diff --git a/build/scripts/Targets/TargetDescriptionFiles/Pad.php b/build/scripts/Targets/TargetDescriptionFiles/Pad.php
new file mode 100644
index 00000000..8f18f3ff
--- /dev/null
+++ b/build/scripts/Targets/TargetDescriptionFiles/Pad.php
@@ -0,0 +1,14 @@
+<?php
+namespace Targets\TargetDescriptionFiles;
+
+class Pad
+{
+    public ?string $key = null;
+    public ?string $name = null;
+
+    public function __construct(?string $key, ?string $name)
+    {
+        $this->key = $key;
+        $this->name = $name;
+    }
+}
diff --git a/build/scripts/Targets/TargetDescriptionFiles/Pin.php b/build/scripts/Targets/TargetDescriptionFiles/Pin.php
index aed6e5c1..2bd87315 100644
--- a/build/scripts/Targets/TargetDescriptionFiles/Pin.php
+++ b/build/scripts/Targets/TargetDescriptionFiles/Pin.php
@@ -4,11 +4,11 @@ namespace Targets\TargetDescriptionFiles;
 class Pin
 {
     public ?string $position = null;
-    public ?string $pad = null;
+    public ?string $padKey = null;
 
-    public function __construct(?string $position, ?string $pad)
+    public function __construct(?string $position, ?string $padKey)
     {
         $this->position = $position;
-        $this->pad = $pad;
+        $this->padKey = $padKey;
     }
 }
diff --git a/build/scripts/Targets/TargetDescriptionFiles/Services/ValidationService.php b/build/scripts/Targets/TargetDescriptionFiles/Services/ValidationService.php
index 6bc76d9b..e5c9c1ef 100644
--- a/build/scripts/Targets/TargetDescriptionFiles/Services/ValidationService.php
+++ b/build/scripts/Targets/TargetDescriptionFiles/Services/ValidationService.php
@@ -16,6 +16,7 @@ use Targets\TargetDescriptionFiles\Register;
 use Targets\TargetDescriptionFiles\RegisterGroup;
 use Targets\TargetDescriptionFiles\RegisterGroupReference;
 use Targets\TargetDescriptionFiles\Signal;
+use Targets\TargetDescriptionFiles\Pad;
 use Targets\TargetDescriptionFiles\Pinout;
 use Targets\TargetDescriptionFiles\PinoutType;
 use Targets\TargetDescriptionFiles\Variant;
@@ -119,6 +120,21 @@ class ValidationService
             $failures[] = 'Missing GPIO port peripherals';
         }
 
+        if (empty($tdf->pads)) {
+            $failures[] = 'Missing pads';
+        }
+
+        $processedPadKeys = [];
+        foreach ($tdf->pads as $pad) {
+            $failures = array_merge($failures, $this->validatePad($pad));
+
+            if ($pad->key !== null && in_array($pad->key, $processedPadKeys)) {
+                $failures[] = 'Duplicate pad key ("' . $pad->key . '") detected';
+            }
+
+            $processedPadKeys[] = $pad->key;
+        }
+
         if (empty($tdf->pinouts)) {
             $failures[] = 'Missing pinouts';
 
@@ -128,7 +144,7 @@ class ValidationService
 
         $processedPinoutKeys = [];
         foreach ($tdf->pinouts as $pinout) {
-            $failures = array_merge($failures, $this->validatePinout($pinout));
+            $failures = array_merge($failures, $this->validatePinout($pinout, $tdf));
 
             if ($pinout->key !== null && in_array($pinout->key, $processedPinoutKeys)) {
                 $failures[] = 'Duplicate pinout key ("' . $pinout->key . '") detected';
@@ -137,15 +153,15 @@ class ValidationService
             $processedPinoutKeys[] = $pinout->key;
         }
 
-        $processedVariantNames = [];
+        $processedVariantKeys = [];
         foreach ($tdf->variants as $variant) {
             $failures = array_merge($failures, $this->validateVariant($variant, $tdf));
 
-            if ($variant->name !== null && in_array($variant->name, $processedVariantNames)) {
-                $failures[] = 'Duplicate variant name ("' . $variant->name . '") detected';
+            if ($variant->key !== null && in_array($variant->key, $processedVariantKeys)) {
+                $failures[] = 'Duplicate variant key ("' . $variant->key . '") detected';
             }
 
-            $processedVariantNames[] = $variant->name;
+            $processedVariantKeys[] = $variant->key;
         }
 
         // Validate resolved peripherals
@@ -699,7 +715,7 @@ class ValidationService
         }
 
         foreach ($peripheral->signals as $signal) {
-            $failures = array_merge($failures, $this->validateSignal($signal));
+            $failures = array_merge($failures, $this->validateSignal($signal, $tdf));
         }
 
         return array_map(
@@ -750,12 +766,15 @@ class ValidationService
         );
     }
 
-    protected function validateSignal(Signal $signal): array
+    protected function validateSignal(Signal $signal, TargetDescriptionFile $tdf): array
     {
         $failures = [];
 
-        if (empty($signal->padId)) {
-            $failures[] = 'Missing pad ID';
+        if (empty($signal->padKey)) {
+            $failures[] = 'Missing pad key';
+
+        } elseif ($tdf->getPad($signal->padKey) === null) {
+            $failures[] = 'Failed to resolve pad key "' . $signal->padKey . '"';
         }
 
         return array_map(
@@ -764,7 +783,28 @@ class ValidationService
         );
     }
 
-    protected function validatePinout(Pinout $pinout): array
+    protected function validatePad(Pad $pad): array
+    {
+        $failures = [];
+
+        if (empty($pad->key)) {
+            $failures[] = 'Missing key';
+
+        } else {
+            $failures = array_merge($failures, $this->validateKey($pad->key));
+        }
+
+        if (empty($pad->name)) {
+            $failures[] = 'Missing name';
+        }
+
+        return array_map(
+            fn (string $failure): string => 'Pad validation failure: ' . $failure,
+            $failures
+        );
+    }
+
+    protected function validatePinout(Pinout $pinout, TargetDescriptionFile $tdf): array
     {
         $failures = [];
 
@@ -806,7 +846,7 @@ class ValidationService
 
         $processedPositions = [];
         foreach ($pinout->pins as $pin) {
-            $failures = array_merge($failures, $this->validatePin($pin, $pinout));
+            $failures = array_merge($failures, $this->validatePin($pin, $pinout, $tdf));
 
             if ($pin->position !== null && in_array($pin->position, $processedPositions)) {
                 $failures[] = 'Duplicate pin position (' . $pin->position . ') detected';
@@ -821,7 +861,7 @@ class ValidationService
         );
     }
 
-    protected function validatePin(Pin $pin, Pinout $pinout): array
+    protected function validatePin(Pin $pin, Pinout $pinout, TargetDescriptionFile $tdf): array
     {
         $failures = [];
 
@@ -839,12 +879,12 @@ class ValidationService
                 . $pin->position . '")';
         }
 
-        if (empty($pin->pad)) {
-            $failures[] = 'Missing pad';
+        if (!empty($pin->padKey) && $tdf->getPad($pin->padKey) === null) {
+            $failures[] = 'Failed to resolve pad key "' . $pin->padKey . '"';
         }
 
         return array_map(
-            fn (string $failure): string => 'Pin validation failure: ' . $failure,
+            fn (string $failure): string => 'Pin "' . $pin->position . '" validation failure: ' . $failure,
             $failures
         );
     }
@@ -853,6 +893,13 @@ class ValidationService
     {
         $failures = [];
 
+        if (empty($variant->key)) {
+            $failures[] = 'Missing key';
+
+        } else {
+            $failures = array_merge($failures, $this->validateKey($variant->key));
+        }
+
         if (empty($variant->name)) {
             $failures[] = 'Missing name';
         }
@@ -865,10 +912,6 @@ class ValidationService
                 . '" - check pinout key';
         }
 
-        if (empty($variant->package)) {
-            $failures[] = 'Missing package';
-        }
-
         return array_map(
             fn (string $failure): string => 'Variant "' . $variant->name . '" validation failure: ' . $failure,
             $failures
diff --git a/build/scripts/Targets/TargetDescriptionFiles/Services/Xml/FromXmlService.php b/build/scripts/Targets/TargetDescriptionFiles/Services/Xml/FromXmlService.php
index 96cbde95..cd9d9018 100644
--- a/build/scripts/Targets/TargetDescriptionFiles/Services/Xml/FromXmlService.php
+++ b/build/scripts/Targets/TargetDescriptionFiles/Services/Xml/FromXmlService.php
@@ -5,6 +5,7 @@ use DOMDocument;
 use DOMNode;
 use DOMNodeList;
 use DOMElement;
+use Targets\TargetDescriptionFiles\Pad;
 use Targets\TargetDescriptionFiles\Services\StringService;
 use Targets\TargetDescriptionFiles\Services\Xml\Exceptions\XmlParsingException;
 use Targets\TargetDescriptionFiles\AddressSpace;
@@ -370,7 +371,7 @@ class FromXmlService
         $attributes = $this->getNodeAttributesByName($element);
 
         return new Signal(
-            $attributes['pad-id'] ?? null,
+            $attributes['pad-key'] ?? null,
             $this->stringService->tryStringToInt($attributes['index'] ?? null),
             $attributes['function'] ?? null,
             $attributes['group'] ?? null,
@@ -378,6 +379,16 @@ class FromXmlService
         );
     }
 
+    public function padFromElement(DOMElement $element): Pad
+    {
+        $attributes = $this->getNodeAttributesByName($element);
+
+        return new Pad(
+            $attributes['key'] ?? null,
+            $attributes['name'] ?? null
+        );
+    }
+
     public function pinoutFromElement(DOMElement $element): Pinout
     {
         $attributes = $this->getNodeAttributesByName($element);
@@ -409,7 +420,7 @@ class FromXmlService
 
         return new Pin(
             $attributes['position'] ?? null,
-            $attributes['pad'] ?? null
+            $attributes['pad-key'] ?? null
         );
     }
 
@@ -418,9 +429,9 @@ class FromXmlService
         $attributes = $this->getNodeAttributesByName($element);
 
         return new Variant(
+            $attributes['key'] ?? null,
             $attributes['name'] ?? null,
-            $attributes['pinout-key'] ?? null,
-            $attributes['package'] ?? null
+            $attributes['pinout-key'] ?? null
         );
     }
 }
diff --git a/build/scripts/Targets/TargetDescriptionFiles/Services/Xml/ToXmlService.php b/build/scripts/Targets/TargetDescriptionFiles/Services/Xml/ToXmlService.php
index 0dcb9519..2bec22bc 100644
--- a/build/scripts/Targets/TargetDescriptionFiles/Services/Xml/ToXmlService.php
+++ b/build/scripts/Targets/TargetDescriptionFiles/Services/Xml/ToXmlService.php
@@ -8,6 +8,7 @@ use Targets\TargetDescriptionFiles\BitField;
 use Targets\TargetDescriptionFiles\MemorySegment;
 use Targets\TargetDescriptionFiles\MemorySegmentSection;
 use Targets\TargetDescriptionFiles\Module;
+use Targets\TargetDescriptionFiles\Pad;
 use Targets\TargetDescriptionFiles\Peripheral;
 use Targets\TargetDescriptionFiles\RegisterGroupInstance;
 use Targets\TargetDescriptionFiles\PhysicalInterface;
@@ -185,7 +186,7 @@ class ToXmlService
     public function signalToXml(Signal $signal, DOMDocument $document): DOMElement
     {
         $element = $document->createElement('signal');
-        $element->setAttribute('pad-id', $signal->padId);
+        $element->setAttribute('pad-key', $signal->padKey);
 
         if ($signal->index !== null) {
             $element->setAttribute('index', $signal->index);
@@ -349,6 +350,15 @@ class ToXmlService
         return $element;
     }
 
+    public function padToXml(Pad $pad, DOMDocument $document): DOMElement
+    {
+        $element = $document->createElement('pad');
+        $element->setAttribute('key', $pad->key);
+        $element->setAttribute('name', $pad->name);
+
+        return $element;
+    }
+
     public function pinoutToXml(Pinout $pinout, DOMDocument $document): DOMElement
     {
         $element = $document->createElement('pinout');
@@ -371,7 +381,10 @@ class ToXmlService
     {
         $element = $document->createElement('pin');
         $element->setAttribute('position', $pin->position);
-        $element->setAttribute('pad', $pin->pad);
+
+        if (!empty($pin->padKey)) {
+            $element->setAttribute('pad-key', $pin->padKey);
+        }
 
         return $element;
     }
@@ -379,9 +392,9 @@ class ToXmlService
     public function variantToXml(Variant $variant, DOMDocument $document): DOMElement
     {
         $element = $document->createElement('variant');
+        $element->setAttribute('key', $variant->key);
         $element->setAttribute('name', $variant->name);
         $element->setAttribute('pinout-key', $variant->pinoutKey);
-        $element->setAttribute('package', $variant->package);
 
         return $element;
     }
diff --git a/build/scripts/Targets/TargetDescriptionFiles/Services/Xml/XmlService.php b/build/scripts/Targets/TargetDescriptionFiles/Services/Xml/XmlService.php
index df4fa085..6d55176d 100644
--- a/build/scripts/Targets/TargetDescriptionFiles/Services/Xml/XmlService.php
+++ b/build/scripts/Targets/TargetDescriptionFiles/Services/Xml/XmlService.php
@@ -98,6 +98,14 @@ class XmlService
             $tdf->modules[] = $this->fromXmlService->moduleFromElement($element);
         }
 
+        $padElements = $this->fromXmlService->getDeviceElementsFromXPath(
+            'pads/pad',
+            $document
+        );
+        foreach ($padElements as $element) {
+            $tdf->pads[] = $this->fromXmlService->padFromElement($element);
+        }
+
         $pinoutElements = $this->fromXmlService->getDeviceElementsFromXPath(
             'pinouts/pinout',
             $document
@@ -186,6 +194,13 @@ class XmlService
 
         $deviceElement->append($modulesElement);
 
+        $padsElement = $document->createElement('pads');
+        foreach ($tdf->pads as $pad) {
+            $padsElement->append($this->toXmlService->padToXml($pad, $document));
+        }
+
+        $deviceElement->append($padsElement);
+
         $pinoutsElement = $document->createElement('pinouts');
         foreach ($tdf->pinouts as $pinout) {
             $pinoutsElement->append($this->toXmlService->pinoutToXml($pinout, $document));
diff --git a/build/scripts/Targets/TargetDescriptionFiles/Signal.php b/build/scripts/Targets/TargetDescriptionFiles/Signal.php
index 63cf6184..ae2a3c42 100644
--- a/build/scripts/Targets/TargetDescriptionFiles/Signal.php
+++ b/build/scripts/Targets/TargetDescriptionFiles/Signal.php
@@ -3,20 +3,20 @@ namespace Targets\TargetDescriptionFiles;
 
 class Signal
 {
-    public ?string $padId = null;
+    public ?string $padKey = null;
     public ?int $index = null;
     public ?string $function = null;
     public ?string $group = null;
     public ?string $field = null;
 
     public function __construct(
-        ?string $padId,
+        ?string $padKey,
         ?int $index,
         ?string $function,
         ?string $group,
         ?string $field
     ) {
-        $this->padId = $padId;
+        $this->padKey = $padKey;
         $this->index = $index;
         $this->function = $function;
         $this->group = $group;
diff --git a/build/scripts/Targets/TargetDescriptionFiles/TargetDescriptionFile.php b/build/scripts/Targets/TargetDescriptionFiles/TargetDescriptionFile.php
index 0fe6b594..8e7a0162 100644
--- a/build/scripts/Targets/TargetDescriptionFiles/TargetDescriptionFile.php
+++ b/build/scripts/Targets/TargetDescriptionFiles/TargetDescriptionFile.php
@@ -17,6 +17,7 @@ require_once __DIR__ . "/Module.php";
 require_once __DIR__ . "/RegisterGroup.php";
 require_once __DIR__ . "/RegisterGroupReference.php";
 require_once __DIR__ . "/Register.php";
+require_once __DIR__ . "/Pad.php";
 require_once __DIR__ . "/Pinout.php";
 require_once __DIR__ . "/Variant.php";
 require_once __DIR__ . "/TargetFamily.php";
@@ -47,6 +48,9 @@ class TargetDescriptionFile
     /** @var Module[] */
     public array $modules = [];
 
+    /** @var Pad[] */
+    public array $pads = [];
+
     /** @var Pinout[] */
     public array $pinouts = [];
 
@@ -236,6 +240,17 @@ class TargetDescriptionFile
         $module->key = $newKey;
     }
 
+    public function getPad(string $key): ?Pad
+    {
+        foreach ($this->pads as $pad) {
+            if ($pad->key === $key) {
+                return $pad;
+            }
+        }
+
+        return null;
+    }
+
     public function getPinout(string $key): ?Pinout
     {
         foreach ($this->pinouts as $pinout) {
diff --git a/build/scripts/Targets/TargetDescriptionFiles/Variant.php b/build/scripts/Targets/TargetDescriptionFiles/Variant.php
index 430365a8..e3e3ff78 100644
--- a/build/scripts/Targets/TargetDescriptionFiles/Variant.php
+++ b/build/scripts/Targets/TargetDescriptionFiles/Variant.php
@@ -3,14 +3,14 @@ namespace Targets\TargetDescriptionFiles;
 
 class Variant
 {
+    public ?string $key = null;
     public ?string $name = null;
     public ?string $pinoutKey = null;
-    public ?string $package = null;
 
-    public function __construct(?string $name, ?string $pinoutKey, ?string $package)
+    public function __construct(?string $key, ?string $name, ?string $pinoutKey)
     {
+        $this->key = $key;
         $this->name = $name;
         $this->pinoutKey = $pinoutKey;
-        $this->package = $package;
     }
 }
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR128DA28.xml b/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR128DA28.xml
index 05e5ba33..2e9eb93e 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR128DA28.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR128DA28.xml
@@ -44,52 +44,52 @@
         <peripheral key="ac0" name="AC0" module-key="cmp_control_v8">
             <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"/>
-                <signal pad-id="pd7" index="2" function="AC0" group="N"/>
-                <signal pad-id="pa7" index="0" function="AC0" group="OUT" field="PORTMUX.ACROUTEA.AC0"/>
-                <signal pad-id="pd2" index="0" function="AC0" group="P"/>
-                <signal pad-id="pd6" index="3" function="AC0" group="P"/>
+                <signal pad-key="pd3" index="0" function="AC0" group="N"/>
+                <signal pad-key="pd0" index="1" function="AC0" group="N"/>
+                <signal pad-key="pd7" index="2" function="AC0" group="N"/>
+                <signal pad-key="pa7" index="0" function="AC0" group="OUT" field="PORTMUX.ACROUTEA.AC0"/>
+                <signal pad-key="pd2" index="0" function="AC0" group="P"/>
+                <signal pad-key="pd6" index="3" function="AC0" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="ac1" name="AC1" module-key="cmp_control_v8">
             <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"/>
-                <signal pad-id="pd7" index="2" function="AC1" group="N"/>
-                <signal pad-id="pa7" index="0" function="AC1" group="OUT" field="PORTMUX.ACROUTEA.AC1"/>
-                <signal pad-id="pd2" index="0" function="AC1" group="P"/>
-                <signal pad-id="pd3" index="1" function="AC1" group="P"/>
-                <signal pad-id="pd4" index="2" function="AC1" group="P"/>
-                <signal pad-id="pd6" index="3" function="AC1" group="P"/>
+                <signal pad-key="pd5" index="0" function="AC1" group="N"/>
+                <signal pad-key="pd0" index="1" function="AC1" group="N"/>
+                <signal pad-key="pd7" index="2" function="AC1" group="N"/>
+                <signal pad-key="pa7" index="0" function="AC1" group="OUT" field="PORTMUX.ACROUTEA.AC1"/>
+                <signal pad-key="pd2" index="0" function="AC1" group="P"/>
+                <signal pad-key="pd3" index="1" function="AC1" group="P"/>
+                <signal pad-key="pd4" index="2" function="AC1" group="P"/>
+                <signal pad-key="pd6" index="3" function="AC1" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="ac2" name="AC2" module-key="cmp_control_v8">
             <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"/>
-                <signal pad-id="pd7" index="2" function="AC2" group="N"/>
-                <signal pad-id="pa7" index="0" function="AC2" group="OUT" field="PORTMUX.ACROUTEA.AC2"/>
-                <signal pad-id="pd2" index="0" function="AC2" group="P"/>
-                <signal pad-id="pd4" index="1" function="AC2" group="P"/>
-                <signal pad-id="pd6" index="3" function="AC2" group="P"/>
+                <signal pad-key="pd7" index="0" function="AC2" group="N"/>
+                <signal pad-key="pd0" index="1" function="AC2" group="N"/>
+                <signal pad-key="pd7" index="2" function="AC2" group="N"/>
+                <signal pad-key="pa7" index="0" function="AC2" group="OUT" field="PORTMUX.ACROUTEA.AC2"/>
+                <signal pad-key="pd2" index="0" function="AC2" group="P"/>
+                <signal pad-key="pd4" index="1" function="AC2" group="P"/>
+                <signal pad-key="pd6" index="3" function="AC2" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="adc0" name="ADC0" module-key="adc_12b_diff_ctrl_v1">
             <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"/>
-                <signal pad-id="pd2" index="2" function="AIN0" group="AIN"/>
-                <signal pad-id="pd3" index="3" function="AIN0" group="AIN"/>
-                <signal pad-id="pd4" index="4" function="AIN0" group="AIN"/>
-                <signal pad-id="pd5" index="5" function="AIN0" group="AIN"/>
-                <signal pad-id="pd6" index="6" function="AIN0" group="AIN"/>
-                <signal pad-id="pd7" index="7" function="AIN0" group="AIN"/>
-                <signal pad-id="pf0" index="16" function="AIN0" group="AIN"/>
-                <signal pad-id="pf1" index="17" function="AIN0" group="AIN"/>
+                <signal pad-key="pd0" index="0" function="AIN0" group="AIN"/>
+                <signal pad-key="pd1" index="1" function="AIN0" group="AIN"/>
+                <signal pad-key="pd2" index="2" function="AIN0" group="AIN"/>
+                <signal pad-key="pd3" index="3" function="AIN0" group="AIN"/>
+                <signal pad-key="pd4" index="4" function="AIN0" group="AIN"/>
+                <signal pad-key="pd5" index="5" function="AIN0" group="AIN"/>
+                <signal pad-key="pd6" index="6" function="AIN0" group="AIN"/>
+                <signal pad-key="pd7" index="7" function="AIN0" group="AIN"/>
+                <signal pad-key="pf0" index="16" function="AIN0" group="AIN"/>
+                <signal pad-key="pf1" index="17" function="AIN0" group="AIN"/>
             </signals>
         </peripheral>
         <peripheral key="bod" name="BOD" module-key="bor_lvd_ctrl_v1">
@@ -98,31 +98,31 @@
         <peripheral key="ccl" name="CCL" module-key="cla_ccl_v1">
             <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"/>
-                <signal pad-id="pa2" index="2" function="CCL_IN" group="LUT0_IN"/>
-                <signal pad-id="pa6" index="0" function="CCL_ALT" group="LUT0_OUT" field="PORTMUX.CCLROUTEA.LUT0"/>
-                <signal pad-id="pa3" index="0" function="CCL" group="LUT0_OUT" field="PORTMUX.CCLROUTEA.LUT0"/>
-                <signal pad-id="pc0" index="0" function="CCL_IN" group="LUT1_IN"/>
-                <signal pad-id="pc1" index="1" function="CCL_IN" group="LUT1_IN"/>
-                <signal pad-id="pc2" index="2" function="CCL_IN" group="LUT1_IN"/>
-                <signal pad-id="pc3" index="0" function="CCL" group="LUT1_OUT" field="PORTMUX.CCLROUTEA.LUT1"/>
-                <signal pad-id="pd0" index="0" function="CCL_IN" group="LUT2_IN"/>
-                <signal pad-id="pd1" index="1" function="CCL_IN" group="LUT2_IN"/>
-                <signal pad-id="pd2" index="2" function="CCL_IN" group="LUT2_IN"/>
-                <signal pad-id="pd6" index="0" function="CCL_ALT" group="LUT2_OUT" field="PORTMUX.CCLROUTEA.LUT2"/>
-                <signal pad-id="pd3" index="0" function="CCL" group="LUT2_OUT" field="PORTMUX.CCLROUTEA.LUT2"/>
-                <signal pad-id="pf0" index="0" function="CCL_IN" group="LUT3_IN"/>
-                <signal pad-id="pf1" index="1" function="CCL_IN" group="LUT3_IN"/>
+                <signal pad-key="pa0" index="0" function="CCL_IN" group="LUT0_IN"/>
+                <signal pad-key="pa1" index="1" function="CCL_IN" group="LUT0_IN"/>
+                <signal pad-key="pa2" index="2" function="CCL_IN" group="LUT0_IN"/>
+                <signal pad-key="pa6" index="0" function="CCL_ALT" group="LUT0_OUT" field="PORTMUX.CCLROUTEA.LUT0"/>
+                <signal pad-key="pa3" index="0" function="CCL" group="LUT0_OUT" field="PORTMUX.CCLROUTEA.LUT0"/>
+                <signal pad-key="pc0" index="0" function="CCL_IN" group="LUT1_IN"/>
+                <signal pad-key="pc1" index="1" function="CCL_IN" group="LUT1_IN"/>
+                <signal pad-key="pc2" index="2" function="CCL_IN" group="LUT1_IN"/>
+                <signal pad-key="pc3" index="0" function="CCL" group="LUT1_OUT" field="PORTMUX.CCLROUTEA.LUT1"/>
+                <signal pad-key="pd0" index="0" function="CCL_IN" group="LUT2_IN"/>
+                <signal pad-key="pd1" index="1" function="CCL_IN" group="LUT2_IN"/>
+                <signal pad-key="pd2" index="2" function="CCL_IN" group="LUT2_IN"/>
+                <signal pad-key="pd6" index="0" function="CCL_ALT" group="LUT2_OUT" field="PORTMUX.CCLROUTEA.LUT2"/>
+                <signal pad-key="pd3" index="0" function="CCL" group="LUT2_OUT" field="PORTMUX.CCLROUTEA.LUT2"/>
+                <signal pad-key="pf0" index="0" function="CCL_IN" group="LUT3_IN"/>
+                <signal pad-key="pf1" index="1" function="CCL_IN" group="LUT3_IN"/>
             </signals>
         </peripheral>
         <peripheral key="clkctrl" name="CLKCTRL" module-key="avrda_clkctrl">
             <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"/>
-                <signal pad-id="pf0" function="CLKCTRL" group="XTAL32K1"/>
-                <signal pad-id="pf1" function="CLKCTRL" group="XTAL32K2"/>
+                <signal pad-key="pa7" function="CLKCTRL" group="CLKOUT"/>
+                <signal pad-key="pa0" function="CLKCTRL" group="EXTCLK"/>
+                <signal pad-key="pf0" function="CLKCTRL" group="XTAL32K1"/>
+                <signal pad-key="pf1" function="CLKCTRL" group="XTAL32K2"/>
             </signals>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="cpu_avr_xt_v1">
@@ -137,17 +137,17 @@
         <peripheral key="dac0" name="DAC0" module-key="dac_nbit_ctrl_v5">
             <register-group-instance register-group-key="dac" address-space-key="data" offset="0x6A0"/>
             <signals>
-                <signal pad-id="pd6" index="0" function="DAC0" group="OUT"/>
+                <signal pad-key="pd6" index="0" function="DAC0" group="OUT"/>
             </signals>
         </peripheral>
         <peripheral key="evsys" name="EVSYS" module-key="avrda_evsys">
             <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"/>
-                <signal pad-id="pc2" index="2" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTC"/>
-                <signal pad-id="pd7" index="3" function="EVSYS_ALT" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTD"/>
-                <signal pad-id="pd2" index="3" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTD"/>
+                <signal pad-key="pa7" index="0" function="EVSYS_ALT" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTA"/>
+                <signal pad-key="pa2" index="0" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTA"/>
+                <signal pad-key="pc2" index="2" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTC"/>
+                <signal pad-key="pd7" index="3" function="EVSYS_ALT" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTD"/>
+                <signal pad-key="pd2" index="3" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTD"/>
             </signals>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="avrda_fuse">
@@ -165,44 +165,44 @@
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pa2" index="2" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa3" index="3" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa4" index="4" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa5" index="5" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa6" index="6" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa7" index="7" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa0" index="0" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa1" index="1" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa2" index="2" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa3" index="3" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa4" index="4" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa5" index="5" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa6" index="6" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa7" index="7" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pc2" index="2" function="IOPORT" group="PIN"/>
-                <signal pad-id="pc3" index="3" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc0" index="0" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc1" index="1" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc2" index="2" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc3" index="3" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pd2" index="2" function="IOPORT" group="PIN"/>
-                <signal pad-id="pd3" index="3" function="IOPORT" group="PIN"/>
-                <signal pad-id="pd4" index="4" function="IOPORT" group="PIN"/>
-                <signal pad-id="pd5" index="5" function="IOPORT" group="PIN"/>
-                <signal pad-id="pd6" index="6" function="IOPORT" group="PIN"/>
-                <signal pad-id="pd7" index="7" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd0" index="0" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd1" index="1" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd2" index="2" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd3" index="3" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd4" index="4" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd5" index="5" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd6" index="6" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd7" index="7" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="portf" name="PORTF" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pf6" index="6" function="IOPORT" group="PIN"/>
+                <signal pad-key="pf0" index="0" function="IOPORT" group="PIN"/>
+                <signal pad-key="pf1" index="1" function="IOPORT" group="PIN"/>
+                <signal pad-key="pf6" index="6" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="portmux" name="PORTMUX" module-key="avrda_portmux">
@@ -210,30 +210,30 @@
         </peripheral>
         <peripheral key="ptc" name="PTC" module-key="adc_ptc_ctrl_v1">
             <signals>
-                <signal pad-id="pa0" index="0" function="PTC" group="XY"/>
-                <signal pad-id="pa1" index="1" function="PTC" group="XY"/>
-                <signal pad-id="pa2" index="2" function="PTC" group="XY"/>
-                <signal pad-id="pa3" index="3" function="PTC" group="XY"/>
-                <signal pad-id="pa4" index="4" function="PTC" group="XY"/>
-                <signal pad-id="pa5" index="5" function="PTC" group="XY"/>
-                <signal pad-id="pa6" index="6" function="PTC" group="XY"/>
-                <signal pad-id="pa7" index="7" function="PTC" group="XY"/>
-                <signal pad-id="pd0" index="16" function="PTC" group="XY"/>
-                <signal pad-id="pd1" index="17" function="PTC" group="XY"/>
-                <signal pad-id="pd2" index="18" function="PTC" group="XY"/>
-                <signal pad-id="pd3" index="19" function="PTC" group="XY"/>
-                <signal pad-id="pd4" index="20" function="PTC" group="XY"/>
-                <signal pad-id="pd5" index="21" function="PTC" group="XY"/>
-                <signal pad-id="pd6" index="22" function="PTC" group="XY"/>
-                <signal pad-id="pd7" index="23" function="PTC" group="XY"/>
-                <signal pad-id="pf0" index="32" function="PTC" group="XY"/>
-                <signal pad-id="pf1" index="33" function="PTC" group="XY"/>
+                <signal pad-key="pa0" index="0" function="PTC" group="XY"/>
+                <signal pad-key="pa1" index="1" function="PTC" group="XY"/>
+                <signal pad-key="pa2" index="2" function="PTC" group="XY"/>
+                <signal pad-key="pa3" index="3" function="PTC" group="XY"/>
+                <signal pad-key="pa4" index="4" function="PTC" group="XY"/>
+                <signal pad-key="pa5" index="5" function="PTC" group="XY"/>
+                <signal pad-key="pa6" index="6" function="PTC" group="XY"/>
+                <signal pad-key="pa7" index="7" function="PTC" group="XY"/>
+                <signal pad-key="pd0" index="16" function="PTC" group="XY"/>
+                <signal pad-key="pd1" index="17" function="PTC" group="XY"/>
+                <signal pad-key="pd2" index="18" function="PTC" group="XY"/>
+                <signal pad-key="pd3" index="19" function="PTC" group="XY"/>
+                <signal pad-key="pd4" index="20" function="PTC" group="XY"/>
+                <signal pad-key="pd5" index="21" function="PTC" group="XY"/>
+                <signal pad-key="pd6" index="22" function="PTC" group="XY"/>
+                <signal pad-key="pd7" index="23" function="PTC" group="XY"/>
+                <signal pad-key="pf0" index="32" function="PTC" group="XY"/>
+                <signal pad-key="pf1" index="33" function="PTC" group="XY"/>
             </signals>
         </peripheral>
         <peripheral key="rstctrl" name="RSTCTRL" module-key="rst_integration_v8">
             <register-group-instance register-group-key="rstctrl" address-space-key="data" offset="0x40"/>
             <signals>
-                <signal pad-id="pf6" function="OTHER" group="RESET"/>
+                <signal pad-key="pf6" function="OTHER" group="RESET"/>
             </signals>
         </peripheral>
         <peripheral key="rtc" name="RTC" module-key="tmr_16b_rtc_v1">
@@ -248,19 +248,19 @@
         <peripheral key="spi0" name="SPI0" module-key="spi_8bit_v2">
             <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"/>
-                <signal pad-id="pa6" function="SPI0" group="SCK" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <signal pad-id="pa7" function="SPI0" group="SS" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pa5" function="SPI0" group="MISO" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pa4" function="SPI0" group="MOSI" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pa6" function="SPI0" group="SCK" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pa7" function="SPI0" group="SS" field="PORTMUX.SPIROUTEA.SPI0"/>
             </signals>
         </peripheral>
         <peripheral key="spi1" name="SPI1" module-key="spi_8bit_v2">
             <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"/>
-                <signal pad-id="pc2" function="SPI1" group="SCK" field="PORTMUX.SPIROUTEA.SPI1"/>
-                <signal pad-id="pc3" function="SPI1" group="SS" field="PORTMUX.SPIROUTEA.SPI1"/>
+                <signal pad-key="pc1" function="SPI1" group="MISO" field="PORTMUX.SPIROUTEA.SPI1"/>
+                <signal pad-key="pc0" function="SPI1" group="MOSI" field="PORTMUX.SPIROUTEA.SPI1"/>
+                <signal pad-key="pc2" function="SPI1" group="SCK" field="PORTMUX.SPIROUTEA.SPI1"/>
+                <signal pad-key="pc3" function="SPI1" group="SS" field="PORTMUX.SPIROUTEA.SPI1"/>
             </signals>
         </peripheral>
         <peripheral key="syscfg" name="SYSCFG" module-key="avrda_syscfg">
@@ -269,95 +269,95 @@
         <peripheral key="tca0" name="TCA0" module-key="tmr_16b_pwm_v1">
             <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"/>
-                <signal pad-id="pc0" index="0" function="TCA0_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pa0" index="0" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pf1" index="1" function="TCA0_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pd1" index="1" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pc1" index="1" function="TCA0_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pa1" index="1" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pd2" index="2" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pc2" index="2" function="TCA0_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pa2" index="2" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pd3" index="3" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pc3" index="3" function="TCA0_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pa3" index="3" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pd4" index="4" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pa4" index="4" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pd5" index="5" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pa5" index="5" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pf0" index="0" function="TCA0_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pd0" index="0" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pc0" index="0" function="TCA0_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pa0" index="0" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pf1" index="1" function="TCA0_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pd1" index="1" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pc1" index="1" function="TCA0_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pa1" index="1" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pd2" index="2" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pc2" index="2" function="TCA0_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pa2" index="2" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pd3" index="3" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pc3" index="3" function="TCA0_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pa3" index="3" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pd4" index="4" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pa4" index="4" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pd5" index="5" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pa5" index="5" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
             </signals>
         </peripheral>
         <peripheral key="tcb0" name="TCB0" module-key="tmr_16b_capture_v1">
             <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-key="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 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-key="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 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"/>
+                <signal pad-key="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 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"/>
-                <signal pad-id="pf1" index="1" function="TCD0_ALT2" group="WOB" field="PORTMUX.TCDROUTEA.TCD0"/>
-                <signal pad-id="pa5" index="1" function="TCD0" group="WOB" field="PORTMUX.TCDROUTEA.TCD0"/>
-                <signal pad-id="pa6" index="2" function="TCD0" group="WOC" field="PORTMUX.TCDROUTEA.TCD0"/>
-                <signal pad-id="pa7" index="3" function="TCD0" group="WOD" field="PORTMUX.TCDROUTEA.TCD0"/>
+                <signal pad-key="pf0" function="TCD0_ALT2" group="WOA" field="PORTMUX.TCDROUTEA.TCD0"/>
+                <signal pad-key="pa4" function="TCD0" group="WOA" field="PORTMUX.TCDROUTEA.TCD0"/>
+                <signal pad-key="pf1" index="1" function="TCD0_ALT2" group="WOB" field="PORTMUX.TCDROUTEA.TCD0"/>
+                <signal pad-key="pa5" index="1" function="TCD0" group="WOB" field="PORTMUX.TCDROUTEA.TCD0"/>
+                <signal pad-key="pa6" index="2" function="TCD0" group="WOC" field="PORTMUX.TCDROUTEA.TCD0"/>
+                <signal pad-key="pa7" index="3" function="TCD0" group="WOD" field="PORTMUX.TCDROUTEA.TCD0"/>
             </signals>
         </peripheral>
         <peripheral key="twi0" name="TWI0" module-key="i2c_8bit_v2">
             <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"/>
-                <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"/>
-                <signal pad-id="pc2" function="I2C0_ALT2" group="SDA" field="PORTMUX.TWIROUTEA.TWI0"/>
-                <signal pad-id="pa2" function="I2C0_ALT1" group="SDA" field="PORTMUX.TWIROUTEA.TWI0"/>
-                <signal pad-id="pa2" function="I2C0" group="SDA" field="PORTMUX.TWIROUTEA.TWI0"/>
-                <signal pad-id="pc2" function="I2C0" group="SDA_DUAL" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pc3" function="I2C0_ALT2" group="SCL" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pa3" function="I2C0_ALT1" group="SCL" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pa3" function="I2C0" group="SCL" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pc3" function="I2C0" group="SCL_DUAL" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pc2" function="I2C0_ALT2" group="SDA" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pa2" function="I2C0_ALT1" group="SDA" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pa2" function="I2C0" group="SDA" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pc2" function="I2C0" group="SDA_DUAL" field="PORTMUX.TWIROUTEA.TWI0"/>
             </signals>
         </peripheral>
         <peripheral key="usart0" name="USART0" module-key="uart_autobd_v4">
             <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"/>
-                <signal pad-id="pa4" function="USART0_ALT" group="TXD" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pa0" function="USART0" group="TXD" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pa6" function="USART0_ALT" group="XCK" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pa2" function="USART0" group="XCK" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pa7" function="USART0_ALT" group="XDIR" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pa3" function="USART0" group="XDIR" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa5" function="USART0_ALT" group="RXD" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa1" function="USART0" group="RXD" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa4" function="USART0_ALT" group="TXD" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa0" function="USART0" group="TXD" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa6" function="USART0_ALT" group="XCK" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa2" function="USART0" group="XCK" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa7" function="USART0_ALT" group="XDIR" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa3" function="USART0" group="XDIR" field="PORTMUX.USARTROUTEA.USART0"/>
             </signals>
         </peripheral>
         <peripheral key="usart1" name="USART1" module-key="uart_autobd_v4">
             <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"/>
-                <signal pad-id="pc2" function="USART1" group="XCK" field="PORTMUX.USARTROUTEA.USART1"/>
-                <signal pad-id="pc3" function="USART1" group="XDIR" field="PORTMUX.USARTROUTEA.USART1"/>
+                <signal pad-key="pc1" function="USART1" group="RXD" field="PORTMUX.USARTROUTEA.USART1"/>
+                <signal pad-key="pc0" function="USART1" group="TXD" field="PORTMUX.USARTROUTEA.USART1"/>
+                <signal pad-key="pc2" function="USART1" group="XCK" field="PORTMUX.USARTROUTEA.USART1"/>
+                <signal pad-key="pc3" function="USART1" group="XDIR" field="PORTMUX.USARTROUTEA.USART1"/>
             </signals>
         </peripheral>
         <peripheral key="usart2" name="USART2" module-key="uart_autobd_v4">
             <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"/>
+                <signal pad-key="pf1" function="USART2" group="RXD" field="PORTMUX.USARTROUTEA.USART2"/>
+                <signal pad-key="pf0" function="USART2" group="TXD" field="PORTMUX.USARTROUTEA.USART2"/>
             </signals>
         </peripheral>
         <peripheral key="userrow" name="USERROW" module-key="avrda_userrow">
@@ -384,8 +384,8 @@
         <peripheral key="zcd0" name="ZCD0" module-key="cmp_zxover_ctrl_v3">
             <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"/>
+                <signal pad-key="pd1" function="ZCD0" group="IN"/>
+                <signal pad-key="pa7" function="ZCD0" group="OUT" field="PORTMUX.ZCDROUTEA.ZCD0"/>
             </signals>
         </peripheral>
     </peripherals>
@@ -1609,39 +1609,69 @@
             </register-group>
         </module>
     </modules>
+    <pads>
+        <pad key="pa7" name="PA7"/>
+        <pad key="pc0" name="PC0"/>
+        <pad key="pc1" name="PC1"/>
+        <pad key="pc2" name="PC2"/>
+        <pad key="pc3" name="PC3"/>
+        <pad key="pd0" name="PD0"/>
+        <pad key="pd1" name="PD1"/>
+        <pad key="pd2" name="PD2"/>
+        <pad key="pd3" name="PD3"/>
+        <pad key="pd4" name="PD4"/>
+        <pad key="pd5" name="PD5"/>
+        <pad key="pd6" name="PD6"/>
+        <pad key="pd7" name="PD7"/>
+        <pad key="avdd" name="AVDD"/>
+        <pad key="agnd" name="AGND"/>
+        <pad key="pf0" name="PF0"/>
+        <pad key="pf1" name="PF1"/>
+        <pad key="pf6" name="PF6"/>
+        <pad key="updi" name="UPDI"/>
+        <pad key="vdd0" name="VDD0"/>
+        <pad key="gnd0" name="GND0"/>
+        <pad key="pa0" name="PA0"/>
+        <pad key="pa1" name="PA1"/>
+        <pad key="pa2" name="PA2"/>
+        <pad key="pa3" name="PA3"/>
+        <pad key="pa4" name="PA4"/>
+        <pad key="pa5" name="PA5"/>
+        <pad key="pa6" name="PA6"/>
+    </pads>
     <pinouts>
         <pinout key="soic28" name="SOIC28" type="soic">
-            <pin position="1" pad="PA7"/>
-            <pin position="2" pad="PC0"/>
-            <pin position="3" pad="PC1"/>
-            <pin position="4" pad="PC2"/>
-            <pin position="5" pad="PC3"/>
-            <pin position="6" pad="PD0"/>
-            <pin position="7" pad="PD1"/>
-            <pin position="8" pad="PD2"/>
-            <pin position="9" pad="PD3"/>
-            <pin position="10" pad="PD4"/>
-            <pin position="11" pad="PD5"/>
-            <pin position="12" pad="PD6"/>
-            <pin position="13" pad="PD7"/>
-            <pin position="14" pad="AVDD"/>
-            <pin position="15" pad="AGND"/>
-            <pin position="16" pad="PF0"/>
-            <pin position="17" pad="PF1"/>
-            <pin position="18" pad="PF6"/>
-            <pin position="19" pad="UPDI"/>
-            <pin position="20" pad="VDD0"/>
-            <pin position="21" pad="GND0"/>
-            <pin position="22" pad="PA0"/>
-            <pin position="23" pad="PA1"/>
-            <pin position="24" pad="PA2"/>
-            <pin position="25" pad="PA3"/>
-            <pin position="26" pad="PA4"/>
-            <pin position="27" pad="PA5"/>
-            <pin position="28" pad="PA6"/>
+            <pin position="1" pad-key="pa7"/>
+            <pin position="2" pad-key="pc0"/>
+            <pin position="3" pad-key="pc1"/>
+            <pin position="4" pad-key="pc2"/>
+            <pin position="5" pad-key="pc3"/>
+            <pin position="6" pad-key="pd0"/>
+            <pin position="7" pad-key="pd1"/>
+            <pin position="8" pad-key="pd2"/>
+            <pin position="9" pad-key="pd3"/>
+            <pin position="10" pad-key="pd4"/>
+            <pin position="11" pad-key="pd5"/>
+            <pin position="12" pad-key="pd6"/>
+            <pin position="13" pad-key="pd7"/>
+            <pin position="14" pad-key="avdd"/>
+            <pin position="15" pad-key="agnd"/>
+            <pin position="16" pad-key="pf0"/>
+            <pin position="17" pad-key="pf1"/>
+            <pin position="18" pad-key="pf6"/>
+            <pin position="19" pad-key="updi"/>
+            <pin position="20" pad-key="vdd0"/>
+            <pin position="21" pad-key="gnd0"/>
+            <pin position="22" pad-key="pa0"/>
+            <pin position="23" pad-key="pa1"/>
+            <pin position="24" pad-key="pa2"/>
+            <pin position="25" pad-key="pa3"/>
+            <pin position="26" pad-key="pa4"/>
+            <pin position="27" pad-key="pa5"/>
+            <pin position="28" pad-key="pa6"/>
         </pinout>
     </pinouts>
     <variants>
-        <variant name="AVR128DA28" pinout-key="soic28" package="SOIC28"/>
+        <variant key="avr128da28" name="AVR128DA28" pinout-key="soic28"/>
     </variants>
 </device>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR128DA32.xml b/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR128DA32.xml
index d99b1b71..425f1f7c 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR128DA32.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR128DA32.xml
@@ -44,56 +44,56 @@
         <peripheral key="ac0" name="AC0" module-key="cmp_control_v8">
             <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"/>
-                <signal pad-id="pd7" index="2" function="AC0" group="N"/>
-                <signal pad-id="pa7" index="0" function="AC0" group="OUT" field="PORTMUX.ACROUTEA.AC0"/>
-                <signal pad-id="pd2" index="0" function="AC0" group="P"/>
-                <signal pad-id="pd6" index="3" function="AC0" group="P"/>
+                <signal pad-key="pd3" index="0" function="AC0" group="N"/>
+                <signal pad-key="pd0" index="1" function="AC0" group="N"/>
+                <signal pad-key="pd7" index="2" function="AC0" group="N"/>
+                <signal pad-key="pa7" index="0" function="AC0" group="OUT" field="PORTMUX.ACROUTEA.AC0"/>
+                <signal pad-key="pd2" index="0" function="AC0" group="P"/>
+                <signal pad-key="pd6" index="3" function="AC0" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="ac1" name="AC1" module-key="cmp_control_v8">
             <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"/>
-                <signal pad-id="pd7" index="2" function="AC1" group="N"/>
-                <signal pad-id="pa7" index="0" function="AC1" group="OUT" field="PORTMUX.ACROUTEA.AC1"/>
-                <signal pad-id="pd2" index="0" function="AC1" group="P"/>
-                <signal pad-id="pd3" index="1" function="AC1" group="P"/>
-                <signal pad-id="pd4" index="2" function="AC1" group="P"/>
-                <signal pad-id="pd6" index="3" function="AC1" group="P"/>
+                <signal pad-key="pd5" index="0" function="AC1" group="N"/>
+                <signal pad-key="pd0" index="1" function="AC1" group="N"/>
+                <signal pad-key="pd7" index="2" function="AC1" group="N"/>
+                <signal pad-key="pa7" index="0" function="AC1" group="OUT" field="PORTMUX.ACROUTEA.AC1"/>
+                <signal pad-key="pd2" index="0" function="AC1" group="P"/>
+                <signal pad-key="pd3" index="1" function="AC1" group="P"/>
+                <signal pad-key="pd4" index="2" function="AC1" group="P"/>
+                <signal pad-key="pd6" index="3" function="AC1" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="ac2" name="AC2" module-key="cmp_control_v8">
             <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"/>
-                <signal pad-id="pd7" index="2" function="AC2" group="N"/>
-                <signal pad-id="pa7" index="0" function="AC2" group="OUT" field="PORTMUX.ACROUTEA.AC2"/>
-                <signal pad-id="pd2" index="0" function="AC2" group="P"/>
-                <signal pad-id="pd4" index="1" function="AC2" group="P"/>
-                <signal pad-id="pd6" index="3" function="AC2" group="P"/>
+                <signal pad-key="pd7" index="0" function="AC2" group="N"/>
+                <signal pad-key="pd0" index="1" function="AC2" group="N"/>
+                <signal pad-key="pd7" index="2" function="AC2" group="N"/>
+                <signal pad-key="pa7" index="0" function="AC2" group="OUT" field="PORTMUX.ACROUTEA.AC2"/>
+                <signal pad-key="pd2" index="0" function="AC2" group="P"/>
+                <signal pad-key="pd4" index="1" function="AC2" group="P"/>
+                <signal pad-key="pd6" index="3" function="AC2" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="adc0" name="ADC0" module-key="adc_12b_diff_ctrl_v1">
             <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"/>
-                <signal pad-id="pd2" index="2" function="AIN0" group="AIN"/>
-                <signal pad-id="pd3" index="3" function="AIN0" group="AIN"/>
-                <signal pad-id="pd4" index="4" function="AIN0" group="AIN"/>
-                <signal pad-id="pd5" index="5" function="AIN0" group="AIN"/>
-                <signal pad-id="pd6" index="6" function="AIN0" group="AIN"/>
-                <signal pad-id="pd7" index="7" function="AIN0" group="AIN"/>
-                <signal pad-id="pf0" index="16" function="AIN0" group="AIN"/>
-                <signal pad-id="pf1" index="17" function="AIN0" group="AIN"/>
-                <signal pad-id="pf2" index="18" function="AIN0" group="AIN"/>
-                <signal pad-id="pf3" index="19" function="AIN0" group="AIN"/>
-                <signal pad-id="pf4" index="20" function="AIN0" group="AIN"/>
-                <signal pad-id="pf5" index="21" function="AIN0" group="AIN"/>
+                <signal pad-key="pd0" index="0" function="AIN0" group="AIN"/>
+                <signal pad-key="pd1" index="1" function="AIN0" group="AIN"/>
+                <signal pad-key="pd2" index="2" function="AIN0" group="AIN"/>
+                <signal pad-key="pd3" index="3" function="AIN0" group="AIN"/>
+                <signal pad-key="pd4" index="4" function="AIN0" group="AIN"/>
+                <signal pad-key="pd5" index="5" function="AIN0" group="AIN"/>
+                <signal pad-key="pd6" index="6" function="AIN0" group="AIN"/>
+                <signal pad-key="pd7" index="7" function="AIN0" group="AIN"/>
+                <signal pad-key="pf0" index="16" function="AIN0" group="AIN"/>
+                <signal pad-key="pf1" index="17" function="AIN0" group="AIN"/>
+                <signal pad-key="pf2" index="18" function="AIN0" group="AIN"/>
+                <signal pad-key="pf3" index="19" function="AIN0" group="AIN"/>
+                <signal pad-key="pf4" index="20" function="AIN0" group="AIN"/>
+                <signal pad-key="pf5" index="21" function="AIN0" group="AIN"/>
             </signals>
         </peripheral>
         <peripheral key="bod" name="BOD" module-key="bor_lvd_ctrl_v1">
@@ -102,33 +102,33 @@
         <peripheral key="ccl" name="CCL" module-key="cla_ccl_v1">
             <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"/>
-                <signal pad-id="pa2" index="2" function="CCL_IN" group="LUT0_IN"/>
-                <signal pad-id="pa6" index="0" function="CCL_ALT" group="LUT0_OUT" field="PORTMUX.CCLROUTEA.LUT0"/>
-                <signal pad-id="pa3" index="0" function="CCL" group="LUT0_OUT" field="PORTMUX.CCLROUTEA.LUT0"/>
-                <signal pad-id="pc0" index="0" function="CCL_IN" group="LUT1_IN"/>
-                <signal pad-id="pc1" index="1" function="CCL_IN" group="LUT1_IN"/>
-                <signal pad-id="pc2" index="2" function="CCL_IN" group="LUT1_IN"/>
-                <signal pad-id="pc3" index="0" function="CCL" group="LUT1_OUT" field="PORTMUX.CCLROUTEA.LUT1"/>
-                <signal pad-id="pd0" index="0" function="CCL_IN" group="LUT2_IN"/>
-                <signal pad-id="pd1" index="1" function="CCL_IN" group="LUT2_IN"/>
-                <signal pad-id="pd2" index="2" function="CCL_IN" group="LUT2_IN"/>
-                <signal pad-id="pd6" index="0" function="CCL_ALT" group="LUT2_OUT" field="PORTMUX.CCLROUTEA.LUT2"/>
-                <signal pad-id="pd3" index="0" function="CCL" group="LUT2_OUT" field="PORTMUX.CCLROUTEA.LUT2"/>
-                <signal pad-id="pf0" index="0" function="CCL_IN" group="LUT3_IN"/>
-                <signal pad-id="pf1" index="1" function="CCL_IN" group="LUT3_IN"/>
-                <signal pad-id="pf2" index="2" function="CCL_IN" group="LUT3_IN"/>
-                <signal pad-id="pf3" index="0" function="CCL" group="LUT3_OUT" field="PORTMUX.CCLROUTEA.LUT3"/>
+                <signal pad-key="pa0" index="0" function="CCL_IN" group="LUT0_IN"/>
+                <signal pad-key="pa1" index="1" function="CCL_IN" group="LUT0_IN"/>
+                <signal pad-key="pa2" index="2" function="CCL_IN" group="LUT0_IN"/>
+                <signal pad-key="pa6" index="0" function="CCL_ALT" group="LUT0_OUT" field="PORTMUX.CCLROUTEA.LUT0"/>
+                <signal pad-key="pa3" index="0" function="CCL" group="LUT0_OUT" field="PORTMUX.CCLROUTEA.LUT0"/>
+                <signal pad-key="pc0" index="0" function="CCL_IN" group="LUT1_IN"/>
+                <signal pad-key="pc1" index="1" function="CCL_IN" group="LUT1_IN"/>
+                <signal pad-key="pc2" index="2" function="CCL_IN" group="LUT1_IN"/>
+                <signal pad-key="pc3" index="0" function="CCL" group="LUT1_OUT" field="PORTMUX.CCLROUTEA.LUT1"/>
+                <signal pad-key="pd0" index="0" function="CCL_IN" group="LUT2_IN"/>
+                <signal pad-key="pd1" index="1" function="CCL_IN" group="LUT2_IN"/>
+                <signal pad-key="pd2" index="2" function="CCL_IN" group="LUT2_IN"/>
+                <signal pad-key="pd6" index="0" function="CCL_ALT" group="LUT2_OUT" field="PORTMUX.CCLROUTEA.LUT2"/>
+                <signal pad-key="pd3" index="0" function="CCL" group="LUT2_OUT" field="PORTMUX.CCLROUTEA.LUT2"/>
+                <signal pad-key="pf0" index="0" function="CCL_IN" group="LUT3_IN"/>
+                <signal pad-key="pf1" index="1" function="CCL_IN" group="LUT3_IN"/>
+                <signal pad-key="pf2" index="2" function="CCL_IN" group="LUT3_IN"/>
+                <signal pad-key="pf3" index="0" function="CCL" group="LUT3_OUT" field="PORTMUX.CCLROUTEA.LUT3"/>
             </signals>
         </peripheral>
         <peripheral key="clkctrl" name="CLKCTRL" module-key="avrda_clkctrl">
             <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"/>
-                <signal pad-id="pf0" function="CLKCTRL" group="XTAL32K1"/>
-                <signal pad-id="pf1" function="CLKCTRL" group="XTAL32K2"/>
+                <signal pad-key="pa7" function="CLKCTRL" group="CLKOUT"/>
+                <signal pad-key="pa0" function="CLKCTRL" group="EXTCLK"/>
+                <signal pad-key="pf0" function="CLKCTRL" group="XTAL32K1"/>
+                <signal pad-key="pf1" function="CLKCTRL" group="XTAL32K2"/>
             </signals>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="cpu_avr_xt_v1">
@@ -143,18 +143,18 @@
         <peripheral key="dac0" name="DAC0" module-key="dac_nbit_ctrl_v5">
             <register-group-instance register-group-key="dac" address-space-key="data" offset="0x6A0"/>
             <signals>
-                <signal pad-id="pd6" index="0" function="DAC0" group="OUT"/>
+                <signal pad-key="pd6" index="0" function="DAC0" group="OUT"/>
             </signals>
         </peripheral>
         <peripheral key="evsys" name="EVSYS" module-key="avrda_evsys">
             <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"/>
-                <signal pad-id="pc2" index="2" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTC"/>
-                <signal pad-id="pd7" index="3" function="EVSYS_ALT" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTD"/>
-                <signal pad-id="pd2" index="3" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTD"/>
-                <signal pad-id="pf2" index="5" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTF"/>
+                <signal pad-key="pa7" index="0" function="EVSYS_ALT" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTA"/>
+                <signal pad-key="pa2" index="0" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTA"/>
+                <signal pad-key="pc2" index="2" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTC"/>
+                <signal pad-key="pd7" index="3" function="EVSYS_ALT" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTD"/>
+                <signal pad-key="pd2" index="3" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTD"/>
+                <signal pad-key="pf2" index="5" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTF"/>
             </signals>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="avrda_fuse">
@@ -172,48 +172,48 @@
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pa2" index="2" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa3" index="3" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa4" index="4" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa5" index="5" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa6" index="6" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa7" index="7" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa0" index="0" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa1" index="1" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa2" index="2" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa3" index="3" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa4" index="4" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa5" index="5" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa6" index="6" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa7" index="7" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pc2" index="2" function="IOPORT" group="PIN"/>
-                <signal pad-id="pc3" index="3" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc0" index="0" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc1" index="1" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc2" index="2" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc3" index="3" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pd2" index="2" function="IOPORT" group="PIN"/>
-                <signal pad-id="pd3" index="3" function="IOPORT" group="PIN"/>
-                <signal pad-id="pd4" index="4" function="IOPORT" group="PIN"/>
-                <signal pad-id="pd5" index="5" function="IOPORT" group="PIN"/>
-                <signal pad-id="pd6" index="6" function="IOPORT" group="PIN"/>
-                <signal pad-id="pd7" index="7" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd0" index="0" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd1" index="1" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd2" index="2" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd3" index="3" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd4" index="4" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd5" index="5" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd6" index="6" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd7" index="7" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="portf" name="PORTF" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pf2" index="2" function="IOPORT" group="PIN"/>
-                <signal pad-id="pf3" index="3" function="IOPORT" group="PIN"/>
-                <signal pad-id="pf4" index="4" function="IOPORT" group="PIN"/>
-                <signal pad-id="pf5" index="5" function="IOPORT" group="PIN"/>
-                <signal pad-id="pf6" index="6" function="IOPORT" group="PIN"/>
+                <signal pad-key="pf0" index="0" function="IOPORT" group="PIN"/>
+                <signal pad-key="pf1" index="1" function="IOPORT" group="PIN"/>
+                <signal pad-key="pf2" index="2" function="IOPORT" group="PIN"/>
+                <signal pad-key="pf3" index="3" function="IOPORT" group="PIN"/>
+                <signal pad-key="pf4" index="4" function="IOPORT" group="PIN"/>
+                <signal pad-key="pf5" index="5" function="IOPORT" group="PIN"/>
+                <signal pad-key="pf6" index="6" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="portmux" name="PORTMUX" module-key="avrda_portmux">
@@ -221,34 +221,34 @@
         </peripheral>
         <peripheral key="ptc" name="PTC" module-key="adc_ptc_ctrl_v1">
             <signals>
-                <signal pad-id="pa0" index="0" function="PTC" group="XY"/>
-                <signal pad-id="pa1" index="1" function="PTC" group="XY"/>
-                <signal pad-id="pa2" index="2" function="PTC" group="XY"/>
-                <signal pad-id="pa3" index="3" function="PTC" group="XY"/>
-                <signal pad-id="pa4" index="4" function="PTC" group="XY"/>
-                <signal pad-id="pa5" index="5" function="PTC" group="XY"/>
-                <signal pad-id="pa6" index="6" function="PTC" group="XY"/>
-                <signal pad-id="pa7" index="7" function="PTC" group="XY"/>
-                <signal pad-id="pd0" index="16" function="PTC" group="XY"/>
-                <signal pad-id="pd1" index="17" function="PTC" group="XY"/>
-                <signal pad-id="pd2" index="18" function="PTC" group="XY"/>
-                <signal pad-id="pd3" index="19" function="PTC" group="XY"/>
-                <signal pad-id="pd4" index="20" function="PTC" group="XY"/>
-                <signal pad-id="pd5" index="21" function="PTC" group="XY"/>
-                <signal pad-id="pd6" index="22" function="PTC" group="XY"/>
-                <signal pad-id="pd7" index="23" function="PTC" group="XY"/>
-                <signal pad-id="pf0" index="32" function="PTC" group="XY"/>
-                <signal pad-id="pf1" index="33" function="PTC" group="XY"/>
-                <signal pad-id="pf2" index="34" function="PTC" group="XY"/>
-                <signal pad-id="pf3" index="35" function="PTC" group="XY"/>
-                <signal pad-id="pf4" index="36" function="PTC" group="XY"/>
-                <signal pad-id="pf5" index="37" function="PTC" group="XY"/>
+                <signal pad-key="pa0" index="0" function="PTC" group="XY"/>
+                <signal pad-key="pa1" index="1" function="PTC" group="XY"/>
+                <signal pad-key="pa2" index="2" function="PTC" group="XY"/>
+                <signal pad-key="pa3" index="3" function="PTC" group="XY"/>
+                <signal pad-key="pa4" index="4" function="PTC" group="XY"/>
+                <signal pad-key="pa5" index="5" function="PTC" group="XY"/>
+                <signal pad-key="pa6" index="6" function="PTC" group="XY"/>
+                <signal pad-key="pa7" index="7" function="PTC" group="XY"/>
+                <signal pad-key="pd0" index="16" function="PTC" group="XY"/>
+                <signal pad-key="pd1" index="17" function="PTC" group="XY"/>
+                <signal pad-key="pd2" index="18" function="PTC" group="XY"/>
+                <signal pad-key="pd3" index="19" function="PTC" group="XY"/>
+                <signal pad-key="pd4" index="20" function="PTC" group="XY"/>
+                <signal pad-key="pd5" index="21" function="PTC" group="XY"/>
+                <signal pad-key="pd6" index="22" function="PTC" group="XY"/>
+                <signal pad-key="pd7" index="23" function="PTC" group="XY"/>
+                <signal pad-key="pf0" index="32" function="PTC" group="XY"/>
+                <signal pad-key="pf1" index="33" function="PTC" group="XY"/>
+                <signal pad-key="pf2" index="34" function="PTC" group="XY"/>
+                <signal pad-key="pf3" index="35" function="PTC" group="XY"/>
+                <signal pad-key="pf4" index="36" function="PTC" group="XY"/>
+                <signal pad-key="pf5" index="37" function="PTC" group="XY"/>
             </signals>
         </peripheral>
         <peripheral key="rstctrl" name="RSTCTRL" module-key="rst_integration_v8">
             <register-group-instance register-group-key="rstctrl" address-space-key="data" offset="0x40"/>
             <signals>
-                <signal pad-id="pf6" function="OTHER" group="RESET"/>
+                <signal pad-key="pf6" function="OTHER" group="RESET"/>
             </signals>
         </peripheral>
         <peripheral key="rtc" name="RTC" module-key="tmr_16b_rtc_v1">
@@ -263,19 +263,19 @@
         <peripheral key="spi0" name="SPI0" module-key="spi_8bit_v2">
             <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"/>
-                <signal pad-id="pa6" function="SPI0" group="SCK" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <signal pad-id="pa7" function="SPI0" group="SS" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pa5" function="SPI0" group="MISO" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pa4" function="SPI0" group="MOSI" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pa6" function="SPI0" group="SCK" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pa7" function="SPI0" group="SS" field="PORTMUX.SPIROUTEA.SPI0"/>
             </signals>
         </peripheral>
         <peripheral key="spi1" name="SPI1" module-key="spi_8bit_v2">
             <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"/>
-                <signal pad-id="pc2" function="SPI1" group="SCK" field="PORTMUX.SPIROUTEA.SPI1"/>
-                <signal pad-id="pc3" function="SPI1" group="SS" field="PORTMUX.SPIROUTEA.SPI1"/>
+                <signal pad-key="pc1" function="SPI1" group="MISO" field="PORTMUX.SPIROUTEA.SPI1"/>
+                <signal pad-key="pc0" function="SPI1" group="MOSI" field="PORTMUX.SPIROUTEA.SPI1"/>
+                <signal pad-key="pc2" function="SPI1" group="SCK" field="PORTMUX.SPIROUTEA.SPI1"/>
+                <signal pad-key="pc3" function="SPI1" group="SS" field="PORTMUX.SPIROUTEA.SPI1"/>
             </signals>
         </peripheral>
         <peripheral key="syscfg" name="SYSCFG" module-key="avrda_syscfg">
@@ -284,116 +284,116 @@
         <peripheral key="tca0" name="TCA0" module-key="tmr_16b_pwm_v1">
             <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"/>
-                <signal pad-id="pc0" index="0" function="TCA0_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pa0" index="0" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pf1" index="1" function="TCA0_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pd1" index="1" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pc1" index="1" function="TCA0_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pa1" index="1" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pf2" index="2" function="TCA0_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pd2" index="2" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pc2" index="2" function="TCA0_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pa2" index="2" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pf3" index="3" function="TCA0_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pd3" index="3" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pc3" index="3" function="TCA0_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pa3" index="3" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pf4" index="4" function="TCA0_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pd4" index="4" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pa4" index="4" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pf5" index="5" function="TCA0_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pd5" index="5" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pa5" index="5" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pf0" index="0" function="TCA0_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pd0" index="0" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pc0" index="0" function="TCA0_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pa0" index="0" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pf1" index="1" function="TCA0_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pd1" index="1" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pc1" index="1" function="TCA0_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pa1" index="1" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pf2" index="2" function="TCA0_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pd2" index="2" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pc2" index="2" function="TCA0_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pa2" index="2" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pf3" index="3" function="TCA0_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pd3" index="3" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pc3" index="3" function="TCA0_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pa3" index="3" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pf4" index="4" function="TCA0_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pd4" index="4" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pa4" index="4" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pf5" index="5" function="TCA0_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pd5" index="5" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pa5" index="5" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
             </signals>
         </peripheral>
         <peripheral key="tcb0" name="TCB0" module-key="tmr_16b_capture_v1">
             <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"/>
+                <signal pad-key="pf4" index="0" function="TCB0_ALT" group="WO" field="PORTMUX.TCBROUTEA.TCB0"/>
+                <signal pad-key="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 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"/>
+                <signal pad-key="pf5" index="0" function="TCB1_ALT" group="WO" field="PORTMUX.TCBROUTEA.TCB1"/>
+                <signal pad-key="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 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"/>
+                <signal pad-key="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 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"/>
-                <signal pad-id="pf1" index="1" function="TCD0_ALT2" group="WOB" field="PORTMUX.TCDROUTEA.TCD0"/>
-                <signal pad-id="pa5" index="1" function="TCD0" group="WOB" field="PORTMUX.TCDROUTEA.TCD0"/>
-                <signal pad-id="pf2" index="2" function="TCD0_ALT2" group="WOC" field="PORTMUX.TCDROUTEA.TCD0"/>
-                <signal pad-id="pa6" index="2" function="TCD0" group="WOC" field="PORTMUX.TCDROUTEA.TCD0"/>
-                <signal pad-id="pf3" index="3" function="TCD0_ALT2" group="WOD" field="PORTMUX.TCDROUTEA.TCD0"/>
-                <signal pad-id="pa7" index="3" function="TCD0" group="WOD" field="PORTMUX.TCDROUTEA.TCD0"/>
+                <signal pad-key="pf0" function="TCD0_ALT2" group="WOA" field="PORTMUX.TCDROUTEA.TCD0"/>
+                <signal pad-key="pa4" function="TCD0" group="WOA" field="PORTMUX.TCDROUTEA.TCD0"/>
+                <signal pad-key="pf1" index="1" function="TCD0_ALT2" group="WOB" field="PORTMUX.TCDROUTEA.TCD0"/>
+                <signal pad-key="pa5" index="1" function="TCD0" group="WOB" field="PORTMUX.TCDROUTEA.TCD0"/>
+                <signal pad-key="pf2" index="2" function="TCD0_ALT2" group="WOC" field="PORTMUX.TCDROUTEA.TCD0"/>
+                <signal pad-key="pa6" index="2" function="TCD0" group="WOC" field="PORTMUX.TCDROUTEA.TCD0"/>
+                <signal pad-key="pf3" index="3" function="TCD0_ALT2" group="WOD" field="PORTMUX.TCDROUTEA.TCD0"/>
+                <signal pad-key="pa7" index="3" function="TCD0" group="WOD" field="PORTMUX.TCDROUTEA.TCD0"/>
             </signals>
         </peripheral>
         <peripheral key="twi0" name="TWI0" module-key="i2c_8bit_v2">
             <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"/>
-                <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"/>
-                <signal pad-id="pc2" function="I2C0_ALT2" group="SDA" field="PORTMUX.TWIROUTEA.TWI0"/>
-                <signal pad-id="pa2" function="I2C0_ALT1" group="SDA" field="PORTMUX.TWIROUTEA.TWI0"/>
-                <signal pad-id="pa2" function="I2C0" group="SDA" field="PORTMUX.TWIROUTEA.TWI0"/>
-                <signal pad-id="pc2" function="I2C0" group="SDA_DUAL" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pc3" function="I2C0_ALT2" group="SCL" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pa3" function="I2C0_ALT1" group="SCL" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pa3" function="I2C0" group="SCL" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pc3" function="I2C0" group="SCL_DUAL" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pc2" function="I2C0_ALT2" group="SDA" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pa2" function="I2C0_ALT1" group="SDA" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pa2" function="I2C0" group="SDA" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pc2" function="I2C0" group="SDA_DUAL" field="PORTMUX.TWIROUTEA.TWI0"/>
             </signals>
         </peripheral>
         <peripheral key="twi1" name="TWI1" module-key="i2c_8bit_v2">
             <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"/>
-                <signal pad-id="pf2" function="I2C1_ALT1" group="SDA" field="PORTMUX.TWIROUTEA.TWI1"/>
-                <signal pad-id="pf2" function="I2C1" group="SDA" field="PORTMUX.TWIROUTEA.TWI1"/>
+                <signal pad-key="pf3" function="I2C1_ALT1" group="SCL" field="PORTMUX.TWIROUTEA.TWI1"/>
+                <signal pad-key="pf3" function="I2C1" group="SCL" field="PORTMUX.TWIROUTEA.TWI1"/>
+                <signal pad-key="pf2" function="I2C1_ALT1" group="SDA" field="PORTMUX.TWIROUTEA.TWI1"/>
+                <signal pad-key="pf2" function="I2C1" group="SDA" field="PORTMUX.TWIROUTEA.TWI1"/>
             </signals>
         </peripheral>
         <peripheral key="usart0" name="USART0" module-key="uart_autobd_v4">
             <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"/>
-                <signal pad-id="pa4" function="USART0_ALT" group="TXD" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pa0" function="USART0" group="TXD" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pa6" function="USART0_ALT" group="XCK" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pa2" function="USART0" group="XCK" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pa7" function="USART0_ALT" group="XDIR" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pa3" function="USART0" group="XDIR" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa5" function="USART0_ALT" group="RXD" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa1" function="USART0" group="RXD" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa4" function="USART0_ALT" group="TXD" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa0" function="USART0" group="TXD" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa6" function="USART0_ALT" group="XCK" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa2" function="USART0" group="XCK" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa7" function="USART0_ALT" group="XDIR" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa3" function="USART0" group="XDIR" field="PORTMUX.USARTROUTEA.USART0"/>
             </signals>
         </peripheral>
         <peripheral key="usart1" name="USART1" module-key="uart_autobd_v4">
             <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"/>
-                <signal pad-id="pc2" function="USART1" group="XCK" field="PORTMUX.USARTROUTEA.USART1"/>
-                <signal pad-id="pc3" function="USART1" group="XDIR" field="PORTMUX.USARTROUTEA.USART1"/>
+                <signal pad-key="pc1" function="USART1" group="RXD" field="PORTMUX.USARTROUTEA.USART1"/>
+                <signal pad-key="pc0" function="USART1" group="TXD" field="PORTMUX.USARTROUTEA.USART1"/>
+                <signal pad-key="pc2" function="USART1" group="XCK" field="PORTMUX.USARTROUTEA.USART1"/>
+                <signal pad-key="pc3" function="USART1" group="XDIR" field="PORTMUX.USARTROUTEA.USART1"/>
             </signals>
         </peripheral>
         <peripheral key="usart2" name="USART2" module-key="uart_autobd_v4">
             <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"/>
-                <signal pad-id="pf4" function="USART2_ALT" group="TXD" field="PORTMUX.USARTROUTEA.USART2"/>
-                <signal pad-id="pf0" function="USART2" group="TXD" field="PORTMUX.USARTROUTEA.USART2"/>
-                <signal pad-id="pf2" function="USART2" group="XCK" field="PORTMUX.USARTROUTEA.USART2"/>
-                <signal pad-id="pf3" function="USART2" group="XDIR" field="PORTMUX.USARTROUTEA.USART2"/>
+                <signal pad-key="pf5" function="USART2_ALT" group="RXD" field="PORTMUX.USARTROUTEA.USART2"/>
+                <signal pad-key="pf1" function="USART2" group="RXD" field="PORTMUX.USARTROUTEA.USART2"/>
+                <signal pad-key="pf4" function="USART2_ALT" group="TXD" field="PORTMUX.USARTROUTEA.USART2"/>
+                <signal pad-key="pf0" function="USART2" group="TXD" field="PORTMUX.USARTROUTEA.USART2"/>
+                <signal pad-key="pf2" function="USART2" group="XCK" field="PORTMUX.USARTROUTEA.USART2"/>
+                <signal pad-key="pf3" function="USART2" group="XDIR" field="PORTMUX.USARTROUTEA.USART2"/>
             </signals>
         </peripheral>
         <peripheral key="userrow" name="USERROW" module-key="avrda_userrow">
@@ -420,8 +420,8 @@
         <peripheral key="zcd0" name="ZCD0" module-key="cmp_zxover_ctrl_v3">
             <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"/>
+                <signal pad-key="pd1" function="ZCD0" group="IN"/>
+                <signal pad-key="pa7" function="ZCD0" group="OUT" field="PORTMUX.ZCDROUTEA.ZCD0"/>
             </signals>
         </peripheral>
     </peripherals>
@@ -1647,43 +1647,77 @@
             </register-group>
         </module>
     </modules>
+    <pads>
+        <pad key="pa3" name="PA3"/>
+        <pad key="pa4" name="PA4"/>
+        <pad key="pa5" name="PA5"/>
+        <pad key="pa6" name="PA6"/>
+        <pad key="pa7" name="PA7"/>
+        <pad key="pc0" name="PC0"/>
+        <pad key="pc1" name="PC1"/>
+        <pad key="pc2" name="PC2"/>
+        <pad key="pc3" name="PC3"/>
+        <pad key="pd0" name="PD0"/>
+        <pad key="pd1" name="PD1"/>
+        <pad key="pd2" name="PD2"/>
+        <pad key="pd3" name="PD3"/>
+        <pad key="pd4" name="PD4"/>
+        <pad key="pd5" name="PD5"/>
+        <pad key="pd6" name="PD6"/>
+        <pad key="pd7" name="PD7"/>
+        <pad key="avdd" name="AVDD"/>
+        <pad key="agnd" name="AGND"/>
+        <pad key="pf0" name="PF0"/>
+        <pad key="pf1" name="PF1"/>
+        <pad key="pf2" name="PF2"/>
+        <pad key="pf3" name="PF3"/>
+        <pad key="pf4" name="PF4"/>
+        <pad key="pf5" name="PF5"/>
+        <pad key="pf6" name="PF6"/>
+        <pad key="updi" name="UPDI"/>
+        <pad key="vdd0" name="VDD0"/>
+        <pad key="gnd0" name="GND0"/>
+        <pad key="pa0" name="PA0"/>
+        <pad key="pa1" name="PA1"/>
+        <pad key="pa2" name="PA2"/>
+    </pads>
     <pinouts>
         <pinout key="qfn32" name="QFN32" type="qfn">
-            <pin position="1" pad="PA3"/>
-            <pin position="2" pad="PA4"/>
-            <pin position="3" pad="PA5"/>
-            <pin position="4" pad="PA6"/>
-            <pin position="5" pad="PA7"/>
-            <pin position="6" pad="PC0"/>
-            <pin position="7" pad="PC1"/>
-            <pin position="8" pad="PC2"/>
-            <pin position="9" pad="PC3"/>
-            <pin position="10" pad="PD0"/>
-            <pin position="11" pad="PD1"/>
-            <pin position="12" pad="PD2"/>
-            <pin position="13" pad="PD3"/>
-            <pin position="14" pad="PD4"/>
-            <pin position="15" pad="PD5"/>
-            <pin position="16" pad="PD6"/>
-            <pin position="17" pad="PD7"/>
-            <pin position="18" pad="AVDD"/>
-            <pin position="19" pad="AGND"/>
-            <pin position="20" pad="PF0"/>
-            <pin position="21" pad="PF1"/>
-            <pin position="22" pad="PF2"/>
-            <pin position="23" pad="PF3"/>
-            <pin position="24" pad="PF4"/>
-            <pin position="25" pad="PF5"/>
-            <pin position="26" pad="PF6"/>
-            <pin position="27" pad="UPDI"/>
-            <pin position="28" pad="VDD0"/>
-            <pin position="29" pad="GND0"/>
-            <pin position="30" pad="PA0"/>
-            <pin position="31" pad="PA1"/>
-            <pin position="32" pad="PA2"/>
+            <pin position="1" pad-key="pa3"/>
+            <pin position="2" pad-key="pa4"/>
+            <pin position="3" pad-key="pa5"/>
+            <pin position="4" pad-key="pa6"/>
+            <pin position="5" pad-key="pa7"/>
+            <pin position="6" pad-key="pc0"/>
+            <pin position="7" pad-key="pc1"/>
+            <pin position="8" pad-key="pc2"/>
+            <pin position="9" pad-key="pc3"/>
+            <pin position="10" pad-key="pd0"/>
+            <pin position="11" pad-key="pd1"/>
+            <pin position="12" pad-key="pd2"/>
+            <pin position="13" pad-key="pd3"/>
+            <pin position="14" pad-key="pd4"/>
+            <pin position="15" pad-key="pd5"/>
+            <pin position="16" pad-key="pd6"/>
+            <pin position="17" pad-key="pd7"/>
+            <pin position="18" pad-key="avdd"/>
+            <pin position="19" pad-key="agnd"/>
+            <pin position="20" pad-key="pf0"/>
+            <pin position="21" pad-key="pf1"/>
+            <pin position="22" pad-key="pf2"/>
+            <pin position="23" pad-key="pf3"/>
+            <pin position="24" pad-key="pf4"/>
+            <pin position="25" pad-key="pf5"/>
+            <pin position="26" pad-key="pf6"/>
+            <pin position="27" pad-key="updi"/>
+            <pin position="28" pad-key="vdd0"/>
+            <pin position="29" pad-key="gnd0"/>
+            <pin position="30" pad-key="pa0"/>
+            <pin position="31" pad-key="pa1"/>
+            <pin position="32" pad-key="pa2"/>
         </pinout>
     </pinouts>
     <variants>
-        <variant name="AVR128DA32" pinout-key="qfn32" package="QFN32"/>
+        <variant key="avr128da32" name="AVR128DA32" pinout-key="qfn32"/>
     </variants>
 </device>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR128DA48.xml b/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR128DA48.xml
index acd32dc6..472b9e1f 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR128DA48.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR128DA48.xml
@@ -44,66 +44,66 @@
         <peripheral key="ac0" name="AC0" module-key="cmp_control_v8">
             <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"/>
-                <signal pad-id="pd7" index="2" function="AC0" group="N"/>
-                <signal pad-id="pc6" index="0" function="AC0_ALT" group="OUT" field="PORTMUX.ACROUTEA.AC0"/>
-                <signal pad-id="pa7" index="0" function="AC0" group="OUT" field="PORTMUX.ACROUTEA.AC0"/>
-                <signal pad-id="pd2" index="0" function="AC0" group="P"/>
-                <signal pad-id="pe0" index="1" function="AC0" group="P"/>
-                <signal pad-id="pe2" index="2" function="AC0" group="P"/>
-                <signal pad-id="pd6" index="3" function="AC0" group="P"/>
+                <signal pad-key="pd3" index="0" function="AC0" group="N"/>
+                <signal pad-key="pd0" index="1" function="AC0" group="N"/>
+                <signal pad-key="pd7" index="2" function="AC0" group="N"/>
+                <signal pad-key="pc6" index="0" function="AC0_ALT" group="OUT" field="PORTMUX.ACROUTEA.AC0"/>
+                <signal pad-key="pa7" index="0" function="AC0" group="OUT" field="PORTMUX.ACROUTEA.AC0"/>
+                <signal pad-key="pd2" index="0" function="AC0" group="P"/>
+                <signal pad-key="pe0" index="1" function="AC0" group="P"/>
+                <signal pad-key="pe2" index="2" function="AC0" group="P"/>
+                <signal pad-key="pd6" index="3" function="AC0" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="ac1" name="AC1" module-key="cmp_control_v8">
             <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"/>
-                <signal pad-id="pd7" index="2" function="AC1" group="N"/>
-                <signal pad-id="pc6" index="0" function="AC1_ALT" group="OUT" field="PORTMUX.ACROUTEA.AC1"/>
-                <signal pad-id="pa7" index="0" function="AC1" group="OUT" field="PORTMUX.ACROUTEA.AC1"/>
-                <signal pad-id="pd2" index="0" function="AC1" group="P"/>
-                <signal pad-id="pd3" index="1" function="AC1" group="P"/>
-                <signal pad-id="pd4" index="2" function="AC1" group="P"/>
-                <signal pad-id="pd6" index="3" function="AC1" group="P"/>
+                <signal pad-key="pd5" index="0" function="AC1" group="N"/>
+                <signal pad-key="pd0" index="1" function="AC1" group="N"/>
+                <signal pad-key="pd7" index="2" function="AC1" group="N"/>
+                <signal pad-key="pc6" index="0" function="AC1_ALT" group="OUT" field="PORTMUX.ACROUTEA.AC1"/>
+                <signal pad-key="pa7" index="0" function="AC1" group="OUT" field="PORTMUX.ACROUTEA.AC1"/>
+                <signal pad-key="pd2" index="0" function="AC1" group="P"/>
+                <signal pad-key="pd3" index="1" function="AC1" group="P"/>
+                <signal pad-key="pd4" index="2" function="AC1" group="P"/>
+                <signal pad-key="pd6" index="3" function="AC1" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="ac2" name="AC2" module-key="cmp_control_v8">
             <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"/>
-                <signal pad-id="pd7" index="2" function="AC2" group="N"/>
-                <signal pad-id="pc6" index="0" function="AC2_ALT" group="OUT" field="PORTMUX.ACROUTEA.AC2"/>
-                <signal pad-id="pa7" index="0" function="AC2" group="OUT" field="PORTMUX.ACROUTEA.AC2"/>
-                <signal pad-id="pd2" index="0" function="AC2" group="P"/>
-                <signal pad-id="pd4" index="1" function="AC2" group="P"/>
-                <signal pad-id="pe1" index="2" function="AC2" group="P"/>
-                <signal pad-id="pd6" index="3" function="AC2" group="P"/>
+                <signal pad-key="pd7" index="0" function="AC2" group="N"/>
+                <signal pad-key="pd0" index="1" function="AC2" group="N"/>
+                <signal pad-key="pd7" index="2" function="AC2" group="N"/>
+                <signal pad-key="pc6" index="0" function="AC2_ALT" group="OUT" field="PORTMUX.ACROUTEA.AC2"/>
+                <signal pad-key="pa7" index="0" function="AC2" group="OUT" field="PORTMUX.ACROUTEA.AC2"/>
+                <signal pad-key="pd2" index="0" function="AC2" group="P"/>
+                <signal pad-key="pd4" index="1" function="AC2" group="P"/>
+                <signal pad-key="pe1" index="2" function="AC2" group="P"/>
+                <signal pad-key="pd6" index="3" function="AC2" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="adc0" name="ADC0" module-key="adc_12b_diff_ctrl_v1">
             <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"/>
-                <signal pad-id="pd2" index="2" function="AIN0" group="AIN"/>
-                <signal pad-id="pd3" index="3" function="AIN0" group="AIN"/>
-                <signal pad-id="pd4" index="4" function="AIN0" group="AIN"/>
-                <signal pad-id="pd5" index="5" function="AIN0" group="AIN"/>
-                <signal pad-id="pd6" index="6" function="AIN0" group="AIN"/>
-                <signal pad-id="pd7" index="7" function="AIN0" group="AIN"/>
-                <signal pad-id="pe0" index="8" function="AIN0" group="AIN"/>
-                <signal pad-id="pe1" index="9" function="AIN0" group="AIN"/>
-                <signal pad-id="pe2" index="10" function="AIN0" group="AIN"/>
-                <signal pad-id="pe3" index="11" function="AIN0" group="AIN"/>
-                <signal pad-id="pf0" index="16" function="AIN0" group="AIN"/>
-                <signal pad-id="pf1" index="17" function="AIN0" group="AIN"/>
-                <signal pad-id="pf2" index="18" function="AIN0" group="AIN"/>
-                <signal pad-id="pf3" index="19" function="AIN0" group="AIN"/>
-                <signal pad-id="pf4" index="20" function="AIN0" group="AIN"/>
-                <signal pad-id="pf5" index="21" function="AIN0" group="AIN"/>
+                <signal pad-key="pd0" index="0" function="AIN0" group="AIN"/>
+                <signal pad-key="pd1" index="1" function="AIN0" group="AIN"/>
+                <signal pad-key="pd2" index="2" function="AIN0" group="AIN"/>
+                <signal pad-key="pd3" index="3" function="AIN0" group="AIN"/>
+                <signal pad-key="pd4" index="4" function="AIN0" group="AIN"/>
+                <signal pad-key="pd5" index="5" function="AIN0" group="AIN"/>
+                <signal pad-key="pd6" index="6" function="AIN0" group="AIN"/>
+                <signal pad-key="pd7" index="7" function="AIN0" group="AIN"/>
+                <signal pad-key="pe0" index="8" function="AIN0" group="AIN"/>
+                <signal pad-key="pe1" index="9" function="AIN0" group="AIN"/>
+                <signal pad-key="pe2" index="10" function="AIN0" group="AIN"/>
+                <signal pad-key="pe3" index="11" function="AIN0" group="AIN"/>
+                <signal pad-key="pf0" index="16" function="AIN0" group="AIN"/>
+                <signal pad-key="pf1" index="17" function="AIN0" group="AIN"/>
+                <signal pad-key="pf2" index="18" function="AIN0" group="AIN"/>
+                <signal pad-key="pf3" index="19" function="AIN0" group="AIN"/>
+                <signal pad-key="pf4" index="20" function="AIN0" group="AIN"/>
+                <signal pad-key="pf5" index="21" function="AIN0" group="AIN"/>
             </signals>
         </peripheral>
         <peripheral key="bod" name="BOD" module-key="bor_lvd_ctrl_v1">
@@ -112,38 +112,38 @@
         <peripheral key="ccl" name="CCL" module-key="cla_ccl_v1">
             <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"/>
-                <signal pad-id="pa2" index="2" function="CCL_IN" group="LUT0_IN"/>
-                <signal pad-id="pa6" index="0" function="CCL_ALT" group="LUT0_OUT" field="PORTMUX.CCLROUTEA.LUT0"/>
-                <signal pad-id="pa3" index="0" function="CCL" group="LUT0_OUT" field="PORTMUX.CCLROUTEA.LUT0"/>
-                <signal pad-id="pc0" index="0" function="CCL_IN" group="LUT1_IN"/>
-                <signal pad-id="pc1" index="1" function="CCL_IN" group="LUT1_IN"/>
-                <signal pad-id="pc2" index="2" function="CCL_IN" group="LUT1_IN"/>
-                <signal pad-id="pc6" index="0" function="CCL_ALT" group="LUT1_OUT" field="PORTMUX.CCLROUTEA.LUT1"/>
-                <signal pad-id="pc3" index="0" function="CCL" group="LUT1_OUT" field="PORTMUX.CCLROUTEA.LUT1"/>
-                <signal pad-id="pd0" index="0" function="CCL_IN" group="LUT2_IN"/>
-                <signal pad-id="pd1" index="1" function="CCL_IN" group="LUT2_IN"/>
-                <signal pad-id="pd2" index="2" function="CCL_IN" group="LUT2_IN"/>
-                <signal pad-id="pd6" index="0" function="CCL_ALT" group="LUT2_OUT" field="PORTMUX.CCLROUTEA.LUT2"/>
-                <signal pad-id="pd3" index="0" function="CCL" group="LUT2_OUT" field="PORTMUX.CCLROUTEA.LUT2"/>
-                <signal pad-id="pf0" index="0" function="CCL_IN" group="LUT3_IN"/>
-                <signal pad-id="pf1" index="1" function="CCL_IN" group="LUT3_IN"/>
-                <signal pad-id="pf2" index="2" function="CCL_IN" group="LUT3_IN"/>
-                <signal pad-id="pf3" index="0" function="CCL" group="LUT3_OUT" field="PORTMUX.CCLROUTEA.LUT3"/>
-                <signal pad-id="pb0" index="0" function="CCL_IN" group="LUT4_IN"/>
-                <signal pad-id="pb1" index="1" function="CCL_IN" group="LUT4_IN"/>
-                <signal pad-id="pb2" index="2" function="CCL_IN" group="LUT4_IN"/>
-                <signal pad-id="pb3" index="0" function="CCL" group="LUT4_OUT" field="PORTMUX.CCLROUTEA.LUT4"/>
+                <signal pad-key="pa0" index="0" function="CCL_IN" group="LUT0_IN"/>
+                <signal pad-key="pa1" index="1" function="CCL_IN" group="LUT0_IN"/>
+                <signal pad-key="pa2" index="2" function="CCL_IN" group="LUT0_IN"/>
+                <signal pad-key="pa6" index="0" function="CCL_ALT" group="LUT0_OUT" field="PORTMUX.CCLROUTEA.LUT0"/>
+                <signal pad-key="pa3" index="0" function="CCL" group="LUT0_OUT" field="PORTMUX.CCLROUTEA.LUT0"/>
+                <signal pad-key="pc0" index="0" function="CCL_IN" group="LUT1_IN"/>
+                <signal pad-key="pc1" index="1" function="CCL_IN" group="LUT1_IN"/>
+                <signal pad-key="pc2" index="2" function="CCL_IN" group="LUT1_IN"/>
+                <signal pad-key="pc6" index="0" function="CCL_ALT" group="LUT1_OUT" field="PORTMUX.CCLROUTEA.LUT1"/>
+                <signal pad-key="pc3" index="0" function="CCL" group="LUT1_OUT" field="PORTMUX.CCLROUTEA.LUT1"/>
+                <signal pad-key="pd0" index="0" function="CCL_IN" group="LUT2_IN"/>
+                <signal pad-key="pd1" index="1" function="CCL_IN" group="LUT2_IN"/>
+                <signal pad-key="pd2" index="2" function="CCL_IN" group="LUT2_IN"/>
+                <signal pad-key="pd6" index="0" function="CCL_ALT" group="LUT2_OUT" field="PORTMUX.CCLROUTEA.LUT2"/>
+                <signal pad-key="pd3" index="0" function="CCL" group="LUT2_OUT" field="PORTMUX.CCLROUTEA.LUT2"/>
+                <signal pad-key="pf0" index="0" function="CCL_IN" group="LUT3_IN"/>
+                <signal pad-key="pf1" index="1" function="CCL_IN" group="LUT3_IN"/>
+                <signal pad-key="pf2" index="2" function="CCL_IN" group="LUT3_IN"/>
+                <signal pad-key="pf3" index="0" function="CCL" group="LUT3_OUT" field="PORTMUX.CCLROUTEA.LUT3"/>
+                <signal pad-key="pb0" index="0" function="CCL_IN" group="LUT4_IN"/>
+                <signal pad-key="pb1" index="1" function="CCL_IN" group="LUT4_IN"/>
+                <signal pad-key="pb2" index="2" function="CCL_IN" group="LUT4_IN"/>
+                <signal pad-key="pb3" index="0" function="CCL" group="LUT4_OUT" field="PORTMUX.CCLROUTEA.LUT4"/>
             </signals>
         </peripheral>
         <peripheral key="clkctrl" name="CLKCTRL" module-key="avrda_clkctrl">
             <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"/>
-                <signal pad-id="pf0" function="CLKCTRL" group="XTAL32K1"/>
-                <signal pad-id="pf1" function="CLKCTRL" group="XTAL32K2"/>
+                <signal pad-key="pa7" function="CLKCTRL" group="CLKOUT"/>
+                <signal pad-key="pa0" function="CLKCTRL" group="EXTCLK"/>
+                <signal pad-key="pf0" function="CLKCTRL" group="XTAL32K1"/>
+                <signal pad-key="pf1" function="CLKCTRL" group="XTAL32K2"/>
             </signals>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="cpu_avr_xt_v1">
@@ -158,21 +158,21 @@
         <peripheral key="dac0" name="DAC0" module-key="dac_nbit_ctrl_v5">
             <register-group-instance register-group-key="dac" address-space-key="data" offset="0x6A0"/>
             <signals>
-                <signal pad-id="pd6" index="0" function="DAC0" group="OUT"/>
+                <signal pad-key="pd6" index="0" function="DAC0" group="OUT"/>
             </signals>
         </peripheral>
         <peripheral key="evsys" name="EVSYS" module-key="avrda_evsys">
             <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"/>
-                <signal pad-id="pb2" index="1" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTB"/>
-                <signal pad-id="pc7" index="2" function="EVSYS_ALT" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTC"/>
-                <signal pad-id="pc2" index="2" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTC"/>
-                <signal pad-id="pd7" index="3" function="EVSYS_ALT" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTD"/>
-                <signal pad-id="pd2" index="3" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTD"/>
-                <signal pad-id="pe2" index="4" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTE"/>
-                <signal pad-id="pf2" index="5" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTF"/>
+                <signal pad-key="pa7" index="0" function="EVSYS_ALT" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTA"/>
+                <signal pad-key="pa2" index="0" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTA"/>
+                <signal pad-key="pb2" index="1" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTB"/>
+                <signal pad-key="pc7" index="2" function="EVSYS_ALT" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTC"/>
+                <signal pad-key="pc2" index="2" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTC"/>
+                <signal pad-key="pd7" index="3" function="EVSYS_ALT" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTD"/>
+                <signal pad-key="pd2" index="3" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTD"/>
+                <signal pad-key="pe2" index="4" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTE"/>
+                <signal pad-key="pf2" index="5" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTF"/>
             </signals>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="avrda_fuse">
@@ -190,72 +190,72 @@
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pa2" index="2" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa3" index="3" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa4" index="4" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa5" index="5" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa6" index="6" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa7" index="7" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa0" index="0" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa1" index="1" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa2" index="2" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa3" index="3" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa4" index="4" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa5" index="5" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa6" index="6" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa7" index="7" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pb2" index="2" function="IOPORT" group="PIN"/>
-                <signal pad-id="pb3" index="3" function="IOPORT" group="PIN"/>
-                <signal pad-id="pb4" index="4" function="IOPORT" group="PIN"/>
-                <signal pad-id="pb5" index="5" function="IOPORT" group="PIN"/>
+                <signal pad-key="pb0" index="0" function="IOPORT" group="PIN"/>
+                <signal pad-key="pb1" index="1" function="IOPORT" group="PIN"/>
+                <signal pad-key="pb2" index="2" function="IOPORT" group="PIN"/>
+                <signal pad-key="pb3" index="3" function="IOPORT" group="PIN"/>
+                <signal pad-key="pb4" index="4" function="IOPORT" group="PIN"/>
+                <signal pad-key="pb5" index="5" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pc2" index="2" function="IOPORT" group="PIN"/>
-                <signal pad-id="pc3" index="3" function="IOPORT" group="PIN"/>
-                <signal pad-id="pc4" index="4" function="IOPORT" group="PIN"/>
-                <signal pad-id="pc5" index="5" function="IOPORT" group="PIN"/>
-                <signal pad-id="pc6" index="6" function="IOPORT" group="PIN"/>
-                <signal pad-id="pc7" index="7" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc0" index="0" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc1" index="1" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc2" index="2" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc3" index="3" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc4" index="4" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc5" index="5" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc6" index="6" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc7" index="7" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pd2" index="2" function="IOPORT" group="PIN"/>
-                <signal pad-id="pd3" index="3" function="IOPORT" group="PIN"/>
-                <signal pad-id="pd4" index="4" function="IOPORT" group="PIN"/>
-                <signal pad-id="pd5" index="5" function="IOPORT" group="PIN"/>
-                <signal pad-id="pd6" index="6" function="IOPORT" group="PIN"/>
-                <signal pad-id="pd7" index="7" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd0" index="0" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd1" index="1" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd2" index="2" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd3" index="3" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd4" index="4" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd5" index="5" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd6" index="6" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd7" index="7" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="porte" name="PORTE" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pe2" index="2" function="IOPORT" group="PIN"/>
-                <signal pad-id="pe3" index="3" function="IOPORT" group="PIN"/>
+                <signal pad-key="pe0" index="0" function="IOPORT" group="PIN"/>
+                <signal pad-key="pe1" index="1" function="IOPORT" group="PIN"/>
+                <signal pad-key="pe2" index="2" function="IOPORT" group="PIN"/>
+                <signal pad-key="pe3" index="3" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="portf" name="PORTF" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pf2" index="2" function="IOPORT" group="PIN"/>
-                <signal pad-id="pf3" index="3" function="IOPORT" group="PIN"/>
-                <signal pad-id="pf4" index="4" function="IOPORT" group="PIN"/>
-                <signal pad-id="pf5" index="5" function="IOPORT" group="PIN"/>
-                <signal pad-id="pf6" index="6" function="IOPORT" group="PIN"/>
+                <signal pad-key="pf0" index="0" function="IOPORT" group="PIN"/>
+                <signal pad-key="pf1" index="1" function="IOPORT" group="PIN"/>
+                <signal pad-key="pf2" index="2" function="IOPORT" group="PIN"/>
+                <signal pad-key="pf3" index="3" function="IOPORT" group="PIN"/>
+                <signal pad-key="pf4" index="4" function="IOPORT" group="PIN"/>
+                <signal pad-key="pf5" index="5" function="IOPORT" group="PIN"/>
+                <signal pad-key="pf6" index="6" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="portmux" name="PORTMUX" module-key="avrda_portmux">
@@ -263,44 +263,44 @@
         </peripheral>
         <peripheral key="ptc" name="PTC" module-key="adc_ptc_ctrl_v1">
             <signals>
-                <signal pad-id="pa0" index="0" function="PTC" group="XY"/>
-                <signal pad-id="pa1" index="1" function="PTC" group="XY"/>
-                <signal pad-id="pa2" index="2" function="PTC" group="XY"/>
-                <signal pad-id="pa3" index="3" function="PTC" group="XY"/>
-                <signal pad-id="pa4" index="4" function="PTC" group="XY"/>
-                <signal pad-id="pa5" index="5" function="PTC" group="XY"/>
-                <signal pad-id="pa6" index="6" function="PTC" group="XY"/>
-                <signal pad-id="pa7" index="7" function="PTC" group="XY"/>
-                <signal pad-id="pb0" index="8" function="PTC" group="XY"/>
-                <signal pad-id="pb1" index="9" function="PTC" group="XY"/>
-                <signal pad-id="pb2" index="10" function="PTC" group="XY"/>
-                <signal pad-id="pb3" index="11" function="PTC" group="XY"/>
-                <signal pad-id="pb4" index="12" function="PTC" group="XY"/>
-                <signal pad-id="pb5" index="13" function="PTC" group="XY"/>
-                <signal pad-id="pd0" index="16" function="PTC" group="XY"/>
-                <signal pad-id="pd1" index="17" function="PTC" group="XY"/>
-                <signal pad-id="pd2" index="18" function="PTC" group="XY"/>
-                <signal pad-id="pd3" index="19" function="PTC" group="XY"/>
-                <signal pad-id="pd4" index="20" function="PTC" group="XY"/>
-                <signal pad-id="pd5" index="21" function="PTC" group="XY"/>
-                <signal pad-id="pd6" index="22" function="PTC" group="XY"/>
-                <signal pad-id="pd7" index="23" function="PTC" group="XY"/>
-                <signal pad-id="pe0" index="24" function="PTC" group="XY"/>
-                <signal pad-id="pe1" index="25" function="PTC" group="XY"/>
-                <signal pad-id="pe2" index="26" function="PTC" group="XY"/>
-                <signal pad-id="pe3" index="27" function="PTC" group="XY"/>
-                <signal pad-id="pf0" index="32" function="PTC" group="XY"/>
-                <signal pad-id="pf1" index="33" function="PTC" group="XY"/>
-                <signal pad-id="pf2" index="34" function="PTC" group="XY"/>
-                <signal pad-id="pf3" index="35" function="PTC" group="XY"/>
-                <signal pad-id="pf4" index="36" function="PTC" group="XY"/>
-                <signal pad-id="pf5" index="37" function="PTC" group="XY"/>
+                <signal pad-key="pa0" index="0" function="PTC" group="XY"/>
+                <signal pad-key="pa1" index="1" function="PTC" group="XY"/>
+                <signal pad-key="pa2" index="2" function="PTC" group="XY"/>
+                <signal pad-key="pa3" index="3" function="PTC" group="XY"/>
+                <signal pad-key="pa4" index="4" function="PTC" group="XY"/>
+                <signal pad-key="pa5" index="5" function="PTC" group="XY"/>
+                <signal pad-key="pa6" index="6" function="PTC" group="XY"/>
+                <signal pad-key="pa7" index="7" function="PTC" group="XY"/>
+                <signal pad-key="pb0" index="8" function="PTC" group="XY"/>
+                <signal pad-key="pb1" index="9" function="PTC" group="XY"/>
+                <signal pad-key="pb2" index="10" function="PTC" group="XY"/>
+                <signal pad-key="pb3" index="11" function="PTC" group="XY"/>
+                <signal pad-key="pb4" index="12" function="PTC" group="XY"/>
+                <signal pad-key="pb5" index="13" function="PTC" group="XY"/>
+                <signal pad-key="pd0" index="16" function="PTC" group="XY"/>
+                <signal pad-key="pd1" index="17" function="PTC" group="XY"/>
+                <signal pad-key="pd2" index="18" function="PTC" group="XY"/>
+                <signal pad-key="pd3" index="19" function="PTC" group="XY"/>
+                <signal pad-key="pd4" index="20" function="PTC" group="XY"/>
+                <signal pad-key="pd5" index="21" function="PTC" group="XY"/>
+                <signal pad-key="pd6" index="22" function="PTC" group="XY"/>
+                <signal pad-key="pd7" index="23" function="PTC" group="XY"/>
+                <signal pad-key="pe0" index="24" function="PTC" group="XY"/>
+                <signal pad-key="pe1" index="25" function="PTC" group="XY"/>
+                <signal pad-key="pe2" index="26" function="PTC" group="XY"/>
+                <signal pad-key="pe3" index="27" function="PTC" group="XY"/>
+                <signal pad-key="pf0" index="32" function="PTC" group="XY"/>
+                <signal pad-key="pf1" index="33" function="PTC" group="XY"/>
+                <signal pad-key="pf2" index="34" function="PTC" group="XY"/>
+                <signal pad-key="pf3" index="35" function="PTC" group="XY"/>
+                <signal pad-key="pf4" index="36" function="PTC" group="XY"/>
+                <signal pad-key="pf5" index="37" function="PTC" group="XY"/>
             </signals>
         </peripheral>
         <peripheral key="rstctrl" name="RSTCTRL" module-key="rst_integration_v8">
             <register-group-instance register-group-key="rstctrl" address-space-key="data" offset="0x40"/>
             <signals>
-                <signal pad-id="pf6" function="OTHER" group="RESET"/>
+                <signal pad-key="pf6" function="OTHER" group="RESET"/>
             </signals>
         </peripheral>
         <peripheral key="rtc" name="RTC" module-key="tmr_16b_rtc_v1">
@@ -315,29 +315,29 @@
         <peripheral key="spi0" name="SPI0" module-key="spi_8bit_v2">
             <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"/>
-                <signal pad-id="pe0" function="SPI0_ALT" group="MOSI" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <signal pad-id="pa4" function="SPI0" group="MOSI" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <signal pad-id="pe2" function="SPI0_ALT" group="SCK" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <signal pad-id="pa6" function="SPI0" group="SCK" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <signal pad-id="pe3" function="SPI0_ALT" group="SS" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <signal pad-id="pa7" function="SPI0" group="SS" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pe1" function="SPI0_ALT" group="MISO" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pa5" function="SPI0" group="MISO" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pe0" function="SPI0_ALT" group="MOSI" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pa4" function="SPI0" group="MOSI" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pe2" function="SPI0_ALT" group="SCK" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pa6" function="SPI0" group="SCK" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pe3" function="SPI0_ALT" group="SS" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pa7" function="SPI0" group="SS" field="PORTMUX.SPIROUTEA.SPI0"/>
             </signals>
         </peripheral>
         <peripheral key="spi1" name="SPI1" module-key="spi_8bit_v2">
             <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"/>
-                <signal pad-id="pc1" function="SPI1" group="MISO" field="PORTMUX.SPIROUTEA.SPI1"/>
-                <signal pad-id="pb4" function="SPI1_ALT2" group="MOSI" field="PORTMUX.SPIROUTEA.SPI1"/>
-                <signal pad-id="pc4" function="SPI1_ALT" group="MOSI" field="PORTMUX.SPIROUTEA.SPI1"/>
-                <signal pad-id="pc0" function="SPI1" group="MOSI" field="PORTMUX.SPIROUTEA.SPI1"/>
-                <signal pad-id="pc6" function="SPI1_ALT" group="SCK" field="PORTMUX.SPIROUTEA.SPI1"/>
-                <signal pad-id="pc2" function="SPI1" group="SCK" field="PORTMUX.SPIROUTEA.SPI1"/>
-                <signal pad-id="pc7" function="SPI1_ALT" group="SS" field="PORTMUX.SPIROUTEA.SPI1"/>
-                <signal pad-id="pc3" function="SPI1" group="SS" field="PORTMUX.SPIROUTEA.SPI1"/>
+                <signal pad-key="pb5" function="SPI1_ALT2" group="MISO" field="PORTMUX.SPIROUTEA.SPI1"/>
+                <signal pad-key="pc5" function="SPI1_ALT" group="MISO" field="PORTMUX.SPIROUTEA.SPI1"/>
+                <signal pad-key="pc1" function="SPI1" group="MISO" field="PORTMUX.SPIROUTEA.SPI1"/>
+                <signal pad-key="pb4" function="SPI1_ALT2" group="MOSI" field="PORTMUX.SPIROUTEA.SPI1"/>
+                <signal pad-key="pc4" function="SPI1_ALT" group="MOSI" field="PORTMUX.SPIROUTEA.SPI1"/>
+                <signal pad-key="pc0" function="SPI1" group="MOSI" field="PORTMUX.SPIROUTEA.SPI1"/>
+                <signal pad-key="pc6" function="SPI1_ALT" group="SCK" field="PORTMUX.SPIROUTEA.SPI1"/>
+                <signal pad-key="pc2" function="SPI1" group="SCK" field="PORTMUX.SPIROUTEA.SPI1"/>
+                <signal pad-key="pc7" function="SPI1_ALT" group="SS" field="PORTMUX.SPIROUTEA.SPI1"/>
+                <signal pad-key="pc3" function="SPI1" group="SS" field="PORTMUX.SPIROUTEA.SPI1"/>
             </signals>
         </peripheral>
         <peripheral key="syscfg" name="SYSCFG" module-key="avrda_syscfg">
@@ -346,184 +346,184 @@
         <peripheral key="tca0" name="TCA0" module-key="tmr_16b_pwm_v1">
             <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"/>
-                <signal pad-id="pd0" index="0" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pc0" index="0" function="TCA0_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pb0" index="0" function="TCA0_ALT" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pa0" index="0" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pf1" index="1" function="TCA0_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pe1" index="1" function="TCA0_ALT4" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pd1" index="1" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pc1" index="1" function="TCA0_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pb1" index="1" function="TCA0_ALT" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pa1" index="1" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pf2" index="2" function="TCA0_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pe2" index="2" function="TCA0_ALT4" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pd2" index="2" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pc2" index="2" function="TCA0_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pb2" index="2" function="TCA0_ALT" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pa2" index="2" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pf3" index="3" function="TCA0_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pe3" index="3" function="TCA0_ALT4" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pd3" index="3" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pc3" index="3" function="TCA0_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pb3" index="3" function="TCA0_ALT" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pa3" index="3" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pf4" index="4" function="TCA0_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pd4" index="4" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pc4" index="4" function="TCA0_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pb4" index="4" function="TCA0_ALT" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pa4" index="4" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pf5" index="5" function="TCA0_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pd5" index="5" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pc5" index="5" function="TCA0_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pb5" index="5" function="TCA0_ALT" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pa5" index="5" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pf0" index="0" function="TCA0_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pe0" index="0" function="TCA0_ALT4" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pd0" index="0" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pc0" index="0" function="TCA0_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pb0" index="0" function="TCA0_ALT" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pa0" index="0" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pf1" index="1" function="TCA0_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pe1" index="1" function="TCA0_ALT4" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pd1" index="1" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pc1" index="1" function="TCA0_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pb1" index="1" function="TCA0_ALT" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pa1" index="1" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pf2" index="2" function="TCA0_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pe2" index="2" function="TCA0_ALT4" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pd2" index="2" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pc2" index="2" function="TCA0_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pb2" index="2" function="TCA0_ALT" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pa2" index="2" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pf3" index="3" function="TCA0_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pe3" index="3" function="TCA0_ALT4" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pd3" index="3" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pc3" index="3" function="TCA0_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pb3" index="3" function="TCA0_ALT" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pa3" index="3" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pf4" index="4" function="TCA0_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pd4" index="4" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pc4" index="4" function="TCA0_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pb4" index="4" function="TCA0_ALT" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pa4" index="4" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pf5" index="5" function="TCA0_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pd5" index="5" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pc5" index="5" function="TCA0_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pb5" index="5" function="TCA0_ALT" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pa5" index="5" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
             </signals>
         </peripheral>
         <peripheral key="tca1" name="TCA1" module-key="tmr_16b_pwm_v1">
             <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"/>
-                <signal pad-id="pc5" index="1" function="TCA1_ALT" group="WO" field="PORTMUX.TCAROUTEA.TCA1"/>
-                <signal pad-id="pb1" index="1" function="TCA1" group="WO" field="PORTMUX.TCAROUTEA.TCA1"/>
-                <signal pad-id="pc6" index="2" function="TCA1_ALT" group="WO" field="PORTMUX.TCAROUTEA.TCA1"/>
-                <signal pad-id="pb2" index="2" function="TCA1" group="WO" field="PORTMUX.TCAROUTEA.TCA1"/>
-                <signal pad-id="pb3" index="3" function="TCA1" group="WO" field="PORTMUX.TCAROUTEA.TCA1"/>
-                <signal pad-id="pb4" index="4" function="TCA1" group="WO" field="PORTMUX.TCAROUTEA.TCA1"/>
-                <signal pad-id="pb5" index="5" function="TCA1" group="WO" field="PORTMUX.TCAROUTEA.TCA1"/>
+                <signal pad-key="pc4" index="0" function="TCA1_ALT" group="WO" field="PORTMUX.TCAROUTEA.TCA1"/>
+                <signal pad-key="pb0" index="0" function="TCA1" group="WO" field="PORTMUX.TCAROUTEA.TCA1"/>
+                <signal pad-key="pc5" index="1" function="TCA1_ALT" group="WO" field="PORTMUX.TCAROUTEA.TCA1"/>
+                <signal pad-key="pb1" index="1" function="TCA1" group="WO" field="PORTMUX.TCAROUTEA.TCA1"/>
+                <signal pad-key="pc6" index="2" function="TCA1_ALT" group="WO" field="PORTMUX.TCAROUTEA.TCA1"/>
+                <signal pad-key="pb2" index="2" function="TCA1" group="WO" field="PORTMUX.TCAROUTEA.TCA1"/>
+                <signal pad-key="pb3" index="3" function="TCA1" group="WO" field="PORTMUX.TCAROUTEA.TCA1"/>
+                <signal pad-key="pb4" index="4" function="TCA1" group="WO" field="PORTMUX.TCAROUTEA.TCA1"/>
+                <signal pad-key="pb5" index="5" function="TCA1" group="WO" field="PORTMUX.TCAROUTEA.TCA1"/>
             </signals>
         </peripheral>
         <peripheral key="tcb0" name="TCB0" module-key="tmr_16b_capture_v1">
             <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"/>
+                <signal pad-key="pf4" index="0" function="TCB0_ALT" group="WO" field="PORTMUX.TCBROUTEA.TCB0"/>
+                <signal pad-key="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 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"/>
+                <signal pad-key="pf5" index="0" function="TCB1_ALT" group="WO" field="PORTMUX.TCBROUTEA.TCB1"/>
+                <signal pad-key="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 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"/>
+                <signal pad-key="pb4" index="0" function="TCB2_ALT" group="WO" field="PORTMUX.TCBROUTEA.TCB2"/>
+                <signal pad-key="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 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"/>
+                <signal pad-key="pc1" index="0" function="TCB3_ALT" group="WO" field="PORTMUX.TCBROUTEA.TCB3"/>
+                <signal pad-key="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 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"/>
-                <signal pad-id="pa4" function="TCD0" group="WOA" field="PORTMUX.TCDROUTEA.TCD0"/>
-                <signal pad-id="pf1" index="1" function="TCD0_ALT2" group="WOB" field="PORTMUX.TCDROUTEA.TCD0"/>
-                <signal pad-id="pb5" index="1" function="TCD0_ALT" group="WOB" field="PORTMUX.TCDROUTEA.TCD0"/>
-                <signal pad-id="pa5" index="1" function="TCD0" group="WOB" field="PORTMUX.TCDROUTEA.TCD0"/>
-                <signal pad-id="pf2" index="2" function="TCD0_ALT2" group="WOC" field="PORTMUX.TCDROUTEA.TCD0"/>
-                <signal pad-id="pa6" index="2" function="TCD0" group="WOC" field="PORTMUX.TCDROUTEA.TCD0"/>
-                <signal pad-id="pf3" index="3" function="TCD0_ALT2" group="WOD" field="PORTMUX.TCDROUTEA.TCD0"/>
-                <signal pad-id="pa7" index="3" function="TCD0" group="WOD" field="PORTMUX.TCDROUTEA.TCD0"/>
+                <signal pad-key="pf0" function="TCD0_ALT2" group="WOA" field="PORTMUX.TCDROUTEA.TCD0"/>
+                <signal pad-key="pb4" function="TCD0_ALT" group="WOA" field="PORTMUX.TCDROUTEA.TCD0"/>
+                <signal pad-key="pa4" function="TCD0" group="WOA" field="PORTMUX.TCDROUTEA.TCD0"/>
+                <signal pad-key="pf1" index="1" function="TCD0_ALT2" group="WOB" field="PORTMUX.TCDROUTEA.TCD0"/>
+                <signal pad-key="pb5" index="1" function="TCD0_ALT" group="WOB" field="PORTMUX.TCDROUTEA.TCD0"/>
+                <signal pad-key="pa5" index="1" function="TCD0" group="WOB" field="PORTMUX.TCDROUTEA.TCD0"/>
+                <signal pad-key="pf2" index="2" function="TCD0_ALT2" group="WOC" field="PORTMUX.TCDROUTEA.TCD0"/>
+                <signal pad-key="pa6" index="2" function="TCD0" group="WOC" field="PORTMUX.TCDROUTEA.TCD0"/>
+                <signal pad-key="pf3" index="3" function="TCD0_ALT2" group="WOD" field="PORTMUX.TCDROUTEA.TCD0"/>
+                <signal pad-key="pa7" index="3" function="TCD0" group="WOD" field="PORTMUX.TCDROUTEA.TCD0"/>
             </signals>
         </peripheral>
         <peripheral key="twi0" name="TWI0" module-key="i2c_8bit_v2">
             <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"/>
-                <signal pad-id="pa3" function="I2C0" group="SCL" field="PORTMUX.TWIROUTEA.TWI0"/>
-                <signal pad-id="pc7" function="I2C0_ALT2" group="SCL_DUAL" field="PORTMUX.TWIROUTEA.TWI0"/>
-                <signal pad-id="pc7" function="I2C0_ALT1" group="SCL_DUAL" field="PORTMUX.TWIROUTEA.TWI0"/>
-                <signal pad-id="pc3" function="I2C0" group="SCL_DUAL" field="PORTMUX.TWIROUTEA.TWI0"/>
-                <signal pad-id="pc2" function="I2C0_ALT2" group="SDA" field="PORTMUX.TWIROUTEA.TWI0"/>
-                <signal pad-id="pa2" function="I2C0_ALT1" group="SDA" field="PORTMUX.TWIROUTEA.TWI0"/>
-                <signal pad-id="pa2" function="I2C0" group="SDA" field="PORTMUX.TWIROUTEA.TWI0"/>
-                <signal pad-id="pc6" function="I2C0_ALT2" group="SDA_DUAL" field="PORTMUX.TWIROUTEA.TWI0"/>
-                <signal pad-id="pc6" function="I2C0_ALT1" group="SDA_DUAL" field="PORTMUX.TWIROUTEA.TWI0"/>
-                <signal pad-id="pc2" function="I2C0" group="SDA_DUAL" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pc3" function="I2C0_ALT2" group="SCL" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pa3" function="I2C0_ALT1" group="SCL" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pa3" function="I2C0" group="SCL" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pc7" function="I2C0_ALT2" group="SCL_DUAL" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pc7" function="I2C0_ALT1" group="SCL_DUAL" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pc3" function="I2C0" group="SCL_DUAL" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pc2" function="I2C0_ALT2" group="SDA" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pa2" function="I2C0_ALT1" group="SDA" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pa2" function="I2C0" group="SDA" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pc6" function="I2C0_ALT2" group="SDA_DUAL" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pc6" function="I2C0_ALT1" group="SDA_DUAL" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pc2" function="I2C0" group="SDA_DUAL" field="PORTMUX.TWIROUTEA.TWI0"/>
             </signals>
         </peripheral>
         <peripheral key="twi1" name="TWI1" module-key="i2c_8bit_v2">
             <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"/>
-                <signal pad-id="pf3" function="I2C1" group="SCL" field="PORTMUX.TWIROUTEA.TWI1"/>
-                <signal pad-id="pb3" function="I2C1" group="SCL_DUAL" field="PORTMUX.TWIROUTEA.TWI1"/>
-                <signal pad-id="pb2" function="I2C1_ALT2" group="SDA" field="PORTMUX.TWIROUTEA.TWI1"/>
-                <signal pad-id="pf2" function="I2C1_ALT1" group="SDA" field="PORTMUX.TWIROUTEA.TWI1"/>
-                <signal pad-id="pf2" function="I2C1" group="SDA" field="PORTMUX.TWIROUTEA.TWI1"/>
-                <signal pad-id="pb2" function="I2C1" group="SDA_DUAL" field="PORTMUX.TWIROUTEA.TWI1"/>
+                <signal pad-key="pb3" function="I2C1_ALT2" group="SCL" field="PORTMUX.TWIROUTEA.TWI1"/>
+                <signal pad-key="pf3" function="I2C1_ALT1" group="SCL" field="PORTMUX.TWIROUTEA.TWI1"/>
+                <signal pad-key="pf3" function="I2C1" group="SCL" field="PORTMUX.TWIROUTEA.TWI1"/>
+                <signal pad-key="pb3" function="I2C1" group="SCL_DUAL" field="PORTMUX.TWIROUTEA.TWI1"/>
+                <signal pad-key="pb2" function="I2C1_ALT2" group="SDA" field="PORTMUX.TWIROUTEA.TWI1"/>
+                <signal pad-key="pf2" function="I2C1_ALT1" group="SDA" field="PORTMUX.TWIROUTEA.TWI1"/>
+                <signal pad-key="pf2" function="I2C1" group="SDA" field="PORTMUX.TWIROUTEA.TWI1"/>
+                <signal pad-key="pb2" function="I2C1" group="SDA_DUAL" field="PORTMUX.TWIROUTEA.TWI1"/>
             </signals>
         </peripheral>
         <peripheral key="usart0" name="USART0" module-key="uart_autobd_v4">
             <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"/>
-                <signal pad-id="pa4" function="USART0_ALT" group="TXD" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pa0" function="USART0" group="TXD" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pa6" function="USART0_ALT" group="XCK" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pa2" function="USART0" group="XCK" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pa7" function="USART0_ALT" group="XDIR" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pa3" function="USART0" group="XDIR" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa5" function="USART0_ALT" group="RXD" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa1" function="USART0" group="RXD" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa4" function="USART0_ALT" group="TXD" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa0" function="USART0" group="TXD" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa6" function="USART0_ALT" group="XCK" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa2" function="USART0" group="XCK" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa7" function="USART0_ALT" group="XDIR" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa3" function="USART0" group="XDIR" field="PORTMUX.USARTROUTEA.USART0"/>
             </signals>
         </peripheral>
         <peripheral key="usart1" name="USART1" module-key="uart_autobd_v4">
             <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"/>
-                <signal pad-id="pc4" function="USART1_ALT" group="TXD" field="PORTMUX.USARTROUTEA.USART1"/>
-                <signal pad-id="pc0" function="USART1" group="TXD" field="PORTMUX.USARTROUTEA.USART1"/>
-                <signal pad-id="pc6" function="USART1_ALT" group="XCK" field="PORTMUX.USARTROUTEA.USART1"/>
-                <signal pad-id="pc2" function="USART1" group="XCK" field="PORTMUX.USARTROUTEA.USART1"/>
-                <signal pad-id="pc7" function="USART1_ALT" group="XDIR" field="PORTMUX.USARTROUTEA.USART1"/>
-                <signal pad-id="pc3" function="USART1" group="XDIR" field="PORTMUX.USARTROUTEA.USART1"/>
+                <signal pad-key="pc5" function="USART1_ALT" group="RXD" field="PORTMUX.USARTROUTEA.USART1"/>
+                <signal pad-key="pc1" function="USART1" group="RXD" field="PORTMUX.USARTROUTEA.USART1"/>
+                <signal pad-key="pc4" function="USART1_ALT" group="TXD" field="PORTMUX.USARTROUTEA.USART1"/>
+                <signal pad-key="pc0" function="USART1" group="TXD" field="PORTMUX.USARTROUTEA.USART1"/>
+                <signal pad-key="pc6" function="USART1_ALT" group="XCK" field="PORTMUX.USARTROUTEA.USART1"/>
+                <signal pad-key="pc2" function="USART1" group="XCK" field="PORTMUX.USARTROUTEA.USART1"/>
+                <signal pad-key="pc7" function="USART1_ALT" group="XDIR" field="PORTMUX.USARTROUTEA.USART1"/>
+                <signal pad-key="pc3" function="USART1" group="XDIR" field="PORTMUX.USARTROUTEA.USART1"/>
             </signals>
         </peripheral>
         <peripheral key="usart2" name="USART2" module-key="uart_autobd_v4">
             <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"/>
-                <signal pad-id="pf4" function="USART2_ALT" group="TXD" field="PORTMUX.USARTROUTEA.USART2"/>
-                <signal pad-id="pf0" function="USART2" group="TXD" field="PORTMUX.USARTROUTEA.USART2"/>
-                <signal pad-id="pf2" function="USART2" group="XCK" field="PORTMUX.USARTROUTEA.USART2"/>
-                <signal pad-id="pf3" function="USART2" group="XDIR" field="PORTMUX.USARTROUTEA.USART2"/>
+                <signal pad-key="pf5" function="USART2_ALT" group="RXD" field="PORTMUX.USARTROUTEA.USART2"/>
+                <signal pad-key="pf1" function="USART2" group="RXD" field="PORTMUX.USARTROUTEA.USART2"/>
+                <signal pad-key="pf4" function="USART2_ALT" group="TXD" field="PORTMUX.USARTROUTEA.USART2"/>
+                <signal pad-key="pf0" function="USART2" group="TXD" field="PORTMUX.USARTROUTEA.USART2"/>
+                <signal pad-key="pf2" function="USART2" group="XCK" field="PORTMUX.USARTROUTEA.USART2"/>
+                <signal pad-key="pf3" function="USART2" group="XDIR" field="PORTMUX.USARTROUTEA.USART2"/>
             </signals>
         </peripheral>
         <peripheral key="usart3" name="USART3" module-key="uart_autobd_v4">
             <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"/>
-                <signal pad-id="pb4" function="USART3_ALT" group="TXD" field="PORTMUX.USARTROUTEA.USART3"/>
-                <signal pad-id="pb0" function="USART3" group="TXD" field="PORTMUX.USARTROUTEA.USART3"/>
-                <signal pad-id="pb2" function="USART3" group="XCK" field="PORTMUX.USARTROUTEA.USART3"/>
-                <signal pad-id="pb3" function="USART3" group="XDIR" field="PORTMUX.USARTROUTEA.USART3"/>
+                <signal pad-key="pb5" function="USART3_ALT" group="RXD" field="PORTMUX.USARTROUTEA.USART3"/>
+                <signal pad-key="pb1" function="USART3" group="RXD" field="PORTMUX.USARTROUTEA.USART3"/>
+                <signal pad-key="pb4" function="USART3_ALT" group="TXD" field="PORTMUX.USARTROUTEA.USART3"/>
+                <signal pad-key="pb0" function="USART3" group="TXD" field="PORTMUX.USARTROUTEA.USART3"/>
+                <signal pad-key="pb2" function="USART3" group="XCK" field="PORTMUX.USARTROUTEA.USART3"/>
+                <signal pad-key="pb3" function="USART3" group="XDIR" field="PORTMUX.USARTROUTEA.USART3"/>
             </signals>
         </peripheral>
         <peripheral key="usart4" name="USART4" module-key="uart_autobd_v4">
             <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"/>
-                <signal pad-id="pe2" function="USART4" group="XCK" field="PORTMUX.USARTROUTEB.USART4"/>
-                <signal pad-id="pe3" function="USART4" group="XDIR" field="PORTMUX.USARTROUTEB.USART4"/>
+                <signal pad-key="pe1" function="USART4" group="RXD" field="PORTMUX.USARTROUTEB.USART4"/>
+                <signal pad-key="pe0" function="USART4" group="TXD" field="PORTMUX.USARTROUTEB.USART4"/>
+                <signal pad-key="pe2" function="USART4" group="XCK" field="PORTMUX.USARTROUTEB.USART4"/>
+                <signal pad-key="pe3" function="USART4" group="XDIR" field="PORTMUX.USARTROUTEB.USART4"/>
             </signals>
         </peripheral>
         <peripheral key="userrow" name="USERROW" module-key="avrda_userrow">
@@ -556,17 +556,17 @@
         <peripheral key="zcd0" name="ZCD0" module-key="cmp_zxover_ctrl_v3">
             <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"/>
-                <signal pad-id="pa7" function="ZCD0" group="OUT" field="PORTMUX.ZCDROUTEA.ZCD0"/>
+                <signal pad-key="pd1" function="ZCD0" group="IN"/>
+                <signal pad-key="pc7" function="ZCD0_ALT" group="OUT" field="PORTMUX.ZCDROUTEA.ZCD0"/>
+                <signal pad-key="pa7" function="ZCD0" group="OUT" field="PORTMUX.ZCDROUTEA.ZCD0"/>
             </signals>
         </peripheral>
         <peripheral key="zcd1" name="ZCD1" module-key="cmp_zxover_ctrl_v3">
             <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"/>
-                <signal pad-id="pa7" function="ZCD1" group="OUT" field="PORTMUX.ZCDROUTEA.ZCD1"/>
+                <signal pad-key="pe3" function="ZCD1" group="IN"/>
+                <signal pad-key="pc7" function="ZCD1_ALT" group="OUT" field="PORTMUX.ZCDROUTEA.ZCD1"/>
+                <signal pad-key="pa7" function="ZCD1" group="OUT" field="PORTMUX.ZCDROUTEA.ZCD1"/>
             </signals>
         </peripheral>
     </peripherals>
@@ -1888,59 +1888,109 @@
             </register-group>
         </module>
     </modules>
+    <pads>
+        <pad key="pa5" name="PA5"/>
+        <pad key="pa6" name="PA6"/>
+        <pad key="pa7" name="PA7"/>
+        <pad key="pb0" name="PB0"/>
+        <pad key="pb1" name="PB1"/>
+        <pad key="pb2" name="PB2"/>
+        <pad key="pb3" name="PB3"/>
+        <pad key="pb4" name="PB4"/>
+        <pad key="pb5" name="PB5"/>
+        <pad key="pc0" name="PC0"/>
+        <pad key="pc1" name="PC1"/>
+        <pad key="pc2" name="PC2"/>
+        <pad key="pc3" name="PC3"/>
+        <pad key="vdd0" name="VDD0"/>
+        <pad key="gnd0" name="GND0"/>
+        <pad key="pc4" name="PC4"/>
+        <pad key="pc5" name="PC5"/>
+        <pad key="pc6" name="PC6"/>
+        <pad key="pc7" name="PC7"/>
+        <pad key="pd0" name="PD0"/>
+        <pad key="pd1" name="PD1"/>
+        <pad key="pd2" name="PD2"/>
+        <pad key="pd3" name="PD3"/>
+        <pad key="pd4" name="PD4"/>
+        <pad key="pd5" name="PD5"/>
+        <pad key="pd6" name="PD6"/>
+        <pad key="pd7" name="PD7"/>
+        <pad key="avdd" name="AVDD"/>
+        <pad key="agnd" name="AGND"/>
+        <pad key="pe0" name="PE0"/>
+        <pad key="pe1" name="PE1"/>
+        <pad key="pe2" name="PE2"/>
+        <pad key="pe3" name="PE3"/>
+        <pad key="pf0" name="PF0"/>
+        <pad key="pf1" name="PF1"/>
+        <pad key="pf2" name="PF2"/>
+        <pad key="pf3" name="PF3"/>
+        <pad key="pf4" name="PF4"/>
+        <pad key="pf5" name="PF5"/>
+        <pad key="pf6" name="PF6"/>
+        <pad key="updi" name="UPDI"/>
+        <pad key="vdd1" name="VDD1"/>
+        <pad key="gnd1" name="GND1"/>
+        <pad key="pa0" name="PA0"/>
+        <pad key="pa1" name="PA1"/>
+        <pad key="pa2" name="PA2"/>
+        <pad key="pa3" name="PA3"/>
+        <pad key="pa4" name="PA4"/>
+    </pads>
     <pinouts>
         <pinout key="qfn48" name="QFN48" type="qfn">
-            <pin position="1" pad="PA5"/>
-            <pin position="2" pad="PA6"/>
-            <pin position="3" pad="PA7"/>
-            <pin position="4" pad="PB0"/>
-            <pin position="5" pad="PB1"/>
-            <pin position="6" pad="PB2"/>
-            <pin position="7" pad="PB3"/>
-            <pin position="8" pad="PB4"/>
-            <pin position="9" pad="PB5"/>
-            <pin position="10" pad="PC0"/>
-            <pin position="11" pad="PC1"/>
-            <pin position="12" pad="PC2"/>
-            <pin position="13" pad="PC3"/>
-            <pin position="14" pad="VDD0"/>
-            <pin position="15" pad="GND0"/>
-            <pin position="16" pad="PC4"/>
-            <pin position="17" pad="PC5"/>
-            <pin position="18" pad="PC6"/>
-            <pin position="19" pad="PC7"/>
-            <pin position="20" pad="PD0"/>
-            <pin position="21" pad="PD1"/>
-            <pin position="22" pad="PD2"/>
-            <pin position="23" pad="PD3"/>
-            <pin position="24" pad="PD4"/>
-            <pin position="25" pad="PD5"/>
-            <pin position="26" pad="PD6"/>
-            <pin position="27" pad="PD7"/>
-            <pin position="28" pad="AVDD"/>
-            <pin position="29" pad="AGND"/>
-            <pin position="30" pad="PE0"/>
-            <pin position="31" pad="PE1"/>
-            <pin position="32" pad="PE2"/>
-            <pin position="33" pad="PE3"/>
-            <pin position="34" pad="PF0"/>
-            <pin position="35" pad="PF1"/>
-            <pin position="36" pad="PF2"/>
-            <pin position="37" pad="PF3"/>
-            <pin position="38" pad="PF4"/>
-            <pin position="39" pad="PF5"/>
-            <pin position="40" pad="PF6"/>
-            <pin position="41" pad="UPDI"/>
-            <pin position="42" pad="VDD1"/>
-            <pin position="43" pad="GND1"/>
-            <pin position="44" pad="PA0"/>
-            <pin position="45" pad="PA1"/>
-            <pin position="46" pad="PA2"/>
-            <pin position="47" pad="PA3"/>
-            <pin position="48" pad="PA4"/>
+            <pin position="1" pad-key="pa5"/>
+            <pin position="2" pad-key="pa6"/>
+            <pin position="3" pad-key="pa7"/>
+            <pin position="4" pad-key="pb0"/>
+            <pin position="5" pad-key="pb1"/>
+            <pin position="6" pad-key="pb2"/>
+            <pin position="7" pad-key="pb3"/>
+            <pin position="8" pad-key="pb4"/>
+            <pin position="9" pad-key="pb5"/>
+            <pin position="10" pad-key="pc0"/>
+            <pin position="11" pad-key="pc1"/>
+            <pin position="12" pad-key="pc2"/>
+            <pin position="13" pad-key="pc3"/>
+            <pin position="14" pad-key="vdd0"/>
+            <pin position="15" pad-key="gnd0"/>
+            <pin position="16" pad-key="pc4"/>
+            <pin position="17" pad-key="pc5"/>
+            <pin position="18" pad-key="pc6"/>
+            <pin position="19" pad-key="pc7"/>
+            <pin position="20" pad-key="pd0"/>
+            <pin position="21" pad-key="pd1"/>
+            <pin position="22" pad-key="pd2"/>
+            <pin position="23" pad-key="pd3"/>
+            <pin position="24" pad-key="pd4"/>
+            <pin position="25" pad-key="pd5"/>
+            <pin position="26" pad-key="pd6"/>
+            <pin position="27" pad-key="pd7"/>
+            <pin position="28" pad-key="avdd"/>
+            <pin position="29" pad-key="agnd"/>
+            <pin position="30" pad-key="pe0"/>
+            <pin position="31" pad-key="pe1"/>
+            <pin position="32" pad-key="pe2"/>
+            <pin position="33" pad-key="pe3"/>
+            <pin position="34" pad-key="pf0"/>
+            <pin position="35" pad-key="pf1"/>
+            <pin position="36" pad-key="pf2"/>
+            <pin position="37" pad-key="pf3"/>
+            <pin position="38" pad-key="pf4"/>
+            <pin position="39" pad-key="pf5"/>
+            <pin position="40" pad-key="pf6"/>
+            <pin position="41" pad-key="updi"/>
+            <pin position="42" pad-key="vdd1"/>
+            <pin position="43" pad-key="gnd1"/>
+            <pin position="44" pad-key="pa0"/>
+            <pin position="45" pad-key="pa1"/>
+            <pin position="46" pad-key="pa2"/>
+            <pin position="47" pad-key="pa3"/>
+            <pin position="48" pad-key="pa4"/>
         </pinout>
     </pinouts>
     <variants>
-        <variant name="AVR128DA48" pinout-key="qfn48" package="QFN48"/>
+        <variant key="avr128da48" name="AVR128DA48" pinout-key="qfn48"/>
     </variants>
 </device>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR128DA64.xml b/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR128DA64.xml
index 52f02d0e..e21f0e11 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR128DA64.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR128DA64.xml
@@ -44,70 +44,70 @@
         <peripheral key="ac0" name="AC0" module-key="cmp_control_v8">
             <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"/>
-                <signal pad-id="pd7" index="2" function="AC0" group="N"/>
-                <signal pad-id="pc6" index="0" function="AC0_ALT" group="OUT" field="PORTMUX.ACROUTEA.AC0"/>
-                <signal pad-id="pa7" index="0" function="AC0" group="OUT" field="PORTMUX.ACROUTEA.AC0"/>
-                <signal pad-id="pd2" index="0" function="AC0" group="P"/>
-                <signal pad-id="pe0" index="1" function="AC0" group="P"/>
-                <signal pad-id="pe2" index="2" function="AC0" group="P"/>
-                <signal pad-id="pd6" index="3" function="AC0" group="P"/>
+                <signal pad-key="pd3" index="0" function="AC0" group="N"/>
+                <signal pad-key="pd0" index="1" function="AC0" group="N"/>
+                <signal pad-key="pd7" index="2" function="AC0" group="N"/>
+                <signal pad-key="pc6" index="0" function="AC0_ALT" group="OUT" field="PORTMUX.ACROUTEA.AC0"/>
+                <signal pad-key="pa7" index="0" function="AC0" group="OUT" field="PORTMUX.ACROUTEA.AC0"/>
+                <signal pad-key="pd2" index="0" function="AC0" group="P"/>
+                <signal pad-key="pe0" index="1" function="AC0" group="P"/>
+                <signal pad-key="pe2" index="2" function="AC0" group="P"/>
+                <signal pad-key="pd6" index="3" function="AC0" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="ac1" name="AC1" module-key="cmp_control_v8">
             <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"/>
-                <signal pad-id="pd7" index="2" function="AC1" group="N"/>
-                <signal pad-id="pc6" index="0" function="AC1_ALT" group="OUT" field="PORTMUX.ACROUTEA.AC1"/>
-                <signal pad-id="pa7" index="0" function="AC1" group="OUT" field="PORTMUX.ACROUTEA.AC1"/>
-                <signal pad-id="pd2" index="0" function="AC1" group="P"/>
-                <signal pad-id="pd3" index="1" function="AC1" group="P"/>
-                <signal pad-id="pd4" index="2" function="AC1" group="P"/>
-                <signal pad-id="pd6" index="3" function="AC1" group="P"/>
+                <signal pad-key="pd5" index="0" function="AC1" group="N"/>
+                <signal pad-key="pd0" index="1" function="AC1" group="N"/>
+                <signal pad-key="pd7" index="2" function="AC1" group="N"/>
+                <signal pad-key="pc6" index="0" function="AC1_ALT" group="OUT" field="PORTMUX.ACROUTEA.AC1"/>
+                <signal pad-key="pa7" index="0" function="AC1" group="OUT" field="PORTMUX.ACROUTEA.AC1"/>
+                <signal pad-key="pd2" index="0" function="AC1" group="P"/>
+                <signal pad-key="pd3" index="1" function="AC1" group="P"/>
+                <signal pad-key="pd4" index="2" function="AC1" group="P"/>
+                <signal pad-key="pd6" index="3" function="AC1" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="ac2" name="AC2" module-key="cmp_control_v8">
             <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"/>
-                <signal pad-id="pd7" index="2" function="AC2" group="N"/>
-                <signal pad-id="pc6" index="0" function="AC2_ALT" group="OUT" field="PORTMUX.ACROUTEA.AC2"/>
-                <signal pad-id="pa7" index="0" function="AC2" group="OUT" field="PORTMUX.ACROUTEA.AC2"/>
-                <signal pad-id="pd2" index="0" function="AC2" group="P"/>
-                <signal pad-id="pd4" index="1" function="AC2" group="P"/>
-                <signal pad-id="pe1" index="2" function="AC2" group="P"/>
-                <signal pad-id="pd6" index="3" function="AC2" group="P"/>
+                <signal pad-key="pd7" index="0" function="AC2" group="N"/>
+                <signal pad-key="pd0" index="1" function="AC2" group="N"/>
+                <signal pad-key="pd7" index="2" function="AC2" group="N"/>
+                <signal pad-key="pc6" index="0" function="AC2_ALT" group="OUT" field="PORTMUX.ACROUTEA.AC2"/>
+                <signal pad-key="pa7" index="0" function="AC2" group="OUT" field="PORTMUX.ACROUTEA.AC2"/>
+                <signal pad-key="pd2" index="0" function="AC2" group="P"/>
+                <signal pad-key="pd4" index="1" function="AC2" group="P"/>
+                <signal pad-key="pe1" index="2" function="AC2" group="P"/>
+                <signal pad-key="pd6" index="3" function="AC2" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="adc0" name="ADC0" module-key="adc_12b_diff_ctrl_v1">
             <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"/>
-                <signal pad-id="pd2" index="2" function="AIN0" group="AIN"/>
-                <signal pad-id="pd3" index="3" function="AIN0" group="AIN"/>
-                <signal pad-id="pd4" index="4" function="AIN0" group="AIN"/>
-                <signal pad-id="pd5" index="5" function="AIN0" group="AIN"/>
-                <signal pad-id="pd6" index="6" function="AIN0" group="AIN"/>
-                <signal pad-id="pd7" index="7" function="AIN0" group="AIN"/>
-                <signal pad-id="pe0" index="8" function="AIN0" group="AIN"/>
-                <signal pad-id="pe1" index="9" function="AIN0" group="AIN"/>
-                <signal pad-id="pe2" index="10" function="AIN0" group="AIN"/>
-                <signal pad-id="pe3" index="11" function="AIN0" group="AIN"/>
-                <signal pad-id="pe4" index="12" function="AIN0" group="AIN"/>
-                <signal pad-id="pe5" index="13" function="AIN0" group="AIN"/>
-                <signal pad-id="pe6" index="14" function="AIN0" group="AIN"/>
-                <signal pad-id="pe7" index="15" function="AIN0" group="AIN"/>
-                <signal pad-id="pf0" index="16" function="AIN0" group="AIN"/>
-                <signal pad-id="pf1" index="17" function="AIN0" group="AIN"/>
-                <signal pad-id="pf2" index="18" function="AIN0" group="AIN"/>
-                <signal pad-id="pf3" index="19" function="AIN0" group="AIN"/>
-                <signal pad-id="pf4" index="20" function="AIN0" group="AIN"/>
-                <signal pad-id="pf5" index="21" function="AIN0" group="AIN"/>
+                <signal pad-key="pd0" index="0" function="AIN0" group="AIN"/>
+                <signal pad-key="pd1" index="1" function="AIN0" group="AIN"/>
+                <signal pad-key="pd2" index="2" function="AIN0" group="AIN"/>
+                <signal pad-key="pd3" index="3" function="AIN0" group="AIN"/>
+                <signal pad-key="pd4" index="4" function="AIN0" group="AIN"/>
+                <signal pad-key="pd5" index="5" function="AIN0" group="AIN"/>
+                <signal pad-key="pd6" index="6" function="AIN0" group="AIN"/>
+                <signal pad-key="pd7" index="7" function="AIN0" group="AIN"/>
+                <signal pad-key="pe0" index="8" function="AIN0" group="AIN"/>
+                <signal pad-key="pe1" index="9" function="AIN0" group="AIN"/>
+                <signal pad-key="pe2" index="10" function="AIN0" group="AIN"/>
+                <signal pad-key="pe3" index="11" function="AIN0" group="AIN"/>
+                <signal pad-key="pe4" index="12" function="AIN0" group="AIN"/>
+                <signal pad-key="pe5" index="13" function="AIN0" group="AIN"/>
+                <signal pad-key="pe6" index="14" function="AIN0" group="AIN"/>
+                <signal pad-key="pe7" index="15" function="AIN0" group="AIN"/>
+                <signal pad-key="pf0" index="16" function="AIN0" group="AIN"/>
+                <signal pad-key="pf1" index="17" function="AIN0" group="AIN"/>
+                <signal pad-key="pf2" index="18" function="AIN0" group="AIN"/>
+                <signal pad-key="pf3" index="19" function="AIN0" group="AIN"/>
+                <signal pad-key="pf4" index="20" function="AIN0" group="AIN"/>
+                <signal pad-key="pf5" index="21" function="AIN0" group="AIN"/>
             </signals>
         </peripheral>
         <peripheral key="bod" name="BOD" module-key="bor_lvd_ctrl_v1">
@@ -116,44 +116,44 @@
         <peripheral key="ccl" name="CCL" module-key="cla_ccl_v1">
             <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"/>
-                <signal pad-id="pa2" index="2" function="CCL_IN" group="LUT0_IN"/>
-                <signal pad-id="pa6" index="0" function="CCL_ALT" group="LUT0_OUT" field="PORTMUX.CCLROUTEA.LUT0"/>
-                <signal pad-id="pa3" index="0" function="CCL" group="LUT0_OUT" field="PORTMUX.CCLROUTEA.LUT0"/>
-                <signal pad-id="pc0" index="0" function="CCL_IN" group="LUT1_IN"/>
-                <signal pad-id="pc1" index="1" function="CCL_IN" group="LUT1_IN"/>
-                <signal pad-id="pc2" index="2" function="CCL_IN" group="LUT1_IN"/>
-                <signal pad-id="pc6" index="0" function="CCL_ALT" group="LUT1_OUT" field="PORTMUX.CCLROUTEA.LUT1"/>
-                <signal pad-id="pc3" index="0" function="CCL" group="LUT1_OUT" field="PORTMUX.CCLROUTEA.LUT1"/>
-                <signal pad-id="pd0" index="0" function="CCL_IN" group="LUT2_IN"/>
-                <signal pad-id="pd1" index="1" function="CCL_IN" group="LUT2_IN"/>
-                <signal pad-id="pd2" index="2" function="CCL_IN" group="LUT2_IN"/>
-                <signal pad-id="pd6" index="0" function="CCL_ALT" group="LUT2_OUT" field="PORTMUX.CCLROUTEA.LUT2"/>
-                <signal pad-id="pd3" index="0" function="CCL" group="LUT2_OUT" field="PORTMUX.CCLROUTEA.LUT2"/>
-                <signal pad-id="pf0" index="0" function="CCL_IN" group="LUT3_IN"/>
-                <signal pad-id="pf1" index="1" function="CCL_IN" group="LUT3_IN"/>
-                <signal pad-id="pf2" index="2" function="CCL_IN" group="LUT3_IN"/>
-                <signal pad-id="pf3" index="0" function="CCL" group="LUT3_OUT" field="PORTMUX.CCLROUTEA.LUT3"/>
-                <signal pad-id="pb0" index="0" function="CCL_IN" group="LUT4_IN"/>
-                <signal pad-id="pb1" index="1" function="CCL_IN" group="LUT4_IN"/>
-                <signal pad-id="pb2" index="2" function="CCL_IN" group="LUT4_IN"/>
-                <signal pad-id="pb6" index="0" function="CCL_ALT" group="LUT4_OUT" field="PORTMUX.CCLROUTEA.LUT4"/>
-                <signal pad-id="pb3" index="0" function="CCL" group="LUT4_OUT" field="PORTMUX.CCLROUTEA.LUT4"/>
-                <signal pad-id="pg0" index="0" function="CCL_IN" group="LUT5_IN"/>
-                <signal pad-id="pg1" index="1" function="CCL_IN" group="LUT5_IN"/>
-                <signal pad-id="pg2" index="2" function="CCL_IN" group="LUT5_IN"/>
-                <signal pad-id="pg6" index="0" function="CCL_ALT" group="LUT5_OUT" field="PORTMUX.CCLROUTEA.LUT5"/>
-                <signal pad-id="pg3" index="0" function="CCL" group="LUT5_OUT" field="PORTMUX.CCLROUTEA.LUT5"/>
+                <signal pad-key="pa0" index="0" function="CCL_IN" group="LUT0_IN"/>
+                <signal pad-key="pa1" index="1" function="CCL_IN" group="LUT0_IN"/>
+                <signal pad-key="pa2" index="2" function="CCL_IN" group="LUT0_IN"/>
+                <signal pad-key="pa6" index="0" function="CCL_ALT" group="LUT0_OUT" field="PORTMUX.CCLROUTEA.LUT0"/>
+                <signal pad-key="pa3" index="0" function="CCL" group="LUT0_OUT" field="PORTMUX.CCLROUTEA.LUT0"/>
+                <signal pad-key="pc0" index="0" function="CCL_IN" group="LUT1_IN"/>
+                <signal pad-key="pc1" index="1" function="CCL_IN" group="LUT1_IN"/>
+                <signal pad-key="pc2" index="2" function="CCL_IN" group="LUT1_IN"/>
+                <signal pad-key="pc6" index="0" function="CCL_ALT" group="LUT1_OUT" field="PORTMUX.CCLROUTEA.LUT1"/>
+                <signal pad-key="pc3" index="0" function="CCL" group="LUT1_OUT" field="PORTMUX.CCLROUTEA.LUT1"/>
+                <signal pad-key="pd0" index="0" function="CCL_IN" group="LUT2_IN"/>
+                <signal pad-key="pd1" index="1" function="CCL_IN" group="LUT2_IN"/>
+                <signal pad-key="pd2" index="2" function="CCL_IN" group="LUT2_IN"/>
+                <signal pad-key="pd6" index="0" function="CCL_ALT" group="LUT2_OUT" field="PORTMUX.CCLROUTEA.LUT2"/>
+                <signal pad-key="pd3" index="0" function="CCL" group="LUT2_OUT" field="PORTMUX.CCLROUTEA.LUT2"/>
+                <signal pad-key="pf0" index="0" function="CCL_IN" group="LUT3_IN"/>
+                <signal pad-key="pf1" index="1" function="CCL_IN" group="LUT3_IN"/>
+                <signal pad-key="pf2" index="2" function="CCL_IN" group="LUT3_IN"/>
+                <signal pad-key="pf3" index="0" function="CCL" group="LUT3_OUT" field="PORTMUX.CCLROUTEA.LUT3"/>
+                <signal pad-key="pb0" index="0" function="CCL_IN" group="LUT4_IN"/>
+                <signal pad-key="pb1" index="1" function="CCL_IN" group="LUT4_IN"/>
+                <signal pad-key="pb2" index="2" function="CCL_IN" group="LUT4_IN"/>
+                <signal pad-key="pb6" index="0" function="CCL_ALT" group="LUT4_OUT" field="PORTMUX.CCLROUTEA.LUT4"/>
+                <signal pad-key="pb3" index="0" function="CCL" group="LUT4_OUT" field="PORTMUX.CCLROUTEA.LUT4"/>
+                <signal pad-key="pg0" index="0" function="CCL_IN" group="LUT5_IN"/>
+                <signal pad-key="pg1" index="1" function="CCL_IN" group="LUT5_IN"/>
+                <signal pad-key="pg2" index="2" function="CCL_IN" group="LUT5_IN"/>
+                <signal pad-key="pg6" index="0" function="CCL_ALT" group="LUT5_OUT" field="PORTMUX.CCLROUTEA.LUT5"/>
+                <signal pad-key="pg3" index="0" function="CCL" group="LUT5_OUT" field="PORTMUX.CCLROUTEA.LUT5"/>
             </signals>
         </peripheral>
         <peripheral key="clkctrl" name="CLKCTRL" module-key="avrda_clkctrl">
             <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"/>
-                <signal pad-id="pf0" function="CLKCTRL" group="XTAL32K1"/>
-                <signal pad-id="pf1" function="CLKCTRL" group="XTAL32K2"/>
+                <signal pad-key="pa7" function="CLKCTRL" group="CLKOUT"/>
+                <signal pad-key="pa0" function="CLKCTRL" group="EXTCLK"/>
+                <signal pad-key="pf0" function="CLKCTRL" group="XTAL32K1"/>
+                <signal pad-key="pf1" function="CLKCTRL" group="XTAL32K2"/>
             </signals>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="cpu_avr_xt_v1">
@@ -168,25 +168,25 @@
         <peripheral key="dac0" name="DAC0" module-key="dac_nbit_ctrl_v5">
             <register-group-instance register-group-key="dac" address-space-key="data" offset="0x6A0"/>
             <signals>
-                <signal pad-id="pd6" index="0" function="DAC0" group="OUT"/>
+                <signal pad-key="pd6" index="0" function="DAC0" group="OUT"/>
             </signals>
         </peripheral>
         <peripheral key="evsys" name="EVSYS" module-key="avrda_evsys">
             <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"/>
-                <signal pad-id="pb7" index="1" function="EVSYS_ALT" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTB"/>
-                <signal pad-id="pb2" index="1" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTB"/>
-                <signal pad-id="pc7" index="2" function="EVSYS_ALT" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTC"/>
-                <signal pad-id="pc2" index="2" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTC"/>
-                <signal pad-id="pd7" index="3" function="EVSYS_ALT" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTD"/>
-                <signal pad-id="pd2" index="3" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTD"/>
-                <signal pad-id="pe7" index="4" function="EVSYS_ALT" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTE"/>
-                <signal pad-id="pe2" index="4" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTE"/>
-                <signal pad-id="pf2" index="5" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTF"/>
-                <signal pad-id="pg7" index="6" function="EVSYS_ALT" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTG"/>
-                <signal pad-id="pg2" index="6" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTG"/>
+                <signal pad-key="pa7" index="0" function="EVSYS_ALT" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTA"/>
+                <signal pad-key="pa2" index="0" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTA"/>
+                <signal pad-key="pb7" index="1" function="EVSYS_ALT" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTB"/>
+                <signal pad-key="pb2" index="1" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTB"/>
+                <signal pad-key="pc7" index="2" function="EVSYS_ALT" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTC"/>
+                <signal pad-key="pc2" index="2" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTC"/>
+                <signal pad-key="pd7" index="3" function="EVSYS_ALT" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTD"/>
+                <signal pad-key="pd2" index="3" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTD"/>
+                <signal pad-key="pe7" index="4" function="EVSYS_ALT" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTE"/>
+                <signal pad-key="pe2" index="4" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTE"/>
+                <signal pad-key="pf2" index="5" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTF"/>
+                <signal pad-key="pg7" index="6" function="EVSYS_ALT" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTG"/>
+                <signal pad-key="pg2" index="6" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTG"/>
             </signals>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="avrda_fuse">
@@ -204,91 +204,91 @@
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pa2" index="2" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa3" index="3" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa4" index="4" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa5" index="5" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa6" index="6" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa7" index="7" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa0" index="0" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa1" index="1" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa2" index="2" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa3" index="3" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa4" index="4" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa5" index="5" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa6" index="6" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa7" index="7" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pb2" index="2" function="IOPORT" group="PIN"/>
-                <signal pad-id="pb3" index="3" function="IOPORT" group="PIN"/>
-                <signal pad-id="pb4" index="4" function="IOPORT" group="PIN"/>
-                <signal pad-id="pb5" index="5" function="IOPORT" group="PIN"/>
-                <signal pad-id="pb6" index="6" function="IOPORT" group="PIN"/>
-                <signal pad-id="pb7" index="7" function="IOPORT" group="PIN"/>
+                <signal pad-key="pb0" index="0" function="IOPORT" group="PIN"/>
+                <signal pad-key="pb1" index="1" function="IOPORT" group="PIN"/>
+                <signal pad-key="pb2" index="2" function="IOPORT" group="PIN"/>
+                <signal pad-key="pb3" index="3" function="IOPORT" group="PIN"/>
+                <signal pad-key="pb4" index="4" function="IOPORT" group="PIN"/>
+                <signal pad-key="pb5" index="5" function="IOPORT" group="PIN"/>
+                <signal pad-key="pb6" index="6" function="IOPORT" group="PIN"/>
+                <signal pad-key="pb7" index="7" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pc2" index="2" function="IOPORT" group="PIN"/>
-                <signal pad-id="pc3" index="3" function="IOPORT" group="PIN"/>
-                <signal pad-id="pc4" index="4" function="IOPORT" group="PIN"/>
-                <signal pad-id="pc5" index="5" function="IOPORT" group="PIN"/>
-                <signal pad-id="pc6" index="6" function="IOPORT" group="PIN"/>
-                <signal pad-id="pc7" index="7" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc0" index="0" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc1" index="1" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc2" index="2" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc3" index="3" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc4" index="4" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc5" index="5" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc6" index="6" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc7" index="7" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pd2" index="2" function="IOPORT" group="PIN"/>
-                <signal pad-id="pd3" index="3" function="IOPORT" group="PIN"/>
-                <signal pad-id="pd4" index="4" function="IOPORT" group="PIN"/>
-                <signal pad-id="pd5" index="5" function="IOPORT" group="PIN"/>
-                <signal pad-id="pd6" index="6" function="IOPORT" group="PIN"/>
-                <signal pad-id="pd7" index="7" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd0" index="0" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd1" index="1" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd2" index="2" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd3" index="3" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd4" index="4" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd5" index="5" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd6" index="6" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd7" index="7" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="porte" name="PORTE" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pe2" index="2" function="IOPORT" group="PIN"/>
-                <signal pad-id="pe3" index="3" function="IOPORT" group="PIN"/>
-                <signal pad-id="pe4" index="4" function="IOPORT" group="PIN"/>
-                <signal pad-id="pe5" index="5" function="IOPORT" group="PIN"/>
-                <signal pad-id="pe6" index="6" function="IOPORT" group="PIN"/>
-                <signal pad-id="pe7" index="7" function="IOPORT" group="PIN"/>
+                <signal pad-key="pe0" index="0" function="IOPORT" group="PIN"/>
+                <signal pad-key="pe1" index="1" function="IOPORT" group="PIN"/>
+                <signal pad-key="pe2" index="2" function="IOPORT" group="PIN"/>
+                <signal pad-key="pe3" index="3" function="IOPORT" group="PIN"/>
+                <signal pad-key="pe4" index="4" function="IOPORT" group="PIN"/>
+                <signal pad-key="pe5" index="5" function="IOPORT" group="PIN"/>
+                <signal pad-key="pe6" index="6" function="IOPORT" group="PIN"/>
+                <signal pad-key="pe7" index="7" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="portf" name="PORTF" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pf2" index="2" function="IOPORT" group="PIN"/>
-                <signal pad-id="pf3" index="3" function="IOPORT" group="PIN"/>
-                <signal pad-id="pf4" index="4" function="IOPORT" group="PIN"/>
-                <signal pad-id="pf5" index="5" function="IOPORT" group="PIN"/>
-                <signal pad-id="pf6" index="6" function="IOPORT" group="PIN"/>
+                <signal pad-key="pf0" index="0" function="IOPORT" group="PIN"/>
+                <signal pad-key="pf1" index="1" function="IOPORT" group="PIN"/>
+                <signal pad-key="pf2" index="2" function="IOPORT" group="PIN"/>
+                <signal pad-key="pf3" index="3" function="IOPORT" group="PIN"/>
+                <signal pad-key="pf4" index="4" function="IOPORT" group="PIN"/>
+                <signal pad-key="pf5" index="5" function="IOPORT" group="PIN"/>
+                <signal pad-key="pf6" index="6" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="portg" name="PORTG" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pg2" index="2" function="IOPORT" group="PIN"/>
-                <signal pad-id="pg3" index="3" function="IOPORT" group="PIN"/>
-                <signal pad-id="pg4" index="4" function="IOPORT" group="PIN"/>
-                <signal pad-id="pg5" index="5" function="IOPORT" group="PIN"/>
-                <signal pad-id="pg6" index="6" function="IOPORT" group="PIN"/>
-                <signal pad-id="pg7" index="7" function="IOPORT" group="PIN"/>
+                <signal pad-key="pg0" index="0" function="IOPORT" group="PIN"/>
+                <signal pad-key="pg1" index="1" function="IOPORT" group="PIN"/>
+                <signal pad-key="pg2" index="2" function="IOPORT" group="PIN"/>
+                <signal pad-key="pg3" index="3" function="IOPORT" group="PIN"/>
+                <signal pad-key="pg4" index="4" function="IOPORT" group="PIN"/>
+                <signal pad-key="pg5" index="5" function="IOPORT" group="PIN"/>
+                <signal pad-key="pg6" index="6" function="IOPORT" group="PIN"/>
+                <signal pad-key="pg7" index="7" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="portmux" name="PORTMUX" module-key="avrda_portmux">
@@ -296,58 +296,58 @@
         </peripheral>
         <peripheral key="ptc" name="PTC" module-key="adc_ptc_ctrl_v1">
             <signals>
-                <signal pad-id="pa0" index="0" function="PTC" group="XY"/>
-                <signal pad-id="pa1" index="1" function="PTC" group="XY"/>
-                <signal pad-id="pa2" index="2" function="PTC" group="XY"/>
-                <signal pad-id="pa3" index="3" function="PTC" group="XY"/>
-                <signal pad-id="pa4" index="4" function="PTC" group="XY"/>
-                <signal pad-id="pa5" index="5" function="PTC" group="XY"/>
-                <signal pad-id="pa6" index="6" function="PTC" group="XY"/>
-                <signal pad-id="pa7" index="7" function="PTC" group="XY"/>
-                <signal pad-id="pb0" index="8" function="PTC" group="XY"/>
-                <signal pad-id="pb1" index="9" function="PTC" group="XY"/>
-                <signal pad-id="pb2" index="10" function="PTC" group="XY"/>
-                <signal pad-id="pb3" index="11" function="PTC" group="XY"/>
-                <signal pad-id="pb4" index="12" function="PTC" group="XY"/>
-                <signal pad-id="pb5" index="13" function="PTC" group="XY"/>
-                <signal pad-id="pb6" index="14" function="PTC" group="XY"/>
-                <signal pad-id="pb7" index="15" function="PTC" group="XY"/>
-                <signal pad-id="pd0" index="16" function="PTC" group="XY"/>
-                <signal pad-id="pd1" index="17" function="PTC" group="XY"/>
-                <signal pad-id="pd2" index="18" function="PTC" group="XY"/>
-                <signal pad-id="pd3" index="19" function="PTC" group="XY"/>
-                <signal pad-id="pd4" index="20" function="PTC" group="XY"/>
-                <signal pad-id="pd5" index="21" function="PTC" group="XY"/>
-                <signal pad-id="pd6" index="22" function="PTC" group="XY"/>
-                <signal pad-id="pd7" index="23" function="PTC" group="XY"/>
-                <signal pad-id="pe0" index="24" function="PTC" group="XY"/>
-                <signal pad-id="pe1" index="25" function="PTC" group="XY"/>
-                <signal pad-id="pe2" index="26" function="PTC" group="XY"/>
-                <signal pad-id="pe3" index="27" function="PTC" group="XY"/>
-                <signal pad-id="pe4" index="28" function="PTC" group="XY"/>
-                <signal pad-id="pe5" index="29" function="PTC" group="XY"/>
-                <signal pad-id="pe6" index="30" function="PTC" group="XY"/>
-                <signal pad-id="pe7" index="31" function="PTC" group="XY"/>
-                <signal pad-id="pf0" index="32" function="PTC" group="XY"/>
-                <signal pad-id="pf1" index="33" function="PTC" group="XY"/>
-                <signal pad-id="pf2" index="34" function="PTC" group="XY"/>
-                <signal pad-id="pf3" index="35" function="PTC" group="XY"/>
-                <signal pad-id="pf4" index="36" function="PTC" group="XY"/>
-                <signal pad-id="pf5" index="37" function="PTC" group="XY"/>
-                <signal pad-id="pg0" index="40" function="PTC" group="XY"/>
-                <signal pad-id="pg1" index="41" function="PTC" group="XY"/>
-                <signal pad-id="pg2" index="42" function="PTC" group="XY"/>
-                <signal pad-id="pg3" index="43" function="PTC" group="XY"/>
-                <signal pad-id="pg4" index="44" function="PTC" group="XY"/>
-                <signal pad-id="pg5" index="45" function="PTC" group="XY"/>
-                <signal pad-id="pg6" index="46" function="PTC" group="XY"/>
-                <signal pad-id="pg7" index="47" function="PTC" group="XY"/>
+                <signal pad-key="pa0" index="0" function="PTC" group="XY"/>
+                <signal pad-key="pa1" index="1" function="PTC" group="XY"/>
+                <signal pad-key="pa2" index="2" function="PTC" group="XY"/>
+                <signal pad-key="pa3" index="3" function="PTC" group="XY"/>
+                <signal pad-key="pa4" index="4" function="PTC" group="XY"/>
+                <signal pad-key="pa5" index="5" function="PTC" group="XY"/>
+                <signal pad-key="pa6" index="6" function="PTC" group="XY"/>
+                <signal pad-key="pa7" index="7" function="PTC" group="XY"/>
+                <signal pad-key="pb0" index="8" function="PTC" group="XY"/>
+                <signal pad-key="pb1" index="9" function="PTC" group="XY"/>
+                <signal pad-key="pb2" index="10" function="PTC" group="XY"/>
+                <signal pad-key="pb3" index="11" function="PTC" group="XY"/>
+                <signal pad-key="pb4" index="12" function="PTC" group="XY"/>
+                <signal pad-key="pb5" index="13" function="PTC" group="XY"/>
+                <signal pad-key="pb6" index="14" function="PTC" group="XY"/>
+                <signal pad-key="pb7" index="15" function="PTC" group="XY"/>
+                <signal pad-key="pd0" index="16" function="PTC" group="XY"/>
+                <signal pad-key="pd1" index="17" function="PTC" group="XY"/>
+                <signal pad-key="pd2" index="18" function="PTC" group="XY"/>
+                <signal pad-key="pd3" index="19" function="PTC" group="XY"/>
+                <signal pad-key="pd4" index="20" function="PTC" group="XY"/>
+                <signal pad-key="pd5" index="21" function="PTC" group="XY"/>
+                <signal pad-key="pd6" index="22" function="PTC" group="XY"/>
+                <signal pad-key="pd7" index="23" function="PTC" group="XY"/>
+                <signal pad-key="pe0" index="24" function="PTC" group="XY"/>
+                <signal pad-key="pe1" index="25" function="PTC" group="XY"/>
+                <signal pad-key="pe2" index="26" function="PTC" group="XY"/>
+                <signal pad-key="pe3" index="27" function="PTC" group="XY"/>
+                <signal pad-key="pe4" index="28" function="PTC" group="XY"/>
+                <signal pad-key="pe5" index="29" function="PTC" group="XY"/>
+                <signal pad-key="pe6" index="30" function="PTC" group="XY"/>
+                <signal pad-key="pe7" index="31" function="PTC" group="XY"/>
+                <signal pad-key="pf0" index="32" function="PTC" group="XY"/>
+                <signal pad-key="pf1" index="33" function="PTC" group="XY"/>
+                <signal pad-key="pf2" index="34" function="PTC" group="XY"/>
+                <signal pad-key="pf3" index="35" function="PTC" group="XY"/>
+                <signal pad-key="pf4" index="36" function="PTC" group="XY"/>
+                <signal pad-key="pf5" index="37" function="PTC" group="XY"/>
+                <signal pad-key="pg0" index="40" function="PTC" group="XY"/>
+                <signal pad-key="pg1" index="41" function="PTC" group="XY"/>
+                <signal pad-key="pg2" index="42" function="PTC" group="XY"/>
+                <signal pad-key="pg3" index="43" function="PTC" group="XY"/>
+                <signal pad-key="pg4" index="44" function="PTC" group="XY"/>
+                <signal pad-key="pg5" index="45" function="PTC" group="XY"/>
+                <signal pad-key="pg6" index="46" function="PTC" group="XY"/>
+                <signal pad-key="pg7" index="47" function="PTC" group="XY"/>
             </signals>
         </peripheral>
         <peripheral key="rstctrl" name="RSTCTRL" module-key="rst_integration_v8">
             <register-group-instance register-group-key="rstctrl" address-space-key="data" offset="0x40"/>
             <signals>
-                <signal pad-id="pf6" function="OTHER" group="RESET"/>
+                <signal pad-key="pf6" function="OTHER" group="RESET"/>
             </signals>
         </peripheral>
         <peripheral key="rtc" name="RTC" module-key="tmr_16b_rtc_v1">
@@ -362,35 +362,35 @@
         <peripheral key="spi0" name="SPI0" module-key="spi_8bit_v2">
             <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"/>
-                <signal pad-id="pa5" function="SPI0" group="MISO" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <signal pad-id="pg4" function="SPI0_ALT2" group="MOSI" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <signal pad-id="pe0" function="SPI0_ALT" group="MOSI" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <signal pad-id="pa4" function="SPI0" group="MOSI" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <signal pad-id="pg6" function="SPI0_ALT2" group="SCK" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <signal pad-id="pe2" function="SPI0_ALT" group="SCK" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <signal pad-id="pa6" function="SPI0" group="SCK" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <signal pad-id="pg7" function="SPI0_ALT2" group="SS" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <signal pad-id="pe3" function="SPI0_ALT" group="SS" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <signal pad-id="pa7" function="SPI0" group="SS" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pg5" function="SPI0_ALT2" group="MISO" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pe1" function="SPI0_ALT" group="MISO" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pa5" function="SPI0" group="MISO" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pg4" function="SPI0_ALT2" group="MOSI" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pe0" function="SPI0_ALT" group="MOSI" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pa4" function="SPI0" group="MOSI" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pg6" function="SPI0_ALT2" group="SCK" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pe2" function="SPI0_ALT" group="SCK" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pa6" function="SPI0" group="SCK" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pg7" function="SPI0_ALT2" group="SS" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pe3" function="SPI0_ALT" group="SS" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pa7" function="SPI0" group="SS" field="PORTMUX.SPIROUTEA.SPI0"/>
             </signals>
         </peripheral>
         <peripheral key="spi1" name="SPI1" module-key="spi_8bit_v2">
             <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"/>
-                <signal pad-id="pc1" function="SPI1" group="MISO" field="PORTMUX.SPIROUTEA.SPI1"/>
-                <signal pad-id="pb4" function="SPI1_ALT2" group="MOSI" field="PORTMUX.SPIROUTEA.SPI1"/>
-                <signal pad-id="pc4" function="SPI1_ALT" group="MOSI" field="PORTMUX.SPIROUTEA.SPI1"/>
-                <signal pad-id="pc0" function="SPI1" group="MOSI" field="PORTMUX.SPIROUTEA.SPI1"/>
-                <signal pad-id="pb6" function="SPI1_ALT2" group="SCK" field="PORTMUX.SPIROUTEA.SPI1"/>
-                <signal pad-id="pc6" function="SPI1_ALT" group="SCK" field="PORTMUX.SPIROUTEA.SPI1"/>
-                <signal pad-id="pc2" function="SPI1" group="SCK" field="PORTMUX.SPIROUTEA.SPI1"/>
-                <signal pad-id="pb7" function="SPI1_ALT2" group="SS" field="PORTMUX.SPIROUTEA.SPI1"/>
-                <signal pad-id="pc7" function="SPI1_ALT" group="SS" field="PORTMUX.SPIROUTEA.SPI1"/>
-                <signal pad-id="pc3" function="SPI1" group="SS" field="PORTMUX.SPIROUTEA.SPI1"/>
+                <signal pad-key="pb5" function="SPI1_ALT2" group="MISO" field="PORTMUX.SPIROUTEA.SPI1"/>
+                <signal pad-key="pc5" function="SPI1_ALT" group="MISO" field="PORTMUX.SPIROUTEA.SPI1"/>
+                <signal pad-key="pc1" function="SPI1" group="MISO" field="PORTMUX.SPIROUTEA.SPI1"/>
+                <signal pad-key="pb4" function="SPI1_ALT2" group="MOSI" field="PORTMUX.SPIROUTEA.SPI1"/>
+                <signal pad-key="pc4" function="SPI1_ALT" group="MOSI" field="PORTMUX.SPIROUTEA.SPI1"/>
+                <signal pad-key="pc0" function="SPI1" group="MOSI" field="PORTMUX.SPIROUTEA.SPI1"/>
+                <signal pad-key="pb6" function="SPI1_ALT2" group="SCK" field="PORTMUX.SPIROUTEA.SPI1"/>
+                <signal pad-key="pc6" function="SPI1_ALT" group="SCK" field="PORTMUX.SPIROUTEA.SPI1"/>
+                <signal pad-key="pc2" function="SPI1" group="SCK" field="PORTMUX.SPIROUTEA.SPI1"/>
+                <signal pad-key="pb7" function="SPI1_ALT2" group="SS" field="PORTMUX.SPIROUTEA.SPI1"/>
+                <signal pad-key="pc7" function="SPI1_ALT" group="SS" field="PORTMUX.SPIROUTEA.SPI1"/>
+                <signal pad-key="pc3" function="SPI1" group="SS" field="PORTMUX.SPIROUTEA.SPI1"/>
             </signals>
         </peripheral>
         <peripheral key="syscfg" name="SYSCFG" module-key="avrda_syscfg">
@@ -399,237 +399,237 @@
         <peripheral key="tca0" name="TCA0" module-key="tmr_16b_pwm_v1">
             <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"/>
-                <signal pad-id="pe0" index="0" function="TCA0_ALT4" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pd0" index="0" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pc0" index="0" function="TCA0_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pb0" index="0" function="TCA0_ALT" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pa0" index="0" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pg1" index="1" function="TCA0_ALT6" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pf1" index="1" function="TCA0_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pe1" index="1" function="TCA0_ALT4" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pd1" index="1" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pc1" index="1" function="TCA0_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pb1" index="1" function="TCA0_ALT" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pa1" index="1" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pg2" index="2" function="TCA0_ALT6" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pf2" index="2" function="TCA0_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pe2" index="2" function="TCA0_ALT4" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pd2" index="2" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pc2" index="2" function="TCA0_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pb2" index="2" function="TCA0_ALT" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pa2" index="2" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pg3" index="3" function="TCA0_ALT6" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pf3" index="3" function="TCA0_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pe3" index="3" function="TCA0_ALT4" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pd3" index="3" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pc3" index="3" function="TCA0_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pb3" index="3" function="TCA0_ALT" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pa3" index="3" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pg4" index="4" function="TCA0_ALT6" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pf4" index="4" function="TCA0_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pe4" index="4" function="TCA0_ALT4" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pd4" index="4" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pc4" index="4" function="TCA0_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pb4" index="4" function="TCA0_ALT" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pa4" index="4" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pg5" index="5" function="TCA0_ALT6" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pf5" index="5" function="TCA0_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pe5" index="5" function="TCA0_ALT4" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pd5" index="5" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pc5" index="5" function="TCA0_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pb5" index="5" function="TCA0_ALT" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pa5" index="5" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pg0" index="0" function="TCA0_ALT6" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pf0" index="0" function="TCA0_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pe0" index="0" function="TCA0_ALT4" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pd0" index="0" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pc0" index="0" function="TCA0_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pb0" index="0" function="TCA0_ALT" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pa0" index="0" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pg1" index="1" function="TCA0_ALT6" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pf1" index="1" function="TCA0_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pe1" index="1" function="TCA0_ALT4" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pd1" index="1" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pc1" index="1" function="TCA0_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pb1" index="1" function="TCA0_ALT" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pa1" index="1" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pg2" index="2" function="TCA0_ALT6" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pf2" index="2" function="TCA0_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pe2" index="2" function="TCA0_ALT4" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pd2" index="2" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pc2" index="2" function="TCA0_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pb2" index="2" function="TCA0_ALT" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pa2" index="2" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pg3" index="3" function="TCA0_ALT6" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pf3" index="3" function="TCA0_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pe3" index="3" function="TCA0_ALT4" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pd3" index="3" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pc3" index="3" function="TCA0_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pb3" index="3" function="TCA0_ALT" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pa3" index="3" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pg4" index="4" function="TCA0_ALT6" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pf4" index="4" function="TCA0_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pe4" index="4" function="TCA0_ALT4" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pd4" index="4" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pc4" index="4" function="TCA0_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pb4" index="4" function="TCA0_ALT" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pa4" index="4" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pg5" index="5" function="TCA0_ALT6" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pf5" index="5" function="TCA0_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pe5" index="5" function="TCA0_ALT4" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pd5" index="5" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pc5" index="5" function="TCA0_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pb5" index="5" function="TCA0_ALT" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pa5" index="5" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
             </signals>
         </peripheral>
         <peripheral key="tca1" name="TCA1" module-key="tmr_16b_pwm_v1">
             <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"/>
-                <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"/>
-                <signal pad-id="pg1" index="1" function="TCA1_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA1"/>
-                <signal pad-id="pe5" index="1" function="TCA1_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA1"/>
-                <signal pad-id="pc5" index="1" function="TCA1_ALT" group="WO" field="PORTMUX.TCAROUTEA.TCA1"/>
-                <signal pad-id="pb1" index="1" function="TCA1" group="WO" field="PORTMUX.TCAROUTEA.TCA1"/>
-                <signal pad-id="pg2" index="2" function="TCA1_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA1"/>
-                <signal pad-id="pe6" index="2" function="TCA1_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA1"/>
-                <signal pad-id="pc6" index="2" function="TCA1_ALT" group="WO" field="PORTMUX.TCAROUTEA.TCA1"/>
-                <signal pad-id="pb2" index="2" function="TCA1" group="WO" field="PORTMUX.TCAROUTEA.TCA1"/>
-                <signal pad-id="pg3" index="3" function="TCA1_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA1"/>
-                <signal pad-id="pb3" index="3" function="TCA1" group="WO" field="PORTMUX.TCAROUTEA.TCA1"/>
-                <signal pad-id="pg4" index="4" function="TCA1_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA1"/>
-                <signal pad-id="pb4" index="4" function="TCA1" group="WO" field="PORTMUX.TCAROUTEA.TCA1"/>
-                <signal pad-id="pg5" index="5" function="TCA1_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA1"/>
-                <signal pad-id="pb5" index="5" function="TCA1" group="WO" field="PORTMUX.TCAROUTEA.TCA1"/>
+                <signal pad-key="pg0" index="0" function="TCA1_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA1"/>
+                <signal pad-key="pe4" index="0" function="TCA1_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA1"/>
+                <signal pad-key="pc4" index="0" function="TCA1_ALT" group="WO" field="PORTMUX.TCAROUTEA.TCA1"/>
+                <signal pad-key="pb0" index="0" function="TCA1" group="WO" field="PORTMUX.TCAROUTEA.TCA1"/>
+                <signal pad-key="pg1" index="1" function="TCA1_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA1"/>
+                <signal pad-key="pe5" index="1" function="TCA1_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA1"/>
+                <signal pad-key="pc5" index="1" function="TCA1_ALT" group="WO" field="PORTMUX.TCAROUTEA.TCA1"/>
+                <signal pad-key="pb1" index="1" function="TCA1" group="WO" field="PORTMUX.TCAROUTEA.TCA1"/>
+                <signal pad-key="pg2" index="2" function="TCA1_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA1"/>
+                <signal pad-key="pe6" index="2" function="TCA1_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA1"/>
+                <signal pad-key="pc6" index="2" function="TCA1_ALT" group="WO" field="PORTMUX.TCAROUTEA.TCA1"/>
+                <signal pad-key="pb2" index="2" function="TCA1" group="WO" field="PORTMUX.TCAROUTEA.TCA1"/>
+                <signal pad-key="pg3" index="3" function="TCA1_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA1"/>
+                <signal pad-key="pb3" index="3" function="TCA1" group="WO" field="PORTMUX.TCAROUTEA.TCA1"/>
+                <signal pad-key="pg4" index="4" function="TCA1_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA1"/>
+                <signal pad-key="pb4" index="4" function="TCA1" group="WO" field="PORTMUX.TCAROUTEA.TCA1"/>
+                <signal pad-key="pg5" index="5" function="TCA1_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA1"/>
+                <signal pad-key="pb5" index="5" function="TCA1" group="WO" field="PORTMUX.TCAROUTEA.TCA1"/>
             </signals>
         </peripheral>
         <peripheral key="tcb0" name="TCB0" module-key="tmr_16b_capture_v1">
             <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"/>
+                <signal pad-key="pf4" index="0" function="TCB0_ALT" group="WO" field="PORTMUX.TCBROUTEA.TCB0"/>
+                <signal pad-key="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 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"/>
+                <signal pad-key="pf5" index="0" function="TCB1_ALT" group="WO" field="PORTMUX.TCBROUTEA.TCB1"/>
+                <signal pad-key="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 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"/>
+                <signal pad-key="pb4" index="0" function="TCB2_ALT" group="WO" field="PORTMUX.TCBROUTEA.TCB2"/>
+                <signal pad-key="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 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"/>
+                <signal pad-key="pc1" index="0" function="TCB3_ALT" group="WO" field="PORTMUX.TCBROUTEA.TCB3"/>
+                <signal pad-key="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 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"/>
+                <signal pad-key="pc6" index="0" function="TCB4_ALT" group="WO" field="PORTMUX.TCBROUTEA.TCB4"/>
+                <signal pad-key="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 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"/>
-                <signal pad-id="pb4" function="TCD0_ALT" group="WOA" field="PORTMUX.TCDROUTEA.TCD0"/>
-                <signal pad-id="pa4" function="TCD0" group="WOA" field="PORTMUX.TCDROUTEA.TCD0"/>
-                <signal pad-id="pg5" index="1" function="TCD0_ALT3" group="WOB" field="PORTMUX.TCDROUTEA.TCD0"/>
-                <signal pad-id="pf1" index="1" function="TCD0_ALT2" group="WOB" field="PORTMUX.TCDROUTEA.TCD0"/>
-                <signal pad-id="pb5" index="1" function="TCD0_ALT" group="WOB" field="PORTMUX.TCDROUTEA.TCD0"/>
-                <signal pad-id="pa5" index="1" function="TCD0" group="WOB" field="PORTMUX.TCDROUTEA.TCD0"/>
-                <signal pad-id="pg6" index="2" function="TCD0_ALT3" group="WOC" field="PORTMUX.TCDROUTEA.TCD0"/>
-                <signal pad-id="pf2" index="2" function="TCD0_ALT2" group="WOC" field="PORTMUX.TCDROUTEA.TCD0"/>
-                <signal pad-id="pb6" index="2" function="TCD0_ALT" group="WOC" field="PORTMUX.TCDROUTEA.TCD0"/>
-                <signal pad-id="pa6" index="2" function="TCD0" group="WOC" field="PORTMUX.TCDROUTEA.TCD0"/>
-                <signal pad-id="pg7" index="3" function="TCD0_ALT3" group="WOD" field="PORTMUX.TCDROUTEA.TCD0"/>
-                <signal pad-id="pf3" index="3" function="TCD0_ALT2" group="WOD" field="PORTMUX.TCDROUTEA.TCD0"/>
-                <signal pad-id="pb7" index="3" function="TCD0_ALT" group="WOD" field="PORTMUX.TCDROUTEA.TCD0"/>
-                <signal pad-id="pa7" index="3" function="TCD0" group="WOD" field="PORTMUX.TCDROUTEA.TCD0"/>
+                <signal pad-key="pg4" function="TCD0_ALT3" group="WOA" field="PORTMUX.TCDROUTEA.TCD0"/>
+                <signal pad-key="pf0" function="TCD0_ALT2" group="WOA" field="PORTMUX.TCDROUTEA.TCD0"/>
+                <signal pad-key="pb4" function="TCD0_ALT" group="WOA" field="PORTMUX.TCDROUTEA.TCD0"/>
+                <signal pad-key="pa4" function="TCD0" group="WOA" field="PORTMUX.TCDROUTEA.TCD0"/>
+                <signal pad-key="pg5" index="1" function="TCD0_ALT3" group="WOB" field="PORTMUX.TCDROUTEA.TCD0"/>
+                <signal pad-key="pf1" index="1" function="TCD0_ALT2" group="WOB" field="PORTMUX.TCDROUTEA.TCD0"/>
+                <signal pad-key="pb5" index="1" function="TCD0_ALT" group="WOB" field="PORTMUX.TCDROUTEA.TCD0"/>
+                <signal pad-key="pa5" index="1" function="TCD0" group="WOB" field="PORTMUX.TCDROUTEA.TCD0"/>
+                <signal pad-key="pg6" index="2" function="TCD0_ALT3" group="WOC" field="PORTMUX.TCDROUTEA.TCD0"/>
+                <signal pad-key="pf2" index="2" function="TCD0_ALT2" group="WOC" field="PORTMUX.TCDROUTEA.TCD0"/>
+                <signal pad-key="pb6" index="2" function="TCD0_ALT" group="WOC" field="PORTMUX.TCDROUTEA.TCD0"/>
+                <signal pad-key="pa6" index="2" function="TCD0" group="WOC" field="PORTMUX.TCDROUTEA.TCD0"/>
+                <signal pad-key="pg7" index="3" function="TCD0_ALT3" group="WOD" field="PORTMUX.TCDROUTEA.TCD0"/>
+                <signal pad-key="pf3" index="3" function="TCD0_ALT2" group="WOD" field="PORTMUX.TCDROUTEA.TCD0"/>
+                <signal pad-key="pb7" index="3" function="TCD0_ALT" group="WOD" field="PORTMUX.TCDROUTEA.TCD0"/>
+                <signal pad-key="pa7" index="3" function="TCD0" group="WOD" field="PORTMUX.TCDROUTEA.TCD0"/>
             </signals>
         </peripheral>
         <peripheral key="twi0" name="TWI0" module-key="i2c_8bit_v2">
             <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"/>
-                <signal pad-id="pa3" function="I2C0" group="SCL" field="PORTMUX.TWIROUTEA.TWI0"/>
-                <signal pad-id="pc7" function="I2C0_ALT2" group="SCL_DUAL" field="PORTMUX.TWIROUTEA.TWI0"/>
-                <signal pad-id="pc7" function="I2C0_ALT1" group="SCL_DUAL" field="PORTMUX.TWIROUTEA.TWI0"/>
-                <signal pad-id="pc3" function="I2C0" group="SCL_DUAL" field="PORTMUX.TWIROUTEA.TWI0"/>
-                <signal pad-id="pc2" function="I2C0_ALT2" group="SDA" field="PORTMUX.TWIROUTEA.TWI0"/>
-                <signal pad-id="pa2" function="I2C0_ALT1" group="SDA" field="PORTMUX.TWIROUTEA.TWI0"/>
-                <signal pad-id="pa2" function="I2C0" group="SDA" field="PORTMUX.TWIROUTEA.TWI0"/>
-                <signal pad-id="pc6" function="I2C0_ALT2" group="SDA_DUAL" field="PORTMUX.TWIROUTEA.TWI0"/>
-                <signal pad-id="pc6" function="I2C0_ALT1" group="SDA_DUAL" field="PORTMUX.TWIROUTEA.TWI0"/>
-                <signal pad-id="pc2" function="I2C0" group="SDA_DUAL" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pc3" function="I2C0_ALT2" group="SCL" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pa3" function="I2C0_ALT1" group="SCL" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pa3" function="I2C0" group="SCL" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pc7" function="I2C0_ALT2" group="SCL_DUAL" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pc7" function="I2C0_ALT1" group="SCL_DUAL" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pc3" function="I2C0" group="SCL_DUAL" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pc2" function="I2C0_ALT2" group="SDA" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pa2" function="I2C0_ALT1" group="SDA" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pa2" function="I2C0" group="SDA" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pc6" function="I2C0_ALT2" group="SDA_DUAL" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pc6" function="I2C0_ALT1" group="SDA_DUAL" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pc2" function="I2C0" group="SDA_DUAL" field="PORTMUX.TWIROUTEA.TWI0"/>
             </signals>
         </peripheral>
         <peripheral key="twi1" name="TWI1" module-key="i2c_8bit_v2">
             <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"/>
-                <signal pad-id="pf3" function="I2C1" group="SCL" field="PORTMUX.TWIROUTEA.TWI1"/>
-                <signal pad-id="pb7" function="I2C1_ALT2" group="SCL_DUAL" field="PORTMUX.TWIROUTEA.TWI1"/>
-                <signal pad-id="pb7" function="I2C1_ALT1" group="SCL_DUAL" field="PORTMUX.TWIROUTEA.TWI1"/>
-                <signal pad-id="pb3" function="I2C1" group="SCL_DUAL" field="PORTMUX.TWIROUTEA.TWI1"/>
-                <signal pad-id="pb2" function="I2C1_ALT2" group="SDA" field="PORTMUX.TWIROUTEA.TWI1"/>
-                <signal pad-id="pf2" function="I2C1_ALT1" group="SDA" field="PORTMUX.TWIROUTEA.TWI1"/>
-                <signal pad-id="pf2" function="I2C1" group="SDA" field="PORTMUX.TWIROUTEA.TWI1"/>
-                <signal pad-id="pb6" function="I2C1_ALT2" group="SDA_DUAL" field="PORTMUX.TWIROUTEA.TWI1"/>
-                <signal pad-id="pb6" function="I2C1_ALT1" group="SDA_DUAL" field="PORTMUX.TWIROUTEA.TWI1"/>
-                <signal pad-id="pb2" function="I2C1" group="SDA_DUAL" field="PORTMUX.TWIROUTEA.TWI1"/>
+                <signal pad-key="pb3" function="I2C1_ALT2" group="SCL" field="PORTMUX.TWIROUTEA.TWI1"/>
+                <signal pad-key="pf3" function="I2C1_ALT1" group="SCL" field="PORTMUX.TWIROUTEA.TWI1"/>
+                <signal pad-key="pf3" function="I2C1" group="SCL" field="PORTMUX.TWIROUTEA.TWI1"/>
+                <signal pad-key="pb7" function="I2C1_ALT2" group="SCL_DUAL" field="PORTMUX.TWIROUTEA.TWI1"/>
+                <signal pad-key="pb7" function="I2C1_ALT1" group="SCL_DUAL" field="PORTMUX.TWIROUTEA.TWI1"/>
+                <signal pad-key="pb3" function="I2C1" group="SCL_DUAL" field="PORTMUX.TWIROUTEA.TWI1"/>
+                <signal pad-key="pb2" function="I2C1_ALT2" group="SDA" field="PORTMUX.TWIROUTEA.TWI1"/>
+                <signal pad-key="pf2" function="I2C1_ALT1" group="SDA" field="PORTMUX.TWIROUTEA.TWI1"/>
+                <signal pad-key="pf2" function="I2C1" group="SDA" field="PORTMUX.TWIROUTEA.TWI1"/>
+                <signal pad-key="pb6" function="I2C1_ALT2" group="SDA_DUAL" field="PORTMUX.TWIROUTEA.TWI1"/>
+                <signal pad-key="pb6" function="I2C1_ALT1" group="SDA_DUAL" field="PORTMUX.TWIROUTEA.TWI1"/>
+                <signal pad-key="pb2" function="I2C1" group="SDA_DUAL" field="PORTMUX.TWIROUTEA.TWI1"/>
             </signals>
         </peripheral>
         <peripheral key="usart0" name="USART0" module-key="uart_autobd_v4">
             <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"/>
-                <signal pad-id="pa4" function="USART0_ALT" group="TXD" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pa0" function="USART0" group="TXD" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pa6" function="USART0_ALT" group="XCK" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pa2" function="USART0" group="XCK" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pa7" function="USART0_ALT" group="XDIR" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pa3" function="USART0" group="XDIR" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa5" function="USART0_ALT" group="RXD" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa1" function="USART0" group="RXD" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa4" function="USART0_ALT" group="TXD" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa0" function="USART0" group="TXD" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa6" function="USART0_ALT" group="XCK" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa2" function="USART0" group="XCK" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa7" function="USART0_ALT" group="XDIR" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa3" function="USART0" group="XDIR" field="PORTMUX.USARTROUTEA.USART0"/>
             </signals>
         </peripheral>
         <peripheral key="usart1" name="USART1" module-key="uart_autobd_v4">
             <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"/>
-                <signal pad-id="pc4" function="USART1_ALT" group="TXD" field="PORTMUX.USARTROUTEA.USART1"/>
-                <signal pad-id="pc0" function="USART1" group="TXD" field="PORTMUX.USARTROUTEA.USART1"/>
-                <signal pad-id="pc6" function="USART1_ALT" group="XCK" field="PORTMUX.USARTROUTEA.USART1"/>
-                <signal pad-id="pc2" function="USART1" group="XCK" field="PORTMUX.USARTROUTEA.USART1"/>
-                <signal pad-id="pc7" function="USART1_ALT" group="XDIR" field="PORTMUX.USARTROUTEA.USART1"/>
-                <signal pad-id="pc3" function="USART1" group="XDIR" field="PORTMUX.USARTROUTEA.USART1"/>
+                <signal pad-key="pc5" function="USART1_ALT" group="RXD" field="PORTMUX.USARTROUTEA.USART1"/>
+                <signal pad-key="pc1" function="USART1" group="RXD" field="PORTMUX.USARTROUTEA.USART1"/>
+                <signal pad-key="pc4" function="USART1_ALT" group="TXD" field="PORTMUX.USARTROUTEA.USART1"/>
+                <signal pad-key="pc0" function="USART1" group="TXD" field="PORTMUX.USARTROUTEA.USART1"/>
+                <signal pad-key="pc6" function="USART1_ALT" group="XCK" field="PORTMUX.USARTROUTEA.USART1"/>
+                <signal pad-key="pc2" function="USART1" group="XCK" field="PORTMUX.USARTROUTEA.USART1"/>
+                <signal pad-key="pc7" function="USART1_ALT" group="XDIR" field="PORTMUX.USARTROUTEA.USART1"/>
+                <signal pad-key="pc3" function="USART1" group="XDIR" field="PORTMUX.USARTROUTEA.USART1"/>
             </signals>
         </peripheral>
         <peripheral key="usart2" name="USART2" module-key="uart_autobd_v4">
             <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"/>
-                <signal pad-id="pf4" function="USART2_ALT" group="TXD" field="PORTMUX.USARTROUTEA.USART2"/>
-                <signal pad-id="pf0" function="USART2" group="TXD" field="PORTMUX.USARTROUTEA.USART2"/>
-                <signal pad-id="pf2" function="USART2" group="XCK" field="PORTMUX.USARTROUTEA.USART2"/>
-                <signal pad-id="pf3" function="USART2" group="XDIR" field="PORTMUX.USARTROUTEA.USART2"/>
+                <signal pad-key="pf5" function="USART2_ALT" group="RXD" field="PORTMUX.USARTROUTEA.USART2"/>
+                <signal pad-key="pf1" function="USART2" group="RXD" field="PORTMUX.USARTROUTEA.USART2"/>
+                <signal pad-key="pf4" function="USART2_ALT" group="TXD" field="PORTMUX.USARTROUTEA.USART2"/>
+                <signal pad-key="pf0" function="USART2" group="TXD" field="PORTMUX.USARTROUTEA.USART2"/>
+                <signal pad-key="pf2" function="USART2" group="XCK" field="PORTMUX.USARTROUTEA.USART2"/>
+                <signal pad-key="pf3" function="USART2" group="XDIR" field="PORTMUX.USARTROUTEA.USART2"/>
             </signals>
         </peripheral>
         <peripheral key="usart3" name="USART3" module-key="uart_autobd_v4">
             <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"/>
-                <signal pad-id="pb4" function="USART3_ALT" group="TXD" field="PORTMUX.USARTROUTEA.USART3"/>
-                <signal pad-id="pb0" function="USART3" group="TXD" field="PORTMUX.USARTROUTEA.USART3"/>
-                <signal pad-id="pb6" function="USART3_ALT" group="XCK" field="PORTMUX.USARTROUTEA.USART3"/>
-                <signal pad-id="pb2" function="USART3" group="XCK" field="PORTMUX.USARTROUTEA.USART3"/>
-                <signal pad-id="pb7" function="USART3_ALT" group="XDIR" field="PORTMUX.USARTROUTEA.USART3"/>
-                <signal pad-id="pb3" function="USART3" group="XDIR" field="PORTMUX.USARTROUTEA.USART3"/>
+                <signal pad-key="pb5" function="USART3_ALT" group="RXD" field="PORTMUX.USARTROUTEA.USART3"/>
+                <signal pad-key="pb1" function="USART3" group="RXD" field="PORTMUX.USARTROUTEA.USART3"/>
+                <signal pad-key="pb4" function="USART3_ALT" group="TXD" field="PORTMUX.USARTROUTEA.USART3"/>
+                <signal pad-key="pb0" function="USART3" group="TXD" field="PORTMUX.USARTROUTEA.USART3"/>
+                <signal pad-key="pb6" function="USART3_ALT" group="XCK" field="PORTMUX.USARTROUTEA.USART3"/>
+                <signal pad-key="pb2" function="USART3" group="XCK" field="PORTMUX.USARTROUTEA.USART3"/>
+                <signal pad-key="pb7" function="USART3_ALT" group="XDIR" field="PORTMUX.USARTROUTEA.USART3"/>
+                <signal pad-key="pb3" function="USART3" group="XDIR" field="PORTMUX.USARTROUTEA.USART3"/>
             </signals>
         </peripheral>
         <peripheral key="usart4" name="USART4" module-key="uart_autobd_v4">
             <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"/>
-                <signal pad-id="pe4" function="USART4_ALT" group="TXD" field="PORTMUX.USARTROUTEB.USART4"/>
-                <signal pad-id="pe0" function="USART4" group="TXD" field="PORTMUX.USARTROUTEB.USART4"/>
-                <signal pad-id="pe6" function="USART4_ALT" group="XCK" field="PORTMUX.USARTROUTEB.USART4"/>
-                <signal pad-id="pe2" function="USART4" group="XCK" field="PORTMUX.USARTROUTEB.USART4"/>
-                <signal pad-id="pe7" function="USART4_ALT" group="XDIR" field="PORTMUX.USARTROUTEB.USART4"/>
-                <signal pad-id="pe3" function="USART4" group="XDIR" field="PORTMUX.USARTROUTEB.USART4"/>
+                <signal pad-key="pe5" function="USART4_ALT" group="RXD" field="PORTMUX.USARTROUTEB.USART4"/>
+                <signal pad-key="pe1" function="USART4" group="RXD" field="PORTMUX.USARTROUTEB.USART4"/>
+                <signal pad-key="pe4" function="USART4_ALT" group="TXD" field="PORTMUX.USARTROUTEB.USART4"/>
+                <signal pad-key="pe0" function="USART4" group="TXD" field="PORTMUX.USARTROUTEB.USART4"/>
+                <signal pad-key="pe6" function="USART4_ALT" group="XCK" field="PORTMUX.USARTROUTEB.USART4"/>
+                <signal pad-key="pe2" function="USART4" group="XCK" field="PORTMUX.USARTROUTEB.USART4"/>
+                <signal pad-key="pe7" function="USART4_ALT" group="XDIR" field="PORTMUX.USARTROUTEB.USART4"/>
+                <signal pad-key="pe3" function="USART4" group="XDIR" field="PORTMUX.USARTROUTEB.USART4"/>
             </signals>
         </peripheral>
         <peripheral key="usart5" name="USART5" module-key="uart_autobd_v4">
             <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"/>
-                <signal pad-id="pg4" function="USART5_ALT" group="TXD" field="PORTMUX.USARTROUTEB.USART5"/>
-                <signal pad-id="pg0" function="USART5" group="TXD" field="PORTMUX.USARTROUTEB.USART5"/>
-                <signal pad-id="pg6" function="USART5_ALT" group="XCK" field="PORTMUX.USARTROUTEB.USART5"/>
-                <signal pad-id="pg2" function="USART5" group="XCK" field="PORTMUX.USARTROUTEB.USART5"/>
-                <signal pad-id="pg7" function="USART5_ALT" group="XDIR" field="PORTMUX.USARTROUTEB.USART5"/>
-                <signal pad-id="pg3" function="USART5" group="XDIR" field="PORTMUX.USARTROUTEB.USART5"/>
+                <signal pad-key="pg5" function="USART5_ALT" group="RXD" field="PORTMUX.USARTROUTEB.USART5"/>
+                <signal pad-key="pg1" function="USART5" group="RXD" field="PORTMUX.USARTROUTEB.USART5"/>
+                <signal pad-key="pg4" function="USART5_ALT" group="TXD" field="PORTMUX.USARTROUTEB.USART5"/>
+                <signal pad-key="pg0" function="USART5" group="TXD" field="PORTMUX.USARTROUTEB.USART5"/>
+                <signal pad-key="pg6" function="USART5_ALT" group="XCK" field="PORTMUX.USARTROUTEB.USART5"/>
+                <signal pad-key="pg2" function="USART5" group="XCK" field="PORTMUX.USARTROUTEB.USART5"/>
+                <signal pad-key="pg7" function="USART5_ALT" group="XDIR" field="PORTMUX.USARTROUTEB.USART5"/>
+                <signal pad-key="pg3" function="USART5" group="XDIR" field="PORTMUX.USARTROUTEB.USART5"/>
             </signals>
         </peripheral>
         <peripheral key="userrow" name="USERROW" module-key="avrda_userrow">
@@ -665,25 +665,25 @@
         <peripheral key="zcd0" name="ZCD0" module-key="cmp_zxover_ctrl_v3">
             <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"/>
-                <signal pad-id="pa7" function="ZCD0" group="OUT" field="PORTMUX.ZCDROUTEA.ZCD0"/>
+                <signal pad-key="pd1" function="ZCD0" group="IN"/>
+                <signal pad-key="pc7" function="ZCD0_ALT" group="OUT" field="PORTMUX.ZCDROUTEA.ZCD0"/>
+                <signal pad-key="pa7" function="ZCD0" group="OUT" field="PORTMUX.ZCDROUTEA.ZCD0"/>
             </signals>
         </peripheral>
         <peripheral key="zcd1" name="ZCD1" module-key="cmp_zxover_ctrl_v3">
             <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"/>
-                <signal pad-id="pa7" function="ZCD1" group="OUT" field="PORTMUX.ZCDROUTEA.ZCD1"/>
+                <signal pad-key="pe3" function="ZCD1" group="IN"/>
+                <signal pad-key="pc7" function="ZCD1_ALT" group="OUT" field="PORTMUX.ZCDROUTEA.ZCD1"/>
+                <signal pad-key="pa7" function="ZCD1" group="OUT" field="PORTMUX.ZCDROUTEA.ZCD1"/>
             </signals>
         </peripheral>
         <peripheral key="zcd2" name="ZCD2" module-key="cmp_zxover_ctrl_v3">
             <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"/>
-                <signal pad-id="pa7" function="ZCD2" group="OUT" field="PORTMUX.ZCDROUTEA.ZCD2"/>
+                <signal pad-key="pe7" function="ZCD2" group="IN"/>
+                <signal pad-key="pc7" function="ZCD2_ALT" group="OUT" field="PORTMUX.ZCDROUTEA.ZCD2"/>
+                <signal pad-key="pa7" function="ZCD2" group="OUT" field="PORTMUX.ZCDROUTEA.ZCD2"/>
             </signals>
         </peripheral>
     </peripherals>
@@ -2022,75 +2022,141 @@
             </register-group>
         </module>
     </modules>
+    <pads>
+        <pad key="pa3" name="PA3"/>
+        <pad key="pa4" name="PA4"/>
+        <pad key="pa5" name="PA5"/>
+        <pad key="pa6" name="PA6"/>
+        <pad key="pa7" name="PA7"/>
+        <pad key="vdd0" name="VDD0"/>
+        <pad key="gnd0" name="GND0"/>
+        <pad key="pb0" name="PB0"/>
+        <pad key="pb1" name="PB1"/>
+        <pad key="pb2" name="PB2"/>
+        <pad key="pb3" name="PB3"/>
+        <pad key="pb4" name="PB4"/>
+        <pad key="pb5" name="PB5"/>
+        <pad key="pb6" name="PB6"/>
+        <pad key="pb7" name="PB7"/>
+        <pad key="pc0" name="PC0"/>
+        <pad key="pc1" name="PC1"/>
+        <pad key="pc2" name="PC2"/>
+        <pad key="pc3" name="PC3"/>
+        <pad key="vdd1" name="VDD1"/>
+        <pad key="gnd1" name="GND1"/>
+        <pad key="pc4" name="PC4"/>
+        <pad key="pc5" name="PC5"/>
+        <pad key="pc6" name="PC6"/>
+        <pad key="pc7" name="PC7"/>
+        <pad key="pd0" name="PD0"/>
+        <pad key="pd1" name="PD1"/>
+        <pad key="pd2" name="PD2"/>
+        <pad key="pd3" name="PD3"/>
+        <pad key="pd4" name="PD4"/>
+        <pad key="pd5" name="PD5"/>
+        <pad key="pd6" name="PD6"/>
+        <pad key="pd7" name="PD7"/>
+        <pad key="avdd" name="AVDD"/>
+        <pad key="agnd" name="AGND"/>
+        <pad key="pe0" name="PE0"/>
+        <pad key="pe1" name="PE1"/>
+        <pad key="pe2" name="PE2"/>
+        <pad key="pe3" name="PE3"/>
+        <pad key="pe4" name="PE4"/>
+        <pad key="pe5" name="PE5"/>
+        <pad key="pe6" name="PE6"/>
+        <pad key="pe7" name="PE7"/>
+        <pad key="pf0" name="PF0"/>
+        <pad key="pf1" name="PF1"/>
+        <pad key="pf2" name="PF2"/>
+        <pad key="pf3" name="PF3"/>
+        <pad key="pf4" name="PF4"/>
+        <pad key="pf5" name="PF5"/>
+        <pad key="pf6" name="PF6"/>
+        <pad key="updi" name="UPDI"/>
+        <pad key="pg0" name="PG0"/>
+        <pad key="pg1" name="PG1"/>
+        <pad key="pg2" name="PG2"/>
+        <pad key="pg3" name="PG3"/>
+        <pad key="vdd2" name="VDD2"/>
+        <pad key="gnd2" name="GND2"/>
+        <pad key="pg4" name="PG4"/>
+        <pad key="pg5" name="PG5"/>
+        <pad key="pg6" name="PG6"/>
+        <pad key="pg7" name="PG7"/>
+        <pad key="pa0" name="PA0"/>
+        <pad key="pa1" name="PA1"/>
+        <pad key="pa2" name="PA2"/>
+    </pads>
     <pinouts>
         <pinout key="qfn64" name="QFN64" type="qfn">
-            <pin position="1" pad="PA3"/>
-            <pin position="2" pad="PA4"/>
-            <pin position="3" pad="PA5"/>
-            <pin position="4" pad="PA6"/>
-            <pin position="5" pad="PA7"/>
-            <pin position="6" pad="VDD0"/>
-            <pin position="7" pad="GND0"/>
-            <pin position="8" pad="PB0"/>
-            <pin position="9" pad="PB1"/>
-            <pin position="10" pad="PB2"/>
-            <pin position="11" pad="PB3"/>
-            <pin position="12" pad="PB4"/>
-            <pin position="13" pad="PB5"/>
-            <pin position="14" pad="PB6"/>
-            <pin position="15" pad="PB7"/>
-            <pin position="16" pad="PC0"/>
-            <pin position="17" pad="PC1"/>
-            <pin position="18" pad="PC2"/>
-            <pin position="19" pad="PC3"/>
-            <pin position="20" pad="VDD1"/>
-            <pin position="21" pad="GND1"/>
-            <pin position="22" pad="PC4"/>
-            <pin position="23" pad="PC5"/>
-            <pin position="24" pad="PC6"/>
-            <pin position="25" pad="PC7"/>
-            <pin position="26" pad="PD0"/>
-            <pin position="27" pad="PD1"/>
-            <pin position="28" pad="PD2"/>
-            <pin position="29" pad="PD3"/>
-            <pin position="30" pad="PD4"/>
-            <pin position="31" pad="PD5"/>
-            <pin position="32" pad="PD6"/>
-            <pin position="33" pad="PD7"/>
-            <pin position="34" pad="AVDD"/>
-            <pin position="35" pad="AGND"/>
-            <pin position="36" pad="PE0"/>
-            <pin position="37" pad="PE1"/>
-            <pin position="38" pad="PE2"/>
-            <pin position="39" pad="PE3"/>
-            <pin position="40" pad="PE4"/>
-            <pin position="41" pad="PE5"/>
-            <pin position="42" pad="PE6"/>
-            <pin position="43" pad="PE7"/>
-            <pin position="44" pad="PF0"/>
-            <pin position="45" pad="PF1"/>
-            <pin position="46" pad="PF2"/>
-            <pin position="47" pad="PF3"/>
-            <pin position="48" pad="PF4"/>
-            <pin position="49" pad="PF5"/>
-            <pin position="50" pad="PF6"/>
-            <pin position="51" pad="UPDI"/>
-            <pin position="52" pad="PG0"/>
-            <pin position="53" pad="PG1"/>
-            <pin position="54" pad="PG2"/>
-            <pin position="55" pad="PG3"/>
-            <pin position="56" pad="VDD2"/>
-            <pin position="57" pad="GND2"/>
-            <pin position="58" pad="PG4"/>
-            <pin position="59" pad="PG5"/>
-            <pin position="60" pad="PG6"/>
-            <pin position="61" pad="PG7"/>
-            <pin position="62" pad="PA0"/>
-            <pin position="63" pad="PA1"/>
-            <pin position="64" pad="PA2"/>
+            <pin position="1" pad-key="pa3"/>
+            <pin position="2" pad-key="pa4"/>
+            <pin position="3" pad-key="pa5"/>
+            <pin position="4" pad-key="pa6"/>
+            <pin position="5" pad-key="pa7"/>
+            <pin position="6" pad-key="vdd0"/>
+            <pin position="7" pad-key="gnd0"/>
+            <pin position="8" pad-key="pb0"/>
+            <pin position="9" pad-key="pb1"/>
+            <pin position="10" pad-key="pb2"/>
+            <pin position="11" pad-key="pb3"/>
+            <pin position="12" pad-key="pb4"/>
+            <pin position="13" pad-key="pb5"/>
+            <pin position="14" pad-key="pb6"/>
+            <pin position="15" pad-key="pb7"/>
+            <pin position="16" pad-key="pc0"/>
+            <pin position="17" pad-key="pc1"/>
+            <pin position="18" pad-key="pc2"/>
+            <pin position="19" pad-key="pc3"/>
+            <pin position="20" pad-key="vdd1"/>
+            <pin position="21" pad-key="gnd1"/>
+            <pin position="22" pad-key="pc4"/>
+            <pin position="23" pad-key="pc5"/>
+            <pin position="24" pad-key="pc6"/>
+            <pin position="25" pad-key="pc7"/>
+            <pin position="26" pad-key="pd0"/>
+            <pin position="27" pad-key="pd1"/>
+            <pin position="28" pad-key="pd2"/>
+            <pin position="29" pad-key="pd3"/>
+            <pin position="30" pad-key="pd4"/>
+            <pin position="31" pad-key="pd5"/>
+            <pin position="32" pad-key="pd6"/>
+            <pin position="33" pad-key="pd7"/>
+            <pin position="34" pad-key="avdd"/>
+            <pin position="35" pad-key="agnd"/>
+            <pin position="36" pad-key="pe0"/>
+            <pin position="37" pad-key="pe1"/>
+            <pin position="38" pad-key="pe2"/>
+            <pin position="39" pad-key="pe3"/>
+            <pin position="40" pad-key="pe4"/>
+            <pin position="41" pad-key="pe5"/>
+            <pin position="42" pad-key="pe6"/>
+            <pin position="43" pad-key="pe7"/>
+            <pin position="44" pad-key="pf0"/>
+            <pin position="45" pad-key="pf1"/>
+            <pin position="46" pad-key="pf2"/>
+            <pin position="47" pad-key="pf3"/>
+            <pin position="48" pad-key="pf4"/>
+            <pin position="49" pad-key="pf5"/>
+            <pin position="50" pad-key="pf6"/>
+            <pin position="51" pad-key="updi"/>
+            <pin position="52" pad-key="pg0"/>
+            <pin position="53" pad-key="pg1"/>
+            <pin position="54" pad-key="pg2"/>
+            <pin position="55" pad-key="pg3"/>
+            <pin position="56" pad-key="vdd2"/>
+            <pin position="57" pad-key="gnd2"/>
+            <pin position="58" pad-key="pg4"/>
+            <pin position="59" pad-key="pg5"/>
+            <pin position="60" pad-key="pg6"/>
+            <pin position="61" pad-key="pg7"/>
+            <pin position="62" pad-key="pa0"/>
+            <pin position="63" pad-key="pa1"/>
+            <pin position="64" pad-key="pa2"/>
         </pinout>
     </pinouts>
     <variants>
-        <variant name="AVR128DA64" pinout-key="qfn64" package="QFN64"/>
+        <variant key="avr128da64" name="AVR128DA64" pinout-key="qfn64"/>
     </variants>
 </device>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR128DB28.xml b/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR128DB28.xml
index c347fe1b..2026eea3 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR128DB28.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR128DB28.xml
@@ -44,48 +44,48 @@
         <peripheral key="ac0" name="AC0" module-key="cmp_control_v8">
             <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"/>
-                <signal pad-id="pa7" index="0" function="AC0" group="OUT" field="PORTMUX.ACROUTEA.AC0"/>
-                <signal pad-id="pd2" index="0" function="AC0" group="P"/>
-                <signal pad-id="pd6" index="3" function="AC0" group="P"/>
+                <signal pad-key="pd3" index="0" function="AC0" group="N"/>
+                <signal pad-key="pd7" index="2" function="AC0" group="N"/>
+                <signal pad-key="pa7" index="0" function="AC0" group="OUT" field="PORTMUX.ACROUTEA.AC0"/>
+                <signal pad-key="pd2" index="0" function="AC0" group="P"/>
+                <signal pad-key="pd6" index="3" function="AC0" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="ac1" name="AC1" module-key="cmp_control_v8">
             <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"/>
-                <signal pad-id="pa7" index="0" function="AC1" group="OUT" field="PORTMUX.ACROUTEA.AC1"/>
-                <signal pad-id="pd2" index="0" function="AC1" group="P"/>
-                <signal pad-id="pd3" index="1" function="AC1" group="P"/>
-                <signal pad-id="pd4" index="2" function="AC1" group="P"/>
-                <signal pad-id="pd6" index="3" function="AC1" group="P"/>
+                <signal pad-key="pd5" index="0" function="AC1" group="N"/>
+                <signal pad-key="pd7" index="2" function="AC1" group="N"/>
+                <signal pad-key="pa7" index="0" function="AC1" group="OUT" field="PORTMUX.ACROUTEA.AC1"/>
+                <signal pad-key="pd2" index="0" function="AC1" group="P"/>
+                <signal pad-key="pd3" index="1" function="AC1" group="P"/>
+                <signal pad-key="pd4" index="2" function="AC1" group="P"/>
+                <signal pad-key="pd6" index="3" function="AC1" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="ac2" name="AC2" module-key="cmp_control_v8">
             <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"/>
-                <signal pad-id="pa7" index="0" function="AC2" group="OUT" field="PORTMUX.ACROUTEA.AC2"/>
-                <signal pad-id="pd2" index="0" function="AC2" group="P"/>
-                <signal pad-id="pd4" index="1" function="AC2" group="P"/>
-                <signal pad-id="pd6" index="3" function="AC2" group="P"/>
+                <signal pad-key="pd7" index="0" function="AC2" group="N"/>
+                <signal pad-key="pd7" index="2" function="AC2" group="N"/>
+                <signal pad-key="pa7" index="0" function="AC2" group="OUT" field="PORTMUX.ACROUTEA.AC2"/>
+                <signal pad-key="pd2" index="0" function="AC2" group="P"/>
+                <signal pad-key="pd4" index="1" function="AC2" group="P"/>
+                <signal pad-key="pd6" index="3" function="AC2" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="adc0" name="ADC0" module-key="adc_12b_diff_ctrl_v1">
             <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"/>
-                <signal pad-id="pd3" index="3" function="AIN0" group="AIN"/>
-                <signal pad-id="pd4" index="4" function="AIN0" group="AIN"/>
-                <signal pad-id="pd5" index="5" function="AIN0" group="AIN"/>
-                <signal pad-id="pd6" index="6" function="AIN0" group="AIN"/>
-                <signal pad-id="pd7" index="7" function="AIN0" group="AIN"/>
-                <signal pad-id="pf0" index="16" function="AIN0" group="AIN"/>
-                <signal pad-id="pf1" index="17" function="AIN0" group="AIN"/>
+                <signal pad-key="pd1" index="1" function="AIN0" group="AIN"/>
+                <signal pad-key="pd2" index="2" function="AIN0" group="AIN"/>
+                <signal pad-key="pd3" index="3" function="AIN0" group="AIN"/>
+                <signal pad-key="pd4" index="4" function="AIN0" group="AIN"/>
+                <signal pad-key="pd5" index="5" function="AIN0" group="AIN"/>
+                <signal pad-key="pd6" index="6" function="AIN0" group="AIN"/>
+                <signal pad-key="pd7" index="7" function="AIN0" group="AIN"/>
+                <signal pad-key="pf0" index="16" function="AIN0" group="AIN"/>
+                <signal pad-key="pf1" index="17" function="AIN0" group="AIN"/>
             </signals>
         </peripheral>
         <peripheral key="bod" name="BOD" module-key="bor_lvd_ctrl_v1">
@@ -94,32 +94,32 @@
         <peripheral key="ccl" name="CCL" module-key="cla_ccl_v1">
             <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"/>
-                <signal pad-id="pa2" index="2" function="CCL_IN" group="LUT0_IN"/>
-                <signal pad-id="pa6" index="0" function="CCL_ALT" group="LUT0_OUT" field="PORTMUX.CCLROUTEA.LUT0"/>
-                <signal pad-id="pa3" index="0" function="CCL" group="LUT0_OUT" field="PORTMUX.CCLROUTEA.LUT0"/>
-                <signal pad-id="pc0" index="0" function="CCL_IN" group="LUT1_IN"/>
-                <signal pad-id="pc1" index="1" function="CCL_IN" group="LUT1_IN"/>
-                <signal pad-id="pc2" index="2" function="CCL_IN" group="LUT1_IN"/>
-                <signal pad-id="pc3" index="0" function="CCL" group="LUT1_OUT" field="PORTMUX.CCLROUTEA.LUT1"/>
-                <signal pad-id="pd1" index="1" function="CCL_IN" group="LUT2_IN"/>
-                <signal pad-id="pd2" index="2" function="CCL_IN" group="LUT2_IN"/>
-                <signal pad-id="pd6" index="0" function="CCL_ALT" group="LUT2_OUT" field="PORTMUX.CCLROUTEA.LUT2"/>
-                <signal pad-id="pd3" index="0" function="CCL" group="LUT2_OUT" field="PORTMUX.CCLROUTEA.LUT2"/>
-                <signal pad-id="pf0" index="0" function="CCL_IN" group="LUT3_IN"/>
-                <signal pad-id="pf1" index="1" function="CCL_IN" group="LUT3_IN"/>
+                <signal pad-key="pa0" index="0" function="CCL_IN" group="LUT0_IN"/>
+                <signal pad-key="pa1" index="1" function="CCL_IN" group="LUT0_IN"/>
+                <signal pad-key="pa2" index="2" function="CCL_IN" group="LUT0_IN"/>
+                <signal pad-key="pa6" index="0" function="CCL_ALT" group="LUT0_OUT" field="PORTMUX.CCLROUTEA.LUT0"/>
+                <signal pad-key="pa3" index="0" function="CCL" group="LUT0_OUT" field="PORTMUX.CCLROUTEA.LUT0"/>
+                <signal pad-key="pc0" index="0" function="CCL_IN" group="LUT1_IN"/>
+                <signal pad-key="pc1" index="1" function="CCL_IN" group="LUT1_IN"/>
+                <signal pad-key="pc2" index="2" function="CCL_IN" group="LUT1_IN"/>
+                <signal pad-key="pc3" index="0" function="CCL" group="LUT1_OUT" field="PORTMUX.CCLROUTEA.LUT1"/>
+                <signal pad-key="pd1" index="1" function="CCL_IN" group="LUT2_IN"/>
+                <signal pad-key="pd2" index="2" function="CCL_IN" group="LUT2_IN"/>
+                <signal pad-key="pd6" index="0" function="CCL_ALT" group="LUT2_OUT" field="PORTMUX.CCLROUTEA.LUT2"/>
+                <signal pad-key="pd3" index="0" function="CCL" group="LUT2_OUT" field="PORTMUX.CCLROUTEA.LUT2"/>
+                <signal pad-key="pf0" index="0" function="CCL_IN" group="LUT3_IN"/>
+                <signal pad-key="pf1" index="1" function="CCL_IN" group="LUT3_IN"/>
             </signals>
         </peripheral>
         <peripheral key="clkctrl" name="CLKCTRL" module-key="chip_clkctrl">
             <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"/>
-                <signal pad-id="pf0" function="CLKCTRL" group="XTAL32K1"/>
-                <signal pad-id="pf1" function="CLKCTRL" group="XTAL32K2"/>
-                <signal pad-id="pa0" function="CLKCTRL" group="XTALHF1"/>
-                <signal pad-id="pa1" function="CLKCTRL" group="XTALHF2"/>
+                <signal pad-key="pa7" function="CLKCTRL" group="CLKOUT"/>
+                <signal pad-key="pa0" function="CLKCTRL" group="EXTCLK"/>
+                <signal pad-key="pf0" function="CLKCTRL" group="XTAL32K1"/>
+                <signal pad-key="pf1" function="CLKCTRL" group="XTAL32K2"/>
+                <signal pad-key="pa0" function="CLKCTRL" group="XTALHF1"/>
+                <signal pad-key="pa1" function="CLKCTRL" group="XTALHF2"/>
             </signals>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="cpu_avr_xt_v1">
@@ -134,17 +134,17 @@
         <peripheral key="dac0" name="DAC0" module-key="dac_nbit_ctrl_v5">
             <register-group-instance register-group-key="dac" address-space-key="data" offset="0x6A0"/>
             <signals>
-                <signal pad-id="pd6" index="0" function="DAC0" group="OUT"/>
+                <signal pad-key="pd6" index="0" function="DAC0" group="OUT"/>
             </signals>
         </peripheral>
         <peripheral key="evsys" name="EVSYS" module-key="chip_evsys">
             <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"/>
-                <signal pad-id="pc2" index="2" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTC"/>
-                <signal pad-id="pd7" index="3" function="EVSYS_ALT" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTD"/>
-                <signal pad-id="pd2" index="3" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTD"/>
+                <signal pad-key="pa7" index="0" function="EVSYS_ALT" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTA"/>
+                <signal pad-key="pa2" index="0" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTA"/>
+                <signal pad-key="pc2" index="2" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTC"/>
+                <signal pad-key="pd7" index="3" function="EVSYS_ALT" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTD"/>
+                <signal pad-key="pd2" index="3" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTD"/>
             </signals>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="chip_fuse">
@@ -165,54 +165,54 @@
         <peripheral key="opamp" name="OPAMP" module-key="amp_opamp_ctrl_avr_v1">
             <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"/>
-                <signal pad-id="pd2" function="OPAMP" group="OP0OUT"/>
-                <signal pad-id="pd7" function="OPAMP" group="OP1INN"/>
-                <signal pad-id="pd4" function="OPAMP" group="OP1INP"/>
-                <signal pad-id="pd5" function="OPAMP" group="OP1OUT"/>
+                <signal pad-key="pd3" function="OPAMP" group="OP0INN"/>
+                <signal pad-key="pd1" function="OPAMP" group="OP0INP"/>
+                <signal pad-key="pd2" function="OPAMP" group="OP0OUT"/>
+                <signal pad-key="pd7" function="OPAMP" group="OP1INN"/>
+                <signal pad-key="pd4" function="OPAMP" group="OP1INP"/>
+                <signal pad-key="pd5" function="OPAMP" group="OP1OUT"/>
             </signals>
         </peripheral>
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pa2" index="2" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa3" index="3" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa4" index="4" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa5" index="5" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa6" index="6" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa7" index="7" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa0" index="0" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa1" index="1" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa2" index="2" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa3" index="3" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa4" index="4" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa5" index="5" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa6" index="6" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa7" index="7" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pc2" index="2" function="IOPORT" group="PIN"/>
-                <signal pad-id="pc3" index="3" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc0" index="0" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc1" index="1" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc2" index="2" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc3" index="3" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pd3" index="3" function="IOPORT" group="PIN"/>
-                <signal pad-id="pd4" index="4" function="IOPORT" group="PIN"/>
-                <signal pad-id="pd5" index="5" function="IOPORT" group="PIN"/>
-                <signal pad-id="pd6" index="6" function="IOPORT" group="PIN"/>
-                <signal pad-id="pd7" index="7" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd1" index="1" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd2" index="2" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd3" index="3" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd4" index="4" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd5" index="5" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd6" index="6" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd7" index="7" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="portf" name="PORTF" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pf6" index="6" function="IOPORT" group="PIN"/>
+                <signal pad-key="pf0" index="0" function="IOPORT" group="PIN"/>
+                <signal pad-key="pf1" index="1" function="IOPORT" group="PIN"/>
+                <signal pad-key="pf6" index="6" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="portmux" name="PORTMUX" module-key="chip_portmux">
@@ -221,7 +221,7 @@
         <peripheral key="rstctrl" name="RSTCTRL" module-key="rst_integration_v8">
             <register-group-instance register-group-key="rstctrl" address-space-key="data" offset="0x40"/>
             <signals>
-                <signal pad-id="pf6" function="OTHER" group="RESET"/>
+                <signal pad-key="pf6" function="OTHER" group="RESET"/>
             </signals>
         </peripheral>
         <peripheral key="rtc" name="RTC" module-key="tmr_16b_rtc_v1">
@@ -236,19 +236,19 @@
         <peripheral key="spi0" name="SPI0" module-key="spi_8bit_v2">
             <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"/>
-                <signal pad-id="pa6" function="SPI0" group="SCK" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <signal pad-id="pa7" function="SPI0" group="SS" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pa5" function="SPI0" group="MISO" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pa4" function="SPI0" group="MOSI" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pa6" function="SPI0" group="SCK" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pa7" function="SPI0" group="SS" field="PORTMUX.SPIROUTEA.SPI0"/>
             </signals>
         </peripheral>
         <peripheral key="spi1" name="SPI1" module-key="spi_8bit_v2">
             <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"/>
-                <signal pad-id="pc2" function="SPI1" group="SCK" field="PORTMUX.SPIROUTEA.SPI1"/>
-                <signal pad-id="pc3" function="SPI1" group="SS" field="PORTMUX.SPIROUTEA.SPI1"/>
+                <signal pad-key="pc1" function="SPI1" group="MISO" field="PORTMUX.SPIROUTEA.SPI1"/>
+                <signal pad-key="pc0" function="SPI1" group="MOSI" field="PORTMUX.SPIROUTEA.SPI1"/>
+                <signal pad-key="pc2" function="SPI1" group="SCK" field="PORTMUX.SPIROUTEA.SPI1"/>
+                <signal pad-key="pc3" function="SPI1" group="SS" field="PORTMUX.SPIROUTEA.SPI1"/>
             </signals>
         </peripheral>
         <peripheral key="syscfg" name="SYSCFG" module-key="chip_syscfg">
@@ -257,90 +257,90 @@
         <peripheral key="tca0" name="TCA0" module-key="tmr_16b_pwm_v1">
             <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"/>
-                <signal pad-id="pa0" index="0" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pf1" index="1" function="TCA0_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pd1" index="1" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pc1" index="1" function="TCA0_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pa1" index="1" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pd2" index="2" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pc2" index="2" function="TCA0_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pa2" index="2" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pd3" index="3" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pc3" index="3" function="TCA0_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pa3" index="3" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pd4" index="4" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pa4" index="4" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pd5" index="5" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pa5" index="5" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pf0" index="0" function="TCA0_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pc0" index="0" function="TCA0_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pa0" index="0" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pf1" index="1" function="TCA0_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pd1" index="1" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pc1" index="1" function="TCA0_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pa1" index="1" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pd2" index="2" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pc2" index="2" function="TCA0_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pa2" index="2" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pd3" index="3" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pc3" index="3" function="TCA0_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pa3" index="3" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pd4" index="4" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pa4" index="4" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pd5" index="5" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pa5" index="5" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
             </signals>
         </peripheral>
         <peripheral key="tcb0" name="TCB0" module-key="tmr_16b_capture_v1">
             <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-key="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 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-key="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 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"/>
+                <signal pad-key="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 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"/>
-                <signal pad-id="pf1" index="1" function="TCD0_ALT2" group="WOB" field="PORTMUX.TCDROUTEA.TCD0"/>
-                <signal pad-id="pa5" index="1" function="TCD0" group="WOB" field="PORTMUX.TCDROUTEA.TCD0"/>
-                <signal pad-id="pa6" index="2" function="TCD0" group="WOC" field="PORTMUX.TCDROUTEA.TCD0"/>
-                <signal pad-id="pa7" index="3" function="TCD0" group="WOD" field="PORTMUX.TCDROUTEA.TCD0"/>
+                <signal pad-key="pf0" function="TCD0_ALT2" group="WOA" field="PORTMUX.TCDROUTEA.TCD0"/>
+                <signal pad-key="pa4" function="TCD0" group="WOA" field="PORTMUX.TCDROUTEA.TCD0"/>
+                <signal pad-key="pf1" index="1" function="TCD0_ALT2" group="WOB" field="PORTMUX.TCDROUTEA.TCD0"/>
+                <signal pad-key="pa5" index="1" function="TCD0" group="WOB" field="PORTMUX.TCDROUTEA.TCD0"/>
+                <signal pad-key="pa6" index="2" function="TCD0" group="WOC" field="PORTMUX.TCDROUTEA.TCD0"/>
+                <signal pad-key="pa7" index="3" function="TCD0" group="WOD" field="PORTMUX.TCDROUTEA.TCD0"/>
             </signals>
         </peripheral>
         <peripheral key="twi0" name="TWI0" module-key="i2c_8bit_v2">
             <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"/>
-                <signal pad-id="pc2" function="I2C0_ALT" group="SDA" field="PORTMUX.TWIROUTEA.TWI0"/>
-                <signal pad-id="pa2" function="I2C0" group="SDA" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pc3" function="I2C0_ALT" group="SCL" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pa3" function="I2C0" group="SCL" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pc2" function="I2C0_ALT" group="SDA" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pa2" function="I2C0" group="SDA" field="PORTMUX.TWIROUTEA.TWI0"/>
             </signals>
         </peripheral>
         <peripheral key="usart0" name="USART0" module-key="uart_autobd_v4">
             <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"/>
-                <signal pad-id="pa4" function="USART0_ALT" group="TXD" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pa0" function="USART0" group="TXD" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pa6" function="USART0_ALT" group="XCK" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pa2" function="USART0" group="XCK" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pa7" function="USART0_ALT" group="XDIR" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pa3" function="USART0" group="XDIR" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa5" function="USART0_ALT" group="RXD" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa1" function="USART0" group="RXD" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa4" function="USART0_ALT" group="TXD" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa0" function="USART0" group="TXD" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa6" function="USART0_ALT" group="XCK" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa2" function="USART0" group="XCK" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa7" function="USART0_ALT" group="XDIR" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa3" function="USART0" group="XDIR" field="PORTMUX.USARTROUTEA.USART0"/>
             </signals>
         </peripheral>
         <peripheral key="usart1" name="USART1" module-key="uart_autobd_v4">
             <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"/>
-                <signal pad-id="pc2" function="USART1" group="XCK" field="PORTMUX.USARTROUTEA.USART1"/>
-                <signal pad-id="pc3" function="USART1" group="XDIR" field="PORTMUX.USARTROUTEA.USART1"/>
+                <signal pad-key="pc1" function="USART1" group="RXD" field="PORTMUX.USARTROUTEA.USART1"/>
+                <signal pad-key="pc0" function="USART1" group="TXD" field="PORTMUX.USARTROUTEA.USART1"/>
+                <signal pad-key="pc2" function="USART1" group="XCK" field="PORTMUX.USARTROUTEA.USART1"/>
+                <signal pad-key="pc3" function="USART1" group="XDIR" field="PORTMUX.USARTROUTEA.USART1"/>
             </signals>
         </peripheral>
         <peripheral key="usart2" name="USART2" module-key="uart_autobd_v4">
             <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"/>
+                <signal pad-key="pf1" function="USART2" group="RXD" field="PORTMUX.USARTROUTEA.USART2"/>
+                <signal pad-key="pf0" function="USART2" group="TXD" field="PORTMUX.USARTROUTEA.USART2"/>
             </signals>
         </peripheral>
         <peripheral key="userrow" name="USERROW" module-key="chip_userrow">
@@ -367,8 +367,8 @@
         <peripheral key="zcd0" name="ZCD0" module-key="cmp_zxover_ctrl_v3">
             <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"/>
+                <signal pad-key="pd1" function="ZCD0" group="IN"/>
+                <signal pad-key="pa7" function="ZCD0" group="OUT" field="PORTMUX.ZCDROUTEA.ZCD0"/>
             </signals>
         </peripheral>
     </peripherals>
@@ -1707,39 +1707,69 @@
             </register-group>
         </module>
     </modules>
+    <pads>
+        <pad key="pa7" name="PA7"/>
+        <pad key="pc0" name="PC0"/>
+        <pad key="pc1" name="PC1"/>
+        <pad key="pc2" name="PC2"/>
+        <pad key="pc3" name="PC3"/>
+        <pad key="vddio2" name="VDDIO2"/>
+        <pad key="pd1" name="PD1"/>
+        <pad key="pd2" name="PD2"/>
+        <pad key="pd3" name="PD3"/>
+        <pad key="pd4" name="PD4"/>
+        <pad key="pd5" name="PD5"/>
+        <pad key="pd6" name="PD6"/>
+        <pad key="pd7" name="PD7"/>
+        <pad key="avdd" name="AVDD"/>
+        <pad key="agnd" name="AGND"/>
+        <pad key="pf0" name="PF0"/>
+        <pad key="pf1" name="PF1"/>
+        <pad key="pf6" name="PF6"/>
+        <pad key="updi" name="UPDI"/>
+        <pad key="vdd0" name="VDD0"/>
+        <pad key="gnd0" name="GND0"/>
+        <pad key="pa0" name="PA0"/>
+        <pad key="pa1" name="PA1"/>
+        <pad key="pa2" name="PA2"/>
+        <pad key="pa3" name="PA3"/>
+        <pad key="pa4" name="PA4"/>
+        <pad key="pa5" name="PA5"/>
+        <pad key="pa6" name="PA6"/>
+    </pads>
     <pinouts>
         <pinout key="soic28" name="SOIC28" type="soic">
-            <pin position="1" pad="PA7"/>
-            <pin position="2" pad="PC0"/>
-            <pin position="3" pad="PC1"/>
-            <pin position="4" pad="PC2"/>
-            <pin position="5" pad="PC3"/>
-            <pin position="6" pad="VDDIO2"/>
-            <pin position="7" pad="PD1"/>
-            <pin position="8" pad="PD2"/>
-            <pin position="9" pad="PD3"/>
-            <pin position="10" pad="PD4"/>
-            <pin position="11" pad="PD5"/>
-            <pin position="12" pad="PD6"/>
-            <pin position="13" pad="PD7"/>
-            <pin position="14" pad="AVDD"/>
-            <pin position="15" pad="AGND"/>
-            <pin position="16" pad="PF0"/>
-            <pin position="17" pad="PF1"/>
-            <pin position="18" pad="PF6"/>
-            <pin position="19" pad="UPDI"/>
-            <pin position="20" pad="VDD0"/>
-            <pin position="21" pad="GND0"/>
-            <pin position="22" pad="PA0"/>
-            <pin position="23" pad="PA1"/>
-            <pin position="24" pad="PA2"/>
-            <pin position="25" pad="PA3"/>
-            <pin position="26" pad="PA4"/>
-            <pin position="27" pad="PA5"/>
-            <pin position="28" pad="PA6"/>
+            <pin position="1" pad-key="pa7"/>
+            <pin position="2" pad-key="pc0"/>
+            <pin position="3" pad-key="pc1"/>
+            <pin position="4" pad-key="pc2"/>
+            <pin position="5" pad-key="pc3"/>
+            <pin position="6" pad-key="vddio2"/>
+            <pin position="7" pad-key="pd1"/>
+            <pin position="8" pad-key="pd2"/>
+            <pin position="9" pad-key="pd3"/>
+            <pin position="10" pad-key="pd4"/>
+            <pin position="11" pad-key="pd5"/>
+            <pin position="12" pad-key="pd6"/>
+            <pin position="13" pad-key="pd7"/>
+            <pin position="14" pad-key="avdd"/>
+            <pin position="15" pad-key="agnd"/>
+            <pin position="16" pad-key="pf0"/>
+            <pin position="17" pad-key="pf1"/>
+            <pin position="18" pad-key="pf6"/>
+            <pin position="19" pad-key="updi"/>
+            <pin position="20" pad-key="vdd0"/>
+            <pin position="21" pad-key="gnd0"/>
+            <pin position="22" pad-key="pa0"/>
+            <pin position="23" pad-key="pa1"/>
+            <pin position="24" pad-key="pa2"/>
+            <pin position="25" pad-key="pa3"/>
+            <pin position="26" pad-key="pa4"/>
+            <pin position="27" pad-key="pa5"/>
+            <pin position="28" pad-key="pa6"/>
         </pinout>
     </pinouts>
     <variants>
-        <variant name="AVR128DB28" pinout-key="soic28" package="SOIC28"/>
+        <variant key="avr128db28" name="AVR128DB28" pinout-key="soic28"/>
     </variants>
 </device>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR128DB32.xml b/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR128DB32.xml
index 80040f1b..a09c5a59 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR128DB32.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR128DB32.xml
@@ -44,52 +44,52 @@
         <peripheral key="ac0" name="AC0" module-key="cmp_control_v8">
             <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"/>
-                <signal pad-id="pa7" index="0" function="AC0" group="OUT" field="PORTMUX.ACROUTEA.AC0"/>
-                <signal pad-id="pd2" index="0" function="AC0" group="P"/>
-                <signal pad-id="pd6" index="3" function="AC0" group="P"/>
+                <signal pad-key="pd3" index="0" function="AC0" group="N"/>
+                <signal pad-key="pd7" index="2" function="AC0" group="N"/>
+                <signal pad-key="pa7" index="0" function="AC0" group="OUT" field="PORTMUX.ACROUTEA.AC0"/>
+                <signal pad-key="pd2" index="0" function="AC0" group="P"/>
+                <signal pad-key="pd6" index="3" function="AC0" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="ac1" name="AC1" module-key="cmp_control_v8">
             <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"/>
-                <signal pad-id="pa7" index="0" function="AC1" group="OUT" field="PORTMUX.ACROUTEA.AC1"/>
-                <signal pad-id="pd2" index="0" function="AC1" group="P"/>
-                <signal pad-id="pd3" index="1" function="AC1" group="P"/>
-                <signal pad-id="pd4" index="2" function="AC1" group="P"/>
-                <signal pad-id="pd6" index="3" function="AC1" group="P"/>
+                <signal pad-key="pd5" index="0" function="AC1" group="N"/>
+                <signal pad-key="pd7" index="2" function="AC1" group="N"/>
+                <signal pad-key="pa7" index="0" function="AC1" group="OUT" field="PORTMUX.ACROUTEA.AC1"/>
+                <signal pad-key="pd2" index="0" function="AC1" group="P"/>
+                <signal pad-key="pd3" index="1" function="AC1" group="P"/>
+                <signal pad-key="pd4" index="2" function="AC1" group="P"/>
+                <signal pad-key="pd6" index="3" function="AC1" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="ac2" name="AC2" module-key="cmp_control_v8">
             <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"/>
-                <signal pad-id="pa7" index="0" function="AC2" group="OUT" field="PORTMUX.ACROUTEA.AC2"/>
-                <signal pad-id="pd2" index="0" function="AC2" group="P"/>
-                <signal pad-id="pd4" index="1" function="AC2" group="P"/>
-                <signal pad-id="pd6" index="3" function="AC2" group="P"/>
+                <signal pad-key="pd7" index="0" function="AC2" group="N"/>
+                <signal pad-key="pd7" index="2" function="AC2" group="N"/>
+                <signal pad-key="pa7" index="0" function="AC2" group="OUT" field="PORTMUX.ACROUTEA.AC2"/>
+                <signal pad-key="pd2" index="0" function="AC2" group="P"/>
+                <signal pad-key="pd4" index="1" function="AC2" group="P"/>
+                <signal pad-key="pd6" index="3" function="AC2" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="adc0" name="ADC0" module-key="adc_12b_diff_ctrl_v1">
             <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"/>
-                <signal pad-id="pd3" index="3" function="AIN0" group="AIN"/>
-                <signal pad-id="pd4" index="4" function="AIN0" group="AIN"/>
-                <signal pad-id="pd5" index="5" function="AIN0" group="AIN"/>
-                <signal pad-id="pd6" index="6" function="AIN0" group="AIN"/>
-                <signal pad-id="pd7" index="7" function="AIN0" group="AIN"/>
-                <signal pad-id="pf0" index="16" function="AIN0" group="AIN"/>
-                <signal pad-id="pf1" index="17" function="AIN0" group="AIN"/>
-                <signal pad-id="pf2" index="18" function="AIN0" group="AIN"/>
-                <signal pad-id="pf3" index="19" function="AIN0" group="AIN"/>
-                <signal pad-id="pf4" index="20" function="AIN0" group="AIN"/>
-                <signal pad-id="pf5" index="21" function="AIN0" group="AIN"/>
+                <signal pad-key="pd1" index="1" function="AIN0" group="AIN"/>
+                <signal pad-key="pd2" index="2" function="AIN0" group="AIN"/>
+                <signal pad-key="pd3" index="3" function="AIN0" group="AIN"/>
+                <signal pad-key="pd4" index="4" function="AIN0" group="AIN"/>
+                <signal pad-key="pd5" index="5" function="AIN0" group="AIN"/>
+                <signal pad-key="pd6" index="6" function="AIN0" group="AIN"/>
+                <signal pad-key="pd7" index="7" function="AIN0" group="AIN"/>
+                <signal pad-key="pf0" index="16" function="AIN0" group="AIN"/>
+                <signal pad-key="pf1" index="17" function="AIN0" group="AIN"/>
+                <signal pad-key="pf2" index="18" function="AIN0" group="AIN"/>
+                <signal pad-key="pf3" index="19" function="AIN0" group="AIN"/>
+                <signal pad-key="pf4" index="20" function="AIN0" group="AIN"/>
+                <signal pad-key="pf5" index="21" function="AIN0" group="AIN"/>
             </signals>
         </peripheral>
         <peripheral key="bod" name="BOD" module-key="bor_lvd_ctrl_v1">
@@ -98,34 +98,34 @@
         <peripheral key="ccl" name="CCL" module-key="cla_ccl_v1">
             <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"/>
-                <signal pad-id="pa2" index="2" function="CCL_IN" group="LUT0_IN"/>
-                <signal pad-id="pa6" index="0" function="CCL_ALT" group="LUT0_OUT" field="PORTMUX.CCLROUTEA.LUT0"/>
-                <signal pad-id="pa3" index="0" function="CCL" group="LUT0_OUT" field="PORTMUX.CCLROUTEA.LUT0"/>
-                <signal pad-id="pc0" index="0" function="CCL_IN" group="LUT1_IN"/>
-                <signal pad-id="pc1" index="1" function="CCL_IN" group="LUT1_IN"/>
-                <signal pad-id="pc2" index="2" function="CCL_IN" group="LUT1_IN"/>
-                <signal pad-id="pc3" index="0" function="CCL" group="LUT1_OUT" field="PORTMUX.CCLROUTEA.LUT1"/>
-                <signal pad-id="pd1" index="1" function="CCL_IN" group="LUT2_IN"/>
-                <signal pad-id="pd2" index="2" function="CCL_IN" group="LUT2_IN"/>
-                <signal pad-id="pd6" index="0" function="CCL_ALT" group="LUT2_OUT" field="PORTMUX.CCLROUTEA.LUT2"/>
-                <signal pad-id="pd3" index="0" function="CCL" group="LUT2_OUT" field="PORTMUX.CCLROUTEA.LUT2"/>
-                <signal pad-id="pf0" index="0" function="CCL_IN" group="LUT3_IN"/>
-                <signal pad-id="pf1" index="1" function="CCL_IN" group="LUT3_IN"/>
-                <signal pad-id="pf2" index="2" function="CCL_IN" group="LUT3_IN"/>
-                <signal pad-id="pf3" index="0" function="CCL" group="LUT3_OUT" field="PORTMUX.CCLROUTEA.LUT3"/>
+                <signal pad-key="pa0" index="0" function="CCL_IN" group="LUT0_IN"/>
+                <signal pad-key="pa1" index="1" function="CCL_IN" group="LUT0_IN"/>
+                <signal pad-key="pa2" index="2" function="CCL_IN" group="LUT0_IN"/>
+                <signal pad-key="pa6" index="0" function="CCL_ALT" group="LUT0_OUT" field="PORTMUX.CCLROUTEA.LUT0"/>
+                <signal pad-key="pa3" index="0" function="CCL" group="LUT0_OUT" field="PORTMUX.CCLROUTEA.LUT0"/>
+                <signal pad-key="pc0" index="0" function="CCL_IN" group="LUT1_IN"/>
+                <signal pad-key="pc1" index="1" function="CCL_IN" group="LUT1_IN"/>
+                <signal pad-key="pc2" index="2" function="CCL_IN" group="LUT1_IN"/>
+                <signal pad-key="pc3" index="0" function="CCL" group="LUT1_OUT" field="PORTMUX.CCLROUTEA.LUT1"/>
+                <signal pad-key="pd1" index="1" function="CCL_IN" group="LUT2_IN"/>
+                <signal pad-key="pd2" index="2" function="CCL_IN" group="LUT2_IN"/>
+                <signal pad-key="pd6" index="0" function="CCL_ALT" group="LUT2_OUT" field="PORTMUX.CCLROUTEA.LUT2"/>
+                <signal pad-key="pd3" index="0" function="CCL" group="LUT2_OUT" field="PORTMUX.CCLROUTEA.LUT2"/>
+                <signal pad-key="pf0" index="0" function="CCL_IN" group="LUT3_IN"/>
+                <signal pad-key="pf1" index="1" function="CCL_IN" group="LUT3_IN"/>
+                <signal pad-key="pf2" index="2" function="CCL_IN" group="LUT3_IN"/>
+                <signal pad-key="pf3" index="0" function="CCL" group="LUT3_OUT" field="PORTMUX.CCLROUTEA.LUT3"/>
             </signals>
         </peripheral>
         <peripheral key="clkctrl" name="CLKCTRL" module-key="chip_clkctrl">
             <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"/>
-                <signal pad-id="pf0" function="CLKCTRL" group="XTAL32K1"/>
-                <signal pad-id="pf1" function="CLKCTRL" group="XTAL32K2"/>
-                <signal pad-id="pa0" function="CLKCTRL" group="XTALHF1"/>
-                <signal pad-id="pa1" function="CLKCTRL" group="XTALHF2"/>
+                <signal pad-key="pa7" function="CLKCTRL" group="CLKOUT"/>
+                <signal pad-key="pa0" function="CLKCTRL" group="EXTCLK"/>
+                <signal pad-key="pf0" function="CLKCTRL" group="XTAL32K1"/>
+                <signal pad-key="pf1" function="CLKCTRL" group="XTAL32K2"/>
+                <signal pad-key="pa0" function="CLKCTRL" group="XTALHF1"/>
+                <signal pad-key="pa1" function="CLKCTRL" group="XTALHF2"/>
             </signals>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="cpu_avr_xt_v1">
@@ -140,18 +140,18 @@
         <peripheral key="dac0" name="DAC0" module-key="dac_nbit_ctrl_v5">
             <register-group-instance register-group-key="dac" address-space-key="data" offset="0x6A0"/>
             <signals>
-                <signal pad-id="pd6" index="0" function="DAC0" group="OUT"/>
+                <signal pad-key="pd6" index="0" function="DAC0" group="OUT"/>
             </signals>
         </peripheral>
         <peripheral key="evsys" name="EVSYS" module-key="chip_evsys">
             <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"/>
-                <signal pad-id="pc2" index="2" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTC"/>
-                <signal pad-id="pd7" index="3" function="EVSYS_ALT" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTD"/>
-                <signal pad-id="pd2" index="3" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTD"/>
-                <signal pad-id="pf2" index="5" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTF"/>
+                <signal pad-key="pa7" index="0" function="EVSYS_ALT" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTA"/>
+                <signal pad-key="pa2" index="0" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTA"/>
+                <signal pad-key="pc2" index="2" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTC"/>
+                <signal pad-key="pd7" index="3" function="EVSYS_ALT" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTD"/>
+                <signal pad-key="pd2" index="3" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTD"/>
+                <signal pad-key="pf2" index="5" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTF"/>
             </signals>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="chip_fuse">
@@ -172,58 +172,58 @@
         <peripheral key="opamp" name="OPAMP" module-key="amp_opamp_ctrl_avr_v1">
             <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"/>
-                <signal pad-id="pd2" function="OPAMP" group="OP0OUT"/>
-                <signal pad-id="pd7" function="OPAMP" group="OP1INN"/>
-                <signal pad-id="pd4" function="OPAMP" group="OP1INP"/>
-                <signal pad-id="pd5" function="OPAMP" group="OP1OUT"/>
+                <signal pad-key="pd3" function="OPAMP" group="OP0INN"/>
+                <signal pad-key="pd1" function="OPAMP" group="OP0INP"/>
+                <signal pad-key="pd2" function="OPAMP" group="OP0OUT"/>
+                <signal pad-key="pd7" function="OPAMP" group="OP1INN"/>
+                <signal pad-key="pd4" function="OPAMP" group="OP1INP"/>
+                <signal pad-key="pd5" function="OPAMP" group="OP1OUT"/>
             </signals>
         </peripheral>
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pa2" index="2" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa3" index="3" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa4" index="4" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa5" index="5" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa6" index="6" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa7" index="7" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa0" index="0" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa1" index="1" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa2" index="2" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa3" index="3" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa4" index="4" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa5" index="5" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa6" index="6" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa7" index="7" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pc2" index="2" function="IOPORT" group="PIN"/>
-                <signal pad-id="pc3" index="3" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc0" index="0" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc1" index="1" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc2" index="2" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc3" index="3" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pd3" index="3" function="IOPORT" group="PIN"/>
-                <signal pad-id="pd4" index="4" function="IOPORT" group="PIN"/>
-                <signal pad-id="pd5" index="5" function="IOPORT" group="PIN"/>
-                <signal pad-id="pd6" index="6" function="IOPORT" group="PIN"/>
-                <signal pad-id="pd7" index="7" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd1" index="1" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd2" index="2" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd3" index="3" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd4" index="4" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd5" index="5" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd6" index="6" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd7" index="7" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="portf" name="PORTF" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pf2" index="2" function="IOPORT" group="PIN"/>
-                <signal pad-id="pf3" index="3" function="IOPORT" group="PIN"/>
-                <signal pad-id="pf4" index="4" function="IOPORT" group="PIN"/>
-                <signal pad-id="pf5" index="5" function="IOPORT" group="PIN"/>
-                <signal pad-id="pf6" index="6" function="IOPORT" group="PIN"/>
+                <signal pad-key="pf0" index="0" function="IOPORT" group="PIN"/>
+                <signal pad-key="pf1" index="1" function="IOPORT" group="PIN"/>
+                <signal pad-key="pf2" index="2" function="IOPORT" group="PIN"/>
+                <signal pad-key="pf3" index="3" function="IOPORT" group="PIN"/>
+                <signal pad-key="pf4" index="4" function="IOPORT" group="PIN"/>
+                <signal pad-key="pf5" index="5" function="IOPORT" group="PIN"/>
+                <signal pad-key="pf6" index="6" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="portmux" name="PORTMUX" module-key="chip_portmux">
@@ -232,7 +232,7 @@
         <peripheral key="rstctrl" name="RSTCTRL" module-key="rst_integration_v8">
             <register-group-instance register-group-key="rstctrl" address-space-key="data" offset="0x40"/>
             <signals>
-                <signal pad-id="pf6" function="OTHER" group="RESET"/>
+                <signal pad-key="pf6" function="OTHER" group="RESET"/>
             </signals>
         </peripheral>
         <peripheral key="rtc" name="RTC" module-key="tmr_16b_rtc_v1">
@@ -247,19 +247,19 @@
         <peripheral key="spi0" name="SPI0" module-key="spi_8bit_v2">
             <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"/>
-                <signal pad-id="pa6" function="SPI0" group="SCK" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <signal pad-id="pa7" function="SPI0" group="SS" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pa5" function="SPI0" group="MISO" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pa4" function="SPI0" group="MOSI" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pa6" function="SPI0" group="SCK" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pa7" function="SPI0" group="SS" field="PORTMUX.SPIROUTEA.SPI0"/>
             </signals>
         </peripheral>
         <peripheral key="spi1" name="SPI1" module-key="spi_8bit_v2">
             <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"/>
-                <signal pad-id="pc2" function="SPI1" group="SCK" field="PORTMUX.SPIROUTEA.SPI1"/>
-                <signal pad-id="pc3" function="SPI1" group="SS" field="PORTMUX.SPIROUTEA.SPI1"/>
+                <signal pad-key="pc1" function="SPI1" group="MISO" field="PORTMUX.SPIROUTEA.SPI1"/>
+                <signal pad-key="pc0" function="SPI1" group="MOSI" field="PORTMUX.SPIROUTEA.SPI1"/>
+                <signal pad-key="pc2" function="SPI1" group="SCK" field="PORTMUX.SPIROUTEA.SPI1"/>
+                <signal pad-key="pc3" function="SPI1" group="SS" field="PORTMUX.SPIROUTEA.SPI1"/>
             </signals>
         </peripheral>
         <peripheral key="syscfg" name="SYSCFG" module-key="chip_syscfg">
@@ -268,109 +268,109 @@
         <peripheral key="tca0" name="TCA0" module-key="tmr_16b_pwm_v1">
             <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"/>
-                <signal pad-id="pa0" index="0" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pf1" index="1" function="TCA0_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pd1" index="1" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pc1" index="1" function="TCA0_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pa1" index="1" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pf2" index="2" function="TCA0_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pd2" index="2" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pc2" index="2" function="TCA0_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pa2" index="2" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pf3" index="3" function="TCA0_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pd3" index="3" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pc3" index="3" function="TCA0_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pa3" index="3" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pf4" index="4" function="TCA0_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pd4" index="4" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pa4" index="4" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pf5" index="5" function="TCA0_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pd5" index="5" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pa5" index="5" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pf0" index="0" function="TCA0_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pc0" index="0" function="TCA0_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pa0" index="0" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pf1" index="1" function="TCA0_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pd1" index="1" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pc1" index="1" function="TCA0_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pa1" index="1" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pf2" index="2" function="TCA0_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pd2" index="2" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pc2" index="2" function="TCA0_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pa2" index="2" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pf3" index="3" function="TCA0_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pd3" index="3" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pc3" index="3" function="TCA0_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pa3" index="3" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pf4" index="4" function="TCA0_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pd4" index="4" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pa4" index="4" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pf5" index="5" function="TCA0_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pd5" index="5" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pa5" index="5" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
             </signals>
         </peripheral>
         <peripheral key="tcb0" name="TCB0" module-key="tmr_16b_capture_v1">
             <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"/>
+                <signal pad-key="pf4" index="0" function="TCB0_ALT" group="WO" field="PORTMUX.TCBROUTEA.TCB0"/>
+                <signal pad-key="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 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"/>
+                <signal pad-key="pf5" index="0" function="TCB1_ALT" group="WO" field="PORTMUX.TCBROUTEA.TCB1"/>
+                <signal pad-key="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 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"/>
+                <signal pad-key="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 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"/>
-                <signal pad-id="pf1" index="1" function="TCD0_ALT2" group="WOB" field="PORTMUX.TCDROUTEA.TCD0"/>
-                <signal pad-id="pa5" index="1" function="TCD0" group="WOB" field="PORTMUX.TCDROUTEA.TCD0"/>
-                <signal pad-id="pf2" index="2" function="TCD0_ALT2" group="WOC" field="PORTMUX.TCDROUTEA.TCD0"/>
-                <signal pad-id="pa6" index="2" function="TCD0" group="WOC" field="PORTMUX.TCDROUTEA.TCD0"/>
-                <signal pad-id="pf3" index="3" function="TCD0_ALT2" group="WOD" field="PORTMUX.TCDROUTEA.TCD0"/>
-                <signal pad-id="pa7" index="3" function="TCD0" group="WOD" field="PORTMUX.TCDROUTEA.TCD0"/>
+                <signal pad-key="pf0" function="TCD0_ALT2" group="WOA" field="PORTMUX.TCDROUTEA.TCD0"/>
+                <signal pad-key="pa4" function="TCD0" group="WOA" field="PORTMUX.TCDROUTEA.TCD0"/>
+                <signal pad-key="pf1" index="1" function="TCD0_ALT2" group="WOB" field="PORTMUX.TCDROUTEA.TCD0"/>
+                <signal pad-key="pa5" index="1" function="TCD0" group="WOB" field="PORTMUX.TCDROUTEA.TCD0"/>
+                <signal pad-key="pf2" index="2" function="TCD0_ALT2" group="WOC" field="PORTMUX.TCDROUTEA.TCD0"/>
+                <signal pad-key="pa6" index="2" function="TCD0" group="WOC" field="PORTMUX.TCDROUTEA.TCD0"/>
+                <signal pad-key="pf3" index="3" function="TCD0_ALT2" group="WOD" field="PORTMUX.TCDROUTEA.TCD0"/>
+                <signal pad-key="pa7" index="3" function="TCD0" group="WOD" field="PORTMUX.TCDROUTEA.TCD0"/>
             </signals>
         </peripheral>
         <peripheral key="twi0" name="TWI0" module-key="i2c_8bit_v2">
             <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"/>
-                <signal pad-id="pc2" function="I2C0_ALT" group="SDA" field="PORTMUX.TWIROUTEA.TWI0"/>
-                <signal pad-id="pa2" function="I2C0" group="SDA" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pc3" function="I2C0_ALT" group="SCL" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pa3" function="I2C0" group="SCL" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pc2" function="I2C0_ALT" group="SDA" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pa2" function="I2C0" group="SDA" field="PORTMUX.TWIROUTEA.TWI0"/>
             </signals>
         </peripheral>
         <peripheral key="twi1" name="TWI1" module-key="i2c_8bit_v2">
             <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"/>
+                <signal pad-key="pf3" function="I2C1" group="SCL" field="PORTMUX.TWIROUTEA.TWI1"/>
+                <signal pad-key="pf2" function="I2C1" group="SDA" field="PORTMUX.TWIROUTEA.TWI1"/>
             </signals>
         </peripheral>
         <peripheral key="usart0" name="USART0" module-key="uart_autobd_v4">
             <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"/>
-                <signal pad-id="pa4" function="USART0_ALT" group="TXD" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pa0" function="USART0" group="TXD" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pa6" function="USART0_ALT" group="XCK" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pa2" function="USART0" group="XCK" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pa7" function="USART0_ALT" group="XDIR" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pa3" function="USART0" group="XDIR" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa5" function="USART0_ALT" group="RXD" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa1" function="USART0" group="RXD" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa4" function="USART0_ALT" group="TXD" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa0" function="USART0" group="TXD" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa6" function="USART0_ALT" group="XCK" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa2" function="USART0" group="XCK" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa7" function="USART0_ALT" group="XDIR" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa3" function="USART0" group="XDIR" field="PORTMUX.USARTROUTEA.USART0"/>
             </signals>
         </peripheral>
         <peripheral key="usart1" name="USART1" module-key="uart_autobd_v4">
             <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"/>
-                <signal pad-id="pc2" function="USART1" group="XCK" field="PORTMUX.USARTROUTEA.USART1"/>
-                <signal pad-id="pc3" function="USART1" group="XDIR" field="PORTMUX.USARTROUTEA.USART1"/>
+                <signal pad-key="pc1" function="USART1" group="RXD" field="PORTMUX.USARTROUTEA.USART1"/>
+                <signal pad-key="pc0" function="USART1" group="TXD" field="PORTMUX.USARTROUTEA.USART1"/>
+                <signal pad-key="pc2" function="USART1" group="XCK" field="PORTMUX.USARTROUTEA.USART1"/>
+                <signal pad-key="pc3" function="USART1" group="XDIR" field="PORTMUX.USARTROUTEA.USART1"/>
             </signals>
         </peripheral>
         <peripheral key="usart2" name="USART2" module-key="uart_autobd_v4">
             <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"/>
-                <signal pad-id="pf4" function="USART2_ALT" group="TXD" field="PORTMUX.USARTROUTEA.USART2"/>
-                <signal pad-id="pf0" function="USART2" group="TXD" field="PORTMUX.USARTROUTEA.USART2"/>
-                <signal pad-id="pf2" function="USART2" group="XCK" field="PORTMUX.USARTROUTEA.USART2"/>
-                <signal pad-id="pf3" function="USART2" group="XDIR" field="PORTMUX.USARTROUTEA.USART2"/>
+                <signal pad-key="pf5" function="USART2_ALT" group="RXD" field="PORTMUX.USARTROUTEA.USART2"/>
+                <signal pad-key="pf1" function="USART2" group="RXD" field="PORTMUX.USARTROUTEA.USART2"/>
+                <signal pad-key="pf4" function="USART2_ALT" group="TXD" field="PORTMUX.USARTROUTEA.USART2"/>
+                <signal pad-key="pf0" function="USART2" group="TXD" field="PORTMUX.USARTROUTEA.USART2"/>
+                <signal pad-key="pf2" function="USART2" group="XCK" field="PORTMUX.USARTROUTEA.USART2"/>
+                <signal pad-key="pf3" function="USART2" group="XDIR" field="PORTMUX.USARTROUTEA.USART2"/>
             </signals>
         </peripheral>
         <peripheral key="userrow" name="USERROW" module-key="chip_userrow">
@@ -397,8 +397,8 @@
         <peripheral key="zcd0" name="ZCD0" module-key="cmp_zxover_ctrl_v3">
             <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"/>
+                <signal pad-key="pd1" function="ZCD0" group="IN"/>
+                <signal pad-key="pa7" function="ZCD0" group="OUT" field="PORTMUX.ZCDROUTEA.ZCD0"/>
             </signals>
         </peripheral>
     </peripherals>
@@ -1738,43 +1738,77 @@
             </register-group>
         </module>
     </modules>
+    <pads>
+        <pad key="pa3" name="PA3"/>
+        <pad key="pa4" name="PA4"/>
+        <pad key="pa5" name="PA5"/>
+        <pad key="pa6" name="PA6"/>
+        <pad key="pa7" name="PA7"/>
+        <pad key="pc0" name="PC0"/>
+        <pad key="pc1" name="PC1"/>
+        <pad key="pc2" name="PC2"/>
+        <pad key="pc3" name="PC3"/>
+        <pad key="vddio2" name="VDDIO2"/>
+        <pad key="pd1" name="PD1"/>
+        <pad key="pd2" name="PD2"/>
+        <pad key="pd3" name="PD3"/>
+        <pad key="pd4" name="PD4"/>
+        <pad key="pd5" name="PD5"/>
+        <pad key="pd6" name="PD6"/>
+        <pad key="pd7" name="PD7"/>
+        <pad key="avdd" name="AVDD"/>
+        <pad key="agnd" name="AGND"/>
+        <pad key="pf0" name="PF0"/>
+        <pad key="pf1" name="PF1"/>
+        <pad key="pf2" name="PF2"/>
+        <pad key="pf3" name="PF3"/>
+        <pad key="pf4" name="PF4"/>
+        <pad key="pf5" name="PF5"/>
+        <pad key="pf6" name="PF6"/>
+        <pad key="updi" name="UPDI"/>
+        <pad key="vdd0" name="VDD0"/>
+        <pad key="gnd0" name="GND0"/>
+        <pad key="pa0" name="PA0"/>
+        <pad key="pa1" name="PA1"/>
+        <pad key="pa2" name="PA2"/>
+    </pads>
     <pinouts>
         <pinout key="qfn32" name="QFN32" type="qfn">
-            <pin position="1" pad="PA3"/>
-            <pin position="2" pad="PA4"/>
-            <pin position="3" pad="PA5"/>
-            <pin position="4" pad="PA6"/>
-            <pin position="5" pad="PA7"/>
-            <pin position="6" pad="PC0"/>
-            <pin position="7" pad="PC1"/>
-            <pin position="8" pad="PC2"/>
-            <pin position="9" pad="PC3"/>
-            <pin position="10" pad="VDDIO2"/>
-            <pin position="11" pad="PD1"/>
-            <pin position="12" pad="PD2"/>
-            <pin position="13" pad="PD3"/>
-            <pin position="14" pad="PD4"/>
-            <pin position="15" pad="PD5"/>
-            <pin position="16" pad="PD6"/>
-            <pin position="17" pad="PD7"/>
-            <pin position="18" pad="AVDD"/>
-            <pin position="19" pad="AGND"/>
-            <pin position="20" pad="PF0"/>
-            <pin position="21" pad="PF1"/>
-            <pin position="22" pad="PF2"/>
-            <pin position="23" pad="PF3"/>
-            <pin position="24" pad="PF4"/>
-            <pin position="25" pad="PF5"/>
-            <pin position="26" pad="PF6"/>
-            <pin position="27" pad="UPDI"/>
-            <pin position="28" pad="VDD0"/>
-            <pin position="29" pad="GND0"/>
-            <pin position="30" pad="PA0"/>
-            <pin position="31" pad="PA1"/>
-            <pin position="32" pad="PA2"/>
+            <pin position="1" pad-key="pa3"/>
+            <pin position="2" pad-key="pa4"/>
+            <pin position="3" pad-key="pa5"/>
+            <pin position="4" pad-key="pa6"/>
+            <pin position="5" pad-key="pa7"/>
+            <pin position="6" pad-key="pc0"/>
+            <pin position="7" pad-key="pc1"/>
+            <pin position="8" pad-key="pc2"/>
+            <pin position="9" pad-key="pc3"/>
+            <pin position="10" pad-key="vddio2"/>
+            <pin position="11" pad-key="pd1"/>
+            <pin position="12" pad-key="pd2"/>
+            <pin position="13" pad-key="pd3"/>
+            <pin position="14" pad-key="pd4"/>
+            <pin position="15" pad-key="pd5"/>
+            <pin position="16" pad-key="pd6"/>
+            <pin position="17" pad-key="pd7"/>
+            <pin position="18" pad-key="avdd"/>
+            <pin position="19" pad-key="agnd"/>
+            <pin position="20" pad-key="pf0"/>
+            <pin position="21" pad-key="pf1"/>
+            <pin position="22" pad-key="pf2"/>
+            <pin position="23" pad-key="pf3"/>
+            <pin position="24" pad-key="pf4"/>
+            <pin position="25" pad-key="pf5"/>
+            <pin position="26" pad-key="pf6"/>
+            <pin position="27" pad-key="updi"/>
+            <pin position="28" pad-key="vdd0"/>
+            <pin position="29" pad-key="gnd0"/>
+            <pin position="30" pad-key="pa0"/>
+            <pin position="31" pad-key="pa1"/>
+            <pin position="32" pad-key="pa2"/>
         </pinout>
     </pinouts>
     <variants>
-        <variant name="AVR128DB32" pinout-key="qfn32" package="QFN32"/>
+        <variant key="avr128db32" name="AVR128DB32" pinout-key="qfn32"/>
     </variants>
 </device>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR128DB48.xml b/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR128DB48.xml
index 7549d8df..361e2d96 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR128DB48.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR128DB48.xml
@@ -44,66 +44,66 @@
         <peripheral key="ac0" name="AC0" module-key="cmp_control_v8">
             <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"/>
-                <signal pad-id="pd7" index="2" function="AC0" group="N"/>
-                <signal pad-id="pc6" index="0" function="AC0_ALT" group="OUT" field="PORTMUX.ACROUTEA.AC0"/>
-                <signal pad-id="pa7" index="0" function="AC0" group="OUT" field="PORTMUX.ACROUTEA.AC0"/>
-                <signal pad-id="pd2" index="0" function="AC0" group="P"/>
-                <signal pad-id="pe0" index="1" function="AC0" group="P"/>
-                <signal pad-id="pe2" index="2" function="AC0" group="P"/>
-                <signal pad-id="pd6" index="3" function="AC0" group="P"/>
+                <signal pad-key="pd3" index="0" function="AC0" group="N"/>
+                <signal pad-key="pd0" index="1" function="AC0" group="N"/>
+                <signal pad-key="pd7" index="2" function="AC0" group="N"/>
+                <signal pad-key="pc6" index="0" function="AC0_ALT" group="OUT" field="PORTMUX.ACROUTEA.AC0"/>
+                <signal pad-key="pa7" index="0" function="AC0" group="OUT" field="PORTMUX.ACROUTEA.AC0"/>
+                <signal pad-key="pd2" index="0" function="AC0" group="P"/>
+                <signal pad-key="pe0" index="1" function="AC0" group="P"/>
+                <signal pad-key="pe2" index="2" function="AC0" group="P"/>
+                <signal pad-key="pd6" index="3" function="AC0" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="ac1" name="AC1" module-key="cmp_control_v8">
             <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"/>
-                <signal pad-id="pd7" index="2" function="AC1" group="N"/>
-                <signal pad-id="pc6" index="0" function="AC1_ALT" group="OUT" field="PORTMUX.ACROUTEA.AC1"/>
-                <signal pad-id="pa7" index="0" function="AC1" group="OUT" field="PORTMUX.ACROUTEA.AC1"/>
-                <signal pad-id="pd2" index="0" function="AC1" group="P"/>
-                <signal pad-id="pd3" index="1" function="AC1" group="P"/>
-                <signal pad-id="pd4" index="2" function="AC1" group="P"/>
-                <signal pad-id="pd6" index="3" function="AC1" group="P"/>
+                <signal pad-key="pd5" index="0" function="AC1" group="N"/>
+                <signal pad-key="pd0" index="1" function="AC1" group="N"/>
+                <signal pad-key="pd7" index="2" function="AC1" group="N"/>
+                <signal pad-key="pc6" index="0" function="AC1_ALT" group="OUT" field="PORTMUX.ACROUTEA.AC1"/>
+                <signal pad-key="pa7" index="0" function="AC1" group="OUT" field="PORTMUX.ACROUTEA.AC1"/>
+                <signal pad-key="pd2" index="0" function="AC1" group="P"/>
+                <signal pad-key="pd3" index="1" function="AC1" group="P"/>
+                <signal pad-key="pd4" index="2" function="AC1" group="P"/>
+                <signal pad-key="pd6" index="3" function="AC1" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="ac2" name="AC2" module-key="cmp_control_v8">
             <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"/>
-                <signal pad-id="pd7" index="2" function="AC2" group="N"/>
-                <signal pad-id="pc6" index="0" function="AC2_ALT" group="OUT" field="PORTMUX.ACROUTEA.AC2"/>
-                <signal pad-id="pa7" index="0" function="AC2" group="OUT" field="PORTMUX.ACROUTEA.AC2"/>
-                <signal pad-id="pd2" index="0" function="AC2" group="P"/>
-                <signal pad-id="pd4" index="1" function="AC2" group="P"/>
-                <signal pad-id="pe1" index="2" function="AC2" group="P"/>
-                <signal pad-id="pd6" index="3" function="AC2" group="P"/>
+                <signal pad-key="pd7" index="0" function="AC2" group="N"/>
+                <signal pad-key="pd0" index="1" function="AC2" group="N"/>
+                <signal pad-key="pd7" index="2" function="AC2" group="N"/>
+                <signal pad-key="pc6" index="0" function="AC2_ALT" group="OUT" field="PORTMUX.ACROUTEA.AC2"/>
+                <signal pad-key="pa7" index="0" function="AC2" group="OUT" field="PORTMUX.ACROUTEA.AC2"/>
+                <signal pad-key="pd2" index="0" function="AC2" group="P"/>
+                <signal pad-key="pd4" index="1" function="AC2" group="P"/>
+                <signal pad-key="pe1" index="2" function="AC2" group="P"/>
+                <signal pad-key="pd6" index="3" function="AC2" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="adc0" name="ADC0" module-key="adc_12b_diff_ctrl_v1">
             <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"/>
-                <signal pad-id="pd2" index="2" function="AIN0" group="AIN"/>
-                <signal pad-id="pd3" index="3" function="AIN0" group="AIN"/>
-                <signal pad-id="pd4" index="4" function="AIN0" group="AIN"/>
-                <signal pad-id="pd5" index="5" function="AIN0" group="AIN"/>
-                <signal pad-id="pd6" index="6" function="AIN0" group="AIN"/>
-                <signal pad-id="pd7" index="7" function="AIN0" group="AIN"/>
-                <signal pad-id="pe0" index="8" function="AIN0" group="AIN"/>
-                <signal pad-id="pe1" index="9" function="AIN0" group="AIN"/>
-                <signal pad-id="pe2" index="10" function="AIN0" group="AIN"/>
-                <signal pad-id="pe3" index="11" function="AIN0" group="AIN"/>
-                <signal pad-id="pf0" index="16" function="AIN0" group="AIN"/>
-                <signal pad-id="pf1" index="17" function="AIN0" group="AIN"/>
-                <signal pad-id="pf2" index="18" function="AIN0" group="AIN"/>
-                <signal pad-id="pf3" index="19" function="AIN0" group="AIN"/>
-                <signal pad-id="pf4" index="20" function="AIN0" group="AIN"/>
-                <signal pad-id="pf5" index="21" function="AIN0" group="AIN"/>
+                <signal pad-key="pd0" index="0" function="AIN0" group="AIN"/>
+                <signal pad-key="pd1" index="1" function="AIN0" group="AIN"/>
+                <signal pad-key="pd2" index="2" function="AIN0" group="AIN"/>
+                <signal pad-key="pd3" index="3" function="AIN0" group="AIN"/>
+                <signal pad-key="pd4" index="4" function="AIN0" group="AIN"/>
+                <signal pad-key="pd5" index="5" function="AIN0" group="AIN"/>
+                <signal pad-key="pd6" index="6" function="AIN0" group="AIN"/>
+                <signal pad-key="pd7" index="7" function="AIN0" group="AIN"/>
+                <signal pad-key="pe0" index="8" function="AIN0" group="AIN"/>
+                <signal pad-key="pe1" index="9" function="AIN0" group="AIN"/>
+                <signal pad-key="pe2" index="10" function="AIN0" group="AIN"/>
+                <signal pad-key="pe3" index="11" function="AIN0" group="AIN"/>
+                <signal pad-key="pf0" index="16" function="AIN0" group="AIN"/>
+                <signal pad-key="pf1" index="17" function="AIN0" group="AIN"/>
+                <signal pad-key="pf2" index="18" function="AIN0" group="AIN"/>
+                <signal pad-key="pf3" index="19" function="AIN0" group="AIN"/>
+                <signal pad-key="pf4" index="20" function="AIN0" group="AIN"/>
+                <signal pad-key="pf5" index="21" function="AIN0" group="AIN"/>
             </signals>
         </peripheral>
         <peripheral key="bod" name="BOD" module-key="bor_lvd_ctrl_v1">
@@ -112,40 +112,40 @@
         <peripheral key="ccl" name="CCL" module-key="cla_ccl_v1">
             <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"/>
-                <signal pad-id="pa2" index="2" function="CCL_IN" group="LUT0_IN"/>
-                <signal pad-id="pa6" index="0" function="CCL_ALT" group="LUT0_OUT" field="PORTMUX.CCLROUTEA.LUT0"/>
-                <signal pad-id="pa3" index="0" function="CCL" group="LUT0_OUT" field="PORTMUX.CCLROUTEA.LUT0"/>
-                <signal pad-id="pc0" index="0" function="CCL_IN" group="LUT1_IN"/>
-                <signal pad-id="pc1" index="1" function="CCL_IN" group="LUT1_IN"/>
-                <signal pad-id="pc2" index="2" function="CCL_IN" group="LUT1_IN"/>
-                <signal pad-id="pc6" index="0" function="CCL_ALT" group="LUT1_OUT" field="PORTMUX.CCLROUTEA.LUT1"/>
-                <signal pad-id="pc3" index="0" function="CCL" group="LUT1_OUT" field="PORTMUX.CCLROUTEA.LUT1"/>
-                <signal pad-id="pd0" index="0" function="CCL_IN" group="LUT2_IN"/>
-                <signal pad-id="pd1" index="1" function="CCL_IN" group="LUT2_IN"/>
-                <signal pad-id="pd2" index="2" function="CCL_IN" group="LUT2_IN"/>
-                <signal pad-id="pd6" index="0" function="CCL_ALT" group="LUT2_OUT" field="PORTMUX.CCLROUTEA.LUT2"/>
-                <signal pad-id="pd3" index="0" function="CCL" group="LUT2_OUT" field="PORTMUX.CCLROUTEA.LUT2"/>
-                <signal pad-id="pf0" index="0" function="CCL_IN" group="LUT3_IN"/>
-                <signal pad-id="pf1" index="1" function="CCL_IN" group="LUT3_IN"/>
-                <signal pad-id="pf2" index="2" function="CCL_IN" group="LUT3_IN"/>
-                <signal pad-id="pf3" index="0" function="CCL" group="LUT3_OUT" field="PORTMUX.CCLROUTEA.LUT3"/>
-                <signal pad-id="pb0" index="0" function="CCL_IN" group="LUT4_IN"/>
-                <signal pad-id="pb1" index="1" function="CCL_IN" group="LUT4_IN"/>
-                <signal pad-id="pb2" index="2" function="CCL_IN" group="LUT4_IN"/>
-                <signal pad-id="pb3" index="0" function="CCL" group="LUT4_OUT" field="PORTMUX.CCLROUTEA.LUT4"/>
+                <signal pad-key="pa0" index="0" function="CCL_IN" group="LUT0_IN"/>
+                <signal pad-key="pa1" index="1" function="CCL_IN" group="LUT0_IN"/>
+                <signal pad-key="pa2" index="2" function="CCL_IN" group="LUT0_IN"/>
+                <signal pad-key="pa6" index="0" function="CCL_ALT" group="LUT0_OUT" field="PORTMUX.CCLROUTEA.LUT0"/>
+                <signal pad-key="pa3" index="0" function="CCL" group="LUT0_OUT" field="PORTMUX.CCLROUTEA.LUT0"/>
+                <signal pad-key="pc0" index="0" function="CCL_IN" group="LUT1_IN"/>
+                <signal pad-key="pc1" index="1" function="CCL_IN" group="LUT1_IN"/>
+                <signal pad-key="pc2" index="2" function="CCL_IN" group="LUT1_IN"/>
+                <signal pad-key="pc6" index="0" function="CCL_ALT" group="LUT1_OUT" field="PORTMUX.CCLROUTEA.LUT1"/>
+                <signal pad-key="pc3" index="0" function="CCL" group="LUT1_OUT" field="PORTMUX.CCLROUTEA.LUT1"/>
+                <signal pad-key="pd0" index="0" function="CCL_IN" group="LUT2_IN"/>
+                <signal pad-key="pd1" index="1" function="CCL_IN" group="LUT2_IN"/>
+                <signal pad-key="pd2" index="2" function="CCL_IN" group="LUT2_IN"/>
+                <signal pad-key="pd6" index="0" function="CCL_ALT" group="LUT2_OUT" field="PORTMUX.CCLROUTEA.LUT2"/>
+                <signal pad-key="pd3" index="0" function="CCL" group="LUT2_OUT" field="PORTMUX.CCLROUTEA.LUT2"/>
+                <signal pad-key="pf0" index="0" function="CCL_IN" group="LUT3_IN"/>
+                <signal pad-key="pf1" index="1" function="CCL_IN" group="LUT3_IN"/>
+                <signal pad-key="pf2" index="2" function="CCL_IN" group="LUT3_IN"/>
+                <signal pad-key="pf3" index="0" function="CCL" group="LUT3_OUT" field="PORTMUX.CCLROUTEA.LUT3"/>
+                <signal pad-key="pb0" index="0" function="CCL_IN" group="LUT4_IN"/>
+                <signal pad-key="pb1" index="1" function="CCL_IN" group="LUT4_IN"/>
+                <signal pad-key="pb2" index="2" function="CCL_IN" group="LUT4_IN"/>
+                <signal pad-key="pb3" index="0" function="CCL" group="LUT4_OUT" field="PORTMUX.CCLROUTEA.LUT4"/>
             </signals>
         </peripheral>
         <peripheral key="clkctrl" name="CLKCTRL" module-key="chip_clkctrl">
             <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"/>
-                <signal pad-id="pf0" function="CLKCTRL" group="XTAL32K1"/>
-                <signal pad-id="pf1" function="CLKCTRL" group="XTAL32K2"/>
-                <signal pad-id="pa0" function="CLKCTRL" group="XTALHF1"/>
-                <signal pad-id="pa1" function="CLKCTRL" group="XTALHF2"/>
+                <signal pad-key="pa7" function="CLKCTRL" group="CLKOUT"/>
+                <signal pad-key="pa0" function="CLKCTRL" group="EXTCLK"/>
+                <signal pad-key="pf0" function="CLKCTRL" group="XTAL32K1"/>
+                <signal pad-key="pf1" function="CLKCTRL" group="XTAL32K2"/>
+                <signal pad-key="pa0" function="CLKCTRL" group="XTALHF1"/>
+                <signal pad-key="pa1" function="CLKCTRL" group="XTALHF2"/>
             </signals>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="cpu_avr_xt_v1">
@@ -160,21 +160,21 @@
         <peripheral key="dac0" name="DAC0" module-key="dac_nbit_ctrl_v5">
             <register-group-instance register-group-key="dac" address-space-key="data" offset="0x6A0"/>
             <signals>
-                <signal pad-id="pd6" index="0" function="DAC0" group="OUT"/>
+                <signal pad-key="pd6" index="0" function="DAC0" group="OUT"/>
             </signals>
         </peripheral>
         <peripheral key="evsys" name="EVSYS" module-key="chip_evsys">
             <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"/>
-                <signal pad-id="pb2" index="1" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTB"/>
-                <signal pad-id="pc7" index="2" function="EVSYS_ALT" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTC"/>
-                <signal pad-id="pc2" index="2" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTC"/>
-                <signal pad-id="pd7" index="3" function="EVSYS_ALT" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTD"/>
-                <signal pad-id="pd2" index="3" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTD"/>
-                <signal pad-id="pe2" index="4" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTE"/>
-                <signal pad-id="pf2" index="5" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTF"/>
+                <signal pad-key="pa7" index="0" function="EVSYS_ALT" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTA"/>
+                <signal pad-key="pa2" index="0" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTA"/>
+                <signal pad-key="pb2" index="1" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTB"/>
+                <signal pad-key="pc7" index="2" function="EVSYS_ALT" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTC"/>
+                <signal pad-key="pc2" index="2" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTC"/>
+                <signal pad-key="pd7" index="3" function="EVSYS_ALT" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTD"/>
+                <signal pad-key="pd2" index="3" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTD"/>
+                <signal pad-key="pe2" index="4" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTE"/>
+                <signal pad-key="pf2" index="5" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTF"/>
             </signals>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="chip_fuse">
@@ -195,86 +195,86 @@
         <peripheral key="opamp" name="OPAMP" module-key="amp_opamp_ctrl_avr_v1">
             <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"/>
-                <signal pad-id="pd2" function="OPAMP" group="OP0OUT"/>
-                <signal pad-id="pd7" function="OPAMP" group="OP1INN"/>
-                <signal pad-id="pd4" function="OPAMP" group="OP1INP"/>
-                <signal pad-id="pd5" function="OPAMP" group="OP1OUT"/>
-                <signal pad-id="pe3" function="OPAMP" group="OP2INN"/>
-                <signal pad-id="pe1" function="OPAMP" group="OP2INP"/>
-                <signal pad-id="pe2" function="OPAMP" group="OP2OUT"/>
+                <signal pad-key="pd3" function="OPAMP" group="OP0INN"/>
+                <signal pad-key="pd1" function="OPAMP" group="OP0INP"/>
+                <signal pad-key="pd2" function="OPAMP" group="OP0OUT"/>
+                <signal pad-key="pd7" function="OPAMP" group="OP1INN"/>
+                <signal pad-key="pd4" function="OPAMP" group="OP1INP"/>
+                <signal pad-key="pd5" function="OPAMP" group="OP1OUT"/>
+                <signal pad-key="pe3" function="OPAMP" group="OP2INN"/>
+                <signal pad-key="pe1" function="OPAMP" group="OP2INP"/>
+                <signal pad-key="pe2" function="OPAMP" group="OP2OUT"/>
             </signals>
         </peripheral>
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pa2" index="2" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa3" index="3" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa4" index="4" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa5" index="5" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa6" index="6" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa7" index="7" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa0" index="0" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa1" index="1" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa2" index="2" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa3" index="3" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa4" index="4" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa5" index="5" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa6" index="6" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa7" index="7" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pb2" index="2" function="IOPORT" group="PIN"/>
-                <signal pad-id="pb3" index="3" function="IOPORT" group="PIN"/>
-                <signal pad-id="pb4" index="4" function="IOPORT" group="PIN"/>
-                <signal pad-id="pb5" index="5" function="IOPORT" group="PIN"/>
+                <signal pad-key="pb0" index="0" function="IOPORT" group="PIN"/>
+                <signal pad-key="pb1" index="1" function="IOPORT" group="PIN"/>
+                <signal pad-key="pb2" index="2" function="IOPORT" group="PIN"/>
+                <signal pad-key="pb3" index="3" function="IOPORT" group="PIN"/>
+                <signal pad-key="pb4" index="4" function="IOPORT" group="PIN"/>
+                <signal pad-key="pb5" index="5" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pc2" index="2" function="IOPORT" group="PIN"/>
-                <signal pad-id="pc3" index="3" function="IOPORT" group="PIN"/>
-                <signal pad-id="pc4" index="4" function="IOPORT" group="PIN"/>
-                <signal pad-id="pc5" index="5" function="IOPORT" group="PIN"/>
-                <signal pad-id="pc6" index="6" function="IOPORT" group="PIN"/>
-                <signal pad-id="pc7" index="7" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc0" index="0" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc1" index="1" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc2" index="2" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc3" index="3" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc4" index="4" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc5" index="5" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc6" index="6" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc7" index="7" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pd2" index="2" function="IOPORT" group="PIN"/>
-                <signal pad-id="pd3" index="3" function="IOPORT" group="PIN"/>
-                <signal pad-id="pd4" index="4" function="IOPORT" group="PIN"/>
-                <signal pad-id="pd5" index="5" function="IOPORT" group="PIN"/>
-                <signal pad-id="pd6" index="6" function="IOPORT" group="PIN"/>
-                <signal pad-id="pd7" index="7" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd0" index="0" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd1" index="1" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd2" index="2" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd3" index="3" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd4" index="4" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd5" index="5" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd6" index="6" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd7" index="7" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="porte" name="PORTE" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pe2" index="2" function="IOPORT" group="PIN"/>
-                <signal pad-id="pe3" index="3" function="IOPORT" group="PIN"/>
+                <signal pad-key="pe0" index="0" function="IOPORT" group="PIN"/>
+                <signal pad-key="pe1" index="1" function="IOPORT" group="PIN"/>
+                <signal pad-key="pe2" index="2" function="IOPORT" group="PIN"/>
+                <signal pad-key="pe3" index="3" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="portf" name="PORTF" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pf2" index="2" function="IOPORT" group="PIN"/>
-                <signal pad-id="pf3" index="3" function="IOPORT" group="PIN"/>
-                <signal pad-id="pf4" index="4" function="IOPORT" group="PIN"/>
-                <signal pad-id="pf5" index="5" function="IOPORT" group="PIN"/>
-                <signal pad-id="pf6" index="6" function="IOPORT" group="PIN"/>
+                <signal pad-key="pf0" index="0" function="IOPORT" group="PIN"/>
+                <signal pad-key="pf1" index="1" function="IOPORT" group="PIN"/>
+                <signal pad-key="pf2" index="2" function="IOPORT" group="PIN"/>
+                <signal pad-key="pf3" index="3" function="IOPORT" group="PIN"/>
+                <signal pad-key="pf4" index="4" function="IOPORT" group="PIN"/>
+                <signal pad-key="pf5" index="5" function="IOPORT" group="PIN"/>
+                <signal pad-key="pf6" index="6" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="portmux" name="PORTMUX" module-key="chip_portmux">
@@ -283,7 +283,7 @@
         <peripheral key="rstctrl" name="RSTCTRL" module-key="rst_integration_v8">
             <register-group-instance register-group-key="rstctrl" address-space-key="data" offset="0x40"/>
             <signals>
-                <signal pad-id="pf6" function="OTHER" group="RESET"/>
+                <signal pad-key="pf6" function="OTHER" group="RESET"/>
             </signals>
         </peripheral>
         <peripheral key="rtc" name="RTC" module-key="tmr_16b_rtc_v1">
@@ -298,29 +298,29 @@
         <peripheral key="spi0" name="SPI0" module-key="spi_8bit_v2">
             <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"/>
-                <signal pad-id="pe0" function="SPI0_ALT" group="MOSI" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <signal pad-id="pa4" function="SPI0" group="MOSI" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <signal pad-id="pe2" function="SPI0_ALT" group="SCK" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <signal pad-id="pa6" function="SPI0" group="SCK" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <signal pad-id="pe3" function="SPI0_ALT" group="SS" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <signal pad-id="pa7" function="SPI0" group="SS" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pe1" function="SPI0_ALT" group="MISO" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pa5" function="SPI0" group="MISO" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pe0" function="SPI0_ALT" group="MOSI" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pa4" function="SPI0" group="MOSI" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pe2" function="SPI0_ALT" group="SCK" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pa6" function="SPI0" group="SCK" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pe3" function="SPI0_ALT" group="SS" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pa7" function="SPI0" group="SS" field="PORTMUX.SPIROUTEA.SPI0"/>
             </signals>
         </peripheral>
         <peripheral key="spi1" name="SPI1" module-key="spi_8bit_v2">
             <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"/>
-                <signal pad-id="pc1" function="SPI1" group="MISO" field="PORTMUX.SPIROUTEA.SPI1"/>
-                <signal pad-id="pc4" function="SPI1_ALT2" group="MOSI" field="PORTMUX.SPIROUTEA.SPI1"/>
-                <signal pad-id="pb4" function="SPI1_ALT" group="MOSI" field="PORTMUX.SPIROUTEA.SPI1"/>
-                <signal pad-id="pc0" function="SPI1" group="MOSI" field="PORTMUX.SPIROUTEA.SPI1"/>
-                <signal pad-id="pc6" function="SPI1_ALT2" group="SCK" field="PORTMUX.SPIROUTEA.SPI1"/>
-                <signal pad-id="pc2" function="SPI1" group="SCK" field="PORTMUX.SPIROUTEA.SPI1"/>
-                <signal pad-id="pc7" function="SPI1_ALT2" group="SS" field="PORTMUX.SPIROUTEA.SPI1"/>
-                <signal pad-id="pc3" function="SPI1" group="SS" field="PORTMUX.SPIROUTEA.SPI1"/>
+                <signal pad-key="pc5" function="SPI1_ALT2" group="MISO" field="PORTMUX.SPIROUTEA.SPI1"/>
+                <signal pad-key="pb5" function="SPI1_ALT" group="MISO" field="PORTMUX.SPIROUTEA.SPI1"/>
+                <signal pad-key="pc1" function="SPI1" group="MISO" field="PORTMUX.SPIROUTEA.SPI1"/>
+                <signal pad-key="pc4" function="SPI1_ALT2" group="MOSI" field="PORTMUX.SPIROUTEA.SPI1"/>
+                <signal pad-key="pb4" function="SPI1_ALT" group="MOSI" field="PORTMUX.SPIROUTEA.SPI1"/>
+                <signal pad-key="pc0" function="SPI1" group="MOSI" field="PORTMUX.SPIROUTEA.SPI1"/>
+                <signal pad-key="pc6" function="SPI1_ALT2" group="SCK" field="PORTMUX.SPIROUTEA.SPI1"/>
+                <signal pad-key="pc2" function="SPI1" group="SCK" field="PORTMUX.SPIROUTEA.SPI1"/>
+                <signal pad-key="pc7" function="SPI1_ALT2" group="SS" field="PORTMUX.SPIROUTEA.SPI1"/>
+                <signal pad-key="pc3" function="SPI1" group="SS" field="PORTMUX.SPIROUTEA.SPI1"/>
             </signals>
         </peripheral>
         <peripheral key="syscfg" name="SYSCFG" module-key="chip_syscfg">
@@ -329,174 +329,174 @@
         <peripheral key="tca0" name="TCA0" module-key="tmr_16b_pwm_v1">
             <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"/>
-                <signal pad-id="pd0" index="0" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pc0" index="0" function="TCA0_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pb0" index="0" function="TCA0_ALT" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pa0" index="0" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pf1" index="1" function="TCA0_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pe1" index="1" function="TCA0_ALT4" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pd1" index="1" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pc1" index="1" function="TCA0_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pb1" index="1" function="TCA0_ALT" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pa1" index="1" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pf2" index="2" function="TCA0_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pe2" index="2" function="TCA0_ALT4" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pd2" index="2" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pc2" index="2" function="TCA0_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pb2" index="2" function="TCA0_ALT" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pa2" index="2" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pf3" index="3" function="TCA0_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pe3" index="3" function="TCA0_ALT4" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pd3" index="3" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pc3" index="3" function="TCA0_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pb3" index="3" function="TCA0_ALT" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pa3" index="3" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pf4" index="4" function="TCA0_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pd4" index="4" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pc4" index="4" function="TCA0_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pb4" index="4" function="TCA0_ALT" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pa4" index="4" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pf5" index="5" function="TCA0_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pd5" index="5" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pc5" index="5" function="TCA0_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pb5" index="5" function="TCA0_ALT" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pa5" index="5" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pf0" index="0" function="TCA0_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pe0" index="0" function="TCA0_ALT4" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pd0" index="0" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pc0" index="0" function="TCA0_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pb0" index="0" function="TCA0_ALT" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pa0" index="0" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pf1" index="1" function="TCA0_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pe1" index="1" function="TCA0_ALT4" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pd1" index="1" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pc1" index="1" function="TCA0_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pb1" index="1" function="TCA0_ALT" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pa1" index="1" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pf2" index="2" function="TCA0_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pe2" index="2" function="TCA0_ALT4" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pd2" index="2" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pc2" index="2" function="TCA0_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pb2" index="2" function="TCA0_ALT" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pa2" index="2" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pf3" index="3" function="TCA0_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pe3" index="3" function="TCA0_ALT4" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pd3" index="3" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pc3" index="3" function="TCA0_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pb3" index="3" function="TCA0_ALT" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pa3" index="3" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pf4" index="4" function="TCA0_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pd4" index="4" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pc4" index="4" function="TCA0_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pb4" index="4" function="TCA0_ALT" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pa4" index="4" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pf5" index="5" function="TCA0_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pd5" index="5" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pc5" index="5" function="TCA0_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pb5" index="5" function="TCA0_ALT" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pa5" index="5" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
             </signals>
         </peripheral>
         <peripheral key="tca1" name="TCA1" module-key="tmr_16b_pwm_v1">
             <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"/>
-                <signal pad-id="pc5" index="1" function="TCA1_ALT" group="WO" field="PORTMUX.TCAROUTEA.TCA1"/>
-                <signal pad-id="pb1" index="1" function="TCA1" group="WO" field="PORTMUX.TCAROUTEA.TCA1"/>
-                <signal pad-id="pc6" index="2" function="TCA1_ALT" group="WO" field="PORTMUX.TCAROUTEA.TCA1"/>
-                <signal pad-id="pb2" index="2" function="TCA1" group="WO" field="PORTMUX.TCAROUTEA.TCA1"/>
-                <signal pad-id="pb3" index="3" function="TCA1" group="WO" field="PORTMUX.TCAROUTEA.TCA1"/>
-                <signal pad-id="pb4" index="4" function="TCA1" group="WO" field="PORTMUX.TCAROUTEA.TCA1"/>
-                <signal pad-id="pb5" index="5" function="TCA1" group="WO" field="PORTMUX.TCAROUTEA.TCA1"/>
+                <signal pad-key="pc4" index="0" function="TCA1_ALT" group="WO" field="PORTMUX.TCAROUTEA.TCA1"/>
+                <signal pad-key="pb0" index="0" function="TCA1" group="WO" field="PORTMUX.TCAROUTEA.TCA1"/>
+                <signal pad-key="pc5" index="1" function="TCA1_ALT" group="WO" field="PORTMUX.TCAROUTEA.TCA1"/>
+                <signal pad-key="pb1" index="1" function="TCA1" group="WO" field="PORTMUX.TCAROUTEA.TCA1"/>
+                <signal pad-key="pc6" index="2" function="TCA1_ALT" group="WO" field="PORTMUX.TCAROUTEA.TCA1"/>
+                <signal pad-key="pb2" index="2" function="TCA1" group="WO" field="PORTMUX.TCAROUTEA.TCA1"/>
+                <signal pad-key="pb3" index="3" function="TCA1" group="WO" field="PORTMUX.TCAROUTEA.TCA1"/>
+                <signal pad-key="pb4" index="4" function="TCA1" group="WO" field="PORTMUX.TCAROUTEA.TCA1"/>
+                <signal pad-key="pb5" index="5" function="TCA1" group="WO" field="PORTMUX.TCAROUTEA.TCA1"/>
             </signals>
         </peripheral>
         <peripheral key="tcb0" name="TCB0" module-key="tmr_16b_capture_v1">
             <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"/>
+                <signal pad-key="pf4" index="0" function="TCB0_ALT" group="WO" field="PORTMUX.TCBROUTEA.TCB0"/>
+                <signal pad-key="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 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"/>
+                <signal pad-key="pf5" index="0" function="TCB1_ALT" group="WO" field="PORTMUX.TCBROUTEA.TCB1"/>
+                <signal pad-key="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 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"/>
+                <signal pad-key="pb4" index="0" function="TCB2_ALT" group="WO" field="PORTMUX.TCBROUTEA.TCB2"/>
+                <signal pad-key="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 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"/>
+                <signal pad-key="pc1" index="0" function="TCB3_ALT" group="WO" field="PORTMUX.TCBROUTEA.TCB3"/>
+                <signal pad-key="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 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"/>
-                <signal pad-id="pa4" function="TCD0" group="WOA" field="PORTMUX.TCDROUTEA.TCD0"/>
-                <signal pad-id="pf1" index="1" function="TCD0_ALT2" group="WOB" field="PORTMUX.TCDROUTEA.TCD0"/>
-                <signal pad-id="pb5" index="1" function="TCD0_ALT" group="WOB" field="PORTMUX.TCDROUTEA.TCD0"/>
-                <signal pad-id="pa5" index="1" function="TCD0" group="WOB" field="PORTMUX.TCDROUTEA.TCD0"/>
-                <signal pad-id="pf2" index="2" function="TCD0_ALT2" group="WOC" field="PORTMUX.TCDROUTEA.TCD0"/>
-                <signal pad-id="pa6" index="2" function="TCD0" group="WOC" field="PORTMUX.TCDROUTEA.TCD0"/>
-                <signal pad-id="pf3" index="3" function="TCD0_ALT2" group="WOD" field="PORTMUX.TCDROUTEA.TCD0"/>
-                <signal pad-id="pa7" index="3" function="TCD0" group="WOD" field="PORTMUX.TCDROUTEA.TCD0"/>
+                <signal pad-key="pf0" function="TCD0_ALT2" group="WOA" field="PORTMUX.TCDROUTEA.TCD0"/>
+                <signal pad-key="pb4" function="TCD0_ALT" group="WOA" field="PORTMUX.TCDROUTEA.TCD0"/>
+                <signal pad-key="pa4" function="TCD0" group="WOA" field="PORTMUX.TCDROUTEA.TCD0"/>
+                <signal pad-key="pf1" index="1" function="TCD0_ALT2" group="WOB" field="PORTMUX.TCDROUTEA.TCD0"/>
+                <signal pad-key="pb5" index="1" function="TCD0_ALT" group="WOB" field="PORTMUX.TCDROUTEA.TCD0"/>
+                <signal pad-key="pa5" index="1" function="TCD0" group="WOB" field="PORTMUX.TCDROUTEA.TCD0"/>
+                <signal pad-key="pf2" index="2" function="TCD0_ALT2" group="WOC" field="PORTMUX.TCDROUTEA.TCD0"/>
+                <signal pad-key="pa6" index="2" function="TCD0" group="WOC" field="PORTMUX.TCDROUTEA.TCD0"/>
+                <signal pad-key="pf3" index="3" function="TCD0_ALT2" group="WOD" field="PORTMUX.TCDROUTEA.TCD0"/>
+                <signal pad-key="pa7" index="3" function="TCD0" group="WOD" field="PORTMUX.TCDROUTEA.TCD0"/>
             </signals>
         </peripheral>
         <peripheral key="twi0" name="TWI0" module-key="i2c_8bit_v2">
             <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"/>
-                <signal pad-id="pa3" function="I2C0" group="SCL" field="PORTMUX.TWIROUTEA.TWI0"/>
-                <signal pad-id="pc6" function="I2C0_ALT2" group="SDA" field="PORTMUX.TWIROUTEA.TWI0"/>
-                <signal pad-id="pc2" function="I2C0_ALT" group="SDA" field="PORTMUX.TWIROUTEA.TWI0"/>
-                <signal pad-id="pa2" function="I2C0" group="SDA" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pc7" function="I2C0_ALT2" group="SCL" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pc3" function="I2C0_ALT" group="SCL" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pa3" function="I2C0" group="SCL" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pc6" function="I2C0_ALT2" group="SDA" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pc2" function="I2C0_ALT" group="SDA" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pa2" function="I2C0" group="SDA" field="PORTMUX.TWIROUTEA.TWI0"/>
             </signals>
         </peripheral>
         <peripheral key="twi1" name="TWI1" module-key="i2c_8bit_v2">
             <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"/>
-                <signal pad-id="pb2" function="I2C1_ALT" group="SDA" field="PORTMUX.TWIROUTEA.TWI1"/>
-                <signal pad-id="pf2" function="I2C1" group="SDA" field="PORTMUX.TWIROUTEA.TWI1"/>
+                <signal pad-key="pb3" function="I2C1_ALT" group="SCL" field="PORTMUX.TWIROUTEA.TWI1"/>
+                <signal pad-key="pf3" function="I2C1" group="SCL" field="PORTMUX.TWIROUTEA.TWI1"/>
+                <signal pad-key="pb2" function="I2C1_ALT" group="SDA" field="PORTMUX.TWIROUTEA.TWI1"/>
+                <signal pad-key="pf2" function="I2C1" group="SDA" field="PORTMUX.TWIROUTEA.TWI1"/>
             </signals>
         </peripheral>
         <peripheral key="usart0" name="USART0" module-key="uart_autobd_v4">
             <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"/>
-                <signal pad-id="pa4" function="USART0_ALT" group="TXD" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pa0" function="USART0" group="TXD" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pa6" function="USART0_ALT" group="XCK" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pa2" function="USART0" group="XCK" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pa7" function="USART0_ALT" group="XDIR" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pa3" function="USART0" group="XDIR" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa5" function="USART0_ALT" group="RXD" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa1" function="USART0" group="RXD" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa4" function="USART0_ALT" group="TXD" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa0" function="USART0" group="TXD" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa6" function="USART0_ALT" group="XCK" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa2" function="USART0" group="XCK" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa7" function="USART0_ALT" group="XDIR" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa3" function="USART0" group="XDIR" field="PORTMUX.USARTROUTEA.USART0"/>
             </signals>
         </peripheral>
         <peripheral key="usart1" name="USART1" module-key="uart_autobd_v4">
             <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"/>
-                <signal pad-id="pc4" function="USART1_ALT" group="TXD" field="PORTMUX.USARTROUTEA.USART1"/>
-                <signal pad-id="pc0" function="USART1" group="TXD" field="PORTMUX.USARTROUTEA.USART1"/>
-                <signal pad-id="pc6" function="USART1_ALT" group="XCK" field="PORTMUX.USARTROUTEA.USART1"/>
-                <signal pad-id="pc2" function="USART1" group="XCK" field="PORTMUX.USARTROUTEA.USART1"/>
-                <signal pad-id="pc7" function="USART1_ALT" group="XDIR" field="PORTMUX.USARTROUTEA.USART1"/>
-                <signal pad-id="pc3" function="USART1" group="XDIR" field="PORTMUX.USARTROUTEA.USART1"/>
+                <signal pad-key="pc5" function="USART1_ALT" group="RXD" field="PORTMUX.USARTROUTEA.USART1"/>
+                <signal pad-key="pc1" function="USART1" group="RXD" field="PORTMUX.USARTROUTEA.USART1"/>
+                <signal pad-key="pc4" function="USART1_ALT" group="TXD" field="PORTMUX.USARTROUTEA.USART1"/>
+                <signal pad-key="pc0" function="USART1" group="TXD" field="PORTMUX.USARTROUTEA.USART1"/>
+                <signal pad-key="pc6" function="USART1_ALT" group="XCK" field="PORTMUX.USARTROUTEA.USART1"/>
+                <signal pad-key="pc2" function="USART1" group="XCK" field="PORTMUX.USARTROUTEA.USART1"/>
+                <signal pad-key="pc7" function="USART1_ALT" group="XDIR" field="PORTMUX.USARTROUTEA.USART1"/>
+                <signal pad-key="pc3" function="USART1" group="XDIR" field="PORTMUX.USARTROUTEA.USART1"/>
             </signals>
         </peripheral>
         <peripheral key="usart2" name="USART2" module-key="uart_autobd_v4">
             <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"/>
-                <signal pad-id="pf4" function="USART2_ALT" group="TXD" field="PORTMUX.USARTROUTEA.USART2"/>
-                <signal pad-id="pf0" function="USART2" group="TXD" field="PORTMUX.USARTROUTEA.USART2"/>
-                <signal pad-id="pf2" function="USART2" group="XCK" field="PORTMUX.USARTROUTEA.USART2"/>
-                <signal pad-id="pf3" function="USART2" group="XDIR" field="PORTMUX.USARTROUTEA.USART2"/>
+                <signal pad-key="pf5" function="USART2_ALT" group="RXD" field="PORTMUX.USARTROUTEA.USART2"/>
+                <signal pad-key="pf1" function="USART2" group="RXD" field="PORTMUX.USARTROUTEA.USART2"/>
+                <signal pad-key="pf4" function="USART2_ALT" group="TXD" field="PORTMUX.USARTROUTEA.USART2"/>
+                <signal pad-key="pf0" function="USART2" group="TXD" field="PORTMUX.USARTROUTEA.USART2"/>
+                <signal pad-key="pf2" function="USART2" group="XCK" field="PORTMUX.USARTROUTEA.USART2"/>
+                <signal pad-key="pf3" function="USART2" group="XDIR" field="PORTMUX.USARTROUTEA.USART2"/>
             </signals>
         </peripheral>
         <peripheral key="usart3" name="USART3" module-key="uart_autobd_v4">
             <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"/>
-                <signal pad-id="pb4" function="USART3_ALT" group="TXD" field="PORTMUX.USARTROUTEA.USART3"/>
-                <signal pad-id="pb0" function="USART3" group="TXD" field="PORTMUX.USARTROUTEA.USART3"/>
-                <signal pad-id="pb2" function="USART3" group="XCK" field="PORTMUX.USARTROUTEA.USART3"/>
-                <signal pad-id="pb3" function="USART3" group="XDIR" field="PORTMUX.USARTROUTEA.USART3"/>
+                <signal pad-key="pb5" function="USART3_ALT" group="RXD" field="PORTMUX.USARTROUTEA.USART3"/>
+                <signal pad-key="pb1" function="USART3" group="RXD" field="PORTMUX.USARTROUTEA.USART3"/>
+                <signal pad-key="pb4" function="USART3_ALT" group="TXD" field="PORTMUX.USARTROUTEA.USART3"/>
+                <signal pad-key="pb0" function="USART3" group="TXD" field="PORTMUX.USARTROUTEA.USART3"/>
+                <signal pad-key="pb2" function="USART3" group="XCK" field="PORTMUX.USARTROUTEA.USART3"/>
+                <signal pad-key="pb3" function="USART3" group="XDIR" field="PORTMUX.USARTROUTEA.USART3"/>
             </signals>
         </peripheral>
         <peripheral key="usart4" name="USART4" module-key="uart_autobd_v4">
             <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"/>
-                <signal pad-id="pe2" function="USART4" group="XCK" field="PORTMUX.USARTROUTEB.USART4"/>
-                <signal pad-id="pe3" function="USART4" group="XDIR" field="PORTMUX.USARTROUTEB.USART4"/>
+                <signal pad-key="pe1" function="USART4" group="RXD" field="PORTMUX.USARTROUTEB.USART4"/>
+                <signal pad-key="pe0" function="USART4" group="TXD" field="PORTMUX.USARTROUTEB.USART4"/>
+                <signal pad-key="pe2" function="USART4" group="XCK" field="PORTMUX.USARTROUTEB.USART4"/>
+                <signal pad-key="pe3" function="USART4" group="XDIR" field="PORTMUX.USARTROUTEB.USART4"/>
             </signals>
         </peripheral>
         <peripheral key="userrow" name="USERROW" module-key="chip_userrow">
@@ -529,24 +529,24 @@
         <peripheral key="zcd0" name="ZCD0" module-key="cmp_zxover_ctrl_v3">
             <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"/>
-                <signal pad-id="pa7" function="ZCD0" group="OUT" field="PORTMUX.ZCDROUTEA.ZCD0"/>
+                <signal pad-key="pd1" function="ZCD0" group="IN"/>
+                <signal pad-key="pc7" function="ZCD0_ALT" group="OUT" field="PORTMUX.ZCDROUTEA.ZCD0"/>
+                <signal pad-key="pa7" function="ZCD0" group="OUT" field="PORTMUX.ZCDROUTEA.ZCD0"/>
             </signals>
         </peripheral>
         <peripheral key="zcd1" name="ZCD1" module-key="cmp_zxover_ctrl_v3">
             <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"/>
-                <signal pad-id="pa7" function="ZCD1" group="OUT" field="PORTMUX.ZCDROUTEA.ZCD1"/>
+                <signal pad-key="pe3" function="ZCD1" group="IN"/>
+                <signal pad-key="pc7" function="ZCD1_ALT" group="OUT" field="PORTMUX.ZCDROUTEA.ZCD1"/>
+                <signal pad-key="pa7" function="ZCD1" group="OUT" field="PORTMUX.ZCDROUTEA.ZCD1"/>
             </signals>
         </peripheral>
         <peripheral key="zcd2" name="ZCD2" module-key="cmp_zxover_ctrl_v3">
             <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"/>
+                <signal pad-key="pc7" function="ZCD2_ALT" group="OUT" field="PORTMUX.ZCDROUTEA.ZCD2"/>
+                <signal pad-key="pa7" function="ZCD2" group="OUT" field="PORTMUX.ZCDROUTEA.ZCD2"/>
             </signals>
         </peripheral>
     </peripherals>
@@ -2020,59 +2020,109 @@
             </register-group>
         </module>
     </modules>
+    <pads>
+        <pad key="pa5" name="PA5"/>
+        <pad key="pa6" name="PA6"/>
+        <pad key="pa7" name="PA7"/>
+        <pad key="pb0" name="PB0"/>
+        <pad key="pb1" name="PB1"/>
+        <pad key="pb2" name="PB2"/>
+        <pad key="pb3" name="PB3"/>
+        <pad key="pb4" name="PB4"/>
+        <pad key="pb5" name="PB5"/>
+        <pad key="pc0" name="PC0"/>
+        <pad key="pc1" name="PC1"/>
+        <pad key="pc2" name="PC2"/>
+        <pad key="pc3" name="PC3"/>
+        <pad key="vddio2" name="VDDIO2"/>
+        <pad key="gnd0" name="GND0"/>
+        <pad key="pc4" name="PC4"/>
+        <pad key="pc5" name="PC5"/>
+        <pad key="pc6" name="PC6"/>
+        <pad key="pc7" name="PC7"/>
+        <pad key="pd0" name="PD0"/>
+        <pad key="pd1" name="PD1"/>
+        <pad key="pd2" name="PD2"/>
+        <pad key="pd3" name="PD3"/>
+        <pad key="pd4" name="PD4"/>
+        <pad key="pd5" name="PD5"/>
+        <pad key="pd6" name="PD6"/>
+        <pad key="pd7" name="PD7"/>
+        <pad key="avdd" name="AVDD"/>
+        <pad key="agnd" name="AGND"/>
+        <pad key="pe0" name="PE0"/>
+        <pad key="pe1" name="PE1"/>
+        <pad key="pe2" name="PE2"/>
+        <pad key="pe3" name="PE3"/>
+        <pad key="pf0" name="PF0"/>
+        <pad key="pf1" name="PF1"/>
+        <pad key="pf2" name="PF2"/>
+        <pad key="pf3" name="PF3"/>
+        <pad key="pf4" name="PF4"/>
+        <pad key="pf5" name="PF5"/>
+        <pad key="pf6" name="PF6"/>
+        <pad key="updi" name="UPDI"/>
+        <pad key="vdd" name="VDD"/>
+        <pad key="gnd2" name="GND2"/>
+        <pad key="pa0" name="PA0"/>
+        <pad key="pa1" name="PA1"/>
+        <pad key="pa2" name="PA2"/>
+        <pad key="pa3" name="PA3"/>
+        <pad key="pa4" name="PA4"/>
+    </pads>
     <pinouts>
         <pinout key="qfn48" name="QFN48" type="qfn">
-            <pin position="1" pad="PA5"/>
-            <pin position="2" pad="PA6"/>
-            <pin position="3" pad="PA7"/>
-            <pin position="4" pad="PB0"/>
-            <pin position="5" pad="PB1"/>
-            <pin position="6" pad="PB2"/>
-            <pin position="7" pad="PB3"/>
-            <pin position="8" pad="PB4"/>
-            <pin position="9" pad="PB5"/>
-            <pin position="10" pad="PC0"/>
-            <pin position="11" pad="PC1"/>
-            <pin position="12" pad="PC2"/>
-            <pin position="13" pad="PC3"/>
-            <pin position="14" pad="VDDIO2"/>
-            <pin position="15" pad="GND0"/>
-            <pin position="16" pad="PC4"/>
-            <pin position="17" pad="PC5"/>
-            <pin position="18" pad="PC6"/>
-            <pin position="19" pad="PC7"/>
-            <pin position="20" pad="PD0"/>
-            <pin position="21" pad="PD1"/>
-            <pin position="22" pad="PD2"/>
-            <pin position="23" pad="PD3"/>
-            <pin position="24" pad="PD4"/>
-            <pin position="25" pad="PD5"/>
-            <pin position="26" pad="PD6"/>
-            <pin position="27" pad="PD7"/>
-            <pin position="28" pad="AVDD"/>
-            <pin position="29" pad="AGND"/>
-            <pin position="30" pad="PE0"/>
-            <pin position="31" pad="PE1"/>
-            <pin position="32" pad="PE2"/>
-            <pin position="33" pad="PE3"/>
-            <pin position="34" pad="PF0"/>
-            <pin position="35" pad="PF1"/>
-            <pin position="36" pad="PF2"/>
-            <pin position="37" pad="PF3"/>
-            <pin position="38" pad="PF4"/>
-            <pin position="39" pad="PF5"/>
-            <pin position="40" pad="PF6"/>
-            <pin position="41" pad="UPDI"/>
-            <pin position="42" pad="VDD"/>
-            <pin position="43" pad="GND2"/>
-            <pin position="44" pad="PA0"/>
-            <pin position="45" pad="PA1"/>
-            <pin position="46" pad="PA2"/>
-            <pin position="47" pad="PA3"/>
-            <pin position="48" pad="PA4"/>
+            <pin position="1" pad-key="pa5"/>
+            <pin position="2" pad-key="pa6"/>
+            <pin position="3" pad-key="pa7"/>
+            <pin position="4" pad-key="pb0"/>
+            <pin position="5" pad-key="pb1"/>
+            <pin position="6" pad-key="pb2"/>
+            <pin position="7" pad-key="pb3"/>
+            <pin position="8" pad-key="pb4"/>
+            <pin position="9" pad-key="pb5"/>
+            <pin position="10" pad-key="pc0"/>
+            <pin position="11" pad-key="pc1"/>
+            <pin position="12" pad-key="pc2"/>
+            <pin position="13" pad-key="pc3"/>
+            <pin position="14" pad-key="vddio2"/>
+            <pin position="15" pad-key="gnd0"/>
+            <pin position="16" pad-key="pc4"/>
+            <pin position="17" pad-key="pc5"/>
+            <pin position="18" pad-key="pc6"/>
+            <pin position="19" pad-key="pc7"/>
+            <pin position="20" pad-key="pd0"/>
+            <pin position="21" pad-key="pd1"/>
+            <pin position="22" pad-key="pd2"/>
+            <pin position="23" pad-key="pd3"/>
+            <pin position="24" pad-key="pd4"/>
+            <pin position="25" pad-key="pd5"/>
+            <pin position="26" pad-key="pd6"/>
+            <pin position="27" pad-key="pd7"/>
+            <pin position="28" pad-key="avdd"/>
+            <pin position="29" pad-key="agnd"/>
+            <pin position="30" pad-key="pe0"/>
+            <pin position="31" pad-key="pe1"/>
+            <pin position="32" pad-key="pe2"/>
+            <pin position="33" pad-key="pe3"/>
+            <pin position="34" pad-key="pf0"/>
+            <pin position="35" pad-key="pf1"/>
+            <pin position="36" pad-key="pf2"/>
+            <pin position="37" pad-key="pf3"/>
+            <pin position="38" pad-key="pf4"/>
+            <pin position="39" pad-key="pf5"/>
+            <pin position="40" pad-key="pf6"/>
+            <pin position="41" pad-key="updi"/>
+            <pin position="42" pad-key="vdd"/>
+            <pin position="43" pad-key="gnd2"/>
+            <pin position="44" pad-key="pa0"/>
+            <pin position="45" pad-key="pa1"/>
+            <pin position="46" pad-key="pa2"/>
+            <pin position="47" pad-key="pa3"/>
+            <pin position="48" pad-key="pa4"/>
         </pinout>
     </pinouts>
     <variants>
-        <variant name="AVR128DB48" pinout-key="qfn48" package="QFN48"/>
+        <variant key="avr128db48" name="AVR128DB48" pinout-key="qfn48"/>
     </variants>
 </device>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR128DB64.xml b/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR128DB64.xml
index a5879114..a3b5bcfa 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR128DB64.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR128DB64.xml
@@ -44,70 +44,70 @@
         <peripheral key="ac0" name="AC0" module-key="cmp_control_v8">
             <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"/>
-                <signal pad-id="pd7" index="2" function="AC0" group="N"/>
-                <signal pad-id="pc6" index="0" function="AC0_ALT" group="OUT" field="PORTMUX.ACROUTEA.AC0"/>
-                <signal pad-id="pa7" index="0" function="AC0" group="OUT" field="PORTMUX.ACROUTEA.AC0"/>
-                <signal pad-id="pd2" index="0" function="AC0" group="P"/>
-                <signal pad-id="pe0" index="1" function="AC0" group="P"/>
-                <signal pad-id="pe2" index="2" function="AC0" group="P"/>
-                <signal pad-id="pd6" index="3" function="AC0" group="P"/>
+                <signal pad-key="pd3" index="0" function="AC0" group="N"/>
+                <signal pad-key="pd0" index="1" function="AC0" group="N"/>
+                <signal pad-key="pd7" index="2" function="AC0" group="N"/>
+                <signal pad-key="pc6" index="0" function="AC0_ALT" group="OUT" field="PORTMUX.ACROUTEA.AC0"/>
+                <signal pad-key="pa7" index="0" function="AC0" group="OUT" field="PORTMUX.ACROUTEA.AC0"/>
+                <signal pad-key="pd2" index="0" function="AC0" group="P"/>
+                <signal pad-key="pe0" index="1" function="AC0" group="P"/>
+                <signal pad-key="pe2" index="2" function="AC0" group="P"/>
+                <signal pad-key="pd6" index="3" function="AC0" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="ac1" name="AC1" module-key="cmp_control_v8">
             <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"/>
-                <signal pad-id="pd7" index="2" function="AC1" group="N"/>
-                <signal pad-id="pc6" index="0" function="AC1_ALT" group="OUT" field="PORTMUX.ACROUTEA.AC1"/>
-                <signal pad-id="pa7" index="0" function="AC1" group="OUT" field="PORTMUX.ACROUTEA.AC1"/>
-                <signal pad-id="pd2" index="0" function="AC1" group="P"/>
-                <signal pad-id="pd3" index="1" function="AC1" group="P"/>
-                <signal pad-id="pd4" index="2" function="AC1" group="P"/>
-                <signal pad-id="pd6" index="3" function="AC1" group="P"/>
+                <signal pad-key="pd5" index="0" function="AC1" group="N"/>
+                <signal pad-key="pd0" index="1" function="AC1" group="N"/>
+                <signal pad-key="pd7" index="2" function="AC1" group="N"/>
+                <signal pad-key="pc6" index="0" function="AC1_ALT" group="OUT" field="PORTMUX.ACROUTEA.AC1"/>
+                <signal pad-key="pa7" index="0" function="AC1" group="OUT" field="PORTMUX.ACROUTEA.AC1"/>
+                <signal pad-key="pd2" index="0" function="AC1" group="P"/>
+                <signal pad-key="pd3" index="1" function="AC1" group="P"/>
+                <signal pad-key="pd4" index="2" function="AC1" group="P"/>
+                <signal pad-key="pd6" index="3" function="AC1" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="ac2" name="AC2" module-key="cmp_control_v8">
             <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"/>
-                <signal pad-id="pd7" index="2" function="AC2" group="N"/>
-                <signal pad-id="pc6" index="0" function="AC2_ALT" group="OUT" field="PORTMUX.ACROUTEA.AC2"/>
-                <signal pad-id="pa7" index="0" function="AC2" group="OUT" field="PORTMUX.ACROUTEA.AC2"/>
-                <signal pad-id="pd2" index="0" function="AC2" group="P"/>
-                <signal pad-id="pd4" index="1" function="AC2" group="P"/>
-                <signal pad-id="pe1" index="2" function="AC2" group="P"/>
-                <signal pad-id="pd6" index="3" function="AC2" group="P"/>
+                <signal pad-key="pd7" index="0" function="AC2" group="N"/>
+                <signal pad-key="pd0" index="1" function="AC2" group="N"/>
+                <signal pad-key="pd7" index="2" function="AC2" group="N"/>
+                <signal pad-key="pc6" index="0" function="AC2_ALT" group="OUT" field="PORTMUX.ACROUTEA.AC2"/>
+                <signal pad-key="pa7" index="0" function="AC2" group="OUT" field="PORTMUX.ACROUTEA.AC2"/>
+                <signal pad-key="pd2" index="0" function="AC2" group="P"/>
+                <signal pad-key="pd4" index="1" function="AC2" group="P"/>
+                <signal pad-key="pe1" index="2" function="AC2" group="P"/>
+                <signal pad-key="pd6" index="3" function="AC2" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="adc0" name="ADC0" module-key="adc_12b_diff_ctrl_v1">
             <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"/>
-                <signal pad-id="pd2" index="2" function="AIN0" group="AIN"/>
-                <signal pad-id="pd3" index="3" function="AIN0" group="AIN"/>
-                <signal pad-id="pd4" index="4" function="AIN0" group="AIN"/>
-                <signal pad-id="pd5" index="5" function="AIN0" group="AIN"/>
-                <signal pad-id="pd6" index="6" function="AIN0" group="AIN"/>
-                <signal pad-id="pd7" index="7" function="AIN0" group="AIN"/>
-                <signal pad-id="pe0" index="8" function="AIN0" group="AIN"/>
-                <signal pad-id="pe1" index="9" function="AIN0" group="AIN"/>
-                <signal pad-id="pe2" index="10" function="AIN0" group="AIN"/>
-                <signal pad-id="pe3" index="11" function="AIN0" group="AIN"/>
-                <signal pad-id="pe4" index="12" function="AIN0" group="AIN"/>
-                <signal pad-id="pe5" index="13" function="AIN0" group="AIN"/>
-                <signal pad-id="pe6" index="14" function="AIN0" group="AIN"/>
-                <signal pad-id="pe7" index="15" function="AIN0" group="AIN"/>
-                <signal pad-id="pf0" index="16" function="AIN0" group="AIN"/>
-                <signal pad-id="pf1" index="17" function="AIN0" group="AIN"/>
-                <signal pad-id="pf2" index="18" function="AIN0" group="AIN"/>
-                <signal pad-id="pf3" index="19" function="AIN0" group="AIN"/>
-                <signal pad-id="pf4" index="20" function="AIN0" group="AIN"/>
-                <signal pad-id="pf5" index="21" function="AIN0" group="AIN"/>
+                <signal pad-key="pd0" index="0" function="AIN0" group="AIN"/>
+                <signal pad-key="pd1" index="1" function="AIN0" group="AIN"/>
+                <signal pad-key="pd2" index="2" function="AIN0" group="AIN"/>
+                <signal pad-key="pd3" index="3" function="AIN0" group="AIN"/>
+                <signal pad-key="pd4" index="4" function="AIN0" group="AIN"/>
+                <signal pad-key="pd5" index="5" function="AIN0" group="AIN"/>
+                <signal pad-key="pd6" index="6" function="AIN0" group="AIN"/>
+                <signal pad-key="pd7" index="7" function="AIN0" group="AIN"/>
+                <signal pad-key="pe0" index="8" function="AIN0" group="AIN"/>
+                <signal pad-key="pe1" index="9" function="AIN0" group="AIN"/>
+                <signal pad-key="pe2" index="10" function="AIN0" group="AIN"/>
+                <signal pad-key="pe3" index="11" function="AIN0" group="AIN"/>
+                <signal pad-key="pe4" index="12" function="AIN0" group="AIN"/>
+                <signal pad-key="pe5" index="13" function="AIN0" group="AIN"/>
+                <signal pad-key="pe6" index="14" function="AIN0" group="AIN"/>
+                <signal pad-key="pe7" index="15" function="AIN0" group="AIN"/>
+                <signal pad-key="pf0" index="16" function="AIN0" group="AIN"/>
+                <signal pad-key="pf1" index="17" function="AIN0" group="AIN"/>
+                <signal pad-key="pf2" index="18" function="AIN0" group="AIN"/>
+                <signal pad-key="pf3" index="19" function="AIN0" group="AIN"/>
+                <signal pad-key="pf4" index="20" function="AIN0" group="AIN"/>
+                <signal pad-key="pf5" index="21" function="AIN0" group="AIN"/>
             </signals>
         </peripheral>
         <peripheral key="bod" name="BOD" module-key="bor_lvd_ctrl_v1">
@@ -116,46 +116,46 @@
         <peripheral key="ccl" name="CCL" module-key="cla_ccl_v1">
             <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"/>
-                <signal pad-id="pa2" index="2" function="CCL_IN" group="LUT0_IN"/>
-                <signal pad-id="pa6" index="0" function="CCL_ALT" group="LUT0_OUT" field="PORTMUX.CCLROUTEA.LUT0"/>
-                <signal pad-id="pa3" index="0" function="CCL" group="LUT0_OUT" field="PORTMUX.CCLROUTEA.LUT0"/>
-                <signal pad-id="pc0" index="0" function="CCL_IN" group="LUT1_IN"/>
-                <signal pad-id="pc1" index="1" function="CCL_IN" group="LUT1_IN"/>
-                <signal pad-id="pc2" index="2" function="CCL_IN" group="LUT1_IN"/>
-                <signal pad-id="pc6" index="0" function="CCL_ALT" group="LUT1_OUT" field="PORTMUX.CCLROUTEA.LUT1"/>
-                <signal pad-id="pc3" index="0" function="CCL" group="LUT1_OUT" field="PORTMUX.CCLROUTEA.LUT1"/>
-                <signal pad-id="pd0" index="0" function="CCL_IN" group="LUT2_IN"/>
-                <signal pad-id="pd1" index="1" function="CCL_IN" group="LUT2_IN"/>
-                <signal pad-id="pd2" index="2" function="CCL_IN" group="LUT2_IN"/>
-                <signal pad-id="pd6" index="0" function="CCL_ALT" group="LUT2_OUT" field="PORTMUX.CCLROUTEA.LUT2"/>
-                <signal pad-id="pd3" index="0" function="CCL" group="LUT2_OUT" field="PORTMUX.CCLROUTEA.LUT2"/>
-                <signal pad-id="pf0" index="0" function="CCL_IN" group="LUT3_IN"/>
-                <signal pad-id="pf1" index="1" function="CCL_IN" group="LUT3_IN"/>
-                <signal pad-id="pf2" index="2" function="CCL_IN" group="LUT3_IN"/>
-                <signal pad-id="pf3" index="0" function="CCL" group="LUT3_OUT" field="PORTMUX.CCLROUTEA.LUT3"/>
-                <signal pad-id="pb0" index="0" function="CCL_IN" group="LUT4_IN"/>
-                <signal pad-id="pb1" index="1" function="CCL_IN" group="LUT4_IN"/>
-                <signal pad-id="pb2" index="2" function="CCL_IN" group="LUT4_IN"/>
-                <signal pad-id="pb6" index="0" function="CCL_ALT" group="LUT4_OUT" field="PORTMUX.CCLROUTEA.LUT4"/>
-                <signal pad-id="pb3" index="0" function="CCL" group="LUT4_OUT" field="PORTMUX.CCLROUTEA.LUT4"/>
-                <signal pad-id="pg0" index="0" function="CCL_IN" group="LUT5_IN"/>
-                <signal pad-id="pg1" index="1" function="CCL_IN" group="LUT5_IN"/>
-                <signal pad-id="pg2" index="2" function="CCL_IN" group="LUT5_IN"/>
-                <signal pad-id="pg6" index="0" function="CCL_ALT" group="LUT5_OUT" field="PORTMUX.CCLROUTEA.LUT5"/>
-                <signal pad-id="pg3" index="0" function="CCL" group="LUT5_OUT" field="PORTMUX.CCLROUTEA.LUT5"/>
+                <signal pad-key="pa0" index="0" function="CCL_IN" group="LUT0_IN"/>
+                <signal pad-key="pa1" index="1" function="CCL_IN" group="LUT0_IN"/>
+                <signal pad-key="pa2" index="2" function="CCL_IN" group="LUT0_IN"/>
+                <signal pad-key="pa6" index="0" function="CCL_ALT" group="LUT0_OUT" field="PORTMUX.CCLROUTEA.LUT0"/>
+                <signal pad-key="pa3" index="0" function="CCL" group="LUT0_OUT" field="PORTMUX.CCLROUTEA.LUT0"/>
+                <signal pad-key="pc0" index="0" function="CCL_IN" group="LUT1_IN"/>
+                <signal pad-key="pc1" index="1" function="CCL_IN" group="LUT1_IN"/>
+                <signal pad-key="pc2" index="2" function="CCL_IN" group="LUT1_IN"/>
+                <signal pad-key="pc6" index="0" function="CCL_ALT" group="LUT1_OUT" field="PORTMUX.CCLROUTEA.LUT1"/>
+                <signal pad-key="pc3" index="0" function="CCL" group="LUT1_OUT" field="PORTMUX.CCLROUTEA.LUT1"/>
+                <signal pad-key="pd0" index="0" function="CCL_IN" group="LUT2_IN"/>
+                <signal pad-key="pd1" index="1" function="CCL_IN" group="LUT2_IN"/>
+                <signal pad-key="pd2" index="2" function="CCL_IN" group="LUT2_IN"/>
+                <signal pad-key="pd6" index="0" function="CCL_ALT" group="LUT2_OUT" field="PORTMUX.CCLROUTEA.LUT2"/>
+                <signal pad-key="pd3" index="0" function="CCL" group="LUT2_OUT" field="PORTMUX.CCLROUTEA.LUT2"/>
+                <signal pad-key="pf0" index="0" function="CCL_IN" group="LUT3_IN"/>
+                <signal pad-key="pf1" index="1" function="CCL_IN" group="LUT3_IN"/>
+                <signal pad-key="pf2" index="2" function="CCL_IN" group="LUT3_IN"/>
+                <signal pad-key="pf3" index="0" function="CCL" group="LUT3_OUT" field="PORTMUX.CCLROUTEA.LUT3"/>
+                <signal pad-key="pb0" index="0" function="CCL_IN" group="LUT4_IN"/>
+                <signal pad-key="pb1" index="1" function="CCL_IN" group="LUT4_IN"/>
+                <signal pad-key="pb2" index="2" function="CCL_IN" group="LUT4_IN"/>
+                <signal pad-key="pb6" index="0" function="CCL_ALT" group="LUT4_OUT" field="PORTMUX.CCLROUTEA.LUT4"/>
+                <signal pad-key="pb3" index="0" function="CCL" group="LUT4_OUT" field="PORTMUX.CCLROUTEA.LUT4"/>
+                <signal pad-key="pg0" index="0" function="CCL_IN" group="LUT5_IN"/>
+                <signal pad-key="pg1" index="1" function="CCL_IN" group="LUT5_IN"/>
+                <signal pad-key="pg2" index="2" function="CCL_IN" group="LUT5_IN"/>
+                <signal pad-key="pg6" index="0" function="CCL_ALT" group="LUT5_OUT" field="PORTMUX.CCLROUTEA.LUT5"/>
+                <signal pad-key="pg3" index="0" function="CCL" group="LUT5_OUT" field="PORTMUX.CCLROUTEA.LUT5"/>
             </signals>
         </peripheral>
         <peripheral key="clkctrl" name="CLKCTRL" module-key="chip_clkctrl">
             <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"/>
-                <signal pad-id="pf0" function="CLKCTRL" group="XTAL32K1"/>
-                <signal pad-id="pf1" function="CLKCTRL" group="XTAL32K2"/>
-                <signal pad-id="pa0" function="CLKCTRL" group="XTALHF1"/>
-                <signal pad-id="pa1" function="CLKCTRL" group="XTALHF2"/>
+                <signal pad-key="pa7" function="CLKCTRL" group="CLKOUT"/>
+                <signal pad-key="pa0" function="CLKCTRL" group="EXTCLK"/>
+                <signal pad-key="pf0" function="CLKCTRL" group="XTAL32K1"/>
+                <signal pad-key="pf1" function="CLKCTRL" group="XTAL32K2"/>
+                <signal pad-key="pa0" function="CLKCTRL" group="XTALHF1"/>
+                <signal pad-key="pa1" function="CLKCTRL" group="XTALHF2"/>
             </signals>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="cpu_avr_xt_v1">
@@ -170,25 +170,25 @@
         <peripheral key="dac0" name="DAC0" module-key="dac_nbit_ctrl_v5">
             <register-group-instance register-group-key="dac" address-space-key="data" offset="0x6A0"/>
             <signals>
-                <signal pad-id="pd6" index="0" function="DAC0" group="OUT"/>
+                <signal pad-key="pd6" index="0" function="DAC0" group="OUT"/>
             </signals>
         </peripheral>
         <peripheral key="evsys" name="EVSYS" module-key="chip_evsys">
             <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"/>
-                <signal pad-id="pb7" index="1" function="EVSYS_ALT" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTB"/>
-                <signal pad-id="pb2" index="1" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTB"/>
-                <signal pad-id="pc7" index="2" function="EVSYS_ALT" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTC"/>
-                <signal pad-id="pc2" index="2" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTC"/>
-                <signal pad-id="pd7" index="3" function="EVSYS_ALT" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTD"/>
-                <signal pad-id="pd2" index="3" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTD"/>
-                <signal pad-id="pe7" index="4" function="EVSYS_ALT" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTE"/>
-                <signal pad-id="pe2" index="4" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTE"/>
-                <signal pad-id="pf2" index="5" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTF"/>
-                <signal pad-id="pg7" index="6" function="EVSYS_ALT" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTG"/>
-                <signal pad-id="pg2" index="6" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTG"/>
+                <signal pad-key="pa7" index="0" function="EVSYS_ALT" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTA"/>
+                <signal pad-key="pa2" index="0" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTA"/>
+                <signal pad-key="pb7" index="1" function="EVSYS_ALT" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTB"/>
+                <signal pad-key="pb2" index="1" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTB"/>
+                <signal pad-key="pc7" index="2" function="EVSYS_ALT" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTC"/>
+                <signal pad-key="pc2" index="2" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTC"/>
+                <signal pad-key="pd7" index="3" function="EVSYS_ALT" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTD"/>
+                <signal pad-key="pd2" index="3" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTD"/>
+                <signal pad-key="pe7" index="4" function="EVSYS_ALT" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTE"/>
+                <signal pad-key="pe2" index="4" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTE"/>
+                <signal pad-key="pf2" index="5" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTF"/>
+                <signal pad-key="pg7" index="6" function="EVSYS_ALT" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTG"/>
+                <signal pad-key="pg2" index="6" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTG"/>
             </signals>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="chip_fuse">
@@ -209,105 +209,105 @@
         <peripheral key="opamp" name="OPAMP" module-key="amp_opamp_ctrl_avr_v1">
             <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"/>
-                <signal pad-id="pd2" function="OPAMP" group="OP0OUT"/>
-                <signal pad-id="pd7" function="OPAMP" group="OP1INN"/>
-                <signal pad-id="pd4" function="OPAMP" group="OP1INP"/>
-                <signal pad-id="pd5" function="OPAMP" group="OP1OUT"/>
-                <signal pad-id="pe3" function="OPAMP" group="OP2INN"/>
-                <signal pad-id="pe1" function="OPAMP" group="OP2INP"/>
-                <signal pad-id="pe2" function="OPAMP" group="OP2OUT"/>
+                <signal pad-key="pd3" function="OPAMP" group="OP0INN"/>
+                <signal pad-key="pd1" function="OPAMP" group="OP0INP"/>
+                <signal pad-key="pd2" function="OPAMP" group="OP0OUT"/>
+                <signal pad-key="pd7" function="OPAMP" group="OP1INN"/>
+                <signal pad-key="pd4" function="OPAMP" group="OP1INP"/>
+                <signal pad-key="pd5" function="OPAMP" group="OP1OUT"/>
+                <signal pad-key="pe3" function="OPAMP" group="OP2INN"/>
+                <signal pad-key="pe1" function="OPAMP" group="OP2INP"/>
+                <signal pad-key="pe2" function="OPAMP" group="OP2OUT"/>
             </signals>
         </peripheral>
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pa2" index="2" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa3" index="3" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa4" index="4" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa5" index="5" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa6" index="6" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa7" index="7" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa0" index="0" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa1" index="1" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa2" index="2" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa3" index="3" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa4" index="4" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa5" index="5" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa6" index="6" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa7" index="7" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pb2" index="2" function="IOPORT" group="PIN"/>
-                <signal pad-id="pb3" index="3" function="IOPORT" group="PIN"/>
-                <signal pad-id="pb4" index="4" function="IOPORT" group="PIN"/>
-                <signal pad-id="pb5" index="5" function="IOPORT" group="PIN"/>
-                <signal pad-id="pb6" index="6" function="IOPORT" group="PIN"/>
-                <signal pad-id="pb7" index="7" function="IOPORT" group="PIN"/>
+                <signal pad-key="pb0" index="0" function="IOPORT" group="PIN"/>
+                <signal pad-key="pb1" index="1" function="IOPORT" group="PIN"/>
+                <signal pad-key="pb2" index="2" function="IOPORT" group="PIN"/>
+                <signal pad-key="pb3" index="3" function="IOPORT" group="PIN"/>
+                <signal pad-key="pb4" index="4" function="IOPORT" group="PIN"/>
+                <signal pad-key="pb5" index="5" function="IOPORT" group="PIN"/>
+                <signal pad-key="pb6" index="6" function="IOPORT" group="PIN"/>
+                <signal pad-key="pb7" index="7" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pc2" index="2" function="IOPORT" group="PIN"/>
-                <signal pad-id="pc3" index="3" function="IOPORT" group="PIN"/>
-                <signal pad-id="pc4" index="4" function="IOPORT" group="PIN"/>
-                <signal pad-id="pc5" index="5" function="IOPORT" group="PIN"/>
-                <signal pad-id="pc6" index="6" function="IOPORT" group="PIN"/>
-                <signal pad-id="pc7" index="7" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc0" index="0" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc1" index="1" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc2" index="2" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc3" index="3" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc4" index="4" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc5" index="5" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc6" index="6" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc7" index="7" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pd2" index="2" function="IOPORT" group="PIN"/>
-                <signal pad-id="pd3" index="3" function="IOPORT" group="PIN"/>
-                <signal pad-id="pd4" index="4" function="IOPORT" group="PIN"/>
-                <signal pad-id="pd5" index="5" function="IOPORT" group="PIN"/>
-                <signal pad-id="pd6" index="6" function="IOPORT" group="PIN"/>
-                <signal pad-id="pd7" index="7" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd0" index="0" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd1" index="1" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd2" index="2" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd3" index="3" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd4" index="4" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd5" index="5" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd6" index="6" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd7" index="7" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="porte" name="PORTE" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pe2" index="2" function="IOPORT" group="PIN"/>
-                <signal pad-id="pe3" index="3" function="IOPORT" group="PIN"/>
-                <signal pad-id="pe4" index="4" function="IOPORT" group="PIN"/>
-                <signal pad-id="pe5" index="5" function="IOPORT" group="PIN"/>
-                <signal pad-id="pe6" index="6" function="IOPORT" group="PIN"/>
-                <signal pad-id="pe7" index="7" function="IOPORT" group="PIN"/>
+                <signal pad-key="pe0" index="0" function="IOPORT" group="PIN"/>
+                <signal pad-key="pe1" index="1" function="IOPORT" group="PIN"/>
+                <signal pad-key="pe2" index="2" function="IOPORT" group="PIN"/>
+                <signal pad-key="pe3" index="3" function="IOPORT" group="PIN"/>
+                <signal pad-key="pe4" index="4" function="IOPORT" group="PIN"/>
+                <signal pad-key="pe5" index="5" function="IOPORT" group="PIN"/>
+                <signal pad-key="pe6" index="6" function="IOPORT" group="PIN"/>
+                <signal pad-key="pe7" index="7" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="portf" name="PORTF" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pf2" index="2" function="IOPORT" group="PIN"/>
-                <signal pad-id="pf3" index="3" function="IOPORT" group="PIN"/>
-                <signal pad-id="pf4" index="4" function="IOPORT" group="PIN"/>
-                <signal pad-id="pf5" index="5" function="IOPORT" group="PIN"/>
-                <signal pad-id="pf6" index="6" function="IOPORT" group="PIN"/>
+                <signal pad-key="pf0" index="0" function="IOPORT" group="PIN"/>
+                <signal pad-key="pf1" index="1" function="IOPORT" group="PIN"/>
+                <signal pad-key="pf2" index="2" function="IOPORT" group="PIN"/>
+                <signal pad-key="pf3" index="3" function="IOPORT" group="PIN"/>
+                <signal pad-key="pf4" index="4" function="IOPORT" group="PIN"/>
+                <signal pad-key="pf5" index="5" function="IOPORT" group="PIN"/>
+                <signal pad-key="pf6" index="6" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="portg" name="PORTG" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pg2" index="2" function="IOPORT" group="PIN"/>
-                <signal pad-id="pg3" index="3" function="IOPORT" group="PIN"/>
-                <signal pad-id="pg4" index="4" function="IOPORT" group="PIN"/>
-                <signal pad-id="pg5" index="5" function="IOPORT" group="PIN"/>
-                <signal pad-id="pg6" index="6" function="IOPORT" group="PIN"/>
-                <signal pad-id="pg7" index="7" function="IOPORT" group="PIN"/>
+                <signal pad-key="pg0" index="0" function="IOPORT" group="PIN"/>
+                <signal pad-key="pg1" index="1" function="IOPORT" group="PIN"/>
+                <signal pad-key="pg2" index="2" function="IOPORT" group="PIN"/>
+                <signal pad-key="pg3" index="3" function="IOPORT" group="PIN"/>
+                <signal pad-key="pg4" index="4" function="IOPORT" group="PIN"/>
+                <signal pad-key="pg5" index="5" function="IOPORT" group="PIN"/>
+                <signal pad-key="pg6" index="6" function="IOPORT" group="PIN"/>
+                <signal pad-key="pg7" index="7" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="portmux" name="PORTMUX" module-key="chip_portmux">
@@ -316,7 +316,7 @@
         <peripheral key="rstctrl" name="RSTCTRL" module-key="rst_integration_v8">
             <register-group-instance register-group-key="rstctrl" address-space-key="data" offset="0x40"/>
             <signals>
-                <signal pad-id="pf6" function="OTHER" group="RESET"/>
+                <signal pad-key="pf6" function="OTHER" group="RESET"/>
             </signals>
         </peripheral>
         <peripheral key="rtc" name="RTC" module-key="tmr_16b_rtc_v1">
@@ -331,35 +331,35 @@
         <peripheral key="spi0" name="SPI0" module-key="spi_8bit_v2">
             <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"/>
-                <signal pad-id="pa5" function="SPI0" group="MISO" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <signal pad-id="pg4" function="SPI0_ALT2" group="MOSI" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <signal pad-id="pe0" function="SPI0_ALT" group="MOSI" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <signal pad-id="pa4" function="SPI0" group="MOSI" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <signal pad-id="pg6" function="SPI0_ALT2" group="SCK" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <signal pad-id="pe2" function="SPI0_ALT" group="SCK" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <signal pad-id="pa6" function="SPI0" group="SCK" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <signal pad-id="pg7" function="SPI0_ALT2" group="SS" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <signal pad-id="pe3" function="SPI0_ALT" group="SS" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <signal pad-id="pa7" function="SPI0" group="SS" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pg5" function="SPI0_ALT2" group="MISO" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pe1" function="SPI0_ALT" group="MISO" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pa5" function="SPI0" group="MISO" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pg4" function="SPI0_ALT2" group="MOSI" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pe0" function="SPI0_ALT" group="MOSI" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pa4" function="SPI0" group="MOSI" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pg6" function="SPI0_ALT2" group="SCK" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pe2" function="SPI0_ALT" group="SCK" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pa6" function="SPI0" group="SCK" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pg7" function="SPI0_ALT2" group="SS" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pe3" function="SPI0_ALT" group="SS" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pa7" function="SPI0" group="SS" field="PORTMUX.SPIROUTEA.SPI0"/>
             </signals>
         </peripheral>
         <peripheral key="spi1" name="SPI1" module-key="spi_8bit_v2">
             <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"/>
-                <signal pad-id="pc1" function="SPI1" group="MISO" field="PORTMUX.SPIROUTEA.SPI1"/>
-                <signal pad-id="pc4" function="SPI1_ALT2" group="MOSI" field="PORTMUX.SPIROUTEA.SPI1"/>
-                <signal pad-id="pb4" function="SPI1_ALT" group="MOSI" field="PORTMUX.SPIROUTEA.SPI1"/>
-                <signal pad-id="pc0" function="SPI1" group="MOSI" field="PORTMUX.SPIROUTEA.SPI1"/>
-                <signal pad-id="pc6" function="SPI1_ALT2" group="SCK" field="PORTMUX.SPIROUTEA.SPI1"/>
-                <signal pad-id="pb6" function="SPI1_ALT" group="SCK" field="PORTMUX.SPIROUTEA.SPI1"/>
-                <signal pad-id="pc2" function="SPI1" group="SCK" field="PORTMUX.SPIROUTEA.SPI1"/>
-                <signal pad-id="pc7" function="SPI1_ALT2" group="SS" field="PORTMUX.SPIROUTEA.SPI1"/>
-                <signal pad-id="pb7" function="SPI1_ALT" group="SS" field="PORTMUX.SPIROUTEA.SPI1"/>
-                <signal pad-id="pc3" function="SPI1" group="SS" field="PORTMUX.SPIROUTEA.SPI1"/>
+                <signal pad-key="pc5" function="SPI1_ALT2" group="MISO" field="PORTMUX.SPIROUTEA.SPI1"/>
+                <signal pad-key="pb5" function="SPI1_ALT" group="MISO" field="PORTMUX.SPIROUTEA.SPI1"/>
+                <signal pad-key="pc1" function="SPI1" group="MISO" field="PORTMUX.SPIROUTEA.SPI1"/>
+                <signal pad-key="pc4" function="SPI1_ALT2" group="MOSI" field="PORTMUX.SPIROUTEA.SPI1"/>
+                <signal pad-key="pb4" function="SPI1_ALT" group="MOSI" field="PORTMUX.SPIROUTEA.SPI1"/>
+                <signal pad-key="pc0" function="SPI1" group="MOSI" field="PORTMUX.SPIROUTEA.SPI1"/>
+                <signal pad-key="pc6" function="SPI1_ALT2" group="SCK" field="PORTMUX.SPIROUTEA.SPI1"/>
+                <signal pad-key="pb6" function="SPI1_ALT" group="SCK" field="PORTMUX.SPIROUTEA.SPI1"/>
+                <signal pad-key="pc2" function="SPI1" group="SCK" field="PORTMUX.SPIROUTEA.SPI1"/>
+                <signal pad-key="pc7" function="SPI1_ALT2" group="SS" field="PORTMUX.SPIROUTEA.SPI1"/>
+                <signal pad-key="pb7" function="SPI1_ALT" group="SS" field="PORTMUX.SPIROUTEA.SPI1"/>
+                <signal pad-key="pc3" function="SPI1" group="SS" field="PORTMUX.SPIROUTEA.SPI1"/>
             </signals>
         </peripheral>
         <peripheral key="syscfg" name="SYSCFG" module-key="chip_syscfg">
@@ -368,225 +368,225 @@
         <peripheral key="tca0" name="TCA0" module-key="tmr_16b_pwm_v1">
             <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"/>
-                <signal pad-id="pe0" index="0" function="TCA0_ALT4" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pd0" index="0" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pc0" index="0" function="TCA0_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pb0" index="0" function="TCA0_ALT" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pa0" index="0" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pg1" index="1" function="TCA0_ALT6" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pf1" index="1" function="TCA0_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pe1" index="1" function="TCA0_ALT4" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pd1" index="1" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pc1" index="1" function="TCA0_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pb1" index="1" function="TCA0_ALT" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pa1" index="1" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pg2" index="2" function="TCA0_ALT6" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pf2" index="2" function="TCA0_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pe2" index="2" function="TCA0_ALT4" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pd2" index="2" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pc2" index="2" function="TCA0_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pb2" index="2" function="TCA0_ALT" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pa2" index="2" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pg3" index="3" function="TCA0_ALT6" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pf3" index="3" function="TCA0_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pe3" index="3" function="TCA0_ALT4" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pd3" index="3" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pc3" index="3" function="TCA0_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pb3" index="3" function="TCA0_ALT" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pa3" index="3" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pg4" index="4" function="TCA0_ALT6" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pf4" index="4" function="TCA0_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pe4" index="4" function="TCA0_ALT4" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pd4" index="4" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pc4" index="4" function="TCA0_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pb4" index="4" function="TCA0_ALT" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pa4" index="4" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pg5" index="5" function="TCA0_ALT6" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pf5" index="5" function="TCA0_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pe5" index="5" function="TCA0_ALT4" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pd5" index="5" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pc5" index="5" function="TCA0_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pb5" index="5" function="TCA0_ALT" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pa5" index="5" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pg0" index="0" function="TCA0_ALT6" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pf0" index="0" function="TCA0_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pe0" index="0" function="TCA0_ALT4" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pd0" index="0" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pc0" index="0" function="TCA0_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pb0" index="0" function="TCA0_ALT" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pa0" index="0" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pg1" index="1" function="TCA0_ALT6" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pf1" index="1" function="TCA0_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pe1" index="1" function="TCA0_ALT4" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pd1" index="1" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pc1" index="1" function="TCA0_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pb1" index="1" function="TCA0_ALT" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pa1" index="1" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pg2" index="2" function="TCA0_ALT6" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pf2" index="2" function="TCA0_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pe2" index="2" function="TCA0_ALT4" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pd2" index="2" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pc2" index="2" function="TCA0_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pb2" index="2" function="TCA0_ALT" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pa2" index="2" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pg3" index="3" function="TCA0_ALT6" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pf3" index="3" function="TCA0_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pe3" index="3" function="TCA0_ALT4" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pd3" index="3" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pc3" index="3" function="TCA0_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pb3" index="3" function="TCA0_ALT" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pa3" index="3" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pg4" index="4" function="TCA0_ALT6" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pf4" index="4" function="TCA0_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pe4" index="4" function="TCA0_ALT4" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pd4" index="4" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pc4" index="4" function="TCA0_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pb4" index="4" function="TCA0_ALT" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pa4" index="4" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pg5" index="5" function="TCA0_ALT6" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pf5" index="5" function="TCA0_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pe5" index="5" function="TCA0_ALT4" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pd5" index="5" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pc5" index="5" function="TCA0_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pb5" index="5" function="TCA0_ALT" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pa5" index="5" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
             </signals>
         </peripheral>
         <peripheral key="tca1" name="TCA1" module-key="tmr_16b_pwm_v1">
             <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"/>
-                <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"/>
-                <signal pad-id="pg1" index="1" function="TCA1_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA1"/>
-                <signal pad-id="pe5" index="1" function="TCA1_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA1"/>
-                <signal pad-id="pc5" index="1" function="TCA1_ALT" group="WO" field="PORTMUX.TCAROUTEA.TCA1"/>
-                <signal pad-id="pb1" index="1" function="TCA1" group="WO" field="PORTMUX.TCAROUTEA.TCA1"/>
-                <signal pad-id="pg2" index="2" function="TCA1_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA1"/>
-                <signal pad-id="pe6" index="2" function="TCA1_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA1"/>
-                <signal pad-id="pc6" index="2" function="TCA1_ALT" group="WO" field="PORTMUX.TCAROUTEA.TCA1"/>
-                <signal pad-id="pb2" index="2" function="TCA1" group="WO" field="PORTMUX.TCAROUTEA.TCA1"/>
-                <signal pad-id="pg3" index="3" function="TCA1_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA1"/>
-                <signal pad-id="pb3" index="3" function="TCA1" group="WO" field="PORTMUX.TCAROUTEA.TCA1"/>
-                <signal pad-id="pg4" index="4" function="TCA1_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA1"/>
-                <signal pad-id="pb4" index="4" function="TCA1" group="WO" field="PORTMUX.TCAROUTEA.TCA1"/>
-                <signal pad-id="pg5" index="5" function="TCA1_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA1"/>
-                <signal pad-id="pb5" index="5" function="TCA1" group="WO" field="PORTMUX.TCAROUTEA.TCA1"/>
+                <signal pad-key="pg0" index="0" function="TCA1_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA1"/>
+                <signal pad-key="pe4" index="0" function="TCA1_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA1"/>
+                <signal pad-key="pc4" index="0" function="TCA1_ALT" group="WO" field="PORTMUX.TCAROUTEA.TCA1"/>
+                <signal pad-key="pb0" index="0" function="TCA1" group="WO" field="PORTMUX.TCAROUTEA.TCA1"/>
+                <signal pad-key="pg1" index="1" function="TCA1_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA1"/>
+                <signal pad-key="pe5" index="1" function="TCA1_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA1"/>
+                <signal pad-key="pc5" index="1" function="TCA1_ALT" group="WO" field="PORTMUX.TCAROUTEA.TCA1"/>
+                <signal pad-key="pb1" index="1" function="TCA1" group="WO" field="PORTMUX.TCAROUTEA.TCA1"/>
+                <signal pad-key="pg2" index="2" function="TCA1_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA1"/>
+                <signal pad-key="pe6" index="2" function="TCA1_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA1"/>
+                <signal pad-key="pc6" index="2" function="TCA1_ALT" group="WO" field="PORTMUX.TCAROUTEA.TCA1"/>
+                <signal pad-key="pb2" index="2" function="TCA1" group="WO" field="PORTMUX.TCAROUTEA.TCA1"/>
+                <signal pad-key="pg3" index="3" function="TCA1_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA1"/>
+                <signal pad-key="pb3" index="3" function="TCA1" group="WO" field="PORTMUX.TCAROUTEA.TCA1"/>
+                <signal pad-key="pg4" index="4" function="TCA1_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA1"/>
+                <signal pad-key="pb4" index="4" function="TCA1" group="WO" field="PORTMUX.TCAROUTEA.TCA1"/>
+                <signal pad-key="pg5" index="5" function="TCA1_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA1"/>
+                <signal pad-key="pb5" index="5" function="TCA1" group="WO" field="PORTMUX.TCAROUTEA.TCA1"/>
             </signals>
         </peripheral>
         <peripheral key="tcb0" name="TCB0" module-key="tmr_16b_capture_v1">
             <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"/>
+                <signal pad-key="pf4" index="0" function="TCB0_ALT" group="WO" field="PORTMUX.TCBROUTEA.TCB0"/>
+                <signal pad-key="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 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"/>
+                <signal pad-key="pf5" index="0" function="TCB1_ALT" group="WO" field="PORTMUX.TCBROUTEA.TCB1"/>
+                <signal pad-key="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 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"/>
+                <signal pad-key="pb4" index="0" function="TCB2_ALT" group="WO" field="PORTMUX.TCBROUTEA.TCB2"/>
+                <signal pad-key="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 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"/>
+                <signal pad-key="pc1" index="0" function="TCB3_ALT" group="WO" field="PORTMUX.TCBROUTEA.TCB3"/>
+                <signal pad-key="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 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"/>
+                <signal pad-key="pc6" index="0" function="TCB4_ALT" group="WO" field="PORTMUX.TCBROUTEA.TCB4"/>
+                <signal pad-key="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 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"/>
-                <signal pad-id="pb4" function="TCD0_ALT" group="WOA" field="PORTMUX.TCDROUTEA.TCD0"/>
-                <signal pad-id="pa4" function="TCD0" group="WOA" field="PORTMUX.TCDROUTEA.TCD0"/>
-                <signal pad-id="pg5" index="1" function="TCD0_ALT3" group="WOB" field="PORTMUX.TCDROUTEA.TCD0"/>
-                <signal pad-id="pf1" index="1" function="TCD0_ALT2" group="WOB" field="PORTMUX.TCDROUTEA.TCD0"/>
-                <signal pad-id="pb5" index="1" function="TCD0_ALT" group="WOB" field="PORTMUX.TCDROUTEA.TCD0"/>
-                <signal pad-id="pa5" index="1" function="TCD0" group="WOB" field="PORTMUX.TCDROUTEA.TCD0"/>
-                <signal pad-id="pg6" index="2" function="TCD0_ALT3" group="WOC" field="PORTMUX.TCDROUTEA.TCD0"/>
-                <signal pad-id="pf2" index="2" function="TCD0_ALT2" group="WOC" field="PORTMUX.TCDROUTEA.TCD0"/>
-                <signal pad-id="pb6" index="2" function="TCD0_ALT" group="WOC" field="PORTMUX.TCDROUTEA.TCD0"/>
-                <signal pad-id="pa6" index="2" function="TCD0" group="WOC" field="PORTMUX.TCDROUTEA.TCD0"/>
-                <signal pad-id="pg7" index="3" function="TCD0_ALT3" group="WOD" field="PORTMUX.TCDROUTEA.TCD0"/>
-                <signal pad-id="pf3" index="3" function="TCD0_ALT2" group="WOD" field="PORTMUX.TCDROUTEA.TCD0"/>
-                <signal pad-id="pb7" index="3" function="TCD0_ALT" group="WOD" field="PORTMUX.TCDROUTEA.TCD0"/>
-                <signal pad-id="pa7" index="3" function="TCD0" group="WOD" field="PORTMUX.TCDROUTEA.TCD0"/>
+                <signal pad-key="pg4" function="TCD0_ALT3" group="WOA" field="PORTMUX.TCDROUTEA.TCD0"/>
+                <signal pad-key="pf0" function="TCD0_ALT2" group="WOA" field="PORTMUX.TCDROUTEA.TCD0"/>
+                <signal pad-key="pb4" function="TCD0_ALT" group="WOA" field="PORTMUX.TCDROUTEA.TCD0"/>
+                <signal pad-key="pa4" function="TCD0" group="WOA" field="PORTMUX.TCDROUTEA.TCD0"/>
+                <signal pad-key="pg5" index="1" function="TCD0_ALT3" group="WOB" field="PORTMUX.TCDROUTEA.TCD0"/>
+                <signal pad-key="pf1" index="1" function="TCD0_ALT2" group="WOB" field="PORTMUX.TCDROUTEA.TCD0"/>
+                <signal pad-key="pb5" index="1" function="TCD0_ALT" group="WOB" field="PORTMUX.TCDROUTEA.TCD0"/>
+                <signal pad-key="pa5" index="1" function="TCD0" group="WOB" field="PORTMUX.TCDROUTEA.TCD0"/>
+                <signal pad-key="pg6" index="2" function="TCD0_ALT3" group="WOC" field="PORTMUX.TCDROUTEA.TCD0"/>
+                <signal pad-key="pf2" index="2" function="TCD0_ALT2" group="WOC" field="PORTMUX.TCDROUTEA.TCD0"/>
+                <signal pad-key="pb6" index="2" function="TCD0_ALT" group="WOC" field="PORTMUX.TCDROUTEA.TCD0"/>
+                <signal pad-key="pa6" index="2" function="TCD0" group="WOC" field="PORTMUX.TCDROUTEA.TCD0"/>
+                <signal pad-key="pg7" index="3" function="TCD0_ALT3" group="WOD" field="PORTMUX.TCDROUTEA.TCD0"/>
+                <signal pad-key="pf3" index="3" function="TCD0_ALT2" group="WOD" field="PORTMUX.TCDROUTEA.TCD0"/>
+                <signal pad-key="pb7" index="3" function="TCD0_ALT" group="WOD" field="PORTMUX.TCDROUTEA.TCD0"/>
+                <signal pad-key="pa7" index="3" function="TCD0" group="WOD" field="PORTMUX.TCDROUTEA.TCD0"/>
             </signals>
         </peripheral>
         <peripheral key="twi0" name="TWI0" module-key="i2c_8bit_v2">
             <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"/>
-                <signal pad-id="pa3" function="I2C0" group="SCL" field="PORTMUX.TWIROUTEA.TWI0"/>
-                <signal pad-id="pc6" function="I2C0_ALT2" group="SDA" field="PORTMUX.TWIROUTEA.TWI0"/>
-                <signal pad-id="pc2" function="I2C0_ALT" group="SDA" field="PORTMUX.TWIROUTEA.TWI0"/>
-                <signal pad-id="pa2" function="I2C0" group="SDA" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pc7" function="I2C0_ALT2" group="SCL" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pc3" function="I2C0_ALT" group="SCL" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pa3" function="I2C0" group="SCL" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pc6" function="I2C0_ALT2" group="SDA" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pc2" function="I2C0_ALT" group="SDA" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pa2" function="I2C0" group="SDA" field="PORTMUX.TWIROUTEA.TWI0"/>
             </signals>
         </peripheral>
         <peripheral key="twi1" name="TWI1" module-key="i2c_8bit_v2">
             <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"/>
-                <signal pad-id="pf3" function="I2C1" group="SCL" field="PORTMUX.TWIROUTEA.TWI1"/>
-                <signal pad-id="pb6" function="I2C1_ALT2" group="SDA" field="PORTMUX.TWIROUTEA.TWI1"/>
-                <signal pad-id="pb2" function="I2C1_ALT" group="SDA" field="PORTMUX.TWIROUTEA.TWI1"/>
-                <signal pad-id="pf2" function="I2C1" group="SDA" field="PORTMUX.TWIROUTEA.TWI1"/>
+                <signal pad-key="pb7" function="I2C1_ALT2" group="SCL" field="PORTMUX.TWIROUTEA.TWI1"/>
+                <signal pad-key="pb3" function="I2C1_ALT" group="SCL" field="PORTMUX.TWIROUTEA.TWI1"/>
+                <signal pad-key="pf3" function="I2C1" group="SCL" field="PORTMUX.TWIROUTEA.TWI1"/>
+                <signal pad-key="pb6" function="I2C1_ALT2" group="SDA" field="PORTMUX.TWIROUTEA.TWI1"/>
+                <signal pad-key="pb2" function="I2C1_ALT" group="SDA" field="PORTMUX.TWIROUTEA.TWI1"/>
+                <signal pad-key="pf2" function="I2C1" group="SDA" field="PORTMUX.TWIROUTEA.TWI1"/>
             </signals>
         </peripheral>
         <peripheral key="usart0" name="USART0" module-key="uart_autobd_v4">
             <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"/>
-                <signal pad-id="pa4" function="USART0_ALT" group="TXD" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pa0" function="USART0" group="TXD" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pa6" function="USART0_ALT" group="XCK" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pa2" function="USART0" group="XCK" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pa7" function="USART0_ALT" group="XDIR" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pa3" function="USART0" group="XDIR" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa5" function="USART0_ALT" group="RXD" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa1" function="USART0" group="RXD" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa4" function="USART0_ALT" group="TXD" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa0" function="USART0" group="TXD" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa6" function="USART0_ALT" group="XCK" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa2" function="USART0" group="XCK" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa7" function="USART0_ALT" group="XDIR" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa3" function="USART0" group="XDIR" field="PORTMUX.USARTROUTEA.USART0"/>
             </signals>
         </peripheral>
         <peripheral key="usart1" name="USART1" module-key="uart_autobd_v4">
             <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"/>
-                <signal pad-id="pc4" function="USART1_ALT" group="TXD" field="PORTMUX.USARTROUTEA.USART1"/>
-                <signal pad-id="pc0" function="USART1" group="TXD" field="PORTMUX.USARTROUTEA.USART1"/>
-                <signal pad-id="pc6" function="USART1_ALT" group="XCK" field="PORTMUX.USARTROUTEA.USART1"/>
-                <signal pad-id="pc2" function="USART1" group="XCK" field="PORTMUX.USARTROUTEA.USART1"/>
-                <signal pad-id="pc7" function="USART1_ALT" group="XDIR" field="PORTMUX.USARTROUTEA.USART1"/>
-                <signal pad-id="pc3" function="USART1" group="XDIR" field="PORTMUX.USARTROUTEA.USART1"/>
+                <signal pad-key="pc5" function="USART1_ALT" group="RXD" field="PORTMUX.USARTROUTEA.USART1"/>
+                <signal pad-key="pc1" function="USART1" group="RXD" field="PORTMUX.USARTROUTEA.USART1"/>
+                <signal pad-key="pc4" function="USART1_ALT" group="TXD" field="PORTMUX.USARTROUTEA.USART1"/>
+                <signal pad-key="pc0" function="USART1" group="TXD" field="PORTMUX.USARTROUTEA.USART1"/>
+                <signal pad-key="pc6" function="USART1_ALT" group="XCK" field="PORTMUX.USARTROUTEA.USART1"/>
+                <signal pad-key="pc2" function="USART1" group="XCK" field="PORTMUX.USARTROUTEA.USART1"/>
+                <signal pad-key="pc7" function="USART1_ALT" group="XDIR" field="PORTMUX.USARTROUTEA.USART1"/>
+                <signal pad-key="pc3" function="USART1" group="XDIR" field="PORTMUX.USARTROUTEA.USART1"/>
             </signals>
         </peripheral>
         <peripheral key="usart2" name="USART2" module-key="uart_autobd_v4">
             <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"/>
-                <signal pad-id="pf4" function="USART2_ALT" group="TXD" field="PORTMUX.USARTROUTEA.USART2"/>
-                <signal pad-id="pf0" function="USART2" group="TXD" field="PORTMUX.USARTROUTEA.USART2"/>
-                <signal pad-id="pf2" function="USART2" group="XCK" field="PORTMUX.USARTROUTEA.USART2"/>
-                <signal pad-id="pf3" function="USART2" group="XDIR" field="PORTMUX.USARTROUTEA.USART2"/>
+                <signal pad-key="pf5" function="USART2_ALT" group="RXD" field="PORTMUX.USARTROUTEA.USART2"/>
+                <signal pad-key="pf1" function="USART2" group="RXD" field="PORTMUX.USARTROUTEA.USART2"/>
+                <signal pad-key="pf4" function="USART2_ALT" group="TXD" field="PORTMUX.USARTROUTEA.USART2"/>
+                <signal pad-key="pf0" function="USART2" group="TXD" field="PORTMUX.USARTROUTEA.USART2"/>
+                <signal pad-key="pf2" function="USART2" group="XCK" field="PORTMUX.USARTROUTEA.USART2"/>
+                <signal pad-key="pf3" function="USART2" group="XDIR" field="PORTMUX.USARTROUTEA.USART2"/>
             </signals>
         </peripheral>
         <peripheral key="usart3" name="USART3" module-key="uart_autobd_v4">
             <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"/>
-                <signal pad-id="pb4" function="USART3_ALT" group="TXD" field="PORTMUX.USARTROUTEA.USART3"/>
-                <signal pad-id="pb0" function="USART3" group="TXD" field="PORTMUX.USARTROUTEA.USART3"/>
-                <signal pad-id="pb6" function="USART3_ALT" group="XCK" field="PORTMUX.USARTROUTEA.USART3"/>
-                <signal pad-id="pb2" function="USART3" group="XCK" field="PORTMUX.USARTROUTEA.USART3"/>
-                <signal pad-id="pb7" function="USART3_ALT" group="XDIR" field="PORTMUX.USARTROUTEA.USART3"/>
-                <signal pad-id="pb3" function="USART3" group="XDIR" field="PORTMUX.USARTROUTEA.USART3"/>
+                <signal pad-key="pb5" function="USART3_ALT" group="RXD" field="PORTMUX.USARTROUTEA.USART3"/>
+                <signal pad-key="pb1" function="USART3" group="RXD" field="PORTMUX.USARTROUTEA.USART3"/>
+                <signal pad-key="pb4" function="USART3_ALT" group="TXD" field="PORTMUX.USARTROUTEA.USART3"/>
+                <signal pad-key="pb0" function="USART3" group="TXD" field="PORTMUX.USARTROUTEA.USART3"/>
+                <signal pad-key="pb6" function="USART3_ALT" group="XCK" field="PORTMUX.USARTROUTEA.USART3"/>
+                <signal pad-key="pb2" function="USART3" group="XCK" field="PORTMUX.USARTROUTEA.USART3"/>
+                <signal pad-key="pb7" function="USART3_ALT" group="XDIR" field="PORTMUX.USARTROUTEA.USART3"/>
+                <signal pad-key="pb3" function="USART3" group="XDIR" field="PORTMUX.USARTROUTEA.USART3"/>
             </signals>
         </peripheral>
         <peripheral key="usart4" name="USART4" module-key="uart_autobd_v4">
             <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"/>
-                <signal pad-id="pe4" function="USART4_ALT" group="TXD" field="PORTMUX.USARTROUTEB.USART4"/>
-                <signal pad-id="pe0" function="USART4" group="TXD" field="PORTMUX.USARTROUTEB.USART4"/>
-                <signal pad-id="pe6" function="USART4_ALT" group="XCK" field="PORTMUX.USARTROUTEB.USART4"/>
-                <signal pad-id="pe2" function="USART4" group="XCK" field="PORTMUX.USARTROUTEB.USART4"/>
-                <signal pad-id="pe7" function="USART4_ALT" group="XDIR" field="PORTMUX.USARTROUTEB.USART4"/>
-                <signal pad-id="pe3" function="USART4" group="XDIR" field="PORTMUX.USARTROUTEB.USART4"/>
+                <signal pad-key="pe5" function="USART4_ALT" group="RXD" field="PORTMUX.USARTROUTEB.USART4"/>
+                <signal pad-key="pe1" function="USART4" group="RXD" field="PORTMUX.USARTROUTEB.USART4"/>
+                <signal pad-key="pe4" function="USART4_ALT" group="TXD" field="PORTMUX.USARTROUTEB.USART4"/>
+                <signal pad-key="pe0" function="USART4" group="TXD" field="PORTMUX.USARTROUTEB.USART4"/>
+                <signal pad-key="pe6" function="USART4_ALT" group="XCK" field="PORTMUX.USARTROUTEB.USART4"/>
+                <signal pad-key="pe2" function="USART4" group="XCK" field="PORTMUX.USARTROUTEB.USART4"/>
+                <signal pad-key="pe7" function="USART4_ALT" group="XDIR" field="PORTMUX.USARTROUTEB.USART4"/>
+                <signal pad-key="pe3" function="USART4" group="XDIR" field="PORTMUX.USARTROUTEB.USART4"/>
             </signals>
         </peripheral>
         <peripheral key="usart5" name="USART5" module-key="uart_autobd_v4">
             <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"/>
-                <signal pad-id="pg4" function="USART5_ALT" group="TXD" field="PORTMUX.USARTROUTEB.USART5"/>
-                <signal pad-id="pg0" function="USART5" group="TXD" field="PORTMUX.USARTROUTEB.USART5"/>
-                <signal pad-id="pg6" function="USART5_ALT" group="XCK" field="PORTMUX.USARTROUTEB.USART5"/>
-                <signal pad-id="pg2" function="USART5" group="XCK" field="PORTMUX.USARTROUTEB.USART5"/>
-                <signal pad-id="pg7" function="USART5_ALT" group="XDIR" field="PORTMUX.USARTROUTEB.USART5"/>
-                <signal pad-id="pg3" function="USART5" group="XDIR" field="PORTMUX.USARTROUTEB.USART5"/>
+                <signal pad-key="pg5" function="USART5_ALT" group="RXD" field="PORTMUX.USARTROUTEB.USART5"/>
+                <signal pad-key="pg1" function="USART5" group="RXD" field="PORTMUX.USARTROUTEB.USART5"/>
+                <signal pad-key="pg4" function="USART5_ALT" group="TXD" field="PORTMUX.USARTROUTEB.USART5"/>
+                <signal pad-key="pg0" function="USART5" group="TXD" field="PORTMUX.USARTROUTEB.USART5"/>
+                <signal pad-key="pg6" function="USART5_ALT" group="XCK" field="PORTMUX.USARTROUTEB.USART5"/>
+                <signal pad-key="pg2" function="USART5" group="XCK" field="PORTMUX.USARTROUTEB.USART5"/>
+                <signal pad-key="pg7" function="USART5_ALT" group="XDIR" field="PORTMUX.USARTROUTEB.USART5"/>
+                <signal pad-key="pg3" function="USART5" group="XDIR" field="PORTMUX.USARTROUTEB.USART5"/>
             </signals>
         </peripheral>
         <peripheral key="userrow" name="USERROW" module-key="chip_userrow">
@@ -622,25 +622,25 @@
         <peripheral key="zcd0" name="ZCD0" module-key="cmp_zxover_ctrl_v3">
             <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"/>
-                <signal pad-id="pa7" function="ZCD0" group="OUT" field="PORTMUX.ZCDROUTEA.ZCD0"/>
+                <signal pad-key="pd1" function="ZCD0" group="IN"/>
+                <signal pad-key="pc7" function="ZCD0_ALT" group="OUT" field="PORTMUX.ZCDROUTEA.ZCD0"/>
+                <signal pad-key="pa7" function="ZCD0" group="OUT" field="PORTMUX.ZCDROUTEA.ZCD0"/>
             </signals>
         </peripheral>
         <peripheral key="zcd1" name="ZCD1" module-key="cmp_zxover_ctrl_v3">
             <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"/>
-                <signal pad-id="pa7" function="ZCD1" group="OUT" field="PORTMUX.ZCDROUTEA.ZCD1"/>
+                <signal pad-key="pe3" function="ZCD1" group="IN"/>
+                <signal pad-key="pc7" function="ZCD1_ALT" group="OUT" field="PORTMUX.ZCDROUTEA.ZCD1"/>
+                <signal pad-key="pa7" function="ZCD1" group="OUT" field="PORTMUX.ZCDROUTEA.ZCD1"/>
             </signals>
         </peripheral>
         <peripheral key="zcd2" name="ZCD2" module-key="cmp_zxover_ctrl_v3">
             <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"/>
-                <signal pad-id="pa7" function="ZCD2" group="OUT" field="PORTMUX.ZCDROUTEA.ZCD2"/>
+                <signal pad-key="pe7" function="ZCD2" group="IN"/>
+                <signal pad-key="pc7" function="ZCD2_ALT" group="OUT" field="PORTMUX.ZCDROUTEA.ZCD2"/>
+                <signal pad-key="pa7" function="ZCD2" group="OUT" field="PORTMUX.ZCDROUTEA.ZCD2"/>
             </signals>
         </peripheral>
     </peripherals>
@@ -2129,75 +2129,141 @@
             </register-group>
         </module>
     </modules>
+    <pads>
+        <pad key="pa3" name="PA3"/>
+        <pad key="pa4" name="PA4"/>
+        <pad key="pa5" name="PA5"/>
+        <pad key="pa6" name="PA6"/>
+        <pad key="pa7" name="PA7"/>
+        <pad key="vdd0" name="VDD0"/>
+        <pad key="gnd0" name="GND0"/>
+        <pad key="pb0" name="PB0"/>
+        <pad key="pb1" name="PB1"/>
+        <pad key="pb2" name="PB2"/>
+        <pad key="pb3" name="PB3"/>
+        <pad key="pb4" name="PB4"/>
+        <pad key="pb5" name="PB5"/>
+        <pad key="pb6" name="PB6"/>
+        <pad key="pb7" name="PB7"/>
+        <pad key="pc0" name="PC0"/>
+        <pad key="pc1" name="PC1"/>
+        <pad key="pc2" name="PC2"/>
+        <pad key="pc3" name="PC3"/>
+        <pad key="vddio2" name="VDDIO2"/>
+        <pad key="gnd1" name="GND1"/>
+        <pad key="pc4" name="PC4"/>
+        <pad key="pc5" name="PC5"/>
+        <pad key="pc6" name="PC6"/>
+        <pad key="pc7" name="PC7"/>
+        <pad key="pd0" name="PD0"/>
+        <pad key="pd1" name="PD1"/>
+        <pad key="pd2" name="PD2"/>
+        <pad key="pd3" name="PD3"/>
+        <pad key="pd4" name="PD4"/>
+        <pad key="pd5" name="PD5"/>
+        <pad key="pd6" name="PD6"/>
+        <pad key="pd7" name="PD7"/>
+        <pad key="avdd" name="AVDD"/>
+        <pad key="agnd" name="AGND"/>
+        <pad key="pe0" name="PE0"/>
+        <pad key="pe1" name="PE1"/>
+        <pad key="pe2" name="PE2"/>
+        <pad key="pe3" name="PE3"/>
+        <pad key="pe4" name="PE4"/>
+        <pad key="pe5" name="PE5"/>
+        <pad key="pe6" name="PE6"/>
+        <pad key="pe7" name="PE7"/>
+        <pad key="pf0" name="PF0"/>
+        <pad key="pf1" name="PF1"/>
+        <pad key="pf2" name="PF2"/>
+        <pad key="pf3" name="PF3"/>
+        <pad key="pf4" name="PF4"/>
+        <pad key="pf5" name="PF5"/>
+        <pad key="pf6" name="PF6"/>
+        <pad key="updi" name="UPDI"/>
+        <pad key="pg0" name="PG0"/>
+        <pad key="pg1" name="PG1"/>
+        <pad key="pg2" name="PG2"/>
+        <pad key="pg3" name="PG3"/>
+        <pad key="vdd2" name="VDD2"/>
+        <pad key="gnd2" name="GND2"/>
+        <pad key="pg4" name="PG4"/>
+        <pad key="pg5" name="PG5"/>
+        <pad key="pg6" name="PG6"/>
+        <pad key="pg7" name="PG7"/>
+        <pad key="pa0" name="PA0"/>
+        <pad key="pa1" name="PA1"/>
+        <pad key="pa2" name="PA2"/>
+    </pads>
     <pinouts>
         <pinout key="qfn64" name="QFN64" type="qfn">
-            <pin position="1" pad="PA3"/>
-            <pin position="2" pad="PA4"/>
-            <pin position="3" pad="PA5"/>
-            <pin position="4" pad="PA6"/>
-            <pin position="5" pad="PA7"/>
-            <pin position="6" pad="VDD0"/>
-            <pin position="7" pad="GND0"/>
-            <pin position="8" pad="PB0"/>
-            <pin position="9" pad="PB1"/>
-            <pin position="10" pad="PB2"/>
-            <pin position="11" pad="PB3"/>
-            <pin position="12" pad="PB4"/>
-            <pin position="13" pad="PB5"/>
-            <pin position="14" pad="PB6"/>
-            <pin position="15" pad="PB7"/>
-            <pin position="16" pad="PC0"/>
-            <pin position="17" pad="PC1"/>
-            <pin position="18" pad="PC2"/>
-            <pin position="19" pad="PC3"/>
-            <pin position="20" pad="VDDIO2"/>
-            <pin position="21" pad="GND1"/>
-            <pin position="22" pad="PC4"/>
-            <pin position="23" pad="PC5"/>
-            <pin position="24" pad="PC6"/>
-            <pin position="25" pad="PC7"/>
-            <pin position="26" pad="PD0"/>
-            <pin position="27" pad="PD1"/>
-            <pin position="28" pad="PD2"/>
-            <pin position="29" pad="PD3"/>
-            <pin position="30" pad="PD4"/>
-            <pin position="31" pad="PD5"/>
-            <pin position="32" pad="PD6"/>
-            <pin position="33" pad="PD7"/>
-            <pin position="34" pad="AVDD"/>
-            <pin position="35" pad="AGND"/>
-            <pin position="36" pad="PE0"/>
-            <pin position="37" pad="PE1"/>
-            <pin position="38" pad="PE2"/>
-            <pin position="39" pad="PE3"/>
-            <pin position="40" pad="PE4"/>
-            <pin position="41" pad="PE5"/>
-            <pin position="42" pad="PE6"/>
-            <pin position="43" pad="PE7"/>
-            <pin position="44" pad="PF0"/>
-            <pin position="45" pad="PF1"/>
-            <pin position="46" pad="PF2"/>
-            <pin position="47" pad="PF3"/>
-            <pin position="48" pad="PF4"/>
-            <pin position="49" pad="PF5"/>
-            <pin position="50" pad="PF6"/>
-            <pin position="51" pad="UPDI"/>
-            <pin position="52" pad="PG0"/>
-            <pin position="53" pad="PG1"/>
-            <pin position="54" pad="PG2"/>
-            <pin position="55" pad="PG3"/>
-            <pin position="56" pad="VDD2"/>
-            <pin position="57" pad="GND2"/>
-            <pin position="58" pad="PG4"/>
-            <pin position="59" pad="PG5"/>
-            <pin position="60" pad="PG6"/>
-            <pin position="61" pad="PG7"/>
-            <pin position="62" pad="PA0"/>
-            <pin position="63" pad="PA1"/>
-            <pin position="64" pad="PA2"/>
+            <pin position="1" pad-key="pa3"/>
+            <pin position="2" pad-key="pa4"/>
+            <pin position="3" pad-key="pa5"/>
+            <pin position="4" pad-key="pa6"/>
+            <pin position="5" pad-key="pa7"/>
+            <pin position="6" pad-key="vdd0"/>
+            <pin position="7" pad-key="gnd0"/>
+            <pin position="8" pad-key="pb0"/>
+            <pin position="9" pad-key="pb1"/>
+            <pin position="10" pad-key="pb2"/>
+            <pin position="11" pad-key="pb3"/>
+            <pin position="12" pad-key="pb4"/>
+            <pin position="13" pad-key="pb5"/>
+            <pin position="14" pad-key="pb6"/>
+            <pin position="15" pad-key="pb7"/>
+            <pin position="16" pad-key="pc0"/>
+            <pin position="17" pad-key="pc1"/>
+            <pin position="18" pad-key="pc2"/>
+            <pin position="19" pad-key="pc3"/>
+            <pin position="20" pad-key="vddio2"/>
+            <pin position="21" pad-key="gnd1"/>
+            <pin position="22" pad-key="pc4"/>
+            <pin position="23" pad-key="pc5"/>
+            <pin position="24" pad-key="pc6"/>
+            <pin position="25" pad-key="pc7"/>
+            <pin position="26" pad-key="pd0"/>
+            <pin position="27" pad-key="pd1"/>
+            <pin position="28" pad-key="pd2"/>
+            <pin position="29" pad-key="pd3"/>
+            <pin position="30" pad-key="pd4"/>
+            <pin position="31" pad-key="pd5"/>
+            <pin position="32" pad-key="pd6"/>
+            <pin position="33" pad-key="pd7"/>
+            <pin position="34" pad-key="avdd"/>
+            <pin position="35" pad-key="agnd"/>
+            <pin position="36" pad-key="pe0"/>
+            <pin position="37" pad-key="pe1"/>
+            <pin position="38" pad-key="pe2"/>
+            <pin position="39" pad-key="pe3"/>
+            <pin position="40" pad-key="pe4"/>
+            <pin position="41" pad-key="pe5"/>
+            <pin position="42" pad-key="pe6"/>
+            <pin position="43" pad-key="pe7"/>
+            <pin position="44" pad-key="pf0"/>
+            <pin position="45" pad-key="pf1"/>
+            <pin position="46" pad-key="pf2"/>
+            <pin position="47" pad-key="pf3"/>
+            <pin position="48" pad-key="pf4"/>
+            <pin position="49" pad-key="pf5"/>
+            <pin position="50" pad-key="pf6"/>
+            <pin position="51" pad-key="updi"/>
+            <pin position="52" pad-key="pg0"/>
+            <pin position="53" pad-key="pg1"/>
+            <pin position="54" pad-key="pg2"/>
+            <pin position="55" pad-key="pg3"/>
+            <pin position="56" pad-key="vdd2"/>
+            <pin position="57" pad-key="gnd2"/>
+            <pin position="58" pad-key="pg4"/>
+            <pin position="59" pad-key="pg5"/>
+            <pin position="60" pad-key="pg6"/>
+            <pin position="61" pad-key="pg7"/>
+            <pin position="62" pad-key="pa0"/>
+            <pin position="63" pad-key="pa1"/>
+            <pin position="64" pad-key="pa2"/>
         </pinout>
     </pinouts>
     <variants>
-        <variant name="AVR128DB64" pinout-key="qfn64" package="QFN64"/>
+        <variant key="avr128db64" name="AVR128DB64" pinout-key="qfn64"/>
     </variants>
 </device>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR16DD14.xml b/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR16DD14.xml
index 5d74fc7c..d6097a72 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR16DD14.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR16DD14.xml
@@ -45,22 +45,22 @@
         <peripheral key="ac0" name="AC0" module-key="cmp_control_v8">
             <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"/>
-                <signal pad-id="pd6" index="3" function="AC0" group="P"/>
-                <signal pad-id="pc3" index="4" function="AC0" group="P"/>
+                <signal pad-key="pd7" index="2" function="AC0" group="N"/>
+                <signal pad-key="pc2" index="3" function="AC0" group="N"/>
+                <signal pad-key="pd6" index="3" function="AC0" group="P"/>
+                <signal pad-key="pc3" index="4" function="AC0" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="adc0" name="ADC0" module-key="adc_12b_diff_ctrl_v1">
             <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"/>
-                <signal pad-id="pd6" index="6" function="AIN0" group="AIN"/>
-                <signal pad-id="pd7" index="7" function="AIN0" group="AIN"/>
-                <signal pad-id="pc1" index="29" function="AIN0" group="AIN"/>
-                <signal pad-id="pc2" index="30" function="AIN0" group="AIN"/>
-                <signal pad-id="pc3" index="31" function="AIN0" group="AIN"/>
+                <signal pad-key="pd4" index="4" function="AIN0" group="AIN"/>
+                <signal pad-key="pd5" index="5" function="AIN0" group="AIN"/>
+                <signal pad-key="pd6" index="6" function="AIN0" group="AIN"/>
+                <signal pad-key="pd7" index="7" function="AIN0" group="AIN"/>
+                <signal pad-key="pc1" index="29" function="AIN0" group="AIN"/>
+                <signal pad-key="pc2" index="30" function="AIN0" group="AIN"/>
+                <signal pad-key="pc3" index="31" function="AIN0" group="AIN"/>
             </signals>
         </peripheral>
         <peripheral key="bod" name="BOD" module-key="bor_lvd_ctrl_v1">
@@ -69,26 +69,26 @@
         <peripheral key="ccl" name="CCL" module-key="cla_ccl_v1">
             <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"/>
-                <signal pad-id="pa0" index="0" function="CCL_ALT1" group="LUT0_IN" field="PORTMUX.CCLROUTEA.LUT0"/>
-                <signal pad-id="pa1" index="1" function="CCL_ALT1" group="LUT0_IN" field="PORTMUX.CCLROUTEA.LUT0"/>
-                <signal pad-id="pc1" index="1" function="CCL" group="LUT1_IN" field="PORTMUX.CCLROUTEA.LUT1"/>
-                <signal pad-id="pc2" index="2" function="CCL" group="LUT1_IN" field="PORTMUX.CCLROUTEA.LUT1"/>
-                <signal pad-id="pc3" index="0" function="CCL" group="LUT1_OUT" field="PORTMUX.CCLROUTEA.LUT1"/>
-                <signal pad-id="pc1" index="1" function="CCL_ALT1" group="LUT1_IN" field="PORTMUX.CCLROUTEA.LUT1"/>
-                <signal pad-id="pc2" index="2" function="CCL_ALT1" group="LUT1_IN" field="PORTMUX.CCLROUTEA.LUT1"/>
-                <signal pad-id="pd6" index="0" function="CCL_ALT1" group="LUT2_OUT" field="PORTMUX.CCLROUTEA.LUT2"/>
+                <signal pad-key="pa0" index="0" function="CCL" group="LUT0_IN" field="PORTMUX.CCLROUTEA.LUT0"/>
+                <signal pad-key="pa1" index="1" function="CCL" group="LUT0_IN" field="PORTMUX.CCLROUTEA.LUT0"/>
+                <signal pad-key="pa0" index="0" function="CCL_ALT1" group="LUT0_IN" field="PORTMUX.CCLROUTEA.LUT0"/>
+                <signal pad-key="pa1" index="1" function="CCL_ALT1" group="LUT0_IN" field="PORTMUX.CCLROUTEA.LUT0"/>
+                <signal pad-key="pc1" index="1" function="CCL" group="LUT1_IN" field="PORTMUX.CCLROUTEA.LUT1"/>
+                <signal pad-key="pc2" index="2" function="CCL" group="LUT1_IN" field="PORTMUX.CCLROUTEA.LUT1"/>
+                <signal pad-key="pc3" index="0" function="CCL" group="LUT1_OUT" field="PORTMUX.CCLROUTEA.LUT1"/>
+                <signal pad-key="pc1" index="1" function="CCL_ALT1" group="LUT1_IN" field="PORTMUX.CCLROUTEA.LUT1"/>
+                <signal pad-key="pc2" index="2" function="CCL_ALT1" group="LUT1_IN" field="PORTMUX.CCLROUTEA.LUT1"/>
+                <signal pad-key="pd6" index="0" function="CCL_ALT1" group="LUT2_OUT" field="PORTMUX.CCLROUTEA.LUT2"/>
             </signals>
         </peripheral>
         <peripheral key="clkctrl" name="CLKCTRL" module-key="avrdd_clkctrl">
             <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"/>
-                <signal pad-id="pa1" function="CLKCTRL" group="XTALHF2"/>
-                <signal pad-id="pa0" function="CLKCTRL_ALT1" group="XTAL32K1"/>
-                <signal pad-id="pa1" function="CLKCTRL_ALT1" group="XTAL32K2"/>
+                <signal pad-key="pa0" function="CLKCTRL" group="EXTCLK"/>
+                <signal pad-key="pa0" function="CLKCTRL" group="XTALHF1"/>
+                <signal pad-key="pa1" function="CLKCTRL" group="XTALHF2"/>
+                <signal pad-key="pa0" function="CLKCTRL_ALT1" group="XTAL32K1"/>
+                <signal pad-key="pa1" function="CLKCTRL_ALT1" group="XTAL32K2"/>
             </signals>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="cpu_avr_xt_v1">
@@ -103,15 +103,15 @@
         <peripheral key="dac0" name="DAC0" module-key="dac_nbit_ctrl_v5">
             <register-group-instance register-group-key="dac" address-space-key="data" offset="0x6A0"/>
             <signals>
-                <signal pad-id="pd6" index="0" function="DAC0" group="OUT"/>
+                <signal pad-key="pd6" index="0" function="DAC0" group="OUT"/>
             </signals>
         </peripheral>
         <peripheral key="evsys" name="EVSYS" module-key="avrdd_evsys">
             <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"/>
-                <signal pad-id="pf7" index="5" function="EVSYS_ALT1" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTF"/>
+                <signal pad-key="pc2" index="2" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTC"/>
+                <signal pad-key="pd7" index="3" function="EVSYS_ALT1" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTD"/>
+                <signal pad-key="pf7" index="5" function="EVSYS_ALT1" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTF"/>
             </signals>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="avrdd_fuse">
@@ -132,32 +132,32 @@
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
             <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"/>
+                <signal pad-key="pa0" index="0" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa1" index="1" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pc3" index="3" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc1" index="1" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc2" index="2" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc3" index="3" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pd6" index="6" function="IOPORT" group="PIN"/>
-                <signal pad-id="pd7" index="7" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd4" index="4" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd5" index="5" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd6" index="6" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd7" index="7" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="portf" name="PORTF" module-key="gpio_port">
             <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"/>
+                <signal pad-key="pf6" index="6" function="IOPORT" group="PIN"/>
+                <signal pad-key="pf7" index="7" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="portmux" name="PORTMUX" module-key="avrdd_portmux">
@@ -166,7 +166,7 @@
         <peripheral key="rstctrl" name="RSTCTRL" module-key="rst_integration_v8">
             <register-group-instance register-group-key="rstctrl" address-space-key="data" offset="0x40"/>
             <signals>
-                <signal pad-id="pf6" function="OTHER" group="RESET"/>
+                <signal pad-key="pf6" function="OTHER" group="RESET"/>
             </signals>
         </peripheral>
         <peripheral key="rtc" name="RTC" module-key="tmr_16b_rtc_v1">
@@ -181,20 +181,20 @@
         <peripheral key="spi0" name="SPI0" module-key="spi_8bit_v2">
             <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"/>
-                <signal pad-id="pc1" function="SPI0_ALT3" group="SS" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <signal pad-id="pd5" function="SPI0_ALT4" group="MISO" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <signal pad-id="pd4" function="SPI0_ALT4" group="MOSI" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <signal pad-id="pd6" function="SPI0_ALT4" group="SCK" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <signal pad-id="pd7" function="SPI0_ALT4" group="SS" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <signal pad-id="pc1" function="SPI0_ALT5" group="MISO" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <signal pad-id="pc2" function="SPI0_ALT5" group="SCK" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <signal pad-id="pc3" function="SPI0_ALT5" group="SS" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <signal pad-id="pc2" function="SPI0_ALT6" group="MISO" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <signal pad-id="pc1" function="SPI0_ALT6" group="MOSI" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <signal pad-id="pc3" function="SPI0_ALT6" group="SCK" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <signal pad-id="pf7" function="SPI0_ALT6" group="SS" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pa1" function="SPI0_ALT3" group="MISO" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pa0" function="SPI0_ALT3" group="MOSI" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pc1" function="SPI0_ALT3" group="SS" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pd5" function="SPI0_ALT4" group="MISO" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pd4" function="SPI0_ALT4" group="MOSI" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pd6" function="SPI0_ALT4" group="SCK" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pd7" function="SPI0_ALT4" group="SS" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pc1" function="SPI0_ALT5" group="MISO" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pc2" function="SPI0_ALT5" group="SCK" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pc3" function="SPI0_ALT5" group="SS" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pc2" function="SPI0_ALT6" group="MISO" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pc1" function="SPI0_ALT6" group="MOSI" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pc3" function="SPI0_ALT6" group="SCK" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pf7" function="SPI0_ALT6" group="SS" field="PORTMUX.SPIROUTEA.SPI0"/>
             </signals>
         </peripheral>
         <peripheral key="syscfg" name="SYSCFG" module-key="avrdd_syscfg">
@@ -203,13 +203,13 @@
         <peripheral key="tca0" name="TCA0" module-key="tmr_16b_pwm_v1">
             <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"/>
-                <signal pad-id="pc1" index="1" function="TCA0_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pc2" index="2" function="TCA0_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pc3" index="3" function="TCA0_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pd4" index="4" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pd5" index="5" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pa0" index="0" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pa1" index="1" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pc1" index="1" function="TCA0_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pc2" index="2" function="TCA0_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pc3" index="3" function="TCA0_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pd4" index="4" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pd5" index="5" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
             </signals>
         </peripheral>
         <peripheral key="tcb0" name="TCB0" module-key="tmr_16b_capture_v1">
@@ -224,45 +224,45 @@
         <peripheral key="tcd0" name="TCD0" module-key="tmr_12b_psc_v1">
             <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"/>
+                <signal pad-key="pd4" index="2" function="TCD0_ALT4" group="WOC" field="PORTMUX.TCDROUTEA.TCD0"/>
+                <signal pad-key="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 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"/>
-                <signal pad-id="pc3" function="I2C0_ALT2" group="SCL" field="PORTMUX.TWIROUTEA.TWI0"/>
-                <signal pad-id="pc2" function="I2C0_ALT2" group="SDA" field="PORTMUX.TWIROUTEA.TWI0"/>
-                <signal pad-id="pa1" function="I2C0_ALT3" group="SCL" field="PORTMUX.TWIROUTEA.TWI0"/>
-                <signal pad-id="pc3" function="I2C0_ALT3" group="SCL_DUAL" field="PORTMUX.TWIROUTEA.TWI0"/>
-                <signal pad-id="pa0" function="I2C0_ALT3" group="SDA" field="PORTMUX.TWIROUTEA.TWI0"/>
-                <signal pad-id="pc2" function="I2C0_ALT3" group="SDA_DUAL" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pc3" function="I2C0" group="SCL_DUAL" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pc2" function="I2C0" group="SDA_DUAL" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pc3" function="I2C0_ALT2" group="SCL" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pc2" function="I2C0_ALT2" group="SDA" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pa1" function="I2C0_ALT3" group="SCL" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pc3" function="I2C0_ALT3" group="SCL_DUAL" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pa0" function="I2C0_ALT3" group="SDA" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pc2" function="I2C0_ALT3" group="SDA_DUAL" field="PORTMUX.TWIROUTEA.TWI0"/>
             </signals>
         </peripheral>
         <peripheral key="usart0" name="USART0" module-key="uart_autobd_v4">
             <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"/>
-                <signal pad-id="pd5" function="USART0_ALT3" group="RXD" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pd4" function="USART0_ALT3" group="TXD" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pd6" function="USART0_ALT3" group="XCK" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pd7" function="USART0_ALT3" group="XDIR" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pc2" function="USART0_ALT4" group="RXD" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pc1" function="USART0_ALT4" group="TXD" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pc3" function="USART0_ALT4" group="XCK" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa1" function="USART0" group="RXD" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa0" function="USART0" group="TXD" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pd5" function="USART0_ALT3" group="RXD" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pd4" function="USART0_ALT3" group="TXD" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pd6" function="USART0_ALT3" group="XCK" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pd7" function="USART0_ALT3" group="XDIR" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pc2" function="USART0_ALT4" group="RXD" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pc1" function="USART0_ALT4" group="TXD" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pc3" function="USART0_ALT4" group="XCK" field="PORTMUX.USARTROUTEA.USART0"/>
             </signals>
         </peripheral>
         <peripheral key="usart1" name="USART1" module-key="uart_autobd_v4">
             <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"/>
-                <signal pad-id="pc3" function="USART1" group="XDIR" field="PORTMUX.USARTROUTEA.USART1"/>
-                <signal pad-id="pd7" function="USART1_ALT2" group="RXD" field="PORTMUX.USARTROUTEA.USART1"/>
-                <signal pad-id="pd6" function="USART1_ALT2" group="TXD" field="PORTMUX.USARTROUTEA.USART1"/>
+                <signal pad-key="pc1" function="USART1" group="RXD" field="PORTMUX.USARTROUTEA.USART1"/>
+                <signal pad-key="pc2" function="USART1" group="XCK" field="PORTMUX.USARTROUTEA.USART1"/>
+                <signal pad-key="pc3" function="USART1" group="XDIR" field="PORTMUX.USARTROUTEA.USART1"/>
+                <signal pad-key="pd7" function="USART1_ALT2" group="RXD" field="PORTMUX.USARTROUTEA.USART1"/>
+                <signal pad-key="pd6" function="USART1_ALT2" group="TXD" field="PORTMUX.USARTROUTEA.USART1"/>
             </signals>
         </peripheral>
         <peripheral key="userrow" name="USERROW" module-key="avrdd_userrow">
@@ -289,7 +289,7 @@
         <peripheral key="zcd3" name="ZCD3" module-key="cmp_zxover_ctrl_v3">
             <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-key="pc2" function="ZCD3" group="IN" field="PORTMUX.ZCDROUTEA.ZCD3"/>
             </signals>
         </peripheral>
     </peripherals>
@@ -1542,25 +1542,41 @@
             </register-group>
         </module>
     </modules>
+    <pads>
+        <pad key="agnd" name="AGND"/>
+        <pad key="pf6" name="PF6"/>
+        <pad key="pf7" name="PF7"/>
+        <pad key="pa0" name="PA0"/>
+        <pad key="pa1" name="PA1"/>
+        <pad key="pc1" name="PC1"/>
+        <pad key="pc2" name="PC2"/>
+        <pad key="pc3" name="PC3"/>
+        <pad key="vddio2" name="VDDIO2"/>
+        <pad key="pd4" name="PD4"/>
+        <pad key="pd5" name="PD5"/>
+        <pad key="pd6" name="PD6"/>
+        <pad key="pd7" name="PD7"/>
+        <pad key="avdd" name="AVDD"/>
+    </pads>
     <pinouts>
         <pinout key="soic14mvio" name="SOIC14MVIO" type="soic">
-            <pin position="1" pad="AGND"/>
-            <pin position="2" pad="PF6"/>
-            <pin position="3" pad="PF7"/>
-            <pin position="4" pad="PA0"/>
-            <pin position="5" pad="PA1"/>
-            <pin position="6" pad="PC1"/>
-            <pin position="7" pad="PC2"/>
-            <pin position="8" pad="PC3"/>
-            <pin position="9" pad="VDDIO2"/>
-            <pin position="10" pad="PD4"/>
-            <pin position="11" pad="PD5"/>
-            <pin position="12" pad="PD6"/>
-            <pin position="13" pad="PD7"/>
-            <pin position="14" pad="AVDD"/>
+            <pin position="1" pad-key="agnd"/>
+            <pin position="2" pad-key="pf6"/>
+            <pin position="3" pad-key="pf7"/>
+            <pin position="4" pad-key="pa0"/>
+            <pin position="5" pad-key="pa1"/>
+            <pin position="6" pad-key="pc1"/>
+            <pin position="7" pad-key="pc2"/>
+            <pin position="8" pad-key="pc3"/>
+            <pin position="9" pad-key="vddio2"/>
+            <pin position="10" pad-key="pd4"/>
+            <pin position="11" pad-key="pd5"/>
+            <pin position="12" pad-key="pd6"/>
+            <pin position="13" pad-key="pd7"/>
+            <pin position="14" pad-key="avdd"/>
         </pinout>
     </pinouts>
     <variants>
-        <variant name="AVR16DD14" pinout-key="soic14mvio" package="SOIC14"/>
+        <variant key="avr16dd14" name="AVR16DD14" pinout-key="soic14mvio"/>
     </variants>
 </device>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR16DD20.xml b/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR16DD20.xml
index b44b1965..59b1942a 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR16DD20.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR16DD20.xml
@@ -45,29 +45,29 @@
         <peripheral key="ac0" name="AC0" module-key="cmp_control_v8">
             <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"/>
-                <signal pad-id="pd6" index="3" function="AC0" group="P"/>
-                <signal pad-id="pc3" index="4" function="AC0" group="P"/>
-                <signal pad-id="pa7" index="0" function="AC0" group="OUT" field="PORTMUX.ACROUTEA.AC0"/>
+                <signal pad-key="pd7" index="2" function="AC0" group="N"/>
+                <signal pad-key="pc2" index="3" function="AC0" group="N"/>
+                <signal pad-key="pd6" index="3" function="AC0" group="P"/>
+                <signal pad-key="pc3" index="4" function="AC0" group="P"/>
+                <signal pad-key="pa7" index="0" function="AC0" group="OUT" field="PORTMUX.ACROUTEA.AC0"/>
             </signals>
         </peripheral>
         <peripheral key="adc0" name="ADC0" module-key="adc_12b_diff_ctrl_v1">
             <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"/>
-                <signal pad-id="pd6" index="6" function="AIN0" group="AIN"/>
-                <signal pad-id="pd7" index="7" function="AIN0" group="AIN"/>
-                <signal pad-id="pa2" index="22" function="AIN0" group="AIN"/>
-                <signal pad-id="pa3" index="23" function="AIN0" group="AIN"/>
-                <signal pad-id="pa4" index="24" function="AIN0" group="AIN"/>
-                <signal pad-id="pa5" index="25" function="AIN0" group="AIN"/>
-                <signal pad-id="pa6" index="26" function="AIN0" group="AIN"/>
-                <signal pad-id="pa7" index="27" function="AIN0" group="AIN"/>
-                <signal pad-id="pc1" index="29" function="AIN0" group="AIN"/>
-                <signal pad-id="pc2" index="30" function="AIN0" group="AIN"/>
-                <signal pad-id="pc3" index="31" function="AIN0" group="AIN"/>
+                <signal pad-key="pd4" index="4" function="AIN0" group="AIN"/>
+                <signal pad-key="pd5" index="5" function="AIN0" group="AIN"/>
+                <signal pad-key="pd6" index="6" function="AIN0" group="AIN"/>
+                <signal pad-key="pd7" index="7" function="AIN0" group="AIN"/>
+                <signal pad-key="pa2" index="22" function="AIN0" group="AIN"/>
+                <signal pad-key="pa3" index="23" function="AIN0" group="AIN"/>
+                <signal pad-key="pa4" index="24" function="AIN0" group="AIN"/>
+                <signal pad-key="pa5" index="25" function="AIN0" group="AIN"/>
+                <signal pad-key="pa6" index="26" function="AIN0" group="AIN"/>
+                <signal pad-key="pa7" index="27" function="AIN0" group="AIN"/>
+                <signal pad-key="pc1" index="29" function="AIN0" group="AIN"/>
+                <signal pad-key="pc2" index="30" function="AIN0" group="AIN"/>
+                <signal pad-key="pc3" index="31" function="AIN0" group="AIN"/>
             </signals>
         </peripheral>
         <peripheral key="bod" name="BOD" module-key="bor_lvd_ctrl_v1">
@@ -76,31 +76,31 @@
         <peripheral key="ccl" name="CCL" module-key="cla_ccl_v1">
             <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"/>
-                <signal pad-id="pa2" index="2" function="CCL" group="LUT0_IN" field="PORTMUX.CCLROUTEA.LUT0"/>
-                <signal pad-id="pa3" index="0" function="CCL" group="LUT0_OUT" field="PORTMUX.CCLROUTEA.LUT0"/>
-                <signal pad-id="pa0" index="0" function="CCL_ALT1" group="LUT0_IN" field="PORTMUX.CCLROUTEA.LUT0"/>
-                <signal pad-id="pa1" index="1" function="CCL_ALT1" group="LUT0_IN" field="PORTMUX.CCLROUTEA.LUT0"/>
-                <signal pad-id="pa2" index="2" function="CCL_ALT1" group="LUT0_IN" field="PORTMUX.CCLROUTEA.LUT0"/>
-                <signal pad-id="pa6" index="0" function="CCL_ALT1" group="LUT0_OUT" field="PORTMUX.CCLROUTEA.LUT0"/>
-                <signal pad-id="pc1" index="1" function="CCL" group="LUT1_IN" field="PORTMUX.CCLROUTEA.LUT1"/>
-                <signal pad-id="pc2" index="2" function="CCL" group="LUT1_IN" field="PORTMUX.CCLROUTEA.LUT1"/>
-                <signal pad-id="pc3" index="0" function="CCL" group="LUT1_OUT" field="PORTMUX.CCLROUTEA.LUT1"/>
-                <signal pad-id="pc1" index="1" function="CCL_ALT1" group="LUT1_IN" field="PORTMUX.CCLROUTEA.LUT1"/>
-                <signal pad-id="pc2" index="2" function="CCL_ALT1" group="LUT1_IN" field="PORTMUX.CCLROUTEA.LUT1"/>
-                <signal pad-id="pd6" index="0" function="CCL_ALT1" group="LUT2_OUT" field="PORTMUX.CCLROUTEA.LUT2"/>
+                <signal pad-key="pa0" index="0" function="CCL" group="LUT0_IN" field="PORTMUX.CCLROUTEA.LUT0"/>
+                <signal pad-key="pa1" index="1" function="CCL" group="LUT0_IN" field="PORTMUX.CCLROUTEA.LUT0"/>
+                <signal pad-key="pa2" index="2" function="CCL" group="LUT0_IN" field="PORTMUX.CCLROUTEA.LUT0"/>
+                <signal pad-key="pa3" index="0" function="CCL" group="LUT0_OUT" field="PORTMUX.CCLROUTEA.LUT0"/>
+                <signal pad-key="pa0" index="0" function="CCL_ALT1" group="LUT0_IN" field="PORTMUX.CCLROUTEA.LUT0"/>
+                <signal pad-key="pa1" index="1" function="CCL_ALT1" group="LUT0_IN" field="PORTMUX.CCLROUTEA.LUT0"/>
+                <signal pad-key="pa2" index="2" function="CCL_ALT1" group="LUT0_IN" field="PORTMUX.CCLROUTEA.LUT0"/>
+                <signal pad-key="pa6" index="0" function="CCL_ALT1" group="LUT0_OUT" field="PORTMUX.CCLROUTEA.LUT0"/>
+                <signal pad-key="pc1" index="1" function="CCL" group="LUT1_IN" field="PORTMUX.CCLROUTEA.LUT1"/>
+                <signal pad-key="pc2" index="2" function="CCL" group="LUT1_IN" field="PORTMUX.CCLROUTEA.LUT1"/>
+                <signal pad-key="pc3" index="0" function="CCL" group="LUT1_OUT" field="PORTMUX.CCLROUTEA.LUT1"/>
+                <signal pad-key="pc1" index="1" function="CCL_ALT1" group="LUT1_IN" field="PORTMUX.CCLROUTEA.LUT1"/>
+                <signal pad-key="pc2" index="2" function="CCL_ALT1" group="LUT1_IN" field="PORTMUX.CCLROUTEA.LUT1"/>
+                <signal pad-key="pd6" index="0" function="CCL_ALT1" group="LUT2_OUT" field="PORTMUX.CCLROUTEA.LUT2"/>
             </signals>
         </peripheral>
         <peripheral key="clkctrl" name="CLKCTRL" module-key="avrdd_clkctrl">
             <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"/>
-                <signal pad-id="pa0" function="CLKCTRL" group="XTALHF1"/>
-                <signal pad-id="pa1" function="CLKCTRL" group="XTALHF2"/>
-                <signal pad-id="pa0" function="CLKCTRL_ALT1" group="XTAL32K1"/>
-                <signal pad-id="pa1" function="CLKCTRL_ALT1" group="XTAL32K2"/>
+                <signal pad-key="pa7" function="CLKCTRL" group="CLKOUT"/>
+                <signal pad-key="pa0" function="CLKCTRL" group="EXTCLK"/>
+                <signal pad-key="pa0" function="CLKCTRL" group="XTALHF1"/>
+                <signal pad-key="pa1" function="CLKCTRL" group="XTALHF2"/>
+                <signal pad-key="pa0" function="CLKCTRL_ALT1" group="XTAL32K1"/>
+                <signal pad-key="pa1" function="CLKCTRL_ALT1" group="XTAL32K2"/>
             </signals>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="cpu_avr_xt_v1">
@@ -115,17 +115,17 @@
         <peripheral key="dac0" name="DAC0" module-key="dac_nbit_ctrl_v5">
             <register-group-instance register-group-key="dac" address-space-key="data" offset="0x6A0"/>
             <signals>
-                <signal pad-id="pd6" index="0" function="DAC0" group="OUT"/>
+                <signal pad-key="pd6" index="0" function="DAC0" group="OUT"/>
             </signals>
         </peripheral>
         <peripheral key="evsys" name="EVSYS" module-key="avrdd_evsys">
             <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"/>
-                <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"/>
-                <signal pad-id="pf7" index="5" function="EVSYS_ALT1" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTF"/>
+                <signal pad-key="pa2" index="0" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTA"/>
+                <signal pad-key="pa7" index="0" function="EVSYS_ALT1" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTA"/>
+                <signal pad-key="pc2" index="2" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTC"/>
+                <signal pad-key="pd7" index="3" function="EVSYS_ALT1" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTD"/>
+                <signal pad-key="pf7" index="5" function="EVSYS_ALT1" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTF"/>
             </signals>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="avrdd_fuse">
@@ -146,38 +146,38 @@
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pa2" index="2" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa3" index="3" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa4" index="4" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa5" index="5" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa6" index="6" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa7" index="7" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa0" index="0" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa1" index="1" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa2" index="2" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa3" index="3" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa4" index="4" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa5" index="5" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa6" index="6" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa7" index="7" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pc3" index="3" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc1" index="1" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc2" index="2" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc3" index="3" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pd6" index="6" function="IOPORT" group="PIN"/>
-                <signal pad-id="pd7" index="7" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd4" index="4" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd5" index="5" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd6" index="6" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd7" index="7" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="portf" name="PORTF" module-key="gpio_port">
             <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"/>
+                <signal pad-key="pf6" index="6" function="IOPORT" group="PIN"/>
+                <signal pad-key="pf7" index="7" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="portmux" name="PORTMUX" module-key="avrdd_portmux">
@@ -186,7 +186,7 @@
         <peripheral key="rstctrl" name="RSTCTRL" module-key="rst_integration_v8">
             <register-group-instance register-group-key="rstctrl" address-space-key="data" offset="0x40"/>
             <signals>
-                <signal pad-id="pf6" function="OTHER" group="RESET"/>
+                <signal pad-key="pf6" function="OTHER" group="RESET"/>
             </signals>
         </peripheral>
         <peripheral key="rtc" name="RTC" module-key="tmr_16b_rtc_v1">
@@ -201,24 +201,24 @@
         <peripheral key="spi0" name="SPI0" module-key="spi_8bit_v2">
             <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"/>
-                <signal pad-id="pa6" function="SPI0" group="SCK" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <signal pad-id="pa7" function="SPI0" group="SS" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <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"/>
-                <signal pad-id="pc1" function="SPI0_ALT3" group="SS" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <signal pad-id="pd5" function="SPI0_ALT4" group="MISO" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <signal pad-id="pd4" function="SPI0_ALT4" group="MOSI" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <signal pad-id="pd6" function="SPI0_ALT4" group="SCK" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <signal pad-id="pd7" function="SPI0_ALT4" group="SS" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <signal pad-id="pc1" function="SPI0_ALT5" group="MISO" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <signal pad-id="pc2" function="SPI0_ALT5" group="SCK" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <signal pad-id="pc3" function="SPI0_ALT5" group="SS" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <signal pad-id="pc2" function="SPI0_ALT6" group="MISO" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <signal pad-id="pc1" function="SPI0_ALT6" group="MOSI" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <signal pad-id="pc3" function="SPI0_ALT6" group="SCK" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <signal pad-id="pf7" function="SPI0_ALT6" group="SS" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pa5" function="SPI0" group="MISO" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pa4" function="SPI0" group="MOSI" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pa6" function="SPI0" group="SCK" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pa7" function="SPI0" group="SS" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pa1" function="SPI0_ALT3" group="MISO" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pa0" function="SPI0_ALT3" group="MOSI" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pc1" function="SPI0_ALT3" group="SS" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pd5" function="SPI0_ALT4" group="MISO" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pd4" function="SPI0_ALT4" group="MOSI" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pd6" function="SPI0_ALT4" group="SCK" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pd7" function="SPI0_ALT4" group="SS" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pc1" function="SPI0_ALT5" group="MISO" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pc2" function="SPI0_ALT5" group="SCK" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pc3" function="SPI0_ALT5" group="SS" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pc2" function="SPI0_ALT6" group="MISO" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pc1" function="SPI0_ALT6" group="MOSI" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pc3" function="SPI0_ALT6" group="SCK" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pf7" function="SPI0_ALT6" group="SS" field="PORTMUX.SPIROUTEA.SPI0"/>
             </signals>
         </peripheral>
         <peripheral key="syscfg" name="SYSCFG" module-key="avrdd_syscfg">
@@ -227,29 +227,29 @@
         <peripheral key="tca0" name="TCA0" module-key="tmr_16b_pwm_v1">
             <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"/>
-                <signal pad-id="pa2" index="2" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pa3" index="3" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pa4" index="4" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pa5" index="5" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pc1" index="1" function="TCA0_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pc2" index="2" function="TCA0_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pc3" index="3" function="TCA0_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pd4" index="4" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pd5" index="5" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pa0" index="0" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pa1" index="1" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pa2" index="2" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pa3" index="3" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pa4" index="4" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pa5" index="5" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pc1" index="1" function="TCA0_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pc2" index="2" function="TCA0_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pc3" index="3" function="TCA0_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pd4" index="4" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pd5" index="5" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
             </signals>
         </peripheral>
         <peripheral key="tcb0" name="TCB0" module-key="tmr_16b_capture_v1">
             <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-key="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 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-key="pa3" index="0" function="TCB1" group="WO" field="PORTMUX.TCBROUTEA.TCB1"/>
             </signals>
         </peripheral>
         <peripheral key="tcb2" name="TCB2" module-key="tmr_16b_capture_v1">
@@ -258,63 +258,63 @@
         <peripheral key="tcd0" name="TCD0" module-key="tmr_12b_psc_v1">
             <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"/>
-                <signal pad-id="pa6" index="2" function="TCD0" group="WOC" field="PORTMUX.TCDROUTEA.TCD0"/>
-                <signal pad-id="pa7" index="3" function="TCD0" group="WOD" field="PORTMUX.TCDROUTEA.TCD0"/>
-                <signal pad-id="pa4" function="TCD0_ALT4" group="WOA" field="PORTMUX.TCDROUTEA.TCD0"/>
-                <signal pad-id="pa5" index="1" function="TCD0_ALT4" group="WOB" field="PORTMUX.TCDROUTEA.TCD0"/>
-                <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"/>
+                <signal pad-key="pa4" function="TCD0" group="WOA" field="PORTMUX.TCDROUTEA.TCD0"/>
+                <signal pad-key="pa5" index="1" function="TCD0" group="WOB" field="PORTMUX.TCDROUTEA.TCD0"/>
+                <signal pad-key="pa6" index="2" function="TCD0" group="WOC" field="PORTMUX.TCDROUTEA.TCD0"/>
+                <signal pad-key="pa7" index="3" function="TCD0" group="WOD" field="PORTMUX.TCDROUTEA.TCD0"/>
+                <signal pad-key="pa4" function="TCD0_ALT4" group="WOA" field="PORTMUX.TCDROUTEA.TCD0"/>
+                <signal pad-key="pa5" index="1" function="TCD0_ALT4" group="WOB" field="PORTMUX.TCDROUTEA.TCD0"/>
+                <signal pad-key="pd4" index="2" function="TCD0_ALT4" group="WOC" field="PORTMUX.TCDROUTEA.TCD0"/>
+                <signal pad-key="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 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"/>
-                <signal pad-id="pa2" function="I2C0" group="SDA" field="PORTMUX.TWIROUTEA.TWI0"/>
-                <signal pad-id="pc2" function="I2C0" group="SDA_DUAL" field="PORTMUX.TWIROUTEA.TWI0"/>
-                <signal pad-id="pa3" function="I2C0_ALT1" group="SCL" field="PORTMUX.TWIROUTEA.TWI0"/>
-                <signal pad-id="pa2" function="I2C0_ALT1" group="SDA" field="PORTMUX.TWIROUTEA.TWI0"/>
-                <signal pad-id="pc3" function="I2C0_ALT2" group="SCL" field="PORTMUX.TWIROUTEA.TWI0"/>
-                <signal pad-id="pc2" function="I2C0_ALT2" group="SDA" field="PORTMUX.TWIROUTEA.TWI0"/>
-                <signal pad-id="pa1" function="I2C0_ALT3" group="SCL" field="PORTMUX.TWIROUTEA.TWI0"/>
-                <signal pad-id="pc3" function="I2C0_ALT3" group="SCL_DUAL" field="PORTMUX.TWIROUTEA.TWI0"/>
-                <signal pad-id="pa0" function="I2C0_ALT3" group="SDA" field="PORTMUX.TWIROUTEA.TWI0"/>
-                <signal pad-id="pc2" function="I2C0_ALT3" group="SDA_DUAL" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pa3" function="I2C0" group="SCL" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pc3" function="I2C0" group="SCL_DUAL" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pa2" function="I2C0" group="SDA" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pc2" function="I2C0" group="SDA_DUAL" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pa3" function="I2C0_ALT1" group="SCL" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pa2" function="I2C0_ALT1" group="SDA" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pc3" function="I2C0_ALT2" group="SCL" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pc2" function="I2C0_ALT2" group="SDA" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pa1" function="I2C0_ALT3" group="SCL" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pc3" function="I2C0_ALT3" group="SCL_DUAL" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pa0" function="I2C0_ALT3" group="SDA" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pc2" function="I2C0_ALT3" group="SDA_DUAL" field="PORTMUX.TWIROUTEA.TWI0"/>
             </signals>
         </peripheral>
         <peripheral key="usart0" name="USART0" module-key="uart_autobd_v4">
             <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"/>
-                <signal pad-id="pa2" function="USART0" group="XCK" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pa3" function="USART0" group="XDIR" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pa5" function="USART0_ALT1" group="RXD" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pa4" function="USART0_ALT1" group="TXD" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pa6" function="USART0_ALT1" group="XCK" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pa7" function="USART0_ALT1" group="XDIR" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pa3" function="USART0_ALT2" group="RXD" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pa2" function="USART0_ALT2" group="TXD" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pd5" function="USART0_ALT3" group="RXD" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pd4" function="USART0_ALT3" group="TXD" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pd6" function="USART0_ALT3" group="XCK" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pd7" function="USART0_ALT3" group="XDIR" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pc2" function="USART0_ALT4" group="RXD" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pc1" function="USART0_ALT4" group="TXD" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pc3" function="USART0_ALT4" group="XCK" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa1" function="USART0" group="RXD" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa0" function="USART0" group="TXD" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa2" function="USART0" group="XCK" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa3" function="USART0" group="XDIR" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa5" function="USART0_ALT1" group="RXD" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa4" function="USART0_ALT1" group="TXD" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa6" function="USART0_ALT1" group="XCK" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa7" function="USART0_ALT1" group="XDIR" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa3" function="USART0_ALT2" group="RXD" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa2" function="USART0_ALT2" group="TXD" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pd5" function="USART0_ALT3" group="RXD" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pd4" function="USART0_ALT3" group="TXD" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pd6" function="USART0_ALT3" group="XCK" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pd7" function="USART0_ALT3" group="XDIR" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pc2" function="USART0_ALT4" group="RXD" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pc1" function="USART0_ALT4" group="TXD" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pc3" function="USART0_ALT4" group="XCK" field="PORTMUX.USARTROUTEA.USART0"/>
             </signals>
         </peripheral>
         <peripheral key="usart1" name="USART1" module-key="uart_autobd_v4">
             <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"/>
-                <signal pad-id="pc3" function="USART1" group="XDIR" field="PORTMUX.USARTROUTEA.USART1"/>
-                <signal pad-id="pd7" function="USART1_ALT2" group="RXD" field="PORTMUX.USARTROUTEA.USART1"/>
-                <signal pad-id="pd6" function="USART1_ALT2" group="TXD" field="PORTMUX.USARTROUTEA.USART1"/>
+                <signal pad-key="pc1" function="USART1" group="RXD" field="PORTMUX.USARTROUTEA.USART1"/>
+                <signal pad-key="pc2" function="USART1" group="XCK" field="PORTMUX.USARTROUTEA.USART1"/>
+                <signal pad-key="pc3" function="USART1" group="XDIR" field="PORTMUX.USARTROUTEA.USART1"/>
+                <signal pad-key="pd7" function="USART1_ALT2" group="RXD" field="PORTMUX.USARTROUTEA.USART1"/>
+                <signal pad-key="pd6" function="USART1_ALT2" group="TXD" field="PORTMUX.USARTROUTEA.USART1"/>
             </signals>
         </peripheral>
         <peripheral key="userrow" name="USERROW" module-key="avrdd_userrow">
@@ -341,8 +341,8 @@
         <peripheral key="zcd3" name="ZCD3" module-key="cmp_zxover_ctrl_v3">
             <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"/>
+                <signal pad-key="pc2" function="ZCD3" group="IN" field="PORTMUX.ZCDROUTEA.ZCD3"/>
+                <signal pad-key="pa7" function="ZCD3" group="OUT" field="PORTMUX.ZCDROUTEA.ZCD3"/>
             </signals>
         </peripheral>
     </peripherals>
@@ -1595,31 +1595,53 @@
             </register-group>
         </module>
     </modules>
+    <pads>
+        <pad key="pa4" name="PA4"/>
+        <pad key="pa5" name="PA5"/>
+        <pad key="pa6" name="PA6"/>
+        <pad key="pa7" name="PA7"/>
+        <pad key="pc1" name="PC1"/>
+        <pad key="pc2" name="PC2"/>
+        <pad key="pc3" name="PC3"/>
+        <pad key="vddio2" name="VDDIO2"/>
+        <pad key="pd4" name="PD4"/>
+        <pad key="pd5" name="PD5"/>
+        <pad key="pd6" name="PD6"/>
+        <pad key="pd7" name="PD7"/>
+        <pad key="avdd" name="AVDD"/>
+        <pad key="agnd" name="AGND"/>
+        <pad key="pf6" name="PF6"/>
+        <pad key="pf7" name="PF7"/>
+        <pad key="pa0" name="PA0"/>
+        <pad key="pa1" name="PA1"/>
+        <pad key="pa2" name="PA2"/>
+        <pad key="pa3" name="PA3"/>
+    </pads>
     <pinouts>
         <pinout key="qfn20mvio" name="QFN20MVIO" type="qfn">
-            <pin position="1" pad="PA4"/>
-            <pin position="2" pad="PA5"/>
-            <pin position="3" pad="PA6"/>
-            <pin position="4" pad="PA7"/>
-            <pin position="5" pad="PC1"/>
-            <pin position="6" pad="PC2"/>
-            <pin position="7" pad="PC3"/>
-            <pin position="8" pad="VDDIO2"/>
-            <pin position="9" pad="PD4"/>
-            <pin position="10" pad="PD5"/>
-            <pin position="11" pad="PD6"/>
-            <pin position="12" pad="PD7"/>
-            <pin position="13" pad="AVDD"/>
-            <pin position="14" pad="AGND"/>
-            <pin position="15" pad="PF6"/>
-            <pin position="16" pad="PF7"/>
-            <pin position="17" pad="PA0"/>
-            <pin position="18" pad="PA1"/>
-            <pin position="19" pad="PA2"/>
-            <pin position="20" pad="PA3"/>
+            <pin position="1" pad-key="pa4"/>
+            <pin position="2" pad-key="pa5"/>
+            <pin position="3" pad-key="pa6"/>
+            <pin position="4" pad-key="pa7"/>
+            <pin position="5" pad-key="pc1"/>
+            <pin position="6" pad-key="pc2"/>
+            <pin position="7" pad-key="pc3"/>
+            <pin position="8" pad-key="vddio2"/>
+            <pin position="9" pad-key="pd4"/>
+            <pin position="10" pad-key="pd5"/>
+            <pin position="11" pad-key="pd6"/>
+            <pin position="12" pad-key="pd7"/>
+            <pin position="13" pad-key="avdd"/>
+            <pin position="14" pad-key="agnd"/>
+            <pin position="15" pad-key="pf6"/>
+            <pin position="16" pad-key="pf7"/>
+            <pin position="17" pad-key="pa0"/>
+            <pin position="18" pad-key="pa1"/>
+            <pin position="19" pad-key="pa2"/>
+            <pin position="20" pad-key="pa3"/>
         </pinout>
     </pinouts>
     <variants>
-        <variant name="AVR16DD20" pinout-key="qfn20mvio" package="QFN20"/>
+        <variant key="avr16dd20" name="AVR16DD20" pinout-key="qfn20mvio"/>
     </variants>
 </device>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR16DD28.xml b/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR16DD28.xml
index 52220bab..9ba3e07a 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR16DD28.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR16DD28.xml
@@ -45,37 +45,37 @@
         <peripheral key="ac0" name="AC0" module-key="cmp_control_v8">
             <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"/>
-                <signal pad-id="pc2" index="3" function="AC0" group="N"/>
-                <signal pad-id="pd2" index="0" function="AC0" group="P"/>
-                <signal pad-id="pd6" index="3" function="AC0" group="P"/>
-                <signal pad-id="pc3" index="4" function="AC0" group="P"/>
-                <signal pad-id="pa7" index="0" function="AC0" group="OUT" field="PORTMUX.ACROUTEA.AC0"/>
+                <signal pad-key="pd3" index="0" function="AC0" group="N"/>
+                <signal pad-key="pd7" index="2" function="AC0" group="N"/>
+                <signal pad-key="pc2" index="3" function="AC0" group="N"/>
+                <signal pad-key="pd2" index="0" function="AC0" group="P"/>
+                <signal pad-key="pd6" index="3" function="AC0" group="P"/>
+                <signal pad-key="pc3" index="4" function="AC0" group="P"/>
+                <signal pad-key="pa7" index="0" function="AC0" group="OUT" field="PORTMUX.ACROUTEA.AC0"/>
             </signals>
         </peripheral>
         <peripheral key="adc0" name="ADC0" module-key="adc_12b_diff_ctrl_v1">
             <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"/>
-                <signal pad-id="pd3" index="3" function="AIN0" group="AIN"/>
-                <signal pad-id="pd4" index="4" function="AIN0" group="AIN"/>
-                <signal pad-id="pd5" index="5" function="AIN0" group="AIN"/>
-                <signal pad-id="pd6" index="6" function="AIN0" group="AIN"/>
-                <signal pad-id="pd7" index="7" function="AIN0" group="AIN"/>
-                <signal pad-id="pf0" index="16" function="AIN0" group="AIN"/>
-                <signal pad-id="pf1" index="17" function="AIN0" group="AIN"/>
-                <signal pad-id="pa2" index="22" function="AIN0" group="AIN"/>
-                <signal pad-id="pa3" index="23" function="AIN0" group="AIN"/>
-                <signal pad-id="pa4" index="24" function="AIN0" group="AIN"/>
-                <signal pad-id="pa5" index="25" function="AIN0" group="AIN"/>
-                <signal pad-id="pa6" index="26" function="AIN0" group="AIN"/>
-                <signal pad-id="pa7" index="27" function="AIN0" group="AIN"/>
-                <signal pad-id="pc0" index="28" function="AIN0" group="AIN"/>
-                <signal pad-id="pc1" index="29" function="AIN0" group="AIN"/>
-                <signal pad-id="pc2" index="30" function="AIN0" group="AIN"/>
-                <signal pad-id="pc3" index="31" function="AIN0" group="AIN"/>
+                <signal pad-key="pd1" index="1" function="AIN0" group="AIN"/>
+                <signal pad-key="pd2" index="2" function="AIN0" group="AIN"/>
+                <signal pad-key="pd3" index="3" function="AIN0" group="AIN"/>
+                <signal pad-key="pd4" index="4" function="AIN0" group="AIN"/>
+                <signal pad-key="pd5" index="5" function="AIN0" group="AIN"/>
+                <signal pad-key="pd6" index="6" function="AIN0" group="AIN"/>
+                <signal pad-key="pd7" index="7" function="AIN0" group="AIN"/>
+                <signal pad-key="pf0" index="16" function="AIN0" group="AIN"/>
+                <signal pad-key="pf1" index="17" function="AIN0" group="AIN"/>
+                <signal pad-key="pa2" index="22" function="AIN0" group="AIN"/>
+                <signal pad-key="pa3" index="23" function="AIN0" group="AIN"/>
+                <signal pad-key="pa4" index="24" function="AIN0" group="AIN"/>
+                <signal pad-key="pa5" index="25" function="AIN0" group="AIN"/>
+                <signal pad-key="pa6" index="26" function="AIN0" group="AIN"/>
+                <signal pad-key="pa7" index="27" function="AIN0" group="AIN"/>
+                <signal pad-key="pc0" index="28" function="AIN0" group="AIN"/>
+                <signal pad-key="pc1" index="29" function="AIN0" group="AIN"/>
+                <signal pad-key="pc2" index="30" function="AIN0" group="AIN"/>
+                <signal pad-key="pc3" index="31" function="AIN0" group="AIN"/>
             </signals>
         </peripheral>
         <peripheral key="bod" name="BOD" module-key="bor_lvd_ctrl_v1">
@@ -84,42 +84,42 @@
         <peripheral key="ccl" name="CCL" module-key="cla_ccl_v1">
             <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"/>
-                <signal pad-id="pa2" index="2" function="CCL" group="LUT0_IN" field="PORTMUX.CCLROUTEA.LUT0"/>
-                <signal pad-id="pa3" index="0" function="CCL" group="LUT0_OUT" field="PORTMUX.CCLROUTEA.LUT0"/>
-                <signal pad-id="pa0" index="0" function="CCL_ALT1" group="LUT0_IN" field="PORTMUX.CCLROUTEA.LUT0"/>
-                <signal pad-id="pa1" index="1" function="CCL_ALT1" group="LUT0_IN" field="PORTMUX.CCLROUTEA.LUT0"/>
-                <signal pad-id="pa2" index="2" function="CCL_ALT1" group="LUT0_IN" field="PORTMUX.CCLROUTEA.LUT0"/>
-                <signal pad-id="pa6" index="0" function="CCL_ALT1" group="LUT0_OUT" field="PORTMUX.CCLROUTEA.LUT0"/>
-                <signal pad-id="pc0" index="0" function="CCL" group="LUT1_IN" field="PORTMUX.CCLROUTEA.LUT1"/>
-                <signal pad-id="pc1" index="1" function="CCL" group="LUT1_IN" field="PORTMUX.CCLROUTEA.LUT1"/>
-                <signal pad-id="pc2" index="2" function="CCL" group="LUT1_IN" field="PORTMUX.CCLROUTEA.LUT1"/>
-                <signal pad-id="pc3" index="0" function="CCL" group="LUT1_OUT" field="PORTMUX.CCLROUTEA.LUT1"/>
-                <signal pad-id="pc0" index="0" function="CCL_ALT1" group="LUT1_IN" field="PORTMUX.CCLROUTEA.LUT1"/>
-                <signal pad-id="pc1" index="1" function="CCL_ALT1" group="LUT1_IN" field="PORTMUX.CCLROUTEA.LUT1"/>
-                <signal pad-id="pc2" index="2" function="CCL_ALT1" group="LUT1_IN" field="PORTMUX.CCLROUTEA.LUT1"/>
-                <signal pad-id="pd1" index="1" function="CCL" group="LUT2_IN" field="PORTMUX.CCLROUTEA.LUT2"/>
-                <signal pad-id="pd2" index="2" function="CCL" group="LUT2_IN" field="PORTMUX.CCLROUTEA.LUT2"/>
-                <signal pad-id="pd3" index="0" function="CCL" group="LUT2_OUT" field="PORTMUX.CCLROUTEA.LUT2"/>
-                <signal pad-id="pd1" index="1" function="CCL_ALT1" group="LUT2_IN" field="PORTMUX.CCLROUTEA.LUT2"/>
-                <signal pad-id="pd2" index="2" function="CCL_ALT1" group="LUT2_IN" field="PORTMUX.CCLROUTEA.LUT2"/>
-                <signal pad-id="pd6" index="0" function="CCL_ALT1" group="LUT2_OUT" field="PORTMUX.CCLROUTEA.LUT2"/>
-                <signal pad-id="pf0" index="0" function="CCL" group="LUT3_IN" field="PORTMUX.CCLROUTEA.LUT3"/>
-                <signal pad-id="pf1" index="1" function="CCL" group="LUT3_IN" field="PORTMUX.CCLROUTEA.LUT3"/>
+                <signal pad-key="pa0" index="0" function="CCL" group="LUT0_IN" field="PORTMUX.CCLROUTEA.LUT0"/>
+                <signal pad-key="pa1" index="1" function="CCL" group="LUT0_IN" field="PORTMUX.CCLROUTEA.LUT0"/>
+                <signal pad-key="pa2" index="2" function="CCL" group="LUT0_IN" field="PORTMUX.CCLROUTEA.LUT0"/>
+                <signal pad-key="pa3" index="0" function="CCL" group="LUT0_OUT" field="PORTMUX.CCLROUTEA.LUT0"/>
+                <signal pad-key="pa0" index="0" function="CCL_ALT1" group="LUT0_IN" field="PORTMUX.CCLROUTEA.LUT0"/>
+                <signal pad-key="pa1" index="1" function="CCL_ALT1" group="LUT0_IN" field="PORTMUX.CCLROUTEA.LUT0"/>
+                <signal pad-key="pa2" index="2" function="CCL_ALT1" group="LUT0_IN" field="PORTMUX.CCLROUTEA.LUT0"/>
+                <signal pad-key="pa6" index="0" function="CCL_ALT1" group="LUT0_OUT" field="PORTMUX.CCLROUTEA.LUT0"/>
+                <signal pad-key="pc0" index="0" function="CCL" group="LUT1_IN" field="PORTMUX.CCLROUTEA.LUT1"/>
+                <signal pad-key="pc1" index="1" function="CCL" group="LUT1_IN" field="PORTMUX.CCLROUTEA.LUT1"/>
+                <signal pad-key="pc2" index="2" function="CCL" group="LUT1_IN" field="PORTMUX.CCLROUTEA.LUT1"/>
+                <signal pad-key="pc3" index="0" function="CCL" group="LUT1_OUT" field="PORTMUX.CCLROUTEA.LUT1"/>
+                <signal pad-key="pc0" index="0" function="CCL_ALT1" group="LUT1_IN" field="PORTMUX.CCLROUTEA.LUT1"/>
+                <signal pad-key="pc1" index="1" function="CCL_ALT1" group="LUT1_IN" field="PORTMUX.CCLROUTEA.LUT1"/>
+                <signal pad-key="pc2" index="2" function="CCL_ALT1" group="LUT1_IN" field="PORTMUX.CCLROUTEA.LUT1"/>
+                <signal pad-key="pd1" index="1" function="CCL" group="LUT2_IN" field="PORTMUX.CCLROUTEA.LUT2"/>
+                <signal pad-key="pd2" index="2" function="CCL" group="LUT2_IN" field="PORTMUX.CCLROUTEA.LUT2"/>
+                <signal pad-key="pd3" index="0" function="CCL" group="LUT2_OUT" field="PORTMUX.CCLROUTEA.LUT2"/>
+                <signal pad-key="pd1" index="1" function="CCL_ALT1" group="LUT2_IN" field="PORTMUX.CCLROUTEA.LUT2"/>
+                <signal pad-key="pd2" index="2" function="CCL_ALT1" group="LUT2_IN" field="PORTMUX.CCLROUTEA.LUT2"/>
+                <signal pad-key="pd6" index="0" function="CCL_ALT1" group="LUT2_OUT" field="PORTMUX.CCLROUTEA.LUT2"/>
+                <signal pad-key="pf0" index="0" function="CCL" group="LUT3_IN" field="PORTMUX.CCLROUTEA.LUT3"/>
+                <signal pad-key="pf1" index="1" function="CCL" group="LUT3_IN" field="PORTMUX.CCLROUTEA.LUT3"/>
             </signals>
         </peripheral>
         <peripheral key="clkctrl" name="CLKCTRL" module-key="avrdd_clkctrl">
             <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"/>
-                <signal pad-id="pf0" function="CLKCTRL" group="XTAL32K1"/>
-                <signal pad-id="pf1" function="CLKCTRL" group="XTAL32K2"/>
-                <signal pad-id="pa0" function="CLKCTRL" group="XTALHF1"/>
-                <signal pad-id="pa1" function="CLKCTRL" group="XTALHF2"/>
-                <signal pad-id="pa0" function="CLKCTRL_ALT1" group="XTAL32K1"/>
-                <signal pad-id="pa1" function="CLKCTRL_ALT1" group="XTAL32K2"/>
+                <signal pad-key="pa7" function="CLKCTRL" group="CLKOUT"/>
+                <signal pad-key="pa0" function="CLKCTRL" group="EXTCLK"/>
+                <signal pad-key="pf0" function="CLKCTRL" group="XTAL32K1"/>
+                <signal pad-key="pf1" function="CLKCTRL" group="XTAL32K2"/>
+                <signal pad-key="pa0" function="CLKCTRL" group="XTALHF1"/>
+                <signal pad-key="pa1" function="CLKCTRL" group="XTALHF2"/>
+                <signal pad-key="pa0" function="CLKCTRL_ALT1" group="XTAL32K1"/>
+                <signal pad-key="pa1" function="CLKCTRL_ALT1" group="XTAL32K2"/>
             </signals>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="cpu_avr_xt_v1">
@@ -134,18 +134,18 @@
         <peripheral key="dac0" name="DAC0" module-key="dac_nbit_ctrl_v5">
             <register-group-instance register-group-key="dac" address-space-key="data" offset="0x6A0"/>
             <signals>
-                <signal pad-id="pd6" index="0" function="DAC0" group="OUT"/>
+                <signal pad-key="pd6" index="0" function="DAC0" group="OUT"/>
             </signals>
         </peripheral>
         <peripheral key="evsys" name="EVSYS" module-key="avrdd_evsys">
             <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"/>
-                <signal pad-id="pc2" index="2" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTC"/>
-                <signal pad-id="pd2" index="3" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTD"/>
-                <signal pad-id="pd7" index="3" function="EVSYS_ALT1" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTD"/>
-                <signal pad-id="pf7" index="5" function="EVSYS_ALT1" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTF"/>
+                <signal pad-key="pa2" index="0" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTA"/>
+                <signal pad-key="pa7" index="0" function="EVSYS_ALT1" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTA"/>
+                <signal pad-key="pc2" index="2" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTC"/>
+                <signal pad-key="pd2" index="3" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTD"/>
+                <signal pad-key="pd7" index="3" function="EVSYS_ALT1" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTD"/>
+                <signal pad-key="pf7" index="5" function="EVSYS_ALT1" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTF"/>
             </signals>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="avrdd_fuse">
@@ -166,44 +166,44 @@
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pa2" index="2" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa3" index="3" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa4" index="4" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa5" index="5" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa6" index="6" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa7" index="7" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa0" index="0" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa1" index="1" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa2" index="2" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa3" index="3" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa4" index="4" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa5" index="5" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa6" index="6" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa7" index="7" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pc2" index="2" function="IOPORT" group="PIN"/>
-                <signal pad-id="pc3" index="3" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc0" index="0" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc1" index="1" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc2" index="2" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc3" index="3" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pd3" index="3" function="IOPORT" group="PIN"/>
-                <signal pad-id="pd4" index="4" function="IOPORT" group="PIN"/>
-                <signal pad-id="pd5" index="5" function="IOPORT" group="PIN"/>
-                <signal pad-id="pd6" index="6" function="IOPORT" group="PIN"/>
-                <signal pad-id="pd7" index="7" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd1" index="1" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd2" index="2" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd3" index="3" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd4" index="4" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd5" index="5" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd6" index="6" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd7" index="7" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="portf" name="PORTF" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pf6" index="6" function="IOPORT" group="PIN"/>
-                <signal pad-id="pf7" index="7" function="IOPORT" group="PIN"/>
+                <signal pad-key="pf0" index="0" function="IOPORT" group="PIN"/>
+                <signal pad-key="pf1" index="1" function="IOPORT" group="PIN"/>
+                <signal pad-key="pf6" index="6" function="IOPORT" group="PIN"/>
+                <signal pad-key="pf7" index="7" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="portmux" name="PORTMUX" module-key="avrdd_portmux">
@@ -212,7 +212,7 @@
         <peripheral key="rstctrl" name="RSTCTRL" module-key="rst_integration_v8">
             <register-group-instance register-group-key="rstctrl" address-space-key="data" offset="0x40"/>
             <signals>
-                <signal pad-id="pf6" function="OTHER" group="RESET"/>
+                <signal pad-key="pf6" function="OTHER" group="RESET"/>
             </signals>
         </peripheral>
         <peripheral key="rtc" name="RTC" module-key="tmr_16b_rtc_v1">
@@ -227,26 +227,26 @@
         <peripheral key="spi0" name="SPI0" module-key="spi_8bit_v2">
             <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"/>
-                <signal pad-id="pa6" function="SPI0" group="SCK" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <signal pad-id="pa7" function="SPI0" group="SS" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <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"/>
-                <signal pad-id="pc0" function="SPI0_ALT3" group="SCK" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <signal pad-id="pc1" function="SPI0_ALT3" group="SS" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <signal pad-id="pd5" function="SPI0_ALT4" group="MISO" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <signal pad-id="pd4" function="SPI0_ALT4" group="MOSI" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <signal pad-id="pd6" function="SPI0_ALT4" group="SCK" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <signal pad-id="pd7" function="SPI0_ALT4" group="SS" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <signal pad-id="pc1" function="SPI0_ALT5" group="MISO" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <signal pad-id="pc0" function="SPI0_ALT5" group="MOSI" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <signal pad-id="pc2" function="SPI0_ALT5" group="SCK" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <signal pad-id="pc3" function="SPI0_ALT5" group="SS" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <signal pad-id="pc2" function="SPI0_ALT6" group="MISO" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <signal pad-id="pc1" function="SPI0_ALT6" group="MOSI" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <signal pad-id="pc3" function="SPI0_ALT6" group="SCK" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <signal pad-id="pf7" function="SPI0_ALT6" group="SS" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pa5" function="SPI0" group="MISO" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pa4" function="SPI0" group="MOSI" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pa6" function="SPI0" group="SCK" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pa7" function="SPI0" group="SS" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pa1" function="SPI0_ALT3" group="MISO" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pa0" function="SPI0_ALT3" group="MOSI" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pc0" function="SPI0_ALT3" group="SCK" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pc1" function="SPI0_ALT3" group="SS" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pd5" function="SPI0_ALT4" group="MISO" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pd4" function="SPI0_ALT4" group="MOSI" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pd6" function="SPI0_ALT4" group="SCK" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pd7" function="SPI0_ALT4" group="SS" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pc1" function="SPI0_ALT5" group="MISO" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pc0" function="SPI0_ALT5" group="MOSI" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pc2" function="SPI0_ALT5" group="SCK" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pc3" function="SPI0_ALT5" group="SS" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pc2" function="SPI0_ALT6" group="MISO" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pc1" function="SPI0_ALT6" group="MOSI" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pc3" function="SPI0_ALT6" group="SCK" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pf7" function="SPI0_ALT6" group="SS" field="PORTMUX.SPIROUTEA.SPI0"/>
             </signals>
         </peripheral>
         <peripheral key="syscfg" name="SYSCFG" module-key="avrdd_syscfg">
@@ -255,106 +255,106 @@
         <peripheral key="tca0" name="TCA0" module-key="tmr_16b_pwm_v1">
             <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"/>
-                <signal pad-id="pa2" index="2" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pa3" index="3" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pa4" index="4" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pa5" index="5" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pc0" index="0" function="TCA0_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pc1" index="1" function="TCA0_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pc2" index="2" function="TCA0_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pc3" index="3" function="TCA0_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pd1" index="1" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pd2" index="2" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pd3" index="3" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pd4" index="4" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pd5" index="5" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pf0" index="0" function="TCA0_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pf1" index="1" function="TCA0_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pa0" index="0" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pa1" index="1" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pa2" index="2" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pa3" index="3" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pa4" index="4" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pa5" index="5" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pc0" index="0" function="TCA0_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pc1" index="1" function="TCA0_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pc2" index="2" function="TCA0_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pc3" index="3" function="TCA0_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pd1" index="1" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pd2" index="2" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pd3" index="3" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pd4" index="4" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pd5" index="5" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pf0" index="0" function="TCA0_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pf1" index="1" function="TCA0_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
             </signals>
         </peripheral>
         <peripheral key="tcb0" name="TCB0" module-key="tmr_16b_capture_v1">
             <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-key="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 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-key="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 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"/>
+                <signal pad-key="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 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"/>
-                <signal pad-id="pa6" index="2" function="TCD0" group="WOC" field="PORTMUX.TCDROUTEA.TCD0"/>
-                <signal pad-id="pa7" index="3" function="TCD0" group="WOD" field="PORTMUX.TCDROUTEA.TCD0"/>
-                <signal pad-id="pf0" function="TCD0_ALT2" group="WOA" field="PORTMUX.TCDROUTEA.TCD0"/>
-                <signal pad-id="pf1" index="1" function="TCD0_ALT2" group="WOB" field="PORTMUX.TCDROUTEA.TCD0"/>
-                <signal pad-id="pa4" function="TCD0_ALT4" group="WOA" field="PORTMUX.TCDROUTEA.TCD0"/>
-                <signal pad-id="pa5" index="1" function="TCD0_ALT4" group="WOB" field="PORTMUX.TCDROUTEA.TCD0"/>
-                <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"/>
+                <signal pad-key="pa4" function="TCD0" group="WOA" field="PORTMUX.TCDROUTEA.TCD0"/>
+                <signal pad-key="pa5" index="1" function="TCD0" group="WOB" field="PORTMUX.TCDROUTEA.TCD0"/>
+                <signal pad-key="pa6" index="2" function="TCD0" group="WOC" field="PORTMUX.TCDROUTEA.TCD0"/>
+                <signal pad-key="pa7" index="3" function="TCD0" group="WOD" field="PORTMUX.TCDROUTEA.TCD0"/>
+                <signal pad-key="pf0" function="TCD0_ALT2" group="WOA" field="PORTMUX.TCDROUTEA.TCD0"/>
+                <signal pad-key="pf1" index="1" function="TCD0_ALT2" group="WOB" field="PORTMUX.TCDROUTEA.TCD0"/>
+                <signal pad-key="pa4" function="TCD0_ALT4" group="WOA" field="PORTMUX.TCDROUTEA.TCD0"/>
+                <signal pad-key="pa5" index="1" function="TCD0_ALT4" group="WOB" field="PORTMUX.TCDROUTEA.TCD0"/>
+                <signal pad-key="pd4" index="2" function="TCD0_ALT4" group="WOC" field="PORTMUX.TCDROUTEA.TCD0"/>
+                <signal pad-key="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 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"/>
-                <signal pad-id="pa2" function="I2C0" group="SDA" field="PORTMUX.TWIROUTEA.TWI0"/>
-                <signal pad-id="pc2" function="I2C0" group="SDA_DUAL" field="PORTMUX.TWIROUTEA.TWI0"/>
-                <signal pad-id="pa3" function="I2C0_ALT1" group="SCL" field="PORTMUX.TWIROUTEA.TWI0"/>
-                <signal pad-id="pa2" function="I2C0_ALT1" group="SDA" field="PORTMUX.TWIROUTEA.TWI0"/>
-                <signal pad-id="pc3" function="I2C0_ALT2" group="SCL" field="PORTMUX.TWIROUTEA.TWI0"/>
-                <signal pad-id="pc2" function="I2C0_ALT2" group="SDA" field="PORTMUX.TWIROUTEA.TWI0"/>
-                <signal pad-id="pa1" function="I2C0_ALT3" group="SCL" field="PORTMUX.TWIROUTEA.TWI0"/>
-                <signal pad-id="pc3" function="I2C0_ALT3" group="SCL_DUAL" field="PORTMUX.TWIROUTEA.TWI0"/>
-                <signal pad-id="pa0" function="I2C0_ALT3" group="SDA" field="PORTMUX.TWIROUTEA.TWI0"/>
-                <signal pad-id="pc2" function="I2C0_ALT3" group="SDA_DUAL" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pa3" function="I2C0" group="SCL" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pc3" function="I2C0" group="SCL_DUAL" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pa2" function="I2C0" group="SDA" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pc2" function="I2C0" group="SDA_DUAL" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pa3" function="I2C0_ALT1" group="SCL" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pa2" function="I2C0_ALT1" group="SDA" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pc3" function="I2C0_ALT2" group="SCL" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pc2" function="I2C0_ALT2" group="SDA" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pa1" function="I2C0_ALT3" group="SCL" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pc3" function="I2C0_ALT3" group="SCL_DUAL" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pa0" function="I2C0_ALT3" group="SDA" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pc2" function="I2C0_ALT3" group="SDA_DUAL" field="PORTMUX.TWIROUTEA.TWI0"/>
             </signals>
         </peripheral>
         <peripheral key="usart0" name="USART0" module-key="uart_autobd_v4">
             <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"/>
-                <signal pad-id="pa2" function="USART0" group="XCK" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pa3" function="USART0" group="XDIR" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pa5" function="USART0_ALT1" group="RXD" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pa4" function="USART0_ALT1" group="TXD" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pa6" function="USART0_ALT1" group="XCK" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pa7" function="USART0_ALT1" group="XDIR" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pa3" function="USART0_ALT2" group="RXD" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pa2" function="USART0_ALT2" group="TXD" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pd5" function="USART0_ALT3" group="RXD" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pd4" function="USART0_ALT3" group="TXD" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pd6" function="USART0_ALT3" group="XCK" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pd7" function="USART0_ALT3" group="XDIR" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pc2" function="USART0_ALT4" group="RXD" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pc1" function="USART0_ALT4" group="TXD" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pc3" function="USART0_ALT4" group="XCK" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa1" function="USART0" group="RXD" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa0" function="USART0" group="TXD" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa2" function="USART0" group="XCK" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa3" function="USART0" group="XDIR" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa5" function="USART0_ALT1" group="RXD" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa4" function="USART0_ALT1" group="TXD" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa6" function="USART0_ALT1" group="XCK" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa7" function="USART0_ALT1" group="XDIR" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa3" function="USART0_ALT2" group="RXD" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa2" function="USART0_ALT2" group="TXD" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pd5" function="USART0_ALT3" group="RXD" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pd4" function="USART0_ALT3" group="TXD" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pd6" function="USART0_ALT3" group="XCK" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pd7" function="USART0_ALT3" group="XDIR" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pc2" function="USART0_ALT4" group="RXD" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pc1" function="USART0_ALT4" group="TXD" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pc3" function="USART0_ALT4" group="XCK" field="PORTMUX.USARTROUTEA.USART0"/>
             </signals>
         </peripheral>
         <peripheral key="usart1" name="USART1" module-key="uart_autobd_v4">
             <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"/>
-                <signal pad-id="pc2" function="USART1" group="XCK" field="PORTMUX.USARTROUTEA.USART1"/>
-                <signal pad-id="pc3" function="USART1" group="XDIR" field="PORTMUX.USARTROUTEA.USART1"/>
-                <signal pad-id="pd7" function="USART1_ALT2" group="RXD" field="PORTMUX.USARTROUTEA.USART1"/>
-                <signal pad-id="pd6" function="USART1_ALT2" group="TXD" field="PORTMUX.USARTROUTEA.USART1"/>
+                <signal pad-key="pc1" function="USART1" group="RXD" field="PORTMUX.USARTROUTEA.USART1"/>
+                <signal pad-key="pc0" function="USART1" group="TXD" field="PORTMUX.USARTROUTEA.USART1"/>
+                <signal pad-key="pc2" function="USART1" group="XCK" field="PORTMUX.USARTROUTEA.USART1"/>
+                <signal pad-key="pc3" function="USART1" group="XDIR" field="PORTMUX.USARTROUTEA.USART1"/>
+                <signal pad-key="pd7" function="USART1_ALT2" group="RXD" field="PORTMUX.USARTROUTEA.USART1"/>
+                <signal pad-key="pd6" function="USART1_ALT2" group="TXD" field="PORTMUX.USARTROUTEA.USART1"/>
             </signals>
         </peripheral>
         <peripheral key="userrow" name="USERROW" module-key="avrdd_userrow">
@@ -381,8 +381,8 @@
         <peripheral key="zcd3" name="ZCD3" module-key="cmp_zxover_ctrl_v3">
             <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"/>
+                <signal pad-key="pc2" function="ZCD3" group="IN" field="PORTMUX.ZCDROUTEA.ZCD3"/>
+                <signal pad-key="pa7" function="ZCD3" group="OUT" field="PORTMUX.ZCDROUTEA.ZCD3"/>
             </signals>
         </peripheral>
     </peripherals>
@@ -1636,39 +1636,69 @@
             </register-group>
         </module>
     </modules>
+    <pads>
+        <pad key="pa7" name="PA7"/>
+        <pad key="pc0" name="PC0"/>
+        <pad key="pc1" name="PC1"/>
+        <pad key="pc2" name="PC2"/>
+        <pad key="pc3" name="PC3"/>
+        <pad key="vddio2" name="VDDIO2"/>
+        <pad key="pd1" name="PD1"/>
+        <pad key="pd2" name="PD2"/>
+        <pad key="pd3" name="PD3"/>
+        <pad key="pd4" name="PD4"/>
+        <pad key="pd5" name="PD5"/>
+        <pad key="pd6" name="PD6"/>
+        <pad key="pd7" name="PD7"/>
+        <pad key="avdd" name="AVDD"/>
+        <pad key="agnd" name="AGND"/>
+        <pad key="pf0" name="PF0"/>
+        <pad key="pf1" name="PF1"/>
+        <pad key="pf6" name="PF6"/>
+        <pad key="pf7" name="PF7"/>
+        <pad key="vdd0" name="VDD0"/>
+        <pad key="gnd0" name="GND0"/>
+        <pad key="pa0" name="PA0"/>
+        <pad key="pa1" name="PA1"/>
+        <pad key="pa2" name="PA2"/>
+        <pad key="pa3" name="PA3"/>
+        <pad key="pa4" name="PA4"/>
+        <pad key="pa5" name="PA5"/>
+        <pad key="pa6" name="PA6"/>
+    </pads>
     <pinouts>
         <pinout key="soic28mvio" name="SOIC28MVIO" type="soic">
-            <pin position="1" pad="PA7"/>
-            <pin position="2" pad="PC0"/>
-            <pin position="3" pad="PC1"/>
-            <pin position="4" pad="PC2"/>
-            <pin position="5" pad="PC3"/>
-            <pin position="6" pad="VDDIO2"/>
-            <pin position="7" pad="PD1"/>
-            <pin position="8" pad="PD2"/>
-            <pin position="9" pad="PD3"/>
-            <pin position="10" pad="PD4"/>
-            <pin position="11" pad="PD5"/>
-            <pin position="12" pad="PD6"/>
-            <pin position="13" pad="PD7"/>
-            <pin position="14" pad="AVDD"/>
-            <pin position="15" pad="AGND"/>
-            <pin position="16" pad="PF0"/>
-            <pin position="17" pad="PF1"/>
-            <pin position="18" pad="PF6"/>
-            <pin position="19" pad="PF7"/>
-            <pin position="20" pad="VDD0"/>
-            <pin position="21" pad="GND0"/>
-            <pin position="22" pad="PA0"/>
-            <pin position="23" pad="PA1"/>
-            <pin position="24" pad="PA2"/>
-            <pin position="25" pad="PA3"/>
-            <pin position="26" pad="PA4"/>
-            <pin position="27" pad="PA5"/>
-            <pin position="28" pad="PA6"/>
+            <pin position="1" pad-key="pa7"/>
+            <pin position="2" pad-key="pc0"/>
+            <pin position="3" pad-key="pc1"/>
+            <pin position="4" pad-key="pc2"/>
+            <pin position="5" pad-key="pc3"/>
+            <pin position="6" pad-key="vddio2"/>
+            <pin position="7" pad-key="pd1"/>
+            <pin position="8" pad-key="pd2"/>
+            <pin position="9" pad-key="pd3"/>
+            <pin position="10" pad-key="pd4"/>
+            <pin position="11" pad-key="pd5"/>
+            <pin position="12" pad-key="pd6"/>
+            <pin position="13" pad-key="pd7"/>
+            <pin position="14" pad-key="avdd"/>
+            <pin position="15" pad-key="agnd"/>
+            <pin position="16" pad-key="pf0"/>
+            <pin position="17" pad-key="pf1"/>
+            <pin position="18" pad-key="pf6"/>
+            <pin position="19" pad-key="pf7"/>
+            <pin position="20" pad-key="vdd0"/>
+            <pin position="21" pad-key="gnd0"/>
+            <pin position="22" pad-key="pa0"/>
+            <pin position="23" pad-key="pa1"/>
+            <pin position="24" pad-key="pa2"/>
+            <pin position="25" pad-key="pa3"/>
+            <pin position="26" pad-key="pa4"/>
+            <pin position="27" pad-key="pa5"/>
+            <pin position="28" pad-key="pa6"/>
         </pinout>
     </pinouts>
     <variants>
-        <variant name="AVR16DD28" pinout-key="soic28mvio" package="SOIC28"/>
+        <variant key="avr16dd28" name="AVR16DD28" pinout-key="soic28mvio"/>
     </variants>
 </device>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR16DD32.xml b/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR16DD32.xml
index a7cb64bc..9b30fbe6 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR16DD32.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR16DD32.xml
@@ -45,41 +45,41 @@
         <peripheral key="ac0" name="AC0" module-key="cmp_control_v8">
             <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"/>
-                <signal pad-id="pc2" index="3" function="AC0" group="N"/>
-                <signal pad-id="pd2" index="0" function="AC0" group="P"/>
-                <signal pad-id="pd6" index="3" function="AC0" group="P"/>
-                <signal pad-id="pc3" index="4" function="AC0" group="P"/>
-                <signal pad-id="pa7" index="0" function="AC0" group="OUT" field="PORTMUX.ACROUTEA.AC0"/>
+                <signal pad-key="pd3" index="0" function="AC0" group="N"/>
+                <signal pad-key="pd7" index="2" function="AC0" group="N"/>
+                <signal pad-key="pc2" index="3" function="AC0" group="N"/>
+                <signal pad-key="pd2" index="0" function="AC0" group="P"/>
+                <signal pad-key="pd6" index="3" function="AC0" group="P"/>
+                <signal pad-key="pc3" index="4" function="AC0" group="P"/>
+                <signal pad-key="pa7" index="0" function="AC0" group="OUT" field="PORTMUX.ACROUTEA.AC0"/>
             </signals>
         </peripheral>
         <peripheral key="adc0" name="ADC0" module-key="adc_12b_diff_ctrl_v1">
             <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"/>
-                <signal pad-id="pd3" index="3" function="AIN0" group="AIN"/>
-                <signal pad-id="pd4" index="4" function="AIN0" group="AIN"/>
-                <signal pad-id="pd5" index="5" function="AIN0" group="AIN"/>
-                <signal pad-id="pd6" index="6" function="AIN0" group="AIN"/>
-                <signal pad-id="pd7" index="7" function="AIN0" group="AIN"/>
-                <signal pad-id="pf0" index="16" function="AIN0" group="AIN"/>
-                <signal pad-id="pf1" index="17" function="AIN0" group="AIN"/>
-                <signal pad-id="pf2" index="18" function="AIN0" group="AIN"/>
-                <signal pad-id="pf3" index="19" function="AIN0" group="AIN"/>
-                <signal pad-id="pf4" index="20" function="AIN0" group="AIN"/>
-                <signal pad-id="pf5" index="21" function="AIN0" group="AIN"/>
-                <signal pad-id="pa2" index="22" function="AIN0" group="AIN"/>
-                <signal pad-id="pa3" index="23" function="AIN0" group="AIN"/>
-                <signal pad-id="pa4" index="24" function="AIN0" group="AIN"/>
-                <signal pad-id="pa5" index="25" function="AIN0" group="AIN"/>
-                <signal pad-id="pa6" index="26" function="AIN0" group="AIN"/>
-                <signal pad-id="pa7" index="27" function="AIN0" group="AIN"/>
-                <signal pad-id="pc0" index="28" function="AIN0" group="AIN"/>
-                <signal pad-id="pc1" index="29" function="AIN0" group="AIN"/>
-                <signal pad-id="pc2" index="30" function="AIN0" group="AIN"/>
-                <signal pad-id="pc3" index="31" function="AIN0" group="AIN"/>
+                <signal pad-key="pd1" index="1" function="AIN0" group="AIN"/>
+                <signal pad-key="pd2" index="2" function="AIN0" group="AIN"/>
+                <signal pad-key="pd3" index="3" function="AIN0" group="AIN"/>
+                <signal pad-key="pd4" index="4" function="AIN0" group="AIN"/>
+                <signal pad-key="pd5" index="5" function="AIN0" group="AIN"/>
+                <signal pad-key="pd6" index="6" function="AIN0" group="AIN"/>
+                <signal pad-key="pd7" index="7" function="AIN0" group="AIN"/>
+                <signal pad-key="pf0" index="16" function="AIN0" group="AIN"/>
+                <signal pad-key="pf1" index="17" function="AIN0" group="AIN"/>
+                <signal pad-key="pf2" index="18" function="AIN0" group="AIN"/>
+                <signal pad-key="pf3" index="19" function="AIN0" group="AIN"/>
+                <signal pad-key="pf4" index="20" function="AIN0" group="AIN"/>
+                <signal pad-key="pf5" index="21" function="AIN0" group="AIN"/>
+                <signal pad-key="pa2" index="22" function="AIN0" group="AIN"/>
+                <signal pad-key="pa3" index="23" function="AIN0" group="AIN"/>
+                <signal pad-key="pa4" index="24" function="AIN0" group="AIN"/>
+                <signal pad-key="pa5" index="25" function="AIN0" group="AIN"/>
+                <signal pad-key="pa6" index="26" function="AIN0" group="AIN"/>
+                <signal pad-key="pa7" index="27" function="AIN0" group="AIN"/>
+                <signal pad-key="pc0" index="28" function="AIN0" group="AIN"/>
+                <signal pad-key="pc1" index="29" function="AIN0" group="AIN"/>
+                <signal pad-key="pc2" index="30" function="AIN0" group="AIN"/>
+                <signal pad-key="pc3" index="31" function="AIN0" group="AIN"/>
             </signals>
         </peripheral>
         <peripheral key="bod" name="BOD" module-key="bor_lvd_ctrl_v1">
@@ -88,44 +88,44 @@
         <peripheral key="ccl" name="CCL" module-key="cla_ccl_v1">
             <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"/>
-                <signal pad-id="pa2" index="2" function="CCL" group="LUT0_IN" field="PORTMUX.CCLROUTEA.LUT0"/>
-                <signal pad-id="pa3" index="0" function="CCL" group="LUT0_OUT" field="PORTMUX.CCLROUTEA.LUT0"/>
-                <signal pad-id="pa0" index="0" function="CCL_ALT1" group="LUT0_IN" field="PORTMUX.CCLROUTEA.LUT0"/>
-                <signal pad-id="pa1" index="1" function="CCL_ALT1" group="LUT0_IN" field="PORTMUX.CCLROUTEA.LUT0"/>
-                <signal pad-id="pa2" index="2" function="CCL_ALT1" group="LUT0_IN" field="PORTMUX.CCLROUTEA.LUT0"/>
-                <signal pad-id="pa6" index="0" function="CCL_ALT1" group="LUT0_OUT" field="PORTMUX.CCLROUTEA.LUT0"/>
-                <signal pad-id="pc0" index="0" function="CCL" group="LUT1_IN" field="PORTMUX.CCLROUTEA.LUT1"/>
-                <signal pad-id="pc1" index="1" function="CCL" group="LUT1_IN" field="PORTMUX.CCLROUTEA.LUT1"/>
-                <signal pad-id="pc2" index="2" function="CCL" group="LUT1_IN" field="PORTMUX.CCLROUTEA.LUT1"/>
-                <signal pad-id="pc3" index="0" function="CCL" group="LUT1_OUT" field="PORTMUX.CCLROUTEA.LUT1"/>
-                <signal pad-id="pc0" index="0" function="CCL_ALT1" group="LUT1_IN" field="PORTMUX.CCLROUTEA.LUT1"/>
-                <signal pad-id="pc1" index="1" function="CCL_ALT1" group="LUT1_IN" field="PORTMUX.CCLROUTEA.LUT1"/>
-                <signal pad-id="pc2" index="2" function="CCL_ALT1" group="LUT1_IN" field="PORTMUX.CCLROUTEA.LUT1"/>
-                <signal pad-id="pd1" index="1" function="CCL" group="LUT2_IN" field="PORTMUX.CCLROUTEA.LUT2"/>
-                <signal pad-id="pd2" index="2" function="CCL" group="LUT2_IN" field="PORTMUX.CCLROUTEA.LUT2"/>
-                <signal pad-id="pd3" index="0" function="CCL" group="LUT2_OUT" field="PORTMUX.CCLROUTEA.LUT2"/>
-                <signal pad-id="pd1" index="1" function="CCL_ALT1" group="LUT2_IN" field="PORTMUX.CCLROUTEA.LUT2"/>
-                <signal pad-id="pd2" index="2" function="CCL_ALT1" group="LUT2_IN" field="PORTMUX.CCLROUTEA.LUT2"/>
-                <signal pad-id="pd6" index="0" function="CCL_ALT1" group="LUT2_OUT" field="PORTMUX.CCLROUTEA.LUT2"/>
-                <signal pad-id="pf0" index="0" function="CCL" group="LUT3_IN" field="PORTMUX.CCLROUTEA.LUT3"/>
-                <signal pad-id="pf1" index="1" function="CCL" group="LUT3_IN" field="PORTMUX.CCLROUTEA.LUT3"/>
-                <signal pad-id="pf2" index="2" function="CCL" group="LUT3_IN" field="PORTMUX.CCLROUTEA.LUT3"/>
-                <signal pad-id="pf3" index="0" function="CCL" group="LUT3_OUT" field="PORTMUX.CCLROUTEA.LUT3"/>
+                <signal pad-key="pa0" index="0" function="CCL" group="LUT0_IN" field="PORTMUX.CCLROUTEA.LUT0"/>
+                <signal pad-key="pa1" index="1" function="CCL" group="LUT0_IN" field="PORTMUX.CCLROUTEA.LUT0"/>
+                <signal pad-key="pa2" index="2" function="CCL" group="LUT0_IN" field="PORTMUX.CCLROUTEA.LUT0"/>
+                <signal pad-key="pa3" index="0" function="CCL" group="LUT0_OUT" field="PORTMUX.CCLROUTEA.LUT0"/>
+                <signal pad-key="pa0" index="0" function="CCL_ALT1" group="LUT0_IN" field="PORTMUX.CCLROUTEA.LUT0"/>
+                <signal pad-key="pa1" index="1" function="CCL_ALT1" group="LUT0_IN" field="PORTMUX.CCLROUTEA.LUT0"/>
+                <signal pad-key="pa2" index="2" function="CCL_ALT1" group="LUT0_IN" field="PORTMUX.CCLROUTEA.LUT0"/>
+                <signal pad-key="pa6" index="0" function="CCL_ALT1" group="LUT0_OUT" field="PORTMUX.CCLROUTEA.LUT0"/>
+                <signal pad-key="pc0" index="0" function="CCL" group="LUT1_IN" field="PORTMUX.CCLROUTEA.LUT1"/>
+                <signal pad-key="pc1" index="1" function="CCL" group="LUT1_IN" field="PORTMUX.CCLROUTEA.LUT1"/>
+                <signal pad-key="pc2" index="2" function="CCL" group="LUT1_IN" field="PORTMUX.CCLROUTEA.LUT1"/>
+                <signal pad-key="pc3" index="0" function="CCL" group="LUT1_OUT" field="PORTMUX.CCLROUTEA.LUT1"/>
+                <signal pad-key="pc0" index="0" function="CCL_ALT1" group="LUT1_IN" field="PORTMUX.CCLROUTEA.LUT1"/>
+                <signal pad-key="pc1" index="1" function="CCL_ALT1" group="LUT1_IN" field="PORTMUX.CCLROUTEA.LUT1"/>
+                <signal pad-key="pc2" index="2" function="CCL_ALT1" group="LUT1_IN" field="PORTMUX.CCLROUTEA.LUT1"/>
+                <signal pad-key="pd1" index="1" function="CCL" group="LUT2_IN" field="PORTMUX.CCLROUTEA.LUT2"/>
+                <signal pad-key="pd2" index="2" function="CCL" group="LUT2_IN" field="PORTMUX.CCLROUTEA.LUT2"/>
+                <signal pad-key="pd3" index="0" function="CCL" group="LUT2_OUT" field="PORTMUX.CCLROUTEA.LUT2"/>
+                <signal pad-key="pd1" index="1" function="CCL_ALT1" group="LUT2_IN" field="PORTMUX.CCLROUTEA.LUT2"/>
+                <signal pad-key="pd2" index="2" function="CCL_ALT1" group="LUT2_IN" field="PORTMUX.CCLROUTEA.LUT2"/>
+                <signal pad-key="pd6" index="0" function="CCL_ALT1" group="LUT2_OUT" field="PORTMUX.CCLROUTEA.LUT2"/>
+                <signal pad-key="pf0" index="0" function="CCL" group="LUT3_IN" field="PORTMUX.CCLROUTEA.LUT3"/>
+                <signal pad-key="pf1" index="1" function="CCL" group="LUT3_IN" field="PORTMUX.CCLROUTEA.LUT3"/>
+                <signal pad-key="pf2" index="2" function="CCL" group="LUT3_IN" field="PORTMUX.CCLROUTEA.LUT3"/>
+                <signal pad-key="pf3" index="0" function="CCL" group="LUT3_OUT" field="PORTMUX.CCLROUTEA.LUT3"/>
             </signals>
         </peripheral>
         <peripheral key="clkctrl" name="CLKCTRL" module-key="avrdd_clkctrl">
             <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"/>
-                <signal pad-id="pf0" function="CLKCTRL" group="XTAL32K1"/>
-                <signal pad-id="pf1" function="CLKCTRL" group="XTAL32K2"/>
-                <signal pad-id="pa0" function="CLKCTRL" group="XTALHF1"/>
-                <signal pad-id="pa1" function="CLKCTRL" group="XTALHF2"/>
-                <signal pad-id="pa0" function="CLKCTRL_ALT1" group="XTAL32K1"/>
-                <signal pad-id="pa1" function="CLKCTRL_ALT1" group="XTAL32K2"/>
+                <signal pad-key="pa7" function="CLKCTRL" group="CLKOUT"/>
+                <signal pad-key="pa0" function="CLKCTRL" group="EXTCLK"/>
+                <signal pad-key="pf0" function="CLKCTRL" group="XTAL32K1"/>
+                <signal pad-key="pf1" function="CLKCTRL" group="XTAL32K2"/>
+                <signal pad-key="pa0" function="CLKCTRL" group="XTALHF1"/>
+                <signal pad-key="pa1" function="CLKCTRL" group="XTALHF2"/>
+                <signal pad-key="pa0" function="CLKCTRL_ALT1" group="XTAL32K1"/>
+                <signal pad-key="pa1" function="CLKCTRL_ALT1" group="XTAL32K2"/>
             </signals>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="cpu_avr_xt_v1">
@@ -140,19 +140,19 @@
         <peripheral key="dac0" name="DAC0" module-key="dac_nbit_ctrl_v5">
             <register-group-instance register-group-key="dac" address-space-key="data" offset="0x6A0"/>
             <signals>
-                <signal pad-id="pd6" index="0" function="DAC0" group="OUT"/>
+                <signal pad-key="pd6" index="0" function="DAC0" group="OUT"/>
             </signals>
         </peripheral>
         <peripheral key="evsys" name="EVSYS" module-key="avrdd_evsys">
             <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"/>
-                <signal pad-id="pc2" index="2" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTC"/>
-                <signal pad-id="pd2" index="3" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTD"/>
-                <signal pad-id="pd7" index="3" function="EVSYS_ALT1" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTD"/>
-                <signal pad-id="pf2" index="5" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTF"/>
-                <signal pad-id="pf7" index="5" function="EVSYS_ALT1" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTF"/>
+                <signal pad-key="pa2" index="0" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTA"/>
+                <signal pad-key="pa7" index="0" function="EVSYS_ALT1" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTA"/>
+                <signal pad-key="pc2" index="2" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTC"/>
+                <signal pad-key="pd2" index="3" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTD"/>
+                <signal pad-key="pd7" index="3" function="EVSYS_ALT1" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTD"/>
+                <signal pad-key="pf2" index="5" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTF"/>
+                <signal pad-key="pf7" index="5" function="EVSYS_ALT1" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTF"/>
             </signals>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="avrdd_fuse">
@@ -173,48 +173,48 @@
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pa2" index="2" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa3" index="3" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa4" index="4" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa5" index="5" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa6" index="6" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa7" index="7" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa0" index="0" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa1" index="1" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa2" index="2" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa3" index="3" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa4" index="4" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa5" index="5" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa6" index="6" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa7" index="7" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pc2" index="2" function="IOPORT" group="PIN"/>
-                <signal pad-id="pc3" index="3" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc0" index="0" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc1" index="1" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc2" index="2" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc3" index="3" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pd3" index="3" function="IOPORT" group="PIN"/>
-                <signal pad-id="pd4" index="4" function="IOPORT" group="PIN"/>
-                <signal pad-id="pd5" index="5" function="IOPORT" group="PIN"/>
-                <signal pad-id="pd6" index="6" function="IOPORT" group="PIN"/>
-                <signal pad-id="pd7" index="7" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd1" index="1" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd2" index="2" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd3" index="3" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd4" index="4" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd5" index="5" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd6" index="6" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd7" index="7" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="portf" name="PORTF" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pf2" index="2" function="IOPORT" group="PIN"/>
-                <signal pad-id="pf3" index="3" function="IOPORT" group="PIN"/>
-                <signal pad-id="pf4" index="4" function="IOPORT" group="PIN"/>
-                <signal pad-id="pf5" index="5" function="IOPORT" group="PIN"/>
-                <signal pad-id="pf6" index="6" function="IOPORT" group="PIN"/>
-                <signal pad-id="pf7" index="7" function="IOPORT" group="PIN"/>
+                <signal pad-key="pf0" index="0" function="IOPORT" group="PIN"/>
+                <signal pad-key="pf1" index="1" function="IOPORT" group="PIN"/>
+                <signal pad-key="pf2" index="2" function="IOPORT" group="PIN"/>
+                <signal pad-key="pf3" index="3" function="IOPORT" group="PIN"/>
+                <signal pad-key="pf4" index="4" function="IOPORT" group="PIN"/>
+                <signal pad-key="pf5" index="5" function="IOPORT" group="PIN"/>
+                <signal pad-key="pf6" index="6" function="IOPORT" group="PIN"/>
+                <signal pad-key="pf7" index="7" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="portmux" name="PORTMUX" module-key="avrdd_portmux">
@@ -223,7 +223,7 @@
         <peripheral key="rstctrl" name="RSTCTRL" module-key="rst_integration_v8">
             <register-group-instance register-group-key="rstctrl" address-space-key="data" offset="0x40"/>
             <signals>
-                <signal pad-id="pf6" function="OTHER" group="RESET"/>
+                <signal pad-key="pf6" function="OTHER" group="RESET"/>
             </signals>
         </peripheral>
         <peripheral key="rtc" name="RTC" module-key="tmr_16b_rtc_v1">
@@ -238,26 +238,26 @@
         <peripheral key="spi0" name="SPI0" module-key="spi_8bit_v2">
             <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"/>
-                <signal pad-id="pa6" function="SPI0" group="SCK" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <signal pad-id="pa7" function="SPI0" group="SS" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <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"/>
-                <signal pad-id="pc0" function="SPI0_ALT3" group="SCK" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <signal pad-id="pc1" function="SPI0_ALT3" group="SS" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <signal pad-id="pd5" function="SPI0_ALT4" group="MISO" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <signal pad-id="pd4" function="SPI0_ALT4" group="MOSI" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <signal pad-id="pd6" function="SPI0_ALT4" group="SCK" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <signal pad-id="pd7" function="SPI0_ALT4" group="SS" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <signal pad-id="pc1" function="SPI0_ALT5" group="MISO" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <signal pad-id="pc0" function="SPI0_ALT5" group="MOSI" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <signal pad-id="pc2" function="SPI0_ALT5" group="SCK" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <signal pad-id="pc3" function="SPI0_ALT5" group="SS" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <signal pad-id="pc2" function="SPI0_ALT6" group="MISO" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <signal pad-id="pc1" function="SPI0_ALT6" group="MOSI" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <signal pad-id="pc3" function="SPI0_ALT6" group="SCK" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <signal pad-id="pf7" function="SPI0_ALT6" group="SS" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pa5" function="SPI0" group="MISO" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pa4" function="SPI0" group="MOSI" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pa6" function="SPI0" group="SCK" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pa7" function="SPI0" group="SS" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pa1" function="SPI0_ALT3" group="MISO" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pa0" function="SPI0_ALT3" group="MOSI" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pc0" function="SPI0_ALT3" group="SCK" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pc1" function="SPI0_ALT3" group="SS" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pd5" function="SPI0_ALT4" group="MISO" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pd4" function="SPI0_ALT4" group="MOSI" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pd6" function="SPI0_ALT4" group="SCK" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pd7" function="SPI0_ALT4" group="SS" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pc1" function="SPI0_ALT5" group="MISO" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pc0" function="SPI0_ALT5" group="MOSI" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pc2" function="SPI0_ALT5" group="SCK" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pc3" function="SPI0_ALT5" group="SS" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pc2" function="SPI0_ALT6" group="MISO" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pc1" function="SPI0_ALT6" group="MOSI" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pc3" function="SPI0_ALT6" group="SCK" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pf7" function="SPI0_ALT6" group="SS" field="PORTMUX.SPIROUTEA.SPI0"/>
             </signals>
         </peripheral>
         <peripheral key="syscfg" name="SYSCFG" module-key="avrdd_syscfg">
@@ -266,114 +266,114 @@
         <peripheral key="tca0" name="TCA0" module-key="tmr_16b_pwm_v1">
             <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"/>
-                <signal pad-id="pa2" index="2" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pa3" index="3" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pa4" index="4" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pa5" index="5" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pc0" index="0" function="TCA0_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pc1" index="1" function="TCA0_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pc2" index="2" function="TCA0_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pc3" index="3" function="TCA0_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pd1" index="1" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pd2" index="2" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pd3" index="3" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pd4" index="4" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pd5" index="5" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pf0" index="0" function="TCA0_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pf1" index="1" function="TCA0_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pf2" index="2" function="TCA0_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pf3" index="3" function="TCA0_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pf4" index="4" function="TCA0_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pf5" index="5" function="TCA0_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pa0" index="0" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pa1" index="1" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pa2" index="2" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pa3" index="3" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pa4" index="4" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pa5" index="5" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pc0" index="0" function="TCA0_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pc1" index="1" function="TCA0_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pc2" index="2" function="TCA0_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pc3" index="3" function="TCA0_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pd1" index="1" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pd2" index="2" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pd3" index="3" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pd4" index="4" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pd5" index="5" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pf0" index="0" function="TCA0_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pf1" index="1" function="TCA0_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pf2" index="2" function="TCA0_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pf3" index="3" function="TCA0_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pf4" index="4" function="TCA0_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pf5" index="5" function="TCA0_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
             </signals>
         </peripheral>
         <peripheral key="tcb0" name="TCB0" module-key="tmr_16b_capture_v1">
             <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"/>
+                <signal pad-key="pa2" index="0" function="TCB0" group="WO" field="PORTMUX.TCBROUTEA.TCB0"/>
+                <signal pad-key="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 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"/>
+                <signal pad-key="pa3" index="0" function="TCB1" group="WO" field="PORTMUX.TCBROUTEA.TCB1"/>
+                <signal pad-key="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 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"/>
+                <signal pad-key="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 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"/>
-                <signal pad-id="pa6" index="2" function="TCD0" group="WOC" field="PORTMUX.TCDROUTEA.TCD0"/>
-                <signal pad-id="pa7" index="3" function="TCD0" group="WOD" field="PORTMUX.TCDROUTEA.TCD0"/>
-                <signal pad-id="pf0" function="TCD0_ALT2" group="WOA" field="PORTMUX.TCDROUTEA.TCD0"/>
-                <signal pad-id="pf1" index="1" function="TCD0_ALT2" group="WOB" field="PORTMUX.TCDROUTEA.TCD0"/>
-                <signal pad-id="pf2" index="2" function="TCD0_ALT2" group="WOC" field="PORTMUX.TCDROUTEA.TCD0"/>
-                <signal pad-id="pf3" index="3" function="TCD0_ALT2" group="WOD" field="PORTMUX.TCDROUTEA.TCD0"/>
-                <signal pad-id="pa4" function="TCD0_ALT4" group="WOA" field="PORTMUX.TCDROUTEA.TCD0"/>
-                <signal pad-id="pa5" index="1" function="TCD0_ALT4" group="WOB" field="PORTMUX.TCDROUTEA.TCD0"/>
-                <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"/>
+                <signal pad-key="pa4" function="TCD0" group="WOA" field="PORTMUX.TCDROUTEA.TCD0"/>
+                <signal pad-key="pa5" index="1" function="TCD0" group="WOB" field="PORTMUX.TCDROUTEA.TCD0"/>
+                <signal pad-key="pa6" index="2" function="TCD0" group="WOC" field="PORTMUX.TCDROUTEA.TCD0"/>
+                <signal pad-key="pa7" index="3" function="TCD0" group="WOD" field="PORTMUX.TCDROUTEA.TCD0"/>
+                <signal pad-key="pf0" function="TCD0_ALT2" group="WOA" field="PORTMUX.TCDROUTEA.TCD0"/>
+                <signal pad-key="pf1" index="1" function="TCD0_ALT2" group="WOB" field="PORTMUX.TCDROUTEA.TCD0"/>
+                <signal pad-key="pf2" index="2" function="TCD0_ALT2" group="WOC" field="PORTMUX.TCDROUTEA.TCD0"/>
+                <signal pad-key="pf3" index="3" function="TCD0_ALT2" group="WOD" field="PORTMUX.TCDROUTEA.TCD0"/>
+                <signal pad-key="pa4" function="TCD0_ALT4" group="WOA" field="PORTMUX.TCDROUTEA.TCD0"/>
+                <signal pad-key="pa5" index="1" function="TCD0_ALT4" group="WOB" field="PORTMUX.TCDROUTEA.TCD0"/>
+                <signal pad-key="pd4" index="2" function="TCD0_ALT4" group="WOC" field="PORTMUX.TCDROUTEA.TCD0"/>
+                <signal pad-key="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 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"/>
-                <signal pad-id="pa2" function="I2C0" group="SDA" field="PORTMUX.TWIROUTEA.TWI0"/>
-                <signal pad-id="pc2" function="I2C0" group="SDA_DUAL" field="PORTMUX.TWIROUTEA.TWI0"/>
-                <signal pad-id="pa3" function="I2C0_ALT1" group="SCL" field="PORTMUX.TWIROUTEA.TWI0"/>
-                <signal pad-id="pa2" function="I2C0_ALT1" group="SDA" field="PORTMUX.TWIROUTEA.TWI0"/>
-                <signal pad-id="pc3" function="I2C0_ALT2" group="SCL" field="PORTMUX.TWIROUTEA.TWI0"/>
-                <signal pad-id="pc2" function="I2C0_ALT2" group="SDA" field="PORTMUX.TWIROUTEA.TWI0"/>
-                <signal pad-id="pa1" function="I2C0_ALT3" group="SCL" field="PORTMUX.TWIROUTEA.TWI0"/>
-                <signal pad-id="pc3" function="I2C0_ALT3" group="SCL_DUAL" field="PORTMUX.TWIROUTEA.TWI0"/>
-                <signal pad-id="pa0" function="I2C0_ALT3" group="SDA" field="PORTMUX.TWIROUTEA.TWI0"/>
-                <signal pad-id="pc2" function="I2C0_ALT3" group="SDA_DUAL" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pa3" function="I2C0" group="SCL" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pc3" function="I2C0" group="SCL_DUAL" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pa2" function="I2C0" group="SDA" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pc2" function="I2C0" group="SDA_DUAL" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pa3" function="I2C0_ALT1" group="SCL" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pa2" function="I2C0_ALT1" group="SDA" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pc3" function="I2C0_ALT2" group="SCL" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pc2" function="I2C0_ALT2" group="SDA" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pa1" function="I2C0_ALT3" group="SCL" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pc3" function="I2C0_ALT3" group="SCL_DUAL" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pa0" function="I2C0_ALT3" group="SDA" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pc2" function="I2C0_ALT3" group="SDA_DUAL" field="PORTMUX.TWIROUTEA.TWI0"/>
             </signals>
         </peripheral>
         <peripheral key="usart0" name="USART0" module-key="uart_autobd_v4">
             <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"/>
-                <signal pad-id="pa2" function="USART0" group="XCK" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pa3" function="USART0" group="XDIR" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pa5" function="USART0_ALT1" group="RXD" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pa4" function="USART0_ALT1" group="TXD" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pa6" function="USART0_ALT1" group="XCK" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pa7" function="USART0_ALT1" group="XDIR" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pa3" function="USART0_ALT2" group="RXD" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pa2" function="USART0_ALT2" group="TXD" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pd5" function="USART0_ALT3" group="RXD" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pd4" function="USART0_ALT3" group="TXD" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pd6" function="USART0_ALT3" group="XCK" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pd7" function="USART0_ALT3" group="XDIR" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pc2" function="USART0_ALT4" group="RXD" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pc1" function="USART0_ALT4" group="TXD" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pc3" function="USART0_ALT4" group="XCK" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa1" function="USART0" group="RXD" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa0" function="USART0" group="TXD" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa2" function="USART0" group="XCK" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa3" function="USART0" group="XDIR" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa5" function="USART0_ALT1" group="RXD" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa4" function="USART0_ALT1" group="TXD" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa6" function="USART0_ALT1" group="XCK" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa7" function="USART0_ALT1" group="XDIR" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa3" function="USART0_ALT2" group="RXD" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa2" function="USART0_ALT2" group="TXD" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pd5" function="USART0_ALT3" group="RXD" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pd4" function="USART0_ALT3" group="TXD" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pd6" function="USART0_ALT3" group="XCK" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pd7" function="USART0_ALT3" group="XDIR" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pc2" function="USART0_ALT4" group="RXD" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pc1" function="USART0_ALT4" group="TXD" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pc3" function="USART0_ALT4" group="XCK" field="PORTMUX.USARTROUTEA.USART0"/>
             </signals>
         </peripheral>
         <peripheral key="usart1" name="USART1" module-key="uart_autobd_v4">
             <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"/>
-                <signal pad-id="pc2" function="USART1" group="XCK" field="PORTMUX.USARTROUTEA.USART1"/>
-                <signal pad-id="pc3" function="USART1" group="XDIR" field="PORTMUX.USARTROUTEA.USART1"/>
-                <signal pad-id="pd7" function="USART1_ALT2" group="RXD" field="PORTMUX.USARTROUTEA.USART1"/>
-                <signal pad-id="pd6" function="USART1_ALT2" group="TXD" field="PORTMUX.USARTROUTEA.USART1"/>
+                <signal pad-key="pc1" function="USART1" group="RXD" field="PORTMUX.USARTROUTEA.USART1"/>
+                <signal pad-key="pc0" function="USART1" group="TXD" field="PORTMUX.USARTROUTEA.USART1"/>
+                <signal pad-key="pc2" function="USART1" group="XCK" field="PORTMUX.USARTROUTEA.USART1"/>
+                <signal pad-key="pc3" function="USART1" group="XDIR" field="PORTMUX.USARTROUTEA.USART1"/>
+                <signal pad-key="pd7" function="USART1_ALT2" group="RXD" field="PORTMUX.USARTROUTEA.USART1"/>
+                <signal pad-key="pd6" function="USART1_ALT2" group="TXD" field="PORTMUX.USARTROUTEA.USART1"/>
             </signals>
         </peripheral>
         <peripheral key="userrow" name="USERROW" module-key="avrdd_userrow">
@@ -400,8 +400,8 @@
         <peripheral key="zcd3" name="ZCD3" module-key="cmp_zxover_ctrl_v3">
             <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"/>
+                <signal pad-key="pc2" function="ZCD3" group="IN" field="PORTMUX.ZCDROUTEA.ZCD3"/>
+                <signal pad-key="pa7" function="ZCD3" group="OUT" field="PORTMUX.ZCDROUTEA.ZCD3"/>
             </signals>
         </peripheral>
     </peripherals>
@@ -1655,43 +1655,77 @@
             </register-group>
         </module>
     </modules>
+    <pads>
+        <pad key="pa3" name="PA3"/>
+        <pad key="pa4" name="PA4"/>
+        <pad key="pa5" name="PA5"/>
+        <pad key="pa6" name="PA6"/>
+        <pad key="pa7" name="PA7"/>
+        <pad key="pc0" name="PC0"/>
+        <pad key="pc1" name="PC1"/>
+        <pad key="pc2" name="PC2"/>
+        <pad key="pc3" name="PC3"/>
+        <pad key="vddio2" name="VDDIO2"/>
+        <pad key="pd1" name="PD1"/>
+        <pad key="pd2" name="PD2"/>
+        <pad key="pd3" name="PD3"/>
+        <pad key="pd4" name="PD4"/>
+        <pad key="pd5" name="PD5"/>
+        <pad key="pd6" name="PD6"/>
+        <pad key="pd7" name="PD7"/>
+        <pad key="avdd" name="AVDD"/>
+        <pad key="agnd" name="AGND"/>
+        <pad key="pf0" name="PF0"/>
+        <pad key="pf1" name="PF1"/>
+        <pad key="pf2" name="PF2"/>
+        <pad key="pf3" name="PF3"/>
+        <pad key="pf4" name="PF4"/>
+        <pad key="pf5" name="PF5"/>
+        <pad key="pf6" name="PF6"/>
+        <pad key="pf7" name="PF7"/>
+        <pad key="vdd0" name="VDD0"/>
+        <pad key="gnd0" name="GND0"/>
+        <pad key="pa0" name="PA0"/>
+        <pad key="pa1" name="PA1"/>
+        <pad key="pa2" name="PA2"/>
+    </pads>
     <pinouts>
         <pinout key="qfn32mvio" name="QFN32MVIO" type="qfn">
-            <pin position="1" pad="PA3"/>
-            <pin position="2" pad="PA4"/>
-            <pin position="3" pad="PA5"/>
-            <pin position="4" pad="PA6"/>
-            <pin position="5" pad="PA7"/>
-            <pin position="6" pad="PC0"/>
-            <pin position="7" pad="PC1"/>
-            <pin position="8" pad="PC2"/>
-            <pin position="9" pad="PC3"/>
-            <pin position="10" pad="VDDIO2"/>
-            <pin position="11" pad="PD1"/>
-            <pin position="12" pad="PD2"/>
-            <pin position="13" pad="PD3"/>
-            <pin position="14" pad="PD4"/>
-            <pin position="15" pad="PD5"/>
-            <pin position="16" pad="PD6"/>
-            <pin position="17" pad="PD7"/>
-            <pin position="18" pad="AVDD"/>
-            <pin position="19" pad="AGND"/>
-            <pin position="20" pad="PF0"/>
-            <pin position="21" pad="PF1"/>
-            <pin position="22" pad="PF2"/>
-            <pin position="23" pad="PF3"/>
-            <pin position="24" pad="PF4"/>
-            <pin position="25" pad="PF5"/>
-            <pin position="26" pad="PF6"/>
-            <pin position="27" pad="PF7"/>
-            <pin position="28" pad="VDD0"/>
-            <pin position="29" pad="GND0"/>
-            <pin position="30" pad="PA0"/>
-            <pin position="31" pad="PA1"/>
-            <pin position="32" pad="PA2"/>
+            <pin position="1" pad-key="pa3"/>
+            <pin position="2" pad-key="pa4"/>
+            <pin position="3" pad-key="pa5"/>
+            <pin position="4" pad-key="pa6"/>
+            <pin position="5" pad-key="pa7"/>
+            <pin position="6" pad-key="pc0"/>
+            <pin position="7" pad-key="pc1"/>
+            <pin position="8" pad-key="pc2"/>
+            <pin position="9" pad-key="pc3"/>
+            <pin position="10" pad-key="vddio2"/>
+            <pin position="11" pad-key="pd1"/>
+            <pin position="12" pad-key="pd2"/>
+            <pin position="13" pad-key="pd3"/>
+            <pin position="14" pad-key="pd4"/>
+            <pin position="15" pad-key="pd5"/>
+            <pin position="16" pad-key="pd6"/>
+            <pin position="17" pad-key="pd7"/>
+            <pin position="18" pad-key="avdd"/>
+            <pin position="19" pad-key="agnd"/>
+            <pin position="20" pad-key="pf0"/>
+            <pin position="21" pad-key="pf1"/>
+            <pin position="22" pad-key="pf2"/>
+            <pin position="23" pad-key="pf3"/>
+            <pin position="24" pad-key="pf4"/>
+            <pin position="25" pad-key="pf5"/>
+            <pin position="26" pad-key="pf6"/>
+            <pin position="27" pad-key="pf7"/>
+            <pin position="28" pad-key="vdd0"/>
+            <pin position="29" pad-key="gnd0"/>
+            <pin position="30" pad-key="pa0"/>
+            <pin position="31" pad-key="pa1"/>
+            <pin position="32" pad-key="pa2"/>
         </pinout>
     </pinouts>
     <variants>
-        <variant name="AVR16DD32" pinout-key="qfn32mvio" package="QFN32"/>
+        <variant key="avr16dd32" name="AVR16DD32" pinout-key="qfn32mvio"/>
     </variants>
 </device>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR32DA28.xml b/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR32DA28.xml
index a72e91ff..d4851014 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR32DA28.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR32DA28.xml
@@ -44,52 +44,52 @@
         <peripheral key="ac0" name="AC0" module-key="cmp_control_v8">
             <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"/>
-                <signal pad-id="pd7" index="2" function="AC0" group="N"/>
-                <signal pad-id="pa7" index="0" function="AC0" group="OUT" field="PORTMUX.ACROUTEA.AC0"/>
-                <signal pad-id="pd2" index="0" function="AC0" group="P"/>
-                <signal pad-id="pd6" index="3" function="AC0" group="P"/>
+                <signal pad-key="pd3" index="0" function="AC0" group="N"/>
+                <signal pad-key="pd0" index="1" function="AC0" group="N"/>
+                <signal pad-key="pd7" index="2" function="AC0" group="N"/>
+                <signal pad-key="pa7" index="0" function="AC0" group="OUT" field="PORTMUX.ACROUTEA.AC0"/>
+                <signal pad-key="pd2" index="0" function="AC0" group="P"/>
+                <signal pad-key="pd6" index="3" function="AC0" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="ac1" name="AC1" module-key="cmp_control_v8">
             <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"/>
-                <signal pad-id="pd7" index="2" function="AC1" group="N"/>
-                <signal pad-id="pa7" index="0" function="AC1" group="OUT" field="PORTMUX.ACROUTEA.AC1"/>
-                <signal pad-id="pd2" index="0" function="AC1" group="P"/>
-                <signal pad-id="pd3" index="1" function="AC1" group="P"/>
-                <signal pad-id="pd4" index="2" function="AC1" group="P"/>
-                <signal pad-id="pd6" index="3" function="AC1" group="P"/>
+                <signal pad-key="pd5" index="0" function="AC1" group="N"/>
+                <signal pad-key="pd0" index="1" function="AC1" group="N"/>
+                <signal pad-key="pd7" index="2" function="AC1" group="N"/>
+                <signal pad-key="pa7" index="0" function="AC1" group="OUT" field="PORTMUX.ACROUTEA.AC1"/>
+                <signal pad-key="pd2" index="0" function="AC1" group="P"/>
+                <signal pad-key="pd3" index="1" function="AC1" group="P"/>
+                <signal pad-key="pd4" index="2" function="AC1" group="P"/>
+                <signal pad-key="pd6" index="3" function="AC1" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="ac2" name="AC2" module-key="cmp_control_v8">
             <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"/>
-                <signal pad-id="pd7" index="2" function="AC2" group="N"/>
-                <signal pad-id="pa7" index="0" function="AC2" group="OUT" field="PORTMUX.ACROUTEA.AC2"/>
-                <signal pad-id="pd2" index="0" function="AC2" group="P"/>
-                <signal pad-id="pd4" index="1" function="AC2" group="P"/>
-                <signal pad-id="pd6" index="3" function="AC2" group="P"/>
+                <signal pad-key="pd7" index="0" function="AC2" group="N"/>
+                <signal pad-key="pd0" index="1" function="AC2" group="N"/>
+                <signal pad-key="pd7" index="2" function="AC2" group="N"/>
+                <signal pad-key="pa7" index="0" function="AC2" group="OUT" field="PORTMUX.ACROUTEA.AC2"/>
+                <signal pad-key="pd2" index="0" function="AC2" group="P"/>
+                <signal pad-key="pd4" index="1" function="AC2" group="P"/>
+                <signal pad-key="pd6" index="3" function="AC2" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="adc0" name="ADC0" module-key="adc_12b_diff_ctrl_v1">
             <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"/>
-                <signal pad-id="pd2" index="2" function="AIN0" group="AIN"/>
-                <signal pad-id="pd3" index="3" function="AIN0" group="AIN"/>
-                <signal pad-id="pd4" index="4" function="AIN0" group="AIN"/>
-                <signal pad-id="pd5" index="5" function="AIN0" group="AIN"/>
-                <signal pad-id="pd6" index="6" function="AIN0" group="AIN"/>
-                <signal pad-id="pd7" index="7" function="AIN0" group="AIN"/>
-                <signal pad-id="pf0" index="16" function="AIN0" group="AIN"/>
-                <signal pad-id="pf1" index="17" function="AIN0" group="AIN"/>
+                <signal pad-key="pd0" index="0" function="AIN0" group="AIN"/>
+                <signal pad-key="pd1" index="1" function="AIN0" group="AIN"/>
+                <signal pad-key="pd2" index="2" function="AIN0" group="AIN"/>
+                <signal pad-key="pd3" index="3" function="AIN0" group="AIN"/>
+                <signal pad-key="pd4" index="4" function="AIN0" group="AIN"/>
+                <signal pad-key="pd5" index="5" function="AIN0" group="AIN"/>
+                <signal pad-key="pd6" index="6" function="AIN0" group="AIN"/>
+                <signal pad-key="pd7" index="7" function="AIN0" group="AIN"/>
+                <signal pad-key="pf0" index="16" function="AIN0" group="AIN"/>
+                <signal pad-key="pf1" index="17" function="AIN0" group="AIN"/>
             </signals>
         </peripheral>
         <peripheral key="bod" name="BOD" module-key="bor_lvd_ctrl_v1">
@@ -98,31 +98,31 @@
         <peripheral key="ccl" name="CCL" module-key="cla_ccl_v1">
             <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"/>
-                <signal pad-id="pa2" index="2" function="CCL_IN" group="LUT0_IN"/>
-                <signal pad-id="pa6" index="0" function="CCL_ALT" group="LUT0_OUT" field="PORTMUX.CCLROUTEA.LUT0"/>
-                <signal pad-id="pa3" index="0" function="CCL" group="LUT0_OUT" field="PORTMUX.CCLROUTEA.LUT0"/>
-                <signal pad-id="pc0" index="0" function="CCL_IN" group="LUT1_IN"/>
-                <signal pad-id="pc1" index="1" function="CCL_IN" group="LUT1_IN"/>
-                <signal pad-id="pc2" index="2" function="CCL_IN" group="LUT1_IN"/>
-                <signal pad-id="pc3" index="0" function="CCL" group="LUT1_OUT" field="PORTMUX.CCLROUTEA.LUT1"/>
-                <signal pad-id="pd0" index="0" function="CCL_IN" group="LUT2_IN"/>
-                <signal pad-id="pd1" index="1" function="CCL_IN" group="LUT2_IN"/>
-                <signal pad-id="pd2" index="2" function="CCL_IN" group="LUT2_IN"/>
-                <signal pad-id="pd6" index="0" function="CCL_ALT" group="LUT2_OUT" field="PORTMUX.CCLROUTEA.LUT2"/>
-                <signal pad-id="pd3" index="0" function="CCL" group="LUT2_OUT" field="PORTMUX.CCLROUTEA.LUT2"/>
-                <signal pad-id="pf0" index="0" function="CCL_IN" group="LUT3_IN"/>
-                <signal pad-id="pf1" index="1" function="CCL_IN" group="LUT3_IN"/>
+                <signal pad-key="pa0" index="0" function="CCL_IN" group="LUT0_IN"/>
+                <signal pad-key="pa1" index="1" function="CCL_IN" group="LUT0_IN"/>
+                <signal pad-key="pa2" index="2" function="CCL_IN" group="LUT0_IN"/>
+                <signal pad-key="pa6" index="0" function="CCL_ALT" group="LUT0_OUT" field="PORTMUX.CCLROUTEA.LUT0"/>
+                <signal pad-key="pa3" index="0" function="CCL" group="LUT0_OUT" field="PORTMUX.CCLROUTEA.LUT0"/>
+                <signal pad-key="pc0" index="0" function="CCL_IN" group="LUT1_IN"/>
+                <signal pad-key="pc1" index="1" function="CCL_IN" group="LUT1_IN"/>
+                <signal pad-key="pc2" index="2" function="CCL_IN" group="LUT1_IN"/>
+                <signal pad-key="pc3" index="0" function="CCL" group="LUT1_OUT" field="PORTMUX.CCLROUTEA.LUT1"/>
+                <signal pad-key="pd0" index="0" function="CCL_IN" group="LUT2_IN"/>
+                <signal pad-key="pd1" index="1" function="CCL_IN" group="LUT2_IN"/>
+                <signal pad-key="pd2" index="2" function="CCL_IN" group="LUT2_IN"/>
+                <signal pad-key="pd6" index="0" function="CCL_ALT" group="LUT2_OUT" field="PORTMUX.CCLROUTEA.LUT2"/>
+                <signal pad-key="pd3" index="0" function="CCL" group="LUT2_OUT" field="PORTMUX.CCLROUTEA.LUT2"/>
+                <signal pad-key="pf0" index="0" function="CCL_IN" group="LUT3_IN"/>
+                <signal pad-key="pf1" index="1" function="CCL_IN" group="LUT3_IN"/>
             </signals>
         </peripheral>
         <peripheral key="clkctrl" name="CLKCTRL" module-key="avrda_clkctrl">
             <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"/>
-                <signal pad-id="pf0" function="CLKCTRL" group="XTAL32K1"/>
-                <signal pad-id="pf1" function="CLKCTRL" group="XTAL32K2"/>
+                <signal pad-key="pa7" function="CLKCTRL" group="CLKOUT"/>
+                <signal pad-key="pa0" function="CLKCTRL" group="EXTCLK"/>
+                <signal pad-key="pf0" function="CLKCTRL" group="XTAL32K1"/>
+                <signal pad-key="pf1" function="CLKCTRL" group="XTAL32K2"/>
             </signals>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="cpu_avr_xt_v1">
@@ -137,17 +137,17 @@
         <peripheral key="dac0" name="DAC0" module-key="dac_nbit_ctrl_v5">
             <register-group-instance register-group-key="dac" address-space-key="data" offset="0x6A0"/>
             <signals>
-                <signal pad-id="pd6" index="0" function="DAC0" group="OUT"/>
+                <signal pad-key="pd6" index="0" function="DAC0" group="OUT"/>
             </signals>
         </peripheral>
         <peripheral key="evsys" name="EVSYS" module-key="avrda_evsys">
             <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"/>
-                <signal pad-id="pc2" index="2" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTC"/>
-                <signal pad-id="pd7" index="3" function="EVSYS_ALT" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTD"/>
-                <signal pad-id="pd2" index="3" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTD"/>
+                <signal pad-key="pa7" index="0" function="EVSYS_ALT" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTA"/>
+                <signal pad-key="pa2" index="0" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTA"/>
+                <signal pad-key="pc2" index="2" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTC"/>
+                <signal pad-key="pd7" index="3" function="EVSYS_ALT" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTD"/>
+                <signal pad-key="pd2" index="3" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTD"/>
             </signals>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="avrda_fuse">
@@ -165,44 +165,44 @@
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pa2" index="2" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa3" index="3" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa4" index="4" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa5" index="5" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa6" index="6" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa7" index="7" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa0" index="0" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa1" index="1" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa2" index="2" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa3" index="3" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa4" index="4" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa5" index="5" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa6" index="6" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa7" index="7" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pc2" index="2" function="IOPORT" group="PIN"/>
-                <signal pad-id="pc3" index="3" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc0" index="0" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc1" index="1" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc2" index="2" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc3" index="3" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pd2" index="2" function="IOPORT" group="PIN"/>
-                <signal pad-id="pd3" index="3" function="IOPORT" group="PIN"/>
-                <signal pad-id="pd4" index="4" function="IOPORT" group="PIN"/>
-                <signal pad-id="pd5" index="5" function="IOPORT" group="PIN"/>
-                <signal pad-id="pd6" index="6" function="IOPORT" group="PIN"/>
-                <signal pad-id="pd7" index="7" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd0" index="0" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd1" index="1" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd2" index="2" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd3" index="3" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd4" index="4" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd5" index="5" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd6" index="6" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd7" index="7" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="portf" name="PORTF" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pf6" index="6" function="IOPORT" group="PIN"/>
+                <signal pad-key="pf0" index="0" function="IOPORT" group="PIN"/>
+                <signal pad-key="pf1" index="1" function="IOPORT" group="PIN"/>
+                <signal pad-key="pf6" index="6" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="portmux" name="PORTMUX" module-key="avrda_portmux">
@@ -210,30 +210,30 @@
         </peripheral>
         <peripheral key="ptc" name="PTC" module-key="adc_ptc_ctrl_v1">
             <signals>
-                <signal pad-id="pa0" index="0" function="PTC" group="XY"/>
-                <signal pad-id="pa1" index="1" function="PTC" group="XY"/>
-                <signal pad-id="pa2" index="2" function="PTC" group="XY"/>
-                <signal pad-id="pa3" index="3" function="PTC" group="XY"/>
-                <signal pad-id="pa4" index="4" function="PTC" group="XY"/>
-                <signal pad-id="pa5" index="5" function="PTC" group="XY"/>
-                <signal pad-id="pa6" index="6" function="PTC" group="XY"/>
-                <signal pad-id="pa7" index="7" function="PTC" group="XY"/>
-                <signal pad-id="pd0" index="16" function="PTC" group="XY"/>
-                <signal pad-id="pd1" index="17" function="PTC" group="XY"/>
-                <signal pad-id="pd2" index="18" function="PTC" group="XY"/>
-                <signal pad-id="pd3" index="19" function="PTC" group="XY"/>
-                <signal pad-id="pd4" index="20" function="PTC" group="XY"/>
-                <signal pad-id="pd5" index="21" function="PTC" group="XY"/>
-                <signal pad-id="pd6" index="22" function="PTC" group="XY"/>
-                <signal pad-id="pd7" index="23" function="PTC" group="XY"/>
-                <signal pad-id="pf0" index="32" function="PTC" group="XY"/>
-                <signal pad-id="pf1" index="33" function="PTC" group="XY"/>
+                <signal pad-key="pa0" index="0" function="PTC" group="XY"/>
+                <signal pad-key="pa1" index="1" function="PTC" group="XY"/>
+                <signal pad-key="pa2" index="2" function="PTC" group="XY"/>
+                <signal pad-key="pa3" index="3" function="PTC" group="XY"/>
+                <signal pad-key="pa4" index="4" function="PTC" group="XY"/>
+                <signal pad-key="pa5" index="5" function="PTC" group="XY"/>
+                <signal pad-key="pa6" index="6" function="PTC" group="XY"/>
+                <signal pad-key="pa7" index="7" function="PTC" group="XY"/>
+                <signal pad-key="pd0" index="16" function="PTC" group="XY"/>
+                <signal pad-key="pd1" index="17" function="PTC" group="XY"/>
+                <signal pad-key="pd2" index="18" function="PTC" group="XY"/>
+                <signal pad-key="pd3" index="19" function="PTC" group="XY"/>
+                <signal pad-key="pd4" index="20" function="PTC" group="XY"/>
+                <signal pad-key="pd5" index="21" function="PTC" group="XY"/>
+                <signal pad-key="pd6" index="22" function="PTC" group="XY"/>
+                <signal pad-key="pd7" index="23" function="PTC" group="XY"/>
+                <signal pad-key="pf0" index="32" function="PTC" group="XY"/>
+                <signal pad-key="pf1" index="33" function="PTC" group="XY"/>
             </signals>
         </peripheral>
         <peripheral key="rstctrl" name="RSTCTRL" module-key="rst_integration_v8">
             <register-group-instance register-group-key="rstctrl" address-space-key="data" offset="0x40"/>
             <signals>
-                <signal pad-id="pf6" function="OTHER" group="RESET"/>
+                <signal pad-key="pf6" function="OTHER" group="RESET"/>
             </signals>
         </peripheral>
         <peripheral key="rtc" name="RTC" module-key="tmr_16b_rtc_v1">
@@ -248,19 +248,19 @@
         <peripheral key="spi0" name="SPI0" module-key="spi_8bit_v2">
             <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"/>
-                <signal pad-id="pa6" function="SPI0" group="SCK" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <signal pad-id="pa7" function="SPI0" group="SS" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pa5" function="SPI0" group="MISO" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pa4" function="SPI0" group="MOSI" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pa6" function="SPI0" group="SCK" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pa7" function="SPI0" group="SS" field="PORTMUX.SPIROUTEA.SPI0"/>
             </signals>
         </peripheral>
         <peripheral key="spi1" name="SPI1" module-key="spi_8bit_v2">
             <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"/>
-                <signal pad-id="pc2" function="SPI1" group="SCK" field="PORTMUX.SPIROUTEA.SPI1"/>
-                <signal pad-id="pc3" function="SPI1" group="SS" field="PORTMUX.SPIROUTEA.SPI1"/>
+                <signal pad-key="pc1" function="SPI1" group="MISO" field="PORTMUX.SPIROUTEA.SPI1"/>
+                <signal pad-key="pc0" function="SPI1" group="MOSI" field="PORTMUX.SPIROUTEA.SPI1"/>
+                <signal pad-key="pc2" function="SPI1" group="SCK" field="PORTMUX.SPIROUTEA.SPI1"/>
+                <signal pad-key="pc3" function="SPI1" group="SS" field="PORTMUX.SPIROUTEA.SPI1"/>
             </signals>
         </peripheral>
         <peripheral key="syscfg" name="SYSCFG" module-key="avrda_syscfg">
@@ -269,95 +269,95 @@
         <peripheral key="tca0" name="TCA0" module-key="tmr_16b_pwm_v1">
             <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"/>
-                <signal pad-id="pc0" index="0" function="TCA0_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pa0" index="0" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pf1" index="1" function="TCA0_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pd1" index="1" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pc1" index="1" function="TCA0_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pa1" index="1" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pd2" index="2" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pc2" index="2" function="TCA0_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pa2" index="2" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pd3" index="3" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pc3" index="3" function="TCA0_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pa3" index="3" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pd4" index="4" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pa4" index="4" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pd5" index="5" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pa5" index="5" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pf0" index="0" function="TCA0_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pd0" index="0" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pc0" index="0" function="TCA0_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pa0" index="0" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pf1" index="1" function="TCA0_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pd1" index="1" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pc1" index="1" function="TCA0_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pa1" index="1" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pd2" index="2" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pc2" index="2" function="TCA0_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pa2" index="2" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pd3" index="3" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pc3" index="3" function="TCA0_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pa3" index="3" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pd4" index="4" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pa4" index="4" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pd5" index="5" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pa5" index="5" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
             </signals>
         </peripheral>
         <peripheral key="tcb0" name="TCB0" module-key="tmr_16b_capture_v1">
             <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-key="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 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-key="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 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"/>
+                <signal pad-key="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 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"/>
-                <signal pad-id="pf1" index="1" function="TCD0_ALT2" group="WOB" field="PORTMUX.TCDROUTEA.TCD0"/>
-                <signal pad-id="pa5" index="1" function="TCD0" group="WOB" field="PORTMUX.TCDROUTEA.TCD0"/>
-                <signal pad-id="pa6" index="2" function="TCD0" group="WOC" field="PORTMUX.TCDROUTEA.TCD0"/>
-                <signal pad-id="pa7" index="3" function="TCD0" group="WOD" field="PORTMUX.TCDROUTEA.TCD0"/>
+                <signal pad-key="pf0" function="TCD0_ALT2" group="WOA" field="PORTMUX.TCDROUTEA.TCD0"/>
+                <signal pad-key="pa4" function="TCD0" group="WOA" field="PORTMUX.TCDROUTEA.TCD0"/>
+                <signal pad-key="pf1" index="1" function="TCD0_ALT2" group="WOB" field="PORTMUX.TCDROUTEA.TCD0"/>
+                <signal pad-key="pa5" index="1" function="TCD0" group="WOB" field="PORTMUX.TCDROUTEA.TCD0"/>
+                <signal pad-key="pa6" index="2" function="TCD0" group="WOC" field="PORTMUX.TCDROUTEA.TCD0"/>
+                <signal pad-key="pa7" index="3" function="TCD0" group="WOD" field="PORTMUX.TCDROUTEA.TCD0"/>
             </signals>
         </peripheral>
         <peripheral key="twi0" name="TWI0" module-key="i2c_8bit_v2">
             <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"/>
-                <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"/>
-                <signal pad-id="pc2" function="I2C0_ALT2" group="SDA" field="PORTMUX.TWIROUTEA.TWI0"/>
-                <signal pad-id="pa2" function="I2C0_ALT1" group="SDA" field="PORTMUX.TWIROUTEA.TWI0"/>
-                <signal pad-id="pa2" function="I2C0" group="SDA" field="PORTMUX.TWIROUTEA.TWI0"/>
-                <signal pad-id="pc2" function="I2C0" group="SDA_DUAL" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pc3" function="I2C0_ALT2" group="SCL" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pa3" function="I2C0_ALT1" group="SCL" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pa3" function="I2C0" group="SCL" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pc3" function="I2C0" group="SCL_DUAL" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pc2" function="I2C0_ALT2" group="SDA" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pa2" function="I2C0_ALT1" group="SDA" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pa2" function="I2C0" group="SDA" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pc2" function="I2C0" group="SDA_DUAL" field="PORTMUX.TWIROUTEA.TWI0"/>
             </signals>
         </peripheral>
         <peripheral key="usart0" name="USART0" module-key="uart_autobd_v4">
             <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"/>
-                <signal pad-id="pa4" function="USART0_ALT" group="TXD" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pa0" function="USART0" group="TXD" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pa6" function="USART0_ALT" group="XCK" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pa2" function="USART0" group="XCK" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pa7" function="USART0_ALT" group="XDIR" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pa3" function="USART0" group="XDIR" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa5" function="USART0_ALT" group="RXD" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa1" function="USART0" group="RXD" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa4" function="USART0_ALT" group="TXD" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa0" function="USART0" group="TXD" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa6" function="USART0_ALT" group="XCK" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa2" function="USART0" group="XCK" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa7" function="USART0_ALT" group="XDIR" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa3" function="USART0" group="XDIR" field="PORTMUX.USARTROUTEA.USART0"/>
             </signals>
         </peripheral>
         <peripheral key="usart1" name="USART1" module-key="uart_autobd_v4">
             <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"/>
-                <signal pad-id="pc2" function="USART1" group="XCK" field="PORTMUX.USARTROUTEA.USART1"/>
-                <signal pad-id="pc3" function="USART1" group="XDIR" field="PORTMUX.USARTROUTEA.USART1"/>
+                <signal pad-key="pc1" function="USART1" group="RXD" field="PORTMUX.USARTROUTEA.USART1"/>
+                <signal pad-key="pc0" function="USART1" group="TXD" field="PORTMUX.USARTROUTEA.USART1"/>
+                <signal pad-key="pc2" function="USART1" group="XCK" field="PORTMUX.USARTROUTEA.USART1"/>
+                <signal pad-key="pc3" function="USART1" group="XDIR" field="PORTMUX.USARTROUTEA.USART1"/>
             </signals>
         </peripheral>
         <peripheral key="usart2" name="USART2" module-key="uart_autobd_v4">
             <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"/>
+                <signal pad-key="pf1" function="USART2" group="RXD" field="PORTMUX.USARTROUTEA.USART2"/>
+                <signal pad-key="pf0" function="USART2" group="TXD" field="PORTMUX.USARTROUTEA.USART2"/>
             </signals>
         </peripheral>
         <peripheral key="userrow" name="USERROW" module-key="avrda_userrow">
@@ -384,8 +384,8 @@
         <peripheral key="zcd0" name="ZCD0" module-key="cmp_zxover_ctrl_v3">
             <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"/>
+                <signal pad-key="pd1" function="ZCD0" group="IN"/>
+                <signal pad-key="pa7" function="ZCD0" group="OUT" field="PORTMUX.ZCDROUTEA.ZCD0"/>
             </signals>
         </peripheral>
     </peripherals>
@@ -1606,39 +1606,69 @@
             </register-group>
         </module>
     </modules>
+    <pads>
+        <pad key="pa7" name="PA7"/>
+        <pad key="pc0" name="PC0"/>
+        <pad key="pc1" name="PC1"/>
+        <pad key="pc2" name="PC2"/>
+        <pad key="pc3" name="PC3"/>
+        <pad key="pd0" name="PD0"/>
+        <pad key="pd1" name="PD1"/>
+        <pad key="pd2" name="PD2"/>
+        <pad key="pd3" name="PD3"/>
+        <pad key="pd4" name="PD4"/>
+        <pad key="pd5" name="PD5"/>
+        <pad key="pd6" name="PD6"/>
+        <pad key="pd7" name="PD7"/>
+        <pad key="avdd" name="AVDD"/>
+        <pad key="agnd" name="AGND"/>
+        <pad key="pf0" name="PF0"/>
+        <pad key="pf1" name="PF1"/>
+        <pad key="pf6" name="PF6"/>
+        <pad key="updi" name="UPDI"/>
+        <pad key="vdd0" name="VDD0"/>
+        <pad key="gnd0" name="GND0"/>
+        <pad key="pa0" name="PA0"/>
+        <pad key="pa1" name="PA1"/>
+        <pad key="pa2" name="PA2"/>
+        <pad key="pa3" name="PA3"/>
+        <pad key="pa4" name="PA4"/>
+        <pad key="pa5" name="PA5"/>
+        <pad key="pa6" name="PA6"/>
+    </pads>
     <pinouts>
         <pinout key="soic28" name="SOIC28" type="soic">
-            <pin position="1" pad="PA7"/>
-            <pin position="2" pad="PC0"/>
-            <pin position="3" pad="PC1"/>
-            <pin position="4" pad="PC2"/>
-            <pin position="5" pad="PC3"/>
-            <pin position="6" pad="PD0"/>
-            <pin position="7" pad="PD1"/>
-            <pin position="8" pad="PD2"/>
-            <pin position="9" pad="PD3"/>
-            <pin position="10" pad="PD4"/>
-            <pin position="11" pad="PD5"/>
-            <pin position="12" pad="PD6"/>
-            <pin position="13" pad="PD7"/>
-            <pin position="14" pad="AVDD"/>
-            <pin position="15" pad="AGND"/>
-            <pin position="16" pad="PF0"/>
-            <pin position="17" pad="PF1"/>
-            <pin position="18" pad="PF6"/>
-            <pin position="19" pad="UPDI"/>
-            <pin position="20" pad="VDD0"/>
-            <pin position="21" pad="GND0"/>
-            <pin position="22" pad="PA0"/>
-            <pin position="23" pad="PA1"/>
-            <pin position="24" pad="PA2"/>
-            <pin position="25" pad="PA3"/>
-            <pin position="26" pad="PA4"/>
-            <pin position="27" pad="PA5"/>
-            <pin position="28" pad="PA6"/>
+            <pin position="1" pad-key="pa7"/>
+            <pin position="2" pad-key="pc0"/>
+            <pin position="3" pad-key="pc1"/>
+            <pin position="4" pad-key="pc2"/>
+            <pin position="5" pad-key="pc3"/>
+            <pin position="6" pad-key="pd0"/>
+            <pin position="7" pad-key="pd1"/>
+            <pin position="8" pad-key="pd2"/>
+            <pin position="9" pad-key="pd3"/>
+            <pin position="10" pad-key="pd4"/>
+            <pin position="11" pad-key="pd5"/>
+            <pin position="12" pad-key="pd6"/>
+            <pin position="13" pad-key="pd7"/>
+            <pin position="14" pad-key="avdd"/>
+            <pin position="15" pad-key="agnd"/>
+            <pin position="16" pad-key="pf0"/>
+            <pin position="17" pad-key="pf1"/>
+            <pin position="18" pad-key="pf6"/>
+            <pin position="19" pad-key="updi"/>
+            <pin position="20" pad-key="vdd0"/>
+            <pin position="21" pad-key="gnd0"/>
+            <pin position="22" pad-key="pa0"/>
+            <pin position="23" pad-key="pa1"/>
+            <pin position="24" pad-key="pa2"/>
+            <pin position="25" pad-key="pa3"/>
+            <pin position="26" pad-key="pa4"/>
+            <pin position="27" pad-key="pa5"/>
+            <pin position="28" pad-key="pa6"/>
         </pinout>
     </pinouts>
     <variants>
-        <variant name="AVR32DA28" pinout-key="soic28" package="SOIC28"/>
+        <variant key="avr32da28" name="AVR32DA28" pinout-key="soic28"/>
     </variants>
 </device>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR32DA32.xml b/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR32DA32.xml
index 221b318b..714916b2 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR32DA32.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR32DA32.xml
@@ -44,56 +44,56 @@
         <peripheral key="ac0" name="AC0" module-key="cmp_control_v8">
             <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"/>
-                <signal pad-id="pd7" index="2" function="AC0" group="N"/>
-                <signal pad-id="pa7" index="0" function="AC0" group="OUT" field="PORTMUX.ACROUTEA.AC0"/>
-                <signal pad-id="pd2" index="0" function="AC0" group="P"/>
-                <signal pad-id="pd6" index="3" function="AC0" group="P"/>
+                <signal pad-key="pd3" index="0" function="AC0" group="N"/>
+                <signal pad-key="pd0" index="1" function="AC0" group="N"/>
+                <signal pad-key="pd7" index="2" function="AC0" group="N"/>
+                <signal pad-key="pa7" index="0" function="AC0" group="OUT" field="PORTMUX.ACROUTEA.AC0"/>
+                <signal pad-key="pd2" index="0" function="AC0" group="P"/>
+                <signal pad-key="pd6" index="3" function="AC0" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="ac1" name="AC1" module-key="cmp_control_v8">
             <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"/>
-                <signal pad-id="pd7" index="2" function="AC1" group="N"/>
-                <signal pad-id="pa7" index="0" function="AC1" group="OUT" field="PORTMUX.ACROUTEA.AC1"/>
-                <signal pad-id="pd2" index="0" function="AC1" group="P"/>
-                <signal pad-id="pd3" index="1" function="AC1" group="P"/>
-                <signal pad-id="pd4" index="2" function="AC1" group="P"/>
-                <signal pad-id="pd6" index="3" function="AC1" group="P"/>
+                <signal pad-key="pd5" index="0" function="AC1" group="N"/>
+                <signal pad-key="pd0" index="1" function="AC1" group="N"/>
+                <signal pad-key="pd7" index="2" function="AC1" group="N"/>
+                <signal pad-key="pa7" index="0" function="AC1" group="OUT" field="PORTMUX.ACROUTEA.AC1"/>
+                <signal pad-key="pd2" index="0" function="AC1" group="P"/>
+                <signal pad-key="pd3" index="1" function="AC1" group="P"/>
+                <signal pad-key="pd4" index="2" function="AC1" group="P"/>
+                <signal pad-key="pd6" index="3" function="AC1" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="ac2" name="AC2" module-key="cmp_control_v8">
             <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"/>
-                <signal pad-id="pd7" index="2" function="AC2" group="N"/>
-                <signal pad-id="pa7" index="0" function="AC2" group="OUT" field="PORTMUX.ACROUTEA.AC2"/>
-                <signal pad-id="pd2" index="0" function="AC2" group="P"/>
-                <signal pad-id="pd4" index="1" function="AC2" group="P"/>
-                <signal pad-id="pd6" index="3" function="AC2" group="P"/>
+                <signal pad-key="pd7" index="0" function="AC2" group="N"/>
+                <signal pad-key="pd0" index="1" function="AC2" group="N"/>
+                <signal pad-key="pd7" index="2" function="AC2" group="N"/>
+                <signal pad-key="pa7" index="0" function="AC2" group="OUT" field="PORTMUX.ACROUTEA.AC2"/>
+                <signal pad-key="pd2" index="0" function="AC2" group="P"/>
+                <signal pad-key="pd4" index="1" function="AC2" group="P"/>
+                <signal pad-key="pd6" index="3" function="AC2" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="adc0" name="ADC0" module-key="adc_12b_diff_ctrl_v1">
             <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"/>
-                <signal pad-id="pd2" index="2" function="AIN0" group="AIN"/>
-                <signal pad-id="pd3" index="3" function="AIN0" group="AIN"/>
-                <signal pad-id="pd4" index="4" function="AIN0" group="AIN"/>
-                <signal pad-id="pd5" index="5" function="AIN0" group="AIN"/>
-                <signal pad-id="pd6" index="6" function="AIN0" group="AIN"/>
-                <signal pad-id="pd7" index="7" function="AIN0" group="AIN"/>
-                <signal pad-id="pf0" index="16" function="AIN0" group="AIN"/>
-                <signal pad-id="pf1" index="17" function="AIN0" group="AIN"/>
-                <signal pad-id="pf2" index="18" function="AIN0" group="AIN"/>
-                <signal pad-id="pf3" index="19" function="AIN0" group="AIN"/>
-                <signal pad-id="pf4" index="20" function="AIN0" group="AIN"/>
-                <signal pad-id="pf5" index="21" function="AIN0" group="AIN"/>
+                <signal pad-key="pd0" index="0" function="AIN0" group="AIN"/>
+                <signal pad-key="pd1" index="1" function="AIN0" group="AIN"/>
+                <signal pad-key="pd2" index="2" function="AIN0" group="AIN"/>
+                <signal pad-key="pd3" index="3" function="AIN0" group="AIN"/>
+                <signal pad-key="pd4" index="4" function="AIN0" group="AIN"/>
+                <signal pad-key="pd5" index="5" function="AIN0" group="AIN"/>
+                <signal pad-key="pd6" index="6" function="AIN0" group="AIN"/>
+                <signal pad-key="pd7" index="7" function="AIN0" group="AIN"/>
+                <signal pad-key="pf0" index="16" function="AIN0" group="AIN"/>
+                <signal pad-key="pf1" index="17" function="AIN0" group="AIN"/>
+                <signal pad-key="pf2" index="18" function="AIN0" group="AIN"/>
+                <signal pad-key="pf3" index="19" function="AIN0" group="AIN"/>
+                <signal pad-key="pf4" index="20" function="AIN0" group="AIN"/>
+                <signal pad-key="pf5" index="21" function="AIN0" group="AIN"/>
             </signals>
         </peripheral>
         <peripheral key="bod" name="BOD" module-key="bor_lvd_ctrl_v1">
@@ -102,33 +102,33 @@
         <peripheral key="ccl" name="CCL" module-key="cla_ccl_v1">
             <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"/>
-                <signal pad-id="pa2" index="2" function="CCL_IN" group="LUT0_IN"/>
-                <signal pad-id="pa6" index="0" function="CCL_ALT" group="LUT0_OUT" field="PORTMUX.CCLROUTEA.LUT0"/>
-                <signal pad-id="pa3" index="0" function="CCL" group="LUT0_OUT" field="PORTMUX.CCLROUTEA.LUT0"/>
-                <signal pad-id="pc0" index="0" function="CCL_IN" group="LUT1_IN"/>
-                <signal pad-id="pc1" index="1" function="CCL_IN" group="LUT1_IN"/>
-                <signal pad-id="pc2" index="2" function="CCL_IN" group="LUT1_IN"/>
-                <signal pad-id="pc3" index="0" function="CCL" group="LUT1_OUT" field="PORTMUX.CCLROUTEA.LUT1"/>
-                <signal pad-id="pd0" index="0" function="CCL_IN" group="LUT2_IN"/>
-                <signal pad-id="pd1" index="1" function="CCL_IN" group="LUT2_IN"/>
-                <signal pad-id="pd2" index="2" function="CCL_IN" group="LUT2_IN"/>
-                <signal pad-id="pd6" index="0" function="CCL_ALT" group="LUT2_OUT" field="PORTMUX.CCLROUTEA.LUT2"/>
-                <signal pad-id="pd3" index="0" function="CCL" group="LUT2_OUT" field="PORTMUX.CCLROUTEA.LUT2"/>
-                <signal pad-id="pf0" index="0" function="CCL_IN" group="LUT3_IN"/>
-                <signal pad-id="pf1" index="1" function="CCL_IN" group="LUT3_IN"/>
-                <signal pad-id="pf2" index="2" function="CCL_IN" group="LUT3_IN"/>
-                <signal pad-id="pf3" index="0" function="CCL" group="LUT3_OUT" field="PORTMUX.CCLROUTEA.LUT3"/>
+                <signal pad-key="pa0" index="0" function="CCL_IN" group="LUT0_IN"/>
+                <signal pad-key="pa1" index="1" function="CCL_IN" group="LUT0_IN"/>
+                <signal pad-key="pa2" index="2" function="CCL_IN" group="LUT0_IN"/>
+                <signal pad-key="pa6" index="0" function="CCL_ALT" group="LUT0_OUT" field="PORTMUX.CCLROUTEA.LUT0"/>
+                <signal pad-key="pa3" index="0" function="CCL" group="LUT0_OUT" field="PORTMUX.CCLROUTEA.LUT0"/>
+                <signal pad-key="pc0" index="0" function="CCL_IN" group="LUT1_IN"/>
+                <signal pad-key="pc1" index="1" function="CCL_IN" group="LUT1_IN"/>
+                <signal pad-key="pc2" index="2" function="CCL_IN" group="LUT1_IN"/>
+                <signal pad-key="pc3" index="0" function="CCL" group="LUT1_OUT" field="PORTMUX.CCLROUTEA.LUT1"/>
+                <signal pad-key="pd0" index="0" function="CCL_IN" group="LUT2_IN"/>
+                <signal pad-key="pd1" index="1" function="CCL_IN" group="LUT2_IN"/>
+                <signal pad-key="pd2" index="2" function="CCL_IN" group="LUT2_IN"/>
+                <signal pad-key="pd6" index="0" function="CCL_ALT" group="LUT2_OUT" field="PORTMUX.CCLROUTEA.LUT2"/>
+                <signal pad-key="pd3" index="0" function="CCL" group="LUT2_OUT" field="PORTMUX.CCLROUTEA.LUT2"/>
+                <signal pad-key="pf0" index="0" function="CCL_IN" group="LUT3_IN"/>
+                <signal pad-key="pf1" index="1" function="CCL_IN" group="LUT3_IN"/>
+                <signal pad-key="pf2" index="2" function="CCL_IN" group="LUT3_IN"/>
+                <signal pad-key="pf3" index="0" function="CCL" group="LUT3_OUT" field="PORTMUX.CCLROUTEA.LUT3"/>
             </signals>
         </peripheral>
         <peripheral key="clkctrl" name="CLKCTRL" module-key="avrda_clkctrl">
             <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"/>
-                <signal pad-id="pf0" function="CLKCTRL" group="XTAL32K1"/>
-                <signal pad-id="pf1" function="CLKCTRL" group="XTAL32K2"/>
+                <signal pad-key="pa7" function="CLKCTRL" group="CLKOUT"/>
+                <signal pad-key="pa0" function="CLKCTRL" group="EXTCLK"/>
+                <signal pad-key="pf0" function="CLKCTRL" group="XTAL32K1"/>
+                <signal pad-key="pf1" function="CLKCTRL" group="XTAL32K2"/>
             </signals>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="cpu_avr_xt_v1">
@@ -143,18 +143,18 @@
         <peripheral key="dac0" name="DAC0" module-key="dac_nbit_ctrl_v5">
             <register-group-instance register-group-key="dac" address-space-key="data" offset="0x6A0"/>
             <signals>
-                <signal pad-id="pd6" index="0" function="DAC0" group="OUT"/>
+                <signal pad-key="pd6" index="0" function="DAC0" group="OUT"/>
             </signals>
         </peripheral>
         <peripheral key="evsys" name="EVSYS" module-key="avrda_evsys">
             <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"/>
-                <signal pad-id="pc2" index="2" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTC"/>
-                <signal pad-id="pd7" index="3" function="EVSYS_ALT" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTD"/>
-                <signal pad-id="pd2" index="3" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTD"/>
-                <signal pad-id="pf2" index="5" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTF"/>
+                <signal pad-key="pa7" index="0" function="EVSYS_ALT" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTA"/>
+                <signal pad-key="pa2" index="0" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTA"/>
+                <signal pad-key="pc2" index="2" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTC"/>
+                <signal pad-key="pd7" index="3" function="EVSYS_ALT" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTD"/>
+                <signal pad-key="pd2" index="3" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTD"/>
+                <signal pad-key="pf2" index="5" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTF"/>
             </signals>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="avrda_fuse">
@@ -172,48 +172,48 @@
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pa2" index="2" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa3" index="3" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa4" index="4" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa5" index="5" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa6" index="6" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa7" index="7" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa0" index="0" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa1" index="1" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa2" index="2" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa3" index="3" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa4" index="4" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa5" index="5" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa6" index="6" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa7" index="7" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pc2" index="2" function="IOPORT" group="PIN"/>
-                <signal pad-id="pc3" index="3" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc0" index="0" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc1" index="1" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc2" index="2" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc3" index="3" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pd2" index="2" function="IOPORT" group="PIN"/>
-                <signal pad-id="pd3" index="3" function="IOPORT" group="PIN"/>
-                <signal pad-id="pd4" index="4" function="IOPORT" group="PIN"/>
-                <signal pad-id="pd5" index="5" function="IOPORT" group="PIN"/>
-                <signal pad-id="pd6" index="6" function="IOPORT" group="PIN"/>
-                <signal pad-id="pd7" index="7" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd0" index="0" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd1" index="1" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd2" index="2" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd3" index="3" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd4" index="4" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd5" index="5" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd6" index="6" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd7" index="7" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="portf" name="PORTF" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pf2" index="2" function="IOPORT" group="PIN"/>
-                <signal pad-id="pf3" index="3" function="IOPORT" group="PIN"/>
-                <signal pad-id="pf4" index="4" function="IOPORT" group="PIN"/>
-                <signal pad-id="pf5" index="5" function="IOPORT" group="PIN"/>
-                <signal pad-id="pf6" index="6" function="IOPORT" group="PIN"/>
+                <signal pad-key="pf0" index="0" function="IOPORT" group="PIN"/>
+                <signal pad-key="pf1" index="1" function="IOPORT" group="PIN"/>
+                <signal pad-key="pf2" index="2" function="IOPORT" group="PIN"/>
+                <signal pad-key="pf3" index="3" function="IOPORT" group="PIN"/>
+                <signal pad-key="pf4" index="4" function="IOPORT" group="PIN"/>
+                <signal pad-key="pf5" index="5" function="IOPORT" group="PIN"/>
+                <signal pad-key="pf6" index="6" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="portmux" name="PORTMUX" module-key="avrda_portmux">
@@ -221,34 +221,34 @@
         </peripheral>
         <peripheral key="ptc" name="PTC" module-key="adc_ptc_ctrl_v1">
             <signals>
-                <signal pad-id="pa0" index="0" function="PTC" group="XY"/>
-                <signal pad-id="pa1" index="1" function="PTC" group="XY"/>
-                <signal pad-id="pa2" index="2" function="PTC" group="XY"/>
-                <signal pad-id="pa3" index="3" function="PTC" group="XY"/>
-                <signal pad-id="pa4" index="4" function="PTC" group="XY"/>
-                <signal pad-id="pa5" index="5" function="PTC" group="XY"/>
-                <signal pad-id="pa6" index="6" function="PTC" group="XY"/>
-                <signal pad-id="pa7" index="7" function="PTC" group="XY"/>
-                <signal pad-id="pd0" index="16" function="PTC" group="XY"/>
-                <signal pad-id="pd1" index="17" function="PTC" group="XY"/>
-                <signal pad-id="pd2" index="18" function="PTC" group="XY"/>
-                <signal pad-id="pd3" index="19" function="PTC" group="XY"/>
-                <signal pad-id="pd4" index="20" function="PTC" group="XY"/>
-                <signal pad-id="pd5" index="21" function="PTC" group="XY"/>
-                <signal pad-id="pd6" index="22" function="PTC" group="XY"/>
-                <signal pad-id="pd7" index="23" function="PTC" group="XY"/>
-                <signal pad-id="pf0" index="32" function="PTC" group="XY"/>
-                <signal pad-id="pf1" index="33" function="PTC" group="XY"/>
-                <signal pad-id="pf2" index="34" function="PTC" group="XY"/>
-                <signal pad-id="pf3" index="35" function="PTC" group="XY"/>
-                <signal pad-id="pf4" index="36" function="PTC" group="XY"/>
-                <signal pad-id="pf5" index="37" function="PTC" group="XY"/>
+                <signal pad-key="pa0" index="0" function="PTC" group="XY"/>
+                <signal pad-key="pa1" index="1" function="PTC" group="XY"/>
+                <signal pad-key="pa2" index="2" function="PTC" group="XY"/>
+                <signal pad-key="pa3" index="3" function="PTC" group="XY"/>
+                <signal pad-key="pa4" index="4" function="PTC" group="XY"/>
+                <signal pad-key="pa5" index="5" function="PTC" group="XY"/>
+                <signal pad-key="pa6" index="6" function="PTC" group="XY"/>
+                <signal pad-key="pa7" index="7" function="PTC" group="XY"/>
+                <signal pad-key="pd0" index="16" function="PTC" group="XY"/>
+                <signal pad-key="pd1" index="17" function="PTC" group="XY"/>
+                <signal pad-key="pd2" index="18" function="PTC" group="XY"/>
+                <signal pad-key="pd3" index="19" function="PTC" group="XY"/>
+                <signal pad-key="pd4" index="20" function="PTC" group="XY"/>
+                <signal pad-key="pd5" index="21" function="PTC" group="XY"/>
+                <signal pad-key="pd6" index="22" function="PTC" group="XY"/>
+                <signal pad-key="pd7" index="23" function="PTC" group="XY"/>
+                <signal pad-key="pf0" index="32" function="PTC" group="XY"/>
+                <signal pad-key="pf1" index="33" function="PTC" group="XY"/>
+                <signal pad-key="pf2" index="34" function="PTC" group="XY"/>
+                <signal pad-key="pf3" index="35" function="PTC" group="XY"/>
+                <signal pad-key="pf4" index="36" function="PTC" group="XY"/>
+                <signal pad-key="pf5" index="37" function="PTC" group="XY"/>
             </signals>
         </peripheral>
         <peripheral key="rstctrl" name="RSTCTRL" module-key="rst_integration_v8">
             <register-group-instance register-group-key="rstctrl" address-space-key="data" offset="0x40"/>
             <signals>
-                <signal pad-id="pf6" function="OTHER" group="RESET"/>
+                <signal pad-key="pf6" function="OTHER" group="RESET"/>
             </signals>
         </peripheral>
         <peripheral key="rtc" name="RTC" module-key="tmr_16b_rtc_v1">
@@ -263,19 +263,19 @@
         <peripheral key="spi0" name="SPI0" module-key="spi_8bit_v2">
             <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"/>
-                <signal pad-id="pa6" function="SPI0" group="SCK" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <signal pad-id="pa7" function="SPI0" group="SS" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pa5" function="SPI0" group="MISO" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pa4" function="SPI0" group="MOSI" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pa6" function="SPI0" group="SCK" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pa7" function="SPI0" group="SS" field="PORTMUX.SPIROUTEA.SPI0"/>
             </signals>
         </peripheral>
         <peripheral key="spi1" name="SPI1" module-key="spi_8bit_v2">
             <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"/>
-                <signal pad-id="pc2" function="SPI1" group="SCK" field="PORTMUX.SPIROUTEA.SPI1"/>
-                <signal pad-id="pc3" function="SPI1" group="SS" field="PORTMUX.SPIROUTEA.SPI1"/>
+                <signal pad-key="pc1" function="SPI1" group="MISO" field="PORTMUX.SPIROUTEA.SPI1"/>
+                <signal pad-key="pc0" function="SPI1" group="MOSI" field="PORTMUX.SPIROUTEA.SPI1"/>
+                <signal pad-key="pc2" function="SPI1" group="SCK" field="PORTMUX.SPIROUTEA.SPI1"/>
+                <signal pad-key="pc3" function="SPI1" group="SS" field="PORTMUX.SPIROUTEA.SPI1"/>
             </signals>
         </peripheral>
         <peripheral key="syscfg" name="SYSCFG" module-key="avrda_syscfg">
@@ -284,116 +284,116 @@
         <peripheral key="tca0" name="TCA0" module-key="tmr_16b_pwm_v1">
             <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"/>
-                <signal pad-id="pc0" index="0" function="TCA0_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pa0" index="0" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pf1" index="1" function="TCA0_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pd1" index="1" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pc1" index="1" function="TCA0_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pa1" index="1" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pf2" index="2" function="TCA0_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pd2" index="2" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pc2" index="2" function="TCA0_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pa2" index="2" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pf3" index="3" function="TCA0_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pd3" index="3" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pc3" index="3" function="TCA0_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pa3" index="3" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pf4" index="4" function="TCA0_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pd4" index="4" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pa4" index="4" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pf5" index="5" function="TCA0_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pd5" index="5" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pa5" index="5" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pf0" index="0" function="TCA0_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pd0" index="0" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pc0" index="0" function="TCA0_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pa0" index="0" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pf1" index="1" function="TCA0_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pd1" index="1" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pc1" index="1" function="TCA0_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pa1" index="1" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pf2" index="2" function="TCA0_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pd2" index="2" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pc2" index="2" function="TCA0_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pa2" index="2" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pf3" index="3" function="TCA0_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pd3" index="3" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pc3" index="3" function="TCA0_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pa3" index="3" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pf4" index="4" function="TCA0_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pd4" index="4" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pa4" index="4" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pf5" index="5" function="TCA0_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pd5" index="5" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pa5" index="5" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
             </signals>
         </peripheral>
         <peripheral key="tcb0" name="TCB0" module-key="tmr_16b_capture_v1">
             <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"/>
+                <signal pad-key="pf4" index="0" function="TCB0_ALT" group="WO" field="PORTMUX.TCBROUTEA.TCB0"/>
+                <signal pad-key="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 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"/>
+                <signal pad-key="pf5" index="0" function="TCB1_ALT" group="WO" field="PORTMUX.TCBROUTEA.TCB1"/>
+                <signal pad-key="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 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"/>
+                <signal pad-key="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 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"/>
-                <signal pad-id="pf1" index="1" function="TCD0_ALT2" group="WOB" field="PORTMUX.TCDROUTEA.TCD0"/>
-                <signal pad-id="pa5" index="1" function="TCD0" group="WOB" field="PORTMUX.TCDROUTEA.TCD0"/>
-                <signal pad-id="pf2" index="2" function="TCD0_ALT2" group="WOC" field="PORTMUX.TCDROUTEA.TCD0"/>
-                <signal pad-id="pa6" index="2" function="TCD0" group="WOC" field="PORTMUX.TCDROUTEA.TCD0"/>
-                <signal pad-id="pf3" index="3" function="TCD0_ALT2" group="WOD" field="PORTMUX.TCDROUTEA.TCD0"/>
-                <signal pad-id="pa7" index="3" function="TCD0" group="WOD" field="PORTMUX.TCDROUTEA.TCD0"/>
+                <signal pad-key="pf0" function="TCD0_ALT2" group="WOA" field="PORTMUX.TCDROUTEA.TCD0"/>
+                <signal pad-key="pa4" function="TCD0" group="WOA" field="PORTMUX.TCDROUTEA.TCD0"/>
+                <signal pad-key="pf1" index="1" function="TCD0_ALT2" group="WOB" field="PORTMUX.TCDROUTEA.TCD0"/>
+                <signal pad-key="pa5" index="1" function="TCD0" group="WOB" field="PORTMUX.TCDROUTEA.TCD0"/>
+                <signal pad-key="pf2" index="2" function="TCD0_ALT2" group="WOC" field="PORTMUX.TCDROUTEA.TCD0"/>
+                <signal pad-key="pa6" index="2" function="TCD0" group="WOC" field="PORTMUX.TCDROUTEA.TCD0"/>
+                <signal pad-key="pf3" index="3" function="TCD0_ALT2" group="WOD" field="PORTMUX.TCDROUTEA.TCD0"/>
+                <signal pad-key="pa7" index="3" function="TCD0" group="WOD" field="PORTMUX.TCDROUTEA.TCD0"/>
             </signals>
         </peripheral>
         <peripheral key="twi0" name="TWI0" module-key="i2c_8bit_v2">
             <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"/>
-                <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"/>
-                <signal pad-id="pc2" function="I2C0_ALT2" group="SDA" field="PORTMUX.TWIROUTEA.TWI0"/>
-                <signal pad-id="pa2" function="I2C0_ALT1" group="SDA" field="PORTMUX.TWIROUTEA.TWI0"/>
-                <signal pad-id="pa2" function="I2C0" group="SDA" field="PORTMUX.TWIROUTEA.TWI0"/>
-                <signal pad-id="pc2" function="I2C0" group="SDA_DUAL" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pc3" function="I2C0_ALT2" group="SCL" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pa3" function="I2C0_ALT1" group="SCL" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pa3" function="I2C0" group="SCL" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pc3" function="I2C0" group="SCL_DUAL" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pc2" function="I2C0_ALT2" group="SDA" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pa2" function="I2C0_ALT1" group="SDA" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pa2" function="I2C0" group="SDA" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pc2" function="I2C0" group="SDA_DUAL" field="PORTMUX.TWIROUTEA.TWI0"/>
             </signals>
         </peripheral>
         <peripheral key="twi1" name="TWI1" module-key="i2c_8bit_v2">
             <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"/>
-                <signal pad-id="pf2" function="I2C1_ALT1" group="SDA" field="PORTMUX.TWIROUTEA.TWI1"/>
-                <signal pad-id="pf2" function="I2C1" group="SDA" field="PORTMUX.TWIROUTEA.TWI1"/>
+                <signal pad-key="pf3" function="I2C1_ALT1" group="SCL" field="PORTMUX.TWIROUTEA.TWI1"/>
+                <signal pad-key="pf3" function="I2C1" group="SCL" field="PORTMUX.TWIROUTEA.TWI1"/>
+                <signal pad-key="pf2" function="I2C1_ALT1" group="SDA" field="PORTMUX.TWIROUTEA.TWI1"/>
+                <signal pad-key="pf2" function="I2C1" group="SDA" field="PORTMUX.TWIROUTEA.TWI1"/>
             </signals>
         </peripheral>
         <peripheral key="usart0" name="USART0" module-key="uart_autobd_v4">
             <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"/>
-                <signal pad-id="pa4" function="USART0_ALT" group="TXD" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pa0" function="USART0" group="TXD" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pa6" function="USART0_ALT" group="XCK" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pa2" function="USART0" group="XCK" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pa7" function="USART0_ALT" group="XDIR" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pa3" function="USART0" group="XDIR" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa5" function="USART0_ALT" group="RXD" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa1" function="USART0" group="RXD" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa4" function="USART0_ALT" group="TXD" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa0" function="USART0" group="TXD" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa6" function="USART0_ALT" group="XCK" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa2" function="USART0" group="XCK" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa7" function="USART0_ALT" group="XDIR" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa3" function="USART0" group="XDIR" field="PORTMUX.USARTROUTEA.USART0"/>
             </signals>
         </peripheral>
         <peripheral key="usart1" name="USART1" module-key="uart_autobd_v4">
             <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"/>
-                <signal pad-id="pc2" function="USART1" group="XCK" field="PORTMUX.USARTROUTEA.USART1"/>
-                <signal pad-id="pc3" function="USART1" group="XDIR" field="PORTMUX.USARTROUTEA.USART1"/>
+                <signal pad-key="pc1" function="USART1" group="RXD" field="PORTMUX.USARTROUTEA.USART1"/>
+                <signal pad-key="pc0" function="USART1" group="TXD" field="PORTMUX.USARTROUTEA.USART1"/>
+                <signal pad-key="pc2" function="USART1" group="XCK" field="PORTMUX.USARTROUTEA.USART1"/>
+                <signal pad-key="pc3" function="USART1" group="XDIR" field="PORTMUX.USARTROUTEA.USART1"/>
             </signals>
         </peripheral>
         <peripheral key="usart2" name="USART2" module-key="uart_autobd_v4">
             <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"/>
-                <signal pad-id="pf4" function="USART2_ALT" group="TXD" field="PORTMUX.USARTROUTEA.USART2"/>
-                <signal pad-id="pf0" function="USART2" group="TXD" field="PORTMUX.USARTROUTEA.USART2"/>
-                <signal pad-id="pf2" function="USART2" group="XCK" field="PORTMUX.USARTROUTEA.USART2"/>
-                <signal pad-id="pf3" function="USART2" group="XDIR" field="PORTMUX.USARTROUTEA.USART2"/>
+                <signal pad-key="pf5" function="USART2_ALT" group="RXD" field="PORTMUX.USARTROUTEA.USART2"/>
+                <signal pad-key="pf1" function="USART2" group="RXD" field="PORTMUX.USARTROUTEA.USART2"/>
+                <signal pad-key="pf4" function="USART2_ALT" group="TXD" field="PORTMUX.USARTROUTEA.USART2"/>
+                <signal pad-key="pf0" function="USART2" group="TXD" field="PORTMUX.USARTROUTEA.USART2"/>
+                <signal pad-key="pf2" function="USART2" group="XCK" field="PORTMUX.USARTROUTEA.USART2"/>
+                <signal pad-key="pf3" function="USART2" group="XDIR" field="PORTMUX.USARTROUTEA.USART2"/>
             </signals>
         </peripheral>
         <peripheral key="userrow" name="USERROW" module-key="avrda_userrow">
@@ -420,8 +420,8 @@
         <peripheral key="zcd0" name="ZCD0" module-key="cmp_zxover_ctrl_v3">
             <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"/>
+                <signal pad-key="pd1" function="ZCD0" group="IN"/>
+                <signal pad-key="pa7" function="ZCD0" group="OUT" field="PORTMUX.ZCDROUTEA.ZCD0"/>
             </signals>
         </peripheral>
     </peripherals>
@@ -1644,43 +1644,77 @@
             </register-group>
         </module>
     </modules>
+    <pads>
+        <pad key="pa3" name="PA3"/>
+        <pad key="pa4" name="PA4"/>
+        <pad key="pa5" name="PA5"/>
+        <pad key="pa6" name="PA6"/>
+        <pad key="pa7" name="PA7"/>
+        <pad key="pc0" name="PC0"/>
+        <pad key="pc1" name="PC1"/>
+        <pad key="pc2" name="PC2"/>
+        <pad key="pc3" name="PC3"/>
+        <pad key="pd0" name="PD0"/>
+        <pad key="pd1" name="PD1"/>
+        <pad key="pd2" name="PD2"/>
+        <pad key="pd3" name="PD3"/>
+        <pad key="pd4" name="PD4"/>
+        <pad key="pd5" name="PD5"/>
+        <pad key="pd6" name="PD6"/>
+        <pad key="pd7" name="PD7"/>
+        <pad key="avdd" name="AVDD"/>
+        <pad key="agnd" name="AGND"/>
+        <pad key="pf0" name="PF0"/>
+        <pad key="pf1" name="PF1"/>
+        <pad key="pf2" name="PF2"/>
+        <pad key="pf3" name="PF3"/>
+        <pad key="pf4" name="PF4"/>
+        <pad key="pf5" name="PF5"/>
+        <pad key="pf6" name="PF6"/>
+        <pad key="updi" name="UPDI"/>
+        <pad key="vdd0" name="VDD0"/>
+        <pad key="gnd0" name="GND0"/>
+        <pad key="pa0" name="PA0"/>
+        <pad key="pa1" name="PA1"/>
+        <pad key="pa2" name="PA2"/>
+    </pads>
     <pinouts>
         <pinout key="qfn32" name="QFN32" type="qfn">
-            <pin position="1" pad="PA3"/>
-            <pin position="2" pad="PA4"/>
-            <pin position="3" pad="PA5"/>
-            <pin position="4" pad="PA6"/>
-            <pin position="5" pad="PA7"/>
-            <pin position="6" pad="PC0"/>
-            <pin position="7" pad="PC1"/>
-            <pin position="8" pad="PC2"/>
-            <pin position="9" pad="PC3"/>
-            <pin position="10" pad="PD0"/>
-            <pin position="11" pad="PD1"/>
-            <pin position="12" pad="PD2"/>
-            <pin position="13" pad="PD3"/>
-            <pin position="14" pad="PD4"/>
-            <pin position="15" pad="PD5"/>
-            <pin position="16" pad="PD6"/>
-            <pin position="17" pad="PD7"/>
-            <pin position="18" pad="AVDD"/>
-            <pin position="19" pad="AGND"/>
-            <pin position="20" pad="PF0"/>
-            <pin position="21" pad="PF1"/>
-            <pin position="22" pad="PF2"/>
-            <pin position="23" pad="PF3"/>
-            <pin position="24" pad="PF4"/>
-            <pin position="25" pad="PF5"/>
-            <pin position="26" pad="PF6"/>
-            <pin position="27" pad="UPDI"/>
-            <pin position="28" pad="VDD0"/>
-            <pin position="29" pad="GND0"/>
-            <pin position="30" pad="PA0"/>
-            <pin position="31" pad="PA1"/>
-            <pin position="32" pad="PA2"/>
+            <pin position="1" pad-key="pa3"/>
+            <pin position="2" pad-key="pa4"/>
+            <pin position="3" pad-key="pa5"/>
+            <pin position="4" pad-key="pa6"/>
+            <pin position="5" pad-key="pa7"/>
+            <pin position="6" pad-key="pc0"/>
+            <pin position="7" pad-key="pc1"/>
+            <pin position="8" pad-key="pc2"/>
+            <pin position="9" pad-key="pc3"/>
+            <pin position="10" pad-key="pd0"/>
+            <pin position="11" pad-key="pd1"/>
+            <pin position="12" pad-key="pd2"/>
+            <pin position="13" pad-key="pd3"/>
+            <pin position="14" pad-key="pd4"/>
+            <pin position="15" pad-key="pd5"/>
+            <pin position="16" pad-key="pd6"/>
+            <pin position="17" pad-key="pd7"/>
+            <pin position="18" pad-key="avdd"/>
+            <pin position="19" pad-key="agnd"/>
+            <pin position="20" pad-key="pf0"/>
+            <pin position="21" pad-key="pf1"/>
+            <pin position="22" pad-key="pf2"/>
+            <pin position="23" pad-key="pf3"/>
+            <pin position="24" pad-key="pf4"/>
+            <pin position="25" pad-key="pf5"/>
+            <pin position="26" pad-key="pf6"/>
+            <pin position="27" pad-key="updi"/>
+            <pin position="28" pad-key="vdd0"/>
+            <pin position="29" pad-key="gnd0"/>
+            <pin position="30" pad-key="pa0"/>
+            <pin position="31" pad-key="pa1"/>
+            <pin position="32" pad-key="pa2"/>
         </pinout>
     </pinouts>
     <variants>
-        <variant name="AVR32DA32" pinout-key="qfn32" package="QFN32"/>
+        <variant key="avr32da32" name="AVR32DA32" pinout-key="qfn32"/>
     </variants>
 </device>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR32DA48.xml b/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR32DA48.xml
index 53498d6b..f0b4d75a 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR32DA48.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR32DA48.xml
@@ -44,66 +44,66 @@
         <peripheral key="ac0" name="AC0" module-key="cmp_control_v8">
             <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"/>
-                <signal pad-id="pd7" index="2" function="AC0" group="N"/>
-                <signal pad-id="pc6" index="0" function="AC0_ALT" group="OUT" field="PORTMUX.ACROUTEA.AC0"/>
-                <signal pad-id="pa7" index="0" function="AC0" group="OUT" field="PORTMUX.ACROUTEA.AC0"/>
-                <signal pad-id="pd2" index="0" function="AC0" group="P"/>
-                <signal pad-id="pe0" index="1" function="AC0" group="P"/>
-                <signal pad-id="pe2" index="2" function="AC0" group="P"/>
-                <signal pad-id="pd6" index="3" function="AC0" group="P"/>
+                <signal pad-key="pd3" index="0" function="AC0" group="N"/>
+                <signal pad-key="pd0" index="1" function="AC0" group="N"/>
+                <signal pad-key="pd7" index="2" function="AC0" group="N"/>
+                <signal pad-key="pc6" index="0" function="AC0_ALT" group="OUT" field="PORTMUX.ACROUTEA.AC0"/>
+                <signal pad-key="pa7" index="0" function="AC0" group="OUT" field="PORTMUX.ACROUTEA.AC0"/>
+                <signal pad-key="pd2" index="0" function="AC0" group="P"/>
+                <signal pad-key="pe0" index="1" function="AC0" group="P"/>
+                <signal pad-key="pe2" index="2" function="AC0" group="P"/>
+                <signal pad-key="pd6" index="3" function="AC0" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="ac1" name="AC1" module-key="cmp_control_v8">
             <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"/>
-                <signal pad-id="pd7" index="2" function="AC1" group="N"/>
-                <signal pad-id="pc6" index="0" function="AC1_ALT" group="OUT" field="PORTMUX.ACROUTEA.AC1"/>
-                <signal pad-id="pa7" index="0" function="AC1" group="OUT" field="PORTMUX.ACROUTEA.AC1"/>
-                <signal pad-id="pd2" index="0" function="AC1" group="P"/>
-                <signal pad-id="pd3" index="1" function="AC1" group="P"/>
-                <signal pad-id="pd4" index="2" function="AC1" group="P"/>
-                <signal pad-id="pd6" index="3" function="AC1" group="P"/>
+                <signal pad-key="pd5" index="0" function="AC1" group="N"/>
+                <signal pad-key="pd0" index="1" function="AC1" group="N"/>
+                <signal pad-key="pd7" index="2" function="AC1" group="N"/>
+                <signal pad-key="pc6" index="0" function="AC1_ALT" group="OUT" field="PORTMUX.ACROUTEA.AC1"/>
+                <signal pad-key="pa7" index="0" function="AC1" group="OUT" field="PORTMUX.ACROUTEA.AC1"/>
+                <signal pad-key="pd2" index="0" function="AC1" group="P"/>
+                <signal pad-key="pd3" index="1" function="AC1" group="P"/>
+                <signal pad-key="pd4" index="2" function="AC1" group="P"/>
+                <signal pad-key="pd6" index="3" function="AC1" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="ac2" name="AC2" module-key="cmp_control_v8">
             <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"/>
-                <signal pad-id="pd7" index="2" function="AC2" group="N"/>
-                <signal pad-id="pc6" index="0" function="AC2_ALT" group="OUT" field="PORTMUX.ACROUTEA.AC2"/>
-                <signal pad-id="pa7" index="0" function="AC2" group="OUT" field="PORTMUX.ACROUTEA.AC2"/>
-                <signal pad-id="pd2" index="0" function="AC2" group="P"/>
-                <signal pad-id="pd4" index="1" function="AC2" group="P"/>
-                <signal pad-id="pe1" index="2" function="AC2" group="P"/>
-                <signal pad-id="pd6" index="3" function="AC2" group="P"/>
+                <signal pad-key="pd7" index="0" function="AC2" group="N"/>
+                <signal pad-key="pd0" index="1" function="AC2" group="N"/>
+                <signal pad-key="pd7" index="2" function="AC2" group="N"/>
+                <signal pad-key="pc6" index="0" function="AC2_ALT" group="OUT" field="PORTMUX.ACROUTEA.AC2"/>
+                <signal pad-key="pa7" index="0" function="AC2" group="OUT" field="PORTMUX.ACROUTEA.AC2"/>
+                <signal pad-key="pd2" index="0" function="AC2" group="P"/>
+                <signal pad-key="pd4" index="1" function="AC2" group="P"/>
+                <signal pad-key="pe1" index="2" function="AC2" group="P"/>
+                <signal pad-key="pd6" index="3" function="AC2" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="adc0" name="ADC0" module-key="adc_12b_diff_ctrl_v1">
             <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"/>
-                <signal pad-id="pd2" index="2" function="AIN0" group="AIN"/>
-                <signal pad-id="pd3" index="3" function="AIN0" group="AIN"/>
-                <signal pad-id="pd4" index="4" function="AIN0" group="AIN"/>
-                <signal pad-id="pd5" index="5" function="AIN0" group="AIN"/>
-                <signal pad-id="pd6" index="6" function="AIN0" group="AIN"/>
-                <signal pad-id="pd7" index="7" function="AIN0" group="AIN"/>
-                <signal pad-id="pe0" index="8" function="AIN0" group="AIN"/>
-                <signal pad-id="pe1" index="9" function="AIN0" group="AIN"/>
-                <signal pad-id="pe2" index="10" function="AIN0" group="AIN"/>
-                <signal pad-id="pe3" index="11" function="AIN0" group="AIN"/>
-                <signal pad-id="pf0" index="16" function="AIN0" group="AIN"/>
-                <signal pad-id="pf1" index="17" function="AIN0" group="AIN"/>
-                <signal pad-id="pf2" index="18" function="AIN0" group="AIN"/>
-                <signal pad-id="pf3" index="19" function="AIN0" group="AIN"/>
-                <signal pad-id="pf4" index="20" function="AIN0" group="AIN"/>
-                <signal pad-id="pf5" index="21" function="AIN0" group="AIN"/>
+                <signal pad-key="pd0" index="0" function="AIN0" group="AIN"/>
+                <signal pad-key="pd1" index="1" function="AIN0" group="AIN"/>
+                <signal pad-key="pd2" index="2" function="AIN0" group="AIN"/>
+                <signal pad-key="pd3" index="3" function="AIN0" group="AIN"/>
+                <signal pad-key="pd4" index="4" function="AIN0" group="AIN"/>
+                <signal pad-key="pd5" index="5" function="AIN0" group="AIN"/>
+                <signal pad-key="pd6" index="6" function="AIN0" group="AIN"/>
+                <signal pad-key="pd7" index="7" function="AIN0" group="AIN"/>
+                <signal pad-key="pe0" index="8" function="AIN0" group="AIN"/>
+                <signal pad-key="pe1" index="9" function="AIN0" group="AIN"/>
+                <signal pad-key="pe2" index="10" function="AIN0" group="AIN"/>
+                <signal pad-key="pe3" index="11" function="AIN0" group="AIN"/>
+                <signal pad-key="pf0" index="16" function="AIN0" group="AIN"/>
+                <signal pad-key="pf1" index="17" function="AIN0" group="AIN"/>
+                <signal pad-key="pf2" index="18" function="AIN0" group="AIN"/>
+                <signal pad-key="pf3" index="19" function="AIN0" group="AIN"/>
+                <signal pad-key="pf4" index="20" function="AIN0" group="AIN"/>
+                <signal pad-key="pf5" index="21" function="AIN0" group="AIN"/>
             </signals>
         </peripheral>
         <peripheral key="bod" name="BOD" module-key="bor_lvd_ctrl_v1">
@@ -112,38 +112,38 @@
         <peripheral key="ccl" name="CCL" module-key="cla_ccl_v1">
             <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"/>
-                <signal pad-id="pa2" index="2" function="CCL_IN" group="LUT0_IN"/>
-                <signal pad-id="pa6" index="0" function="CCL_ALT" group="LUT0_OUT" field="PORTMUX.CCLROUTEA.LUT0"/>
-                <signal pad-id="pa3" index="0" function="CCL" group="LUT0_OUT" field="PORTMUX.CCLROUTEA.LUT0"/>
-                <signal pad-id="pc0" index="0" function="CCL_IN" group="LUT1_IN"/>
-                <signal pad-id="pc1" index="1" function="CCL_IN" group="LUT1_IN"/>
-                <signal pad-id="pc2" index="2" function="CCL_IN" group="LUT1_IN"/>
-                <signal pad-id="pc6" index="0" function="CCL_ALT" group="LUT1_OUT" field="PORTMUX.CCLROUTEA.LUT1"/>
-                <signal pad-id="pc3" index="0" function="CCL" group="LUT1_OUT" field="PORTMUX.CCLROUTEA.LUT1"/>
-                <signal pad-id="pd0" index="0" function="CCL_IN" group="LUT2_IN"/>
-                <signal pad-id="pd1" index="1" function="CCL_IN" group="LUT2_IN"/>
-                <signal pad-id="pd2" index="2" function="CCL_IN" group="LUT2_IN"/>
-                <signal pad-id="pd6" index="0" function="CCL_ALT" group="LUT2_OUT" field="PORTMUX.CCLROUTEA.LUT2"/>
-                <signal pad-id="pd3" index="0" function="CCL" group="LUT2_OUT" field="PORTMUX.CCLROUTEA.LUT2"/>
-                <signal pad-id="pf0" index="0" function="CCL_IN" group="LUT3_IN"/>
-                <signal pad-id="pf1" index="1" function="CCL_IN" group="LUT3_IN"/>
-                <signal pad-id="pf2" index="2" function="CCL_IN" group="LUT3_IN"/>
-                <signal pad-id="pf3" index="0" function="CCL" group="LUT3_OUT" field="PORTMUX.CCLROUTEA.LUT3"/>
-                <signal pad-id="pb0" index="0" function="CCL_IN" group="LUT4_IN"/>
-                <signal pad-id="pb1" index="1" function="CCL_IN" group="LUT4_IN"/>
-                <signal pad-id="pb2" index="2" function="CCL_IN" group="LUT4_IN"/>
-                <signal pad-id="pb3" index="0" function="CCL" group="LUT4_OUT" field="PORTMUX.CCLROUTEA.LUT4"/>
+                <signal pad-key="pa0" index="0" function="CCL_IN" group="LUT0_IN"/>
+                <signal pad-key="pa1" index="1" function="CCL_IN" group="LUT0_IN"/>
+                <signal pad-key="pa2" index="2" function="CCL_IN" group="LUT0_IN"/>
+                <signal pad-key="pa6" index="0" function="CCL_ALT" group="LUT0_OUT" field="PORTMUX.CCLROUTEA.LUT0"/>
+                <signal pad-key="pa3" index="0" function="CCL" group="LUT0_OUT" field="PORTMUX.CCLROUTEA.LUT0"/>
+                <signal pad-key="pc0" index="0" function="CCL_IN" group="LUT1_IN"/>
+                <signal pad-key="pc1" index="1" function="CCL_IN" group="LUT1_IN"/>
+                <signal pad-key="pc2" index="2" function="CCL_IN" group="LUT1_IN"/>
+                <signal pad-key="pc6" index="0" function="CCL_ALT" group="LUT1_OUT" field="PORTMUX.CCLROUTEA.LUT1"/>
+                <signal pad-key="pc3" index="0" function="CCL" group="LUT1_OUT" field="PORTMUX.CCLROUTEA.LUT1"/>
+                <signal pad-key="pd0" index="0" function="CCL_IN" group="LUT2_IN"/>
+                <signal pad-key="pd1" index="1" function="CCL_IN" group="LUT2_IN"/>
+                <signal pad-key="pd2" index="2" function="CCL_IN" group="LUT2_IN"/>
+                <signal pad-key="pd6" index="0" function="CCL_ALT" group="LUT2_OUT" field="PORTMUX.CCLROUTEA.LUT2"/>
+                <signal pad-key="pd3" index="0" function="CCL" group="LUT2_OUT" field="PORTMUX.CCLROUTEA.LUT2"/>
+                <signal pad-key="pf0" index="0" function="CCL_IN" group="LUT3_IN"/>
+                <signal pad-key="pf1" index="1" function="CCL_IN" group="LUT3_IN"/>
+                <signal pad-key="pf2" index="2" function="CCL_IN" group="LUT3_IN"/>
+                <signal pad-key="pf3" index="0" function="CCL" group="LUT3_OUT" field="PORTMUX.CCLROUTEA.LUT3"/>
+                <signal pad-key="pb0" index="0" function="CCL_IN" group="LUT4_IN"/>
+                <signal pad-key="pb1" index="1" function="CCL_IN" group="LUT4_IN"/>
+                <signal pad-key="pb2" index="2" function="CCL_IN" group="LUT4_IN"/>
+                <signal pad-key="pb3" index="0" function="CCL" group="LUT4_OUT" field="PORTMUX.CCLROUTEA.LUT4"/>
             </signals>
         </peripheral>
         <peripheral key="clkctrl" name="CLKCTRL" module-key="avrda_clkctrl">
             <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"/>
-                <signal pad-id="pf0" function="CLKCTRL" group="XTAL32K1"/>
-                <signal pad-id="pf1" function="CLKCTRL" group="XTAL32K2"/>
+                <signal pad-key="pa7" function="CLKCTRL" group="CLKOUT"/>
+                <signal pad-key="pa0" function="CLKCTRL" group="EXTCLK"/>
+                <signal pad-key="pf0" function="CLKCTRL" group="XTAL32K1"/>
+                <signal pad-key="pf1" function="CLKCTRL" group="XTAL32K2"/>
             </signals>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="cpu_avr_xt_v1">
@@ -158,21 +158,21 @@
         <peripheral key="dac0" name="DAC0" module-key="dac_nbit_ctrl_v5">
             <register-group-instance register-group-key="dac" address-space-key="data" offset="0x6A0"/>
             <signals>
-                <signal pad-id="pd6" index="0" function="DAC0" group="OUT"/>
+                <signal pad-key="pd6" index="0" function="DAC0" group="OUT"/>
             </signals>
         </peripheral>
         <peripheral key="evsys" name="EVSYS" module-key="avrda_evsys">
             <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"/>
-                <signal pad-id="pb2" index="1" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTB"/>
-                <signal pad-id="pc7" index="2" function="EVSYS_ALT" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTC"/>
-                <signal pad-id="pc2" index="2" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTC"/>
-                <signal pad-id="pd7" index="3" function="EVSYS_ALT" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTD"/>
-                <signal pad-id="pd2" index="3" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTD"/>
-                <signal pad-id="pe2" index="4" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTE"/>
-                <signal pad-id="pf2" index="5" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTF"/>
+                <signal pad-key="pa7" index="0" function="EVSYS_ALT" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTA"/>
+                <signal pad-key="pa2" index="0" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTA"/>
+                <signal pad-key="pb2" index="1" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTB"/>
+                <signal pad-key="pc7" index="2" function="EVSYS_ALT" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTC"/>
+                <signal pad-key="pc2" index="2" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTC"/>
+                <signal pad-key="pd7" index="3" function="EVSYS_ALT" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTD"/>
+                <signal pad-key="pd2" index="3" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTD"/>
+                <signal pad-key="pe2" index="4" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTE"/>
+                <signal pad-key="pf2" index="5" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTF"/>
             </signals>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="avrda_fuse">
@@ -190,72 +190,72 @@
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pa2" index="2" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa3" index="3" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa4" index="4" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa5" index="5" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa6" index="6" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa7" index="7" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa0" index="0" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa1" index="1" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa2" index="2" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa3" index="3" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa4" index="4" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa5" index="5" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa6" index="6" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa7" index="7" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pb2" index="2" function="IOPORT" group="PIN"/>
-                <signal pad-id="pb3" index="3" function="IOPORT" group="PIN"/>
-                <signal pad-id="pb4" index="4" function="IOPORT" group="PIN"/>
-                <signal pad-id="pb5" index="5" function="IOPORT" group="PIN"/>
+                <signal pad-key="pb0" index="0" function="IOPORT" group="PIN"/>
+                <signal pad-key="pb1" index="1" function="IOPORT" group="PIN"/>
+                <signal pad-key="pb2" index="2" function="IOPORT" group="PIN"/>
+                <signal pad-key="pb3" index="3" function="IOPORT" group="PIN"/>
+                <signal pad-key="pb4" index="4" function="IOPORT" group="PIN"/>
+                <signal pad-key="pb5" index="5" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pc2" index="2" function="IOPORT" group="PIN"/>
-                <signal pad-id="pc3" index="3" function="IOPORT" group="PIN"/>
-                <signal pad-id="pc4" index="4" function="IOPORT" group="PIN"/>
-                <signal pad-id="pc5" index="5" function="IOPORT" group="PIN"/>
-                <signal pad-id="pc6" index="6" function="IOPORT" group="PIN"/>
-                <signal pad-id="pc7" index="7" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc0" index="0" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc1" index="1" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc2" index="2" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc3" index="3" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc4" index="4" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc5" index="5" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc6" index="6" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc7" index="7" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pd2" index="2" function="IOPORT" group="PIN"/>
-                <signal pad-id="pd3" index="3" function="IOPORT" group="PIN"/>
-                <signal pad-id="pd4" index="4" function="IOPORT" group="PIN"/>
-                <signal pad-id="pd5" index="5" function="IOPORT" group="PIN"/>
-                <signal pad-id="pd6" index="6" function="IOPORT" group="PIN"/>
-                <signal pad-id="pd7" index="7" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd0" index="0" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd1" index="1" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd2" index="2" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd3" index="3" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd4" index="4" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd5" index="5" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd6" index="6" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd7" index="7" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="porte" name="PORTE" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pe2" index="2" function="IOPORT" group="PIN"/>
-                <signal pad-id="pe3" index="3" function="IOPORT" group="PIN"/>
+                <signal pad-key="pe0" index="0" function="IOPORT" group="PIN"/>
+                <signal pad-key="pe1" index="1" function="IOPORT" group="PIN"/>
+                <signal pad-key="pe2" index="2" function="IOPORT" group="PIN"/>
+                <signal pad-key="pe3" index="3" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="portf" name="PORTF" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pf2" index="2" function="IOPORT" group="PIN"/>
-                <signal pad-id="pf3" index="3" function="IOPORT" group="PIN"/>
-                <signal pad-id="pf4" index="4" function="IOPORT" group="PIN"/>
-                <signal pad-id="pf5" index="5" function="IOPORT" group="PIN"/>
-                <signal pad-id="pf6" index="6" function="IOPORT" group="PIN"/>
+                <signal pad-key="pf0" index="0" function="IOPORT" group="PIN"/>
+                <signal pad-key="pf1" index="1" function="IOPORT" group="PIN"/>
+                <signal pad-key="pf2" index="2" function="IOPORT" group="PIN"/>
+                <signal pad-key="pf3" index="3" function="IOPORT" group="PIN"/>
+                <signal pad-key="pf4" index="4" function="IOPORT" group="PIN"/>
+                <signal pad-key="pf5" index="5" function="IOPORT" group="PIN"/>
+                <signal pad-key="pf6" index="6" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="portmux" name="PORTMUX" module-key="avrda_portmux">
@@ -263,44 +263,44 @@
         </peripheral>
         <peripheral key="ptc" name="PTC" module-key="adc_ptc_ctrl_v1">
             <signals>
-                <signal pad-id="pa0" index="0" function="PTC" group="XY"/>
-                <signal pad-id="pa1" index="1" function="PTC" group="XY"/>
-                <signal pad-id="pa2" index="2" function="PTC" group="XY"/>
-                <signal pad-id="pa3" index="3" function="PTC" group="XY"/>
-                <signal pad-id="pa4" index="4" function="PTC" group="XY"/>
-                <signal pad-id="pa5" index="5" function="PTC" group="XY"/>
-                <signal pad-id="pa6" index="6" function="PTC" group="XY"/>
-                <signal pad-id="pa7" index="7" function="PTC" group="XY"/>
-                <signal pad-id="pb0" index="8" function="PTC" group="XY"/>
-                <signal pad-id="pb1" index="9" function="PTC" group="XY"/>
-                <signal pad-id="pb2" index="10" function="PTC" group="XY"/>
-                <signal pad-id="pb3" index="11" function="PTC" group="XY"/>
-                <signal pad-id="pb4" index="12" function="PTC" group="XY"/>
-                <signal pad-id="pb5" index="13" function="PTC" group="XY"/>
-                <signal pad-id="pd0" index="16" function="PTC" group="XY"/>
-                <signal pad-id="pd1" index="17" function="PTC" group="XY"/>
-                <signal pad-id="pd2" index="18" function="PTC" group="XY"/>
-                <signal pad-id="pd3" index="19" function="PTC" group="XY"/>
-                <signal pad-id="pd4" index="20" function="PTC" group="XY"/>
-                <signal pad-id="pd5" index="21" function="PTC" group="XY"/>
-                <signal pad-id="pd6" index="22" function="PTC" group="XY"/>
-                <signal pad-id="pd7" index="23" function="PTC" group="XY"/>
-                <signal pad-id="pe0" index="24" function="PTC" group="XY"/>
-                <signal pad-id="pe1" index="25" function="PTC" group="XY"/>
-                <signal pad-id="pe2" index="26" function="PTC" group="XY"/>
-                <signal pad-id="pe3" index="27" function="PTC" group="XY"/>
-                <signal pad-id="pf0" index="32" function="PTC" group="XY"/>
-                <signal pad-id="pf1" index="33" function="PTC" group="XY"/>
-                <signal pad-id="pf2" index="34" function="PTC" group="XY"/>
-                <signal pad-id="pf3" index="35" function="PTC" group="XY"/>
-                <signal pad-id="pf4" index="36" function="PTC" group="XY"/>
-                <signal pad-id="pf5" index="37" function="PTC" group="XY"/>
+                <signal pad-key="pa0" index="0" function="PTC" group="XY"/>
+                <signal pad-key="pa1" index="1" function="PTC" group="XY"/>
+                <signal pad-key="pa2" index="2" function="PTC" group="XY"/>
+                <signal pad-key="pa3" index="3" function="PTC" group="XY"/>
+                <signal pad-key="pa4" index="4" function="PTC" group="XY"/>
+                <signal pad-key="pa5" index="5" function="PTC" group="XY"/>
+                <signal pad-key="pa6" index="6" function="PTC" group="XY"/>
+                <signal pad-key="pa7" index="7" function="PTC" group="XY"/>
+                <signal pad-key="pb0" index="8" function="PTC" group="XY"/>
+                <signal pad-key="pb1" index="9" function="PTC" group="XY"/>
+                <signal pad-key="pb2" index="10" function="PTC" group="XY"/>
+                <signal pad-key="pb3" index="11" function="PTC" group="XY"/>
+                <signal pad-key="pb4" index="12" function="PTC" group="XY"/>
+                <signal pad-key="pb5" index="13" function="PTC" group="XY"/>
+                <signal pad-key="pd0" index="16" function="PTC" group="XY"/>
+                <signal pad-key="pd1" index="17" function="PTC" group="XY"/>
+                <signal pad-key="pd2" index="18" function="PTC" group="XY"/>
+                <signal pad-key="pd3" index="19" function="PTC" group="XY"/>
+                <signal pad-key="pd4" index="20" function="PTC" group="XY"/>
+                <signal pad-key="pd5" index="21" function="PTC" group="XY"/>
+                <signal pad-key="pd6" index="22" function="PTC" group="XY"/>
+                <signal pad-key="pd7" index="23" function="PTC" group="XY"/>
+                <signal pad-key="pe0" index="24" function="PTC" group="XY"/>
+                <signal pad-key="pe1" index="25" function="PTC" group="XY"/>
+                <signal pad-key="pe2" index="26" function="PTC" group="XY"/>
+                <signal pad-key="pe3" index="27" function="PTC" group="XY"/>
+                <signal pad-key="pf0" index="32" function="PTC" group="XY"/>
+                <signal pad-key="pf1" index="33" function="PTC" group="XY"/>
+                <signal pad-key="pf2" index="34" function="PTC" group="XY"/>
+                <signal pad-key="pf3" index="35" function="PTC" group="XY"/>
+                <signal pad-key="pf4" index="36" function="PTC" group="XY"/>
+                <signal pad-key="pf5" index="37" function="PTC" group="XY"/>
             </signals>
         </peripheral>
         <peripheral key="rstctrl" name="RSTCTRL" module-key="rst_integration_v8">
             <register-group-instance register-group-key="rstctrl" address-space-key="data" offset="0x40"/>
             <signals>
-                <signal pad-id="pf6" function="OTHER" group="RESET"/>
+                <signal pad-key="pf6" function="OTHER" group="RESET"/>
             </signals>
         </peripheral>
         <peripheral key="rtc" name="RTC" module-key="tmr_16b_rtc_v1">
@@ -315,29 +315,29 @@
         <peripheral key="spi0" name="SPI0" module-key="spi_8bit_v2">
             <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"/>
-                <signal pad-id="pe0" function="SPI0_ALT" group="MOSI" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <signal pad-id="pa4" function="SPI0" group="MOSI" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <signal pad-id="pe2" function="SPI0_ALT" group="SCK" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <signal pad-id="pa6" function="SPI0" group="SCK" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <signal pad-id="pe3" function="SPI0_ALT" group="SS" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <signal pad-id="pa7" function="SPI0" group="SS" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pe1" function="SPI0_ALT" group="MISO" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pa5" function="SPI0" group="MISO" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pe0" function="SPI0_ALT" group="MOSI" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pa4" function="SPI0" group="MOSI" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pe2" function="SPI0_ALT" group="SCK" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pa6" function="SPI0" group="SCK" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pe3" function="SPI0_ALT" group="SS" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pa7" function="SPI0" group="SS" field="PORTMUX.SPIROUTEA.SPI0"/>
             </signals>
         </peripheral>
         <peripheral key="spi1" name="SPI1" module-key="spi_8bit_v2">
             <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"/>
-                <signal pad-id="pc1" function="SPI1" group="MISO" field="PORTMUX.SPIROUTEA.SPI1"/>
-                <signal pad-id="pb4" function="SPI1_ALT2" group="MOSI" field="PORTMUX.SPIROUTEA.SPI1"/>
-                <signal pad-id="pc4" function="SPI1_ALT" group="MOSI" field="PORTMUX.SPIROUTEA.SPI1"/>
-                <signal pad-id="pc0" function="SPI1" group="MOSI" field="PORTMUX.SPIROUTEA.SPI1"/>
-                <signal pad-id="pc6" function="SPI1_ALT" group="SCK" field="PORTMUX.SPIROUTEA.SPI1"/>
-                <signal pad-id="pc2" function="SPI1" group="SCK" field="PORTMUX.SPIROUTEA.SPI1"/>
-                <signal pad-id="pc7" function="SPI1_ALT" group="SS" field="PORTMUX.SPIROUTEA.SPI1"/>
-                <signal pad-id="pc3" function="SPI1" group="SS" field="PORTMUX.SPIROUTEA.SPI1"/>
+                <signal pad-key="pb5" function="SPI1_ALT2" group="MISO" field="PORTMUX.SPIROUTEA.SPI1"/>
+                <signal pad-key="pc5" function="SPI1_ALT" group="MISO" field="PORTMUX.SPIROUTEA.SPI1"/>
+                <signal pad-key="pc1" function="SPI1" group="MISO" field="PORTMUX.SPIROUTEA.SPI1"/>
+                <signal pad-key="pb4" function="SPI1_ALT2" group="MOSI" field="PORTMUX.SPIROUTEA.SPI1"/>
+                <signal pad-key="pc4" function="SPI1_ALT" group="MOSI" field="PORTMUX.SPIROUTEA.SPI1"/>
+                <signal pad-key="pc0" function="SPI1" group="MOSI" field="PORTMUX.SPIROUTEA.SPI1"/>
+                <signal pad-key="pc6" function="SPI1_ALT" group="SCK" field="PORTMUX.SPIROUTEA.SPI1"/>
+                <signal pad-key="pc2" function="SPI1" group="SCK" field="PORTMUX.SPIROUTEA.SPI1"/>
+                <signal pad-key="pc7" function="SPI1_ALT" group="SS" field="PORTMUX.SPIROUTEA.SPI1"/>
+                <signal pad-key="pc3" function="SPI1" group="SS" field="PORTMUX.SPIROUTEA.SPI1"/>
             </signals>
         </peripheral>
         <peripheral key="syscfg" name="SYSCFG" module-key="avrda_syscfg">
@@ -346,184 +346,184 @@
         <peripheral key="tca0" name="TCA0" module-key="tmr_16b_pwm_v1">
             <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"/>
-                <signal pad-id="pd0" index="0" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pc0" index="0" function="TCA0_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pb0" index="0" function="TCA0_ALT" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pa0" index="0" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pf1" index="1" function="TCA0_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pe1" index="1" function="TCA0_ALT4" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pd1" index="1" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pc1" index="1" function="TCA0_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pb1" index="1" function="TCA0_ALT" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pa1" index="1" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pf2" index="2" function="TCA0_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pe2" index="2" function="TCA0_ALT4" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pd2" index="2" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pc2" index="2" function="TCA0_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pb2" index="2" function="TCA0_ALT" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pa2" index="2" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pf3" index="3" function="TCA0_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pe3" index="3" function="TCA0_ALT4" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pd3" index="3" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pc3" index="3" function="TCA0_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pb3" index="3" function="TCA0_ALT" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pa3" index="3" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pf4" index="4" function="TCA0_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pd4" index="4" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pc4" index="4" function="TCA0_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pb4" index="4" function="TCA0_ALT" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pa4" index="4" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pf5" index="5" function="TCA0_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pd5" index="5" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pc5" index="5" function="TCA0_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pb5" index="5" function="TCA0_ALT" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pa5" index="5" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pf0" index="0" function="TCA0_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pe0" index="0" function="TCA0_ALT4" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pd0" index="0" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pc0" index="0" function="TCA0_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pb0" index="0" function="TCA0_ALT" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pa0" index="0" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pf1" index="1" function="TCA0_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pe1" index="1" function="TCA0_ALT4" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pd1" index="1" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pc1" index="1" function="TCA0_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pb1" index="1" function="TCA0_ALT" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pa1" index="1" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pf2" index="2" function="TCA0_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pe2" index="2" function="TCA0_ALT4" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pd2" index="2" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pc2" index="2" function="TCA0_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pb2" index="2" function="TCA0_ALT" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pa2" index="2" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pf3" index="3" function="TCA0_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pe3" index="3" function="TCA0_ALT4" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pd3" index="3" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pc3" index="3" function="TCA0_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pb3" index="3" function="TCA0_ALT" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pa3" index="3" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pf4" index="4" function="TCA0_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pd4" index="4" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pc4" index="4" function="TCA0_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pb4" index="4" function="TCA0_ALT" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pa4" index="4" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pf5" index="5" function="TCA0_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pd5" index="5" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pc5" index="5" function="TCA0_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pb5" index="5" function="TCA0_ALT" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pa5" index="5" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
             </signals>
         </peripheral>
         <peripheral key="tca1" name="TCA1" module-key="tmr_16b_pwm_v1">
             <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"/>
-                <signal pad-id="pc5" index="1" function="TCA1_ALT" group="WO" field="PORTMUX.TCAROUTEA.TCA1"/>
-                <signal pad-id="pb1" index="1" function="TCA1" group="WO" field="PORTMUX.TCAROUTEA.TCA1"/>
-                <signal pad-id="pc6" index="2" function="TCA1_ALT" group="WO" field="PORTMUX.TCAROUTEA.TCA1"/>
-                <signal pad-id="pb2" index="2" function="TCA1" group="WO" field="PORTMUX.TCAROUTEA.TCA1"/>
-                <signal pad-id="pb3" index="3" function="TCA1" group="WO" field="PORTMUX.TCAROUTEA.TCA1"/>
-                <signal pad-id="pb4" index="4" function="TCA1" group="WO" field="PORTMUX.TCAROUTEA.TCA1"/>
-                <signal pad-id="pb5" index="5" function="TCA1" group="WO" field="PORTMUX.TCAROUTEA.TCA1"/>
+                <signal pad-key="pc4" index="0" function="TCA1_ALT" group="WO" field="PORTMUX.TCAROUTEA.TCA1"/>
+                <signal pad-key="pb0" index="0" function="TCA1" group="WO" field="PORTMUX.TCAROUTEA.TCA1"/>
+                <signal pad-key="pc5" index="1" function="TCA1_ALT" group="WO" field="PORTMUX.TCAROUTEA.TCA1"/>
+                <signal pad-key="pb1" index="1" function="TCA1" group="WO" field="PORTMUX.TCAROUTEA.TCA1"/>
+                <signal pad-key="pc6" index="2" function="TCA1_ALT" group="WO" field="PORTMUX.TCAROUTEA.TCA1"/>
+                <signal pad-key="pb2" index="2" function="TCA1" group="WO" field="PORTMUX.TCAROUTEA.TCA1"/>
+                <signal pad-key="pb3" index="3" function="TCA1" group="WO" field="PORTMUX.TCAROUTEA.TCA1"/>
+                <signal pad-key="pb4" index="4" function="TCA1" group="WO" field="PORTMUX.TCAROUTEA.TCA1"/>
+                <signal pad-key="pb5" index="5" function="TCA1" group="WO" field="PORTMUX.TCAROUTEA.TCA1"/>
             </signals>
         </peripheral>
         <peripheral key="tcb0" name="TCB0" module-key="tmr_16b_capture_v1">
             <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"/>
+                <signal pad-key="pf4" index="0" function="TCB0_ALT" group="WO" field="PORTMUX.TCBROUTEA.TCB0"/>
+                <signal pad-key="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 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"/>
+                <signal pad-key="pf5" index="0" function="TCB1_ALT" group="WO" field="PORTMUX.TCBROUTEA.TCB1"/>
+                <signal pad-key="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 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"/>
+                <signal pad-key="pb4" index="0" function="TCB2_ALT" group="WO" field="PORTMUX.TCBROUTEA.TCB2"/>
+                <signal pad-key="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 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"/>
+                <signal pad-key="pc1" index="0" function="TCB3_ALT" group="WO" field="PORTMUX.TCBROUTEA.TCB3"/>
+                <signal pad-key="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 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"/>
-                <signal pad-id="pa4" function="TCD0" group="WOA" field="PORTMUX.TCDROUTEA.TCD0"/>
-                <signal pad-id="pf1" index="1" function="TCD0_ALT2" group="WOB" field="PORTMUX.TCDROUTEA.TCD0"/>
-                <signal pad-id="pb5" index="1" function="TCD0_ALT" group="WOB" field="PORTMUX.TCDROUTEA.TCD0"/>
-                <signal pad-id="pa5" index="1" function="TCD0" group="WOB" field="PORTMUX.TCDROUTEA.TCD0"/>
-                <signal pad-id="pf2" index="2" function="TCD0_ALT2" group="WOC" field="PORTMUX.TCDROUTEA.TCD0"/>
-                <signal pad-id="pa6" index="2" function="TCD0" group="WOC" field="PORTMUX.TCDROUTEA.TCD0"/>
-                <signal pad-id="pf3" index="3" function="TCD0_ALT2" group="WOD" field="PORTMUX.TCDROUTEA.TCD0"/>
-                <signal pad-id="pa7" index="3" function="TCD0" group="WOD" field="PORTMUX.TCDROUTEA.TCD0"/>
+                <signal pad-key="pf0" function="TCD0_ALT2" group="WOA" field="PORTMUX.TCDROUTEA.TCD0"/>
+                <signal pad-key="pb4" function="TCD0_ALT" group="WOA" field="PORTMUX.TCDROUTEA.TCD0"/>
+                <signal pad-key="pa4" function="TCD0" group="WOA" field="PORTMUX.TCDROUTEA.TCD0"/>
+                <signal pad-key="pf1" index="1" function="TCD0_ALT2" group="WOB" field="PORTMUX.TCDROUTEA.TCD0"/>
+                <signal pad-key="pb5" index="1" function="TCD0_ALT" group="WOB" field="PORTMUX.TCDROUTEA.TCD0"/>
+                <signal pad-key="pa5" index="1" function="TCD0" group="WOB" field="PORTMUX.TCDROUTEA.TCD0"/>
+                <signal pad-key="pf2" index="2" function="TCD0_ALT2" group="WOC" field="PORTMUX.TCDROUTEA.TCD0"/>
+                <signal pad-key="pa6" index="2" function="TCD0" group="WOC" field="PORTMUX.TCDROUTEA.TCD0"/>
+                <signal pad-key="pf3" index="3" function="TCD0_ALT2" group="WOD" field="PORTMUX.TCDROUTEA.TCD0"/>
+                <signal pad-key="pa7" index="3" function="TCD0" group="WOD" field="PORTMUX.TCDROUTEA.TCD0"/>
             </signals>
         </peripheral>
         <peripheral key="twi0" name="TWI0" module-key="i2c_8bit_v2">
             <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"/>
-                <signal pad-id="pa3" function="I2C0" group="SCL" field="PORTMUX.TWIROUTEA.TWI0"/>
-                <signal pad-id="pc7" function="I2C0_ALT2" group="SCL_DUAL" field="PORTMUX.TWIROUTEA.TWI0"/>
-                <signal pad-id="pc7" function="I2C0_ALT1" group="SCL_DUAL" field="PORTMUX.TWIROUTEA.TWI0"/>
-                <signal pad-id="pc3" function="I2C0" group="SCL_DUAL" field="PORTMUX.TWIROUTEA.TWI0"/>
-                <signal pad-id="pc2" function="I2C0_ALT2" group="SDA" field="PORTMUX.TWIROUTEA.TWI0"/>
-                <signal pad-id="pa2" function="I2C0_ALT1" group="SDA" field="PORTMUX.TWIROUTEA.TWI0"/>
-                <signal pad-id="pa2" function="I2C0" group="SDA" field="PORTMUX.TWIROUTEA.TWI0"/>
-                <signal pad-id="pc6" function="I2C0_ALT2" group="SDA_DUAL" field="PORTMUX.TWIROUTEA.TWI0"/>
-                <signal pad-id="pc6" function="I2C0_ALT1" group="SDA_DUAL" field="PORTMUX.TWIROUTEA.TWI0"/>
-                <signal pad-id="pc2" function="I2C0" group="SDA_DUAL" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pc3" function="I2C0_ALT2" group="SCL" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pa3" function="I2C0_ALT1" group="SCL" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pa3" function="I2C0" group="SCL" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pc7" function="I2C0_ALT2" group="SCL_DUAL" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pc7" function="I2C0_ALT1" group="SCL_DUAL" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pc3" function="I2C0" group="SCL_DUAL" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pc2" function="I2C0_ALT2" group="SDA" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pa2" function="I2C0_ALT1" group="SDA" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pa2" function="I2C0" group="SDA" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pc6" function="I2C0_ALT2" group="SDA_DUAL" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pc6" function="I2C0_ALT1" group="SDA_DUAL" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pc2" function="I2C0" group="SDA_DUAL" field="PORTMUX.TWIROUTEA.TWI0"/>
             </signals>
         </peripheral>
         <peripheral key="twi1" name="TWI1" module-key="i2c_8bit_v2">
             <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"/>
-                <signal pad-id="pf3" function="I2C1" group="SCL" field="PORTMUX.TWIROUTEA.TWI1"/>
-                <signal pad-id="pb3" function="I2C1" group="SCL_DUAL" field="PORTMUX.TWIROUTEA.TWI1"/>
-                <signal pad-id="pb2" function="I2C1_ALT2" group="SDA" field="PORTMUX.TWIROUTEA.TWI1"/>
-                <signal pad-id="pf2" function="I2C1_ALT1" group="SDA" field="PORTMUX.TWIROUTEA.TWI1"/>
-                <signal pad-id="pf2" function="I2C1" group="SDA" field="PORTMUX.TWIROUTEA.TWI1"/>
-                <signal pad-id="pb2" function="I2C1" group="SDA_DUAL" field="PORTMUX.TWIROUTEA.TWI1"/>
+                <signal pad-key="pb3" function="I2C1_ALT2" group="SCL" field="PORTMUX.TWIROUTEA.TWI1"/>
+                <signal pad-key="pf3" function="I2C1_ALT1" group="SCL" field="PORTMUX.TWIROUTEA.TWI1"/>
+                <signal pad-key="pf3" function="I2C1" group="SCL" field="PORTMUX.TWIROUTEA.TWI1"/>
+                <signal pad-key="pb3" function="I2C1" group="SCL_DUAL" field="PORTMUX.TWIROUTEA.TWI1"/>
+                <signal pad-key="pb2" function="I2C1_ALT2" group="SDA" field="PORTMUX.TWIROUTEA.TWI1"/>
+                <signal pad-key="pf2" function="I2C1_ALT1" group="SDA" field="PORTMUX.TWIROUTEA.TWI1"/>
+                <signal pad-key="pf2" function="I2C1" group="SDA" field="PORTMUX.TWIROUTEA.TWI1"/>
+                <signal pad-key="pb2" function="I2C1" group="SDA_DUAL" field="PORTMUX.TWIROUTEA.TWI1"/>
             </signals>
         </peripheral>
         <peripheral key="usart0" name="USART0" module-key="uart_autobd_v4">
             <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"/>
-                <signal pad-id="pa4" function="USART0_ALT" group="TXD" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pa0" function="USART0" group="TXD" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pa6" function="USART0_ALT" group="XCK" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pa2" function="USART0" group="XCK" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pa7" function="USART0_ALT" group="XDIR" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pa3" function="USART0" group="XDIR" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa5" function="USART0_ALT" group="RXD" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa1" function="USART0" group="RXD" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa4" function="USART0_ALT" group="TXD" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa0" function="USART0" group="TXD" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa6" function="USART0_ALT" group="XCK" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa2" function="USART0" group="XCK" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa7" function="USART0_ALT" group="XDIR" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa3" function="USART0" group="XDIR" field="PORTMUX.USARTROUTEA.USART0"/>
             </signals>
         </peripheral>
         <peripheral key="usart1" name="USART1" module-key="uart_autobd_v4">
             <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"/>
-                <signal pad-id="pc4" function="USART1_ALT" group="TXD" field="PORTMUX.USARTROUTEA.USART1"/>
-                <signal pad-id="pc0" function="USART1" group="TXD" field="PORTMUX.USARTROUTEA.USART1"/>
-                <signal pad-id="pc6" function="USART1_ALT" group="XCK" field="PORTMUX.USARTROUTEA.USART1"/>
-                <signal pad-id="pc2" function="USART1" group="XCK" field="PORTMUX.USARTROUTEA.USART1"/>
-                <signal pad-id="pc7" function="USART1_ALT" group="XDIR" field="PORTMUX.USARTROUTEA.USART1"/>
-                <signal pad-id="pc3" function="USART1" group="XDIR" field="PORTMUX.USARTROUTEA.USART1"/>
+                <signal pad-key="pc5" function="USART1_ALT" group="RXD" field="PORTMUX.USARTROUTEA.USART1"/>
+                <signal pad-key="pc1" function="USART1" group="RXD" field="PORTMUX.USARTROUTEA.USART1"/>
+                <signal pad-key="pc4" function="USART1_ALT" group="TXD" field="PORTMUX.USARTROUTEA.USART1"/>
+                <signal pad-key="pc0" function="USART1" group="TXD" field="PORTMUX.USARTROUTEA.USART1"/>
+                <signal pad-key="pc6" function="USART1_ALT" group="XCK" field="PORTMUX.USARTROUTEA.USART1"/>
+                <signal pad-key="pc2" function="USART1" group="XCK" field="PORTMUX.USARTROUTEA.USART1"/>
+                <signal pad-key="pc7" function="USART1_ALT" group="XDIR" field="PORTMUX.USARTROUTEA.USART1"/>
+                <signal pad-key="pc3" function="USART1" group="XDIR" field="PORTMUX.USARTROUTEA.USART1"/>
             </signals>
         </peripheral>
         <peripheral key="usart2" name="USART2" module-key="uart_autobd_v4">
             <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"/>
-                <signal pad-id="pf4" function="USART2_ALT" group="TXD" field="PORTMUX.USARTROUTEA.USART2"/>
-                <signal pad-id="pf0" function="USART2" group="TXD" field="PORTMUX.USARTROUTEA.USART2"/>
-                <signal pad-id="pf2" function="USART2" group="XCK" field="PORTMUX.USARTROUTEA.USART2"/>
-                <signal pad-id="pf3" function="USART2" group="XDIR" field="PORTMUX.USARTROUTEA.USART2"/>
+                <signal pad-key="pf5" function="USART2_ALT" group="RXD" field="PORTMUX.USARTROUTEA.USART2"/>
+                <signal pad-key="pf1" function="USART2" group="RXD" field="PORTMUX.USARTROUTEA.USART2"/>
+                <signal pad-key="pf4" function="USART2_ALT" group="TXD" field="PORTMUX.USARTROUTEA.USART2"/>
+                <signal pad-key="pf0" function="USART2" group="TXD" field="PORTMUX.USARTROUTEA.USART2"/>
+                <signal pad-key="pf2" function="USART2" group="XCK" field="PORTMUX.USARTROUTEA.USART2"/>
+                <signal pad-key="pf3" function="USART2" group="XDIR" field="PORTMUX.USARTROUTEA.USART2"/>
             </signals>
         </peripheral>
         <peripheral key="usart3" name="USART3" module-key="uart_autobd_v4">
             <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"/>
-                <signal pad-id="pb4" function="USART3_ALT" group="TXD" field="PORTMUX.USARTROUTEA.USART3"/>
-                <signal pad-id="pb0" function="USART3" group="TXD" field="PORTMUX.USARTROUTEA.USART3"/>
-                <signal pad-id="pb2" function="USART3" group="XCK" field="PORTMUX.USARTROUTEA.USART3"/>
-                <signal pad-id="pb3" function="USART3" group="XDIR" field="PORTMUX.USARTROUTEA.USART3"/>
+                <signal pad-key="pb5" function="USART3_ALT" group="RXD" field="PORTMUX.USARTROUTEA.USART3"/>
+                <signal pad-key="pb1" function="USART3" group="RXD" field="PORTMUX.USARTROUTEA.USART3"/>
+                <signal pad-key="pb4" function="USART3_ALT" group="TXD" field="PORTMUX.USARTROUTEA.USART3"/>
+                <signal pad-key="pb0" function="USART3" group="TXD" field="PORTMUX.USARTROUTEA.USART3"/>
+                <signal pad-key="pb2" function="USART3" group="XCK" field="PORTMUX.USARTROUTEA.USART3"/>
+                <signal pad-key="pb3" function="USART3" group="XDIR" field="PORTMUX.USARTROUTEA.USART3"/>
             </signals>
         </peripheral>
         <peripheral key="usart4" name="USART4" module-key="uart_autobd_v4">
             <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"/>
-                <signal pad-id="pe2" function="USART4" group="XCK" field="PORTMUX.USARTROUTEB.USART4"/>
-                <signal pad-id="pe3" function="USART4" group="XDIR" field="PORTMUX.USARTROUTEB.USART4"/>
+                <signal pad-key="pe1" function="USART4" group="RXD" field="PORTMUX.USARTROUTEB.USART4"/>
+                <signal pad-key="pe0" function="USART4" group="TXD" field="PORTMUX.USARTROUTEB.USART4"/>
+                <signal pad-key="pe2" function="USART4" group="XCK" field="PORTMUX.USARTROUTEB.USART4"/>
+                <signal pad-key="pe3" function="USART4" group="XDIR" field="PORTMUX.USARTROUTEB.USART4"/>
             </signals>
         </peripheral>
         <peripheral key="userrow" name="USERROW" module-key="avrda_userrow">
@@ -556,17 +556,17 @@
         <peripheral key="zcd0" name="ZCD0" module-key="cmp_zxover_ctrl_v3">
             <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"/>
-                <signal pad-id="pa7" function="ZCD0" group="OUT" field="PORTMUX.ZCDROUTEA.ZCD0"/>
+                <signal pad-key="pd1" function="ZCD0" group="IN"/>
+                <signal pad-key="pc7" function="ZCD0_ALT" group="OUT" field="PORTMUX.ZCDROUTEA.ZCD0"/>
+                <signal pad-key="pa7" function="ZCD0" group="OUT" field="PORTMUX.ZCDROUTEA.ZCD0"/>
             </signals>
         </peripheral>
         <peripheral key="zcd1" name="ZCD1" module-key="cmp_zxover_ctrl_v3">
             <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"/>
-                <signal pad-id="pa7" function="ZCD1" group="OUT" field="PORTMUX.ZCDROUTEA.ZCD1"/>
+                <signal pad-key="pe3" function="ZCD1" group="IN"/>
+                <signal pad-key="pc7" function="ZCD1_ALT" group="OUT" field="PORTMUX.ZCDROUTEA.ZCD1"/>
+                <signal pad-key="pa7" function="ZCD1" group="OUT" field="PORTMUX.ZCDROUTEA.ZCD1"/>
             </signals>
         </peripheral>
     </peripherals>
@@ -1885,59 +1885,109 @@
             </register-group>
         </module>
     </modules>
+    <pads>
+        <pad key="pa5" name="PA5"/>
+        <pad key="pa6" name="PA6"/>
+        <pad key="pa7" name="PA7"/>
+        <pad key="pb0" name="PB0"/>
+        <pad key="pb1" name="PB1"/>
+        <pad key="pb2" name="PB2"/>
+        <pad key="pb3" name="PB3"/>
+        <pad key="pb4" name="PB4"/>
+        <pad key="pb5" name="PB5"/>
+        <pad key="pc0" name="PC0"/>
+        <pad key="pc1" name="PC1"/>
+        <pad key="pc2" name="PC2"/>
+        <pad key="pc3" name="PC3"/>
+        <pad key="vdd0" name="VDD0"/>
+        <pad key="gnd0" name="GND0"/>
+        <pad key="pc4" name="PC4"/>
+        <pad key="pc5" name="PC5"/>
+        <pad key="pc6" name="PC6"/>
+        <pad key="pc7" name="PC7"/>
+        <pad key="pd0" name="PD0"/>
+        <pad key="pd1" name="PD1"/>
+        <pad key="pd2" name="PD2"/>
+        <pad key="pd3" name="PD3"/>
+        <pad key="pd4" name="PD4"/>
+        <pad key="pd5" name="PD5"/>
+        <pad key="pd6" name="PD6"/>
+        <pad key="pd7" name="PD7"/>
+        <pad key="avdd" name="AVDD"/>
+        <pad key="agnd" name="AGND"/>
+        <pad key="pe0" name="PE0"/>
+        <pad key="pe1" name="PE1"/>
+        <pad key="pe2" name="PE2"/>
+        <pad key="pe3" name="PE3"/>
+        <pad key="pf0" name="PF0"/>
+        <pad key="pf1" name="PF1"/>
+        <pad key="pf2" name="PF2"/>
+        <pad key="pf3" name="PF3"/>
+        <pad key="pf4" name="PF4"/>
+        <pad key="pf5" name="PF5"/>
+        <pad key="pf6" name="PF6"/>
+        <pad key="updi" name="UPDI"/>
+        <pad key="vdd1" name="VDD1"/>
+        <pad key="gnd1" name="GND1"/>
+        <pad key="pa0" name="PA0"/>
+        <pad key="pa1" name="PA1"/>
+        <pad key="pa2" name="PA2"/>
+        <pad key="pa3" name="PA3"/>
+        <pad key="pa4" name="PA4"/>
+    </pads>
     <pinouts>
         <pinout key="qfn48" name="QFN48" type="qfn">
-            <pin position="1" pad="PA5"/>
-            <pin position="2" pad="PA6"/>
-            <pin position="3" pad="PA7"/>
-            <pin position="4" pad="PB0"/>
-            <pin position="5" pad="PB1"/>
-            <pin position="6" pad="PB2"/>
-            <pin position="7" pad="PB3"/>
-            <pin position="8" pad="PB4"/>
-            <pin position="9" pad="PB5"/>
-            <pin position="10" pad="PC0"/>
-            <pin position="11" pad="PC1"/>
-            <pin position="12" pad="PC2"/>
-            <pin position="13" pad="PC3"/>
-            <pin position="14" pad="VDD0"/>
-            <pin position="15" pad="GND0"/>
-            <pin position="16" pad="PC4"/>
-            <pin position="17" pad="PC5"/>
-            <pin position="18" pad="PC6"/>
-            <pin position="19" pad="PC7"/>
-            <pin position="20" pad="PD0"/>
-            <pin position="21" pad="PD1"/>
-            <pin position="22" pad="PD2"/>
-            <pin position="23" pad="PD3"/>
-            <pin position="24" pad="PD4"/>
-            <pin position="25" pad="PD5"/>
-            <pin position="26" pad="PD6"/>
-            <pin position="27" pad="PD7"/>
-            <pin position="28" pad="AVDD"/>
-            <pin position="29" pad="AGND"/>
-            <pin position="30" pad="PE0"/>
-            <pin position="31" pad="PE1"/>
-            <pin position="32" pad="PE2"/>
-            <pin position="33" pad="PE3"/>
-            <pin position="34" pad="PF0"/>
-            <pin position="35" pad="PF1"/>
-            <pin position="36" pad="PF2"/>
-            <pin position="37" pad="PF3"/>
-            <pin position="38" pad="PF4"/>
-            <pin position="39" pad="PF5"/>
-            <pin position="40" pad="PF6"/>
-            <pin position="41" pad="UPDI"/>
-            <pin position="42" pad="VDD1"/>
-            <pin position="43" pad="GND1"/>
-            <pin position="44" pad="PA0"/>
-            <pin position="45" pad="PA1"/>
-            <pin position="46" pad="PA2"/>
-            <pin position="47" pad="PA3"/>
-            <pin position="48" pad="PA4"/>
+            <pin position="1" pad-key="pa5"/>
+            <pin position="2" pad-key="pa6"/>
+            <pin position="3" pad-key="pa7"/>
+            <pin position="4" pad-key="pb0"/>
+            <pin position="5" pad-key="pb1"/>
+            <pin position="6" pad-key="pb2"/>
+            <pin position="7" pad-key="pb3"/>
+            <pin position="8" pad-key="pb4"/>
+            <pin position="9" pad-key="pb5"/>
+            <pin position="10" pad-key="pc0"/>
+            <pin position="11" pad-key="pc1"/>
+            <pin position="12" pad-key="pc2"/>
+            <pin position="13" pad-key="pc3"/>
+            <pin position="14" pad-key="vdd0"/>
+            <pin position="15" pad-key="gnd0"/>
+            <pin position="16" pad-key="pc4"/>
+            <pin position="17" pad-key="pc5"/>
+            <pin position="18" pad-key="pc6"/>
+            <pin position="19" pad-key="pc7"/>
+            <pin position="20" pad-key="pd0"/>
+            <pin position="21" pad-key="pd1"/>
+            <pin position="22" pad-key="pd2"/>
+            <pin position="23" pad-key="pd3"/>
+            <pin position="24" pad-key="pd4"/>
+            <pin position="25" pad-key="pd5"/>
+            <pin position="26" pad-key="pd6"/>
+            <pin position="27" pad-key="pd7"/>
+            <pin position="28" pad-key="avdd"/>
+            <pin position="29" pad-key="agnd"/>
+            <pin position="30" pad-key="pe0"/>
+            <pin position="31" pad-key="pe1"/>
+            <pin position="32" pad-key="pe2"/>
+            <pin position="33" pad-key="pe3"/>
+            <pin position="34" pad-key="pf0"/>
+            <pin position="35" pad-key="pf1"/>
+            <pin position="36" pad-key="pf2"/>
+            <pin position="37" pad-key="pf3"/>
+            <pin position="38" pad-key="pf4"/>
+            <pin position="39" pad-key="pf5"/>
+            <pin position="40" pad-key="pf6"/>
+            <pin position="41" pad-key="updi"/>
+            <pin position="42" pad-key="vdd1"/>
+            <pin position="43" pad-key="gnd1"/>
+            <pin position="44" pad-key="pa0"/>
+            <pin position="45" pad-key="pa1"/>
+            <pin position="46" pad-key="pa2"/>
+            <pin position="47" pad-key="pa3"/>
+            <pin position="48" pad-key="pa4"/>
         </pinout>
     </pinouts>
     <variants>
-        <variant name="AVR32DA48" pinout-key="qfn48" package="QFN48"/>
+        <variant key="avr32da48" name="AVR32DA48" pinout-key="qfn48"/>
     </variants>
 </device>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR32DB28.xml b/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR32DB28.xml
index d24bb355..4175c399 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR32DB28.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR32DB28.xml
@@ -44,48 +44,48 @@
         <peripheral key="ac0" name="AC0" module-key="cmp_control_v8">
             <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"/>
-                <signal pad-id="pa7" index="0" function="AC0" group="OUT" field="PORTMUX.ACROUTEA.AC0"/>
-                <signal pad-id="pd2" index="0" function="AC0" group="P"/>
-                <signal pad-id="pd6" index="3" function="AC0" group="P"/>
+                <signal pad-key="pd3" index="0" function="AC0" group="N"/>
+                <signal pad-key="pd7" index="2" function="AC0" group="N"/>
+                <signal pad-key="pa7" index="0" function="AC0" group="OUT" field="PORTMUX.ACROUTEA.AC0"/>
+                <signal pad-key="pd2" index="0" function="AC0" group="P"/>
+                <signal pad-key="pd6" index="3" function="AC0" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="ac1" name="AC1" module-key="cmp_control_v8">
             <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"/>
-                <signal pad-id="pa7" index="0" function="AC1" group="OUT" field="PORTMUX.ACROUTEA.AC1"/>
-                <signal pad-id="pd2" index="0" function="AC1" group="P"/>
-                <signal pad-id="pd3" index="1" function="AC1" group="P"/>
-                <signal pad-id="pd4" index="2" function="AC1" group="P"/>
-                <signal pad-id="pd6" index="3" function="AC1" group="P"/>
+                <signal pad-key="pd5" index="0" function="AC1" group="N"/>
+                <signal pad-key="pd7" index="2" function="AC1" group="N"/>
+                <signal pad-key="pa7" index="0" function="AC1" group="OUT" field="PORTMUX.ACROUTEA.AC1"/>
+                <signal pad-key="pd2" index="0" function="AC1" group="P"/>
+                <signal pad-key="pd3" index="1" function="AC1" group="P"/>
+                <signal pad-key="pd4" index="2" function="AC1" group="P"/>
+                <signal pad-key="pd6" index="3" function="AC1" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="ac2" name="AC2" module-key="cmp_control_v8">
             <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"/>
-                <signal pad-id="pa7" index="0" function="AC2" group="OUT" field="PORTMUX.ACROUTEA.AC2"/>
-                <signal pad-id="pd2" index="0" function="AC2" group="P"/>
-                <signal pad-id="pd4" index="1" function="AC2" group="P"/>
-                <signal pad-id="pd6" index="3" function="AC2" group="P"/>
+                <signal pad-key="pd7" index="0" function="AC2" group="N"/>
+                <signal pad-key="pd7" index="2" function="AC2" group="N"/>
+                <signal pad-key="pa7" index="0" function="AC2" group="OUT" field="PORTMUX.ACROUTEA.AC2"/>
+                <signal pad-key="pd2" index="0" function="AC2" group="P"/>
+                <signal pad-key="pd4" index="1" function="AC2" group="P"/>
+                <signal pad-key="pd6" index="3" function="AC2" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="adc0" name="ADC0" module-key="adc_12b_diff_ctrl_v1">
             <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"/>
-                <signal pad-id="pd3" index="3" function="AIN0" group="AIN"/>
-                <signal pad-id="pd4" index="4" function="AIN0" group="AIN"/>
-                <signal pad-id="pd5" index="5" function="AIN0" group="AIN"/>
-                <signal pad-id="pd6" index="6" function="AIN0" group="AIN"/>
-                <signal pad-id="pd7" index="7" function="AIN0" group="AIN"/>
-                <signal pad-id="pf0" index="16" function="AIN0" group="AIN"/>
-                <signal pad-id="pf1" index="17" function="AIN0" group="AIN"/>
+                <signal pad-key="pd1" index="1" function="AIN0" group="AIN"/>
+                <signal pad-key="pd2" index="2" function="AIN0" group="AIN"/>
+                <signal pad-key="pd3" index="3" function="AIN0" group="AIN"/>
+                <signal pad-key="pd4" index="4" function="AIN0" group="AIN"/>
+                <signal pad-key="pd5" index="5" function="AIN0" group="AIN"/>
+                <signal pad-key="pd6" index="6" function="AIN0" group="AIN"/>
+                <signal pad-key="pd7" index="7" function="AIN0" group="AIN"/>
+                <signal pad-key="pf0" index="16" function="AIN0" group="AIN"/>
+                <signal pad-key="pf1" index="17" function="AIN0" group="AIN"/>
             </signals>
         </peripheral>
         <peripheral key="bod" name="BOD" module-key="bor_lvd_ctrl_v1">
@@ -94,32 +94,32 @@
         <peripheral key="ccl" name="CCL" module-key="cla_ccl_v1">
             <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"/>
-                <signal pad-id="pa2" index="2" function="CCL_IN" group="LUT0_IN"/>
-                <signal pad-id="pa6" index="0" function="CCL_ALT" group="LUT0_OUT" field="PORTMUX.CCLROUTEA.LUT0"/>
-                <signal pad-id="pa3" index="0" function="CCL" group="LUT0_OUT" field="PORTMUX.CCLROUTEA.LUT0"/>
-                <signal pad-id="pc0" index="0" function="CCL_IN" group="LUT1_IN"/>
-                <signal pad-id="pc1" index="1" function="CCL_IN" group="LUT1_IN"/>
-                <signal pad-id="pc2" index="2" function="CCL_IN" group="LUT1_IN"/>
-                <signal pad-id="pc3" index="0" function="CCL" group="LUT1_OUT" field="PORTMUX.CCLROUTEA.LUT1"/>
-                <signal pad-id="pd1" index="1" function="CCL_IN" group="LUT2_IN"/>
-                <signal pad-id="pd2" index="2" function="CCL_IN" group="LUT2_IN"/>
-                <signal pad-id="pd6" index="0" function="CCL_ALT" group="LUT2_OUT" field="PORTMUX.CCLROUTEA.LUT2"/>
-                <signal pad-id="pd3" index="0" function="CCL" group="LUT2_OUT" field="PORTMUX.CCLROUTEA.LUT2"/>
-                <signal pad-id="pf0" index="0" function="CCL_IN" group="LUT3_IN"/>
-                <signal pad-id="pf1" index="1" function="CCL_IN" group="LUT3_IN"/>
+                <signal pad-key="pa0" index="0" function="CCL_IN" group="LUT0_IN"/>
+                <signal pad-key="pa1" index="1" function="CCL_IN" group="LUT0_IN"/>
+                <signal pad-key="pa2" index="2" function="CCL_IN" group="LUT0_IN"/>
+                <signal pad-key="pa6" index="0" function="CCL_ALT" group="LUT0_OUT" field="PORTMUX.CCLROUTEA.LUT0"/>
+                <signal pad-key="pa3" index="0" function="CCL" group="LUT0_OUT" field="PORTMUX.CCLROUTEA.LUT0"/>
+                <signal pad-key="pc0" index="0" function="CCL_IN" group="LUT1_IN"/>
+                <signal pad-key="pc1" index="1" function="CCL_IN" group="LUT1_IN"/>
+                <signal pad-key="pc2" index="2" function="CCL_IN" group="LUT1_IN"/>
+                <signal pad-key="pc3" index="0" function="CCL" group="LUT1_OUT" field="PORTMUX.CCLROUTEA.LUT1"/>
+                <signal pad-key="pd1" index="1" function="CCL_IN" group="LUT2_IN"/>
+                <signal pad-key="pd2" index="2" function="CCL_IN" group="LUT2_IN"/>
+                <signal pad-key="pd6" index="0" function="CCL_ALT" group="LUT2_OUT" field="PORTMUX.CCLROUTEA.LUT2"/>
+                <signal pad-key="pd3" index="0" function="CCL" group="LUT2_OUT" field="PORTMUX.CCLROUTEA.LUT2"/>
+                <signal pad-key="pf0" index="0" function="CCL_IN" group="LUT3_IN"/>
+                <signal pad-key="pf1" index="1" function="CCL_IN" group="LUT3_IN"/>
             </signals>
         </peripheral>
         <peripheral key="clkctrl" name="CLKCTRL" module-key="chip_clkctrl">
             <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"/>
-                <signal pad-id="pf0" function="CLKCTRL" group="XTAL32K1"/>
-                <signal pad-id="pf1" function="CLKCTRL" group="XTAL32K2"/>
-                <signal pad-id="pa0" function="CLKCTRL" group="XTALHF1"/>
-                <signal pad-id="pa1" function="CLKCTRL" group="XTALHF2"/>
+                <signal pad-key="pa7" function="CLKCTRL" group="CLKOUT"/>
+                <signal pad-key="pa0" function="CLKCTRL" group="EXTCLK"/>
+                <signal pad-key="pf0" function="CLKCTRL" group="XTAL32K1"/>
+                <signal pad-key="pf1" function="CLKCTRL" group="XTAL32K2"/>
+                <signal pad-key="pa0" function="CLKCTRL" group="XTALHF1"/>
+                <signal pad-key="pa1" function="CLKCTRL" group="XTALHF2"/>
             </signals>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="cpu_avr_xt_v1">
@@ -134,17 +134,17 @@
         <peripheral key="dac0" name="DAC0" module-key="dac_nbit_ctrl_v5">
             <register-group-instance register-group-key="dac" address-space-key="data" offset="0x6A0"/>
             <signals>
-                <signal pad-id="pd6" index="0" function="DAC0" group="OUT"/>
+                <signal pad-key="pd6" index="0" function="DAC0" group="OUT"/>
             </signals>
         </peripheral>
         <peripheral key="evsys" name="EVSYS" module-key="chip_evsys">
             <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"/>
-                <signal pad-id="pc2" index="2" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTC"/>
-                <signal pad-id="pd7" index="3" function="EVSYS_ALT" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTD"/>
-                <signal pad-id="pd2" index="3" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTD"/>
+                <signal pad-key="pa7" index="0" function="EVSYS_ALT" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTA"/>
+                <signal pad-key="pa2" index="0" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTA"/>
+                <signal pad-key="pc2" index="2" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTC"/>
+                <signal pad-key="pd7" index="3" function="EVSYS_ALT" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTD"/>
+                <signal pad-key="pd2" index="3" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTD"/>
             </signals>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="chip_fuse">
@@ -165,54 +165,54 @@
         <peripheral key="opamp" name="OPAMP" module-key="amp_opamp_ctrl_avr_v1">
             <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"/>
-                <signal pad-id="pd2" function="OPAMP" group="OP0OUT"/>
-                <signal pad-id="pd7" function="OPAMP" group="OP1INN"/>
-                <signal pad-id="pd4" function="OPAMP" group="OP1INP"/>
-                <signal pad-id="pd5" function="OPAMP" group="OP1OUT"/>
+                <signal pad-key="pd3" function="OPAMP" group="OP0INN"/>
+                <signal pad-key="pd1" function="OPAMP" group="OP0INP"/>
+                <signal pad-key="pd2" function="OPAMP" group="OP0OUT"/>
+                <signal pad-key="pd7" function="OPAMP" group="OP1INN"/>
+                <signal pad-key="pd4" function="OPAMP" group="OP1INP"/>
+                <signal pad-key="pd5" function="OPAMP" group="OP1OUT"/>
             </signals>
         </peripheral>
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pa2" index="2" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa3" index="3" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa4" index="4" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa5" index="5" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa6" index="6" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa7" index="7" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa0" index="0" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa1" index="1" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa2" index="2" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa3" index="3" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa4" index="4" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa5" index="5" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa6" index="6" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa7" index="7" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pc2" index="2" function="IOPORT" group="PIN"/>
-                <signal pad-id="pc3" index="3" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc0" index="0" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc1" index="1" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc2" index="2" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc3" index="3" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pd3" index="3" function="IOPORT" group="PIN"/>
-                <signal pad-id="pd4" index="4" function="IOPORT" group="PIN"/>
-                <signal pad-id="pd5" index="5" function="IOPORT" group="PIN"/>
-                <signal pad-id="pd6" index="6" function="IOPORT" group="PIN"/>
-                <signal pad-id="pd7" index="7" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd1" index="1" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd2" index="2" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd3" index="3" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd4" index="4" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd5" index="5" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd6" index="6" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd7" index="7" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="portf" name="PORTF" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pf6" index="6" function="IOPORT" group="PIN"/>
+                <signal pad-key="pf0" index="0" function="IOPORT" group="PIN"/>
+                <signal pad-key="pf1" index="1" function="IOPORT" group="PIN"/>
+                <signal pad-key="pf6" index="6" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="portmux" name="PORTMUX" module-key="chip_portmux">
@@ -221,7 +221,7 @@
         <peripheral key="rstctrl" name="RSTCTRL" module-key="rst_integration_v8">
             <register-group-instance register-group-key="rstctrl" address-space-key="data" offset="0x40"/>
             <signals>
-                <signal pad-id="pf6" function="OTHER" group="RESET"/>
+                <signal pad-key="pf6" function="OTHER" group="RESET"/>
             </signals>
         </peripheral>
         <peripheral key="rtc" name="RTC" module-key="tmr_16b_rtc_v1">
@@ -236,19 +236,19 @@
         <peripheral key="spi0" name="SPI0" module-key="spi_8bit_v2">
             <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"/>
-                <signal pad-id="pa6" function="SPI0" group="SCK" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <signal pad-id="pa7" function="SPI0" group="SS" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pa5" function="SPI0" group="MISO" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pa4" function="SPI0" group="MOSI" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pa6" function="SPI0" group="SCK" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pa7" function="SPI0" group="SS" field="PORTMUX.SPIROUTEA.SPI0"/>
             </signals>
         </peripheral>
         <peripheral key="spi1" name="SPI1" module-key="spi_8bit_v2">
             <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"/>
-                <signal pad-id="pc2" function="SPI1" group="SCK" field="PORTMUX.SPIROUTEA.SPI1"/>
-                <signal pad-id="pc3" function="SPI1" group="SS" field="PORTMUX.SPIROUTEA.SPI1"/>
+                <signal pad-key="pc1" function="SPI1" group="MISO" field="PORTMUX.SPIROUTEA.SPI1"/>
+                <signal pad-key="pc0" function="SPI1" group="MOSI" field="PORTMUX.SPIROUTEA.SPI1"/>
+                <signal pad-key="pc2" function="SPI1" group="SCK" field="PORTMUX.SPIROUTEA.SPI1"/>
+                <signal pad-key="pc3" function="SPI1" group="SS" field="PORTMUX.SPIROUTEA.SPI1"/>
             </signals>
         </peripheral>
         <peripheral key="syscfg" name="SYSCFG" module-key="chip_syscfg">
@@ -257,90 +257,90 @@
         <peripheral key="tca0" name="TCA0" module-key="tmr_16b_pwm_v1">
             <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"/>
-                <signal pad-id="pa0" index="0" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pf1" index="1" function="TCA0_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pd1" index="1" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pc1" index="1" function="TCA0_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pa1" index="1" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pd2" index="2" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pc2" index="2" function="TCA0_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pa2" index="2" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pd3" index="3" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pc3" index="3" function="TCA0_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pa3" index="3" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pd4" index="4" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pa4" index="4" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pd5" index="5" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pa5" index="5" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pf0" index="0" function="TCA0_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pc0" index="0" function="TCA0_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pa0" index="0" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pf1" index="1" function="TCA0_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pd1" index="1" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pc1" index="1" function="TCA0_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pa1" index="1" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pd2" index="2" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pc2" index="2" function="TCA0_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pa2" index="2" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pd3" index="3" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pc3" index="3" function="TCA0_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pa3" index="3" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pd4" index="4" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pa4" index="4" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pd5" index="5" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pa5" index="5" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
             </signals>
         </peripheral>
         <peripheral key="tcb0" name="TCB0" module-key="tmr_16b_capture_v1">
             <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-key="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 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-key="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 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"/>
+                <signal pad-key="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 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"/>
-                <signal pad-id="pf1" index="1" function="TCD0_ALT2" group="WOB" field="PORTMUX.TCDROUTEA.TCD0"/>
-                <signal pad-id="pa5" index="1" function="TCD0" group="WOB" field="PORTMUX.TCDROUTEA.TCD0"/>
-                <signal pad-id="pa6" index="2" function="TCD0" group="WOC" field="PORTMUX.TCDROUTEA.TCD0"/>
-                <signal pad-id="pa7" index="3" function="TCD0" group="WOD" field="PORTMUX.TCDROUTEA.TCD0"/>
+                <signal pad-key="pf0" function="TCD0_ALT2" group="WOA" field="PORTMUX.TCDROUTEA.TCD0"/>
+                <signal pad-key="pa4" function="TCD0" group="WOA" field="PORTMUX.TCDROUTEA.TCD0"/>
+                <signal pad-key="pf1" index="1" function="TCD0_ALT2" group="WOB" field="PORTMUX.TCDROUTEA.TCD0"/>
+                <signal pad-key="pa5" index="1" function="TCD0" group="WOB" field="PORTMUX.TCDROUTEA.TCD0"/>
+                <signal pad-key="pa6" index="2" function="TCD0" group="WOC" field="PORTMUX.TCDROUTEA.TCD0"/>
+                <signal pad-key="pa7" index="3" function="TCD0" group="WOD" field="PORTMUX.TCDROUTEA.TCD0"/>
             </signals>
         </peripheral>
         <peripheral key="twi0" name="TWI0" module-key="i2c_8bit_v2">
             <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"/>
-                <signal pad-id="pc2" function="I2C0_ALT" group="SDA" field="PORTMUX.TWIROUTEA.TWI0"/>
-                <signal pad-id="pa2" function="I2C0" group="SDA" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pc3" function="I2C0_ALT" group="SCL" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pa3" function="I2C0" group="SCL" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pc2" function="I2C0_ALT" group="SDA" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pa2" function="I2C0" group="SDA" field="PORTMUX.TWIROUTEA.TWI0"/>
             </signals>
         </peripheral>
         <peripheral key="usart0" name="USART0" module-key="uart_autobd_v4">
             <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"/>
-                <signal pad-id="pa4" function="USART0_ALT" group="TXD" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pa0" function="USART0" group="TXD" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pa6" function="USART0_ALT" group="XCK" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pa2" function="USART0" group="XCK" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pa7" function="USART0_ALT" group="XDIR" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pa3" function="USART0" group="XDIR" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa5" function="USART0_ALT" group="RXD" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa1" function="USART0" group="RXD" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa4" function="USART0_ALT" group="TXD" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa0" function="USART0" group="TXD" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa6" function="USART0_ALT" group="XCK" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa2" function="USART0" group="XCK" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa7" function="USART0_ALT" group="XDIR" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa3" function="USART0" group="XDIR" field="PORTMUX.USARTROUTEA.USART0"/>
             </signals>
         </peripheral>
         <peripheral key="usart1" name="USART1" module-key="uart_autobd_v4">
             <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"/>
-                <signal pad-id="pc2" function="USART1" group="XCK" field="PORTMUX.USARTROUTEA.USART1"/>
-                <signal pad-id="pc3" function="USART1" group="XDIR" field="PORTMUX.USARTROUTEA.USART1"/>
+                <signal pad-key="pc1" function="USART1" group="RXD" field="PORTMUX.USARTROUTEA.USART1"/>
+                <signal pad-key="pc0" function="USART1" group="TXD" field="PORTMUX.USARTROUTEA.USART1"/>
+                <signal pad-key="pc2" function="USART1" group="XCK" field="PORTMUX.USARTROUTEA.USART1"/>
+                <signal pad-key="pc3" function="USART1" group="XDIR" field="PORTMUX.USARTROUTEA.USART1"/>
             </signals>
         </peripheral>
         <peripheral key="usart2" name="USART2" module-key="uart_autobd_v4">
             <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"/>
+                <signal pad-key="pf1" function="USART2" group="RXD" field="PORTMUX.USARTROUTEA.USART2"/>
+                <signal pad-key="pf0" function="USART2" group="TXD" field="PORTMUX.USARTROUTEA.USART2"/>
             </signals>
         </peripheral>
         <peripheral key="userrow" name="USERROW" module-key="chip_userrow">
@@ -367,8 +367,8 @@
         <peripheral key="zcd0" name="ZCD0" module-key="cmp_zxover_ctrl_v3">
             <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"/>
+                <signal pad-key="pd1" function="ZCD0" group="IN"/>
+                <signal pad-key="pa7" function="ZCD0" group="OUT" field="PORTMUX.ZCDROUTEA.ZCD0"/>
             </signals>
         </peripheral>
     </peripherals>
@@ -1705,39 +1705,69 @@
             </register-group>
         </module>
     </modules>
+    <pads>
+        <pad key="pa7" name="PA7"/>
+        <pad key="pc0" name="PC0"/>
+        <pad key="pc1" name="PC1"/>
+        <pad key="pc2" name="PC2"/>
+        <pad key="pc3" name="PC3"/>
+        <pad key="vddio2" name="VDDIO2"/>
+        <pad key="pd1" name="PD1"/>
+        <pad key="pd2" name="PD2"/>
+        <pad key="pd3" name="PD3"/>
+        <pad key="pd4" name="PD4"/>
+        <pad key="pd5" name="PD5"/>
+        <pad key="pd6" name="PD6"/>
+        <pad key="pd7" name="PD7"/>
+        <pad key="avdd" name="AVDD"/>
+        <pad key="agnd" name="AGND"/>
+        <pad key="pf0" name="PF0"/>
+        <pad key="pf1" name="PF1"/>
+        <pad key="pf6" name="PF6"/>
+        <pad key="updi" name="UPDI"/>
+        <pad key="vdd0" name="VDD0"/>
+        <pad key="gnd0" name="GND0"/>
+        <pad key="pa0" name="PA0"/>
+        <pad key="pa1" name="PA1"/>
+        <pad key="pa2" name="PA2"/>
+        <pad key="pa3" name="PA3"/>
+        <pad key="pa4" name="PA4"/>
+        <pad key="pa5" name="PA5"/>
+        <pad key="pa6" name="PA6"/>
+    </pads>
     <pinouts>
         <pinout key="soic28" name="SOIC28" type="soic">
-            <pin position="1" pad="PA7"/>
-            <pin position="2" pad="PC0"/>
-            <pin position="3" pad="PC1"/>
-            <pin position="4" pad="PC2"/>
-            <pin position="5" pad="PC3"/>
-            <pin position="6" pad="VDDIO2"/>
-            <pin position="7" pad="PD1"/>
-            <pin position="8" pad="PD2"/>
-            <pin position="9" pad="PD3"/>
-            <pin position="10" pad="PD4"/>
-            <pin position="11" pad="PD5"/>
-            <pin position="12" pad="PD6"/>
-            <pin position="13" pad="PD7"/>
-            <pin position="14" pad="AVDD"/>
-            <pin position="15" pad="AGND"/>
-            <pin position="16" pad="PF0"/>
-            <pin position="17" pad="PF1"/>
-            <pin position="18" pad="PF6"/>
-            <pin position="19" pad="UPDI"/>
-            <pin position="20" pad="VDD0"/>
-            <pin position="21" pad="GND0"/>
-            <pin position="22" pad="PA0"/>
-            <pin position="23" pad="PA1"/>
-            <pin position="24" pad="PA2"/>
-            <pin position="25" pad="PA3"/>
-            <pin position="26" pad="PA4"/>
-            <pin position="27" pad="PA5"/>
-            <pin position="28" pad="PA6"/>
+            <pin position="1" pad-key="pa7"/>
+            <pin position="2" pad-key="pc0"/>
+            <pin position="3" pad-key="pc1"/>
+            <pin position="4" pad-key="pc2"/>
+            <pin position="5" pad-key="pc3"/>
+            <pin position="6" pad-key="vddio2"/>
+            <pin position="7" pad-key="pd1"/>
+            <pin position="8" pad-key="pd2"/>
+            <pin position="9" pad-key="pd3"/>
+            <pin position="10" pad-key="pd4"/>
+            <pin position="11" pad-key="pd5"/>
+            <pin position="12" pad-key="pd6"/>
+            <pin position="13" pad-key="pd7"/>
+            <pin position="14" pad-key="avdd"/>
+            <pin position="15" pad-key="agnd"/>
+            <pin position="16" pad-key="pf0"/>
+            <pin position="17" pad-key="pf1"/>
+            <pin position="18" pad-key="pf6"/>
+            <pin position="19" pad-key="updi"/>
+            <pin position="20" pad-key="vdd0"/>
+            <pin position="21" pad-key="gnd0"/>
+            <pin position="22" pad-key="pa0"/>
+            <pin position="23" pad-key="pa1"/>
+            <pin position="24" pad-key="pa2"/>
+            <pin position="25" pad-key="pa3"/>
+            <pin position="26" pad-key="pa4"/>
+            <pin position="27" pad-key="pa5"/>
+            <pin position="28" pad-key="pa6"/>
         </pinout>
     </pinouts>
     <variants>
-        <variant name="AVR32DB28" pinout-key="soic28" package="SOIC28"/>
+        <variant key="avr32db28" name="AVR32DB28" pinout-key="soic28"/>
     </variants>
 </device>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR32DB32.xml b/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR32DB32.xml
index 07ea77f5..82a7b498 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR32DB32.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR32DB32.xml
@@ -44,52 +44,52 @@
         <peripheral key="ac0" name="AC0" module-key="cmp_control_v8">
             <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"/>
-                <signal pad-id="pa7" index="0" function="AC0" group="OUT" field="PORTMUX.ACROUTEA.AC0"/>
-                <signal pad-id="pd2" index="0" function="AC0" group="P"/>
-                <signal pad-id="pd6" index="3" function="AC0" group="P"/>
+                <signal pad-key="pd3" index="0" function="AC0" group="N"/>
+                <signal pad-key="pd7" index="2" function="AC0" group="N"/>
+                <signal pad-key="pa7" index="0" function="AC0" group="OUT" field="PORTMUX.ACROUTEA.AC0"/>
+                <signal pad-key="pd2" index="0" function="AC0" group="P"/>
+                <signal pad-key="pd6" index="3" function="AC0" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="ac1" name="AC1" module-key="cmp_control_v8">
             <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"/>
-                <signal pad-id="pa7" index="0" function="AC1" group="OUT" field="PORTMUX.ACROUTEA.AC1"/>
-                <signal pad-id="pd2" index="0" function="AC1" group="P"/>
-                <signal pad-id="pd3" index="1" function="AC1" group="P"/>
-                <signal pad-id="pd4" index="2" function="AC1" group="P"/>
-                <signal pad-id="pd6" index="3" function="AC1" group="P"/>
+                <signal pad-key="pd5" index="0" function="AC1" group="N"/>
+                <signal pad-key="pd7" index="2" function="AC1" group="N"/>
+                <signal pad-key="pa7" index="0" function="AC1" group="OUT" field="PORTMUX.ACROUTEA.AC1"/>
+                <signal pad-key="pd2" index="0" function="AC1" group="P"/>
+                <signal pad-key="pd3" index="1" function="AC1" group="P"/>
+                <signal pad-key="pd4" index="2" function="AC1" group="P"/>
+                <signal pad-key="pd6" index="3" function="AC1" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="ac2" name="AC2" module-key="cmp_control_v8">
             <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"/>
-                <signal pad-id="pa7" index="0" function="AC2" group="OUT" field="PORTMUX.ACROUTEA.AC2"/>
-                <signal pad-id="pd2" index="0" function="AC2" group="P"/>
-                <signal pad-id="pd4" index="1" function="AC2" group="P"/>
-                <signal pad-id="pd6" index="3" function="AC2" group="P"/>
+                <signal pad-key="pd7" index="0" function="AC2" group="N"/>
+                <signal pad-key="pd7" index="2" function="AC2" group="N"/>
+                <signal pad-key="pa7" index="0" function="AC2" group="OUT" field="PORTMUX.ACROUTEA.AC2"/>
+                <signal pad-key="pd2" index="0" function="AC2" group="P"/>
+                <signal pad-key="pd4" index="1" function="AC2" group="P"/>
+                <signal pad-key="pd6" index="3" function="AC2" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="adc0" name="ADC0" module-key="adc_12b_diff_ctrl_v1">
             <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"/>
-                <signal pad-id="pd3" index="3" function="AIN0" group="AIN"/>
-                <signal pad-id="pd4" index="4" function="AIN0" group="AIN"/>
-                <signal pad-id="pd5" index="5" function="AIN0" group="AIN"/>
-                <signal pad-id="pd6" index="6" function="AIN0" group="AIN"/>
-                <signal pad-id="pd7" index="7" function="AIN0" group="AIN"/>
-                <signal pad-id="pf0" index="16" function="AIN0" group="AIN"/>
-                <signal pad-id="pf1" index="17" function="AIN0" group="AIN"/>
-                <signal pad-id="pf2" index="18" function="AIN0" group="AIN"/>
-                <signal pad-id="pf3" index="19" function="AIN0" group="AIN"/>
-                <signal pad-id="pf4" index="20" function="AIN0" group="AIN"/>
-                <signal pad-id="pf5" index="21" function="AIN0" group="AIN"/>
+                <signal pad-key="pd1" index="1" function="AIN0" group="AIN"/>
+                <signal pad-key="pd2" index="2" function="AIN0" group="AIN"/>
+                <signal pad-key="pd3" index="3" function="AIN0" group="AIN"/>
+                <signal pad-key="pd4" index="4" function="AIN0" group="AIN"/>
+                <signal pad-key="pd5" index="5" function="AIN0" group="AIN"/>
+                <signal pad-key="pd6" index="6" function="AIN0" group="AIN"/>
+                <signal pad-key="pd7" index="7" function="AIN0" group="AIN"/>
+                <signal pad-key="pf0" index="16" function="AIN0" group="AIN"/>
+                <signal pad-key="pf1" index="17" function="AIN0" group="AIN"/>
+                <signal pad-key="pf2" index="18" function="AIN0" group="AIN"/>
+                <signal pad-key="pf3" index="19" function="AIN0" group="AIN"/>
+                <signal pad-key="pf4" index="20" function="AIN0" group="AIN"/>
+                <signal pad-key="pf5" index="21" function="AIN0" group="AIN"/>
             </signals>
         </peripheral>
         <peripheral key="bod" name="BOD" module-key="bor_lvd_ctrl_v1">
@@ -98,34 +98,34 @@
         <peripheral key="ccl" name="CCL" module-key="cla_ccl_v1">
             <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"/>
-                <signal pad-id="pa2" index="2" function="CCL_IN" group="LUT0_IN"/>
-                <signal pad-id="pa6" index="0" function="CCL_ALT" group="LUT0_OUT" field="PORTMUX.CCLROUTEA.LUT0"/>
-                <signal pad-id="pa3" index="0" function="CCL" group="LUT0_OUT" field="PORTMUX.CCLROUTEA.LUT0"/>
-                <signal pad-id="pc0" index="0" function="CCL_IN" group="LUT1_IN"/>
-                <signal pad-id="pc1" index="1" function="CCL_IN" group="LUT1_IN"/>
-                <signal pad-id="pc2" index="2" function="CCL_IN" group="LUT1_IN"/>
-                <signal pad-id="pc3" index="0" function="CCL" group="LUT1_OUT" field="PORTMUX.CCLROUTEA.LUT1"/>
-                <signal pad-id="pd1" index="1" function="CCL_IN" group="LUT2_IN"/>
-                <signal pad-id="pd2" index="2" function="CCL_IN" group="LUT2_IN"/>
-                <signal pad-id="pd6" index="0" function="CCL_ALT" group="LUT2_OUT" field="PORTMUX.CCLROUTEA.LUT2"/>
-                <signal pad-id="pd3" index="0" function="CCL" group="LUT2_OUT" field="PORTMUX.CCLROUTEA.LUT2"/>
-                <signal pad-id="pf0" index="0" function="CCL_IN" group="LUT3_IN"/>
-                <signal pad-id="pf1" index="1" function="CCL_IN" group="LUT3_IN"/>
-                <signal pad-id="pf2" index="2" function="CCL_IN" group="LUT3_IN"/>
-                <signal pad-id="pf3" index="0" function="CCL" group="LUT3_OUT" field="PORTMUX.CCLROUTEA.LUT3"/>
+                <signal pad-key="pa0" index="0" function="CCL_IN" group="LUT0_IN"/>
+                <signal pad-key="pa1" index="1" function="CCL_IN" group="LUT0_IN"/>
+                <signal pad-key="pa2" index="2" function="CCL_IN" group="LUT0_IN"/>
+                <signal pad-key="pa6" index="0" function="CCL_ALT" group="LUT0_OUT" field="PORTMUX.CCLROUTEA.LUT0"/>
+                <signal pad-key="pa3" index="0" function="CCL" group="LUT0_OUT" field="PORTMUX.CCLROUTEA.LUT0"/>
+                <signal pad-key="pc0" index="0" function="CCL_IN" group="LUT1_IN"/>
+                <signal pad-key="pc1" index="1" function="CCL_IN" group="LUT1_IN"/>
+                <signal pad-key="pc2" index="2" function="CCL_IN" group="LUT1_IN"/>
+                <signal pad-key="pc3" index="0" function="CCL" group="LUT1_OUT" field="PORTMUX.CCLROUTEA.LUT1"/>
+                <signal pad-key="pd1" index="1" function="CCL_IN" group="LUT2_IN"/>
+                <signal pad-key="pd2" index="2" function="CCL_IN" group="LUT2_IN"/>
+                <signal pad-key="pd6" index="0" function="CCL_ALT" group="LUT2_OUT" field="PORTMUX.CCLROUTEA.LUT2"/>
+                <signal pad-key="pd3" index="0" function="CCL" group="LUT2_OUT" field="PORTMUX.CCLROUTEA.LUT2"/>
+                <signal pad-key="pf0" index="0" function="CCL_IN" group="LUT3_IN"/>
+                <signal pad-key="pf1" index="1" function="CCL_IN" group="LUT3_IN"/>
+                <signal pad-key="pf2" index="2" function="CCL_IN" group="LUT3_IN"/>
+                <signal pad-key="pf3" index="0" function="CCL" group="LUT3_OUT" field="PORTMUX.CCLROUTEA.LUT3"/>
             </signals>
         </peripheral>
         <peripheral key="clkctrl" name="CLKCTRL" module-key="chip_clkctrl">
             <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"/>
-                <signal pad-id="pf0" function="CLKCTRL" group="XTAL32K1"/>
-                <signal pad-id="pf1" function="CLKCTRL" group="XTAL32K2"/>
-                <signal pad-id="pa0" function="CLKCTRL" group="XTALHF1"/>
-                <signal pad-id="pa1" function="CLKCTRL" group="XTALHF2"/>
+                <signal pad-key="pa7" function="CLKCTRL" group="CLKOUT"/>
+                <signal pad-key="pa0" function="CLKCTRL" group="EXTCLK"/>
+                <signal pad-key="pf0" function="CLKCTRL" group="XTAL32K1"/>
+                <signal pad-key="pf1" function="CLKCTRL" group="XTAL32K2"/>
+                <signal pad-key="pa0" function="CLKCTRL" group="XTALHF1"/>
+                <signal pad-key="pa1" function="CLKCTRL" group="XTALHF2"/>
             </signals>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="cpu_avr_xt_v1">
@@ -140,18 +140,18 @@
         <peripheral key="dac0" name="DAC0" module-key="dac_nbit_ctrl_v5">
             <register-group-instance register-group-key="dac" address-space-key="data" offset="0x6A0"/>
             <signals>
-                <signal pad-id="pd6" index="0" function="DAC0" group="OUT"/>
+                <signal pad-key="pd6" index="0" function="DAC0" group="OUT"/>
             </signals>
         </peripheral>
         <peripheral key="evsys" name="EVSYS" module-key="chip_evsys">
             <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"/>
-                <signal pad-id="pc2" index="2" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTC"/>
-                <signal pad-id="pd7" index="3" function="EVSYS_ALT" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTD"/>
-                <signal pad-id="pd2" index="3" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTD"/>
-                <signal pad-id="pf2" index="5" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTF"/>
+                <signal pad-key="pa7" index="0" function="EVSYS_ALT" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTA"/>
+                <signal pad-key="pa2" index="0" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTA"/>
+                <signal pad-key="pc2" index="2" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTC"/>
+                <signal pad-key="pd7" index="3" function="EVSYS_ALT" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTD"/>
+                <signal pad-key="pd2" index="3" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTD"/>
+                <signal pad-key="pf2" index="5" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTF"/>
             </signals>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="chip_fuse">
@@ -172,58 +172,58 @@
         <peripheral key="opamp" name="OPAMP" module-key="amp_opamp_ctrl_avr_v1">
             <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"/>
-                <signal pad-id="pd2" function="OPAMP" group="OP0OUT"/>
-                <signal pad-id="pd7" function="OPAMP" group="OP1INN"/>
-                <signal pad-id="pd4" function="OPAMP" group="OP1INP"/>
-                <signal pad-id="pd5" function="OPAMP" group="OP1OUT"/>
+                <signal pad-key="pd3" function="OPAMP" group="OP0INN"/>
+                <signal pad-key="pd1" function="OPAMP" group="OP0INP"/>
+                <signal pad-key="pd2" function="OPAMP" group="OP0OUT"/>
+                <signal pad-key="pd7" function="OPAMP" group="OP1INN"/>
+                <signal pad-key="pd4" function="OPAMP" group="OP1INP"/>
+                <signal pad-key="pd5" function="OPAMP" group="OP1OUT"/>
             </signals>
         </peripheral>
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pa2" index="2" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa3" index="3" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa4" index="4" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa5" index="5" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa6" index="6" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa7" index="7" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa0" index="0" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa1" index="1" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa2" index="2" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa3" index="3" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa4" index="4" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa5" index="5" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa6" index="6" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa7" index="7" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pc2" index="2" function="IOPORT" group="PIN"/>
-                <signal pad-id="pc3" index="3" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc0" index="0" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc1" index="1" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc2" index="2" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc3" index="3" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pd3" index="3" function="IOPORT" group="PIN"/>
-                <signal pad-id="pd4" index="4" function="IOPORT" group="PIN"/>
-                <signal pad-id="pd5" index="5" function="IOPORT" group="PIN"/>
-                <signal pad-id="pd6" index="6" function="IOPORT" group="PIN"/>
-                <signal pad-id="pd7" index="7" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd1" index="1" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd2" index="2" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd3" index="3" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd4" index="4" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd5" index="5" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd6" index="6" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd7" index="7" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="portf" name="PORTF" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pf2" index="2" function="IOPORT" group="PIN"/>
-                <signal pad-id="pf3" index="3" function="IOPORT" group="PIN"/>
-                <signal pad-id="pf4" index="4" function="IOPORT" group="PIN"/>
-                <signal pad-id="pf5" index="5" function="IOPORT" group="PIN"/>
-                <signal pad-id="pf6" index="6" function="IOPORT" group="PIN"/>
+                <signal pad-key="pf0" index="0" function="IOPORT" group="PIN"/>
+                <signal pad-key="pf1" index="1" function="IOPORT" group="PIN"/>
+                <signal pad-key="pf2" index="2" function="IOPORT" group="PIN"/>
+                <signal pad-key="pf3" index="3" function="IOPORT" group="PIN"/>
+                <signal pad-key="pf4" index="4" function="IOPORT" group="PIN"/>
+                <signal pad-key="pf5" index="5" function="IOPORT" group="PIN"/>
+                <signal pad-key="pf6" index="6" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="portmux" name="PORTMUX" module-key="chip_portmux">
@@ -232,7 +232,7 @@
         <peripheral key="rstctrl" name="RSTCTRL" module-key="rst_integration_v8">
             <register-group-instance register-group-key="rstctrl" address-space-key="data" offset="0x40"/>
             <signals>
-                <signal pad-id="pf6" function="OTHER" group="RESET"/>
+                <signal pad-key="pf6" function="OTHER" group="RESET"/>
             </signals>
         </peripheral>
         <peripheral key="rtc" name="RTC" module-key="tmr_16b_rtc_v1">
@@ -247,19 +247,19 @@
         <peripheral key="spi0" name="SPI0" module-key="spi_8bit_v2">
             <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"/>
-                <signal pad-id="pa6" function="SPI0" group="SCK" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <signal pad-id="pa7" function="SPI0" group="SS" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pa5" function="SPI0" group="MISO" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pa4" function="SPI0" group="MOSI" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pa6" function="SPI0" group="SCK" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pa7" function="SPI0" group="SS" field="PORTMUX.SPIROUTEA.SPI0"/>
             </signals>
         </peripheral>
         <peripheral key="spi1" name="SPI1" module-key="spi_8bit_v2">
             <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"/>
-                <signal pad-id="pc2" function="SPI1" group="SCK" field="PORTMUX.SPIROUTEA.SPI1"/>
-                <signal pad-id="pc3" function="SPI1" group="SS" field="PORTMUX.SPIROUTEA.SPI1"/>
+                <signal pad-key="pc1" function="SPI1" group="MISO" field="PORTMUX.SPIROUTEA.SPI1"/>
+                <signal pad-key="pc0" function="SPI1" group="MOSI" field="PORTMUX.SPIROUTEA.SPI1"/>
+                <signal pad-key="pc2" function="SPI1" group="SCK" field="PORTMUX.SPIROUTEA.SPI1"/>
+                <signal pad-key="pc3" function="SPI1" group="SS" field="PORTMUX.SPIROUTEA.SPI1"/>
             </signals>
         </peripheral>
         <peripheral key="syscfg" name="SYSCFG" module-key="chip_syscfg">
@@ -268,109 +268,109 @@
         <peripheral key="tca0" name="TCA0" module-key="tmr_16b_pwm_v1">
             <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"/>
-                <signal pad-id="pa0" index="0" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pf1" index="1" function="TCA0_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pd1" index="1" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pc1" index="1" function="TCA0_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pa1" index="1" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pf2" index="2" function="TCA0_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pd2" index="2" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pc2" index="2" function="TCA0_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pa2" index="2" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pf3" index="3" function="TCA0_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pd3" index="3" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pc3" index="3" function="TCA0_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pa3" index="3" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pf4" index="4" function="TCA0_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pd4" index="4" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pa4" index="4" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pf5" index="5" function="TCA0_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pd5" index="5" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pa5" index="5" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pf0" index="0" function="TCA0_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pc0" index="0" function="TCA0_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pa0" index="0" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pf1" index="1" function="TCA0_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pd1" index="1" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pc1" index="1" function="TCA0_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pa1" index="1" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pf2" index="2" function="TCA0_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pd2" index="2" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pc2" index="2" function="TCA0_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pa2" index="2" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pf3" index="3" function="TCA0_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pd3" index="3" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pc3" index="3" function="TCA0_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pa3" index="3" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pf4" index="4" function="TCA0_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pd4" index="4" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pa4" index="4" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pf5" index="5" function="TCA0_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pd5" index="5" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pa5" index="5" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
             </signals>
         </peripheral>
         <peripheral key="tcb0" name="TCB0" module-key="tmr_16b_capture_v1">
             <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"/>
+                <signal pad-key="pf4" index="0" function="TCB0_ALT" group="WO" field="PORTMUX.TCBROUTEA.TCB0"/>
+                <signal pad-key="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 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"/>
+                <signal pad-key="pf5" index="0" function="TCB1_ALT" group="WO" field="PORTMUX.TCBROUTEA.TCB1"/>
+                <signal pad-key="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 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"/>
+                <signal pad-key="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 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"/>
-                <signal pad-id="pf1" index="1" function="TCD0_ALT2" group="WOB" field="PORTMUX.TCDROUTEA.TCD0"/>
-                <signal pad-id="pa5" index="1" function="TCD0" group="WOB" field="PORTMUX.TCDROUTEA.TCD0"/>
-                <signal pad-id="pf2" index="2" function="TCD0_ALT2" group="WOC" field="PORTMUX.TCDROUTEA.TCD0"/>
-                <signal pad-id="pa6" index="2" function="TCD0" group="WOC" field="PORTMUX.TCDROUTEA.TCD0"/>
-                <signal pad-id="pf3" index="3" function="TCD0_ALT2" group="WOD" field="PORTMUX.TCDROUTEA.TCD0"/>
-                <signal pad-id="pa7" index="3" function="TCD0" group="WOD" field="PORTMUX.TCDROUTEA.TCD0"/>
+                <signal pad-key="pf0" function="TCD0_ALT2" group="WOA" field="PORTMUX.TCDROUTEA.TCD0"/>
+                <signal pad-key="pa4" function="TCD0" group="WOA" field="PORTMUX.TCDROUTEA.TCD0"/>
+                <signal pad-key="pf1" index="1" function="TCD0_ALT2" group="WOB" field="PORTMUX.TCDROUTEA.TCD0"/>
+                <signal pad-key="pa5" index="1" function="TCD0" group="WOB" field="PORTMUX.TCDROUTEA.TCD0"/>
+                <signal pad-key="pf2" index="2" function="TCD0_ALT2" group="WOC" field="PORTMUX.TCDROUTEA.TCD0"/>
+                <signal pad-key="pa6" index="2" function="TCD0" group="WOC" field="PORTMUX.TCDROUTEA.TCD0"/>
+                <signal pad-key="pf3" index="3" function="TCD0_ALT2" group="WOD" field="PORTMUX.TCDROUTEA.TCD0"/>
+                <signal pad-key="pa7" index="3" function="TCD0" group="WOD" field="PORTMUX.TCDROUTEA.TCD0"/>
             </signals>
         </peripheral>
         <peripheral key="twi0" name="TWI0" module-key="i2c_8bit_v2">
             <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"/>
-                <signal pad-id="pc2" function="I2C0_ALT" group="SDA" field="PORTMUX.TWIROUTEA.TWI0"/>
-                <signal pad-id="pa2" function="I2C0" group="SDA" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pc3" function="I2C0_ALT" group="SCL" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pa3" function="I2C0" group="SCL" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pc2" function="I2C0_ALT" group="SDA" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pa2" function="I2C0" group="SDA" field="PORTMUX.TWIROUTEA.TWI0"/>
             </signals>
         </peripheral>
         <peripheral key="twi1" name="TWI1" module-key="i2c_8bit_v2">
             <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"/>
+                <signal pad-key="pf3" function="I2C1" group="SCL" field="PORTMUX.TWIROUTEA.TWI1"/>
+                <signal pad-key="pf2" function="I2C1" group="SDA" field="PORTMUX.TWIROUTEA.TWI1"/>
             </signals>
         </peripheral>
         <peripheral key="usart0" name="USART0" module-key="uart_autobd_v4">
             <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"/>
-                <signal pad-id="pa4" function="USART0_ALT" group="TXD" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pa0" function="USART0" group="TXD" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pa6" function="USART0_ALT" group="XCK" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pa2" function="USART0" group="XCK" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pa7" function="USART0_ALT" group="XDIR" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pa3" function="USART0" group="XDIR" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa5" function="USART0_ALT" group="RXD" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa1" function="USART0" group="RXD" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa4" function="USART0_ALT" group="TXD" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa0" function="USART0" group="TXD" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa6" function="USART0_ALT" group="XCK" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa2" function="USART0" group="XCK" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa7" function="USART0_ALT" group="XDIR" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa3" function="USART0" group="XDIR" field="PORTMUX.USARTROUTEA.USART0"/>
             </signals>
         </peripheral>
         <peripheral key="usart1" name="USART1" module-key="uart_autobd_v4">
             <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"/>
-                <signal pad-id="pc2" function="USART1" group="XCK" field="PORTMUX.USARTROUTEA.USART1"/>
-                <signal pad-id="pc3" function="USART1" group="XDIR" field="PORTMUX.USARTROUTEA.USART1"/>
+                <signal pad-key="pc1" function="USART1" group="RXD" field="PORTMUX.USARTROUTEA.USART1"/>
+                <signal pad-key="pc0" function="USART1" group="TXD" field="PORTMUX.USARTROUTEA.USART1"/>
+                <signal pad-key="pc2" function="USART1" group="XCK" field="PORTMUX.USARTROUTEA.USART1"/>
+                <signal pad-key="pc3" function="USART1" group="XDIR" field="PORTMUX.USARTROUTEA.USART1"/>
             </signals>
         </peripheral>
         <peripheral key="usart2" name="USART2" module-key="uart_autobd_v4">
             <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"/>
-                <signal pad-id="pf4" function="USART2_ALT" group="TXD" field="PORTMUX.USARTROUTEA.USART2"/>
-                <signal pad-id="pf0" function="USART2" group="TXD" field="PORTMUX.USARTROUTEA.USART2"/>
-                <signal pad-id="pf2" function="USART2" group="XCK" field="PORTMUX.USARTROUTEA.USART2"/>
-                <signal pad-id="pf3" function="USART2" group="XDIR" field="PORTMUX.USARTROUTEA.USART2"/>
+                <signal pad-key="pf5" function="USART2_ALT" group="RXD" field="PORTMUX.USARTROUTEA.USART2"/>
+                <signal pad-key="pf1" function="USART2" group="RXD" field="PORTMUX.USARTROUTEA.USART2"/>
+                <signal pad-key="pf4" function="USART2_ALT" group="TXD" field="PORTMUX.USARTROUTEA.USART2"/>
+                <signal pad-key="pf0" function="USART2" group="TXD" field="PORTMUX.USARTROUTEA.USART2"/>
+                <signal pad-key="pf2" function="USART2" group="XCK" field="PORTMUX.USARTROUTEA.USART2"/>
+                <signal pad-key="pf3" function="USART2" group="XDIR" field="PORTMUX.USARTROUTEA.USART2"/>
             </signals>
         </peripheral>
         <peripheral key="userrow" name="USERROW" module-key="chip_userrow">
@@ -397,8 +397,8 @@
         <peripheral key="zcd0" name="ZCD0" module-key="cmp_zxover_ctrl_v3">
             <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"/>
+                <signal pad-key="pd1" function="ZCD0" group="IN"/>
+                <signal pad-key="pa7" function="ZCD0" group="OUT" field="PORTMUX.ZCDROUTEA.ZCD0"/>
             </signals>
         </peripheral>
     </peripherals>
@@ -1736,43 +1736,77 @@
             </register-group>
         </module>
     </modules>
+    <pads>
+        <pad key="pa3" name="PA3"/>
+        <pad key="pa4" name="PA4"/>
+        <pad key="pa5" name="PA5"/>
+        <pad key="pa6" name="PA6"/>
+        <pad key="pa7" name="PA7"/>
+        <pad key="pc0" name="PC0"/>
+        <pad key="pc1" name="PC1"/>
+        <pad key="pc2" name="PC2"/>
+        <pad key="pc3" name="PC3"/>
+        <pad key="vddio2" name="VDDIO2"/>
+        <pad key="pd1" name="PD1"/>
+        <pad key="pd2" name="PD2"/>
+        <pad key="pd3" name="PD3"/>
+        <pad key="pd4" name="PD4"/>
+        <pad key="pd5" name="PD5"/>
+        <pad key="pd6" name="PD6"/>
+        <pad key="pd7" name="PD7"/>
+        <pad key="avdd" name="AVDD"/>
+        <pad key="agnd" name="AGND"/>
+        <pad key="pf0" name="PF0"/>
+        <pad key="pf1" name="PF1"/>
+        <pad key="pf2" name="PF2"/>
+        <pad key="pf3" name="PF3"/>
+        <pad key="pf4" name="PF4"/>
+        <pad key="pf5" name="PF5"/>
+        <pad key="pf6" name="PF6"/>
+        <pad key="updi" name="UPDI"/>
+        <pad key="vdd0" name="VDD0"/>
+        <pad key="gnd0" name="GND0"/>
+        <pad key="pa0" name="PA0"/>
+        <pad key="pa1" name="PA1"/>
+        <pad key="pa2" name="PA2"/>
+    </pads>
     <pinouts>
         <pinout key="qfn32" name="QFN32" type="qfn">
-            <pin position="1" pad="PA3"/>
-            <pin position="2" pad="PA4"/>
-            <pin position="3" pad="PA5"/>
-            <pin position="4" pad="PA6"/>
-            <pin position="5" pad="PA7"/>
-            <pin position="6" pad="PC0"/>
-            <pin position="7" pad="PC1"/>
-            <pin position="8" pad="PC2"/>
-            <pin position="9" pad="PC3"/>
-            <pin position="10" pad="VDDIO2"/>
-            <pin position="11" pad="PD1"/>
-            <pin position="12" pad="PD2"/>
-            <pin position="13" pad="PD3"/>
-            <pin position="14" pad="PD4"/>
-            <pin position="15" pad="PD5"/>
-            <pin position="16" pad="PD6"/>
-            <pin position="17" pad="PD7"/>
-            <pin position="18" pad="AVDD"/>
-            <pin position="19" pad="AGND"/>
-            <pin position="20" pad="PF0"/>
-            <pin position="21" pad="PF1"/>
-            <pin position="22" pad="PF2"/>
-            <pin position="23" pad="PF3"/>
-            <pin position="24" pad="PF4"/>
-            <pin position="25" pad="PF5"/>
-            <pin position="26" pad="PF6"/>
-            <pin position="27" pad="UPDI"/>
-            <pin position="28" pad="VDD0"/>
-            <pin position="29" pad="GND0"/>
-            <pin position="30" pad="PA0"/>
-            <pin position="31" pad="PA1"/>
-            <pin position="32" pad="PA2"/>
+            <pin position="1" pad-key="pa3"/>
+            <pin position="2" pad-key="pa4"/>
+            <pin position="3" pad-key="pa5"/>
+            <pin position="4" pad-key="pa6"/>
+            <pin position="5" pad-key="pa7"/>
+            <pin position="6" pad-key="pc0"/>
+            <pin position="7" pad-key="pc1"/>
+            <pin position="8" pad-key="pc2"/>
+            <pin position="9" pad-key="pc3"/>
+            <pin position="10" pad-key="vddio2"/>
+            <pin position="11" pad-key="pd1"/>
+            <pin position="12" pad-key="pd2"/>
+            <pin position="13" pad-key="pd3"/>
+            <pin position="14" pad-key="pd4"/>
+            <pin position="15" pad-key="pd5"/>
+            <pin position="16" pad-key="pd6"/>
+            <pin position="17" pad-key="pd7"/>
+            <pin position="18" pad-key="avdd"/>
+            <pin position="19" pad-key="agnd"/>
+            <pin position="20" pad-key="pf0"/>
+            <pin position="21" pad-key="pf1"/>
+            <pin position="22" pad-key="pf2"/>
+            <pin position="23" pad-key="pf3"/>
+            <pin position="24" pad-key="pf4"/>
+            <pin position="25" pad-key="pf5"/>
+            <pin position="26" pad-key="pf6"/>
+            <pin position="27" pad-key="updi"/>
+            <pin position="28" pad-key="vdd0"/>
+            <pin position="29" pad-key="gnd0"/>
+            <pin position="30" pad-key="pa0"/>
+            <pin position="31" pad-key="pa1"/>
+            <pin position="32" pad-key="pa2"/>
         </pinout>
     </pinouts>
     <variants>
-        <variant name="AVR32DB32" pinout-key="qfn32" package="QFN32"/>
+        <variant key="avr32db32" name="AVR32DB32" pinout-key="qfn32"/>
     </variants>
 </device>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR32DB48.xml b/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR32DB48.xml
index 8eea99e7..4c19f3f3 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR32DB48.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR32DB48.xml
@@ -44,66 +44,66 @@
         <peripheral key="ac0" name="AC0" module-key="cmp_control_v8">
             <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"/>
-                <signal pad-id="pd7" index="2" function="AC0" group="N"/>
-                <signal pad-id="pc6" index="0" function="AC0_ALT" group="OUT" field="PORTMUX.ACROUTEA.AC0"/>
-                <signal pad-id="pa7" index="0" function="AC0" group="OUT" field="PORTMUX.ACROUTEA.AC0"/>
-                <signal pad-id="pd2" index="0" function="AC0" group="P"/>
-                <signal pad-id="pe0" index="1" function="AC0" group="P"/>
-                <signal pad-id="pe2" index="2" function="AC0" group="P"/>
-                <signal pad-id="pd6" index="3" function="AC0" group="P"/>
+                <signal pad-key="pd3" index="0" function="AC0" group="N"/>
+                <signal pad-key="pd0" index="1" function="AC0" group="N"/>
+                <signal pad-key="pd7" index="2" function="AC0" group="N"/>
+                <signal pad-key="pc6" index="0" function="AC0_ALT" group="OUT" field="PORTMUX.ACROUTEA.AC0"/>
+                <signal pad-key="pa7" index="0" function="AC0" group="OUT" field="PORTMUX.ACROUTEA.AC0"/>
+                <signal pad-key="pd2" index="0" function="AC0" group="P"/>
+                <signal pad-key="pe0" index="1" function="AC0" group="P"/>
+                <signal pad-key="pe2" index="2" function="AC0" group="P"/>
+                <signal pad-key="pd6" index="3" function="AC0" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="ac1" name="AC1" module-key="cmp_control_v8">
             <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"/>
-                <signal pad-id="pd7" index="2" function="AC1" group="N"/>
-                <signal pad-id="pc6" index="0" function="AC1_ALT" group="OUT" field="PORTMUX.ACROUTEA.AC1"/>
-                <signal pad-id="pa7" index="0" function="AC1" group="OUT" field="PORTMUX.ACROUTEA.AC1"/>
-                <signal pad-id="pd2" index="0" function="AC1" group="P"/>
-                <signal pad-id="pd3" index="1" function="AC1" group="P"/>
-                <signal pad-id="pd4" index="2" function="AC1" group="P"/>
-                <signal pad-id="pd6" index="3" function="AC1" group="P"/>
+                <signal pad-key="pd5" index="0" function="AC1" group="N"/>
+                <signal pad-key="pd0" index="1" function="AC1" group="N"/>
+                <signal pad-key="pd7" index="2" function="AC1" group="N"/>
+                <signal pad-key="pc6" index="0" function="AC1_ALT" group="OUT" field="PORTMUX.ACROUTEA.AC1"/>
+                <signal pad-key="pa7" index="0" function="AC1" group="OUT" field="PORTMUX.ACROUTEA.AC1"/>
+                <signal pad-key="pd2" index="0" function="AC1" group="P"/>
+                <signal pad-key="pd3" index="1" function="AC1" group="P"/>
+                <signal pad-key="pd4" index="2" function="AC1" group="P"/>
+                <signal pad-key="pd6" index="3" function="AC1" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="ac2" name="AC2" module-key="cmp_control_v8">
             <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"/>
-                <signal pad-id="pd7" index="2" function="AC2" group="N"/>
-                <signal pad-id="pc6" index="0" function="AC2_ALT" group="OUT" field="PORTMUX.ACROUTEA.AC2"/>
-                <signal pad-id="pa7" index="0" function="AC2" group="OUT" field="PORTMUX.ACROUTEA.AC2"/>
-                <signal pad-id="pd2" index="0" function="AC2" group="P"/>
-                <signal pad-id="pd4" index="1" function="AC2" group="P"/>
-                <signal pad-id="pe1" index="2" function="AC2" group="P"/>
-                <signal pad-id="pd6" index="3" function="AC2" group="P"/>
+                <signal pad-key="pd7" index="0" function="AC2" group="N"/>
+                <signal pad-key="pd0" index="1" function="AC2" group="N"/>
+                <signal pad-key="pd7" index="2" function="AC2" group="N"/>
+                <signal pad-key="pc6" index="0" function="AC2_ALT" group="OUT" field="PORTMUX.ACROUTEA.AC2"/>
+                <signal pad-key="pa7" index="0" function="AC2" group="OUT" field="PORTMUX.ACROUTEA.AC2"/>
+                <signal pad-key="pd2" index="0" function="AC2" group="P"/>
+                <signal pad-key="pd4" index="1" function="AC2" group="P"/>
+                <signal pad-key="pe1" index="2" function="AC2" group="P"/>
+                <signal pad-key="pd6" index="3" function="AC2" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="adc0" name="ADC0" module-key="adc_12b_diff_ctrl_v1">
             <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"/>
-                <signal pad-id="pd2" index="2" function="AIN0" group="AIN"/>
-                <signal pad-id="pd3" index="3" function="AIN0" group="AIN"/>
-                <signal pad-id="pd4" index="4" function="AIN0" group="AIN"/>
-                <signal pad-id="pd5" index="5" function="AIN0" group="AIN"/>
-                <signal pad-id="pd6" index="6" function="AIN0" group="AIN"/>
-                <signal pad-id="pd7" index="7" function="AIN0" group="AIN"/>
-                <signal pad-id="pe0" index="8" function="AIN0" group="AIN"/>
-                <signal pad-id="pe1" index="9" function="AIN0" group="AIN"/>
-                <signal pad-id="pe2" index="10" function="AIN0" group="AIN"/>
-                <signal pad-id="pe3" index="11" function="AIN0" group="AIN"/>
-                <signal pad-id="pf0" index="16" function="AIN0" group="AIN"/>
-                <signal pad-id="pf1" index="17" function="AIN0" group="AIN"/>
-                <signal pad-id="pf2" index="18" function="AIN0" group="AIN"/>
-                <signal pad-id="pf3" index="19" function="AIN0" group="AIN"/>
-                <signal pad-id="pf4" index="20" function="AIN0" group="AIN"/>
-                <signal pad-id="pf5" index="21" function="AIN0" group="AIN"/>
+                <signal pad-key="pd0" index="0" function="AIN0" group="AIN"/>
+                <signal pad-key="pd1" index="1" function="AIN0" group="AIN"/>
+                <signal pad-key="pd2" index="2" function="AIN0" group="AIN"/>
+                <signal pad-key="pd3" index="3" function="AIN0" group="AIN"/>
+                <signal pad-key="pd4" index="4" function="AIN0" group="AIN"/>
+                <signal pad-key="pd5" index="5" function="AIN0" group="AIN"/>
+                <signal pad-key="pd6" index="6" function="AIN0" group="AIN"/>
+                <signal pad-key="pd7" index="7" function="AIN0" group="AIN"/>
+                <signal pad-key="pe0" index="8" function="AIN0" group="AIN"/>
+                <signal pad-key="pe1" index="9" function="AIN0" group="AIN"/>
+                <signal pad-key="pe2" index="10" function="AIN0" group="AIN"/>
+                <signal pad-key="pe3" index="11" function="AIN0" group="AIN"/>
+                <signal pad-key="pf0" index="16" function="AIN0" group="AIN"/>
+                <signal pad-key="pf1" index="17" function="AIN0" group="AIN"/>
+                <signal pad-key="pf2" index="18" function="AIN0" group="AIN"/>
+                <signal pad-key="pf3" index="19" function="AIN0" group="AIN"/>
+                <signal pad-key="pf4" index="20" function="AIN0" group="AIN"/>
+                <signal pad-key="pf5" index="21" function="AIN0" group="AIN"/>
             </signals>
         </peripheral>
         <peripheral key="bod" name="BOD" module-key="bor_lvd_ctrl_v1">
@@ -112,40 +112,40 @@
         <peripheral key="ccl" name="CCL" module-key="cla_ccl_v1">
             <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"/>
-                <signal pad-id="pa2" index="2" function="CCL_IN" group="LUT0_IN"/>
-                <signal pad-id="pa6" index="0" function="CCL_ALT" group="LUT0_OUT" field="PORTMUX.CCLROUTEA.LUT0"/>
-                <signal pad-id="pa3" index="0" function="CCL" group="LUT0_OUT" field="PORTMUX.CCLROUTEA.LUT0"/>
-                <signal pad-id="pc0" index="0" function="CCL_IN" group="LUT1_IN"/>
-                <signal pad-id="pc1" index="1" function="CCL_IN" group="LUT1_IN"/>
-                <signal pad-id="pc2" index="2" function="CCL_IN" group="LUT1_IN"/>
-                <signal pad-id="pc6" index="0" function="CCL_ALT" group="LUT1_OUT" field="PORTMUX.CCLROUTEA.LUT1"/>
-                <signal pad-id="pc3" index="0" function="CCL" group="LUT1_OUT" field="PORTMUX.CCLROUTEA.LUT1"/>
-                <signal pad-id="pd0" index="0" function="CCL_IN" group="LUT2_IN"/>
-                <signal pad-id="pd1" index="1" function="CCL_IN" group="LUT2_IN"/>
-                <signal pad-id="pd2" index="2" function="CCL_IN" group="LUT2_IN"/>
-                <signal pad-id="pd6" index="0" function="CCL_ALT" group="LUT2_OUT" field="PORTMUX.CCLROUTEA.LUT2"/>
-                <signal pad-id="pd3" index="0" function="CCL" group="LUT2_OUT" field="PORTMUX.CCLROUTEA.LUT2"/>
-                <signal pad-id="pf0" index="0" function="CCL_IN" group="LUT3_IN"/>
-                <signal pad-id="pf1" index="1" function="CCL_IN" group="LUT3_IN"/>
-                <signal pad-id="pf2" index="2" function="CCL_IN" group="LUT3_IN"/>
-                <signal pad-id="pf3" index="0" function="CCL" group="LUT3_OUT" field="PORTMUX.CCLROUTEA.LUT3"/>
-                <signal pad-id="pb0" index="0" function="CCL_IN" group="LUT4_IN"/>
-                <signal pad-id="pb1" index="1" function="CCL_IN" group="LUT4_IN"/>
-                <signal pad-id="pb2" index="2" function="CCL_IN" group="LUT4_IN"/>
-                <signal pad-id="pb3" index="0" function="CCL" group="LUT4_OUT" field="PORTMUX.CCLROUTEA.LUT4"/>
+                <signal pad-key="pa0" index="0" function="CCL_IN" group="LUT0_IN"/>
+                <signal pad-key="pa1" index="1" function="CCL_IN" group="LUT0_IN"/>
+                <signal pad-key="pa2" index="2" function="CCL_IN" group="LUT0_IN"/>
+                <signal pad-key="pa6" index="0" function="CCL_ALT" group="LUT0_OUT" field="PORTMUX.CCLROUTEA.LUT0"/>
+                <signal pad-key="pa3" index="0" function="CCL" group="LUT0_OUT" field="PORTMUX.CCLROUTEA.LUT0"/>
+                <signal pad-key="pc0" index="0" function="CCL_IN" group="LUT1_IN"/>
+                <signal pad-key="pc1" index="1" function="CCL_IN" group="LUT1_IN"/>
+                <signal pad-key="pc2" index="2" function="CCL_IN" group="LUT1_IN"/>
+                <signal pad-key="pc6" index="0" function="CCL_ALT" group="LUT1_OUT" field="PORTMUX.CCLROUTEA.LUT1"/>
+                <signal pad-key="pc3" index="0" function="CCL" group="LUT1_OUT" field="PORTMUX.CCLROUTEA.LUT1"/>
+                <signal pad-key="pd0" index="0" function="CCL_IN" group="LUT2_IN"/>
+                <signal pad-key="pd1" index="1" function="CCL_IN" group="LUT2_IN"/>
+                <signal pad-key="pd2" index="2" function="CCL_IN" group="LUT2_IN"/>
+                <signal pad-key="pd6" index="0" function="CCL_ALT" group="LUT2_OUT" field="PORTMUX.CCLROUTEA.LUT2"/>
+                <signal pad-key="pd3" index="0" function="CCL" group="LUT2_OUT" field="PORTMUX.CCLROUTEA.LUT2"/>
+                <signal pad-key="pf0" index="0" function="CCL_IN" group="LUT3_IN"/>
+                <signal pad-key="pf1" index="1" function="CCL_IN" group="LUT3_IN"/>
+                <signal pad-key="pf2" index="2" function="CCL_IN" group="LUT3_IN"/>
+                <signal pad-key="pf3" index="0" function="CCL" group="LUT3_OUT" field="PORTMUX.CCLROUTEA.LUT3"/>
+                <signal pad-key="pb0" index="0" function="CCL_IN" group="LUT4_IN"/>
+                <signal pad-key="pb1" index="1" function="CCL_IN" group="LUT4_IN"/>
+                <signal pad-key="pb2" index="2" function="CCL_IN" group="LUT4_IN"/>
+                <signal pad-key="pb3" index="0" function="CCL" group="LUT4_OUT" field="PORTMUX.CCLROUTEA.LUT4"/>
             </signals>
         </peripheral>
         <peripheral key="clkctrl" name="CLKCTRL" module-key="chip_clkctrl">
             <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"/>
-                <signal pad-id="pf0" function="CLKCTRL" group="XTAL32K1"/>
-                <signal pad-id="pf1" function="CLKCTRL" group="XTAL32K2"/>
-                <signal pad-id="pa0" function="CLKCTRL" group="XTALHF1"/>
-                <signal pad-id="pa1" function="CLKCTRL" group="XTALHF2"/>
+                <signal pad-key="pa7" function="CLKCTRL" group="CLKOUT"/>
+                <signal pad-key="pa0" function="CLKCTRL" group="EXTCLK"/>
+                <signal pad-key="pf0" function="CLKCTRL" group="XTAL32K1"/>
+                <signal pad-key="pf1" function="CLKCTRL" group="XTAL32K2"/>
+                <signal pad-key="pa0" function="CLKCTRL" group="XTALHF1"/>
+                <signal pad-key="pa1" function="CLKCTRL" group="XTALHF2"/>
             </signals>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="cpu_avr_xt_v1">
@@ -160,21 +160,21 @@
         <peripheral key="dac0" name="DAC0" module-key="dac_nbit_ctrl_v5">
             <register-group-instance register-group-key="dac" address-space-key="data" offset="0x6A0"/>
             <signals>
-                <signal pad-id="pd6" index="0" function="DAC0" group="OUT"/>
+                <signal pad-key="pd6" index="0" function="DAC0" group="OUT"/>
             </signals>
         </peripheral>
         <peripheral key="evsys" name="EVSYS" module-key="chip_evsys">
             <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"/>
-                <signal pad-id="pb2" index="1" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTB"/>
-                <signal pad-id="pc7" index="2" function="EVSYS_ALT" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTC"/>
-                <signal pad-id="pc2" index="2" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTC"/>
-                <signal pad-id="pd7" index="3" function="EVSYS_ALT" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTD"/>
-                <signal pad-id="pd2" index="3" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTD"/>
-                <signal pad-id="pe2" index="4" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTE"/>
-                <signal pad-id="pf2" index="5" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTF"/>
+                <signal pad-key="pa7" index="0" function="EVSYS_ALT" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTA"/>
+                <signal pad-key="pa2" index="0" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTA"/>
+                <signal pad-key="pb2" index="1" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTB"/>
+                <signal pad-key="pc7" index="2" function="EVSYS_ALT" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTC"/>
+                <signal pad-key="pc2" index="2" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTC"/>
+                <signal pad-key="pd7" index="3" function="EVSYS_ALT" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTD"/>
+                <signal pad-key="pd2" index="3" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTD"/>
+                <signal pad-key="pe2" index="4" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTE"/>
+                <signal pad-key="pf2" index="5" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTF"/>
             </signals>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="chip_fuse">
@@ -195,86 +195,86 @@
         <peripheral key="opamp" name="OPAMP" module-key="amp_opamp_ctrl_avr_v1">
             <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"/>
-                <signal pad-id="pd2" function="OPAMP" group="OP0OUT"/>
-                <signal pad-id="pd7" function="OPAMP" group="OP1INN"/>
-                <signal pad-id="pd4" function="OPAMP" group="OP1INP"/>
-                <signal pad-id="pd5" function="OPAMP" group="OP1OUT"/>
-                <signal pad-id="pe3" function="OPAMP" group="OP2INN"/>
-                <signal pad-id="pe1" function="OPAMP" group="OP2INP"/>
-                <signal pad-id="pe2" function="OPAMP" group="OP2OUT"/>
+                <signal pad-key="pd3" function="OPAMP" group="OP0INN"/>
+                <signal pad-key="pd1" function="OPAMP" group="OP0INP"/>
+                <signal pad-key="pd2" function="OPAMP" group="OP0OUT"/>
+                <signal pad-key="pd7" function="OPAMP" group="OP1INN"/>
+                <signal pad-key="pd4" function="OPAMP" group="OP1INP"/>
+                <signal pad-key="pd5" function="OPAMP" group="OP1OUT"/>
+                <signal pad-key="pe3" function="OPAMP" group="OP2INN"/>
+                <signal pad-key="pe1" function="OPAMP" group="OP2INP"/>
+                <signal pad-key="pe2" function="OPAMP" group="OP2OUT"/>
             </signals>
         </peripheral>
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pa2" index="2" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa3" index="3" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa4" index="4" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa5" index="5" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa6" index="6" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa7" index="7" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa0" index="0" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa1" index="1" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa2" index="2" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa3" index="3" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa4" index="4" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa5" index="5" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa6" index="6" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa7" index="7" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pb2" index="2" function="IOPORT" group="PIN"/>
-                <signal pad-id="pb3" index="3" function="IOPORT" group="PIN"/>
-                <signal pad-id="pb4" index="4" function="IOPORT" group="PIN"/>
-                <signal pad-id="pb5" index="5" function="IOPORT" group="PIN"/>
+                <signal pad-key="pb0" index="0" function="IOPORT" group="PIN"/>
+                <signal pad-key="pb1" index="1" function="IOPORT" group="PIN"/>
+                <signal pad-key="pb2" index="2" function="IOPORT" group="PIN"/>
+                <signal pad-key="pb3" index="3" function="IOPORT" group="PIN"/>
+                <signal pad-key="pb4" index="4" function="IOPORT" group="PIN"/>
+                <signal pad-key="pb5" index="5" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pc2" index="2" function="IOPORT" group="PIN"/>
-                <signal pad-id="pc3" index="3" function="IOPORT" group="PIN"/>
-                <signal pad-id="pc4" index="4" function="IOPORT" group="PIN"/>
-                <signal pad-id="pc5" index="5" function="IOPORT" group="PIN"/>
-                <signal pad-id="pc6" index="6" function="IOPORT" group="PIN"/>
-                <signal pad-id="pc7" index="7" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc0" index="0" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc1" index="1" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc2" index="2" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc3" index="3" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc4" index="4" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc5" index="5" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc6" index="6" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc7" index="7" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pd2" index="2" function="IOPORT" group="PIN"/>
-                <signal pad-id="pd3" index="3" function="IOPORT" group="PIN"/>
-                <signal pad-id="pd4" index="4" function="IOPORT" group="PIN"/>
-                <signal pad-id="pd5" index="5" function="IOPORT" group="PIN"/>
-                <signal pad-id="pd6" index="6" function="IOPORT" group="PIN"/>
-                <signal pad-id="pd7" index="7" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd0" index="0" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd1" index="1" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd2" index="2" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd3" index="3" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd4" index="4" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd5" index="5" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd6" index="6" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd7" index="7" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="porte" name="PORTE" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pe2" index="2" function="IOPORT" group="PIN"/>
-                <signal pad-id="pe3" index="3" function="IOPORT" group="PIN"/>
+                <signal pad-key="pe0" index="0" function="IOPORT" group="PIN"/>
+                <signal pad-key="pe1" index="1" function="IOPORT" group="PIN"/>
+                <signal pad-key="pe2" index="2" function="IOPORT" group="PIN"/>
+                <signal pad-key="pe3" index="3" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="portf" name="PORTF" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pf2" index="2" function="IOPORT" group="PIN"/>
-                <signal pad-id="pf3" index="3" function="IOPORT" group="PIN"/>
-                <signal pad-id="pf4" index="4" function="IOPORT" group="PIN"/>
-                <signal pad-id="pf5" index="5" function="IOPORT" group="PIN"/>
-                <signal pad-id="pf6" index="6" function="IOPORT" group="PIN"/>
+                <signal pad-key="pf0" index="0" function="IOPORT" group="PIN"/>
+                <signal pad-key="pf1" index="1" function="IOPORT" group="PIN"/>
+                <signal pad-key="pf2" index="2" function="IOPORT" group="PIN"/>
+                <signal pad-key="pf3" index="3" function="IOPORT" group="PIN"/>
+                <signal pad-key="pf4" index="4" function="IOPORT" group="PIN"/>
+                <signal pad-key="pf5" index="5" function="IOPORT" group="PIN"/>
+                <signal pad-key="pf6" index="6" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="portmux" name="PORTMUX" module-key="chip_portmux">
@@ -283,7 +283,7 @@
         <peripheral key="rstctrl" name="RSTCTRL" module-key="rst_integration_v8">
             <register-group-instance register-group-key="rstctrl" address-space-key="data" offset="0x40"/>
             <signals>
-                <signal pad-id="pf6" function="OTHER" group="RESET"/>
+                <signal pad-key="pf6" function="OTHER" group="RESET"/>
             </signals>
         </peripheral>
         <peripheral key="rtc" name="RTC" module-key="tmr_16b_rtc_v1">
@@ -298,29 +298,29 @@
         <peripheral key="spi0" name="SPI0" module-key="spi_8bit_v2">
             <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"/>
-                <signal pad-id="pe0" function="SPI0_ALT" group="MOSI" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <signal pad-id="pa4" function="SPI0" group="MOSI" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <signal pad-id="pe2" function="SPI0_ALT" group="SCK" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <signal pad-id="pa6" function="SPI0" group="SCK" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <signal pad-id="pe3" function="SPI0_ALT" group="SS" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <signal pad-id="pa7" function="SPI0" group="SS" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pe1" function="SPI0_ALT" group="MISO" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pa5" function="SPI0" group="MISO" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pe0" function="SPI0_ALT" group="MOSI" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pa4" function="SPI0" group="MOSI" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pe2" function="SPI0_ALT" group="SCK" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pa6" function="SPI0" group="SCK" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pe3" function="SPI0_ALT" group="SS" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pa7" function="SPI0" group="SS" field="PORTMUX.SPIROUTEA.SPI0"/>
             </signals>
         </peripheral>
         <peripheral key="spi1" name="SPI1" module-key="spi_8bit_v2">
             <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"/>
-                <signal pad-id="pc1" function="SPI1" group="MISO" field="PORTMUX.SPIROUTEA.SPI1"/>
-                <signal pad-id="pc4" function="SPI1_ALT2" group="MOSI" field="PORTMUX.SPIROUTEA.SPI1"/>
-                <signal pad-id="pb4" function="SPI1_ALT" group="MOSI" field="PORTMUX.SPIROUTEA.SPI1"/>
-                <signal pad-id="pc0" function="SPI1" group="MOSI" field="PORTMUX.SPIROUTEA.SPI1"/>
-                <signal pad-id="pc6" function="SPI1_ALT2" group="SCK" field="PORTMUX.SPIROUTEA.SPI1"/>
-                <signal pad-id="pc2" function="SPI1" group="SCK" field="PORTMUX.SPIROUTEA.SPI1"/>
-                <signal pad-id="pc7" function="SPI1_ALT2" group="SS" field="PORTMUX.SPIROUTEA.SPI1"/>
-                <signal pad-id="pc3" function="SPI1" group="SS" field="PORTMUX.SPIROUTEA.SPI1"/>
+                <signal pad-key="pc5" function="SPI1_ALT2" group="MISO" field="PORTMUX.SPIROUTEA.SPI1"/>
+                <signal pad-key="pb5" function="SPI1_ALT" group="MISO" field="PORTMUX.SPIROUTEA.SPI1"/>
+                <signal pad-key="pc1" function="SPI1" group="MISO" field="PORTMUX.SPIROUTEA.SPI1"/>
+                <signal pad-key="pc4" function="SPI1_ALT2" group="MOSI" field="PORTMUX.SPIROUTEA.SPI1"/>
+                <signal pad-key="pb4" function="SPI1_ALT" group="MOSI" field="PORTMUX.SPIROUTEA.SPI1"/>
+                <signal pad-key="pc0" function="SPI1" group="MOSI" field="PORTMUX.SPIROUTEA.SPI1"/>
+                <signal pad-key="pc6" function="SPI1_ALT2" group="SCK" field="PORTMUX.SPIROUTEA.SPI1"/>
+                <signal pad-key="pc2" function="SPI1" group="SCK" field="PORTMUX.SPIROUTEA.SPI1"/>
+                <signal pad-key="pc7" function="SPI1_ALT2" group="SS" field="PORTMUX.SPIROUTEA.SPI1"/>
+                <signal pad-key="pc3" function="SPI1" group="SS" field="PORTMUX.SPIROUTEA.SPI1"/>
             </signals>
         </peripheral>
         <peripheral key="syscfg" name="SYSCFG" module-key="chip_syscfg">
@@ -329,174 +329,174 @@
         <peripheral key="tca0" name="TCA0" module-key="tmr_16b_pwm_v1">
             <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"/>
-                <signal pad-id="pd0" index="0" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pc0" index="0" function="TCA0_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pb0" index="0" function="TCA0_ALT" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pa0" index="0" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pf1" index="1" function="TCA0_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pe1" index="1" function="TCA0_ALT4" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pd1" index="1" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pc1" index="1" function="TCA0_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pb1" index="1" function="TCA0_ALT" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pa1" index="1" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pf2" index="2" function="TCA0_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pe2" index="2" function="TCA0_ALT4" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pd2" index="2" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pc2" index="2" function="TCA0_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pb2" index="2" function="TCA0_ALT" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pa2" index="2" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pf3" index="3" function="TCA0_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pe3" index="3" function="TCA0_ALT4" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pd3" index="3" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pc3" index="3" function="TCA0_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pb3" index="3" function="TCA0_ALT" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pa3" index="3" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pf4" index="4" function="TCA0_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pd4" index="4" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pc4" index="4" function="TCA0_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pb4" index="4" function="TCA0_ALT" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pa4" index="4" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pf5" index="5" function="TCA0_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pd5" index="5" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pc5" index="5" function="TCA0_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pb5" index="5" function="TCA0_ALT" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pa5" index="5" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pf0" index="0" function="TCA0_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pe0" index="0" function="TCA0_ALT4" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pd0" index="0" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pc0" index="0" function="TCA0_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pb0" index="0" function="TCA0_ALT" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pa0" index="0" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pf1" index="1" function="TCA0_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pe1" index="1" function="TCA0_ALT4" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pd1" index="1" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pc1" index="1" function="TCA0_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pb1" index="1" function="TCA0_ALT" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pa1" index="1" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pf2" index="2" function="TCA0_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pe2" index="2" function="TCA0_ALT4" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pd2" index="2" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pc2" index="2" function="TCA0_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pb2" index="2" function="TCA0_ALT" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pa2" index="2" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pf3" index="3" function="TCA0_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pe3" index="3" function="TCA0_ALT4" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pd3" index="3" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pc3" index="3" function="TCA0_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pb3" index="3" function="TCA0_ALT" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pa3" index="3" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pf4" index="4" function="TCA0_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pd4" index="4" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pc4" index="4" function="TCA0_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pb4" index="4" function="TCA0_ALT" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pa4" index="4" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pf5" index="5" function="TCA0_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pd5" index="5" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pc5" index="5" function="TCA0_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pb5" index="5" function="TCA0_ALT" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pa5" index="5" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
             </signals>
         </peripheral>
         <peripheral key="tca1" name="TCA1" module-key="tmr_16b_pwm_v1">
             <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"/>
-                <signal pad-id="pc5" index="1" function="TCA1_ALT" group="WO" field="PORTMUX.TCAROUTEA.TCA1"/>
-                <signal pad-id="pb1" index="1" function="TCA1" group="WO" field="PORTMUX.TCAROUTEA.TCA1"/>
-                <signal pad-id="pc6" index="2" function="TCA1_ALT" group="WO" field="PORTMUX.TCAROUTEA.TCA1"/>
-                <signal pad-id="pb2" index="2" function="TCA1" group="WO" field="PORTMUX.TCAROUTEA.TCA1"/>
-                <signal pad-id="pb3" index="3" function="TCA1" group="WO" field="PORTMUX.TCAROUTEA.TCA1"/>
-                <signal pad-id="pb4" index="4" function="TCA1" group="WO" field="PORTMUX.TCAROUTEA.TCA1"/>
-                <signal pad-id="pb5" index="5" function="TCA1" group="WO" field="PORTMUX.TCAROUTEA.TCA1"/>
+                <signal pad-key="pc4" index="0" function="TCA1_ALT" group="WO" field="PORTMUX.TCAROUTEA.TCA1"/>
+                <signal pad-key="pb0" index="0" function="TCA1" group="WO" field="PORTMUX.TCAROUTEA.TCA1"/>
+                <signal pad-key="pc5" index="1" function="TCA1_ALT" group="WO" field="PORTMUX.TCAROUTEA.TCA1"/>
+                <signal pad-key="pb1" index="1" function="TCA1" group="WO" field="PORTMUX.TCAROUTEA.TCA1"/>
+                <signal pad-key="pc6" index="2" function="TCA1_ALT" group="WO" field="PORTMUX.TCAROUTEA.TCA1"/>
+                <signal pad-key="pb2" index="2" function="TCA1" group="WO" field="PORTMUX.TCAROUTEA.TCA1"/>
+                <signal pad-key="pb3" index="3" function="TCA1" group="WO" field="PORTMUX.TCAROUTEA.TCA1"/>
+                <signal pad-key="pb4" index="4" function="TCA1" group="WO" field="PORTMUX.TCAROUTEA.TCA1"/>
+                <signal pad-key="pb5" index="5" function="TCA1" group="WO" field="PORTMUX.TCAROUTEA.TCA1"/>
             </signals>
         </peripheral>
         <peripheral key="tcb0" name="TCB0" module-key="tmr_16b_capture_v1">
             <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"/>
+                <signal pad-key="pf4" index="0" function="TCB0_ALT" group="WO" field="PORTMUX.TCBROUTEA.TCB0"/>
+                <signal pad-key="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 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"/>
+                <signal pad-key="pf5" index="0" function="TCB1_ALT" group="WO" field="PORTMUX.TCBROUTEA.TCB1"/>
+                <signal pad-key="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 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"/>
+                <signal pad-key="pb4" index="0" function="TCB2_ALT" group="WO" field="PORTMUX.TCBROUTEA.TCB2"/>
+                <signal pad-key="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 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"/>
+                <signal pad-key="pc1" index="0" function="TCB3_ALT" group="WO" field="PORTMUX.TCBROUTEA.TCB3"/>
+                <signal pad-key="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 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"/>
-                <signal pad-id="pa4" function="TCD0" group="WOA" field="PORTMUX.TCDROUTEA.TCD0"/>
-                <signal pad-id="pf1" index="1" function="TCD0_ALT2" group="WOB" field="PORTMUX.TCDROUTEA.TCD0"/>
-                <signal pad-id="pb5" index="1" function="TCD0_ALT" group="WOB" field="PORTMUX.TCDROUTEA.TCD0"/>
-                <signal pad-id="pa5" index="1" function="TCD0" group="WOB" field="PORTMUX.TCDROUTEA.TCD0"/>
-                <signal pad-id="pf2" index="2" function="TCD0_ALT2" group="WOC" field="PORTMUX.TCDROUTEA.TCD0"/>
-                <signal pad-id="pa6" index="2" function="TCD0" group="WOC" field="PORTMUX.TCDROUTEA.TCD0"/>
-                <signal pad-id="pf3" index="3" function="TCD0_ALT2" group="WOD" field="PORTMUX.TCDROUTEA.TCD0"/>
-                <signal pad-id="pa7" index="3" function="TCD0" group="WOD" field="PORTMUX.TCDROUTEA.TCD0"/>
+                <signal pad-key="pf0" function="TCD0_ALT2" group="WOA" field="PORTMUX.TCDROUTEA.TCD0"/>
+                <signal pad-key="pb4" function="TCD0_ALT" group="WOA" field="PORTMUX.TCDROUTEA.TCD0"/>
+                <signal pad-key="pa4" function="TCD0" group="WOA" field="PORTMUX.TCDROUTEA.TCD0"/>
+                <signal pad-key="pf1" index="1" function="TCD0_ALT2" group="WOB" field="PORTMUX.TCDROUTEA.TCD0"/>
+                <signal pad-key="pb5" index="1" function="TCD0_ALT" group="WOB" field="PORTMUX.TCDROUTEA.TCD0"/>
+                <signal pad-key="pa5" index="1" function="TCD0" group="WOB" field="PORTMUX.TCDROUTEA.TCD0"/>
+                <signal pad-key="pf2" index="2" function="TCD0_ALT2" group="WOC" field="PORTMUX.TCDROUTEA.TCD0"/>
+                <signal pad-key="pa6" index="2" function="TCD0" group="WOC" field="PORTMUX.TCDROUTEA.TCD0"/>
+                <signal pad-key="pf3" index="3" function="TCD0_ALT2" group="WOD" field="PORTMUX.TCDROUTEA.TCD0"/>
+                <signal pad-key="pa7" index="3" function="TCD0" group="WOD" field="PORTMUX.TCDROUTEA.TCD0"/>
             </signals>
         </peripheral>
         <peripheral key="twi0" name="TWI0" module-key="i2c_8bit_v2">
             <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"/>
-                <signal pad-id="pa3" function="I2C0" group="SCL" field="PORTMUX.TWIROUTEA.TWI0"/>
-                <signal pad-id="pc6" function="I2C0_ALT2" group="SDA" field="PORTMUX.TWIROUTEA.TWI0"/>
-                <signal pad-id="pc2" function="I2C0_ALT" group="SDA" field="PORTMUX.TWIROUTEA.TWI0"/>
-                <signal pad-id="pa2" function="I2C0" group="SDA" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pc7" function="I2C0_ALT2" group="SCL" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pc3" function="I2C0_ALT" group="SCL" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pa3" function="I2C0" group="SCL" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pc6" function="I2C0_ALT2" group="SDA" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pc2" function="I2C0_ALT" group="SDA" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pa2" function="I2C0" group="SDA" field="PORTMUX.TWIROUTEA.TWI0"/>
             </signals>
         </peripheral>
         <peripheral key="twi1" name="TWI1" module-key="i2c_8bit_v2">
             <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"/>
-                <signal pad-id="pb2" function="I2C1_ALT" group="SDA" field="PORTMUX.TWIROUTEA.TWI1"/>
-                <signal pad-id="pf2" function="I2C1" group="SDA" field="PORTMUX.TWIROUTEA.TWI1"/>
+                <signal pad-key="pb3" function="I2C1_ALT" group="SCL" field="PORTMUX.TWIROUTEA.TWI1"/>
+                <signal pad-key="pf3" function="I2C1" group="SCL" field="PORTMUX.TWIROUTEA.TWI1"/>
+                <signal pad-key="pb2" function="I2C1_ALT" group="SDA" field="PORTMUX.TWIROUTEA.TWI1"/>
+                <signal pad-key="pf2" function="I2C1" group="SDA" field="PORTMUX.TWIROUTEA.TWI1"/>
             </signals>
         </peripheral>
         <peripheral key="usart0" name="USART0" module-key="uart_autobd_v4">
             <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"/>
-                <signal pad-id="pa4" function="USART0_ALT" group="TXD" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pa0" function="USART0" group="TXD" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pa6" function="USART0_ALT" group="XCK" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pa2" function="USART0" group="XCK" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pa7" function="USART0_ALT" group="XDIR" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pa3" function="USART0" group="XDIR" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa5" function="USART0_ALT" group="RXD" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa1" function="USART0" group="RXD" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa4" function="USART0_ALT" group="TXD" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa0" function="USART0" group="TXD" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa6" function="USART0_ALT" group="XCK" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa2" function="USART0" group="XCK" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa7" function="USART0_ALT" group="XDIR" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa3" function="USART0" group="XDIR" field="PORTMUX.USARTROUTEA.USART0"/>
             </signals>
         </peripheral>
         <peripheral key="usart1" name="USART1" module-key="uart_autobd_v4">
             <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"/>
-                <signal pad-id="pc4" function="USART1_ALT" group="TXD" field="PORTMUX.USARTROUTEA.USART1"/>
-                <signal pad-id="pc0" function="USART1" group="TXD" field="PORTMUX.USARTROUTEA.USART1"/>
-                <signal pad-id="pc6" function="USART1_ALT" group="XCK" field="PORTMUX.USARTROUTEA.USART1"/>
-                <signal pad-id="pc2" function="USART1" group="XCK" field="PORTMUX.USARTROUTEA.USART1"/>
-                <signal pad-id="pc7" function="USART1_ALT" group="XDIR" field="PORTMUX.USARTROUTEA.USART1"/>
-                <signal pad-id="pc3" function="USART1" group="XDIR" field="PORTMUX.USARTROUTEA.USART1"/>
+                <signal pad-key="pc5" function="USART1_ALT" group="RXD" field="PORTMUX.USARTROUTEA.USART1"/>
+                <signal pad-key="pc1" function="USART1" group="RXD" field="PORTMUX.USARTROUTEA.USART1"/>
+                <signal pad-key="pc4" function="USART1_ALT" group="TXD" field="PORTMUX.USARTROUTEA.USART1"/>
+                <signal pad-key="pc0" function="USART1" group="TXD" field="PORTMUX.USARTROUTEA.USART1"/>
+                <signal pad-key="pc6" function="USART1_ALT" group="XCK" field="PORTMUX.USARTROUTEA.USART1"/>
+                <signal pad-key="pc2" function="USART1" group="XCK" field="PORTMUX.USARTROUTEA.USART1"/>
+                <signal pad-key="pc7" function="USART1_ALT" group="XDIR" field="PORTMUX.USARTROUTEA.USART1"/>
+                <signal pad-key="pc3" function="USART1" group="XDIR" field="PORTMUX.USARTROUTEA.USART1"/>
             </signals>
         </peripheral>
         <peripheral key="usart2" name="USART2" module-key="uart_autobd_v4">
             <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"/>
-                <signal pad-id="pf4" function="USART2_ALT" group="TXD" field="PORTMUX.USARTROUTEA.USART2"/>
-                <signal pad-id="pf0" function="USART2" group="TXD" field="PORTMUX.USARTROUTEA.USART2"/>
-                <signal pad-id="pf2" function="USART2" group="XCK" field="PORTMUX.USARTROUTEA.USART2"/>
-                <signal pad-id="pf3" function="USART2" group="XDIR" field="PORTMUX.USARTROUTEA.USART2"/>
+                <signal pad-key="pf5" function="USART2_ALT" group="RXD" field="PORTMUX.USARTROUTEA.USART2"/>
+                <signal pad-key="pf1" function="USART2" group="RXD" field="PORTMUX.USARTROUTEA.USART2"/>
+                <signal pad-key="pf4" function="USART2_ALT" group="TXD" field="PORTMUX.USARTROUTEA.USART2"/>
+                <signal pad-key="pf0" function="USART2" group="TXD" field="PORTMUX.USARTROUTEA.USART2"/>
+                <signal pad-key="pf2" function="USART2" group="XCK" field="PORTMUX.USARTROUTEA.USART2"/>
+                <signal pad-key="pf3" function="USART2" group="XDIR" field="PORTMUX.USARTROUTEA.USART2"/>
             </signals>
         </peripheral>
         <peripheral key="usart3" name="USART3" module-key="uart_autobd_v4">
             <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"/>
-                <signal pad-id="pb4" function="USART3_ALT" group="TXD" field="PORTMUX.USARTROUTEA.USART3"/>
-                <signal pad-id="pb0" function="USART3" group="TXD" field="PORTMUX.USARTROUTEA.USART3"/>
-                <signal pad-id="pb2" function="USART3" group="XCK" field="PORTMUX.USARTROUTEA.USART3"/>
-                <signal pad-id="pb3" function="USART3" group="XDIR" field="PORTMUX.USARTROUTEA.USART3"/>
+                <signal pad-key="pb5" function="USART3_ALT" group="RXD" field="PORTMUX.USARTROUTEA.USART3"/>
+                <signal pad-key="pb1" function="USART3" group="RXD" field="PORTMUX.USARTROUTEA.USART3"/>
+                <signal pad-key="pb4" function="USART3_ALT" group="TXD" field="PORTMUX.USARTROUTEA.USART3"/>
+                <signal pad-key="pb0" function="USART3" group="TXD" field="PORTMUX.USARTROUTEA.USART3"/>
+                <signal pad-key="pb2" function="USART3" group="XCK" field="PORTMUX.USARTROUTEA.USART3"/>
+                <signal pad-key="pb3" function="USART3" group="XDIR" field="PORTMUX.USARTROUTEA.USART3"/>
             </signals>
         </peripheral>
         <peripheral key="usart4" name="USART4" module-key="uart_autobd_v4">
             <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"/>
-                <signal pad-id="pe2" function="USART4" group="XCK" field="PORTMUX.USARTROUTEB.USART4"/>
-                <signal pad-id="pe3" function="USART4" group="XDIR" field="PORTMUX.USARTROUTEB.USART4"/>
+                <signal pad-key="pe1" function="USART4" group="RXD" field="PORTMUX.USARTROUTEB.USART4"/>
+                <signal pad-key="pe0" function="USART4" group="TXD" field="PORTMUX.USARTROUTEB.USART4"/>
+                <signal pad-key="pe2" function="USART4" group="XCK" field="PORTMUX.USARTROUTEB.USART4"/>
+                <signal pad-key="pe3" function="USART4" group="XDIR" field="PORTMUX.USARTROUTEB.USART4"/>
             </signals>
         </peripheral>
         <peripheral key="userrow" name="USERROW" module-key="chip_userrow">
@@ -529,24 +529,24 @@
         <peripheral key="zcd0" name="ZCD0" module-key="cmp_zxover_ctrl_v3">
             <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"/>
-                <signal pad-id="pa7" function="ZCD0" group="OUT" field="PORTMUX.ZCDROUTEA.ZCD0"/>
+                <signal pad-key="pd1" function="ZCD0" group="IN"/>
+                <signal pad-key="pc7" function="ZCD0_ALT" group="OUT" field="PORTMUX.ZCDROUTEA.ZCD0"/>
+                <signal pad-key="pa7" function="ZCD0" group="OUT" field="PORTMUX.ZCDROUTEA.ZCD0"/>
             </signals>
         </peripheral>
         <peripheral key="zcd1" name="ZCD1" module-key="cmp_zxover_ctrl_v3">
             <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"/>
-                <signal pad-id="pa7" function="ZCD1" group="OUT" field="PORTMUX.ZCDROUTEA.ZCD1"/>
+                <signal pad-key="pe3" function="ZCD1" group="IN"/>
+                <signal pad-key="pc7" function="ZCD1_ALT" group="OUT" field="PORTMUX.ZCDROUTEA.ZCD1"/>
+                <signal pad-key="pa7" function="ZCD1" group="OUT" field="PORTMUX.ZCDROUTEA.ZCD1"/>
             </signals>
         </peripheral>
         <peripheral key="zcd2" name="ZCD2" module-key="cmp_zxover_ctrl_v3">
             <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"/>
+                <signal pad-key="pc7" function="ZCD2_ALT" group="OUT" field="PORTMUX.ZCDROUTEA.ZCD2"/>
+                <signal pad-key="pa7" function="ZCD2" group="OUT" field="PORTMUX.ZCDROUTEA.ZCD2"/>
             </signals>
         </peripheral>
     </peripherals>
@@ -2018,59 +2018,109 @@
             </register-group>
         </module>
     </modules>
+    <pads>
+        <pad key="pa5" name="PA5"/>
+        <pad key="pa6" name="PA6"/>
+        <pad key="pa7" name="PA7"/>
+        <pad key="pb0" name="PB0"/>
+        <pad key="pb1" name="PB1"/>
+        <pad key="pb2" name="PB2"/>
+        <pad key="pb3" name="PB3"/>
+        <pad key="pb4" name="PB4"/>
+        <pad key="pb5" name="PB5"/>
+        <pad key="pc0" name="PC0"/>
+        <pad key="pc1" name="PC1"/>
+        <pad key="pc2" name="PC2"/>
+        <pad key="pc3" name="PC3"/>
+        <pad key="vddio2" name="VDDIO2"/>
+        <pad key="gnd0" name="GND0"/>
+        <pad key="pc4" name="PC4"/>
+        <pad key="pc5" name="PC5"/>
+        <pad key="pc6" name="PC6"/>
+        <pad key="pc7" name="PC7"/>
+        <pad key="pd0" name="PD0"/>
+        <pad key="pd1" name="PD1"/>
+        <pad key="pd2" name="PD2"/>
+        <pad key="pd3" name="PD3"/>
+        <pad key="pd4" name="PD4"/>
+        <pad key="pd5" name="PD5"/>
+        <pad key="pd6" name="PD6"/>
+        <pad key="pd7" name="PD7"/>
+        <pad key="avdd" name="AVDD"/>
+        <pad key="agnd" name="AGND"/>
+        <pad key="pe0" name="PE0"/>
+        <pad key="pe1" name="PE1"/>
+        <pad key="pe2" name="PE2"/>
+        <pad key="pe3" name="PE3"/>
+        <pad key="pf0" name="PF0"/>
+        <pad key="pf1" name="PF1"/>
+        <pad key="pf2" name="PF2"/>
+        <pad key="pf3" name="PF3"/>
+        <pad key="pf4" name="PF4"/>
+        <pad key="pf5" name="PF5"/>
+        <pad key="pf6" name="PF6"/>
+        <pad key="updi" name="UPDI"/>
+        <pad key="vdd" name="VDD"/>
+        <pad key="gnd2" name="GND2"/>
+        <pad key="pa0" name="PA0"/>
+        <pad key="pa1" name="PA1"/>
+        <pad key="pa2" name="PA2"/>
+        <pad key="pa3" name="PA3"/>
+        <pad key="pa4" name="PA4"/>
+    </pads>
     <pinouts>
         <pinout key="qfn48" name="QFN48" type="qfn">
-            <pin position="1" pad="PA5"/>
-            <pin position="2" pad="PA6"/>
-            <pin position="3" pad="PA7"/>
-            <pin position="4" pad="PB0"/>
-            <pin position="5" pad="PB1"/>
-            <pin position="6" pad="PB2"/>
-            <pin position="7" pad="PB3"/>
-            <pin position="8" pad="PB4"/>
-            <pin position="9" pad="PB5"/>
-            <pin position="10" pad="PC0"/>
-            <pin position="11" pad="PC1"/>
-            <pin position="12" pad="PC2"/>
-            <pin position="13" pad="PC3"/>
-            <pin position="14" pad="VDDIO2"/>
-            <pin position="15" pad="GND0"/>
-            <pin position="16" pad="PC4"/>
-            <pin position="17" pad="PC5"/>
-            <pin position="18" pad="PC6"/>
-            <pin position="19" pad="PC7"/>
-            <pin position="20" pad="PD0"/>
-            <pin position="21" pad="PD1"/>
-            <pin position="22" pad="PD2"/>
-            <pin position="23" pad="PD3"/>
-            <pin position="24" pad="PD4"/>
-            <pin position="25" pad="PD5"/>
-            <pin position="26" pad="PD6"/>
-            <pin position="27" pad="PD7"/>
-            <pin position="28" pad="AVDD"/>
-            <pin position="29" pad="AGND"/>
-            <pin position="30" pad="PE0"/>
-            <pin position="31" pad="PE1"/>
-            <pin position="32" pad="PE2"/>
-            <pin position="33" pad="PE3"/>
-            <pin position="34" pad="PF0"/>
-            <pin position="35" pad="PF1"/>
-            <pin position="36" pad="PF2"/>
-            <pin position="37" pad="PF3"/>
-            <pin position="38" pad="PF4"/>
-            <pin position="39" pad="PF5"/>
-            <pin position="40" pad="PF6"/>
-            <pin position="41" pad="UPDI"/>
-            <pin position="42" pad="VDD"/>
-            <pin position="43" pad="GND2"/>
-            <pin position="44" pad="PA0"/>
-            <pin position="45" pad="PA1"/>
-            <pin position="46" pad="PA2"/>
-            <pin position="47" pad="PA3"/>
-            <pin position="48" pad="PA4"/>
+            <pin position="1" pad-key="pa5"/>
+            <pin position="2" pad-key="pa6"/>
+            <pin position="3" pad-key="pa7"/>
+            <pin position="4" pad-key="pb0"/>
+            <pin position="5" pad-key="pb1"/>
+            <pin position="6" pad-key="pb2"/>
+            <pin position="7" pad-key="pb3"/>
+            <pin position="8" pad-key="pb4"/>
+            <pin position="9" pad-key="pb5"/>
+            <pin position="10" pad-key="pc0"/>
+            <pin position="11" pad-key="pc1"/>
+            <pin position="12" pad-key="pc2"/>
+            <pin position="13" pad-key="pc3"/>
+            <pin position="14" pad-key="vddio2"/>
+            <pin position="15" pad-key="gnd0"/>
+            <pin position="16" pad-key="pc4"/>
+            <pin position="17" pad-key="pc5"/>
+            <pin position="18" pad-key="pc6"/>
+            <pin position="19" pad-key="pc7"/>
+            <pin position="20" pad-key="pd0"/>
+            <pin position="21" pad-key="pd1"/>
+            <pin position="22" pad-key="pd2"/>
+            <pin position="23" pad-key="pd3"/>
+            <pin position="24" pad-key="pd4"/>
+            <pin position="25" pad-key="pd5"/>
+            <pin position="26" pad-key="pd6"/>
+            <pin position="27" pad-key="pd7"/>
+            <pin position="28" pad-key="avdd"/>
+            <pin position="29" pad-key="agnd"/>
+            <pin position="30" pad-key="pe0"/>
+            <pin position="31" pad-key="pe1"/>
+            <pin position="32" pad-key="pe2"/>
+            <pin position="33" pad-key="pe3"/>
+            <pin position="34" pad-key="pf0"/>
+            <pin position="35" pad-key="pf1"/>
+            <pin position="36" pad-key="pf2"/>
+            <pin position="37" pad-key="pf3"/>
+            <pin position="38" pad-key="pf4"/>
+            <pin position="39" pad-key="pf5"/>
+            <pin position="40" pad-key="pf6"/>
+            <pin position="41" pad-key="updi"/>
+            <pin position="42" pad-key="vdd"/>
+            <pin position="43" pad-key="gnd2"/>
+            <pin position="44" pad-key="pa0"/>
+            <pin position="45" pad-key="pa1"/>
+            <pin position="46" pad-key="pa2"/>
+            <pin position="47" pad-key="pa3"/>
+            <pin position="48" pad-key="pa4"/>
         </pinout>
     </pinouts>
     <variants>
-        <variant name="AVR32DB48" pinout-key="qfn48" package="QFN48"/>
+        <variant key="avr32db48" name="AVR32DB48" pinout-key="qfn48"/>
     </variants>
 </device>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR32DD14.xml b/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR32DD14.xml
index 5a3dd6ed..0cf75135 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR32DD14.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR32DD14.xml
@@ -45,22 +45,22 @@
         <peripheral key="ac0" name="AC0" module-key="cmp_control_v8">
             <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"/>
-                <signal pad-id="pd6" index="3" function="AC0" group="P"/>
-                <signal pad-id="pc3" index="4" function="AC0" group="P"/>
+                <signal pad-key="pd7" index="2" function="AC0" group="N"/>
+                <signal pad-key="pc2" index="3" function="AC0" group="N"/>
+                <signal pad-key="pd6" index="3" function="AC0" group="P"/>
+                <signal pad-key="pc3" index="4" function="AC0" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="adc0" name="ADC0" module-key="adc_12b_diff_ctrl_v1">
             <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"/>
-                <signal pad-id="pd6" index="6" function="AIN0" group="AIN"/>
-                <signal pad-id="pd7" index="7" function="AIN0" group="AIN"/>
-                <signal pad-id="pc1" index="29" function="AIN0" group="AIN"/>
-                <signal pad-id="pc2" index="30" function="AIN0" group="AIN"/>
-                <signal pad-id="pc3" index="31" function="AIN0" group="AIN"/>
+                <signal pad-key="pd4" index="4" function="AIN0" group="AIN"/>
+                <signal pad-key="pd5" index="5" function="AIN0" group="AIN"/>
+                <signal pad-key="pd6" index="6" function="AIN0" group="AIN"/>
+                <signal pad-key="pd7" index="7" function="AIN0" group="AIN"/>
+                <signal pad-key="pc1" index="29" function="AIN0" group="AIN"/>
+                <signal pad-key="pc2" index="30" function="AIN0" group="AIN"/>
+                <signal pad-key="pc3" index="31" function="AIN0" group="AIN"/>
             </signals>
         </peripheral>
         <peripheral key="bod" name="BOD" module-key="bor_lvd_ctrl_v1">
@@ -69,26 +69,26 @@
         <peripheral key="ccl" name="CCL" module-key="cla_ccl_v1">
             <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"/>
-                <signal pad-id="pa0" index="0" function="CCL_ALT1" group="LUT0_IN" field="PORTMUX.CCLROUTEA.LUT0"/>
-                <signal pad-id="pa1" index="1" function="CCL_ALT1" group="LUT0_IN" field="PORTMUX.CCLROUTEA.LUT0"/>
-                <signal pad-id="pc1" index="1" function="CCL" group="LUT1_IN" field="PORTMUX.CCLROUTEA.LUT1"/>
-                <signal pad-id="pc2" index="2" function="CCL" group="LUT1_IN" field="PORTMUX.CCLROUTEA.LUT1"/>
-                <signal pad-id="pc3" index="0" function="CCL" group="LUT1_OUT" field="PORTMUX.CCLROUTEA.LUT1"/>
-                <signal pad-id="pc1" index="1" function="CCL_ALT1" group="LUT1_IN" field="PORTMUX.CCLROUTEA.LUT1"/>
-                <signal pad-id="pc2" index="2" function="CCL_ALT1" group="LUT1_IN" field="PORTMUX.CCLROUTEA.LUT1"/>
-                <signal pad-id="pd6" index="0" function="CCL_ALT1" group="LUT2_OUT" field="PORTMUX.CCLROUTEA.LUT2"/>
+                <signal pad-key="pa0" index="0" function="CCL" group="LUT0_IN" field="PORTMUX.CCLROUTEA.LUT0"/>
+                <signal pad-key="pa1" index="1" function="CCL" group="LUT0_IN" field="PORTMUX.CCLROUTEA.LUT0"/>
+                <signal pad-key="pa0" index="0" function="CCL_ALT1" group="LUT0_IN" field="PORTMUX.CCLROUTEA.LUT0"/>
+                <signal pad-key="pa1" index="1" function="CCL_ALT1" group="LUT0_IN" field="PORTMUX.CCLROUTEA.LUT0"/>
+                <signal pad-key="pc1" index="1" function="CCL" group="LUT1_IN" field="PORTMUX.CCLROUTEA.LUT1"/>
+                <signal pad-key="pc2" index="2" function="CCL" group="LUT1_IN" field="PORTMUX.CCLROUTEA.LUT1"/>
+                <signal pad-key="pc3" index="0" function="CCL" group="LUT1_OUT" field="PORTMUX.CCLROUTEA.LUT1"/>
+                <signal pad-key="pc1" index="1" function="CCL_ALT1" group="LUT1_IN" field="PORTMUX.CCLROUTEA.LUT1"/>
+                <signal pad-key="pc2" index="2" function="CCL_ALT1" group="LUT1_IN" field="PORTMUX.CCLROUTEA.LUT1"/>
+                <signal pad-key="pd6" index="0" function="CCL_ALT1" group="LUT2_OUT" field="PORTMUX.CCLROUTEA.LUT2"/>
             </signals>
         </peripheral>
         <peripheral key="clkctrl" name="CLKCTRL" module-key="avrdd_clkctrl">
             <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"/>
-                <signal pad-id="pa1" function="CLKCTRL" group="XTALHF2"/>
-                <signal pad-id="pa0" function="CLKCTRL_ALT1" group="XTAL32K1"/>
-                <signal pad-id="pa1" function="CLKCTRL_ALT1" group="XTAL32K2"/>
+                <signal pad-key="pa0" function="CLKCTRL" group="EXTCLK"/>
+                <signal pad-key="pa0" function="CLKCTRL" group="XTALHF1"/>
+                <signal pad-key="pa1" function="CLKCTRL" group="XTALHF2"/>
+                <signal pad-key="pa0" function="CLKCTRL_ALT1" group="XTAL32K1"/>
+                <signal pad-key="pa1" function="CLKCTRL_ALT1" group="XTAL32K2"/>
             </signals>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="cpu_avr_xt_v1">
@@ -103,15 +103,15 @@
         <peripheral key="dac0" name="DAC0" module-key="dac_nbit_ctrl_v5">
             <register-group-instance register-group-key="dac" address-space-key="data" offset="0x6A0"/>
             <signals>
-                <signal pad-id="pd6" index="0" function="DAC0" group="OUT"/>
+                <signal pad-key="pd6" index="0" function="DAC0" group="OUT"/>
             </signals>
         </peripheral>
         <peripheral key="evsys" name="EVSYS" module-key="avrdd_evsys">
             <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"/>
-                <signal pad-id="pf7" index="5" function="EVSYS_ALT1" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTF"/>
+                <signal pad-key="pc2" index="2" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTC"/>
+                <signal pad-key="pd7" index="3" function="EVSYS_ALT1" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTD"/>
+                <signal pad-key="pf7" index="5" function="EVSYS_ALT1" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTF"/>
             </signals>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="avrdd_fuse">
@@ -132,32 +132,32 @@
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
             <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"/>
+                <signal pad-key="pa0" index="0" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa1" index="1" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pc3" index="3" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc1" index="1" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc2" index="2" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc3" index="3" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pd6" index="6" function="IOPORT" group="PIN"/>
-                <signal pad-id="pd7" index="7" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd4" index="4" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd5" index="5" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd6" index="6" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd7" index="7" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="portf" name="PORTF" module-key="gpio_port">
             <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"/>
+                <signal pad-key="pf6" index="6" function="IOPORT" group="PIN"/>
+                <signal pad-key="pf7" index="7" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="portmux" name="PORTMUX" module-key="avrdd_portmux">
@@ -166,7 +166,7 @@
         <peripheral key="rstctrl" name="RSTCTRL" module-key="rst_integration_v8">
             <register-group-instance register-group-key="rstctrl" address-space-key="data" offset="0x40"/>
             <signals>
-                <signal pad-id="pf6" function="OTHER" group="RESET"/>
+                <signal pad-key="pf6" function="OTHER" group="RESET"/>
             </signals>
         </peripheral>
         <peripheral key="rtc" name="RTC" module-key="tmr_16b_rtc_v1">
@@ -181,20 +181,20 @@
         <peripheral key="spi0" name="SPI0" module-key="spi_8bit_v2">
             <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"/>
-                <signal pad-id="pc1" function="SPI0_ALT3" group="SS" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <signal pad-id="pd5" function="SPI0_ALT4" group="MISO" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <signal pad-id="pd4" function="SPI0_ALT4" group="MOSI" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <signal pad-id="pd6" function="SPI0_ALT4" group="SCK" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <signal pad-id="pd7" function="SPI0_ALT4" group="SS" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <signal pad-id="pc1" function="SPI0_ALT5" group="MISO" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <signal pad-id="pc2" function="SPI0_ALT5" group="SCK" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <signal pad-id="pc3" function="SPI0_ALT5" group="SS" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <signal pad-id="pc2" function="SPI0_ALT6" group="MISO" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <signal pad-id="pc1" function="SPI0_ALT6" group="MOSI" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <signal pad-id="pc3" function="SPI0_ALT6" group="SCK" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <signal pad-id="pf7" function="SPI0_ALT6" group="SS" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pa1" function="SPI0_ALT3" group="MISO" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pa0" function="SPI0_ALT3" group="MOSI" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pc1" function="SPI0_ALT3" group="SS" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pd5" function="SPI0_ALT4" group="MISO" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pd4" function="SPI0_ALT4" group="MOSI" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pd6" function="SPI0_ALT4" group="SCK" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pd7" function="SPI0_ALT4" group="SS" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pc1" function="SPI0_ALT5" group="MISO" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pc2" function="SPI0_ALT5" group="SCK" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pc3" function="SPI0_ALT5" group="SS" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pc2" function="SPI0_ALT6" group="MISO" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pc1" function="SPI0_ALT6" group="MOSI" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pc3" function="SPI0_ALT6" group="SCK" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pf7" function="SPI0_ALT6" group="SS" field="PORTMUX.SPIROUTEA.SPI0"/>
             </signals>
         </peripheral>
         <peripheral key="syscfg" name="SYSCFG" module-key="avrdd_syscfg">
@@ -203,13 +203,13 @@
         <peripheral key="tca0" name="TCA0" module-key="tmr_16b_pwm_v1">
             <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"/>
-                <signal pad-id="pc1" index="1" function="TCA0_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pc2" index="2" function="TCA0_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pc3" index="3" function="TCA0_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pd4" index="4" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pd5" index="5" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pa0" index="0" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pa1" index="1" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pc1" index="1" function="TCA0_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pc2" index="2" function="TCA0_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pc3" index="3" function="TCA0_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pd4" index="4" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pd5" index="5" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
             </signals>
         </peripheral>
         <peripheral key="tcb0" name="TCB0" module-key="tmr_16b_capture_v1">
@@ -224,45 +224,45 @@
         <peripheral key="tcd0" name="TCD0" module-key="tmr_12b_psc_v1">
             <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"/>
+                <signal pad-key="pd4" index="2" function="TCD0_ALT4" group="WOC" field="PORTMUX.TCDROUTEA.TCD0"/>
+                <signal pad-key="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 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"/>
-                <signal pad-id="pc3" function="I2C0_ALT2" group="SCL" field="PORTMUX.TWIROUTEA.TWI0"/>
-                <signal pad-id="pc2" function="I2C0_ALT2" group="SDA" field="PORTMUX.TWIROUTEA.TWI0"/>
-                <signal pad-id="pa1" function="I2C0_ALT3" group="SCL" field="PORTMUX.TWIROUTEA.TWI0"/>
-                <signal pad-id="pc3" function="I2C0_ALT3" group="SCL_DUAL" field="PORTMUX.TWIROUTEA.TWI0"/>
-                <signal pad-id="pa0" function="I2C0_ALT3" group="SDA" field="PORTMUX.TWIROUTEA.TWI0"/>
-                <signal pad-id="pc2" function="I2C0_ALT3" group="SDA_DUAL" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pc3" function="I2C0" group="SCL_DUAL" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pc2" function="I2C0" group="SDA_DUAL" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pc3" function="I2C0_ALT2" group="SCL" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pc2" function="I2C0_ALT2" group="SDA" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pa1" function="I2C0_ALT3" group="SCL" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pc3" function="I2C0_ALT3" group="SCL_DUAL" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pa0" function="I2C0_ALT3" group="SDA" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pc2" function="I2C0_ALT3" group="SDA_DUAL" field="PORTMUX.TWIROUTEA.TWI0"/>
             </signals>
         </peripheral>
         <peripheral key="usart0" name="USART0" module-key="uart_autobd_v4">
             <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"/>
-                <signal pad-id="pd5" function="USART0_ALT3" group="RXD" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pd4" function="USART0_ALT3" group="TXD" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pd6" function="USART0_ALT3" group="XCK" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pd7" function="USART0_ALT3" group="XDIR" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pc2" function="USART0_ALT4" group="RXD" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pc1" function="USART0_ALT4" group="TXD" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pc3" function="USART0_ALT4" group="XCK" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa1" function="USART0" group="RXD" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa0" function="USART0" group="TXD" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pd5" function="USART0_ALT3" group="RXD" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pd4" function="USART0_ALT3" group="TXD" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pd6" function="USART0_ALT3" group="XCK" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pd7" function="USART0_ALT3" group="XDIR" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pc2" function="USART0_ALT4" group="RXD" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pc1" function="USART0_ALT4" group="TXD" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pc3" function="USART0_ALT4" group="XCK" field="PORTMUX.USARTROUTEA.USART0"/>
             </signals>
         </peripheral>
         <peripheral key="usart1" name="USART1" module-key="uart_autobd_v4">
             <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"/>
-                <signal pad-id="pc3" function="USART1" group="XDIR" field="PORTMUX.USARTROUTEA.USART1"/>
-                <signal pad-id="pd7" function="USART1_ALT2" group="RXD" field="PORTMUX.USARTROUTEA.USART1"/>
-                <signal pad-id="pd6" function="USART1_ALT2" group="TXD" field="PORTMUX.USARTROUTEA.USART1"/>
+                <signal pad-key="pc1" function="USART1" group="RXD" field="PORTMUX.USARTROUTEA.USART1"/>
+                <signal pad-key="pc2" function="USART1" group="XCK" field="PORTMUX.USARTROUTEA.USART1"/>
+                <signal pad-key="pc3" function="USART1" group="XDIR" field="PORTMUX.USARTROUTEA.USART1"/>
+                <signal pad-key="pd7" function="USART1_ALT2" group="RXD" field="PORTMUX.USARTROUTEA.USART1"/>
+                <signal pad-key="pd6" function="USART1_ALT2" group="TXD" field="PORTMUX.USARTROUTEA.USART1"/>
             </signals>
         </peripheral>
         <peripheral key="userrow" name="USERROW" module-key="avrdd_userrow">
@@ -289,7 +289,7 @@
         <peripheral key="zcd3" name="ZCD3" module-key="cmp_zxover_ctrl_v3">
             <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-key="pc2" function="ZCD3" group="IN" field="PORTMUX.ZCDROUTEA.ZCD3"/>
             </signals>
         </peripheral>
     </peripherals>
@@ -1542,25 +1542,41 @@
             </register-group>
         </module>
     </modules>
+    <pads>
+        <pad key="agnd" name="AGND"/>
+        <pad key="pf6" name="PF6"/>
+        <pad key="pf7" name="PF7"/>
+        <pad key="pa0" name="PA0"/>
+        <pad key="pa1" name="PA1"/>
+        <pad key="pc1" name="PC1"/>
+        <pad key="pc2" name="PC2"/>
+        <pad key="pc3" name="PC3"/>
+        <pad key="vddio2" name="VDDIO2"/>
+        <pad key="pd4" name="PD4"/>
+        <pad key="pd5" name="PD5"/>
+        <pad key="pd6" name="PD6"/>
+        <pad key="pd7" name="PD7"/>
+        <pad key="avdd" name="AVDD"/>
+    </pads>
     <pinouts>
         <pinout key="soic14mvio" name="SOIC14MVIO" type="soic">
-            <pin position="1" pad="AGND"/>
-            <pin position="2" pad="PF6"/>
-            <pin position="3" pad="PF7"/>
-            <pin position="4" pad="PA0"/>
-            <pin position="5" pad="PA1"/>
-            <pin position="6" pad="PC1"/>
-            <pin position="7" pad="PC2"/>
-            <pin position="8" pad="PC3"/>
-            <pin position="9" pad="VDDIO2"/>
-            <pin position="10" pad="PD4"/>
-            <pin position="11" pad="PD5"/>
-            <pin position="12" pad="PD6"/>
-            <pin position="13" pad="PD7"/>
-            <pin position="14" pad="AVDD"/>
+            <pin position="1" pad-key="agnd"/>
+            <pin position="2" pad-key="pf6"/>
+            <pin position="3" pad-key="pf7"/>
+            <pin position="4" pad-key="pa0"/>
+            <pin position="5" pad-key="pa1"/>
+            <pin position="6" pad-key="pc1"/>
+            <pin position="7" pad-key="pc2"/>
+            <pin position="8" pad-key="pc3"/>
+            <pin position="9" pad-key="vddio2"/>
+            <pin position="10" pad-key="pd4"/>
+            <pin position="11" pad-key="pd5"/>
+            <pin position="12" pad-key="pd6"/>
+            <pin position="13" pad-key="pd7"/>
+            <pin position="14" pad-key="avdd"/>
         </pinout>
     </pinouts>
     <variants>
-        <variant name="AVR32DD14" pinout-key="soic14mvio" package="SOIC14"/>
+        <variant key="avr32dd14" name="AVR32DD14" pinout-key="soic14mvio"/>
     </variants>
 </device>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR32DD20.xml b/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR32DD20.xml
index 34a57364..9f0257b1 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR32DD20.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR32DD20.xml
@@ -45,29 +45,29 @@
         <peripheral key="ac0" name="AC0" module-key="cmp_control_v8">
             <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"/>
-                <signal pad-id="pd6" index="3" function="AC0" group="P"/>
-                <signal pad-id="pc3" index="4" function="AC0" group="P"/>
-                <signal pad-id="pa7" index="0" function="AC0" group="OUT" field="PORTMUX.ACROUTEA.AC0"/>
+                <signal pad-key="pd7" index="2" function="AC0" group="N"/>
+                <signal pad-key="pc2" index="3" function="AC0" group="N"/>
+                <signal pad-key="pd6" index="3" function="AC0" group="P"/>
+                <signal pad-key="pc3" index="4" function="AC0" group="P"/>
+                <signal pad-key="pa7" index="0" function="AC0" group="OUT" field="PORTMUX.ACROUTEA.AC0"/>
             </signals>
         </peripheral>
         <peripheral key="adc0" name="ADC0" module-key="adc_12b_diff_ctrl_v1">
             <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"/>
-                <signal pad-id="pd6" index="6" function="AIN0" group="AIN"/>
-                <signal pad-id="pd7" index="7" function="AIN0" group="AIN"/>
-                <signal pad-id="pa2" index="22" function="AIN0" group="AIN"/>
-                <signal pad-id="pa3" index="23" function="AIN0" group="AIN"/>
-                <signal pad-id="pa4" index="24" function="AIN0" group="AIN"/>
-                <signal pad-id="pa5" index="25" function="AIN0" group="AIN"/>
-                <signal pad-id="pa6" index="26" function="AIN0" group="AIN"/>
-                <signal pad-id="pa7" index="27" function="AIN0" group="AIN"/>
-                <signal pad-id="pc1" index="29" function="AIN0" group="AIN"/>
-                <signal pad-id="pc2" index="30" function="AIN0" group="AIN"/>
-                <signal pad-id="pc3" index="31" function="AIN0" group="AIN"/>
+                <signal pad-key="pd4" index="4" function="AIN0" group="AIN"/>
+                <signal pad-key="pd5" index="5" function="AIN0" group="AIN"/>
+                <signal pad-key="pd6" index="6" function="AIN0" group="AIN"/>
+                <signal pad-key="pd7" index="7" function="AIN0" group="AIN"/>
+                <signal pad-key="pa2" index="22" function="AIN0" group="AIN"/>
+                <signal pad-key="pa3" index="23" function="AIN0" group="AIN"/>
+                <signal pad-key="pa4" index="24" function="AIN0" group="AIN"/>
+                <signal pad-key="pa5" index="25" function="AIN0" group="AIN"/>
+                <signal pad-key="pa6" index="26" function="AIN0" group="AIN"/>
+                <signal pad-key="pa7" index="27" function="AIN0" group="AIN"/>
+                <signal pad-key="pc1" index="29" function="AIN0" group="AIN"/>
+                <signal pad-key="pc2" index="30" function="AIN0" group="AIN"/>
+                <signal pad-key="pc3" index="31" function="AIN0" group="AIN"/>
             </signals>
         </peripheral>
         <peripheral key="bod" name="BOD" module-key="bor_lvd_ctrl_v1">
@@ -76,31 +76,31 @@
         <peripheral key="ccl" name="CCL" module-key="cla_ccl_v1">
             <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"/>
-                <signal pad-id="pa2" index="2" function="CCL" group="LUT0_IN" field="PORTMUX.CCLROUTEA.LUT0"/>
-                <signal pad-id="pa3" index="0" function="CCL" group="LUT0_OUT" field="PORTMUX.CCLROUTEA.LUT0"/>
-                <signal pad-id="pa0" index="0" function="CCL_ALT1" group="LUT0_IN" field="PORTMUX.CCLROUTEA.LUT0"/>
-                <signal pad-id="pa1" index="1" function="CCL_ALT1" group="LUT0_IN" field="PORTMUX.CCLROUTEA.LUT0"/>
-                <signal pad-id="pa2" index="2" function="CCL_ALT1" group="LUT0_IN" field="PORTMUX.CCLROUTEA.LUT0"/>
-                <signal pad-id="pa6" index="0" function="CCL_ALT1" group="LUT0_OUT" field="PORTMUX.CCLROUTEA.LUT0"/>
-                <signal pad-id="pc1" index="1" function="CCL" group="LUT1_IN" field="PORTMUX.CCLROUTEA.LUT1"/>
-                <signal pad-id="pc2" index="2" function="CCL" group="LUT1_IN" field="PORTMUX.CCLROUTEA.LUT1"/>
-                <signal pad-id="pc3" index="0" function="CCL" group="LUT1_OUT" field="PORTMUX.CCLROUTEA.LUT1"/>
-                <signal pad-id="pc1" index="1" function="CCL_ALT1" group="LUT1_IN" field="PORTMUX.CCLROUTEA.LUT1"/>
-                <signal pad-id="pc2" index="2" function="CCL_ALT1" group="LUT1_IN" field="PORTMUX.CCLROUTEA.LUT1"/>
-                <signal pad-id="pd6" index="0" function="CCL_ALT1" group="LUT2_OUT" field="PORTMUX.CCLROUTEA.LUT2"/>
+                <signal pad-key="pa0" index="0" function="CCL" group="LUT0_IN" field="PORTMUX.CCLROUTEA.LUT0"/>
+                <signal pad-key="pa1" index="1" function="CCL" group="LUT0_IN" field="PORTMUX.CCLROUTEA.LUT0"/>
+                <signal pad-key="pa2" index="2" function="CCL" group="LUT0_IN" field="PORTMUX.CCLROUTEA.LUT0"/>
+                <signal pad-key="pa3" index="0" function="CCL" group="LUT0_OUT" field="PORTMUX.CCLROUTEA.LUT0"/>
+                <signal pad-key="pa0" index="0" function="CCL_ALT1" group="LUT0_IN" field="PORTMUX.CCLROUTEA.LUT0"/>
+                <signal pad-key="pa1" index="1" function="CCL_ALT1" group="LUT0_IN" field="PORTMUX.CCLROUTEA.LUT0"/>
+                <signal pad-key="pa2" index="2" function="CCL_ALT1" group="LUT0_IN" field="PORTMUX.CCLROUTEA.LUT0"/>
+                <signal pad-key="pa6" index="0" function="CCL_ALT1" group="LUT0_OUT" field="PORTMUX.CCLROUTEA.LUT0"/>
+                <signal pad-key="pc1" index="1" function="CCL" group="LUT1_IN" field="PORTMUX.CCLROUTEA.LUT1"/>
+                <signal pad-key="pc2" index="2" function="CCL" group="LUT1_IN" field="PORTMUX.CCLROUTEA.LUT1"/>
+                <signal pad-key="pc3" index="0" function="CCL" group="LUT1_OUT" field="PORTMUX.CCLROUTEA.LUT1"/>
+                <signal pad-key="pc1" index="1" function="CCL_ALT1" group="LUT1_IN" field="PORTMUX.CCLROUTEA.LUT1"/>
+                <signal pad-key="pc2" index="2" function="CCL_ALT1" group="LUT1_IN" field="PORTMUX.CCLROUTEA.LUT1"/>
+                <signal pad-key="pd6" index="0" function="CCL_ALT1" group="LUT2_OUT" field="PORTMUX.CCLROUTEA.LUT2"/>
             </signals>
         </peripheral>
         <peripheral key="clkctrl" name="CLKCTRL" module-key="avrdd_clkctrl">
             <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"/>
-                <signal pad-id="pa0" function="CLKCTRL" group="XTALHF1"/>
-                <signal pad-id="pa1" function="CLKCTRL" group="XTALHF2"/>
-                <signal pad-id="pa0" function="CLKCTRL_ALT1" group="XTAL32K1"/>
-                <signal pad-id="pa1" function="CLKCTRL_ALT1" group="XTAL32K2"/>
+                <signal pad-key="pa7" function="CLKCTRL" group="CLKOUT"/>
+                <signal pad-key="pa0" function="CLKCTRL" group="EXTCLK"/>
+                <signal pad-key="pa0" function="CLKCTRL" group="XTALHF1"/>
+                <signal pad-key="pa1" function="CLKCTRL" group="XTALHF2"/>
+                <signal pad-key="pa0" function="CLKCTRL_ALT1" group="XTAL32K1"/>
+                <signal pad-key="pa1" function="CLKCTRL_ALT1" group="XTAL32K2"/>
             </signals>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="cpu_avr_xt_v1">
@@ -115,17 +115,17 @@
         <peripheral key="dac0" name="DAC0" module-key="dac_nbit_ctrl_v5">
             <register-group-instance register-group-key="dac" address-space-key="data" offset="0x6A0"/>
             <signals>
-                <signal pad-id="pd6" index="0" function="DAC0" group="OUT"/>
+                <signal pad-key="pd6" index="0" function="DAC0" group="OUT"/>
             </signals>
         </peripheral>
         <peripheral key="evsys" name="EVSYS" module-key="avrdd_evsys">
             <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"/>
-                <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"/>
-                <signal pad-id="pf7" index="5" function="EVSYS_ALT1" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTF"/>
+                <signal pad-key="pa2" index="0" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTA"/>
+                <signal pad-key="pa7" index="0" function="EVSYS_ALT1" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTA"/>
+                <signal pad-key="pc2" index="2" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTC"/>
+                <signal pad-key="pd7" index="3" function="EVSYS_ALT1" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTD"/>
+                <signal pad-key="pf7" index="5" function="EVSYS_ALT1" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTF"/>
             </signals>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="avrdd_fuse">
@@ -146,38 +146,38 @@
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pa2" index="2" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa3" index="3" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa4" index="4" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa5" index="5" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa6" index="6" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa7" index="7" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa0" index="0" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa1" index="1" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa2" index="2" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa3" index="3" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa4" index="4" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa5" index="5" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa6" index="6" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa7" index="7" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pc3" index="3" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc1" index="1" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc2" index="2" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc3" index="3" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pd6" index="6" function="IOPORT" group="PIN"/>
-                <signal pad-id="pd7" index="7" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd4" index="4" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd5" index="5" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd6" index="6" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd7" index="7" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="portf" name="PORTF" module-key="gpio_port">
             <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"/>
+                <signal pad-key="pf6" index="6" function="IOPORT" group="PIN"/>
+                <signal pad-key="pf7" index="7" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="portmux" name="PORTMUX" module-key="avrdd_portmux">
@@ -186,7 +186,7 @@
         <peripheral key="rstctrl" name="RSTCTRL" module-key="rst_integration_v8">
             <register-group-instance register-group-key="rstctrl" address-space-key="data" offset="0x40"/>
             <signals>
-                <signal pad-id="pf6" function="OTHER" group="RESET"/>
+                <signal pad-key="pf6" function="OTHER" group="RESET"/>
             </signals>
         </peripheral>
         <peripheral key="rtc" name="RTC" module-key="tmr_16b_rtc_v1">
@@ -201,24 +201,24 @@
         <peripheral key="spi0" name="SPI0" module-key="spi_8bit_v2">
             <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"/>
-                <signal pad-id="pa6" function="SPI0" group="SCK" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <signal pad-id="pa7" function="SPI0" group="SS" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <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"/>
-                <signal pad-id="pc1" function="SPI0_ALT3" group="SS" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <signal pad-id="pd5" function="SPI0_ALT4" group="MISO" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <signal pad-id="pd4" function="SPI0_ALT4" group="MOSI" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <signal pad-id="pd6" function="SPI0_ALT4" group="SCK" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <signal pad-id="pd7" function="SPI0_ALT4" group="SS" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <signal pad-id="pc1" function="SPI0_ALT5" group="MISO" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <signal pad-id="pc2" function="SPI0_ALT5" group="SCK" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <signal pad-id="pc3" function="SPI0_ALT5" group="SS" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <signal pad-id="pc2" function="SPI0_ALT6" group="MISO" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <signal pad-id="pc1" function="SPI0_ALT6" group="MOSI" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <signal pad-id="pc3" function="SPI0_ALT6" group="SCK" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <signal pad-id="pf7" function="SPI0_ALT6" group="SS" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pa5" function="SPI0" group="MISO" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pa4" function="SPI0" group="MOSI" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pa6" function="SPI0" group="SCK" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pa7" function="SPI0" group="SS" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pa1" function="SPI0_ALT3" group="MISO" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pa0" function="SPI0_ALT3" group="MOSI" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pc1" function="SPI0_ALT3" group="SS" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pd5" function="SPI0_ALT4" group="MISO" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pd4" function="SPI0_ALT4" group="MOSI" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pd6" function="SPI0_ALT4" group="SCK" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pd7" function="SPI0_ALT4" group="SS" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pc1" function="SPI0_ALT5" group="MISO" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pc2" function="SPI0_ALT5" group="SCK" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pc3" function="SPI0_ALT5" group="SS" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pc2" function="SPI0_ALT6" group="MISO" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pc1" function="SPI0_ALT6" group="MOSI" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pc3" function="SPI0_ALT6" group="SCK" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pf7" function="SPI0_ALT6" group="SS" field="PORTMUX.SPIROUTEA.SPI0"/>
             </signals>
         </peripheral>
         <peripheral key="syscfg" name="SYSCFG" module-key="avrdd_syscfg">
@@ -227,29 +227,29 @@
         <peripheral key="tca0" name="TCA0" module-key="tmr_16b_pwm_v1">
             <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"/>
-                <signal pad-id="pa2" index="2" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pa3" index="3" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pa4" index="4" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pa5" index="5" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pc1" index="1" function="TCA0_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pc2" index="2" function="TCA0_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pc3" index="3" function="TCA0_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pd4" index="4" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pd5" index="5" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pa0" index="0" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pa1" index="1" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pa2" index="2" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pa3" index="3" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pa4" index="4" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pa5" index="5" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pc1" index="1" function="TCA0_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pc2" index="2" function="TCA0_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pc3" index="3" function="TCA0_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pd4" index="4" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pd5" index="5" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
             </signals>
         </peripheral>
         <peripheral key="tcb0" name="TCB0" module-key="tmr_16b_capture_v1">
             <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-key="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 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-key="pa3" index="0" function="TCB1" group="WO" field="PORTMUX.TCBROUTEA.TCB1"/>
             </signals>
         </peripheral>
         <peripheral key="tcb2" name="TCB2" module-key="tmr_16b_capture_v1">
@@ -258,63 +258,63 @@
         <peripheral key="tcd0" name="TCD0" module-key="tmr_12b_psc_v1">
             <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"/>
-                <signal pad-id="pa6" index="2" function="TCD0" group="WOC" field="PORTMUX.TCDROUTEA.TCD0"/>
-                <signal pad-id="pa7" index="3" function="TCD0" group="WOD" field="PORTMUX.TCDROUTEA.TCD0"/>
-                <signal pad-id="pa4" function="TCD0_ALT4" group="WOA" field="PORTMUX.TCDROUTEA.TCD0"/>
-                <signal pad-id="pa5" index="1" function="TCD0_ALT4" group="WOB" field="PORTMUX.TCDROUTEA.TCD0"/>
-                <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"/>
+                <signal pad-key="pa4" function="TCD0" group="WOA" field="PORTMUX.TCDROUTEA.TCD0"/>
+                <signal pad-key="pa5" index="1" function="TCD0" group="WOB" field="PORTMUX.TCDROUTEA.TCD0"/>
+                <signal pad-key="pa6" index="2" function="TCD0" group="WOC" field="PORTMUX.TCDROUTEA.TCD0"/>
+                <signal pad-key="pa7" index="3" function="TCD0" group="WOD" field="PORTMUX.TCDROUTEA.TCD0"/>
+                <signal pad-key="pa4" function="TCD0_ALT4" group="WOA" field="PORTMUX.TCDROUTEA.TCD0"/>
+                <signal pad-key="pa5" index="1" function="TCD0_ALT4" group="WOB" field="PORTMUX.TCDROUTEA.TCD0"/>
+                <signal pad-key="pd4" index="2" function="TCD0_ALT4" group="WOC" field="PORTMUX.TCDROUTEA.TCD0"/>
+                <signal pad-key="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 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"/>
-                <signal pad-id="pa2" function="I2C0" group="SDA" field="PORTMUX.TWIROUTEA.TWI0"/>
-                <signal pad-id="pc2" function="I2C0" group="SDA_DUAL" field="PORTMUX.TWIROUTEA.TWI0"/>
-                <signal pad-id="pa3" function="I2C0_ALT1" group="SCL" field="PORTMUX.TWIROUTEA.TWI0"/>
-                <signal pad-id="pa2" function="I2C0_ALT1" group="SDA" field="PORTMUX.TWIROUTEA.TWI0"/>
-                <signal pad-id="pc3" function="I2C0_ALT2" group="SCL" field="PORTMUX.TWIROUTEA.TWI0"/>
-                <signal pad-id="pc2" function="I2C0_ALT2" group="SDA" field="PORTMUX.TWIROUTEA.TWI0"/>
-                <signal pad-id="pa1" function="I2C0_ALT3" group="SCL" field="PORTMUX.TWIROUTEA.TWI0"/>
-                <signal pad-id="pc3" function="I2C0_ALT3" group="SCL_DUAL" field="PORTMUX.TWIROUTEA.TWI0"/>
-                <signal pad-id="pa0" function="I2C0_ALT3" group="SDA" field="PORTMUX.TWIROUTEA.TWI0"/>
-                <signal pad-id="pc2" function="I2C0_ALT3" group="SDA_DUAL" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pa3" function="I2C0" group="SCL" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pc3" function="I2C0" group="SCL_DUAL" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pa2" function="I2C0" group="SDA" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pc2" function="I2C0" group="SDA_DUAL" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pa3" function="I2C0_ALT1" group="SCL" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pa2" function="I2C0_ALT1" group="SDA" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pc3" function="I2C0_ALT2" group="SCL" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pc2" function="I2C0_ALT2" group="SDA" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pa1" function="I2C0_ALT3" group="SCL" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pc3" function="I2C0_ALT3" group="SCL_DUAL" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pa0" function="I2C0_ALT3" group="SDA" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pc2" function="I2C0_ALT3" group="SDA_DUAL" field="PORTMUX.TWIROUTEA.TWI0"/>
             </signals>
         </peripheral>
         <peripheral key="usart0" name="USART0" module-key="uart_autobd_v4">
             <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"/>
-                <signal pad-id="pa2" function="USART0" group="XCK" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pa3" function="USART0" group="XDIR" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pa5" function="USART0_ALT1" group="RXD" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pa4" function="USART0_ALT1" group="TXD" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pa6" function="USART0_ALT1" group="XCK" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pa7" function="USART0_ALT1" group="XDIR" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pa3" function="USART0_ALT2" group="RXD" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pa2" function="USART0_ALT2" group="TXD" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pd5" function="USART0_ALT3" group="RXD" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pd4" function="USART0_ALT3" group="TXD" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pd6" function="USART0_ALT3" group="XCK" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pd7" function="USART0_ALT3" group="XDIR" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pc2" function="USART0_ALT4" group="RXD" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pc1" function="USART0_ALT4" group="TXD" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pc3" function="USART0_ALT4" group="XCK" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa1" function="USART0" group="RXD" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa0" function="USART0" group="TXD" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa2" function="USART0" group="XCK" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa3" function="USART0" group="XDIR" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa5" function="USART0_ALT1" group="RXD" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa4" function="USART0_ALT1" group="TXD" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa6" function="USART0_ALT1" group="XCK" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa7" function="USART0_ALT1" group="XDIR" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa3" function="USART0_ALT2" group="RXD" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa2" function="USART0_ALT2" group="TXD" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pd5" function="USART0_ALT3" group="RXD" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pd4" function="USART0_ALT3" group="TXD" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pd6" function="USART0_ALT3" group="XCK" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pd7" function="USART0_ALT3" group="XDIR" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pc2" function="USART0_ALT4" group="RXD" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pc1" function="USART0_ALT4" group="TXD" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pc3" function="USART0_ALT4" group="XCK" field="PORTMUX.USARTROUTEA.USART0"/>
             </signals>
         </peripheral>
         <peripheral key="usart1" name="USART1" module-key="uart_autobd_v4">
             <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"/>
-                <signal pad-id="pc3" function="USART1" group="XDIR" field="PORTMUX.USARTROUTEA.USART1"/>
-                <signal pad-id="pd7" function="USART1_ALT2" group="RXD" field="PORTMUX.USARTROUTEA.USART1"/>
-                <signal pad-id="pd6" function="USART1_ALT2" group="TXD" field="PORTMUX.USARTROUTEA.USART1"/>
+                <signal pad-key="pc1" function="USART1" group="RXD" field="PORTMUX.USARTROUTEA.USART1"/>
+                <signal pad-key="pc2" function="USART1" group="XCK" field="PORTMUX.USARTROUTEA.USART1"/>
+                <signal pad-key="pc3" function="USART1" group="XDIR" field="PORTMUX.USARTROUTEA.USART1"/>
+                <signal pad-key="pd7" function="USART1_ALT2" group="RXD" field="PORTMUX.USARTROUTEA.USART1"/>
+                <signal pad-key="pd6" function="USART1_ALT2" group="TXD" field="PORTMUX.USARTROUTEA.USART1"/>
             </signals>
         </peripheral>
         <peripheral key="userrow" name="USERROW" module-key="avrdd_userrow">
@@ -341,8 +341,8 @@
         <peripheral key="zcd3" name="ZCD3" module-key="cmp_zxover_ctrl_v3">
             <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"/>
+                <signal pad-key="pc2" function="ZCD3" group="IN" field="PORTMUX.ZCDROUTEA.ZCD3"/>
+                <signal pad-key="pa7" function="ZCD3" group="OUT" field="PORTMUX.ZCDROUTEA.ZCD3"/>
             </signals>
         </peripheral>
     </peripherals>
@@ -1595,31 +1595,53 @@
             </register-group>
         </module>
     </modules>
+    <pads>
+        <pad key="pa4" name="PA4"/>
+        <pad key="pa5" name="PA5"/>
+        <pad key="pa6" name="PA6"/>
+        <pad key="pa7" name="PA7"/>
+        <pad key="pc1" name="PC1"/>
+        <pad key="pc2" name="PC2"/>
+        <pad key="pc3" name="PC3"/>
+        <pad key="vddio2" name="VDDIO2"/>
+        <pad key="pd4" name="PD4"/>
+        <pad key="pd5" name="PD5"/>
+        <pad key="pd6" name="PD6"/>
+        <pad key="pd7" name="PD7"/>
+        <pad key="avdd" name="AVDD"/>
+        <pad key="agnd" name="AGND"/>
+        <pad key="pf6" name="PF6"/>
+        <pad key="pf7" name="PF7"/>
+        <pad key="pa0" name="PA0"/>
+        <pad key="pa1" name="PA1"/>
+        <pad key="pa2" name="PA2"/>
+        <pad key="pa3" name="PA3"/>
+    </pads>
     <pinouts>
         <pinout key="qfn20mvio" name="QFN20MVIO" type="qfn">
-            <pin position="1" pad="PA4"/>
-            <pin position="2" pad="PA5"/>
-            <pin position="3" pad="PA6"/>
-            <pin position="4" pad="PA7"/>
-            <pin position="5" pad="PC1"/>
-            <pin position="6" pad="PC2"/>
-            <pin position="7" pad="PC3"/>
-            <pin position="8" pad="VDDIO2"/>
-            <pin position="9" pad="PD4"/>
-            <pin position="10" pad="PD5"/>
-            <pin position="11" pad="PD6"/>
-            <pin position="12" pad="PD7"/>
-            <pin position="13" pad="AVDD"/>
-            <pin position="14" pad="AGND"/>
-            <pin position="15" pad="PF6"/>
-            <pin position="16" pad="PF7"/>
-            <pin position="17" pad="PA0"/>
-            <pin position="18" pad="PA1"/>
-            <pin position="19" pad="PA2"/>
-            <pin position="20" pad="PA3"/>
+            <pin position="1" pad-key="pa4"/>
+            <pin position="2" pad-key="pa5"/>
+            <pin position="3" pad-key="pa6"/>
+            <pin position="4" pad-key="pa7"/>
+            <pin position="5" pad-key="pc1"/>
+            <pin position="6" pad-key="pc2"/>
+            <pin position="7" pad-key="pc3"/>
+            <pin position="8" pad-key="vddio2"/>
+            <pin position="9" pad-key="pd4"/>
+            <pin position="10" pad-key="pd5"/>
+            <pin position="11" pad-key="pd6"/>
+            <pin position="12" pad-key="pd7"/>
+            <pin position="13" pad-key="avdd"/>
+            <pin position="14" pad-key="agnd"/>
+            <pin position="15" pad-key="pf6"/>
+            <pin position="16" pad-key="pf7"/>
+            <pin position="17" pad-key="pa0"/>
+            <pin position="18" pad-key="pa1"/>
+            <pin position="19" pad-key="pa2"/>
+            <pin position="20" pad-key="pa3"/>
         </pinout>
     </pinouts>
     <variants>
-        <variant name="AVR32DD20" pinout-key="qfn20mvio" package="QFN20"/>
+        <variant key="avr32dd20" name="AVR32DD20" pinout-key="qfn20mvio"/>
     </variants>
 </device>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR32DD28.xml b/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR32DD28.xml
index db669db7..e03c0284 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR32DD28.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR32DD28.xml
@@ -45,37 +45,37 @@
         <peripheral key="ac0" name="AC0" module-key="cmp_control_v8">
             <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"/>
-                <signal pad-id="pc2" index="3" function="AC0" group="N"/>
-                <signal pad-id="pd2" index="0" function="AC0" group="P"/>
-                <signal pad-id="pd6" index="3" function="AC0" group="P"/>
-                <signal pad-id="pc3" index="4" function="AC0" group="P"/>
-                <signal pad-id="pa7" index="0" function="AC0" group="OUT" field="PORTMUX.ACROUTEA.AC0"/>
+                <signal pad-key="pd3" index="0" function="AC0" group="N"/>
+                <signal pad-key="pd7" index="2" function="AC0" group="N"/>
+                <signal pad-key="pc2" index="3" function="AC0" group="N"/>
+                <signal pad-key="pd2" index="0" function="AC0" group="P"/>
+                <signal pad-key="pd6" index="3" function="AC0" group="P"/>
+                <signal pad-key="pc3" index="4" function="AC0" group="P"/>
+                <signal pad-key="pa7" index="0" function="AC0" group="OUT" field="PORTMUX.ACROUTEA.AC0"/>
             </signals>
         </peripheral>
         <peripheral key="adc0" name="ADC0" module-key="adc_12b_diff_ctrl_v1">
             <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"/>
-                <signal pad-id="pd3" index="3" function="AIN0" group="AIN"/>
-                <signal pad-id="pd4" index="4" function="AIN0" group="AIN"/>
-                <signal pad-id="pd5" index="5" function="AIN0" group="AIN"/>
-                <signal pad-id="pd6" index="6" function="AIN0" group="AIN"/>
-                <signal pad-id="pd7" index="7" function="AIN0" group="AIN"/>
-                <signal pad-id="pf0" index="16" function="AIN0" group="AIN"/>
-                <signal pad-id="pf1" index="17" function="AIN0" group="AIN"/>
-                <signal pad-id="pa2" index="22" function="AIN0" group="AIN"/>
-                <signal pad-id="pa3" index="23" function="AIN0" group="AIN"/>
-                <signal pad-id="pa4" index="24" function="AIN0" group="AIN"/>
-                <signal pad-id="pa5" index="25" function="AIN0" group="AIN"/>
-                <signal pad-id="pa6" index="26" function="AIN0" group="AIN"/>
-                <signal pad-id="pa7" index="27" function="AIN0" group="AIN"/>
-                <signal pad-id="pc0" index="28" function="AIN0" group="AIN"/>
-                <signal pad-id="pc1" index="29" function="AIN0" group="AIN"/>
-                <signal pad-id="pc2" index="30" function="AIN0" group="AIN"/>
-                <signal pad-id="pc3" index="31" function="AIN0" group="AIN"/>
+                <signal pad-key="pd1" index="1" function="AIN0" group="AIN"/>
+                <signal pad-key="pd2" index="2" function="AIN0" group="AIN"/>
+                <signal pad-key="pd3" index="3" function="AIN0" group="AIN"/>
+                <signal pad-key="pd4" index="4" function="AIN0" group="AIN"/>
+                <signal pad-key="pd5" index="5" function="AIN0" group="AIN"/>
+                <signal pad-key="pd6" index="6" function="AIN0" group="AIN"/>
+                <signal pad-key="pd7" index="7" function="AIN0" group="AIN"/>
+                <signal pad-key="pf0" index="16" function="AIN0" group="AIN"/>
+                <signal pad-key="pf1" index="17" function="AIN0" group="AIN"/>
+                <signal pad-key="pa2" index="22" function="AIN0" group="AIN"/>
+                <signal pad-key="pa3" index="23" function="AIN0" group="AIN"/>
+                <signal pad-key="pa4" index="24" function="AIN0" group="AIN"/>
+                <signal pad-key="pa5" index="25" function="AIN0" group="AIN"/>
+                <signal pad-key="pa6" index="26" function="AIN0" group="AIN"/>
+                <signal pad-key="pa7" index="27" function="AIN0" group="AIN"/>
+                <signal pad-key="pc0" index="28" function="AIN0" group="AIN"/>
+                <signal pad-key="pc1" index="29" function="AIN0" group="AIN"/>
+                <signal pad-key="pc2" index="30" function="AIN0" group="AIN"/>
+                <signal pad-key="pc3" index="31" function="AIN0" group="AIN"/>
             </signals>
         </peripheral>
         <peripheral key="bod" name="BOD" module-key="bor_lvd_ctrl_v1">
@@ -84,42 +84,42 @@
         <peripheral key="ccl" name="CCL" module-key="cla_ccl_v1">
             <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"/>
-                <signal pad-id="pa2" index="2" function="CCL" group="LUT0_IN" field="PORTMUX.CCLROUTEA.LUT0"/>
-                <signal pad-id="pa3" index="0" function="CCL" group="LUT0_OUT" field="PORTMUX.CCLROUTEA.LUT0"/>
-                <signal pad-id="pa0" index="0" function="CCL_ALT1" group="LUT0_IN" field="PORTMUX.CCLROUTEA.LUT0"/>
-                <signal pad-id="pa1" index="1" function="CCL_ALT1" group="LUT0_IN" field="PORTMUX.CCLROUTEA.LUT0"/>
-                <signal pad-id="pa2" index="2" function="CCL_ALT1" group="LUT0_IN" field="PORTMUX.CCLROUTEA.LUT0"/>
-                <signal pad-id="pa6" index="0" function="CCL_ALT1" group="LUT0_OUT" field="PORTMUX.CCLROUTEA.LUT0"/>
-                <signal pad-id="pc0" index="0" function="CCL" group="LUT1_IN" field="PORTMUX.CCLROUTEA.LUT1"/>
-                <signal pad-id="pc1" index="1" function="CCL" group="LUT1_IN" field="PORTMUX.CCLROUTEA.LUT1"/>
-                <signal pad-id="pc2" index="2" function="CCL" group="LUT1_IN" field="PORTMUX.CCLROUTEA.LUT1"/>
-                <signal pad-id="pc3" index="0" function="CCL" group="LUT1_OUT" field="PORTMUX.CCLROUTEA.LUT1"/>
-                <signal pad-id="pc0" index="0" function="CCL_ALT1" group="LUT1_IN" field="PORTMUX.CCLROUTEA.LUT1"/>
-                <signal pad-id="pc1" index="1" function="CCL_ALT1" group="LUT1_IN" field="PORTMUX.CCLROUTEA.LUT1"/>
-                <signal pad-id="pc2" index="2" function="CCL_ALT1" group="LUT1_IN" field="PORTMUX.CCLROUTEA.LUT1"/>
-                <signal pad-id="pd1" index="1" function="CCL" group="LUT2_IN" field="PORTMUX.CCLROUTEA.LUT2"/>
-                <signal pad-id="pd2" index="2" function="CCL" group="LUT2_IN" field="PORTMUX.CCLROUTEA.LUT2"/>
-                <signal pad-id="pd3" index="0" function="CCL" group="LUT2_OUT" field="PORTMUX.CCLROUTEA.LUT2"/>
-                <signal pad-id="pd1" index="1" function="CCL_ALT1" group="LUT2_IN" field="PORTMUX.CCLROUTEA.LUT2"/>
-                <signal pad-id="pd2" index="2" function="CCL_ALT1" group="LUT2_IN" field="PORTMUX.CCLROUTEA.LUT2"/>
-                <signal pad-id="pd6" index="0" function="CCL_ALT1" group="LUT2_OUT" field="PORTMUX.CCLROUTEA.LUT2"/>
-                <signal pad-id="pf0" index="0" function="CCL" group="LUT3_IN" field="PORTMUX.CCLROUTEA.LUT3"/>
-                <signal pad-id="pf1" index="1" function="CCL" group="LUT3_IN" field="PORTMUX.CCLROUTEA.LUT3"/>
+                <signal pad-key="pa0" index="0" function="CCL" group="LUT0_IN" field="PORTMUX.CCLROUTEA.LUT0"/>
+                <signal pad-key="pa1" index="1" function="CCL" group="LUT0_IN" field="PORTMUX.CCLROUTEA.LUT0"/>
+                <signal pad-key="pa2" index="2" function="CCL" group="LUT0_IN" field="PORTMUX.CCLROUTEA.LUT0"/>
+                <signal pad-key="pa3" index="0" function="CCL" group="LUT0_OUT" field="PORTMUX.CCLROUTEA.LUT0"/>
+                <signal pad-key="pa0" index="0" function="CCL_ALT1" group="LUT0_IN" field="PORTMUX.CCLROUTEA.LUT0"/>
+                <signal pad-key="pa1" index="1" function="CCL_ALT1" group="LUT0_IN" field="PORTMUX.CCLROUTEA.LUT0"/>
+                <signal pad-key="pa2" index="2" function="CCL_ALT1" group="LUT0_IN" field="PORTMUX.CCLROUTEA.LUT0"/>
+                <signal pad-key="pa6" index="0" function="CCL_ALT1" group="LUT0_OUT" field="PORTMUX.CCLROUTEA.LUT0"/>
+                <signal pad-key="pc0" index="0" function="CCL" group="LUT1_IN" field="PORTMUX.CCLROUTEA.LUT1"/>
+                <signal pad-key="pc1" index="1" function="CCL" group="LUT1_IN" field="PORTMUX.CCLROUTEA.LUT1"/>
+                <signal pad-key="pc2" index="2" function="CCL" group="LUT1_IN" field="PORTMUX.CCLROUTEA.LUT1"/>
+                <signal pad-key="pc3" index="0" function="CCL" group="LUT1_OUT" field="PORTMUX.CCLROUTEA.LUT1"/>
+                <signal pad-key="pc0" index="0" function="CCL_ALT1" group="LUT1_IN" field="PORTMUX.CCLROUTEA.LUT1"/>
+                <signal pad-key="pc1" index="1" function="CCL_ALT1" group="LUT1_IN" field="PORTMUX.CCLROUTEA.LUT1"/>
+                <signal pad-key="pc2" index="2" function="CCL_ALT1" group="LUT1_IN" field="PORTMUX.CCLROUTEA.LUT1"/>
+                <signal pad-key="pd1" index="1" function="CCL" group="LUT2_IN" field="PORTMUX.CCLROUTEA.LUT2"/>
+                <signal pad-key="pd2" index="2" function="CCL" group="LUT2_IN" field="PORTMUX.CCLROUTEA.LUT2"/>
+                <signal pad-key="pd3" index="0" function="CCL" group="LUT2_OUT" field="PORTMUX.CCLROUTEA.LUT2"/>
+                <signal pad-key="pd1" index="1" function="CCL_ALT1" group="LUT2_IN" field="PORTMUX.CCLROUTEA.LUT2"/>
+                <signal pad-key="pd2" index="2" function="CCL_ALT1" group="LUT2_IN" field="PORTMUX.CCLROUTEA.LUT2"/>
+                <signal pad-key="pd6" index="0" function="CCL_ALT1" group="LUT2_OUT" field="PORTMUX.CCLROUTEA.LUT2"/>
+                <signal pad-key="pf0" index="0" function="CCL" group="LUT3_IN" field="PORTMUX.CCLROUTEA.LUT3"/>
+                <signal pad-key="pf1" index="1" function="CCL" group="LUT3_IN" field="PORTMUX.CCLROUTEA.LUT3"/>
             </signals>
         </peripheral>
         <peripheral key="clkctrl" name="CLKCTRL" module-key="avrdd_clkctrl">
             <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"/>
-                <signal pad-id="pf0" function="CLKCTRL" group="XTAL32K1"/>
-                <signal pad-id="pf1" function="CLKCTRL" group="XTAL32K2"/>
-                <signal pad-id="pa0" function="CLKCTRL" group="XTALHF1"/>
-                <signal pad-id="pa1" function="CLKCTRL" group="XTALHF2"/>
-                <signal pad-id="pa0" function="CLKCTRL_ALT1" group="XTAL32K1"/>
-                <signal pad-id="pa1" function="CLKCTRL_ALT1" group="XTAL32K2"/>
+                <signal pad-key="pa7" function="CLKCTRL" group="CLKOUT"/>
+                <signal pad-key="pa0" function="CLKCTRL" group="EXTCLK"/>
+                <signal pad-key="pf0" function="CLKCTRL" group="XTAL32K1"/>
+                <signal pad-key="pf1" function="CLKCTRL" group="XTAL32K2"/>
+                <signal pad-key="pa0" function="CLKCTRL" group="XTALHF1"/>
+                <signal pad-key="pa1" function="CLKCTRL" group="XTALHF2"/>
+                <signal pad-key="pa0" function="CLKCTRL_ALT1" group="XTAL32K1"/>
+                <signal pad-key="pa1" function="CLKCTRL_ALT1" group="XTAL32K2"/>
             </signals>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="cpu_avr_xt_v1">
@@ -134,18 +134,18 @@
         <peripheral key="dac0" name="DAC0" module-key="dac_nbit_ctrl_v5">
             <register-group-instance register-group-key="dac" address-space-key="data" offset="0x6A0"/>
             <signals>
-                <signal pad-id="pd6" index="0" function="DAC0" group="OUT"/>
+                <signal pad-key="pd6" index="0" function="DAC0" group="OUT"/>
             </signals>
         </peripheral>
         <peripheral key="evsys" name="EVSYS" module-key="avrdd_evsys">
             <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"/>
-                <signal pad-id="pc2" index="2" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTC"/>
-                <signal pad-id="pd2" index="3" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTD"/>
-                <signal pad-id="pd7" index="3" function="EVSYS_ALT1" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTD"/>
-                <signal pad-id="pf7" index="5" function="EVSYS_ALT1" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTF"/>
+                <signal pad-key="pa2" index="0" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTA"/>
+                <signal pad-key="pa7" index="0" function="EVSYS_ALT1" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTA"/>
+                <signal pad-key="pc2" index="2" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTC"/>
+                <signal pad-key="pd2" index="3" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTD"/>
+                <signal pad-key="pd7" index="3" function="EVSYS_ALT1" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTD"/>
+                <signal pad-key="pf7" index="5" function="EVSYS_ALT1" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTF"/>
             </signals>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="avrdd_fuse">
@@ -166,44 +166,44 @@
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pa2" index="2" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa3" index="3" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa4" index="4" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa5" index="5" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa6" index="6" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa7" index="7" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa0" index="0" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa1" index="1" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa2" index="2" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa3" index="3" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa4" index="4" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa5" index="5" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa6" index="6" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa7" index="7" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pc2" index="2" function="IOPORT" group="PIN"/>
-                <signal pad-id="pc3" index="3" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc0" index="0" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc1" index="1" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc2" index="2" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc3" index="3" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pd3" index="3" function="IOPORT" group="PIN"/>
-                <signal pad-id="pd4" index="4" function="IOPORT" group="PIN"/>
-                <signal pad-id="pd5" index="5" function="IOPORT" group="PIN"/>
-                <signal pad-id="pd6" index="6" function="IOPORT" group="PIN"/>
-                <signal pad-id="pd7" index="7" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd1" index="1" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd2" index="2" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd3" index="3" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd4" index="4" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd5" index="5" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd6" index="6" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd7" index="7" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="portf" name="PORTF" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pf6" index="6" function="IOPORT" group="PIN"/>
-                <signal pad-id="pf7" index="7" function="IOPORT" group="PIN"/>
+                <signal pad-key="pf0" index="0" function="IOPORT" group="PIN"/>
+                <signal pad-key="pf1" index="1" function="IOPORT" group="PIN"/>
+                <signal pad-key="pf6" index="6" function="IOPORT" group="PIN"/>
+                <signal pad-key="pf7" index="7" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="portmux" name="PORTMUX" module-key="avrdd_portmux">
@@ -212,7 +212,7 @@
         <peripheral key="rstctrl" name="RSTCTRL" module-key="rst_integration_v8">
             <register-group-instance register-group-key="rstctrl" address-space-key="data" offset="0x40"/>
             <signals>
-                <signal pad-id="pf6" function="OTHER" group="RESET"/>
+                <signal pad-key="pf6" function="OTHER" group="RESET"/>
             </signals>
         </peripheral>
         <peripheral key="rtc" name="RTC" module-key="tmr_16b_rtc_v1">
@@ -227,26 +227,26 @@
         <peripheral key="spi0" name="SPI0" module-key="spi_8bit_v2">
             <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"/>
-                <signal pad-id="pa6" function="SPI0" group="SCK" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <signal pad-id="pa7" function="SPI0" group="SS" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <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"/>
-                <signal pad-id="pc0" function="SPI0_ALT3" group="SCK" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <signal pad-id="pc1" function="SPI0_ALT3" group="SS" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <signal pad-id="pd5" function="SPI0_ALT4" group="MISO" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <signal pad-id="pd4" function="SPI0_ALT4" group="MOSI" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <signal pad-id="pd6" function="SPI0_ALT4" group="SCK" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <signal pad-id="pd7" function="SPI0_ALT4" group="SS" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <signal pad-id="pc1" function="SPI0_ALT5" group="MISO" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <signal pad-id="pc0" function="SPI0_ALT5" group="MOSI" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <signal pad-id="pc2" function="SPI0_ALT5" group="SCK" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <signal pad-id="pc3" function="SPI0_ALT5" group="SS" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <signal pad-id="pc2" function="SPI0_ALT6" group="MISO" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <signal pad-id="pc1" function="SPI0_ALT6" group="MOSI" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <signal pad-id="pc3" function="SPI0_ALT6" group="SCK" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <signal pad-id="pf7" function="SPI0_ALT6" group="SS" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pa5" function="SPI0" group="MISO" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pa4" function="SPI0" group="MOSI" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pa6" function="SPI0" group="SCK" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pa7" function="SPI0" group="SS" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pa1" function="SPI0_ALT3" group="MISO" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pa0" function="SPI0_ALT3" group="MOSI" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pc0" function="SPI0_ALT3" group="SCK" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pc1" function="SPI0_ALT3" group="SS" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pd5" function="SPI0_ALT4" group="MISO" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pd4" function="SPI0_ALT4" group="MOSI" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pd6" function="SPI0_ALT4" group="SCK" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pd7" function="SPI0_ALT4" group="SS" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pc1" function="SPI0_ALT5" group="MISO" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pc0" function="SPI0_ALT5" group="MOSI" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pc2" function="SPI0_ALT5" group="SCK" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pc3" function="SPI0_ALT5" group="SS" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pc2" function="SPI0_ALT6" group="MISO" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pc1" function="SPI0_ALT6" group="MOSI" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pc3" function="SPI0_ALT6" group="SCK" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pf7" function="SPI0_ALT6" group="SS" field="PORTMUX.SPIROUTEA.SPI0"/>
             </signals>
         </peripheral>
         <peripheral key="syscfg" name="SYSCFG" module-key="avrdd_syscfg">
@@ -255,106 +255,106 @@
         <peripheral key="tca0" name="TCA0" module-key="tmr_16b_pwm_v1">
             <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"/>
-                <signal pad-id="pa2" index="2" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pa3" index="3" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pa4" index="4" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pa5" index="5" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pc0" index="0" function="TCA0_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pc1" index="1" function="TCA0_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pc2" index="2" function="TCA0_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pc3" index="3" function="TCA0_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pd1" index="1" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pd2" index="2" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pd3" index="3" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pd4" index="4" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pd5" index="5" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pf0" index="0" function="TCA0_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pf1" index="1" function="TCA0_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pa0" index="0" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pa1" index="1" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pa2" index="2" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pa3" index="3" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pa4" index="4" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pa5" index="5" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pc0" index="0" function="TCA0_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pc1" index="1" function="TCA0_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pc2" index="2" function="TCA0_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pc3" index="3" function="TCA0_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pd1" index="1" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pd2" index="2" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pd3" index="3" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pd4" index="4" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pd5" index="5" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pf0" index="0" function="TCA0_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pf1" index="1" function="TCA0_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
             </signals>
         </peripheral>
         <peripheral key="tcb0" name="TCB0" module-key="tmr_16b_capture_v1">
             <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-key="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 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-key="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 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"/>
+                <signal pad-key="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 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"/>
-                <signal pad-id="pa6" index="2" function="TCD0" group="WOC" field="PORTMUX.TCDROUTEA.TCD0"/>
-                <signal pad-id="pa7" index="3" function="TCD0" group="WOD" field="PORTMUX.TCDROUTEA.TCD0"/>
-                <signal pad-id="pf0" function="TCD0_ALT2" group="WOA" field="PORTMUX.TCDROUTEA.TCD0"/>
-                <signal pad-id="pf1" index="1" function="TCD0_ALT2" group="WOB" field="PORTMUX.TCDROUTEA.TCD0"/>
-                <signal pad-id="pa4" function="TCD0_ALT4" group="WOA" field="PORTMUX.TCDROUTEA.TCD0"/>
-                <signal pad-id="pa5" index="1" function="TCD0_ALT4" group="WOB" field="PORTMUX.TCDROUTEA.TCD0"/>
-                <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"/>
+                <signal pad-key="pa4" function="TCD0" group="WOA" field="PORTMUX.TCDROUTEA.TCD0"/>
+                <signal pad-key="pa5" index="1" function="TCD0" group="WOB" field="PORTMUX.TCDROUTEA.TCD0"/>
+                <signal pad-key="pa6" index="2" function="TCD0" group="WOC" field="PORTMUX.TCDROUTEA.TCD0"/>
+                <signal pad-key="pa7" index="3" function="TCD0" group="WOD" field="PORTMUX.TCDROUTEA.TCD0"/>
+                <signal pad-key="pf0" function="TCD0_ALT2" group="WOA" field="PORTMUX.TCDROUTEA.TCD0"/>
+                <signal pad-key="pf1" index="1" function="TCD0_ALT2" group="WOB" field="PORTMUX.TCDROUTEA.TCD0"/>
+                <signal pad-key="pa4" function="TCD0_ALT4" group="WOA" field="PORTMUX.TCDROUTEA.TCD0"/>
+                <signal pad-key="pa5" index="1" function="TCD0_ALT4" group="WOB" field="PORTMUX.TCDROUTEA.TCD0"/>
+                <signal pad-key="pd4" index="2" function="TCD0_ALT4" group="WOC" field="PORTMUX.TCDROUTEA.TCD0"/>
+                <signal pad-key="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 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"/>
-                <signal pad-id="pa2" function="I2C0" group="SDA" field="PORTMUX.TWIROUTEA.TWI0"/>
-                <signal pad-id="pc2" function="I2C0" group="SDA_DUAL" field="PORTMUX.TWIROUTEA.TWI0"/>
-                <signal pad-id="pa3" function="I2C0_ALT1" group="SCL" field="PORTMUX.TWIROUTEA.TWI0"/>
-                <signal pad-id="pa2" function="I2C0_ALT1" group="SDA" field="PORTMUX.TWIROUTEA.TWI0"/>
-                <signal pad-id="pc3" function="I2C0_ALT2" group="SCL" field="PORTMUX.TWIROUTEA.TWI0"/>
-                <signal pad-id="pc2" function="I2C0_ALT2" group="SDA" field="PORTMUX.TWIROUTEA.TWI0"/>
-                <signal pad-id="pa1" function="I2C0_ALT3" group="SCL" field="PORTMUX.TWIROUTEA.TWI0"/>
-                <signal pad-id="pc3" function="I2C0_ALT3" group="SCL_DUAL" field="PORTMUX.TWIROUTEA.TWI0"/>
-                <signal pad-id="pa0" function="I2C0_ALT3" group="SDA" field="PORTMUX.TWIROUTEA.TWI0"/>
-                <signal pad-id="pc2" function="I2C0_ALT3" group="SDA_DUAL" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pa3" function="I2C0" group="SCL" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pc3" function="I2C0" group="SCL_DUAL" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pa2" function="I2C0" group="SDA" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pc2" function="I2C0" group="SDA_DUAL" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pa3" function="I2C0_ALT1" group="SCL" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pa2" function="I2C0_ALT1" group="SDA" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pc3" function="I2C0_ALT2" group="SCL" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pc2" function="I2C0_ALT2" group="SDA" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pa1" function="I2C0_ALT3" group="SCL" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pc3" function="I2C0_ALT3" group="SCL_DUAL" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pa0" function="I2C0_ALT3" group="SDA" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pc2" function="I2C0_ALT3" group="SDA_DUAL" field="PORTMUX.TWIROUTEA.TWI0"/>
             </signals>
         </peripheral>
         <peripheral key="usart0" name="USART0" module-key="uart_autobd_v4">
             <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"/>
-                <signal pad-id="pa2" function="USART0" group="XCK" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pa3" function="USART0" group="XDIR" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pa5" function="USART0_ALT1" group="RXD" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pa4" function="USART0_ALT1" group="TXD" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pa6" function="USART0_ALT1" group="XCK" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pa7" function="USART0_ALT1" group="XDIR" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pa3" function="USART0_ALT2" group="RXD" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pa2" function="USART0_ALT2" group="TXD" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pd5" function="USART0_ALT3" group="RXD" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pd4" function="USART0_ALT3" group="TXD" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pd6" function="USART0_ALT3" group="XCK" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pd7" function="USART0_ALT3" group="XDIR" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pc2" function="USART0_ALT4" group="RXD" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pc1" function="USART0_ALT4" group="TXD" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pc3" function="USART0_ALT4" group="XCK" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa1" function="USART0" group="RXD" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa0" function="USART0" group="TXD" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa2" function="USART0" group="XCK" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa3" function="USART0" group="XDIR" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa5" function="USART0_ALT1" group="RXD" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa4" function="USART0_ALT1" group="TXD" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa6" function="USART0_ALT1" group="XCK" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa7" function="USART0_ALT1" group="XDIR" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa3" function="USART0_ALT2" group="RXD" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa2" function="USART0_ALT2" group="TXD" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pd5" function="USART0_ALT3" group="RXD" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pd4" function="USART0_ALT3" group="TXD" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pd6" function="USART0_ALT3" group="XCK" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pd7" function="USART0_ALT3" group="XDIR" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pc2" function="USART0_ALT4" group="RXD" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pc1" function="USART0_ALT4" group="TXD" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pc3" function="USART0_ALT4" group="XCK" field="PORTMUX.USARTROUTEA.USART0"/>
             </signals>
         </peripheral>
         <peripheral key="usart1" name="USART1" module-key="uart_autobd_v4">
             <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"/>
-                <signal pad-id="pc2" function="USART1" group="XCK" field="PORTMUX.USARTROUTEA.USART1"/>
-                <signal pad-id="pc3" function="USART1" group="XDIR" field="PORTMUX.USARTROUTEA.USART1"/>
-                <signal pad-id="pd7" function="USART1_ALT2" group="RXD" field="PORTMUX.USARTROUTEA.USART1"/>
-                <signal pad-id="pd6" function="USART1_ALT2" group="TXD" field="PORTMUX.USARTROUTEA.USART1"/>
+                <signal pad-key="pc1" function="USART1" group="RXD" field="PORTMUX.USARTROUTEA.USART1"/>
+                <signal pad-key="pc0" function="USART1" group="TXD" field="PORTMUX.USARTROUTEA.USART1"/>
+                <signal pad-key="pc2" function="USART1" group="XCK" field="PORTMUX.USARTROUTEA.USART1"/>
+                <signal pad-key="pc3" function="USART1" group="XDIR" field="PORTMUX.USARTROUTEA.USART1"/>
+                <signal pad-key="pd7" function="USART1_ALT2" group="RXD" field="PORTMUX.USARTROUTEA.USART1"/>
+                <signal pad-key="pd6" function="USART1_ALT2" group="TXD" field="PORTMUX.USARTROUTEA.USART1"/>
             </signals>
         </peripheral>
         <peripheral key="userrow" name="USERROW" module-key="avrdd_userrow">
@@ -381,8 +381,8 @@
         <peripheral key="zcd3" name="ZCD3" module-key="cmp_zxover_ctrl_v3">
             <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"/>
+                <signal pad-key="pc2" function="ZCD3" group="IN" field="PORTMUX.ZCDROUTEA.ZCD3"/>
+                <signal pad-key="pa7" function="ZCD3" group="OUT" field="PORTMUX.ZCDROUTEA.ZCD3"/>
             </signals>
         </peripheral>
     </peripherals>
@@ -1636,39 +1636,69 @@
             </register-group>
         </module>
     </modules>
+    <pads>
+        <pad key="pa7" name="PA7"/>
+        <pad key="pc0" name="PC0"/>
+        <pad key="pc1" name="PC1"/>
+        <pad key="pc2" name="PC2"/>
+        <pad key="pc3" name="PC3"/>
+        <pad key="vddio2" name="VDDIO2"/>
+        <pad key="pd1" name="PD1"/>
+        <pad key="pd2" name="PD2"/>
+        <pad key="pd3" name="PD3"/>
+        <pad key="pd4" name="PD4"/>
+        <pad key="pd5" name="PD5"/>
+        <pad key="pd6" name="PD6"/>
+        <pad key="pd7" name="PD7"/>
+        <pad key="avdd" name="AVDD"/>
+        <pad key="agnd" name="AGND"/>
+        <pad key="pf0" name="PF0"/>
+        <pad key="pf1" name="PF1"/>
+        <pad key="pf6" name="PF6"/>
+        <pad key="pf7" name="PF7"/>
+        <pad key="vdd0" name="VDD0"/>
+        <pad key="gnd0" name="GND0"/>
+        <pad key="pa0" name="PA0"/>
+        <pad key="pa1" name="PA1"/>
+        <pad key="pa2" name="PA2"/>
+        <pad key="pa3" name="PA3"/>
+        <pad key="pa4" name="PA4"/>
+        <pad key="pa5" name="PA5"/>
+        <pad key="pa6" name="PA6"/>
+    </pads>
     <pinouts>
         <pinout key="soic28mvio" name="SOIC28MVIO" type="soic">
-            <pin position="1" pad="PA7"/>
-            <pin position="2" pad="PC0"/>
-            <pin position="3" pad="PC1"/>
-            <pin position="4" pad="PC2"/>
-            <pin position="5" pad="PC3"/>
-            <pin position="6" pad="VDDIO2"/>
-            <pin position="7" pad="PD1"/>
-            <pin position="8" pad="PD2"/>
-            <pin position="9" pad="PD3"/>
-            <pin position="10" pad="PD4"/>
-            <pin position="11" pad="PD5"/>
-            <pin position="12" pad="PD6"/>
-            <pin position="13" pad="PD7"/>
-            <pin position="14" pad="AVDD"/>
-            <pin position="15" pad="AGND"/>
-            <pin position="16" pad="PF0"/>
-            <pin position="17" pad="PF1"/>
-            <pin position="18" pad="PF6"/>
-            <pin position="19" pad="PF7"/>
-            <pin position="20" pad="VDD0"/>
-            <pin position="21" pad="GND0"/>
-            <pin position="22" pad="PA0"/>
-            <pin position="23" pad="PA1"/>
-            <pin position="24" pad="PA2"/>
-            <pin position="25" pad="PA3"/>
-            <pin position="26" pad="PA4"/>
-            <pin position="27" pad="PA5"/>
-            <pin position="28" pad="PA6"/>
+            <pin position="1" pad-key="pa7"/>
+            <pin position="2" pad-key="pc0"/>
+            <pin position="3" pad-key="pc1"/>
+            <pin position="4" pad-key="pc2"/>
+            <pin position="5" pad-key="pc3"/>
+            <pin position="6" pad-key="vddio2"/>
+            <pin position="7" pad-key="pd1"/>
+            <pin position="8" pad-key="pd2"/>
+            <pin position="9" pad-key="pd3"/>
+            <pin position="10" pad-key="pd4"/>
+            <pin position="11" pad-key="pd5"/>
+            <pin position="12" pad-key="pd6"/>
+            <pin position="13" pad-key="pd7"/>
+            <pin position="14" pad-key="avdd"/>
+            <pin position="15" pad-key="agnd"/>
+            <pin position="16" pad-key="pf0"/>
+            <pin position="17" pad-key="pf1"/>
+            <pin position="18" pad-key="pf6"/>
+            <pin position="19" pad-key="pf7"/>
+            <pin position="20" pad-key="vdd0"/>
+            <pin position="21" pad-key="gnd0"/>
+            <pin position="22" pad-key="pa0"/>
+            <pin position="23" pad-key="pa1"/>
+            <pin position="24" pad-key="pa2"/>
+            <pin position="25" pad-key="pa3"/>
+            <pin position="26" pad-key="pa4"/>
+            <pin position="27" pad-key="pa5"/>
+            <pin position="28" pad-key="pa6"/>
         </pinout>
     </pinouts>
     <variants>
-        <variant name="AVR32DD28" pinout-key="soic28mvio" package="SOIC28"/>
+        <variant key="avr32dd28" name="AVR32DD28" pinout-key="soic28mvio"/>
     </variants>
 </device>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR32DD32.xml b/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR32DD32.xml
index 0863b44e..422a794e 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR32DD32.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR32DD32.xml
@@ -45,41 +45,41 @@
         <peripheral key="ac0" name="AC0" module-key="cmp_control_v8">
             <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"/>
-                <signal pad-id="pc2" index="3" function="AC0" group="N"/>
-                <signal pad-id="pd2" index="0" function="AC0" group="P"/>
-                <signal pad-id="pd6" index="3" function="AC0" group="P"/>
-                <signal pad-id="pc3" index="4" function="AC0" group="P"/>
-                <signal pad-id="pa7" index="0" function="AC0" group="OUT" field="PORTMUX.ACROUTEA.AC0"/>
+                <signal pad-key="pd3" index="0" function="AC0" group="N"/>
+                <signal pad-key="pd7" index="2" function="AC0" group="N"/>
+                <signal pad-key="pc2" index="3" function="AC0" group="N"/>
+                <signal pad-key="pd2" index="0" function="AC0" group="P"/>
+                <signal pad-key="pd6" index="3" function="AC0" group="P"/>
+                <signal pad-key="pc3" index="4" function="AC0" group="P"/>
+                <signal pad-key="pa7" index="0" function="AC0" group="OUT" field="PORTMUX.ACROUTEA.AC0"/>
             </signals>
         </peripheral>
         <peripheral key="adc0" name="ADC0" module-key="adc_12b_diff_ctrl_v1">
             <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"/>
-                <signal pad-id="pd3" index="3" function="AIN0" group="AIN"/>
-                <signal pad-id="pd4" index="4" function="AIN0" group="AIN"/>
-                <signal pad-id="pd5" index="5" function="AIN0" group="AIN"/>
-                <signal pad-id="pd6" index="6" function="AIN0" group="AIN"/>
-                <signal pad-id="pd7" index="7" function="AIN0" group="AIN"/>
-                <signal pad-id="pf0" index="16" function="AIN0" group="AIN"/>
-                <signal pad-id="pf1" index="17" function="AIN0" group="AIN"/>
-                <signal pad-id="pf2" index="18" function="AIN0" group="AIN"/>
-                <signal pad-id="pf3" index="19" function="AIN0" group="AIN"/>
-                <signal pad-id="pf4" index="20" function="AIN0" group="AIN"/>
-                <signal pad-id="pf5" index="21" function="AIN0" group="AIN"/>
-                <signal pad-id="pa2" index="22" function="AIN0" group="AIN"/>
-                <signal pad-id="pa3" index="23" function="AIN0" group="AIN"/>
-                <signal pad-id="pa4" index="24" function="AIN0" group="AIN"/>
-                <signal pad-id="pa5" index="25" function="AIN0" group="AIN"/>
-                <signal pad-id="pa6" index="26" function="AIN0" group="AIN"/>
-                <signal pad-id="pa7" index="27" function="AIN0" group="AIN"/>
-                <signal pad-id="pc0" index="28" function="AIN0" group="AIN"/>
-                <signal pad-id="pc1" index="29" function="AIN0" group="AIN"/>
-                <signal pad-id="pc2" index="30" function="AIN0" group="AIN"/>
-                <signal pad-id="pc3" index="31" function="AIN0" group="AIN"/>
+                <signal pad-key="pd1" index="1" function="AIN0" group="AIN"/>
+                <signal pad-key="pd2" index="2" function="AIN0" group="AIN"/>
+                <signal pad-key="pd3" index="3" function="AIN0" group="AIN"/>
+                <signal pad-key="pd4" index="4" function="AIN0" group="AIN"/>
+                <signal pad-key="pd5" index="5" function="AIN0" group="AIN"/>
+                <signal pad-key="pd6" index="6" function="AIN0" group="AIN"/>
+                <signal pad-key="pd7" index="7" function="AIN0" group="AIN"/>
+                <signal pad-key="pf0" index="16" function="AIN0" group="AIN"/>
+                <signal pad-key="pf1" index="17" function="AIN0" group="AIN"/>
+                <signal pad-key="pf2" index="18" function="AIN0" group="AIN"/>
+                <signal pad-key="pf3" index="19" function="AIN0" group="AIN"/>
+                <signal pad-key="pf4" index="20" function="AIN0" group="AIN"/>
+                <signal pad-key="pf5" index="21" function="AIN0" group="AIN"/>
+                <signal pad-key="pa2" index="22" function="AIN0" group="AIN"/>
+                <signal pad-key="pa3" index="23" function="AIN0" group="AIN"/>
+                <signal pad-key="pa4" index="24" function="AIN0" group="AIN"/>
+                <signal pad-key="pa5" index="25" function="AIN0" group="AIN"/>
+                <signal pad-key="pa6" index="26" function="AIN0" group="AIN"/>
+                <signal pad-key="pa7" index="27" function="AIN0" group="AIN"/>
+                <signal pad-key="pc0" index="28" function="AIN0" group="AIN"/>
+                <signal pad-key="pc1" index="29" function="AIN0" group="AIN"/>
+                <signal pad-key="pc2" index="30" function="AIN0" group="AIN"/>
+                <signal pad-key="pc3" index="31" function="AIN0" group="AIN"/>
             </signals>
         </peripheral>
         <peripheral key="bod" name="BOD" module-key="bor_lvd_ctrl_v1">
@@ -88,44 +88,44 @@
         <peripheral key="ccl" name="CCL" module-key="cla_ccl_v1">
             <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"/>
-                <signal pad-id="pa2" index="2" function="CCL" group="LUT0_IN" field="PORTMUX.CCLROUTEA.LUT0"/>
-                <signal pad-id="pa3" index="0" function="CCL" group="LUT0_OUT" field="PORTMUX.CCLROUTEA.LUT0"/>
-                <signal pad-id="pa0" index="0" function="CCL_ALT1" group="LUT0_IN" field="PORTMUX.CCLROUTEA.LUT0"/>
-                <signal pad-id="pa1" index="1" function="CCL_ALT1" group="LUT0_IN" field="PORTMUX.CCLROUTEA.LUT0"/>
-                <signal pad-id="pa2" index="2" function="CCL_ALT1" group="LUT0_IN" field="PORTMUX.CCLROUTEA.LUT0"/>
-                <signal pad-id="pa6" index="0" function="CCL_ALT1" group="LUT0_OUT" field="PORTMUX.CCLROUTEA.LUT0"/>
-                <signal pad-id="pc0" index="0" function="CCL" group="LUT1_IN" field="PORTMUX.CCLROUTEA.LUT1"/>
-                <signal pad-id="pc1" index="1" function="CCL" group="LUT1_IN" field="PORTMUX.CCLROUTEA.LUT1"/>
-                <signal pad-id="pc2" index="2" function="CCL" group="LUT1_IN" field="PORTMUX.CCLROUTEA.LUT1"/>
-                <signal pad-id="pc3" index="0" function="CCL" group="LUT1_OUT" field="PORTMUX.CCLROUTEA.LUT1"/>
-                <signal pad-id="pc0" index="0" function="CCL_ALT1" group="LUT1_IN" field="PORTMUX.CCLROUTEA.LUT1"/>
-                <signal pad-id="pc1" index="1" function="CCL_ALT1" group="LUT1_IN" field="PORTMUX.CCLROUTEA.LUT1"/>
-                <signal pad-id="pc2" index="2" function="CCL_ALT1" group="LUT1_IN" field="PORTMUX.CCLROUTEA.LUT1"/>
-                <signal pad-id="pd1" index="1" function="CCL" group="LUT2_IN" field="PORTMUX.CCLROUTEA.LUT2"/>
-                <signal pad-id="pd2" index="2" function="CCL" group="LUT2_IN" field="PORTMUX.CCLROUTEA.LUT2"/>
-                <signal pad-id="pd3" index="0" function="CCL" group="LUT2_OUT" field="PORTMUX.CCLROUTEA.LUT2"/>
-                <signal pad-id="pd1" index="1" function="CCL_ALT1" group="LUT2_IN" field="PORTMUX.CCLROUTEA.LUT2"/>
-                <signal pad-id="pd2" index="2" function="CCL_ALT1" group="LUT2_IN" field="PORTMUX.CCLROUTEA.LUT2"/>
-                <signal pad-id="pd6" index="0" function="CCL_ALT1" group="LUT2_OUT" field="PORTMUX.CCLROUTEA.LUT2"/>
-                <signal pad-id="pf0" index="0" function="CCL" group="LUT3_IN" field="PORTMUX.CCLROUTEA.LUT3"/>
-                <signal pad-id="pf1" index="1" function="CCL" group="LUT3_IN" field="PORTMUX.CCLROUTEA.LUT3"/>
-                <signal pad-id="pf2" index="2" function="CCL" group="LUT3_IN" field="PORTMUX.CCLROUTEA.LUT3"/>
-                <signal pad-id="pf3" index="0" function="CCL" group="LUT3_OUT" field="PORTMUX.CCLROUTEA.LUT3"/>
+                <signal pad-key="pa0" index="0" function="CCL" group="LUT0_IN" field="PORTMUX.CCLROUTEA.LUT0"/>
+                <signal pad-key="pa1" index="1" function="CCL" group="LUT0_IN" field="PORTMUX.CCLROUTEA.LUT0"/>
+                <signal pad-key="pa2" index="2" function="CCL" group="LUT0_IN" field="PORTMUX.CCLROUTEA.LUT0"/>
+                <signal pad-key="pa3" index="0" function="CCL" group="LUT0_OUT" field="PORTMUX.CCLROUTEA.LUT0"/>
+                <signal pad-key="pa0" index="0" function="CCL_ALT1" group="LUT0_IN" field="PORTMUX.CCLROUTEA.LUT0"/>
+                <signal pad-key="pa1" index="1" function="CCL_ALT1" group="LUT0_IN" field="PORTMUX.CCLROUTEA.LUT0"/>
+                <signal pad-key="pa2" index="2" function="CCL_ALT1" group="LUT0_IN" field="PORTMUX.CCLROUTEA.LUT0"/>
+                <signal pad-key="pa6" index="0" function="CCL_ALT1" group="LUT0_OUT" field="PORTMUX.CCLROUTEA.LUT0"/>
+                <signal pad-key="pc0" index="0" function="CCL" group="LUT1_IN" field="PORTMUX.CCLROUTEA.LUT1"/>
+                <signal pad-key="pc1" index="1" function="CCL" group="LUT1_IN" field="PORTMUX.CCLROUTEA.LUT1"/>
+                <signal pad-key="pc2" index="2" function="CCL" group="LUT1_IN" field="PORTMUX.CCLROUTEA.LUT1"/>
+                <signal pad-key="pc3" index="0" function="CCL" group="LUT1_OUT" field="PORTMUX.CCLROUTEA.LUT1"/>
+                <signal pad-key="pc0" index="0" function="CCL_ALT1" group="LUT1_IN" field="PORTMUX.CCLROUTEA.LUT1"/>
+                <signal pad-key="pc1" index="1" function="CCL_ALT1" group="LUT1_IN" field="PORTMUX.CCLROUTEA.LUT1"/>
+                <signal pad-key="pc2" index="2" function="CCL_ALT1" group="LUT1_IN" field="PORTMUX.CCLROUTEA.LUT1"/>
+                <signal pad-key="pd1" index="1" function="CCL" group="LUT2_IN" field="PORTMUX.CCLROUTEA.LUT2"/>
+                <signal pad-key="pd2" index="2" function="CCL" group="LUT2_IN" field="PORTMUX.CCLROUTEA.LUT2"/>
+                <signal pad-key="pd3" index="0" function="CCL" group="LUT2_OUT" field="PORTMUX.CCLROUTEA.LUT2"/>
+                <signal pad-key="pd1" index="1" function="CCL_ALT1" group="LUT2_IN" field="PORTMUX.CCLROUTEA.LUT2"/>
+                <signal pad-key="pd2" index="2" function="CCL_ALT1" group="LUT2_IN" field="PORTMUX.CCLROUTEA.LUT2"/>
+                <signal pad-key="pd6" index="0" function="CCL_ALT1" group="LUT2_OUT" field="PORTMUX.CCLROUTEA.LUT2"/>
+                <signal pad-key="pf0" index="0" function="CCL" group="LUT3_IN" field="PORTMUX.CCLROUTEA.LUT3"/>
+                <signal pad-key="pf1" index="1" function="CCL" group="LUT3_IN" field="PORTMUX.CCLROUTEA.LUT3"/>
+                <signal pad-key="pf2" index="2" function="CCL" group="LUT3_IN" field="PORTMUX.CCLROUTEA.LUT3"/>
+                <signal pad-key="pf3" index="0" function="CCL" group="LUT3_OUT" field="PORTMUX.CCLROUTEA.LUT3"/>
             </signals>
         </peripheral>
         <peripheral key="clkctrl" name="CLKCTRL" module-key="avrdd_clkctrl">
             <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"/>
-                <signal pad-id="pf0" function="CLKCTRL" group="XTAL32K1"/>
-                <signal pad-id="pf1" function="CLKCTRL" group="XTAL32K2"/>
-                <signal pad-id="pa0" function="CLKCTRL" group="XTALHF1"/>
-                <signal pad-id="pa1" function="CLKCTRL" group="XTALHF2"/>
-                <signal pad-id="pa0" function="CLKCTRL_ALT1" group="XTAL32K1"/>
-                <signal pad-id="pa1" function="CLKCTRL_ALT1" group="XTAL32K2"/>
+                <signal pad-key="pa7" function="CLKCTRL" group="CLKOUT"/>
+                <signal pad-key="pa0" function="CLKCTRL" group="EXTCLK"/>
+                <signal pad-key="pf0" function="CLKCTRL" group="XTAL32K1"/>
+                <signal pad-key="pf1" function="CLKCTRL" group="XTAL32K2"/>
+                <signal pad-key="pa0" function="CLKCTRL" group="XTALHF1"/>
+                <signal pad-key="pa1" function="CLKCTRL" group="XTALHF2"/>
+                <signal pad-key="pa0" function="CLKCTRL_ALT1" group="XTAL32K1"/>
+                <signal pad-key="pa1" function="CLKCTRL_ALT1" group="XTAL32K2"/>
             </signals>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="cpu_avr_xt_v1">
@@ -140,19 +140,19 @@
         <peripheral key="dac0" name="DAC0" module-key="dac_nbit_ctrl_v5">
             <register-group-instance register-group-key="dac" address-space-key="data" offset="0x6A0"/>
             <signals>
-                <signal pad-id="pd6" index="0" function="DAC0" group="OUT"/>
+                <signal pad-key="pd6" index="0" function="DAC0" group="OUT"/>
             </signals>
         </peripheral>
         <peripheral key="evsys" name="EVSYS" module-key="avrdd_evsys">
             <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"/>
-                <signal pad-id="pc2" index="2" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTC"/>
-                <signal pad-id="pd2" index="3" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTD"/>
-                <signal pad-id="pd7" index="3" function="EVSYS_ALT1" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTD"/>
-                <signal pad-id="pf2" index="5" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTF"/>
-                <signal pad-id="pf7" index="5" function="EVSYS_ALT1" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTF"/>
+                <signal pad-key="pa2" index="0" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTA"/>
+                <signal pad-key="pa7" index="0" function="EVSYS_ALT1" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTA"/>
+                <signal pad-key="pc2" index="2" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTC"/>
+                <signal pad-key="pd2" index="3" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTD"/>
+                <signal pad-key="pd7" index="3" function="EVSYS_ALT1" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTD"/>
+                <signal pad-key="pf2" index="5" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTF"/>
+                <signal pad-key="pf7" index="5" function="EVSYS_ALT1" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTF"/>
             </signals>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="avrdd_fuse">
@@ -173,48 +173,48 @@
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pa2" index="2" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa3" index="3" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa4" index="4" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa5" index="5" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa6" index="6" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa7" index="7" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa0" index="0" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa1" index="1" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa2" index="2" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa3" index="3" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa4" index="4" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa5" index="5" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa6" index="6" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa7" index="7" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pc2" index="2" function="IOPORT" group="PIN"/>
-                <signal pad-id="pc3" index="3" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc0" index="0" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc1" index="1" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc2" index="2" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc3" index="3" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pd3" index="3" function="IOPORT" group="PIN"/>
-                <signal pad-id="pd4" index="4" function="IOPORT" group="PIN"/>
-                <signal pad-id="pd5" index="5" function="IOPORT" group="PIN"/>
-                <signal pad-id="pd6" index="6" function="IOPORT" group="PIN"/>
-                <signal pad-id="pd7" index="7" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd1" index="1" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd2" index="2" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd3" index="3" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd4" index="4" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd5" index="5" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd6" index="6" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd7" index="7" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="portf" name="PORTF" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pf2" index="2" function="IOPORT" group="PIN"/>
-                <signal pad-id="pf3" index="3" function="IOPORT" group="PIN"/>
-                <signal pad-id="pf4" index="4" function="IOPORT" group="PIN"/>
-                <signal pad-id="pf5" index="5" function="IOPORT" group="PIN"/>
-                <signal pad-id="pf6" index="6" function="IOPORT" group="PIN"/>
-                <signal pad-id="pf7" index="7" function="IOPORT" group="PIN"/>
+                <signal pad-key="pf0" index="0" function="IOPORT" group="PIN"/>
+                <signal pad-key="pf1" index="1" function="IOPORT" group="PIN"/>
+                <signal pad-key="pf2" index="2" function="IOPORT" group="PIN"/>
+                <signal pad-key="pf3" index="3" function="IOPORT" group="PIN"/>
+                <signal pad-key="pf4" index="4" function="IOPORT" group="PIN"/>
+                <signal pad-key="pf5" index="5" function="IOPORT" group="PIN"/>
+                <signal pad-key="pf6" index="6" function="IOPORT" group="PIN"/>
+                <signal pad-key="pf7" index="7" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="portmux" name="PORTMUX" module-key="avrdd_portmux">
@@ -223,7 +223,7 @@
         <peripheral key="rstctrl" name="RSTCTRL" module-key="rst_integration_v8">
             <register-group-instance register-group-key="rstctrl" address-space-key="data" offset="0x40"/>
             <signals>
-                <signal pad-id="pf6" function="OTHER" group="RESET"/>
+                <signal pad-key="pf6" function="OTHER" group="RESET"/>
             </signals>
         </peripheral>
         <peripheral key="rtc" name="RTC" module-key="tmr_16b_rtc_v1">
@@ -238,26 +238,26 @@
         <peripheral key="spi0" name="SPI0" module-key="spi_8bit_v2">
             <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"/>
-                <signal pad-id="pa6" function="SPI0" group="SCK" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <signal pad-id="pa7" function="SPI0" group="SS" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <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"/>
-                <signal pad-id="pc0" function="SPI0_ALT3" group="SCK" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <signal pad-id="pc1" function="SPI0_ALT3" group="SS" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <signal pad-id="pd5" function="SPI0_ALT4" group="MISO" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <signal pad-id="pd4" function="SPI0_ALT4" group="MOSI" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <signal pad-id="pd6" function="SPI0_ALT4" group="SCK" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <signal pad-id="pd7" function="SPI0_ALT4" group="SS" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <signal pad-id="pc1" function="SPI0_ALT5" group="MISO" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <signal pad-id="pc0" function="SPI0_ALT5" group="MOSI" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <signal pad-id="pc2" function="SPI0_ALT5" group="SCK" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <signal pad-id="pc3" function="SPI0_ALT5" group="SS" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <signal pad-id="pc2" function="SPI0_ALT6" group="MISO" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <signal pad-id="pc1" function="SPI0_ALT6" group="MOSI" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <signal pad-id="pc3" function="SPI0_ALT6" group="SCK" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <signal pad-id="pf7" function="SPI0_ALT6" group="SS" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pa5" function="SPI0" group="MISO" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pa4" function="SPI0" group="MOSI" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pa6" function="SPI0" group="SCK" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pa7" function="SPI0" group="SS" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pa1" function="SPI0_ALT3" group="MISO" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pa0" function="SPI0_ALT3" group="MOSI" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pc0" function="SPI0_ALT3" group="SCK" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pc1" function="SPI0_ALT3" group="SS" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pd5" function="SPI0_ALT4" group="MISO" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pd4" function="SPI0_ALT4" group="MOSI" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pd6" function="SPI0_ALT4" group="SCK" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pd7" function="SPI0_ALT4" group="SS" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pc1" function="SPI0_ALT5" group="MISO" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pc0" function="SPI0_ALT5" group="MOSI" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pc2" function="SPI0_ALT5" group="SCK" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pc3" function="SPI0_ALT5" group="SS" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pc2" function="SPI0_ALT6" group="MISO" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pc1" function="SPI0_ALT6" group="MOSI" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pc3" function="SPI0_ALT6" group="SCK" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pf7" function="SPI0_ALT6" group="SS" field="PORTMUX.SPIROUTEA.SPI0"/>
             </signals>
         </peripheral>
         <peripheral key="syscfg" name="SYSCFG" module-key="avrdd_syscfg">
@@ -266,114 +266,114 @@
         <peripheral key="tca0" name="TCA0" module-key="tmr_16b_pwm_v1">
             <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"/>
-                <signal pad-id="pa2" index="2" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pa3" index="3" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pa4" index="4" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pa5" index="5" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pc0" index="0" function="TCA0_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pc1" index="1" function="TCA0_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pc2" index="2" function="TCA0_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pc3" index="3" function="TCA0_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pd1" index="1" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pd2" index="2" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pd3" index="3" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pd4" index="4" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pd5" index="5" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pf0" index="0" function="TCA0_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pf1" index="1" function="TCA0_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pf2" index="2" function="TCA0_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pf3" index="3" function="TCA0_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pf4" index="4" function="TCA0_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pf5" index="5" function="TCA0_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pa0" index="0" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pa1" index="1" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pa2" index="2" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pa3" index="3" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pa4" index="4" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pa5" index="5" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pc0" index="0" function="TCA0_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pc1" index="1" function="TCA0_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pc2" index="2" function="TCA0_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pc3" index="3" function="TCA0_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pd1" index="1" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pd2" index="2" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pd3" index="3" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pd4" index="4" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pd5" index="5" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pf0" index="0" function="TCA0_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pf1" index="1" function="TCA0_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pf2" index="2" function="TCA0_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pf3" index="3" function="TCA0_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pf4" index="4" function="TCA0_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pf5" index="5" function="TCA0_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
             </signals>
         </peripheral>
         <peripheral key="tcb0" name="TCB0" module-key="tmr_16b_capture_v1">
             <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"/>
+                <signal pad-key="pa2" index="0" function="TCB0" group="WO" field="PORTMUX.TCBROUTEA.TCB0"/>
+                <signal pad-key="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 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"/>
+                <signal pad-key="pa3" index="0" function="TCB1" group="WO" field="PORTMUX.TCBROUTEA.TCB1"/>
+                <signal pad-key="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 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"/>
+                <signal pad-key="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 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"/>
-                <signal pad-id="pa6" index="2" function="TCD0" group="WOC" field="PORTMUX.TCDROUTEA.TCD0"/>
-                <signal pad-id="pa7" index="3" function="TCD0" group="WOD" field="PORTMUX.TCDROUTEA.TCD0"/>
-                <signal pad-id="pf0" function="TCD0_ALT2" group="WOA" field="PORTMUX.TCDROUTEA.TCD0"/>
-                <signal pad-id="pf1" index="1" function="TCD0_ALT2" group="WOB" field="PORTMUX.TCDROUTEA.TCD0"/>
-                <signal pad-id="pf2" index="2" function="TCD0_ALT2" group="WOC" field="PORTMUX.TCDROUTEA.TCD0"/>
-                <signal pad-id="pf3" index="3" function="TCD0_ALT2" group="WOD" field="PORTMUX.TCDROUTEA.TCD0"/>
-                <signal pad-id="pa4" function="TCD0_ALT4" group="WOA" field="PORTMUX.TCDROUTEA.TCD0"/>
-                <signal pad-id="pa5" index="1" function="TCD0_ALT4" group="WOB" field="PORTMUX.TCDROUTEA.TCD0"/>
-                <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"/>
+                <signal pad-key="pa4" function="TCD0" group="WOA" field="PORTMUX.TCDROUTEA.TCD0"/>
+                <signal pad-key="pa5" index="1" function="TCD0" group="WOB" field="PORTMUX.TCDROUTEA.TCD0"/>
+                <signal pad-key="pa6" index="2" function="TCD0" group="WOC" field="PORTMUX.TCDROUTEA.TCD0"/>
+                <signal pad-key="pa7" index="3" function="TCD0" group="WOD" field="PORTMUX.TCDROUTEA.TCD0"/>
+                <signal pad-key="pf0" function="TCD0_ALT2" group="WOA" field="PORTMUX.TCDROUTEA.TCD0"/>
+                <signal pad-key="pf1" index="1" function="TCD0_ALT2" group="WOB" field="PORTMUX.TCDROUTEA.TCD0"/>
+                <signal pad-key="pf2" index="2" function="TCD0_ALT2" group="WOC" field="PORTMUX.TCDROUTEA.TCD0"/>
+                <signal pad-key="pf3" index="3" function="TCD0_ALT2" group="WOD" field="PORTMUX.TCDROUTEA.TCD0"/>
+                <signal pad-key="pa4" function="TCD0_ALT4" group="WOA" field="PORTMUX.TCDROUTEA.TCD0"/>
+                <signal pad-key="pa5" index="1" function="TCD0_ALT4" group="WOB" field="PORTMUX.TCDROUTEA.TCD0"/>
+                <signal pad-key="pd4" index="2" function="TCD0_ALT4" group="WOC" field="PORTMUX.TCDROUTEA.TCD0"/>
+                <signal pad-key="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 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"/>
-                <signal pad-id="pa2" function="I2C0" group="SDA" field="PORTMUX.TWIROUTEA.TWI0"/>
-                <signal pad-id="pc2" function="I2C0" group="SDA_DUAL" field="PORTMUX.TWIROUTEA.TWI0"/>
-                <signal pad-id="pa3" function="I2C0_ALT1" group="SCL" field="PORTMUX.TWIROUTEA.TWI0"/>
-                <signal pad-id="pa2" function="I2C0_ALT1" group="SDA" field="PORTMUX.TWIROUTEA.TWI0"/>
-                <signal pad-id="pc3" function="I2C0_ALT2" group="SCL" field="PORTMUX.TWIROUTEA.TWI0"/>
-                <signal pad-id="pc2" function="I2C0_ALT2" group="SDA" field="PORTMUX.TWIROUTEA.TWI0"/>
-                <signal pad-id="pa1" function="I2C0_ALT3" group="SCL" field="PORTMUX.TWIROUTEA.TWI0"/>
-                <signal pad-id="pc3" function="I2C0_ALT3" group="SCL_DUAL" field="PORTMUX.TWIROUTEA.TWI0"/>
-                <signal pad-id="pa0" function="I2C0_ALT3" group="SDA" field="PORTMUX.TWIROUTEA.TWI0"/>
-                <signal pad-id="pc2" function="I2C0_ALT3" group="SDA_DUAL" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pa3" function="I2C0" group="SCL" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pc3" function="I2C0" group="SCL_DUAL" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pa2" function="I2C0" group="SDA" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pc2" function="I2C0" group="SDA_DUAL" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pa3" function="I2C0_ALT1" group="SCL" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pa2" function="I2C0_ALT1" group="SDA" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pc3" function="I2C0_ALT2" group="SCL" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pc2" function="I2C0_ALT2" group="SDA" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pa1" function="I2C0_ALT3" group="SCL" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pc3" function="I2C0_ALT3" group="SCL_DUAL" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pa0" function="I2C0_ALT3" group="SDA" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pc2" function="I2C0_ALT3" group="SDA_DUAL" field="PORTMUX.TWIROUTEA.TWI0"/>
             </signals>
         </peripheral>
         <peripheral key="usart0" name="USART0" module-key="uart_autobd_v4">
             <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"/>
-                <signal pad-id="pa2" function="USART0" group="XCK" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pa3" function="USART0" group="XDIR" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pa5" function="USART0_ALT1" group="RXD" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pa4" function="USART0_ALT1" group="TXD" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pa6" function="USART0_ALT1" group="XCK" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pa7" function="USART0_ALT1" group="XDIR" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pa3" function="USART0_ALT2" group="RXD" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pa2" function="USART0_ALT2" group="TXD" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pd5" function="USART0_ALT3" group="RXD" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pd4" function="USART0_ALT3" group="TXD" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pd6" function="USART0_ALT3" group="XCK" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pd7" function="USART0_ALT3" group="XDIR" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pc2" function="USART0_ALT4" group="RXD" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pc1" function="USART0_ALT4" group="TXD" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pc3" function="USART0_ALT4" group="XCK" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa1" function="USART0" group="RXD" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa0" function="USART0" group="TXD" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa2" function="USART0" group="XCK" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa3" function="USART0" group="XDIR" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa5" function="USART0_ALT1" group="RXD" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa4" function="USART0_ALT1" group="TXD" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa6" function="USART0_ALT1" group="XCK" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa7" function="USART0_ALT1" group="XDIR" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa3" function="USART0_ALT2" group="RXD" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa2" function="USART0_ALT2" group="TXD" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pd5" function="USART0_ALT3" group="RXD" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pd4" function="USART0_ALT3" group="TXD" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pd6" function="USART0_ALT3" group="XCK" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pd7" function="USART0_ALT3" group="XDIR" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pc2" function="USART0_ALT4" group="RXD" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pc1" function="USART0_ALT4" group="TXD" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pc3" function="USART0_ALT4" group="XCK" field="PORTMUX.USARTROUTEA.USART0"/>
             </signals>
         </peripheral>
         <peripheral key="usart1" name="USART1" module-key="uart_autobd_v4">
             <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"/>
-                <signal pad-id="pc2" function="USART1" group="XCK" field="PORTMUX.USARTROUTEA.USART1"/>
-                <signal pad-id="pc3" function="USART1" group="XDIR" field="PORTMUX.USARTROUTEA.USART1"/>
-                <signal pad-id="pd7" function="USART1_ALT2" group="RXD" field="PORTMUX.USARTROUTEA.USART1"/>
-                <signal pad-id="pd6" function="USART1_ALT2" group="TXD" field="PORTMUX.USARTROUTEA.USART1"/>
+                <signal pad-key="pc1" function="USART1" group="RXD" field="PORTMUX.USARTROUTEA.USART1"/>
+                <signal pad-key="pc0" function="USART1" group="TXD" field="PORTMUX.USARTROUTEA.USART1"/>
+                <signal pad-key="pc2" function="USART1" group="XCK" field="PORTMUX.USARTROUTEA.USART1"/>
+                <signal pad-key="pc3" function="USART1" group="XDIR" field="PORTMUX.USARTROUTEA.USART1"/>
+                <signal pad-key="pd7" function="USART1_ALT2" group="RXD" field="PORTMUX.USARTROUTEA.USART1"/>
+                <signal pad-key="pd6" function="USART1_ALT2" group="TXD" field="PORTMUX.USARTROUTEA.USART1"/>
             </signals>
         </peripheral>
         <peripheral key="userrow" name="USERROW" module-key="avrdd_userrow">
@@ -400,8 +400,8 @@
         <peripheral key="zcd3" name="ZCD3" module-key="cmp_zxover_ctrl_v3">
             <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"/>
+                <signal pad-key="pc2" function="ZCD3" group="IN" field="PORTMUX.ZCDROUTEA.ZCD3"/>
+                <signal pad-key="pa7" function="ZCD3" group="OUT" field="PORTMUX.ZCDROUTEA.ZCD3"/>
             </signals>
         </peripheral>
     </peripherals>
@@ -1655,43 +1655,77 @@
             </register-group>
         </module>
     </modules>
+    <pads>
+        <pad key="pa3" name="PA3"/>
+        <pad key="pa4" name="PA4"/>
+        <pad key="pa5" name="PA5"/>
+        <pad key="pa6" name="PA6"/>
+        <pad key="pa7" name="PA7"/>
+        <pad key="pc0" name="PC0"/>
+        <pad key="pc1" name="PC1"/>
+        <pad key="pc2" name="PC2"/>
+        <pad key="pc3" name="PC3"/>
+        <pad key="vddio2" name="VDDIO2"/>
+        <pad key="pd1" name="PD1"/>
+        <pad key="pd2" name="PD2"/>
+        <pad key="pd3" name="PD3"/>
+        <pad key="pd4" name="PD4"/>
+        <pad key="pd5" name="PD5"/>
+        <pad key="pd6" name="PD6"/>
+        <pad key="pd7" name="PD7"/>
+        <pad key="avdd" name="AVDD"/>
+        <pad key="agnd" name="AGND"/>
+        <pad key="pf0" name="PF0"/>
+        <pad key="pf1" name="PF1"/>
+        <pad key="pf2" name="PF2"/>
+        <pad key="pf3" name="PF3"/>
+        <pad key="pf4" name="PF4"/>
+        <pad key="pf5" name="PF5"/>
+        <pad key="pf6" name="PF6"/>
+        <pad key="pf7" name="PF7"/>
+        <pad key="vdd0" name="VDD0"/>
+        <pad key="gnd0" name="GND0"/>
+        <pad key="pa0" name="PA0"/>
+        <pad key="pa1" name="PA1"/>
+        <pad key="pa2" name="PA2"/>
+    </pads>
     <pinouts>
         <pinout key="qfn32mvio" name="QFN32MVIO" type="qfn">
-            <pin position="1" pad="PA3"/>
-            <pin position="2" pad="PA4"/>
-            <pin position="3" pad="PA5"/>
-            <pin position="4" pad="PA6"/>
-            <pin position="5" pad="PA7"/>
-            <pin position="6" pad="PC0"/>
-            <pin position="7" pad="PC1"/>
-            <pin position="8" pad="PC2"/>
-            <pin position="9" pad="PC3"/>
-            <pin position="10" pad="VDDIO2"/>
-            <pin position="11" pad="PD1"/>
-            <pin position="12" pad="PD2"/>
-            <pin position="13" pad="PD3"/>
-            <pin position="14" pad="PD4"/>
-            <pin position="15" pad="PD5"/>
-            <pin position="16" pad="PD6"/>
-            <pin position="17" pad="PD7"/>
-            <pin position="18" pad="AVDD"/>
-            <pin position="19" pad="AGND"/>
-            <pin position="20" pad="PF0"/>
-            <pin position="21" pad="PF1"/>
-            <pin position="22" pad="PF2"/>
-            <pin position="23" pad="PF3"/>
-            <pin position="24" pad="PF4"/>
-            <pin position="25" pad="PF5"/>
-            <pin position="26" pad="PF6"/>
-            <pin position="27" pad="PF7"/>
-            <pin position="28" pad="VDD0"/>
-            <pin position="29" pad="GND0"/>
-            <pin position="30" pad="PA0"/>
-            <pin position="31" pad="PA1"/>
-            <pin position="32" pad="PA2"/>
+            <pin position="1" pad-key="pa3"/>
+            <pin position="2" pad-key="pa4"/>
+            <pin position="3" pad-key="pa5"/>
+            <pin position="4" pad-key="pa6"/>
+            <pin position="5" pad-key="pa7"/>
+            <pin position="6" pad-key="pc0"/>
+            <pin position="7" pad-key="pc1"/>
+            <pin position="8" pad-key="pc2"/>
+            <pin position="9" pad-key="pc3"/>
+            <pin position="10" pad-key="vddio2"/>
+            <pin position="11" pad-key="pd1"/>
+            <pin position="12" pad-key="pd2"/>
+            <pin position="13" pad-key="pd3"/>
+            <pin position="14" pad-key="pd4"/>
+            <pin position="15" pad-key="pd5"/>
+            <pin position="16" pad-key="pd6"/>
+            <pin position="17" pad-key="pd7"/>
+            <pin position="18" pad-key="avdd"/>
+            <pin position="19" pad-key="agnd"/>
+            <pin position="20" pad-key="pf0"/>
+            <pin position="21" pad-key="pf1"/>
+            <pin position="22" pad-key="pf2"/>
+            <pin position="23" pad-key="pf3"/>
+            <pin position="24" pad-key="pf4"/>
+            <pin position="25" pad-key="pf5"/>
+            <pin position="26" pad-key="pf6"/>
+            <pin position="27" pad-key="pf7"/>
+            <pin position="28" pad-key="vdd0"/>
+            <pin position="29" pad-key="gnd0"/>
+            <pin position="30" pad-key="pa0"/>
+            <pin position="31" pad-key="pa1"/>
+            <pin position="32" pad-key="pa2"/>
         </pinout>
     </pinouts>
     <variants>
-        <variant name="AVR32DD32" pinout-key="qfn32mvio" package="QFN32"/>
+        <variant key="avr32dd32" name="AVR32DD32" pinout-key="qfn32mvio"/>
     </variants>
 </device>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR64DA28.xml b/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR64DA28.xml
index 7f91b64c..3f74548f 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR64DA28.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR64DA28.xml
@@ -44,52 +44,52 @@
         <peripheral key="ac0" name="AC0" module-key="cmp_control_v8">
             <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"/>
-                <signal pad-id="pd7" index="2" function="AC0" group="N"/>
-                <signal pad-id="pa7" index="0" function="AC0" group="OUT" field="PORTMUX.ACROUTEA.AC0"/>
-                <signal pad-id="pd2" index="0" function="AC0" group="P"/>
-                <signal pad-id="pd6" index="3" function="AC0" group="P"/>
+                <signal pad-key="pd3" index="0" function="AC0" group="N"/>
+                <signal pad-key="pd0" index="1" function="AC0" group="N"/>
+                <signal pad-key="pd7" index="2" function="AC0" group="N"/>
+                <signal pad-key="pa7" index="0" function="AC0" group="OUT" field="PORTMUX.ACROUTEA.AC0"/>
+                <signal pad-key="pd2" index="0" function="AC0" group="P"/>
+                <signal pad-key="pd6" index="3" function="AC0" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="ac1" name="AC1" module-key="cmp_control_v8">
             <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"/>
-                <signal pad-id="pd7" index="2" function="AC1" group="N"/>
-                <signal pad-id="pa7" index="0" function="AC1" group="OUT" field="PORTMUX.ACROUTEA.AC1"/>
-                <signal pad-id="pd2" index="0" function="AC1" group="P"/>
-                <signal pad-id="pd3" index="1" function="AC1" group="P"/>
-                <signal pad-id="pd4" index="2" function="AC1" group="P"/>
-                <signal pad-id="pd6" index="3" function="AC1" group="P"/>
+                <signal pad-key="pd5" index="0" function="AC1" group="N"/>
+                <signal pad-key="pd0" index="1" function="AC1" group="N"/>
+                <signal pad-key="pd7" index="2" function="AC1" group="N"/>
+                <signal pad-key="pa7" index="0" function="AC1" group="OUT" field="PORTMUX.ACROUTEA.AC1"/>
+                <signal pad-key="pd2" index="0" function="AC1" group="P"/>
+                <signal pad-key="pd3" index="1" function="AC1" group="P"/>
+                <signal pad-key="pd4" index="2" function="AC1" group="P"/>
+                <signal pad-key="pd6" index="3" function="AC1" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="ac2" name="AC2" module-key="cmp_control_v8">
             <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"/>
-                <signal pad-id="pd7" index="2" function="AC2" group="N"/>
-                <signal pad-id="pa7" index="0" function="AC2" group="OUT" field="PORTMUX.ACROUTEA.AC2"/>
-                <signal pad-id="pd2" index="0" function="AC2" group="P"/>
-                <signal pad-id="pd4" index="1" function="AC2" group="P"/>
-                <signal pad-id="pd6" index="3" function="AC2" group="P"/>
+                <signal pad-key="pd7" index="0" function="AC2" group="N"/>
+                <signal pad-key="pd0" index="1" function="AC2" group="N"/>
+                <signal pad-key="pd7" index="2" function="AC2" group="N"/>
+                <signal pad-key="pa7" index="0" function="AC2" group="OUT" field="PORTMUX.ACROUTEA.AC2"/>
+                <signal pad-key="pd2" index="0" function="AC2" group="P"/>
+                <signal pad-key="pd4" index="1" function="AC2" group="P"/>
+                <signal pad-key="pd6" index="3" function="AC2" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="adc0" name="ADC0" module-key="adc_12b_diff_ctrl_v1">
             <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"/>
-                <signal pad-id="pd2" index="2" function="AIN0" group="AIN"/>
-                <signal pad-id="pd3" index="3" function="AIN0" group="AIN"/>
-                <signal pad-id="pd4" index="4" function="AIN0" group="AIN"/>
-                <signal pad-id="pd5" index="5" function="AIN0" group="AIN"/>
-                <signal pad-id="pd6" index="6" function="AIN0" group="AIN"/>
-                <signal pad-id="pd7" index="7" function="AIN0" group="AIN"/>
-                <signal pad-id="pf0" index="16" function="AIN0" group="AIN"/>
-                <signal pad-id="pf1" index="17" function="AIN0" group="AIN"/>
+                <signal pad-key="pd0" index="0" function="AIN0" group="AIN"/>
+                <signal pad-key="pd1" index="1" function="AIN0" group="AIN"/>
+                <signal pad-key="pd2" index="2" function="AIN0" group="AIN"/>
+                <signal pad-key="pd3" index="3" function="AIN0" group="AIN"/>
+                <signal pad-key="pd4" index="4" function="AIN0" group="AIN"/>
+                <signal pad-key="pd5" index="5" function="AIN0" group="AIN"/>
+                <signal pad-key="pd6" index="6" function="AIN0" group="AIN"/>
+                <signal pad-key="pd7" index="7" function="AIN0" group="AIN"/>
+                <signal pad-key="pf0" index="16" function="AIN0" group="AIN"/>
+                <signal pad-key="pf1" index="17" function="AIN0" group="AIN"/>
             </signals>
         </peripheral>
         <peripheral key="bod" name="BOD" module-key="bor_lvd_ctrl_v1">
@@ -98,31 +98,31 @@
         <peripheral key="ccl" name="CCL" module-key="cla_ccl_v1">
             <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"/>
-                <signal pad-id="pa2" index="2" function="CCL_IN" group="LUT0_IN"/>
-                <signal pad-id="pa6" index="0" function="CCL_ALT" group="LUT0_OUT" field="PORTMUX.CCLROUTEA.LUT0"/>
-                <signal pad-id="pa3" index="0" function="CCL" group="LUT0_OUT" field="PORTMUX.CCLROUTEA.LUT0"/>
-                <signal pad-id="pc0" index="0" function="CCL_IN" group="LUT1_IN"/>
-                <signal pad-id="pc1" index="1" function="CCL_IN" group="LUT1_IN"/>
-                <signal pad-id="pc2" index="2" function="CCL_IN" group="LUT1_IN"/>
-                <signal pad-id="pc3" index="0" function="CCL" group="LUT1_OUT" field="PORTMUX.CCLROUTEA.LUT1"/>
-                <signal pad-id="pd0" index="0" function="CCL_IN" group="LUT2_IN"/>
-                <signal pad-id="pd1" index="1" function="CCL_IN" group="LUT2_IN"/>
-                <signal pad-id="pd2" index="2" function="CCL_IN" group="LUT2_IN"/>
-                <signal pad-id="pd6" index="0" function="CCL_ALT" group="LUT2_OUT" field="PORTMUX.CCLROUTEA.LUT2"/>
-                <signal pad-id="pd3" index="0" function="CCL" group="LUT2_OUT" field="PORTMUX.CCLROUTEA.LUT2"/>
-                <signal pad-id="pf0" index="0" function="CCL_IN" group="LUT3_IN"/>
-                <signal pad-id="pf1" index="1" function="CCL_IN" group="LUT3_IN"/>
+                <signal pad-key="pa0" index="0" function="CCL_IN" group="LUT0_IN"/>
+                <signal pad-key="pa1" index="1" function="CCL_IN" group="LUT0_IN"/>
+                <signal pad-key="pa2" index="2" function="CCL_IN" group="LUT0_IN"/>
+                <signal pad-key="pa6" index="0" function="CCL_ALT" group="LUT0_OUT" field="PORTMUX.CCLROUTEA.LUT0"/>
+                <signal pad-key="pa3" index="0" function="CCL" group="LUT0_OUT" field="PORTMUX.CCLROUTEA.LUT0"/>
+                <signal pad-key="pc0" index="0" function="CCL_IN" group="LUT1_IN"/>
+                <signal pad-key="pc1" index="1" function="CCL_IN" group="LUT1_IN"/>
+                <signal pad-key="pc2" index="2" function="CCL_IN" group="LUT1_IN"/>
+                <signal pad-key="pc3" index="0" function="CCL" group="LUT1_OUT" field="PORTMUX.CCLROUTEA.LUT1"/>
+                <signal pad-key="pd0" index="0" function="CCL_IN" group="LUT2_IN"/>
+                <signal pad-key="pd1" index="1" function="CCL_IN" group="LUT2_IN"/>
+                <signal pad-key="pd2" index="2" function="CCL_IN" group="LUT2_IN"/>
+                <signal pad-key="pd6" index="0" function="CCL_ALT" group="LUT2_OUT" field="PORTMUX.CCLROUTEA.LUT2"/>
+                <signal pad-key="pd3" index="0" function="CCL" group="LUT2_OUT" field="PORTMUX.CCLROUTEA.LUT2"/>
+                <signal pad-key="pf0" index="0" function="CCL_IN" group="LUT3_IN"/>
+                <signal pad-key="pf1" index="1" function="CCL_IN" group="LUT3_IN"/>
             </signals>
         </peripheral>
         <peripheral key="clkctrl" name="CLKCTRL" module-key="avrda_clkctrl">
             <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"/>
-                <signal pad-id="pf0" function="CLKCTRL" group="XTAL32K1"/>
-                <signal pad-id="pf1" function="CLKCTRL" group="XTAL32K2"/>
+                <signal pad-key="pa7" function="CLKCTRL" group="CLKOUT"/>
+                <signal pad-key="pa0" function="CLKCTRL" group="EXTCLK"/>
+                <signal pad-key="pf0" function="CLKCTRL" group="XTAL32K1"/>
+                <signal pad-key="pf1" function="CLKCTRL" group="XTAL32K2"/>
             </signals>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="cpu_avr_xt_v1">
@@ -137,17 +137,17 @@
         <peripheral key="dac0" name="DAC0" module-key="dac_nbit_ctrl_v5">
             <register-group-instance register-group-key="dac" address-space-key="data" offset="0x6A0"/>
             <signals>
-                <signal pad-id="pd6" index="0" function="DAC0" group="OUT"/>
+                <signal pad-key="pd6" index="0" function="DAC0" group="OUT"/>
             </signals>
         </peripheral>
         <peripheral key="evsys" name="EVSYS" module-key="avrda_evsys">
             <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"/>
-                <signal pad-id="pc2" index="2" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTC"/>
-                <signal pad-id="pd7" index="3" function="EVSYS_ALT" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTD"/>
-                <signal pad-id="pd2" index="3" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTD"/>
+                <signal pad-key="pa7" index="0" function="EVSYS_ALT" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTA"/>
+                <signal pad-key="pa2" index="0" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTA"/>
+                <signal pad-key="pc2" index="2" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTC"/>
+                <signal pad-key="pd7" index="3" function="EVSYS_ALT" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTD"/>
+                <signal pad-key="pd2" index="3" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTD"/>
             </signals>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="avrda_fuse">
@@ -165,44 +165,44 @@
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pa2" index="2" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa3" index="3" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa4" index="4" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa5" index="5" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa6" index="6" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa7" index="7" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa0" index="0" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa1" index="1" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa2" index="2" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa3" index="3" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa4" index="4" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa5" index="5" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa6" index="6" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa7" index="7" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pc2" index="2" function="IOPORT" group="PIN"/>
-                <signal pad-id="pc3" index="3" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc0" index="0" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc1" index="1" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc2" index="2" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc3" index="3" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pd2" index="2" function="IOPORT" group="PIN"/>
-                <signal pad-id="pd3" index="3" function="IOPORT" group="PIN"/>
-                <signal pad-id="pd4" index="4" function="IOPORT" group="PIN"/>
-                <signal pad-id="pd5" index="5" function="IOPORT" group="PIN"/>
-                <signal pad-id="pd6" index="6" function="IOPORT" group="PIN"/>
-                <signal pad-id="pd7" index="7" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd0" index="0" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd1" index="1" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd2" index="2" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd3" index="3" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd4" index="4" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd5" index="5" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd6" index="6" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd7" index="7" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="portf" name="PORTF" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pf6" index="6" function="IOPORT" group="PIN"/>
+                <signal pad-key="pf0" index="0" function="IOPORT" group="PIN"/>
+                <signal pad-key="pf1" index="1" function="IOPORT" group="PIN"/>
+                <signal pad-key="pf6" index="6" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="portmux" name="PORTMUX" module-key="avrda_portmux">
@@ -210,30 +210,30 @@
         </peripheral>
         <peripheral key="ptc" name="PTC" module-key="adc_ptc_ctrl_v1">
             <signals>
-                <signal pad-id="pa0" index="0" function="PTC" group="XY"/>
-                <signal pad-id="pa1" index="1" function="PTC" group="XY"/>
-                <signal pad-id="pa2" index="2" function="PTC" group="XY"/>
-                <signal pad-id="pa3" index="3" function="PTC" group="XY"/>
-                <signal pad-id="pa4" index="4" function="PTC" group="XY"/>
-                <signal pad-id="pa5" index="5" function="PTC" group="XY"/>
-                <signal pad-id="pa6" index="6" function="PTC" group="XY"/>
-                <signal pad-id="pa7" index="7" function="PTC" group="XY"/>
-                <signal pad-id="pd0" index="16" function="PTC" group="XY"/>
-                <signal pad-id="pd1" index="17" function="PTC" group="XY"/>
-                <signal pad-id="pd2" index="18" function="PTC" group="XY"/>
-                <signal pad-id="pd3" index="19" function="PTC" group="XY"/>
-                <signal pad-id="pd4" index="20" function="PTC" group="XY"/>
-                <signal pad-id="pd5" index="21" function="PTC" group="XY"/>
-                <signal pad-id="pd6" index="22" function="PTC" group="XY"/>
-                <signal pad-id="pd7" index="23" function="PTC" group="XY"/>
-                <signal pad-id="pf0" index="32" function="PTC" group="XY"/>
-                <signal pad-id="pf1" index="33" function="PTC" group="XY"/>
+                <signal pad-key="pa0" index="0" function="PTC" group="XY"/>
+                <signal pad-key="pa1" index="1" function="PTC" group="XY"/>
+                <signal pad-key="pa2" index="2" function="PTC" group="XY"/>
+                <signal pad-key="pa3" index="3" function="PTC" group="XY"/>
+                <signal pad-key="pa4" index="4" function="PTC" group="XY"/>
+                <signal pad-key="pa5" index="5" function="PTC" group="XY"/>
+                <signal pad-key="pa6" index="6" function="PTC" group="XY"/>
+                <signal pad-key="pa7" index="7" function="PTC" group="XY"/>
+                <signal pad-key="pd0" index="16" function="PTC" group="XY"/>
+                <signal pad-key="pd1" index="17" function="PTC" group="XY"/>
+                <signal pad-key="pd2" index="18" function="PTC" group="XY"/>
+                <signal pad-key="pd3" index="19" function="PTC" group="XY"/>
+                <signal pad-key="pd4" index="20" function="PTC" group="XY"/>
+                <signal pad-key="pd5" index="21" function="PTC" group="XY"/>
+                <signal pad-key="pd6" index="22" function="PTC" group="XY"/>
+                <signal pad-key="pd7" index="23" function="PTC" group="XY"/>
+                <signal pad-key="pf0" index="32" function="PTC" group="XY"/>
+                <signal pad-key="pf1" index="33" function="PTC" group="XY"/>
             </signals>
         </peripheral>
         <peripheral key="rstctrl" name="RSTCTRL" module-key="rst_integration_v8">
             <register-group-instance register-group-key="rstctrl" address-space-key="data" offset="0x40"/>
             <signals>
-                <signal pad-id="pf6" function="OTHER" group="RESET"/>
+                <signal pad-key="pf6" function="OTHER" group="RESET"/>
             </signals>
         </peripheral>
         <peripheral key="rtc" name="RTC" module-key="tmr_16b_rtc_v1">
@@ -248,19 +248,19 @@
         <peripheral key="spi0" name="SPI0" module-key="spi_8bit_v2">
             <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"/>
-                <signal pad-id="pa6" function="SPI0" group="SCK" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <signal pad-id="pa7" function="SPI0" group="SS" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pa5" function="SPI0" group="MISO" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pa4" function="SPI0" group="MOSI" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pa6" function="SPI0" group="SCK" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pa7" function="SPI0" group="SS" field="PORTMUX.SPIROUTEA.SPI0"/>
             </signals>
         </peripheral>
         <peripheral key="spi1" name="SPI1" module-key="spi_8bit_v2">
             <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"/>
-                <signal pad-id="pc2" function="SPI1" group="SCK" field="PORTMUX.SPIROUTEA.SPI1"/>
-                <signal pad-id="pc3" function="SPI1" group="SS" field="PORTMUX.SPIROUTEA.SPI1"/>
+                <signal pad-key="pc1" function="SPI1" group="MISO" field="PORTMUX.SPIROUTEA.SPI1"/>
+                <signal pad-key="pc0" function="SPI1" group="MOSI" field="PORTMUX.SPIROUTEA.SPI1"/>
+                <signal pad-key="pc2" function="SPI1" group="SCK" field="PORTMUX.SPIROUTEA.SPI1"/>
+                <signal pad-key="pc3" function="SPI1" group="SS" field="PORTMUX.SPIROUTEA.SPI1"/>
             </signals>
         </peripheral>
         <peripheral key="syscfg" name="SYSCFG" module-key="avrda_syscfg">
@@ -269,95 +269,95 @@
         <peripheral key="tca0" name="TCA0" module-key="tmr_16b_pwm_v1">
             <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"/>
-                <signal pad-id="pc0" index="0" function="TCA0_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pa0" index="0" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pf1" index="1" function="TCA0_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pd1" index="1" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pc1" index="1" function="TCA0_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pa1" index="1" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pd2" index="2" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pc2" index="2" function="TCA0_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pa2" index="2" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pd3" index="3" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pc3" index="3" function="TCA0_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pa3" index="3" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pd4" index="4" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pa4" index="4" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pd5" index="5" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pa5" index="5" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pf0" index="0" function="TCA0_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pd0" index="0" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pc0" index="0" function="TCA0_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pa0" index="0" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pf1" index="1" function="TCA0_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pd1" index="1" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pc1" index="1" function="TCA0_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pa1" index="1" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pd2" index="2" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pc2" index="2" function="TCA0_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pa2" index="2" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pd3" index="3" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pc3" index="3" function="TCA0_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pa3" index="3" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pd4" index="4" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pa4" index="4" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pd5" index="5" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pa5" index="5" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
             </signals>
         </peripheral>
         <peripheral key="tcb0" name="TCB0" module-key="tmr_16b_capture_v1">
             <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-key="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 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-key="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 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"/>
+                <signal pad-key="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 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"/>
-                <signal pad-id="pf1" index="1" function="TCD0_ALT2" group="WOB" field="PORTMUX.TCDROUTEA.TCD0"/>
-                <signal pad-id="pa5" index="1" function="TCD0" group="WOB" field="PORTMUX.TCDROUTEA.TCD0"/>
-                <signal pad-id="pa6" index="2" function="TCD0" group="WOC" field="PORTMUX.TCDROUTEA.TCD0"/>
-                <signal pad-id="pa7" index="3" function="TCD0" group="WOD" field="PORTMUX.TCDROUTEA.TCD0"/>
+                <signal pad-key="pf0" function="TCD0_ALT2" group="WOA" field="PORTMUX.TCDROUTEA.TCD0"/>
+                <signal pad-key="pa4" function="TCD0" group="WOA" field="PORTMUX.TCDROUTEA.TCD0"/>
+                <signal pad-key="pf1" index="1" function="TCD0_ALT2" group="WOB" field="PORTMUX.TCDROUTEA.TCD0"/>
+                <signal pad-key="pa5" index="1" function="TCD0" group="WOB" field="PORTMUX.TCDROUTEA.TCD0"/>
+                <signal pad-key="pa6" index="2" function="TCD0" group="WOC" field="PORTMUX.TCDROUTEA.TCD0"/>
+                <signal pad-key="pa7" index="3" function="TCD0" group="WOD" field="PORTMUX.TCDROUTEA.TCD0"/>
             </signals>
         </peripheral>
         <peripheral key="twi0" name="TWI0" module-key="i2c_8bit_v2">
             <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"/>
-                <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"/>
-                <signal pad-id="pc2" function="I2C0_ALT2" group="SDA" field="PORTMUX.TWIROUTEA.TWI0"/>
-                <signal pad-id="pa2" function="I2C0_ALT1" group="SDA" field="PORTMUX.TWIROUTEA.TWI0"/>
-                <signal pad-id="pa2" function="I2C0" group="SDA" field="PORTMUX.TWIROUTEA.TWI0"/>
-                <signal pad-id="pc2" function="I2C0" group="SDA_DUAL" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pc3" function="I2C0_ALT2" group="SCL" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pa3" function="I2C0_ALT1" group="SCL" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pa3" function="I2C0" group="SCL" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pc3" function="I2C0" group="SCL_DUAL" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pc2" function="I2C0_ALT2" group="SDA" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pa2" function="I2C0_ALT1" group="SDA" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pa2" function="I2C0" group="SDA" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pc2" function="I2C0" group="SDA_DUAL" field="PORTMUX.TWIROUTEA.TWI0"/>
             </signals>
         </peripheral>
         <peripheral key="usart0" name="USART0" module-key="uart_autobd_v4">
             <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"/>
-                <signal pad-id="pa4" function="USART0_ALT" group="TXD" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pa0" function="USART0" group="TXD" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pa6" function="USART0_ALT" group="XCK" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pa2" function="USART0" group="XCK" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pa7" function="USART0_ALT" group="XDIR" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pa3" function="USART0" group="XDIR" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa5" function="USART0_ALT" group="RXD" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa1" function="USART0" group="RXD" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa4" function="USART0_ALT" group="TXD" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa0" function="USART0" group="TXD" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa6" function="USART0_ALT" group="XCK" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa2" function="USART0" group="XCK" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa7" function="USART0_ALT" group="XDIR" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa3" function="USART0" group="XDIR" field="PORTMUX.USARTROUTEA.USART0"/>
             </signals>
         </peripheral>
         <peripheral key="usart1" name="USART1" module-key="uart_autobd_v4">
             <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"/>
-                <signal pad-id="pc2" function="USART1" group="XCK" field="PORTMUX.USARTROUTEA.USART1"/>
-                <signal pad-id="pc3" function="USART1" group="XDIR" field="PORTMUX.USARTROUTEA.USART1"/>
+                <signal pad-key="pc1" function="USART1" group="RXD" field="PORTMUX.USARTROUTEA.USART1"/>
+                <signal pad-key="pc0" function="USART1" group="TXD" field="PORTMUX.USARTROUTEA.USART1"/>
+                <signal pad-key="pc2" function="USART1" group="XCK" field="PORTMUX.USARTROUTEA.USART1"/>
+                <signal pad-key="pc3" function="USART1" group="XDIR" field="PORTMUX.USARTROUTEA.USART1"/>
             </signals>
         </peripheral>
         <peripheral key="usart2" name="USART2" module-key="uart_autobd_v4">
             <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"/>
+                <signal pad-key="pf1" function="USART2" group="RXD" field="PORTMUX.USARTROUTEA.USART2"/>
+                <signal pad-key="pf0" function="USART2" group="TXD" field="PORTMUX.USARTROUTEA.USART2"/>
             </signals>
         </peripheral>
         <peripheral key="userrow" name="USERROW" module-key="avrda_userrow">
@@ -384,8 +384,8 @@
         <peripheral key="zcd0" name="ZCD0" module-key="cmp_zxover_ctrl_v3">
             <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"/>
+                <signal pad-key="pd1" function="ZCD0" group="IN"/>
+                <signal pad-key="pa7" function="ZCD0" group="OUT" field="PORTMUX.ZCDROUTEA.ZCD0"/>
             </signals>
         </peripheral>
     </peripherals>
@@ -1607,39 +1607,69 @@
             </register-group>
         </module>
     </modules>
+    <pads>
+        <pad key="pa7" name="PA7"/>
+        <pad key="pc0" name="PC0"/>
+        <pad key="pc1" name="PC1"/>
+        <pad key="pc2" name="PC2"/>
+        <pad key="pc3" name="PC3"/>
+        <pad key="pd0" name="PD0"/>
+        <pad key="pd1" name="PD1"/>
+        <pad key="pd2" name="PD2"/>
+        <pad key="pd3" name="PD3"/>
+        <pad key="pd4" name="PD4"/>
+        <pad key="pd5" name="PD5"/>
+        <pad key="pd6" name="PD6"/>
+        <pad key="pd7" name="PD7"/>
+        <pad key="avdd" name="AVDD"/>
+        <pad key="agnd" name="AGND"/>
+        <pad key="pf0" name="PF0"/>
+        <pad key="pf1" name="PF1"/>
+        <pad key="pf6" name="PF6"/>
+        <pad key="updi" name="UPDI"/>
+        <pad key="vdd0" name="VDD0"/>
+        <pad key="gnd0" name="GND0"/>
+        <pad key="pa0" name="PA0"/>
+        <pad key="pa1" name="PA1"/>
+        <pad key="pa2" name="PA2"/>
+        <pad key="pa3" name="PA3"/>
+        <pad key="pa4" name="PA4"/>
+        <pad key="pa5" name="PA5"/>
+        <pad key="pa6" name="PA6"/>
+    </pads>
     <pinouts>
         <pinout key="soic28" name="SOIC28" type="soic">
-            <pin position="1" pad="PA7"/>
-            <pin position="2" pad="PC0"/>
-            <pin position="3" pad="PC1"/>
-            <pin position="4" pad="PC2"/>
-            <pin position="5" pad="PC3"/>
-            <pin position="6" pad="PD0"/>
-            <pin position="7" pad="PD1"/>
-            <pin position="8" pad="PD2"/>
-            <pin position="9" pad="PD3"/>
-            <pin position="10" pad="PD4"/>
-            <pin position="11" pad="PD5"/>
-            <pin position="12" pad="PD6"/>
-            <pin position="13" pad="PD7"/>
-            <pin position="14" pad="AVDD"/>
-            <pin position="15" pad="AGND"/>
-            <pin position="16" pad="PF0"/>
-            <pin position="17" pad="PF1"/>
-            <pin position="18" pad="PF6"/>
-            <pin position="19" pad="UPDI"/>
-            <pin position="20" pad="VDD0"/>
-            <pin position="21" pad="GND0"/>
-            <pin position="22" pad="PA0"/>
-            <pin position="23" pad="PA1"/>
-            <pin position="24" pad="PA2"/>
-            <pin position="25" pad="PA3"/>
-            <pin position="26" pad="PA4"/>
-            <pin position="27" pad="PA5"/>
-            <pin position="28" pad="PA6"/>
+            <pin position="1" pad-key="pa7"/>
+            <pin position="2" pad-key="pc0"/>
+            <pin position="3" pad-key="pc1"/>
+            <pin position="4" pad-key="pc2"/>
+            <pin position="5" pad-key="pc3"/>
+            <pin position="6" pad-key="pd0"/>
+            <pin position="7" pad-key="pd1"/>
+            <pin position="8" pad-key="pd2"/>
+            <pin position="9" pad-key="pd3"/>
+            <pin position="10" pad-key="pd4"/>
+            <pin position="11" pad-key="pd5"/>
+            <pin position="12" pad-key="pd6"/>
+            <pin position="13" pad-key="pd7"/>
+            <pin position="14" pad-key="avdd"/>
+            <pin position="15" pad-key="agnd"/>
+            <pin position="16" pad-key="pf0"/>
+            <pin position="17" pad-key="pf1"/>
+            <pin position="18" pad-key="pf6"/>
+            <pin position="19" pad-key="updi"/>
+            <pin position="20" pad-key="vdd0"/>
+            <pin position="21" pad-key="gnd0"/>
+            <pin position="22" pad-key="pa0"/>
+            <pin position="23" pad-key="pa1"/>
+            <pin position="24" pad-key="pa2"/>
+            <pin position="25" pad-key="pa3"/>
+            <pin position="26" pad-key="pa4"/>
+            <pin position="27" pad-key="pa5"/>
+            <pin position="28" pad-key="pa6"/>
         </pinout>
     </pinouts>
     <variants>
-        <variant name="AVR64DA28" pinout-key="soic28" package="SOIC28"/>
+        <variant key="avr64da28" name="AVR64DA28" pinout-key="soic28"/>
     </variants>
 </device>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR64DA32.xml b/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR64DA32.xml
index c86b2e60..2e95b046 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR64DA32.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR64DA32.xml
@@ -44,56 +44,56 @@
         <peripheral key="ac0" name="AC0" module-key="cmp_control_v8">
             <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"/>
-                <signal pad-id="pd7" index="2" function="AC0" group="N"/>
-                <signal pad-id="pa7" index="0" function="AC0" group="OUT" field="PORTMUX.ACROUTEA.AC0"/>
-                <signal pad-id="pd2" index="0" function="AC0" group="P"/>
-                <signal pad-id="pd6" index="3" function="AC0" group="P"/>
+                <signal pad-key="pd3" index="0" function="AC0" group="N"/>
+                <signal pad-key="pd0" index="1" function="AC0" group="N"/>
+                <signal pad-key="pd7" index="2" function="AC0" group="N"/>
+                <signal pad-key="pa7" index="0" function="AC0" group="OUT" field="PORTMUX.ACROUTEA.AC0"/>
+                <signal pad-key="pd2" index="0" function="AC0" group="P"/>
+                <signal pad-key="pd6" index="3" function="AC0" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="ac1" name="AC1" module-key="cmp_control_v8">
             <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"/>
-                <signal pad-id="pd7" index="2" function="AC1" group="N"/>
-                <signal pad-id="pa7" index="0" function="AC1" group="OUT" field="PORTMUX.ACROUTEA.AC1"/>
-                <signal pad-id="pd2" index="0" function="AC1" group="P"/>
-                <signal pad-id="pd3" index="1" function="AC1" group="P"/>
-                <signal pad-id="pd4" index="2" function="AC1" group="P"/>
-                <signal pad-id="pd6" index="3" function="AC1" group="P"/>
+                <signal pad-key="pd5" index="0" function="AC1" group="N"/>
+                <signal pad-key="pd0" index="1" function="AC1" group="N"/>
+                <signal pad-key="pd7" index="2" function="AC1" group="N"/>
+                <signal pad-key="pa7" index="0" function="AC1" group="OUT" field="PORTMUX.ACROUTEA.AC1"/>
+                <signal pad-key="pd2" index="0" function="AC1" group="P"/>
+                <signal pad-key="pd3" index="1" function="AC1" group="P"/>
+                <signal pad-key="pd4" index="2" function="AC1" group="P"/>
+                <signal pad-key="pd6" index="3" function="AC1" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="ac2" name="AC2" module-key="cmp_control_v8">
             <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"/>
-                <signal pad-id="pd7" index="2" function="AC2" group="N"/>
-                <signal pad-id="pa7" index="0" function="AC2" group="OUT" field="PORTMUX.ACROUTEA.AC2"/>
-                <signal pad-id="pd2" index="0" function="AC2" group="P"/>
-                <signal pad-id="pd4" index="1" function="AC2" group="P"/>
-                <signal pad-id="pd6" index="3" function="AC2" group="P"/>
+                <signal pad-key="pd7" index="0" function="AC2" group="N"/>
+                <signal pad-key="pd0" index="1" function="AC2" group="N"/>
+                <signal pad-key="pd7" index="2" function="AC2" group="N"/>
+                <signal pad-key="pa7" index="0" function="AC2" group="OUT" field="PORTMUX.ACROUTEA.AC2"/>
+                <signal pad-key="pd2" index="0" function="AC2" group="P"/>
+                <signal pad-key="pd4" index="1" function="AC2" group="P"/>
+                <signal pad-key="pd6" index="3" function="AC2" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="adc0" name="ADC0" module-key="adc_12b_diff_ctrl_v1">
             <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"/>
-                <signal pad-id="pd2" index="2" function="AIN0" group="AIN"/>
-                <signal pad-id="pd3" index="3" function="AIN0" group="AIN"/>
-                <signal pad-id="pd4" index="4" function="AIN0" group="AIN"/>
-                <signal pad-id="pd5" index="5" function="AIN0" group="AIN"/>
-                <signal pad-id="pd6" index="6" function="AIN0" group="AIN"/>
-                <signal pad-id="pd7" index="7" function="AIN0" group="AIN"/>
-                <signal pad-id="pf0" index="16" function="AIN0" group="AIN"/>
-                <signal pad-id="pf1" index="17" function="AIN0" group="AIN"/>
-                <signal pad-id="pf2" index="18" function="AIN0" group="AIN"/>
-                <signal pad-id="pf3" index="19" function="AIN0" group="AIN"/>
-                <signal pad-id="pf4" index="20" function="AIN0" group="AIN"/>
-                <signal pad-id="pf5" index="21" function="AIN0" group="AIN"/>
+                <signal pad-key="pd0" index="0" function="AIN0" group="AIN"/>
+                <signal pad-key="pd1" index="1" function="AIN0" group="AIN"/>
+                <signal pad-key="pd2" index="2" function="AIN0" group="AIN"/>
+                <signal pad-key="pd3" index="3" function="AIN0" group="AIN"/>
+                <signal pad-key="pd4" index="4" function="AIN0" group="AIN"/>
+                <signal pad-key="pd5" index="5" function="AIN0" group="AIN"/>
+                <signal pad-key="pd6" index="6" function="AIN0" group="AIN"/>
+                <signal pad-key="pd7" index="7" function="AIN0" group="AIN"/>
+                <signal pad-key="pf0" index="16" function="AIN0" group="AIN"/>
+                <signal pad-key="pf1" index="17" function="AIN0" group="AIN"/>
+                <signal pad-key="pf2" index="18" function="AIN0" group="AIN"/>
+                <signal pad-key="pf3" index="19" function="AIN0" group="AIN"/>
+                <signal pad-key="pf4" index="20" function="AIN0" group="AIN"/>
+                <signal pad-key="pf5" index="21" function="AIN0" group="AIN"/>
             </signals>
         </peripheral>
         <peripheral key="bod" name="BOD" module-key="bor_lvd_ctrl_v1">
@@ -102,33 +102,33 @@
         <peripheral key="ccl" name="CCL" module-key="cla_ccl_v1">
             <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"/>
-                <signal pad-id="pa2" index="2" function="CCL_IN" group="LUT0_IN"/>
-                <signal pad-id="pa6" index="0" function="CCL_ALT" group="LUT0_OUT" field="PORTMUX.CCLROUTEA.LUT0"/>
-                <signal pad-id="pa3" index="0" function="CCL" group="LUT0_OUT" field="PORTMUX.CCLROUTEA.LUT0"/>
-                <signal pad-id="pc0" index="0" function="CCL_IN" group="LUT1_IN"/>
-                <signal pad-id="pc1" index="1" function="CCL_IN" group="LUT1_IN"/>
-                <signal pad-id="pc2" index="2" function="CCL_IN" group="LUT1_IN"/>
-                <signal pad-id="pc3" index="0" function="CCL" group="LUT1_OUT" field="PORTMUX.CCLROUTEA.LUT1"/>
-                <signal pad-id="pd0" index="0" function="CCL_IN" group="LUT2_IN"/>
-                <signal pad-id="pd1" index="1" function="CCL_IN" group="LUT2_IN"/>
-                <signal pad-id="pd2" index="2" function="CCL_IN" group="LUT2_IN"/>
-                <signal pad-id="pd6" index="0" function="CCL_ALT" group="LUT2_OUT" field="PORTMUX.CCLROUTEA.LUT2"/>
-                <signal pad-id="pd3" index="0" function="CCL" group="LUT2_OUT" field="PORTMUX.CCLROUTEA.LUT2"/>
-                <signal pad-id="pf0" index="0" function="CCL_IN" group="LUT3_IN"/>
-                <signal pad-id="pf1" index="1" function="CCL_IN" group="LUT3_IN"/>
-                <signal pad-id="pf2" index="2" function="CCL_IN" group="LUT3_IN"/>
-                <signal pad-id="pf3" index="0" function="CCL" group="LUT3_OUT" field="PORTMUX.CCLROUTEA.LUT3"/>
+                <signal pad-key="pa0" index="0" function="CCL_IN" group="LUT0_IN"/>
+                <signal pad-key="pa1" index="1" function="CCL_IN" group="LUT0_IN"/>
+                <signal pad-key="pa2" index="2" function="CCL_IN" group="LUT0_IN"/>
+                <signal pad-key="pa6" index="0" function="CCL_ALT" group="LUT0_OUT" field="PORTMUX.CCLROUTEA.LUT0"/>
+                <signal pad-key="pa3" index="0" function="CCL" group="LUT0_OUT" field="PORTMUX.CCLROUTEA.LUT0"/>
+                <signal pad-key="pc0" index="0" function="CCL_IN" group="LUT1_IN"/>
+                <signal pad-key="pc1" index="1" function="CCL_IN" group="LUT1_IN"/>
+                <signal pad-key="pc2" index="2" function="CCL_IN" group="LUT1_IN"/>
+                <signal pad-key="pc3" index="0" function="CCL" group="LUT1_OUT" field="PORTMUX.CCLROUTEA.LUT1"/>
+                <signal pad-key="pd0" index="0" function="CCL_IN" group="LUT2_IN"/>
+                <signal pad-key="pd1" index="1" function="CCL_IN" group="LUT2_IN"/>
+                <signal pad-key="pd2" index="2" function="CCL_IN" group="LUT2_IN"/>
+                <signal pad-key="pd6" index="0" function="CCL_ALT" group="LUT2_OUT" field="PORTMUX.CCLROUTEA.LUT2"/>
+                <signal pad-key="pd3" index="0" function="CCL" group="LUT2_OUT" field="PORTMUX.CCLROUTEA.LUT2"/>
+                <signal pad-key="pf0" index="0" function="CCL_IN" group="LUT3_IN"/>
+                <signal pad-key="pf1" index="1" function="CCL_IN" group="LUT3_IN"/>
+                <signal pad-key="pf2" index="2" function="CCL_IN" group="LUT3_IN"/>
+                <signal pad-key="pf3" index="0" function="CCL" group="LUT3_OUT" field="PORTMUX.CCLROUTEA.LUT3"/>
             </signals>
         </peripheral>
         <peripheral key="clkctrl" name="CLKCTRL" module-key="avrda_clkctrl">
             <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"/>
-                <signal pad-id="pf0" function="CLKCTRL" group="XTAL32K1"/>
-                <signal pad-id="pf1" function="CLKCTRL" group="XTAL32K2"/>
+                <signal pad-key="pa7" function="CLKCTRL" group="CLKOUT"/>
+                <signal pad-key="pa0" function="CLKCTRL" group="EXTCLK"/>
+                <signal pad-key="pf0" function="CLKCTRL" group="XTAL32K1"/>
+                <signal pad-key="pf1" function="CLKCTRL" group="XTAL32K2"/>
             </signals>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="cpu_avr_xt_v1">
@@ -143,18 +143,18 @@
         <peripheral key="dac0" name="DAC0" module-key="dac_nbit_ctrl_v5">
             <register-group-instance register-group-key="dac" address-space-key="data" offset="0x6A0"/>
             <signals>
-                <signal pad-id="pd6" index="0" function="DAC0" group="OUT"/>
+                <signal pad-key="pd6" index="0" function="DAC0" group="OUT"/>
             </signals>
         </peripheral>
         <peripheral key="evsys" name="EVSYS" module-key="avrda_evsys">
             <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"/>
-                <signal pad-id="pc2" index="2" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTC"/>
-                <signal pad-id="pd7" index="3" function="EVSYS_ALT" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTD"/>
-                <signal pad-id="pd2" index="3" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTD"/>
-                <signal pad-id="pf2" index="5" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTF"/>
+                <signal pad-key="pa7" index="0" function="EVSYS_ALT" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTA"/>
+                <signal pad-key="pa2" index="0" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTA"/>
+                <signal pad-key="pc2" index="2" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTC"/>
+                <signal pad-key="pd7" index="3" function="EVSYS_ALT" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTD"/>
+                <signal pad-key="pd2" index="3" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTD"/>
+                <signal pad-key="pf2" index="5" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTF"/>
             </signals>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="avrda_fuse">
@@ -172,48 +172,48 @@
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pa2" index="2" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa3" index="3" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa4" index="4" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa5" index="5" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa6" index="6" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa7" index="7" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa0" index="0" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa1" index="1" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa2" index="2" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa3" index="3" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa4" index="4" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa5" index="5" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa6" index="6" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa7" index="7" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pc2" index="2" function="IOPORT" group="PIN"/>
-                <signal pad-id="pc3" index="3" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc0" index="0" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc1" index="1" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc2" index="2" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc3" index="3" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pd2" index="2" function="IOPORT" group="PIN"/>
-                <signal pad-id="pd3" index="3" function="IOPORT" group="PIN"/>
-                <signal pad-id="pd4" index="4" function="IOPORT" group="PIN"/>
-                <signal pad-id="pd5" index="5" function="IOPORT" group="PIN"/>
-                <signal pad-id="pd6" index="6" function="IOPORT" group="PIN"/>
-                <signal pad-id="pd7" index="7" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd0" index="0" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd1" index="1" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd2" index="2" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd3" index="3" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd4" index="4" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd5" index="5" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd6" index="6" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd7" index="7" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="portf" name="PORTF" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pf2" index="2" function="IOPORT" group="PIN"/>
-                <signal pad-id="pf3" index="3" function="IOPORT" group="PIN"/>
-                <signal pad-id="pf4" index="4" function="IOPORT" group="PIN"/>
-                <signal pad-id="pf5" index="5" function="IOPORT" group="PIN"/>
-                <signal pad-id="pf6" index="6" function="IOPORT" group="PIN"/>
+                <signal pad-key="pf0" index="0" function="IOPORT" group="PIN"/>
+                <signal pad-key="pf1" index="1" function="IOPORT" group="PIN"/>
+                <signal pad-key="pf2" index="2" function="IOPORT" group="PIN"/>
+                <signal pad-key="pf3" index="3" function="IOPORT" group="PIN"/>
+                <signal pad-key="pf4" index="4" function="IOPORT" group="PIN"/>
+                <signal pad-key="pf5" index="5" function="IOPORT" group="PIN"/>
+                <signal pad-key="pf6" index="6" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="portmux" name="PORTMUX" module-key="avrda_portmux">
@@ -221,34 +221,34 @@
         </peripheral>
         <peripheral key="ptc" name="PTC" module-key="adc_ptc_ctrl_v1">
             <signals>
-                <signal pad-id="pa0" index="0" function="PTC" group="XY"/>
-                <signal pad-id="pa1" index="1" function="PTC" group="XY"/>
-                <signal pad-id="pa2" index="2" function="PTC" group="XY"/>
-                <signal pad-id="pa3" index="3" function="PTC" group="XY"/>
-                <signal pad-id="pa4" index="4" function="PTC" group="XY"/>
-                <signal pad-id="pa5" index="5" function="PTC" group="XY"/>
-                <signal pad-id="pa6" index="6" function="PTC" group="XY"/>
-                <signal pad-id="pa7" index="7" function="PTC" group="XY"/>
-                <signal pad-id="pd0" index="16" function="PTC" group="XY"/>
-                <signal pad-id="pd1" index="17" function="PTC" group="XY"/>
-                <signal pad-id="pd2" index="18" function="PTC" group="XY"/>
-                <signal pad-id="pd3" index="19" function="PTC" group="XY"/>
-                <signal pad-id="pd4" index="20" function="PTC" group="XY"/>
-                <signal pad-id="pd5" index="21" function="PTC" group="XY"/>
-                <signal pad-id="pd6" index="22" function="PTC" group="XY"/>
-                <signal pad-id="pd7" index="23" function="PTC" group="XY"/>
-                <signal pad-id="pf0" index="32" function="PTC" group="XY"/>
-                <signal pad-id="pf1" index="33" function="PTC" group="XY"/>
-                <signal pad-id="pf2" index="34" function="PTC" group="XY"/>
-                <signal pad-id="pf3" index="35" function="PTC" group="XY"/>
-                <signal pad-id="pf4" index="36" function="PTC" group="XY"/>
-                <signal pad-id="pf5" index="37" function="PTC" group="XY"/>
+                <signal pad-key="pa0" index="0" function="PTC" group="XY"/>
+                <signal pad-key="pa1" index="1" function="PTC" group="XY"/>
+                <signal pad-key="pa2" index="2" function="PTC" group="XY"/>
+                <signal pad-key="pa3" index="3" function="PTC" group="XY"/>
+                <signal pad-key="pa4" index="4" function="PTC" group="XY"/>
+                <signal pad-key="pa5" index="5" function="PTC" group="XY"/>
+                <signal pad-key="pa6" index="6" function="PTC" group="XY"/>
+                <signal pad-key="pa7" index="7" function="PTC" group="XY"/>
+                <signal pad-key="pd0" index="16" function="PTC" group="XY"/>
+                <signal pad-key="pd1" index="17" function="PTC" group="XY"/>
+                <signal pad-key="pd2" index="18" function="PTC" group="XY"/>
+                <signal pad-key="pd3" index="19" function="PTC" group="XY"/>
+                <signal pad-key="pd4" index="20" function="PTC" group="XY"/>
+                <signal pad-key="pd5" index="21" function="PTC" group="XY"/>
+                <signal pad-key="pd6" index="22" function="PTC" group="XY"/>
+                <signal pad-key="pd7" index="23" function="PTC" group="XY"/>
+                <signal pad-key="pf0" index="32" function="PTC" group="XY"/>
+                <signal pad-key="pf1" index="33" function="PTC" group="XY"/>
+                <signal pad-key="pf2" index="34" function="PTC" group="XY"/>
+                <signal pad-key="pf3" index="35" function="PTC" group="XY"/>
+                <signal pad-key="pf4" index="36" function="PTC" group="XY"/>
+                <signal pad-key="pf5" index="37" function="PTC" group="XY"/>
             </signals>
         </peripheral>
         <peripheral key="rstctrl" name="RSTCTRL" module-key="rst_integration_v8">
             <register-group-instance register-group-key="rstctrl" address-space-key="data" offset="0x40"/>
             <signals>
-                <signal pad-id="pf6" function="OTHER" group="RESET"/>
+                <signal pad-key="pf6" function="OTHER" group="RESET"/>
             </signals>
         </peripheral>
         <peripheral key="rtc" name="RTC" module-key="tmr_16b_rtc_v1">
@@ -263,19 +263,19 @@
         <peripheral key="spi0" name="SPI0" module-key="spi_8bit_v2">
             <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"/>
-                <signal pad-id="pa6" function="SPI0" group="SCK" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <signal pad-id="pa7" function="SPI0" group="SS" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pa5" function="SPI0" group="MISO" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pa4" function="SPI0" group="MOSI" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pa6" function="SPI0" group="SCK" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pa7" function="SPI0" group="SS" field="PORTMUX.SPIROUTEA.SPI0"/>
             </signals>
         </peripheral>
         <peripheral key="spi1" name="SPI1" module-key="spi_8bit_v2">
             <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"/>
-                <signal pad-id="pc2" function="SPI1" group="SCK" field="PORTMUX.SPIROUTEA.SPI1"/>
-                <signal pad-id="pc3" function="SPI1" group="SS" field="PORTMUX.SPIROUTEA.SPI1"/>
+                <signal pad-key="pc1" function="SPI1" group="MISO" field="PORTMUX.SPIROUTEA.SPI1"/>
+                <signal pad-key="pc0" function="SPI1" group="MOSI" field="PORTMUX.SPIROUTEA.SPI1"/>
+                <signal pad-key="pc2" function="SPI1" group="SCK" field="PORTMUX.SPIROUTEA.SPI1"/>
+                <signal pad-key="pc3" function="SPI1" group="SS" field="PORTMUX.SPIROUTEA.SPI1"/>
             </signals>
         </peripheral>
         <peripheral key="syscfg" name="SYSCFG" module-key="avrda_syscfg">
@@ -284,116 +284,116 @@
         <peripheral key="tca0" name="TCA0" module-key="tmr_16b_pwm_v1">
             <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"/>
-                <signal pad-id="pc0" index="0" function="TCA0_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pa0" index="0" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pf1" index="1" function="TCA0_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pd1" index="1" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pc1" index="1" function="TCA0_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pa1" index="1" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pf2" index="2" function="TCA0_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pd2" index="2" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pc2" index="2" function="TCA0_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pa2" index="2" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pf3" index="3" function="TCA0_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pd3" index="3" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pc3" index="3" function="TCA0_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pa3" index="3" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pf4" index="4" function="TCA0_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pd4" index="4" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pa4" index="4" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pf5" index="5" function="TCA0_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pd5" index="5" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pa5" index="5" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pf0" index="0" function="TCA0_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pd0" index="0" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pc0" index="0" function="TCA0_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pa0" index="0" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pf1" index="1" function="TCA0_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pd1" index="1" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pc1" index="1" function="TCA0_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pa1" index="1" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pf2" index="2" function="TCA0_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pd2" index="2" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pc2" index="2" function="TCA0_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pa2" index="2" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pf3" index="3" function="TCA0_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pd3" index="3" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pc3" index="3" function="TCA0_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pa3" index="3" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pf4" index="4" function="TCA0_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pd4" index="4" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pa4" index="4" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pf5" index="5" function="TCA0_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pd5" index="5" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pa5" index="5" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
             </signals>
         </peripheral>
         <peripheral key="tcb0" name="TCB0" module-key="tmr_16b_capture_v1">
             <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"/>
+                <signal pad-key="pf4" index="0" function="TCB0_ALT" group="WO" field="PORTMUX.TCBROUTEA.TCB0"/>
+                <signal pad-key="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 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"/>
+                <signal pad-key="pf5" index="0" function="TCB1_ALT" group="WO" field="PORTMUX.TCBROUTEA.TCB1"/>
+                <signal pad-key="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 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"/>
+                <signal pad-key="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 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"/>
-                <signal pad-id="pf1" index="1" function="TCD0_ALT2" group="WOB" field="PORTMUX.TCDROUTEA.TCD0"/>
-                <signal pad-id="pa5" index="1" function="TCD0" group="WOB" field="PORTMUX.TCDROUTEA.TCD0"/>
-                <signal pad-id="pf2" index="2" function="TCD0_ALT2" group="WOC" field="PORTMUX.TCDROUTEA.TCD0"/>
-                <signal pad-id="pa6" index="2" function="TCD0" group="WOC" field="PORTMUX.TCDROUTEA.TCD0"/>
-                <signal pad-id="pf3" index="3" function="TCD0_ALT2" group="WOD" field="PORTMUX.TCDROUTEA.TCD0"/>
-                <signal pad-id="pa7" index="3" function="TCD0" group="WOD" field="PORTMUX.TCDROUTEA.TCD0"/>
+                <signal pad-key="pf0" function="TCD0_ALT2" group="WOA" field="PORTMUX.TCDROUTEA.TCD0"/>
+                <signal pad-key="pa4" function="TCD0" group="WOA" field="PORTMUX.TCDROUTEA.TCD0"/>
+                <signal pad-key="pf1" index="1" function="TCD0_ALT2" group="WOB" field="PORTMUX.TCDROUTEA.TCD0"/>
+                <signal pad-key="pa5" index="1" function="TCD0" group="WOB" field="PORTMUX.TCDROUTEA.TCD0"/>
+                <signal pad-key="pf2" index="2" function="TCD0_ALT2" group="WOC" field="PORTMUX.TCDROUTEA.TCD0"/>
+                <signal pad-key="pa6" index="2" function="TCD0" group="WOC" field="PORTMUX.TCDROUTEA.TCD0"/>
+                <signal pad-key="pf3" index="3" function="TCD0_ALT2" group="WOD" field="PORTMUX.TCDROUTEA.TCD0"/>
+                <signal pad-key="pa7" index="3" function="TCD0" group="WOD" field="PORTMUX.TCDROUTEA.TCD0"/>
             </signals>
         </peripheral>
         <peripheral key="twi0" name="TWI0" module-key="i2c_8bit_v2">
             <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"/>
-                <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"/>
-                <signal pad-id="pc2" function="I2C0_ALT2" group="SDA" field="PORTMUX.TWIROUTEA.TWI0"/>
-                <signal pad-id="pa2" function="I2C0_ALT1" group="SDA" field="PORTMUX.TWIROUTEA.TWI0"/>
-                <signal pad-id="pa2" function="I2C0" group="SDA" field="PORTMUX.TWIROUTEA.TWI0"/>
-                <signal pad-id="pc2" function="I2C0" group="SDA_DUAL" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pc3" function="I2C0_ALT2" group="SCL" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pa3" function="I2C0_ALT1" group="SCL" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pa3" function="I2C0" group="SCL" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pc3" function="I2C0" group="SCL_DUAL" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pc2" function="I2C0_ALT2" group="SDA" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pa2" function="I2C0_ALT1" group="SDA" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pa2" function="I2C0" group="SDA" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pc2" function="I2C0" group="SDA_DUAL" field="PORTMUX.TWIROUTEA.TWI0"/>
             </signals>
         </peripheral>
         <peripheral key="twi1" name="TWI1" module-key="i2c_8bit_v2">
             <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"/>
-                <signal pad-id="pf2" function="I2C1_ALT1" group="SDA" field="PORTMUX.TWIROUTEA.TWI1"/>
-                <signal pad-id="pf2" function="I2C1" group="SDA" field="PORTMUX.TWIROUTEA.TWI1"/>
+                <signal pad-key="pf3" function="I2C1_ALT1" group="SCL" field="PORTMUX.TWIROUTEA.TWI1"/>
+                <signal pad-key="pf3" function="I2C1" group="SCL" field="PORTMUX.TWIROUTEA.TWI1"/>
+                <signal pad-key="pf2" function="I2C1_ALT1" group="SDA" field="PORTMUX.TWIROUTEA.TWI1"/>
+                <signal pad-key="pf2" function="I2C1" group="SDA" field="PORTMUX.TWIROUTEA.TWI1"/>
             </signals>
         </peripheral>
         <peripheral key="usart0" name="USART0" module-key="uart_autobd_v4">
             <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"/>
-                <signal pad-id="pa4" function="USART0_ALT" group="TXD" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pa0" function="USART0" group="TXD" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pa6" function="USART0_ALT" group="XCK" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pa2" function="USART0" group="XCK" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pa7" function="USART0_ALT" group="XDIR" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pa3" function="USART0" group="XDIR" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa5" function="USART0_ALT" group="RXD" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa1" function="USART0" group="RXD" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa4" function="USART0_ALT" group="TXD" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa0" function="USART0" group="TXD" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa6" function="USART0_ALT" group="XCK" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa2" function="USART0" group="XCK" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa7" function="USART0_ALT" group="XDIR" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa3" function="USART0" group="XDIR" field="PORTMUX.USARTROUTEA.USART0"/>
             </signals>
         </peripheral>
         <peripheral key="usart1" name="USART1" module-key="uart_autobd_v4">
             <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"/>
-                <signal pad-id="pc2" function="USART1" group="XCK" field="PORTMUX.USARTROUTEA.USART1"/>
-                <signal pad-id="pc3" function="USART1" group="XDIR" field="PORTMUX.USARTROUTEA.USART1"/>
+                <signal pad-key="pc1" function="USART1" group="RXD" field="PORTMUX.USARTROUTEA.USART1"/>
+                <signal pad-key="pc0" function="USART1" group="TXD" field="PORTMUX.USARTROUTEA.USART1"/>
+                <signal pad-key="pc2" function="USART1" group="XCK" field="PORTMUX.USARTROUTEA.USART1"/>
+                <signal pad-key="pc3" function="USART1" group="XDIR" field="PORTMUX.USARTROUTEA.USART1"/>
             </signals>
         </peripheral>
         <peripheral key="usart2" name="USART2" module-key="uart_autobd_v4">
             <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"/>
-                <signal pad-id="pf4" function="USART2_ALT" group="TXD" field="PORTMUX.USARTROUTEA.USART2"/>
-                <signal pad-id="pf0" function="USART2" group="TXD" field="PORTMUX.USARTROUTEA.USART2"/>
-                <signal pad-id="pf2" function="USART2" group="XCK" field="PORTMUX.USARTROUTEA.USART2"/>
-                <signal pad-id="pf3" function="USART2" group="XDIR" field="PORTMUX.USARTROUTEA.USART2"/>
+                <signal pad-key="pf5" function="USART2_ALT" group="RXD" field="PORTMUX.USARTROUTEA.USART2"/>
+                <signal pad-key="pf1" function="USART2" group="RXD" field="PORTMUX.USARTROUTEA.USART2"/>
+                <signal pad-key="pf4" function="USART2_ALT" group="TXD" field="PORTMUX.USARTROUTEA.USART2"/>
+                <signal pad-key="pf0" function="USART2" group="TXD" field="PORTMUX.USARTROUTEA.USART2"/>
+                <signal pad-key="pf2" function="USART2" group="XCK" field="PORTMUX.USARTROUTEA.USART2"/>
+                <signal pad-key="pf3" function="USART2" group="XDIR" field="PORTMUX.USARTROUTEA.USART2"/>
             </signals>
         </peripheral>
         <peripheral key="userrow" name="USERROW" module-key="avrda_userrow">
@@ -420,8 +420,8 @@
         <peripheral key="zcd0" name="ZCD0" module-key="cmp_zxover_ctrl_v3">
             <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"/>
+                <signal pad-key="pd1" function="ZCD0" group="IN"/>
+                <signal pad-key="pa7" function="ZCD0" group="OUT" field="PORTMUX.ZCDROUTEA.ZCD0"/>
             </signals>
         </peripheral>
     </peripherals>
@@ -1645,43 +1645,77 @@
             </register-group>
         </module>
     </modules>
+    <pads>
+        <pad key="pa3" name="PA3"/>
+        <pad key="pa4" name="PA4"/>
+        <pad key="pa5" name="PA5"/>
+        <pad key="pa6" name="PA6"/>
+        <pad key="pa7" name="PA7"/>
+        <pad key="pc0" name="PC0"/>
+        <pad key="pc1" name="PC1"/>
+        <pad key="pc2" name="PC2"/>
+        <pad key="pc3" name="PC3"/>
+        <pad key="pd0" name="PD0"/>
+        <pad key="pd1" name="PD1"/>
+        <pad key="pd2" name="PD2"/>
+        <pad key="pd3" name="PD3"/>
+        <pad key="pd4" name="PD4"/>
+        <pad key="pd5" name="PD5"/>
+        <pad key="pd6" name="PD6"/>
+        <pad key="pd7" name="PD7"/>
+        <pad key="avdd" name="AVDD"/>
+        <pad key="agnd" name="AGND"/>
+        <pad key="pf0" name="PF0"/>
+        <pad key="pf1" name="PF1"/>
+        <pad key="pf2" name="PF2"/>
+        <pad key="pf3" name="PF3"/>
+        <pad key="pf4" name="PF4"/>
+        <pad key="pf5" name="PF5"/>
+        <pad key="pf6" name="PF6"/>
+        <pad key="updi" name="UPDI"/>
+        <pad key="vdd0" name="VDD0"/>
+        <pad key="gnd0" name="GND0"/>
+        <pad key="pa0" name="PA0"/>
+        <pad key="pa1" name="PA1"/>
+        <pad key="pa2" name="PA2"/>
+    </pads>
     <pinouts>
         <pinout key="qfn32" name="QFN32" type="qfn">
-            <pin position="1" pad="PA3"/>
-            <pin position="2" pad="PA4"/>
-            <pin position="3" pad="PA5"/>
-            <pin position="4" pad="PA6"/>
-            <pin position="5" pad="PA7"/>
-            <pin position="6" pad="PC0"/>
-            <pin position="7" pad="PC1"/>
-            <pin position="8" pad="PC2"/>
-            <pin position="9" pad="PC3"/>
-            <pin position="10" pad="PD0"/>
-            <pin position="11" pad="PD1"/>
-            <pin position="12" pad="PD2"/>
-            <pin position="13" pad="PD3"/>
-            <pin position="14" pad="PD4"/>
-            <pin position="15" pad="PD5"/>
-            <pin position="16" pad="PD6"/>
-            <pin position="17" pad="PD7"/>
-            <pin position="18" pad="AVDD"/>
-            <pin position="19" pad="AGND"/>
-            <pin position="20" pad="PF0"/>
-            <pin position="21" pad="PF1"/>
-            <pin position="22" pad="PF2"/>
-            <pin position="23" pad="PF3"/>
-            <pin position="24" pad="PF4"/>
-            <pin position="25" pad="PF5"/>
-            <pin position="26" pad="PF6"/>
-            <pin position="27" pad="UPDI"/>
-            <pin position="28" pad="VDD0"/>
-            <pin position="29" pad="GND0"/>
-            <pin position="30" pad="PA0"/>
-            <pin position="31" pad="PA1"/>
-            <pin position="32" pad="PA2"/>
+            <pin position="1" pad-key="pa3"/>
+            <pin position="2" pad-key="pa4"/>
+            <pin position="3" pad-key="pa5"/>
+            <pin position="4" pad-key="pa6"/>
+            <pin position="5" pad-key="pa7"/>
+            <pin position="6" pad-key="pc0"/>
+            <pin position="7" pad-key="pc1"/>
+            <pin position="8" pad-key="pc2"/>
+            <pin position="9" pad-key="pc3"/>
+            <pin position="10" pad-key="pd0"/>
+            <pin position="11" pad-key="pd1"/>
+            <pin position="12" pad-key="pd2"/>
+            <pin position="13" pad-key="pd3"/>
+            <pin position="14" pad-key="pd4"/>
+            <pin position="15" pad-key="pd5"/>
+            <pin position="16" pad-key="pd6"/>
+            <pin position="17" pad-key="pd7"/>
+            <pin position="18" pad-key="avdd"/>
+            <pin position="19" pad-key="agnd"/>
+            <pin position="20" pad-key="pf0"/>
+            <pin position="21" pad-key="pf1"/>
+            <pin position="22" pad-key="pf2"/>
+            <pin position="23" pad-key="pf3"/>
+            <pin position="24" pad-key="pf4"/>
+            <pin position="25" pad-key="pf5"/>
+            <pin position="26" pad-key="pf6"/>
+            <pin position="27" pad-key="updi"/>
+            <pin position="28" pad-key="vdd0"/>
+            <pin position="29" pad-key="gnd0"/>
+            <pin position="30" pad-key="pa0"/>
+            <pin position="31" pad-key="pa1"/>
+            <pin position="32" pad-key="pa2"/>
         </pinout>
     </pinouts>
     <variants>
-        <variant name="AVR64DA32" pinout-key="qfn32" package="QFN32"/>
+        <variant key="avr64da32" name="AVR64DA32" pinout-key="qfn32"/>
     </variants>
 </device>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR64DA48.xml b/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR64DA48.xml
index dd542158..8f5fbed9 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR64DA48.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR64DA48.xml
@@ -44,66 +44,66 @@
         <peripheral key="ac0" name="AC0" module-key="cmp_control_v8">
             <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"/>
-                <signal pad-id="pd7" index="2" function="AC0" group="N"/>
-                <signal pad-id="pc6" index="0" function="AC0_ALT" group="OUT" field="PORTMUX.ACROUTEA.AC0"/>
-                <signal pad-id="pa7" index="0" function="AC0" group="OUT" field="PORTMUX.ACROUTEA.AC0"/>
-                <signal pad-id="pd2" index="0" function="AC0" group="P"/>
-                <signal pad-id="pe0" index="1" function="AC0" group="P"/>
-                <signal pad-id="pe2" index="2" function="AC0" group="P"/>
-                <signal pad-id="pd6" index="3" function="AC0" group="P"/>
+                <signal pad-key="pd3" index="0" function="AC0" group="N"/>
+                <signal pad-key="pd0" index="1" function="AC0" group="N"/>
+                <signal pad-key="pd7" index="2" function="AC0" group="N"/>
+                <signal pad-key="pc6" index="0" function="AC0_ALT" group="OUT" field="PORTMUX.ACROUTEA.AC0"/>
+                <signal pad-key="pa7" index="0" function="AC0" group="OUT" field="PORTMUX.ACROUTEA.AC0"/>
+                <signal pad-key="pd2" index="0" function="AC0" group="P"/>
+                <signal pad-key="pe0" index="1" function="AC0" group="P"/>
+                <signal pad-key="pe2" index="2" function="AC0" group="P"/>
+                <signal pad-key="pd6" index="3" function="AC0" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="ac1" name="AC1" module-key="cmp_control_v8">
             <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"/>
-                <signal pad-id="pd7" index="2" function="AC1" group="N"/>
-                <signal pad-id="pc6" index="0" function="AC1_ALT" group="OUT" field="PORTMUX.ACROUTEA.AC1"/>
-                <signal pad-id="pa7" index="0" function="AC1" group="OUT" field="PORTMUX.ACROUTEA.AC1"/>
-                <signal pad-id="pd2" index="0" function="AC1" group="P"/>
-                <signal pad-id="pd3" index="1" function="AC1" group="P"/>
-                <signal pad-id="pd4" index="2" function="AC1" group="P"/>
-                <signal pad-id="pd6" index="3" function="AC1" group="P"/>
+                <signal pad-key="pd5" index="0" function="AC1" group="N"/>
+                <signal pad-key="pd0" index="1" function="AC1" group="N"/>
+                <signal pad-key="pd7" index="2" function="AC1" group="N"/>
+                <signal pad-key="pc6" index="0" function="AC1_ALT" group="OUT" field="PORTMUX.ACROUTEA.AC1"/>
+                <signal pad-key="pa7" index="0" function="AC1" group="OUT" field="PORTMUX.ACROUTEA.AC1"/>
+                <signal pad-key="pd2" index="0" function="AC1" group="P"/>
+                <signal pad-key="pd3" index="1" function="AC1" group="P"/>
+                <signal pad-key="pd4" index="2" function="AC1" group="P"/>
+                <signal pad-key="pd6" index="3" function="AC1" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="ac2" name="AC2" module-key="cmp_control_v8">
             <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"/>
-                <signal pad-id="pd7" index="2" function="AC2" group="N"/>
-                <signal pad-id="pc6" index="0" function="AC2_ALT" group="OUT" field="PORTMUX.ACROUTEA.AC2"/>
-                <signal pad-id="pa7" index="0" function="AC2" group="OUT" field="PORTMUX.ACROUTEA.AC2"/>
-                <signal pad-id="pd2" index="0" function="AC2" group="P"/>
-                <signal pad-id="pd4" index="1" function="AC2" group="P"/>
-                <signal pad-id="pe1" index="2" function="AC2" group="P"/>
-                <signal pad-id="pd6" index="3" function="AC2" group="P"/>
+                <signal pad-key="pd7" index="0" function="AC2" group="N"/>
+                <signal pad-key="pd0" index="1" function="AC2" group="N"/>
+                <signal pad-key="pd7" index="2" function="AC2" group="N"/>
+                <signal pad-key="pc6" index="0" function="AC2_ALT" group="OUT" field="PORTMUX.ACROUTEA.AC2"/>
+                <signal pad-key="pa7" index="0" function="AC2" group="OUT" field="PORTMUX.ACROUTEA.AC2"/>
+                <signal pad-key="pd2" index="0" function="AC2" group="P"/>
+                <signal pad-key="pd4" index="1" function="AC2" group="P"/>
+                <signal pad-key="pe1" index="2" function="AC2" group="P"/>
+                <signal pad-key="pd6" index="3" function="AC2" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="adc0" name="ADC0" module-key="adc_12b_diff_ctrl_v1">
             <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"/>
-                <signal pad-id="pd2" index="2" function="AIN0" group="AIN"/>
-                <signal pad-id="pd3" index="3" function="AIN0" group="AIN"/>
-                <signal pad-id="pd4" index="4" function="AIN0" group="AIN"/>
-                <signal pad-id="pd5" index="5" function="AIN0" group="AIN"/>
-                <signal pad-id="pd6" index="6" function="AIN0" group="AIN"/>
-                <signal pad-id="pd7" index="7" function="AIN0" group="AIN"/>
-                <signal pad-id="pe0" index="8" function="AIN0" group="AIN"/>
-                <signal pad-id="pe1" index="9" function="AIN0" group="AIN"/>
-                <signal pad-id="pe2" index="10" function="AIN0" group="AIN"/>
-                <signal pad-id="pe3" index="11" function="AIN0" group="AIN"/>
-                <signal pad-id="pf0" index="16" function="AIN0" group="AIN"/>
-                <signal pad-id="pf1" index="17" function="AIN0" group="AIN"/>
-                <signal pad-id="pf2" index="18" function="AIN0" group="AIN"/>
-                <signal pad-id="pf3" index="19" function="AIN0" group="AIN"/>
-                <signal pad-id="pf4" index="20" function="AIN0" group="AIN"/>
-                <signal pad-id="pf5" index="21" function="AIN0" group="AIN"/>
+                <signal pad-key="pd0" index="0" function="AIN0" group="AIN"/>
+                <signal pad-key="pd1" index="1" function="AIN0" group="AIN"/>
+                <signal pad-key="pd2" index="2" function="AIN0" group="AIN"/>
+                <signal pad-key="pd3" index="3" function="AIN0" group="AIN"/>
+                <signal pad-key="pd4" index="4" function="AIN0" group="AIN"/>
+                <signal pad-key="pd5" index="5" function="AIN0" group="AIN"/>
+                <signal pad-key="pd6" index="6" function="AIN0" group="AIN"/>
+                <signal pad-key="pd7" index="7" function="AIN0" group="AIN"/>
+                <signal pad-key="pe0" index="8" function="AIN0" group="AIN"/>
+                <signal pad-key="pe1" index="9" function="AIN0" group="AIN"/>
+                <signal pad-key="pe2" index="10" function="AIN0" group="AIN"/>
+                <signal pad-key="pe3" index="11" function="AIN0" group="AIN"/>
+                <signal pad-key="pf0" index="16" function="AIN0" group="AIN"/>
+                <signal pad-key="pf1" index="17" function="AIN0" group="AIN"/>
+                <signal pad-key="pf2" index="18" function="AIN0" group="AIN"/>
+                <signal pad-key="pf3" index="19" function="AIN0" group="AIN"/>
+                <signal pad-key="pf4" index="20" function="AIN0" group="AIN"/>
+                <signal pad-key="pf5" index="21" function="AIN0" group="AIN"/>
             </signals>
         </peripheral>
         <peripheral key="bod" name="BOD" module-key="bor_lvd_ctrl_v1">
@@ -112,38 +112,38 @@
         <peripheral key="ccl" name="CCL" module-key="cla_ccl_v1">
             <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"/>
-                <signal pad-id="pa2" index="2" function="CCL_IN" group="LUT0_IN"/>
-                <signal pad-id="pa6" index="0" function="CCL_ALT" group="LUT0_OUT" field="PORTMUX.CCLROUTEA.LUT0"/>
-                <signal pad-id="pa3" index="0" function="CCL" group="LUT0_OUT" field="PORTMUX.CCLROUTEA.LUT0"/>
-                <signal pad-id="pc0" index="0" function="CCL_IN" group="LUT1_IN"/>
-                <signal pad-id="pc1" index="1" function="CCL_IN" group="LUT1_IN"/>
-                <signal pad-id="pc2" index="2" function="CCL_IN" group="LUT1_IN"/>
-                <signal pad-id="pc6" index="0" function="CCL_ALT" group="LUT1_OUT" field="PORTMUX.CCLROUTEA.LUT1"/>
-                <signal pad-id="pc3" index="0" function="CCL" group="LUT1_OUT" field="PORTMUX.CCLROUTEA.LUT1"/>
-                <signal pad-id="pd0" index="0" function="CCL_IN" group="LUT2_IN"/>
-                <signal pad-id="pd1" index="1" function="CCL_IN" group="LUT2_IN"/>
-                <signal pad-id="pd2" index="2" function="CCL_IN" group="LUT2_IN"/>
-                <signal pad-id="pd6" index="0" function="CCL_ALT" group="LUT2_OUT" field="PORTMUX.CCLROUTEA.LUT2"/>
-                <signal pad-id="pd3" index="0" function="CCL" group="LUT2_OUT" field="PORTMUX.CCLROUTEA.LUT2"/>
-                <signal pad-id="pf0" index="0" function="CCL_IN" group="LUT3_IN"/>
-                <signal pad-id="pf1" index="1" function="CCL_IN" group="LUT3_IN"/>
-                <signal pad-id="pf2" index="2" function="CCL_IN" group="LUT3_IN"/>
-                <signal pad-id="pf3" index="0" function="CCL" group="LUT3_OUT" field="PORTMUX.CCLROUTEA.LUT3"/>
-                <signal pad-id="pb0" index="0" function="CCL_IN" group="LUT4_IN"/>
-                <signal pad-id="pb1" index="1" function="CCL_IN" group="LUT4_IN"/>
-                <signal pad-id="pb2" index="2" function="CCL_IN" group="LUT4_IN"/>
-                <signal pad-id="pb3" index="0" function="CCL" group="LUT4_OUT" field="PORTMUX.CCLROUTEA.LUT4"/>
+                <signal pad-key="pa0" index="0" function="CCL_IN" group="LUT0_IN"/>
+                <signal pad-key="pa1" index="1" function="CCL_IN" group="LUT0_IN"/>
+                <signal pad-key="pa2" index="2" function="CCL_IN" group="LUT0_IN"/>
+                <signal pad-key="pa6" index="0" function="CCL_ALT" group="LUT0_OUT" field="PORTMUX.CCLROUTEA.LUT0"/>
+                <signal pad-key="pa3" index="0" function="CCL" group="LUT0_OUT" field="PORTMUX.CCLROUTEA.LUT0"/>
+                <signal pad-key="pc0" index="0" function="CCL_IN" group="LUT1_IN"/>
+                <signal pad-key="pc1" index="1" function="CCL_IN" group="LUT1_IN"/>
+                <signal pad-key="pc2" index="2" function="CCL_IN" group="LUT1_IN"/>
+                <signal pad-key="pc6" index="0" function="CCL_ALT" group="LUT1_OUT" field="PORTMUX.CCLROUTEA.LUT1"/>
+                <signal pad-key="pc3" index="0" function="CCL" group="LUT1_OUT" field="PORTMUX.CCLROUTEA.LUT1"/>
+                <signal pad-key="pd0" index="0" function="CCL_IN" group="LUT2_IN"/>
+                <signal pad-key="pd1" index="1" function="CCL_IN" group="LUT2_IN"/>
+                <signal pad-key="pd2" index="2" function="CCL_IN" group="LUT2_IN"/>
+                <signal pad-key="pd6" index="0" function="CCL_ALT" group="LUT2_OUT" field="PORTMUX.CCLROUTEA.LUT2"/>
+                <signal pad-key="pd3" index="0" function="CCL" group="LUT2_OUT" field="PORTMUX.CCLROUTEA.LUT2"/>
+                <signal pad-key="pf0" index="0" function="CCL_IN" group="LUT3_IN"/>
+                <signal pad-key="pf1" index="1" function="CCL_IN" group="LUT3_IN"/>
+                <signal pad-key="pf2" index="2" function="CCL_IN" group="LUT3_IN"/>
+                <signal pad-key="pf3" index="0" function="CCL" group="LUT3_OUT" field="PORTMUX.CCLROUTEA.LUT3"/>
+                <signal pad-key="pb0" index="0" function="CCL_IN" group="LUT4_IN"/>
+                <signal pad-key="pb1" index="1" function="CCL_IN" group="LUT4_IN"/>
+                <signal pad-key="pb2" index="2" function="CCL_IN" group="LUT4_IN"/>
+                <signal pad-key="pb3" index="0" function="CCL" group="LUT4_OUT" field="PORTMUX.CCLROUTEA.LUT4"/>
             </signals>
         </peripheral>
         <peripheral key="clkctrl" name="CLKCTRL" module-key="avrda_clkctrl">
             <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"/>
-                <signal pad-id="pf0" function="CLKCTRL" group="XTAL32K1"/>
-                <signal pad-id="pf1" function="CLKCTRL" group="XTAL32K2"/>
+                <signal pad-key="pa7" function="CLKCTRL" group="CLKOUT"/>
+                <signal pad-key="pa0" function="CLKCTRL" group="EXTCLK"/>
+                <signal pad-key="pf0" function="CLKCTRL" group="XTAL32K1"/>
+                <signal pad-key="pf1" function="CLKCTRL" group="XTAL32K2"/>
             </signals>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="cpu_avr_xt_v1">
@@ -158,21 +158,21 @@
         <peripheral key="dac0" name="DAC0" module-key="dac_nbit_ctrl_v5">
             <register-group-instance register-group-key="dac" address-space-key="data" offset="0x6A0"/>
             <signals>
-                <signal pad-id="pd6" index="0" function="DAC0" group="OUT"/>
+                <signal pad-key="pd6" index="0" function="DAC0" group="OUT"/>
             </signals>
         </peripheral>
         <peripheral key="evsys" name="EVSYS" module-key="avrda_evsys">
             <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"/>
-                <signal pad-id="pb2" index="1" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTB"/>
-                <signal pad-id="pc7" index="2" function="EVSYS_ALT" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTC"/>
-                <signal pad-id="pc2" index="2" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTC"/>
-                <signal pad-id="pd7" index="3" function="EVSYS_ALT" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTD"/>
-                <signal pad-id="pd2" index="3" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTD"/>
-                <signal pad-id="pe2" index="4" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTE"/>
-                <signal pad-id="pf2" index="5" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTF"/>
+                <signal pad-key="pa7" index="0" function="EVSYS_ALT" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTA"/>
+                <signal pad-key="pa2" index="0" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTA"/>
+                <signal pad-key="pb2" index="1" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTB"/>
+                <signal pad-key="pc7" index="2" function="EVSYS_ALT" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTC"/>
+                <signal pad-key="pc2" index="2" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTC"/>
+                <signal pad-key="pd7" index="3" function="EVSYS_ALT" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTD"/>
+                <signal pad-key="pd2" index="3" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTD"/>
+                <signal pad-key="pe2" index="4" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTE"/>
+                <signal pad-key="pf2" index="5" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTF"/>
             </signals>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="avrda_fuse">
@@ -190,72 +190,72 @@
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pa2" index="2" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa3" index="3" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa4" index="4" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa5" index="5" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa6" index="6" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa7" index="7" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa0" index="0" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa1" index="1" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa2" index="2" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa3" index="3" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa4" index="4" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa5" index="5" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa6" index="6" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa7" index="7" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pb2" index="2" function="IOPORT" group="PIN"/>
-                <signal pad-id="pb3" index="3" function="IOPORT" group="PIN"/>
-                <signal pad-id="pb4" index="4" function="IOPORT" group="PIN"/>
-                <signal pad-id="pb5" index="5" function="IOPORT" group="PIN"/>
+                <signal pad-key="pb0" index="0" function="IOPORT" group="PIN"/>
+                <signal pad-key="pb1" index="1" function="IOPORT" group="PIN"/>
+                <signal pad-key="pb2" index="2" function="IOPORT" group="PIN"/>
+                <signal pad-key="pb3" index="3" function="IOPORT" group="PIN"/>
+                <signal pad-key="pb4" index="4" function="IOPORT" group="PIN"/>
+                <signal pad-key="pb5" index="5" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pc2" index="2" function="IOPORT" group="PIN"/>
-                <signal pad-id="pc3" index="3" function="IOPORT" group="PIN"/>
-                <signal pad-id="pc4" index="4" function="IOPORT" group="PIN"/>
-                <signal pad-id="pc5" index="5" function="IOPORT" group="PIN"/>
-                <signal pad-id="pc6" index="6" function="IOPORT" group="PIN"/>
-                <signal pad-id="pc7" index="7" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc0" index="0" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc1" index="1" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc2" index="2" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc3" index="3" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc4" index="4" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc5" index="5" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc6" index="6" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc7" index="7" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pd2" index="2" function="IOPORT" group="PIN"/>
-                <signal pad-id="pd3" index="3" function="IOPORT" group="PIN"/>
-                <signal pad-id="pd4" index="4" function="IOPORT" group="PIN"/>
-                <signal pad-id="pd5" index="5" function="IOPORT" group="PIN"/>
-                <signal pad-id="pd6" index="6" function="IOPORT" group="PIN"/>
-                <signal pad-id="pd7" index="7" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd0" index="0" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd1" index="1" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd2" index="2" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd3" index="3" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd4" index="4" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd5" index="5" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd6" index="6" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd7" index="7" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="porte" name="PORTE" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pe2" index="2" function="IOPORT" group="PIN"/>
-                <signal pad-id="pe3" index="3" function="IOPORT" group="PIN"/>
+                <signal pad-key="pe0" index="0" function="IOPORT" group="PIN"/>
+                <signal pad-key="pe1" index="1" function="IOPORT" group="PIN"/>
+                <signal pad-key="pe2" index="2" function="IOPORT" group="PIN"/>
+                <signal pad-key="pe3" index="3" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="portf" name="PORTF" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pf2" index="2" function="IOPORT" group="PIN"/>
-                <signal pad-id="pf3" index="3" function="IOPORT" group="PIN"/>
-                <signal pad-id="pf4" index="4" function="IOPORT" group="PIN"/>
-                <signal pad-id="pf5" index="5" function="IOPORT" group="PIN"/>
-                <signal pad-id="pf6" index="6" function="IOPORT" group="PIN"/>
+                <signal pad-key="pf0" index="0" function="IOPORT" group="PIN"/>
+                <signal pad-key="pf1" index="1" function="IOPORT" group="PIN"/>
+                <signal pad-key="pf2" index="2" function="IOPORT" group="PIN"/>
+                <signal pad-key="pf3" index="3" function="IOPORT" group="PIN"/>
+                <signal pad-key="pf4" index="4" function="IOPORT" group="PIN"/>
+                <signal pad-key="pf5" index="5" function="IOPORT" group="PIN"/>
+                <signal pad-key="pf6" index="6" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="portmux" name="PORTMUX" module-key="avrda_portmux">
@@ -263,44 +263,44 @@
         </peripheral>
         <peripheral key="ptc" name="PTC" module-key="adc_ptc_ctrl_v1">
             <signals>
-                <signal pad-id="pa0" index="0" function="PTC" group="XY"/>
-                <signal pad-id="pa1" index="1" function="PTC" group="XY"/>
-                <signal pad-id="pa2" index="2" function="PTC" group="XY"/>
-                <signal pad-id="pa3" index="3" function="PTC" group="XY"/>
-                <signal pad-id="pa4" index="4" function="PTC" group="XY"/>
-                <signal pad-id="pa5" index="5" function="PTC" group="XY"/>
-                <signal pad-id="pa6" index="6" function="PTC" group="XY"/>
-                <signal pad-id="pa7" index="7" function="PTC" group="XY"/>
-                <signal pad-id="pb0" index="8" function="PTC" group="XY"/>
-                <signal pad-id="pb1" index="9" function="PTC" group="XY"/>
-                <signal pad-id="pb2" index="10" function="PTC" group="XY"/>
-                <signal pad-id="pb3" index="11" function="PTC" group="XY"/>
-                <signal pad-id="pb4" index="12" function="PTC" group="XY"/>
-                <signal pad-id="pb5" index="13" function="PTC" group="XY"/>
-                <signal pad-id="pd0" index="16" function="PTC" group="XY"/>
-                <signal pad-id="pd1" index="17" function="PTC" group="XY"/>
-                <signal pad-id="pd2" index="18" function="PTC" group="XY"/>
-                <signal pad-id="pd3" index="19" function="PTC" group="XY"/>
-                <signal pad-id="pd4" index="20" function="PTC" group="XY"/>
-                <signal pad-id="pd5" index="21" function="PTC" group="XY"/>
-                <signal pad-id="pd6" index="22" function="PTC" group="XY"/>
-                <signal pad-id="pd7" index="23" function="PTC" group="XY"/>
-                <signal pad-id="pe0" index="24" function="PTC" group="XY"/>
-                <signal pad-id="pe1" index="25" function="PTC" group="XY"/>
-                <signal pad-id="pe2" index="26" function="PTC" group="XY"/>
-                <signal pad-id="pe3" index="27" function="PTC" group="XY"/>
-                <signal pad-id="pf0" index="32" function="PTC" group="XY"/>
-                <signal pad-id="pf1" index="33" function="PTC" group="XY"/>
-                <signal pad-id="pf2" index="34" function="PTC" group="XY"/>
-                <signal pad-id="pf3" index="35" function="PTC" group="XY"/>
-                <signal pad-id="pf4" index="36" function="PTC" group="XY"/>
-                <signal pad-id="pf5" index="37" function="PTC" group="XY"/>
+                <signal pad-key="pa0" index="0" function="PTC" group="XY"/>
+                <signal pad-key="pa1" index="1" function="PTC" group="XY"/>
+                <signal pad-key="pa2" index="2" function="PTC" group="XY"/>
+                <signal pad-key="pa3" index="3" function="PTC" group="XY"/>
+                <signal pad-key="pa4" index="4" function="PTC" group="XY"/>
+                <signal pad-key="pa5" index="5" function="PTC" group="XY"/>
+                <signal pad-key="pa6" index="6" function="PTC" group="XY"/>
+                <signal pad-key="pa7" index="7" function="PTC" group="XY"/>
+                <signal pad-key="pb0" index="8" function="PTC" group="XY"/>
+                <signal pad-key="pb1" index="9" function="PTC" group="XY"/>
+                <signal pad-key="pb2" index="10" function="PTC" group="XY"/>
+                <signal pad-key="pb3" index="11" function="PTC" group="XY"/>
+                <signal pad-key="pb4" index="12" function="PTC" group="XY"/>
+                <signal pad-key="pb5" index="13" function="PTC" group="XY"/>
+                <signal pad-key="pd0" index="16" function="PTC" group="XY"/>
+                <signal pad-key="pd1" index="17" function="PTC" group="XY"/>
+                <signal pad-key="pd2" index="18" function="PTC" group="XY"/>
+                <signal pad-key="pd3" index="19" function="PTC" group="XY"/>
+                <signal pad-key="pd4" index="20" function="PTC" group="XY"/>
+                <signal pad-key="pd5" index="21" function="PTC" group="XY"/>
+                <signal pad-key="pd6" index="22" function="PTC" group="XY"/>
+                <signal pad-key="pd7" index="23" function="PTC" group="XY"/>
+                <signal pad-key="pe0" index="24" function="PTC" group="XY"/>
+                <signal pad-key="pe1" index="25" function="PTC" group="XY"/>
+                <signal pad-key="pe2" index="26" function="PTC" group="XY"/>
+                <signal pad-key="pe3" index="27" function="PTC" group="XY"/>
+                <signal pad-key="pf0" index="32" function="PTC" group="XY"/>
+                <signal pad-key="pf1" index="33" function="PTC" group="XY"/>
+                <signal pad-key="pf2" index="34" function="PTC" group="XY"/>
+                <signal pad-key="pf3" index="35" function="PTC" group="XY"/>
+                <signal pad-key="pf4" index="36" function="PTC" group="XY"/>
+                <signal pad-key="pf5" index="37" function="PTC" group="XY"/>
             </signals>
         </peripheral>
         <peripheral key="rstctrl" name="RSTCTRL" module-key="rst_integration_v8">
             <register-group-instance register-group-key="rstctrl" address-space-key="data" offset="0x40"/>
             <signals>
-                <signal pad-id="pf6" function="OTHER" group="RESET"/>
+                <signal pad-key="pf6" function="OTHER" group="RESET"/>
             </signals>
         </peripheral>
         <peripheral key="rtc" name="RTC" module-key="tmr_16b_rtc_v1">
@@ -315,29 +315,29 @@
         <peripheral key="spi0" name="SPI0" module-key="spi_8bit_v2">
             <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"/>
-                <signal pad-id="pe0" function="SPI0_ALT" group="MOSI" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <signal pad-id="pa4" function="SPI0" group="MOSI" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <signal pad-id="pe2" function="SPI0_ALT" group="SCK" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <signal pad-id="pa6" function="SPI0" group="SCK" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <signal pad-id="pe3" function="SPI0_ALT" group="SS" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <signal pad-id="pa7" function="SPI0" group="SS" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pe1" function="SPI0_ALT" group="MISO" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pa5" function="SPI0" group="MISO" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pe0" function="SPI0_ALT" group="MOSI" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pa4" function="SPI0" group="MOSI" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pe2" function="SPI0_ALT" group="SCK" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pa6" function="SPI0" group="SCK" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pe3" function="SPI0_ALT" group="SS" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pa7" function="SPI0" group="SS" field="PORTMUX.SPIROUTEA.SPI0"/>
             </signals>
         </peripheral>
         <peripheral key="spi1" name="SPI1" module-key="spi_8bit_v2">
             <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"/>
-                <signal pad-id="pc1" function="SPI1" group="MISO" field="PORTMUX.SPIROUTEA.SPI1"/>
-                <signal pad-id="pb4" function="SPI1_ALT2" group="MOSI" field="PORTMUX.SPIROUTEA.SPI1"/>
-                <signal pad-id="pc4" function="SPI1_ALT" group="MOSI" field="PORTMUX.SPIROUTEA.SPI1"/>
-                <signal pad-id="pc0" function="SPI1" group="MOSI" field="PORTMUX.SPIROUTEA.SPI1"/>
-                <signal pad-id="pc6" function="SPI1_ALT" group="SCK" field="PORTMUX.SPIROUTEA.SPI1"/>
-                <signal pad-id="pc2" function="SPI1" group="SCK" field="PORTMUX.SPIROUTEA.SPI1"/>
-                <signal pad-id="pc7" function="SPI1_ALT" group="SS" field="PORTMUX.SPIROUTEA.SPI1"/>
-                <signal pad-id="pc3" function="SPI1" group="SS" field="PORTMUX.SPIROUTEA.SPI1"/>
+                <signal pad-key="pb5" function="SPI1_ALT2" group="MISO" field="PORTMUX.SPIROUTEA.SPI1"/>
+                <signal pad-key="pc5" function="SPI1_ALT" group="MISO" field="PORTMUX.SPIROUTEA.SPI1"/>
+                <signal pad-key="pc1" function="SPI1" group="MISO" field="PORTMUX.SPIROUTEA.SPI1"/>
+                <signal pad-key="pb4" function="SPI1_ALT2" group="MOSI" field="PORTMUX.SPIROUTEA.SPI1"/>
+                <signal pad-key="pc4" function="SPI1_ALT" group="MOSI" field="PORTMUX.SPIROUTEA.SPI1"/>
+                <signal pad-key="pc0" function="SPI1" group="MOSI" field="PORTMUX.SPIROUTEA.SPI1"/>
+                <signal pad-key="pc6" function="SPI1_ALT" group="SCK" field="PORTMUX.SPIROUTEA.SPI1"/>
+                <signal pad-key="pc2" function="SPI1" group="SCK" field="PORTMUX.SPIROUTEA.SPI1"/>
+                <signal pad-key="pc7" function="SPI1_ALT" group="SS" field="PORTMUX.SPIROUTEA.SPI1"/>
+                <signal pad-key="pc3" function="SPI1" group="SS" field="PORTMUX.SPIROUTEA.SPI1"/>
             </signals>
         </peripheral>
         <peripheral key="syscfg" name="SYSCFG" module-key="avrda_syscfg">
@@ -346,184 +346,184 @@
         <peripheral key="tca0" name="TCA0" module-key="tmr_16b_pwm_v1">
             <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"/>
-                <signal pad-id="pd0" index="0" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pc0" index="0" function="TCA0_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pb0" index="0" function="TCA0_ALT" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pa0" index="0" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pf1" index="1" function="TCA0_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pe1" index="1" function="TCA0_ALT4" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pd1" index="1" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pc1" index="1" function="TCA0_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pb1" index="1" function="TCA0_ALT" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pa1" index="1" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pf2" index="2" function="TCA0_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pe2" index="2" function="TCA0_ALT4" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pd2" index="2" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pc2" index="2" function="TCA0_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pb2" index="2" function="TCA0_ALT" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pa2" index="2" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pf3" index="3" function="TCA0_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pe3" index="3" function="TCA0_ALT4" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pd3" index="3" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pc3" index="3" function="TCA0_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pb3" index="3" function="TCA0_ALT" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pa3" index="3" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pf4" index="4" function="TCA0_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pd4" index="4" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pc4" index="4" function="TCA0_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pb4" index="4" function="TCA0_ALT" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pa4" index="4" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pf5" index="5" function="TCA0_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pd5" index="5" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pc5" index="5" function="TCA0_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pb5" index="5" function="TCA0_ALT" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pa5" index="5" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pf0" index="0" function="TCA0_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pe0" index="0" function="TCA0_ALT4" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pd0" index="0" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pc0" index="0" function="TCA0_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pb0" index="0" function="TCA0_ALT" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pa0" index="0" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pf1" index="1" function="TCA0_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pe1" index="1" function="TCA0_ALT4" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pd1" index="1" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pc1" index="1" function="TCA0_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pb1" index="1" function="TCA0_ALT" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pa1" index="1" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pf2" index="2" function="TCA0_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pe2" index="2" function="TCA0_ALT4" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pd2" index="2" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pc2" index="2" function="TCA0_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pb2" index="2" function="TCA0_ALT" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pa2" index="2" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pf3" index="3" function="TCA0_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pe3" index="3" function="TCA0_ALT4" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pd3" index="3" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pc3" index="3" function="TCA0_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pb3" index="3" function="TCA0_ALT" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pa3" index="3" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pf4" index="4" function="TCA0_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pd4" index="4" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pc4" index="4" function="TCA0_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pb4" index="4" function="TCA0_ALT" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pa4" index="4" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pf5" index="5" function="TCA0_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pd5" index="5" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pc5" index="5" function="TCA0_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pb5" index="5" function="TCA0_ALT" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pa5" index="5" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
             </signals>
         </peripheral>
         <peripheral key="tca1" name="TCA1" module-key="tmr_16b_pwm_v1">
             <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"/>
-                <signal pad-id="pc5" index="1" function="TCA1_ALT" group="WO" field="PORTMUX.TCAROUTEA.TCA1"/>
-                <signal pad-id="pb1" index="1" function="TCA1" group="WO" field="PORTMUX.TCAROUTEA.TCA1"/>
-                <signal pad-id="pc6" index="2" function="TCA1_ALT" group="WO" field="PORTMUX.TCAROUTEA.TCA1"/>
-                <signal pad-id="pb2" index="2" function="TCA1" group="WO" field="PORTMUX.TCAROUTEA.TCA1"/>
-                <signal pad-id="pb3" index="3" function="TCA1" group="WO" field="PORTMUX.TCAROUTEA.TCA1"/>
-                <signal pad-id="pb4" index="4" function="TCA1" group="WO" field="PORTMUX.TCAROUTEA.TCA1"/>
-                <signal pad-id="pb5" index="5" function="TCA1" group="WO" field="PORTMUX.TCAROUTEA.TCA1"/>
+                <signal pad-key="pc4" index="0" function="TCA1_ALT" group="WO" field="PORTMUX.TCAROUTEA.TCA1"/>
+                <signal pad-key="pb0" index="0" function="TCA1" group="WO" field="PORTMUX.TCAROUTEA.TCA1"/>
+                <signal pad-key="pc5" index="1" function="TCA1_ALT" group="WO" field="PORTMUX.TCAROUTEA.TCA1"/>
+                <signal pad-key="pb1" index="1" function="TCA1" group="WO" field="PORTMUX.TCAROUTEA.TCA1"/>
+                <signal pad-key="pc6" index="2" function="TCA1_ALT" group="WO" field="PORTMUX.TCAROUTEA.TCA1"/>
+                <signal pad-key="pb2" index="2" function="TCA1" group="WO" field="PORTMUX.TCAROUTEA.TCA1"/>
+                <signal pad-key="pb3" index="3" function="TCA1" group="WO" field="PORTMUX.TCAROUTEA.TCA1"/>
+                <signal pad-key="pb4" index="4" function="TCA1" group="WO" field="PORTMUX.TCAROUTEA.TCA1"/>
+                <signal pad-key="pb5" index="5" function="TCA1" group="WO" field="PORTMUX.TCAROUTEA.TCA1"/>
             </signals>
         </peripheral>
         <peripheral key="tcb0" name="TCB0" module-key="tmr_16b_capture_v1">
             <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"/>
+                <signal pad-key="pf4" index="0" function="TCB0_ALT" group="WO" field="PORTMUX.TCBROUTEA.TCB0"/>
+                <signal pad-key="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 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"/>
+                <signal pad-key="pf5" index="0" function="TCB1_ALT" group="WO" field="PORTMUX.TCBROUTEA.TCB1"/>
+                <signal pad-key="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 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"/>
+                <signal pad-key="pb4" index="0" function="TCB2_ALT" group="WO" field="PORTMUX.TCBROUTEA.TCB2"/>
+                <signal pad-key="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 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"/>
+                <signal pad-key="pc1" index="0" function="TCB3_ALT" group="WO" field="PORTMUX.TCBROUTEA.TCB3"/>
+                <signal pad-key="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 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"/>
-                <signal pad-id="pa4" function="TCD0" group="WOA" field="PORTMUX.TCDROUTEA.TCD0"/>
-                <signal pad-id="pf1" index="1" function="TCD0_ALT2" group="WOB" field="PORTMUX.TCDROUTEA.TCD0"/>
-                <signal pad-id="pb5" index="1" function="TCD0_ALT" group="WOB" field="PORTMUX.TCDROUTEA.TCD0"/>
-                <signal pad-id="pa5" index="1" function="TCD0" group="WOB" field="PORTMUX.TCDROUTEA.TCD0"/>
-                <signal pad-id="pf2" index="2" function="TCD0_ALT2" group="WOC" field="PORTMUX.TCDROUTEA.TCD0"/>
-                <signal pad-id="pa6" index="2" function="TCD0" group="WOC" field="PORTMUX.TCDROUTEA.TCD0"/>
-                <signal pad-id="pf3" index="3" function="TCD0_ALT2" group="WOD" field="PORTMUX.TCDROUTEA.TCD0"/>
-                <signal pad-id="pa7" index="3" function="TCD0" group="WOD" field="PORTMUX.TCDROUTEA.TCD0"/>
+                <signal pad-key="pf0" function="TCD0_ALT2" group="WOA" field="PORTMUX.TCDROUTEA.TCD0"/>
+                <signal pad-key="pb4" function="TCD0_ALT" group="WOA" field="PORTMUX.TCDROUTEA.TCD0"/>
+                <signal pad-key="pa4" function="TCD0" group="WOA" field="PORTMUX.TCDROUTEA.TCD0"/>
+                <signal pad-key="pf1" index="1" function="TCD0_ALT2" group="WOB" field="PORTMUX.TCDROUTEA.TCD0"/>
+                <signal pad-key="pb5" index="1" function="TCD0_ALT" group="WOB" field="PORTMUX.TCDROUTEA.TCD0"/>
+                <signal pad-key="pa5" index="1" function="TCD0" group="WOB" field="PORTMUX.TCDROUTEA.TCD0"/>
+                <signal pad-key="pf2" index="2" function="TCD0_ALT2" group="WOC" field="PORTMUX.TCDROUTEA.TCD0"/>
+                <signal pad-key="pa6" index="2" function="TCD0" group="WOC" field="PORTMUX.TCDROUTEA.TCD0"/>
+                <signal pad-key="pf3" index="3" function="TCD0_ALT2" group="WOD" field="PORTMUX.TCDROUTEA.TCD0"/>
+                <signal pad-key="pa7" index="3" function="TCD0" group="WOD" field="PORTMUX.TCDROUTEA.TCD0"/>
             </signals>
         </peripheral>
         <peripheral key="twi0" name="TWI0" module-key="i2c_8bit_v2">
             <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"/>
-                <signal pad-id="pa3" function="I2C0" group="SCL" field="PORTMUX.TWIROUTEA.TWI0"/>
-                <signal pad-id="pc7" function="I2C0_ALT2" group="SCL_DUAL" field="PORTMUX.TWIROUTEA.TWI0"/>
-                <signal pad-id="pc7" function="I2C0_ALT1" group="SCL_DUAL" field="PORTMUX.TWIROUTEA.TWI0"/>
-                <signal pad-id="pc3" function="I2C0" group="SCL_DUAL" field="PORTMUX.TWIROUTEA.TWI0"/>
-                <signal pad-id="pc2" function="I2C0_ALT2" group="SDA" field="PORTMUX.TWIROUTEA.TWI0"/>
-                <signal pad-id="pa2" function="I2C0_ALT1" group="SDA" field="PORTMUX.TWIROUTEA.TWI0"/>
-                <signal pad-id="pa2" function="I2C0" group="SDA" field="PORTMUX.TWIROUTEA.TWI0"/>
-                <signal pad-id="pc6" function="I2C0_ALT2" group="SDA_DUAL" field="PORTMUX.TWIROUTEA.TWI0"/>
-                <signal pad-id="pc6" function="I2C0_ALT1" group="SDA_DUAL" field="PORTMUX.TWIROUTEA.TWI0"/>
-                <signal pad-id="pc2" function="I2C0" group="SDA_DUAL" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pc3" function="I2C0_ALT2" group="SCL" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pa3" function="I2C0_ALT1" group="SCL" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pa3" function="I2C0" group="SCL" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pc7" function="I2C0_ALT2" group="SCL_DUAL" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pc7" function="I2C0_ALT1" group="SCL_DUAL" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pc3" function="I2C0" group="SCL_DUAL" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pc2" function="I2C0_ALT2" group="SDA" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pa2" function="I2C0_ALT1" group="SDA" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pa2" function="I2C0" group="SDA" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pc6" function="I2C0_ALT2" group="SDA_DUAL" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pc6" function="I2C0_ALT1" group="SDA_DUAL" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pc2" function="I2C0" group="SDA_DUAL" field="PORTMUX.TWIROUTEA.TWI0"/>
             </signals>
         </peripheral>
         <peripheral key="twi1" name="TWI1" module-key="i2c_8bit_v2">
             <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"/>
-                <signal pad-id="pf3" function="I2C1" group="SCL" field="PORTMUX.TWIROUTEA.TWI1"/>
-                <signal pad-id="pb3" function="I2C1" group="SCL_DUAL" field="PORTMUX.TWIROUTEA.TWI1"/>
-                <signal pad-id="pb2" function="I2C1_ALT2" group="SDA" field="PORTMUX.TWIROUTEA.TWI1"/>
-                <signal pad-id="pf2" function="I2C1_ALT1" group="SDA" field="PORTMUX.TWIROUTEA.TWI1"/>
-                <signal pad-id="pf2" function="I2C1" group="SDA" field="PORTMUX.TWIROUTEA.TWI1"/>
-                <signal pad-id="pb2" function="I2C1" group="SDA_DUAL" field="PORTMUX.TWIROUTEA.TWI1"/>
+                <signal pad-key="pb3" function="I2C1_ALT2" group="SCL" field="PORTMUX.TWIROUTEA.TWI1"/>
+                <signal pad-key="pf3" function="I2C1_ALT1" group="SCL" field="PORTMUX.TWIROUTEA.TWI1"/>
+                <signal pad-key="pf3" function="I2C1" group="SCL" field="PORTMUX.TWIROUTEA.TWI1"/>
+                <signal pad-key="pb3" function="I2C1" group="SCL_DUAL" field="PORTMUX.TWIROUTEA.TWI1"/>
+                <signal pad-key="pb2" function="I2C1_ALT2" group="SDA" field="PORTMUX.TWIROUTEA.TWI1"/>
+                <signal pad-key="pf2" function="I2C1_ALT1" group="SDA" field="PORTMUX.TWIROUTEA.TWI1"/>
+                <signal pad-key="pf2" function="I2C1" group="SDA" field="PORTMUX.TWIROUTEA.TWI1"/>
+                <signal pad-key="pb2" function="I2C1" group="SDA_DUAL" field="PORTMUX.TWIROUTEA.TWI1"/>
             </signals>
         </peripheral>
         <peripheral key="usart0" name="USART0" module-key="uart_autobd_v4">
             <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"/>
-                <signal pad-id="pa4" function="USART0_ALT" group="TXD" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pa0" function="USART0" group="TXD" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pa6" function="USART0_ALT" group="XCK" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pa2" function="USART0" group="XCK" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pa7" function="USART0_ALT" group="XDIR" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pa3" function="USART0" group="XDIR" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa5" function="USART0_ALT" group="RXD" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa1" function="USART0" group="RXD" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa4" function="USART0_ALT" group="TXD" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa0" function="USART0" group="TXD" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa6" function="USART0_ALT" group="XCK" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa2" function="USART0" group="XCK" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa7" function="USART0_ALT" group="XDIR" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa3" function="USART0" group="XDIR" field="PORTMUX.USARTROUTEA.USART0"/>
             </signals>
         </peripheral>
         <peripheral key="usart1" name="USART1" module-key="uart_autobd_v4">
             <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"/>
-                <signal pad-id="pc4" function="USART1_ALT" group="TXD" field="PORTMUX.USARTROUTEA.USART1"/>
-                <signal pad-id="pc0" function="USART1" group="TXD" field="PORTMUX.USARTROUTEA.USART1"/>
-                <signal pad-id="pc6" function="USART1_ALT" group="XCK" field="PORTMUX.USARTROUTEA.USART1"/>
-                <signal pad-id="pc2" function="USART1" group="XCK" field="PORTMUX.USARTROUTEA.USART1"/>
-                <signal pad-id="pc7" function="USART1_ALT" group="XDIR" field="PORTMUX.USARTROUTEA.USART1"/>
-                <signal pad-id="pc3" function="USART1" group="XDIR" field="PORTMUX.USARTROUTEA.USART1"/>
+                <signal pad-key="pc5" function="USART1_ALT" group="RXD" field="PORTMUX.USARTROUTEA.USART1"/>
+                <signal pad-key="pc1" function="USART1" group="RXD" field="PORTMUX.USARTROUTEA.USART1"/>
+                <signal pad-key="pc4" function="USART1_ALT" group="TXD" field="PORTMUX.USARTROUTEA.USART1"/>
+                <signal pad-key="pc0" function="USART1" group="TXD" field="PORTMUX.USARTROUTEA.USART1"/>
+                <signal pad-key="pc6" function="USART1_ALT" group="XCK" field="PORTMUX.USARTROUTEA.USART1"/>
+                <signal pad-key="pc2" function="USART1" group="XCK" field="PORTMUX.USARTROUTEA.USART1"/>
+                <signal pad-key="pc7" function="USART1_ALT" group="XDIR" field="PORTMUX.USARTROUTEA.USART1"/>
+                <signal pad-key="pc3" function="USART1" group="XDIR" field="PORTMUX.USARTROUTEA.USART1"/>
             </signals>
         </peripheral>
         <peripheral key="usart2" name="USART2" module-key="uart_autobd_v4">
             <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"/>
-                <signal pad-id="pf4" function="USART2_ALT" group="TXD" field="PORTMUX.USARTROUTEA.USART2"/>
-                <signal pad-id="pf0" function="USART2" group="TXD" field="PORTMUX.USARTROUTEA.USART2"/>
-                <signal pad-id="pf2" function="USART2" group="XCK" field="PORTMUX.USARTROUTEA.USART2"/>
-                <signal pad-id="pf3" function="USART2" group="XDIR" field="PORTMUX.USARTROUTEA.USART2"/>
+                <signal pad-key="pf5" function="USART2_ALT" group="RXD" field="PORTMUX.USARTROUTEA.USART2"/>
+                <signal pad-key="pf1" function="USART2" group="RXD" field="PORTMUX.USARTROUTEA.USART2"/>
+                <signal pad-key="pf4" function="USART2_ALT" group="TXD" field="PORTMUX.USARTROUTEA.USART2"/>
+                <signal pad-key="pf0" function="USART2" group="TXD" field="PORTMUX.USARTROUTEA.USART2"/>
+                <signal pad-key="pf2" function="USART2" group="XCK" field="PORTMUX.USARTROUTEA.USART2"/>
+                <signal pad-key="pf3" function="USART2" group="XDIR" field="PORTMUX.USARTROUTEA.USART2"/>
             </signals>
         </peripheral>
         <peripheral key="usart3" name="USART3" module-key="uart_autobd_v4">
             <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"/>
-                <signal pad-id="pb4" function="USART3_ALT" group="TXD" field="PORTMUX.USARTROUTEA.USART3"/>
-                <signal pad-id="pb0" function="USART3" group="TXD" field="PORTMUX.USARTROUTEA.USART3"/>
-                <signal pad-id="pb2" function="USART3" group="XCK" field="PORTMUX.USARTROUTEA.USART3"/>
-                <signal pad-id="pb3" function="USART3" group="XDIR" field="PORTMUX.USARTROUTEA.USART3"/>
+                <signal pad-key="pb5" function="USART3_ALT" group="RXD" field="PORTMUX.USARTROUTEA.USART3"/>
+                <signal pad-key="pb1" function="USART3" group="RXD" field="PORTMUX.USARTROUTEA.USART3"/>
+                <signal pad-key="pb4" function="USART3_ALT" group="TXD" field="PORTMUX.USARTROUTEA.USART3"/>
+                <signal pad-key="pb0" function="USART3" group="TXD" field="PORTMUX.USARTROUTEA.USART3"/>
+                <signal pad-key="pb2" function="USART3" group="XCK" field="PORTMUX.USARTROUTEA.USART3"/>
+                <signal pad-key="pb3" function="USART3" group="XDIR" field="PORTMUX.USARTROUTEA.USART3"/>
             </signals>
         </peripheral>
         <peripheral key="usart4" name="USART4" module-key="uart_autobd_v4">
             <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"/>
-                <signal pad-id="pe2" function="USART4" group="XCK" field="PORTMUX.USARTROUTEB.USART4"/>
-                <signal pad-id="pe3" function="USART4" group="XDIR" field="PORTMUX.USARTROUTEB.USART4"/>
+                <signal pad-key="pe1" function="USART4" group="RXD" field="PORTMUX.USARTROUTEB.USART4"/>
+                <signal pad-key="pe0" function="USART4" group="TXD" field="PORTMUX.USARTROUTEB.USART4"/>
+                <signal pad-key="pe2" function="USART4" group="XCK" field="PORTMUX.USARTROUTEB.USART4"/>
+                <signal pad-key="pe3" function="USART4" group="XDIR" field="PORTMUX.USARTROUTEB.USART4"/>
             </signals>
         </peripheral>
         <peripheral key="userrow" name="USERROW" module-key="avrda_userrow">
@@ -556,17 +556,17 @@
         <peripheral key="zcd0" name="ZCD0" module-key="cmp_zxover_ctrl_v3">
             <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"/>
-                <signal pad-id="pa7" function="ZCD0" group="OUT" field="PORTMUX.ZCDROUTEA.ZCD0"/>
+                <signal pad-key="pd1" function="ZCD0" group="IN"/>
+                <signal pad-key="pc7" function="ZCD0_ALT" group="OUT" field="PORTMUX.ZCDROUTEA.ZCD0"/>
+                <signal pad-key="pa7" function="ZCD0" group="OUT" field="PORTMUX.ZCDROUTEA.ZCD0"/>
             </signals>
         </peripheral>
         <peripheral key="zcd1" name="ZCD1" module-key="cmp_zxover_ctrl_v3">
             <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"/>
-                <signal pad-id="pa7" function="ZCD1" group="OUT" field="PORTMUX.ZCDROUTEA.ZCD1"/>
+                <signal pad-key="pe3" function="ZCD1" group="IN"/>
+                <signal pad-key="pc7" function="ZCD1_ALT" group="OUT" field="PORTMUX.ZCDROUTEA.ZCD1"/>
+                <signal pad-key="pa7" function="ZCD1" group="OUT" field="PORTMUX.ZCDROUTEA.ZCD1"/>
             </signals>
         </peripheral>
     </peripherals>
@@ -1886,59 +1886,109 @@
             </register-group>
         </module>
     </modules>
+    <pads>
+        <pad key="pa5" name="PA5"/>
+        <pad key="pa6" name="PA6"/>
+        <pad key="pa7" name="PA7"/>
+        <pad key="pb0" name="PB0"/>
+        <pad key="pb1" name="PB1"/>
+        <pad key="pb2" name="PB2"/>
+        <pad key="pb3" name="PB3"/>
+        <pad key="pb4" name="PB4"/>
+        <pad key="pb5" name="PB5"/>
+        <pad key="pc0" name="PC0"/>
+        <pad key="pc1" name="PC1"/>
+        <pad key="pc2" name="PC2"/>
+        <pad key="pc3" name="PC3"/>
+        <pad key="vdd0" name="VDD0"/>
+        <pad key="gnd0" name="GND0"/>
+        <pad key="pc4" name="PC4"/>
+        <pad key="pc5" name="PC5"/>
+        <pad key="pc6" name="PC6"/>
+        <pad key="pc7" name="PC7"/>
+        <pad key="pd0" name="PD0"/>
+        <pad key="pd1" name="PD1"/>
+        <pad key="pd2" name="PD2"/>
+        <pad key="pd3" name="PD3"/>
+        <pad key="pd4" name="PD4"/>
+        <pad key="pd5" name="PD5"/>
+        <pad key="pd6" name="PD6"/>
+        <pad key="pd7" name="PD7"/>
+        <pad key="avdd" name="AVDD"/>
+        <pad key="agnd" name="AGND"/>
+        <pad key="pe0" name="PE0"/>
+        <pad key="pe1" name="PE1"/>
+        <pad key="pe2" name="PE2"/>
+        <pad key="pe3" name="PE3"/>
+        <pad key="pf0" name="PF0"/>
+        <pad key="pf1" name="PF1"/>
+        <pad key="pf2" name="PF2"/>
+        <pad key="pf3" name="PF3"/>
+        <pad key="pf4" name="PF4"/>
+        <pad key="pf5" name="PF5"/>
+        <pad key="pf6" name="PF6"/>
+        <pad key="updi" name="UPDI"/>
+        <pad key="vdd1" name="VDD1"/>
+        <pad key="gnd1" name="GND1"/>
+        <pad key="pa0" name="PA0"/>
+        <pad key="pa1" name="PA1"/>
+        <pad key="pa2" name="PA2"/>
+        <pad key="pa3" name="PA3"/>
+        <pad key="pa4" name="PA4"/>
+    </pads>
     <pinouts>
         <pinout key="qfn48" name="QFN48" type="qfn">
-            <pin position="1" pad="PA5"/>
-            <pin position="2" pad="PA6"/>
-            <pin position="3" pad="PA7"/>
-            <pin position="4" pad="PB0"/>
-            <pin position="5" pad="PB1"/>
-            <pin position="6" pad="PB2"/>
-            <pin position="7" pad="PB3"/>
-            <pin position="8" pad="PB4"/>
-            <pin position="9" pad="PB5"/>
-            <pin position="10" pad="PC0"/>
-            <pin position="11" pad="PC1"/>
-            <pin position="12" pad="PC2"/>
-            <pin position="13" pad="PC3"/>
-            <pin position="14" pad="VDD0"/>
-            <pin position="15" pad="GND0"/>
-            <pin position="16" pad="PC4"/>
-            <pin position="17" pad="PC5"/>
-            <pin position="18" pad="PC6"/>
-            <pin position="19" pad="PC7"/>
-            <pin position="20" pad="PD0"/>
-            <pin position="21" pad="PD1"/>
-            <pin position="22" pad="PD2"/>
-            <pin position="23" pad="PD3"/>
-            <pin position="24" pad="PD4"/>
-            <pin position="25" pad="PD5"/>
-            <pin position="26" pad="PD6"/>
-            <pin position="27" pad="PD7"/>
-            <pin position="28" pad="AVDD"/>
-            <pin position="29" pad="AGND"/>
-            <pin position="30" pad="PE0"/>
-            <pin position="31" pad="PE1"/>
-            <pin position="32" pad="PE2"/>
-            <pin position="33" pad="PE3"/>
-            <pin position="34" pad="PF0"/>
-            <pin position="35" pad="PF1"/>
-            <pin position="36" pad="PF2"/>
-            <pin position="37" pad="PF3"/>
-            <pin position="38" pad="PF4"/>
-            <pin position="39" pad="PF5"/>
-            <pin position="40" pad="PF6"/>
-            <pin position="41" pad="UPDI"/>
-            <pin position="42" pad="VDD1"/>
-            <pin position="43" pad="GND1"/>
-            <pin position="44" pad="PA0"/>
-            <pin position="45" pad="PA1"/>
-            <pin position="46" pad="PA2"/>
-            <pin position="47" pad="PA3"/>
-            <pin position="48" pad="PA4"/>
+            <pin position="1" pad-key="pa5"/>
+            <pin position="2" pad-key="pa6"/>
+            <pin position="3" pad-key="pa7"/>
+            <pin position="4" pad-key="pb0"/>
+            <pin position="5" pad-key="pb1"/>
+            <pin position="6" pad-key="pb2"/>
+            <pin position="7" pad-key="pb3"/>
+            <pin position="8" pad-key="pb4"/>
+            <pin position="9" pad-key="pb5"/>
+            <pin position="10" pad-key="pc0"/>
+            <pin position="11" pad-key="pc1"/>
+            <pin position="12" pad-key="pc2"/>
+            <pin position="13" pad-key="pc3"/>
+            <pin position="14" pad-key="vdd0"/>
+            <pin position="15" pad-key="gnd0"/>
+            <pin position="16" pad-key="pc4"/>
+            <pin position="17" pad-key="pc5"/>
+            <pin position="18" pad-key="pc6"/>
+            <pin position="19" pad-key="pc7"/>
+            <pin position="20" pad-key="pd0"/>
+            <pin position="21" pad-key="pd1"/>
+            <pin position="22" pad-key="pd2"/>
+            <pin position="23" pad-key="pd3"/>
+            <pin position="24" pad-key="pd4"/>
+            <pin position="25" pad-key="pd5"/>
+            <pin position="26" pad-key="pd6"/>
+            <pin position="27" pad-key="pd7"/>
+            <pin position="28" pad-key="avdd"/>
+            <pin position="29" pad-key="agnd"/>
+            <pin position="30" pad-key="pe0"/>
+            <pin position="31" pad-key="pe1"/>
+            <pin position="32" pad-key="pe2"/>
+            <pin position="33" pad-key="pe3"/>
+            <pin position="34" pad-key="pf0"/>
+            <pin position="35" pad-key="pf1"/>
+            <pin position="36" pad-key="pf2"/>
+            <pin position="37" pad-key="pf3"/>
+            <pin position="38" pad-key="pf4"/>
+            <pin position="39" pad-key="pf5"/>
+            <pin position="40" pad-key="pf6"/>
+            <pin position="41" pad-key="updi"/>
+            <pin position="42" pad-key="vdd1"/>
+            <pin position="43" pad-key="gnd1"/>
+            <pin position="44" pad-key="pa0"/>
+            <pin position="45" pad-key="pa1"/>
+            <pin position="46" pad-key="pa2"/>
+            <pin position="47" pad-key="pa3"/>
+            <pin position="48" pad-key="pa4"/>
         </pinout>
     </pinouts>
     <variants>
-        <variant name="AVR64DA48" pinout-key="qfn48" package="QFN48"/>
+        <variant key="avr64da48" name="AVR64DA48" pinout-key="qfn48"/>
     </variants>
 </device>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR64DA64.xml b/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR64DA64.xml
index ff5e169a..94116cb5 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR64DA64.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR64DA64.xml
@@ -44,70 +44,70 @@
         <peripheral key="ac0" name="AC0" module-key="cmp_control_v8">
             <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"/>
-                <signal pad-id="pd7" index="2" function="AC0" group="N"/>
-                <signal pad-id="pc6" index="0" function="AC0_ALT" group="OUT" field="PORTMUX.ACROUTEA.AC0"/>
-                <signal pad-id="pa7" index="0" function="AC0" group="OUT" field="PORTMUX.ACROUTEA.AC0"/>
-                <signal pad-id="pd2" index="0" function="AC0" group="P"/>
-                <signal pad-id="pe0" index="1" function="AC0" group="P"/>
-                <signal pad-id="pe2" index="2" function="AC0" group="P"/>
-                <signal pad-id="pd6" index="3" function="AC0" group="P"/>
+                <signal pad-key="pd3" index="0" function="AC0" group="N"/>
+                <signal pad-key="pd0" index="1" function="AC0" group="N"/>
+                <signal pad-key="pd7" index="2" function="AC0" group="N"/>
+                <signal pad-key="pc6" index="0" function="AC0_ALT" group="OUT" field="PORTMUX.ACROUTEA.AC0"/>
+                <signal pad-key="pa7" index="0" function="AC0" group="OUT" field="PORTMUX.ACROUTEA.AC0"/>
+                <signal pad-key="pd2" index="0" function="AC0" group="P"/>
+                <signal pad-key="pe0" index="1" function="AC0" group="P"/>
+                <signal pad-key="pe2" index="2" function="AC0" group="P"/>
+                <signal pad-key="pd6" index="3" function="AC0" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="ac1" name="AC1" module-key="cmp_control_v8">
             <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"/>
-                <signal pad-id="pd7" index="2" function="AC1" group="N"/>
-                <signal pad-id="pc6" index="0" function="AC1_ALT" group="OUT" field="PORTMUX.ACROUTEA.AC1"/>
-                <signal pad-id="pa7" index="0" function="AC1" group="OUT" field="PORTMUX.ACROUTEA.AC1"/>
-                <signal pad-id="pd2" index="0" function="AC1" group="P"/>
-                <signal pad-id="pd3" index="1" function="AC1" group="P"/>
-                <signal pad-id="pd4" index="2" function="AC1" group="P"/>
-                <signal pad-id="pd6" index="3" function="AC1" group="P"/>
+                <signal pad-key="pd5" index="0" function="AC1" group="N"/>
+                <signal pad-key="pd0" index="1" function="AC1" group="N"/>
+                <signal pad-key="pd7" index="2" function="AC1" group="N"/>
+                <signal pad-key="pc6" index="0" function="AC1_ALT" group="OUT" field="PORTMUX.ACROUTEA.AC1"/>
+                <signal pad-key="pa7" index="0" function="AC1" group="OUT" field="PORTMUX.ACROUTEA.AC1"/>
+                <signal pad-key="pd2" index="0" function="AC1" group="P"/>
+                <signal pad-key="pd3" index="1" function="AC1" group="P"/>
+                <signal pad-key="pd4" index="2" function="AC1" group="P"/>
+                <signal pad-key="pd6" index="3" function="AC1" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="ac2" name="AC2" module-key="cmp_control_v8">
             <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"/>
-                <signal pad-id="pd7" index="2" function="AC2" group="N"/>
-                <signal pad-id="pc6" index="0" function="AC2_ALT" group="OUT" field="PORTMUX.ACROUTEA.AC2"/>
-                <signal pad-id="pa7" index="0" function="AC2" group="OUT" field="PORTMUX.ACROUTEA.AC2"/>
-                <signal pad-id="pd2" index="0" function="AC2" group="P"/>
-                <signal pad-id="pd4" index="1" function="AC2" group="P"/>
-                <signal pad-id="pe1" index="2" function="AC2" group="P"/>
-                <signal pad-id="pd6" index="3" function="AC2" group="P"/>
+                <signal pad-key="pd7" index="0" function="AC2" group="N"/>
+                <signal pad-key="pd0" index="1" function="AC2" group="N"/>
+                <signal pad-key="pd7" index="2" function="AC2" group="N"/>
+                <signal pad-key="pc6" index="0" function="AC2_ALT" group="OUT" field="PORTMUX.ACROUTEA.AC2"/>
+                <signal pad-key="pa7" index="0" function="AC2" group="OUT" field="PORTMUX.ACROUTEA.AC2"/>
+                <signal pad-key="pd2" index="0" function="AC2" group="P"/>
+                <signal pad-key="pd4" index="1" function="AC2" group="P"/>
+                <signal pad-key="pe1" index="2" function="AC2" group="P"/>
+                <signal pad-key="pd6" index="3" function="AC2" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="adc0" name="ADC0" module-key="adc_12b_diff_ctrl_v1">
             <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"/>
-                <signal pad-id="pd2" index="2" function="AIN0" group="AIN"/>
-                <signal pad-id="pd3" index="3" function="AIN0" group="AIN"/>
-                <signal pad-id="pd4" index="4" function="AIN0" group="AIN"/>
-                <signal pad-id="pd5" index="5" function="AIN0" group="AIN"/>
-                <signal pad-id="pd6" index="6" function="AIN0" group="AIN"/>
-                <signal pad-id="pd7" index="7" function="AIN0" group="AIN"/>
-                <signal pad-id="pe0" index="8" function="AIN0" group="AIN"/>
-                <signal pad-id="pe1" index="9" function="AIN0" group="AIN"/>
-                <signal pad-id="pe2" index="10" function="AIN0" group="AIN"/>
-                <signal pad-id="pe3" index="11" function="AIN0" group="AIN"/>
-                <signal pad-id="pe4" index="12" function="AIN0" group="AIN"/>
-                <signal pad-id="pe5" index="13" function="AIN0" group="AIN"/>
-                <signal pad-id="pe6" index="14" function="AIN0" group="AIN"/>
-                <signal pad-id="pe7" index="15" function="AIN0" group="AIN"/>
-                <signal pad-id="pf0" index="16" function="AIN0" group="AIN"/>
-                <signal pad-id="pf1" index="17" function="AIN0" group="AIN"/>
-                <signal pad-id="pf2" index="18" function="AIN0" group="AIN"/>
-                <signal pad-id="pf3" index="19" function="AIN0" group="AIN"/>
-                <signal pad-id="pf4" index="20" function="AIN0" group="AIN"/>
-                <signal pad-id="pf5" index="21" function="AIN0" group="AIN"/>
+                <signal pad-key="pd0" index="0" function="AIN0" group="AIN"/>
+                <signal pad-key="pd1" index="1" function="AIN0" group="AIN"/>
+                <signal pad-key="pd2" index="2" function="AIN0" group="AIN"/>
+                <signal pad-key="pd3" index="3" function="AIN0" group="AIN"/>
+                <signal pad-key="pd4" index="4" function="AIN0" group="AIN"/>
+                <signal pad-key="pd5" index="5" function="AIN0" group="AIN"/>
+                <signal pad-key="pd6" index="6" function="AIN0" group="AIN"/>
+                <signal pad-key="pd7" index="7" function="AIN0" group="AIN"/>
+                <signal pad-key="pe0" index="8" function="AIN0" group="AIN"/>
+                <signal pad-key="pe1" index="9" function="AIN0" group="AIN"/>
+                <signal pad-key="pe2" index="10" function="AIN0" group="AIN"/>
+                <signal pad-key="pe3" index="11" function="AIN0" group="AIN"/>
+                <signal pad-key="pe4" index="12" function="AIN0" group="AIN"/>
+                <signal pad-key="pe5" index="13" function="AIN0" group="AIN"/>
+                <signal pad-key="pe6" index="14" function="AIN0" group="AIN"/>
+                <signal pad-key="pe7" index="15" function="AIN0" group="AIN"/>
+                <signal pad-key="pf0" index="16" function="AIN0" group="AIN"/>
+                <signal pad-key="pf1" index="17" function="AIN0" group="AIN"/>
+                <signal pad-key="pf2" index="18" function="AIN0" group="AIN"/>
+                <signal pad-key="pf3" index="19" function="AIN0" group="AIN"/>
+                <signal pad-key="pf4" index="20" function="AIN0" group="AIN"/>
+                <signal pad-key="pf5" index="21" function="AIN0" group="AIN"/>
             </signals>
         </peripheral>
         <peripheral key="bod" name="BOD" module-key="bor_lvd_ctrl_v1">
@@ -116,44 +116,44 @@
         <peripheral key="ccl" name="CCL" module-key="cla_ccl_v1">
             <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"/>
-                <signal pad-id="pa2" index="2" function="CCL_IN" group="LUT0_IN"/>
-                <signal pad-id="pa6" index="0" function="CCL_ALT" group="LUT0_OUT" field="PORTMUX.CCLROUTEA.LUT0"/>
-                <signal pad-id="pa3" index="0" function="CCL" group="LUT0_OUT" field="PORTMUX.CCLROUTEA.LUT0"/>
-                <signal pad-id="pc0" index="0" function="CCL_IN" group="LUT1_IN"/>
-                <signal pad-id="pc1" index="1" function="CCL_IN" group="LUT1_IN"/>
-                <signal pad-id="pc2" index="2" function="CCL_IN" group="LUT1_IN"/>
-                <signal pad-id="pc6" index="0" function="CCL_ALT" group="LUT1_OUT" field="PORTMUX.CCLROUTEA.LUT1"/>
-                <signal pad-id="pc3" index="0" function="CCL" group="LUT1_OUT" field="PORTMUX.CCLROUTEA.LUT1"/>
-                <signal pad-id="pd0" index="0" function="CCL_IN" group="LUT2_IN"/>
-                <signal pad-id="pd1" index="1" function="CCL_IN" group="LUT2_IN"/>
-                <signal pad-id="pd2" index="2" function="CCL_IN" group="LUT2_IN"/>
-                <signal pad-id="pd6" index="0" function="CCL_ALT" group="LUT2_OUT" field="PORTMUX.CCLROUTEA.LUT2"/>
-                <signal pad-id="pd3" index="0" function="CCL" group="LUT2_OUT" field="PORTMUX.CCLROUTEA.LUT2"/>
-                <signal pad-id="pf0" index="0" function="CCL_IN" group="LUT3_IN"/>
-                <signal pad-id="pf1" index="1" function="CCL_IN" group="LUT3_IN"/>
-                <signal pad-id="pf2" index="2" function="CCL_IN" group="LUT3_IN"/>
-                <signal pad-id="pf3" index="0" function="CCL" group="LUT3_OUT" field="PORTMUX.CCLROUTEA.LUT3"/>
-                <signal pad-id="pb0" index="0" function="CCL_IN" group="LUT4_IN"/>
-                <signal pad-id="pb1" index="1" function="CCL_IN" group="LUT4_IN"/>
-                <signal pad-id="pb2" index="2" function="CCL_IN" group="LUT4_IN"/>
-                <signal pad-id="pb6" index="0" function="CCL_ALT" group="LUT4_OUT" field="PORTMUX.CCLROUTEA.LUT4"/>
-                <signal pad-id="pb3" index="0" function="CCL" group="LUT4_OUT" field="PORTMUX.CCLROUTEA.LUT4"/>
-                <signal pad-id="pg0" index="0" function="CCL_IN" group="LUT5_IN"/>
-                <signal pad-id="pg1" index="1" function="CCL_IN" group="LUT5_IN"/>
-                <signal pad-id="pg2" index="2" function="CCL_IN" group="LUT5_IN"/>
-                <signal pad-id="pg6" index="0" function="CCL_ALT" group="LUT5_OUT" field="PORTMUX.CCLROUTEA.LUT5"/>
-                <signal pad-id="pg3" index="0" function="CCL" group="LUT5_OUT" field="PORTMUX.CCLROUTEA.LUT5"/>
+                <signal pad-key="pa0" index="0" function="CCL_IN" group="LUT0_IN"/>
+                <signal pad-key="pa1" index="1" function="CCL_IN" group="LUT0_IN"/>
+                <signal pad-key="pa2" index="2" function="CCL_IN" group="LUT0_IN"/>
+                <signal pad-key="pa6" index="0" function="CCL_ALT" group="LUT0_OUT" field="PORTMUX.CCLROUTEA.LUT0"/>
+                <signal pad-key="pa3" index="0" function="CCL" group="LUT0_OUT" field="PORTMUX.CCLROUTEA.LUT0"/>
+                <signal pad-key="pc0" index="0" function="CCL_IN" group="LUT1_IN"/>
+                <signal pad-key="pc1" index="1" function="CCL_IN" group="LUT1_IN"/>
+                <signal pad-key="pc2" index="2" function="CCL_IN" group="LUT1_IN"/>
+                <signal pad-key="pc6" index="0" function="CCL_ALT" group="LUT1_OUT" field="PORTMUX.CCLROUTEA.LUT1"/>
+                <signal pad-key="pc3" index="0" function="CCL" group="LUT1_OUT" field="PORTMUX.CCLROUTEA.LUT1"/>
+                <signal pad-key="pd0" index="0" function="CCL_IN" group="LUT2_IN"/>
+                <signal pad-key="pd1" index="1" function="CCL_IN" group="LUT2_IN"/>
+                <signal pad-key="pd2" index="2" function="CCL_IN" group="LUT2_IN"/>
+                <signal pad-key="pd6" index="0" function="CCL_ALT" group="LUT2_OUT" field="PORTMUX.CCLROUTEA.LUT2"/>
+                <signal pad-key="pd3" index="0" function="CCL" group="LUT2_OUT" field="PORTMUX.CCLROUTEA.LUT2"/>
+                <signal pad-key="pf0" index="0" function="CCL_IN" group="LUT3_IN"/>
+                <signal pad-key="pf1" index="1" function="CCL_IN" group="LUT3_IN"/>
+                <signal pad-key="pf2" index="2" function="CCL_IN" group="LUT3_IN"/>
+                <signal pad-key="pf3" index="0" function="CCL" group="LUT3_OUT" field="PORTMUX.CCLROUTEA.LUT3"/>
+                <signal pad-key="pb0" index="0" function="CCL_IN" group="LUT4_IN"/>
+                <signal pad-key="pb1" index="1" function="CCL_IN" group="LUT4_IN"/>
+                <signal pad-key="pb2" index="2" function="CCL_IN" group="LUT4_IN"/>
+                <signal pad-key="pb6" index="0" function="CCL_ALT" group="LUT4_OUT" field="PORTMUX.CCLROUTEA.LUT4"/>
+                <signal pad-key="pb3" index="0" function="CCL" group="LUT4_OUT" field="PORTMUX.CCLROUTEA.LUT4"/>
+                <signal pad-key="pg0" index="0" function="CCL_IN" group="LUT5_IN"/>
+                <signal pad-key="pg1" index="1" function="CCL_IN" group="LUT5_IN"/>
+                <signal pad-key="pg2" index="2" function="CCL_IN" group="LUT5_IN"/>
+                <signal pad-key="pg6" index="0" function="CCL_ALT" group="LUT5_OUT" field="PORTMUX.CCLROUTEA.LUT5"/>
+                <signal pad-key="pg3" index="0" function="CCL" group="LUT5_OUT" field="PORTMUX.CCLROUTEA.LUT5"/>
             </signals>
         </peripheral>
         <peripheral key="clkctrl" name="CLKCTRL" module-key="avrda_clkctrl">
             <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"/>
-                <signal pad-id="pf0" function="CLKCTRL" group="XTAL32K1"/>
-                <signal pad-id="pf1" function="CLKCTRL" group="XTAL32K2"/>
+                <signal pad-key="pa7" function="CLKCTRL" group="CLKOUT"/>
+                <signal pad-key="pa0" function="CLKCTRL" group="EXTCLK"/>
+                <signal pad-key="pf0" function="CLKCTRL" group="XTAL32K1"/>
+                <signal pad-key="pf1" function="CLKCTRL" group="XTAL32K2"/>
             </signals>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="cpu_avr_xt_v1">
@@ -168,25 +168,25 @@
         <peripheral key="dac0" name="DAC0" module-key="dac_nbit_ctrl_v5">
             <register-group-instance register-group-key="dac" address-space-key="data" offset="0x6A0"/>
             <signals>
-                <signal pad-id="pd6" index="0" function="DAC0" group="OUT"/>
+                <signal pad-key="pd6" index="0" function="DAC0" group="OUT"/>
             </signals>
         </peripheral>
         <peripheral key="evsys" name="EVSYS" module-key="avrda_evsys">
             <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"/>
-                <signal pad-id="pb7" index="1" function="EVSYS_ALT" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTB"/>
-                <signal pad-id="pb2" index="1" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTB"/>
-                <signal pad-id="pc7" index="2" function="EVSYS_ALT" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTC"/>
-                <signal pad-id="pc2" index="2" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTC"/>
-                <signal pad-id="pd7" index="3" function="EVSYS_ALT" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTD"/>
-                <signal pad-id="pd2" index="3" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTD"/>
-                <signal pad-id="pe7" index="4" function="EVSYS_ALT" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTE"/>
-                <signal pad-id="pe2" index="4" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTE"/>
-                <signal pad-id="pf2" index="5" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTF"/>
-                <signal pad-id="pg7" index="6" function="EVSYS_ALT" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTG"/>
-                <signal pad-id="pg2" index="6" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTG"/>
+                <signal pad-key="pa7" index="0" function="EVSYS_ALT" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTA"/>
+                <signal pad-key="pa2" index="0" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTA"/>
+                <signal pad-key="pb7" index="1" function="EVSYS_ALT" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTB"/>
+                <signal pad-key="pb2" index="1" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTB"/>
+                <signal pad-key="pc7" index="2" function="EVSYS_ALT" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTC"/>
+                <signal pad-key="pc2" index="2" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTC"/>
+                <signal pad-key="pd7" index="3" function="EVSYS_ALT" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTD"/>
+                <signal pad-key="pd2" index="3" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTD"/>
+                <signal pad-key="pe7" index="4" function="EVSYS_ALT" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTE"/>
+                <signal pad-key="pe2" index="4" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTE"/>
+                <signal pad-key="pf2" index="5" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTF"/>
+                <signal pad-key="pg7" index="6" function="EVSYS_ALT" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTG"/>
+                <signal pad-key="pg2" index="6" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTG"/>
             </signals>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="avrda_fuse">
@@ -204,91 +204,91 @@
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pa2" index="2" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa3" index="3" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa4" index="4" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa5" index="5" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa6" index="6" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa7" index="7" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa0" index="0" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa1" index="1" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa2" index="2" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa3" index="3" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa4" index="4" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa5" index="5" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa6" index="6" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa7" index="7" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pb2" index="2" function="IOPORT" group="PIN"/>
-                <signal pad-id="pb3" index="3" function="IOPORT" group="PIN"/>
-                <signal pad-id="pb4" index="4" function="IOPORT" group="PIN"/>
-                <signal pad-id="pb5" index="5" function="IOPORT" group="PIN"/>
-                <signal pad-id="pb6" index="6" function="IOPORT" group="PIN"/>
-                <signal pad-id="pb7" index="7" function="IOPORT" group="PIN"/>
+                <signal pad-key="pb0" index="0" function="IOPORT" group="PIN"/>
+                <signal pad-key="pb1" index="1" function="IOPORT" group="PIN"/>
+                <signal pad-key="pb2" index="2" function="IOPORT" group="PIN"/>
+                <signal pad-key="pb3" index="3" function="IOPORT" group="PIN"/>
+                <signal pad-key="pb4" index="4" function="IOPORT" group="PIN"/>
+                <signal pad-key="pb5" index="5" function="IOPORT" group="PIN"/>
+                <signal pad-key="pb6" index="6" function="IOPORT" group="PIN"/>
+                <signal pad-key="pb7" index="7" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pc2" index="2" function="IOPORT" group="PIN"/>
-                <signal pad-id="pc3" index="3" function="IOPORT" group="PIN"/>
-                <signal pad-id="pc4" index="4" function="IOPORT" group="PIN"/>
-                <signal pad-id="pc5" index="5" function="IOPORT" group="PIN"/>
-                <signal pad-id="pc6" index="6" function="IOPORT" group="PIN"/>
-                <signal pad-id="pc7" index="7" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc0" index="0" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc1" index="1" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc2" index="2" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc3" index="3" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc4" index="4" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc5" index="5" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc6" index="6" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc7" index="7" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pd2" index="2" function="IOPORT" group="PIN"/>
-                <signal pad-id="pd3" index="3" function="IOPORT" group="PIN"/>
-                <signal pad-id="pd4" index="4" function="IOPORT" group="PIN"/>
-                <signal pad-id="pd5" index="5" function="IOPORT" group="PIN"/>
-                <signal pad-id="pd6" index="6" function="IOPORT" group="PIN"/>
-                <signal pad-id="pd7" index="7" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd0" index="0" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd1" index="1" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd2" index="2" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd3" index="3" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd4" index="4" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd5" index="5" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd6" index="6" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd7" index="7" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="porte" name="PORTE" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pe2" index="2" function="IOPORT" group="PIN"/>
-                <signal pad-id="pe3" index="3" function="IOPORT" group="PIN"/>
-                <signal pad-id="pe4" index="4" function="IOPORT" group="PIN"/>
-                <signal pad-id="pe5" index="5" function="IOPORT" group="PIN"/>
-                <signal pad-id="pe6" index="6" function="IOPORT" group="PIN"/>
-                <signal pad-id="pe7" index="7" function="IOPORT" group="PIN"/>
+                <signal pad-key="pe0" index="0" function="IOPORT" group="PIN"/>
+                <signal pad-key="pe1" index="1" function="IOPORT" group="PIN"/>
+                <signal pad-key="pe2" index="2" function="IOPORT" group="PIN"/>
+                <signal pad-key="pe3" index="3" function="IOPORT" group="PIN"/>
+                <signal pad-key="pe4" index="4" function="IOPORT" group="PIN"/>
+                <signal pad-key="pe5" index="5" function="IOPORT" group="PIN"/>
+                <signal pad-key="pe6" index="6" function="IOPORT" group="PIN"/>
+                <signal pad-key="pe7" index="7" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="portf" name="PORTF" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pf2" index="2" function="IOPORT" group="PIN"/>
-                <signal pad-id="pf3" index="3" function="IOPORT" group="PIN"/>
-                <signal pad-id="pf4" index="4" function="IOPORT" group="PIN"/>
-                <signal pad-id="pf5" index="5" function="IOPORT" group="PIN"/>
-                <signal pad-id="pf6" index="6" function="IOPORT" group="PIN"/>
+                <signal pad-key="pf0" index="0" function="IOPORT" group="PIN"/>
+                <signal pad-key="pf1" index="1" function="IOPORT" group="PIN"/>
+                <signal pad-key="pf2" index="2" function="IOPORT" group="PIN"/>
+                <signal pad-key="pf3" index="3" function="IOPORT" group="PIN"/>
+                <signal pad-key="pf4" index="4" function="IOPORT" group="PIN"/>
+                <signal pad-key="pf5" index="5" function="IOPORT" group="PIN"/>
+                <signal pad-key="pf6" index="6" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="portg" name="PORTG" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pg2" index="2" function="IOPORT" group="PIN"/>
-                <signal pad-id="pg3" index="3" function="IOPORT" group="PIN"/>
-                <signal pad-id="pg4" index="4" function="IOPORT" group="PIN"/>
-                <signal pad-id="pg5" index="5" function="IOPORT" group="PIN"/>
-                <signal pad-id="pg6" index="6" function="IOPORT" group="PIN"/>
-                <signal pad-id="pg7" index="7" function="IOPORT" group="PIN"/>
+                <signal pad-key="pg0" index="0" function="IOPORT" group="PIN"/>
+                <signal pad-key="pg1" index="1" function="IOPORT" group="PIN"/>
+                <signal pad-key="pg2" index="2" function="IOPORT" group="PIN"/>
+                <signal pad-key="pg3" index="3" function="IOPORT" group="PIN"/>
+                <signal pad-key="pg4" index="4" function="IOPORT" group="PIN"/>
+                <signal pad-key="pg5" index="5" function="IOPORT" group="PIN"/>
+                <signal pad-key="pg6" index="6" function="IOPORT" group="PIN"/>
+                <signal pad-key="pg7" index="7" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="portmux" name="PORTMUX" module-key="avrda_portmux">
@@ -296,58 +296,58 @@
         </peripheral>
         <peripheral key="ptc" name="PTC" module-key="adc_ptc_ctrl_v1">
             <signals>
-                <signal pad-id="pa0" index="0" function="PTC" group="XY"/>
-                <signal pad-id="pa1" index="1" function="PTC" group="XY"/>
-                <signal pad-id="pa2" index="2" function="PTC" group="XY"/>
-                <signal pad-id="pa3" index="3" function="PTC" group="XY"/>
-                <signal pad-id="pa4" index="4" function="PTC" group="XY"/>
-                <signal pad-id="pa5" index="5" function="PTC" group="XY"/>
-                <signal pad-id="pa6" index="6" function="PTC" group="XY"/>
-                <signal pad-id="pa7" index="7" function="PTC" group="XY"/>
-                <signal pad-id="pb0" index="8" function="PTC" group="XY"/>
-                <signal pad-id="pb1" index="9" function="PTC" group="XY"/>
-                <signal pad-id="pb2" index="10" function="PTC" group="XY"/>
-                <signal pad-id="pb3" index="11" function="PTC" group="XY"/>
-                <signal pad-id="pb4" index="12" function="PTC" group="XY"/>
-                <signal pad-id="pb5" index="13" function="PTC" group="XY"/>
-                <signal pad-id="pb6" index="14" function="PTC" group="XY"/>
-                <signal pad-id="pb7" index="15" function="PTC" group="XY"/>
-                <signal pad-id="pd0" index="16" function="PTC" group="XY"/>
-                <signal pad-id="pd1" index="17" function="PTC" group="XY"/>
-                <signal pad-id="pd2" index="18" function="PTC" group="XY"/>
-                <signal pad-id="pd3" index="19" function="PTC" group="XY"/>
-                <signal pad-id="pd4" index="20" function="PTC" group="XY"/>
-                <signal pad-id="pd5" index="21" function="PTC" group="XY"/>
-                <signal pad-id="pd6" index="22" function="PTC" group="XY"/>
-                <signal pad-id="pd7" index="23" function="PTC" group="XY"/>
-                <signal pad-id="pe0" index="24" function="PTC" group="XY"/>
-                <signal pad-id="pe1" index="25" function="PTC" group="XY"/>
-                <signal pad-id="pe2" index="26" function="PTC" group="XY"/>
-                <signal pad-id="pe3" index="27" function="PTC" group="XY"/>
-                <signal pad-id="pe4" index="28" function="PTC" group="XY"/>
-                <signal pad-id="pe5" index="29" function="PTC" group="XY"/>
-                <signal pad-id="pe6" index="30" function="PTC" group="XY"/>
-                <signal pad-id="pe7" index="31" function="PTC" group="XY"/>
-                <signal pad-id="pf0" index="32" function="PTC" group="XY"/>
-                <signal pad-id="pf1" index="33" function="PTC" group="XY"/>
-                <signal pad-id="pf2" index="34" function="PTC" group="XY"/>
-                <signal pad-id="pf3" index="35" function="PTC" group="XY"/>
-                <signal pad-id="pf4" index="36" function="PTC" group="XY"/>
-                <signal pad-id="pf5" index="37" function="PTC" group="XY"/>
-                <signal pad-id="pg0" index="40" function="PTC" group="XY"/>
-                <signal pad-id="pg1" index="41" function="PTC" group="XY"/>
-                <signal pad-id="pg2" index="42" function="PTC" group="XY"/>
-                <signal pad-id="pg3" index="43" function="PTC" group="XY"/>
-                <signal pad-id="pg4" index="44" function="PTC" group="XY"/>
-                <signal pad-id="pg5" index="45" function="PTC" group="XY"/>
-                <signal pad-id="pg6" index="46" function="PTC" group="XY"/>
-                <signal pad-id="pg7" index="47" function="PTC" group="XY"/>
+                <signal pad-key="pa0" index="0" function="PTC" group="XY"/>
+                <signal pad-key="pa1" index="1" function="PTC" group="XY"/>
+                <signal pad-key="pa2" index="2" function="PTC" group="XY"/>
+                <signal pad-key="pa3" index="3" function="PTC" group="XY"/>
+                <signal pad-key="pa4" index="4" function="PTC" group="XY"/>
+                <signal pad-key="pa5" index="5" function="PTC" group="XY"/>
+                <signal pad-key="pa6" index="6" function="PTC" group="XY"/>
+                <signal pad-key="pa7" index="7" function="PTC" group="XY"/>
+                <signal pad-key="pb0" index="8" function="PTC" group="XY"/>
+                <signal pad-key="pb1" index="9" function="PTC" group="XY"/>
+                <signal pad-key="pb2" index="10" function="PTC" group="XY"/>
+                <signal pad-key="pb3" index="11" function="PTC" group="XY"/>
+                <signal pad-key="pb4" index="12" function="PTC" group="XY"/>
+                <signal pad-key="pb5" index="13" function="PTC" group="XY"/>
+                <signal pad-key="pb6" index="14" function="PTC" group="XY"/>
+                <signal pad-key="pb7" index="15" function="PTC" group="XY"/>
+                <signal pad-key="pd0" index="16" function="PTC" group="XY"/>
+                <signal pad-key="pd1" index="17" function="PTC" group="XY"/>
+                <signal pad-key="pd2" index="18" function="PTC" group="XY"/>
+                <signal pad-key="pd3" index="19" function="PTC" group="XY"/>
+                <signal pad-key="pd4" index="20" function="PTC" group="XY"/>
+                <signal pad-key="pd5" index="21" function="PTC" group="XY"/>
+                <signal pad-key="pd6" index="22" function="PTC" group="XY"/>
+                <signal pad-key="pd7" index="23" function="PTC" group="XY"/>
+                <signal pad-key="pe0" index="24" function="PTC" group="XY"/>
+                <signal pad-key="pe1" index="25" function="PTC" group="XY"/>
+                <signal pad-key="pe2" index="26" function="PTC" group="XY"/>
+                <signal pad-key="pe3" index="27" function="PTC" group="XY"/>
+                <signal pad-key="pe4" index="28" function="PTC" group="XY"/>
+                <signal pad-key="pe5" index="29" function="PTC" group="XY"/>
+                <signal pad-key="pe6" index="30" function="PTC" group="XY"/>
+                <signal pad-key="pe7" index="31" function="PTC" group="XY"/>
+                <signal pad-key="pf0" index="32" function="PTC" group="XY"/>
+                <signal pad-key="pf1" index="33" function="PTC" group="XY"/>
+                <signal pad-key="pf2" index="34" function="PTC" group="XY"/>
+                <signal pad-key="pf3" index="35" function="PTC" group="XY"/>
+                <signal pad-key="pf4" index="36" function="PTC" group="XY"/>
+                <signal pad-key="pf5" index="37" function="PTC" group="XY"/>
+                <signal pad-key="pg0" index="40" function="PTC" group="XY"/>
+                <signal pad-key="pg1" index="41" function="PTC" group="XY"/>
+                <signal pad-key="pg2" index="42" function="PTC" group="XY"/>
+                <signal pad-key="pg3" index="43" function="PTC" group="XY"/>
+                <signal pad-key="pg4" index="44" function="PTC" group="XY"/>
+                <signal pad-key="pg5" index="45" function="PTC" group="XY"/>
+                <signal pad-key="pg6" index="46" function="PTC" group="XY"/>
+                <signal pad-key="pg7" index="47" function="PTC" group="XY"/>
             </signals>
         </peripheral>
         <peripheral key="rstctrl" name="RSTCTRL" module-key="rst_integration_v8">
             <register-group-instance register-group-key="rstctrl" address-space-key="data" offset="0x40"/>
             <signals>
-                <signal pad-id="pf6" function="OTHER" group="RESET"/>
+                <signal pad-key="pf6" function="OTHER" group="RESET"/>
             </signals>
         </peripheral>
         <peripheral key="rtc" name="RTC" module-key="tmr_16b_rtc_v1">
@@ -362,35 +362,35 @@
         <peripheral key="spi0" name="SPI0" module-key="spi_8bit_v2">
             <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"/>
-                <signal pad-id="pa5" function="SPI0" group="MISO" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <signal pad-id="pg4" function="SPI0_ALT2" group="MOSI" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <signal pad-id="pe0" function="SPI0_ALT" group="MOSI" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <signal pad-id="pa4" function="SPI0" group="MOSI" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <signal pad-id="pg6" function="SPI0_ALT2" group="SCK" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <signal pad-id="pe2" function="SPI0_ALT" group="SCK" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <signal pad-id="pa6" function="SPI0" group="SCK" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <signal pad-id="pg7" function="SPI0_ALT2" group="SS" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <signal pad-id="pe3" function="SPI0_ALT" group="SS" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <signal pad-id="pa7" function="SPI0" group="SS" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pg5" function="SPI0_ALT2" group="MISO" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pe1" function="SPI0_ALT" group="MISO" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pa5" function="SPI0" group="MISO" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pg4" function="SPI0_ALT2" group="MOSI" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pe0" function="SPI0_ALT" group="MOSI" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pa4" function="SPI0" group="MOSI" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pg6" function="SPI0_ALT2" group="SCK" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pe2" function="SPI0_ALT" group="SCK" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pa6" function="SPI0" group="SCK" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pg7" function="SPI0_ALT2" group="SS" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pe3" function="SPI0_ALT" group="SS" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pa7" function="SPI0" group="SS" field="PORTMUX.SPIROUTEA.SPI0"/>
             </signals>
         </peripheral>
         <peripheral key="spi1" name="SPI1" module-key="spi_8bit_v2">
             <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"/>
-                <signal pad-id="pc1" function="SPI1" group="MISO" field="PORTMUX.SPIROUTEA.SPI1"/>
-                <signal pad-id="pb4" function="SPI1_ALT2" group="MOSI" field="PORTMUX.SPIROUTEA.SPI1"/>
-                <signal pad-id="pc4" function="SPI1_ALT" group="MOSI" field="PORTMUX.SPIROUTEA.SPI1"/>
-                <signal pad-id="pc0" function="SPI1" group="MOSI" field="PORTMUX.SPIROUTEA.SPI1"/>
-                <signal pad-id="pb6" function="SPI1_ALT2" group="SCK" field="PORTMUX.SPIROUTEA.SPI1"/>
-                <signal pad-id="pc6" function="SPI1_ALT" group="SCK" field="PORTMUX.SPIROUTEA.SPI1"/>
-                <signal pad-id="pc2" function="SPI1" group="SCK" field="PORTMUX.SPIROUTEA.SPI1"/>
-                <signal pad-id="pb7" function="SPI1_ALT2" group="SS" field="PORTMUX.SPIROUTEA.SPI1"/>
-                <signal pad-id="pc7" function="SPI1_ALT" group="SS" field="PORTMUX.SPIROUTEA.SPI1"/>
-                <signal pad-id="pc3" function="SPI1" group="SS" field="PORTMUX.SPIROUTEA.SPI1"/>
+                <signal pad-key="pb5" function="SPI1_ALT2" group="MISO" field="PORTMUX.SPIROUTEA.SPI1"/>
+                <signal pad-key="pc5" function="SPI1_ALT" group="MISO" field="PORTMUX.SPIROUTEA.SPI1"/>
+                <signal pad-key="pc1" function="SPI1" group="MISO" field="PORTMUX.SPIROUTEA.SPI1"/>
+                <signal pad-key="pb4" function="SPI1_ALT2" group="MOSI" field="PORTMUX.SPIROUTEA.SPI1"/>
+                <signal pad-key="pc4" function="SPI1_ALT" group="MOSI" field="PORTMUX.SPIROUTEA.SPI1"/>
+                <signal pad-key="pc0" function="SPI1" group="MOSI" field="PORTMUX.SPIROUTEA.SPI1"/>
+                <signal pad-key="pb6" function="SPI1_ALT2" group="SCK" field="PORTMUX.SPIROUTEA.SPI1"/>
+                <signal pad-key="pc6" function="SPI1_ALT" group="SCK" field="PORTMUX.SPIROUTEA.SPI1"/>
+                <signal pad-key="pc2" function="SPI1" group="SCK" field="PORTMUX.SPIROUTEA.SPI1"/>
+                <signal pad-key="pb7" function="SPI1_ALT2" group="SS" field="PORTMUX.SPIROUTEA.SPI1"/>
+                <signal pad-key="pc7" function="SPI1_ALT" group="SS" field="PORTMUX.SPIROUTEA.SPI1"/>
+                <signal pad-key="pc3" function="SPI1" group="SS" field="PORTMUX.SPIROUTEA.SPI1"/>
             </signals>
         </peripheral>
         <peripheral key="syscfg" name="SYSCFG" module-key="avrda_syscfg">
@@ -399,237 +399,237 @@
         <peripheral key="tca0" name="TCA0" module-key="tmr_16b_pwm_v1">
             <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"/>
-                <signal pad-id="pe0" index="0" function="TCA0_ALT4" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pd0" index="0" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pc0" index="0" function="TCA0_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pb0" index="0" function="TCA0_ALT" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pa0" index="0" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pg1" index="1" function="TCA0_ALT6" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pf1" index="1" function="TCA0_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pe1" index="1" function="TCA0_ALT4" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pd1" index="1" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pc1" index="1" function="TCA0_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pb1" index="1" function="TCA0_ALT" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pa1" index="1" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pg2" index="2" function="TCA0_ALT6" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pf2" index="2" function="TCA0_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pe2" index="2" function="TCA0_ALT4" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pd2" index="2" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pc2" index="2" function="TCA0_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pb2" index="2" function="TCA0_ALT" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pa2" index="2" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pg3" index="3" function="TCA0_ALT6" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pf3" index="3" function="TCA0_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pe3" index="3" function="TCA0_ALT4" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pd3" index="3" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pc3" index="3" function="TCA0_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pb3" index="3" function="TCA0_ALT" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pa3" index="3" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pg4" index="4" function="TCA0_ALT6" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pf4" index="4" function="TCA0_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pe4" index="4" function="TCA0_ALT4" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pd4" index="4" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pc4" index="4" function="TCA0_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pb4" index="4" function="TCA0_ALT" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pa4" index="4" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pg5" index="5" function="TCA0_ALT6" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pf5" index="5" function="TCA0_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pe5" index="5" function="TCA0_ALT4" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pd5" index="5" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pc5" index="5" function="TCA0_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pb5" index="5" function="TCA0_ALT" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pa5" index="5" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pg0" index="0" function="TCA0_ALT6" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pf0" index="0" function="TCA0_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pe0" index="0" function="TCA0_ALT4" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pd0" index="0" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pc0" index="0" function="TCA0_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pb0" index="0" function="TCA0_ALT" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pa0" index="0" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pg1" index="1" function="TCA0_ALT6" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pf1" index="1" function="TCA0_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pe1" index="1" function="TCA0_ALT4" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pd1" index="1" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pc1" index="1" function="TCA0_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pb1" index="1" function="TCA0_ALT" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pa1" index="1" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pg2" index="2" function="TCA0_ALT6" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pf2" index="2" function="TCA0_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pe2" index="2" function="TCA0_ALT4" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pd2" index="2" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pc2" index="2" function="TCA0_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pb2" index="2" function="TCA0_ALT" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pa2" index="2" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pg3" index="3" function="TCA0_ALT6" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pf3" index="3" function="TCA0_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pe3" index="3" function="TCA0_ALT4" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pd3" index="3" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pc3" index="3" function="TCA0_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pb3" index="3" function="TCA0_ALT" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pa3" index="3" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pg4" index="4" function="TCA0_ALT6" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pf4" index="4" function="TCA0_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pe4" index="4" function="TCA0_ALT4" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pd4" index="4" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pc4" index="4" function="TCA0_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pb4" index="4" function="TCA0_ALT" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pa4" index="4" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pg5" index="5" function="TCA0_ALT6" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pf5" index="5" function="TCA0_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pe5" index="5" function="TCA0_ALT4" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pd5" index="5" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pc5" index="5" function="TCA0_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pb5" index="5" function="TCA0_ALT" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pa5" index="5" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
             </signals>
         </peripheral>
         <peripheral key="tca1" name="TCA1" module-key="tmr_16b_pwm_v1">
             <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"/>
-                <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"/>
-                <signal pad-id="pg1" index="1" function="TCA1_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA1"/>
-                <signal pad-id="pe5" index="1" function="TCA1_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA1"/>
-                <signal pad-id="pc5" index="1" function="TCA1_ALT" group="WO" field="PORTMUX.TCAROUTEA.TCA1"/>
-                <signal pad-id="pb1" index="1" function="TCA1" group="WO" field="PORTMUX.TCAROUTEA.TCA1"/>
-                <signal pad-id="pg2" index="2" function="TCA1_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA1"/>
-                <signal pad-id="pe6" index="2" function="TCA1_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA1"/>
-                <signal pad-id="pc6" index="2" function="TCA1_ALT" group="WO" field="PORTMUX.TCAROUTEA.TCA1"/>
-                <signal pad-id="pb2" index="2" function="TCA1" group="WO" field="PORTMUX.TCAROUTEA.TCA1"/>
-                <signal pad-id="pg3" index="3" function="TCA1_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA1"/>
-                <signal pad-id="pb3" index="3" function="TCA1" group="WO" field="PORTMUX.TCAROUTEA.TCA1"/>
-                <signal pad-id="pg4" index="4" function="TCA1_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA1"/>
-                <signal pad-id="pb4" index="4" function="TCA1" group="WO" field="PORTMUX.TCAROUTEA.TCA1"/>
-                <signal pad-id="pg5" index="5" function="TCA1_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA1"/>
-                <signal pad-id="pb5" index="5" function="TCA1" group="WO" field="PORTMUX.TCAROUTEA.TCA1"/>
+                <signal pad-key="pg0" index="0" function="TCA1_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA1"/>
+                <signal pad-key="pe4" index="0" function="TCA1_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA1"/>
+                <signal pad-key="pc4" index="0" function="TCA1_ALT" group="WO" field="PORTMUX.TCAROUTEA.TCA1"/>
+                <signal pad-key="pb0" index="0" function="TCA1" group="WO" field="PORTMUX.TCAROUTEA.TCA1"/>
+                <signal pad-key="pg1" index="1" function="TCA1_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA1"/>
+                <signal pad-key="pe5" index="1" function="TCA1_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA1"/>
+                <signal pad-key="pc5" index="1" function="TCA1_ALT" group="WO" field="PORTMUX.TCAROUTEA.TCA1"/>
+                <signal pad-key="pb1" index="1" function="TCA1" group="WO" field="PORTMUX.TCAROUTEA.TCA1"/>
+                <signal pad-key="pg2" index="2" function="TCA1_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA1"/>
+                <signal pad-key="pe6" index="2" function="TCA1_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA1"/>
+                <signal pad-key="pc6" index="2" function="TCA1_ALT" group="WO" field="PORTMUX.TCAROUTEA.TCA1"/>
+                <signal pad-key="pb2" index="2" function="TCA1" group="WO" field="PORTMUX.TCAROUTEA.TCA1"/>
+                <signal pad-key="pg3" index="3" function="TCA1_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA1"/>
+                <signal pad-key="pb3" index="3" function="TCA1" group="WO" field="PORTMUX.TCAROUTEA.TCA1"/>
+                <signal pad-key="pg4" index="4" function="TCA1_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA1"/>
+                <signal pad-key="pb4" index="4" function="TCA1" group="WO" field="PORTMUX.TCAROUTEA.TCA1"/>
+                <signal pad-key="pg5" index="5" function="TCA1_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA1"/>
+                <signal pad-key="pb5" index="5" function="TCA1" group="WO" field="PORTMUX.TCAROUTEA.TCA1"/>
             </signals>
         </peripheral>
         <peripheral key="tcb0" name="TCB0" module-key="tmr_16b_capture_v1">
             <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"/>
+                <signal pad-key="pf4" index="0" function="TCB0_ALT" group="WO" field="PORTMUX.TCBROUTEA.TCB0"/>
+                <signal pad-key="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 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"/>
+                <signal pad-key="pf5" index="0" function="TCB1_ALT" group="WO" field="PORTMUX.TCBROUTEA.TCB1"/>
+                <signal pad-key="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 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"/>
+                <signal pad-key="pb4" index="0" function="TCB2_ALT" group="WO" field="PORTMUX.TCBROUTEA.TCB2"/>
+                <signal pad-key="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 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"/>
+                <signal pad-key="pc1" index="0" function="TCB3_ALT" group="WO" field="PORTMUX.TCBROUTEA.TCB3"/>
+                <signal pad-key="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 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"/>
+                <signal pad-key="pc6" index="0" function="TCB4_ALT" group="WO" field="PORTMUX.TCBROUTEA.TCB4"/>
+                <signal pad-key="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 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"/>
-                <signal pad-id="pb4" function="TCD0_ALT" group="WOA" field="PORTMUX.TCDROUTEA.TCD0"/>
-                <signal pad-id="pa4" function="TCD0" group="WOA" field="PORTMUX.TCDROUTEA.TCD0"/>
-                <signal pad-id="pg5" index="1" function="TCD0_ALT3" group="WOB" field="PORTMUX.TCDROUTEA.TCD0"/>
-                <signal pad-id="pf1" index="1" function="TCD0_ALT2" group="WOB" field="PORTMUX.TCDROUTEA.TCD0"/>
-                <signal pad-id="pb5" index="1" function="TCD0_ALT" group="WOB" field="PORTMUX.TCDROUTEA.TCD0"/>
-                <signal pad-id="pa5" index="1" function="TCD0" group="WOB" field="PORTMUX.TCDROUTEA.TCD0"/>
-                <signal pad-id="pg6" index="2" function="TCD0_ALT3" group="WOC" field="PORTMUX.TCDROUTEA.TCD0"/>
-                <signal pad-id="pf2" index="2" function="TCD0_ALT2" group="WOC" field="PORTMUX.TCDROUTEA.TCD0"/>
-                <signal pad-id="pb6" index="2" function="TCD0_ALT" group="WOC" field="PORTMUX.TCDROUTEA.TCD0"/>
-                <signal pad-id="pa6" index="2" function="TCD0" group="WOC" field="PORTMUX.TCDROUTEA.TCD0"/>
-                <signal pad-id="pg7" index="3" function="TCD0_ALT3" group="WOD" field="PORTMUX.TCDROUTEA.TCD0"/>
-                <signal pad-id="pf3" index="3" function="TCD0_ALT2" group="WOD" field="PORTMUX.TCDROUTEA.TCD0"/>
-                <signal pad-id="pb7" index="3" function="TCD0_ALT" group="WOD" field="PORTMUX.TCDROUTEA.TCD0"/>
-                <signal pad-id="pa7" index="3" function="TCD0" group="WOD" field="PORTMUX.TCDROUTEA.TCD0"/>
+                <signal pad-key="pg4" function="TCD0_ALT3" group="WOA" field="PORTMUX.TCDROUTEA.TCD0"/>
+                <signal pad-key="pf0" function="TCD0_ALT2" group="WOA" field="PORTMUX.TCDROUTEA.TCD0"/>
+                <signal pad-key="pb4" function="TCD0_ALT" group="WOA" field="PORTMUX.TCDROUTEA.TCD0"/>
+                <signal pad-key="pa4" function="TCD0" group="WOA" field="PORTMUX.TCDROUTEA.TCD0"/>
+                <signal pad-key="pg5" index="1" function="TCD0_ALT3" group="WOB" field="PORTMUX.TCDROUTEA.TCD0"/>
+                <signal pad-key="pf1" index="1" function="TCD0_ALT2" group="WOB" field="PORTMUX.TCDROUTEA.TCD0"/>
+                <signal pad-key="pb5" index="1" function="TCD0_ALT" group="WOB" field="PORTMUX.TCDROUTEA.TCD0"/>
+                <signal pad-key="pa5" index="1" function="TCD0" group="WOB" field="PORTMUX.TCDROUTEA.TCD0"/>
+                <signal pad-key="pg6" index="2" function="TCD0_ALT3" group="WOC" field="PORTMUX.TCDROUTEA.TCD0"/>
+                <signal pad-key="pf2" index="2" function="TCD0_ALT2" group="WOC" field="PORTMUX.TCDROUTEA.TCD0"/>
+                <signal pad-key="pb6" index="2" function="TCD0_ALT" group="WOC" field="PORTMUX.TCDROUTEA.TCD0"/>
+                <signal pad-key="pa6" index="2" function="TCD0" group="WOC" field="PORTMUX.TCDROUTEA.TCD0"/>
+                <signal pad-key="pg7" index="3" function="TCD0_ALT3" group="WOD" field="PORTMUX.TCDROUTEA.TCD0"/>
+                <signal pad-key="pf3" index="3" function="TCD0_ALT2" group="WOD" field="PORTMUX.TCDROUTEA.TCD0"/>
+                <signal pad-key="pb7" index="3" function="TCD0_ALT" group="WOD" field="PORTMUX.TCDROUTEA.TCD0"/>
+                <signal pad-key="pa7" index="3" function="TCD0" group="WOD" field="PORTMUX.TCDROUTEA.TCD0"/>
             </signals>
         </peripheral>
         <peripheral key="twi0" name="TWI0" module-key="i2c_8bit_v2">
             <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"/>
-                <signal pad-id="pa3" function="I2C0" group="SCL" field="PORTMUX.TWIROUTEA.TWI0"/>
-                <signal pad-id="pc7" function="I2C0_ALT2" group="SCL_DUAL" field="PORTMUX.TWIROUTEA.TWI0"/>
-                <signal pad-id="pc7" function="I2C0_ALT1" group="SCL_DUAL" field="PORTMUX.TWIROUTEA.TWI0"/>
-                <signal pad-id="pc3" function="I2C0" group="SCL_DUAL" field="PORTMUX.TWIROUTEA.TWI0"/>
-                <signal pad-id="pc2" function="I2C0_ALT2" group="SDA" field="PORTMUX.TWIROUTEA.TWI0"/>
-                <signal pad-id="pa2" function="I2C0_ALT1" group="SDA" field="PORTMUX.TWIROUTEA.TWI0"/>
-                <signal pad-id="pa2" function="I2C0" group="SDA" field="PORTMUX.TWIROUTEA.TWI0"/>
-                <signal pad-id="pc6" function="I2C0_ALT2" group="SDA_DUAL" field="PORTMUX.TWIROUTEA.TWI0"/>
-                <signal pad-id="pc6" function="I2C0_ALT1" group="SDA_DUAL" field="PORTMUX.TWIROUTEA.TWI0"/>
-                <signal pad-id="pc2" function="I2C0" group="SDA_DUAL" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pc3" function="I2C0_ALT2" group="SCL" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pa3" function="I2C0_ALT1" group="SCL" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pa3" function="I2C0" group="SCL" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pc7" function="I2C0_ALT2" group="SCL_DUAL" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pc7" function="I2C0_ALT1" group="SCL_DUAL" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pc3" function="I2C0" group="SCL_DUAL" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pc2" function="I2C0_ALT2" group="SDA" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pa2" function="I2C0_ALT1" group="SDA" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pa2" function="I2C0" group="SDA" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pc6" function="I2C0_ALT2" group="SDA_DUAL" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pc6" function="I2C0_ALT1" group="SDA_DUAL" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pc2" function="I2C0" group="SDA_DUAL" field="PORTMUX.TWIROUTEA.TWI0"/>
             </signals>
         </peripheral>
         <peripheral key="twi1" name="TWI1" module-key="i2c_8bit_v2">
             <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"/>
-                <signal pad-id="pf3" function="I2C1" group="SCL" field="PORTMUX.TWIROUTEA.TWI1"/>
-                <signal pad-id="pb7" function="I2C1_ALT2" group="SCL_DUAL" field="PORTMUX.TWIROUTEA.TWI1"/>
-                <signal pad-id="pb7" function="I2C1_ALT1" group="SCL_DUAL" field="PORTMUX.TWIROUTEA.TWI1"/>
-                <signal pad-id="pb3" function="I2C1" group="SCL_DUAL" field="PORTMUX.TWIROUTEA.TWI1"/>
-                <signal pad-id="pb2" function="I2C1_ALT2" group="SDA" field="PORTMUX.TWIROUTEA.TWI1"/>
-                <signal pad-id="pf2" function="I2C1_ALT1" group="SDA" field="PORTMUX.TWIROUTEA.TWI1"/>
-                <signal pad-id="pf2" function="I2C1" group="SDA" field="PORTMUX.TWIROUTEA.TWI1"/>
-                <signal pad-id="pb6" function="I2C1_ALT2" group="SDA_DUAL" field="PORTMUX.TWIROUTEA.TWI1"/>
-                <signal pad-id="pb6" function="I2C1_ALT1" group="SDA_DUAL" field="PORTMUX.TWIROUTEA.TWI1"/>
-                <signal pad-id="pb2" function="I2C1" group="SDA_DUAL" field="PORTMUX.TWIROUTEA.TWI1"/>
+                <signal pad-key="pb3" function="I2C1_ALT2" group="SCL" field="PORTMUX.TWIROUTEA.TWI1"/>
+                <signal pad-key="pf3" function="I2C1_ALT1" group="SCL" field="PORTMUX.TWIROUTEA.TWI1"/>
+                <signal pad-key="pf3" function="I2C1" group="SCL" field="PORTMUX.TWIROUTEA.TWI1"/>
+                <signal pad-key="pb7" function="I2C1_ALT2" group="SCL_DUAL" field="PORTMUX.TWIROUTEA.TWI1"/>
+                <signal pad-key="pb7" function="I2C1_ALT1" group="SCL_DUAL" field="PORTMUX.TWIROUTEA.TWI1"/>
+                <signal pad-key="pb3" function="I2C1" group="SCL_DUAL" field="PORTMUX.TWIROUTEA.TWI1"/>
+                <signal pad-key="pb2" function="I2C1_ALT2" group="SDA" field="PORTMUX.TWIROUTEA.TWI1"/>
+                <signal pad-key="pf2" function="I2C1_ALT1" group="SDA" field="PORTMUX.TWIROUTEA.TWI1"/>
+                <signal pad-key="pf2" function="I2C1" group="SDA" field="PORTMUX.TWIROUTEA.TWI1"/>
+                <signal pad-key="pb6" function="I2C1_ALT2" group="SDA_DUAL" field="PORTMUX.TWIROUTEA.TWI1"/>
+                <signal pad-key="pb6" function="I2C1_ALT1" group="SDA_DUAL" field="PORTMUX.TWIROUTEA.TWI1"/>
+                <signal pad-key="pb2" function="I2C1" group="SDA_DUAL" field="PORTMUX.TWIROUTEA.TWI1"/>
             </signals>
         </peripheral>
         <peripheral key="usart0" name="USART0" module-key="uart_autobd_v4">
             <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"/>
-                <signal pad-id="pa4" function="USART0_ALT" group="TXD" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pa0" function="USART0" group="TXD" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pa6" function="USART0_ALT" group="XCK" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pa2" function="USART0" group="XCK" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pa7" function="USART0_ALT" group="XDIR" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pa3" function="USART0" group="XDIR" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa5" function="USART0_ALT" group="RXD" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa1" function="USART0" group="RXD" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa4" function="USART0_ALT" group="TXD" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa0" function="USART0" group="TXD" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa6" function="USART0_ALT" group="XCK" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa2" function="USART0" group="XCK" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa7" function="USART0_ALT" group="XDIR" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa3" function="USART0" group="XDIR" field="PORTMUX.USARTROUTEA.USART0"/>
             </signals>
         </peripheral>
         <peripheral key="usart1" name="USART1" module-key="uart_autobd_v4">
             <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"/>
-                <signal pad-id="pc4" function="USART1_ALT" group="TXD" field="PORTMUX.USARTROUTEA.USART1"/>
-                <signal pad-id="pc0" function="USART1" group="TXD" field="PORTMUX.USARTROUTEA.USART1"/>
-                <signal pad-id="pc6" function="USART1_ALT" group="XCK" field="PORTMUX.USARTROUTEA.USART1"/>
-                <signal pad-id="pc2" function="USART1" group="XCK" field="PORTMUX.USARTROUTEA.USART1"/>
-                <signal pad-id="pc7" function="USART1_ALT" group="XDIR" field="PORTMUX.USARTROUTEA.USART1"/>
-                <signal pad-id="pc3" function="USART1" group="XDIR" field="PORTMUX.USARTROUTEA.USART1"/>
+                <signal pad-key="pc5" function="USART1_ALT" group="RXD" field="PORTMUX.USARTROUTEA.USART1"/>
+                <signal pad-key="pc1" function="USART1" group="RXD" field="PORTMUX.USARTROUTEA.USART1"/>
+                <signal pad-key="pc4" function="USART1_ALT" group="TXD" field="PORTMUX.USARTROUTEA.USART1"/>
+                <signal pad-key="pc0" function="USART1" group="TXD" field="PORTMUX.USARTROUTEA.USART1"/>
+                <signal pad-key="pc6" function="USART1_ALT" group="XCK" field="PORTMUX.USARTROUTEA.USART1"/>
+                <signal pad-key="pc2" function="USART1" group="XCK" field="PORTMUX.USARTROUTEA.USART1"/>
+                <signal pad-key="pc7" function="USART1_ALT" group="XDIR" field="PORTMUX.USARTROUTEA.USART1"/>
+                <signal pad-key="pc3" function="USART1" group="XDIR" field="PORTMUX.USARTROUTEA.USART1"/>
             </signals>
         </peripheral>
         <peripheral key="usart2" name="USART2" module-key="uart_autobd_v4">
             <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"/>
-                <signal pad-id="pf4" function="USART2_ALT" group="TXD" field="PORTMUX.USARTROUTEA.USART2"/>
-                <signal pad-id="pf0" function="USART2" group="TXD" field="PORTMUX.USARTROUTEA.USART2"/>
-                <signal pad-id="pf2" function="USART2" group="XCK" field="PORTMUX.USARTROUTEA.USART2"/>
-                <signal pad-id="pf3" function="USART2" group="XDIR" field="PORTMUX.USARTROUTEA.USART2"/>
+                <signal pad-key="pf5" function="USART2_ALT" group="RXD" field="PORTMUX.USARTROUTEA.USART2"/>
+                <signal pad-key="pf1" function="USART2" group="RXD" field="PORTMUX.USARTROUTEA.USART2"/>
+                <signal pad-key="pf4" function="USART2_ALT" group="TXD" field="PORTMUX.USARTROUTEA.USART2"/>
+                <signal pad-key="pf0" function="USART2" group="TXD" field="PORTMUX.USARTROUTEA.USART2"/>
+                <signal pad-key="pf2" function="USART2" group="XCK" field="PORTMUX.USARTROUTEA.USART2"/>
+                <signal pad-key="pf3" function="USART2" group="XDIR" field="PORTMUX.USARTROUTEA.USART2"/>
             </signals>
         </peripheral>
         <peripheral key="usart3" name="USART3" module-key="uart_autobd_v4">
             <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"/>
-                <signal pad-id="pb4" function="USART3_ALT" group="TXD" field="PORTMUX.USARTROUTEA.USART3"/>
-                <signal pad-id="pb0" function="USART3" group="TXD" field="PORTMUX.USARTROUTEA.USART3"/>
-                <signal pad-id="pb6" function="USART3_ALT" group="XCK" field="PORTMUX.USARTROUTEA.USART3"/>
-                <signal pad-id="pb2" function="USART3" group="XCK" field="PORTMUX.USARTROUTEA.USART3"/>
-                <signal pad-id="pb7" function="USART3_ALT" group="XDIR" field="PORTMUX.USARTROUTEA.USART3"/>
-                <signal pad-id="pb3" function="USART3" group="XDIR" field="PORTMUX.USARTROUTEA.USART3"/>
+                <signal pad-key="pb5" function="USART3_ALT" group="RXD" field="PORTMUX.USARTROUTEA.USART3"/>
+                <signal pad-key="pb1" function="USART3" group="RXD" field="PORTMUX.USARTROUTEA.USART3"/>
+                <signal pad-key="pb4" function="USART3_ALT" group="TXD" field="PORTMUX.USARTROUTEA.USART3"/>
+                <signal pad-key="pb0" function="USART3" group="TXD" field="PORTMUX.USARTROUTEA.USART3"/>
+                <signal pad-key="pb6" function="USART3_ALT" group="XCK" field="PORTMUX.USARTROUTEA.USART3"/>
+                <signal pad-key="pb2" function="USART3" group="XCK" field="PORTMUX.USARTROUTEA.USART3"/>
+                <signal pad-key="pb7" function="USART3_ALT" group="XDIR" field="PORTMUX.USARTROUTEA.USART3"/>
+                <signal pad-key="pb3" function="USART3" group="XDIR" field="PORTMUX.USARTROUTEA.USART3"/>
             </signals>
         </peripheral>
         <peripheral key="usart4" name="USART4" module-key="uart_autobd_v4">
             <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"/>
-                <signal pad-id="pe4" function="USART4_ALT" group="TXD" field="PORTMUX.USARTROUTEB.USART4"/>
-                <signal pad-id="pe0" function="USART4" group="TXD" field="PORTMUX.USARTROUTEB.USART4"/>
-                <signal pad-id="pe6" function="USART4_ALT" group="XCK" field="PORTMUX.USARTROUTEB.USART4"/>
-                <signal pad-id="pe2" function="USART4" group="XCK" field="PORTMUX.USARTROUTEB.USART4"/>
-                <signal pad-id="pe7" function="USART4_ALT" group="XDIR" field="PORTMUX.USARTROUTEB.USART4"/>
-                <signal pad-id="pe3" function="USART4" group="XDIR" field="PORTMUX.USARTROUTEB.USART4"/>
+                <signal pad-key="pe5" function="USART4_ALT" group="RXD" field="PORTMUX.USARTROUTEB.USART4"/>
+                <signal pad-key="pe1" function="USART4" group="RXD" field="PORTMUX.USARTROUTEB.USART4"/>
+                <signal pad-key="pe4" function="USART4_ALT" group="TXD" field="PORTMUX.USARTROUTEB.USART4"/>
+                <signal pad-key="pe0" function="USART4" group="TXD" field="PORTMUX.USARTROUTEB.USART4"/>
+                <signal pad-key="pe6" function="USART4_ALT" group="XCK" field="PORTMUX.USARTROUTEB.USART4"/>
+                <signal pad-key="pe2" function="USART4" group="XCK" field="PORTMUX.USARTROUTEB.USART4"/>
+                <signal pad-key="pe7" function="USART4_ALT" group="XDIR" field="PORTMUX.USARTROUTEB.USART4"/>
+                <signal pad-key="pe3" function="USART4" group="XDIR" field="PORTMUX.USARTROUTEB.USART4"/>
             </signals>
         </peripheral>
         <peripheral key="usart5" name="USART5" module-key="uart_autobd_v4">
             <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"/>
-                <signal pad-id="pg4" function="USART5_ALT" group="TXD" field="PORTMUX.USARTROUTEB.USART5"/>
-                <signal pad-id="pg0" function="USART5" group="TXD" field="PORTMUX.USARTROUTEB.USART5"/>
-                <signal pad-id="pg6" function="USART5_ALT" group="XCK" field="PORTMUX.USARTROUTEB.USART5"/>
-                <signal pad-id="pg2" function="USART5" group="XCK" field="PORTMUX.USARTROUTEB.USART5"/>
-                <signal pad-id="pg7" function="USART5_ALT" group="XDIR" field="PORTMUX.USARTROUTEB.USART5"/>
-                <signal pad-id="pg3" function="USART5" group="XDIR" field="PORTMUX.USARTROUTEB.USART5"/>
+                <signal pad-key="pg5" function="USART5_ALT" group="RXD" field="PORTMUX.USARTROUTEB.USART5"/>
+                <signal pad-key="pg1" function="USART5" group="RXD" field="PORTMUX.USARTROUTEB.USART5"/>
+                <signal pad-key="pg4" function="USART5_ALT" group="TXD" field="PORTMUX.USARTROUTEB.USART5"/>
+                <signal pad-key="pg0" function="USART5" group="TXD" field="PORTMUX.USARTROUTEB.USART5"/>
+                <signal pad-key="pg6" function="USART5_ALT" group="XCK" field="PORTMUX.USARTROUTEB.USART5"/>
+                <signal pad-key="pg2" function="USART5" group="XCK" field="PORTMUX.USARTROUTEB.USART5"/>
+                <signal pad-key="pg7" function="USART5_ALT" group="XDIR" field="PORTMUX.USARTROUTEB.USART5"/>
+                <signal pad-key="pg3" function="USART5" group="XDIR" field="PORTMUX.USARTROUTEB.USART5"/>
             </signals>
         </peripheral>
         <peripheral key="userrow" name="USERROW" module-key="avrda_userrow">
@@ -665,25 +665,25 @@
         <peripheral key="zcd0" name="ZCD0" module-key="cmp_zxover_ctrl_v3">
             <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"/>
-                <signal pad-id="pa7" function="ZCD0" group="OUT" field="PORTMUX.ZCDROUTEA.ZCD0"/>
+                <signal pad-key="pd1" function="ZCD0" group="IN"/>
+                <signal pad-key="pc7" function="ZCD0_ALT" group="OUT" field="PORTMUX.ZCDROUTEA.ZCD0"/>
+                <signal pad-key="pa7" function="ZCD0" group="OUT" field="PORTMUX.ZCDROUTEA.ZCD0"/>
             </signals>
         </peripheral>
         <peripheral key="zcd1" name="ZCD1" module-key="cmp_zxover_ctrl_v3">
             <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"/>
-                <signal pad-id="pa7" function="ZCD1" group="OUT" field="PORTMUX.ZCDROUTEA.ZCD1"/>
+                <signal pad-key="pe3" function="ZCD1" group="IN"/>
+                <signal pad-key="pc7" function="ZCD1_ALT" group="OUT" field="PORTMUX.ZCDROUTEA.ZCD1"/>
+                <signal pad-key="pa7" function="ZCD1" group="OUT" field="PORTMUX.ZCDROUTEA.ZCD1"/>
             </signals>
         </peripheral>
         <peripheral key="zcd2" name="ZCD2" module-key="cmp_zxover_ctrl_v3">
             <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"/>
-                <signal pad-id="pa7" function="ZCD2" group="OUT" field="PORTMUX.ZCDROUTEA.ZCD2"/>
+                <signal pad-key="pe7" function="ZCD2" group="IN"/>
+                <signal pad-key="pc7" function="ZCD2_ALT" group="OUT" field="PORTMUX.ZCDROUTEA.ZCD2"/>
+                <signal pad-key="pa7" function="ZCD2" group="OUT" field="PORTMUX.ZCDROUTEA.ZCD2"/>
             </signals>
         </peripheral>
     </peripherals>
@@ -2020,75 +2020,141 @@
             </register-group>
         </module>
     </modules>
+    <pads>
+        <pad key="pa3" name="PA3"/>
+        <pad key="pa4" name="PA4"/>
+        <pad key="pa5" name="PA5"/>
+        <pad key="pa6" name="PA6"/>
+        <pad key="pa7" name="PA7"/>
+        <pad key="vdd0" name="VDD0"/>
+        <pad key="gnd0" name="GND0"/>
+        <pad key="pb0" name="PB0"/>
+        <pad key="pb1" name="PB1"/>
+        <pad key="pb2" name="PB2"/>
+        <pad key="pb3" name="PB3"/>
+        <pad key="pb4" name="PB4"/>
+        <pad key="pb5" name="PB5"/>
+        <pad key="pb6" name="PB6"/>
+        <pad key="pb7" name="PB7"/>
+        <pad key="pc0" name="PC0"/>
+        <pad key="pc1" name="PC1"/>
+        <pad key="pc2" name="PC2"/>
+        <pad key="pc3" name="PC3"/>
+        <pad key="vdd1" name="VDD1"/>
+        <pad key="gnd1" name="GND1"/>
+        <pad key="pc4" name="PC4"/>
+        <pad key="pc5" name="PC5"/>
+        <pad key="pc6" name="PC6"/>
+        <pad key="pc7" name="PC7"/>
+        <pad key="pd0" name="PD0"/>
+        <pad key="pd1" name="PD1"/>
+        <pad key="pd2" name="PD2"/>
+        <pad key="pd3" name="PD3"/>
+        <pad key="pd4" name="PD4"/>
+        <pad key="pd5" name="PD5"/>
+        <pad key="pd6" name="PD6"/>
+        <pad key="pd7" name="PD7"/>
+        <pad key="avdd" name="AVDD"/>
+        <pad key="agnd" name="AGND"/>
+        <pad key="pe0" name="PE0"/>
+        <pad key="pe1" name="PE1"/>
+        <pad key="pe2" name="PE2"/>
+        <pad key="pe3" name="PE3"/>
+        <pad key="pe4" name="PE4"/>
+        <pad key="pe5" name="PE5"/>
+        <pad key="pe6" name="PE6"/>
+        <pad key="pe7" name="PE7"/>
+        <pad key="pf0" name="PF0"/>
+        <pad key="pf1" name="PF1"/>
+        <pad key="pf2" name="PF2"/>
+        <pad key="pf3" name="PF3"/>
+        <pad key="pf4" name="PF4"/>
+        <pad key="pf5" name="PF5"/>
+        <pad key="pf6" name="PF6"/>
+        <pad key="updi" name="UPDI"/>
+        <pad key="pg0" name="PG0"/>
+        <pad key="pg1" name="PG1"/>
+        <pad key="pg2" name="PG2"/>
+        <pad key="pg3" name="PG3"/>
+        <pad key="vdd2" name="VDD2"/>
+        <pad key="gnd2" name="GND2"/>
+        <pad key="pg4" name="PG4"/>
+        <pad key="pg5" name="PG5"/>
+        <pad key="pg6" name="PG6"/>
+        <pad key="pg7" name="PG7"/>
+        <pad key="pa0" name="PA0"/>
+        <pad key="pa1" name="PA1"/>
+        <pad key="pa2" name="PA2"/>
+    </pads>
     <pinouts>
         <pinout key="qfn64" name="QFN64" type="qfn">
-            <pin position="1" pad="PA3"/>
-            <pin position="2" pad="PA4"/>
-            <pin position="3" pad="PA5"/>
-            <pin position="4" pad="PA6"/>
-            <pin position="5" pad="PA7"/>
-            <pin position="6" pad="VDD0"/>
-            <pin position="7" pad="GND0"/>
-            <pin position="8" pad="PB0"/>
-            <pin position="9" pad="PB1"/>
-            <pin position="10" pad="PB2"/>
-            <pin position="11" pad="PB3"/>
-            <pin position="12" pad="PB4"/>
-            <pin position="13" pad="PB5"/>
-            <pin position="14" pad="PB6"/>
-            <pin position="15" pad="PB7"/>
-            <pin position="16" pad="PC0"/>
-            <pin position="17" pad="PC1"/>
-            <pin position="18" pad="PC2"/>
-            <pin position="19" pad="PC3"/>
-            <pin position="20" pad="VDD1"/>
-            <pin position="21" pad="GND1"/>
-            <pin position="22" pad="PC4"/>
-            <pin position="23" pad="PC5"/>
-            <pin position="24" pad="PC6"/>
-            <pin position="25" pad="PC7"/>
-            <pin position="26" pad="PD0"/>
-            <pin position="27" pad="PD1"/>
-            <pin position="28" pad="PD2"/>
-            <pin position="29" pad="PD3"/>
-            <pin position="30" pad="PD4"/>
-            <pin position="31" pad="PD5"/>
-            <pin position="32" pad="PD6"/>
-            <pin position="33" pad="PD7"/>
-            <pin position="34" pad="AVDD"/>
-            <pin position="35" pad="AGND"/>
-            <pin position="36" pad="PE0"/>
-            <pin position="37" pad="PE1"/>
-            <pin position="38" pad="PE2"/>
-            <pin position="39" pad="PE3"/>
-            <pin position="40" pad="PE4"/>
-            <pin position="41" pad="PE5"/>
-            <pin position="42" pad="PE6"/>
-            <pin position="43" pad="PE7"/>
-            <pin position="44" pad="PF0"/>
-            <pin position="45" pad="PF1"/>
-            <pin position="46" pad="PF2"/>
-            <pin position="47" pad="PF3"/>
-            <pin position="48" pad="PF4"/>
-            <pin position="49" pad="PF5"/>
-            <pin position="50" pad="PF6"/>
-            <pin position="51" pad="UPDI"/>
-            <pin position="52" pad="PG0"/>
-            <pin position="53" pad="PG1"/>
-            <pin position="54" pad="PG2"/>
-            <pin position="55" pad="PG3"/>
-            <pin position="56" pad="VDD2"/>
-            <pin position="57" pad="GND2"/>
-            <pin position="58" pad="PG4"/>
-            <pin position="59" pad="PG5"/>
-            <pin position="60" pad="PG6"/>
-            <pin position="61" pad="PG7"/>
-            <pin position="62" pad="PA0"/>
-            <pin position="63" pad="PA1"/>
-            <pin position="64" pad="PA2"/>
+            <pin position="1" pad-key="pa3"/>
+            <pin position="2" pad-key="pa4"/>
+            <pin position="3" pad-key="pa5"/>
+            <pin position="4" pad-key="pa6"/>
+            <pin position="5" pad-key="pa7"/>
+            <pin position="6" pad-key="vdd0"/>
+            <pin position="7" pad-key="gnd0"/>
+            <pin position="8" pad-key="pb0"/>
+            <pin position="9" pad-key="pb1"/>
+            <pin position="10" pad-key="pb2"/>
+            <pin position="11" pad-key="pb3"/>
+            <pin position="12" pad-key="pb4"/>
+            <pin position="13" pad-key="pb5"/>
+            <pin position="14" pad-key="pb6"/>
+            <pin position="15" pad-key="pb7"/>
+            <pin position="16" pad-key="pc0"/>
+            <pin position="17" pad-key="pc1"/>
+            <pin position="18" pad-key="pc2"/>
+            <pin position="19" pad-key="pc3"/>
+            <pin position="20" pad-key="vdd1"/>
+            <pin position="21" pad-key="gnd1"/>
+            <pin position="22" pad-key="pc4"/>
+            <pin position="23" pad-key="pc5"/>
+            <pin position="24" pad-key="pc6"/>
+            <pin position="25" pad-key="pc7"/>
+            <pin position="26" pad-key="pd0"/>
+            <pin position="27" pad-key="pd1"/>
+            <pin position="28" pad-key="pd2"/>
+            <pin position="29" pad-key="pd3"/>
+            <pin position="30" pad-key="pd4"/>
+            <pin position="31" pad-key="pd5"/>
+            <pin position="32" pad-key="pd6"/>
+            <pin position="33" pad-key="pd7"/>
+            <pin position="34" pad-key="avdd"/>
+            <pin position="35" pad-key="agnd"/>
+            <pin position="36" pad-key="pe0"/>
+            <pin position="37" pad-key="pe1"/>
+            <pin position="38" pad-key="pe2"/>
+            <pin position="39" pad-key="pe3"/>
+            <pin position="40" pad-key="pe4"/>
+            <pin position="41" pad-key="pe5"/>
+            <pin position="42" pad-key="pe6"/>
+            <pin position="43" pad-key="pe7"/>
+            <pin position="44" pad-key="pf0"/>
+            <pin position="45" pad-key="pf1"/>
+            <pin position="46" pad-key="pf2"/>
+            <pin position="47" pad-key="pf3"/>
+            <pin position="48" pad-key="pf4"/>
+            <pin position="49" pad-key="pf5"/>
+            <pin position="50" pad-key="pf6"/>
+            <pin position="51" pad-key="updi"/>
+            <pin position="52" pad-key="pg0"/>
+            <pin position="53" pad-key="pg1"/>
+            <pin position="54" pad-key="pg2"/>
+            <pin position="55" pad-key="pg3"/>
+            <pin position="56" pad-key="vdd2"/>
+            <pin position="57" pad-key="gnd2"/>
+            <pin position="58" pad-key="pg4"/>
+            <pin position="59" pad-key="pg5"/>
+            <pin position="60" pad-key="pg6"/>
+            <pin position="61" pad-key="pg7"/>
+            <pin position="62" pad-key="pa0"/>
+            <pin position="63" pad-key="pa1"/>
+            <pin position="64" pad-key="pa2"/>
         </pinout>
     </pinouts>
     <variants>
-        <variant name="AVR64DA64" pinout-key="qfn64" package="QFN64"/>
+        <variant key="avr64da64" name="AVR64DA64" pinout-key="qfn64"/>
     </variants>
 </device>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR64DB28.xml b/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR64DB28.xml
index 8e4cb0f5..9e601785 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR64DB28.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR64DB28.xml
@@ -44,48 +44,48 @@
         <peripheral key="ac0" name="AC0" module-key="cmp_control_v8">
             <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"/>
-                <signal pad-id="pa7" index="0" function="AC0" group="OUT" field="PORTMUX.ACROUTEA.AC0"/>
-                <signal pad-id="pd2" index="0" function="AC0" group="P"/>
-                <signal pad-id="pd6" index="3" function="AC0" group="P"/>
+                <signal pad-key="pd3" index="0" function="AC0" group="N"/>
+                <signal pad-key="pd7" index="2" function="AC0" group="N"/>
+                <signal pad-key="pa7" index="0" function="AC0" group="OUT" field="PORTMUX.ACROUTEA.AC0"/>
+                <signal pad-key="pd2" index="0" function="AC0" group="P"/>
+                <signal pad-key="pd6" index="3" function="AC0" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="ac1" name="AC1" module-key="cmp_control_v8">
             <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"/>
-                <signal pad-id="pa7" index="0" function="AC1" group="OUT" field="PORTMUX.ACROUTEA.AC1"/>
-                <signal pad-id="pd2" index="0" function="AC1" group="P"/>
-                <signal pad-id="pd3" index="1" function="AC1" group="P"/>
-                <signal pad-id="pd4" index="2" function="AC1" group="P"/>
-                <signal pad-id="pd6" index="3" function="AC1" group="P"/>
+                <signal pad-key="pd5" index="0" function="AC1" group="N"/>
+                <signal pad-key="pd7" index="2" function="AC1" group="N"/>
+                <signal pad-key="pa7" index="0" function="AC1" group="OUT" field="PORTMUX.ACROUTEA.AC1"/>
+                <signal pad-key="pd2" index="0" function="AC1" group="P"/>
+                <signal pad-key="pd3" index="1" function="AC1" group="P"/>
+                <signal pad-key="pd4" index="2" function="AC1" group="P"/>
+                <signal pad-key="pd6" index="3" function="AC1" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="ac2" name="AC2" module-key="cmp_control_v8">
             <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"/>
-                <signal pad-id="pa7" index="0" function="AC2" group="OUT" field="PORTMUX.ACROUTEA.AC2"/>
-                <signal pad-id="pd2" index="0" function="AC2" group="P"/>
-                <signal pad-id="pd4" index="1" function="AC2" group="P"/>
-                <signal pad-id="pd6" index="3" function="AC2" group="P"/>
+                <signal pad-key="pd7" index="0" function="AC2" group="N"/>
+                <signal pad-key="pd7" index="2" function="AC2" group="N"/>
+                <signal pad-key="pa7" index="0" function="AC2" group="OUT" field="PORTMUX.ACROUTEA.AC2"/>
+                <signal pad-key="pd2" index="0" function="AC2" group="P"/>
+                <signal pad-key="pd4" index="1" function="AC2" group="P"/>
+                <signal pad-key="pd6" index="3" function="AC2" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="adc0" name="ADC0" module-key="adc_12b_diff_ctrl_v1">
             <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"/>
-                <signal pad-id="pd3" index="3" function="AIN0" group="AIN"/>
-                <signal pad-id="pd4" index="4" function="AIN0" group="AIN"/>
-                <signal pad-id="pd5" index="5" function="AIN0" group="AIN"/>
-                <signal pad-id="pd6" index="6" function="AIN0" group="AIN"/>
-                <signal pad-id="pd7" index="7" function="AIN0" group="AIN"/>
-                <signal pad-id="pf0" index="16" function="AIN0" group="AIN"/>
-                <signal pad-id="pf1" index="17" function="AIN0" group="AIN"/>
+                <signal pad-key="pd1" index="1" function="AIN0" group="AIN"/>
+                <signal pad-key="pd2" index="2" function="AIN0" group="AIN"/>
+                <signal pad-key="pd3" index="3" function="AIN0" group="AIN"/>
+                <signal pad-key="pd4" index="4" function="AIN0" group="AIN"/>
+                <signal pad-key="pd5" index="5" function="AIN0" group="AIN"/>
+                <signal pad-key="pd6" index="6" function="AIN0" group="AIN"/>
+                <signal pad-key="pd7" index="7" function="AIN0" group="AIN"/>
+                <signal pad-key="pf0" index="16" function="AIN0" group="AIN"/>
+                <signal pad-key="pf1" index="17" function="AIN0" group="AIN"/>
             </signals>
         </peripheral>
         <peripheral key="bod" name="BOD" module-key="bor_lvd_ctrl_v1">
@@ -94,32 +94,32 @@
         <peripheral key="ccl" name="CCL" module-key="cla_ccl_v1">
             <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"/>
-                <signal pad-id="pa2" index="2" function="CCL_IN" group="LUT0_IN"/>
-                <signal pad-id="pa6" index="0" function="CCL_ALT" group="LUT0_OUT" field="PORTMUX.CCLROUTEA.LUT0"/>
-                <signal pad-id="pa3" index="0" function="CCL" group="LUT0_OUT" field="PORTMUX.CCLROUTEA.LUT0"/>
-                <signal pad-id="pc0" index="0" function="CCL_IN" group="LUT1_IN"/>
-                <signal pad-id="pc1" index="1" function="CCL_IN" group="LUT1_IN"/>
-                <signal pad-id="pc2" index="2" function="CCL_IN" group="LUT1_IN"/>
-                <signal pad-id="pc3" index="0" function="CCL" group="LUT1_OUT" field="PORTMUX.CCLROUTEA.LUT1"/>
-                <signal pad-id="pd1" index="1" function="CCL_IN" group="LUT2_IN"/>
-                <signal pad-id="pd2" index="2" function="CCL_IN" group="LUT2_IN"/>
-                <signal pad-id="pd6" index="0" function="CCL_ALT" group="LUT2_OUT" field="PORTMUX.CCLROUTEA.LUT2"/>
-                <signal pad-id="pd3" index="0" function="CCL" group="LUT2_OUT" field="PORTMUX.CCLROUTEA.LUT2"/>
-                <signal pad-id="pf0" index="0" function="CCL_IN" group="LUT3_IN"/>
-                <signal pad-id="pf1" index="1" function="CCL_IN" group="LUT3_IN"/>
+                <signal pad-key="pa0" index="0" function="CCL_IN" group="LUT0_IN"/>
+                <signal pad-key="pa1" index="1" function="CCL_IN" group="LUT0_IN"/>
+                <signal pad-key="pa2" index="2" function="CCL_IN" group="LUT0_IN"/>
+                <signal pad-key="pa6" index="0" function="CCL_ALT" group="LUT0_OUT" field="PORTMUX.CCLROUTEA.LUT0"/>
+                <signal pad-key="pa3" index="0" function="CCL" group="LUT0_OUT" field="PORTMUX.CCLROUTEA.LUT0"/>
+                <signal pad-key="pc0" index="0" function="CCL_IN" group="LUT1_IN"/>
+                <signal pad-key="pc1" index="1" function="CCL_IN" group="LUT1_IN"/>
+                <signal pad-key="pc2" index="2" function="CCL_IN" group="LUT1_IN"/>
+                <signal pad-key="pc3" index="0" function="CCL" group="LUT1_OUT" field="PORTMUX.CCLROUTEA.LUT1"/>
+                <signal pad-key="pd1" index="1" function="CCL_IN" group="LUT2_IN"/>
+                <signal pad-key="pd2" index="2" function="CCL_IN" group="LUT2_IN"/>
+                <signal pad-key="pd6" index="0" function="CCL_ALT" group="LUT2_OUT" field="PORTMUX.CCLROUTEA.LUT2"/>
+                <signal pad-key="pd3" index="0" function="CCL" group="LUT2_OUT" field="PORTMUX.CCLROUTEA.LUT2"/>
+                <signal pad-key="pf0" index="0" function="CCL_IN" group="LUT3_IN"/>
+                <signal pad-key="pf1" index="1" function="CCL_IN" group="LUT3_IN"/>
             </signals>
         </peripheral>
         <peripheral key="clkctrl" name="CLKCTRL" module-key="chip_clkctrl">
             <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"/>
-                <signal pad-id="pf0" function="CLKCTRL" group="XTAL32K1"/>
-                <signal pad-id="pf1" function="CLKCTRL" group="XTAL32K2"/>
-                <signal pad-id="pa0" function="CLKCTRL" group="XTALHF1"/>
-                <signal pad-id="pa1" function="CLKCTRL" group="XTALHF2"/>
+                <signal pad-key="pa7" function="CLKCTRL" group="CLKOUT"/>
+                <signal pad-key="pa0" function="CLKCTRL" group="EXTCLK"/>
+                <signal pad-key="pf0" function="CLKCTRL" group="XTAL32K1"/>
+                <signal pad-key="pf1" function="CLKCTRL" group="XTAL32K2"/>
+                <signal pad-key="pa0" function="CLKCTRL" group="XTALHF1"/>
+                <signal pad-key="pa1" function="CLKCTRL" group="XTALHF2"/>
             </signals>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="cpu_avr_xt_v1">
@@ -134,17 +134,17 @@
         <peripheral key="dac0" name="DAC0" module-key="dac_nbit_ctrl_v5">
             <register-group-instance register-group-key="dac" address-space-key="data" offset="0x6A0"/>
             <signals>
-                <signal pad-id="pd6" index="0" function="DAC0" group="OUT"/>
+                <signal pad-key="pd6" index="0" function="DAC0" group="OUT"/>
             </signals>
         </peripheral>
         <peripheral key="evsys" name="EVSYS" module-key="chip_evsys">
             <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"/>
-                <signal pad-id="pc2" index="2" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTC"/>
-                <signal pad-id="pd7" index="3" function="EVSYS_ALT" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTD"/>
-                <signal pad-id="pd2" index="3" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTD"/>
+                <signal pad-key="pa7" index="0" function="EVSYS_ALT" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTA"/>
+                <signal pad-key="pa2" index="0" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTA"/>
+                <signal pad-key="pc2" index="2" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTC"/>
+                <signal pad-key="pd7" index="3" function="EVSYS_ALT" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTD"/>
+                <signal pad-key="pd2" index="3" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTD"/>
             </signals>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="chip_fuse">
@@ -165,54 +165,54 @@
         <peripheral key="opamp" name="OPAMP" module-key="amp_opamp_ctrl_avr_v1">
             <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"/>
-                <signal pad-id="pd2" function="OPAMP" group="OP0OUT"/>
-                <signal pad-id="pd7" function="OPAMP" group="OP1INN"/>
-                <signal pad-id="pd4" function="OPAMP" group="OP1INP"/>
-                <signal pad-id="pd5" function="OPAMP" group="OP1OUT"/>
+                <signal pad-key="pd3" function="OPAMP" group="OP0INN"/>
+                <signal pad-key="pd1" function="OPAMP" group="OP0INP"/>
+                <signal pad-key="pd2" function="OPAMP" group="OP0OUT"/>
+                <signal pad-key="pd7" function="OPAMP" group="OP1INN"/>
+                <signal pad-key="pd4" function="OPAMP" group="OP1INP"/>
+                <signal pad-key="pd5" function="OPAMP" group="OP1OUT"/>
             </signals>
         </peripheral>
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pa2" index="2" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa3" index="3" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa4" index="4" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa5" index="5" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa6" index="6" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa7" index="7" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa0" index="0" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa1" index="1" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa2" index="2" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa3" index="3" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa4" index="4" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa5" index="5" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa6" index="6" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa7" index="7" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pc2" index="2" function="IOPORT" group="PIN"/>
-                <signal pad-id="pc3" index="3" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc0" index="0" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc1" index="1" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc2" index="2" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc3" index="3" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pd3" index="3" function="IOPORT" group="PIN"/>
-                <signal pad-id="pd4" index="4" function="IOPORT" group="PIN"/>
-                <signal pad-id="pd5" index="5" function="IOPORT" group="PIN"/>
-                <signal pad-id="pd6" index="6" function="IOPORT" group="PIN"/>
-                <signal pad-id="pd7" index="7" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd1" index="1" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd2" index="2" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd3" index="3" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd4" index="4" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd5" index="5" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd6" index="6" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd7" index="7" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="portf" name="PORTF" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pf6" index="6" function="IOPORT" group="PIN"/>
+                <signal pad-key="pf0" index="0" function="IOPORT" group="PIN"/>
+                <signal pad-key="pf1" index="1" function="IOPORT" group="PIN"/>
+                <signal pad-key="pf6" index="6" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="portmux" name="PORTMUX" module-key="chip_portmux">
@@ -221,7 +221,7 @@
         <peripheral key="rstctrl" name="RSTCTRL" module-key="rst_integration_v8">
             <register-group-instance register-group-key="rstctrl" address-space-key="data" offset="0x40"/>
             <signals>
-                <signal pad-id="pf6" function="OTHER" group="RESET"/>
+                <signal pad-key="pf6" function="OTHER" group="RESET"/>
             </signals>
         </peripheral>
         <peripheral key="rtc" name="RTC" module-key="tmr_16b_rtc_v1">
@@ -236,19 +236,19 @@
         <peripheral key="spi0" name="SPI0" module-key="spi_8bit_v2">
             <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"/>
-                <signal pad-id="pa6" function="SPI0" group="SCK" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <signal pad-id="pa7" function="SPI0" group="SS" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pa5" function="SPI0" group="MISO" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pa4" function="SPI0" group="MOSI" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pa6" function="SPI0" group="SCK" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pa7" function="SPI0" group="SS" field="PORTMUX.SPIROUTEA.SPI0"/>
             </signals>
         </peripheral>
         <peripheral key="spi1" name="SPI1" module-key="spi_8bit_v2">
             <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"/>
-                <signal pad-id="pc2" function="SPI1" group="SCK" field="PORTMUX.SPIROUTEA.SPI1"/>
-                <signal pad-id="pc3" function="SPI1" group="SS" field="PORTMUX.SPIROUTEA.SPI1"/>
+                <signal pad-key="pc1" function="SPI1" group="MISO" field="PORTMUX.SPIROUTEA.SPI1"/>
+                <signal pad-key="pc0" function="SPI1" group="MOSI" field="PORTMUX.SPIROUTEA.SPI1"/>
+                <signal pad-key="pc2" function="SPI1" group="SCK" field="PORTMUX.SPIROUTEA.SPI1"/>
+                <signal pad-key="pc3" function="SPI1" group="SS" field="PORTMUX.SPIROUTEA.SPI1"/>
             </signals>
         </peripheral>
         <peripheral key="syscfg" name="SYSCFG" module-key="chip_syscfg">
@@ -257,90 +257,90 @@
         <peripheral key="tca0" name="TCA0" module-key="tmr_16b_pwm_v1">
             <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"/>
-                <signal pad-id="pa0" index="0" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pf1" index="1" function="TCA0_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pd1" index="1" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pc1" index="1" function="TCA0_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pa1" index="1" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pd2" index="2" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pc2" index="2" function="TCA0_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pa2" index="2" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pd3" index="3" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pc3" index="3" function="TCA0_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pa3" index="3" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pd4" index="4" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pa4" index="4" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pd5" index="5" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pa5" index="5" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pf0" index="0" function="TCA0_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pc0" index="0" function="TCA0_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pa0" index="0" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pf1" index="1" function="TCA0_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pd1" index="1" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pc1" index="1" function="TCA0_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pa1" index="1" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pd2" index="2" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pc2" index="2" function="TCA0_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pa2" index="2" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pd3" index="3" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pc3" index="3" function="TCA0_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pa3" index="3" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pd4" index="4" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pa4" index="4" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pd5" index="5" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pa5" index="5" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
             </signals>
         </peripheral>
         <peripheral key="tcb0" name="TCB0" module-key="tmr_16b_capture_v1">
             <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-key="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 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-key="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 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"/>
+                <signal pad-key="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 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"/>
-                <signal pad-id="pf1" index="1" function="TCD0_ALT2" group="WOB" field="PORTMUX.TCDROUTEA.TCD0"/>
-                <signal pad-id="pa5" index="1" function="TCD0" group="WOB" field="PORTMUX.TCDROUTEA.TCD0"/>
-                <signal pad-id="pa6" index="2" function="TCD0" group="WOC" field="PORTMUX.TCDROUTEA.TCD0"/>
-                <signal pad-id="pa7" index="3" function="TCD0" group="WOD" field="PORTMUX.TCDROUTEA.TCD0"/>
+                <signal pad-key="pf0" function="TCD0_ALT2" group="WOA" field="PORTMUX.TCDROUTEA.TCD0"/>
+                <signal pad-key="pa4" function="TCD0" group="WOA" field="PORTMUX.TCDROUTEA.TCD0"/>
+                <signal pad-key="pf1" index="1" function="TCD0_ALT2" group="WOB" field="PORTMUX.TCDROUTEA.TCD0"/>
+                <signal pad-key="pa5" index="1" function="TCD0" group="WOB" field="PORTMUX.TCDROUTEA.TCD0"/>
+                <signal pad-key="pa6" index="2" function="TCD0" group="WOC" field="PORTMUX.TCDROUTEA.TCD0"/>
+                <signal pad-key="pa7" index="3" function="TCD0" group="WOD" field="PORTMUX.TCDROUTEA.TCD0"/>
             </signals>
         </peripheral>
         <peripheral key="twi0" name="TWI0" module-key="i2c_8bit_v2">
             <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"/>
-                <signal pad-id="pc2" function="I2C0_ALT" group="SDA" field="PORTMUX.TWIROUTEA.TWI0"/>
-                <signal pad-id="pa2" function="I2C0" group="SDA" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pc3" function="I2C0_ALT" group="SCL" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pa3" function="I2C0" group="SCL" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pc2" function="I2C0_ALT" group="SDA" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pa2" function="I2C0" group="SDA" field="PORTMUX.TWIROUTEA.TWI0"/>
             </signals>
         </peripheral>
         <peripheral key="usart0" name="USART0" module-key="uart_autobd_v4">
             <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"/>
-                <signal pad-id="pa4" function="USART0_ALT" group="TXD" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pa0" function="USART0" group="TXD" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pa6" function="USART0_ALT" group="XCK" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pa2" function="USART0" group="XCK" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pa7" function="USART0_ALT" group="XDIR" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pa3" function="USART0" group="XDIR" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa5" function="USART0_ALT" group="RXD" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa1" function="USART0" group="RXD" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa4" function="USART0_ALT" group="TXD" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa0" function="USART0" group="TXD" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa6" function="USART0_ALT" group="XCK" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa2" function="USART0" group="XCK" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa7" function="USART0_ALT" group="XDIR" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa3" function="USART0" group="XDIR" field="PORTMUX.USARTROUTEA.USART0"/>
             </signals>
         </peripheral>
         <peripheral key="usart1" name="USART1" module-key="uart_autobd_v4">
             <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"/>
-                <signal pad-id="pc2" function="USART1" group="XCK" field="PORTMUX.USARTROUTEA.USART1"/>
-                <signal pad-id="pc3" function="USART1" group="XDIR" field="PORTMUX.USARTROUTEA.USART1"/>
+                <signal pad-key="pc1" function="USART1" group="RXD" field="PORTMUX.USARTROUTEA.USART1"/>
+                <signal pad-key="pc0" function="USART1" group="TXD" field="PORTMUX.USARTROUTEA.USART1"/>
+                <signal pad-key="pc2" function="USART1" group="XCK" field="PORTMUX.USARTROUTEA.USART1"/>
+                <signal pad-key="pc3" function="USART1" group="XDIR" field="PORTMUX.USARTROUTEA.USART1"/>
             </signals>
         </peripheral>
         <peripheral key="usart2" name="USART2" module-key="uart_autobd_v4">
             <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"/>
+                <signal pad-key="pf1" function="USART2" group="RXD" field="PORTMUX.USARTROUTEA.USART2"/>
+                <signal pad-key="pf0" function="USART2" group="TXD" field="PORTMUX.USARTROUTEA.USART2"/>
             </signals>
         </peripheral>
         <peripheral key="userrow" name="USERROW" module-key="chip_userrow">
@@ -367,8 +367,8 @@
         <peripheral key="zcd0" name="ZCD0" module-key="cmp_zxover_ctrl_v3">
             <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"/>
+                <signal pad-key="pd1" function="ZCD0" group="IN"/>
+                <signal pad-key="pa7" function="ZCD0" group="OUT" field="PORTMUX.ZCDROUTEA.ZCD0"/>
             </signals>
         </peripheral>
     </peripherals>
@@ -1705,39 +1705,69 @@
             </register-group>
         </module>
     </modules>
+    <pads>
+        <pad key="pa7" name="PA7"/>
+        <pad key="pc0" name="PC0"/>
+        <pad key="pc1" name="PC1"/>
+        <pad key="pc2" name="PC2"/>
+        <pad key="pc3" name="PC3"/>
+        <pad key="vddio2" name="VDDIO2"/>
+        <pad key="pd1" name="PD1"/>
+        <pad key="pd2" name="PD2"/>
+        <pad key="pd3" name="PD3"/>
+        <pad key="pd4" name="PD4"/>
+        <pad key="pd5" name="PD5"/>
+        <pad key="pd6" name="PD6"/>
+        <pad key="pd7" name="PD7"/>
+        <pad key="avdd" name="AVDD"/>
+        <pad key="agnd" name="AGND"/>
+        <pad key="pf0" name="PF0"/>
+        <pad key="pf1" name="PF1"/>
+        <pad key="pf6" name="PF6"/>
+        <pad key="updi" name="UPDI"/>
+        <pad key="vdd0" name="VDD0"/>
+        <pad key="gnd0" name="GND0"/>
+        <pad key="pa0" name="PA0"/>
+        <pad key="pa1" name="PA1"/>
+        <pad key="pa2" name="PA2"/>
+        <pad key="pa3" name="PA3"/>
+        <pad key="pa4" name="PA4"/>
+        <pad key="pa5" name="PA5"/>
+        <pad key="pa6" name="PA6"/>
+    </pads>
     <pinouts>
         <pinout key="soic28" name="SOIC28" type="soic">
-            <pin position="1" pad="PA7"/>
-            <pin position="2" pad="PC0"/>
-            <pin position="3" pad="PC1"/>
-            <pin position="4" pad="PC2"/>
-            <pin position="5" pad="PC3"/>
-            <pin position="6" pad="VDDIO2"/>
-            <pin position="7" pad="PD1"/>
-            <pin position="8" pad="PD2"/>
-            <pin position="9" pad="PD3"/>
-            <pin position="10" pad="PD4"/>
-            <pin position="11" pad="PD5"/>
-            <pin position="12" pad="PD6"/>
-            <pin position="13" pad="PD7"/>
-            <pin position="14" pad="AVDD"/>
-            <pin position="15" pad="AGND"/>
-            <pin position="16" pad="PF0"/>
-            <pin position="17" pad="PF1"/>
-            <pin position="18" pad="PF6"/>
-            <pin position="19" pad="UPDI"/>
-            <pin position="20" pad="VDD0"/>
-            <pin position="21" pad="GND0"/>
-            <pin position="22" pad="PA0"/>
-            <pin position="23" pad="PA1"/>
-            <pin position="24" pad="PA2"/>
-            <pin position="25" pad="PA3"/>
-            <pin position="26" pad="PA4"/>
-            <pin position="27" pad="PA5"/>
-            <pin position="28" pad="PA6"/>
+            <pin position="1" pad-key="pa7"/>
+            <pin position="2" pad-key="pc0"/>
+            <pin position="3" pad-key="pc1"/>
+            <pin position="4" pad-key="pc2"/>
+            <pin position="5" pad-key="pc3"/>
+            <pin position="6" pad-key="vddio2"/>
+            <pin position="7" pad-key="pd1"/>
+            <pin position="8" pad-key="pd2"/>
+            <pin position="9" pad-key="pd3"/>
+            <pin position="10" pad-key="pd4"/>
+            <pin position="11" pad-key="pd5"/>
+            <pin position="12" pad-key="pd6"/>
+            <pin position="13" pad-key="pd7"/>
+            <pin position="14" pad-key="avdd"/>
+            <pin position="15" pad-key="agnd"/>
+            <pin position="16" pad-key="pf0"/>
+            <pin position="17" pad-key="pf1"/>
+            <pin position="18" pad-key="pf6"/>
+            <pin position="19" pad-key="updi"/>
+            <pin position="20" pad-key="vdd0"/>
+            <pin position="21" pad-key="gnd0"/>
+            <pin position="22" pad-key="pa0"/>
+            <pin position="23" pad-key="pa1"/>
+            <pin position="24" pad-key="pa2"/>
+            <pin position="25" pad-key="pa3"/>
+            <pin position="26" pad-key="pa4"/>
+            <pin position="27" pad-key="pa5"/>
+            <pin position="28" pad-key="pa6"/>
         </pinout>
     </pinouts>
     <variants>
-        <variant name="AVR64DB28" pinout-key="soic28" package="SOIC28"/>
+        <variant key="avr64db28" name="AVR64DB28" pinout-key="soic28"/>
     </variants>
 </device>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR64DB32.xml b/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR64DB32.xml
index 6fdf4c86..9b427419 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR64DB32.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR64DB32.xml
@@ -44,52 +44,52 @@
         <peripheral key="ac0" name="AC0" module-key="cmp_control_v8">
             <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"/>
-                <signal pad-id="pa7" index="0" function="AC0" group="OUT" field="PORTMUX.ACROUTEA.AC0"/>
-                <signal pad-id="pd2" index="0" function="AC0" group="P"/>
-                <signal pad-id="pd6" index="3" function="AC0" group="P"/>
+                <signal pad-key="pd3" index="0" function="AC0" group="N"/>
+                <signal pad-key="pd7" index="2" function="AC0" group="N"/>
+                <signal pad-key="pa7" index="0" function="AC0" group="OUT" field="PORTMUX.ACROUTEA.AC0"/>
+                <signal pad-key="pd2" index="0" function="AC0" group="P"/>
+                <signal pad-key="pd6" index="3" function="AC0" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="ac1" name="AC1" module-key="cmp_control_v8">
             <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"/>
-                <signal pad-id="pa7" index="0" function="AC1" group="OUT" field="PORTMUX.ACROUTEA.AC1"/>
-                <signal pad-id="pd2" index="0" function="AC1" group="P"/>
-                <signal pad-id="pd3" index="1" function="AC1" group="P"/>
-                <signal pad-id="pd4" index="2" function="AC1" group="P"/>
-                <signal pad-id="pd6" index="3" function="AC1" group="P"/>
+                <signal pad-key="pd5" index="0" function="AC1" group="N"/>
+                <signal pad-key="pd7" index="2" function="AC1" group="N"/>
+                <signal pad-key="pa7" index="0" function="AC1" group="OUT" field="PORTMUX.ACROUTEA.AC1"/>
+                <signal pad-key="pd2" index="0" function="AC1" group="P"/>
+                <signal pad-key="pd3" index="1" function="AC1" group="P"/>
+                <signal pad-key="pd4" index="2" function="AC1" group="P"/>
+                <signal pad-key="pd6" index="3" function="AC1" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="ac2" name="AC2" module-key="cmp_control_v8">
             <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"/>
-                <signal pad-id="pa7" index="0" function="AC2" group="OUT" field="PORTMUX.ACROUTEA.AC2"/>
-                <signal pad-id="pd2" index="0" function="AC2" group="P"/>
-                <signal pad-id="pd4" index="1" function="AC2" group="P"/>
-                <signal pad-id="pd6" index="3" function="AC2" group="P"/>
+                <signal pad-key="pd7" index="0" function="AC2" group="N"/>
+                <signal pad-key="pd7" index="2" function="AC2" group="N"/>
+                <signal pad-key="pa7" index="0" function="AC2" group="OUT" field="PORTMUX.ACROUTEA.AC2"/>
+                <signal pad-key="pd2" index="0" function="AC2" group="P"/>
+                <signal pad-key="pd4" index="1" function="AC2" group="P"/>
+                <signal pad-key="pd6" index="3" function="AC2" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="adc0" name="ADC0" module-key="adc_12b_diff_ctrl_v1">
             <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"/>
-                <signal pad-id="pd3" index="3" function="AIN0" group="AIN"/>
-                <signal pad-id="pd4" index="4" function="AIN0" group="AIN"/>
-                <signal pad-id="pd5" index="5" function="AIN0" group="AIN"/>
-                <signal pad-id="pd6" index="6" function="AIN0" group="AIN"/>
-                <signal pad-id="pd7" index="7" function="AIN0" group="AIN"/>
-                <signal pad-id="pf0" index="16" function="AIN0" group="AIN"/>
-                <signal pad-id="pf1" index="17" function="AIN0" group="AIN"/>
-                <signal pad-id="pf2" index="18" function="AIN0" group="AIN"/>
-                <signal pad-id="pf3" index="19" function="AIN0" group="AIN"/>
-                <signal pad-id="pf4" index="20" function="AIN0" group="AIN"/>
-                <signal pad-id="pf5" index="21" function="AIN0" group="AIN"/>
+                <signal pad-key="pd1" index="1" function="AIN0" group="AIN"/>
+                <signal pad-key="pd2" index="2" function="AIN0" group="AIN"/>
+                <signal pad-key="pd3" index="3" function="AIN0" group="AIN"/>
+                <signal pad-key="pd4" index="4" function="AIN0" group="AIN"/>
+                <signal pad-key="pd5" index="5" function="AIN0" group="AIN"/>
+                <signal pad-key="pd6" index="6" function="AIN0" group="AIN"/>
+                <signal pad-key="pd7" index="7" function="AIN0" group="AIN"/>
+                <signal pad-key="pf0" index="16" function="AIN0" group="AIN"/>
+                <signal pad-key="pf1" index="17" function="AIN0" group="AIN"/>
+                <signal pad-key="pf2" index="18" function="AIN0" group="AIN"/>
+                <signal pad-key="pf3" index="19" function="AIN0" group="AIN"/>
+                <signal pad-key="pf4" index="20" function="AIN0" group="AIN"/>
+                <signal pad-key="pf5" index="21" function="AIN0" group="AIN"/>
             </signals>
         </peripheral>
         <peripheral key="bod" name="BOD" module-key="bor_lvd_ctrl_v1">
@@ -98,34 +98,34 @@
         <peripheral key="ccl" name="CCL" module-key="cla_ccl_v1">
             <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"/>
-                <signal pad-id="pa2" index="2" function="CCL_IN" group="LUT0_IN"/>
-                <signal pad-id="pa6" index="0" function="CCL_ALT" group="LUT0_OUT" field="PORTMUX.CCLROUTEA.LUT0"/>
-                <signal pad-id="pa3" index="0" function="CCL" group="LUT0_OUT" field="PORTMUX.CCLROUTEA.LUT0"/>
-                <signal pad-id="pc0" index="0" function="CCL_IN" group="LUT1_IN"/>
-                <signal pad-id="pc1" index="1" function="CCL_IN" group="LUT1_IN"/>
-                <signal pad-id="pc2" index="2" function="CCL_IN" group="LUT1_IN"/>
-                <signal pad-id="pc3" index="0" function="CCL" group="LUT1_OUT" field="PORTMUX.CCLROUTEA.LUT1"/>
-                <signal pad-id="pd1" index="1" function="CCL_IN" group="LUT2_IN"/>
-                <signal pad-id="pd2" index="2" function="CCL_IN" group="LUT2_IN"/>
-                <signal pad-id="pd6" index="0" function="CCL_ALT" group="LUT2_OUT" field="PORTMUX.CCLROUTEA.LUT2"/>
-                <signal pad-id="pd3" index="0" function="CCL" group="LUT2_OUT" field="PORTMUX.CCLROUTEA.LUT2"/>
-                <signal pad-id="pf0" index="0" function="CCL_IN" group="LUT3_IN"/>
-                <signal pad-id="pf1" index="1" function="CCL_IN" group="LUT3_IN"/>
-                <signal pad-id="pf2" index="2" function="CCL_IN" group="LUT3_IN"/>
-                <signal pad-id="pf3" index="0" function="CCL" group="LUT3_OUT" field="PORTMUX.CCLROUTEA.LUT3"/>
+                <signal pad-key="pa0" index="0" function="CCL_IN" group="LUT0_IN"/>
+                <signal pad-key="pa1" index="1" function="CCL_IN" group="LUT0_IN"/>
+                <signal pad-key="pa2" index="2" function="CCL_IN" group="LUT0_IN"/>
+                <signal pad-key="pa6" index="0" function="CCL_ALT" group="LUT0_OUT" field="PORTMUX.CCLROUTEA.LUT0"/>
+                <signal pad-key="pa3" index="0" function="CCL" group="LUT0_OUT" field="PORTMUX.CCLROUTEA.LUT0"/>
+                <signal pad-key="pc0" index="0" function="CCL_IN" group="LUT1_IN"/>
+                <signal pad-key="pc1" index="1" function="CCL_IN" group="LUT1_IN"/>
+                <signal pad-key="pc2" index="2" function="CCL_IN" group="LUT1_IN"/>
+                <signal pad-key="pc3" index="0" function="CCL" group="LUT1_OUT" field="PORTMUX.CCLROUTEA.LUT1"/>
+                <signal pad-key="pd1" index="1" function="CCL_IN" group="LUT2_IN"/>
+                <signal pad-key="pd2" index="2" function="CCL_IN" group="LUT2_IN"/>
+                <signal pad-key="pd6" index="0" function="CCL_ALT" group="LUT2_OUT" field="PORTMUX.CCLROUTEA.LUT2"/>
+                <signal pad-key="pd3" index="0" function="CCL" group="LUT2_OUT" field="PORTMUX.CCLROUTEA.LUT2"/>
+                <signal pad-key="pf0" index="0" function="CCL_IN" group="LUT3_IN"/>
+                <signal pad-key="pf1" index="1" function="CCL_IN" group="LUT3_IN"/>
+                <signal pad-key="pf2" index="2" function="CCL_IN" group="LUT3_IN"/>
+                <signal pad-key="pf3" index="0" function="CCL" group="LUT3_OUT" field="PORTMUX.CCLROUTEA.LUT3"/>
             </signals>
         </peripheral>
         <peripheral key="clkctrl" name="CLKCTRL" module-key="chip_clkctrl">
             <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"/>
-                <signal pad-id="pf0" function="CLKCTRL" group="XTAL32K1"/>
-                <signal pad-id="pf1" function="CLKCTRL" group="XTAL32K2"/>
-                <signal pad-id="pa0" function="CLKCTRL" group="XTALHF1"/>
-                <signal pad-id="pa1" function="CLKCTRL" group="XTALHF2"/>
+                <signal pad-key="pa7" function="CLKCTRL" group="CLKOUT"/>
+                <signal pad-key="pa0" function="CLKCTRL" group="EXTCLK"/>
+                <signal pad-key="pf0" function="CLKCTRL" group="XTAL32K1"/>
+                <signal pad-key="pf1" function="CLKCTRL" group="XTAL32K2"/>
+                <signal pad-key="pa0" function="CLKCTRL" group="XTALHF1"/>
+                <signal pad-key="pa1" function="CLKCTRL" group="XTALHF2"/>
             </signals>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="cpu_avr_xt_v1">
@@ -140,18 +140,18 @@
         <peripheral key="dac0" name="DAC0" module-key="dac_nbit_ctrl_v5">
             <register-group-instance register-group-key="dac" address-space-key="data" offset="0x6A0"/>
             <signals>
-                <signal pad-id="pd6" index="0" function="DAC0" group="OUT"/>
+                <signal pad-key="pd6" index="0" function="DAC0" group="OUT"/>
             </signals>
         </peripheral>
         <peripheral key="evsys" name="EVSYS" module-key="chip_evsys">
             <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"/>
-                <signal pad-id="pc2" index="2" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTC"/>
-                <signal pad-id="pd7" index="3" function="EVSYS_ALT" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTD"/>
-                <signal pad-id="pd2" index="3" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTD"/>
-                <signal pad-id="pf2" index="5" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTF"/>
+                <signal pad-key="pa7" index="0" function="EVSYS_ALT" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTA"/>
+                <signal pad-key="pa2" index="0" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTA"/>
+                <signal pad-key="pc2" index="2" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTC"/>
+                <signal pad-key="pd7" index="3" function="EVSYS_ALT" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTD"/>
+                <signal pad-key="pd2" index="3" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTD"/>
+                <signal pad-key="pf2" index="5" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTF"/>
             </signals>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="chip_fuse">
@@ -172,58 +172,58 @@
         <peripheral key="opamp" name="OPAMP" module-key="amp_opamp_ctrl_avr_v1">
             <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"/>
-                <signal pad-id="pd2" function="OPAMP" group="OP0OUT"/>
-                <signal pad-id="pd7" function="OPAMP" group="OP1INN"/>
-                <signal pad-id="pd4" function="OPAMP" group="OP1INP"/>
-                <signal pad-id="pd5" function="OPAMP" group="OP1OUT"/>
+                <signal pad-key="pd3" function="OPAMP" group="OP0INN"/>
+                <signal pad-key="pd1" function="OPAMP" group="OP0INP"/>
+                <signal pad-key="pd2" function="OPAMP" group="OP0OUT"/>
+                <signal pad-key="pd7" function="OPAMP" group="OP1INN"/>
+                <signal pad-key="pd4" function="OPAMP" group="OP1INP"/>
+                <signal pad-key="pd5" function="OPAMP" group="OP1OUT"/>
             </signals>
         </peripheral>
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pa2" index="2" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa3" index="3" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa4" index="4" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa5" index="5" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa6" index="6" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa7" index="7" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa0" index="0" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa1" index="1" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa2" index="2" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa3" index="3" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa4" index="4" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa5" index="5" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa6" index="6" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa7" index="7" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pc2" index="2" function="IOPORT" group="PIN"/>
-                <signal pad-id="pc3" index="3" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc0" index="0" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc1" index="1" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc2" index="2" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc3" index="3" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pd3" index="3" function="IOPORT" group="PIN"/>
-                <signal pad-id="pd4" index="4" function="IOPORT" group="PIN"/>
-                <signal pad-id="pd5" index="5" function="IOPORT" group="PIN"/>
-                <signal pad-id="pd6" index="6" function="IOPORT" group="PIN"/>
-                <signal pad-id="pd7" index="7" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd1" index="1" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd2" index="2" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd3" index="3" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd4" index="4" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd5" index="5" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd6" index="6" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd7" index="7" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="portf" name="PORTF" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pf2" index="2" function="IOPORT" group="PIN"/>
-                <signal pad-id="pf3" index="3" function="IOPORT" group="PIN"/>
-                <signal pad-id="pf4" index="4" function="IOPORT" group="PIN"/>
-                <signal pad-id="pf5" index="5" function="IOPORT" group="PIN"/>
-                <signal pad-id="pf6" index="6" function="IOPORT" group="PIN"/>
+                <signal pad-key="pf0" index="0" function="IOPORT" group="PIN"/>
+                <signal pad-key="pf1" index="1" function="IOPORT" group="PIN"/>
+                <signal pad-key="pf2" index="2" function="IOPORT" group="PIN"/>
+                <signal pad-key="pf3" index="3" function="IOPORT" group="PIN"/>
+                <signal pad-key="pf4" index="4" function="IOPORT" group="PIN"/>
+                <signal pad-key="pf5" index="5" function="IOPORT" group="PIN"/>
+                <signal pad-key="pf6" index="6" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="portmux" name="PORTMUX" module-key="chip_portmux">
@@ -232,7 +232,7 @@
         <peripheral key="rstctrl" name="RSTCTRL" module-key="rst_integration_v8">
             <register-group-instance register-group-key="rstctrl" address-space-key="data" offset="0x40"/>
             <signals>
-                <signal pad-id="pf6" function="OTHER" group="RESET"/>
+                <signal pad-key="pf6" function="OTHER" group="RESET"/>
             </signals>
         </peripheral>
         <peripheral key="rtc" name="RTC" module-key="tmr_16b_rtc_v1">
@@ -247,19 +247,19 @@
         <peripheral key="spi0" name="SPI0" module-key="spi_8bit_v2">
             <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"/>
-                <signal pad-id="pa6" function="SPI0" group="SCK" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <signal pad-id="pa7" function="SPI0" group="SS" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pa5" function="SPI0" group="MISO" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pa4" function="SPI0" group="MOSI" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pa6" function="SPI0" group="SCK" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pa7" function="SPI0" group="SS" field="PORTMUX.SPIROUTEA.SPI0"/>
             </signals>
         </peripheral>
         <peripheral key="spi1" name="SPI1" module-key="spi_8bit_v2">
             <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"/>
-                <signal pad-id="pc2" function="SPI1" group="SCK" field="PORTMUX.SPIROUTEA.SPI1"/>
-                <signal pad-id="pc3" function="SPI1" group="SS" field="PORTMUX.SPIROUTEA.SPI1"/>
+                <signal pad-key="pc1" function="SPI1" group="MISO" field="PORTMUX.SPIROUTEA.SPI1"/>
+                <signal pad-key="pc0" function="SPI1" group="MOSI" field="PORTMUX.SPIROUTEA.SPI1"/>
+                <signal pad-key="pc2" function="SPI1" group="SCK" field="PORTMUX.SPIROUTEA.SPI1"/>
+                <signal pad-key="pc3" function="SPI1" group="SS" field="PORTMUX.SPIROUTEA.SPI1"/>
             </signals>
         </peripheral>
         <peripheral key="syscfg" name="SYSCFG" module-key="chip_syscfg">
@@ -268,109 +268,109 @@
         <peripheral key="tca0" name="TCA0" module-key="tmr_16b_pwm_v1">
             <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"/>
-                <signal pad-id="pa0" index="0" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pf1" index="1" function="TCA0_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pd1" index="1" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pc1" index="1" function="TCA0_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pa1" index="1" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pf2" index="2" function="TCA0_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pd2" index="2" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pc2" index="2" function="TCA0_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pa2" index="2" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pf3" index="3" function="TCA0_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pd3" index="3" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pc3" index="3" function="TCA0_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pa3" index="3" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pf4" index="4" function="TCA0_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pd4" index="4" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pa4" index="4" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pf5" index="5" function="TCA0_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pd5" index="5" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pa5" index="5" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pf0" index="0" function="TCA0_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pc0" index="0" function="TCA0_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pa0" index="0" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pf1" index="1" function="TCA0_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pd1" index="1" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pc1" index="1" function="TCA0_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pa1" index="1" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pf2" index="2" function="TCA0_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pd2" index="2" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pc2" index="2" function="TCA0_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pa2" index="2" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pf3" index="3" function="TCA0_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pd3" index="3" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pc3" index="3" function="TCA0_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pa3" index="3" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pf4" index="4" function="TCA0_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pd4" index="4" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pa4" index="4" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pf5" index="5" function="TCA0_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pd5" index="5" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pa5" index="5" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
             </signals>
         </peripheral>
         <peripheral key="tcb0" name="TCB0" module-key="tmr_16b_capture_v1">
             <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"/>
+                <signal pad-key="pf4" index="0" function="TCB0_ALT" group="WO" field="PORTMUX.TCBROUTEA.TCB0"/>
+                <signal pad-key="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 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"/>
+                <signal pad-key="pf5" index="0" function="TCB1_ALT" group="WO" field="PORTMUX.TCBROUTEA.TCB1"/>
+                <signal pad-key="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 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"/>
+                <signal pad-key="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 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"/>
-                <signal pad-id="pf1" index="1" function="TCD0_ALT2" group="WOB" field="PORTMUX.TCDROUTEA.TCD0"/>
-                <signal pad-id="pa5" index="1" function="TCD0" group="WOB" field="PORTMUX.TCDROUTEA.TCD0"/>
-                <signal pad-id="pf2" index="2" function="TCD0_ALT2" group="WOC" field="PORTMUX.TCDROUTEA.TCD0"/>
-                <signal pad-id="pa6" index="2" function="TCD0" group="WOC" field="PORTMUX.TCDROUTEA.TCD0"/>
-                <signal pad-id="pf3" index="3" function="TCD0_ALT2" group="WOD" field="PORTMUX.TCDROUTEA.TCD0"/>
-                <signal pad-id="pa7" index="3" function="TCD0" group="WOD" field="PORTMUX.TCDROUTEA.TCD0"/>
+                <signal pad-key="pf0" function="TCD0_ALT2" group="WOA" field="PORTMUX.TCDROUTEA.TCD0"/>
+                <signal pad-key="pa4" function="TCD0" group="WOA" field="PORTMUX.TCDROUTEA.TCD0"/>
+                <signal pad-key="pf1" index="1" function="TCD0_ALT2" group="WOB" field="PORTMUX.TCDROUTEA.TCD0"/>
+                <signal pad-key="pa5" index="1" function="TCD0" group="WOB" field="PORTMUX.TCDROUTEA.TCD0"/>
+                <signal pad-key="pf2" index="2" function="TCD0_ALT2" group="WOC" field="PORTMUX.TCDROUTEA.TCD0"/>
+                <signal pad-key="pa6" index="2" function="TCD0" group="WOC" field="PORTMUX.TCDROUTEA.TCD0"/>
+                <signal pad-key="pf3" index="3" function="TCD0_ALT2" group="WOD" field="PORTMUX.TCDROUTEA.TCD0"/>
+                <signal pad-key="pa7" index="3" function="TCD0" group="WOD" field="PORTMUX.TCDROUTEA.TCD0"/>
             </signals>
         </peripheral>
         <peripheral key="twi0" name="TWI0" module-key="i2c_8bit_v2">
             <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"/>
-                <signal pad-id="pc2" function="I2C0_ALT" group="SDA" field="PORTMUX.TWIROUTEA.TWI0"/>
-                <signal pad-id="pa2" function="I2C0" group="SDA" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pc3" function="I2C0_ALT" group="SCL" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pa3" function="I2C0" group="SCL" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pc2" function="I2C0_ALT" group="SDA" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pa2" function="I2C0" group="SDA" field="PORTMUX.TWIROUTEA.TWI0"/>
             </signals>
         </peripheral>
         <peripheral key="twi1" name="TWI1" module-key="i2c_8bit_v2">
             <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"/>
+                <signal pad-key="pf3" function="I2C1" group="SCL" field="PORTMUX.TWIROUTEA.TWI1"/>
+                <signal pad-key="pf2" function="I2C1" group="SDA" field="PORTMUX.TWIROUTEA.TWI1"/>
             </signals>
         </peripheral>
         <peripheral key="usart0" name="USART0" module-key="uart_autobd_v4">
             <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"/>
-                <signal pad-id="pa4" function="USART0_ALT" group="TXD" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pa0" function="USART0" group="TXD" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pa6" function="USART0_ALT" group="XCK" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pa2" function="USART0" group="XCK" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pa7" function="USART0_ALT" group="XDIR" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pa3" function="USART0" group="XDIR" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa5" function="USART0_ALT" group="RXD" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa1" function="USART0" group="RXD" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa4" function="USART0_ALT" group="TXD" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa0" function="USART0" group="TXD" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa6" function="USART0_ALT" group="XCK" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa2" function="USART0" group="XCK" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa7" function="USART0_ALT" group="XDIR" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa3" function="USART0" group="XDIR" field="PORTMUX.USARTROUTEA.USART0"/>
             </signals>
         </peripheral>
         <peripheral key="usart1" name="USART1" module-key="uart_autobd_v4">
             <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"/>
-                <signal pad-id="pc2" function="USART1" group="XCK" field="PORTMUX.USARTROUTEA.USART1"/>
-                <signal pad-id="pc3" function="USART1" group="XDIR" field="PORTMUX.USARTROUTEA.USART1"/>
+                <signal pad-key="pc1" function="USART1" group="RXD" field="PORTMUX.USARTROUTEA.USART1"/>
+                <signal pad-key="pc0" function="USART1" group="TXD" field="PORTMUX.USARTROUTEA.USART1"/>
+                <signal pad-key="pc2" function="USART1" group="XCK" field="PORTMUX.USARTROUTEA.USART1"/>
+                <signal pad-key="pc3" function="USART1" group="XDIR" field="PORTMUX.USARTROUTEA.USART1"/>
             </signals>
         </peripheral>
         <peripheral key="usart2" name="USART2" module-key="uart_autobd_v4">
             <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"/>
-                <signal pad-id="pf4" function="USART2_ALT" group="TXD" field="PORTMUX.USARTROUTEA.USART2"/>
-                <signal pad-id="pf0" function="USART2" group="TXD" field="PORTMUX.USARTROUTEA.USART2"/>
-                <signal pad-id="pf2" function="USART2" group="XCK" field="PORTMUX.USARTROUTEA.USART2"/>
-                <signal pad-id="pf3" function="USART2" group="XDIR" field="PORTMUX.USARTROUTEA.USART2"/>
+                <signal pad-key="pf5" function="USART2_ALT" group="RXD" field="PORTMUX.USARTROUTEA.USART2"/>
+                <signal pad-key="pf1" function="USART2" group="RXD" field="PORTMUX.USARTROUTEA.USART2"/>
+                <signal pad-key="pf4" function="USART2_ALT" group="TXD" field="PORTMUX.USARTROUTEA.USART2"/>
+                <signal pad-key="pf0" function="USART2" group="TXD" field="PORTMUX.USARTROUTEA.USART2"/>
+                <signal pad-key="pf2" function="USART2" group="XCK" field="PORTMUX.USARTROUTEA.USART2"/>
+                <signal pad-key="pf3" function="USART2" group="XDIR" field="PORTMUX.USARTROUTEA.USART2"/>
             </signals>
         </peripheral>
         <peripheral key="userrow" name="USERROW" module-key="chip_userrow">
@@ -397,8 +397,8 @@
         <peripheral key="zcd0" name="ZCD0" module-key="cmp_zxover_ctrl_v3">
             <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"/>
+                <signal pad-key="pd1" function="ZCD0" group="IN"/>
+                <signal pad-key="pa7" function="ZCD0" group="OUT" field="PORTMUX.ZCDROUTEA.ZCD0"/>
             </signals>
         </peripheral>
     </peripherals>
@@ -1736,43 +1736,77 @@
             </register-group>
         </module>
     </modules>
+    <pads>
+        <pad key="pa3" name="PA3"/>
+        <pad key="pa4" name="PA4"/>
+        <pad key="pa5" name="PA5"/>
+        <pad key="pa6" name="PA6"/>
+        <pad key="pa7" name="PA7"/>
+        <pad key="pc0" name="PC0"/>
+        <pad key="pc1" name="PC1"/>
+        <pad key="pc2" name="PC2"/>
+        <pad key="pc3" name="PC3"/>
+        <pad key="vddio2" name="VDDIO2"/>
+        <pad key="pd1" name="PD1"/>
+        <pad key="pd2" name="PD2"/>
+        <pad key="pd3" name="PD3"/>
+        <pad key="pd4" name="PD4"/>
+        <pad key="pd5" name="PD5"/>
+        <pad key="pd6" name="PD6"/>
+        <pad key="pd7" name="PD7"/>
+        <pad key="avdd" name="AVDD"/>
+        <pad key="agnd" name="AGND"/>
+        <pad key="pf0" name="PF0"/>
+        <pad key="pf1" name="PF1"/>
+        <pad key="pf2" name="PF2"/>
+        <pad key="pf3" name="PF3"/>
+        <pad key="pf4" name="PF4"/>
+        <pad key="pf5" name="PF5"/>
+        <pad key="pf6" name="PF6"/>
+        <pad key="updi" name="UPDI"/>
+        <pad key="vdd0" name="VDD0"/>
+        <pad key="gnd0" name="GND0"/>
+        <pad key="pa0" name="PA0"/>
+        <pad key="pa1" name="PA1"/>
+        <pad key="pa2" name="PA2"/>
+    </pads>
     <pinouts>
         <pinout key="qfn32" name="QFN32" type="qfn">
-            <pin position="1" pad="PA3"/>
-            <pin position="2" pad="PA4"/>
-            <pin position="3" pad="PA5"/>
-            <pin position="4" pad="PA6"/>
-            <pin position="5" pad="PA7"/>
-            <pin position="6" pad="PC0"/>
-            <pin position="7" pad="PC1"/>
-            <pin position="8" pad="PC2"/>
-            <pin position="9" pad="PC3"/>
-            <pin position="10" pad="VDDIO2"/>
-            <pin position="11" pad="PD1"/>
-            <pin position="12" pad="PD2"/>
-            <pin position="13" pad="PD3"/>
-            <pin position="14" pad="PD4"/>
-            <pin position="15" pad="PD5"/>
-            <pin position="16" pad="PD6"/>
-            <pin position="17" pad="PD7"/>
-            <pin position="18" pad="AVDD"/>
-            <pin position="19" pad="AGND"/>
-            <pin position="20" pad="PF0"/>
-            <pin position="21" pad="PF1"/>
-            <pin position="22" pad="PF2"/>
-            <pin position="23" pad="PF3"/>
-            <pin position="24" pad="PF4"/>
-            <pin position="25" pad="PF5"/>
-            <pin position="26" pad="PF6"/>
-            <pin position="27" pad="UPDI"/>
-            <pin position="28" pad="VDD0"/>
-            <pin position="29" pad="GND0"/>
-            <pin position="30" pad="PA0"/>
-            <pin position="31" pad="PA1"/>
-            <pin position="32" pad="PA2"/>
+            <pin position="1" pad-key="pa3"/>
+            <pin position="2" pad-key="pa4"/>
+            <pin position="3" pad-key="pa5"/>
+            <pin position="4" pad-key="pa6"/>
+            <pin position="5" pad-key="pa7"/>
+            <pin position="6" pad-key="pc0"/>
+            <pin position="7" pad-key="pc1"/>
+            <pin position="8" pad-key="pc2"/>
+            <pin position="9" pad-key="pc3"/>
+            <pin position="10" pad-key="vddio2"/>
+            <pin position="11" pad-key="pd1"/>
+            <pin position="12" pad-key="pd2"/>
+            <pin position="13" pad-key="pd3"/>
+            <pin position="14" pad-key="pd4"/>
+            <pin position="15" pad-key="pd5"/>
+            <pin position="16" pad-key="pd6"/>
+            <pin position="17" pad-key="pd7"/>
+            <pin position="18" pad-key="avdd"/>
+            <pin position="19" pad-key="agnd"/>
+            <pin position="20" pad-key="pf0"/>
+            <pin position="21" pad-key="pf1"/>
+            <pin position="22" pad-key="pf2"/>
+            <pin position="23" pad-key="pf3"/>
+            <pin position="24" pad-key="pf4"/>
+            <pin position="25" pad-key="pf5"/>
+            <pin position="26" pad-key="pf6"/>
+            <pin position="27" pad-key="updi"/>
+            <pin position="28" pad-key="vdd0"/>
+            <pin position="29" pad-key="gnd0"/>
+            <pin position="30" pad-key="pa0"/>
+            <pin position="31" pad-key="pa1"/>
+            <pin position="32" pad-key="pa2"/>
         </pinout>
     </pinouts>
     <variants>
-        <variant name="AVR64DB32" pinout-key="qfn32" package="QFN32"/>
+        <variant key="avr64db32" name="AVR64DB32" pinout-key="qfn32"/>
     </variants>
 </device>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR64DB48.xml b/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR64DB48.xml
index b699c76a..f7178041 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR64DB48.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR64DB48.xml
@@ -44,66 +44,66 @@
         <peripheral key="ac0" name="AC0" module-key="cmp_control_v8">
             <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"/>
-                <signal pad-id="pd7" index="2" function="AC0" group="N"/>
-                <signal pad-id="pc6" index="0" function="AC0_ALT" group="OUT" field="PORTMUX.ACROUTEA.AC0"/>
-                <signal pad-id="pa7" index="0" function="AC0" group="OUT" field="PORTMUX.ACROUTEA.AC0"/>
-                <signal pad-id="pd2" index="0" function="AC0" group="P"/>
-                <signal pad-id="pe0" index="1" function="AC0" group="P"/>
-                <signal pad-id="pe2" index="2" function="AC0" group="P"/>
-                <signal pad-id="pd6" index="3" function="AC0" group="P"/>
+                <signal pad-key="pd3" index="0" function="AC0" group="N"/>
+                <signal pad-key="pd0" index="1" function="AC0" group="N"/>
+                <signal pad-key="pd7" index="2" function="AC0" group="N"/>
+                <signal pad-key="pc6" index="0" function="AC0_ALT" group="OUT" field="PORTMUX.ACROUTEA.AC0"/>
+                <signal pad-key="pa7" index="0" function="AC0" group="OUT" field="PORTMUX.ACROUTEA.AC0"/>
+                <signal pad-key="pd2" index="0" function="AC0" group="P"/>
+                <signal pad-key="pe0" index="1" function="AC0" group="P"/>
+                <signal pad-key="pe2" index="2" function="AC0" group="P"/>
+                <signal pad-key="pd6" index="3" function="AC0" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="ac1" name="AC1" module-key="cmp_control_v8">
             <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"/>
-                <signal pad-id="pd7" index="2" function="AC1" group="N"/>
-                <signal pad-id="pc6" index="0" function="AC1_ALT" group="OUT" field="PORTMUX.ACROUTEA.AC1"/>
-                <signal pad-id="pa7" index="0" function="AC1" group="OUT" field="PORTMUX.ACROUTEA.AC1"/>
-                <signal pad-id="pd2" index="0" function="AC1" group="P"/>
-                <signal pad-id="pd3" index="1" function="AC1" group="P"/>
-                <signal pad-id="pd4" index="2" function="AC1" group="P"/>
-                <signal pad-id="pd6" index="3" function="AC1" group="P"/>
+                <signal pad-key="pd5" index="0" function="AC1" group="N"/>
+                <signal pad-key="pd0" index="1" function="AC1" group="N"/>
+                <signal pad-key="pd7" index="2" function="AC1" group="N"/>
+                <signal pad-key="pc6" index="0" function="AC1_ALT" group="OUT" field="PORTMUX.ACROUTEA.AC1"/>
+                <signal pad-key="pa7" index="0" function="AC1" group="OUT" field="PORTMUX.ACROUTEA.AC1"/>
+                <signal pad-key="pd2" index="0" function="AC1" group="P"/>
+                <signal pad-key="pd3" index="1" function="AC1" group="P"/>
+                <signal pad-key="pd4" index="2" function="AC1" group="P"/>
+                <signal pad-key="pd6" index="3" function="AC1" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="ac2" name="AC2" module-key="cmp_control_v8">
             <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"/>
-                <signal pad-id="pd7" index="2" function="AC2" group="N"/>
-                <signal pad-id="pc6" index="0" function="AC2_ALT" group="OUT" field="PORTMUX.ACROUTEA.AC2"/>
-                <signal pad-id="pa7" index="0" function="AC2" group="OUT" field="PORTMUX.ACROUTEA.AC2"/>
-                <signal pad-id="pd2" index="0" function="AC2" group="P"/>
-                <signal pad-id="pd4" index="1" function="AC2" group="P"/>
-                <signal pad-id="pe1" index="2" function="AC2" group="P"/>
-                <signal pad-id="pd6" index="3" function="AC2" group="P"/>
+                <signal pad-key="pd7" index="0" function="AC2" group="N"/>
+                <signal pad-key="pd0" index="1" function="AC2" group="N"/>
+                <signal pad-key="pd7" index="2" function="AC2" group="N"/>
+                <signal pad-key="pc6" index="0" function="AC2_ALT" group="OUT" field="PORTMUX.ACROUTEA.AC2"/>
+                <signal pad-key="pa7" index="0" function="AC2" group="OUT" field="PORTMUX.ACROUTEA.AC2"/>
+                <signal pad-key="pd2" index="0" function="AC2" group="P"/>
+                <signal pad-key="pd4" index="1" function="AC2" group="P"/>
+                <signal pad-key="pe1" index="2" function="AC2" group="P"/>
+                <signal pad-key="pd6" index="3" function="AC2" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="adc0" name="ADC0" module-key="adc_12b_diff_ctrl_v1">
             <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"/>
-                <signal pad-id="pd2" index="2" function="AIN0" group="AIN"/>
-                <signal pad-id="pd3" index="3" function="AIN0" group="AIN"/>
-                <signal pad-id="pd4" index="4" function="AIN0" group="AIN"/>
-                <signal pad-id="pd5" index="5" function="AIN0" group="AIN"/>
-                <signal pad-id="pd6" index="6" function="AIN0" group="AIN"/>
-                <signal pad-id="pd7" index="7" function="AIN0" group="AIN"/>
-                <signal pad-id="pe0" index="8" function="AIN0" group="AIN"/>
-                <signal pad-id="pe1" index="9" function="AIN0" group="AIN"/>
-                <signal pad-id="pe2" index="10" function="AIN0" group="AIN"/>
-                <signal pad-id="pe3" index="11" function="AIN0" group="AIN"/>
-                <signal pad-id="pf0" index="16" function="AIN0" group="AIN"/>
-                <signal pad-id="pf1" index="17" function="AIN0" group="AIN"/>
-                <signal pad-id="pf2" index="18" function="AIN0" group="AIN"/>
-                <signal pad-id="pf3" index="19" function="AIN0" group="AIN"/>
-                <signal pad-id="pf4" index="20" function="AIN0" group="AIN"/>
-                <signal pad-id="pf5" index="21" function="AIN0" group="AIN"/>
+                <signal pad-key="pd0" index="0" function="AIN0" group="AIN"/>
+                <signal pad-key="pd1" index="1" function="AIN0" group="AIN"/>
+                <signal pad-key="pd2" index="2" function="AIN0" group="AIN"/>
+                <signal pad-key="pd3" index="3" function="AIN0" group="AIN"/>
+                <signal pad-key="pd4" index="4" function="AIN0" group="AIN"/>
+                <signal pad-key="pd5" index="5" function="AIN0" group="AIN"/>
+                <signal pad-key="pd6" index="6" function="AIN0" group="AIN"/>
+                <signal pad-key="pd7" index="7" function="AIN0" group="AIN"/>
+                <signal pad-key="pe0" index="8" function="AIN0" group="AIN"/>
+                <signal pad-key="pe1" index="9" function="AIN0" group="AIN"/>
+                <signal pad-key="pe2" index="10" function="AIN0" group="AIN"/>
+                <signal pad-key="pe3" index="11" function="AIN0" group="AIN"/>
+                <signal pad-key="pf0" index="16" function="AIN0" group="AIN"/>
+                <signal pad-key="pf1" index="17" function="AIN0" group="AIN"/>
+                <signal pad-key="pf2" index="18" function="AIN0" group="AIN"/>
+                <signal pad-key="pf3" index="19" function="AIN0" group="AIN"/>
+                <signal pad-key="pf4" index="20" function="AIN0" group="AIN"/>
+                <signal pad-key="pf5" index="21" function="AIN0" group="AIN"/>
             </signals>
         </peripheral>
         <peripheral key="bod" name="BOD" module-key="bor_lvd_ctrl_v1">
@@ -112,40 +112,40 @@
         <peripheral key="ccl" name="CCL" module-key="cla_ccl_v1">
             <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"/>
-                <signal pad-id="pa2" index="2" function="CCL_IN" group="LUT0_IN"/>
-                <signal pad-id="pa6" index="0" function="CCL_ALT" group="LUT0_OUT" field="PORTMUX.CCLROUTEA.LUT0"/>
-                <signal pad-id="pa3" index="0" function="CCL" group="LUT0_OUT" field="PORTMUX.CCLROUTEA.LUT0"/>
-                <signal pad-id="pc0" index="0" function="CCL_IN" group="LUT1_IN"/>
-                <signal pad-id="pc1" index="1" function="CCL_IN" group="LUT1_IN"/>
-                <signal pad-id="pc2" index="2" function="CCL_IN" group="LUT1_IN"/>
-                <signal pad-id="pc6" index="0" function="CCL_ALT" group="LUT1_OUT" field="PORTMUX.CCLROUTEA.LUT1"/>
-                <signal pad-id="pc3" index="0" function="CCL" group="LUT1_OUT" field="PORTMUX.CCLROUTEA.LUT1"/>
-                <signal pad-id="pd0" index="0" function="CCL_IN" group="LUT2_IN"/>
-                <signal pad-id="pd1" index="1" function="CCL_IN" group="LUT2_IN"/>
-                <signal pad-id="pd2" index="2" function="CCL_IN" group="LUT2_IN"/>
-                <signal pad-id="pd6" index="0" function="CCL_ALT" group="LUT2_OUT" field="PORTMUX.CCLROUTEA.LUT2"/>
-                <signal pad-id="pd3" index="0" function="CCL" group="LUT2_OUT" field="PORTMUX.CCLROUTEA.LUT2"/>
-                <signal pad-id="pf0" index="0" function="CCL_IN" group="LUT3_IN"/>
-                <signal pad-id="pf1" index="1" function="CCL_IN" group="LUT3_IN"/>
-                <signal pad-id="pf2" index="2" function="CCL_IN" group="LUT3_IN"/>
-                <signal pad-id="pf3" index="0" function="CCL" group="LUT3_OUT" field="PORTMUX.CCLROUTEA.LUT3"/>
-                <signal pad-id="pb0" index="0" function="CCL_IN" group="LUT4_IN"/>
-                <signal pad-id="pb1" index="1" function="CCL_IN" group="LUT4_IN"/>
-                <signal pad-id="pb2" index="2" function="CCL_IN" group="LUT4_IN"/>
-                <signal pad-id="pb3" index="0" function="CCL" group="LUT4_OUT" field="PORTMUX.CCLROUTEA.LUT4"/>
+                <signal pad-key="pa0" index="0" function="CCL_IN" group="LUT0_IN"/>
+                <signal pad-key="pa1" index="1" function="CCL_IN" group="LUT0_IN"/>
+                <signal pad-key="pa2" index="2" function="CCL_IN" group="LUT0_IN"/>
+                <signal pad-key="pa6" index="0" function="CCL_ALT" group="LUT0_OUT" field="PORTMUX.CCLROUTEA.LUT0"/>
+                <signal pad-key="pa3" index="0" function="CCL" group="LUT0_OUT" field="PORTMUX.CCLROUTEA.LUT0"/>
+                <signal pad-key="pc0" index="0" function="CCL_IN" group="LUT1_IN"/>
+                <signal pad-key="pc1" index="1" function="CCL_IN" group="LUT1_IN"/>
+                <signal pad-key="pc2" index="2" function="CCL_IN" group="LUT1_IN"/>
+                <signal pad-key="pc6" index="0" function="CCL_ALT" group="LUT1_OUT" field="PORTMUX.CCLROUTEA.LUT1"/>
+                <signal pad-key="pc3" index="0" function="CCL" group="LUT1_OUT" field="PORTMUX.CCLROUTEA.LUT1"/>
+                <signal pad-key="pd0" index="0" function="CCL_IN" group="LUT2_IN"/>
+                <signal pad-key="pd1" index="1" function="CCL_IN" group="LUT2_IN"/>
+                <signal pad-key="pd2" index="2" function="CCL_IN" group="LUT2_IN"/>
+                <signal pad-key="pd6" index="0" function="CCL_ALT" group="LUT2_OUT" field="PORTMUX.CCLROUTEA.LUT2"/>
+                <signal pad-key="pd3" index="0" function="CCL" group="LUT2_OUT" field="PORTMUX.CCLROUTEA.LUT2"/>
+                <signal pad-key="pf0" index="0" function="CCL_IN" group="LUT3_IN"/>
+                <signal pad-key="pf1" index="1" function="CCL_IN" group="LUT3_IN"/>
+                <signal pad-key="pf2" index="2" function="CCL_IN" group="LUT3_IN"/>
+                <signal pad-key="pf3" index="0" function="CCL" group="LUT3_OUT" field="PORTMUX.CCLROUTEA.LUT3"/>
+                <signal pad-key="pb0" index="0" function="CCL_IN" group="LUT4_IN"/>
+                <signal pad-key="pb1" index="1" function="CCL_IN" group="LUT4_IN"/>
+                <signal pad-key="pb2" index="2" function="CCL_IN" group="LUT4_IN"/>
+                <signal pad-key="pb3" index="0" function="CCL" group="LUT4_OUT" field="PORTMUX.CCLROUTEA.LUT4"/>
             </signals>
         </peripheral>
         <peripheral key="clkctrl" name="CLKCTRL" module-key="chip_clkctrl">
             <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"/>
-                <signal pad-id="pf0" function="CLKCTRL" group="XTAL32K1"/>
-                <signal pad-id="pf1" function="CLKCTRL" group="XTAL32K2"/>
-                <signal pad-id="pa0" function="CLKCTRL" group="XTALHF1"/>
-                <signal pad-id="pa1" function="CLKCTRL" group="XTALHF2"/>
+                <signal pad-key="pa7" function="CLKCTRL" group="CLKOUT"/>
+                <signal pad-key="pa0" function="CLKCTRL" group="EXTCLK"/>
+                <signal pad-key="pf0" function="CLKCTRL" group="XTAL32K1"/>
+                <signal pad-key="pf1" function="CLKCTRL" group="XTAL32K2"/>
+                <signal pad-key="pa0" function="CLKCTRL" group="XTALHF1"/>
+                <signal pad-key="pa1" function="CLKCTRL" group="XTALHF2"/>
             </signals>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="cpu_avr_xt_v1">
@@ -160,21 +160,21 @@
         <peripheral key="dac0" name="DAC0" module-key="dac_nbit_ctrl_v5">
             <register-group-instance register-group-key="dac" address-space-key="data" offset="0x6A0"/>
             <signals>
-                <signal pad-id="pd6" index="0" function="DAC0" group="OUT"/>
+                <signal pad-key="pd6" index="0" function="DAC0" group="OUT"/>
             </signals>
         </peripheral>
         <peripheral key="evsys" name="EVSYS" module-key="chip_evsys">
             <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"/>
-                <signal pad-id="pb2" index="1" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTB"/>
-                <signal pad-id="pc7" index="2" function="EVSYS_ALT" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTC"/>
-                <signal pad-id="pc2" index="2" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTC"/>
-                <signal pad-id="pd7" index="3" function="EVSYS_ALT" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTD"/>
-                <signal pad-id="pd2" index="3" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTD"/>
-                <signal pad-id="pe2" index="4" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTE"/>
-                <signal pad-id="pf2" index="5" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTF"/>
+                <signal pad-key="pa7" index="0" function="EVSYS_ALT" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTA"/>
+                <signal pad-key="pa2" index="0" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTA"/>
+                <signal pad-key="pb2" index="1" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTB"/>
+                <signal pad-key="pc7" index="2" function="EVSYS_ALT" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTC"/>
+                <signal pad-key="pc2" index="2" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTC"/>
+                <signal pad-key="pd7" index="3" function="EVSYS_ALT" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTD"/>
+                <signal pad-key="pd2" index="3" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTD"/>
+                <signal pad-key="pe2" index="4" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTE"/>
+                <signal pad-key="pf2" index="5" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTF"/>
             </signals>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="chip_fuse">
@@ -195,86 +195,86 @@
         <peripheral key="opamp" name="OPAMP" module-key="amp_opamp_ctrl_avr_v1">
             <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"/>
-                <signal pad-id="pd2" function="OPAMP" group="OP0OUT"/>
-                <signal pad-id="pd7" function="OPAMP" group="OP1INN"/>
-                <signal pad-id="pd4" function="OPAMP" group="OP1INP"/>
-                <signal pad-id="pd5" function="OPAMP" group="OP1OUT"/>
-                <signal pad-id="pe3" function="OPAMP" group="OP2INN"/>
-                <signal pad-id="pe1" function="OPAMP" group="OP2INP"/>
-                <signal pad-id="pe2" function="OPAMP" group="OP2OUT"/>
+                <signal pad-key="pd3" function="OPAMP" group="OP0INN"/>
+                <signal pad-key="pd1" function="OPAMP" group="OP0INP"/>
+                <signal pad-key="pd2" function="OPAMP" group="OP0OUT"/>
+                <signal pad-key="pd7" function="OPAMP" group="OP1INN"/>
+                <signal pad-key="pd4" function="OPAMP" group="OP1INP"/>
+                <signal pad-key="pd5" function="OPAMP" group="OP1OUT"/>
+                <signal pad-key="pe3" function="OPAMP" group="OP2INN"/>
+                <signal pad-key="pe1" function="OPAMP" group="OP2INP"/>
+                <signal pad-key="pe2" function="OPAMP" group="OP2OUT"/>
             </signals>
         </peripheral>
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pa2" index="2" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa3" index="3" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa4" index="4" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa5" index="5" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa6" index="6" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa7" index="7" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa0" index="0" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa1" index="1" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa2" index="2" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa3" index="3" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa4" index="4" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa5" index="5" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa6" index="6" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa7" index="7" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pb2" index="2" function="IOPORT" group="PIN"/>
-                <signal pad-id="pb3" index="3" function="IOPORT" group="PIN"/>
-                <signal pad-id="pb4" index="4" function="IOPORT" group="PIN"/>
-                <signal pad-id="pb5" index="5" function="IOPORT" group="PIN"/>
+                <signal pad-key="pb0" index="0" function="IOPORT" group="PIN"/>
+                <signal pad-key="pb1" index="1" function="IOPORT" group="PIN"/>
+                <signal pad-key="pb2" index="2" function="IOPORT" group="PIN"/>
+                <signal pad-key="pb3" index="3" function="IOPORT" group="PIN"/>
+                <signal pad-key="pb4" index="4" function="IOPORT" group="PIN"/>
+                <signal pad-key="pb5" index="5" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pc2" index="2" function="IOPORT" group="PIN"/>
-                <signal pad-id="pc3" index="3" function="IOPORT" group="PIN"/>
-                <signal pad-id="pc4" index="4" function="IOPORT" group="PIN"/>
-                <signal pad-id="pc5" index="5" function="IOPORT" group="PIN"/>
-                <signal pad-id="pc6" index="6" function="IOPORT" group="PIN"/>
-                <signal pad-id="pc7" index="7" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc0" index="0" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc1" index="1" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc2" index="2" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc3" index="3" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc4" index="4" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc5" index="5" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc6" index="6" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc7" index="7" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pd2" index="2" function="IOPORT" group="PIN"/>
-                <signal pad-id="pd3" index="3" function="IOPORT" group="PIN"/>
-                <signal pad-id="pd4" index="4" function="IOPORT" group="PIN"/>
-                <signal pad-id="pd5" index="5" function="IOPORT" group="PIN"/>
-                <signal pad-id="pd6" index="6" function="IOPORT" group="PIN"/>
-                <signal pad-id="pd7" index="7" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd0" index="0" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd1" index="1" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd2" index="2" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd3" index="3" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd4" index="4" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd5" index="5" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd6" index="6" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd7" index="7" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="porte" name="PORTE" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pe2" index="2" function="IOPORT" group="PIN"/>
-                <signal pad-id="pe3" index="3" function="IOPORT" group="PIN"/>
+                <signal pad-key="pe0" index="0" function="IOPORT" group="PIN"/>
+                <signal pad-key="pe1" index="1" function="IOPORT" group="PIN"/>
+                <signal pad-key="pe2" index="2" function="IOPORT" group="PIN"/>
+                <signal pad-key="pe3" index="3" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="portf" name="PORTF" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pf2" index="2" function="IOPORT" group="PIN"/>
-                <signal pad-id="pf3" index="3" function="IOPORT" group="PIN"/>
-                <signal pad-id="pf4" index="4" function="IOPORT" group="PIN"/>
-                <signal pad-id="pf5" index="5" function="IOPORT" group="PIN"/>
-                <signal pad-id="pf6" index="6" function="IOPORT" group="PIN"/>
+                <signal pad-key="pf0" index="0" function="IOPORT" group="PIN"/>
+                <signal pad-key="pf1" index="1" function="IOPORT" group="PIN"/>
+                <signal pad-key="pf2" index="2" function="IOPORT" group="PIN"/>
+                <signal pad-key="pf3" index="3" function="IOPORT" group="PIN"/>
+                <signal pad-key="pf4" index="4" function="IOPORT" group="PIN"/>
+                <signal pad-key="pf5" index="5" function="IOPORT" group="PIN"/>
+                <signal pad-key="pf6" index="6" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="portmux" name="PORTMUX" module-key="chip_portmux">
@@ -283,7 +283,7 @@
         <peripheral key="rstctrl" name="RSTCTRL" module-key="rst_integration_v8">
             <register-group-instance register-group-key="rstctrl" address-space-key="data" offset="0x40"/>
             <signals>
-                <signal pad-id="pf6" function="OTHER" group="RESET"/>
+                <signal pad-key="pf6" function="OTHER" group="RESET"/>
             </signals>
         </peripheral>
         <peripheral key="rtc" name="RTC" module-key="tmr_16b_rtc_v1">
@@ -298,29 +298,29 @@
         <peripheral key="spi0" name="SPI0" module-key="spi_8bit_v2">
             <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"/>
-                <signal pad-id="pe0" function="SPI0_ALT" group="MOSI" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <signal pad-id="pa4" function="SPI0" group="MOSI" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <signal pad-id="pe2" function="SPI0_ALT" group="SCK" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <signal pad-id="pa6" function="SPI0" group="SCK" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <signal pad-id="pe3" function="SPI0_ALT" group="SS" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <signal pad-id="pa7" function="SPI0" group="SS" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pe1" function="SPI0_ALT" group="MISO" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pa5" function="SPI0" group="MISO" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pe0" function="SPI0_ALT" group="MOSI" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pa4" function="SPI0" group="MOSI" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pe2" function="SPI0_ALT" group="SCK" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pa6" function="SPI0" group="SCK" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pe3" function="SPI0_ALT" group="SS" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pa7" function="SPI0" group="SS" field="PORTMUX.SPIROUTEA.SPI0"/>
             </signals>
         </peripheral>
         <peripheral key="spi1" name="SPI1" module-key="spi_8bit_v2">
             <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"/>
-                <signal pad-id="pc1" function="SPI1" group="MISO" field="PORTMUX.SPIROUTEA.SPI1"/>
-                <signal pad-id="pc4" function="SPI1_ALT2" group="MOSI" field="PORTMUX.SPIROUTEA.SPI1"/>
-                <signal pad-id="pb4" function="SPI1_ALT" group="MOSI" field="PORTMUX.SPIROUTEA.SPI1"/>
-                <signal pad-id="pc0" function="SPI1" group="MOSI" field="PORTMUX.SPIROUTEA.SPI1"/>
-                <signal pad-id="pc6" function="SPI1_ALT2" group="SCK" field="PORTMUX.SPIROUTEA.SPI1"/>
-                <signal pad-id="pc2" function="SPI1" group="SCK" field="PORTMUX.SPIROUTEA.SPI1"/>
-                <signal pad-id="pc7" function="SPI1_ALT2" group="SS" field="PORTMUX.SPIROUTEA.SPI1"/>
-                <signal pad-id="pc3" function="SPI1" group="SS" field="PORTMUX.SPIROUTEA.SPI1"/>
+                <signal pad-key="pc5" function="SPI1_ALT2" group="MISO" field="PORTMUX.SPIROUTEA.SPI1"/>
+                <signal pad-key="pb5" function="SPI1_ALT" group="MISO" field="PORTMUX.SPIROUTEA.SPI1"/>
+                <signal pad-key="pc1" function="SPI1" group="MISO" field="PORTMUX.SPIROUTEA.SPI1"/>
+                <signal pad-key="pc4" function="SPI1_ALT2" group="MOSI" field="PORTMUX.SPIROUTEA.SPI1"/>
+                <signal pad-key="pb4" function="SPI1_ALT" group="MOSI" field="PORTMUX.SPIROUTEA.SPI1"/>
+                <signal pad-key="pc0" function="SPI1" group="MOSI" field="PORTMUX.SPIROUTEA.SPI1"/>
+                <signal pad-key="pc6" function="SPI1_ALT2" group="SCK" field="PORTMUX.SPIROUTEA.SPI1"/>
+                <signal pad-key="pc2" function="SPI1" group="SCK" field="PORTMUX.SPIROUTEA.SPI1"/>
+                <signal pad-key="pc7" function="SPI1_ALT2" group="SS" field="PORTMUX.SPIROUTEA.SPI1"/>
+                <signal pad-key="pc3" function="SPI1" group="SS" field="PORTMUX.SPIROUTEA.SPI1"/>
             </signals>
         </peripheral>
         <peripheral key="syscfg" name="SYSCFG" module-key="chip_syscfg">
@@ -329,174 +329,174 @@
         <peripheral key="tca0" name="TCA0" module-key="tmr_16b_pwm_v1">
             <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"/>
-                <signal pad-id="pd0" index="0" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pc0" index="0" function="TCA0_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pb0" index="0" function="TCA0_ALT" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pa0" index="0" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pf1" index="1" function="TCA0_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pe1" index="1" function="TCA0_ALT4" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pd1" index="1" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pc1" index="1" function="TCA0_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pb1" index="1" function="TCA0_ALT" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pa1" index="1" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pf2" index="2" function="TCA0_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pe2" index="2" function="TCA0_ALT4" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pd2" index="2" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pc2" index="2" function="TCA0_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pb2" index="2" function="TCA0_ALT" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pa2" index="2" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pf3" index="3" function="TCA0_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pe3" index="3" function="TCA0_ALT4" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pd3" index="3" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pc3" index="3" function="TCA0_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pb3" index="3" function="TCA0_ALT" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pa3" index="3" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pf4" index="4" function="TCA0_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pd4" index="4" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pc4" index="4" function="TCA0_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pb4" index="4" function="TCA0_ALT" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pa4" index="4" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pf5" index="5" function="TCA0_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pd5" index="5" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pc5" index="5" function="TCA0_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pb5" index="5" function="TCA0_ALT" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pa5" index="5" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pf0" index="0" function="TCA0_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pe0" index="0" function="TCA0_ALT4" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pd0" index="0" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pc0" index="0" function="TCA0_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pb0" index="0" function="TCA0_ALT" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pa0" index="0" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pf1" index="1" function="TCA0_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pe1" index="1" function="TCA0_ALT4" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pd1" index="1" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pc1" index="1" function="TCA0_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pb1" index="1" function="TCA0_ALT" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pa1" index="1" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pf2" index="2" function="TCA0_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pe2" index="2" function="TCA0_ALT4" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pd2" index="2" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pc2" index="2" function="TCA0_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pb2" index="2" function="TCA0_ALT" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pa2" index="2" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pf3" index="3" function="TCA0_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pe3" index="3" function="TCA0_ALT4" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pd3" index="3" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pc3" index="3" function="TCA0_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pb3" index="3" function="TCA0_ALT" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pa3" index="3" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pf4" index="4" function="TCA0_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pd4" index="4" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pc4" index="4" function="TCA0_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pb4" index="4" function="TCA0_ALT" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pa4" index="4" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pf5" index="5" function="TCA0_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pd5" index="5" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pc5" index="5" function="TCA0_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pb5" index="5" function="TCA0_ALT" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pa5" index="5" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
             </signals>
         </peripheral>
         <peripheral key="tca1" name="TCA1" module-key="tmr_16b_pwm_v1">
             <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"/>
-                <signal pad-id="pc5" index="1" function="TCA1_ALT" group="WO" field="PORTMUX.TCAROUTEA.TCA1"/>
-                <signal pad-id="pb1" index="1" function="TCA1" group="WO" field="PORTMUX.TCAROUTEA.TCA1"/>
-                <signal pad-id="pc6" index="2" function="TCA1_ALT" group="WO" field="PORTMUX.TCAROUTEA.TCA1"/>
-                <signal pad-id="pb2" index="2" function="TCA1" group="WO" field="PORTMUX.TCAROUTEA.TCA1"/>
-                <signal pad-id="pb3" index="3" function="TCA1" group="WO" field="PORTMUX.TCAROUTEA.TCA1"/>
-                <signal pad-id="pb4" index="4" function="TCA1" group="WO" field="PORTMUX.TCAROUTEA.TCA1"/>
-                <signal pad-id="pb5" index="5" function="TCA1" group="WO" field="PORTMUX.TCAROUTEA.TCA1"/>
+                <signal pad-key="pc4" index="0" function="TCA1_ALT" group="WO" field="PORTMUX.TCAROUTEA.TCA1"/>
+                <signal pad-key="pb0" index="0" function="TCA1" group="WO" field="PORTMUX.TCAROUTEA.TCA1"/>
+                <signal pad-key="pc5" index="1" function="TCA1_ALT" group="WO" field="PORTMUX.TCAROUTEA.TCA1"/>
+                <signal pad-key="pb1" index="1" function="TCA1" group="WO" field="PORTMUX.TCAROUTEA.TCA1"/>
+                <signal pad-key="pc6" index="2" function="TCA1_ALT" group="WO" field="PORTMUX.TCAROUTEA.TCA1"/>
+                <signal pad-key="pb2" index="2" function="TCA1" group="WO" field="PORTMUX.TCAROUTEA.TCA1"/>
+                <signal pad-key="pb3" index="3" function="TCA1" group="WO" field="PORTMUX.TCAROUTEA.TCA1"/>
+                <signal pad-key="pb4" index="4" function="TCA1" group="WO" field="PORTMUX.TCAROUTEA.TCA1"/>
+                <signal pad-key="pb5" index="5" function="TCA1" group="WO" field="PORTMUX.TCAROUTEA.TCA1"/>
             </signals>
         </peripheral>
         <peripheral key="tcb0" name="TCB0" module-key="tmr_16b_capture_v1">
             <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"/>
+                <signal pad-key="pf4" index="0" function="TCB0_ALT" group="WO" field="PORTMUX.TCBROUTEA.TCB0"/>
+                <signal pad-key="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 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"/>
+                <signal pad-key="pf5" index="0" function="TCB1_ALT" group="WO" field="PORTMUX.TCBROUTEA.TCB1"/>
+                <signal pad-key="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 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"/>
+                <signal pad-key="pb4" index="0" function="TCB2_ALT" group="WO" field="PORTMUX.TCBROUTEA.TCB2"/>
+                <signal pad-key="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 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"/>
+                <signal pad-key="pc1" index="0" function="TCB3_ALT" group="WO" field="PORTMUX.TCBROUTEA.TCB3"/>
+                <signal pad-key="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 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"/>
-                <signal pad-id="pa4" function="TCD0" group="WOA" field="PORTMUX.TCDROUTEA.TCD0"/>
-                <signal pad-id="pf1" index="1" function="TCD0_ALT2" group="WOB" field="PORTMUX.TCDROUTEA.TCD0"/>
-                <signal pad-id="pb5" index="1" function="TCD0_ALT" group="WOB" field="PORTMUX.TCDROUTEA.TCD0"/>
-                <signal pad-id="pa5" index="1" function="TCD0" group="WOB" field="PORTMUX.TCDROUTEA.TCD0"/>
-                <signal pad-id="pf2" index="2" function="TCD0_ALT2" group="WOC" field="PORTMUX.TCDROUTEA.TCD0"/>
-                <signal pad-id="pa6" index="2" function="TCD0" group="WOC" field="PORTMUX.TCDROUTEA.TCD0"/>
-                <signal pad-id="pf3" index="3" function="TCD0_ALT2" group="WOD" field="PORTMUX.TCDROUTEA.TCD0"/>
-                <signal pad-id="pa7" index="3" function="TCD0" group="WOD" field="PORTMUX.TCDROUTEA.TCD0"/>
+                <signal pad-key="pf0" function="TCD0_ALT2" group="WOA" field="PORTMUX.TCDROUTEA.TCD0"/>
+                <signal pad-key="pb4" function="TCD0_ALT" group="WOA" field="PORTMUX.TCDROUTEA.TCD0"/>
+                <signal pad-key="pa4" function="TCD0" group="WOA" field="PORTMUX.TCDROUTEA.TCD0"/>
+                <signal pad-key="pf1" index="1" function="TCD0_ALT2" group="WOB" field="PORTMUX.TCDROUTEA.TCD0"/>
+                <signal pad-key="pb5" index="1" function="TCD0_ALT" group="WOB" field="PORTMUX.TCDROUTEA.TCD0"/>
+                <signal pad-key="pa5" index="1" function="TCD0" group="WOB" field="PORTMUX.TCDROUTEA.TCD0"/>
+                <signal pad-key="pf2" index="2" function="TCD0_ALT2" group="WOC" field="PORTMUX.TCDROUTEA.TCD0"/>
+                <signal pad-key="pa6" index="2" function="TCD0" group="WOC" field="PORTMUX.TCDROUTEA.TCD0"/>
+                <signal pad-key="pf3" index="3" function="TCD0_ALT2" group="WOD" field="PORTMUX.TCDROUTEA.TCD0"/>
+                <signal pad-key="pa7" index="3" function="TCD0" group="WOD" field="PORTMUX.TCDROUTEA.TCD0"/>
             </signals>
         </peripheral>
         <peripheral key="twi0" name="TWI0" module-key="i2c_8bit_v2">
             <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"/>
-                <signal pad-id="pa3" function="I2C0" group="SCL" field="PORTMUX.TWIROUTEA.TWI0"/>
-                <signal pad-id="pc6" function="I2C0_ALT2" group="SDA" field="PORTMUX.TWIROUTEA.TWI0"/>
-                <signal pad-id="pc2" function="I2C0_ALT" group="SDA" field="PORTMUX.TWIROUTEA.TWI0"/>
-                <signal pad-id="pa2" function="I2C0" group="SDA" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pc7" function="I2C0_ALT2" group="SCL" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pc3" function="I2C0_ALT" group="SCL" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pa3" function="I2C0" group="SCL" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pc6" function="I2C0_ALT2" group="SDA" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pc2" function="I2C0_ALT" group="SDA" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pa2" function="I2C0" group="SDA" field="PORTMUX.TWIROUTEA.TWI0"/>
             </signals>
         </peripheral>
         <peripheral key="twi1" name="TWI1" module-key="i2c_8bit_v2">
             <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"/>
-                <signal pad-id="pb2" function="I2C1_ALT" group="SDA" field="PORTMUX.TWIROUTEA.TWI1"/>
-                <signal pad-id="pf2" function="I2C1" group="SDA" field="PORTMUX.TWIROUTEA.TWI1"/>
+                <signal pad-key="pb3" function="I2C1_ALT" group="SCL" field="PORTMUX.TWIROUTEA.TWI1"/>
+                <signal pad-key="pf3" function="I2C1" group="SCL" field="PORTMUX.TWIROUTEA.TWI1"/>
+                <signal pad-key="pb2" function="I2C1_ALT" group="SDA" field="PORTMUX.TWIROUTEA.TWI1"/>
+                <signal pad-key="pf2" function="I2C1" group="SDA" field="PORTMUX.TWIROUTEA.TWI1"/>
             </signals>
         </peripheral>
         <peripheral key="usart0" name="USART0" module-key="uart_autobd_v4">
             <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"/>
-                <signal pad-id="pa4" function="USART0_ALT" group="TXD" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pa0" function="USART0" group="TXD" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pa6" function="USART0_ALT" group="XCK" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pa2" function="USART0" group="XCK" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pa7" function="USART0_ALT" group="XDIR" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pa3" function="USART0" group="XDIR" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa5" function="USART0_ALT" group="RXD" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa1" function="USART0" group="RXD" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa4" function="USART0_ALT" group="TXD" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa0" function="USART0" group="TXD" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa6" function="USART0_ALT" group="XCK" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa2" function="USART0" group="XCK" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa7" function="USART0_ALT" group="XDIR" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa3" function="USART0" group="XDIR" field="PORTMUX.USARTROUTEA.USART0"/>
             </signals>
         </peripheral>
         <peripheral key="usart1" name="USART1" module-key="uart_autobd_v4">
             <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"/>
-                <signal pad-id="pc4" function="USART1_ALT" group="TXD" field="PORTMUX.USARTROUTEA.USART1"/>
-                <signal pad-id="pc0" function="USART1" group="TXD" field="PORTMUX.USARTROUTEA.USART1"/>
-                <signal pad-id="pc6" function="USART1_ALT" group="XCK" field="PORTMUX.USARTROUTEA.USART1"/>
-                <signal pad-id="pc2" function="USART1" group="XCK" field="PORTMUX.USARTROUTEA.USART1"/>
-                <signal pad-id="pc7" function="USART1_ALT" group="XDIR" field="PORTMUX.USARTROUTEA.USART1"/>
-                <signal pad-id="pc3" function="USART1" group="XDIR" field="PORTMUX.USARTROUTEA.USART1"/>
+                <signal pad-key="pc5" function="USART1_ALT" group="RXD" field="PORTMUX.USARTROUTEA.USART1"/>
+                <signal pad-key="pc1" function="USART1" group="RXD" field="PORTMUX.USARTROUTEA.USART1"/>
+                <signal pad-key="pc4" function="USART1_ALT" group="TXD" field="PORTMUX.USARTROUTEA.USART1"/>
+                <signal pad-key="pc0" function="USART1" group="TXD" field="PORTMUX.USARTROUTEA.USART1"/>
+                <signal pad-key="pc6" function="USART1_ALT" group="XCK" field="PORTMUX.USARTROUTEA.USART1"/>
+                <signal pad-key="pc2" function="USART1" group="XCK" field="PORTMUX.USARTROUTEA.USART1"/>
+                <signal pad-key="pc7" function="USART1_ALT" group="XDIR" field="PORTMUX.USARTROUTEA.USART1"/>
+                <signal pad-key="pc3" function="USART1" group="XDIR" field="PORTMUX.USARTROUTEA.USART1"/>
             </signals>
         </peripheral>
         <peripheral key="usart2" name="USART2" module-key="uart_autobd_v4">
             <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"/>
-                <signal pad-id="pf4" function="USART2_ALT" group="TXD" field="PORTMUX.USARTROUTEA.USART2"/>
-                <signal pad-id="pf0" function="USART2" group="TXD" field="PORTMUX.USARTROUTEA.USART2"/>
-                <signal pad-id="pf2" function="USART2" group="XCK" field="PORTMUX.USARTROUTEA.USART2"/>
-                <signal pad-id="pf3" function="USART2" group="XDIR" field="PORTMUX.USARTROUTEA.USART2"/>
+                <signal pad-key="pf5" function="USART2_ALT" group="RXD" field="PORTMUX.USARTROUTEA.USART2"/>
+                <signal pad-key="pf1" function="USART2" group="RXD" field="PORTMUX.USARTROUTEA.USART2"/>
+                <signal pad-key="pf4" function="USART2_ALT" group="TXD" field="PORTMUX.USARTROUTEA.USART2"/>
+                <signal pad-key="pf0" function="USART2" group="TXD" field="PORTMUX.USARTROUTEA.USART2"/>
+                <signal pad-key="pf2" function="USART2" group="XCK" field="PORTMUX.USARTROUTEA.USART2"/>
+                <signal pad-key="pf3" function="USART2" group="XDIR" field="PORTMUX.USARTROUTEA.USART2"/>
             </signals>
         </peripheral>
         <peripheral key="usart3" name="USART3" module-key="uart_autobd_v4">
             <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"/>
-                <signal pad-id="pb4" function="USART3_ALT" group="TXD" field="PORTMUX.USARTROUTEA.USART3"/>
-                <signal pad-id="pb0" function="USART3" group="TXD" field="PORTMUX.USARTROUTEA.USART3"/>
-                <signal pad-id="pb2" function="USART3" group="XCK" field="PORTMUX.USARTROUTEA.USART3"/>
-                <signal pad-id="pb3" function="USART3" group="XDIR" field="PORTMUX.USARTROUTEA.USART3"/>
+                <signal pad-key="pb5" function="USART3_ALT" group="RXD" field="PORTMUX.USARTROUTEA.USART3"/>
+                <signal pad-key="pb1" function="USART3" group="RXD" field="PORTMUX.USARTROUTEA.USART3"/>
+                <signal pad-key="pb4" function="USART3_ALT" group="TXD" field="PORTMUX.USARTROUTEA.USART3"/>
+                <signal pad-key="pb0" function="USART3" group="TXD" field="PORTMUX.USARTROUTEA.USART3"/>
+                <signal pad-key="pb2" function="USART3" group="XCK" field="PORTMUX.USARTROUTEA.USART3"/>
+                <signal pad-key="pb3" function="USART3" group="XDIR" field="PORTMUX.USARTROUTEA.USART3"/>
             </signals>
         </peripheral>
         <peripheral key="usart4" name="USART4" module-key="uart_autobd_v4">
             <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"/>
-                <signal pad-id="pe2" function="USART4" group="XCK" field="PORTMUX.USARTROUTEB.USART4"/>
-                <signal pad-id="pe3" function="USART4" group="XDIR" field="PORTMUX.USARTROUTEB.USART4"/>
+                <signal pad-key="pe1" function="USART4" group="RXD" field="PORTMUX.USARTROUTEB.USART4"/>
+                <signal pad-key="pe0" function="USART4" group="TXD" field="PORTMUX.USARTROUTEB.USART4"/>
+                <signal pad-key="pe2" function="USART4" group="XCK" field="PORTMUX.USARTROUTEB.USART4"/>
+                <signal pad-key="pe3" function="USART4" group="XDIR" field="PORTMUX.USARTROUTEB.USART4"/>
             </signals>
         </peripheral>
         <peripheral key="userrow" name="USERROW" module-key="chip_userrow">
@@ -529,24 +529,24 @@
         <peripheral key="zcd0" name="ZCD0" module-key="cmp_zxover_ctrl_v3">
             <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"/>
-                <signal pad-id="pa7" function="ZCD0" group="OUT" field="PORTMUX.ZCDROUTEA.ZCD0"/>
+                <signal pad-key="pd1" function="ZCD0" group="IN"/>
+                <signal pad-key="pc7" function="ZCD0_ALT" group="OUT" field="PORTMUX.ZCDROUTEA.ZCD0"/>
+                <signal pad-key="pa7" function="ZCD0" group="OUT" field="PORTMUX.ZCDROUTEA.ZCD0"/>
             </signals>
         </peripheral>
         <peripheral key="zcd1" name="ZCD1" module-key="cmp_zxover_ctrl_v3">
             <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"/>
-                <signal pad-id="pa7" function="ZCD1" group="OUT" field="PORTMUX.ZCDROUTEA.ZCD1"/>
+                <signal pad-key="pe3" function="ZCD1" group="IN"/>
+                <signal pad-key="pc7" function="ZCD1_ALT" group="OUT" field="PORTMUX.ZCDROUTEA.ZCD1"/>
+                <signal pad-key="pa7" function="ZCD1" group="OUT" field="PORTMUX.ZCDROUTEA.ZCD1"/>
             </signals>
         </peripheral>
         <peripheral key="zcd2" name="ZCD2" module-key="cmp_zxover_ctrl_v3">
             <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"/>
+                <signal pad-key="pc7" function="ZCD2_ALT" group="OUT" field="PORTMUX.ZCDROUTEA.ZCD2"/>
+                <signal pad-key="pa7" function="ZCD2" group="OUT" field="PORTMUX.ZCDROUTEA.ZCD2"/>
             </signals>
         </peripheral>
     </peripherals>
@@ -2018,59 +2018,109 @@
             </register-group>
         </module>
     </modules>
+    <pads>
+        <pad key="pa5" name="PA5"/>
+        <pad key="pa6" name="PA6"/>
+        <pad key="pa7" name="PA7"/>
+        <pad key="pb0" name="PB0"/>
+        <pad key="pb1" name="PB1"/>
+        <pad key="pb2" name="PB2"/>
+        <pad key="pb3" name="PB3"/>
+        <pad key="pb4" name="PB4"/>
+        <pad key="pb5" name="PB5"/>
+        <pad key="pc0" name="PC0"/>
+        <pad key="pc1" name="PC1"/>
+        <pad key="pc2" name="PC2"/>
+        <pad key="pc3" name="PC3"/>
+        <pad key="vddio2" name="VDDIO2"/>
+        <pad key="gnd0" name="GND0"/>
+        <pad key="pc4" name="PC4"/>
+        <pad key="pc5" name="PC5"/>
+        <pad key="pc6" name="PC6"/>
+        <pad key="pc7" name="PC7"/>
+        <pad key="pd0" name="PD0"/>
+        <pad key="pd1" name="PD1"/>
+        <pad key="pd2" name="PD2"/>
+        <pad key="pd3" name="PD3"/>
+        <pad key="pd4" name="PD4"/>
+        <pad key="pd5" name="PD5"/>
+        <pad key="pd6" name="PD6"/>
+        <pad key="pd7" name="PD7"/>
+        <pad key="avdd" name="AVDD"/>
+        <pad key="agnd" name="AGND"/>
+        <pad key="pe0" name="PE0"/>
+        <pad key="pe1" name="PE1"/>
+        <pad key="pe2" name="PE2"/>
+        <pad key="pe3" name="PE3"/>
+        <pad key="pf0" name="PF0"/>
+        <pad key="pf1" name="PF1"/>
+        <pad key="pf2" name="PF2"/>
+        <pad key="pf3" name="PF3"/>
+        <pad key="pf4" name="PF4"/>
+        <pad key="pf5" name="PF5"/>
+        <pad key="pf6" name="PF6"/>
+        <pad key="updi" name="UPDI"/>
+        <pad key="vdd" name="VDD"/>
+        <pad key="gnd2" name="GND2"/>
+        <pad key="pa0" name="PA0"/>
+        <pad key="pa1" name="PA1"/>
+        <pad key="pa2" name="PA2"/>
+        <pad key="pa3" name="PA3"/>
+        <pad key="pa4" name="PA4"/>
+    </pads>
     <pinouts>
         <pinout key="qfn48" name="QFN48" type="qfn">
-            <pin position="1" pad="PA5"/>
-            <pin position="2" pad="PA6"/>
-            <pin position="3" pad="PA7"/>
-            <pin position="4" pad="PB0"/>
-            <pin position="5" pad="PB1"/>
-            <pin position="6" pad="PB2"/>
-            <pin position="7" pad="PB3"/>
-            <pin position="8" pad="PB4"/>
-            <pin position="9" pad="PB5"/>
-            <pin position="10" pad="PC0"/>
-            <pin position="11" pad="PC1"/>
-            <pin position="12" pad="PC2"/>
-            <pin position="13" pad="PC3"/>
-            <pin position="14" pad="VDDIO2"/>
-            <pin position="15" pad="GND0"/>
-            <pin position="16" pad="PC4"/>
-            <pin position="17" pad="PC5"/>
-            <pin position="18" pad="PC6"/>
-            <pin position="19" pad="PC7"/>
-            <pin position="20" pad="PD0"/>
-            <pin position="21" pad="PD1"/>
-            <pin position="22" pad="PD2"/>
-            <pin position="23" pad="PD3"/>
-            <pin position="24" pad="PD4"/>
-            <pin position="25" pad="PD5"/>
-            <pin position="26" pad="PD6"/>
-            <pin position="27" pad="PD7"/>
-            <pin position="28" pad="AVDD"/>
-            <pin position="29" pad="AGND"/>
-            <pin position="30" pad="PE0"/>
-            <pin position="31" pad="PE1"/>
-            <pin position="32" pad="PE2"/>
-            <pin position="33" pad="PE3"/>
-            <pin position="34" pad="PF0"/>
-            <pin position="35" pad="PF1"/>
-            <pin position="36" pad="PF2"/>
-            <pin position="37" pad="PF3"/>
-            <pin position="38" pad="PF4"/>
-            <pin position="39" pad="PF5"/>
-            <pin position="40" pad="PF6"/>
-            <pin position="41" pad="UPDI"/>
-            <pin position="42" pad="VDD"/>
-            <pin position="43" pad="GND2"/>
-            <pin position="44" pad="PA0"/>
-            <pin position="45" pad="PA1"/>
-            <pin position="46" pad="PA2"/>
-            <pin position="47" pad="PA3"/>
-            <pin position="48" pad="PA4"/>
+            <pin position="1" pad-key="pa5"/>
+            <pin position="2" pad-key="pa6"/>
+            <pin position="3" pad-key="pa7"/>
+            <pin position="4" pad-key="pb0"/>
+            <pin position="5" pad-key="pb1"/>
+            <pin position="6" pad-key="pb2"/>
+            <pin position="7" pad-key="pb3"/>
+            <pin position="8" pad-key="pb4"/>
+            <pin position="9" pad-key="pb5"/>
+            <pin position="10" pad-key="pc0"/>
+            <pin position="11" pad-key="pc1"/>
+            <pin position="12" pad-key="pc2"/>
+            <pin position="13" pad-key="pc3"/>
+            <pin position="14" pad-key="vddio2"/>
+            <pin position="15" pad-key="gnd0"/>
+            <pin position="16" pad-key="pc4"/>
+            <pin position="17" pad-key="pc5"/>
+            <pin position="18" pad-key="pc6"/>
+            <pin position="19" pad-key="pc7"/>
+            <pin position="20" pad-key="pd0"/>
+            <pin position="21" pad-key="pd1"/>
+            <pin position="22" pad-key="pd2"/>
+            <pin position="23" pad-key="pd3"/>
+            <pin position="24" pad-key="pd4"/>
+            <pin position="25" pad-key="pd5"/>
+            <pin position="26" pad-key="pd6"/>
+            <pin position="27" pad-key="pd7"/>
+            <pin position="28" pad-key="avdd"/>
+            <pin position="29" pad-key="agnd"/>
+            <pin position="30" pad-key="pe0"/>
+            <pin position="31" pad-key="pe1"/>
+            <pin position="32" pad-key="pe2"/>
+            <pin position="33" pad-key="pe3"/>
+            <pin position="34" pad-key="pf0"/>
+            <pin position="35" pad-key="pf1"/>
+            <pin position="36" pad-key="pf2"/>
+            <pin position="37" pad-key="pf3"/>
+            <pin position="38" pad-key="pf4"/>
+            <pin position="39" pad-key="pf5"/>
+            <pin position="40" pad-key="pf6"/>
+            <pin position="41" pad-key="updi"/>
+            <pin position="42" pad-key="vdd"/>
+            <pin position="43" pad-key="gnd2"/>
+            <pin position="44" pad-key="pa0"/>
+            <pin position="45" pad-key="pa1"/>
+            <pin position="46" pad-key="pa2"/>
+            <pin position="47" pad-key="pa3"/>
+            <pin position="48" pad-key="pa4"/>
         </pinout>
     </pinouts>
     <variants>
-        <variant name="AVR64DB48" pinout-key="qfn48" package="QFN48"/>
+        <variant key="avr64db48" name="AVR64DB48" pinout-key="qfn48"/>
     </variants>
 </device>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR64DB64.xml b/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR64DB64.xml
index 8ea068b8..914a99e0 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR64DB64.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR64DB64.xml
@@ -44,70 +44,70 @@
         <peripheral key="ac0" name="AC0" module-key="cmp_control_v8">
             <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"/>
-                <signal pad-id="pd7" index="2" function="AC0" group="N"/>
-                <signal pad-id="pc6" index="0" function="AC0_ALT" group="OUT" field="PORTMUX.ACROUTEA.AC0"/>
-                <signal pad-id="pa7" index="0" function="AC0" group="OUT" field="PORTMUX.ACROUTEA.AC0"/>
-                <signal pad-id="pd2" index="0" function="AC0" group="P"/>
-                <signal pad-id="pe0" index="1" function="AC0" group="P"/>
-                <signal pad-id="pe2" index="2" function="AC0" group="P"/>
-                <signal pad-id="pd6" index="3" function="AC0" group="P"/>
+                <signal pad-key="pd3" index="0" function="AC0" group="N"/>
+                <signal pad-key="pd0" index="1" function="AC0" group="N"/>
+                <signal pad-key="pd7" index="2" function="AC0" group="N"/>
+                <signal pad-key="pc6" index="0" function="AC0_ALT" group="OUT" field="PORTMUX.ACROUTEA.AC0"/>
+                <signal pad-key="pa7" index="0" function="AC0" group="OUT" field="PORTMUX.ACROUTEA.AC0"/>
+                <signal pad-key="pd2" index="0" function="AC0" group="P"/>
+                <signal pad-key="pe0" index="1" function="AC0" group="P"/>
+                <signal pad-key="pe2" index="2" function="AC0" group="P"/>
+                <signal pad-key="pd6" index="3" function="AC0" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="ac1" name="AC1" module-key="cmp_control_v8">
             <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"/>
-                <signal pad-id="pd7" index="2" function="AC1" group="N"/>
-                <signal pad-id="pc6" index="0" function="AC1_ALT" group="OUT" field="PORTMUX.ACROUTEA.AC1"/>
-                <signal pad-id="pa7" index="0" function="AC1" group="OUT" field="PORTMUX.ACROUTEA.AC1"/>
-                <signal pad-id="pd2" index="0" function="AC1" group="P"/>
-                <signal pad-id="pd3" index="1" function="AC1" group="P"/>
-                <signal pad-id="pd4" index="2" function="AC1" group="P"/>
-                <signal pad-id="pd6" index="3" function="AC1" group="P"/>
+                <signal pad-key="pd5" index="0" function="AC1" group="N"/>
+                <signal pad-key="pd0" index="1" function="AC1" group="N"/>
+                <signal pad-key="pd7" index="2" function="AC1" group="N"/>
+                <signal pad-key="pc6" index="0" function="AC1_ALT" group="OUT" field="PORTMUX.ACROUTEA.AC1"/>
+                <signal pad-key="pa7" index="0" function="AC1" group="OUT" field="PORTMUX.ACROUTEA.AC1"/>
+                <signal pad-key="pd2" index="0" function="AC1" group="P"/>
+                <signal pad-key="pd3" index="1" function="AC1" group="P"/>
+                <signal pad-key="pd4" index="2" function="AC1" group="P"/>
+                <signal pad-key="pd6" index="3" function="AC1" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="ac2" name="AC2" module-key="cmp_control_v8">
             <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"/>
-                <signal pad-id="pd7" index="2" function="AC2" group="N"/>
-                <signal pad-id="pc6" index="0" function="AC2_ALT" group="OUT" field="PORTMUX.ACROUTEA.AC2"/>
-                <signal pad-id="pa7" index="0" function="AC2" group="OUT" field="PORTMUX.ACROUTEA.AC2"/>
-                <signal pad-id="pd2" index="0" function="AC2" group="P"/>
-                <signal pad-id="pd4" index="1" function="AC2" group="P"/>
-                <signal pad-id="pe1" index="2" function="AC2" group="P"/>
-                <signal pad-id="pd6" index="3" function="AC2" group="P"/>
+                <signal pad-key="pd7" index="0" function="AC2" group="N"/>
+                <signal pad-key="pd0" index="1" function="AC2" group="N"/>
+                <signal pad-key="pd7" index="2" function="AC2" group="N"/>
+                <signal pad-key="pc6" index="0" function="AC2_ALT" group="OUT" field="PORTMUX.ACROUTEA.AC2"/>
+                <signal pad-key="pa7" index="0" function="AC2" group="OUT" field="PORTMUX.ACROUTEA.AC2"/>
+                <signal pad-key="pd2" index="0" function="AC2" group="P"/>
+                <signal pad-key="pd4" index="1" function="AC2" group="P"/>
+                <signal pad-key="pe1" index="2" function="AC2" group="P"/>
+                <signal pad-key="pd6" index="3" function="AC2" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="adc0" name="ADC0" module-key="adc_12b_diff_ctrl_v1">
             <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"/>
-                <signal pad-id="pd2" index="2" function="AIN0" group="AIN"/>
-                <signal pad-id="pd3" index="3" function="AIN0" group="AIN"/>
-                <signal pad-id="pd4" index="4" function="AIN0" group="AIN"/>
-                <signal pad-id="pd5" index="5" function="AIN0" group="AIN"/>
-                <signal pad-id="pd6" index="6" function="AIN0" group="AIN"/>
-                <signal pad-id="pd7" index="7" function="AIN0" group="AIN"/>
-                <signal pad-id="pe0" index="8" function="AIN0" group="AIN"/>
-                <signal pad-id="pe1" index="9" function="AIN0" group="AIN"/>
-                <signal pad-id="pe2" index="10" function="AIN0" group="AIN"/>
-                <signal pad-id="pe3" index="11" function="AIN0" group="AIN"/>
-                <signal pad-id="pe4" index="12" function="AIN0" group="AIN"/>
-                <signal pad-id="pe5" index="13" function="AIN0" group="AIN"/>
-                <signal pad-id="pe6" index="14" function="AIN0" group="AIN"/>
-                <signal pad-id="pe7" index="15" function="AIN0" group="AIN"/>
-                <signal pad-id="pf0" index="16" function="AIN0" group="AIN"/>
-                <signal pad-id="pf1" index="17" function="AIN0" group="AIN"/>
-                <signal pad-id="pf2" index="18" function="AIN0" group="AIN"/>
-                <signal pad-id="pf3" index="19" function="AIN0" group="AIN"/>
-                <signal pad-id="pf4" index="20" function="AIN0" group="AIN"/>
-                <signal pad-id="pf5" index="21" function="AIN0" group="AIN"/>
+                <signal pad-key="pd0" index="0" function="AIN0" group="AIN"/>
+                <signal pad-key="pd1" index="1" function="AIN0" group="AIN"/>
+                <signal pad-key="pd2" index="2" function="AIN0" group="AIN"/>
+                <signal pad-key="pd3" index="3" function="AIN0" group="AIN"/>
+                <signal pad-key="pd4" index="4" function="AIN0" group="AIN"/>
+                <signal pad-key="pd5" index="5" function="AIN0" group="AIN"/>
+                <signal pad-key="pd6" index="6" function="AIN0" group="AIN"/>
+                <signal pad-key="pd7" index="7" function="AIN0" group="AIN"/>
+                <signal pad-key="pe0" index="8" function="AIN0" group="AIN"/>
+                <signal pad-key="pe1" index="9" function="AIN0" group="AIN"/>
+                <signal pad-key="pe2" index="10" function="AIN0" group="AIN"/>
+                <signal pad-key="pe3" index="11" function="AIN0" group="AIN"/>
+                <signal pad-key="pe4" index="12" function="AIN0" group="AIN"/>
+                <signal pad-key="pe5" index="13" function="AIN0" group="AIN"/>
+                <signal pad-key="pe6" index="14" function="AIN0" group="AIN"/>
+                <signal pad-key="pe7" index="15" function="AIN0" group="AIN"/>
+                <signal pad-key="pf0" index="16" function="AIN0" group="AIN"/>
+                <signal pad-key="pf1" index="17" function="AIN0" group="AIN"/>
+                <signal pad-key="pf2" index="18" function="AIN0" group="AIN"/>
+                <signal pad-key="pf3" index="19" function="AIN0" group="AIN"/>
+                <signal pad-key="pf4" index="20" function="AIN0" group="AIN"/>
+                <signal pad-key="pf5" index="21" function="AIN0" group="AIN"/>
             </signals>
         </peripheral>
         <peripheral key="bod" name="BOD" module-key="bor_lvd_ctrl_v1">
@@ -116,46 +116,46 @@
         <peripheral key="ccl" name="CCL" module-key="cla_ccl_v1">
             <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"/>
-                <signal pad-id="pa2" index="2" function="CCL_IN" group="LUT0_IN"/>
-                <signal pad-id="pa6" index="0" function="CCL_ALT" group="LUT0_OUT" field="PORTMUX.CCLROUTEA.LUT0"/>
-                <signal pad-id="pa3" index="0" function="CCL" group="LUT0_OUT" field="PORTMUX.CCLROUTEA.LUT0"/>
-                <signal pad-id="pc0" index="0" function="CCL_IN" group="LUT1_IN"/>
-                <signal pad-id="pc1" index="1" function="CCL_IN" group="LUT1_IN"/>
-                <signal pad-id="pc2" index="2" function="CCL_IN" group="LUT1_IN"/>
-                <signal pad-id="pc6" index="0" function="CCL_ALT" group="LUT1_OUT" field="PORTMUX.CCLROUTEA.LUT1"/>
-                <signal pad-id="pc3" index="0" function="CCL" group="LUT1_OUT" field="PORTMUX.CCLROUTEA.LUT1"/>
-                <signal pad-id="pd0" index="0" function="CCL_IN" group="LUT2_IN"/>
-                <signal pad-id="pd1" index="1" function="CCL_IN" group="LUT2_IN"/>
-                <signal pad-id="pd2" index="2" function="CCL_IN" group="LUT2_IN"/>
-                <signal pad-id="pd6" index="0" function="CCL_ALT" group="LUT2_OUT" field="PORTMUX.CCLROUTEA.LUT2"/>
-                <signal pad-id="pd3" index="0" function="CCL" group="LUT2_OUT" field="PORTMUX.CCLROUTEA.LUT2"/>
-                <signal pad-id="pf0" index="0" function="CCL_IN" group="LUT3_IN"/>
-                <signal pad-id="pf1" index="1" function="CCL_IN" group="LUT3_IN"/>
-                <signal pad-id="pf2" index="2" function="CCL_IN" group="LUT3_IN"/>
-                <signal pad-id="pf3" index="0" function="CCL" group="LUT3_OUT" field="PORTMUX.CCLROUTEA.LUT3"/>
-                <signal pad-id="pb0" index="0" function="CCL_IN" group="LUT4_IN"/>
-                <signal pad-id="pb1" index="1" function="CCL_IN" group="LUT4_IN"/>
-                <signal pad-id="pb2" index="2" function="CCL_IN" group="LUT4_IN"/>
-                <signal pad-id="pb6" index="0" function="CCL_ALT" group="LUT4_OUT" field="PORTMUX.CCLROUTEA.LUT4"/>
-                <signal pad-id="pb3" index="0" function="CCL" group="LUT4_OUT" field="PORTMUX.CCLROUTEA.LUT4"/>
-                <signal pad-id="pg0" index="0" function="CCL_IN" group="LUT5_IN"/>
-                <signal pad-id="pg1" index="1" function="CCL_IN" group="LUT5_IN"/>
-                <signal pad-id="pg2" index="2" function="CCL_IN" group="LUT5_IN"/>
-                <signal pad-id="pg6" index="0" function="CCL_ALT" group="LUT5_OUT" field="PORTMUX.CCLROUTEA.LUT5"/>
-                <signal pad-id="pg3" index="0" function="CCL" group="LUT5_OUT" field="PORTMUX.CCLROUTEA.LUT5"/>
+                <signal pad-key="pa0" index="0" function="CCL_IN" group="LUT0_IN"/>
+                <signal pad-key="pa1" index="1" function="CCL_IN" group="LUT0_IN"/>
+                <signal pad-key="pa2" index="2" function="CCL_IN" group="LUT0_IN"/>
+                <signal pad-key="pa6" index="0" function="CCL_ALT" group="LUT0_OUT" field="PORTMUX.CCLROUTEA.LUT0"/>
+                <signal pad-key="pa3" index="0" function="CCL" group="LUT0_OUT" field="PORTMUX.CCLROUTEA.LUT0"/>
+                <signal pad-key="pc0" index="0" function="CCL_IN" group="LUT1_IN"/>
+                <signal pad-key="pc1" index="1" function="CCL_IN" group="LUT1_IN"/>
+                <signal pad-key="pc2" index="2" function="CCL_IN" group="LUT1_IN"/>
+                <signal pad-key="pc6" index="0" function="CCL_ALT" group="LUT1_OUT" field="PORTMUX.CCLROUTEA.LUT1"/>
+                <signal pad-key="pc3" index="0" function="CCL" group="LUT1_OUT" field="PORTMUX.CCLROUTEA.LUT1"/>
+                <signal pad-key="pd0" index="0" function="CCL_IN" group="LUT2_IN"/>
+                <signal pad-key="pd1" index="1" function="CCL_IN" group="LUT2_IN"/>
+                <signal pad-key="pd2" index="2" function="CCL_IN" group="LUT2_IN"/>
+                <signal pad-key="pd6" index="0" function="CCL_ALT" group="LUT2_OUT" field="PORTMUX.CCLROUTEA.LUT2"/>
+                <signal pad-key="pd3" index="0" function="CCL" group="LUT2_OUT" field="PORTMUX.CCLROUTEA.LUT2"/>
+                <signal pad-key="pf0" index="0" function="CCL_IN" group="LUT3_IN"/>
+                <signal pad-key="pf1" index="1" function="CCL_IN" group="LUT3_IN"/>
+                <signal pad-key="pf2" index="2" function="CCL_IN" group="LUT3_IN"/>
+                <signal pad-key="pf3" index="0" function="CCL" group="LUT3_OUT" field="PORTMUX.CCLROUTEA.LUT3"/>
+                <signal pad-key="pb0" index="0" function="CCL_IN" group="LUT4_IN"/>
+                <signal pad-key="pb1" index="1" function="CCL_IN" group="LUT4_IN"/>
+                <signal pad-key="pb2" index="2" function="CCL_IN" group="LUT4_IN"/>
+                <signal pad-key="pb6" index="0" function="CCL_ALT" group="LUT4_OUT" field="PORTMUX.CCLROUTEA.LUT4"/>
+                <signal pad-key="pb3" index="0" function="CCL" group="LUT4_OUT" field="PORTMUX.CCLROUTEA.LUT4"/>
+                <signal pad-key="pg0" index="0" function="CCL_IN" group="LUT5_IN"/>
+                <signal pad-key="pg1" index="1" function="CCL_IN" group="LUT5_IN"/>
+                <signal pad-key="pg2" index="2" function="CCL_IN" group="LUT5_IN"/>
+                <signal pad-key="pg6" index="0" function="CCL_ALT" group="LUT5_OUT" field="PORTMUX.CCLROUTEA.LUT5"/>
+                <signal pad-key="pg3" index="0" function="CCL" group="LUT5_OUT" field="PORTMUX.CCLROUTEA.LUT5"/>
             </signals>
         </peripheral>
         <peripheral key="clkctrl" name="CLKCTRL" module-key="chip_clkctrl">
             <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"/>
-                <signal pad-id="pf0" function="CLKCTRL" group="XTAL32K1"/>
-                <signal pad-id="pf1" function="CLKCTRL" group="XTAL32K2"/>
-                <signal pad-id="pa0" function="CLKCTRL" group="XTALHF1"/>
-                <signal pad-id="pa1" function="CLKCTRL" group="XTALHF2"/>
+                <signal pad-key="pa7" function="CLKCTRL" group="CLKOUT"/>
+                <signal pad-key="pa0" function="CLKCTRL" group="EXTCLK"/>
+                <signal pad-key="pf0" function="CLKCTRL" group="XTAL32K1"/>
+                <signal pad-key="pf1" function="CLKCTRL" group="XTAL32K2"/>
+                <signal pad-key="pa0" function="CLKCTRL" group="XTALHF1"/>
+                <signal pad-key="pa1" function="CLKCTRL" group="XTALHF2"/>
             </signals>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="cpu_avr_xt_v1">
@@ -170,25 +170,25 @@
         <peripheral key="dac0" name="DAC0" module-key="dac_nbit_ctrl_v5">
             <register-group-instance register-group-key="dac" address-space-key="data" offset="0x6A0"/>
             <signals>
-                <signal pad-id="pd6" index="0" function="DAC0" group="OUT"/>
+                <signal pad-key="pd6" index="0" function="DAC0" group="OUT"/>
             </signals>
         </peripheral>
         <peripheral key="evsys" name="EVSYS" module-key="chip_evsys">
             <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"/>
-                <signal pad-id="pb7" index="1" function="EVSYS_ALT" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTB"/>
-                <signal pad-id="pb2" index="1" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTB"/>
-                <signal pad-id="pc7" index="2" function="EVSYS_ALT" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTC"/>
-                <signal pad-id="pc2" index="2" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTC"/>
-                <signal pad-id="pd7" index="3" function="EVSYS_ALT" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTD"/>
-                <signal pad-id="pd2" index="3" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTD"/>
-                <signal pad-id="pe7" index="4" function="EVSYS_ALT" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTE"/>
-                <signal pad-id="pe2" index="4" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTE"/>
-                <signal pad-id="pf2" index="5" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTF"/>
-                <signal pad-id="pg7" index="6" function="EVSYS_ALT" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTG"/>
-                <signal pad-id="pg2" index="6" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTG"/>
+                <signal pad-key="pa7" index="0" function="EVSYS_ALT" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTA"/>
+                <signal pad-key="pa2" index="0" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTA"/>
+                <signal pad-key="pb7" index="1" function="EVSYS_ALT" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTB"/>
+                <signal pad-key="pb2" index="1" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTB"/>
+                <signal pad-key="pc7" index="2" function="EVSYS_ALT" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTC"/>
+                <signal pad-key="pc2" index="2" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTC"/>
+                <signal pad-key="pd7" index="3" function="EVSYS_ALT" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTD"/>
+                <signal pad-key="pd2" index="3" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTD"/>
+                <signal pad-key="pe7" index="4" function="EVSYS_ALT" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTE"/>
+                <signal pad-key="pe2" index="4" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTE"/>
+                <signal pad-key="pf2" index="5" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTF"/>
+                <signal pad-key="pg7" index="6" function="EVSYS_ALT" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTG"/>
+                <signal pad-key="pg2" index="6" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTG"/>
             </signals>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="chip_fuse">
@@ -209,105 +209,105 @@
         <peripheral key="opamp" name="OPAMP" module-key="amp_opamp_ctrl_avr_v1">
             <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"/>
-                <signal pad-id="pd2" function="OPAMP" group="OP0OUT"/>
-                <signal pad-id="pd7" function="OPAMP" group="OP1INN"/>
-                <signal pad-id="pd4" function="OPAMP" group="OP1INP"/>
-                <signal pad-id="pd5" function="OPAMP" group="OP1OUT"/>
-                <signal pad-id="pe3" function="OPAMP" group="OP2INN"/>
-                <signal pad-id="pe1" function="OPAMP" group="OP2INP"/>
-                <signal pad-id="pe2" function="OPAMP" group="OP2OUT"/>
+                <signal pad-key="pd3" function="OPAMP" group="OP0INN"/>
+                <signal pad-key="pd1" function="OPAMP" group="OP0INP"/>
+                <signal pad-key="pd2" function="OPAMP" group="OP0OUT"/>
+                <signal pad-key="pd7" function="OPAMP" group="OP1INN"/>
+                <signal pad-key="pd4" function="OPAMP" group="OP1INP"/>
+                <signal pad-key="pd5" function="OPAMP" group="OP1OUT"/>
+                <signal pad-key="pe3" function="OPAMP" group="OP2INN"/>
+                <signal pad-key="pe1" function="OPAMP" group="OP2INP"/>
+                <signal pad-key="pe2" function="OPAMP" group="OP2OUT"/>
             </signals>
         </peripheral>
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pa2" index="2" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa3" index="3" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa4" index="4" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa5" index="5" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa6" index="6" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa7" index="7" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa0" index="0" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa1" index="1" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa2" index="2" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa3" index="3" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa4" index="4" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa5" index="5" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa6" index="6" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa7" index="7" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pb2" index="2" function="IOPORT" group="PIN"/>
-                <signal pad-id="pb3" index="3" function="IOPORT" group="PIN"/>
-                <signal pad-id="pb4" index="4" function="IOPORT" group="PIN"/>
-                <signal pad-id="pb5" index="5" function="IOPORT" group="PIN"/>
-                <signal pad-id="pb6" index="6" function="IOPORT" group="PIN"/>
-                <signal pad-id="pb7" index="7" function="IOPORT" group="PIN"/>
+                <signal pad-key="pb0" index="0" function="IOPORT" group="PIN"/>
+                <signal pad-key="pb1" index="1" function="IOPORT" group="PIN"/>
+                <signal pad-key="pb2" index="2" function="IOPORT" group="PIN"/>
+                <signal pad-key="pb3" index="3" function="IOPORT" group="PIN"/>
+                <signal pad-key="pb4" index="4" function="IOPORT" group="PIN"/>
+                <signal pad-key="pb5" index="5" function="IOPORT" group="PIN"/>
+                <signal pad-key="pb6" index="6" function="IOPORT" group="PIN"/>
+                <signal pad-key="pb7" index="7" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pc2" index="2" function="IOPORT" group="PIN"/>
-                <signal pad-id="pc3" index="3" function="IOPORT" group="PIN"/>
-                <signal pad-id="pc4" index="4" function="IOPORT" group="PIN"/>
-                <signal pad-id="pc5" index="5" function="IOPORT" group="PIN"/>
-                <signal pad-id="pc6" index="6" function="IOPORT" group="PIN"/>
-                <signal pad-id="pc7" index="7" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc0" index="0" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc1" index="1" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc2" index="2" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc3" index="3" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc4" index="4" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc5" index="5" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc6" index="6" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc7" index="7" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pd2" index="2" function="IOPORT" group="PIN"/>
-                <signal pad-id="pd3" index="3" function="IOPORT" group="PIN"/>
-                <signal pad-id="pd4" index="4" function="IOPORT" group="PIN"/>
-                <signal pad-id="pd5" index="5" function="IOPORT" group="PIN"/>
-                <signal pad-id="pd6" index="6" function="IOPORT" group="PIN"/>
-                <signal pad-id="pd7" index="7" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd0" index="0" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd1" index="1" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd2" index="2" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd3" index="3" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd4" index="4" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd5" index="5" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd6" index="6" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd7" index="7" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="porte" name="PORTE" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pe2" index="2" function="IOPORT" group="PIN"/>
-                <signal pad-id="pe3" index="3" function="IOPORT" group="PIN"/>
-                <signal pad-id="pe4" index="4" function="IOPORT" group="PIN"/>
-                <signal pad-id="pe5" index="5" function="IOPORT" group="PIN"/>
-                <signal pad-id="pe6" index="6" function="IOPORT" group="PIN"/>
-                <signal pad-id="pe7" index="7" function="IOPORT" group="PIN"/>
+                <signal pad-key="pe0" index="0" function="IOPORT" group="PIN"/>
+                <signal pad-key="pe1" index="1" function="IOPORT" group="PIN"/>
+                <signal pad-key="pe2" index="2" function="IOPORT" group="PIN"/>
+                <signal pad-key="pe3" index="3" function="IOPORT" group="PIN"/>
+                <signal pad-key="pe4" index="4" function="IOPORT" group="PIN"/>
+                <signal pad-key="pe5" index="5" function="IOPORT" group="PIN"/>
+                <signal pad-key="pe6" index="6" function="IOPORT" group="PIN"/>
+                <signal pad-key="pe7" index="7" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="portf" name="PORTF" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pf2" index="2" function="IOPORT" group="PIN"/>
-                <signal pad-id="pf3" index="3" function="IOPORT" group="PIN"/>
-                <signal pad-id="pf4" index="4" function="IOPORT" group="PIN"/>
-                <signal pad-id="pf5" index="5" function="IOPORT" group="PIN"/>
-                <signal pad-id="pf6" index="6" function="IOPORT" group="PIN"/>
+                <signal pad-key="pf0" index="0" function="IOPORT" group="PIN"/>
+                <signal pad-key="pf1" index="1" function="IOPORT" group="PIN"/>
+                <signal pad-key="pf2" index="2" function="IOPORT" group="PIN"/>
+                <signal pad-key="pf3" index="3" function="IOPORT" group="PIN"/>
+                <signal pad-key="pf4" index="4" function="IOPORT" group="PIN"/>
+                <signal pad-key="pf5" index="5" function="IOPORT" group="PIN"/>
+                <signal pad-key="pf6" index="6" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="portg" name="PORTG" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pg2" index="2" function="IOPORT" group="PIN"/>
-                <signal pad-id="pg3" index="3" function="IOPORT" group="PIN"/>
-                <signal pad-id="pg4" index="4" function="IOPORT" group="PIN"/>
-                <signal pad-id="pg5" index="5" function="IOPORT" group="PIN"/>
-                <signal pad-id="pg6" index="6" function="IOPORT" group="PIN"/>
-                <signal pad-id="pg7" index="7" function="IOPORT" group="PIN"/>
+                <signal pad-key="pg0" index="0" function="IOPORT" group="PIN"/>
+                <signal pad-key="pg1" index="1" function="IOPORT" group="PIN"/>
+                <signal pad-key="pg2" index="2" function="IOPORT" group="PIN"/>
+                <signal pad-key="pg3" index="3" function="IOPORT" group="PIN"/>
+                <signal pad-key="pg4" index="4" function="IOPORT" group="PIN"/>
+                <signal pad-key="pg5" index="5" function="IOPORT" group="PIN"/>
+                <signal pad-key="pg6" index="6" function="IOPORT" group="PIN"/>
+                <signal pad-key="pg7" index="7" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="portmux" name="PORTMUX" module-key="chip_portmux">
@@ -316,7 +316,7 @@
         <peripheral key="rstctrl" name="RSTCTRL" module-key="rst_integration_v8">
             <register-group-instance register-group-key="rstctrl" address-space-key="data" offset="0x40"/>
             <signals>
-                <signal pad-id="pf6" function="OTHER" group="RESET"/>
+                <signal pad-key="pf6" function="OTHER" group="RESET"/>
             </signals>
         </peripheral>
         <peripheral key="rtc" name="RTC" module-key="tmr_16b_rtc_v1">
@@ -331,35 +331,35 @@
         <peripheral key="spi0" name="SPI0" module-key="spi_8bit_v2">
             <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"/>
-                <signal pad-id="pa5" function="SPI0" group="MISO" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <signal pad-id="pg4" function="SPI0_ALT2" group="MOSI" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <signal pad-id="pe0" function="SPI0_ALT" group="MOSI" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <signal pad-id="pa4" function="SPI0" group="MOSI" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <signal pad-id="pg6" function="SPI0_ALT2" group="SCK" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <signal pad-id="pe2" function="SPI0_ALT" group="SCK" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <signal pad-id="pa6" function="SPI0" group="SCK" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <signal pad-id="pg7" function="SPI0_ALT2" group="SS" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <signal pad-id="pe3" function="SPI0_ALT" group="SS" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <signal pad-id="pa7" function="SPI0" group="SS" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pg5" function="SPI0_ALT2" group="MISO" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pe1" function="SPI0_ALT" group="MISO" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pa5" function="SPI0" group="MISO" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pg4" function="SPI0_ALT2" group="MOSI" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pe0" function="SPI0_ALT" group="MOSI" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pa4" function="SPI0" group="MOSI" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pg6" function="SPI0_ALT2" group="SCK" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pe2" function="SPI0_ALT" group="SCK" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pa6" function="SPI0" group="SCK" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pg7" function="SPI0_ALT2" group="SS" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pe3" function="SPI0_ALT" group="SS" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pa7" function="SPI0" group="SS" field="PORTMUX.SPIROUTEA.SPI0"/>
             </signals>
         </peripheral>
         <peripheral key="spi1" name="SPI1" module-key="spi_8bit_v2">
             <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"/>
-                <signal pad-id="pc1" function="SPI1" group="MISO" field="PORTMUX.SPIROUTEA.SPI1"/>
-                <signal pad-id="pc4" function="SPI1_ALT2" group="MOSI" field="PORTMUX.SPIROUTEA.SPI1"/>
-                <signal pad-id="pb4" function="SPI1_ALT" group="MOSI" field="PORTMUX.SPIROUTEA.SPI1"/>
-                <signal pad-id="pc0" function="SPI1" group="MOSI" field="PORTMUX.SPIROUTEA.SPI1"/>
-                <signal pad-id="pc6" function="SPI1_ALT2" group="SCK" field="PORTMUX.SPIROUTEA.SPI1"/>
-                <signal pad-id="pb6" function="SPI1_ALT" group="SCK" field="PORTMUX.SPIROUTEA.SPI1"/>
-                <signal pad-id="pc2" function="SPI1" group="SCK" field="PORTMUX.SPIROUTEA.SPI1"/>
-                <signal pad-id="pc7" function="SPI1_ALT2" group="SS" field="PORTMUX.SPIROUTEA.SPI1"/>
-                <signal pad-id="pb7" function="SPI1_ALT" group="SS" field="PORTMUX.SPIROUTEA.SPI1"/>
-                <signal pad-id="pc3" function="SPI1" group="SS" field="PORTMUX.SPIROUTEA.SPI1"/>
+                <signal pad-key="pc5" function="SPI1_ALT2" group="MISO" field="PORTMUX.SPIROUTEA.SPI1"/>
+                <signal pad-key="pb5" function="SPI1_ALT" group="MISO" field="PORTMUX.SPIROUTEA.SPI1"/>
+                <signal pad-key="pc1" function="SPI1" group="MISO" field="PORTMUX.SPIROUTEA.SPI1"/>
+                <signal pad-key="pc4" function="SPI1_ALT2" group="MOSI" field="PORTMUX.SPIROUTEA.SPI1"/>
+                <signal pad-key="pb4" function="SPI1_ALT" group="MOSI" field="PORTMUX.SPIROUTEA.SPI1"/>
+                <signal pad-key="pc0" function="SPI1" group="MOSI" field="PORTMUX.SPIROUTEA.SPI1"/>
+                <signal pad-key="pc6" function="SPI1_ALT2" group="SCK" field="PORTMUX.SPIROUTEA.SPI1"/>
+                <signal pad-key="pb6" function="SPI1_ALT" group="SCK" field="PORTMUX.SPIROUTEA.SPI1"/>
+                <signal pad-key="pc2" function="SPI1" group="SCK" field="PORTMUX.SPIROUTEA.SPI1"/>
+                <signal pad-key="pc7" function="SPI1_ALT2" group="SS" field="PORTMUX.SPIROUTEA.SPI1"/>
+                <signal pad-key="pb7" function="SPI1_ALT" group="SS" field="PORTMUX.SPIROUTEA.SPI1"/>
+                <signal pad-key="pc3" function="SPI1" group="SS" field="PORTMUX.SPIROUTEA.SPI1"/>
             </signals>
         </peripheral>
         <peripheral key="syscfg" name="SYSCFG" module-key="chip_syscfg">
@@ -368,225 +368,225 @@
         <peripheral key="tca0" name="TCA0" module-key="tmr_16b_pwm_v1">
             <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"/>
-                <signal pad-id="pe0" index="0" function="TCA0_ALT4" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pd0" index="0" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pc0" index="0" function="TCA0_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pb0" index="0" function="TCA0_ALT" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pa0" index="0" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pg1" index="1" function="TCA0_ALT6" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pf1" index="1" function="TCA0_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pe1" index="1" function="TCA0_ALT4" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pd1" index="1" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pc1" index="1" function="TCA0_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pb1" index="1" function="TCA0_ALT" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pa1" index="1" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pg2" index="2" function="TCA0_ALT6" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pf2" index="2" function="TCA0_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pe2" index="2" function="TCA0_ALT4" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pd2" index="2" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pc2" index="2" function="TCA0_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pb2" index="2" function="TCA0_ALT" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pa2" index="2" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pg3" index="3" function="TCA0_ALT6" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pf3" index="3" function="TCA0_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pe3" index="3" function="TCA0_ALT4" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pd3" index="3" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pc3" index="3" function="TCA0_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pb3" index="3" function="TCA0_ALT" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pa3" index="3" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pg4" index="4" function="TCA0_ALT6" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pf4" index="4" function="TCA0_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pe4" index="4" function="TCA0_ALT4" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pd4" index="4" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pc4" index="4" function="TCA0_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pb4" index="4" function="TCA0_ALT" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pa4" index="4" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pg5" index="5" function="TCA0_ALT6" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pf5" index="5" function="TCA0_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pe5" index="5" function="TCA0_ALT4" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pd5" index="5" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pc5" index="5" function="TCA0_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pb5" index="5" function="TCA0_ALT" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pa5" index="5" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pg0" index="0" function="TCA0_ALT6" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pf0" index="0" function="TCA0_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pe0" index="0" function="TCA0_ALT4" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pd0" index="0" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pc0" index="0" function="TCA0_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pb0" index="0" function="TCA0_ALT" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pa0" index="0" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pg1" index="1" function="TCA0_ALT6" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pf1" index="1" function="TCA0_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pe1" index="1" function="TCA0_ALT4" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pd1" index="1" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pc1" index="1" function="TCA0_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pb1" index="1" function="TCA0_ALT" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pa1" index="1" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pg2" index="2" function="TCA0_ALT6" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pf2" index="2" function="TCA0_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pe2" index="2" function="TCA0_ALT4" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pd2" index="2" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pc2" index="2" function="TCA0_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pb2" index="2" function="TCA0_ALT" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pa2" index="2" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pg3" index="3" function="TCA0_ALT6" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pf3" index="3" function="TCA0_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pe3" index="3" function="TCA0_ALT4" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pd3" index="3" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pc3" index="3" function="TCA0_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pb3" index="3" function="TCA0_ALT" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pa3" index="3" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pg4" index="4" function="TCA0_ALT6" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pf4" index="4" function="TCA0_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pe4" index="4" function="TCA0_ALT4" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pd4" index="4" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pc4" index="4" function="TCA0_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pb4" index="4" function="TCA0_ALT" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pa4" index="4" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pg5" index="5" function="TCA0_ALT6" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pf5" index="5" function="TCA0_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pe5" index="5" function="TCA0_ALT4" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pd5" index="5" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pc5" index="5" function="TCA0_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pb5" index="5" function="TCA0_ALT" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pa5" index="5" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
             </signals>
         </peripheral>
         <peripheral key="tca1" name="TCA1" module-key="tmr_16b_pwm_v1">
             <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"/>
-                <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"/>
-                <signal pad-id="pg1" index="1" function="TCA1_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA1"/>
-                <signal pad-id="pe5" index="1" function="TCA1_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA1"/>
-                <signal pad-id="pc5" index="1" function="TCA1_ALT" group="WO" field="PORTMUX.TCAROUTEA.TCA1"/>
-                <signal pad-id="pb1" index="1" function="TCA1" group="WO" field="PORTMUX.TCAROUTEA.TCA1"/>
-                <signal pad-id="pg2" index="2" function="TCA1_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA1"/>
-                <signal pad-id="pe6" index="2" function="TCA1_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA1"/>
-                <signal pad-id="pc6" index="2" function="TCA1_ALT" group="WO" field="PORTMUX.TCAROUTEA.TCA1"/>
-                <signal pad-id="pb2" index="2" function="TCA1" group="WO" field="PORTMUX.TCAROUTEA.TCA1"/>
-                <signal pad-id="pg3" index="3" function="TCA1_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA1"/>
-                <signal pad-id="pb3" index="3" function="TCA1" group="WO" field="PORTMUX.TCAROUTEA.TCA1"/>
-                <signal pad-id="pg4" index="4" function="TCA1_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA1"/>
-                <signal pad-id="pb4" index="4" function="TCA1" group="WO" field="PORTMUX.TCAROUTEA.TCA1"/>
-                <signal pad-id="pg5" index="5" function="TCA1_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA1"/>
-                <signal pad-id="pb5" index="5" function="TCA1" group="WO" field="PORTMUX.TCAROUTEA.TCA1"/>
+                <signal pad-key="pg0" index="0" function="TCA1_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA1"/>
+                <signal pad-key="pe4" index="0" function="TCA1_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA1"/>
+                <signal pad-key="pc4" index="0" function="TCA1_ALT" group="WO" field="PORTMUX.TCAROUTEA.TCA1"/>
+                <signal pad-key="pb0" index="0" function="TCA1" group="WO" field="PORTMUX.TCAROUTEA.TCA1"/>
+                <signal pad-key="pg1" index="1" function="TCA1_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA1"/>
+                <signal pad-key="pe5" index="1" function="TCA1_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA1"/>
+                <signal pad-key="pc5" index="1" function="TCA1_ALT" group="WO" field="PORTMUX.TCAROUTEA.TCA1"/>
+                <signal pad-key="pb1" index="1" function="TCA1" group="WO" field="PORTMUX.TCAROUTEA.TCA1"/>
+                <signal pad-key="pg2" index="2" function="TCA1_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA1"/>
+                <signal pad-key="pe6" index="2" function="TCA1_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA1"/>
+                <signal pad-key="pc6" index="2" function="TCA1_ALT" group="WO" field="PORTMUX.TCAROUTEA.TCA1"/>
+                <signal pad-key="pb2" index="2" function="TCA1" group="WO" field="PORTMUX.TCAROUTEA.TCA1"/>
+                <signal pad-key="pg3" index="3" function="TCA1_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA1"/>
+                <signal pad-key="pb3" index="3" function="TCA1" group="WO" field="PORTMUX.TCAROUTEA.TCA1"/>
+                <signal pad-key="pg4" index="4" function="TCA1_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA1"/>
+                <signal pad-key="pb4" index="4" function="TCA1" group="WO" field="PORTMUX.TCAROUTEA.TCA1"/>
+                <signal pad-key="pg5" index="5" function="TCA1_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA1"/>
+                <signal pad-key="pb5" index="5" function="TCA1" group="WO" field="PORTMUX.TCAROUTEA.TCA1"/>
             </signals>
         </peripheral>
         <peripheral key="tcb0" name="TCB0" module-key="tmr_16b_capture_v1">
             <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"/>
+                <signal pad-key="pf4" index="0" function="TCB0_ALT" group="WO" field="PORTMUX.TCBROUTEA.TCB0"/>
+                <signal pad-key="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 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"/>
+                <signal pad-key="pf5" index="0" function="TCB1_ALT" group="WO" field="PORTMUX.TCBROUTEA.TCB1"/>
+                <signal pad-key="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 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"/>
+                <signal pad-key="pb4" index="0" function="TCB2_ALT" group="WO" field="PORTMUX.TCBROUTEA.TCB2"/>
+                <signal pad-key="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 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"/>
+                <signal pad-key="pc1" index="0" function="TCB3_ALT" group="WO" field="PORTMUX.TCBROUTEA.TCB3"/>
+                <signal pad-key="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 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"/>
+                <signal pad-key="pc6" index="0" function="TCB4_ALT" group="WO" field="PORTMUX.TCBROUTEA.TCB4"/>
+                <signal pad-key="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 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"/>
-                <signal pad-id="pb4" function="TCD0_ALT" group="WOA" field="PORTMUX.TCDROUTEA.TCD0"/>
-                <signal pad-id="pa4" function="TCD0" group="WOA" field="PORTMUX.TCDROUTEA.TCD0"/>
-                <signal pad-id="pg5" index="1" function="TCD0_ALT3" group="WOB" field="PORTMUX.TCDROUTEA.TCD0"/>
-                <signal pad-id="pf1" index="1" function="TCD0_ALT2" group="WOB" field="PORTMUX.TCDROUTEA.TCD0"/>
-                <signal pad-id="pb5" index="1" function="TCD0_ALT" group="WOB" field="PORTMUX.TCDROUTEA.TCD0"/>
-                <signal pad-id="pa5" index="1" function="TCD0" group="WOB" field="PORTMUX.TCDROUTEA.TCD0"/>
-                <signal pad-id="pg6" index="2" function="TCD0_ALT3" group="WOC" field="PORTMUX.TCDROUTEA.TCD0"/>
-                <signal pad-id="pf2" index="2" function="TCD0_ALT2" group="WOC" field="PORTMUX.TCDROUTEA.TCD0"/>
-                <signal pad-id="pb6" index="2" function="TCD0_ALT" group="WOC" field="PORTMUX.TCDROUTEA.TCD0"/>
-                <signal pad-id="pa6" index="2" function="TCD0" group="WOC" field="PORTMUX.TCDROUTEA.TCD0"/>
-                <signal pad-id="pg7" index="3" function="TCD0_ALT3" group="WOD" field="PORTMUX.TCDROUTEA.TCD0"/>
-                <signal pad-id="pf3" index="3" function="TCD0_ALT2" group="WOD" field="PORTMUX.TCDROUTEA.TCD0"/>
-                <signal pad-id="pb7" index="3" function="TCD0_ALT" group="WOD" field="PORTMUX.TCDROUTEA.TCD0"/>
-                <signal pad-id="pa7" index="3" function="TCD0" group="WOD" field="PORTMUX.TCDROUTEA.TCD0"/>
+                <signal pad-key="pg4" function="TCD0_ALT3" group="WOA" field="PORTMUX.TCDROUTEA.TCD0"/>
+                <signal pad-key="pf0" function="TCD0_ALT2" group="WOA" field="PORTMUX.TCDROUTEA.TCD0"/>
+                <signal pad-key="pb4" function="TCD0_ALT" group="WOA" field="PORTMUX.TCDROUTEA.TCD0"/>
+                <signal pad-key="pa4" function="TCD0" group="WOA" field="PORTMUX.TCDROUTEA.TCD0"/>
+                <signal pad-key="pg5" index="1" function="TCD0_ALT3" group="WOB" field="PORTMUX.TCDROUTEA.TCD0"/>
+                <signal pad-key="pf1" index="1" function="TCD0_ALT2" group="WOB" field="PORTMUX.TCDROUTEA.TCD0"/>
+                <signal pad-key="pb5" index="1" function="TCD0_ALT" group="WOB" field="PORTMUX.TCDROUTEA.TCD0"/>
+                <signal pad-key="pa5" index="1" function="TCD0" group="WOB" field="PORTMUX.TCDROUTEA.TCD0"/>
+                <signal pad-key="pg6" index="2" function="TCD0_ALT3" group="WOC" field="PORTMUX.TCDROUTEA.TCD0"/>
+                <signal pad-key="pf2" index="2" function="TCD0_ALT2" group="WOC" field="PORTMUX.TCDROUTEA.TCD0"/>
+                <signal pad-key="pb6" index="2" function="TCD0_ALT" group="WOC" field="PORTMUX.TCDROUTEA.TCD0"/>
+                <signal pad-key="pa6" index="2" function="TCD0" group="WOC" field="PORTMUX.TCDROUTEA.TCD0"/>
+                <signal pad-key="pg7" index="3" function="TCD0_ALT3" group="WOD" field="PORTMUX.TCDROUTEA.TCD0"/>
+                <signal pad-key="pf3" index="3" function="TCD0_ALT2" group="WOD" field="PORTMUX.TCDROUTEA.TCD0"/>
+                <signal pad-key="pb7" index="3" function="TCD0_ALT" group="WOD" field="PORTMUX.TCDROUTEA.TCD0"/>
+                <signal pad-key="pa7" index="3" function="TCD0" group="WOD" field="PORTMUX.TCDROUTEA.TCD0"/>
             </signals>
         </peripheral>
         <peripheral key="twi0" name="TWI0" module-key="i2c_8bit_v2">
             <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"/>
-                <signal pad-id="pa3" function="I2C0" group="SCL" field="PORTMUX.TWIROUTEA.TWI0"/>
-                <signal pad-id="pc6" function="I2C0_ALT2" group="SDA" field="PORTMUX.TWIROUTEA.TWI0"/>
-                <signal pad-id="pc2" function="I2C0_ALT" group="SDA" field="PORTMUX.TWIROUTEA.TWI0"/>
-                <signal pad-id="pa2" function="I2C0" group="SDA" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pc7" function="I2C0_ALT2" group="SCL" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pc3" function="I2C0_ALT" group="SCL" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pa3" function="I2C0" group="SCL" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pc6" function="I2C0_ALT2" group="SDA" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pc2" function="I2C0_ALT" group="SDA" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pa2" function="I2C0" group="SDA" field="PORTMUX.TWIROUTEA.TWI0"/>
             </signals>
         </peripheral>
         <peripheral key="twi1" name="TWI1" module-key="i2c_8bit_v2">
             <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"/>
-                <signal pad-id="pf3" function="I2C1" group="SCL" field="PORTMUX.TWIROUTEA.TWI1"/>
-                <signal pad-id="pb6" function="I2C1_ALT2" group="SDA" field="PORTMUX.TWIROUTEA.TWI1"/>
-                <signal pad-id="pb2" function="I2C1_ALT" group="SDA" field="PORTMUX.TWIROUTEA.TWI1"/>
-                <signal pad-id="pf2" function="I2C1" group="SDA" field="PORTMUX.TWIROUTEA.TWI1"/>
+                <signal pad-key="pb7" function="I2C1_ALT2" group="SCL" field="PORTMUX.TWIROUTEA.TWI1"/>
+                <signal pad-key="pb3" function="I2C1_ALT" group="SCL" field="PORTMUX.TWIROUTEA.TWI1"/>
+                <signal pad-key="pf3" function="I2C1" group="SCL" field="PORTMUX.TWIROUTEA.TWI1"/>
+                <signal pad-key="pb6" function="I2C1_ALT2" group="SDA" field="PORTMUX.TWIROUTEA.TWI1"/>
+                <signal pad-key="pb2" function="I2C1_ALT" group="SDA" field="PORTMUX.TWIROUTEA.TWI1"/>
+                <signal pad-key="pf2" function="I2C1" group="SDA" field="PORTMUX.TWIROUTEA.TWI1"/>
             </signals>
         </peripheral>
         <peripheral key="usart0" name="USART0" module-key="uart_autobd_v4">
             <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"/>
-                <signal pad-id="pa4" function="USART0_ALT" group="TXD" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pa0" function="USART0" group="TXD" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pa6" function="USART0_ALT" group="XCK" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pa2" function="USART0" group="XCK" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pa7" function="USART0_ALT" group="XDIR" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pa3" function="USART0" group="XDIR" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa5" function="USART0_ALT" group="RXD" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa1" function="USART0" group="RXD" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa4" function="USART0_ALT" group="TXD" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa0" function="USART0" group="TXD" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa6" function="USART0_ALT" group="XCK" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa2" function="USART0" group="XCK" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa7" function="USART0_ALT" group="XDIR" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa3" function="USART0" group="XDIR" field="PORTMUX.USARTROUTEA.USART0"/>
             </signals>
         </peripheral>
         <peripheral key="usart1" name="USART1" module-key="uart_autobd_v4">
             <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"/>
-                <signal pad-id="pc4" function="USART1_ALT" group="TXD" field="PORTMUX.USARTROUTEA.USART1"/>
-                <signal pad-id="pc0" function="USART1" group="TXD" field="PORTMUX.USARTROUTEA.USART1"/>
-                <signal pad-id="pc6" function="USART1_ALT" group="XCK" field="PORTMUX.USARTROUTEA.USART1"/>
-                <signal pad-id="pc2" function="USART1" group="XCK" field="PORTMUX.USARTROUTEA.USART1"/>
-                <signal pad-id="pc7" function="USART1_ALT" group="XDIR" field="PORTMUX.USARTROUTEA.USART1"/>
-                <signal pad-id="pc3" function="USART1" group="XDIR" field="PORTMUX.USARTROUTEA.USART1"/>
+                <signal pad-key="pc5" function="USART1_ALT" group="RXD" field="PORTMUX.USARTROUTEA.USART1"/>
+                <signal pad-key="pc1" function="USART1" group="RXD" field="PORTMUX.USARTROUTEA.USART1"/>
+                <signal pad-key="pc4" function="USART1_ALT" group="TXD" field="PORTMUX.USARTROUTEA.USART1"/>
+                <signal pad-key="pc0" function="USART1" group="TXD" field="PORTMUX.USARTROUTEA.USART1"/>
+                <signal pad-key="pc6" function="USART1_ALT" group="XCK" field="PORTMUX.USARTROUTEA.USART1"/>
+                <signal pad-key="pc2" function="USART1" group="XCK" field="PORTMUX.USARTROUTEA.USART1"/>
+                <signal pad-key="pc7" function="USART1_ALT" group="XDIR" field="PORTMUX.USARTROUTEA.USART1"/>
+                <signal pad-key="pc3" function="USART1" group="XDIR" field="PORTMUX.USARTROUTEA.USART1"/>
             </signals>
         </peripheral>
         <peripheral key="usart2" name="USART2" module-key="uart_autobd_v4">
             <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"/>
-                <signal pad-id="pf4" function="USART2_ALT" group="TXD" field="PORTMUX.USARTROUTEA.USART2"/>
-                <signal pad-id="pf0" function="USART2" group="TXD" field="PORTMUX.USARTROUTEA.USART2"/>
-                <signal pad-id="pf2" function="USART2" group="XCK" field="PORTMUX.USARTROUTEA.USART2"/>
-                <signal pad-id="pf3" function="USART2" group="XDIR" field="PORTMUX.USARTROUTEA.USART2"/>
+                <signal pad-key="pf5" function="USART2_ALT" group="RXD" field="PORTMUX.USARTROUTEA.USART2"/>
+                <signal pad-key="pf1" function="USART2" group="RXD" field="PORTMUX.USARTROUTEA.USART2"/>
+                <signal pad-key="pf4" function="USART2_ALT" group="TXD" field="PORTMUX.USARTROUTEA.USART2"/>
+                <signal pad-key="pf0" function="USART2" group="TXD" field="PORTMUX.USARTROUTEA.USART2"/>
+                <signal pad-key="pf2" function="USART2" group="XCK" field="PORTMUX.USARTROUTEA.USART2"/>
+                <signal pad-key="pf3" function="USART2" group="XDIR" field="PORTMUX.USARTROUTEA.USART2"/>
             </signals>
         </peripheral>
         <peripheral key="usart3" name="USART3" module-key="uart_autobd_v4">
             <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"/>
-                <signal pad-id="pb4" function="USART3_ALT" group="TXD" field="PORTMUX.USARTROUTEA.USART3"/>
-                <signal pad-id="pb0" function="USART3" group="TXD" field="PORTMUX.USARTROUTEA.USART3"/>
-                <signal pad-id="pb6" function="USART3_ALT" group="XCK" field="PORTMUX.USARTROUTEA.USART3"/>
-                <signal pad-id="pb2" function="USART3" group="XCK" field="PORTMUX.USARTROUTEA.USART3"/>
-                <signal pad-id="pb7" function="USART3_ALT" group="XDIR" field="PORTMUX.USARTROUTEA.USART3"/>
-                <signal pad-id="pb3" function="USART3" group="XDIR" field="PORTMUX.USARTROUTEA.USART3"/>
+                <signal pad-key="pb5" function="USART3_ALT" group="RXD" field="PORTMUX.USARTROUTEA.USART3"/>
+                <signal pad-key="pb1" function="USART3" group="RXD" field="PORTMUX.USARTROUTEA.USART3"/>
+                <signal pad-key="pb4" function="USART3_ALT" group="TXD" field="PORTMUX.USARTROUTEA.USART3"/>
+                <signal pad-key="pb0" function="USART3" group="TXD" field="PORTMUX.USARTROUTEA.USART3"/>
+                <signal pad-key="pb6" function="USART3_ALT" group="XCK" field="PORTMUX.USARTROUTEA.USART3"/>
+                <signal pad-key="pb2" function="USART3" group="XCK" field="PORTMUX.USARTROUTEA.USART3"/>
+                <signal pad-key="pb7" function="USART3_ALT" group="XDIR" field="PORTMUX.USARTROUTEA.USART3"/>
+                <signal pad-key="pb3" function="USART3" group="XDIR" field="PORTMUX.USARTROUTEA.USART3"/>
             </signals>
         </peripheral>
         <peripheral key="usart4" name="USART4" module-key="uart_autobd_v4">
             <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"/>
-                <signal pad-id="pe4" function="USART4_ALT" group="TXD" field="PORTMUX.USARTROUTEB.USART4"/>
-                <signal pad-id="pe0" function="USART4" group="TXD" field="PORTMUX.USARTROUTEB.USART4"/>
-                <signal pad-id="pe6" function="USART4_ALT" group="XCK" field="PORTMUX.USARTROUTEB.USART4"/>
-                <signal pad-id="pe2" function="USART4" group="XCK" field="PORTMUX.USARTROUTEB.USART4"/>
-                <signal pad-id="pe7" function="USART4_ALT" group="XDIR" field="PORTMUX.USARTROUTEB.USART4"/>
-                <signal pad-id="pe3" function="USART4" group="XDIR" field="PORTMUX.USARTROUTEB.USART4"/>
+                <signal pad-key="pe5" function="USART4_ALT" group="RXD" field="PORTMUX.USARTROUTEB.USART4"/>
+                <signal pad-key="pe1" function="USART4" group="RXD" field="PORTMUX.USARTROUTEB.USART4"/>
+                <signal pad-key="pe4" function="USART4_ALT" group="TXD" field="PORTMUX.USARTROUTEB.USART4"/>
+                <signal pad-key="pe0" function="USART4" group="TXD" field="PORTMUX.USARTROUTEB.USART4"/>
+                <signal pad-key="pe6" function="USART4_ALT" group="XCK" field="PORTMUX.USARTROUTEB.USART4"/>
+                <signal pad-key="pe2" function="USART4" group="XCK" field="PORTMUX.USARTROUTEB.USART4"/>
+                <signal pad-key="pe7" function="USART4_ALT" group="XDIR" field="PORTMUX.USARTROUTEB.USART4"/>
+                <signal pad-key="pe3" function="USART4" group="XDIR" field="PORTMUX.USARTROUTEB.USART4"/>
             </signals>
         </peripheral>
         <peripheral key="usart5" name="USART5" module-key="uart_autobd_v4">
             <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"/>
-                <signal pad-id="pg4" function="USART5_ALT" group="TXD" field="PORTMUX.USARTROUTEB.USART5"/>
-                <signal pad-id="pg0" function="USART5" group="TXD" field="PORTMUX.USARTROUTEB.USART5"/>
-                <signal pad-id="pg6" function="USART5_ALT" group="XCK" field="PORTMUX.USARTROUTEB.USART5"/>
-                <signal pad-id="pg2" function="USART5" group="XCK" field="PORTMUX.USARTROUTEB.USART5"/>
-                <signal pad-id="pg7" function="USART5_ALT" group="XDIR" field="PORTMUX.USARTROUTEB.USART5"/>
-                <signal pad-id="pg3" function="USART5" group="XDIR" field="PORTMUX.USARTROUTEB.USART5"/>
+                <signal pad-key="pg5" function="USART5_ALT" group="RXD" field="PORTMUX.USARTROUTEB.USART5"/>
+                <signal pad-key="pg1" function="USART5" group="RXD" field="PORTMUX.USARTROUTEB.USART5"/>
+                <signal pad-key="pg4" function="USART5_ALT" group="TXD" field="PORTMUX.USARTROUTEB.USART5"/>
+                <signal pad-key="pg0" function="USART5" group="TXD" field="PORTMUX.USARTROUTEB.USART5"/>
+                <signal pad-key="pg6" function="USART5_ALT" group="XCK" field="PORTMUX.USARTROUTEB.USART5"/>
+                <signal pad-key="pg2" function="USART5" group="XCK" field="PORTMUX.USARTROUTEB.USART5"/>
+                <signal pad-key="pg7" function="USART5_ALT" group="XDIR" field="PORTMUX.USARTROUTEB.USART5"/>
+                <signal pad-key="pg3" function="USART5" group="XDIR" field="PORTMUX.USARTROUTEB.USART5"/>
             </signals>
         </peripheral>
         <peripheral key="userrow" name="USERROW" module-key="chip_userrow">
@@ -622,25 +622,25 @@
         <peripheral key="zcd0" name="ZCD0" module-key="cmp_zxover_ctrl_v3">
             <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"/>
-                <signal pad-id="pa7" function="ZCD0" group="OUT" field="PORTMUX.ZCDROUTEA.ZCD0"/>
+                <signal pad-key="pd1" function="ZCD0" group="IN"/>
+                <signal pad-key="pc7" function="ZCD0_ALT" group="OUT" field="PORTMUX.ZCDROUTEA.ZCD0"/>
+                <signal pad-key="pa7" function="ZCD0" group="OUT" field="PORTMUX.ZCDROUTEA.ZCD0"/>
             </signals>
         </peripheral>
         <peripheral key="zcd1" name="ZCD1" module-key="cmp_zxover_ctrl_v3">
             <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"/>
-                <signal pad-id="pa7" function="ZCD1" group="OUT" field="PORTMUX.ZCDROUTEA.ZCD1"/>
+                <signal pad-key="pe3" function="ZCD1" group="IN"/>
+                <signal pad-key="pc7" function="ZCD1_ALT" group="OUT" field="PORTMUX.ZCDROUTEA.ZCD1"/>
+                <signal pad-key="pa7" function="ZCD1" group="OUT" field="PORTMUX.ZCDROUTEA.ZCD1"/>
             </signals>
         </peripheral>
         <peripheral key="zcd2" name="ZCD2" module-key="cmp_zxover_ctrl_v3">
             <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"/>
-                <signal pad-id="pa7" function="ZCD2" group="OUT" field="PORTMUX.ZCDROUTEA.ZCD2"/>
+                <signal pad-key="pe7" function="ZCD2" group="IN"/>
+                <signal pad-key="pc7" function="ZCD2_ALT" group="OUT" field="PORTMUX.ZCDROUTEA.ZCD2"/>
+                <signal pad-key="pa7" function="ZCD2" group="OUT" field="PORTMUX.ZCDROUTEA.ZCD2"/>
             </signals>
         </peripheral>
     </peripherals>
@@ -2127,75 +2127,141 @@
             </register-group>
         </module>
     </modules>
+    <pads>
+        <pad key="pa3" name="PA3"/>
+        <pad key="pa4" name="PA4"/>
+        <pad key="pa5" name="PA5"/>
+        <pad key="pa6" name="PA6"/>
+        <pad key="pa7" name="PA7"/>
+        <pad key="vdd0" name="VDD0"/>
+        <pad key="gnd0" name="GND0"/>
+        <pad key="pb0" name="PB0"/>
+        <pad key="pb1" name="PB1"/>
+        <pad key="pb2" name="PB2"/>
+        <pad key="pb3" name="PB3"/>
+        <pad key="pb4" name="PB4"/>
+        <pad key="pb5" name="PB5"/>
+        <pad key="pb6" name="PB6"/>
+        <pad key="pb7" name="PB7"/>
+        <pad key="pc0" name="PC0"/>
+        <pad key="pc1" name="PC1"/>
+        <pad key="pc2" name="PC2"/>
+        <pad key="pc3" name="PC3"/>
+        <pad key="vddio2" name="VDDIO2"/>
+        <pad key="gnd1" name="GND1"/>
+        <pad key="pc4" name="PC4"/>
+        <pad key="pc5" name="PC5"/>
+        <pad key="pc6" name="PC6"/>
+        <pad key="pc7" name="PC7"/>
+        <pad key="pd0" name="PD0"/>
+        <pad key="pd1" name="PD1"/>
+        <pad key="pd2" name="PD2"/>
+        <pad key="pd3" name="PD3"/>
+        <pad key="pd4" name="PD4"/>
+        <pad key="pd5" name="PD5"/>
+        <pad key="pd6" name="PD6"/>
+        <pad key="pd7" name="PD7"/>
+        <pad key="avdd" name="AVDD"/>
+        <pad key="agnd" name="AGND"/>
+        <pad key="pe0" name="PE0"/>
+        <pad key="pe1" name="PE1"/>
+        <pad key="pe2" name="PE2"/>
+        <pad key="pe3" name="PE3"/>
+        <pad key="pe4" name="PE4"/>
+        <pad key="pe5" name="PE5"/>
+        <pad key="pe6" name="PE6"/>
+        <pad key="pe7" name="PE7"/>
+        <pad key="pf0" name="PF0"/>
+        <pad key="pf1" name="PF1"/>
+        <pad key="pf2" name="PF2"/>
+        <pad key="pf3" name="PF3"/>
+        <pad key="pf4" name="PF4"/>
+        <pad key="pf5" name="PF5"/>
+        <pad key="pf6" name="PF6"/>
+        <pad key="updi" name="UPDI"/>
+        <pad key="pg0" name="PG0"/>
+        <pad key="pg1" name="PG1"/>
+        <pad key="pg2" name="PG2"/>
+        <pad key="pg3" name="PG3"/>
+        <pad key="vdd2" name="VDD2"/>
+        <pad key="gnd2" name="GND2"/>
+        <pad key="pg4" name="PG4"/>
+        <pad key="pg5" name="PG5"/>
+        <pad key="pg6" name="PG6"/>
+        <pad key="pg7" name="PG7"/>
+        <pad key="pa0" name="PA0"/>
+        <pad key="pa1" name="PA1"/>
+        <pad key="pa2" name="PA2"/>
+    </pads>
     <pinouts>
         <pinout key="qfn64" name="QFN64" type="qfn">
-            <pin position="1" pad="PA3"/>
-            <pin position="2" pad="PA4"/>
-            <pin position="3" pad="PA5"/>
-            <pin position="4" pad="PA6"/>
-            <pin position="5" pad="PA7"/>
-            <pin position="6" pad="VDD0"/>
-            <pin position="7" pad="GND0"/>
-            <pin position="8" pad="PB0"/>
-            <pin position="9" pad="PB1"/>
-            <pin position="10" pad="PB2"/>
-            <pin position="11" pad="PB3"/>
-            <pin position="12" pad="PB4"/>
-            <pin position="13" pad="PB5"/>
-            <pin position="14" pad="PB6"/>
-            <pin position="15" pad="PB7"/>
-            <pin position="16" pad="PC0"/>
-            <pin position="17" pad="PC1"/>
-            <pin position="18" pad="PC2"/>
-            <pin position="19" pad="PC3"/>
-            <pin position="20" pad="VDDIO2"/>
-            <pin position="21" pad="GND1"/>
-            <pin position="22" pad="PC4"/>
-            <pin position="23" pad="PC5"/>
-            <pin position="24" pad="PC6"/>
-            <pin position="25" pad="PC7"/>
-            <pin position="26" pad="PD0"/>
-            <pin position="27" pad="PD1"/>
-            <pin position="28" pad="PD2"/>
-            <pin position="29" pad="PD3"/>
-            <pin position="30" pad="PD4"/>
-            <pin position="31" pad="PD5"/>
-            <pin position="32" pad="PD6"/>
-            <pin position="33" pad="PD7"/>
-            <pin position="34" pad="AVDD"/>
-            <pin position="35" pad="AGND"/>
-            <pin position="36" pad="PE0"/>
-            <pin position="37" pad="PE1"/>
-            <pin position="38" pad="PE2"/>
-            <pin position="39" pad="PE3"/>
-            <pin position="40" pad="PE4"/>
-            <pin position="41" pad="PE5"/>
-            <pin position="42" pad="PE6"/>
-            <pin position="43" pad="PE7"/>
-            <pin position="44" pad="PF0"/>
-            <pin position="45" pad="PF1"/>
-            <pin position="46" pad="PF2"/>
-            <pin position="47" pad="PF3"/>
-            <pin position="48" pad="PF4"/>
-            <pin position="49" pad="PF5"/>
-            <pin position="50" pad="PF6"/>
-            <pin position="51" pad="UPDI"/>
-            <pin position="52" pad="PG0"/>
-            <pin position="53" pad="PG1"/>
-            <pin position="54" pad="PG2"/>
-            <pin position="55" pad="PG3"/>
-            <pin position="56" pad="VDD2"/>
-            <pin position="57" pad="GND2"/>
-            <pin position="58" pad="PG4"/>
-            <pin position="59" pad="PG5"/>
-            <pin position="60" pad="PG6"/>
-            <pin position="61" pad="PG7"/>
-            <pin position="62" pad="PA0"/>
-            <pin position="63" pad="PA1"/>
-            <pin position="64" pad="PA2"/>
+            <pin position="1" pad-key="pa3"/>
+            <pin position="2" pad-key="pa4"/>
+            <pin position="3" pad-key="pa5"/>
+            <pin position="4" pad-key="pa6"/>
+            <pin position="5" pad-key="pa7"/>
+            <pin position="6" pad-key="vdd0"/>
+            <pin position="7" pad-key="gnd0"/>
+            <pin position="8" pad-key="pb0"/>
+            <pin position="9" pad-key="pb1"/>
+            <pin position="10" pad-key="pb2"/>
+            <pin position="11" pad-key="pb3"/>
+            <pin position="12" pad-key="pb4"/>
+            <pin position="13" pad-key="pb5"/>
+            <pin position="14" pad-key="pb6"/>
+            <pin position="15" pad-key="pb7"/>
+            <pin position="16" pad-key="pc0"/>
+            <pin position="17" pad-key="pc1"/>
+            <pin position="18" pad-key="pc2"/>
+            <pin position="19" pad-key="pc3"/>
+            <pin position="20" pad-key="vddio2"/>
+            <pin position="21" pad-key="gnd1"/>
+            <pin position="22" pad-key="pc4"/>
+            <pin position="23" pad-key="pc5"/>
+            <pin position="24" pad-key="pc6"/>
+            <pin position="25" pad-key="pc7"/>
+            <pin position="26" pad-key="pd0"/>
+            <pin position="27" pad-key="pd1"/>
+            <pin position="28" pad-key="pd2"/>
+            <pin position="29" pad-key="pd3"/>
+            <pin position="30" pad-key="pd4"/>
+            <pin position="31" pad-key="pd5"/>
+            <pin position="32" pad-key="pd6"/>
+            <pin position="33" pad-key="pd7"/>
+            <pin position="34" pad-key="avdd"/>
+            <pin position="35" pad-key="agnd"/>
+            <pin position="36" pad-key="pe0"/>
+            <pin position="37" pad-key="pe1"/>
+            <pin position="38" pad-key="pe2"/>
+            <pin position="39" pad-key="pe3"/>
+            <pin position="40" pad-key="pe4"/>
+            <pin position="41" pad-key="pe5"/>
+            <pin position="42" pad-key="pe6"/>
+            <pin position="43" pad-key="pe7"/>
+            <pin position="44" pad-key="pf0"/>
+            <pin position="45" pad-key="pf1"/>
+            <pin position="46" pad-key="pf2"/>
+            <pin position="47" pad-key="pf3"/>
+            <pin position="48" pad-key="pf4"/>
+            <pin position="49" pad-key="pf5"/>
+            <pin position="50" pad-key="pf6"/>
+            <pin position="51" pad-key="updi"/>
+            <pin position="52" pad-key="pg0"/>
+            <pin position="53" pad-key="pg1"/>
+            <pin position="54" pad-key="pg2"/>
+            <pin position="55" pad-key="pg3"/>
+            <pin position="56" pad-key="vdd2"/>
+            <pin position="57" pad-key="gnd2"/>
+            <pin position="58" pad-key="pg4"/>
+            <pin position="59" pad-key="pg5"/>
+            <pin position="60" pad-key="pg6"/>
+            <pin position="61" pad-key="pg7"/>
+            <pin position="62" pad-key="pa0"/>
+            <pin position="63" pad-key="pa1"/>
+            <pin position="64" pad-key="pa2"/>
         </pinout>
     </pinouts>
     <variants>
-        <variant name="AVR64DB64" pinout-key="qfn64" package="QFN64"/>
+        <variant key="avr64db64" name="AVR64DB64" pinout-key="qfn64"/>
     </variants>
 </device>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR64DD14.xml b/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR64DD14.xml
index 66303f90..7bf406c7 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR64DD14.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR64DD14.xml
@@ -44,22 +44,22 @@
         <peripheral key="ac0" name="AC0" module-key="cmp_control_v8">
             <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"/>
-                <signal pad-id="pd6" index="3" function="AC0" group="P"/>
-                <signal pad-id="pc3" index="4" function="AC0" group="P"/>
+                <signal pad-key="pd7" index="2" function="AC0" group="N"/>
+                <signal pad-key="pc2" index="3" function="AC0" group="N"/>
+                <signal pad-key="pd6" index="3" function="AC0" group="P"/>
+                <signal pad-key="pc3" index="4" function="AC0" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="adc0" name="ADC0" module-key="adc_12b_diff_ctrl_v1">
             <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"/>
-                <signal pad-id="pd6" index="6" function="AIN0" group="AIN"/>
-                <signal pad-id="pd7" index="7" function="AIN0" group="AIN"/>
-                <signal pad-id="pc1" index="29" function="AIN0" group="AIN"/>
-                <signal pad-id="pc2" index="30" function="AIN0" group="AIN"/>
-                <signal pad-id="pc3" index="31" function="AIN0" group="AIN"/>
+                <signal pad-key="pd4" index="4" function="AIN0" group="AIN"/>
+                <signal pad-key="pd5" index="5" function="AIN0" group="AIN"/>
+                <signal pad-key="pd6" index="6" function="AIN0" group="AIN"/>
+                <signal pad-key="pd7" index="7" function="AIN0" group="AIN"/>
+                <signal pad-key="pc1" index="29" function="AIN0" group="AIN"/>
+                <signal pad-key="pc2" index="30" function="AIN0" group="AIN"/>
+                <signal pad-key="pc3" index="31" function="AIN0" group="AIN"/>
             </signals>
         </peripheral>
         <peripheral key="bod" name="BOD" module-key="bor_lvd_ctrl_v1">
@@ -68,26 +68,26 @@
         <peripheral key="ccl" name="CCL" module-key="cla_ccl_v1">
             <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"/>
-                <signal pad-id="pa1" index="1" function="CCL_ALT1" group="LUT0_IN" field="PORTMUX.CCLROUTEA.LUT0"/>
-                <signal pad-id="pa1" index="1" function="CCL" group="LUT0_IN" field="PORTMUX.CCLROUTEA.LUT0"/>
-                <signal pad-id="pc1" index="1" function="CCL_ALT1" group="LUT1_IN" field="PORTMUX.CCLROUTEA.LUT1"/>
-                <signal pad-id="pc1" index="1" function="CCL" group="LUT1_IN" field="PORTMUX.CCLROUTEA.LUT1"/>
-                <signal pad-id="pc2" index="2" function="CCL_ALT1" group="LUT1_IN" field="PORTMUX.CCLROUTEA.LUT1"/>
-                <signal pad-id="pc2" index="2" function="CCL" group="LUT1_IN" field="PORTMUX.CCLROUTEA.LUT1"/>
-                <signal pad-id="pc3" index="0" function="CCL" group="LUT1_OUT" field="PORTMUX.CCLROUTEA.LUT1"/>
-                <signal pad-id="pd6" index="0" function="CCL_ALT1" group="LUT2_OUT" field="PORTMUX.CCLROUTEA.LUT2"/>
+                <signal pad-key="pa0" index="0" function="CCL_ALT1" group="LUT0_IN" field="PORTMUX.CCLROUTEA.LUT0"/>
+                <signal pad-key="pa0" index="0" function="CCL" group="LUT0_IN" field="PORTMUX.CCLROUTEA.LUT0"/>
+                <signal pad-key="pa1" index="1" function="CCL_ALT1" group="LUT0_IN" field="PORTMUX.CCLROUTEA.LUT0"/>
+                <signal pad-key="pa1" index="1" function="CCL" group="LUT0_IN" field="PORTMUX.CCLROUTEA.LUT0"/>
+                <signal pad-key="pc1" index="1" function="CCL_ALT1" group="LUT1_IN" field="PORTMUX.CCLROUTEA.LUT1"/>
+                <signal pad-key="pc1" index="1" function="CCL" group="LUT1_IN" field="PORTMUX.CCLROUTEA.LUT1"/>
+                <signal pad-key="pc2" index="2" function="CCL_ALT1" group="LUT1_IN" field="PORTMUX.CCLROUTEA.LUT1"/>
+                <signal pad-key="pc2" index="2" function="CCL" group="LUT1_IN" field="PORTMUX.CCLROUTEA.LUT1"/>
+                <signal pad-key="pc3" index="0" function="CCL" group="LUT1_OUT" field="PORTMUX.CCLROUTEA.LUT1"/>
+                <signal pad-key="pd6" index="0" function="CCL_ALT1" group="LUT2_OUT" field="PORTMUX.CCLROUTEA.LUT2"/>
             </signals>
         </peripheral>
         <peripheral key="clkctrl" name="CLKCTRL" module-key="chip_clkctrl">
             <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"/>
-                <signal pad-id="pa1" function="CLKCTRL_ALT1" group="XTAL32K2"/>
-                <signal pad-id="pa0" function="CLKCTRL" group="XTALHF1"/>
-                <signal pad-id="pa1" function="CLKCTRL" group="XTALHF2"/>
+                <signal pad-key="pa0" function="CLKCTRL" group="EXTCLK"/>
+                <signal pad-key="pa0" function="CLKCTRL_ALT1" group="XTAL32K1"/>
+                <signal pad-key="pa1" function="CLKCTRL_ALT1" group="XTAL32K2"/>
+                <signal pad-key="pa0" function="CLKCTRL" group="XTALHF1"/>
+                <signal pad-key="pa1" function="CLKCTRL" group="XTALHF2"/>
             </signals>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="cpu_avr_xt_v1">
@@ -102,15 +102,15 @@
         <peripheral key="dac0" name="DAC0" module-key="dac_nbit_ctrl_v5">
             <register-group-instance register-group-key="dac" address-space-key="data" offset="0x6A0"/>
             <signals>
-                <signal pad-id="pd6" index="0" function="DAC0" group="OUT"/>
+                <signal pad-key="pd6" index="0" function="DAC0" group="OUT"/>
             </signals>
         </peripheral>
         <peripheral key="evsys" name="EVSYS" module-key="chip_evsys">
             <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"/>
-                <signal pad-id="pf7" index="5" function="EVSYS_ALT1" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTF"/>
+                <signal pad-key="pc2" index="2" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTC"/>
+                <signal pad-key="pd7" index="3" function="EVSYS_ALT1" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTD"/>
+                <signal pad-key="pf7" index="5" function="EVSYS_ALT1" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTF"/>
             </signals>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="chip_fuse">
@@ -131,32 +131,32 @@
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
             <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"/>
+                <signal pad-key="pa0" index="0" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa1" index="1" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pc3" index="3" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc1" index="1" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc2" index="2" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc3" index="3" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pd6" index="6" function="IOPORT" group="PIN"/>
-                <signal pad-id="pd7" index="7" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd4" index="4" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd5" index="5" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd6" index="6" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd7" index="7" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="portf" name="PORTF" module-key="gpio_port">
             <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"/>
+                <signal pad-key="pf6" index="6" function="IOPORT" group="PIN"/>
+                <signal pad-key="pf7" index="7" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="portmux" name="PORTMUX" module-key="chip_portmux">
@@ -165,7 +165,7 @@
         <peripheral key="rstctrl" name="RSTCTRL" module-key="rst_integration_v8">
             <register-group-instance register-group-key="rstctrl" address-space-key="data" offset="0x40"/>
             <signals>
-                <signal pad-id="pf6" function="OTHER" group="RESET"/>
+                <signal pad-key="pf6" function="OTHER" group="RESET"/>
             </signals>
         </peripheral>
         <peripheral key="rtc" name="RTC" module-key="tmr_16b_rtc_v1">
@@ -180,20 +180,20 @@
         <peripheral key="spi0" name="SPI0" module-key="spi_8bit_v2">
             <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"/>
-                <signal pad-id="pd5" function="SPI0_ALT4" group="MISO" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <signal pad-id="pa1" function="SPI0_ALT3" group="MISO" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <signal pad-id="pc1" function="SPI0_ALT6" group="MOSI" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <signal pad-id="pd4" function="SPI0_ALT4" group="MOSI" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <signal pad-id="pa0" function="SPI0_ALT3" group="MOSI" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <signal pad-id="pc3" function="SPI0_ALT6" group="SCK" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <signal pad-id="pc2" function="SPI0_ALT5" group="SCK" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <signal pad-id="pd6" function="SPI0_ALT4" group="SCK" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <signal pad-id="pf7" function="SPI0_ALT6" group="SS" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <signal pad-id="pc3" function="SPI0_ALT5" group="SS" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <signal pad-id="pd7" function="SPI0_ALT4" group="SS" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <signal pad-id="pc1" function="SPI0_ALT3" group="SS" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pc2" function="SPI0_ALT6" group="MISO" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pc1" function="SPI0_ALT5" group="MISO" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pd5" function="SPI0_ALT4" group="MISO" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pa1" function="SPI0_ALT3" group="MISO" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pc1" function="SPI0_ALT6" group="MOSI" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pd4" function="SPI0_ALT4" group="MOSI" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pa0" function="SPI0_ALT3" group="MOSI" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pc3" function="SPI0_ALT6" group="SCK" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pc2" function="SPI0_ALT5" group="SCK" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pd6" function="SPI0_ALT4" group="SCK" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pf7" function="SPI0_ALT6" group="SS" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pc3" function="SPI0_ALT5" group="SS" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pd7" function="SPI0_ALT4" group="SS" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pc1" function="SPI0_ALT3" group="SS" field="PORTMUX.SPIROUTEA.SPI0"/>
             </signals>
         </peripheral>
         <peripheral key="syscfg" name="SYSCFG" module-key="chip_syscfg">
@@ -202,13 +202,13 @@
         <peripheral key="tca0" name="TCA0" module-key="tmr_16b_pwm_v1">
             <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"/>
-                <signal pad-id="pa1" index="1" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pc2" index="2" function="TCA0_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pc3" index="3" function="TCA0_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pd4" index="4" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pd5" index="5" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pa0" index="0" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pc1" index="1" function="TCA0_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pa1" index="1" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pc2" index="2" function="TCA0_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pc3" index="3" function="TCA0_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pd4" index="4" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pd5" index="5" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
             </signals>
         </peripheral>
         <peripheral key="tcb0" name="TCB0" module-key="tmr_16b_capture_v1">
@@ -223,41 +223,41 @@
         <peripheral key="tcd0" name="TCD0" module-key="tmr_12b_psc_v1">
             <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"/>
+                <signal pad-key="pd4" index="2" function="TCD0_ALT4" group="WOC" field="PORTMUX.TCDROUTEA.TCD0"/>
+                <signal pad-key="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 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"/>
-                <signal pad-id="pa1" function="I2C0_ALT3" group="SDA" field="PORTMUX.TWIROUTEA.TWI0"/>
-                <signal pad-id="pc2" function="I2C0_ALT2" group="SDA" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pa0" function="I2C0_ALT3" group="SCL" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pc3" function="I2C0_ALT2" group="SCL" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pa1" function="I2C0_ALT3" group="SDA" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pc2" function="I2C0_ALT2" group="SDA" field="PORTMUX.TWIROUTEA.TWI0"/>
             </signals>
         </peripheral>
         <peripheral key="usart0" name="USART0" module-key="uart_autobd_v4">
             <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"/>
-                <signal pad-id="pa1" function="USART0" group="RXD" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pc1" function="USART0_ALT4" group="TXD" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pd4" function="USART0_ALT3" group="TXD" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pa0" function="USART0" group="TXD" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pc3" function="USART0_ALT4" group="XCK" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pd6" function="USART0_ALT3" group="XCK" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pd7" function="USART0_ALT3" group="XDIR" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pc2" function="USART0_ALT4" group="RXD" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pd5" function="USART0_ALT3" group="RXD" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa1" function="USART0" group="RXD" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pc1" function="USART0_ALT4" group="TXD" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pd4" function="USART0_ALT3" group="TXD" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa0" function="USART0" group="TXD" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pc3" function="USART0_ALT4" group="XCK" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pd6" function="USART0_ALT3" group="XCK" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pd7" function="USART0_ALT3" group="XDIR" field="PORTMUX.USARTROUTEA.USART0"/>
             </signals>
         </peripheral>
         <peripheral key="usart1" name="USART1" module-key="uart_autobd_v4">
             <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"/>
-                <signal pad-id="pd6" function="USART1_ALT2" group="TXD" field="PORTMUX.USARTROUTEA.USART1"/>
-                <signal pad-id="pc2" function="USART1" group="XCK" field="PORTMUX.USARTROUTEA.USART1"/>
-                <signal pad-id="pc3" function="USART1" group="XDIR" field="PORTMUX.USARTROUTEA.USART1"/>
+                <signal pad-key="pd7" function="USART1_ALT2" group="RXD" field="PORTMUX.USARTROUTEA.USART1"/>
+                <signal pad-key="pc1" function="USART1" group="RXD" field="PORTMUX.USARTROUTEA.USART1"/>
+                <signal pad-key="pd6" function="USART1_ALT2" group="TXD" field="PORTMUX.USARTROUTEA.USART1"/>
+                <signal pad-key="pc2" function="USART1" group="XCK" field="PORTMUX.USARTROUTEA.USART1"/>
+                <signal pad-key="pc3" function="USART1" group="XDIR" field="PORTMUX.USARTROUTEA.USART1"/>
             </signals>
         </peripheral>
         <peripheral key="userrow" name="USERROW" module-key="chip_userrow">
@@ -284,7 +284,7 @@
         <peripheral key="zcd3" name="ZCD3" module-key="cmp_zxover_ctrl_v3">
             <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-key="pc2" function="ZCD3" group="IN" field="PORTMUX.ZCDROUTEA.ZCD3"/>
             </signals>
         </peripheral>
     </peripherals>
@@ -1534,25 +1534,41 @@
             </register-group>
         </module>
     </modules>
+    <pads>
+        <pad key="agnd" name="AGND"/>
+        <pad key="pf6" name="PF6"/>
+        <pad key="pf7" name="PF7"/>
+        <pad key="pa0" name="PA0"/>
+        <pad key="pa1" name="PA1"/>
+        <pad key="pc1" name="PC1"/>
+        <pad key="pc2" name="PC2"/>
+        <pad key="pc3" name="PC3"/>
+        <pad key="vddio2" name="VDDIO2"/>
+        <pad key="pd4" name="PD4"/>
+        <pad key="pd5" name="PD5"/>
+        <pad key="pd6" name="PD6"/>
+        <pad key="pd7" name="PD7"/>
+        <pad key="avdd" name="AVDD"/>
+    </pads>
     <pinouts>
         <pinout key="soic14mvio" name="SOIC14MVIO" type="soic">
-            <pin position="1" pad="AGND"/>
-            <pin position="2" pad="PF6"/>
-            <pin position="3" pad="PF7"/>
-            <pin position="4" pad="PA0"/>
-            <pin position="5" pad="PA1"/>
-            <pin position="6" pad="PC1"/>
-            <pin position="7" pad="PC2"/>
-            <pin position="8" pad="PC3"/>
-            <pin position="9" pad="VDDIO2"/>
-            <pin position="10" pad="PD4"/>
-            <pin position="11" pad="PD5"/>
-            <pin position="12" pad="PD6"/>
-            <pin position="13" pad="PD7"/>
-            <pin position="14" pad="AVDD"/>
+            <pin position="1" pad-key="agnd"/>
+            <pin position="2" pad-key="pf6"/>
+            <pin position="3" pad-key="pf7"/>
+            <pin position="4" pad-key="pa0"/>
+            <pin position="5" pad-key="pa1"/>
+            <pin position="6" pad-key="pc1"/>
+            <pin position="7" pad-key="pc2"/>
+            <pin position="8" pad-key="pc3"/>
+            <pin position="9" pad-key="vddio2"/>
+            <pin position="10" pad-key="pd4"/>
+            <pin position="11" pad-key="pd5"/>
+            <pin position="12" pad-key="pd6"/>
+            <pin position="13" pad-key="pd7"/>
+            <pin position="14" pad-key="avdd"/>
         </pinout>
     </pinouts>
     <variants>
-        <variant name="AVR64DD14" pinout-key="soic14mvio" package="SOIC14"/>
+        <variant key="avr64dd14" name="AVR64DD14" pinout-key="soic14mvio"/>
     </variants>
 </device>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR64DD20.xml b/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR64DD20.xml
index b65e6dab..02cb99fa 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR64DD20.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR64DD20.xml
@@ -44,29 +44,29 @@
         <peripheral key="ac0" name="AC0" module-key="cmp_control_v8">
             <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"/>
-                <signal pad-id="pa7" index="0" function="AC0" group="OUT" field="PORTMUX.ACROUTEA.AC0"/>
-                <signal pad-id="pd6" index="3" function="AC0" group="P"/>
-                <signal pad-id="pc3" index="4" function="AC0" group="P"/>
+                <signal pad-key="pd7" index="2" function="AC0" group="N"/>
+                <signal pad-key="pc2" index="3" function="AC0" group="N"/>
+                <signal pad-key="pa7" index="0" function="AC0" group="OUT" field="PORTMUX.ACROUTEA.AC0"/>
+                <signal pad-key="pd6" index="3" function="AC0" group="P"/>
+                <signal pad-key="pc3" index="4" function="AC0" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="adc0" name="ADC0" module-key="adc_12b_diff_ctrl_v1">
             <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"/>
-                <signal pad-id="pd6" index="6" function="AIN0" group="AIN"/>
-                <signal pad-id="pd7" index="7" function="AIN0" group="AIN"/>
-                <signal pad-id="pa2" index="22" function="AIN0" group="AIN"/>
-                <signal pad-id="pa3" index="23" function="AIN0" group="AIN"/>
-                <signal pad-id="pa4" index="24" function="AIN0" group="AIN"/>
-                <signal pad-id="pa5" index="25" function="AIN0" group="AIN"/>
-                <signal pad-id="pa6" index="26" function="AIN0" group="AIN"/>
-                <signal pad-id="pa7" index="27" function="AIN0" group="AIN"/>
-                <signal pad-id="pc1" index="29" function="AIN0" group="AIN"/>
-                <signal pad-id="pc2" index="30" function="AIN0" group="AIN"/>
-                <signal pad-id="pc3" index="31" function="AIN0" group="AIN"/>
+                <signal pad-key="pd4" index="4" function="AIN0" group="AIN"/>
+                <signal pad-key="pd5" index="5" function="AIN0" group="AIN"/>
+                <signal pad-key="pd6" index="6" function="AIN0" group="AIN"/>
+                <signal pad-key="pd7" index="7" function="AIN0" group="AIN"/>
+                <signal pad-key="pa2" index="22" function="AIN0" group="AIN"/>
+                <signal pad-key="pa3" index="23" function="AIN0" group="AIN"/>
+                <signal pad-key="pa4" index="24" function="AIN0" group="AIN"/>
+                <signal pad-key="pa5" index="25" function="AIN0" group="AIN"/>
+                <signal pad-key="pa6" index="26" function="AIN0" group="AIN"/>
+                <signal pad-key="pa7" index="27" function="AIN0" group="AIN"/>
+                <signal pad-key="pc1" index="29" function="AIN0" group="AIN"/>
+                <signal pad-key="pc2" index="30" function="AIN0" group="AIN"/>
+                <signal pad-key="pc3" index="31" function="AIN0" group="AIN"/>
             </signals>
         </peripheral>
         <peripheral key="bod" name="BOD" module-key="bor_lvd_ctrl_v1">
@@ -75,31 +75,31 @@
         <peripheral key="ccl" name="CCL" module-key="cla_ccl_v1">
             <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"/>
-                <signal pad-id="pa1" index="1" function="CCL_ALT1" group="LUT0_IN" field="PORTMUX.CCLROUTEA.LUT0"/>
-                <signal pad-id="pa1" index="1" function="CCL" group="LUT0_IN" field="PORTMUX.CCLROUTEA.LUT0"/>
-                <signal pad-id="pa2" index="2" function="CCL_ALT1" group="LUT0_IN" field="PORTMUX.CCLROUTEA.LUT0"/>
-                <signal pad-id="pa2" index="2" function="CCL" group="LUT0_IN" field="PORTMUX.CCLROUTEA.LUT0"/>
-                <signal pad-id="pa6" index="0" function="CCL_ALT1" group="LUT0_OUT" field="PORTMUX.CCLROUTEA.LUT0"/>
-                <signal pad-id="pa3" index="0" function="CCL" group="LUT0_OUT" field="PORTMUX.CCLROUTEA.LUT0"/>
-                <signal pad-id="pc1" index="1" function="CCL_ALT1" group="LUT1_IN" field="PORTMUX.CCLROUTEA.LUT1"/>
-                <signal pad-id="pc1" index="1" function="CCL" group="LUT1_IN" field="PORTMUX.CCLROUTEA.LUT1"/>
-                <signal pad-id="pc2" index="2" function="CCL_ALT1" group="LUT1_IN" field="PORTMUX.CCLROUTEA.LUT1"/>
-                <signal pad-id="pc2" index="2" function="CCL" group="LUT1_IN" field="PORTMUX.CCLROUTEA.LUT1"/>
-                <signal pad-id="pc3" index="0" function="CCL" group="LUT1_OUT" field="PORTMUX.CCLROUTEA.LUT1"/>
-                <signal pad-id="pd6" index="0" function="CCL_ALT1" group="LUT2_OUT" field="PORTMUX.CCLROUTEA.LUT2"/>
+                <signal pad-key="pa0" index="0" function="CCL_ALT1" group="LUT0_IN" field="PORTMUX.CCLROUTEA.LUT0"/>
+                <signal pad-key="pa0" index="0" function="CCL" group="LUT0_IN" field="PORTMUX.CCLROUTEA.LUT0"/>
+                <signal pad-key="pa1" index="1" function="CCL_ALT1" group="LUT0_IN" field="PORTMUX.CCLROUTEA.LUT0"/>
+                <signal pad-key="pa1" index="1" function="CCL" group="LUT0_IN" field="PORTMUX.CCLROUTEA.LUT0"/>
+                <signal pad-key="pa2" index="2" function="CCL_ALT1" group="LUT0_IN" field="PORTMUX.CCLROUTEA.LUT0"/>
+                <signal pad-key="pa2" index="2" function="CCL" group="LUT0_IN" field="PORTMUX.CCLROUTEA.LUT0"/>
+                <signal pad-key="pa6" index="0" function="CCL_ALT1" group="LUT0_OUT" field="PORTMUX.CCLROUTEA.LUT0"/>
+                <signal pad-key="pa3" index="0" function="CCL" group="LUT0_OUT" field="PORTMUX.CCLROUTEA.LUT0"/>
+                <signal pad-key="pc1" index="1" function="CCL_ALT1" group="LUT1_IN" field="PORTMUX.CCLROUTEA.LUT1"/>
+                <signal pad-key="pc1" index="1" function="CCL" group="LUT1_IN" field="PORTMUX.CCLROUTEA.LUT1"/>
+                <signal pad-key="pc2" index="2" function="CCL_ALT1" group="LUT1_IN" field="PORTMUX.CCLROUTEA.LUT1"/>
+                <signal pad-key="pc2" index="2" function="CCL" group="LUT1_IN" field="PORTMUX.CCLROUTEA.LUT1"/>
+                <signal pad-key="pc3" index="0" function="CCL" group="LUT1_OUT" field="PORTMUX.CCLROUTEA.LUT1"/>
+                <signal pad-key="pd6" index="0" function="CCL_ALT1" group="LUT2_OUT" field="PORTMUX.CCLROUTEA.LUT2"/>
             </signals>
         </peripheral>
         <peripheral key="clkctrl" name="CLKCTRL" module-key="chip_clkctrl">
             <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"/>
-                <signal pad-id="pa0" function="CLKCTRL_ALT1" group="XTAL32K1"/>
-                <signal pad-id="pa1" function="CLKCTRL_ALT1" group="XTAL32K2"/>
-                <signal pad-id="pa0" function="CLKCTRL" group="XTALHF1"/>
-                <signal pad-id="pa1" function="CLKCTRL" group="XTALHF2"/>
+                <signal pad-key="pa7" function="CLKCTRL" group="CLKOUT"/>
+                <signal pad-key="pa0" function="CLKCTRL" group="EXTCLK"/>
+                <signal pad-key="pa0" function="CLKCTRL_ALT1" group="XTAL32K1"/>
+                <signal pad-key="pa1" function="CLKCTRL_ALT1" group="XTAL32K2"/>
+                <signal pad-key="pa0" function="CLKCTRL" group="XTALHF1"/>
+                <signal pad-key="pa1" function="CLKCTRL" group="XTALHF2"/>
             </signals>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="cpu_avr_xt_v1">
@@ -114,17 +114,17 @@
         <peripheral key="dac0" name="DAC0" module-key="dac_nbit_ctrl_v5">
             <register-group-instance register-group-key="dac" address-space-key="data" offset="0x6A0"/>
             <signals>
-                <signal pad-id="pd6" index="0" function="DAC0" group="OUT"/>
+                <signal pad-key="pd6" index="0" function="DAC0" group="OUT"/>
             </signals>
         </peripheral>
         <peripheral key="evsys" name="EVSYS" module-key="chip_evsys">
             <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"/>
-                <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"/>
-                <signal pad-id="pf7" index="5" function="EVSYS_ALT1" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTF"/>
+                <signal pad-key="pa7" index="0" function="EVSYS_ALT1" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTA"/>
+                <signal pad-key="pa2" index="0" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTA"/>
+                <signal pad-key="pc2" index="2" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTC"/>
+                <signal pad-key="pd7" index="3" function="EVSYS_ALT1" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTD"/>
+                <signal pad-key="pf7" index="5" function="EVSYS_ALT1" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTF"/>
             </signals>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="chip_fuse">
@@ -145,38 +145,38 @@
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pa2" index="2" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa3" index="3" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa4" index="4" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa5" index="5" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa6" index="6" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa7" index="7" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa0" index="0" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa1" index="1" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa2" index="2" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa3" index="3" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa4" index="4" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa5" index="5" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa6" index="6" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa7" index="7" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pc3" index="3" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc1" index="1" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc2" index="2" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc3" index="3" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pd6" index="6" function="IOPORT" group="PIN"/>
-                <signal pad-id="pd7" index="7" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd4" index="4" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd5" index="5" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd6" index="6" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd7" index="7" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="portf" name="PORTF" module-key="gpio_port">
             <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"/>
+                <signal pad-key="pf6" index="6" function="IOPORT" group="PIN"/>
+                <signal pad-key="pf7" index="7" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="portmux" name="PORTMUX" module-key="chip_portmux">
@@ -185,7 +185,7 @@
         <peripheral key="rstctrl" name="RSTCTRL" module-key="rst_integration_v8">
             <register-group-instance register-group-key="rstctrl" address-space-key="data" offset="0x40"/>
             <signals>
-                <signal pad-id="pf6" function="OTHER" group="RESET"/>
+                <signal pad-key="pf6" function="OTHER" group="RESET"/>
             </signals>
         </peripheral>
         <peripheral key="rtc" name="RTC" module-key="tmr_16b_rtc_v1">
@@ -200,24 +200,24 @@
         <peripheral key="spi0" name="SPI0" module-key="spi_8bit_v2">
             <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"/>
-                <signal pad-id="pd5" function="SPI0_ALT4" group="MISO" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <signal pad-id="pa1" function="SPI0_ALT3" group="MISO" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <signal pad-id="pa5" function="SPI0" group="MISO" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <signal pad-id="pc1" function="SPI0_ALT6" group="MOSI" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <signal pad-id="pd4" function="SPI0_ALT4" group="MOSI" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <signal pad-id="pa0" function="SPI0_ALT3" group="MOSI" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <signal pad-id="pa4" function="SPI0" group="MOSI" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <signal pad-id="pc3" function="SPI0_ALT6" group="SCK" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <signal pad-id="pc2" function="SPI0_ALT5" group="SCK" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <signal pad-id="pd6" function="SPI0_ALT4" group="SCK" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <signal pad-id="pa6" function="SPI0" group="SCK" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <signal pad-id="pf7" function="SPI0_ALT6" group="SS" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <signal pad-id="pc3" function="SPI0_ALT5" group="SS" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <signal pad-id="pd7" function="SPI0_ALT4" group="SS" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <signal pad-id="pc1" function="SPI0_ALT3" group="SS" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <signal pad-id="pa7" function="SPI0" group="SS" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pc2" function="SPI0_ALT6" group="MISO" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pc1" function="SPI0_ALT5" group="MISO" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pd5" function="SPI0_ALT4" group="MISO" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pa1" function="SPI0_ALT3" group="MISO" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pa5" function="SPI0" group="MISO" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pc1" function="SPI0_ALT6" group="MOSI" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pd4" function="SPI0_ALT4" group="MOSI" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pa0" function="SPI0_ALT3" group="MOSI" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pa4" function="SPI0" group="MOSI" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pc3" function="SPI0_ALT6" group="SCK" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pc2" function="SPI0_ALT5" group="SCK" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pd6" function="SPI0_ALT4" group="SCK" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pa6" function="SPI0" group="SCK" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pf7" function="SPI0_ALT6" group="SS" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pc3" function="SPI0_ALT5" group="SS" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pd7" function="SPI0_ALT4" group="SS" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pc1" function="SPI0_ALT3" group="SS" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pa7" function="SPI0" group="SS" field="PORTMUX.SPIROUTEA.SPI0"/>
             </signals>
         </peripheral>
         <peripheral key="syscfg" name="SYSCFG" module-key="chip_syscfg">
@@ -226,29 +226,29 @@
         <peripheral key="tca0" name="TCA0" module-key="tmr_16b_pwm_v1">
             <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"/>
-                <signal pad-id="pa1" index="1" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pc2" index="2" function="TCA0_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pa2" index="2" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pc3" index="3" function="TCA0_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pa3" index="3" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pd4" index="4" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pa4" index="4" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pd5" index="5" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pa5" index="5" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pa0" index="0" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pc1" index="1" function="TCA0_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pa1" index="1" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pc2" index="2" function="TCA0_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pa2" index="2" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pc3" index="3" function="TCA0_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pa3" index="3" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pd4" index="4" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pa4" index="4" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pd5" index="5" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pa5" index="5" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
             </signals>
         </peripheral>
         <peripheral key="tcb0" name="TCB0" module-key="tmr_16b_capture_v1">
             <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-key="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 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-key="pa3" index="0" function="TCB1" group="WO" field="PORTMUX.TCBROUTEA.TCB1"/>
             </signals>
         </peripheral>
         <peripheral key="tcb2" name="TCB2" module-key="tmr_16b_capture_v1">
@@ -257,59 +257,59 @@
         <peripheral key="tcd0" name="TCD0" module-key="tmr_12b_psc_v1">
             <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"/>
-                <signal pad-id="pa5" index="1" function="TCD0_ALT4" group="WOB" field="PORTMUX.TCDROUTEA.TCD0"/>
-                <signal pad-id="pa5" index="1" function="TCD0" group="WOB" field="PORTMUX.TCDROUTEA.TCD0"/>
-                <signal pad-id="pd4" index="2" function="TCD0_ALT4" group="WOC" field="PORTMUX.TCDROUTEA.TCD0"/>
-                <signal pad-id="pa6" index="2" function="TCD0" group="WOC" field="PORTMUX.TCDROUTEA.TCD0"/>
-                <signal pad-id="pd5" index="3" function="TCD0_ALT4" group="WOD" field="PORTMUX.TCDROUTEA.TCD0"/>
-                <signal pad-id="pa7" index="3" function="TCD0" group="WOD" field="PORTMUX.TCDROUTEA.TCD0"/>
+                <signal pad-key="pa4" function="TCD0_ALT4" group="WOA" field="PORTMUX.TCDROUTEA.TCD0"/>
+                <signal pad-key="pa4" function="TCD0" group="WOA" field="PORTMUX.TCDROUTEA.TCD0"/>
+                <signal pad-key="pa5" index="1" function="TCD0_ALT4" group="WOB" field="PORTMUX.TCDROUTEA.TCD0"/>
+                <signal pad-key="pa5" index="1" function="TCD0" group="WOB" field="PORTMUX.TCDROUTEA.TCD0"/>
+                <signal pad-key="pd4" index="2" function="TCD0_ALT4" group="WOC" field="PORTMUX.TCDROUTEA.TCD0"/>
+                <signal pad-key="pa6" index="2" function="TCD0" group="WOC" field="PORTMUX.TCDROUTEA.TCD0"/>
+                <signal pad-key="pd5" index="3" function="TCD0_ALT4" group="WOD" field="PORTMUX.TCDROUTEA.TCD0"/>
+                <signal pad-key="pa7" index="3" function="TCD0" group="WOD" field="PORTMUX.TCDROUTEA.TCD0"/>
             </signals>
         </peripheral>
         <peripheral key="twi0" name="TWI0" module-key="i2c_8bit_avr_v3">
             <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"/>
-                <signal pad-id="pa3" function="I2C0_ALT1" group="SCL" field="PORTMUX.TWIROUTEA.TWI0"/>
-                <signal pad-id="pa3" function="I2C0" group="SCL" field="PORTMUX.TWIROUTEA.TWI0"/>
-                <signal pad-id="pa1" function="I2C0_ALT3" group="SDA" field="PORTMUX.TWIROUTEA.TWI0"/>
-                <signal pad-id="pc2" function="I2C0_ALT2" group="SDA" field="PORTMUX.TWIROUTEA.TWI0"/>
-                <signal pad-id="pa2" function="I2C0_ALT1" group="SDA" field="PORTMUX.TWIROUTEA.TWI0"/>
-                <signal pad-id="pa2" function="I2C0" group="SDA" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pa0" function="I2C0_ALT3" group="SCL" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pc3" function="I2C0_ALT2" group="SCL" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pa3" function="I2C0_ALT1" group="SCL" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pa3" function="I2C0" group="SCL" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pa1" function="I2C0_ALT3" group="SDA" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pc2" function="I2C0_ALT2" group="SDA" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pa2" function="I2C0_ALT1" group="SDA" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pa2" function="I2C0" group="SDA" field="PORTMUX.TWIROUTEA.TWI0"/>
             </signals>
         </peripheral>
         <peripheral key="usart0" name="USART0" module-key="uart_autobd_v4">
             <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"/>
-                <signal pad-id="pa3" function="USART0_ALT2" group="RXD" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pa5" function="USART0_ALT1" group="RXD" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pa1" function="USART0" group="RXD" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pc1" function="USART0_ALT4" group="TXD" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pd4" function="USART0_ALT3" group="TXD" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pa2" function="USART0_ALT2" group="TXD" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pa4" function="USART0_ALT1" group="TXD" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pa0" function="USART0" group="TXD" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pc3" function="USART0_ALT4" group="XCK" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pd6" function="USART0_ALT3" group="XCK" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pa6" function="USART0_ALT1" group="XCK" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pa2" function="USART0" group="XCK" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pd7" function="USART0_ALT3" group="XDIR" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pa7" function="USART0_ALT1" group="XDIR" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pa3" function="USART0" group="XDIR" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pc2" function="USART0_ALT4" group="RXD" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pd5" function="USART0_ALT3" group="RXD" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa3" function="USART0_ALT2" group="RXD" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa5" function="USART0_ALT1" group="RXD" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa1" function="USART0" group="RXD" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pc1" function="USART0_ALT4" group="TXD" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pd4" function="USART0_ALT3" group="TXD" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa2" function="USART0_ALT2" group="TXD" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa4" function="USART0_ALT1" group="TXD" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa0" function="USART0" group="TXD" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pc3" function="USART0_ALT4" group="XCK" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pd6" function="USART0_ALT3" group="XCK" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa6" function="USART0_ALT1" group="XCK" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa2" function="USART0" group="XCK" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pd7" function="USART0_ALT3" group="XDIR" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa7" function="USART0_ALT1" group="XDIR" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa3" function="USART0" group="XDIR" field="PORTMUX.USARTROUTEA.USART0"/>
             </signals>
         </peripheral>
         <peripheral key="usart1" name="USART1" module-key="uart_autobd_v4">
             <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"/>
-                <signal pad-id="pd6" function="USART1_ALT2" group="TXD" field="PORTMUX.USARTROUTEA.USART1"/>
-                <signal pad-id="pc2" function="USART1" group="XCK" field="PORTMUX.USARTROUTEA.USART1"/>
-                <signal pad-id="pc3" function="USART1" group="XDIR" field="PORTMUX.USARTROUTEA.USART1"/>
+                <signal pad-key="pd7" function="USART1_ALT2" group="RXD" field="PORTMUX.USARTROUTEA.USART1"/>
+                <signal pad-key="pc1" function="USART1" group="RXD" field="PORTMUX.USARTROUTEA.USART1"/>
+                <signal pad-key="pd6" function="USART1_ALT2" group="TXD" field="PORTMUX.USARTROUTEA.USART1"/>
+                <signal pad-key="pc2" function="USART1" group="XCK" field="PORTMUX.USARTROUTEA.USART1"/>
+                <signal pad-key="pc3" function="USART1" group="XDIR" field="PORTMUX.USARTROUTEA.USART1"/>
             </signals>
         </peripheral>
         <peripheral key="userrow" name="USERROW" module-key="chip_userrow">
@@ -336,8 +336,8 @@
         <peripheral key="zcd3" name="ZCD3" module-key="cmp_zxover_ctrl_v3">
             <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"/>
+                <signal pad-key="pc2" function="ZCD3" group="IN" field="PORTMUX.ZCDROUTEA.ZCD3"/>
+                <signal pad-key="pa7" function="ZCD3" group="OUT" field="PORTMUX.ZCDROUTEA.ZCD3"/>
             </signals>
         </peripheral>
     </peripherals>
@@ -1587,31 +1587,53 @@
             </register-group>
         </module>
     </modules>
+    <pads>
+        <pad key="pa4" name="PA4"/>
+        <pad key="pa5" name="PA5"/>
+        <pad key="pa6" name="PA6"/>
+        <pad key="pa7" name="PA7"/>
+        <pad key="pc1" name="PC1"/>
+        <pad key="pc2" name="PC2"/>
+        <pad key="pc3" name="PC3"/>
+        <pad key="vddio2" name="VDDIO2"/>
+        <pad key="pd4" name="PD4"/>
+        <pad key="pd5" name="PD5"/>
+        <pad key="pd6" name="PD6"/>
+        <pad key="pd7" name="PD7"/>
+        <pad key="avdd" name="AVDD"/>
+        <pad key="agnd" name="AGND"/>
+        <pad key="pf6" name="PF6"/>
+        <pad key="pf7" name="PF7"/>
+        <pad key="pa0" name="PA0"/>
+        <pad key="pa1" name="PA1"/>
+        <pad key="pa2" name="PA2"/>
+        <pad key="pa3" name="PA3"/>
+    </pads>
     <pinouts>
         <pinout key="qfn20mvio" name="QFN20MVIO" type="qfn">
-            <pin position="1" pad="PA4"/>
-            <pin position="2" pad="PA5"/>
-            <pin position="3" pad="PA6"/>
-            <pin position="4" pad="PA7"/>
-            <pin position="5" pad="PC1"/>
-            <pin position="6" pad="PC2"/>
-            <pin position="7" pad="PC3"/>
-            <pin position="8" pad="VDDIO2"/>
-            <pin position="9" pad="PD4"/>
-            <pin position="10" pad="PD5"/>
-            <pin position="11" pad="PD6"/>
-            <pin position="12" pad="PD7"/>
-            <pin position="13" pad="AVDD"/>
-            <pin position="14" pad="AGND"/>
-            <pin position="15" pad="PF6"/>
-            <pin position="16" pad="PF7"/>
-            <pin position="17" pad="PA0"/>
-            <pin position="18" pad="PA1"/>
-            <pin position="19" pad="PA2"/>
-            <pin position="20" pad="PA3"/>
+            <pin position="1" pad-key="pa4"/>
+            <pin position="2" pad-key="pa5"/>
+            <pin position="3" pad-key="pa6"/>
+            <pin position="4" pad-key="pa7"/>
+            <pin position="5" pad-key="pc1"/>
+            <pin position="6" pad-key="pc2"/>
+            <pin position="7" pad-key="pc3"/>
+            <pin position="8" pad-key="vddio2"/>
+            <pin position="9" pad-key="pd4"/>
+            <pin position="10" pad-key="pd5"/>
+            <pin position="11" pad-key="pd6"/>
+            <pin position="12" pad-key="pd7"/>
+            <pin position="13" pad-key="avdd"/>
+            <pin position="14" pad-key="agnd"/>
+            <pin position="15" pad-key="pf6"/>
+            <pin position="16" pad-key="pf7"/>
+            <pin position="17" pad-key="pa0"/>
+            <pin position="18" pad-key="pa1"/>
+            <pin position="19" pad-key="pa2"/>
+            <pin position="20" pad-key="pa3"/>
         </pinout>
     </pinouts>
     <variants>
-        <variant name="AVR64DD20" pinout-key="qfn20mvio" package="QFN20"/>
+        <variant key="avr64dd20" name="AVR64DD20" pinout-key="qfn20mvio"/>
     </variants>
 </device>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR64DD28.xml b/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR64DD28.xml
index d73277e3..77425559 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR64DD28.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR64DD28.xml
@@ -44,37 +44,37 @@
         <peripheral key="ac0" name="AC0" module-key="cmp_control_v8">
             <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"/>
-                <signal pad-id="pc2" index="3" function="AC0" group="N"/>
-                <signal pad-id="pa7" index="0" function="AC0" group="OUT" field="PORTMUX.ACROUTEA.AC0"/>
-                <signal pad-id="pd2" index="0" function="AC0" group="P"/>
-                <signal pad-id="pd6" index="3" function="AC0" group="P"/>
-                <signal pad-id="pc3" index="4" function="AC0" group="P"/>
+                <signal pad-key="pd3" index="0" function="AC0" group="N"/>
+                <signal pad-key="pd7" index="2" function="AC0" group="N"/>
+                <signal pad-key="pc2" index="3" function="AC0" group="N"/>
+                <signal pad-key="pa7" index="0" function="AC0" group="OUT" field="PORTMUX.ACROUTEA.AC0"/>
+                <signal pad-key="pd2" index="0" function="AC0" group="P"/>
+                <signal pad-key="pd6" index="3" function="AC0" group="P"/>
+                <signal pad-key="pc3" index="4" function="AC0" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="adc0" name="ADC0" module-key="adc_12b_diff_ctrl_v1">
             <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"/>
-                <signal pad-id="pd3" index="3" function="AIN0" group="AIN"/>
-                <signal pad-id="pd4" index="4" function="AIN0" group="AIN"/>
-                <signal pad-id="pd5" index="5" function="AIN0" group="AIN"/>
-                <signal pad-id="pd6" index="6" function="AIN0" group="AIN"/>
-                <signal pad-id="pd7" index="7" function="AIN0" group="AIN"/>
-                <signal pad-id="pf0" index="16" function="AIN0" group="AIN"/>
-                <signal pad-id="pf1" index="17" function="AIN0" group="AIN"/>
-                <signal pad-id="pa2" index="22" function="AIN0" group="AIN"/>
-                <signal pad-id="pa3" index="23" function="AIN0" group="AIN"/>
-                <signal pad-id="pa4" index="24" function="AIN0" group="AIN"/>
-                <signal pad-id="pa5" index="25" function="AIN0" group="AIN"/>
-                <signal pad-id="pa6" index="26" function="AIN0" group="AIN"/>
-                <signal pad-id="pa7" index="27" function="AIN0" group="AIN"/>
-                <signal pad-id="pc0" index="28" function="AIN0" group="AIN"/>
-                <signal pad-id="pc1" index="29" function="AIN0" group="AIN"/>
-                <signal pad-id="pc2" index="30" function="AIN0" group="AIN"/>
-                <signal pad-id="pc3" index="31" function="AIN0" group="AIN"/>
+                <signal pad-key="pd1" index="1" function="AIN0" group="AIN"/>
+                <signal pad-key="pd2" index="2" function="AIN0" group="AIN"/>
+                <signal pad-key="pd3" index="3" function="AIN0" group="AIN"/>
+                <signal pad-key="pd4" index="4" function="AIN0" group="AIN"/>
+                <signal pad-key="pd5" index="5" function="AIN0" group="AIN"/>
+                <signal pad-key="pd6" index="6" function="AIN0" group="AIN"/>
+                <signal pad-key="pd7" index="7" function="AIN0" group="AIN"/>
+                <signal pad-key="pf0" index="16" function="AIN0" group="AIN"/>
+                <signal pad-key="pf1" index="17" function="AIN0" group="AIN"/>
+                <signal pad-key="pa2" index="22" function="AIN0" group="AIN"/>
+                <signal pad-key="pa3" index="23" function="AIN0" group="AIN"/>
+                <signal pad-key="pa4" index="24" function="AIN0" group="AIN"/>
+                <signal pad-key="pa5" index="25" function="AIN0" group="AIN"/>
+                <signal pad-key="pa6" index="26" function="AIN0" group="AIN"/>
+                <signal pad-key="pa7" index="27" function="AIN0" group="AIN"/>
+                <signal pad-key="pc0" index="28" function="AIN0" group="AIN"/>
+                <signal pad-key="pc1" index="29" function="AIN0" group="AIN"/>
+                <signal pad-key="pc2" index="30" function="AIN0" group="AIN"/>
+                <signal pad-key="pc3" index="31" function="AIN0" group="AIN"/>
             </signals>
         </peripheral>
         <peripheral key="bod" name="BOD" module-key="bor_lvd_ctrl_v1">
@@ -83,42 +83,42 @@
         <peripheral key="ccl" name="CCL" module-key="cla_ccl_v1">
             <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"/>
-                <signal pad-id="pa1" index="1" function="CCL_ALT1" group="LUT0_IN" field="PORTMUX.CCLROUTEA.LUT0"/>
-                <signal pad-id="pa1" index="1" function="CCL" group="LUT0_IN" field="PORTMUX.CCLROUTEA.LUT0"/>
-                <signal pad-id="pa2" index="2" function="CCL_ALT1" group="LUT0_IN" field="PORTMUX.CCLROUTEA.LUT0"/>
-                <signal pad-id="pa2" index="2" function="CCL" group="LUT0_IN" field="PORTMUX.CCLROUTEA.LUT0"/>
-                <signal pad-id="pa6" index="0" function="CCL_ALT1" group="LUT0_OUT" field="PORTMUX.CCLROUTEA.LUT0"/>
-                <signal pad-id="pa3" index="0" function="CCL" group="LUT0_OUT" field="PORTMUX.CCLROUTEA.LUT0"/>
-                <signal pad-id="pc0" index="0" function="CCL_ALT1" group="LUT1_IN" field="PORTMUX.CCLROUTEA.LUT1"/>
-                <signal pad-id="pc0" index="0" function="CCL" group="LUT1_IN" field="PORTMUX.CCLROUTEA.LUT1"/>
-                <signal pad-id="pc1" index="1" function="CCL_ALT1" group="LUT1_IN" field="PORTMUX.CCLROUTEA.LUT1"/>
-                <signal pad-id="pc1" index="1" function="CCL" group="LUT1_IN" field="PORTMUX.CCLROUTEA.LUT1"/>
-                <signal pad-id="pc2" index="2" function="CCL_ALT1" group="LUT1_IN" field="PORTMUX.CCLROUTEA.LUT1"/>
-                <signal pad-id="pc2" index="2" function="CCL" group="LUT1_IN" field="PORTMUX.CCLROUTEA.LUT1"/>
-                <signal pad-id="pc3" index="0" function="CCL" group="LUT1_OUT" field="PORTMUX.CCLROUTEA.LUT1"/>
-                <signal pad-id="pd1" index="1" function="CCL_ALT1" group="LUT2_IN" field="PORTMUX.CCLROUTEA.LUT2"/>
-                <signal pad-id="pd1" index="1" function="CCL" group="LUT2_IN" field="PORTMUX.CCLROUTEA.LUT2"/>
-                <signal pad-id="pd2" index="2" function="CCL_ALT1" group="LUT2_IN" field="PORTMUX.CCLROUTEA.LUT2"/>
-                <signal pad-id="pd2" index="2" function="CCL" group="LUT2_IN" field="PORTMUX.CCLROUTEA.LUT2"/>
-                <signal pad-id="pd6" index="0" function="CCL_ALT1" group="LUT2_OUT" field="PORTMUX.CCLROUTEA.LUT2"/>
-                <signal pad-id="pd3" index="0" function="CCL" group="LUT2_OUT" field="PORTMUX.CCLROUTEA.LUT2"/>
-                <signal pad-id="pf0" index="0" function="CCL" group="LUT3_IN" field="PORTMUX.CCLROUTEA.LUT3"/>
-                <signal pad-id="pf1" index="1" function="CCL" group="LUT3_IN" field="PORTMUX.CCLROUTEA.LUT3"/>
+                <signal pad-key="pa0" index="0" function="CCL_ALT1" group="LUT0_IN" field="PORTMUX.CCLROUTEA.LUT0"/>
+                <signal pad-key="pa0" index="0" function="CCL" group="LUT0_IN" field="PORTMUX.CCLROUTEA.LUT0"/>
+                <signal pad-key="pa1" index="1" function="CCL_ALT1" group="LUT0_IN" field="PORTMUX.CCLROUTEA.LUT0"/>
+                <signal pad-key="pa1" index="1" function="CCL" group="LUT0_IN" field="PORTMUX.CCLROUTEA.LUT0"/>
+                <signal pad-key="pa2" index="2" function="CCL_ALT1" group="LUT0_IN" field="PORTMUX.CCLROUTEA.LUT0"/>
+                <signal pad-key="pa2" index="2" function="CCL" group="LUT0_IN" field="PORTMUX.CCLROUTEA.LUT0"/>
+                <signal pad-key="pa6" index="0" function="CCL_ALT1" group="LUT0_OUT" field="PORTMUX.CCLROUTEA.LUT0"/>
+                <signal pad-key="pa3" index="0" function="CCL" group="LUT0_OUT" field="PORTMUX.CCLROUTEA.LUT0"/>
+                <signal pad-key="pc0" index="0" function="CCL_ALT1" group="LUT1_IN" field="PORTMUX.CCLROUTEA.LUT1"/>
+                <signal pad-key="pc0" index="0" function="CCL" group="LUT1_IN" field="PORTMUX.CCLROUTEA.LUT1"/>
+                <signal pad-key="pc1" index="1" function="CCL_ALT1" group="LUT1_IN" field="PORTMUX.CCLROUTEA.LUT1"/>
+                <signal pad-key="pc1" index="1" function="CCL" group="LUT1_IN" field="PORTMUX.CCLROUTEA.LUT1"/>
+                <signal pad-key="pc2" index="2" function="CCL_ALT1" group="LUT1_IN" field="PORTMUX.CCLROUTEA.LUT1"/>
+                <signal pad-key="pc2" index="2" function="CCL" group="LUT1_IN" field="PORTMUX.CCLROUTEA.LUT1"/>
+                <signal pad-key="pc3" index="0" function="CCL" group="LUT1_OUT" field="PORTMUX.CCLROUTEA.LUT1"/>
+                <signal pad-key="pd1" index="1" function="CCL_ALT1" group="LUT2_IN" field="PORTMUX.CCLROUTEA.LUT2"/>
+                <signal pad-key="pd1" index="1" function="CCL" group="LUT2_IN" field="PORTMUX.CCLROUTEA.LUT2"/>
+                <signal pad-key="pd2" index="2" function="CCL_ALT1" group="LUT2_IN" field="PORTMUX.CCLROUTEA.LUT2"/>
+                <signal pad-key="pd2" index="2" function="CCL" group="LUT2_IN" field="PORTMUX.CCLROUTEA.LUT2"/>
+                <signal pad-key="pd6" index="0" function="CCL_ALT1" group="LUT2_OUT" field="PORTMUX.CCLROUTEA.LUT2"/>
+                <signal pad-key="pd3" index="0" function="CCL" group="LUT2_OUT" field="PORTMUX.CCLROUTEA.LUT2"/>
+                <signal pad-key="pf0" index="0" function="CCL" group="LUT3_IN" field="PORTMUX.CCLROUTEA.LUT3"/>
+                <signal pad-key="pf1" index="1" function="CCL" group="LUT3_IN" field="PORTMUX.CCLROUTEA.LUT3"/>
             </signals>
         </peripheral>
         <peripheral key="clkctrl" name="CLKCTRL" module-key="chip_clkctrl">
             <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"/>
-                <signal pad-id="pa0" function="CLKCTRL_ALT1" group="XTAL32K1"/>
-                <signal pad-id="pf0" function="CLKCTRL" group="XTAL32K1"/>
-                <signal pad-id="pa1" function="CLKCTRL_ALT1" group="XTAL32K2"/>
-                <signal pad-id="pf1" function="CLKCTRL" group="XTAL32K2"/>
-                <signal pad-id="pa0" function="CLKCTRL" group="XTALHF1"/>
-                <signal pad-id="pa1" function="CLKCTRL" group="XTALHF2"/>
+                <signal pad-key="pa7" function="CLKCTRL" group="CLKOUT"/>
+                <signal pad-key="pa0" function="CLKCTRL" group="EXTCLK"/>
+                <signal pad-key="pa0" function="CLKCTRL_ALT1" group="XTAL32K1"/>
+                <signal pad-key="pf0" function="CLKCTRL" group="XTAL32K1"/>
+                <signal pad-key="pa1" function="CLKCTRL_ALT1" group="XTAL32K2"/>
+                <signal pad-key="pf1" function="CLKCTRL" group="XTAL32K2"/>
+                <signal pad-key="pa0" function="CLKCTRL" group="XTALHF1"/>
+                <signal pad-key="pa1" function="CLKCTRL" group="XTALHF2"/>
             </signals>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="cpu_avr_xt_v1">
@@ -133,18 +133,18 @@
         <peripheral key="dac0" name="DAC0" module-key="dac_nbit_ctrl_v5">
             <register-group-instance register-group-key="dac" address-space-key="data" offset="0x6A0"/>
             <signals>
-                <signal pad-id="pd6" index="0" function="DAC0" group="OUT"/>
+                <signal pad-key="pd6" index="0" function="DAC0" group="OUT"/>
             </signals>
         </peripheral>
         <peripheral key="evsys" name="EVSYS" module-key="chip_evsys">
             <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"/>
-                <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"/>
-                <signal pad-id="pd2" index="3" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTD"/>
-                <signal pad-id="pf7" index="5" function="EVSYS_ALT1" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTF"/>
+                <signal pad-key="pa7" index="0" function="EVSYS_ALT1" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTA"/>
+                <signal pad-key="pa2" index="0" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTA"/>
+                <signal pad-key="pc2" index="2" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTC"/>
+                <signal pad-key="pd7" index="3" function="EVSYS_ALT1" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTD"/>
+                <signal pad-key="pd2" index="3" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTD"/>
+                <signal pad-key="pf7" index="5" function="EVSYS_ALT1" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTF"/>
             </signals>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="chip_fuse">
@@ -165,44 +165,44 @@
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pa2" index="2" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa3" index="3" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa4" index="4" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa5" index="5" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa6" index="6" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa7" index="7" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa0" index="0" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa1" index="1" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa2" index="2" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa3" index="3" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa4" index="4" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa5" index="5" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa6" index="6" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa7" index="7" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pc2" index="2" function="IOPORT" group="PIN"/>
-                <signal pad-id="pc3" index="3" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc0" index="0" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc1" index="1" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc2" index="2" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc3" index="3" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pd3" index="3" function="IOPORT" group="PIN"/>
-                <signal pad-id="pd4" index="4" function="IOPORT" group="PIN"/>
-                <signal pad-id="pd5" index="5" function="IOPORT" group="PIN"/>
-                <signal pad-id="pd6" index="6" function="IOPORT" group="PIN"/>
-                <signal pad-id="pd7" index="7" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd1" index="1" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd2" index="2" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd3" index="3" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd4" index="4" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd5" index="5" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd6" index="6" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd7" index="7" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="portf" name="PORTF" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pf6" index="6" function="IOPORT" group="PIN"/>
-                <signal pad-id="pf7" index="7" function="IOPORT" group="PIN"/>
+                <signal pad-key="pf0" index="0" function="IOPORT" group="PIN"/>
+                <signal pad-key="pf1" index="1" function="IOPORT" group="PIN"/>
+                <signal pad-key="pf6" index="6" function="IOPORT" group="PIN"/>
+                <signal pad-key="pf7" index="7" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="portmux" name="PORTMUX" module-key="chip_portmux">
@@ -211,7 +211,7 @@
         <peripheral key="rstctrl" name="RSTCTRL" module-key="rst_integration_v8">
             <register-group-instance register-group-key="rstctrl" address-space-key="data" offset="0x40"/>
             <signals>
-                <signal pad-id="pf6" function="OTHER" group="RESET"/>
+                <signal pad-key="pf6" function="OTHER" group="RESET"/>
             </signals>
         </peripheral>
         <peripheral key="rtc" name="RTC" module-key="tmr_16b_rtc_v1">
@@ -226,26 +226,26 @@
         <peripheral key="spi0" name="SPI0" module-key="spi_8bit_v2">
             <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"/>
-                <signal pad-id="pd5" function="SPI0_ALT4" group="MISO" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <signal pad-id="pa1" function="SPI0_ALT3" group="MISO" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <signal pad-id="pa5" function="SPI0" group="MISO" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <signal pad-id="pc1" function="SPI0_ALT6" group="MOSI" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <signal pad-id="pc0" function="SPI0_ALT5" group="MOSI" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <signal pad-id="pd4" function="SPI0_ALT4" group="MOSI" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <signal pad-id="pa0" function="SPI0_ALT3" group="MOSI" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <signal pad-id="pa4" function="SPI0" group="MOSI" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <signal pad-id="pc3" function="SPI0_ALT6" group="SCK" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <signal pad-id="pc2" function="SPI0_ALT5" group="SCK" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <signal pad-id="pd6" function="SPI0_ALT4" group="SCK" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <signal pad-id="pc0" function="SPI0_ALT3" group="SCK" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <signal pad-id="pa6" function="SPI0" group="SCK" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <signal pad-id="pf7" function="SPI0_ALT6" group="SS" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <signal pad-id="pc3" function="SPI0_ALT5" group="SS" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <signal pad-id="pd7" function="SPI0_ALT4" group="SS" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <signal pad-id="pc1" function="SPI0_ALT3" group="SS" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <signal pad-id="pa7" function="SPI0" group="SS" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pc2" function="SPI0_ALT6" group="MISO" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pc1" function="SPI0_ALT5" group="MISO" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pd5" function="SPI0_ALT4" group="MISO" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pa1" function="SPI0_ALT3" group="MISO" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pa5" function="SPI0" group="MISO" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pc1" function="SPI0_ALT6" group="MOSI" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pc0" function="SPI0_ALT5" group="MOSI" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pd4" function="SPI0_ALT4" group="MOSI" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pa0" function="SPI0_ALT3" group="MOSI" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pa4" function="SPI0" group="MOSI" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pc3" function="SPI0_ALT6" group="SCK" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pc2" function="SPI0_ALT5" group="SCK" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pd6" function="SPI0_ALT4" group="SCK" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pc0" function="SPI0_ALT3" group="SCK" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pa6" function="SPI0" group="SCK" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pf7" function="SPI0_ALT6" group="SS" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pc3" function="SPI0_ALT5" group="SS" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pd7" function="SPI0_ALT4" group="SS" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pc1" function="SPI0_ALT3" group="SS" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pa7" function="SPI0" group="SS" field="PORTMUX.SPIROUTEA.SPI0"/>
             </signals>
         </peripheral>
         <peripheral key="syscfg" name="SYSCFG" module-key="chip_syscfg">
@@ -254,102 +254,102 @@
         <peripheral key="tca0" name="TCA0" module-key="tmr_16b_pwm_v1">
             <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"/>
-                <signal pad-id="pa0" index="0" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pf1" index="1" function="TCA0_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pd1" index="1" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pc1" index="1" function="TCA0_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pa1" index="1" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pd2" index="2" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pc2" index="2" function="TCA0_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pa2" index="2" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pd3" index="3" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pc3" index="3" function="TCA0_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pa3" index="3" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pd4" index="4" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pa4" index="4" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pd5" index="5" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pa5" index="5" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pf0" index="0" function="TCA0_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pc0" index="0" function="TCA0_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pa0" index="0" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pf1" index="1" function="TCA0_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pd1" index="1" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pc1" index="1" function="TCA0_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pa1" index="1" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pd2" index="2" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pc2" index="2" function="TCA0_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pa2" index="2" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pd3" index="3" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pc3" index="3" function="TCA0_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pa3" index="3" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pd4" index="4" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pa4" index="4" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pd5" index="5" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pa5" index="5" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
             </signals>
         </peripheral>
         <peripheral key="tcb0" name="TCB0" module-key="tmr_16b_capture_v1">
             <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-key="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 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-key="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 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"/>
+                <signal pad-key="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 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"/>
-                <signal pad-id="pa4" function="TCD0" group="WOA" field="PORTMUX.TCDROUTEA.TCD0"/>
-                <signal pad-id="pa5" index="1" function="TCD0_ALT4" group="WOB" field="PORTMUX.TCDROUTEA.TCD0"/>
-                <signal pad-id="pf1" index="1" function="TCD0_ALT2" group="WOB" field="PORTMUX.TCDROUTEA.TCD0"/>
-                <signal pad-id="pa5" index="1" function="TCD0" group="WOB" field="PORTMUX.TCDROUTEA.TCD0"/>
-                <signal pad-id="pd4" index="2" function="TCD0_ALT4" group="WOC" field="PORTMUX.TCDROUTEA.TCD0"/>
-                <signal pad-id="pa6" index="2" function="TCD0" group="WOC" field="PORTMUX.TCDROUTEA.TCD0"/>
-                <signal pad-id="pd5" index="3" function="TCD0_ALT4" group="WOD" field="PORTMUX.TCDROUTEA.TCD0"/>
-                <signal pad-id="pa7" index="3" function="TCD0" group="WOD" field="PORTMUX.TCDROUTEA.TCD0"/>
+                <signal pad-key="pa4" function="TCD0_ALT4" group="WOA" field="PORTMUX.TCDROUTEA.TCD0"/>
+                <signal pad-key="pf0" function="TCD0_ALT2" group="WOA" field="PORTMUX.TCDROUTEA.TCD0"/>
+                <signal pad-key="pa4" function="TCD0" group="WOA" field="PORTMUX.TCDROUTEA.TCD0"/>
+                <signal pad-key="pa5" index="1" function="TCD0_ALT4" group="WOB" field="PORTMUX.TCDROUTEA.TCD0"/>
+                <signal pad-key="pf1" index="1" function="TCD0_ALT2" group="WOB" field="PORTMUX.TCDROUTEA.TCD0"/>
+                <signal pad-key="pa5" index="1" function="TCD0" group="WOB" field="PORTMUX.TCDROUTEA.TCD0"/>
+                <signal pad-key="pd4" index="2" function="TCD0_ALT4" group="WOC" field="PORTMUX.TCDROUTEA.TCD0"/>
+                <signal pad-key="pa6" index="2" function="TCD0" group="WOC" field="PORTMUX.TCDROUTEA.TCD0"/>
+                <signal pad-key="pd5" index="3" function="TCD0_ALT4" group="WOD" field="PORTMUX.TCDROUTEA.TCD0"/>
+                <signal pad-key="pa7" index="3" function="TCD0" group="WOD" field="PORTMUX.TCDROUTEA.TCD0"/>
             </signals>
         </peripheral>
         <peripheral key="twi0" name="TWI0" module-key="i2c_8bit_avr_v3">
             <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"/>
-                <signal pad-id="pa3" function="I2C0_ALT1" group="SCL" field="PORTMUX.TWIROUTEA.TWI0"/>
-                <signal pad-id="pa3" function="I2C0" group="SCL" field="PORTMUX.TWIROUTEA.TWI0"/>
-                <signal pad-id="pa1" function="I2C0_ALT3" group="SDA" field="PORTMUX.TWIROUTEA.TWI0"/>
-                <signal pad-id="pc2" function="I2C0_ALT2" group="SDA" field="PORTMUX.TWIROUTEA.TWI0"/>
-                <signal pad-id="pa2" function="I2C0_ALT1" group="SDA" field="PORTMUX.TWIROUTEA.TWI0"/>
-                <signal pad-id="pa2" function="I2C0" group="SDA" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pa0" function="I2C0_ALT3" group="SCL" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pc3" function="I2C0_ALT2" group="SCL" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pa3" function="I2C0_ALT1" group="SCL" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pa3" function="I2C0" group="SCL" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pa1" function="I2C0_ALT3" group="SDA" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pc2" function="I2C0_ALT2" group="SDA" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pa2" function="I2C0_ALT1" group="SDA" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pa2" function="I2C0" group="SDA" field="PORTMUX.TWIROUTEA.TWI0"/>
             </signals>
         </peripheral>
         <peripheral key="usart0" name="USART0" module-key="uart_autobd_v4">
             <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"/>
-                <signal pad-id="pa3" function="USART0_ALT2" group="RXD" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pa5" function="USART0_ALT1" group="RXD" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pa1" function="USART0" group="RXD" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pc1" function="USART0_ALT4" group="TXD" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pd4" function="USART0_ALT3" group="TXD" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pa2" function="USART0_ALT2" group="TXD" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pa4" function="USART0_ALT1" group="TXD" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pa0" function="USART0" group="TXD" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pc3" function="USART0_ALT4" group="XCK" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pd6" function="USART0_ALT3" group="XCK" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pa6" function="USART0_ALT1" group="XCK" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pa2" function="USART0" group="XCK" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pd7" function="USART0_ALT3" group="XDIR" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pa7" function="USART0_ALT1" group="XDIR" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pa3" function="USART0" group="XDIR" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pc2" function="USART0_ALT4" group="RXD" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pd5" function="USART0_ALT3" group="RXD" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa3" function="USART0_ALT2" group="RXD" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa5" function="USART0_ALT1" group="RXD" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa1" function="USART0" group="RXD" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pc1" function="USART0_ALT4" group="TXD" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pd4" function="USART0_ALT3" group="TXD" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa2" function="USART0_ALT2" group="TXD" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa4" function="USART0_ALT1" group="TXD" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa0" function="USART0" group="TXD" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pc3" function="USART0_ALT4" group="XCK" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pd6" function="USART0_ALT3" group="XCK" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa6" function="USART0_ALT1" group="XCK" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa2" function="USART0" group="XCK" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pd7" function="USART0_ALT3" group="XDIR" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa7" function="USART0_ALT1" group="XDIR" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa3" function="USART0" group="XDIR" field="PORTMUX.USARTROUTEA.USART0"/>
             </signals>
         </peripheral>
         <peripheral key="usart1" name="USART1" module-key="uart_autobd_v4">
             <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"/>
-                <signal pad-id="pd6" function="USART1_ALT2" group="TXD" field="PORTMUX.USARTROUTEA.USART1"/>
-                <signal pad-id="pc0" function="USART1" group="TXD" field="PORTMUX.USARTROUTEA.USART1"/>
-                <signal pad-id="pc2" function="USART1" group="XCK" field="PORTMUX.USARTROUTEA.USART1"/>
-                <signal pad-id="pc3" function="USART1" group="XDIR" field="PORTMUX.USARTROUTEA.USART1"/>
+                <signal pad-key="pd7" function="USART1_ALT2" group="RXD" field="PORTMUX.USARTROUTEA.USART1"/>
+                <signal pad-key="pc1" function="USART1" group="RXD" field="PORTMUX.USARTROUTEA.USART1"/>
+                <signal pad-key="pd6" function="USART1_ALT2" group="TXD" field="PORTMUX.USARTROUTEA.USART1"/>
+                <signal pad-key="pc0" function="USART1" group="TXD" field="PORTMUX.USARTROUTEA.USART1"/>
+                <signal pad-key="pc2" function="USART1" group="XCK" field="PORTMUX.USARTROUTEA.USART1"/>
+                <signal pad-key="pc3" function="USART1" group="XDIR" field="PORTMUX.USARTROUTEA.USART1"/>
             </signals>
         </peripheral>
         <peripheral key="userrow" name="USERROW" module-key="chip_userrow">
@@ -376,8 +376,8 @@
         <peripheral key="zcd3" name="ZCD3" module-key="cmp_zxover_ctrl_v3">
             <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"/>
+                <signal pad-key="pc2" function="ZCD3" group="IN" field="PORTMUX.ZCDROUTEA.ZCD3"/>
+                <signal pad-key="pa7" function="ZCD3" group="OUT" field="PORTMUX.ZCDROUTEA.ZCD3"/>
             </signals>
         </peripheral>
     </peripherals>
@@ -1628,39 +1628,69 @@
             </register-group>
         </module>
     </modules>
+    <pads>
+        <pad key="pa7" name="PA7"/>
+        <pad key="pc0" name="PC0"/>
+        <pad key="pc1" name="PC1"/>
+        <pad key="pc2" name="PC2"/>
+        <pad key="pc3" name="PC3"/>
+        <pad key="vddio2" name="VDDIO2"/>
+        <pad key="pd1" name="PD1"/>
+        <pad key="pd2" name="PD2"/>
+        <pad key="pd3" name="PD3"/>
+        <pad key="pd4" name="PD4"/>
+        <pad key="pd5" name="PD5"/>
+        <pad key="pd6" name="PD6"/>
+        <pad key="pd7" name="PD7"/>
+        <pad key="avdd" name="AVDD"/>
+        <pad key="agnd" name="AGND"/>
+        <pad key="pf0" name="PF0"/>
+        <pad key="pf1" name="PF1"/>
+        <pad key="pf6" name="PF6"/>
+        <pad key="pf7" name="PF7"/>
+        <pad key="vdd0" name="VDD0"/>
+        <pad key="gnd0" name="GND0"/>
+        <pad key="pa0" name="PA0"/>
+        <pad key="pa1" name="PA1"/>
+        <pad key="pa2" name="PA2"/>
+        <pad key="pa3" name="PA3"/>
+        <pad key="pa4" name="PA4"/>
+        <pad key="pa5" name="PA5"/>
+        <pad key="pa6" name="PA6"/>
+    </pads>
     <pinouts>
         <pinout key="soic28mvio" name="SOIC28MVIO" type="soic">
-            <pin position="1" pad="PA7"/>
-            <pin position="2" pad="PC0"/>
-            <pin position="3" pad="PC1"/>
-            <pin position="4" pad="PC2"/>
-            <pin position="5" pad="PC3"/>
-            <pin position="6" pad="VDDIO2"/>
-            <pin position="7" pad="PD1"/>
-            <pin position="8" pad="PD2"/>
-            <pin position="9" pad="PD3"/>
-            <pin position="10" pad="PD4"/>
-            <pin position="11" pad="PD5"/>
-            <pin position="12" pad="PD6"/>
-            <pin position="13" pad="PD7"/>
-            <pin position="14" pad="AVDD"/>
-            <pin position="15" pad="AGND"/>
-            <pin position="16" pad="PF0"/>
-            <pin position="17" pad="PF1"/>
-            <pin position="18" pad="PF6"/>
-            <pin position="19" pad="PF7"/>
-            <pin position="20" pad="VDD0"/>
-            <pin position="21" pad="GND0"/>
-            <pin position="22" pad="PA0"/>
-            <pin position="23" pad="PA1"/>
-            <pin position="24" pad="PA2"/>
-            <pin position="25" pad="PA3"/>
-            <pin position="26" pad="PA4"/>
-            <pin position="27" pad="PA5"/>
-            <pin position="28" pad="PA6"/>
+            <pin position="1" pad-key="pa7"/>
+            <pin position="2" pad-key="pc0"/>
+            <pin position="3" pad-key="pc1"/>
+            <pin position="4" pad-key="pc2"/>
+            <pin position="5" pad-key="pc3"/>
+            <pin position="6" pad-key="vddio2"/>
+            <pin position="7" pad-key="pd1"/>
+            <pin position="8" pad-key="pd2"/>
+            <pin position="9" pad-key="pd3"/>
+            <pin position="10" pad-key="pd4"/>
+            <pin position="11" pad-key="pd5"/>
+            <pin position="12" pad-key="pd6"/>
+            <pin position="13" pad-key="pd7"/>
+            <pin position="14" pad-key="avdd"/>
+            <pin position="15" pad-key="agnd"/>
+            <pin position="16" pad-key="pf0"/>
+            <pin position="17" pad-key="pf1"/>
+            <pin position="18" pad-key="pf6"/>
+            <pin position="19" pad-key="pf7"/>
+            <pin position="20" pad-key="vdd0"/>
+            <pin position="21" pad-key="gnd0"/>
+            <pin position="22" pad-key="pa0"/>
+            <pin position="23" pad-key="pa1"/>
+            <pin position="24" pad-key="pa2"/>
+            <pin position="25" pad-key="pa3"/>
+            <pin position="26" pad-key="pa4"/>
+            <pin position="27" pad-key="pa5"/>
+            <pin position="28" pad-key="pa6"/>
         </pinout>
     </pinouts>
     <variants>
-        <variant name="AVR64DD28" pinout-key="soic28mvio" package="SOIC28"/>
+        <variant key="avr64dd28" name="AVR64DD28" pinout-key="soic28mvio"/>
     </variants>
 </device>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR64DD32.xml b/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR64DD32.xml
index 605f35ef..5767e8ab 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR64DD32.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR64DD32.xml
@@ -44,41 +44,41 @@
         <peripheral key="ac0" name="AC0" module-key="cmp_control_v8">
             <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"/>
-                <signal pad-id="pc2" index="3" function="AC0" group="N"/>
-                <signal pad-id="pa7" index="0" function="AC0" group="OUT" field="PORTMUX.ACROUTEA.AC0"/>
-                <signal pad-id="pd2" index="0" function="AC0" group="P"/>
-                <signal pad-id="pd6" index="3" function="AC0" group="P"/>
-                <signal pad-id="pc3" index="4" function="AC0" group="P"/>
+                <signal pad-key="pd3" index="0" function="AC0" group="N"/>
+                <signal pad-key="pd7" index="2" function="AC0" group="N"/>
+                <signal pad-key="pc2" index="3" function="AC0" group="N"/>
+                <signal pad-key="pa7" index="0" function="AC0" group="OUT" field="PORTMUX.ACROUTEA.AC0"/>
+                <signal pad-key="pd2" index="0" function="AC0" group="P"/>
+                <signal pad-key="pd6" index="3" function="AC0" group="P"/>
+                <signal pad-key="pc3" index="4" function="AC0" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="adc0" name="ADC0" module-key="adc_12b_diff_ctrl_v1">
             <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"/>
-                <signal pad-id="pd3" index="3" function="AIN0" group="AIN"/>
-                <signal pad-id="pd4" index="4" function="AIN0" group="AIN"/>
-                <signal pad-id="pd5" index="5" function="AIN0" group="AIN"/>
-                <signal pad-id="pd6" index="6" function="AIN0" group="AIN"/>
-                <signal pad-id="pd7" index="7" function="AIN0" group="AIN"/>
-                <signal pad-id="pf0" index="16" function="AIN0" group="AIN"/>
-                <signal pad-id="pf1" index="17" function="AIN0" group="AIN"/>
-                <signal pad-id="pf2" index="18" function="AIN0" group="AIN"/>
-                <signal pad-id="pf3" index="19" function="AIN0" group="AIN"/>
-                <signal pad-id="pf4" index="20" function="AIN0" group="AIN"/>
-                <signal pad-id="pf5" index="21" function="AIN0" group="AIN"/>
-                <signal pad-id="pa2" index="22" function="AIN0" group="AIN"/>
-                <signal pad-id="pa3" index="23" function="AIN0" group="AIN"/>
-                <signal pad-id="pa4" index="24" function="AIN0" group="AIN"/>
-                <signal pad-id="pa5" index="25" function="AIN0" group="AIN"/>
-                <signal pad-id="pa6" index="26" function="AIN0" group="AIN"/>
-                <signal pad-id="pa7" index="27" function="AIN0" group="AIN"/>
-                <signal pad-id="pc0" index="28" function="AIN0" group="AIN"/>
-                <signal pad-id="pc1" index="29" function="AIN0" group="AIN"/>
-                <signal pad-id="pc2" index="30" function="AIN0" group="AIN"/>
-                <signal pad-id="pc3" index="31" function="AIN0" group="AIN"/>
+                <signal pad-key="pd1" index="1" function="AIN0" group="AIN"/>
+                <signal pad-key="pd2" index="2" function="AIN0" group="AIN"/>
+                <signal pad-key="pd3" index="3" function="AIN0" group="AIN"/>
+                <signal pad-key="pd4" index="4" function="AIN0" group="AIN"/>
+                <signal pad-key="pd5" index="5" function="AIN0" group="AIN"/>
+                <signal pad-key="pd6" index="6" function="AIN0" group="AIN"/>
+                <signal pad-key="pd7" index="7" function="AIN0" group="AIN"/>
+                <signal pad-key="pf0" index="16" function="AIN0" group="AIN"/>
+                <signal pad-key="pf1" index="17" function="AIN0" group="AIN"/>
+                <signal pad-key="pf2" index="18" function="AIN0" group="AIN"/>
+                <signal pad-key="pf3" index="19" function="AIN0" group="AIN"/>
+                <signal pad-key="pf4" index="20" function="AIN0" group="AIN"/>
+                <signal pad-key="pf5" index="21" function="AIN0" group="AIN"/>
+                <signal pad-key="pa2" index="22" function="AIN0" group="AIN"/>
+                <signal pad-key="pa3" index="23" function="AIN0" group="AIN"/>
+                <signal pad-key="pa4" index="24" function="AIN0" group="AIN"/>
+                <signal pad-key="pa5" index="25" function="AIN0" group="AIN"/>
+                <signal pad-key="pa6" index="26" function="AIN0" group="AIN"/>
+                <signal pad-key="pa7" index="27" function="AIN0" group="AIN"/>
+                <signal pad-key="pc0" index="28" function="AIN0" group="AIN"/>
+                <signal pad-key="pc1" index="29" function="AIN0" group="AIN"/>
+                <signal pad-key="pc2" index="30" function="AIN0" group="AIN"/>
+                <signal pad-key="pc3" index="31" function="AIN0" group="AIN"/>
             </signals>
         </peripheral>
         <peripheral key="bod" name="BOD" module-key="bor_lvd_ctrl_v1">
@@ -87,44 +87,44 @@
         <peripheral key="ccl" name="CCL" module-key="cla_ccl_v1">
             <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"/>
-                <signal pad-id="pa1" index="1" function="CCL_ALT1" group="LUT0_IN" field="PORTMUX.CCLROUTEA.LUT0"/>
-                <signal pad-id="pa1" index="1" function="CCL" group="LUT0_IN" field="PORTMUX.CCLROUTEA.LUT0"/>
-                <signal pad-id="pa2" index="2" function="CCL_ALT1" group="LUT0_IN" field="PORTMUX.CCLROUTEA.LUT0"/>
-                <signal pad-id="pa2" index="2" function="CCL" group="LUT0_IN" field="PORTMUX.CCLROUTEA.LUT0"/>
-                <signal pad-id="pa6" index="0" function="CCL_ALT1" group="LUT0_OUT" field="PORTMUX.CCLROUTEA.LUT0"/>
-                <signal pad-id="pa3" index="0" function="CCL" group="LUT0_OUT" field="PORTMUX.CCLROUTEA.LUT0"/>
-                <signal pad-id="pc0" index="0" function="CCL_ALT1" group="LUT1_IN" field="PORTMUX.CCLROUTEA.LUT1"/>
-                <signal pad-id="pc0" index="0" function="CCL" group="LUT1_IN" field="PORTMUX.CCLROUTEA.LUT1"/>
-                <signal pad-id="pc1" index="1" function="CCL_ALT1" group="LUT1_IN" field="PORTMUX.CCLROUTEA.LUT1"/>
-                <signal pad-id="pc1" index="1" function="CCL" group="LUT1_IN" field="PORTMUX.CCLROUTEA.LUT1"/>
-                <signal pad-id="pc2" index="2" function="CCL_ALT1" group="LUT1_IN" field="PORTMUX.CCLROUTEA.LUT1"/>
-                <signal pad-id="pc2" index="2" function="CCL" group="LUT1_IN" field="PORTMUX.CCLROUTEA.LUT1"/>
-                <signal pad-id="pc3" index="0" function="CCL" group="LUT1_OUT" field="PORTMUX.CCLROUTEA.LUT1"/>
-                <signal pad-id="pd1" index="1" function="CCL_ALT1" group="LUT2_IN" field="PORTMUX.CCLROUTEA.LUT2"/>
-                <signal pad-id="pd1" index="1" function="CCL" group="LUT2_IN" field="PORTMUX.CCLROUTEA.LUT2"/>
-                <signal pad-id="pd2" index="2" function="CCL_ALT1" group="LUT2_IN" field="PORTMUX.CCLROUTEA.LUT2"/>
-                <signal pad-id="pd2" index="2" function="CCL" group="LUT2_IN" field="PORTMUX.CCLROUTEA.LUT2"/>
-                <signal pad-id="pd6" index="0" function="CCL_ALT1" group="LUT2_OUT" field="PORTMUX.CCLROUTEA.LUT2"/>
-                <signal pad-id="pd3" index="0" function="CCL" group="LUT2_OUT" field="PORTMUX.CCLROUTEA.LUT2"/>
-                <signal pad-id="pf0" index="0" function="CCL" group="LUT3_IN" field="PORTMUX.CCLROUTEA.LUT3"/>
-                <signal pad-id="pf1" index="1" function="CCL" group="LUT3_IN" field="PORTMUX.CCLROUTEA.LUT3"/>
-                <signal pad-id="pf2" index="2" function="CCL" group="LUT3_IN" field="PORTMUX.CCLROUTEA.LUT3"/>
-                <signal pad-id="pf3" index="0" function="CCL" group="LUT3_OUT" field="PORTMUX.CCLROUTEA.LUT3"/>
+                <signal pad-key="pa0" index="0" function="CCL_ALT1" group="LUT0_IN" field="PORTMUX.CCLROUTEA.LUT0"/>
+                <signal pad-key="pa0" index="0" function="CCL" group="LUT0_IN" field="PORTMUX.CCLROUTEA.LUT0"/>
+                <signal pad-key="pa1" index="1" function="CCL_ALT1" group="LUT0_IN" field="PORTMUX.CCLROUTEA.LUT0"/>
+                <signal pad-key="pa1" index="1" function="CCL" group="LUT0_IN" field="PORTMUX.CCLROUTEA.LUT0"/>
+                <signal pad-key="pa2" index="2" function="CCL_ALT1" group="LUT0_IN" field="PORTMUX.CCLROUTEA.LUT0"/>
+                <signal pad-key="pa2" index="2" function="CCL" group="LUT0_IN" field="PORTMUX.CCLROUTEA.LUT0"/>
+                <signal pad-key="pa6" index="0" function="CCL_ALT1" group="LUT0_OUT" field="PORTMUX.CCLROUTEA.LUT0"/>
+                <signal pad-key="pa3" index="0" function="CCL" group="LUT0_OUT" field="PORTMUX.CCLROUTEA.LUT0"/>
+                <signal pad-key="pc0" index="0" function="CCL_ALT1" group="LUT1_IN" field="PORTMUX.CCLROUTEA.LUT1"/>
+                <signal pad-key="pc0" index="0" function="CCL" group="LUT1_IN" field="PORTMUX.CCLROUTEA.LUT1"/>
+                <signal pad-key="pc1" index="1" function="CCL_ALT1" group="LUT1_IN" field="PORTMUX.CCLROUTEA.LUT1"/>
+                <signal pad-key="pc1" index="1" function="CCL" group="LUT1_IN" field="PORTMUX.CCLROUTEA.LUT1"/>
+                <signal pad-key="pc2" index="2" function="CCL_ALT1" group="LUT1_IN" field="PORTMUX.CCLROUTEA.LUT1"/>
+                <signal pad-key="pc2" index="2" function="CCL" group="LUT1_IN" field="PORTMUX.CCLROUTEA.LUT1"/>
+                <signal pad-key="pc3" index="0" function="CCL" group="LUT1_OUT" field="PORTMUX.CCLROUTEA.LUT1"/>
+                <signal pad-key="pd1" index="1" function="CCL_ALT1" group="LUT2_IN" field="PORTMUX.CCLROUTEA.LUT2"/>
+                <signal pad-key="pd1" index="1" function="CCL" group="LUT2_IN" field="PORTMUX.CCLROUTEA.LUT2"/>
+                <signal pad-key="pd2" index="2" function="CCL_ALT1" group="LUT2_IN" field="PORTMUX.CCLROUTEA.LUT2"/>
+                <signal pad-key="pd2" index="2" function="CCL" group="LUT2_IN" field="PORTMUX.CCLROUTEA.LUT2"/>
+                <signal pad-key="pd6" index="0" function="CCL_ALT1" group="LUT2_OUT" field="PORTMUX.CCLROUTEA.LUT2"/>
+                <signal pad-key="pd3" index="0" function="CCL" group="LUT2_OUT" field="PORTMUX.CCLROUTEA.LUT2"/>
+                <signal pad-key="pf0" index="0" function="CCL" group="LUT3_IN" field="PORTMUX.CCLROUTEA.LUT3"/>
+                <signal pad-key="pf1" index="1" function="CCL" group="LUT3_IN" field="PORTMUX.CCLROUTEA.LUT3"/>
+                <signal pad-key="pf2" index="2" function="CCL" group="LUT3_IN" field="PORTMUX.CCLROUTEA.LUT3"/>
+                <signal pad-key="pf3" index="0" function="CCL" group="LUT3_OUT" field="PORTMUX.CCLROUTEA.LUT3"/>
             </signals>
         </peripheral>
         <peripheral key="clkctrl" name="CLKCTRL" module-key="chip_clkctrl">
             <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"/>
-                <signal pad-id="pa0" function="CLKCTRL_ALT1" group="XTAL32K1"/>
-                <signal pad-id="pf0" function="CLKCTRL" group="XTAL32K1"/>
-                <signal pad-id="pa1" function="CLKCTRL_ALT1" group="XTAL32K2"/>
-                <signal pad-id="pf1" function="CLKCTRL" group="XTAL32K2"/>
-                <signal pad-id="pa0" function="CLKCTRL" group="XTALHF1"/>
-                <signal pad-id="pa1" function="CLKCTRL" group="XTALHF2"/>
+                <signal pad-key="pa7" function="CLKCTRL" group="CLKOUT"/>
+                <signal pad-key="pa0" function="CLKCTRL" group="EXTCLK"/>
+                <signal pad-key="pa0" function="CLKCTRL_ALT1" group="XTAL32K1"/>
+                <signal pad-key="pf0" function="CLKCTRL" group="XTAL32K1"/>
+                <signal pad-key="pa1" function="CLKCTRL_ALT1" group="XTAL32K2"/>
+                <signal pad-key="pf1" function="CLKCTRL" group="XTAL32K2"/>
+                <signal pad-key="pa0" function="CLKCTRL" group="XTALHF1"/>
+                <signal pad-key="pa1" function="CLKCTRL" group="XTALHF2"/>
             </signals>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="cpu_avr_xt_v1">
@@ -139,19 +139,19 @@
         <peripheral key="dac0" name="DAC0" module-key="dac_nbit_ctrl_v5">
             <register-group-instance register-group-key="dac" address-space-key="data" offset="0x6A0"/>
             <signals>
-                <signal pad-id="pd6" index="0" function="DAC0" group="OUT"/>
+                <signal pad-key="pd6" index="0" function="DAC0" group="OUT"/>
             </signals>
         </peripheral>
         <peripheral key="evsys" name="EVSYS" module-key="chip_evsys">
             <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"/>
-                <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"/>
-                <signal pad-id="pd2" index="3" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTD"/>
-                <signal pad-id="pf7" index="5" function="EVSYS_ALT1" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTF"/>
-                <signal pad-id="pf2" index="5" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTF"/>
+                <signal pad-key="pa7" index="0" function="EVSYS_ALT1" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTA"/>
+                <signal pad-key="pa2" index="0" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTA"/>
+                <signal pad-key="pc2" index="2" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTC"/>
+                <signal pad-key="pd7" index="3" function="EVSYS_ALT1" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTD"/>
+                <signal pad-key="pd2" index="3" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTD"/>
+                <signal pad-key="pf7" index="5" function="EVSYS_ALT1" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTF"/>
+                <signal pad-key="pf2" index="5" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTF"/>
             </signals>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="chip_fuse">
@@ -172,48 +172,48 @@
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pa2" index="2" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa3" index="3" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa4" index="4" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa5" index="5" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa6" index="6" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa7" index="7" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa0" index="0" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa1" index="1" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa2" index="2" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa3" index="3" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa4" index="4" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa5" index="5" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa6" index="6" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa7" index="7" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pc2" index="2" function="IOPORT" group="PIN"/>
-                <signal pad-id="pc3" index="3" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc0" index="0" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc1" index="1" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc2" index="2" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc3" index="3" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pd3" index="3" function="IOPORT" group="PIN"/>
-                <signal pad-id="pd4" index="4" function="IOPORT" group="PIN"/>
-                <signal pad-id="pd5" index="5" function="IOPORT" group="PIN"/>
-                <signal pad-id="pd6" index="6" function="IOPORT" group="PIN"/>
-                <signal pad-id="pd7" index="7" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd1" index="1" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd2" index="2" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd3" index="3" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd4" index="4" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd5" index="5" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd6" index="6" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd7" index="7" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="portf" name="PORTF" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pf2" index="2" function="IOPORT" group="PIN"/>
-                <signal pad-id="pf3" index="3" function="IOPORT" group="PIN"/>
-                <signal pad-id="pf4" index="4" function="IOPORT" group="PIN"/>
-                <signal pad-id="pf5" index="5" function="IOPORT" group="PIN"/>
-                <signal pad-id="pf6" index="6" function="IOPORT" group="PIN"/>
-                <signal pad-id="pf7" index="7" function="IOPORT" group="PIN"/>
+                <signal pad-key="pf0" index="0" function="IOPORT" group="PIN"/>
+                <signal pad-key="pf1" index="1" function="IOPORT" group="PIN"/>
+                <signal pad-key="pf2" index="2" function="IOPORT" group="PIN"/>
+                <signal pad-key="pf3" index="3" function="IOPORT" group="PIN"/>
+                <signal pad-key="pf4" index="4" function="IOPORT" group="PIN"/>
+                <signal pad-key="pf5" index="5" function="IOPORT" group="PIN"/>
+                <signal pad-key="pf6" index="6" function="IOPORT" group="PIN"/>
+                <signal pad-key="pf7" index="7" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="portmux" name="PORTMUX" module-key="chip_portmux">
@@ -222,7 +222,7 @@
         <peripheral key="rstctrl" name="RSTCTRL" module-key="rst_integration_v8">
             <register-group-instance register-group-key="rstctrl" address-space-key="data" offset="0x40"/>
             <signals>
-                <signal pad-id="pf6" function="OTHER" group="RESET"/>
+                <signal pad-key="pf6" function="OTHER" group="RESET"/>
             </signals>
         </peripheral>
         <peripheral key="rtc" name="RTC" module-key="tmr_16b_rtc_v1">
@@ -237,26 +237,26 @@
         <peripheral key="spi0" name="SPI0" module-key="spi_8bit_v2">
             <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"/>
-                <signal pad-id="pd5" function="SPI0_ALT4" group="MISO" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <signal pad-id="pa1" function="SPI0_ALT3" group="MISO" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <signal pad-id="pa5" function="SPI0" group="MISO" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <signal pad-id="pc1" function="SPI0_ALT6" group="MOSI" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <signal pad-id="pc0" function="SPI0_ALT5" group="MOSI" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <signal pad-id="pd4" function="SPI0_ALT4" group="MOSI" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <signal pad-id="pa0" function="SPI0_ALT3" group="MOSI" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <signal pad-id="pa4" function="SPI0" group="MOSI" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <signal pad-id="pc3" function="SPI0_ALT6" group="SCK" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <signal pad-id="pc2" function="SPI0_ALT5" group="SCK" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <signal pad-id="pd6" function="SPI0_ALT4" group="SCK" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <signal pad-id="pc0" function="SPI0_ALT3" group="SCK" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <signal pad-id="pa6" function="SPI0" group="SCK" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <signal pad-id="pf7" function="SPI0_ALT6" group="SS" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <signal pad-id="pc3" function="SPI0_ALT5" group="SS" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <signal pad-id="pd7" function="SPI0_ALT4" group="SS" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <signal pad-id="pc1" function="SPI0_ALT3" group="SS" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <signal pad-id="pa7" function="SPI0" group="SS" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pc2" function="SPI0_ALT6" group="MISO" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pc1" function="SPI0_ALT5" group="MISO" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pd5" function="SPI0_ALT4" group="MISO" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pa1" function="SPI0_ALT3" group="MISO" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pa5" function="SPI0" group="MISO" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pc1" function="SPI0_ALT6" group="MOSI" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pc0" function="SPI0_ALT5" group="MOSI" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pd4" function="SPI0_ALT4" group="MOSI" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pa0" function="SPI0_ALT3" group="MOSI" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pa4" function="SPI0" group="MOSI" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pc3" function="SPI0_ALT6" group="SCK" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pc2" function="SPI0_ALT5" group="SCK" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pd6" function="SPI0_ALT4" group="SCK" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pc0" function="SPI0_ALT3" group="SCK" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pa6" function="SPI0" group="SCK" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pf7" function="SPI0_ALT6" group="SS" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pc3" function="SPI0_ALT5" group="SS" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pd7" function="SPI0_ALT4" group="SS" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pc1" function="SPI0_ALT3" group="SS" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pa7" function="SPI0" group="SS" field="PORTMUX.SPIROUTEA.SPI0"/>
             </signals>
         </peripheral>
         <peripheral key="syscfg" name="SYSCFG" module-key="chip_syscfg">
@@ -265,110 +265,110 @@
         <peripheral key="tca0" name="TCA0" module-key="tmr_16b_pwm_v1">
             <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"/>
-                <signal pad-id="pa0" index="0" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pf1" index="1" function="TCA0_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pd1" index="1" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pc1" index="1" function="TCA0_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pa1" index="1" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pf2" index="2" function="TCA0_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pd2" index="2" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pc2" index="2" function="TCA0_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pa2" index="2" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pf3" index="3" function="TCA0_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pd3" index="3" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pc3" index="3" function="TCA0_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pa3" index="3" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pf4" index="4" function="TCA0_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pd4" index="4" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pa4" index="4" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pf5" index="5" function="TCA0_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pd5" index="5" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pa5" index="5" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pf0" index="0" function="TCA0_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pc0" index="0" function="TCA0_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pa0" index="0" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pf1" index="1" function="TCA0_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pd1" index="1" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pc1" index="1" function="TCA0_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pa1" index="1" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pf2" index="2" function="TCA0_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pd2" index="2" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pc2" index="2" function="TCA0_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pa2" index="2" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pf3" index="3" function="TCA0_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pd3" index="3" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pc3" index="3" function="TCA0_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pa3" index="3" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pf4" index="4" function="TCA0_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pd4" index="4" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pa4" index="4" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pf5" index="5" function="TCA0_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pd5" index="5" function="TCA0_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pa5" index="5" function="TCA0" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
             </signals>
         </peripheral>
         <peripheral key="tcb0" name="TCB0" module-key="tmr_16b_capture_v1">
             <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"/>
+                <signal pad-key="pf4" index="0" function="TCB0_ALT1" group="WO" field="PORTMUX.TCBROUTEA.TCB0"/>
+                <signal pad-key="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 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"/>
+                <signal pad-key="pf5" index="0" function="TCB1_ALT1" group="WO" field="PORTMUX.TCBROUTEA.TCB1"/>
+                <signal pad-key="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 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"/>
+                <signal pad-key="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 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"/>
-                <signal pad-id="pa4" function="TCD0" group="WOA" field="PORTMUX.TCDROUTEA.TCD0"/>
-                <signal pad-id="pa5" index="1" function="TCD0_ALT4" group="WOB" field="PORTMUX.TCDROUTEA.TCD0"/>
-                <signal pad-id="pf1" index="1" function="TCD0_ALT2" group="WOB" field="PORTMUX.TCDROUTEA.TCD0"/>
-                <signal pad-id="pa5" index="1" function="TCD0" group="WOB" field="PORTMUX.TCDROUTEA.TCD0"/>
-                <signal pad-id="pd4" index="2" function="TCD0_ALT4" group="WOC" field="PORTMUX.TCDROUTEA.TCD0"/>
-                <signal pad-id="pf2" index="2" function="TCD0_ALT2" group="WOC" field="PORTMUX.TCDROUTEA.TCD0"/>
-                <signal pad-id="pa6" index="2" function="TCD0" group="WOC" field="PORTMUX.TCDROUTEA.TCD0"/>
-                <signal pad-id="pd5" index="3" function="TCD0_ALT4" group="WOD" field="PORTMUX.TCDROUTEA.TCD0"/>
-                <signal pad-id="pf3" index="3" function="TCD0_ALT2" group="WOD" field="PORTMUX.TCDROUTEA.TCD0"/>
-                <signal pad-id="pa7" index="3" function="TCD0" group="WOD" field="PORTMUX.TCDROUTEA.TCD0"/>
+                <signal pad-key="pa4" function="TCD0_ALT4" group="WOA" field="PORTMUX.TCDROUTEA.TCD0"/>
+                <signal pad-key="pf0" function="TCD0_ALT2" group="WOA" field="PORTMUX.TCDROUTEA.TCD0"/>
+                <signal pad-key="pa4" function="TCD0" group="WOA" field="PORTMUX.TCDROUTEA.TCD0"/>
+                <signal pad-key="pa5" index="1" function="TCD0_ALT4" group="WOB" field="PORTMUX.TCDROUTEA.TCD0"/>
+                <signal pad-key="pf1" index="1" function="TCD0_ALT2" group="WOB" field="PORTMUX.TCDROUTEA.TCD0"/>
+                <signal pad-key="pa5" index="1" function="TCD0" group="WOB" field="PORTMUX.TCDROUTEA.TCD0"/>
+                <signal pad-key="pd4" index="2" function="TCD0_ALT4" group="WOC" field="PORTMUX.TCDROUTEA.TCD0"/>
+                <signal pad-key="pf2" index="2" function="TCD0_ALT2" group="WOC" field="PORTMUX.TCDROUTEA.TCD0"/>
+                <signal pad-key="pa6" index="2" function="TCD0" group="WOC" field="PORTMUX.TCDROUTEA.TCD0"/>
+                <signal pad-key="pd5" index="3" function="TCD0_ALT4" group="WOD" field="PORTMUX.TCDROUTEA.TCD0"/>
+                <signal pad-key="pf3" index="3" function="TCD0_ALT2" group="WOD" field="PORTMUX.TCDROUTEA.TCD0"/>
+                <signal pad-key="pa7" index="3" function="TCD0" group="WOD" field="PORTMUX.TCDROUTEA.TCD0"/>
             </signals>
         </peripheral>
         <peripheral key="twi0" name="TWI0" module-key="i2c_8bit_avr_v3">
             <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"/>
-                <signal pad-id="pa3" function="I2C0_ALT1" group="SCL" field="PORTMUX.TWIROUTEA.TWI0"/>
-                <signal pad-id="pa3" function="I2C0" group="SCL" field="PORTMUX.TWIROUTEA.TWI0"/>
-                <signal pad-id="pa1" function="I2C0_ALT3" group="SDA" field="PORTMUX.TWIROUTEA.TWI0"/>
-                <signal pad-id="pc2" function="I2C0_ALT2" group="SDA" field="PORTMUX.TWIROUTEA.TWI0"/>
-                <signal pad-id="pa2" function="I2C0_ALT1" group="SDA" field="PORTMUX.TWIROUTEA.TWI0"/>
-                <signal pad-id="pa2" function="I2C0" group="SDA" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pa0" function="I2C0_ALT3" group="SCL" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pc3" function="I2C0_ALT2" group="SCL" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pa3" function="I2C0_ALT1" group="SCL" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pa3" function="I2C0" group="SCL" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pa1" function="I2C0_ALT3" group="SDA" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pc2" function="I2C0_ALT2" group="SDA" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pa2" function="I2C0_ALT1" group="SDA" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pa2" function="I2C0" group="SDA" field="PORTMUX.TWIROUTEA.TWI0"/>
             </signals>
         </peripheral>
         <peripheral key="usart0" name="USART0" module-key="uart_autobd_v4">
             <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"/>
-                <signal pad-id="pa3" function="USART0_ALT2" group="RXD" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pa5" function="USART0_ALT1" group="RXD" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pa1" function="USART0" group="RXD" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pc1" function="USART0_ALT4" group="TXD" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pd4" function="USART0_ALT3" group="TXD" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pa2" function="USART0_ALT2" group="TXD" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pa4" function="USART0_ALT1" group="TXD" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pa0" function="USART0" group="TXD" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pc3" function="USART0_ALT4" group="XCK" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pd6" function="USART0_ALT3" group="XCK" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pa6" function="USART0_ALT1" group="XCK" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pa2" function="USART0" group="XCK" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pd7" function="USART0_ALT3" group="XDIR" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pa7" function="USART0_ALT1" group="XDIR" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pa3" function="USART0" group="XDIR" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pc2" function="USART0_ALT4" group="RXD" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pd5" function="USART0_ALT3" group="RXD" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa3" function="USART0_ALT2" group="RXD" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa5" function="USART0_ALT1" group="RXD" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa1" function="USART0" group="RXD" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pc1" function="USART0_ALT4" group="TXD" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pd4" function="USART0_ALT3" group="TXD" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa2" function="USART0_ALT2" group="TXD" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa4" function="USART0_ALT1" group="TXD" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa0" function="USART0" group="TXD" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pc3" function="USART0_ALT4" group="XCK" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pd6" function="USART0_ALT3" group="XCK" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa6" function="USART0_ALT1" group="XCK" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa2" function="USART0" group="XCK" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pd7" function="USART0_ALT3" group="XDIR" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa7" function="USART0_ALT1" group="XDIR" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa3" function="USART0" group="XDIR" field="PORTMUX.USARTROUTEA.USART0"/>
             </signals>
         </peripheral>
         <peripheral key="usart1" name="USART1" module-key="uart_autobd_v4">
             <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"/>
-                <signal pad-id="pd6" function="USART1_ALT2" group="TXD" field="PORTMUX.USARTROUTEA.USART1"/>
-                <signal pad-id="pc0" function="USART1" group="TXD" field="PORTMUX.USARTROUTEA.USART1"/>
-                <signal pad-id="pc2" function="USART1" group="XCK" field="PORTMUX.USARTROUTEA.USART1"/>
-                <signal pad-id="pc3" function="USART1" group="XDIR" field="PORTMUX.USARTROUTEA.USART1"/>
+                <signal pad-key="pd7" function="USART1_ALT2" group="RXD" field="PORTMUX.USARTROUTEA.USART1"/>
+                <signal pad-key="pc1" function="USART1" group="RXD" field="PORTMUX.USARTROUTEA.USART1"/>
+                <signal pad-key="pd6" function="USART1_ALT2" group="TXD" field="PORTMUX.USARTROUTEA.USART1"/>
+                <signal pad-key="pc0" function="USART1" group="TXD" field="PORTMUX.USARTROUTEA.USART1"/>
+                <signal pad-key="pc2" function="USART1" group="XCK" field="PORTMUX.USARTROUTEA.USART1"/>
+                <signal pad-key="pc3" function="USART1" group="XDIR" field="PORTMUX.USARTROUTEA.USART1"/>
             </signals>
         </peripheral>
         <peripheral key="userrow" name="USERROW" module-key="chip_userrow">
@@ -395,8 +395,8 @@
         <peripheral key="zcd3" name="ZCD3" module-key="cmp_zxover_ctrl_v3">
             <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"/>
+                <signal pad-key="pc2" function="ZCD3" group="IN" field="PORTMUX.ZCDROUTEA.ZCD3"/>
+                <signal pad-key="pa7" function="ZCD3" group="OUT" field="PORTMUX.ZCDROUTEA.ZCD3"/>
             </signals>
         </peripheral>
     </peripherals>
@@ -1647,43 +1647,77 @@
             </register-group>
         </module>
     </modules>
+    <pads>
+        <pad key="pa3" name="PA3"/>
+        <pad key="pa4" name="PA4"/>
+        <pad key="pa5" name="PA5"/>
+        <pad key="pa6" name="PA6"/>
+        <pad key="pa7" name="PA7"/>
+        <pad key="pc0" name="PC0"/>
+        <pad key="pc1" name="PC1"/>
+        <pad key="pc2" name="PC2"/>
+        <pad key="pc3" name="PC3"/>
+        <pad key="vddio2" name="VDDIO2"/>
+        <pad key="pd1" name="PD1"/>
+        <pad key="pd2" name="PD2"/>
+        <pad key="pd3" name="PD3"/>
+        <pad key="pd4" name="PD4"/>
+        <pad key="pd5" name="PD5"/>
+        <pad key="pd6" name="PD6"/>
+        <pad key="pd7" name="PD7"/>
+        <pad key="avdd" name="AVDD"/>
+        <pad key="agnd" name="AGND"/>
+        <pad key="pf0" name="PF0"/>
+        <pad key="pf1" name="PF1"/>
+        <pad key="pf2" name="PF2"/>
+        <pad key="pf3" name="PF3"/>
+        <pad key="pf4" name="PF4"/>
+        <pad key="pf5" name="PF5"/>
+        <pad key="pf6" name="PF6"/>
+        <pad key="pf7" name="PF7"/>
+        <pad key="vdd0" name="VDD0"/>
+        <pad key="gnd0" name="GND0"/>
+        <pad key="pa0" name="PA0"/>
+        <pad key="pa1" name="PA1"/>
+        <pad key="pa2" name="PA2"/>
+    </pads>
     <pinouts>
         <pinout key="qfn32mvio" name="QFN32MVIO" type="qfn">
-            <pin position="1" pad="PA3"/>
-            <pin position="2" pad="PA4"/>
-            <pin position="3" pad="PA5"/>
-            <pin position="4" pad="PA6"/>
-            <pin position="5" pad="PA7"/>
-            <pin position="6" pad="PC0"/>
-            <pin position="7" pad="PC1"/>
-            <pin position="8" pad="PC2"/>
-            <pin position="9" pad="PC3"/>
-            <pin position="10" pad="VDDIO2"/>
-            <pin position="11" pad="PD1"/>
-            <pin position="12" pad="PD2"/>
-            <pin position="13" pad="PD3"/>
-            <pin position="14" pad="PD4"/>
-            <pin position="15" pad="PD5"/>
-            <pin position="16" pad="PD6"/>
-            <pin position="17" pad="PD7"/>
-            <pin position="18" pad="AVDD"/>
-            <pin position="19" pad="AGND"/>
-            <pin position="20" pad="PF0"/>
-            <pin position="21" pad="PF1"/>
-            <pin position="22" pad="PF2"/>
-            <pin position="23" pad="PF3"/>
-            <pin position="24" pad="PF4"/>
-            <pin position="25" pad="PF5"/>
-            <pin position="26" pad="PF6"/>
-            <pin position="27" pad="PF7"/>
-            <pin position="28" pad="VDD0"/>
-            <pin position="29" pad="GND0"/>
-            <pin position="30" pad="PA0"/>
-            <pin position="31" pad="PA1"/>
-            <pin position="32" pad="PA2"/>
+            <pin position="1" pad-key="pa3"/>
+            <pin position="2" pad-key="pa4"/>
+            <pin position="3" pad-key="pa5"/>
+            <pin position="4" pad-key="pa6"/>
+            <pin position="5" pad-key="pa7"/>
+            <pin position="6" pad-key="pc0"/>
+            <pin position="7" pad-key="pc1"/>
+            <pin position="8" pad-key="pc2"/>
+            <pin position="9" pad-key="pc3"/>
+            <pin position="10" pad-key="vddio2"/>
+            <pin position="11" pad-key="pd1"/>
+            <pin position="12" pad-key="pd2"/>
+            <pin position="13" pad-key="pd3"/>
+            <pin position="14" pad-key="pd4"/>
+            <pin position="15" pad-key="pd5"/>
+            <pin position="16" pad-key="pd6"/>
+            <pin position="17" pad-key="pd7"/>
+            <pin position="18" pad-key="avdd"/>
+            <pin position="19" pad-key="agnd"/>
+            <pin position="20" pad-key="pf0"/>
+            <pin position="21" pad-key="pf1"/>
+            <pin position="22" pad-key="pf2"/>
+            <pin position="23" pad-key="pf3"/>
+            <pin position="24" pad-key="pf4"/>
+            <pin position="25" pad-key="pf5"/>
+            <pin position="26" pad-key="pf6"/>
+            <pin position="27" pad-key="pf7"/>
+            <pin position="28" pad-key="vdd0"/>
+            <pin position="29" pad-key="gnd0"/>
+            <pin position="30" pad-key="pa0"/>
+            <pin position="31" pad-key="pa1"/>
+            <pin position="32" pad-key="pa2"/>
         </pinout>
     </pinouts>
     <variants>
-        <variant name="AVR64DD32" pinout-key="qfn32mvio" package="QFN32"/>
+        <variant key="avr64dd32" name="AVR64DD32" pinout-key="qfn32mvio"/>
     </variants>
 </device>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/E-SERIES/AVR64EA28.xml b/src/Targets/TargetDescriptionFiles/AVR8/E-SERIES/AVR64EA28.xml
index 347b158d..d2d7a3d9 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/E-SERIES/AVR64EA28.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/E-SERIES/AVR64EA28.xml
@@ -44,73 +44,73 @@
         <peripheral key="ac0" name="AC0" module-key="cmp_control_v8">
             <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"/>
-                <signal pad-id="pd7" index="2" function="AINN" group="AINN"/>
-                <signal pad-id="pc2" index="3" function="AINN" group="AINN"/>
-                <signal pad-id="pd2" index="0" function="AINP" group="AINP"/>
-                <signal pad-id="pd6" index="3" function="AINP" group="AINP"/>
-                <signal pad-id="pc3" index="4" function="AINP" group="AINP"/>
-                <signal pad-id="pa7" function="DEFAULT" group="OUT" field="PORTMUX.ACROUTEA.AC0"/>
+                <signal pad-key="pd3" index="0" function="AINN" group="AINN"/>
+                <signal pad-key="pd0" index="1" function="AINN" group="AINN"/>
+                <signal pad-key="pd7" index="2" function="AINN" group="AINN"/>
+                <signal pad-key="pc2" index="3" function="AINN" group="AINN"/>
+                <signal pad-key="pd2" index="0" function="AINP" group="AINP"/>
+                <signal pad-key="pd6" index="3" function="AINP" group="AINP"/>
+                <signal pad-key="pc3" index="4" function="AINP" group="AINP"/>
+                <signal pad-key="pa7" function="DEFAULT" group="OUT" field="PORTMUX.ACROUTEA.AC0"/>
             </signals>
         </peripheral>
         <peripheral key="ac1" name="AC1" module-key="cmp_control_v8">
             <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"/>
-                <signal pad-id="pd7" index="2" function="AINN" group="AINN"/>
-                <signal pad-id="pd2" index="0" function="AINP" group="AINP"/>
-                <signal pad-id="pd3" index="1" function="AINP" group="AINP"/>
-                <signal pad-id="pd4" index="2" function="AINP" group="AINP"/>
-                <signal pad-id="pd6" index="3" function="AINP" group="AINP"/>
-                <signal pad-id="pc3" index="4" function="AINP" group="AINP"/>
-                <signal pad-id="pa7" function="DEFAULT" group="OUT" field="PORTMUX.ACROUTEA.AC1"/>
+                <signal pad-key="pd5" index="0" function="AINN" group="AINN"/>
+                <signal pad-key="pd0" index="1" function="AINN" group="AINN"/>
+                <signal pad-key="pd7" index="2" function="AINN" group="AINN"/>
+                <signal pad-key="pd2" index="0" function="AINP" group="AINP"/>
+                <signal pad-key="pd3" index="1" function="AINP" group="AINP"/>
+                <signal pad-key="pd4" index="2" function="AINP" group="AINP"/>
+                <signal pad-key="pd6" index="3" function="AINP" group="AINP"/>
+                <signal pad-key="pc3" index="4" function="AINP" group="AINP"/>
+                <signal pad-key="pa7" function="DEFAULT" group="OUT" field="PORTMUX.ACROUTEA.AC1"/>
             </signals>
         </peripheral>
         <peripheral key="adc0" name="ADC0" module-key="adc_12b_diff_ctrl_avr_v2">
             <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"/>
-                <signal pad-id="pd2" index="2" function="AINN" group="AINN"/>
-                <signal pad-id="pd3" index="3" function="AINN" group="AINN"/>
-                <signal pad-id="pd4" index="4" function="AINN" group="AINN"/>
-                <signal pad-id="pd5" index="5" function="AINN" group="AINN"/>
-                <signal pad-id="pd6" index="6" function="AINN" group="AINN"/>
-                <signal pad-id="pd7" index="7" function="AINN" group="AINN"/>
-                <signal pad-id="pf0" index="16" function="AINN" group="AINN"/>
-                <signal pad-id="pf1" index="17" function="AINN" group="AINN"/>
-                <signal pad-id="pa2" index="22" function="AINN" group="AINN"/>
-                <signal pad-id="pa3" index="23" function="AINN" group="AINN"/>
-                <signal pad-id="pa4" index="24" function="AINN" group="AINN"/>
-                <signal pad-id="pa5" index="25" function="AINN" group="AINN"/>
-                <signal pad-id="pa6" index="26" function="AINN" group="AINN"/>
-                <signal pad-id="pa7" index="27" function="AINN" group="AINN"/>
-                <signal pad-id="pc0" index="28" function="AINN" group="AINN"/>
-                <signal pad-id="pc1" index="29" function="AINN" group="AINN"/>
-                <signal pad-id="pc2" index="30" function="AINN" group="AINN"/>
-                <signal pad-id="pc3" index="31" function="AINN" group="AINN"/>
-                <signal pad-id="pd0" index="0" function="AINP" group="AINP"/>
-                <signal pad-id="pd1" index="1" function="AINP" group="AINP"/>
-                <signal pad-id="pd2" index="2" function="AINP" group="AINP"/>
-                <signal pad-id="pd3" index="3" function="AINP" group="AINP"/>
-                <signal pad-id="pd4" index="4" function="AINP" group="AINP"/>
-                <signal pad-id="pd5" index="5" function="AINP" group="AINP"/>
-                <signal pad-id="pd6" index="6" function="AINP" group="AINP"/>
-                <signal pad-id="pd7" index="7" function="AINP" group="AINP"/>
-                <signal pad-id="pf0" index="16" function="AINP" group="AINP"/>
-                <signal pad-id="pf1" index="17" function="AINP" group="AINP"/>
-                <signal pad-id="pa2" index="22" function="AINP" group="AINP"/>
-                <signal pad-id="pa3" index="23" function="AINP" group="AINP"/>
-                <signal pad-id="pa4" index="24" function="AINP" group="AINP"/>
-                <signal pad-id="pa5" index="25" function="AINP" group="AINP"/>
-                <signal pad-id="pa6" index="26" function="AINP" group="AINP"/>
-                <signal pad-id="pa7" index="27" function="AINP" group="AINP"/>
-                <signal pad-id="pc0" index="28" function="AINP" group="AINP"/>
-                <signal pad-id="pc1" index="29" function="AINP" group="AINP"/>
-                <signal pad-id="pc2" index="30" function="AINP" group="AINP"/>
-                <signal pad-id="pc3" index="31" function="AINP" group="AINP"/>
+                <signal pad-key="pd0" index="0" function="AINN" group="AINN"/>
+                <signal pad-key="pd1" index="1" function="AINN" group="AINN"/>
+                <signal pad-key="pd2" index="2" function="AINN" group="AINN"/>
+                <signal pad-key="pd3" index="3" function="AINN" group="AINN"/>
+                <signal pad-key="pd4" index="4" function="AINN" group="AINN"/>
+                <signal pad-key="pd5" index="5" function="AINN" group="AINN"/>
+                <signal pad-key="pd6" index="6" function="AINN" group="AINN"/>
+                <signal pad-key="pd7" index="7" function="AINN" group="AINN"/>
+                <signal pad-key="pf0" index="16" function="AINN" group="AINN"/>
+                <signal pad-key="pf1" index="17" function="AINN" group="AINN"/>
+                <signal pad-key="pa2" index="22" function="AINN" group="AINN"/>
+                <signal pad-key="pa3" index="23" function="AINN" group="AINN"/>
+                <signal pad-key="pa4" index="24" function="AINN" group="AINN"/>
+                <signal pad-key="pa5" index="25" function="AINN" group="AINN"/>
+                <signal pad-key="pa6" index="26" function="AINN" group="AINN"/>
+                <signal pad-key="pa7" index="27" function="AINN" group="AINN"/>
+                <signal pad-key="pc0" index="28" function="AINN" group="AINN"/>
+                <signal pad-key="pc1" index="29" function="AINN" group="AINN"/>
+                <signal pad-key="pc2" index="30" function="AINN" group="AINN"/>
+                <signal pad-key="pc3" index="31" function="AINN" group="AINN"/>
+                <signal pad-key="pd0" index="0" function="AINP" group="AINP"/>
+                <signal pad-key="pd1" index="1" function="AINP" group="AINP"/>
+                <signal pad-key="pd2" index="2" function="AINP" group="AINP"/>
+                <signal pad-key="pd3" index="3" function="AINP" group="AINP"/>
+                <signal pad-key="pd4" index="4" function="AINP" group="AINP"/>
+                <signal pad-key="pd5" index="5" function="AINP" group="AINP"/>
+                <signal pad-key="pd6" index="6" function="AINP" group="AINP"/>
+                <signal pad-key="pd7" index="7" function="AINP" group="AINP"/>
+                <signal pad-key="pf0" index="16" function="AINP" group="AINP"/>
+                <signal pad-key="pf1" index="17" function="AINP" group="AINP"/>
+                <signal pad-key="pa2" index="22" function="AINP" group="AINP"/>
+                <signal pad-key="pa3" index="23" function="AINP" group="AINP"/>
+                <signal pad-key="pa4" index="24" function="AINP" group="AINP"/>
+                <signal pad-key="pa5" index="25" function="AINP" group="AINP"/>
+                <signal pad-key="pa6" index="26" function="AINP" group="AINP"/>
+                <signal pad-key="pa7" index="27" function="AINP" group="AINP"/>
+                <signal pad-key="pc0" index="28" function="AINP" group="AINP"/>
+                <signal pad-key="pc1" index="29" function="AINP" group="AINP"/>
+                <signal pad-key="pc2" index="30" function="AINP" group="AINP"/>
+                <signal pad-key="pc3" index="31" function="AINP" group="AINP"/>
             </signals>
         </peripheral>
         <peripheral key="bod" name="BOD" module-key="bor_lvd_ctrl_avr_v2">
@@ -119,33 +119,33 @@
         <peripheral key="ccl" name="CCL" module-key="cla_ccl_v1">
             <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"/>
-                <signal pad-id="pa2" index="2" function="IN" group="LUT0_IN"/>
-                <signal pad-id="pc0" index="0" function="IN" group="LUT1_IN"/>
-                <signal pad-id="pc1" index="1" function="IN" group="LUT1_IN"/>
-                <signal pad-id="pc2" index="2" function="IN" group="LUT1_IN"/>
-                <signal pad-id="pd0" index="0" function="IN" group="LUT2_IN"/>
-                <signal pad-id="pd1" index="1" function="IN" group="LUT2_IN"/>
-                <signal pad-id="pd2" index="2" function="IN" group="LUT2_IN"/>
-                <signal pad-id="pf0" index="0" function="IN" group="LUT3_IN"/>
-                <signal pad-id="pf1" index="1" function="IN" group="LUT3_IN"/>
-                <signal pad-id="pa6" function="ALT1" group="LUT0_OUT" field="PORTMUX.CCLROUTEA.LUT0"/>
-                <signal pad-id="pa3" function="DEFAULT" group="LUT0_OUT" field="PORTMUX.CCLROUTEA.LUT0"/>
-                <signal pad-id="pc3" function="DEFAULT" group="LUT1_OUT" field="PORTMUX.CCLROUTEA.LUT1"/>
-                <signal pad-id="pd6" function="ALT1" group="LUT2_OUT" field="PORTMUX.CCLROUTEA.LUT2"/>
-                <signal pad-id="pd3" function="DEFAULT" group="LUT2_OUT" field="PORTMUX.CCLROUTEA.LUT2"/>
+                <signal pad-key="pa0" index="0" function="IN" group="LUT0_IN"/>
+                <signal pad-key="pa1" index="1" function="IN" group="LUT0_IN"/>
+                <signal pad-key="pa2" index="2" function="IN" group="LUT0_IN"/>
+                <signal pad-key="pc0" index="0" function="IN" group="LUT1_IN"/>
+                <signal pad-key="pc1" index="1" function="IN" group="LUT1_IN"/>
+                <signal pad-key="pc2" index="2" function="IN" group="LUT1_IN"/>
+                <signal pad-key="pd0" index="0" function="IN" group="LUT2_IN"/>
+                <signal pad-key="pd1" index="1" function="IN" group="LUT2_IN"/>
+                <signal pad-key="pd2" index="2" function="IN" group="LUT2_IN"/>
+                <signal pad-key="pf0" index="0" function="IN" group="LUT3_IN"/>
+                <signal pad-key="pf1" index="1" function="IN" group="LUT3_IN"/>
+                <signal pad-key="pa6" function="ALT1" group="LUT0_OUT" field="PORTMUX.CCLROUTEA.LUT0"/>
+                <signal pad-key="pa3" function="DEFAULT" group="LUT0_OUT" field="PORTMUX.CCLROUTEA.LUT0"/>
+                <signal pad-key="pc3" function="DEFAULT" group="LUT1_OUT" field="PORTMUX.CCLROUTEA.LUT1"/>
+                <signal pad-key="pd6" function="ALT1" group="LUT2_OUT" field="PORTMUX.CCLROUTEA.LUT2"/>
+                <signal pad-key="pd3" function="DEFAULT" group="LUT2_OUT" field="PORTMUX.CCLROUTEA.LUT2"/>
             </signals>
         </peripheral>
         <peripheral key="clkctrl" name="CLKCTRL" module-key="avrea_clkctrl">
             <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"/>
-                <signal pad-id="pf0" index="1" function="XTAL" group="XTAL32K"/>
-                <signal pad-id="pf1" index="2" function="XTAL" group="XTAL32K"/>
-                <signal pad-id="pa0" index="1" function="XTAL" group="XTALHF"/>
-                <signal pad-id="pa1" index="2" function="XTAL" group="XTALHF"/>
+                <signal pad-key="pa0" function="EXTCLK" group="EXTCLK"/>
+                <signal pad-key="pa7" function="OUT" group="CLKOUT"/>
+                <signal pad-key="pf0" index="1" function="XTAL" group="XTAL32K"/>
+                <signal pad-key="pf1" index="2" function="XTAL" group="XTAL32K"/>
+                <signal pad-key="pa0" index="1" function="XTAL" group="XTALHF"/>
+                <signal pad-key="pa1" index="2" function="XTAL" group="XTALHF"/>
             </signals>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="cpu_avr_xt_v1">
@@ -160,18 +160,18 @@
         <peripheral key="dac0" name="DAC0" module-key="dac_nbit_ctrl_avr_v6">
             <register-group-instance register-group-key="dac" address-space-key="data" offset="0x6A0"/>
             <signals>
-                <signal pad-id="pd6" function="VOUT" group="OUT"/>
+                <signal pad-key="pd6" function="VOUT" group="OUT"/>
             </signals>
         </peripheral>
         <peripheral key="evsys" name="EVSYS" module-key="avrea_evsys">
             <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"/>
-                <signal pad-id="pc2" index="2" function="DEFAULT" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTC"/>
-                <signal pad-id="pd7" index="3" function="ALT1" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTD"/>
-                <signal pad-id="pd2" index="3" function="DEFAULT" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTD"/>
-                <signal pad-id="pf7" index="5" function="ALT1" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTF"/>
+                <signal pad-key="pa7" index="0" function="ALT1" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTA"/>
+                <signal pad-key="pa2" index="0" function="DEFAULT" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTA"/>
+                <signal pad-key="pc2" index="2" function="DEFAULT" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTC"/>
+                <signal pad-key="pd7" index="3" function="ALT1" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTD"/>
+                <signal pad-key="pd2" index="3" function="DEFAULT" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTD"/>
+                <signal pad-key="pf7" index="5" function="ALT1" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTF"/>
             </signals>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="avrea_fuse">
@@ -189,45 +189,45 @@
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pa2" index="2" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa3" index="3" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa4" index="4" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa5" index="5" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa6" index="6" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa7" index="7" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa0" index="0" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa1" index="1" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa2" index="2" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa3" index="3" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa4" index="4" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa5" index="5" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa6" index="6" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa7" index="7" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pc2" index="2" function="IOPORT" group="PIN"/>
-                <signal pad-id="pc3" index="3" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc0" index="0" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc1" index="1" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc2" index="2" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc3" index="3" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pd2" index="2" function="IOPORT" group="PIN"/>
-                <signal pad-id="pd3" index="3" function="IOPORT" group="PIN"/>
-                <signal pad-id="pd4" index="4" function="IOPORT" group="PIN"/>
-                <signal pad-id="pd5" index="5" function="IOPORT" group="PIN"/>
-                <signal pad-id="pd6" index="6" function="IOPORT" group="PIN"/>
-                <signal pad-id="pd7" index="7" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd0" index="0" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd1" index="1" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd2" index="2" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd3" index="3" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd4" index="4" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd5" index="5" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd6" index="6" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd7" index="7" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="portf" name="PORTF" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pf6" index="6" function="IOPORT" group="PIN"/>
-                <signal pad-id="pf7" index="7" function="IOPORT" group="PIN"/>
+                <signal pad-key="pf0" index="0" function="IOPORT" group="PIN"/>
+                <signal pad-key="pf1" index="1" function="IOPORT" group="PIN"/>
+                <signal pad-key="pf6" index="6" function="IOPORT" group="PIN"/>
+                <signal pad-key="pf7" index="7" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="portmux" name="PORTMUX" module-key="avrea_portmux">
@@ -236,7 +236,7 @@
         <peripheral key="rstctrl" name="RSTCTRL" module-key="rst_integration_avr_v2">
             <register-group-instance register-group-key="rstctrl" address-space-key="data" offset="0x40"/>
             <signals>
-                <signal pad-id="pf6" function="OTHER" group="RESET"/>
+                <signal pad-key="pf6" function="OTHER" group="RESET"/>
             </signals>
         </peripheral>
         <peripheral key="rtc" name="RTC" module-key="tmr_16b_rtc_avr_v2">
@@ -251,26 +251,26 @@
         <peripheral key="spi0" name="SPI0" module-key="spi_8bit_v2">
             <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"/>
-                <signal pad-id="pc0" function="ALT3" group="SCK" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <signal pad-id="pc1" function="ALT3" group="SS" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <signal pad-id="pd5" function="ALT4" group="MISO" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <signal pad-id="pd4" function="ALT4" group="MOSI" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <signal pad-id="pd6" function="ALT4" group="SCK" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <signal pad-id="pd7" function="ALT4" group="SS" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <signal pad-id="pc1" function="ALT5" group="MISO" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <signal pad-id="pc0" function="ALT5" group="MOSI" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <signal pad-id="pc2" function="ALT5" group="SCK" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <signal pad-id="pc3" function="ALT5" group="SS" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <signal pad-id="pc1" function="ALT6" group="MISO" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <signal pad-id="pc2" function="ALT6" group="MOSI" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <signal pad-id="pc3" function="ALT6" group="SCK" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <signal pad-id="pf7" function="ALT6" group="SS" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <signal pad-id="pa5" function="DEFAULT" group="MISO" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <signal pad-id="pa4" function="DEFAULT" group="MOSI" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <signal pad-id="pa6" function="DEFAULT" group="SCK" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <signal pad-id="pa7" function="DEFAULT" group="SS" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pa1" function="ALT3" group="MISO" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pa0" function="ALT3" group="MOSI" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pc0" function="ALT3" group="SCK" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pc1" function="ALT3" group="SS" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pd5" function="ALT4" group="MISO" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pd4" function="ALT4" group="MOSI" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pd6" function="ALT4" group="SCK" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pd7" function="ALT4" group="SS" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pc1" function="ALT5" group="MISO" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pc0" function="ALT5" group="MOSI" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pc2" function="ALT5" group="SCK" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pc3" function="ALT5" group="SS" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pc1" function="ALT6" group="MISO" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pc2" function="ALT6" group="MOSI" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pc3" function="ALT6" group="SCK" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pf7" function="ALT6" group="SS" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pa5" function="DEFAULT" group="MISO" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pa4" function="DEFAULT" group="MOSI" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pa6" function="DEFAULT" group="SCK" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pa7" function="DEFAULT" group="SS" field="PORTMUX.SPIROUTEA.SPI0"/>
             </signals>
         </peripheral>
         <peripheral key="syscfg" name="SYSCFG" module-key="avrea_syscfg">
@@ -279,99 +279,99 @@
         <peripheral key="tca0" name="TCA0" module-key="tmr_16b_pwm_v1">
             <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"/>
-                <signal pad-id="pc2" index="2" function="ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pc3" index="3" function="ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pd0" index="0" function="ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pd1" index="1" function="ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pd2" index="2" function="ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pd3" index="3" function="ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pd4" index="4" function="ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pd5" index="5" function="ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pf0" index="0" function="ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pf1" index="1" function="ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pa0" index="0" function="DEFAULT" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pa1" index="1" function="DEFAULT" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pa2" index="2" function="DEFAULT" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pa3" index="3" function="DEFAULT" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pa4" index="4" function="DEFAULT" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pa5" index="5" function="DEFAULT" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pc0" index="0" function="ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pc1" index="1" function="ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pc2" index="2" function="ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pc3" index="3" function="ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pd0" index="0" function="ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pd1" index="1" function="ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pd2" index="2" function="ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pd3" index="3" function="ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pd4" index="4" function="ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pd5" index="5" function="ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pf0" index="0" function="ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pf1" index="1" function="ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pa0" index="0" function="DEFAULT" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pa1" index="1" function="DEFAULT" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pa2" index="2" function="DEFAULT" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pa3" index="3" function="DEFAULT" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pa4" index="4" function="DEFAULT" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pa5" index="5" function="DEFAULT" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
             </signals>
         </peripheral>
         <peripheral key="tcb0" name="TCB0" module-key="tmr_16b_capture_v1">
             <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"/>
+                <signal pad-key="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 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"/>
+                <signal pad-key="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 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"/>
+                <signal pad-key="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 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"/>
-                <signal pad-id="pc3" function="ALT2" group="SCL" field="PORTMUX.TWIROUTEA.TWI0"/>
-                <signal pad-id="pc2" function="ALT2" group="SDA" field="PORTMUX.TWIROUTEA.TWI0"/>
-                <signal pad-id="pa1" function="ALT3" group="SCL" field="PORTMUX.TWIROUTEA.TWI0"/>
-                <signal pad-id="pc3" function="ALT3" group="SCL_DUAL" field="PORTMUX.TWIROUTEA.TWI0"/>
-                <signal pad-id="pa0" function="ALT3" group="SDA" field="PORTMUX.TWIROUTEA.TWI0"/>
-                <signal pad-id="pc2" function="ALT3" group="SDA_DUAL" field="PORTMUX.TWIROUTEA.TWI0"/>
-                <signal pad-id="pa3" function="DEFAULT" group="SCL" field="PORTMUX.TWIROUTEA.TWI0"/>
-                <signal pad-id="pc3" function="DEFAULT" group="SCL_DUAL" field="PORTMUX.TWIROUTEA.TWI0"/>
-                <signal pad-id="pa2" function="DEFAULT" group="SDA" field="PORTMUX.TWIROUTEA.TWI0"/>
-                <signal pad-id="pc2" function="DEFAULT" group="SDA_DUAL" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pa3" function="ALT1" group="SCL" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pa2" function="ALT1" group="SDA" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pc3" function="ALT2" group="SCL" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pc2" function="ALT2" group="SDA" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pa1" function="ALT3" group="SCL" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pc3" function="ALT3" group="SCL_DUAL" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pa0" function="ALT3" group="SDA" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pc2" function="ALT3" group="SDA_DUAL" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pa3" function="DEFAULT" group="SCL" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pc3" function="DEFAULT" group="SCL_DUAL" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pa2" function="DEFAULT" group="SDA" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pc2" function="DEFAULT" group="SDA_DUAL" field="PORTMUX.TWIROUTEA.TWI0"/>
             </signals>
         </peripheral>
         <peripheral key="usart0" name="USART0" module-key="uart_autobd_v4">
             <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"/>
-                <signal pad-id="pa6" index="1" function="ALT1" group="XCK" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pa7" index="1" function="ALT1" group="XDIR" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pa3" index="2" function="ALT2" group="RXD" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pa2" index="2" function="ALT2" group="TXD" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pd5" index="3" function="ALT3" group="RXD" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pd4" index="3" function="ALT3" group="TXD" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pd6" index="3" function="ALT3" group="XCK" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pd7" index="3" function="ALT3" group="XDIR" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pc2" index="4" function="ALT4" group="RXD" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pc1" index="4" function="ALT4" group="TXD" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pc3" index="4" function="ALT4" group="XCK" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pa1" function="DEFAULT" group="RXD" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pa0" function="DEFAULT" group="TXD" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pa2" function="DEFAULT" group="XCK" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pa3" function="DEFAULT" group="XDIR" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa5" index="1" function="ALT1" group="RXD" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa4" index="1" function="ALT1" group="TXD" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa6" index="1" function="ALT1" group="XCK" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa7" index="1" function="ALT1" group="XDIR" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa3" index="2" function="ALT2" group="RXD" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa2" index="2" function="ALT2" group="TXD" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pd5" index="3" function="ALT3" group="RXD" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pd4" index="3" function="ALT3" group="TXD" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pd6" index="3" function="ALT3" group="XCK" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pd7" index="3" function="ALT3" group="XDIR" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pc2" index="4" function="ALT4" group="RXD" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pc1" index="4" function="ALT4" group="TXD" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pc3" index="4" function="ALT4" group="XCK" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa1" function="DEFAULT" group="RXD" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa0" function="DEFAULT" group="TXD" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa2" function="DEFAULT" group="XCK" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa3" function="DEFAULT" group="XDIR" field="PORTMUX.USARTROUTEA.USART0"/>
             </signals>
         </peripheral>
         <peripheral key="usart1" name="USART1" module-key="uart_autobd_v4">
             <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"/>
-                <signal pad-id="pc1" function="DEFAULT" group="RXD" field="PORTMUX.USARTROUTEA.USART1"/>
-                <signal pad-id="pc0" function="DEFAULT" group="TXD" field="PORTMUX.USARTROUTEA.USART1"/>
-                <signal pad-id="pc2" function="DEFAULT" group="XCK" field="PORTMUX.USARTROUTEA.USART1"/>
-                <signal pad-id="pc3" function="DEFAULT" group="XDIR" field="PORTMUX.USARTROUTEA.USART1"/>
+                <signal pad-key="pd7" function="ALT2" group="RXD" field="PORTMUX.USARTROUTEA.USART1"/>
+                <signal pad-key="pd6" function="ALT2" group="TXD" field="PORTMUX.USARTROUTEA.USART1"/>
+                <signal pad-key="pc1" function="DEFAULT" group="RXD" field="PORTMUX.USARTROUTEA.USART1"/>
+                <signal pad-key="pc0" function="DEFAULT" group="TXD" field="PORTMUX.USARTROUTEA.USART1"/>
+                <signal pad-key="pc2" function="DEFAULT" group="XCK" field="PORTMUX.USARTROUTEA.USART1"/>
+                <signal pad-key="pc3" function="DEFAULT" group="XDIR" field="PORTMUX.USARTROUTEA.USART1"/>
             </signals>
         </peripheral>
         <peripheral key="usart2" name="USART2" module-key="uart_autobd_v4">
             <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"/>
+                <signal pad-key="pf1" function="DEFAULT" group="RXD" field="PORTMUX.USARTROUTEA.USART2"/>
+                <signal pad-key="pf0" function="DEFAULT" group="TXD" field="PORTMUX.USARTROUTEA.USART2"/>
             </signals>
         </peripheral>
         <peripheral key="userrow" name="USERROW" module-key="avrea_userrow">
@@ -392,7 +392,7 @@
         <peripheral key="vref" name="VREF" module-key="avrea_vref">
             <register-group-instance register-group-key="vref" address-space-key="data" offset="0xB0"/>
             <signals>
-                <signal pad-id="pd7" function="VREF" group="VREFA"/>
+                <signal pad-key="pd7" function="VREF" group="VREFA"/>
             </signals>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="wdt_windowed_v2">
@@ -1582,39 +1582,69 @@
             </register-group>
         </module>
     </modules>
+    <pads>
+        <pad key="pa7" name="PA7"/>
+        <pad key="pc0" name="PC0"/>
+        <pad key="pc1" name="PC1"/>
+        <pad key="pc2" name="PC2"/>
+        <pad key="pc3" name="PC3"/>
+        <pad key="pd0" name="PD0"/>
+        <pad key="pd1" name="PD1"/>
+        <pad key="pd2" name="PD2"/>
+        <pad key="pd3" name="PD3"/>
+        <pad key="pd4" name="PD4"/>
+        <pad key="pd5" name="PD5"/>
+        <pad key="pd6" name="PD6"/>
+        <pad key="pd7" name="PD7"/>
+        <pad key="vdd" name="VDD"/>
+        <pad key="gnd" name="GND"/>
+        <pad key="pf0" name="PF0"/>
+        <pad key="pf1" name="PF1"/>
+        <pad key="pf6" name="PF6"/>
+        <pad key="pf7" name="PF7"/>
+        <pad key="vdd1" name="VDD1"/>
+        <pad key="gnd1" name="GND1"/>
+        <pad key="pa0" name="PA0"/>
+        <pad key="pa1" name="PA1"/>
+        <pad key="pa2" name="PA2"/>
+        <pad key="pa3" name="PA3"/>
+        <pad key="pa4" name="PA4"/>
+        <pad key="pa5" name="PA5"/>
+        <pad key="pa6" name="PA6"/>
+    </pads>
     <pinouts>
         <pinout key="soic28" name="SOIC28" type="soic">
-            <pin position="1" pad="PA7"/>
-            <pin position="2" pad="PC0"/>
-            <pin position="3" pad="PC1"/>
-            <pin position="4" pad="PC2"/>
-            <pin position="5" pad="PC3"/>
-            <pin position="6" pad="PD0"/>
-            <pin position="7" pad="PD1"/>
-            <pin position="8" pad="PD2"/>
-            <pin position="9" pad="PD3"/>
-            <pin position="10" pad="PD4"/>
-            <pin position="11" pad="PD5"/>
-            <pin position="12" pad="PD6"/>
-            <pin position="13" pad="PD7"/>
-            <pin position="14" pad="VDD"/>
-            <pin position="15" pad="GND"/>
-            <pin position="16" pad="PF0"/>
-            <pin position="17" pad="PF1"/>
-            <pin position="18" pad="PF6"/>
-            <pin position="19" pad="PF7"/>
-            <pin position="20" pad="VDD1"/>
-            <pin position="21" pad="GND1"/>
-            <pin position="22" pad="PA0"/>
-            <pin position="23" pad="PA1"/>
-            <pin position="24" pad="PA2"/>
-            <pin position="25" pad="PA3"/>
-            <pin position="26" pad="PA4"/>
-            <pin position="27" pad="PA5"/>
-            <pin position="28" pad="PA6"/>
+            <pin position="1" pad-key="pa7"/>
+            <pin position="2" pad-key="pc0"/>
+            <pin position="3" pad-key="pc1"/>
+            <pin position="4" pad-key="pc2"/>
+            <pin position="5" pad-key="pc3"/>
+            <pin position="6" pad-key="pd0"/>
+            <pin position="7" pad-key="pd1"/>
+            <pin position="8" pad-key="pd2"/>
+            <pin position="9" pad-key="pd3"/>
+            <pin position="10" pad-key="pd4"/>
+            <pin position="11" pad-key="pd5"/>
+            <pin position="12" pad-key="pd6"/>
+            <pin position="13" pad-key="pd7"/>
+            <pin position="14" pad-key="vdd"/>
+            <pin position="15" pad-key="gnd"/>
+            <pin position="16" pad-key="pf0"/>
+            <pin position="17" pad-key="pf1"/>
+            <pin position="18" pad-key="pf6"/>
+            <pin position="19" pad-key="pf7"/>
+            <pin position="20" pad-key="vdd1"/>
+            <pin position="21" pad-key="gnd1"/>
+            <pin position="22" pad-key="pa0"/>
+            <pin position="23" pad-key="pa1"/>
+            <pin position="24" pad-key="pa2"/>
+            <pin position="25" pad-key="pa3"/>
+            <pin position="26" pad-key="pa4"/>
+            <pin position="27" pad-key="pa5"/>
+            <pin position="28" pad-key="pa6"/>
         </pinout>
     </pinouts>
     <variants>
-        <variant name="AVR64EA28" pinout-key="soic28" package="SOIC28"/>
+        <variant key="avr64ea28" name="AVR64EA28" pinout-key="soic28"/>
     </variants>
 </device>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/E-SERIES/AVR64EA32.xml b/src/Targets/TargetDescriptionFiles/AVR8/E-SERIES/AVR64EA32.xml
index 7563a3b8..c3a11bfd 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/E-SERIES/AVR64EA32.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/E-SERIES/AVR64EA32.xml
@@ -44,81 +44,81 @@
         <peripheral key="ac0" name="AC0" module-key="cmp_control_v8">
             <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"/>
-                <signal pad-id="pd7" index="2" function="AINN" group="AINN"/>
-                <signal pad-id="pc2" index="3" function="AINN" group="AINN"/>
-                <signal pad-id="pd2" index="0" function="AINP" group="AINP"/>
-                <signal pad-id="pd6" index="3" function="AINP" group="AINP"/>
-                <signal pad-id="pc3" index="4" function="AINP" group="AINP"/>
-                <signal pad-id="pa7" function="DEFAULT" group="OUT" field="PORTMUX.ACROUTEA.AC0"/>
+                <signal pad-key="pd3" index="0" function="AINN" group="AINN"/>
+                <signal pad-key="pd0" index="1" function="AINN" group="AINN"/>
+                <signal pad-key="pd7" index="2" function="AINN" group="AINN"/>
+                <signal pad-key="pc2" index="3" function="AINN" group="AINN"/>
+                <signal pad-key="pd2" index="0" function="AINP" group="AINP"/>
+                <signal pad-key="pd6" index="3" function="AINP" group="AINP"/>
+                <signal pad-key="pc3" index="4" function="AINP" group="AINP"/>
+                <signal pad-key="pa7" function="DEFAULT" group="OUT" field="PORTMUX.ACROUTEA.AC0"/>
             </signals>
         </peripheral>
         <peripheral key="ac1" name="AC1" module-key="cmp_control_v8">
             <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"/>
-                <signal pad-id="pd7" index="2" function="AINN" group="AINN"/>
-                <signal pad-id="pd2" index="0" function="AINP" group="AINP"/>
-                <signal pad-id="pd3" index="1" function="AINP" group="AINP"/>
-                <signal pad-id="pd4" index="2" function="AINP" group="AINP"/>
-                <signal pad-id="pd6" index="3" function="AINP" group="AINP"/>
-                <signal pad-id="pc3" index="4" function="AINP" group="AINP"/>
-                <signal pad-id="pa7" function="DEFAULT" group="OUT" field="PORTMUX.ACROUTEA.AC1"/>
+                <signal pad-key="pd5" index="0" function="AINN" group="AINN"/>
+                <signal pad-key="pd0" index="1" function="AINN" group="AINN"/>
+                <signal pad-key="pd7" index="2" function="AINN" group="AINN"/>
+                <signal pad-key="pd2" index="0" function="AINP" group="AINP"/>
+                <signal pad-key="pd3" index="1" function="AINP" group="AINP"/>
+                <signal pad-key="pd4" index="2" function="AINP" group="AINP"/>
+                <signal pad-key="pd6" index="3" function="AINP" group="AINP"/>
+                <signal pad-key="pc3" index="4" function="AINP" group="AINP"/>
+                <signal pad-key="pa7" function="DEFAULT" group="OUT" field="PORTMUX.ACROUTEA.AC1"/>
             </signals>
         </peripheral>
         <peripheral key="adc0" name="ADC0" module-key="adc_12b_diff_ctrl_avr_v2">
             <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"/>
-                <signal pad-id="pd2" index="2" function="AINN" group="AINN"/>
-                <signal pad-id="pd3" index="3" function="AINN" group="AINN"/>
-                <signal pad-id="pd4" index="4" function="AINN" group="AINN"/>
-                <signal pad-id="pd5" index="5" function="AINN" group="AINN"/>
-                <signal pad-id="pd6" index="6" function="AINN" group="AINN"/>
-                <signal pad-id="pd7" index="7" function="AINN" group="AINN"/>
-                <signal pad-id="pf0" index="16" function="AINN" group="AINN"/>
-                <signal pad-id="pf1" index="17" function="AINN" group="AINN"/>
-                <signal pad-id="pf2" index="18" function="AINN" group="AINN"/>
-                <signal pad-id="pf3" index="19" function="AINN" group="AINN"/>
-                <signal pad-id="pf4" index="20" function="AINN" group="AINN"/>
-                <signal pad-id="pf5" index="21" function="AINN" group="AINN"/>
-                <signal pad-id="pa2" index="22" function="AINN" group="AINN"/>
-                <signal pad-id="pa3" index="23" function="AINN" group="AINN"/>
-                <signal pad-id="pa4" index="24" function="AINN" group="AINN"/>
-                <signal pad-id="pa5" index="25" function="AINN" group="AINN"/>
-                <signal pad-id="pa6" index="26" function="AINN" group="AINN"/>
-                <signal pad-id="pa7" index="27" function="AINN" group="AINN"/>
-                <signal pad-id="pc0" index="28" function="AINN" group="AINN"/>
-                <signal pad-id="pc1" index="29" function="AINN" group="AINN"/>
-                <signal pad-id="pc2" index="30" function="AINN" group="AINN"/>
-                <signal pad-id="pc3" index="31" function="AINN" group="AINN"/>
-                <signal pad-id="pd0" index="0" function="AINP" group="AINP"/>
-                <signal pad-id="pd1" index="1" function="AINP" group="AINP"/>
-                <signal pad-id="pd2" index="2" function="AINP" group="AINP"/>
-                <signal pad-id="pd3" index="3" function="AINP" group="AINP"/>
-                <signal pad-id="pd4" index="4" function="AINP" group="AINP"/>
-                <signal pad-id="pd5" index="5" function="AINP" group="AINP"/>
-                <signal pad-id="pd6" index="6" function="AINP" group="AINP"/>
-                <signal pad-id="pd7" index="7" function="AINP" group="AINP"/>
-                <signal pad-id="pf0" index="16" function="AINP" group="AINP"/>
-                <signal pad-id="pf1" index="17" function="AINP" group="AINP"/>
-                <signal pad-id="pf2" index="18" function="AINP" group="AINP"/>
-                <signal pad-id="pf3" index="19" function="AINP" group="AINP"/>
-                <signal pad-id="pf4" index="20" function="AINP" group="AINP"/>
-                <signal pad-id="pf5" index="21" function="AINP" group="AINP"/>
-                <signal pad-id="pa2" index="22" function="AINP" group="AINP"/>
-                <signal pad-id="pa3" index="23" function="AINP" group="AINP"/>
-                <signal pad-id="pa4" index="24" function="AINP" group="AINP"/>
-                <signal pad-id="pa5" index="25" function="AINP" group="AINP"/>
-                <signal pad-id="pa6" index="26" function="AINP" group="AINP"/>
-                <signal pad-id="pa7" index="27" function="AINP" group="AINP"/>
-                <signal pad-id="pc0" index="28" function="AINP" group="AINP"/>
-                <signal pad-id="pc1" index="29" function="AINP" group="AINP"/>
-                <signal pad-id="pc2" index="30" function="AINP" group="AINP"/>
-                <signal pad-id="pc3" index="31" function="AINP" group="AINP"/>
+                <signal pad-key="pd0" index="0" function="AINN" group="AINN"/>
+                <signal pad-key="pd1" index="1" function="AINN" group="AINN"/>
+                <signal pad-key="pd2" index="2" function="AINN" group="AINN"/>
+                <signal pad-key="pd3" index="3" function="AINN" group="AINN"/>
+                <signal pad-key="pd4" index="4" function="AINN" group="AINN"/>
+                <signal pad-key="pd5" index="5" function="AINN" group="AINN"/>
+                <signal pad-key="pd6" index="6" function="AINN" group="AINN"/>
+                <signal pad-key="pd7" index="7" function="AINN" group="AINN"/>
+                <signal pad-key="pf0" index="16" function="AINN" group="AINN"/>
+                <signal pad-key="pf1" index="17" function="AINN" group="AINN"/>
+                <signal pad-key="pf2" index="18" function="AINN" group="AINN"/>
+                <signal pad-key="pf3" index="19" function="AINN" group="AINN"/>
+                <signal pad-key="pf4" index="20" function="AINN" group="AINN"/>
+                <signal pad-key="pf5" index="21" function="AINN" group="AINN"/>
+                <signal pad-key="pa2" index="22" function="AINN" group="AINN"/>
+                <signal pad-key="pa3" index="23" function="AINN" group="AINN"/>
+                <signal pad-key="pa4" index="24" function="AINN" group="AINN"/>
+                <signal pad-key="pa5" index="25" function="AINN" group="AINN"/>
+                <signal pad-key="pa6" index="26" function="AINN" group="AINN"/>
+                <signal pad-key="pa7" index="27" function="AINN" group="AINN"/>
+                <signal pad-key="pc0" index="28" function="AINN" group="AINN"/>
+                <signal pad-key="pc1" index="29" function="AINN" group="AINN"/>
+                <signal pad-key="pc2" index="30" function="AINN" group="AINN"/>
+                <signal pad-key="pc3" index="31" function="AINN" group="AINN"/>
+                <signal pad-key="pd0" index="0" function="AINP" group="AINP"/>
+                <signal pad-key="pd1" index="1" function="AINP" group="AINP"/>
+                <signal pad-key="pd2" index="2" function="AINP" group="AINP"/>
+                <signal pad-key="pd3" index="3" function="AINP" group="AINP"/>
+                <signal pad-key="pd4" index="4" function="AINP" group="AINP"/>
+                <signal pad-key="pd5" index="5" function="AINP" group="AINP"/>
+                <signal pad-key="pd6" index="6" function="AINP" group="AINP"/>
+                <signal pad-key="pd7" index="7" function="AINP" group="AINP"/>
+                <signal pad-key="pf0" index="16" function="AINP" group="AINP"/>
+                <signal pad-key="pf1" index="17" function="AINP" group="AINP"/>
+                <signal pad-key="pf2" index="18" function="AINP" group="AINP"/>
+                <signal pad-key="pf3" index="19" function="AINP" group="AINP"/>
+                <signal pad-key="pf4" index="20" function="AINP" group="AINP"/>
+                <signal pad-key="pf5" index="21" function="AINP" group="AINP"/>
+                <signal pad-key="pa2" index="22" function="AINP" group="AINP"/>
+                <signal pad-key="pa3" index="23" function="AINP" group="AINP"/>
+                <signal pad-key="pa4" index="24" function="AINP" group="AINP"/>
+                <signal pad-key="pa5" index="25" function="AINP" group="AINP"/>
+                <signal pad-key="pa6" index="26" function="AINP" group="AINP"/>
+                <signal pad-key="pa7" index="27" function="AINP" group="AINP"/>
+                <signal pad-key="pc0" index="28" function="AINP" group="AINP"/>
+                <signal pad-key="pc1" index="29" function="AINP" group="AINP"/>
+                <signal pad-key="pc2" index="30" function="AINP" group="AINP"/>
+                <signal pad-key="pc3" index="31" function="AINP" group="AINP"/>
             </signals>
         </peripheral>
         <peripheral key="bod" name="BOD" module-key="bor_lvd_ctrl_avr_v2">
@@ -127,35 +127,35 @@
         <peripheral key="ccl" name="CCL" module-key="cla_ccl_v1">
             <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"/>
-                <signal pad-id="pa2" index="2" function="IN" group="LUT0_IN"/>
-                <signal pad-id="pc0" index="0" function="IN" group="LUT1_IN"/>
-                <signal pad-id="pc1" index="1" function="IN" group="LUT1_IN"/>
-                <signal pad-id="pc2" index="2" function="IN" group="LUT1_IN"/>
-                <signal pad-id="pd0" index="0" function="IN" group="LUT2_IN"/>
-                <signal pad-id="pd1" index="1" function="IN" group="LUT2_IN"/>
-                <signal pad-id="pd2" index="2" function="IN" group="LUT2_IN"/>
-                <signal pad-id="pf0" index="0" function="IN" group="LUT3_IN"/>
-                <signal pad-id="pf1" index="1" function="IN" group="LUT3_IN"/>
-                <signal pad-id="pf2" index="2" function="IN" group="LUT3_IN"/>
-                <signal pad-id="pa6" function="ALT1" group="LUT0_OUT" field="PORTMUX.CCLROUTEA.LUT0"/>
-                <signal pad-id="pa3" function="DEFAULT" group="LUT0_OUT" field="PORTMUX.CCLROUTEA.LUT0"/>
-                <signal pad-id="pc3" function="DEFAULT" group="LUT1_OUT" field="PORTMUX.CCLROUTEA.LUT1"/>
-                <signal pad-id="pd6" function="ALT1" group="LUT2_OUT" field="PORTMUX.CCLROUTEA.LUT2"/>
-                <signal pad-id="pd3" function="DEFAULT" group="LUT2_OUT" field="PORTMUX.CCLROUTEA.LUT2"/>
-                <signal pad-id="pf3" function="DEFAULT" group="LUT3_OUT" field="PORTMUX.CCLROUTEA.LUT3"/>
+                <signal pad-key="pa0" index="0" function="IN" group="LUT0_IN"/>
+                <signal pad-key="pa1" index="1" function="IN" group="LUT0_IN"/>
+                <signal pad-key="pa2" index="2" function="IN" group="LUT0_IN"/>
+                <signal pad-key="pc0" index="0" function="IN" group="LUT1_IN"/>
+                <signal pad-key="pc1" index="1" function="IN" group="LUT1_IN"/>
+                <signal pad-key="pc2" index="2" function="IN" group="LUT1_IN"/>
+                <signal pad-key="pd0" index="0" function="IN" group="LUT2_IN"/>
+                <signal pad-key="pd1" index="1" function="IN" group="LUT2_IN"/>
+                <signal pad-key="pd2" index="2" function="IN" group="LUT2_IN"/>
+                <signal pad-key="pf0" index="0" function="IN" group="LUT3_IN"/>
+                <signal pad-key="pf1" index="1" function="IN" group="LUT3_IN"/>
+                <signal pad-key="pf2" index="2" function="IN" group="LUT3_IN"/>
+                <signal pad-key="pa6" function="ALT1" group="LUT0_OUT" field="PORTMUX.CCLROUTEA.LUT0"/>
+                <signal pad-key="pa3" function="DEFAULT" group="LUT0_OUT" field="PORTMUX.CCLROUTEA.LUT0"/>
+                <signal pad-key="pc3" function="DEFAULT" group="LUT1_OUT" field="PORTMUX.CCLROUTEA.LUT1"/>
+                <signal pad-key="pd6" function="ALT1" group="LUT2_OUT" field="PORTMUX.CCLROUTEA.LUT2"/>
+                <signal pad-key="pd3" function="DEFAULT" group="LUT2_OUT" field="PORTMUX.CCLROUTEA.LUT2"/>
+                <signal pad-key="pf3" function="DEFAULT" group="LUT3_OUT" field="PORTMUX.CCLROUTEA.LUT3"/>
             </signals>
         </peripheral>
         <peripheral key="clkctrl" name="CLKCTRL" module-key="avrea_clkctrl">
             <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"/>
-                <signal pad-id="pf0" index="1" function="XTAL" group="XTAL32K"/>
-                <signal pad-id="pf1" index="2" function="XTAL" group="XTAL32K"/>
-                <signal pad-id="pa0" index="1" function="XTAL" group="XTALHF"/>
-                <signal pad-id="pa1" index="2" function="XTAL" group="XTALHF"/>
+                <signal pad-key="pa0" function="EXTCLK" group="EXTCLK"/>
+                <signal pad-key="pa7" function="OUT" group="CLKOUT"/>
+                <signal pad-key="pf0" index="1" function="XTAL" group="XTAL32K"/>
+                <signal pad-key="pf1" index="2" function="XTAL" group="XTAL32K"/>
+                <signal pad-key="pa0" index="1" function="XTAL" group="XTALHF"/>
+                <signal pad-key="pa1" index="2" function="XTAL" group="XTALHF"/>
             </signals>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="cpu_avr_xt_v1">
@@ -170,19 +170,19 @@
         <peripheral key="dac0" name="DAC0" module-key="dac_nbit_ctrl_avr_v6">
             <register-group-instance register-group-key="dac" address-space-key="data" offset="0x6A0"/>
             <signals>
-                <signal pad-id="pd6" function="VOUT" group="OUT"/>
+                <signal pad-key="pd6" function="VOUT" group="OUT"/>
             </signals>
         </peripheral>
         <peripheral key="evsys" name="EVSYS" module-key="avrea_evsys">
             <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"/>
-                <signal pad-id="pc2" index="2" function="DEFAULT" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTC"/>
-                <signal pad-id="pd7" index="3" function="ALT1" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTD"/>
-                <signal pad-id="pd2" index="3" function="DEFAULT" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTD"/>
-                <signal pad-id="pf7" index="5" function="ALT1" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTF"/>
-                <signal pad-id="pf2" index="5" function="DEFAULT" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTF"/>
+                <signal pad-key="pa7" index="0" function="ALT1" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTA"/>
+                <signal pad-key="pa2" index="0" function="DEFAULT" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTA"/>
+                <signal pad-key="pc2" index="2" function="DEFAULT" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTC"/>
+                <signal pad-key="pd7" index="3" function="ALT1" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTD"/>
+                <signal pad-key="pd2" index="3" function="DEFAULT" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTD"/>
+                <signal pad-key="pf7" index="5" function="ALT1" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTF"/>
+                <signal pad-key="pf2" index="5" function="DEFAULT" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTF"/>
             </signals>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="avrea_fuse">
@@ -200,49 +200,49 @@
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pa2" index="2" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa3" index="3" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa4" index="4" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa5" index="5" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa6" index="6" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa7" index="7" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa0" index="0" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa1" index="1" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa2" index="2" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa3" index="3" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa4" index="4" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa5" index="5" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa6" index="6" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa7" index="7" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pc2" index="2" function="IOPORT" group="PIN"/>
-                <signal pad-id="pc3" index="3" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc0" index="0" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc1" index="1" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc2" index="2" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc3" index="3" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pd2" index="2" function="IOPORT" group="PIN"/>
-                <signal pad-id="pd3" index="3" function="IOPORT" group="PIN"/>
-                <signal pad-id="pd4" index="4" function="IOPORT" group="PIN"/>
-                <signal pad-id="pd5" index="5" function="IOPORT" group="PIN"/>
-                <signal pad-id="pd6" index="6" function="IOPORT" group="PIN"/>
-                <signal pad-id="pd7" index="7" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd0" index="0" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd1" index="1" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd2" index="2" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd3" index="3" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd4" index="4" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd5" index="5" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd6" index="6" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd7" index="7" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="portf" name="PORTF" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pf2" index="2" function="IOPORT" group="PIN"/>
-                <signal pad-id="pf3" index="3" function="IOPORT" group="PIN"/>
-                <signal pad-id="pf4" index="4" function="IOPORT" group="PIN"/>
-                <signal pad-id="pf5" index="5" function="IOPORT" group="PIN"/>
-                <signal pad-id="pf6" index="6" function="IOPORT" group="PIN"/>
-                <signal pad-id="pf7" index="7" function="IOPORT" group="PIN"/>
+                <signal pad-key="pf0" index="0" function="IOPORT" group="PIN"/>
+                <signal pad-key="pf1" index="1" function="IOPORT" group="PIN"/>
+                <signal pad-key="pf2" index="2" function="IOPORT" group="PIN"/>
+                <signal pad-key="pf3" index="3" function="IOPORT" group="PIN"/>
+                <signal pad-key="pf4" index="4" function="IOPORT" group="PIN"/>
+                <signal pad-key="pf5" index="5" function="IOPORT" group="PIN"/>
+                <signal pad-key="pf6" index="6" function="IOPORT" group="PIN"/>
+                <signal pad-key="pf7" index="7" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="portmux" name="PORTMUX" module-key="avrea_portmux">
@@ -251,7 +251,7 @@
         <peripheral key="rstctrl" name="RSTCTRL" module-key="rst_integration_avr_v2">
             <register-group-instance register-group-key="rstctrl" address-space-key="data" offset="0x40"/>
             <signals>
-                <signal pad-id="pf6" function="OTHER" group="RESET"/>
+                <signal pad-key="pf6" function="OTHER" group="RESET"/>
             </signals>
         </peripheral>
         <peripheral key="rtc" name="RTC" module-key="tmr_16b_rtc_avr_v2">
@@ -266,26 +266,26 @@
         <peripheral key="spi0" name="SPI0" module-key="spi_8bit_v2">
             <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"/>
-                <signal pad-id="pc0" function="ALT3" group="SCK" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <signal pad-id="pc1" function="ALT3" group="SS" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <signal pad-id="pd5" function="ALT4" group="MISO" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <signal pad-id="pd4" function="ALT4" group="MOSI" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <signal pad-id="pd6" function="ALT4" group="SCK" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <signal pad-id="pd7" function="ALT4" group="SS" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <signal pad-id="pc1" function="ALT5" group="MISO" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <signal pad-id="pc0" function="ALT5" group="MOSI" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <signal pad-id="pc2" function="ALT5" group="SCK" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <signal pad-id="pc3" function="ALT5" group="SS" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <signal pad-id="pc1" function="ALT6" group="MISO" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <signal pad-id="pc2" function="ALT6" group="MOSI" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <signal pad-id="pc3" function="ALT6" group="SCK" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <signal pad-id="pf7" function="ALT6" group="SS" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <signal pad-id="pa5" function="DEFAULT" group="MISO" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <signal pad-id="pa4" function="DEFAULT" group="MOSI" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <signal pad-id="pa6" function="DEFAULT" group="SCK" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <signal pad-id="pa7" function="DEFAULT" group="SS" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pa1" function="ALT3" group="MISO" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pa0" function="ALT3" group="MOSI" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pc0" function="ALT3" group="SCK" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pc1" function="ALT3" group="SS" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pd5" function="ALT4" group="MISO" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pd4" function="ALT4" group="MOSI" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pd6" function="ALT4" group="SCK" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pd7" function="ALT4" group="SS" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pc1" function="ALT5" group="MISO" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pc0" function="ALT5" group="MOSI" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pc2" function="ALT5" group="SCK" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pc3" function="ALT5" group="SS" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pc1" function="ALT6" group="MISO" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pc2" function="ALT6" group="MOSI" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pc3" function="ALT6" group="SCK" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pf7" function="ALT6" group="SS" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pa5" function="DEFAULT" group="MISO" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pa4" function="DEFAULT" group="MOSI" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pa6" function="DEFAULT" group="SCK" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pa7" function="DEFAULT" group="SS" field="PORTMUX.SPIROUTEA.SPI0"/>
             </signals>
         </peripheral>
         <peripheral key="syscfg" name="SYSCFG" module-key="avrea_syscfg">
@@ -294,109 +294,109 @@
         <peripheral key="tca0" name="TCA0" module-key="tmr_16b_pwm_v1">
             <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"/>
-                <signal pad-id="pc2" index="2" function="ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pc3" index="3" function="ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pd0" index="0" function="ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pd1" index="1" function="ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pd2" index="2" function="ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pd3" index="3" function="ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pd4" index="4" function="ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pd5" index="5" function="ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pf0" index="0" function="ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pf1" index="1" function="ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pf2" index="2" function="ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pf3" index="3" function="ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pf4" index="4" function="ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pf5" index="5" function="ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pa0" index="0" function="DEFAULT" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pa1" index="1" function="DEFAULT" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pa2" index="2" function="DEFAULT" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pa3" index="3" function="DEFAULT" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pa4" index="4" function="DEFAULT" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pa5" index="5" function="DEFAULT" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pc0" index="0" function="ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pc1" index="1" function="ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pc2" index="2" function="ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pc3" index="3" function="ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pd0" index="0" function="ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pd1" index="1" function="ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pd2" index="2" function="ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pd3" index="3" function="ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pd4" index="4" function="ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pd5" index="5" function="ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pf0" index="0" function="ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pf1" index="1" function="ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pf2" index="2" function="ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pf3" index="3" function="ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pf4" index="4" function="ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pf5" index="5" function="ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pa0" index="0" function="DEFAULT" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pa1" index="1" function="DEFAULT" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pa2" index="2" function="DEFAULT" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pa3" index="3" function="DEFAULT" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pa4" index="4" function="DEFAULT" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pa5" index="5" function="DEFAULT" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
             </signals>
         </peripheral>
         <peripheral key="tcb0" name="TCB0" module-key="tmr_16b_capture_v1">
             <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"/>
+                <signal pad-key="pf4" index="0" function="ALT1" group="WO" field="PORTMUX.TCBROUTEA.TCB0"/>
+                <signal pad-key="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 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"/>
+                <signal pad-key="pf5" index="0" function="ALT1" group="WO" field="PORTMUX.TCBROUTEA.TCB1"/>
+                <signal pad-key="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 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"/>
+                <signal pad-key="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 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"/>
-                <signal pad-id="pc3" function="ALT2" group="SCL" field="PORTMUX.TWIROUTEA.TWI0"/>
-                <signal pad-id="pc2" function="ALT2" group="SDA" field="PORTMUX.TWIROUTEA.TWI0"/>
-                <signal pad-id="pa1" function="ALT3" group="SCL" field="PORTMUX.TWIROUTEA.TWI0"/>
-                <signal pad-id="pc3" function="ALT3" group="SCL_DUAL" field="PORTMUX.TWIROUTEA.TWI0"/>
-                <signal pad-id="pa0" function="ALT3" group="SDA" field="PORTMUX.TWIROUTEA.TWI0"/>
-                <signal pad-id="pc2" function="ALT3" group="SDA_DUAL" field="PORTMUX.TWIROUTEA.TWI0"/>
-                <signal pad-id="pa3" function="DEFAULT" group="SCL" field="PORTMUX.TWIROUTEA.TWI0"/>
-                <signal pad-id="pc3" function="DEFAULT" group="SCL_DUAL" field="PORTMUX.TWIROUTEA.TWI0"/>
-                <signal pad-id="pa2" function="DEFAULT" group="SDA" field="PORTMUX.TWIROUTEA.TWI0"/>
-                <signal pad-id="pc2" function="DEFAULT" group="SDA_DUAL" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pa3" function="ALT1" group="SCL" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pa2" function="ALT1" group="SDA" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pc3" function="ALT2" group="SCL" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pc2" function="ALT2" group="SDA" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pa1" function="ALT3" group="SCL" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pc3" function="ALT3" group="SCL_DUAL" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pa0" function="ALT3" group="SDA" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pc2" function="ALT3" group="SDA_DUAL" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pa3" function="DEFAULT" group="SCL" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pc3" function="DEFAULT" group="SCL_DUAL" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pa2" function="DEFAULT" group="SDA" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pc2" function="DEFAULT" group="SDA_DUAL" field="PORTMUX.TWIROUTEA.TWI0"/>
             </signals>
         </peripheral>
         <peripheral key="usart0" name="USART0" module-key="uart_autobd_v4">
             <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"/>
-                <signal pad-id="pa6" index="1" function="ALT1" group="XCK" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pa7" index="1" function="ALT1" group="XDIR" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pa3" index="2" function="ALT2" group="RXD" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pa2" index="2" function="ALT2" group="TXD" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pd5" index="3" function="ALT3" group="RXD" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pd4" index="3" function="ALT3" group="TXD" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pd6" index="3" function="ALT3" group="XCK" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pd7" index="3" function="ALT3" group="XDIR" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pc2" index="4" function="ALT4" group="RXD" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pc1" index="4" function="ALT4" group="TXD" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pc3" index="4" function="ALT4" group="XCK" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pa1" function="DEFAULT" group="RXD" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pa0" function="DEFAULT" group="TXD" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pa2" function="DEFAULT" group="XCK" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pa3" function="DEFAULT" group="XDIR" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa5" index="1" function="ALT1" group="RXD" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa4" index="1" function="ALT1" group="TXD" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa6" index="1" function="ALT1" group="XCK" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa7" index="1" function="ALT1" group="XDIR" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa3" index="2" function="ALT2" group="RXD" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa2" index="2" function="ALT2" group="TXD" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pd5" index="3" function="ALT3" group="RXD" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pd4" index="3" function="ALT3" group="TXD" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pd6" index="3" function="ALT3" group="XCK" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pd7" index="3" function="ALT3" group="XDIR" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pc2" index="4" function="ALT4" group="RXD" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pc1" index="4" function="ALT4" group="TXD" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pc3" index="4" function="ALT4" group="XCK" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa1" function="DEFAULT" group="RXD" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa0" function="DEFAULT" group="TXD" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa2" function="DEFAULT" group="XCK" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa3" function="DEFAULT" group="XDIR" field="PORTMUX.USARTROUTEA.USART0"/>
             </signals>
         </peripheral>
         <peripheral key="usart1" name="USART1" module-key="uart_autobd_v4">
             <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"/>
-                <signal pad-id="pc1" function="DEFAULT" group="RXD" field="PORTMUX.USARTROUTEA.USART1"/>
-                <signal pad-id="pc0" function="DEFAULT" group="TXD" field="PORTMUX.USARTROUTEA.USART1"/>
-                <signal pad-id="pc2" function="DEFAULT" group="XCK" field="PORTMUX.USARTROUTEA.USART1"/>
-                <signal pad-id="pc3" function="DEFAULT" group="XDIR" field="PORTMUX.USARTROUTEA.USART1"/>
+                <signal pad-key="pd7" function="ALT2" group="RXD" field="PORTMUX.USARTROUTEA.USART1"/>
+                <signal pad-key="pd6" function="ALT2" group="TXD" field="PORTMUX.USARTROUTEA.USART1"/>
+                <signal pad-key="pc1" function="DEFAULT" group="RXD" field="PORTMUX.USARTROUTEA.USART1"/>
+                <signal pad-key="pc0" function="DEFAULT" group="TXD" field="PORTMUX.USARTROUTEA.USART1"/>
+                <signal pad-key="pc2" function="DEFAULT" group="XCK" field="PORTMUX.USARTROUTEA.USART1"/>
+                <signal pad-key="pc3" function="DEFAULT" group="XDIR" field="PORTMUX.USARTROUTEA.USART1"/>
             </signals>
         </peripheral>
         <peripheral key="usart2" name="USART2" module-key="uart_autobd_v4">
             <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"/>
-                <signal pad-id="pf1" function="DEFAULT" group="RXD" field="PORTMUX.USARTROUTEA.USART2"/>
-                <signal pad-id="pf0" function="DEFAULT" group="TXD" field="PORTMUX.USARTROUTEA.USART2"/>
-                <signal pad-id="pf2" function="DEFAULT" group="XCK" field="PORTMUX.USARTROUTEA.USART2"/>
-                <signal pad-id="pf3" function="DEFAULT" group="XDIR" field="PORTMUX.USARTROUTEA.USART2"/>
+                <signal pad-key="pf5" function="ALT1" group="RXD" field="PORTMUX.USARTROUTEA.USART2"/>
+                <signal pad-key="pf4" function="ALT1" group="TXD" field="PORTMUX.USARTROUTEA.USART2"/>
+                <signal pad-key="pf1" function="DEFAULT" group="RXD" field="PORTMUX.USARTROUTEA.USART2"/>
+                <signal pad-key="pf0" function="DEFAULT" group="TXD" field="PORTMUX.USARTROUTEA.USART2"/>
+                <signal pad-key="pf2" function="DEFAULT" group="XCK" field="PORTMUX.USARTROUTEA.USART2"/>
+                <signal pad-key="pf3" function="DEFAULT" group="XDIR" field="PORTMUX.USARTROUTEA.USART2"/>
             </signals>
         </peripheral>
         <peripheral key="userrow" name="USERROW" module-key="avrea_userrow">
@@ -417,7 +417,7 @@
         <peripheral key="vref" name="VREF" module-key="avrea_vref">
             <register-group-instance register-group-key="vref" address-space-key="data" offset="0xB0"/>
             <signals>
-                <signal pad-id="pd7" function="VREF" group="VREFA"/>
+                <signal pad-key="pd7" function="VREF" group="VREFA"/>
             </signals>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="wdt_windowed_v2">
@@ -1607,43 +1607,77 @@
             </register-group>
         </module>
     </modules>
+    <pads>
+        <pad key="pa3" name="PA3"/>
+        <pad key="pa4" name="PA4"/>
+        <pad key="pa5" name="PA5"/>
+        <pad key="pa6" name="PA6"/>
+        <pad key="pa7" name="PA7"/>
+        <pad key="pc0" name="PC0"/>
+        <pad key="pc1" name="PC1"/>
+        <pad key="pc2" name="PC2"/>
+        <pad key="pc3" name="PC3"/>
+        <pad key="pd0" name="PD0"/>
+        <pad key="pd1" name="PD1"/>
+        <pad key="pd2" name="PD2"/>
+        <pad key="pd3" name="PD3"/>
+        <pad key="pd4" name="PD4"/>
+        <pad key="pd5" name="PD5"/>
+        <pad key="pd6" name="PD6"/>
+        <pad key="pd7" name="PD7"/>
+        <pad key="vdd" name="VDD"/>
+        <pad key="gnd" name="GND"/>
+        <pad key="pf0" name="PF0"/>
+        <pad key="pf1" name="PF1"/>
+        <pad key="pf2" name="PF2"/>
+        <pad key="pf3" name="PF3"/>
+        <pad key="pf4" name="PF4"/>
+        <pad key="pf5" name="PF5"/>
+        <pad key="pf6" name="PF6"/>
+        <pad key="pf7" name="PF7"/>
+        <pad key="vdd1" name="VDD1"/>
+        <pad key="gnd1" name="GND1"/>
+        <pad key="pa0" name="PA0"/>
+        <pad key="pa1" name="PA1"/>
+        <pad key="pa2" name="PA2"/>
+    </pads>
     <pinouts>
         <pinout key="qfn32" name="QFN32" type="qfn">
-            <pin position="1" pad="PA3"/>
-            <pin position="2" pad="PA4"/>
-            <pin position="3" pad="PA5"/>
-            <pin position="4" pad="PA6"/>
-            <pin position="5" pad="PA7"/>
-            <pin position="6" pad="PC0"/>
-            <pin position="7" pad="PC1"/>
-            <pin position="8" pad="PC2"/>
-            <pin position="9" pad="PC3"/>
-            <pin position="10" pad="PD0"/>
-            <pin position="11" pad="PD1"/>
-            <pin position="12" pad="PD2"/>
-            <pin position="13" pad="PD3"/>
-            <pin position="14" pad="PD4"/>
-            <pin position="15" pad="PD5"/>
-            <pin position="16" pad="PD6"/>
-            <pin position="17" pad="PD7"/>
-            <pin position="18" pad="VDD"/>
-            <pin position="19" pad="GND"/>
-            <pin position="20" pad="PF0"/>
-            <pin position="21" pad="PF1"/>
-            <pin position="22" pad="PF2"/>
-            <pin position="23" pad="PF3"/>
-            <pin position="24" pad="PF4"/>
-            <pin position="25" pad="PF5"/>
-            <pin position="26" pad="PF6"/>
-            <pin position="27" pad="PF7"/>
-            <pin position="28" pad="VDD1"/>
-            <pin position="29" pad="GND1"/>
-            <pin position="30" pad="PA0"/>
-            <pin position="31" pad="PA1"/>
-            <pin position="32" pad="PA2"/>
+            <pin position="1" pad-key="pa3"/>
+            <pin position="2" pad-key="pa4"/>
+            <pin position="3" pad-key="pa5"/>
+            <pin position="4" pad-key="pa6"/>
+            <pin position="5" pad-key="pa7"/>
+            <pin position="6" pad-key="pc0"/>
+            <pin position="7" pad-key="pc1"/>
+            <pin position="8" pad-key="pc2"/>
+            <pin position="9" pad-key="pc3"/>
+            <pin position="10" pad-key="pd0"/>
+            <pin position="11" pad-key="pd1"/>
+            <pin position="12" pad-key="pd2"/>
+            <pin position="13" pad-key="pd3"/>
+            <pin position="14" pad-key="pd4"/>
+            <pin position="15" pad-key="pd5"/>
+            <pin position="16" pad-key="pd6"/>
+            <pin position="17" pad-key="pd7"/>
+            <pin position="18" pad-key="vdd"/>
+            <pin position="19" pad-key="gnd"/>
+            <pin position="20" pad-key="pf0"/>
+            <pin position="21" pad-key="pf1"/>
+            <pin position="22" pad-key="pf2"/>
+            <pin position="23" pad-key="pf3"/>
+            <pin position="24" pad-key="pf4"/>
+            <pin position="25" pad-key="pf5"/>
+            <pin position="26" pad-key="pf6"/>
+            <pin position="27" pad-key="pf7"/>
+            <pin position="28" pad-key="vdd1"/>
+            <pin position="29" pad-key="gnd1"/>
+            <pin position="30" pad-key="pa0"/>
+            <pin position="31" pad-key="pa1"/>
+            <pin position="32" pad-key="pa2"/>
         </pinout>
     </pinouts>
     <variants>
-        <variant name="AVR64EA32" pinout-key="qfn32" package="VQFN32"/>
+        <variant key="avr64ea32" name="AVR64EA32" pinout-key="qfn32"/>
     </variants>
 </device>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/E-SERIES/AVR64EA48.xml b/src/Targets/TargetDescriptionFiles/AVR8/E-SERIES/AVR64EA48.xml
index 3db3e8eb..337a1191 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/E-SERIES/AVR64EA48.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/E-SERIES/AVR64EA48.xml
@@ -44,93 +44,93 @@
         <peripheral key="ac0" name="AC0" module-key="cmp_control_v8">
             <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"/>
-                <signal pad-id="pd7" index="2" function="AINN" group="AINN"/>
-                <signal pad-id="pd2" index="0" function="AINP" group="AINP"/>
-                <signal pad-id="pc2" index="3" function="AINN" group="AINN"/>
-                <signal pad-id="pe0" index="1" function="AINP" group="AINP"/>
-                <signal pad-id="pe2" index="2" function="AINP" group="AINP"/>
-                <signal pad-id="pd6" index="3" function="AINP" group="AINP"/>
-                <signal pad-id="pc3" index="4" function="AINP" group="AINP"/>
-                <signal pad-id="pc6" function="ALT1" group="OUT" field="PORTMUX.ACROUTEA.AC0"/>
-                <signal pad-id="pa7" function="DEFAULT" group="OUT" field="PORTMUX.ACROUTEA.AC0"/>
+                <signal pad-key="pd3" index="0" function="AINN" group="AINN"/>
+                <signal pad-key="pd0" index="1" function="AINN" group="AINN"/>
+                <signal pad-key="pd7" index="2" function="AINN" group="AINN"/>
+                <signal pad-key="pd2" index="0" function="AINP" group="AINP"/>
+                <signal pad-key="pc2" index="3" function="AINN" group="AINN"/>
+                <signal pad-key="pe0" index="1" function="AINP" group="AINP"/>
+                <signal pad-key="pe2" index="2" function="AINP" group="AINP"/>
+                <signal pad-key="pd6" index="3" function="AINP" group="AINP"/>
+                <signal pad-key="pc3" index="4" function="AINP" group="AINP"/>
+                <signal pad-key="pc6" function="ALT1" group="OUT" field="PORTMUX.ACROUTEA.AC0"/>
+                <signal pad-key="pa7" function="DEFAULT" group="OUT" field="PORTMUX.ACROUTEA.AC0"/>
             </signals>
         </peripheral>
         <peripheral key="ac1" name="AC1" module-key="cmp_control_v8">
             <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"/>
-                <signal pad-id="pd7" index="2" function="AINN" group="AINN"/>
-                <signal pad-id="pd2" index="0" function="AINP" group="AINP"/>
-                <signal pad-id="pd3" index="1" function="AINP" group="AINP"/>
-                <signal pad-id="pd4" index="2" function="AINP" group="AINP"/>
-                <signal pad-id="pd6" index="3" function="AINP" group="AINP"/>
-                <signal pad-id="pc3" index="4" function="AINP" group="AINP"/>
-                <signal pad-id="pc6" function="ALT1" group="OUT" field="PORTMUX.ACROUTEA.AC1"/>
-                <signal pad-id="pa7" function="DEFAULT" group="OUT" field="PORTMUX.ACROUTEA.AC1"/>
+                <signal pad-key="pd5" index="0" function="AINN" group="AINN"/>
+                <signal pad-key="pd0" index="1" function="AINN" group="AINN"/>
+                <signal pad-key="pd7" index="2" function="AINN" group="AINN"/>
+                <signal pad-key="pd2" index="0" function="AINP" group="AINP"/>
+                <signal pad-key="pd3" index="1" function="AINP" group="AINP"/>
+                <signal pad-key="pd4" index="2" function="AINP" group="AINP"/>
+                <signal pad-key="pd6" index="3" function="AINP" group="AINP"/>
+                <signal pad-key="pc3" index="4" function="AINP" group="AINP"/>
+                <signal pad-key="pc6" function="ALT1" group="OUT" field="PORTMUX.ACROUTEA.AC1"/>
+                <signal pad-key="pa7" function="DEFAULT" group="OUT" field="PORTMUX.ACROUTEA.AC1"/>
             </signals>
         </peripheral>
         <peripheral key="adc0" name="ADC0" module-key="adc_12b_diff_ctrl_avr_v2">
             <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"/>
-                <signal pad-id="pd2" index="2" function="AINN" group="AINN"/>
-                <signal pad-id="pd3" index="3" function="AINN" group="AINN"/>
-                <signal pad-id="pd4" index="4" function="AINN" group="AINN"/>
-                <signal pad-id="pd5" index="5" function="AINN" group="AINN"/>
-                <signal pad-id="pd6" index="6" function="AINN" group="AINN"/>
-                <signal pad-id="pd7" index="7" function="AINN" group="AINN"/>
-                <signal pad-id="pe0" index="8" function="AINN" group="AINN"/>
-                <signal pad-id="pe1" index="9" function="AINN" group="AINN"/>
-                <signal pad-id="pe2" index="10" function="AINN" group="AINN"/>
-                <signal pad-id="pe3" index="11" function="AINN" group="AINN"/>
-                <signal pad-id="pf0" index="16" function="AINN" group="AINN"/>
-                <signal pad-id="pf1" index="17" function="AINN" group="AINN"/>
-                <signal pad-id="pf2" index="18" function="AINN" group="AINN"/>
-                <signal pad-id="pf3" index="19" function="AINN" group="AINN"/>
-                <signal pad-id="pf4" index="20" function="AINN" group="AINN"/>
-                <signal pad-id="pf5" index="21" function="AINN" group="AINN"/>
-                <signal pad-id="pa2" index="22" function="AINN" group="AINN"/>
-                <signal pad-id="pa3" index="23" function="AINN" group="AINN"/>
-                <signal pad-id="pa4" index="24" function="AINN" group="AINN"/>
-                <signal pad-id="pa5" index="25" function="AINN" group="AINN"/>
-                <signal pad-id="pa6" index="26" function="AINN" group="AINN"/>
-                <signal pad-id="pa7" index="27" function="AINN" group="AINN"/>
-                <signal pad-id="pc0" index="28" function="AINN" group="AINN"/>
-                <signal pad-id="pc1" index="29" function="AINN" group="AINN"/>
-                <signal pad-id="pc2" index="30" function="AINN" group="AINN"/>
-                <signal pad-id="pc3" index="31" function="AINN" group="AINN"/>
-                <signal pad-id="pd0" index="0" function="AINP" group="AINP"/>
-                <signal pad-id="pd1" index="1" function="AINP" group="AINP"/>
-                <signal pad-id="pd2" index="2" function="AINP" group="AINP"/>
-                <signal pad-id="pd3" index="3" function="AINP" group="AINP"/>
-                <signal pad-id="pd4" index="4" function="AINP" group="AINP"/>
-                <signal pad-id="pd5" index="5" function="AINP" group="AINP"/>
-                <signal pad-id="pd6" index="6" function="AINP" group="AINP"/>
-                <signal pad-id="pd7" index="7" function="AINP" group="AINP"/>
-                <signal pad-id="pe0" index="8" function="AINP" group="AINP"/>
-                <signal pad-id="pe1" index="9" function="AINP" group="AINP"/>
-                <signal pad-id="pe2" index="10" function="AINP" group="AINP"/>
-                <signal pad-id="pe3" index="11" function="AINP" group="AINP"/>
-                <signal pad-id="pf0" index="16" function="AINP" group="AINP"/>
-                <signal pad-id="pf1" index="17" function="AINP" group="AINP"/>
-                <signal pad-id="pf2" index="18" function="AINP" group="AINP"/>
-                <signal pad-id="pf3" index="19" function="AINP" group="AINP"/>
-                <signal pad-id="pf4" index="20" function="AINP" group="AINP"/>
-                <signal pad-id="pf5" index="21" function="AINP" group="AINP"/>
-                <signal pad-id="pa2" index="22" function="AINP" group="AINP"/>
-                <signal pad-id="pa3" index="23" function="AINP" group="AINP"/>
-                <signal pad-id="pa4" index="24" function="AINP" group="AINP"/>
-                <signal pad-id="pa5" index="25" function="AINP" group="AINP"/>
-                <signal pad-id="pa6" index="26" function="AINP" group="AINP"/>
-                <signal pad-id="pa7" index="27" function="AINP" group="AINP"/>
-                <signal pad-id="pc0" index="28" function="AINP" group="AINP"/>
-                <signal pad-id="pc1" index="29" function="AINP" group="AINP"/>
-                <signal pad-id="pc2" index="30" function="AINP" group="AINP"/>
-                <signal pad-id="pc3" index="31" function="AINP" group="AINP"/>
+                <signal pad-key="pd0" index="0" function="AINN" group="AINN"/>
+                <signal pad-key="pd1" index="1" function="AINN" group="AINN"/>
+                <signal pad-key="pd2" index="2" function="AINN" group="AINN"/>
+                <signal pad-key="pd3" index="3" function="AINN" group="AINN"/>
+                <signal pad-key="pd4" index="4" function="AINN" group="AINN"/>
+                <signal pad-key="pd5" index="5" function="AINN" group="AINN"/>
+                <signal pad-key="pd6" index="6" function="AINN" group="AINN"/>
+                <signal pad-key="pd7" index="7" function="AINN" group="AINN"/>
+                <signal pad-key="pe0" index="8" function="AINN" group="AINN"/>
+                <signal pad-key="pe1" index="9" function="AINN" group="AINN"/>
+                <signal pad-key="pe2" index="10" function="AINN" group="AINN"/>
+                <signal pad-key="pe3" index="11" function="AINN" group="AINN"/>
+                <signal pad-key="pf0" index="16" function="AINN" group="AINN"/>
+                <signal pad-key="pf1" index="17" function="AINN" group="AINN"/>
+                <signal pad-key="pf2" index="18" function="AINN" group="AINN"/>
+                <signal pad-key="pf3" index="19" function="AINN" group="AINN"/>
+                <signal pad-key="pf4" index="20" function="AINN" group="AINN"/>
+                <signal pad-key="pf5" index="21" function="AINN" group="AINN"/>
+                <signal pad-key="pa2" index="22" function="AINN" group="AINN"/>
+                <signal pad-key="pa3" index="23" function="AINN" group="AINN"/>
+                <signal pad-key="pa4" index="24" function="AINN" group="AINN"/>
+                <signal pad-key="pa5" index="25" function="AINN" group="AINN"/>
+                <signal pad-key="pa6" index="26" function="AINN" group="AINN"/>
+                <signal pad-key="pa7" index="27" function="AINN" group="AINN"/>
+                <signal pad-key="pc0" index="28" function="AINN" group="AINN"/>
+                <signal pad-key="pc1" index="29" function="AINN" group="AINN"/>
+                <signal pad-key="pc2" index="30" function="AINN" group="AINN"/>
+                <signal pad-key="pc3" index="31" function="AINN" group="AINN"/>
+                <signal pad-key="pd0" index="0" function="AINP" group="AINP"/>
+                <signal pad-key="pd1" index="1" function="AINP" group="AINP"/>
+                <signal pad-key="pd2" index="2" function="AINP" group="AINP"/>
+                <signal pad-key="pd3" index="3" function="AINP" group="AINP"/>
+                <signal pad-key="pd4" index="4" function="AINP" group="AINP"/>
+                <signal pad-key="pd5" index="5" function="AINP" group="AINP"/>
+                <signal pad-key="pd6" index="6" function="AINP" group="AINP"/>
+                <signal pad-key="pd7" index="7" function="AINP" group="AINP"/>
+                <signal pad-key="pe0" index="8" function="AINP" group="AINP"/>
+                <signal pad-key="pe1" index="9" function="AINP" group="AINP"/>
+                <signal pad-key="pe2" index="10" function="AINP" group="AINP"/>
+                <signal pad-key="pe3" index="11" function="AINP" group="AINP"/>
+                <signal pad-key="pf0" index="16" function="AINP" group="AINP"/>
+                <signal pad-key="pf1" index="17" function="AINP" group="AINP"/>
+                <signal pad-key="pf2" index="18" function="AINP" group="AINP"/>
+                <signal pad-key="pf3" index="19" function="AINP" group="AINP"/>
+                <signal pad-key="pf4" index="20" function="AINP" group="AINP"/>
+                <signal pad-key="pf5" index="21" function="AINP" group="AINP"/>
+                <signal pad-key="pa2" index="22" function="AINP" group="AINP"/>
+                <signal pad-key="pa3" index="23" function="AINP" group="AINP"/>
+                <signal pad-key="pa4" index="24" function="AINP" group="AINP"/>
+                <signal pad-key="pa5" index="25" function="AINP" group="AINP"/>
+                <signal pad-key="pa6" index="26" function="AINP" group="AINP"/>
+                <signal pad-key="pa7" index="27" function="AINP" group="AINP"/>
+                <signal pad-key="pc0" index="28" function="AINP" group="AINP"/>
+                <signal pad-key="pc1" index="29" function="AINP" group="AINP"/>
+                <signal pad-key="pc2" index="30" function="AINP" group="AINP"/>
+                <signal pad-key="pc3" index="31" function="AINP" group="AINP"/>
             </signals>
         </peripheral>
         <peripheral key="bod" name="BOD" module-key="bor_lvd_ctrl_avr_v2">
@@ -139,36 +139,36 @@
         <peripheral key="ccl" name="CCL" module-key="cla_ccl_v1">
             <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"/>
-                <signal pad-id="pa2" index="2" function="IN" group="LUT0_IN"/>
-                <signal pad-id="pc0" index="0" function="IN" group="LUT1_IN"/>
-                <signal pad-id="pc1" index="1" function="IN" group="LUT1_IN"/>
-                <signal pad-id="pc2" index="2" function="IN" group="LUT1_IN"/>
-                <signal pad-id="pd0" index="0" function="IN" group="LUT2_IN"/>
-                <signal pad-id="pd1" index="1" function="IN" group="LUT2_IN"/>
-                <signal pad-id="pd2" index="2" function="IN" group="LUT2_IN"/>
-                <signal pad-id="pf0" index="0" function="IN" group="LUT3_IN"/>
-                <signal pad-id="pf1" index="1" function="IN" group="LUT3_IN"/>
-                <signal pad-id="pf2" index="2" function="IN" group="LUT3_IN"/>
-                <signal pad-id="pa6" function="ALT1" group="LUT0_OUT" field="PORTMUX.CCLROUTEA.LUT0"/>
-                <signal pad-id="pa3" function="DEFAULT" group="LUT0_OUT" field="PORTMUX.CCLROUTEA.LUT0"/>
-                <signal pad-id="pc6" function="ALT1" group="LUT1_OUT" field="PORTMUX.CCLROUTEA.LUT1"/>
-                <signal pad-id="pc3" function="DEFAULT" group="LUT1_OUT" field="PORTMUX.CCLROUTEA.LUT1"/>
-                <signal pad-id="pd6" function="ALT1" group="LUT2_OUT" field="PORTMUX.CCLROUTEA.LUT2"/>
-                <signal pad-id="pd3" function="DEFAULT" group="LUT2_OUT" field="PORTMUX.CCLROUTEA.LUT2"/>
-                <signal pad-id="pf3" function="DEFAULT" group="LUT3_OUT" field="PORTMUX.CCLROUTEA.LUT3"/>
+                <signal pad-key="pa0" index="0" function="IN" group="LUT0_IN"/>
+                <signal pad-key="pa1" index="1" function="IN" group="LUT0_IN"/>
+                <signal pad-key="pa2" index="2" function="IN" group="LUT0_IN"/>
+                <signal pad-key="pc0" index="0" function="IN" group="LUT1_IN"/>
+                <signal pad-key="pc1" index="1" function="IN" group="LUT1_IN"/>
+                <signal pad-key="pc2" index="2" function="IN" group="LUT1_IN"/>
+                <signal pad-key="pd0" index="0" function="IN" group="LUT2_IN"/>
+                <signal pad-key="pd1" index="1" function="IN" group="LUT2_IN"/>
+                <signal pad-key="pd2" index="2" function="IN" group="LUT2_IN"/>
+                <signal pad-key="pf0" index="0" function="IN" group="LUT3_IN"/>
+                <signal pad-key="pf1" index="1" function="IN" group="LUT3_IN"/>
+                <signal pad-key="pf2" index="2" function="IN" group="LUT3_IN"/>
+                <signal pad-key="pa6" function="ALT1" group="LUT0_OUT" field="PORTMUX.CCLROUTEA.LUT0"/>
+                <signal pad-key="pa3" function="DEFAULT" group="LUT0_OUT" field="PORTMUX.CCLROUTEA.LUT0"/>
+                <signal pad-key="pc6" function="ALT1" group="LUT1_OUT" field="PORTMUX.CCLROUTEA.LUT1"/>
+                <signal pad-key="pc3" function="DEFAULT" group="LUT1_OUT" field="PORTMUX.CCLROUTEA.LUT1"/>
+                <signal pad-key="pd6" function="ALT1" group="LUT2_OUT" field="PORTMUX.CCLROUTEA.LUT2"/>
+                <signal pad-key="pd3" function="DEFAULT" group="LUT2_OUT" field="PORTMUX.CCLROUTEA.LUT2"/>
+                <signal pad-key="pf3" function="DEFAULT" group="LUT3_OUT" field="PORTMUX.CCLROUTEA.LUT3"/>
             </signals>
         </peripheral>
         <peripheral key="clkctrl" name="CLKCTRL" module-key="avrea_clkctrl">
             <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"/>
-                <signal pad-id="pf0" index="1" function="XTAL" group="XTAL32K"/>
-                <signal pad-id="pf1" index="2" function="XTAL" group="XTAL32K"/>
-                <signal pad-id="pa0" index="1" function="XTAL" group="XTALHF"/>
-                <signal pad-id="pa1" index="2" function="XTAL" group="XTALHF"/>
+                <signal pad-key="pa0" function="EXTCLK" group="EXTCLK"/>
+                <signal pad-key="pa7" function="OUT" group="CLKOUT"/>
+                <signal pad-key="pf0" index="1" function="XTAL" group="XTAL32K"/>
+                <signal pad-key="pf1" index="2" function="XTAL" group="XTAL32K"/>
+                <signal pad-key="pa0" index="1" function="XTAL" group="XTALHF"/>
+                <signal pad-key="pa1" index="2" function="XTAL" group="XTALHF"/>
             </signals>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="cpu_avr_xt_v1">
@@ -183,22 +183,22 @@
         <peripheral key="dac0" name="DAC0" module-key="dac_nbit_ctrl_avr_v6">
             <register-group-instance register-group-key="dac" address-space-key="data" offset="0x6A0"/>
             <signals>
-                <signal pad-id="pd6" function="VOUT" group="OUT"/>
+                <signal pad-key="pd6" function="VOUT" group="OUT"/>
             </signals>
         </peripheral>
         <peripheral key="evsys" name="EVSYS" module-key="avrea_evsys">
             <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"/>
-                <signal pad-id="pb2" index="1" function="DEFAULT" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTB"/>
-                <signal pad-id="pc7" index="2" function="ALT1" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTC"/>
-                <signal pad-id="pc2" index="2" function="DEFAULT" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTC"/>
-                <signal pad-id="pd7" index="3" function="ALT1" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTD"/>
-                <signal pad-id="pd2" index="3" function="DEFAULT" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTD"/>
-                <signal pad-id="pe2" index="4" function="DEFAULT" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTE"/>
-                <signal pad-id="pf7" index="5" function="ALT1" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTF"/>
-                <signal pad-id="pf2" index="5" function="DEFAULT" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTF"/>
+                <signal pad-key="pa7" index="0" function="ALT1" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTA"/>
+                <signal pad-key="pa2" index="0" function="DEFAULT" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTA"/>
+                <signal pad-key="pb2" index="1" function="DEFAULT" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTB"/>
+                <signal pad-key="pc7" index="2" function="ALT1" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTC"/>
+                <signal pad-key="pc2" index="2" function="DEFAULT" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTC"/>
+                <signal pad-key="pd7" index="3" function="ALT1" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTD"/>
+                <signal pad-key="pd2" index="3" function="DEFAULT" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTD"/>
+                <signal pad-key="pe2" index="4" function="DEFAULT" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTE"/>
+                <signal pad-key="pf7" index="5" function="ALT1" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTF"/>
+                <signal pad-key="pf2" index="5" function="DEFAULT" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTF"/>
             </signals>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="avrea_fuse">
@@ -216,73 +216,73 @@
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pa2" index="2" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa3" index="3" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa4" index="4" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa5" index="5" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa6" index="6" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa7" index="7" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa0" index="0" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa1" index="1" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa2" index="2" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa3" index="3" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa4" index="4" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa5" index="5" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa6" index="6" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa7" index="7" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pb2" index="2" function="IOPORT" group="PIN"/>
-                <signal pad-id="pb3" index="3" function="IOPORT" group="PIN"/>
-                <signal pad-id="pb4" index="4" function="IOPORT" group="PIN"/>
-                <signal pad-id="pb5" index="5" function="IOPORT" group="PIN"/>
+                <signal pad-key="pb0" index="0" function="IOPORT" group="PIN"/>
+                <signal pad-key="pb1" index="1" function="IOPORT" group="PIN"/>
+                <signal pad-key="pb2" index="2" function="IOPORT" group="PIN"/>
+                <signal pad-key="pb3" index="3" function="IOPORT" group="PIN"/>
+                <signal pad-key="pb4" index="4" function="IOPORT" group="PIN"/>
+                <signal pad-key="pb5" index="5" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pc2" index="2" function="IOPORT" group="PIN"/>
-                <signal pad-id="pc3" index="3" function="IOPORT" group="PIN"/>
-                <signal pad-id="pc4" index="4" function="IOPORT" group="PIN"/>
-                <signal pad-id="pc5" index="5" function="IOPORT" group="PIN"/>
-                <signal pad-id="pc6" index="6" function="IOPORT" group="PIN"/>
-                <signal pad-id="pc7" index="7" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc0" index="0" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc1" index="1" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc2" index="2" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc3" index="3" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc4" index="4" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc5" index="5" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc6" index="6" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc7" index="7" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pd2" index="2" function="IOPORT" group="PIN"/>
-                <signal pad-id="pd3" index="3" function="IOPORT" group="PIN"/>
-                <signal pad-id="pd4" index="4" function="IOPORT" group="PIN"/>
-                <signal pad-id="pd5" index="5" function="IOPORT" group="PIN"/>
-                <signal pad-id="pd6" index="6" function="IOPORT" group="PIN"/>
-                <signal pad-id="pd7" index="7" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd0" index="0" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd1" index="1" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd2" index="2" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd3" index="3" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd4" index="4" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd5" index="5" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd6" index="6" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd7" index="7" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="porte" name="PORTE" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pe2" index="2" function="IOPORT" group="PIN"/>
-                <signal pad-id="pe3" index="3" function="IOPORT" group="PIN"/>
+                <signal pad-key="pe0" index="0" function="IOPORT" group="PIN"/>
+                <signal pad-key="pe1" index="1" function="IOPORT" group="PIN"/>
+                <signal pad-key="pe2" index="2" function="IOPORT" group="PIN"/>
+                <signal pad-key="pe3" index="3" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="portf" name="PORTF" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pf2" index="2" function="IOPORT" group="PIN"/>
-                <signal pad-id="pf3" index="3" function="IOPORT" group="PIN"/>
-                <signal pad-id="pf4" index="4" function="IOPORT" group="PIN"/>
-                <signal pad-id="pf5" index="5" function="IOPORT" group="PIN"/>
-                <signal pad-id="pf6" index="6" function="IOPORT" group="PIN"/>
-                <signal pad-id="pf7" index="7" function="IOPORT" group="PIN"/>
+                <signal pad-key="pf0" index="0" function="IOPORT" group="PIN"/>
+                <signal pad-key="pf1" index="1" function="IOPORT" group="PIN"/>
+                <signal pad-key="pf2" index="2" function="IOPORT" group="PIN"/>
+                <signal pad-key="pf3" index="3" function="IOPORT" group="PIN"/>
+                <signal pad-key="pf4" index="4" function="IOPORT" group="PIN"/>
+                <signal pad-key="pf5" index="5" function="IOPORT" group="PIN"/>
+                <signal pad-key="pf6" index="6" function="IOPORT" group="PIN"/>
+                <signal pad-key="pf7" index="7" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="portmux" name="PORTMUX" module-key="avrea_portmux">
@@ -291,7 +291,7 @@
         <peripheral key="rstctrl" name="RSTCTRL" module-key="rst_integration_avr_v2">
             <register-group-instance register-group-key="rstctrl" address-space-key="data" offset="0x40"/>
             <signals>
-                <signal pad-id="pf6" function="OTHER" group="RESET"/>
+                <signal pad-key="pf6" function="OTHER" group="RESET"/>
             </signals>
         </peripheral>
         <peripheral key="rtc" name="RTC" module-key="tmr_16b_rtc_avr_v2">
@@ -306,30 +306,30 @@
         <peripheral key="spi0" name="SPI0" module-key="spi_8bit_v2">
             <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"/>
-                <signal pad-id="pe2" function="ALT1" group="SCK" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <signal pad-id="pe3" function="ALT1" group="SS" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <signal pad-id="pa1" function="ALT3" group="MISO" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <signal pad-id="pa0" function="ALT3" group="MOSI" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <signal pad-id="pc0" function="ALT3" group="SCK" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <signal pad-id="pc1" function="ALT3" group="SS" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <signal pad-id="pd5" function="ALT4" group="MISO" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <signal pad-id="pd4" function="ALT4" group="MOSI" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <signal pad-id="pd6" function="ALT4" group="SCK" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <signal pad-id="pd7" function="ALT4" group="SS" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <signal pad-id="pc1" function="ALT5" group="MISO" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <signal pad-id="pc0" function="ALT5" group="MOSI" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <signal pad-id="pc2" function="ALT5" group="SCK" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <signal pad-id="pc3" function="ALT5" group="SS" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <signal pad-id="pc1" function="ALT6" group="MISO" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <signal pad-id="pc2" function="ALT6" group="MOSI" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <signal pad-id="pc3" function="ALT6" group="SCK" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <signal pad-id="pf7" function="ALT6" group="SS" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <signal pad-id="pa5" function="DEFAULT" group="MISO" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <signal pad-id="pa4" function="DEFAULT" group="MOSI" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <signal pad-id="pa6" function="DEFAULT" group="SCK" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <signal pad-id="pa7" function="DEFAULT" group="SS" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pe1" function="ALT1" group="MISO" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pe0" function="ALT1" group="MOSI" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pe2" function="ALT1" group="SCK" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pe3" function="ALT1" group="SS" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pa1" function="ALT3" group="MISO" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pa0" function="ALT3" group="MOSI" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pc0" function="ALT3" group="SCK" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pc1" function="ALT3" group="SS" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pd5" function="ALT4" group="MISO" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pd4" function="ALT4" group="MOSI" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pd6" function="ALT4" group="SCK" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pd7" function="ALT4" group="SS" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pc1" function="ALT5" group="MISO" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pc0" function="ALT5" group="MOSI" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pc2" function="ALT5" group="SCK" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pc3" function="ALT5" group="SS" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pc1" function="ALT6" group="MISO" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pc2" function="ALT6" group="MOSI" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pc3" function="ALT6" group="SCK" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pf7" function="ALT6" group="SS" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pa5" function="DEFAULT" group="MISO" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pa4" function="DEFAULT" group="MOSI" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pa6" function="DEFAULT" group="SCK" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pa7" function="DEFAULT" group="SS" field="PORTMUX.SPIROUTEA.SPI0"/>
             </signals>
         </peripheral>
         <peripheral key="syscfg" name="SYSCFG" module-key="avrea_syscfg">
@@ -338,157 +338,157 @@
         <peripheral key="tca0" name="TCA0" module-key="tmr_16b_pwm_v1">
             <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"/>
-                <signal pad-id="pb2" index="2" function="ALT1" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pb3" index="3" function="ALT1" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pb4" index="4" function="ALT1" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pb5" index="5" function="ALT1" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <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"/>
-                <signal pad-id="pc2" index="2" function="ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pc3" index="3" function="ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pc4" index="4" function="ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pc5" index="5" function="ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pd0" index="0" function="ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pd1" index="1" function="ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pd2" index="2" function="ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pd3" index="3" function="ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pd4" index="4" function="ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pd5" index="5" function="ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pe0" index="0" function="ALT4" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pe1" index="1" function="ALT4" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pe2" index="2" function="ALT4" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pe3" index="3" function="ALT4" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pf0" index="0" function="ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pf1" index="1" function="ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pf2" index="2" function="ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pf3" index="3" function="ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pf4" index="4" function="ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pf5" index="5" function="ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pa0" index="0" function="DEFAULT" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pa1" index="1" function="DEFAULT" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pa2" index="2" function="DEFAULT" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pa3" index="3" function="DEFAULT" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pa4" index="4" function="DEFAULT" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pa5" index="5" function="DEFAULT" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pb0" index="0" function="ALT1" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pb1" index="1" function="ALT1" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pb2" index="2" function="ALT1" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pb3" index="3" function="ALT1" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pb4" index="4" function="ALT1" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pb5" index="5" function="ALT1" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pc0" index="0" function="ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pc1" index="1" function="ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pc2" index="2" function="ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pc3" index="3" function="ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pc4" index="4" function="ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pc5" index="5" function="ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pd0" index="0" function="ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pd1" index="1" function="ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pd2" index="2" function="ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pd3" index="3" function="ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pd4" index="4" function="ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pd5" index="5" function="ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pe0" index="0" function="ALT4" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pe1" index="1" function="ALT4" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pe2" index="2" function="ALT4" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pe3" index="3" function="ALT4" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pf0" index="0" function="ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pf1" index="1" function="ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pf2" index="2" function="ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pf3" index="3" function="ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pf4" index="4" function="ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pf5" index="5" function="ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pa0" index="0" function="DEFAULT" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pa1" index="1" function="DEFAULT" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pa2" index="2" function="DEFAULT" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pa3" index="3" function="DEFAULT" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pa4" index="4" function="DEFAULT" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pa5" index="5" function="DEFAULT" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
             </signals>
         </peripheral>
         <peripheral key="tca1" name="TCA1" module-key="tmr_16b_pwm_v1">
             <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"/>
-                <signal pad-id="pc6" index="2" function="ALT1" group="WO" field="PORTMUX.TCAROUTEA.TCA1"/>
-                <signal pad-id="pa4" index="0" function="ALT4" group="WO" field="PORTMUX.TCAROUTEA.TCA1"/>
-                <signal pad-id="pa5" index="1" function="ALT4" group="WO" field="PORTMUX.TCAROUTEA.TCA1"/>
-                <signal pad-id="pa6" index="2" function="ALT4" group="WO" field="PORTMUX.TCAROUTEA.TCA1"/>
-                <signal pad-id="pd4" index="0" function="ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA1"/>
-                <signal pad-id="pd5" index="1" function="ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA1"/>
-                <signal pad-id="pd6" index="2" function="ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA1"/>
-                <signal pad-id="pb0" index="0" function="DEFAULT" group="WO" field="PORTMUX.TCAROUTEA.TCA1"/>
-                <signal pad-id="pb1" index="1" function="DEFAULT" group="WO" field="PORTMUX.TCAROUTEA.TCA1"/>
-                <signal pad-id="pb2" index="2" function="DEFAULT" group="WO" field="PORTMUX.TCAROUTEA.TCA1"/>
-                <signal pad-id="pb3" index="3" function="DEFAULT" group="WO" field="PORTMUX.TCAROUTEA.TCA1"/>
-                <signal pad-id="pb4" index="4" function="DEFAULT" group="WO" field="PORTMUX.TCAROUTEA.TCA1"/>
-                <signal pad-id="pb5" index="5" function="DEFAULT" group="WO" field="PORTMUX.TCAROUTEA.TCA1"/>
+                <signal pad-key="pc4" index="0" function="ALT1" group="WO" field="PORTMUX.TCAROUTEA.TCA1"/>
+                <signal pad-key="pc5" index="1" function="ALT1" group="WO" field="PORTMUX.TCAROUTEA.TCA1"/>
+                <signal pad-key="pc6" index="2" function="ALT1" group="WO" field="PORTMUX.TCAROUTEA.TCA1"/>
+                <signal pad-key="pa4" index="0" function="ALT4" group="WO" field="PORTMUX.TCAROUTEA.TCA1"/>
+                <signal pad-key="pa5" index="1" function="ALT4" group="WO" field="PORTMUX.TCAROUTEA.TCA1"/>
+                <signal pad-key="pa6" index="2" function="ALT4" group="WO" field="PORTMUX.TCAROUTEA.TCA1"/>
+                <signal pad-key="pd4" index="0" function="ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA1"/>
+                <signal pad-key="pd5" index="1" function="ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA1"/>
+                <signal pad-key="pd6" index="2" function="ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA1"/>
+                <signal pad-key="pb0" index="0" function="DEFAULT" group="WO" field="PORTMUX.TCAROUTEA.TCA1"/>
+                <signal pad-key="pb1" index="1" function="DEFAULT" group="WO" field="PORTMUX.TCAROUTEA.TCA1"/>
+                <signal pad-key="pb2" index="2" function="DEFAULT" group="WO" field="PORTMUX.TCAROUTEA.TCA1"/>
+                <signal pad-key="pb3" index="3" function="DEFAULT" group="WO" field="PORTMUX.TCAROUTEA.TCA1"/>
+                <signal pad-key="pb4" index="4" function="DEFAULT" group="WO" field="PORTMUX.TCAROUTEA.TCA1"/>
+                <signal pad-key="pb5" index="5" function="DEFAULT" group="WO" field="PORTMUX.TCAROUTEA.TCA1"/>
             </signals>
         </peripheral>
         <peripheral key="tcb0" name="TCB0" module-key="tmr_16b_capture_v1">
             <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"/>
+                <signal pad-key="pf4" index="0" function="ALT1" group="WO" field="PORTMUX.TCBROUTEA.TCB0"/>
+                <signal pad-key="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 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"/>
+                <signal pad-key="pf5" index="0" function="ALT1" group="WO" field="PORTMUX.TCBROUTEA.TCB1"/>
+                <signal pad-key="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 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"/>
+                <signal pad-key="pb4" index="0" function="ALT1" group="WO" field="PORTMUX.TCBROUTEA.TCB2"/>
+                <signal pad-key="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 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"/>
+                <signal pad-key="pc1" index="0" function="ALT1" group="WO" field="PORTMUX.TCBROUTEA.TCB3"/>
+                <signal pad-key="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 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"/>
-                <signal pad-id="pa2" function="ALT1" group="SDA" field="PORTMUX.TWIROUTEA.TWI0"/>
-                <signal pad-id="pc6" function="ALT1" group="SDA_DUAL" field="PORTMUX.TWIROUTEA.TWI0"/>
-                <signal pad-id="pc3" function="ALT2" group="SCL" field="PORTMUX.TWIROUTEA.TWI0"/>
-                <signal pad-id="pc7" function="ALT2" group="SCL_DUAL" field="PORTMUX.TWIROUTEA.TWI0"/>
-                <signal pad-id="pc2" function="ALT2" group="SDA" field="PORTMUX.TWIROUTEA.TWI0"/>
-                <signal pad-id="pc6" function="ALT2" group="SDA_DUAL" field="PORTMUX.TWIROUTEA.TWI0"/>
-                <signal pad-id="pa1" function="ALT3" group="SCL" field="PORTMUX.TWIROUTEA.TWI0"/>
-                <signal pad-id="pc3" function="ALT3" group="SCL_DUAL" field="PORTMUX.TWIROUTEA.TWI0"/>
-                <signal pad-id="pa0" function="ALT3" group="SDA" field="PORTMUX.TWIROUTEA.TWI0"/>
-                <signal pad-id="pc2" function="ALT3" group="SDA_DUAL" field="PORTMUX.TWIROUTEA.TWI0"/>
-                <signal pad-id="pa3" function="DEFAULT" group="SCL" field="PORTMUX.TWIROUTEA.TWI0"/>
-                <signal pad-id="pc3" function="DEFAULT" group="SCL_DUAL" field="PORTMUX.TWIROUTEA.TWI0"/>
-                <signal pad-id="pa2" function="DEFAULT" group="SDA" field="PORTMUX.TWIROUTEA.TWI0"/>
-                <signal pad-id="pc2" function="DEFAULT" group="SDA_DUAL" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pa3" function="ALT1" group="SCL" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pc7" function="ALT1" group="SCL_DUAL" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pa2" function="ALT1" group="SDA" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pc6" function="ALT1" group="SDA_DUAL" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pc3" function="ALT2" group="SCL" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pc7" function="ALT2" group="SCL_DUAL" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pc2" function="ALT2" group="SDA" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pc6" function="ALT2" group="SDA_DUAL" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pa1" function="ALT3" group="SCL" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pc3" function="ALT3" group="SCL_DUAL" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pa0" function="ALT3" group="SDA" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pc2" function="ALT3" group="SDA_DUAL" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pa3" function="DEFAULT" group="SCL" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pc3" function="DEFAULT" group="SCL_DUAL" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pa2" function="DEFAULT" group="SDA" field="PORTMUX.TWIROUTEA.TWI0"/>
+                <signal pad-key="pc2" function="DEFAULT" group="SDA_DUAL" field="PORTMUX.TWIROUTEA.TWI0"/>
             </signals>
         </peripheral>
         <peripheral key="usart0" name="USART0" module-key="uart_autobd_v4">
             <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"/>
-                <signal pad-id="pa6" index="1" function="ALT1" group="XCK" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pa7" index="1" function="ALT1" group="XDIR" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pa3" index="2" function="ALT2" group="RXD" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pa2" index="2" function="ALT2" group="TXD" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pd5" index="3" function="ALT3" group="RXD" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pd4" index="3" function="ALT3" group="TXD" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pd6" index="3" function="ALT3" group="XCK" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pd7" index="3" function="ALT3" group="XDIR" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pc2" index="4" function="ALT4" group="RXD" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pc1" index="4" function="ALT4" group="TXD" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pc3" index="4" function="ALT4" group="XCK" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pa1" function="DEFAULT" group="RXD" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pa0" function="DEFAULT" group="TXD" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pa2" function="DEFAULT" group="XCK" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pa3" function="DEFAULT" group="XDIR" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa5" index="1" function="ALT1" group="RXD" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa4" index="1" function="ALT1" group="TXD" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa6" index="1" function="ALT1" group="XCK" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa7" index="1" function="ALT1" group="XDIR" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa3" index="2" function="ALT2" group="RXD" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa2" index="2" function="ALT2" group="TXD" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pd5" index="3" function="ALT3" group="RXD" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pd4" index="3" function="ALT3" group="TXD" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pd6" index="3" function="ALT3" group="XCK" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pd7" index="3" function="ALT3" group="XDIR" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pc2" index="4" function="ALT4" group="RXD" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pc1" index="4" function="ALT4" group="TXD" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pc3" index="4" function="ALT4" group="XCK" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa1" function="DEFAULT" group="RXD" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa0" function="DEFAULT" group="TXD" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa2" function="DEFAULT" group="XCK" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa3" function="DEFAULT" group="XDIR" field="PORTMUX.USARTROUTEA.USART0"/>
             </signals>
         </peripheral>
         <peripheral key="usart1" name="USART1" module-key="uart_autobd_v4">
             <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"/>
-                <signal pad-id="pc6" function="ALT1" group="XCK" field="PORTMUX.USARTROUTEA.USART1"/>
-                <signal pad-id="pc7" function="ALT1" group="XDIR" field="PORTMUX.USARTROUTEA.USART1"/>
-                <signal pad-id="pd7" function="ALT2" group="RXD" field="PORTMUX.USARTROUTEA.USART1"/>
-                <signal pad-id="pd6" function="ALT2" group="TXD" field="PORTMUX.USARTROUTEA.USART1"/>
-                <signal pad-id="pc1" function="DEFAULT" group="RXD" field="PORTMUX.USARTROUTEA.USART1"/>
-                <signal pad-id="pc0" function="DEFAULT" group="TXD" field="PORTMUX.USARTROUTEA.USART1"/>
-                <signal pad-id="pc2" function="DEFAULT" group="XCK" field="PORTMUX.USARTROUTEA.USART1"/>
-                <signal pad-id="pc3" function="DEFAULT" group="XDIR" field="PORTMUX.USARTROUTEA.USART1"/>
+                <signal pad-key="pc5" function="ALT1" group="RXD" field="PORTMUX.USARTROUTEA.USART1"/>
+                <signal pad-key="pc4" function="ALT1" group="TXD" field="PORTMUX.USARTROUTEA.USART1"/>
+                <signal pad-key="pc6" function="ALT1" group="XCK" field="PORTMUX.USARTROUTEA.USART1"/>
+                <signal pad-key="pc7" function="ALT1" group="XDIR" field="PORTMUX.USARTROUTEA.USART1"/>
+                <signal pad-key="pd7" function="ALT2" group="RXD" field="PORTMUX.USARTROUTEA.USART1"/>
+                <signal pad-key="pd6" function="ALT2" group="TXD" field="PORTMUX.USARTROUTEA.USART1"/>
+                <signal pad-key="pc1" function="DEFAULT" group="RXD" field="PORTMUX.USARTROUTEA.USART1"/>
+                <signal pad-key="pc0" function="DEFAULT" group="TXD" field="PORTMUX.USARTROUTEA.USART1"/>
+                <signal pad-key="pc2" function="DEFAULT" group="XCK" field="PORTMUX.USARTROUTEA.USART1"/>
+                <signal pad-key="pc3" function="DEFAULT" group="XDIR" field="PORTMUX.USARTROUTEA.USART1"/>
             </signals>
         </peripheral>
         <peripheral key="usart2" name="USART2" module-key="uart_autobd_v4">
             <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"/>
-                <signal pad-id="pf1" function="DEFAULT" group="RXD" field="PORTMUX.USARTROUTEA.USART2"/>
-                <signal pad-id="pf0" function="DEFAULT" group="TXD" field="PORTMUX.USARTROUTEA.USART2"/>
-                <signal pad-id="pf2" function="DEFAULT" group="XCK" field="PORTMUX.USARTROUTEA.USART2"/>
-                <signal pad-id="pf3" function="DEFAULT" group="XDIR" field="PORTMUX.USARTROUTEA.USART2"/>
+                <signal pad-key="pf5" function="ALT1" group="RXD" field="PORTMUX.USARTROUTEA.USART2"/>
+                <signal pad-key="pf4" function="ALT1" group="TXD" field="PORTMUX.USARTROUTEA.USART2"/>
+                <signal pad-key="pf1" function="DEFAULT" group="RXD" field="PORTMUX.USARTROUTEA.USART2"/>
+                <signal pad-key="pf0" function="DEFAULT" group="TXD" field="PORTMUX.USARTROUTEA.USART2"/>
+                <signal pad-key="pf2" function="DEFAULT" group="XCK" field="PORTMUX.USARTROUTEA.USART2"/>
+                <signal pad-key="pf3" function="DEFAULT" group="XDIR" field="PORTMUX.USARTROUTEA.USART2"/>
             </signals>
         </peripheral>
         <peripheral key="userrow" name="USERROW" module-key="avrea_userrow">
@@ -515,7 +515,7 @@
         <peripheral key="vref" name="VREF" module-key="avrea_vref">
             <register-group-instance register-group-key="vref" address-space-key="data" offset="0xB0"/>
             <signals>
-                <signal pad-id="pd7" function="VREF" group="VREFA"/>
+                <signal pad-key="pd7" function="VREF" group="VREFA"/>
             </signals>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="wdt_windowed_v2">
@@ -1712,59 +1712,109 @@
             </register-group>
         </module>
     </modules>
+    <pads>
+        <pad key="pa5" name="PA5"/>
+        <pad key="pa6" name="PA6"/>
+        <pad key="pa7" name="PA7"/>
+        <pad key="pb0" name="PB0"/>
+        <pad key="pb1" name="PB1"/>
+        <pad key="pb2" name="PB2"/>
+        <pad key="pb3" name="PB3"/>
+        <pad key="pb4" name="PB4"/>
+        <pad key="pb5" name="PB5"/>
+        <pad key="pc0" name="PC0"/>
+        <pad key="pc1" name="PC1"/>
+        <pad key="pc2" name="PC2"/>
+        <pad key="pc3" name="PC3"/>
+        <pad key="vdd2" name="VDD2"/>
+        <pad key="gnd2" name="GND2"/>
+        <pad key="pc4" name="PC4"/>
+        <pad key="pc5" name="PC5"/>
+        <pad key="pc6" name="PC6"/>
+        <pad key="pc7" name="PC7"/>
+        <pad key="pd0" name="PD0"/>
+        <pad key="pd1" name="PD1"/>
+        <pad key="pd2" name="PD2"/>
+        <pad key="pd3" name="PD3"/>
+        <pad key="pd4" name="PD4"/>
+        <pad key="pd5" name="PD5"/>
+        <pad key="pd6" name="PD6"/>
+        <pad key="pd7" name="PD7"/>
+        <pad key="vdd" name="VDD"/>
+        <pad key="gnd" name="GND"/>
+        <pad key="pe0" name="PE0"/>
+        <pad key="pe1" name="PE1"/>
+        <pad key="pe2" name="PE2"/>
+        <pad key="pe3" name="PE3"/>
+        <pad key="pf0" name="PF0"/>
+        <pad key="pf1" name="PF1"/>
+        <pad key="pf2" name="PF2"/>
+        <pad key="pf3" name="PF3"/>
+        <pad key="pf4" name="PF4"/>
+        <pad key="pf5" name="PF5"/>
+        <pad key="pf6" name="PF6"/>
+        <pad key="pf7" name="PF7"/>
+        <pad key="vdd1" name="VDD1"/>
+        <pad key="gnd1" name="GND1"/>
+        <pad key="pa0" name="PA0"/>
+        <pad key="pa1" name="PA1"/>
+        <pad key="pa2" name="PA2"/>
+        <pad key="pa3" name="PA3"/>
+        <pad key="pa4" name="PA4"/>
+    </pads>
     <pinouts>
         <pinout key="qfn48" name="QFN48" type="qfn">
-            <pin position="1" pad="PA5"/>
-            <pin position="2" pad="PA6"/>
-            <pin position="3" pad="PA7"/>
-            <pin position="4" pad="PB0"/>
-            <pin position="5" pad="PB1"/>
-            <pin position="6" pad="PB2"/>
-            <pin position="7" pad="PB3"/>
-            <pin position="8" pad="PB4"/>
-            <pin position="9" pad="PB5"/>
-            <pin position="10" pad="PC0"/>
-            <pin position="11" pad="PC1"/>
-            <pin position="12" pad="PC2"/>
-            <pin position="13" pad="PC3"/>
-            <pin position="14" pad="VDD2"/>
-            <pin position="15" pad="GND2"/>
-            <pin position="16" pad="PC4"/>
-            <pin position="17" pad="PC5"/>
-            <pin position="18" pad="PC6"/>
-            <pin position="19" pad="PC7"/>
-            <pin position="20" pad="PD0"/>
-            <pin position="21" pad="PD1"/>
-            <pin position="22" pad="PD2"/>
-            <pin position="23" pad="PD3"/>
-            <pin position="24" pad="PD4"/>
-            <pin position="25" pad="PD5"/>
-            <pin position="26" pad="PD6"/>
-            <pin position="27" pad="PD7"/>
-            <pin position="28" pad="VDD"/>
-            <pin position="29" pad="GND"/>
-            <pin position="30" pad="PE0"/>
-            <pin position="31" pad="PE1"/>
-            <pin position="32" pad="PE2"/>
-            <pin position="33" pad="PE3"/>
-            <pin position="34" pad="PF0"/>
-            <pin position="35" pad="PF1"/>
-            <pin position="36" pad="PF2"/>
-            <pin position="37" pad="PF3"/>
-            <pin position="38" pad="PF4"/>
-            <pin position="39" pad="PF5"/>
-            <pin position="40" pad="PF6"/>
-            <pin position="41" pad="PF7"/>
-            <pin position="42" pad="VDD1"/>
-            <pin position="43" pad="GND1"/>
-            <pin position="44" pad="PA0"/>
-            <pin position="45" pad="PA1"/>
-            <pin position="46" pad="PA2"/>
-            <pin position="47" pad="PA3"/>
-            <pin position="48" pad="PA4"/>
+            <pin position="1" pad-key="pa5"/>
+            <pin position="2" pad-key="pa6"/>
+            <pin position="3" pad-key="pa7"/>
+            <pin position="4" pad-key="pb0"/>
+            <pin position="5" pad-key="pb1"/>
+            <pin position="6" pad-key="pb2"/>
+            <pin position="7" pad-key="pb3"/>
+            <pin position="8" pad-key="pb4"/>
+            <pin position="9" pad-key="pb5"/>
+            <pin position="10" pad-key="pc0"/>
+            <pin position="11" pad-key="pc1"/>
+            <pin position="12" pad-key="pc2"/>
+            <pin position="13" pad-key="pc3"/>
+            <pin position="14" pad-key="vdd2"/>
+            <pin position="15" pad-key="gnd2"/>
+            <pin position="16" pad-key="pc4"/>
+            <pin position="17" pad-key="pc5"/>
+            <pin position="18" pad-key="pc6"/>
+            <pin position="19" pad-key="pc7"/>
+            <pin position="20" pad-key="pd0"/>
+            <pin position="21" pad-key="pd1"/>
+            <pin position="22" pad-key="pd2"/>
+            <pin position="23" pad-key="pd3"/>
+            <pin position="24" pad-key="pd4"/>
+            <pin position="25" pad-key="pd5"/>
+            <pin position="26" pad-key="pd6"/>
+            <pin position="27" pad-key="pd7"/>
+            <pin position="28" pad-key="vdd"/>
+            <pin position="29" pad-key="gnd"/>
+            <pin position="30" pad-key="pe0"/>
+            <pin position="31" pad-key="pe1"/>
+            <pin position="32" pad-key="pe2"/>
+            <pin position="33" pad-key="pe3"/>
+            <pin position="34" pad-key="pf0"/>
+            <pin position="35" pad-key="pf1"/>
+            <pin position="36" pad-key="pf2"/>
+            <pin position="37" pad-key="pf3"/>
+            <pin position="38" pad-key="pf4"/>
+            <pin position="39" pad-key="pf5"/>
+            <pin position="40" pad-key="pf6"/>
+            <pin position="41" pad-key="pf7"/>
+            <pin position="42" pad-key="vdd1"/>
+            <pin position="43" pad-key="gnd1"/>
+            <pin position="44" pad-key="pa0"/>
+            <pin position="45" pad-key="pa1"/>
+            <pin position="46" pad-key="pa2"/>
+            <pin position="47" pad-key="pa3"/>
+            <pin position="48" pad-key="pa4"/>
         </pinout>
     </pinouts>
     <variants>
-        <variant name="AVR64EA48" pinout-key="qfn48" package="VQFN48"/>
+        <variant key="avr64ea48" name="AVR64EA48" pinout-key="qfn48"/>
     </variants>
 </device>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90CAN128.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90CAN128.xml
index 39bbc1ce..cf1d636f 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90CAN128.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90CAN128.xml
@@ -195,139 +195,136 @@
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pa2" index="2" function="default" group="P"/>
-                <signal pad-id="pa3" index="3" function="default" group="P"/>
-                <signal pad-id="pa4" index="4" function="default" group="P"/>
-                <signal pad-id="pa5" index="5" function="default" group="P"/>
-                <signal pad-id="pa6" index="6" function="default" group="P"/>
-                <signal pad-id="pa7" index="7" function="default" group="P"/>
+                <signal pad-key="pa0" index="0" function="default" group="P"/>
+                <signal pad-key="pa1" index="1" function="default" group="P"/>
+                <signal pad-key="pa2" index="2" function="default" group="P"/>
+                <signal pad-key="pa3" index="3" function="default" group="P"/>
+                <signal pad-key="pa4" index="4" function="default" group="P"/>
+                <signal pad-key="pa5" index="5" function="default" group="P"/>
+                <signal pad-key="pa6" index="6" function="default" group="P"/>
+                <signal pad-key="pa7" index="7" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pb2" index="2" function="default" group="P"/>
-                <signal pad-id="pb3" index="3" function="default" group="P"/>
-                <signal pad-id="pb4" index="4" function="default" group="P"/>
-                <signal pad-id="pb5" index="5" function="default" group="P"/>
-                <signal pad-id="pb6" index="6" function="default" group="P"/>
-                <signal pad-id="pb7" index="7" function="default" group="P"/>
+                <signal pad-key="pb0" index="0" function="default" group="P"/>
+                <signal pad-key="pb1" index="1" function="default" group="P"/>
+                <signal pad-key="pb2" index="2" function="default" group="P"/>
+                <signal pad-key="pb3" index="3" function="default" group="P"/>
+                <signal pad-key="pb4" index="4" function="default" group="P"/>
+                <signal pad-key="pb5" index="5" function="default" group="P"/>
+                <signal pad-key="pb6" index="6" function="default" group="P"/>
+                <signal pad-key="pb7" index="7" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pc2" index="2" function="default" group="P"/>
-                <signal pad-id="pc3" index="3" function="default" group="P"/>
-                <signal pad-id="pc4" index="4" function="default" group="P"/>
-                <signal pad-id="pc5" index="5" function="default" group="P"/>
-                <signal pad-id="pc6" index="6" function="default" group="P"/>
-                <signal pad-id="pc7" index="7" function="default" group="P"/>
+                <signal pad-key="pc0" index="0" function="default" group="P"/>
+                <signal pad-key="pc1" index="1" function="default" group="P"/>
+                <signal pad-key="pc2" index="2" function="default" group="P"/>
+                <signal pad-key="pc3" index="3" function="default" group="P"/>
+                <signal pad-key="pc4" index="4" function="default" group="P"/>
+                <signal pad-key="pc5" index="5" function="default" group="P"/>
+                <signal pad-key="pc6" index="6" function="default" group="P"/>
+                <signal pad-key="pc7" index="7" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pd2" index="2" function="default" group="P"/>
-                <signal pad-id="pd3" index="3" function="default" group="P"/>
-                <signal pad-id="pd4" index="4" function="default" group="P"/>
-                <signal pad-id="pd5" index="5" function="default" group="P"/>
-                <signal pad-id="pd6" index="6" function="default" group="P"/>
-                <signal pad-id="pd7" index="7" function="default" group="P"/>
+                <signal pad-key="pd0" index="0" function="default" group="P"/>
+                <signal pad-key="pd1" index="1" function="default" group="P"/>
+                <signal pad-key="pd2" index="2" function="default" group="P"/>
+                <signal pad-key="pd3" index="3" function="default" group="P"/>
+                <signal pad-key="pd4" index="4" function="default" group="P"/>
+                <signal pad-key="pd5" index="5" function="default" group="P"/>
+                <signal pad-key="pd6" index="6" function="default" group="P"/>
+                <signal pad-key="pd7" index="7" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="porte" name="PORTE" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pe2" index="2" function="default" group="P"/>
-                <signal pad-id="pe3" index="3" function="default" group="P"/>
-                <signal pad-id="pe4" index="4" function="default" group="P"/>
-                <signal pad-id="pe5" index="5" function="default" group="P"/>
-                <signal pad-id="pe6" index="6" function="default" group="P"/>
-                <signal pad-id="pe7" index="7" function="default" group="P"/>
+                <signal pad-key="pe0" index="0" function="default" group="P"/>
+                <signal pad-key="pe1" index="1" function="default" group="P"/>
+                <signal pad-key="pe2" index="2" function="default" group="P"/>
+                <signal pad-key="pe3" index="3" function="default" group="P"/>
+                <signal pad-key="pe4" index="4" function="default" group="P"/>
+                <signal pad-key="pe5" index="5" function="default" group="P"/>
+                <signal pad-key="pe6" index="6" function="default" group="P"/>
+                <signal pad-key="pe7" index="7" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portf" name="PORTF" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pf2" index="2" function="default" group="P"/>
-                <signal pad-id="pf3" index="3" function="default" group="P"/>
-                <signal pad-id="pf4" index="4" function="default" group="P"/>
-                <signal pad-id="pf5" index="5" function="default" group="P"/>
-                <signal pad-id="pf6" index="6" function="default" group="P"/>
-                <signal pad-id="pf7" index="7" function="default" group="P"/>
+                <signal pad-key="pf0" index="0" function="default" group="P"/>
+                <signal pad-key="pf1" index="1" function="default" group="P"/>
+                <signal pad-key="pf2" index="2" function="default" group="P"/>
+                <signal pad-key="pf3" index="3" function="default" group="P"/>
+                <signal pad-key="pf4" index="4" function="default" group="P"/>
+                <signal pad-key="pf5" index="5" function="default" group="P"/>
+                <signal pad-key="pf6" index="6" function="default" group="P"/>
+                <signal pad-key="pf7" index="7" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portg" name="PORTG" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pg2" index="2" function="default" group="P"/>
-                <signal pad-id="pg3" index="3" function="default" group="P"/>
-                <signal pad-id="pg4" index="4" function="default" group="P"/>
-                <signal pad-id="pg5" index="5" function="default" group="P"/>
-                <signal pad-id="pg6" index="6" function="default" group="P"/>
-                <signal pad-id="pg7" index="7" function="default" group="P"/>
+                <signal pad-key="pg0" index="0" function="default" group="P"/>
+                <signal pad-key="pg1" index="1" function="default" group="P"/>
+                <signal pad-key="pg2" index="2" function="default" group="P"/>
+                <signal pad-key="pg3" index="3" function="default" group="P"/>
+                <signal pad-key="pg4" index="4" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="jtag" name="JTAG" module-key="jtag">
             <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"/>
-                <signal pad-id="pf6" function="default" group="TDO"/>
-                <signal pad-id="pf7" function="default" group="TDI"/>
+                <signal pad-key="pf4" function="default" group="TCK"/>
+                <signal pad-key="pf5" function="default" group="TMS"/>
+                <signal pad-key="pf6" function="default" group="TDO"/>
+                <signal pad-key="pf7" function="default" group="TDI"/>
             </signals>
         </peripheral>
         <peripheral key="spi" name="SPI" module-key="spi">
             <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"/>
-                <signal pad-id="pb3" function="default" group="MISO"/>
-                <signal pad-id="pb1" function="default" group="SCK"/>
+                <signal pad-key="pb0" function="default" group="SS"/>
+                <signal pad-key="pb2" function="default" group="MOSI"/>
+                <signal pad-key="pb3" function="default" group="MISO"/>
+                <signal pad-key="pb1" function="default" group="SCK"/>
             </signals>
         </peripheral>
         <peripheral key="twi" name="TWI" module-key="twi">
             <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"/>
+                <signal pad-key="pd1" function="default" group="SDA"/>
+                <signal pad-key="pd0" function="default" group="SCL"/>
             </signals>
         </peripheral>
         <peripheral key="usart0" name="USART0" module-key="usart">
             <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"/>
-                <signal pad-id="pe2" function="default" group="XCK"/>
+                <signal pad-key="pe1" function="default" group="TXD"/>
+                <signal pad-key="pe0" function="default" group="RXD"/>
+                <signal pad-key="pe2" function="default" group="XCK"/>
             </signals>
         </peripheral>
         <peripheral key="usart1" name="USART1" module-key="usart">
             <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"/>
-                <signal pad-id="pd5" function="default" group="XCK"/>
+                <signal pad-key="pd3" function="default" group="TXD"/>
+                <signal pad-key="pd2" function="default" group="RXD"/>
+                <signal pad-key="pd5" function="default" group="XCK"/>
             </signals>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="cpu">
             <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"/>
+                <signal pad-key="pc7" index="0" function="default" group="CLKO"/>
             </signals>
         </peripheral>
         <peripheral key="boot_load" name="BOOT_LOAD" module-key="boot_load">
@@ -336,14 +333,14 @@
         <peripheral key="exint" name="EXINT" module-key="exint">
             <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"/>
-                <signal pad-id="pd2" index="2" function="default" group="INT"/>
-                <signal pad-id="pd3" index="3" function="default" group="INT"/>
-                <signal pad-id="pe4" index="4" function="default" group="INT"/>
-                <signal pad-id="pe5" index="5" function="default" group="INT"/>
-                <signal pad-id="pe6" index="6" function="default" group="INT"/>
-                <signal pad-id="pe7" index="7" function="default" group="INT"/>
+                <signal pad-key="pd0" index="0" function="default" group="INT"/>
+                <signal pad-key="pd1" index="1" function="default" group="INT"/>
+                <signal pad-key="pd2" index="2" function="default" group="INT"/>
+                <signal pad-key="pd3" index="3" function="default" group="INT"/>
+                <signal pad-key="pe4" index="4" function="default" group="INT"/>
+                <signal pad-key="pe5" index="5" function="default" group="INT"/>
+                <signal pad-key="pe6" index="6" function="default" group="INT"/>
+                <signal pad-key="pe7" index="7" function="default" group="INT"/>
             </signals>
         </peripheral>
         <peripheral key="eeprom" name="EEPROM" module-key="eeprom">
@@ -352,36 +349,36 @@
         <peripheral key="tc0" name="TC0" module-key="tc8">
             <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"/>
+                <signal pad-key="pd7" function="default" group="T"/>
+                <signal pad-key="pb7" function="default" group="OCA"/>
             </signals>
         </peripheral>
         <peripheral key="tc1" name="TC1" module-key="tc16">
             <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"/>
-                <signal pad-id="pb5" function="default" group="OCA"/>
-                <signal pad-id="pb6" function="default" group="OCB"/>
-                <signal pad-id="pb7" function="default" group="OCC"/>
+                <signal pad-key="pd6" function="default" group="T"/>
+                <signal pad-key="pd4" function="default" group="ICP"/>
+                <signal pad-key="pb5" function="default" group="OCA"/>
+                <signal pad-key="pb6" function="default" group="OCB"/>
+                <signal pad-key="pb7" function="default" group="OCC"/>
             </signals>
         </peripheral>
         <peripheral key="tc3" name="TC3" module-key="tc16">
             <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"/>
-                <signal pad-id="pe3" function="default" group="OCA"/>
-                <signal pad-id="pe4" function="default" group="OCB"/>
-                <signal pad-id="pe5" function="default" group="OCC"/>
+                <signal pad-key="pe6" function="default" group="T"/>
+                <signal pad-key="pe7" function="default" group="ICP"/>
+                <signal pad-key="pe3" function="default" group="OCA"/>
+                <signal pad-key="pe4" function="default" group="OCB"/>
+                <signal pad-key="pe5" function="default" group="OCC"/>
             </signals>
         </peripheral>
         <peripheral key="tc2" name="TC2" module-key="tc8_async">
             <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"/>
-                <signal pad-id="pb4" function="default" group="OCA"/>
+                <signal pad-key="pg4" index="1" function="default" group="TOSC"/>
+                <signal pad-key="pg3" index="2" function="default" group="TOSC"/>
+                <signal pad-key="pb4" function="default" group="OCA"/>
             </signals>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="wdt">
@@ -390,28 +387,28 @@
         <peripheral key="adc" name="ADC" module-key="adc">
             <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"/>
-                <signal pad-id="pa2" index="2" function="default" group="ADC"/>
-                <signal pad-id="pa3" index="3" function="default" group="ADC"/>
-                <signal pad-id="pa4" index="4" function="default" group="ADC"/>
-                <signal pad-id="pa5" index="5" function="default" group="ADC"/>
-                <signal pad-id="pa6" index="6" function="default" group="ADC"/>
-                <signal pad-id="pa7" index="7" function="default" group="ADC"/>
+                <signal pad-key="pa0" index="0" function="default" group="ADC"/>
+                <signal pad-key="pa1" index="1" function="default" group="ADC"/>
+                <signal pad-key="pa2" index="2" function="default" group="ADC"/>
+                <signal pad-key="pa3" index="3" function="default" group="ADC"/>
+                <signal pad-key="pa4" index="4" function="default" group="ADC"/>
+                <signal pad-key="pa5" index="5" function="default" group="ADC"/>
+                <signal pad-key="pa6" index="6" function="default" group="ADC"/>
+                <signal pad-key="pa7" index="7" function="default" group="ADC"/>
             </signals>
         </peripheral>
         <peripheral key="ac" name="AC" module-key="ac">
             <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"/>
+                <signal pad-key="pe2" index="0" function="default" group="AIN"/>
+                <signal pad-key="pe3" index="1" function="default" group="AIN"/>
             </signals>
         </peripheral>
         <peripheral key="can" name="CAN" module-key="can">
             <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"/>
+                <signal pad-key="pd5" function="default" group="TXCAN"/>
+                <signal pad-key="pd6" function="default" group="RXCAN"/>
             </signals>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="fuse">
@@ -1072,144 +1069,206 @@
             </register-group>
         </module>
     </modules>
+    <pads>
+        <pad key="pe0" name="PE0"/>
+        <pad key="pe1" name="PE1"/>
+        <pad key="pe2" name="PE2"/>
+        <pad key="pe3" name="PE3"/>
+        <pad key="pe4" name="PE4"/>
+        <pad key="pe5" name="PE5"/>
+        <pad key="pe6" name="PE6"/>
+        <pad key="pe7" name="PE7"/>
+        <pad key="pb0" name="PB0"/>
+        <pad key="pb1" name="PB1"/>
+        <pad key="pb2" name="PB2"/>
+        <pad key="pb3" name="PB3"/>
+        <pad key="pb4" name="PB4"/>
+        <pad key="pb5" name="PB5"/>
+        <pad key="pb6" name="PB6"/>
+        <pad key="pb7" name="PB7"/>
+        <pad key="pg3" name="PG3"/>
+        <pad key="pg4" name="PG4"/>
+        <pad key="reset" name="RESET"/>
+        <pad key="vcc" name="VCC"/>
+        <pad key="gnd" name="GND"/>
+        <pad key="xtal2" name="XTAL2"/>
+        <pad key="xtal1" name="XTAL1"/>
+        <pad key="pd0" name="PD0"/>
+        <pad key="pd1" name="PD1"/>
+        <pad key="pd2" name="PD2"/>
+        <pad key="pd3" name="PD3"/>
+        <pad key="pd4" name="PD4"/>
+        <pad key="pd5" name="PD5"/>
+        <pad key="pd6" name="PD6"/>
+        <pad key="pd7" name="PD7"/>
+        <pad key="pg0" name="PG0"/>
+        <pad key="pg1" name="PG1"/>
+        <pad key="pc0" name="PC0"/>
+        <pad key="pc1" name="PC1"/>
+        <pad key="pc2" name="PC2"/>
+        <pad key="pc3" name="PC3"/>
+        <pad key="pc4" name="PC4"/>
+        <pad key="pc5" name="PC5"/>
+        <pad key="pc6" name="PC6"/>
+        <pad key="pc7" name="PC7"/>
+        <pad key="pg2" name="PG2"/>
+        <pad key="pa7" name="PA7"/>
+        <pad key="pa6" name="PA6"/>
+        <pad key="pa5" name="PA5"/>
+        <pad key="pa4" name="PA4"/>
+        <pad key="pa3" name="PA3"/>
+        <pad key="pa2" name="PA2"/>
+        <pad key="pa1" name="PA1"/>
+        <pad key="pa0" name="PA0"/>
+        <pad key="pf7" name="PF7"/>
+        <pad key="pf6" name="PF6"/>
+        <pad key="pf5" name="PF5"/>
+        <pad key="pf4" name="PF4"/>
+        <pad key="pf3" name="PF3"/>
+        <pad key="pf2" name="PF2"/>
+        <pad key="pf1" name="PF1"/>
+        <pad key="pf0" name="PF0"/>
+        <pad key="aref" name="AREF"/>
+        <pad key="avcc" name="AVCC"/>
+    </pads>
     <pinouts>
         <pinout key="tqfp64" name="TQFP64" type="qfp">
-            <pin position="1" pad="NC"/>
-            <pin position="2" pad="PE0"/>
-            <pin position="3" pad="PE1"/>
-            <pin position="4" pad="PE2"/>
-            <pin position="5" pad="PE3"/>
-            <pin position="6" pad="PE4"/>
-            <pin position="7" pad="PE5"/>
-            <pin position="8" pad="PE6"/>
-            <pin position="9" pad="PE7"/>
-            <pin position="10" pad="PB0"/>
-            <pin position="11" pad="PB1"/>
-            <pin position="12" pad="PB2"/>
-            <pin position="13" pad="PB3"/>
-            <pin position="14" pad="PB4"/>
-            <pin position="15" pad="PB5"/>
-            <pin position="16" pad="PB6"/>
-            <pin position="17" pad="PB7"/>
-            <pin position="18" pad="PG3"/>
-            <pin position="19" pad="PG4"/>
-            <pin position="20" pad="RESET"/>
-            <pin position="21" pad="VCC"/>
-            <pin position="22" pad="GND"/>
-            <pin position="23" pad="XTAL2"/>
-            <pin position="24" pad="XTAL1"/>
-            <pin position="25" pad="PD0"/>
-            <pin position="26" pad="PD1"/>
-            <pin position="27" pad="PD2"/>
-            <pin position="28" pad="PD3"/>
-            <pin position="29" pad="PD4"/>
-            <pin position="30" pad="PD5"/>
-            <pin position="31" pad="PD6"/>
-            <pin position="32" pad="PD7"/>
-            <pin position="33" pad="PG0"/>
-            <pin position="34" pad="PG1"/>
-            <pin position="35" pad="PC0"/>
-            <pin position="36" pad="PC1"/>
-            <pin position="37" pad="PC2"/>
-            <pin position="38" pad="PC3"/>
-            <pin position="39" pad="PC4"/>
-            <pin position="40" pad="PC5"/>
-            <pin position="41" pad="PC6"/>
-            <pin position="42" pad="PC7"/>
-            <pin position="43" pad="PG2"/>
-            <pin position="44" pad="PA7"/>
-            <pin position="45" pad="PA6"/>
-            <pin position="46" pad="PA5"/>
-            <pin position="47" pad="PA4"/>
-            <pin position="48" pad="PA3"/>
-            <pin position="49" pad="PA2"/>
-            <pin position="50" pad="PA1"/>
-            <pin position="51" pad="PA0"/>
-            <pin position="52" pad="VCC"/>
-            <pin position="53" pad="GND"/>
-            <pin position="54" pad="PF7"/>
-            <pin position="55" pad="PF6"/>
-            <pin position="56" pad="PF5"/>
-            <pin position="57" pad="PF4"/>
-            <pin position="58" pad="PF3"/>
-            <pin position="59" pad="PF2"/>
-            <pin position="60" pad="PF1"/>
-            <pin position="61" pad="PF0"/>
-            <pin position="62" pad="AREF"/>
-            <pin position="63" pad="GND"/>
-            <pin position="64" pad="AVCC"/>
+            <pin position="1"/>
+            <pin position="2" pad-key="pe0"/>
+            <pin position="3" pad-key="pe1"/>
+            <pin position="4" pad-key="pe2"/>
+            <pin position="5" pad-key="pe3"/>
+            <pin position="6" pad-key="pe4"/>
+            <pin position="7" pad-key="pe5"/>
+            <pin position="8" pad-key="pe6"/>
+            <pin position="9" pad-key="pe7"/>
+            <pin position="10" pad-key="pb0"/>
+            <pin position="11" pad-key="pb1"/>
+            <pin position="12" pad-key="pb2"/>
+            <pin position="13" pad-key="pb3"/>
+            <pin position="14" pad-key="pb4"/>
+            <pin position="15" pad-key="pb5"/>
+            <pin position="16" pad-key="pb6"/>
+            <pin position="17" pad-key="pb7"/>
+            <pin position="18" pad-key="pg3"/>
+            <pin position="19" pad-key="pg4"/>
+            <pin position="20" pad-key="reset"/>
+            <pin position="21" pad-key="vcc"/>
+            <pin position="22" pad-key="gnd"/>
+            <pin position="23" pad-key="xtal2"/>
+            <pin position="24" pad-key="xtal1"/>
+            <pin position="25" pad-key="pd0"/>
+            <pin position="26" pad-key="pd1"/>
+            <pin position="27" pad-key="pd2"/>
+            <pin position="28" pad-key="pd3"/>
+            <pin position="29" pad-key="pd4"/>
+            <pin position="30" pad-key="pd5"/>
+            <pin position="31" pad-key="pd6"/>
+            <pin position="32" pad-key="pd7"/>
+            <pin position="33" pad-key="pg0"/>
+            <pin position="34" pad-key="pg1"/>
+            <pin position="35" pad-key="pc0"/>
+            <pin position="36" pad-key="pc1"/>
+            <pin position="37" pad-key="pc2"/>
+            <pin position="38" pad-key="pc3"/>
+            <pin position="39" pad-key="pc4"/>
+            <pin position="40" pad-key="pc5"/>
+            <pin position="41" pad-key="pc6"/>
+            <pin position="42" pad-key="pc7"/>
+            <pin position="43" pad-key="pg2"/>
+            <pin position="44" pad-key="pa7"/>
+            <pin position="45" pad-key="pa6"/>
+            <pin position="46" pad-key="pa5"/>
+            <pin position="47" pad-key="pa4"/>
+            <pin position="48" pad-key="pa3"/>
+            <pin position="49" pad-key="pa2"/>
+            <pin position="50" pad-key="pa1"/>
+            <pin position="51" pad-key="pa0"/>
+            <pin position="52" pad-key="vcc"/>
+            <pin position="53" pad-key="gnd"/>
+            <pin position="54" pad-key="pf7"/>
+            <pin position="55" pad-key="pf6"/>
+            <pin position="56" pad-key="pf5"/>
+            <pin position="57" pad-key="pf4"/>
+            <pin position="58" pad-key="pf3"/>
+            <pin position="59" pad-key="pf2"/>
+            <pin position="60" pad-key="pf1"/>
+            <pin position="61" pad-key="pf0"/>
+            <pin position="62" pad-key="aref"/>
+            <pin position="63" pad-key="gnd"/>
+            <pin position="64" pad-key="avcc"/>
         </pinout>
         <pinout key="qfn64" name="QFN64" type="qfn">
-            <pin position="1" pad="NC"/>
-            <pin position="2" pad="PE0"/>
-            <pin position="3" pad="PE1"/>
-            <pin position="4" pad="PE2"/>
-            <pin position="5" pad="PE3"/>
-            <pin position="6" pad="PE4"/>
-            <pin position="7" pad="PE5"/>
-            <pin position="8" pad="PE6"/>
-            <pin position="9" pad="PE7"/>
-            <pin position="10" pad="PB0"/>
-            <pin position="11" pad="PB1"/>
-            <pin position="12" pad="PB2"/>
-            <pin position="13" pad="PB3"/>
-            <pin position="14" pad="PB4"/>
-            <pin position="15" pad="PB5"/>
-            <pin position="16" pad="PB6"/>
-            <pin position="17" pad="PB7"/>
-            <pin position="18" pad="PG3"/>
-            <pin position="19" pad="PG4"/>
-            <pin position="20" pad="RESET"/>
-            <pin position="21" pad="VCC"/>
-            <pin position="22" pad="GND"/>
-            <pin position="23" pad="XTAL2"/>
-            <pin position="24" pad="XTAL1"/>
-            <pin position="25" pad="PD0"/>
-            <pin position="26" pad="PD1"/>
-            <pin position="27" pad="PD2"/>
-            <pin position="28" pad="PD3"/>
-            <pin position="29" pad="PD4"/>
-            <pin position="30" pad="PD5"/>
-            <pin position="31" pad="PD6"/>
-            <pin position="32" pad="PD7"/>
-            <pin position="33" pad="PG0"/>
-            <pin position="34" pad="PG1"/>
-            <pin position="35" pad="PC0"/>
-            <pin position="36" pad="PC1"/>
-            <pin position="37" pad="PC2"/>
-            <pin position="38" pad="PC3"/>
-            <pin position="39" pad="PC4"/>
-            <pin position="40" pad="PC5"/>
-            <pin position="41" pad="PC6"/>
-            <pin position="42" pad="PC7"/>
-            <pin position="43" pad="PG2"/>
-            <pin position="44" pad="PA7"/>
-            <pin position="45" pad="PA6"/>
-            <pin position="46" pad="PA5"/>
-            <pin position="47" pad="PA4"/>
-            <pin position="48" pad="PA3"/>
-            <pin position="49" pad="PA2"/>
-            <pin position="50" pad="PA1"/>
-            <pin position="51" pad="PA0"/>
-            <pin position="52" pad="VCC"/>
-            <pin position="53" pad="GND"/>
-            <pin position="54" pad="PF7"/>
-            <pin position="55" pad="PF6"/>
-            <pin position="56" pad="PF5"/>
-            <pin position="57" pad="PF4"/>
-            <pin position="58" pad="PF3"/>
-            <pin position="59" pad="PF2"/>
-            <pin position="60" pad="PF1"/>
-            <pin position="61" pad="PF0"/>
-            <pin position="62" pad="AREF"/>
-            <pin position="63" pad="GND"/>
-            <pin position="64" pad="AVCC"/>
+            <pin position="1"/>
+            <pin position="2" pad-key="pe0"/>
+            <pin position="3" pad-key="pe1"/>
+            <pin position="4" pad-key="pe2"/>
+            <pin position="5" pad-key="pe3"/>
+            <pin position="6" pad-key="pe4"/>
+            <pin position="7" pad-key="pe5"/>
+            <pin position="8" pad-key="pe6"/>
+            <pin position="9" pad-key="pe7"/>
+            <pin position="10" pad-key="pb0"/>
+            <pin position="11" pad-key="pb1"/>
+            <pin position="12" pad-key="pb2"/>
+            <pin position="13" pad-key="pb3"/>
+            <pin position="14" pad-key="pb4"/>
+            <pin position="15" pad-key="pb5"/>
+            <pin position="16" pad-key="pb6"/>
+            <pin position="17" pad-key="pb7"/>
+            <pin position="18" pad-key="pg3"/>
+            <pin position="19" pad-key="pg4"/>
+            <pin position="20" pad-key="reset"/>
+            <pin position="21" pad-key="vcc"/>
+            <pin position="22" pad-key="gnd"/>
+            <pin position="23" pad-key="xtal2"/>
+            <pin position="24" pad-key="xtal1"/>
+            <pin position="25" pad-key="pd0"/>
+            <pin position="26" pad-key="pd1"/>
+            <pin position="27" pad-key="pd2"/>
+            <pin position="28" pad-key="pd3"/>
+            <pin position="29" pad-key="pd4"/>
+            <pin position="30" pad-key="pd5"/>
+            <pin position="31" pad-key="pd6"/>
+            <pin position="32" pad-key="pd7"/>
+            <pin position="33" pad-key="pg0"/>
+            <pin position="34" pad-key="pg1"/>
+            <pin position="35" pad-key="pc0"/>
+            <pin position="36" pad-key="pc1"/>
+            <pin position="37" pad-key="pc2"/>
+            <pin position="38" pad-key="pc3"/>
+            <pin position="39" pad-key="pc4"/>
+            <pin position="40" pad-key="pc5"/>
+            <pin position="41" pad-key="pc6"/>
+            <pin position="42" pad-key="pc7"/>
+            <pin position="43" pad-key="pg2"/>
+            <pin position="44" pad-key="pa7"/>
+            <pin position="45" pad-key="pa6"/>
+            <pin position="46" pad-key="pa5"/>
+            <pin position="47" pad-key="pa4"/>
+            <pin position="48" pad-key="pa3"/>
+            <pin position="49" pad-key="pa2"/>
+            <pin position="50" pad-key="pa1"/>
+            <pin position="51" pad-key="pa0"/>
+            <pin position="52" pad-key="vcc"/>
+            <pin position="53" pad-key="gnd"/>
+            <pin position="54" pad-key="pf7"/>
+            <pin position="55" pad-key="pf6"/>
+            <pin position="56" pad-key="pf5"/>
+            <pin position="57" pad-key="pf4"/>
+            <pin position="58" pad-key="pf3"/>
+            <pin position="59" pad-key="pf2"/>
+            <pin position="60" pad-key="pf1"/>
+            <pin position="61" pad-key="pf0"/>
+            <pin position="62" pad-key="aref"/>
+            <pin position="63" pad-key="gnd"/>
+            <pin position="64" pad-key="avcc"/>
         </pinout>
     </pinouts>
     <variants>
-        <variant name="AT90CAN128-16AI" pinout-key="tqfp64" package="TQFP64"/>
-        <variant name="AT90CAN128-16MI" pinout-key="qfn64" package="QFN64"/>
-        <variant name="AT90CAN128-16AU" pinout-key="tqfp64" package="TQFP64"/>
-        <variant name="AT90CAN128-16MU" pinout-key="qfn64" package="QFN64"/>
+        <variant key="at90can128_16ai" name="AT90CAN128-16AI" pinout-key="tqfp64"/>
+        <variant key="at90can128_16mi" name="AT90CAN128-16MI" pinout-key="qfn64"/>
+        <variant key="at90can128_16au" name="AT90CAN128-16AU" pinout-key="tqfp64"/>
+        <variant key="at90can128_16mu" name="AT90CAN128-16MU" pinout-key="qfn64"/>
     </variants>
 </device>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90CAN32.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90CAN32.xml
index 4972e377..2bf7e2d4 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90CAN32.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90CAN32.xml
@@ -195,139 +195,136 @@
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pa2" index="2" function="default" group="P"/>
-                <signal pad-id="pa3" index="3" function="default" group="P"/>
-                <signal pad-id="pa4" index="4" function="default" group="P"/>
-                <signal pad-id="pa5" index="5" function="default" group="P"/>
-                <signal pad-id="pa6" index="6" function="default" group="P"/>
-                <signal pad-id="pa7" index="7" function="default" group="P"/>
+                <signal pad-key="pa0" index="0" function="default" group="P"/>
+                <signal pad-key="pa1" index="1" function="default" group="P"/>
+                <signal pad-key="pa2" index="2" function="default" group="P"/>
+                <signal pad-key="pa3" index="3" function="default" group="P"/>
+                <signal pad-key="pa4" index="4" function="default" group="P"/>
+                <signal pad-key="pa5" index="5" function="default" group="P"/>
+                <signal pad-key="pa6" index="6" function="default" group="P"/>
+                <signal pad-key="pa7" index="7" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pb2" index="2" function="default" group="P"/>
-                <signal pad-id="pb3" index="3" function="default" group="P"/>
-                <signal pad-id="pb4" index="4" function="default" group="P"/>
-                <signal pad-id="pb5" index="5" function="default" group="P"/>
-                <signal pad-id="pb6" index="6" function="default" group="P"/>
-                <signal pad-id="pb7" index="7" function="default" group="P"/>
+                <signal pad-key="pb0" index="0" function="default" group="P"/>
+                <signal pad-key="pb1" index="1" function="default" group="P"/>
+                <signal pad-key="pb2" index="2" function="default" group="P"/>
+                <signal pad-key="pb3" index="3" function="default" group="P"/>
+                <signal pad-key="pb4" index="4" function="default" group="P"/>
+                <signal pad-key="pb5" index="5" function="default" group="P"/>
+                <signal pad-key="pb6" index="6" function="default" group="P"/>
+                <signal pad-key="pb7" index="7" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pc2" index="2" function="default" group="P"/>
-                <signal pad-id="pc3" index="3" function="default" group="P"/>
-                <signal pad-id="pc4" index="4" function="default" group="P"/>
-                <signal pad-id="pc5" index="5" function="default" group="P"/>
-                <signal pad-id="pc6" index="6" function="default" group="P"/>
-                <signal pad-id="pc7" index="7" function="default" group="P"/>
+                <signal pad-key="pc0" index="0" function="default" group="P"/>
+                <signal pad-key="pc1" index="1" function="default" group="P"/>
+                <signal pad-key="pc2" index="2" function="default" group="P"/>
+                <signal pad-key="pc3" index="3" function="default" group="P"/>
+                <signal pad-key="pc4" index="4" function="default" group="P"/>
+                <signal pad-key="pc5" index="5" function="default" group="P"/>
+                <signal pad-key="pc6" index="6" function="default" group="P"/>
+                <signal pad-key="pc7" index="7" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pd2" index="2" function="default" group="P"/>
-                <signal pad-id="pd3" index="3" function="default" group="P"/>
-                <signal pad-id="pd4" index="4" function="default" group="P"/>
-                <signal pad-id="pd5" index="5" function="default" group="P"/>
-                <signal pad-id="pd6" index="6" function="default" group="P"/>
-                <signal pad-id="pd7" index="7" function="default" group="P"/>
+                <signal pad-key="pd0" index="0" function="default" group="P"/>
+                <signal pad-key="pd1" index="1" function="default" group="P"/>
+                <signal pad-key="pd2" index="2" function="default" group="P"/>
+                <signal pad-key="pd3" index="3" function="default" group="P"/>
+                <signal pad-key="pd4" index="4" function="default" group="P"/>
+                <signal pad-key="pd5" index="5" function="default" group="P"/>
+                <signal pad-key="pd6" index="6" function="default" group="P"/>
+                <signal pad-key="pd7" index="7" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="porte" name="PORTE" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pe2" index="2" function="default" group="P"/>
-                <signal pad-id="pe3" index="3" function="default" group="P"/>
-                <signal pad-id="pe4" index="4" function="default" group="P"/>
-                <signal pad-id="pe5" index="5" function="default" group="P"/>
-                <signal pad-id="pe6" index="6" function="default" group="P"/>
-                <signal pad-id="pe7" index="7" function="default" group="P"/>
+                <signal pad-key="pe0" index="0" function="default" group="P"/>
+                <signal pad-key="pe1" index="1" function="default" group="P"/>
+                <signal pad-key="pe2" index="2" function="default" group="P"/>
+                <signal pad-key="pe3" index="3" function="default" group="P"/>
+                <signal pad-key="pe4" index="4" function="default" group="P"/>
+                <signal pad-key="pe5" index="5" function="default" group="P"/>
+                <signal pad-key="pe6" index="6" function="default" group="P"/>
+                <signal pad-key="pe7" index="7" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portf" name="PORTF" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pf2" index="2" function="default" group="P"/>
-                <signal pad-id="pf3" index="3" function="default" group="P"/>
-                <signal pad-id="pf4" index="4" function="default" group="P"/>
-                <signal pad-id="pf5" index="5" function="default" group="P"/>
-                <signal pad-id="pf6" index="6" function="default" group="P"/>
-                <signal pad-id="pf7" index="7" function="default" group="P"/>
+                <signal pad-key="pf0" index="0" function="default" group="P"/>
+                <signal pad-key="pf1" index="1" function="default" group="P"/>
+                <signal pad-key="pf2" index="2" function="default" group="P"/>
+                <signal pad-key="pf3" index="3" function="default" group="P"/>
+                <signal pad-key="pf4" index="4" function="default" group="P"/>
+                <signal pad-key="pf5" index="5" function="default" group="P"/>
+                <signal pad-key="pf6" index="6" function="default" group="P"/>
+                <signal pad-key="pf7" index="7" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portg" name="PORTG" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pg2" index="2" function="default" group="P"/>
-                <signal pad-id="pg3" index="3" function="default" group="P"/>
-                <signal pad-id="pg4" index="4" function="default" group="P"/>
-                <signal pad-id="pg5" index="5" function="default" group="P"/>
-                <signal pad-id="pg6" index="6" function="default" group="P"/>
-                <signal pad-id="pg7" index="7" function="default" group="P"/>
+                <signal pad-key="pg0" index="0" function="default" group="P"/>
+                <signal pad-key="pg1" index="1" function="default" group="P"/>
+                <signal pad-key="pg2" index="2" function="default" group="P"/>
+                <signal pad-key="pg3" index="3" function="default" group="P"/>
+                <signal pad-key="pg4" index="4" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="jtag" name="JTAG" module-key="jtag">
             <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"/>
-                <signal pad-id="pf6" function="default" group="TDO"/>
-                <signal pad-id="pf7" function="default" group="TDI"/>
+                <signal pad-key="pf4" function="default" group="TCK"/>
+                <signal pad-key="pf5" function="default" group="TMS"/>
+                <signal pad-key="pf6" function="default" group="TDO"/>
+                <signal pad-key="pf7" function="default" group="TDI"/>
             </signals>
         </peripheral>
         <peripheral key="spi" name="SPI" module-key="spi">
             <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"/>
-                <signal pad-id="pb3" function="default" group="MISO"/>
-                <signal pad-id="pb1" function="default" group="SCK"/>
+                <signal pad-key="pb0" function="default" group="SS"/>
+                <signal pad-key="pb2" function="default" group="MOSI"/>
+                <signal pad-key="pb3" function="default" group="MISO"/>
+                <signal pad-key="pb1" function="default" group="SCK"/>
             </signals>
         </peripheral>
         <peripheral key="twi" name="TWI" module-key="twi">
             <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"/>
+                <signal pad-key="pd1" function="default" group="SDA"/>
+                <signal pad-key="pd0" function="default" group="SCL"/>
             </signals>
         </peripheral>
         <peripheral key="usart0" name="USART0" module-key="usart">
             <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"/>
-                <signal pad-id="pe2" function="default" group="XCK"/>
+                <signal pad-key="pe1" function="default" group="TXD"/>
+                <signal pad-key="pe0" function="default" group="RXD"/>
+                <signal pad-key="pe2" function="default" group="XCK"/>
             </signals>
         </peripheral>
         <peripheral key="usart1" name="USART1" module-key="usart">
             <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"/>
-                <signal pad-id="pd5" function="default" group="XCK"/>
+                <signal pad-key="pd3" function="default" group="TXD"/>
+                <signal pad-key="pd2" function="default" group="RXD"/>
+                <signal pad-key="pd5" function="default" group="XCK"/>
             </signals>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="cpu">
             <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"/>
+                <signal pad-key="pc7" index="0" function="default" group="CLKO"/>
             </signals>
         </peripheral>
         <peripheral key="boot_load" name="BOOT_LOAD" module-key="boot_load">
@@ -336,14 +333,14 @@
         <peripheral key="exint" name="EXINT" module-key="exint">
             <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"/>
-                <signal pad-id="pd2" index="2" function="default" group="INT"/>
-                <signal pad-id="pd3" index="3" function="default" group="INT"/>
-                <signal pad-id="pe4" index="4" function="default" group="INT"/>
-                <signal pad-id="pe5" index="5" function="default" group="INT"/>
-                <signal pad-id="pe6" index="6" function="default" group="INT"/>
-                <signal pad-id="pe7" index="7" function="default" group="INT"/>
+                <signal pad-key="pd0" index="0" function="default" group="INT"/>
+                <signal pad-key="pd1" index="1" function="default" group="INT"/>
+                <signal pad-key="pd2" index="2" function="default" group="INT"/>
+                <signal pad-key="pd3" index="3" function="default" group="INT"/>
+                <signal pad-key="pe4" index="4" function="default" group="INT"/>
+                <signal pad-key="pe5" index="5" function="default" group="INT"/>
+                <signal pad-key="pe6" index="6" function="default" group="INT"/>
+                <signal pad-key="pe7" index="7" function="default" group="INT"/>
             </signals>
         </peripheral>
         <peripheral key="eeprom" name="EEPROM" module-key="eeprom">
@@ -352,36 +349,36 @@
         <peripheral key="tc0" name="TC0" module-key="tc8">
             <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"/>
+                <signal pad-key="pd7" function="default" group="T"/>
+                <signal pad-key="pb7" function="default" group="OCA"/>
             </signals>
         </peripheral>
         <peripheral key="tc1" name="TC1" module-key="tc16">
             <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"/>
-                <signal pad-id="pb5" function="default" group="OCA"/>
-                <signal pad-id="pb6" function="default" group="OCB"/>
-                <signal pad-id="pb7" function="default" group="OCC"/>
+                <signal pad-key="pd6" function="default" group="T"/>
+                <signal pad-key="pd4" function="default" group="ICP"/>
+                <signal pad-key="pb5" function="default" group="OCA"/>
+                <signal pad-key="pb6" function="default" group="OCB"/>
+                <signal pad-key="pb7" function="default" group="OCC"/>
             </signals>
         </peripheral>
         <peripheral key="tc3" name="TC3" module-key="tc16">
             <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"/>
-                <signal pad-id="pe3" function="default" group="OCA"/>
-                <signal pad-id="pe4" function="default" group="OCB"/>
-                <signal pad-id="pe5" function="default" group="OCC"/>
+                <signal pad-key="pe6" function="default" group="T"/>
+                <signal pad-key="pe7" function="default" group="ICP"/>
+                <signal pad-key="pe3" function="default" group="OCA"/>
+                <signal pad-key="pe4" function="default" group="OCB"/>
+                <signal pad-key="pe5" function="default" group="OCC"/>
             </signals>
         </peripheral>
         <peripheral key="tc2" name="TC2" module-key="tc8_async">
             <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"/>
-                <signal pad-id="pb4" function="default" group="OCA"/>
+                <signal pad-key="pg4" index="1" function="default" group="TOSC"/>
+                <signal pad-key="pg3" index="2" function="default" group="TOSC"/>
+                <signal pad-key="pb4" function="default" group="OCA"/>
             </signals>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="wdt">
@@ -390,28 +387,28 @@
         <peripheral key="adc" name="ADC" module-key="adc">
             <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"/>
-                <signal pad-id="pa2" index="2" function="default" group="ADC"/>
-                <signal pad-id="pa3" index="3" function="default" group="ADC"/>
-                <signal pad-id="pa4" index="4" function="default" group="ADC"/>
-                <signal pad-id="pa5" index="5" function="default" group="ADC"/>
-                <signal pad-id="pa6" index="6" function="default" group="ADC"/>
-                <signal pad-id="pa7" index="7" function="default" group="ADC"/>
+                <signal pad-key="pa0" index="0" function="default" group="ADC"/>
+                <signal pad-key="pa1" index="1" function="default" group="ADC"/>
+                <signal pad-key="pa2" index="2" function="default" group="ADC"/>
+                <signal pad-key="pa3" index="3" function="default" group="ADC"/>
+                <signal pad-key="pa4" index="4" function="default" group="ADC"/>
+                <signal pad-key="pa5" index="5" function="default" group="ADC"/>
+                <signal pad-key="pa6" index="6" function="default" group="ADC"/>
+                <signal pad-key="pa7" index="7" function="default" group="ADC"/>
             </signals>
         </peripheral>
         <peripheral key="ac" name="AC" module-key="ac">
             <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"/>
+                <signal pad-key="pe2" index="0" function="default" group="AIN"/>
+                <signal pad-key="pe3" index="1" function="default" group="AIN"/>
             </signals>
         </peripheral>
         <peripheral key="can" name="CAN" module-key="can">
             <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"/>
+                <signal pad-key="pd5" function="default" group="TXCAN"/>
+                <signal pad-key="pd6" function="default" group="RXCAN"/>
             </signals>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="fuse">
@@ -1072,144 +1069,206 @@
             </register-group>
         </module>
     </modules>
+    <pads>
+        <pad key="pe0" name="PE0"/>
+        <pad key="pe1" name="PE1"/>
+        <pad key="pe2" name="PE2"/>
+        <pad key="pe3" name="PE3"/>
+        <pad key="pe4" name="PE4"/>
+        <pad key="pe5" name="PE5"/>
+        <pad key="pe6" name="PE6"/>
+        <pad key="pe7" name="PE7"/>
+        <pad key="pb0" name="PB0"/>
+        <pad key="pb1" name="PB1"/>
+        <pad key="pb2" name="PB2"/>
+        <pad key="pb3" name="PB3"/>
+        <pad key="pb4" name="PB4"/>
+        <pad key="pb5" name="PB5"/>
+        <pad key="pb6" name="PB6"/>
+        <pad key="pb7" name="PB7"/>
+        <pad key="pg3" name="PG3"/>
+        <pad key="pg4" name="PG4"/>
+        <pad key="reset" name="RESET"/>
+        <pad key="vcc" name="VCC"/>
+        <pad key="gnd" name="GND"/>
+        <pad key="xtal2" name="XTAL2"/>
+        <pad key="xtal1" name="XTAL1"/>
+        <pad key="pd0" name="PD0"/>
+        <pad key="pd1" name="PD1"/>
+        <pad key="pd2" name="PD2"/>
+        <pad key="pd3" name="PD3"/>
+        <pad key="pd4" name="PD4"/>
+        <pad key="pd5" name="PD5"/>
+        <pad key="pd6" name="PD6"/>
+        <pad key="pd7" name="PD7"/>
+        <pad key="pg0" name="PG0"/>
+        <pad key="pg1" name="PG1"/>
+        <pad key="pc0" name="PC0"/>
+        <pad key="pc1" name="PC1"/>
+        <pad key="pc2" name="PC2"/>
+        <pad key="pc3" name="PC3"/>
+        <pad key="pc4" name="PC4"/>
+        <pad key="pc5" name="PC5"/>
+        <pad key="pc6" name="PC6"/>
+        <pad key="pc7" name="PC7"/>
+        <pad key="pg2" name="PG2"/>
+        <pad key="pa7" name="PA7"/>
+        <pad key="pa6" name="PA6"/>
+        <pad key="pa5" name="PA5"/>
+        <pad key="pa4" name="PA4"/>
+        <pad key="pa3" name="PA3"/>
+        <pad key="pa2" name="PA2"/>
+        <pad key="pa1" name="PA1"/>
+        <pad key="pa0" name="PA0"/>
+        <pad key="pf7" name="PF7"/>
+        <pad key="pf6" name="PF6"/>
+        <pad key="pf5" name="PF5"/>
+        <pad key="pf4" name="PF4"/>
+        <pad key="pf3" name="PF3"/>
+        <pad key="pf2" name="PF2"/>
+        <pad key="pf1" name="PF1"/>
+        <pad key="pf0" name="PF0"/>
+        <pad key="aref" name="AREF"/>
+        <pad key="avcc" name="AVCC"/>
+    </pads>
     <pinouts>
         <pinout key="tqfp64" name="TQFP64" type="qfp">
-            <pin position="1" pad="NC"/>
-            <pin position="2" pad="PE0"/>
-            <pin position="3" pad="PE1"/>
-            <pin position="4" pad="PE2"/>
-            <pin position="5" pad="PE3"/>
-            <pin position="6" pad="PE4"/>
-            <pin position="7" pad="PE5"/>
-            <pin position="8" pad="PE6"/>
-            <pin position="9" pad="PE7"/>
-            <pin position="10" pad="PB0"/>
-            <pin position="11" pad="PB1"/>
-            <pin position="12" pad="PB2"/>
-            <pin position="13" pad="PB3"/>
-            <pin position="14" pad="PB4"/>
-            <pin position="15" pad="PB5"/>
-            <pin position="16" pad="PB6"/>
-            <pin position="17" pad="PB7"/>
-            <pin position="18" pad="PG3"/>
-            <pin position="19" pad="PG4"/>
-            <pin position="20" pad="RESET"/>
-            <pin position="21" pad="VCC"/>
-            <pin position="22" pad="GND"/>
-            <pin position="23" pad="XTAL2"/>
-            <pin position="24" pad="XTAL1"/>
-            <pin position="25" pad="PD0"/>
-            <pin position="26" pad="PD1"/>
-            <pin position="27" pad="PD2"/>
-            <pin position="28" pad="PD3"/>
-            <pin position="29" pad="PD4"/>
-            <pin position="30" pad="PD5"/>
-            <pin position="31" pad="PD6"/>
-            <pin position="32" pad="PD7"/>
-            <pin position="33" pad="PG0"/>
-            <pin position="34" pad="PG1"/>
-            <pin position="35" pad="PC0"/>
-            <pin position="36" pad="PC1"/>
-            <pin position="37" pad="PC2"/>
-            <pin position="38" pad="PC3"/>
-            <pin position="39" pad="PC4"/>
-            <pin position="40" pad="PC5"/>
-            <pin position="41" pad="PC6"/>
-            <pin position="42" pad="PC7"/>
-            <pin position="43" pad="PG2"/>
-            <pin position="44" pad="PA7"/>
-            <pin position="45" pad="PA6"/>
-            <pin position="46" pad="PA5"/>
-            <pin position="47" pad="PA4"/>
-            <pin position="48" pad="PA3"/>
-            <pin position="49" pad="PA2"/>
-            <pin position="50" pad="PA1"/>
-            <pin position="51" pad="PA0"/>
-            <pin position="52" pad="VCC"/>
-            <pin position="53" pad="GND"/>
-            <pin position="54" pad="PF7"/>
-            <pin position="55" pad="PF6"/>
-            <pin position="56" pad="PF5"/>
-            <pin position="57" pad="PF4"/>
-            <pin position="58" pad="PF3"/>
-            <pin position="59" pad="PF2"/>
-            <pin position="60" pad="PF1"/>
-            <pin position="61" pad="PF0"/>
-            <pin position="62" pad="AREF"/>
-            <pin position="63" pad="GND"/>
-            <pin position="64" pad="AVCC"/>
+            <pin position="1"/>
+            <pin position="2" pad-key="pe0"/>
+            <pin position="3" pad-key="pe1"/>
+            <pin position="4" pad-key="pe2"/>
+            <pin position="5" pad-key="pe3"/>
+            <pin position="6" pad-key="pe4"/>
+            <pin position="7" pad-key="pe5"/>
+            <pin position="8" pad-key="pe6"/>
+            <pin position="9" pad-key="pe7"/>
+            <pin position="10" pad-key="pb0"/>
+            <pin position="11" pad-key="pb1"/>
+            <pin position="12" pad-key="pb2"/>
+            <pin position="13" pad-key="pb3"/>
+            <pin position="14" pad-key="pb4"/>
+            <pin position="15" pad-key="pb5"/>
+            <pin position="16" pad-key="pb6"/>
+            <pin position="17" pad-key="pb7"/>
+            <pin position="18" pad-key="pg3"/>
+            <pin position="19" pad-key="pg4"/>
+            <pin position="20" pad-key="reset"/>
+            <pin position="21" pad-key="vcc"/>
+            <pin position="22" pad-key="gnd"/>
+            <pin position="23" pad-key="xtal2"/>
+            <pin position="24" pad-key="xtal1"/>
+            <pin position="25" pad-key="pd0"/>
+            <pin position="26" pad-key="pd1"/>
+            <pin position="27" pad-key="pd2"/>
+            <pin position="28" pad-key="pd3"/>
+            <pin position="29" pad-key="pd4"/>
+            <pin position="30" pad-key="pd5"/>
+            <pin position="31" pad-key="pd6"/>
+            <pin position="32" pad-key="pd7"/>
+            <pin position="33" pad-key="pg0"/>
+            <pin position="34" pad-key="pg1"/>
+            <pin position="35" pad-key="pc0"/>
+            <pin position="36" pad-key="pc1"/>
+            <pin position="37" pad-key="pc2"/>
+            <pin position="38" pad-key="pc3"/>
+            <pin position="39" pad-key="pc4"/>
+            <pin position="40" pad-key="pc5"/>
+            <pin position="41" pad-key="pc6"/>
+            <pin position="42" pad-key="pc7"/>
+            <pin position="43" pad-key="pg2"/>
+            <pin position="44" pad-key="pa7"/>
+            <pin position="45" pad-key="pa6"/>
+            <pin position="46" pad-key="pa5"/>
+            <pin position="47" pad-key="pa4"/>
+            <pin position="48" pad-key="pa3"/>
+            <pin position="49" pad-key="pa2"/>
+            <pin position="50" pad-key="pa1"/>
+            <pin position="51" pad-key="pa0"/>
+            <pin position="52" pad-key="vcc"/>
+            <pin position="53" pad-key="gnd"/>
+            <pin position="54" pad-key="pf7"/>
+            <pin position="55" pad-key="pf6"/>
+            <pin position="56" pad-key="pf5"/>
+            <pin position="57" pad-key="pf4"/>
+            <pin position="58" pad-key="pf3"/>
+            <pin position="59" pad-key="pf2"/>
+            <pin position="60" pad-key="pf1"/>
+            <pin position="61" pad-key="pf0"/>
+            <pin position="62" pad-key="aref"/>
+            <pin position="63" pad-key="gnd"/>
+            <pin position="64" pad-key="avcc"/>
         </pinout>
         <pinout key="qfn64" name="QFN64" type="qfn">
-            <pin position="1" pad="NC"/>
-            <pin position="2" pad="PE0"/>
-            <pin position="3" pad="PE1"/>
-            <pin position="4" pad="PE2"/>
-            <pin position="5" pad="PE3"/>
-            <pin position="6" pad="PE4"/>
-            <pin position="7" pad="PE5"/>
-            <pin position="8" pad="PE6"/>
-            <pin position="9" pad="PE7"/>
-            <pin position="10" pad="PB0"/>
-            <pin position="11" pad="PB1"/>
-            <pin position="12" pad="PB2"/>
-            <pin position="13" pad="PB3"/>
-            <pin position="14" pad="PB4"/>
-            <pin position="15" pad="PB5"/>
-            <pin position="16" pad="PB6"/>
-            <pin position="17" pad="PB7"/>
-            <pin position="18" pad="PG3"/>
-            <pin position="19" pad="PG4"/>
-            <pin position="20" pad="RESET"/>
-            <pin position="21" pad="VCC"/>
-            <pin position="22" pad="GND"/>
-            <pin position="23" pad="XTAL2"/>
-            <pin position="24" pad="XTAL1"/>
-            <pin position="25" pad="PD0"/>
-            <pin position="26" pad="PD1"/>
-            <pin position="27" pad="PD2"/>
-            <pin position="28" pad="PD3"/>
-            <pin position="29" pad="PD4"/>
-            <pin position="30" pad="PD5"/>
-            <pin position="31" pad="PD6"/>
-            <pin position="32" pad="PD7"/>
-            <pin position="33" pad="PG0"/>
-            <pin position="34" pad="PG1"/>
-            <pin position="35" pad="PC0"/>
-            <pin position="36" pad="PC1"/>
-            <pin position="37" pad="PC2"/>
-            <pin position="38" pad="PC3"/>
-            <pin position="39" pad="PC4"/>
-            <pin position="40" pad="PC5"/>
-            <pin position="41" pad="PC6"/>
-            <pin position="42" pad="PC7"/>
-            <pin position="43" pad="PG2"/>
-            <pin position="44" pad="PA7"/>
-            <pin position="45" pad="PA6"/>
-            <pin position="46" pad="PA5"/>
-            <pin position="47" pad="PA4"/>
-            <pin position="48" pad="PA3"/>
-            <pin position="49" pad="PA2"/>
-            <pin position="50" pad="PA1"/>
-            <pin position="51" pad="PA0"/>
-            <pin position="52" pad="VCC"/>
-            <pin position="53" pad="GND"/>
-            <pin position="54" pad="PF7"/>
-            <pin position="55" pad="PF6"/>
-            <pin position="56" pad="PF5"/>
-            <pin position="57" pad="PF4"/>
-            <pin position="58" pad="PF3"/>
-            <pin position="59" pad="PF2"/>
-            <pin position="60" pad="PF1"/>
-            <pin position="61" pad="PF0"/>
-            <pin position="62" pad="AREF"/>
-            <pin position="63" pad="GND"/>
-            <pin position="64" pad="AVCC"/>
+            <pin position="1"/>
+            <pin position="2" pad-key="pe0"/>
+            <pin position="3" pad-key="pe1"/>
+            <pin position="4" pad-key="pe2"/>
+            <pin position="5" pad-key="pe3"/>
+            <pin position="6" pad-key="pe4"/>
+            <pin position="7" pad-key="pe5"/>
+            <pin position="8" pad-key="pe6"/>
+            <pin position="9" pad-key="pe7"/>
+            <pin position="10" pad-key="pb0"/>
+            <pin position="11" pad-key="pb1"/>
+            <pin position="12" pad-key="pb2"/>
+            <pin position="13" pad-key="pb3"/>
+            <pin position="14" pad-key="pb4"/>
+            <pin position="15" pad-key="pb5"/>
+            <pin position="16" pad-key="pb6"/>
+            <pin position="17" pad-key="pb7"/>
+            <pin position="18" pad-key="pg3"/>
+            <pin position="19" pad-key="pg4"/>
+            <pin position="20" pad-key="reset"/>
+            <pin position="21" pad-key="vcc"/>
+            <pin position="22" pad-key="gnd"/>
+            <pin position="23" pad-key="xtal2"/>
+            <pin position="24" pad-key="xtal1"/>
+            <pin position="25" pad-key="pd0"/>
+            <pin position="26" pad-key="pd1"/>
+            <pin position="27" pad-key="pd2"/>
+            <pin position="28" pad-key="pd3"/>
+            <pin position="29" pad-key="pd4"/>
+            <pin position="30" pad-key="pd5"/>
+            <pin position="31" pad-key="pd6"/>
+            <pin position="32" pad-key="pd7"/>
+            <pin position="33" pad-key="pg0"/>
+            <pin position="34" pad-key="pg1"/>
+            <pin position="35" pad-key="pc0"/>
+            <pin position="36" pad-key="pc1"/>
+            <pin position="37" pad-key="pc2"/>
+            <pin position="38" pad-key="pc3"/>
+            <pin position="39" pad-key="pc4"/>
+            <pin position="40" pad-key="pc5"/>
+            <pin position="41" pad-key="pc6"/>
+            <pin position="42" pad-key="pc7"/>
+            <pin position="43" pad-key="pg2"/>
+            <pin position="44" pad-key="pa7"/>
+            <pin position="45" pad-key="pa6"/>
+            <pin position="46" pad-key="pa5"/>
+            <pin position="47" pad-key="pa4"/>
+            <pin position="48" pad-key="pa3"/>
+            <pin position="49" pad-key="pa2"/>
+            <pin position="50" pad-key="pa1"/>
+            <pin position="51" pad-key="pa0"/>
+            <pin position="52" pad-key="vcc"/>
+            <pin position="53" pad-key="gnd"/>
+            <pin position="54" pad-key="pf7"/>
+            <pin position="55" pad-key="pf6"/>
+            <pin position="56" pad-key="pf5"/>
+            <pin position="57" pad-key="pf4"/>
+            <pin position="58" pad-key="pf3"/>
+            <pin position="59" pad-key="pf2"/>
+            <pin position="60" pad-key="pf1"/>
+            <pin position="61" pad-key="pf0"/>
+            <pin position="62" pad-key="aref"/>
+            <pin position="63" pad-key="gnd"/>
+            <pin position="64" pad-key="avcc"/>
         </pinout>
     </pinouts>
     <variants>
-        <variant name="AT90CAN32-16AI" pinout-key="tqfp64" package="TQFP64"/>
-        <variant name="AT90CAN32-16MI" pinout-key="qfn64" package="QFN64"/>
-        <variant name="AT90CAN32-16AU" pinout-key="tqfp64" package="TQFP64"/>
-        <variant name="AT90CAN32-16MU" pinout-key="qfn64" package="QFN64"/>
+        <variant key="at90can32_16ai" name="AT90CAN32-16AI" pinout-key="tqfp64"/>
+        <variant key="at90can32_16mi" name="AT90CAN32-16MI" pinout-key="qfn64"/>
+        <variant key="at90can32_16au" name="AT90CAN32-16AU" pinout-key="tqfp64"/>
+        <variant key="at90can32_16mu" name="AT90CAN32-16MU" pinout-key="qfn64"/>
     </variants>
 </device>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90CAN64.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90CAN64.xml
index 39fa3ba4..eab67aa3 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90CAN64.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90CAN64.xml
@@ -195,139 +195,136 @@
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pa2" index="2" function="default" group="P"/>
-                <signal pad-id="pa3" index="3" function="default" group="P"/>
-                <signal pad-id="pa4" index="4" function="default" group="P"/>
-                <signal pad-id="pa5" index="5" function="default" group="P"/>
-                <signal pad-id="pa6" index="6" function="default" group="P"/>
-                <signal pad-id="pa7" index="7" function="default" group="P"/>
+                <signal pad-key="pa0" index="0" function="default" group="P"/>
+                <signal pad-key="pa1" index="1" function="default" group="P"/>
+                <signal pad-key="pa2" index="2" function="default" group="P"/>
+                <signal pad-key="pa3" index="3" function="default" group="P"/>
+                <signal pad-key="pa4" index="4" function="default" group="P"/>
+                <signal pad-key="pa5" index="5" function="default" group="P"/>
+                <signal pad-key="pa6" index="6" function="default" group="P"/>
+                <signal pad-key="pa7" index="7" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pb2" index="2" function="default" group="P"/>
-                <signal pad-id="pb3" index="3" function="default" group="P"/>
-                <signal pad-id="pb4" index="4" function="default" group="P"/>
-                <signal pad-id="pb5" index="5" function="default" group="P"/>
-                <signal pad-id="pb6" index="6" function="default" group="P"/>
-                <signal pad-id="pb7" index="7" function="default" group="P"/>
+                <signal pad-key="pb0" index="0" function="default" group="P"/>
+                <signal pad-key="pb1" index="1" function="default" group="P"/>
+                <signal pad-key="pb2" index="2" function="default" group="P"/>
+                <signal pad-key="pb3" index="3" function="default" group="P"/>
+                <signal pad-key="pb4" index="4" function="default" group="P"/>
+                <signal pad-key="pb5" index="5" function="default" group="P"/>
+                <signal pad-key="pb6" index="6" function="default" group="P"/>
+                <signal pad-key="pb7" index="7" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pc2" index="2" function="default" group="P"/>
-                <signal pad-id="pc3" index="3" function="default" group="P"/>
-                <signal pad-id="pc4" index="4" function="default" group="P"/>
-                <signal pad-id="pc5" index="5" function="default" group="P"/>
-                <signal pad-id="pc6" index="6" function="default" group="P"/>
-                <signal pad-id="pc7" index="7" function="default" group="P"/>
+                <signal pad-key="pc0" index="0" function="default" group="P"/>
+                <signal pad-key="pc1" index="1" function="default" group="P"/>
+                <signal pad-key="pc2" index="2" function="default" group="P"/>
+                <signal pad-key="pc3" index="3" function="default" group="P"/>
+                <signal pad-key="pc4" index="4" function="default" group="P"/>
+                <signal pad-key="pc5" index="5" function="default" group="P"/>
+                <signal pad-key="pc6" index="6" function="default" group="P"/>
+                <signal pad-key="pc7" index="7" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pd2" index="2" function="default" group="P"/>
-                <signal pad-id="pd3" index="3" function="default" group="P"/>
-                <signal pad-id="pd4" index="4" function="default" group="P"/>
-                <signal pad-id="pd5" index="5" function="default" group="P"/>
-                <signal pad-id="pd6" index="6" function="default" group="P"/>
-                <signal pad-id="pd7" index="7" function="default" group="P"/>
+                <signal pad-key="pd0" index="0" function="default" group="P"/>
+                <signal pad-key="pd1" index="1" function="default" group="P"/>
+                <signal pad-key="pd2" index="2" function="default" group="P"/>
+                <signal pad-key="pd3" index="3" function="default" group="P"/>
+                <signal pad-key="pd4" index="4" function="default" group="P"/>
+                <signal pad-key="pd5" index="5" function="default" group="P"/>
+                <signal pad-key="pd6" index="6" function="default" group="P"/>
+                <signal pad-key="pd7" index="7" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="porte" name="PORTE" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pe2" index="2" function="default" group="P"/>
-                <signal pad-id="pe3" index="3" function="default" group="P"/>
-                <signal pad-id="pe4" index="4" function="default" group="P"/>
-                <signal pad-id="pe5" index="5" function="default" group="P"/>
-                <signal pad-id="pe6" index="6" function="default" group="P"/>
-                <signal pad-id="pe7" index="7" function="default" group="P"/>
+                <signal pad-key="pe0" index="0" function="default" group="P"/>
+                <signal pad-key="pe1" index="1" function="default" group="P"/>
+                <signal pad-key="pe2" index="2" function="default" group="P"/>
+                <signal pad-key="pe3" index="3" function="default" group="P"/>
+                <signal pad-key="pe4" index="4" function="default" group="P"/>
+                <signal pad-key="pe5" index="5" function="default" group="P"/>
+                <signal pad-key="pe6" index="6" function="default" group="P"/>
+                <signal pad-key="pe7" index="7" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portf" name="PORTF" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pf2" index="2" function="default" group="P"/>
-                <signal pad-id="pf3" index="3" function="default" group="P"/>
-                <signal pad-id="pf4" index="4" function="default" group="P"/>
-                <signal pad-id="pf5" index="5" function="default" group="P"/>
-                <signal pad-id="pf6" index="6" function="default" group="P"/>
-                <signal pad-id="pf7" index="7" function="default" group="P"/>
+                <signal pad-key="pf0" index="0" function="default" group="P"/>
+                <signal pad-key="pf1" index="1" function="default" group="P"/>
+                <signal pad-key="pf2" index="2" function="default" group="P"/>
+                <signal pad-key="pf3" index="3" function="default" group="P"/>
+                <signal pad-key="pf4" index="4" function="default" group="P"/>
+                <signal pad-key="pf5" index="5" function="default" group="P"/>
+                <signal pad-key="pf6" index="6" function="default" group="P"/>
+                <signal pad-key="pf7" index="7" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portg" name="PORTG" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pg2" index="2" function="default" group="P"/>
-                <signal pad-id="pg3" index="3" function="default" group="P"/>
-                <signal pad-id="pg4" index="4" function="default" group="P"/>
-                <signal pad-id="pg5" index="5" function="default" group="P"/>
-                <signal pad-id="pg6" index="6" function="default" group="P"/>
-                <signal pad-id="pg7" index="7" function="default" group="P"/>
+                <signal pad-key="pg0" index="0" function="default" group="P"/>
+                <signal pad-key="pg1" index="1" function="default" group="P"/>
+                <signal pad-key="pg2" index="2" function="default" group="P"/>
+                <signal pad-key="pg3" index="3" function="default" group="P"/>
+                <signal pad-key="pg4" index="4" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="jtag" name="JTAG" module-key="jtag">
             <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"/>
-                <signal pad-id="pf6" function="default" group="TDO"/>
-                <signal pad-id="pf7" function="default" group="TDI"/>
+                <signal pad-key="pf4" function="default" group="TCK"/>
+                <signal pad-key="pf5" function="default" group="TMS"/>
+                <signal pad-key="pf6" function="default" group="TDO"/>
+                <signal pad-key="pf7" function="default" group="TDI"/>
             </signals>
         </peripheral>
         <peripheral key="spi" name="SPI" module-key="spi">
             <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"/>
-                <signal pad-id="pb3" function="default" group="MISO"/>
-                <signal pad-id="pb1" function="default" group="SCK"/>
+                <signal pad-key="pb0" function="default" group="SS"/>
+                <signal pad-key="pb2" function="default" group="MOSI"/>
+                <signal pad-key="pb3" function="default" group="MISO"/>
+                <signal pad-key="pb1" function="default" group="SCK"/>
             </signals>
         </peripheral>
         <peripheral key="twi" name="TWI" module-key="twi">
             <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"/>
+                <signal pad-key="pd1" function="default" group="SDA"/>
+                <signal pad-key="pd0" function="default" group="SCL"/>
             </signals>
         </peripheral>
         <peripheral key="usart0" name="USART0" module-key="usart">
             <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"/>
-                <signal pad-id="pe2" function="default" group="XCK"/>
+                <signal pad-key="pe1" function="default" group="TXD"/>
+                <signal pad-key="pe0" function="default" group="RXD"/>
+                <signal pad-key="pe2" function="default" group="XCK"/>
             </signals>
         </peripheral>
         <peripheral key="usart1" name="USART1" module-key="usart">
             <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"/>
-                <signal pad-id="pd5" function="default" group="XCK"/>
+                <signal pad-key="pd3" function="default" group="TXD"/>
+                <signal pad-key="pd2" function="default" group="RXD"/>
+                <signal pad-key="pd5" function="default" group="XCK"/>
             </signals>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="cpu">
             <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"/>
+                <signal pad-key="pc7" index="0" function="default" group="CLKO"/>
             </signals>
         </peripheral>
         <peripheral key="boot_load" name="BOOT_LOAD" module-key="boot_load">
@@ -336,14 +333,14 @@
         <peripheral key="exint" name="EXINT" module-key="exint">
             <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"/>
-                <signal pad-id="pd2" index="2" function="default" group="INT"/>
-                <signal pad-id="pd3" index="3" function="default" group="INT"/>
-                <signal pad-id="pe4" index="4" function="default" group="INT"/>
-                <signal pad-id="pe5" index="5" function="default" group="INT"/>
-                <signal pad-id="pe6" index="6" function="default" group="INT"/>
-                <signal pad-id="pe7" index="7" function="default" group="INT"/>
+                <signal pad-key="pd0" index="0" function="default" group="INT"/>
+                <signal pad-key="pd1" index="1" function="default" group="INT"/>
+                <signal pad-key="pd2" index="2" function="default" group="INT"/>
+                <signal pad-key="pd3" index="3" function="default" group="INT"/>
+                <signal pad-key="pe4" index="4" function="default" group="INT"/>
+                <signal pad-key="pe5" index="5" function="default" group="INT"/>
+                <signal pad-key="pe6" index="6" function="default" group="INT"/>
+                <signal pad-key="pe7" index="7" function="default" group="INT"/>
             </signals>
         </peripheral>
         <peripheral key="eeprom" name="EEPROM" module-key="eeprom">
@@ -352,36 +349,36 @@
         <peripheral key="tc0" name="TC0" module-key="tc8">
             <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"/>
+                <signal pad-key="pd7" function="default" group="T"/>
+                <signal pad-key="pb7" function="default" group="OCA"/>
             </signals>
         </peripheral>
         <peripheral key="tc1" name="TC1" module-key="tc16">
             <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"/>
-                <signal pad-id="pb5" function="default" group="OCA"/>
-                <signal pad-id="pb6" function="default" group="OCB"/>
-                <signal pad-id="pb7" function="default" group="OCC"/>
+                <signal pad-key="pd6" function="default" group="T"/>
+                <signal pad-key="pd4" function="default" group="ICP"/>
+                <signal pad-key="pb5" function="default" group="OCA"/>
+                <signal pad-key="pb6" function="default" group="OCB"/>
+                <signal pad-key="pb7" function="default" group="OCC"/>
             </signals>
         </peripheral>
         <peripheral key="tc3" name="TC3" module-key="tc16">
             <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"/>
-                <signal pad-id="pe3" function="default" group="OCA"/>
-                <signal pad-id="pe4" function="default" group="OCB"/>
-                <signal pad-id="pe5" function="default" group="OCC"/>
+                <signal pad-key="pe6" function="default" group="T"/>
+                <signal pad-key="pe7" function="default" group="ICP"/>
+                <signal pad-key="pe3" function="default" group="OCA"/>
+                <signal pad-key="pe4" function="default" group="OCB"/>
+                <signal pad-key="pe5" function="default" group="OCC"/>
             </signals>
         </peripheral>
         <peripheral key="tc2" name="TC2" module-key="tc8_async">
             <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"/>
-                <signal pad-id="pb4" function="default" group="OCA"/>
+                <signal pad-key="pg4" index="1" function="default" group="TOSC"/>
+                <signal pad-key="pg3" index="2" function="default" group="TOSC"/>
+                <signal pad-key="pb4" function="default" group="OCA"/>
             </signals>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="wdt">
@@ -390,28 +387,28 @@
         <peripheral key="adc" name="ADC" module-key="adc">
             <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"/>
-                <signal pad-id="pa2" index="2" function="default" group="ADC"/>
-                <signal pad-id="pa3" index="3" function="default" group="ADC"/>
-                <signal pad-id="pa4" index="4" function="default" group="ADC"/>
-                <signal pad-id="pa5" index="5" function="default" group="ADC"/>
-                <signal pad-id="pa6" index="6" function="default" group="ADC"/>
-                <signal pad-id="pa7" index="7" function="default" group="ADC"/>
+                <signal pad-key="pa0" index="0" function="default" group="ADC"/>
+                <signal pad-key="pa1" index="1" function="default" group="ADC"/>
+                <signal pad-key="pa2" index="2" function="default" group="ADC"/>
+                <signal pad-key="pa3" index="3" function="default" group="ADC"/>
+                <signal pad-key="pa4" index="4" function="default" group="ADC"/>
+                <signal pad-key="pa5" index="5" function="default" group="ADC"/>
+                <signal pad-key="pa6" index="6" function="default" group="ADC"/>
+                <signal pad-key="pa7" index="7" function="default" group="ADC"/>
             </signals>
         </peripheral>
         <peripheral key="ac" name="AC" module-key="ac">
             <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"/>
+                <signal pad-key="pe2" index="0" function="default" group="AIN"/>
+                <signal pad-key="pe3" index="1" function="default" group="AIN"/>
             </signals>
         </peripheral>
         <peripheral key="can" name="CAN" module-key="can">
             <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"/>
+                <signal pad-key="pd5" function="default" group="TXCAN"/>
+                <signal pad-key="pd6" function="default" group="RXCAN"/>
             </signals>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="fuse">
@@ -1072,144 +1069,206 @@
             </register-group>
         </module>
     </modules>
+    <pads>
+        <pad key="pe0" name="PE0"/>
+        <pad key="pe1" name="PE1"/>
+        <pad key="pe2" name="PE2"/>
+        <pad key="pe3" name="PE3"/>
+        <pad key="pe4" name="PE4"/>
+        <pad key="pe5" name="PE5"/>
+        <pad key="pe6" name="PE6"/>
+        <pad key="pe7" name="PE7"/>
+        <pad key="pb0" name="PB0"/>
+        <pad key="pb1" name="PB1"/>
+        <pad key="pb2" name="PB2"/>
+        <pad key="pb3" name="PB3"/>
+        <pad key="pb4" name="PB4"/>
+        <pad key="pb5" name="PB5"/>
+        <pad key="pb6" name="PB6"/>
+        <pad key="pb7" name="PB7"/>
+        <pad key="pg3" name="PG3"/>
+        <pad key="pg4" name="PG4"/>
+        <pad key="reset" name="RESET"/>
+        <pad key="vcc" name="VCC"/>
+        <pad key="gnd" name="GND"/>
+        <pad key="xtal2" name="XTAL2"/>
+        <pad key="xtal1" name="XTAL1"/>
+        <pad key="pd0" name="PD0"/>
+        <pad key="pd1" name="PD1"/>
+        <pad key="pd2" name="PD2"/>
+        <pad key="pd3" name="PD3"/>
+        <pad key="pd4" name="PD4"/>
+        <pad key="pd5" name="PD5"/>
+        <pad key="pd6" name="PD6"/>
+        <pad key="pd7" name="PD7"/>
+        <pad key="pg0" name="PG0"/>
+        <pad key="pg1" name="PG1"/>
+        <pad key="pc0" name="PC0"/>
+        <pad key="pc1" name="PC1"/>
+        <pad key="pc2" name="PC2"/>
+        <pad key="pc3" name="PC3"/>
+        <pad key="pc4" name="PC4"/>
+        <pad key="pc5" name="PC5"/>
+        <pad key="pc6" name="PC6"/>
+        <pad key="pc7" name="PC7"/>
+        <pad key="pg2" name="PG2"/>
+        <pad key="pa7" name="PA7"/>
+        <pad key="pa6" name="PA6"/>
+        <pad key="pa5" name="PA5"/>
+        <pad key="pa4" name="PA4"/>
+        <pad key="pa3" name="PA3"/>
+        <pad key="pa2" name="PA2"/>
+        <pad key="pa1" name="PA1"/>
+        <pad key="pa0" name="PA0"/>
+        <pad key="pf7" name="PF7"/>
+        <pad key="pf6" name="PF6"/>
+        <pad key="pf5" name="PF5"/>
+        <pad key="pf4" name="PF4"/>
+        <pad key="pf3" name="PF3"/>
+        <pad key="pf2" name="PF2"/>
+        <pad key="pf1" name="PF1"/>
+        <pad key="pf0" name="PF0"/>
+        <pad key="aref" name="AREF"/>
+        <pad key="avcc" name="AVCC"/>
+    </pads>
     <pinouts>
         <pinout key="tqfp64" name="TQFP64" type="qfp">
-            <pin position="1" pad="NC"/>
-            <pin position="2" pad="PE0"/>
-            <pin position="3" pad="PE1"/>
-            <pin position="4" pad="PE2"/>
-            <pin position="5" pad="PE3"/>
-            <pin position="6" pad="PE4"/>
-            <pin position="7" pad="PE5"/>
-            <pin position="8" pad="PE6"/>
-            <pin position="9" pad="PE7"/>
-            <pin position="10" pad="PB0"/>
-            <pin position="11" pad="PB1"/>
-            <pin position="12" pad="PB2"/>
-            <pin position="13" pad="PB3"/>
-            <pin position="14" pad="PB4"/>
-            <pin position="15" pad="PB5"/>
-            <pin position="16" pad="PB6"/>
-            <pin position="17" pad="PB7"/>
-            <pin position="18" pad="PG3"/>
-            <pin position="19" pad="PG4"/>
-            <pin position="20" pad="RESET"/>
-            <pin position="21" pad="VCC"/>
-            <pin position="22" pad="GND"/>
-            <pin position="23" pad="XTAL2"/>
-            <pin position="24" pad="XTAL1"/>
-            <pin position="25" pad="PD0"/>
-            <pin position="26" pad="PD1"/>
-            <pin position="27" pad="PD2"/>
-            <pin position="28" pad="PD3"/>
-            <pin position="29" pad="PD4"/>
-            <pin position="30" pad="PD5"/>
-            <pin position="31" pad="PD6"/>
-            <pin position="32" pad="PD7"/>
-            <pin position="33" pad="PG0"/>
-            <pin position="34" pad="PG1"/>
-            <pin position="35" pad="PC0"/>
-            <pin position="36" pad="PC1"/>
-            <pin position="37" pad="PC2"/>
-            <pin position="38" pad="PC3"/>
-            <pin position="39" pad="PC4"/>
-            <pin position="40" pad="PC5"/>
-            <pin position="41" pad="PC6"/>
-            <pin position="42" pad="PC7"/>
-            <pin position="43" pad="PG2"/>
-            <pin position="44" pad="PA7"/>
-            <pin position="45" pad="PA6"/>
-            <pin position="46" pad="PA5"/>
-            <pin position="47" pad="PA4"/>
-            <pin position="48" pad="PA3"/>
-            <pin position="49" pad="PA2"/>
-            <pin position="50" pad="PA1"/>
-            <pin position="51" pad="PA0"/>
-            <pin position="52" pad="VCC"/>
-            <pin position="53" pad="GND"/>
-            <pin position="54" pad="PF7"/>
-            <pin position="55" pad="PF6"/>
-            <pin position="56" pad="PF5"/>
-            <pin position="57" pad="PF4"/>
-            <pin position="58" pad="PF3"/>
-            <pin position="59" pad="PF2"/>
-            <pin position="60" pad="PF1"/>
-            <pin position="61" pad="PF0"/>
-            <pin position="62" pad="AREF"/>
-            <pin position="63" pad="GND"/>
-            <pin position="64" pad="AVCC"/>
+            <pin position="1"/>
+            <pin position="2" pad-key="pe0"/>
+            <pin position="3" pad-key="pe1"/>
+            <pin position="4" pad-key="pe2"/>
+            <pin position="5" pad-key="pe3"/>
+            <pin position="6" pad-key="pe4"/>
+            <pin position="7" pad-key="pe5"/>
+            <pin position="8" pad-key="pe6"/>
+            <pin position="9" pad-key="pe7"/>
+            <pin position="10" pad-key="pb0"/>
+            <pin position="11" pad-key="pb1"/>
+            <pin position="12" pad-key="pb2"/>
+            <pin position="13" pad-key="pb3"/>
+            <pin position="14" pad-key="pb4"/>
+            <pin position="15" pad-key="pb5"/>
+            <pin position="16" pad-key="pb6"/>
+            <pin position="17" pad-key="pb7"/>
+            <pin position="18" pad-key="pg3"/>
+            <pin position="19" pad-key="pg4"/>
+            <pin position="20" pad-key="reset"/>
+            <pin position="21" pad-key="vcc"/>
+            <pin position="22" pad-key="gnd"/>
+            <pin position="23" pad-key="xtal2"/>
+            <pin position="24" pad-key="xtal1"/>
+            <pin position="25" pad-key="pd0"/>
+            <pin position="26" pad-key="pd1"/>
+            <pin position="27" pad-key="pd2"/>
+            <pin position="28" pad-key="pd3"/>
+            <pin position="29" pad-key="pd4"/>
+            <pin position="30" pad-key="pd5"/>
+            <pin position="31" pad-key="pd6"/>
+            <pin position="32" pad-key="pd7"/>
+            <pin position="33" pad-key="pg0"/>
+            <pin position="34" pad-key="pg1"/>
+            <pin position="35" pad-key="pc0"/>
+            <pin position="36" pad-key="pc1"/>
+            <pin position="37" pad-key="pc2"/>
+            <pin position="38" pad-key="pc3"/>
+            <pin position="39" pad-key="pc4"/>
+            <pin position="40" pad-key="pc5"/>
+            <pin position="41" pad-key="pc6"/>
+            <pin position="42" pad-key="pc7"/>
+            <pin position="43" pad-key="pg2"/>
+            <pin position="44" pad-key="pa7"/>
+            <pin position="45" pad-key="pa6"/>
+            <pin position="46" pad-key="pa5"/>
+            <pin position="47" pad-key="pa4"/>
+            <pin position="48" pad-key="pa3"/>
+            <pin position="49" pad-key="pa2"/>
+            <pin position="50" pad-key="pa1"/>
+            <pin position="51" pad-key="pa0"/>
+            <pin position="52" pad-key="vcc"/>
+            <pin position="53" pad-key="gnd"/>
+            <pin position="54" pad-key="pf7"/>
+            <pin position="55" pad-key="pf6"/>
+            <pin position="56" pad-key="pf5"/>
+            <pin position="57" pad-key="pf4"/>
+            <pin position="58" pad-key="pf3"/>
+            <pin position="59" pad-key="pf2"/>
+            <pin position="60" pad-key="pf1"/>
+            <pin position="61" pad-key="pf0"/>
+            <pin position="62" pad-key="aref"/>
+            <pin position="63" pad-key="gnd"/>
+            <pin position="64" pad-key="avcc"/>
         </pinout>
         <pinout key="qfn64" name="QFN64" type="qfn">
-            <pin position="1" pad="NC"/>
-            <pin position="2" pad="PE0"/>
-            <pin position="3" pad="PE1"/>
-            <pin position="4" pad="PE2"/>
-            <pin position="5" pad="PE3"/>
-            <pin position="6" pad="PE4"/>
-            <pin position="7" pad="PE5"/>
-            <pin position="8" pad="PE6"/>
-            <pin position="9" pad="PE7"/>
-            <pin position="10" pad="PB0"/>
-            <pin position="11" pad="PB1"/>
-            <pin position="12" pad="PB2"/>
-            <pin position="13" pad="PB3"/>
-            <pin position="14" pad="PB4"/>
-            <pin position="15" pad="PB5"/>
-            <pin position="16" pad="PB6"/>
-            <pin position="17" pad="PB7"/>
-            <pin position="18" pad="PG3"/>
-            <pin position="19" pad="PG4"/>
-            <pin position="20" pad="RESET"/>
-            <pin position="21" pad="VCC"/>
-            <pin position="22" pad="GND"/>
-            <pin position="23" pad="XTAL2"/>
-            <pin position="24" pad="XTAL1"/>
-            <pin position="25" pad="PD0"/>
-            <pin position="26" pad="PD1"/>
-            <pin position="27" pad="PD2"/>
-            <pin position="28" pad="PD3"/>
-            <pin position="29" pad="PD4"/>
-            <pin position="30" pad="PD5"/>
-            <pin position="31" pad="PD6"/>
-            <pin position="32" pad="PD7"/>
-            <pin position="33" pad="PG0"/>
-            <pin position="34" pad="PG1"/>
-            <pin position="35" pad="PC0"/>
-            <pin position="36" pad="PC1"/>
-            <pin position="37" pad="PC2"/>
-            <pin position="38" pad="PC3"/>
-            <pin position="39" pad="PC4"/>
-            <pin position="40" pad="PC5"/>
-            <pin position="41" pad="PC6"/>
-            <pin position="42" pad="PC7"/>
-            <pin position="43" pad="PG2"/>
-            <pin position="44" pad="PA7"/>
-            <pin position="45" pad="PA6"/>
-            <pin position="46" pad="PA5"/>
-            <pin position="47" pad="PA4"/>
-            <pin position="48" pad="PA3"/>
-            <pin position="49" pad="PA2"/>
-            <pin position="50" pad="PA1"/>
-            <pin position="51" pad="PA0"/>
-            <pin position="52" pad="VCC"/>
-            <pin position="53" pad="GND"/>
-            <pin position="54" pad="PF7"/>
-            <pin position="55" pad="PF6"/>
-            <pin position="56" pad="PF5"/>
-            <pin position="57" pad="PF4"/>
-            <pin position="58" pad="PF3"/>
-            <pin position="59" pad="PF2"/>
-            <pin position="60" pad="PF1"/>
-            <pin position="61" pad="PF0"/>
-            <pin position="62" pad="AREF"/>
-            <pin position="63" pad="GND"/>
-            <pin position="64" pad="AVCC"/>
+            <pin position="1"/>
+            <pin position="2" pad-key="pe0"/>
+            <pin position="3" pad-key="pe1"/>
+            <pin position="4" pad-key="pe2"/>
+            <pin position="5" pad-key="pe3"/>
+            <pin position="6" pad-key="pe4"/>
+            <pin position="7" pad-key="pe5"/>
+            <pin position="8" pad-key="pe6"/>
+            <pin position="9" pad-key="pe7"/>
+            <pin position="10" pad-key="pb0"/>
+            <pin position="11" pad-key="pb1"/>
+            <pin position="12" pad-key="pb2"/>
+            <pin position="13" pad-key="pb3"/>
+            <pin position="14" pad-key="pb4"/>
+            <pin position="15" pad-key="pb5"/>
+            <pin position="16" pad-key="pb6"/>
+            <pin position="17" pad-key="pb7"/>
+            <pin position="18" pad-key="pg3"/>
+            <pin position="19" pad-key="pg4"/>
+            <pin position="20" pad-key="reset"/>
+            <pin position="21" pad-key="vcc"/>
+            <pin position="22" pad-key="gnd"/>
+            <pin position="23" pad-key="xtal2"/>
+            <pin position="24" pad-key="xtal1"/>
+            <pin position="25" pad-key="pd0"/>
+            <pin position="26" pad-key="pd1"/>
+            <pin position="27" pad-key="pd2"/>
+            <pin position="28" pad-key="pd3"/>
+            <pin position="29" pad-key="pd4"/>
+            <pin position="30" pad-key="pd5"/>
+            <pin position="31" pad-key="pd6"/>
+            <pin position="32" pad-key="pd7"/>
+            <pin position="33" pad-key="pg0"/>
+            <pin position="34" pad-key="pg1"/>
+            <pin position="35" pad-key="pc0"/>
+            <pin position="36" pad-key="pc1"/>
+            <pin position="37" pad-key="pc2"/>
+            <pin position="38" pad-key="pc3"/>
+            <pin position="39" pad-key="pc4"/>
+            <pin position="40" pad-key="pc5"/>
+            <pin position="41" pad-key="pc6"/>
+            <pin position="42" pad-key="pc7"/>
+            <pin position="43" pad-key="pg2"/>
+            <pin position="44" pad-key="pa7"/>
+            <pin position="45" pad-key="pa6"/>
+            <pin position="46" pad-key="pa5"/>
+            <pin position="47" pad-key="pa4"/>
+            <pin position="48" pad-key="pa3"/>
+            <pin position="49" pad-key="pa2"/>
+            <pin position="50" pad-key="pa1"/>
+            <pin position="51" pad-key="pa0"/>
+            <pin position="52" pad-key="vcc"/>
+            <pin position="53" pad-key="gnd"/>
+            <pin position="54" pad-key="pf7"/>
+            <pin position="55" pad-key="pf6"/>
+            <pin position="56" pad-key="pf5"/>
+            <pin position="57" pad-key="pf4"/>
+            <pin position="58" pad-key="pf3"/>
+            <pin position="59" pad-key="pf2"/>
+            <pin position="60" pad-key="pf1"/>
+            <pin position="61" pad-key="pf0"/>
+            <pin position="62" pad-key="aref"/>
+            <pin position="63" pad-key="gnd"/>
+            <pin position="64" pad-key="avcc"/>
         </pinout>
     </pinouts>
     <variants>
-        <variant name="AT90CAN64-16AI" pinout-key="tqfp64" package="TQFP64"/>
-        <variant name="AT90CAN64-16MI" pinout-key="qfn64" package="QFN64"/>
-        <variant name="AT90CAN64-16AU" pinout-key="tqfp64" package="TQFP64"/>
-        <variant name="AT90CAN64-16MU" pinout-key="qfn64" package="QFN64"/>
+        <variant key="at90can64_16ai" name="AT90CAN64-16AI" pinout-key="tqfp64"/>
+        <variant key="at90can64_16mi" name="AT90CAN64-16MI" pinout-key="qfn64"/>
+        <variant key="at90can64_16au" name="AT90CAN64-16AU" pinout-key="tqfp64"/>
+        <variant key="at90can64_16mu" name="AT90CAN64-16MU" pinout-key="qfn64"/>
     </variants>
 </device>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90PWM1.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90PWM1.xml
index f64172fd..fcb2602e 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90PWM1.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90PWM1.xml
@@ -194,35 +194,35 @@
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pb2" index="2" function="PORTB" group="P"/>
-                <signal pad-id="pb3" index="3" function="PORTB" group="P"/>
-                <signal pad-id="pb4" index="4" function="PORTB" group="P"/>
-                <signal pad-id="pb5" index="5" function="PORTB" group="P"/>
-                <signal pad-id="pb6" index="6" function="PORTB" group="P"/>
-                <signal pad-id="pb7" index="7" function="PORTB" group="P"/>
+                <signal pad-key="pb0" index="0" function="PORTB" group="P"/>
+                <signal pad-key="pb1" index="1" function="PORTB" group="P"/>
+                <signal pad-key="pb2" index="2" function="PORTB" group="P"/>
+                <signal pad-key="pb3" index="3" function="PORTB" group="P"/>
+                <signal pad-key="pb4" index="4" function="PORTB" group="P"/>
+                <signal pad-key="pb5" index="5" function="PORTB" group="P"/>
+                <signal pad-key="pb6" index="6" function="PORTB" group="P"/>
+                <signal pad-key="pb7" index="7" function="PORTB" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pd2" index="2" function="PORTD" group="P"/>
-                <signal pad-id="pd3" index="3" function="PORTD" group="P"/>
-                <signal pad-id="pd4" index="4" function="PORTD" group="P"/>
-                <signal pad-id="pd5" index="5" function="PORTD" group="P"/>
-                <signal pad-id="pd6" index="6" function="PORTD" group="P"/>
-                <signal pad-id="pd7" index="7" function="PORTD" group="P"/>
+                <signal pad-key="pd0" index="0" function="PORTD" group="P"/>
+                <signal pad-key="pd1" index="1" function="PORTD" group="P"/>
+                <signal pad-key="pd2" index="2" function="PORTD" group="P"/>
+                <signal pad-key="pd3" index="3" function="PORTD" group="P"/>
+                <signal pad-key="pd4" index="4" function="PORTD" group="P"/>
+                <signal pad-key="pd5" index="5" function="PORTD" group="P"/>
+                <signal pad-key="pd6" index="6" function="PORTD" group="P"/>
+                <signal pad-key="pd7" index="7" function="PORTD" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="porte" name="PORTE" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pe2" index="2" function="PORTE" group="P"/>
+                <signal pad-key="pe0" index="0" function="PORTE" group="P"/>
+                <signal pad-key="pe1" index="1" function="PORTE" group="P"/>
+                <signal pad-key="pe2" index="2" function="PORTE" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="boot_load" name="BOOT_LOAD" module-key="boot_load">
@@ -799,70 +799,96 @@
             </register-group>
         </module>
     </modules>
+    <pads>
+        <pad key="pd0" name="PD0"/>
+        <pad key="pe0" name="PE0"/>
+        <pad key="pd1" name="PD1"/>
+        <pad key="pd2" name="PD2"/>
+        <pad key="pd3" name="PD3"/>
+        <pad key="vcc" name="VCC"/>
+        <pad key="gnd" name="GND"/>
+        <pad key="pb0" name="PB0"/>
+        <pad key="pb1" name="PB1"/>
+        <pad key="pe1" name="PE1"/>
+        <pad key="pe2" name="PE2"/>
+        <pad key="pd4" name="PD4"/>
+        <pad key="pd5" name="PD5"/>
+        <pad key="pd6" name="PD6"/>
+        <pad key="pd7" name="PD7"/>
+        <pad key="pb2" name="PB2"/>
+        <pad key="avcc" name="AVCC"/>
+        <pad key="agnd" name="AGND"/>
+        <pad key="aref" name="AREF"/>
+        <pad key="pb3" name="PB3"/>
+        <pad key="pb4" name="PB4"/>
+        <pad key="pb5" name="PB5"/>
+        <pad key="pb6" name="PB6"/>
+        <pad key="pb7" name="PB7"/>
+    </pads>
     <pinouts>
         <pinout key="soic24" name="SOIC24" type="soic">
-            <pin position="1" pad="PD0"/>
-            <pin position="2" pad="PE0"/>
-            <pin position="3" pad="PD1"/>
-            <pin position="4" pad="PD2"/>
-            <pin position="5" pad="PD3"/>
-            <pin position="6" pad="VCC"/>
-            <pin position="7" pad="GND"/>
-            <pin position="8" pad="PB0"/>
-            <pin position="9" pad="PB1"/>
-            <pin position="10" pad="PE1"/>
-            <pin position="11" pad="PE2"/>
-            <pin position="12" pad="PD4"/>
-            <pin position="13" pad="PD5"/>
-            <pin position="14" pad="PD6"/>
-            <pin position="15" pad="PD7"/>
-            <pin position="16" pad="PB2"/>
-            <pin position="17" pad="AVCC"/>
-            <pin position="18" pad="AGND"/>
-            <pin position="19" pad="AREF"/>
-            <pin position="20" pad="PB3"/>
-            <pin position="21" pad="PB4"/>
-            <pin position="22" pad="PB5"/>
-            <pin position="23" pad="PB6"/>
-            <pin position="24" pad="PB7"/>
+            <pin position="1" pad-key="pd0"/>
+            <pin position="2" pad-key="pe0"/>
+            <pin position="3" pad-key="pd1"/>
+            <pin position="4" pad-key="pd2"/>
+            <pin position="5" pad-key="pd3"/>
+            <pin position="6" pad-key="vcc"/>
+            <pin position="7" pad-key="gnd"/>
+            <pin position="8" pad-key="pb0"/>
+            <pin position="9" pad-key="pb1"/>
+            <pin position="10" pad-key="pe1"/>
+            <pin position="11" pad-key="pe2"/>
+            <pin position="12" pad-key="pd4"/>
+            <pin position="13" pad-key="pd5"/>
+            <pin position="14" pad-key="pd6"/>
+            <pin position="15" pad-key="pd7"/>
+            <pin position="16" pad-key="pb2"/>
+            <pin position="17" pad-key="avcc"/>
+            <pin position="18" pad-key="agnd"/>
+            <pin position="19" pad-key="aref"/>
+            <pin position="20" pad-key="pb3"/>
+            <pin position="21" pad-key="pb4"/>
+            <pin position="22" pad-key="pb5"/>
+            <pin position="23" pad-key="pb6"/>
+            <pin position="24" pad-key="pb7"/>
         </pinout>
         <pinout key="qfn32" name="QFN32" type="qfn">
-            <pin position="1" pad="PD2"/>
-            <pin position="2" pad="PD3"/>
-            <pin position="3" pad="NC"/>
-            <pin position="4" pad="VCC"/>
-            <pin position="5" pad="GND"/>
-            <pin position="6" pad="NC"/>
-            <pin position="7" pad="NC"/>
-            <pin position="8" pad="PB0"/>
-            <pin position="9" pad="PB1"/>
-            <pin position="10" pad="PE1"/>
-            <pin position="11" pad="PE2"/>
-            <pin position="12" pad="PD4"/>
-            <pin position="13" pad="PD5"/>
-            <pin position="14" pad="PD6"/>
-            <pin position="15" pad="PD7"/>
-            <pin position="16" pad="PB2"/>
-            <pin position="17" pad="NC"/>
-            <pin position="18" pad="NC"/>
-            <pin position="19" pad="AVCC"/>
-            <pin position="20" pad="AGND"/>
-            <pin position="21" pad="AREF"/>
-            <pin position="22" pad="NC"/>
-            <pin position="23" pad="PB3"/>
-            <pin position="24" pad="PB4"/>
-            <pin position="25" pad="NC"/>
-            <pin position="26" pad="PB5"/>
-            <pin position="27" pad="PB6"/>
-            <pin position="28" pad="PB7"/>
-            <pin position="29" pad="PD0"/>
-            <pin position="30" pad="NC"/>
-            <pin position="31" pad="PE0"/>
-            <pin position="32" pad="PD1"/>
+            <pin position="1" pad-key="pd2"/>
+            <pin position="2" pad-key="pd3"/>
+            <pin position="3"/>
+            <pin position="4" pad-key="vcc"/>
+            <pin position="5" pad-key="gnd"/>
+            <pin position="6"/>
+            <pin position="7"/>
+            <pin position="8" pad-key="pb0"/>
+            <pin position="9" pad-key="pb1"/>
+            <pin position="10" pad-key="pe1"/>
+            <pin position="11" pad-key="pe2"/>
+            <pin position="12" pad-key="pd4"/>
+            <pin position="13" pad-key="pd5"/>
+            <pin position="14" pad-key="pd6"/>
+            <pin position="15" pad-key="pd7"/>
+            <pin position="16" pad-key="pb2"/>
+            <pin position="17"/>
+            <pin position="18"/>
+            <pin position="19" pad-key="avcc"/>
+            <pin position="20" pad-key="agnd"/>
+            <pin position="21" pad-key="aref"/>
+            <pin position="22"/>
+            <pin position="23" pad-key="pb3"/>
+            <pin position="24" pad-key="pb4"/>
+            <pin position="25"/>
+            <pin position="26" pad-key="pb5"/>
+            <pin position="27" pad-key="pb6"/>
+            <pin position="28" pad-key="pb7"/>
+            <pin position="29" pad-key="pd0"/>
+            <pin position="30"/>
+            <pin position="31" pad-key="pe0"/>
+            <pin position="32" pad-key="pd1"/>
         </pinout>
     </pinouts>
     <variants>
-        <variant name="AT90PWM1-MU" pinout-key="qfn32" package="VQFN32"/>
-        <variant name="AT90PWM1-SU" pinout-key="soic24" package="SOIC24"/>
+        <variant key="at90pwm1_mu" name="AT90PWM1-MU" pinout-key="qfn32"/>
+        <variant key="at90pwm1_su" name="AT90PWM1-SU" pinout-key="soic24"/>
     </variants>
 </device>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90PWM161.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90PWM161.xml
index 60a9376e..d44abfa4 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90PWM161.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90PWM161.xml
@@ -194,36 +194,36 @@
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pb2" index="2" function="PORTB" group="P"/>
-                <signal pad-id="pb3" index="3" function="PORTB" group="P"/>
-                <signal pad-id="pb4" index="4" function="PORTB" group="P"/>
-                <signal pad-id="pb5" index="5" function="PORTB" group="P"/>
-                <signal pad-id="pb6" index="6" function="PORTB" group="P"/>
-                <signal pad-id="pb7" index="7" function="PORTB" group="P"/>
+                <signal pad-key="pb0" index="0" function="PORTB" group="P"/>
+                <signal pad-key="pb1" index="1" function="PORTB" group="P"/>
+                <signal pad-key="pb2" index="2" function="PORTB" group="P"/>
+                <signal pad-key="pb3" index="3" function="PORTB" group="P"/>
+                <signal pad-key="pb4" index="4" function="PORTB" group="P"/>
+                <signal pad-key="pb5" index="5" function="PORTB" group="P"/>
+                <signal pad-key="pb6" index="6" function="PORTB" group="P"/>
+                <signal pad-key="pb7" index="7" function="PORTB" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pd2" index="2" function="PORTD" group="P"/>
-                <signal pad-id="pd3" index="3" function="PORTD" group="P"/>
-                <signal pad-id="pd4" index="4" function="PORTD" group="P"/>
-                <signal pad-id="pd5" index="5" function="PORTD" group="P"/>
-                <signal pad-id="pd6" index="6" function="PORTD" group="P"/>
-                <signal pad-id="pd7" index="7" function="PORTD" group="P"/>
+                <signal pad-key="pd0" index="0" function="PORTD" group="P"/>
+                <signal pad-key="pd1" index="1" function="PORTD" group="P"/>
+                <signal pad-key="pd2" index="2" function="PORTD" group="P"/>
+                <signal pad-key="pd3" index="3" function="PORTD" group="P"/>
+                <signal pad-key="pd4" index="4" function="PORTD" group="P"/>
+                <signal pad-key="pd5" index="5" function="PORTD" group="P"/>
+                <signal pad-key="pd6" index="6" function="PORTD" group="P"/>
+                <signal pad-key="pd7" index="7" function="PORTD" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="porte" name="PORTE" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pe2" index="2" function="PORTE" group="P"/>
-                <signal pad-id="pe3" index="3" function="PORTE" group="P"/>
+                <signal pad-key="pe0" index="0" function="PORTE" group="P"/>
+                <signal pad-key="pe1" index="1" function="PORTE" group="P"/>
+                <signal pad-key="pe2" index="2" function="PORTE" group="P"/>
+                <signal pad-key="pe3" index="3" function="PORTE" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="dac" name="DAC" module-key="dac">
@@ -751,66 +751,92 @@
             </register-group>
         </module>
     </modules>
+    <pads>
+        <pad key="pb0" name="PB0"/>
+        <pad key="pe0" name="PE0"/>
+        <pad key="pb1" name="PB1"/>
+        <pad key="pb2" name="PB2"/>
+        <pad key="vcc" name="VCC"/>
+        <pad key="gnd" name="GND"/>
+        <pad key="pe1" name="PE1"/>
+        <pad key="pe2" name="PE2"/>
+        <pad key="pd1" name="PD1"/>
+        <pad key="pd2" name="PD2"/>
+        <pad key="pb3" name="PB3"/>
+        <pad key="pb4" name="PB4"/>
+        <pad key="pb5" name="PB5"/>
+        <pad key="avcc" name="AVCC"/>
+        <pad key="agnd" name="AGND"/>
+        <pad key="pe3" name="PE3"/>
+        <pad key="pd5" name="PD5"/>
+        <pad key="pd6" name="PD6"/>
+        <pad key="pb6" name="PB6"/>
+        <pad key="pb7" name="PB7"/>
+        <pad key="pd0" name="PD0"/>
+        <pad key="pd3" name="PD3"/>
+        <pad key="pd4" name="PD4"/>
+        <pad key="pd7" name="PD7"/>
+    </pads>
     <pinouts>
         <pinout key="soic20" name="SOIC20" type="soic">
-            <pin position="1" pad="PB0"/>
-            <pin position="2" pad="PE0"/>
-            <pin position="3" pad="PB1"/>
-            <pin position="4" pad="PB2"/>
-            <pin position="5" pad="VCC"/>
-            <pin position="6" pad="GND"/>
-            <pin position="7" pad="PE1"/>
-            <pin position="8" pad="PE2"/>
-            <pin position="9" pad="PD1"/>
-            <pin position="10" pad="PD2"/>
-            <pin position="11" pad="PB3"/>
-            <pin position="12" pad="PB4"/>
-            <pin position="13" pad="PB5"/>
-            <pin position="14" pad="AVCC"/>
-            <pin position="15" pad="AGND"/>
-            <pin position="16" pad="PE3"/>
-            <pin position="17" pad="PD5"/>
-            <pin position="18" pad="PD6"/>
-            <pin position="19" pad="PB6"/>
-            <pin position="20" pad="PB7"/>
+            <pin position="1" pad-key="pb0"/>
+            <pin position="2" pad-key="pe0"/>
+            <pin position="3" pad-key="pb1"/>
+            <pin position="4" pad-key="pb2"/>
+            <pin position="5" pad-key="vcc"/>
+            <pin position="6" pad-key="gnd"/>
+            <pin position="7" pad-key="pe1"/>
+            <pin position="8" pad-key="pe2"/>
+            <pin position="9" pad-key="pd1"/>
+            <pin position="10" pad-key="pd2"/>
+            <pin position="11" pad-key="pb3"/>
+            <pin position="12" pad-key="pb4"/>
+            <pin position="13" pad-key="pb5"/>
+            <pin position="14" pad-key="avcc"/>
+            <pin position="15" pad-key="agnd"/>
+            <pin position="16" pad-key="pe3"/>
+            <pin position="17" pad-key="pd5"/>
+            <pin position="18" pad-key="pd6"/>
+            <pin position="19" pad-key="pb6"/>
+            <pin position="20" pad-key="pb7"/>
         </pinout>
         <pinout key="qfn32" name="QFN32" type="qfn">
-            <pin position="1" pad="NC"/>
-            <pin position="2" pad="PD0"/>
-            <pin position="3" pad="PB1"/>
-            <pin position="4" pad="PB2"/>
-            <pin position="5" pad="VCC"/>
-            <pin position="6" pad="GND"/>
-            <pin position="7" pad="PE1"/>
-            <pin position="8" pad="NC"/>
-            <pin position="9" pad="NC"/>
-            <pin position="10" pad="PE2"/>
-            <pin position="11" pad="PD1"/>
-            <pin position="12" pad="PD2"/>
-            <pin position="13" pad="PD3"/>
-            <pin position="14" pad="PB3"/>
-            <pin position="15" pad="PB4"/>
-            <pin position="16" pad="NC"/>
-            <pin position="17" pad="NC"/>
-            <pin position="18" pad="PD4"/>
-            <pin position="19" pad="PB5"/>
-            <pin position="20" pad="AVCC"/>
-            <pin position="21" pad="AGND"/>
-            <pin position="22" pad="PE3"/>
-            <pin position="23" pad="PD5"/>
-            <pin position="24" pad="NC"/>
-            <pin position="25" pad="NC"/>
-            <pin position="26" pad="PD6"/>
-            <pin position="27" pad="PB6"/>
-            <pin position="28" pad="PD7"/>
-            <pin position="29" pad="PB7"/>
-            <pin position="30" pad="PB0"/>
-            <pin position="31" pad="PE0"/>
-            <pin position="32" pad="NC"/>
+            <pin position="1"/>
+            <pin position="2" pad-key="pd0"/>
+            <pin position="3" pad-key="pb1"/>
+            <pin position="4" pad-key="pb2"/>
+            <pin position="5" pad-key="vcc"/>
+            <pin position="6" pad-key="gnd"/>
+            <pin position="7" pad-key="pe1"/>
+            <pin position="8"/>
+            <pin position="9"/>
+            <pin position="10" pad-key="pe2"/>
+            <pin position="11" pad-key="pd1"/>
+            <pin position="12" pad-key="pd2"/>
+            <pin position="13" pad-key="pd3"/>
+            <pin position="14" pad-key="pb3"/>
+            <pin position="15" pad-key="pb4"/>
+            <pin position="16"/>
+            <pin position="17"/>
+            <pin position="18" pad-key="pd4"/>
+            <pin position="19" pad-key="pb5"/>
+            <pin position="20" pad-key="avcc"/>
+            <pin position="21" pad-key="agnd"/>
+            <pin position="22" pad-key="pe3"/>
+            <pin position="23" pad-key="pd5"/>
+            <pin position="24"/>
+            <pin position="25"/>
+            <pin position="26" pad-key="pd6"/>
+            <pin position="27" pad-key="pb6"/>
+            <pin position="28" pad-key="pd7"/>
+            <pin position="29" pad-key="pb7"/>
+            <pin position="30" pad-key="pb0"/>
+            <pin position="31" pad-key="pe0"/>
+            <pin position="32"/>
         </pinout>
     </pinouts>
     <variants>
-        <variant name="AT90PWM161-MN" pinout-key="qfn32" package="VQFN32"/>
-        <variant name="AT90PWM161-SN" pinout-key="soic20" package="SOIC20"/>
+        <variant key="at90pwm161_mn" name="AT90PWM161-MN" pinout-key="qfn32"/>
+        <variant key="at90pwm161_sn" name="AT90PWM161-SN" pinout-key="soic20"/>
     </variants>
 </device>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90PWM216.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90PWM216.xml
index b777c671..298399b3 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90PWM216.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90PWM216.xml
@@ -194,35 +194,35 @@
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pb2" index="2" function="PORTB" group="P"/>
-                <signal pad-id="pb3" index="3" function="PORTB" group="P"/>
-                <signal pad-id="pb4" index="4" function="PORTB" group="P"/>
-                <signal pad-id="pb5" index="5" function="PORTB" group="P"/>
-                <signal pad-id="pb6" index="6" function="PORTB" group="P"/>
-                <signal pad-id="pb7" index="7" function="PORTB" group="P"/>
+                <signal pad-key="pb0" index="0" function="PORTB" group="P"/>
+                <signal pad-key="pb1" index="1" function="PORTB" group="P"/>
+                <signal pad-key="pb2" index="2" function="PORTB" group="P"/>
+                <signal pad-key="pb3" index="3" function="PORTB" group="P"/>
+                <signal pad-key="pb4" index="4" function="PORTB" group="P"/>
+                <signal pad-key="pb5" index="5" function="PORTB" group="P"/>
+                <signal pad-key="pb6" index="6" function="PORTB" group="P"/>
+                <signal pad-key="pb7" index="7" function="PORTB" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pd2" index="2" function="PORTD" group="P"/>
-                <signal pad-id="pd3" index="3" function="PORTD" group="P"/>
-                <signal pad-id="pd4" index="4" function="PORTD" group="P"/>
-                <signal pad-id="pd5" index="5" function="PORTD" group="P"/>
-                <signal pad-id="pd6" index="6" function="PORTD" group="P"/>
-                <signal pad-id="pd7" index="7" function="PORTD" group="P"/>
+                <signal pad-key="pd0" index="0" function="PORTD" group="P"/>
+                <signal pad-key="pd1" index="1" function="PORTD" group="P"/>
+                <signal pad-key="pd2" index="2" function="PORTD" group="P"/>
+                <signal pad-key="pd3" index="3" function="PORTD" group="P"/>
+                <signal pad-key="pd4" index="4" function="PORTD" group="P"/>
+                <signal pad-key="pd5" index="5" function="PORTD" group="P"/>
+                <signal pad-key="pd6" index="6" function="PORTD" group="P"/>
+                <signal pad-key="pd7" index="7" function="PORTD" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="porte" name="PORTE" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pe2" index="2" function="PORTE" group="P"/>
+                <signal pad-key="pe0" index="0" function="PORTE" group="P"/>
+                <signal pad-key="pe1" index="1" function="PORTE" group="P"/>
+                <signal pad-key="pe2" index="2" function="PORTE" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="boot_load" name="BOOT_LOAD" module-key="boot_load">
@@ -863,35 +863,61 @@
             </register-group>
         </module>
     </modules>
+    <pads>
+        <pad key="pd0" name="PD0"/>
+        <pad key="pe0" name="PE0"/>
+        <pad key="pd1" name="PD1"/>
+        <pad key="pd2" name="PD2"/>
+        <pad key="pd3" name="PD3"/>
+        <pad key="vcc" name="VCC"/>
+        <pad key="gnd" name="GND"/>
+        <pad key="pb0" name="PB0"/>
+        <pad key="pb1" name="PB1"/>
+        <pad key="pe1" name="PE1"/>
+        <pad key="pe2" name="PE2"/>
+        <pad key="pd4" name="PD4"/>
+        <pad key="pd5" name="PD5"/>
+        <pad key="pd6" name="PD6"/>
+        <pad key="pd7" name="PD7"/>
+        <pad key="pb2" name="PB2"/>
+        <pad key="avcc" name="AVCC"/>
+        <pad key="agnd" name="AGND"/>
+        <pad key="aref" name="AREF"/>
+        <pad key="pb3" name="PB3"/>
+        <pad key="pb4" name="PB4"/>
+        <pad key="pb5" name="PB5"/>
+        <pad key="pb6" name="PB6"/>
+        <pad key="pb7" name="PB7"/>
+    </pads>
     <pinouts>
         <pinout key="soic24" name="SOIC24" type="soic">
-            <pin position="1" pad="PD0"/>
-            <pin position="2" pad="PE0"/>
-            <pin position="3" pad="PD1"/>
-            <pin position="4" pad="PD2"/>
-            <pin position="5" pad="PD3"/>
-            <pin position="6" pad="VCC"/>
-            <pin position="7" pad="GND"/>
-            <pin position="8" pad="PB0"/>
-            <pin position="9" pad="PB1"/>
-            <pin position="10" pad="PE1"/>
-            <pin position="11" pad="PE2"/>
-            <pin position="12" pad="PD4"/>
-            <pin position="13" pad="PD5"/>
-            <pin position="14" pad="PD6"/>
-            <pin position="15" pad="PD7"/>
-            <pin position="16" pad="PB2"/>
-            <pin position="17" pad="AVCC"/>
-            <pin position="18" pad="AGND"/>
-            <pin position="19" pad="AREF"/>
-            <pin position="20" pad="PB3"/>
-            <pin position="21" pad="PB4"/>
-            <pin position="22" pad="PB5"/>
-            <pin position="23" pad="PB6"/>
-            <pin position="24" pad="PB7"/>
+            <pin position="1" pad-key="pd0"/>
+            <pin position="2" pad-key="pe0"/>
+            <pin position="3" pad-key="pd1"/>
+            <pin position="4" pad-key="pd2"/>
+            <pin position="5" pad-key="pd3"/>
+            <pin position="6" pad-key="vcc"/>
+            <pin position="7" pad-key="gnd"/>
+            <pin position="8" pad-key="pb0"/>
+            <pin position="9" pad-key="pb1"/>
+            <pin position="10" pad-key="pe1"/>
+            <pin position="11" pad-key="pe2"/>
+            <pin position="12" pad-key="pd4"/>
+            <pin position="13" pad-key="pd5"/>
+            <pin position="14" pad-key="pd6"/>
+            <pin position="15" pad-key="pd7"/>
+            <pin position="16" pad-key="pb2"/>
+            <pin position="17" pad-key="avcc"/>
+            <pin position="18" pad-key="agnd"/>
+            <pin position="19" pad-key="aref"/>
+            <pin position="20" pad-key="pb3"/>
+            <pin position="21" pad-key="pb4"/>
+            <pin position="22" pad-key="pb5"/>
+            <pin position="23" pad-key="pb6"/>
+            <pin position="24" pad-key="pb7"/>
         </pinout>
     </pinouts>
     <variants>
-        <variant name="AT90PWM216-16SU" pinout-key="soic24" package="SOIC24"/>
+        <variant key="at90pwm216_16su" name="AT90PWM216-16SU" pinout-key="soic24"/>
     </variants>
 </device>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90PWM2B.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90PWM2B.xml
index 2dfdc427..9b1507e2 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90PWM2B.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90PWM2B.xml
@@ -194,35 +194,35 @@
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pb2" index="2" function="PORTB" group="P"/>
-                <signal pad-id="pb3" index="3" function="PORTB" group="P"/>
-                <signal pad-id="pb4" index="4" function="PORTB" group="P"/>
-                <signal pad-id="pb5" index="5" function="PORTB" group="P"/>
-                <signal pad-id="pb6" index="6" function="PORTB" group="P"/>
-                <signal pad-id="pb7" index="7" function="PORTB" group="P"/>
+                <signal pad-key="pb0" index="0" function="PORTB" group="P"/>
+                <signal pad-key="pb1" index="1" function="PORTB" group="P"/>
+                <signal pad-key="pb2" index="2" function="PORTB" group="P"/>
+                <signal pad-key="pb3" index="3" function="PORTB" group="P"/>
+                <signal pad-key="pb4" index="4" function="PORTB" group="P"/>
+                <signal pad-key="pb5" index="5" function="PORTB" group="P"/>
+                <signal pad-key="pb6" index="6" function="PORTB" group="P"/>
+                <signal pad-key="pb7" index="7" function="PORTB" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pd2" index="2" function="PORTD" group="P"/>
-                <signal pad-id="pd3" index="3" function="PORTD" group="P"/>
-                <signal pad-id="pd4" index="4" function="PORTD" group="P"/>
-                <signal pad-id="pd5" index="5" function="PORTD" group="P"/>
-                <signal pad-id="pd6" index="6" function="PORTD" group="P"/>
-                <signal pad-id="pd7" index="7" function="PORTD" group="P"/>
+                <signal pad-key="pd0" index="0" function="PORTD" group="P"/>
+                <signal pad-key="pd1" index="1" function="PORTD" group="P"/>
+                <signal pad-key="pd2" index="2" function="PORTD" group="P"/>
+                <signal pad-key="pd3" index="3" function="PORTD" group="P"/>
+                <signal pad-key="pd4" index="4" function="PORTD" group="P"/>
+                <signal pad-key="pd5" index="5" function="PORTD" group="P"/>
+                <signal pad-key="pd6" index="6" function="PORTD" group="P"/>
+                <signal pad-key="pd7" index="7" function="PORTD" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="porte" name="PORTE" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pe2" index="2" function="PORTE" group="P"/>
+                <signal pad-key="pe0" index="0" function="PORTE" group="P"/>
+                <signal pad-key="pe1" index="1" function="PORTE" group="P"/>
+                <signal pad-key="pe2" index="2" function="PORTE" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="boot_load" name="BOOT_LOAD" module-key="boot_load">
@@ -872,35 +872,61 @@
             </register-group>
         </module>
     </modules>
+    <pads>
+        <pad key="pd0" name="PD0"/>
+        <pad key="pe0" name="PE0"/>
+        <pad key="pd1" name="PD1"/>
+        <pad key="pd2" name="PD2"/>
+        <pad key="pd3" name="PD3"/>
+        <pad key="vcc" name="VCC"/>
+        <pad key="gnd" name="GND"/>
+        <pad key="pb0" name="PB0"/>
+        <pad key="pb1" name="PB1"/>
+        <pad key="pe1" name="PE1"/>
+        <pad key="pe2" name="PE2"/>
+        <pad key="pd4" name="PD4"/>
+        <pad key="pd5" name="PD5"/>
+        <pad key="pd6" name="PD6"/>
+        <pad key="pd7" name="PD7"/>
+        <pad key="pb2" name="PB2"/>
+        <pad key="avcc" name="AVCC"/>
+        <pad key="agnd" name="AGND"/>
+        <pad key="aref" name="AREF"/>
+        <pad key="pb3" name="PB3"/>
+        <pad key="pb4" name="PB4"/>
+        <pad key="pb5" name="PB5"/>
+        <pad key="pb6" name="PB6"/>
+        <pad key="pb7" name="PB7"/>
+    </pads>
     <pinouts>
         <pinout key="soic24" name="SOIC24" type="soic">
-            <pin position="1" pad="PD0"/>
-            <pin position="2" pad="PE0"/>
-            <pin position="3" pad="PD1"/>
-            <pin position="4" pad="PD2"/>
-            <pin position="5" pad="PD3"/>
-            <pin position="6" pad="VCC"/>
-            <pin position="7" pad="GND"/>
-            <pin position="8" pad="PB0"/>
-            <pin position="9" pad="PB1"/>
-            <pin position="10" pad="PE1"/>
-            <pin position="11" pad="PE2"/>
-            <pin position="12" pad="PD4"/>
-            <pin position="13" pad="PD5"/>
-            <pin position="14" pad="PD6"/>
-            <pin position="15" pad="PD7"/>
-            <pin position="16" pad="PB2"/>
-            <pin position="17" pad="AVCC"/>
-            <pin position="18" pad="AGND"/>
-            <pin position="19" pad="AREF"/>
-            <pin position="20" pad="PB3"/>
-            <pin position="21" pad="PB4"/>
-            <pin position="22" pad="PB5"/>
-            <pin position="23" pad="PB6"/>
-            <pin position="24" pad="PB7"/>
+            <pin position="1" pad-key="pd0"/>
+            <pin position="2" pad-key="pe0"/>
+            <pin position="3" pad-key="pd1"/>
+            <pin position="4" pad-key="pd2"/>
+            <pin position="5" pad-key="pd3"/>
+            <pin position="6" pad-key="vcc"/>
+            <pin position="7" pad-key="gnd"/>
+            <pin position="8" pad-key="pb0"/>
+            <pin position="9" pad-key="pb1"/>
+            <pin position="10" pad-key="pe1"/>
+            <pin position="11" pad-key="pe2"/>
+            <pin position="12" pad-key="pd4"/>
+            <pin position="13" pad-key="pd5"/>
+            <pin position="14" pad-key="pd6"/>
+            <pin position="15" pad-key="pd7"/>
+            <pin position="16" pad-key="pb2"/>
+            <pin position="17" pad-key="avcc"/>
+            <pin position="18" pad-key="agnd"/>
+            <pin position="19" pad-key="aref"/>
+            <pin position="20" pad-key="pb3"/>
+            <pin position="21" pad-key="pb4"/>
+            <pin position="22" pad-key="pb5"/>
+            <pin position="23" pad-key="pb6"/>
+            <pin position="24" pad-key="pb7"/>
         </pinout>
     </pinouts>
     <variants>
-        <variant name="AT90PWM2B-16SU" pinout-key="soic24" package="SOIC24"/>
+        <variant key="at90pwm2b_16su" name="AT90PWM2B-16SU" pinout-key="soic24"/>
     </variants>
 </device>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90PWM316.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90PWM316.xml
index 8e8bf3c1..c460cc5e 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90PWM316.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90PWM316.xml
@@ -194,48 +194,48 @@
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pb2" index="2" function="PORTB" group="P"/>
-                <signal pad-id="pb3" index="3" function="PORTB" group="P"/>
-                <signal pad-id="pb4" index="4" function="PORTB" group="P"/>
-                <signal pad-id="pb5" index="5" function="PORTB" group="P"/>
-                <signal pad-id="pb6" index="6" function="PORTB" group="P"/>
-                <signal pad-id="pb7" index="7" function="PORTB" group="P"/>
+                <signal pad-key="pb0" index="0" function="PORTB" group="P"/>
+                <signal pad-key="pb1" index="1" function="PORTB" group="P"/>
+                <signal pad-key="pb2" index="2" function="PORTB" group="P"/>
+                <signal pad-key="pb3" index="3" function="PORTB" group="P"/>
+                <signal pad-key="pb4" index="4" function="PORTB" group="P"/>
+                <signal pad-key="pb5" index="5" function="PORTB" group="P"/>
+                <signal pad-key="pb6" index="6" function="PORTB" group="P"/>
+                <signal pad-key="pb7" index="7" function="PORTB" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pc2" index="2" function="PORTC" group="P"/>
-                <signal pad-id="pc3" index="3" function="PORTC" group="P"/>
-                <signal pad-id="pc4" index="4" function="PORTC" group="P"/>
-                <signal pad-id="pc5" index="5" function="PORTC" group="P"/>
-                <signal pad-id="pc6" index="6" function="PORTC" group="P"/>
-                <signal pad-id="pc7" index="7" function="PORTC" group="P"/>
+                <signal pad-key="pc0" index="0" function="PORTC" group="P"/>
+                <signal pad-key="pc1" index="1" function="PORTC" group="P"/>
+                <signal pad-key="pc2" index="2" function="PORTC" group="P"/>
+                <signal pad-key="pc3" index="3" function="PORTC" group="P"/>
+                <signal pad-key="pc4" index="4" function="PORTC" group="P"/>
+                <signal pad-key="pc5" index="5" function="PORTC" group="P"/>
+                <signal pad-key="pc6" index="6" function="PORTC" group="P"/>
+                <signal pad-key="pc7" index="7" function="PORTC" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pd2" index="2" function="PORTD" group="P"/>
-                <signal pad-id="pd3" index="3" function="PORTD" group="P"/>
-                <signal pad-id="pd4" index="4" function="PORTD" group="P"/>
-                <signal pad-id="pd5" index="5" function="PORTD" group="P"/>
-                <signal pad-id="pd6" index="6" function="PORTD" group="P"/>
-                <signal pad-id="pd7" index="7" function="PORTD" group="P"/>
+                <signal pad-key="pd0" index="0" function="PORTD" group="P"/>
+                <signal pad-key="pd1" index="1" function="PORTD" group="P"/>
+                <signal pad-key="pd2" index="2" function="PORTD" group="P"/>
+                <signal pad-key="pd3" index="3" function="PORTD" group="P"/>
+                <signal pad-key="pd4" index="4" function="PORTD" group="P"/>
+                <signal pad-key="pd5" index="5" function="PORTD" group="P"/>
+                <signal pad-key="pd6" index="6" function="PORTD" group="P"/>
+                <signal pad-key="pd7" index="7" function="PORTD" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="porte" name="PORTE" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pe2" index="2" function="PORTE" group="P"/>
+                <signal pad-key="pe0" index="0" function="PORTE" group="P"/>
+                <signal pad-key="pe1" index="1" function="PORTE" group="P"/>
+                <signal pad-key="pe2" index="2" function="PORTE" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="boot_load" name="BOOT_LOAD" module-key="boot_load">
@@ -942,78 +942,112 @@
             </register-group>
         </module>
     </modules>
+    <pads>
+        <pad key="pd0" name="PD0"/>
+        <pad key="pc0" name="PC0"/>
+        <pad key="pe0" name="PE0"/>
+        <pad key="pd1" name="PD1"/>
+        <pad key="pd2" name="PD2"/>
+        <pad key="pd3" name="PD3"/>
+        <pad key="pc1" name="PC1"/>
+        <pad key="vcc" name="VCC"/>
+        <pad key="gnd" name="GND"/>
+        <pad key="pc2" name="PC2"/>
+        <pad key="pc3" name="PC3"/>
+        <pad key="pb0" name="PB0"/>
+        <pad key="pb1" name="PB1"/>
+        <pad key="pe1" name="PE1"/>
+        <pad key="pe2" name="PE2"/>
+        <pad key="pd4" name="PD4"/>
+        <pad key="pd5" name="PD5"/>
+        <pad key="pd6" name="PD6"/>
+        <pad key="pd7" name="PD7"/>
+        <pad key="pb2" name="PB2"/>
+        <pad key="pc4" name="PC4"/>
+        <pad key="pc5" name="PC5"/>
+        <pad key="avcc" name="AVCC"/>
+        <pad key="agnd" name="AGND"/>
+        <pad key="aref" name="AREF"/>
+        <pad key="pc6" name="PC6"/>
+        <pad key="pb3" name="PB3"/>
+        <pad key="pb4" name="PB4"/>
+        <pad key="pc7" name="PC7"/>
+        <pad key="pb5" name="PB5"/>
+        <pad key="pb6" name="PB6"/>
+        <pad key="pb7" name="PB7"/>
+    </pads>
     <pinouts>
         <pinout key="soic32" name="SOIC32" type="soic">
-            <pin position="1" pad="PD0"/>
-            <pin position="2" pad="PC0"/>
-            <pin position="3" pad="PE0"/>
-            <pin position="4" pad="PD1"/>
-            <pin position="5" pad="PD2"/>
-            <pin position="6" pad="PD3"/>
-            <pin position="7" pad="PC1"/>
-            <pin position="8" pad="VCC"/>
-            <pin position="9" pad="GND"/>
-            <pin position="10" pad="PC2"/>
-            <pin position="11" pad="PC3"/>
-            <pin position="12" pad="PB0"/>
-            <pin position="13" pad="PB1"/>
-            <pin position="14" pad="PE1"/>
-            <pin position="15" pad="PE2"/>
-            <pin position="16" pad="PD4"/>
-            <pin position="17" pad="PD5"/>
-            <pin position="18" pad="PD6"/>
-            <pin position="19" pad="PD7"/>
-            <pin position="20" pad="PB2"/>
-            <pin position="21" pad="PC4"/>
-            <pin position="22" pad="PC5"/>
-            <pin position="23" pad="AVCC"/>
-            <pin position="24" pad="AGND"/>
-            <pin position="25" pad="AREF"/>
-            <pin position="26" pad="PC6"/>
-            <pin position="27" pad="PB3"/>
-            <pin position="28" pad="PB4"/>
-            <pin position="29" pad="PC7"/>
-            <pin position="30" pad="PB5"/>
-            <pin position="31" pad="PB6"/>
-            <pin position="32" pad="PB7"/>
+            <pin position="1" pad-key="pd0"/>
+            <pin position="2" pad-key="pc0"/>
+            <pin position="3" pad-key="pe0"/>
+            <pin position="4" pad-key="pd1"/>
+            <pin position="5" pad-key="pd2"/>
+            <pin position="6" pad-key="pd3"/>
+            <pin position="7" pad-key="pc1"/>
+            <pin position="8" pad-key="vcc"/>
+            <pin position="9" pad-key="gnd"/>
+            <pin position="10" pad-key="pc2"/>
+            <pin position="11" pad-key="pc3"/>
+            <pin position="12" pad-key="pb0"/>
+            <pin position="13" pad-key="pb1"/>
+            <pin position="14" pad-key="pe1"/>
+            <pin position="15" pad-key="pe2"/>
+            <pin position="16" pad-key="pd4"/>
+            <pin position="17" pad-key="pd5"/>
+            <pin position="18" pad-key="pd6"/>
+            <pin position="19" pad-key="pd7"/>
+            <pin position="20" pad-key="pb2"/>
+            <pin position="21" pad-key="pc4"/>
+            <pin position="22" pad-key="pc5"/>
+            <pin position="23" pad-key="avcc"/>
+            <pin position="24" pad-key="agnd"/>
+            <pin position="25" pad-key="aref"/>
+            <pin position="26" pad-key="pc6"/>
+            <pin position="27" pad-key="pb3"/>
+            <pin position="28" pad-key="pb4"/>
+            <pin position="29" pad-key="pc7"/>
+            <pin position="30" pad-key="pb5"/>
+            <pin position="31" pad-key="pb6"/>
+            <pin position="32" pad-key="pb7"/>
         </pinout>
         <pinout key="qfn32" name="QFN32" type="qfn">
-            <pin position="1" pad="PD2"/>
-            <pin position="2" pad="PD3"/>
-            <pin position="3" pad="PC1"/>
-            <pin position="4" pad="VCC"/>
-            <pin position="5" pad="GND"/>
-            <pin position="6" pad="PC2"/>
-            <pin position="7" pad="PC3"/>
-            <pin position="8" pad="PB0"/>
-            <pin position="9" pad="PB1"/>
-            <pin position="10" pad="PE1"/>
-            <pin position="11" pad="PE2"/>
-            <pin position="12" pad="PD4"/>
-            <pin position="13" pad="PD5"/>
-            <pin position="14" pad="PD6"/>
-            <pin position="15" pad="PD7"/>
-            <pin position="16" pad="PB2"/>
-            <pin position="17" pad="PC4"/>
-            <pin position="18" pad="PC5"/>
-            <pin position="19" pad="AVCC"/>
-            <pin position="20" pad="AGND"/>
-            <pin position="21" pad="AREF"/>
-            <pin position="22" pad="PC6"/>
-            <pin position="23" pad="PB3"/>
-            <pin position="24" pad="PB4"/>
-            <pin position="25" pad="PC7"/>
-            <pin position="26" pad="PB5"/>
-            <pin position="27" pad="PB6"/>
-            <pin position="28" pad="PB7"/>
-            <pin position="29" pad="PD0"/>
-            <pin position="30" pad="PC0"/>
-            <pin position="31" pad="PE0"/>
-            <pin position="32" pad="PD1"/>
+            <pin position="1" pad-key="pd2"/>
+            <pin position="2" pad-key="pd3"/>
+            <pin position="3" pad-key="pc1"/>
+            <pin position="4" pad-key="vcc"/>
+            <pin position="5" pad-key="gnd"/>
+            <pin position="6" pad-key="pc2"/>
+            <pin position="7" pad-key="pc3"/>
+            <pin position="8" pad-key="pb0"/>
+            <pin position="9" pad-key="pb1"/>
+            <pin position="10" pad-key="pe1"/>
+            <pin position="11" pad-key="pe2"/>
+            <pin position="12" pad-key="pd4"/>
+            <pin position="13" pad-key="pd5"/>
+            <pin position="14" pad-key="pd6"/>
+            <pin position="15" pad-key="pd7"/>
+            <pin position="16" pad-key="pb2"/>
+            <pin position="17" pad-key="pc4"/>
+            <pin position="18" pad-key="pc5"/>
+            <pin position="19" pad-key="avcc"/>
+            <pin position="20" pad-key="agnd"/>
+            <pin position="21" pad-key="aref"/>
+            <pin position="22" pad-key="pc6"/>
+            <pin position="23" pad-key="pb3"/>
+            <pin position="24" pad-key="pb4"/>
+            <pin position="25" pad-key="pc7"/>
+            <pin position="26" pad-key="pb5"/>
+            <pin position="27" pad-key="pb6"/>
+            <pin position="28" pad-key="pb7"/>
+            <pin position="29" pad-key="pd0"/>
+            <pin position="30" pad-key="pc0"/>
+            <pin position="31" pad-key="pe0"/>
+            <pin position="32" pad-key="pd1"/>
         </pinout>
     </pinouts>
     <variants>
-        <variant name="AT90PWM316-16SU" pinout-key="soic32" package="SOIC32"/>
-        <variant name="AT90PWM316-16MU" pinout-key="qfn32" package="VQFN32"/>
+        <variant key="at90pwm316_16su" name="AT90PWM316-16SU" pinout-key="soic32"/>
+        <variant key="at90pwm316_16mu" name="AT90PWM316-16MU" pinout-key="qfn32"/>
     </variants>
 </device>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90PWM3B.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90PWM3B.xml
index 2013b9f2..b60e4c29 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90PWM3B.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90PWM3B.xml
@@ -194,48 +194,48 @@
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pb2" index="2" function="PORTB" group="P"/>
-                <signal pad-id="pb3" index="3" function="PORTB" group="P"/>
-                <signal pad-id="pb4" index="4" function="PORTB" group="P"/>
-                <signal pad-id="pb5" index="5" function="PORTB" group="P"/>
-                <signal pad-id="pb6" index="6" function="PORTB" group="P"/>
-                <signal pad-id="pb7" index="7" function="PORTB" group="P"/>
+                <signal pad-key="pb0" index="0" function="PORTB" group="P"/>
+                <signal pad-key="pb1" index="1" function="PORTB" group="P"/>
+                <signal pad-key="pb2" index="2" function="PORTB" group="P"/>
+                <signal pad-key="pb3" index="3" function="PORTB" group="P"/>
+                <signal pad-key="pb4" index="4" function="PORTB" group="P"/>
+                <signal pad-key="pb5" index="5" function="PORTB" group="P"/>
+                <signal pad-key="pb6" index="6" function="PORTB" group="P"/>
+                <signal pad-key="pb7" index="7" function="PORTB" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pc2" index="2" function="PORTC" group="P"/>
-                <signal pad-id="pc3" index="3" function="PORTC" group="P"/>
-                <signal pad-id="pc4" index="4" function="PORTC" group="P"/>
-                <signal pad-id="pc5" index="5" function="PORTC" group="P"/>
-                <signal pad-id="pc6" index="6" function="PORTC" group="P"/>
-                <signal pad-id="pc7" index="7" function="PORTC" group="P"/>
+                <signal pad-key="pc0" index="0" function="PORTC" group="P"/>
+                <signal pad-key="pc1" index="1" function="PORTC" group="P"/>
+                <signal pad-key="pc2" index="2" function="PORTC" group="P"/>
+                <signal pad-key="pc3" index="3" function="PORTC" group="P"/>
+                <signal pad-key="pc4" index="4" function="PORTC" group="P"/>
+                <signal pad-key="pc5" index="5" function="PORTC" group="P"/>
+                <signal pad-key="pc6" index="6" function="PORTC" group="P"/>
+                <signal pad-key="pc7" index="7" function="PORTC" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pd2" index="2" function="PORTD" group="P"/>
-                <signal pad-id="pd3" index="3" function="PORTD" group="P"/>
-                <signal pad-id="pd4" index="4" function="PORTD" group="P"/>
-                <signal pad-id="pd5" index="5" function="PORTD" group="P"/>
-                <signal pad-id="pd6" index="6" function="PORTD" group="P"/>
-                <signal pad-id="pd7" index="7" function="PORTD" group="P"/>
+                <signal pad-key="pd0" index="0" function="PORTD" group="P"/>
+                <signal pad-key="pd1" index="1" function="PORTD" group="P"/>
+                <signal pad-key="pd2" index="2" function="PORTD" group="P"/>
+                <signal pad-key="pd3" index="3" function="PORTD" group="P"/>
+                <signal pad-key="pd4" index="4" function="PORTD" group="P"/>
+                <signal pad-key="pd5" index="5" function="PORTD" group="P"/>
+                <signal pad-key="pd6" index="6" function="PORTD" group="P"/>
+                <signal pad-key="pd7" index="7" function="PORTD" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="porte" name="PORTE" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pe2" index="2" function="PORTE" group="P"/>
+                <signal pad-key="pe0" index="0" function="PORTE" group="P"/>
+                <signal pad-key="pe1" index="1" function="PORTE" group="P"/>
+                <signal pad-key="pe2" index="2" function="PORTE" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="boot_load" name="BOOT_LOAD" module-key="boot_load">
@@ -966,78 +966,112 @@
             </register-group>
         </module>
     </modules>
+    <pads>
+        <pad key="pd0" name="PD0"/>
+        <pad key="pc0" name="PC0"/>
+        <pad key="pe0" name="PE0"/>
+        <pad key="pd1" name="PD1"/>
+        <pad key="pd2" name="PD2"/>
+        <pad key="pd3" name="PD3"/>
+        <pad key="pc1" name="PC1"/>
+        <pad key="vcc" name="VCC"/>
+        <pad key="gnd" name="GND"/>
+        <pad key="pc2" name="PC2"/>
+        <pad key="pc3" name="PC3"/>
+        <pad key="pb0" name="PB0"/>
+        <pad key="pb1" name="PB1"/>
+        <pad key="pe1" name="PE1"/>
+        <pad key="pe2" name="PE2"/>
+        <pad key="pd4" name="PD4"/>
+        <pad key="pd5" name="PD5"/>
+        <pad key="pd6" name="PD6"/>
+        <pad key="pd7" name="PD7"/>
+        <pad key="pb2" name="PB2"/>
+        <pad key="pc4" name="PC4"/>
+        <pad key="pc5" name="PC5"/>
+        <pad key="avcc" name="AVCC"/>
+        <pad key="agnd" name="AGND"/>
+        <pad key="aref" name="AREF"/>
+        <pad key="pc6" name="PC6"/>
+        <pad key="pb3" name="PB3"/>
+        <pad key="pb4" name="PB4"/>
+        <pad key="pc7" name="PC7"/>
+        <pad key="pb5" name="PB5"/>
+        <pad key="pb6" name="PB6"/>
+        <pad key="pb7" name="PB7"/>
+    </pads>
     <pinouts>
         <pinout key="soic32" name="SOIC32" type="soic">
-            <pin position="1" pad="PD0"/>
-            <pin position="2" pad="PC0"/>
-            <pin position="3" pad="PE0"/>
-            <pin position="4" pad="PD1"/>
-            <pin position="5" pad="PD2"/>
-            <pin position="6" pad="PD3"/>
-            <pin position="7" pad="PC1"/>
-            <pin position="8" pad="VCC"/>
-            <pin position="9" pad="GND"/>
-            <pin position="10" pad="PC2"/>
-            <pin position="11" pad="PC3"/>
-            <pin position="12" pad="PB0"/>
-            <pin position="13" pad="PB1"/>
-            <pin position="14" pad="PE1"/>
-            <pin position="15" pad="PE2"/>
-            <pin position="16" pad="PD4"/>
-            <pin position="17" pad="PD5"/>
-            <pin position="18" pad="PD6"/>
-            <pin position="19" pad="PD7"/>
-            <pin position="20" pad="PB2"/>
-            <pin position="21" pad="PC4"/>
-            <pin position="22" pad="PC5"/>
-            <pin position="23" pad="AVCC"/>
-            <pin position="24" pad="AGND"/>
-            <pin position="25" pad="AREF"/>
-            <pin position="26" pad="PC6"/>
-            <pin position="27" pad="PB3"/>
-            <pin position="28" pad="PB4"/>
-            <pin position="29" pad="PC7"/>
-            <pin position="30" pad="PB5"/>
-            <pin position="31" pad="PB6"/>
-            <pin position="32" pad="PB7"/>
+            <pin position="1" pad-key="pd0"/>
+            <pin position="2" pad-key="pc0"/>
+            <pin position="3" pad-key="pe0"/>
+            <pin position="4" pad-key="pd1"/>
+            <pin position="5" pad-key="pd2"/>
+            <pin position="6" pad-key="pd3"/>
+            <pin position="7" pad-key="pc1"/>
+            <pin position="8" pad-key="vcc"/>
+            <pin position="9" pad-key="gnd"/>
+            <pin position="10" pad-key="pc2"/>
+            <pin position="11" pad-key="pc3"/>
+            <pin position="12" pad-key="pb0"/>
+            <pin position="13" pad-key="pb1"/>
+            <pin position="14" pad-key="pe1"/>
+            <pin position="15" pad-key="pe2"/>
+            <pin position="16" pad-key="pd4"/>
+            <pin position="17" pad-key="pd5"/>
+            <pin position="18" pad-key="pd6"/>
+            <pin position="19" pad-key="pd7"/>
+            <pin position="20" pad-key="pb2"/>
+            <pin position="21" pad-key="pc4"/>
+            <pin position="22" pad-key="pc5"/>
+            <pin position="23" pad-key="avcc"/>
+            <pin position="24" pad-key="agnd"/>
+            <pin position="25" pad-key="aref"/>
+            <pin position="26" pad-key="pc6"/>
+            <pin position="27" pad-key="pb3"/>
+            <pin position="28" pad-key="pb4"/>
+            <pin position="29" pad-key="pc7"/>
+            <pin position="30" pad-key="pb5"/>
+            <pin position="31" pad-key="pb6"/>
+            <pin position="32" pad-key="pb7"/>
         </pinout>
         <pinout key="qfn32" name="QFN32" type="qfn">
-            <pin position="1" pad="PD2"/>
-            <pin position="2" pad="PD3"/>
-            <pin position="3" pad="PC1"/>
-            <pin position="4" pad="VCC"/>
-            <pin position="5" pad="GND"/>
-            <pin position="6" pad="PC2"/>
-            <pin position="7" pad="PC3"/>
-            <pin position="8" pad="PB0"/>
-            <pin position="9" pad="PB1"/>
-            <pin position="10" pad="PE1"/>
-            <pin position="11" pad="PE2"/>
-            <pin position="12" pad="PD4"/>
-            <pin position="13" pad="PD5"/>
-            <pin position="14" pad="PD6"/>
-            <pin position="15" pad="PD7"/>
-            <pin position="16" pad="PB2"/>
-            <pin position="17" pad="PC4"/>
-            <pin position="18" pad="PC5"/>
-            <pin position="19" pad="AVCC"/>
-            <pin position="20" pad="AGND"/>
-            <pin position="21" pad="AREF"/>
-            <pin position="22" pad="PC6"/>
-            <pin position="23" pad="PB3"/>
-            <pin position="24" pad="PB4"/>
-            <pin position="25" pad="PC7"/>
-            <pin position="26" pad="PB5"/>
-            <pin position="27" pad="PB6"/>
-            <pin position="28" pad="PB7"/>
-            <pin position="29" pad="PD0"/>
-            <pin position="30" pad="PC0"/>
-            <pin position="31" pad="PE0"/>
-            <pin position="32" pad="PD1"/>
+            <pin position="1" pad-key="pd2"/>
+            <pin position="2" pad-key="pd3"/>
+            <pin position="3" pad-key="pc1"/>
+            <pin position="4" pad-key="vcc"/>
+            <pin position="5" pad-key="gnd"/>
+            <pin position="6" pad-key="pc2"/>
+            <pin position="7" pad-key="pc3"/>
+            <pin position="8" pad-key="pb0"/>
+            <pin position="9" pad-key="pb1"/>
+            <pin position="10" pad-key="pe1"/>
+            <pin position="11" pad-key="pe2"/>
+            <pin position="12" pad-key="pd4"/>
+            <pin position="13" pad-key="pd5"/>
+            <pin position="14" pad-key="pd6"/>
+            <pin position="15" pad-key="pd7"/>
+            <pin position="16" pad-key="pb2"/>
+            <pin position="17" pad-key="pc4"/>
+            <pin position="18" pad-key="pc5"/>
+            <pin position="19" pad-key="avcc"/>
+            <pin position="20" pad-key="agnd"/>
+            <pin position="21" pad-key="aref"/>
+            <pin position="22" pad-key="pc6"/>
+            <pin position="23" pad-key="pb3"/>
+            <pin position="24" pad-key="pb4"/>
+            <pin position="25" pad-key="pc7"/>
+            <pin position="26" pad-key="pb5"/>
+            <pin position="27" pad-key="pb6"/>
+            <pin position="28" pad-key="pb7"/>
+            <pin position="29" pad-key="pd0"/>
+            <pin position="30" pad-key="pc0"/>
+            <pin position="31" pad-key="pe0"/>
+            <pin position="32" pad-key="pd1"/>
         </pinout>
     </pinouts>
     <variants>
-        <variant name="AT90PWM3B-SU" pinout-key="soic32" package="SOIC32"/>
-        <variant name="AT90PWM3B-MU" pinout-key="qfn32" package="QFN32"/>
+        <variant key="at90pwm3b_su" name="AT90PWM3B-SU" pinout-key="soic32"/>
+        <variant key="at90pwm3b_mu" name="AT90PWM3B-MU" pinout-key="qfn32"/>
     </variants>
 </device>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90PWM81.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90PWM81.xml
index 258cb9e6..d813122d 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90PWM81.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90PWM81.xml
@@ -194,36 +194,36 @@
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pb2" index="2" function="PORTB" group="P"/>
-                <signal pad-id="pb3" index="3" function="PORTB" group="P"/>
-                <signal pad-id="pb4" index="4" function="PORTB" group="P"/>
-                <signal pad-id="pb5" index="5" function="PORTB" group="P"/>
-                <signal pad-id="pb6" index="6" function="PORTB" group="P"/>
-                <signal pad-id="pb7" index="7" function="PORTB" group="P"/>
+                <signal pad-key="pb0" index="0" function="PORTB" group="P"/>
+                <signal pad-key="pb1" index="1" function="PORTB" group="P"/>
+                <signal pad-key="pb2" index="2" function="PORTB" group="P"/>
+                <signal pad-key="pb3" index="3" function="PORTB" group="P"/>
+                <signal pad-key="pb4" index="4" function="PORTB" group="P"/>
+                <signal pad-key="pb5" index="5" function="PORTB" group="P"/>
+                <signal pad-key="pb6" index="6" function="PORTB" group="P"/>
+                <signal pad-key="pb7" index="7" function="PORTB" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pd2" index="2" function="PORTD" group="P"/>
-                <signal pad-id="pd3" index="3" function="PORTD" group="P"/>
-                <signal pad-id="pd4" index="4" function="PORTD" group="P"/>
-                <signal pad-id="pd5" index="5" function="PORTD" group="P"/>
-                <signal pad-id="pd6" index="6" function="PORTD" group="P"/>
-                <signal pad-id="pd7" index="7" function="PORTD" group="P"/>
+                <signal pad-key="pd0" index="0" function="PORTD" group="P"/>
+                <signal pad-key="pd1" index="1" function="PORTD" group="P"/>
+                <signal pad-key="pd2" index="2" function="PORTD" group="P"/>
+                <signal pad-key="pd3" index="3" function="PORTD" group="P"/>
+                <signal pad-key="pd4" index="4" function="PORTD" group="P"/>
+                <signal pad-key="pd5" index="5" function="PORTD" group="P"/>
+                <signal pad-key="pd6" index="6" function="PORTD" group="P"/>
+                <signal pad-key="pd7" index="7" function="PORTD" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="porte" name="PORTE" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pe2" index="2" function="PORTE" group="P"/>
-                <signal pad-id="pe3" index="3" function="PORTE" group="P"/>
+                <signal pad-key="pe0" index="0" function="PORTE" group="P"/>
+                <signal pad-key="pe1" index="1" function="PORTE" group="P"/>
+                <signal pad-key="pe2" index="2" function="PORTE" group="P"/>
+                <signal pad-key="pe3" index="3" function="PORTE" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="dac" name="DAC" module-key="dac">
@@ -779,66 +779,92 @@
             </register-group>
         </module>
     </modules>
+    <pads>
+        <pad key="pb0" name="PB0"/>
+        <pad key="pe0" name="PE0"/>
+        <pad key="pb1" name="PB1"/>
+        <pad key="pb2" name="PB2"/>
+        <pad key="vcc" name="VCC"/>
+        <pad key="gnd" name="GND"/>
+        <pad key="pe1" name="PE1"/>
+        <pad key="pe2" name="PE2"/>
+        <pad key="pd1" name="PD1"/>
+        <pad key="pd2" name="PD2"/>
+        <pad key="pb3" name="PB3"/>
+        <pad key="pb4" name="PB4"/>
+        <pad key="pb5" name="PB5"/>
+        <pad key="avcc" name="AVCC"/>
+        <pad key="agnd" name="AGND"/>
+        <pad key="pe3" name="PE3"/>
+        <pad key="pd5" name="PD5"/>
+        <pad key="pd6" name="PD6"/>
+        <pad key="pb6" name="PB6"/>
+        <pad key="pb7" name="PB7"/>
+        <pad key="pd0" name="PD0"/>
+        <pad key="pd3" name="PD3"/>
+        <pad key="pd4" name="PD4"/>
+        <pad key="pd7" name="PD7"/>
+    </pads>
     <pinouts>
         <pinout key="soic20" name="SOIC20" type="soic">
-            <pin position="1" pad="PB0"/>
-            <pin position="2" pad="PE0"/>
-            <pin position="3" pad="PB1"/>
-            <pin position="4" pad="PB2"/>
-            <pin position="5" pad="VCC"/>
-            <pin position="6" pad="GND"/>
-            <pin position="7" pad="PE1"/>
-            <pin position="8" pad="PE2"/>
-            <pin position="9" pad="PD1"/>
-            <pin position="10" pad="PD2"/>
-            <pin position="11" pad="PB3"/>
-            <pin position="12" pad="PB4"/>
-            <pin position="13" pad="PB5"/>
-            <pin position="14" pad="AVCC"/>
-            <pin position="15" pad="AGND"/>
-            <pin position="16" pad="PE3"/>
-            <pin position="17" pad="PD5"/>
-            <pin position="18" pad="PD6"/>
-            <pin position="19" pad="PB6"/>
-            <pin position="20" pad="PB7"/>
+            <pin position="1" pad-key="pb0"/>
+            <pin position="2" pad-key="pe0"/>
+            <pin position="3" pad-key="pb1"/>
+            <pin position="4" pad-key="pb2"/>
+            <pin position="5" pad-key="vcc"/>
+            <pin position="6" pad-key="gnd"/>
+            <pin position="7" pad-key="pe1"/>
+            <pin position="8" pad-key="pe2"/>
+            <pin position="9" pad-key="pd1"/>
+            <pin position="10" pad-key="pd2"/>
+            <pin position="11" pad-key="pb3"/>
+            <pin position="12" pad-key="pb4"/>
+            <pin position="13" pad-key="pb5"/>
+            <pin position="14" pad-key="avcc"/>
+            <pin position="15" pad-key="agnd"/>
+            <pin position="16" pad-key="pe3"/>
+            <pin position="17" pad-key="pd5"/>
+            <pin position="18" pad-key="pd6"/>
+            <pin position="19" pad-key="pb6"/>
+            <pin position="20" pad-key="pb7"/>
         </pinout>
         <pinout key="qfn32" name="QFN32" type="qfn">
-            <pin position="1" pad="NC"/>
-            <pin position="2" pad="PD0"/>
-            <pin position="3" pad="PB1"/>
-            <pin position="4" pad="PB2"/>
-            <pin position="5" pad="VCC"/>
-            <pin position="6" pad="GND"/>
-            <pin position="7" pad="PE1"/>
-            <pin position="8" pad="NC"/>
-            <pin position="9" pad="NC"/>
-            <pin position="10" pad="PE2"/>
-            <pin position="11" pad="PD1"/>
-            <pin position="12" pad="PD2"/>
-            <pin position="13" pad="PD3"/>
-            <pin position="14" pad="PB3"/>
-            <pin position="15" pad="PB4"/>
-            <pin position="16" pad="NC"/>
-            <pin position="17" pad="NC"/>
-            <pin position="18" pad="PD4"/>
-            <pin position="19" pad="PB5"/>
-            <pin position="20" pad="AVCC"/>
-            <pin position="21" pad="AGND"/>
-            <pin position="22" pad="PE3"/>
-            <pin position="23" pad="PD5"/>
-            <pin position="24" pad="NC"/>
-            <pin position="25" pad="NC"/>
-            <pin position="26" pad="PD6"/>
-            <pin position="27" pad="PB6"/>
-            <pin position="28" pad="PD7"/>
-            <pin position="29" pad="PB7"/>
-            <pin position="30" pad="PB0"/>
-            <pin position="31" pad="PE0"/>
-            <pin position="32" pad="NC"/>
+            <pin position="1"/>
+            <pin position="2" pad-key="pd0"/>
+            <pin position="3" pad-key="pb1"/>
+            <pin position="4" pad-key="pb2"/>
+            <pin position="5" pad-key="vcc"/>
+            <pin position="6" pad-key="gnd"/>
+            <pin position="7" pad-key="pe1"/>
+            <pin position="8"/>
+            <pin position="9"/>
+            <pin position="10" pad-key="pe2"/>
+            <pin position="11" pad-key="pd1"/>
+            <pin position="12" pad-key="pd2"/>
+            <pin position="13" pad-key="pd3"/>
+            <pin position="14" pad-key="pb3"/>
+            <pin position="15" pad-key="pb4"/>
+            <pin position="16"/>
+            <pin position="17"/>
+            <pin position="18" pad-key="pd4"/>
+            <pin position="19" pad-key="pb5"/>
+            <pin position="20" pad-key="avcc"/>
+            <pin position="21" pad-key="agnd"/>
+            <pin position="22" pad-key="pe3"/>
+            <pin position="23" pad-key="pd5"/>
+            <pin position="24"/>
+            <pin position="25"/>
+            <pin position="26" pad-key="pd6"/>
+            <pin position="27" pad-key="pb6"/>
+            <pin position="28" pad-key="pd7"/>
+            <pin position="29" pad-key="pb7"/>
+            <pin position="30" pad-key="pb0"/>
+            <pin position="31" pad-key="pe0"/>
+            <pin position="32"/>
         </pinout>
     </pinouts>
     <variants>
-        <variant name="AT90PWM81-MN" pinout-key="qfn32" package="VQFN32"/>
-        <variant name="AT90PWM81-SN" pinout-key="soic20" package="SOIC20"/>
+        <variant key="at90pwm81_mn" name="AT90PWM81-MN" pinout-key="qfn32"/>
+        <variant key="at90pwm81_sn" name="AT90PWM81-SN" pinout-key="soic20"/>
     </variants>
 </device>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90USB1286.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90USB1286.xml
index bf6e2180..eab0dd03 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90USB1286.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90USB1286.xml
@@ -198,79 +198,79 @@
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pa2" index="2" function="PORTA" group="P"/>
-                <signal pad-id="pa3" index="3" function="PORTA" group="P"/>
-                <signal pad-id="pa4" index="4" function="PORTA" group="P"/>
-                <signal pad-id="pa5" index="5" function="PORTA" group="P"/>
-                <signal pad-id="pa6" index="6" function="PORTA" group="P"/>
-                <signal pad-id="pa7" index="7" function="PORTA" group="P"/>
+                <signal pad-key="pa0" index="0" function="PORTA" group="P"/>
+                <signal pad-key="pa1" index="1" function="PORTA" group="P"/>
+                <signal pad-key="pa2" index="2" function="PORTA" group="P"/>
+                <signal pad-key="pa3" index="3" function="PORTA" group="P"/>
+                <signal pad-key="pa4" index="4" function="PORTA" group="P"/>
+                <signal pad-key="pa5" index="5" function="PORTA" group="P"/>
+                <signal pad-key="pa6" index="6" function="PORTA" group="P"/>
+                <signal pad-key="pa7" index="7" function="PORTA" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pb2" index="2" function="PORTB" group="P"/>
-                <signal pad-id="pb3" index="3" function="PORTB" group="P"/>
-                <signal pad-id="pb4" index="4" function="PORTB" group="P"/>
-                <signal pad-id="pb5" index="5" function="PORTB" group="P"/>
-                <signal pad-id="pb6" index="6" function="PORTB" group="P"/>
-                <signal pad-id="pb7" index="7" function="PORTB" group="P"/>
+                <signal pad-key="pb0" index="0" function="PORTB" group="P"/>
+                <signal pad-key="pb1" index="1" function="PORTB" group="P"/>
+                <signal pad-key="pb2" index="2" function="PORTB" group="P"/>
+                <signal pad-key="pb3" index="3" function="PORTB" group="P"/>
+                <signal pad-key="pb4" index="4" function="PORTB" group="P"/>
+                <signal pad-key="pb5" index="5" function="PORTB" group="P"/>
+                <signal pad-key="pb6" index="6" function="PORTB" group="P"/>
+                <signal pad-key="pb7" index="7" function="PORTB" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pc2" index="2" function="PORTC" group="P"/>
-                <signal pad-id="pc3" index="3" function="PORTC" group="P"/>
-                <signal pad-id="pc4" index="4" function="PORTC" group="P"/>
-                <signal pad-id="pc5" index="5" function="PORTC" group="P"/>
-                <signal pad-id="pc6" index="6" function="PORTC" group="P"/>
-                <signal pad-id="pc7" index="7" function="PORTC" group="P"/>
+                <signal pad-key="pc0" index="0" function="PORTC" group="P"/>
+                <signal pad-key="pc1" index="1" function="PORTC" group="P"/>
+                <signal pad-key="pc2" index="2" function="PORTC" group="P"/>
+                <signal pad-key="pc3" index="3" function="PORTC" group="P"/>
+                <signal pad-key="pc4" index="4" function="PORTC" group="P"/>
+                <signal pad-key="pc5" index="5" function="PORTC" group="P"/>
+                <signal pad-key="pc6" index="6" function="PORTC" group="P"/>
+                <signal pad-key="pc7" index="7" function="PORTC" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pd2" index="2" function="PORTD" group="P"/>
-                <signal pad-id="pd3" index="3" function="PORTD" group="P"/>
-                <signal pad-id="pd4" index="4" function="PORTD" group="P"/>
-                <signal pad-id="pd5" index="5" function="PORTD" group="P"/>
-                <signal pad-id="pd6" index="6" function="PORTD" group="P"/>
-                <signal pad-id="pd7" index="7" function="PORTD" group="P"/>
+                <signal pad-key="pd0" index="0" function="PORTD" group="P"/>
+                <signal pad-key="pd1" index="1" function="PORTD" group="P"/>
+                <signal pad-key="pd2" index="2" function="PORTD" group="P"/>
+                <signal pad-key="pd3" index="3" function="PORTD" group="P"/>
+                <signal pad-key="pd4" index="4" function="PORTD" group="P"/>
+                <signal pad-key="pd5" index="5" function="PORTD" group="P"/>
+                <signal pad-key="pd6" index="6" function="PORTD" group="P"/>
+                <signal pad-key="pd7" index="7" function="PORTD" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="porte" name="PORTE" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pe2" index="2" function="PORTE" group="P"/>
-                <signal pad-id="pe3" index="3" function="PORTE" group="P"/>
-                <signal pad-id="pe4" index="4" function="PORTE" group="P"/>
-                <signal pad-id="pe5" index="5" function="PORTE" group="P"/>
-                <signal pad-id="pe6" index="6" function="PORTE" group="P"/>
-                <signal pad-id="pe7" index="7" function="PORTE" group="P"/>
+                <signal pad-key="pe0" index="0" function="PORTE" group="P"/>
+                <signal pad-key="pe1" index="1" function="PORTE" group="P"/>
+                <signal pad-key="pe2" index="2" function="PORTE" group="P"/>
+                <signal pad-key="pe3" index="3" function="PORTE" group="P"/>
+                <signal pad-key="pe4" index="4" function="PORTE" group="P"/>
+                <signal pad-key="pe5" index="5" function="PORTE" group="P"/>
+                <signal pad-key="pe6" index="6" function="PORTE" group="P"/>
+                <signal pad-key="pe7" index="7" function="PORTE" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portf" name="PORTF" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pf2" index="2" function="PORTF" group="P"/>
-                <signal pad-id="pf3" index="3" function="PORTF" group="P"/>
-                <signal pad-id="pf4" index="4" function="PORTF" group="P"/>
-                <signal pad-id="pf5" index="5" function="PORTF" group="P"/>
-                <signal pad-id="pf6" index="6" function="PORTF" group="P"/>
-                <signal pad-id="pf7" index="7" function="PORTF" group="P"/>
+                <signal pad-key="pf0" index="0" function="PORTF" group="P"/>
+                <signal pad-key="pf1" index="1" function="PORTF" group="P"/>
+                <signal pad-key="pf2" index="2" function="PORTF" group="P"/>
+                <signal pad-key="pf3" index="3" function="PORTF" group="P"/>
+                <signal pad-key="pf4" index="4" function="PORTF" group="P"/>
+                <signal pad-key="pf5" index="5" function="PORTF" group="P"/>
+                <signal pad-key="pf6" index="6" function="PORTF" group="P"/>
+                <signal pad-key="pf7" index="7" function="PORTF" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="cpu">
@@ -957,76 +957,140 @@
             </register-group>
         </module>
     </modules>
+    <pads>
+        <pad key="pe6" name="PE6"/>
+        <pad key="pe7" name="PE7"/>
+        <pad key="uvcc" name="UVCC"/>
+        <pad key="d-" name="D-"/>
+        <pad key="d+" name="D+"/>
+        <pad key="ugnd" name="UGND"/>
+        <pad key="ucap" name="UCAP"/>
+        <pad key="vbus" name="VBUS"/>
+        <pad key="pe3" name="PE3"/>
+        <pad key="pb0" name="PB0"/>
+        <pad key="pb1" name="PB1"/>
+        <pad key="pb2" name="PB2"/>
+        <pad key="pb3" name="PB3"/>
+        <pad key="pb4" name="PB4"/>
+        <pad key="pb5" name="PB5"/>
+        <pad key="pb6" name="PB6"/>
+        <pad key="pb7" name="PB7"/>
+        <pad key="pe4" name="PE4"/>
+        <pad key="pe5" name="PE5"/>
+        <pad key="reset" name="RESET"/>
+        <pad key="vcc" name="VCC"/>
+        <pad key="gdn" name="GDN"/>
+        <pad key="xtal2" name="XTAL2"/>
+        <pad key="xtal1" name="XTAL1"/>
+        <pad key="pd0" name="PD0"/>
+        <pad key="pd1" name="PD1"/>
+        <pad key="pd2" name="PD2"/>
+        <pad key="pd3" name="PD3"/>
+        <pad key="pd4" name="PD4"/>
+        <pad key="pd5" name="PD5"/>
+        <pad key="pd6" name="PD6"/>
+        <pad key="pd7" name="PD7"/>
+        <pad key="pe0" name="PE0"/>
+        <pad key="pe1" name="PE1"/>
+        <pad key="pc0" name="PC0"/>
+        <pad key="pc1" name="PC1"/>
+        <pad key="pc2" name="PC2"/>
+        <pad key="pc3" name="PC3"/>
+        <pad key="pc4" name="PC4"/>
+        <pad key="pc5" name="PC5"/>
+        <pad key="pc6" name="PC6"/>
+        <pad key="pc7" name="PC7"/>
+        <pad key="pe2" name="PE2"/>
+        <pad key="pa7" name="PA7"/>
+        <pad key="pa6" name="PA6"/>
+        <pad key="pa5" name="PA5"/>
+        <pad key="pa4" name="PA4"/>
+        <pad key="pa3" name="PA3"/>
+        <pad key="pa2" name="PA2"/>
+        <pad key="pa1" name="PA1"/>
+        <pad key="pa0" name="PA0"/>
+        <pad key="gnd" name="GND"/>
+        <pad key="pf7" name="PF7"/>
+        <pad key="pf6" name="PF6"/>
+        <pad key="pf5" name="PF5"/>
+        <pad key="pf4" name="PF4"/>
+        <pad key="pf3" name="PF3"/>
+        <pad key="pf2" name="PF2"/>
+        <pad key="pf1" name="PF1"/>
+        <pad key="pf0" name="PF0"/>
+        <pad key="aref" name="AREF"/>
+        <pad key="avcc" name="AVCC"/>
+    </pads>
     <pinouts>
         <pinout key="qfp_qfn_64" name="QFP_QFN_64" type="qfn">
-            <pin position="1" pad="PE6"/>
-            <pin position="2" pad="PE7"/>
-            <pin position="3" pad="UVCC"/>
-            <pin position="4" pad="D-"/>
-            <pin position="5" pad="D+"/>
-            <pin position="6" pad="UGND"/>
-            <pin position="7" pad="UCAP"/>
-            <pin position="8" pad="VBUS"/>
-            <pin position="9" pad="PE3"/>
-            <pin position="10" pad="PB0"/>
-            <pin position="11" pad="PB1"/>
-            <pin position="12" pad="PB2"/>
-            <pin position="13" pad="PB3"/>
-            <pin position="14" pad="PB4"/>
-            <pin position="15" pad="PB5"/>
-            <pin position="16" pad="PB6"/>
-            <pin position="17" pad="PB7"/>
-            <pin position="18" pad="PE4"/>
-            <pin position="19" pad="PE5"/>
-            <pin position="20" pad="RESET"/>
-            <pin position="21" pad="VCC"/>
-            <pin position="22" pad="GDN"/>
-            <pin position="23" pad="XTAL2"/>
-            <pin position="24" pad="XTAL1"/>
-            <pin position="25" pad="PD0"/>
-            <pin position="26" pad="PD1"/>
-            <pin position="27" pad="PD2"/>
-            <pin position="28" pad="PD3"/>
-            <pin position="29" pad="PD4"/>
-            <pin position="30" pad="PD5"/>
-            <pin position="31" pad="PD6"/>
-            <pin position="32" pad="PD7"/>
-            <pin position="33" pad="PE0"/>
-            <pin position="34" pad="PE1"/>
-            <pin position="35" pad="PC0"/>
-            <pin position="36" pad="PC1"/>
-            <pin position="37" pad="PC2"/>
-            <pin position="38" pad="PC3"/>
-            <pin position="39" pad="PC4"/>
-            <pin position="40" pad="PC5"/>
-            <pin position="41" pad="PC6"/>
-            <pin position="42" pad="PC7"/>
-            <pin position="43" pad="PE2"/>
-            <pin position="44" pad="PA7"/>
-            <pin position="45" pad="PA6"/>
-            <pin position="46" pad="PA5"/>
-            <pin position="47" pad="PA4"/>
-            <pin position="48" pad="PA3"/>
-            <pin position="49" pad="PA2"/>
-            <pin position="50" pad="PA1"/>
-            <pin position="51" pad="PA0"/>
-            <pin position="52" pad="VCC"/>
-            <pin position="53" pad="GND"/>
-            <pin position="54" pad="PF7"/>
-            <pin position="55" pad="PF6"/>
-            <pin position="56" pad="PF5"/>
-            <pin position="57" pad="PF4"/>
-            <pin position="58" pad="PF3"/>
-            <pin position="59" pad="PF2"/>
-            <pin position="60" pad="PF1"/>
-            <pin position="61" pad="PF0"/>
-            <pin position="62" pad="AREF"/>
-            <pin position="63" pad="GND"/>
-            <pin position="64" pad="AVCC"/>
+            <pin position="1" pad-key="pe6"/>
+            <pin position="2" pad-key="pe7"/>
+            <pin position="3" pad-key="uvcc"/>
+            <pin position="4" pad-key="d-"/>
+            <pin position="5" pad-key="d+"/>
+            <pin position="6" pad-key="ugnd"/>
+            <pin position="7" pad-key="ucap"/>
+            <pin position="8" pad-key="vbus"/>
+            <pin position="9" pad-key="pe3"/>
+            <pin position="10" pad-key="pb0"/>
+            <pin position="11" pad-key="pb1"/>
+            <pin position="12" pad-key="pb2"/>
+            <pin position="13" pad-key="pb3"/>
+            <pin position="14" pad-key="pb4"/>
+            <pin position="15" pad-key="pb5"/>
+            <pin position="16" pad-key="pb6"/>
+            <pin position="17" pad-key="pb7"/>
+            <pin position="18" pad-key="pe4"/>
+            <pin position="19" pad-key="pe5"/>
+            <pin position="20" pad-key="reset"/>
+            <pin position="21" pad-key="vcc"/>
+            <pin position="22" pad-key="gdn"/>
+            <pin position="23" pad-key="xtal2"/>
+            <pin position="24" pad-key="xtal1"/>
+            <pin position="25" pad-key="pd0"/>
+            <pin position="26" pad-key="pd1"/>
+            <pin position="27" pad-key="pd2"/>
+            <pin position="28" pad-key="pd3"/>
+            <pin position="29" pad-key="pd4"/>
+            <pin position="30" pad-key="pd5"/>
+            <pin position="31" pad-key="pd6"/>
+            <pin position="32" pad-key="pd7"/>
+            <pin position="33" pad-key="pe0"/>
+            <pin position="34" pad-key="pe1"/>
+            <pin position="35" pad-key="pc0"/>
+            <pin position="36" pad-key="pc1"/>
+            <pin position="37" pad-key="pc2"/>
+            <pin position="38" pad-key="pc3"/>
+            <pin position="39" pad-key="pc4"/>
+            <pin position="40" pad-key="pc5"/>
+            <pin position="41" pad-key="pc6"/>
+            <pin position="42" pad-key="pc7"/>
+            <pin position="43" pad-key="pe2"/>
+            <pin position="44" pad-key="pa7"/>
+            <pin position="45" pad-key="pa6"/>
+            <pin position="46" pad-key="pa5"/>
+            <pin position="47" pad-key="pa4"/>
+            <pin position="48" pad-key="pa3"/>
+            <pin position="49" pad-key="pa2"/>
+            <pin position="50" pad-key="pa1"/>
+            <pin position="51" pad-key="pa0"/>
+            <pin position="52" pad-key="vcc"/>
+            <pin position="53" pad-key="gnd"/>
+            <pin position="54" pad-key="pf7"/>
+            <pin position="55" pad-key="pf6"/>
+            <pin position="56" pad-key="pf5"/>
+            <pin position="57" pad-key="pf4"/>
+            <pin position="58" pad-key="pf3"/>
+            <pin position="59" pad-key="pf2"/>
+            <pin position="60" pad-key="pf1"/>
+            <pin position="61" pad-key="pf0"/>
+            <pin position="62" pad-key="aref"/>
+            <pin position="63" pad-key="gnd"/>
+            <pin position="64" pad-key="avcc"/>
         </pinout>
     </pinouts>
     <variants>
-        <variant name="AT90USB1286-AU" pinout-key="qfp_qfn_64" package="TQFP64"/>
-        <variant name="AT90USB1286-MU" pinout-key="qfp_qfn_64" package="VQFN64"/>
+        <variant key="at90usb1286_au" name="AT90USB1286-AU" pinout-key="qfp_qfn_64"/>
+        <variant key="at90usb1286_mu" name="AT90USB1286-MU" pinout-key="qfp_qfn_64"/>
     </variants>
 </device>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90USB1287.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90USB1287.xml
index 640d132b..2299028a 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90USB1287.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90USB1287.xml
@@ -198,79 +198,79 @@
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pa2" index="2" function="PORTA" group="P"/>
-                <signal pad-id="pa3" index="3" function="PORTA" group="P"/>
-                <signal pad-id="pa4" index="4" function="PORTA" group="P"/>
-                <signal pad-id="pa5" index="5" function="PORTA" group="P"/>
-                <signal pad-id="pa6" index="6" function="PORTA" group="P"/>
-                <signal pad-id="pa7" index="7" function="PORTA" group="P"/>
+                <signal pad-key="pa0" index="0" function="PORTA" group="P"/>
+                <signal pad-key="pa1" index="1" function="PORTA" group="P"/>
+                <signal pad-key="pa2" index="2" function="PORTA" group="P"/>
+                <signal pad-key="pa3" index="3" function="PORTA" group="P"/>
+                <signal pad-key="pa4" index="4" function="PORTA" group="P"/>
+                <signal pad-key="pa5" index="5" function="PORTA" group="P"/>
+                <signal pad-key="pa6" index="6" function="PORTA" group="P"/>
+                <signal pad-key="pa7" index="7" function="PORTA" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pb2" index="2" function="PORTB" group="P"/>
-                <signal pad-id="pb3" index="3" function="PORTB" group="P"/>
-                <signal pad-id="pb4" index="4" function="PORTB" group="P"/>
-                <signal pad-id="pb5" index="5" function="PORTB" group="P"/>
-                <signal pad-id="pb6" index="6" function="PORTB" group="P"/>
-                <signal pad-id="pb7" index="7" function="PORTB" group="P"/>
+                <signal pad-key="pb0" index="0" function="PORTB" group="P"/>
+                <signal pad-key="pb1" index="1" function="PORTB" group="P"/>
+                <signal pad-key="pb2" index="2" function="PORTB" group="P"/>
+                <signal pad-key="pb3" index="3" function="PORTB" group="P"/>
+                <signal pad-key="pb4" index="4" function="PORTB" group="P"/>
+                <signal pad-key="pb5" index="5" function="PORTB" group="P"/>
+                <signal pad-key="pb6" index="6" function="PORTB" group="P"/>
+                <signal pad-key="pb7" index="7" function="PORTB" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pc2" index="2" function="PORTC" group="P"/>
-                <signal pad-id="pc3" index="3" function="PORTC" group="P"/>
-                <signal pad-id="pc4" index="4" function="PORTC" group="P"/>
-                <signal pad-id="pc5" index="5" function="PORTC" group="P"/>
-                <signal pad-id="pc6" index="6" function="PORTC" group="P"/>
-                <signal pad-id="pc7" index="7" function="PORTC" group="P"/>
+                <signal pad-key="pc0" index="0" function="PORTC" group="P"/>
+                <signal pad-key="pc1" index="1" function="PORTC" group="P"/>
+                <signal pad-key="pc2" index="2" function="PORTC" group="P"/>
+                <signal pad-key="pc3" index="3" function="PORTC" group="P"/>
+                <signal pad-key="pc4" index="4" function="PORTC" group="P"/>
+                <signal pad-key="pc5" index="5" function="PORTC" group="P"/>
+                <signal pad-key="pc6" index="6" function="PORTC" group="P"/>
+                <signal pad-key="pc7" index="7" function="PORTC" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pd2" index="2" function="PORTD" group="P"/>
-                <signal pad-id="pd3" index="3" function="PORTD" group="P"/>
-                <signal pad-id="pd4" index="4" function="PORTD" group="P"/>
-                <signal pad-id="pd5" index="5" function="PORTD" group="P"/>
-                <signal pad-id="pd6" index="6" function="PORTD" group="P"/>
-                <signal pad-id="pd7" index="7" function="PORTD" group="P"/>
+                <signal pad-key="pd0" index="0" function="PORTD" group="P"/>
+                <signal pad-key="pd1" index="1" function="PORTD" group="P"/>
+                <signal pad-key="pd2" index="2" function="PORTD" group="P"/>
+                <signal pad-key="pd3" index="3" function="PORTD" group="P"/>
+                <signal pad-key="pd4" index="4" function="PORTD" group="P"/>
+                <signal pad-key="pd5" index="5" function="PORTD" group="P"/>
+                <signal pad-key="pd6" index="6" function="PORTD" group="P"/>
+                <signal pad-key="pd7" index="7" function="PORTD" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="porte" name="PORTE" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pe2" index="2" function="PORTE" group="P"/>
-                <signal pad-id="pe3" index="3" function="PORTE" group="P"/>
-                <signal pad-id="pe4" index="4" function="PORTE" group="P"/>
-                <signal pad-id="pe5" index="5" function="PORTE" group="P"/>
-                <signal pad-id="pe6" index="6" function="PORTE" group="P"/>
-                <signal pad-id="pe7" index="7" function="PORTE" group="P"/>
+                <signal pad-key="pe0" index="0" function="PORTE" group="P"/>
+                <signal pad-key="pe1" index="1" function="PORTE" group="P"/>
+                <signal pad-key="pe2" index="2" function="PORTE" group="P"/>
+                <signal pad-key="pe3" index="3" function="PORTE" group="P"/>
+                <signal pad-key="pe4" index="4" function="PORTE" group="P"/>
+                <signal pad-key="pe5" index="5" function="PORTE" group="P"/>
+                <signal pad-key="pe6" index="6" function="PORTE" group="P"/>
+                <signal pad-key="pe7" index="7" function="PORTE" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portf" name="PORTF" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pf2" index="2" function="PORTF" group="P"/>
-                <signal pad-id="pf3" index="3" function="PORTF" group="P"/>
-                <signal pad-id="pf4" index="4" function="PORTF" group="P"/>
-                <signal pad-id="pf5" index="5" function="PORTF" group="P"/>
-                <signal pad-id="pf6" index="6" function="PORTF" group="P"/>
-                <signal pad-id="pf7" index="7" function="PORTF" group="P"/>
+                <signal pad-key="pf0" index="0" function="PORTF" group="P"/>
+                <signal pad-key="pf1" index="1" function="PORTF" group="P"/>
+                <signal pad-key="pf2" index="2" function="PORTF" group="P"/>
+                <signal pad-key="pf3" index="3" function="PORTF" group="P"/>
+                <signal pad-key="pf4" index="4" function="PORTF" group="P"/>
+                <signal pad-key="pf5" index="5" function="PORTF" group="P"/>
+                <signal pad-key="pf6" index="6" function="PORTF" group="P"/>
+                <signal pad-key="pf7" index="7" function="PORTF" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="cpu">
@@ -1079,76 +1079,140 @@
             </register-group>
         </module>
     </modules>
+    <pads>
+        <pad key="pe6" name="PE6"/>
+        <pad key="pe7" name="PE7"/>
+        <pad key="uvcc" name="UVCC"/>
+        <pad key="d-" name="D-"/>
+        <pad key="d+" name="D+"/>
+        <pad key="ugnd" name="UGND"/>
+        <pad key="ucap" name="UCAP"/>
+        <pad key="vbus" name="VBUS"/>
+        <pad key="pe3" name="PE3"/>
+        <pad key="pb0" name="PB0"/>
+        <pad key="pb1" name="PB1"/>
+        <pad key="pb2" name="PB2"/>
+        <pad key="pb3" name="PB3"/>
+        <pad key="pb4" name="PB4"/>
+        <pad key="pb5" name="PB5"/>
+        <pad key="pb6" name="PB6"/>
+        <pad key="pb7" name="PB7"/>
+        <pad key="pe4" name="PE4"/>
+        <pad key="pe5" name="PE5"/>
+        <pad key="reset" name="RESET"/>
+        <pad key="vcc" name="VCC"/>
+        <pad key="gdn" name="GDN"/>
+        <pad key="xtal2" name="XTAL2"/>
+        <pad key="xtal1" name="XTAL1"/>
+        <pad key="pd0" name="PD0"/>
+        <pad key="pd1" name="PD1"/>
+        <pad key="pd2" name="PD2"/>
+        <pad key="pd3" name="PD3"/>
+        <pad key="pd4" name="PD4"/>
+        <pad key="pd5" name="PD5"/>
+        <pad key="pd6" name="PD6"/>
+        <pad key="pd7" name="PD7"/>
+        <pad key="pe0" name="PE0"/>
+        <pad key="pe1" name="PE1"/>
+        <pad key="pc0" name="PC0"/>
+        <pad key="pc1" name="PC1"/>
+        <pad key="pc2" name="PC2"/>
+        <pad key="pc3" name="PC3"/>
+        <pad key="pc4" name="PC4"/>
+        <pad key="pc5" name="PC5"/>
+        <pad key="pc6" name="PC6"/>
+        <pad key="pc7" name="PC7"/>
+        <pad key="pe2" name="PE2"/>
+        <pad key="pa7" name="PA7"/>
+        <pad key="pa6" name="PA6"/>
+        <pad key="pa5" name="PA5"/>
+        <pad key="pa4" name="PA4"/>
+        <pad key="pa3" name="PA3"/>
+        <pad key="pa2" name="PA2"/>
+        <pad key="pa1" name="PA1"/>
+        <pad key="pa0" name="PA0"/>
+        <pad key="gnd" name="GND"/>
+        <pad key="pf7" name="PF7"/>
+        <pad key="pf6" name="PF6"/>
+        <pad key="pf5" name="PF5"/>
+        <pad key="pf4" name="PF4"/>
+        <pad key="pf3" name="PF3"/>
+        <pad key="pf2" name="PF2"/>
+        <pad key="pf1" name="PF1"/>
+        <pad key="pf0" name="PF0"/>
+        <pad key="aref" name="AREF"/>
+        <pad key="avcc" name="AVCC"/>
+    </pads>
     <pinouts>
         <pinout key="qfp_qfn_64" name="QFP_QFN_64" type="qfn">
-            <pin position="1" pad="PE6"/>
-            <pin position="2" pad="PE7"/>
-            <pin position="3" pad="UVCC"/>
-            <pin position="4" pad="D-"/>
-            <pin position="5" pad="D+"/>
-            <pin position="6" pad="UGND"/>
-            <pin position="7" pad="UCAP"/>
-            <pin position="8" pad="VBUS"/>
-            <pin position="9" pad="PE3"/>
-            <pin position="10" pad="PB0"/>
-            <pin position="11" pad="PB1"/>
-            <pin position="12" pad="PB2"/>
-            <pin position="13" pad="PB3"/>
-            <pin position="14" pad="PB4"/>
-            <pin position="15" pad="PB5"/>
-            <pin position="16" pad="PB6"/>
-            <pin position="17" pad="PB7"/>
-            <pin position="18" pad="PE4"/>
-            <pin position="19" pad="PE5"/>
-            <pin position="20" pad="RESET"/>
-            <pin position="21" pad="VCC"/>
-            <pin position="22" pad="GDN"/>
-            <pin position="23" pad="XTAL2"/>
-            <pin position="24" pad="XTAL1"/>
-            <pin position="25" pad="PD0"/>
-            <pin position="26" pad="PD1"/>
-            <pin position="27" pad="PD2"/>
-            <pin position="28" pad="PD3"/>
-            <pin position="29" pad="PD4"/>
-            <pin position="30" pad="PD5"/>
-            <pin position="31" pad="PD6"/>
-            <pin position="32" pad="PD7"/>
-            <pin position="33" pad="PE0"/>
-            <pin position="34" pad="PE1"/>
-            <pin position="35" pad="PC0"/>
-            <pin position="36" pad="PC1"/>
-            <pin position="37" pad="PC2"/>
-            <pin position="38" pad="PC3"/>
-            <pin position="39" pad="PC4"/>
-            <pin position="40" pad="PC5"/>
-            <pin position="41" pad="PC6"/>
-            <pin position="42" pad="PC7"/>
-            <pin position="43" pad="PE2"/>
-            <pin position="44" pad="PA7"/>
-            <pin position="45" pad="PA6"/>
-            <pin position="46" pad="PA5"/>
-            <pin position="47" pad="PA4"/>
-            <pin position="48" pad="PA3"/>
-            <pin position="49" pad="PA2"/>
-            <pin position="50" pad="PA1"/>
-            <pin position="51" pad="PA0"/>
-            <pin position="52" pad="VCC"/>
-            <pin position="53" pad="GND"/>
-            <pin position="54" pad="PF7"/>
-            <pin position="55" pad="PF6"/>
-            <pin position="56" pad="PF5"/>
-            <pin position="57" pad="PF4"/>
-            <pin position="58" pad="PF3"/>
-            <pin position="59" pad="PF2"/>
-            <pin position="60" pad="PF1"/>
-            <pin position="61" pad="PF0"/>
-            <pin position="62" pad="AREF"/>
-            <pin position="63" pad="GND"/>
-            <pin position="64" pad="AVCC"/>
+            <pin position="1" pad-key="pe6"/>
+            <pin position="2" pad-key="pe7"/>
+            <pin position="3" pad-key="uvcc"/>
+            <pin position="4" pad-key="d-"/>
+            <pin position="5" pad-key="d+"/>
+            <pin position="6" pad-key="ugnd"/>
+            <pin position="7" pad-key="ucap"/>
+            <pin position="8" pad-key="vbus"/>
+            <pin position="9" pad-key="pe3"/>
+            <pin position="10" pad-key="pb0"/>
+            <pin position="11" pad-key="pb1"/>
+            <pin position="12" pad-key="pb2"/>
+            <pin position="13" pad-key="pb3"/>
+            <pin position="14" pad-key="pb4"/>
+            <pin position="15" pad-key="pb5"/>
+            <pin position="16" pad-key="pb6"/>
+            <pin position="17" pad-key="pb7"/>
+            <pin position="18" pad-key="pe4"/>
+            <pin position="19" pad-key="pe5"/>
+            <pin position="20" pad-key="reset"/>
+            <pin position="21" pad-key="vcc"/>
+            <pin position="22" pad-key="gdn"/>
+            <pin position="23" pad-key="xtal2"/>
+            <pin position="24" pad-key="xtal1"/>
+            <pin position="25" pad-key="pd0"/>
+            <pin position="26" pad-key="pd1"/>
+            <pin position="27" pad-key="pd2"/>
+            <pin position="28" pad-key="pd3"/>
+            <pin position="29" pad-key="pd4"/>
+            <pin position="30" pad-key="pd5"/>
+            <pin position="31" pad-key="pd6"/>
+            <pin position="32" pad-key="pd7"/>
+            <pin position="33" pad-key="pe0"/>
+            <pin position="34" pad-key="pe1"/>
+            <pin position="35" pad-key="pc0"/>
+            <pin position="36" pad-key="pc1"/>
+            <pin position="37" pad-key="pc2"/>
+            <pin position="38" pad-key="pc3"/>
+            <pin position="39" pad-key="pc4"/>
+            <pin position="40" pad-key="pc5"/>
+            <pin position="41" pad-key="pc6"/>
+            <pin position="42" pad-key="pc7"/>
+            <pin position="43" pad-key="pe2"/>
+            <pin position="44" pad-key="pa7"/>
+            <pin position="45" pad-key="pa6"/>
+            <pin position="46" pad-key="pa5"/>
+            <pin position="47" pad-key="pa4"/>
+            <pin position="48" pad-key="pa3"/>
+            <pin position="49" pad-key="pa2"/>
+            <pin position="50" pad-key="pa1"/>
+            <pin position="51" pad-key="pa0"/>
+            <pin position="52" pad-key="vcc"/>
+            <pin position="53" pad-key="gnd"/>
+            <pin position="54" pad-key="pf7"/>
+            <pin position="55" pad-key="pf6"/>
+            <pin position="56" pad-key="pf5"/>
+            <pin position="57" pad-key="pf4"/>
+            <pin position="58" pad-key="pf3"/>
+            <pin position="59" pad-key="pf2"/>
+            <pin position="60" pad-key="pf1"/>
+            <pin position="61" pad-key="pf0"/>
+            <pin position="62" pad-key="aref"/>
+            <pin position="63" pad-key="gnd"/>
+            <pin position="64" pad-key="avcc"/>
         </pinout>
     </pinouts>
     <variants>
-        <variant name="AT90USB1287-AU" pinout-key="qfp_qfn_64" package="TQFP64"/>
-        <variant name="AT90USB1287-MU" pinout-key="qfp_qfn_64" package="VQFN64"/>
+        <variant key="at90usb1287_au" name="AT90USB1287-AU" pinout-key="qfp_qfn_64"/>
+        <variant key="at90usb1287_mu" name="AT90USB1287-MU" pinout-key="qfp_qfn_64"/>
     </variants>
 </device>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90USB162.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90USB162.xml
index d0a9e081..7c0c3682 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90USB162.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90USB162.xml
@@ -194,40 +194,38 @@
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pb2" index="2" function="PORTB" group="P"/>
-                <signal pad-id="pb3" index="3" function="PORTB" group="P"/>
-                <signal pad-id="pb4" index="4" function="PORTB" group="P"/>
-                <signal pad-id="pb5" index="5" function="PORTB" group="P"/>
-                <signal pad-id="pb6" index="6" function="PORTB" group="P"/>
-                <signal pad-id="pb7" index="7" function="PORTB" group="P"/>
+                <signal pad-key="pb0" index="0" function="PORTB" group="P"/>
+                <signal pad-key="pb1" index="1" function="PORTB" group="P"/>
+                <signal pad-key="pb2" index="2" function="PORTB" group="P"/>
+                <signal pad-key="pb3" index="3" function="PORTB" group="P"/>
+                <signal pad-key="pb4" index="4" function="PORTB" group="P"/>
+                <signal pad-key="pb5" index="5" function="PORTB" group="P"/>
+                <signal pad-key="pb6" index="6" function="PORTB" group="P"/>
+                <signal pad-key="pb7" index="7" function="PORTB" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pd2" index="2" function="PORTD" group="P"/>
-                <signal pad-id="pd3" index="3" function="PORTD" group="P"/>
-                <signal pad-id="pd4" index="4" function="PORTD" group="P"/>
-                <signal pad-id="pd5" index="5" function="PORTD" group="P"/>
-                <signal pad-id="pd6" index="6" function="PORTD" group="P"/>
-                <signal pad-id="pd7" index="7" function="PORTD" group="P"/>
+                <signal pad-key="pd0" index="0" function="PORTD" group="P"/>
+                <signal pad-key="pd1" index="1" function="PORTD" group="P"/>
+                <signal pad-key="pd2" index="2" function="PORTD" group="P"/>
+                <signal pad-key="pd3" index="3" function="PORTD" group="P"/>
+                <signal pad-key="pd4" index="4" function="PORTD" group="P"/>
+                <signal pad-key="pd5" index="5" function="PORTD" group="P"/>
+                <signal pad-key="pd6" index="6" function="PORTD" group="P"/>
+                <signal pad-key="pd7" index="7" function="PORTD" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pc2" index="2" function="PORTC" group="P"/>
-                <signal pad-id="pc3" index="3" function="PORTC" group="P"/>
-                <signal pad-id="pc4" index="4" function="PORTC" group="P"/>
-                <signal pad-id="pc5" index="5" function="PORTC" group="P"/>
-                <signal pad-id="pc6" index="6" function="PORTC" group="P"/>
-                <signal pad-id="pc7" index="7" function="PORTC" group="P"/>
+                <signal pad-key="pc0" index="0" function="PORTC" group="P"/>
+                <signal pad-key="pc2" index="2" function="PORTC" group="P"/>
+                <signal pad-key="pc4" index="4" function="PORTC" group="P"/>
+                <signal pad-key="pc5" index="5" function="PORTC" group="P"/>
+                <signal pad-key="pc6" index="6" function="PORTC" group="P"/>
+                <signal pad-key="pc7" index="7" function="PORTC" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="spi" name="SPI" module-key="spi">
@@ -744,44 +742,78 @@
             </register-group>
         </module>
     </modules>
+    <pads>
+        <pad key="xtal1" name="XTAL1"/>
+        <pad key="pc0" name="PC0"/>
+        <pad key="gnd" name="GND"/>
+        <pad key="vcc" name="VCC"/>
+        <pad key="pc2" name="PC2"/>
+        <pad key="pd0" name="PD0"/>
+        <pad key="pd1" name="PD1"/>
+        <pad key="pd2" name="PD2"/>
+        <pad key="pd3" name="PD3"/>
+        <pad key="pd4" name="PD4"/>
+        <pad key="pd5" name="PD5"/>
+        <pad key="pd6" name="PD6"/>
+        <pad key="pd7" name="PD7"/>
+        <pad key="pb0" name="PB0"/>
+        <pad key="pb1" name="PB1"/>
+        <pad key="pb2" name="PB2"/>
+        <pad key="pb3" name="PB3"/>
+        <pad key="pb4" name="PB4"/>
+        <pad key="pb5" name="PB5"/>
+        <pad key="pb6" name="PB6"/>
+        <pad key="pb7" name="PB7"/>
+        <pad key="pc7" name="PC7"/>
+        <pad key="pc6" name="PC6"/>
+        <pad key="reset" name="RESET"/>
+        <pad key="pc5" name="PC5"/>
+        <pad key="pc4" name="PC4"/>
+        <pad key="ucap" name="UCAP"/>
+        <pad key="ugnd" name="UGND"/>
+        <pad key="d+" name="D+"/>
+        <pad key="d-" name="D-"/>
+        <pad key="uvcc" name="UVCC"/>
+        <pad key="avcc" name="AVCC"/>
+    </pads>
     <pinouts>
         <pinout key="qfp_qfn_32" name="QFP_QFN_32" type="qfn">
-            <pin position="1" pad="XTAL1"/>
-            <pin position="2" pad="PC0"/>
-            <pin position="3" pad="GND"/>
-            <pin position="4" pad="VCC"/>
-            <pin position="5" pad="PC2"/>
-            <pin position="6" pad="PD0"/>
-            <pin position="7" pad="PD1"/>
-            <pin position="8" pad="PD2"/>
-            <pin position="9" pad="PD3"/>
-            <pin position="10" pad="PD4"/>
-            <pin position="11" pad="PD5"/>
-            <pin position="12" pad="PD6"/>
-            <pin position="13" pad="PD7"/>
-            <pin position="14" pad="PB0"/>
-            <pin position="15" pad="PB1"/>
-            <pin position="16" pad="PB2"/>
-            <pin position="17" pad="PB3"/>
-            <pin position="18" pad="PB4"/>
-            <pin position="19" pad="PB5"/>
-            <pin position="20" pad="PB6"/>
-            <pin position="21" pad="PB7"/>
-            <pin position="22" pad="PC7"/>
-            <pin position="23" pad="PC6"/>
-            <pin position="24" pad="RESET"/>
-            <pin position="25" pad="PC5"/>
-            <pin position="26" pad="PC4"/>
-            <pin position="27" pad="UCAP"/>
-            <pin position="28" pad="UGND"/>
-            <pin position="29" pad="D+"/>
-            <pin position="30" pad="D-"/>
-            <pin position="31" pad="UVCC"/>
-            <pin position="32" pad="AVCC"/>
+            <pin position="1" pad-key="xtal1"/>
+            <pin position="2" pad-key="pc0"/>
+            <pin position="3" pad-key="gnd"/>
+            <pin position="4" pad-key="vcc"/>
+            <pin position="5" pad-key="pc2"/>
+            <pin position="6" pad-key="pd0"/>
+            <pin position="7" pad-key="pd1"/>
+            <pin position="8" pad-key="pd2"/>
+            <pin position="9" pad-key="pd3"/>
+            <pin position="10" pad-key="pd4"/>
+            <pin position="11" pad-key="pd5"/>
+            <pin position="12" pad-key="pd6"/>
+            <pin position="13" pad-key="pd7"/>
+            <pin position="14" pad-key="pb0"/>
+            <pin position="15" pad-key="pb1"/>
+            <pin position="16" pad-key="pb2"/>
+            <pin position="17" pad-key="pb3"/>
+            <pin position="18" pad-key="pb4"/>
+            <pin position="19" pad-key="pb5"/>
+            <pin position="20" pad-key="pb6"/>
+            <pin position="21" pad-key="pb7"/>
+            <pin position="22" pad-key="pc7"/>
+            <pin position="23" pad-key="pc6"/>
+            <pin position="24" pad-key="reset"/>
+            <pin position="25" pad-key="pc5"/>
+            <pin position="26" pad-key="pc4"/>
+            <pin position="27" pad-key="ucap"/>
+            <pin position="28" pad-key="ugnd"/>
+            <pin position="29" pad-key="d+"/>
+            <pin position="30" pad-key="d-"/>
+            <pin position="31" pad-key="uvcc"/>
+            <pin position="32" pad-key="avcc"/>
         </pinout>
     </pinouts>
     <variants>
-        <variant name="AT90USB162-AU" pinout-key="qfp_qfn_32" package="TQFP32"/>
-        <variant name="AT90USB162-MU" pinout-key="qfp_qfn_32" package="VQFN32"/>
+        <variant key="at90usb162_au" name="AT90USB162-AU" pinout-key="qfp_qfn_32"/>
+        <variant key="at90usb162_mu" name="AT90USB162-MU" pinout-key="qfp_qfn_32"/>
     </variants>
 </device>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90USB646.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90USB646.xml
index 6c9f2354..29b15272 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90USB646.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90USB646.xml
@@ -198,79 +198,79 @@
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pa2" index="2" function="PORTA" group="P"/>
-                <signal pad-id="pa3" index="3" function="PORTA" group="P"/>
-                <signal pad-id="pa4" index="4" function="PORTA" group="P"/>
-                <signal pad-id="pa5" index="5" function="PORTA" group="P"/>
-                <signal pad-id="pa6" index="6" function="PORTA" group="P"/>
-                <signal pad-id="pa7" index="7" function="PORTA" group="P"/>
+                <signal pad-key="pa0" index="0" function="PORTA" group="P"/>
+                <signal pad-key="pa1" index="1" function="PORTA" group="P"/>
+                <signal pad-key="pa2" index="2" function="PORTA" group="P"/>
+                <signal pad-key="pa3" index="3" function="PORTA" group="P"/>
+                <signal pad-key="pa4" index="4" function="PORTA" group="P"/>
+                <signal pad-key="pa5" index="5" function="PORTA" group="P"/>
+                <signal pad-key="pa6" index="6" function="PORTA" group="P"/>
+                <signal pad-key="pa7" index="7" function="PORTA" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pb2" index="2" function="PORTB" group="P"/>
-                <signal pad-id="pb3" index="3" function="PORTB" group="P"/>
-                <signal pad-id="pb4" index="4" function="PORTB" group="P"/>
-                <signal pad-id="pb5" index="5" function="PORTB" group="P"/>
-                <signal pad-id="pb6" index="6" function="PORTB" group="P"/>
-                <signal pad-id="pb7" index="7" function="PORTB" group="P"/>
+                <signal pad-key="pb0" index="0" function="PORTB" group="P"/>
+                <signal pad-key="pb1" index="1" function="PORTB" group="P"/>
+                <signal pad-key="pb2" index="2" function="PORTB" group="P"/>
+                <signal pad-key="pb3" index="3" function="PORTB" group="P"/>
+                <signal pad-key="pb4" index="4" function="PORTB" group="P"/>
+                <signal pad-key="pb5" index="5" function="PORTB" group="P"/>
+                <signal pad-key="pb6" index="6" function="PORTB" group="P"/>
+                <signal pad-key="pb7" index="7" function="PORTB" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pc2" index="2" function="PORTC" group="P"/>
-                <signal pad-id="pc3" index="3" function="PORTC" group="P"/>
-                <signal pad-id="pc4" index="4" function="PORTC" group="P"/>
-                <signal pad-id="pc5" index="5" function="PORTC" group="P"/>
-                <signal pad-id="pc6" index="6" function="PORTC" group="P"/>
-                <signal pad-id="pc7" index="7" function="PORTC" group="P"/>
+                <signal pad-key="pc0" index="0" function="PORTC" group="P"/>
+                <signal pad-key="pc1" index="1" function="PORTC" group="P"/>
+                <signal pad-key="pc2" index="2" function="PORTC" group="P"/>
+                <signal pad-key="pc3" index="3" function="PORTC" group="P"/>
+                <signal pad-key="pc4" index="4" function="PORTC" group="P"/>
+                <signal pad-key="pc5" index="5" function="PORTC" group="P"/>
+                <signal pad-key="pc6" index="6" function="PORTC" group="P"/>
+                <signal pad-key="pc7" index="7" function="PORTC" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pd2" index="2" function="PORTD" group="P"/>
-                <signal pad-id="pd3" index="3" function="PORTD" group="P"/>
-                <signal pad-id="pd4" index="4" function="PORTD" group="P"/>
-                <signal pad-id="pd5" index="5" function="PORTD" group="P"/>
-                <signal pad-id="pd6" index="6" function="PORTD" group="P"/>
-                <signal pad-id="pd7" index="7" function="PORTD" group="P"/>
+                <signal pad-key="pd0" index="0" function="PORTD" group="P"/>
+                <signal pad-key="pd1" index="1" function="PORTD" group="P"/>
+                <signal pad-key="pd2" index="2" function="PORTD" group="P"/>
+                <signal pad-key="pd3" index="3" function="PORTD" group="P"/>
+                <signal pad-key="pd4" index="4" function="PORTD" group="P"/>
+                <signal pad-key="pd5" index="5" function="PORTD" group="P"/>
+                <signal pad-key="pd6" index="6" function="PORTD" group="P"/>
+                <signal pad-key="pd7" index="7" function="PORTD" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="porte" name="PORTE" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pe2" index="2" function="PORTE" group="P"/>
-                <signal pad-id="pe3" index="3" function="PORTE" group="P"/>
-                <signal pad-id="pe4" index="4" function="PORTE" group="P"/>
-                <signal pad-id="pe5" index="5" function="PORTE" group="P"/>
-                <signal pad-id="pe6" index="6" function="PORTE" group="P"/>
-                <signal pad-id="pe7" index="7" function="PORTE" group="P"/>
+                <signal pad-key="pe0" index="0" function="PORTE" group="P"/>
+                <signal pad-key="pe1" index="1" function="PORTE" group="P"/>
+                <signal pad-key="pe2" index="2" function="PORTE" group="P"/>
+                <signal pad-key="pe3" index="3" function="PORTE" group="P"/>
+                <signal pad-key="pe4" index="4" function="PORTE" group="P"/>
+                <signal pad-key="pe5" index="5" function="PORTE" group="P"/>
+                <signal pad-key="pe6" index="6" function="PORTE" group="P"/>
+                <signal pad-key="pe7" index="7" function="PORTE" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portf" name="PORTF" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pf2" index="2" function="PORTF" group="P"/>
-                <signal pad-id="pf3" index="3" function="PORTF" group="P"/>
-                <signal pad-id="pf4" index="4" function="PORTF" group="P"/>
-                <signal pad-id="pf5" index="5" function="PORTF" group="P"/>
-                <signal pad-id="pf6" index="6" function="PORTF" group="P"/>
-                <signal pad-id="pf7" index="7" function="PORTF" group="P"/>
+                <signal pad-key="pf0" index="0" function="PORTF" group="P"/>
+                <signal pad-key="pf1" index="1" function="PORTF" group="P"/>
+                <signal pad-key="pf2" index="2" function="PORTF" group="P"/>
+                <signal pad-key="pf3" index="3" function="PORTF" group="P"/>
+                <signal pad-key="pf4" index="4" function="PORTF" group="P"/>
+                <signal pad-key="pf5" index="5" function="PORTF" group="P"/>
+                <signal pad-key="pf6" index="6" function="PORTF" group="P"/>
+                <signal pad-key="pf7" index="7" function="PORTF" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="cpu">
@@ -1079,76 +1079,140 @@
             </register-group>
         </module>
     </modules>
+    <pads>
+        <pad key="pe6" name="PE6"/>
+        <pad key="pe7" name="PE7"/>
+        <pad key="uvcc" name="UVCC"/>
+        <pad key="d-" name="D-"/>
+        <pad key="d+" name="D+"/>
+        <pad key="ugnd" name="UGND"/>
+        <pad key="ucap" name="UCAP"/>
+        <pad key="vbus" name="VBUS"/>
+        <pad key="pe3" name="PE3"/>
+        <pad key="pb0" name="PB0"/>
+        <pad key="pb1" name="PB1"/>
+        <pad key="pb2" name="PB2"/>
+        <pad key="pb3" name="PB3"/>
+        <pad key="pb4" name="PB4"/>
+        <pad key="pb5" name="PB5"/>
+        <pad key="pb6" name="PB6"/>
+        <pad key="pb7" name="PB7"/>
+        <pad key="pe4" name="PE4"/>
+        <pad key="pe5" name="PE5"/>
+        <pad key="reset" name="RESET"/>
+        <pad key="vcc" name="VCC"/>
+        <pad key="gdn" name="GDN"/>
+        <pad key="xtal2" name="XTAL2"/>
+        <pad key="xtal1" name="XTAL1"/>
+        <pad key="pd0" name="PD0"/>
+        <pad key="pd1" name="PD1"/>
+        <pad key="pd2" name="PD2"/>
+        <pad key="pd3" name="PD3"/>
+        <pad key="pd4" name="PD4"/>
+        <pad key="pd5" name="PD5"/>
+        <pad key="pd6" name="PD6"/>
+        <pad key="pd7" name="PD7"/>
+        <pad key="pe0" name="PE0"/>
+        <pad key="pe1" name="PE1"/>
+        <pad key="pc0" name="PC0"/>
+        <pad key="pc1" name="PC1"/>
+        <pad key="pc2" name="PC2"/>
+        <pad key="pc3" name="PC3"/>
+        <pad key="pc4" name="PC4"/>
+        <pad key="pc5" name="PC5"/>
+        <pad key="pc6" name="PC6"/>
+        <pad key="pc7" name="PC7"/>
+        <pad key="pe2" name="PE2"/>
+        <pad key="pa7" name="PA7"/>
+        <pad key="pa6" name="PA6"/>
+        <pad key="pa5" name="PA5"/>
+        <pad key="pa4" name="PA4"/>
+        <pad key="pa3" name="PA3"/>
+        <pad key="pa2" name="PA2"/>
+        <pad key="pa1" name="PA1"/>
+        <pad key="pa0" name="PA0"/>
+        <pad key="gnd" name="GND"/>
+        <pad key="pf7" name="PF7"/>
+        <pad key="pf6" name="PF6"/>
+        <pad key="pf5" name="PF5"/>
+        <pad key="pf4" name="PF4"/>
+        <pad key="pf3" name="PF3"/>
+        <pad key="pf2" name="PF2"/>
+        <pad key="pf1" name="PF1"/>
+        <pad key="pf0" name="PF0"/>
+        <pad key="aref" name="AREF"/>
+        <pad key="avcc" name="AVCC"/>
+    </pads>
     <pinouts>
         <pinout key="qfp_qfn_64" name="QFP_QFN_64" type="qfn">
-            <pin position="1" pad="PE6"/>
-            <pin position="2" pad="PE7"/>
-            <pin position="3" pad="UVCC"/>
-            <pin position="4" pad="D-"/>
-            <pin position="5" pad="D+"/>
-            <pin position="6" pad="UGND"/>
-            <pin position="7" pad="UCAP"/>
-            <pin position="8" pad="VBUS"/>
-            <pin position="9" pad="PE3"/>
-            <pin position="10" pad="PB0"/>
-            <pin position="11" pad="PB1"/>
-            <pin position="12" pad="PB2"/>
-            <pin position="13" pad="PB3"/>
-            <pin position="14" pad="PB4"/>
-            <pin position="15" pad="PB5"/>
-            <pin position="16" pad="PB6"/>
-            <pin position="17" pad="PB7"/>
-            <pin position="18" pad="PE4"/>
-            <pin position="19" pad="PE5"/>
-            <pin position="20" pad="RESET"/>
-            <pin position="21" pad="VCC"/>
-            <pin position="22" pad="GDN"/>
-            <pin position="23" pad="XTAL2"/>
-            <pin position="24" pad="XTAL1"/>
-            <pin position="25" pad="PD0"/>
-            <pin position="26" pad="PD1"/>
-            <pin position="27" pad="PD2"/>
-            <pin position="28" pad="PD3"/>
-            <pin position="29" pad="PD4"/>
-            <pin position="30" pad="PD5"/>
-            <pin position="31" pad="PD6"/>
-            <pin position="32" pad="PD7"/>
-            <pin position="33" pad="PE0"/>
-            <pin position="34" pad="PE1"/>
-            <pin position="35" pad="PC0"/>
-            <pin position="36" pad="PC1"/>
-            <pin position="37" pad="PC2"/>
-            <pin position="38" pad="PC3"/>
-            <pin position="39" pad="PC4"/>
-            <pin position="40" pad="PC5"/>
-            <pin position="41" pad="PC6"/>
-            <pin position="42" pad="PC7"/>
-            <pin position="43" pad="PE2"/>
-            <pin position="44" pad="PA7"/>
-            <pin position="45" pad="PA6"/>
-            <pin position="46" pad="PA5"/>
-            <pin position="47" pad="PA4"/>
-            <pin position="48" pad="PA3"/>
-            <pin position="49" pad="PA2"/>
-            <pin position="50" pad="PA1"/>
-            <pin position="51" pad="PA0"/>
-            <pin position="52" pad="VCC"/>
-            <pin position="53" pad="GND"/>
-            <pin position="54" pad="PF7"/>
-            <pin position="55" pad="PF6"/>
-            <pin position="56" pad="PF5"/>
-            <pin position="57" pad="PF4"/>
-            <pin position="58" pad="PF3"/>
-            <pin position="59" pad="PF2"/>
-            <pin position="60" pad="PF1"/>
-            <pin position="61" pad="PF0"/>
-            <pin position="62" pad="AREF"/>
-            <pin position="63" pad="GND"/>
-            <pin position="64" pad="AVCC"/>
+            <pin position="1" pad-key="pe6"/>
+            <pin position="2" pad-key="pe7"/>
+            <pin position="3" pad-key="uvcc"/>
+            <pin position="4" pad-key="d-"/>
+            <pin position="5" pad-key="d+"/>
+            <pin position="6" pad-key="ugnd"/>
+            <pin position="7" pad-key="ucap"/>
+            <pin position="8" pad-key="vbus"/>
+            <pin position="9" pad-key="pe3"/>
+            <pin position="10" pad-key="pb0"/>
+            <pin position="11" pad-key="pb1"/>
+            <pin position="12" pad-key="pb2"/>
+            <pin position="13" pad-key="pb3"/>
+            <pin position="14" pad-key="pb4"/>
+            <pin position="15" pad-key="pb5"/>
+            <pin position="16" pad-key="pb6"/>
+            <pin position="17" pad-key="pb7"/>
+            <pin position="18" pad-key="pe4"/>
+            <pin position="19" pad-key="pe5"/>
+            <pin position="20" pad-key="reset"/>
+            <pin position="21" pad-key="vcc"/>
+            <pin position="22" pad-key="gdn"/>
+            <pin position="23" pad-key="xtal2"/>
+            <pin position="24" pad-key="xtal1"/>
+            <pin position="25" pad-key="pd0"/>
+            <pin position="26" pad-key="pd1"/>
+            <pin position="27" pad-key="pd2"/>
+            <pin position="28" pad-key="pd3"/>
+            <pin position="29" pad-key="pd4"/>
+            <pin position="30" pad-key="pd5"/>
+            <pin position="31" pad-key="pd6"/>
+            <pin position="32" pad-key="pd7"/>
+            <pin position="33" pad-key="pe0"/>
+            <pin position="34" pad-key="pe1"/>
+            <pin position="35" pad-key="pc0"/>
+            <pin position="36" pad-key="pc1"/>
+            <pin position="37" pad-key="pc2"/>
+            <pin position="38" pad-key="pc3"/>
+            <pin position="39" pad-key="pc4"/>
+            <pin position="40" pad-key="pc5"/>
+            <pin position="41" pad-key="pc6"/>
+            <pin position="42" pad-key="pc7"/>
+            <pin position="43" pad-key="pe2"/>
+            <pin position="44" pad-key="pa7"/>
+            <pin position="45" pad-key="pa6"/>
+            <pin position="46" pad-key="pa5"/>
+            <pin position="47" pad-key="pa4"/>
+            <pin position="48" pad-key="pa3"/>
+            <pin position="49" pad-key="pa2"/>
+            <pin position="50" pad-key="pa1"/>
+            <pin position="51" pad-key="pa0"/>
+            <pin position="52" pad-key="vcc"/>
+            <pin position="53" pad-key="gnd"/>
+            <pin position="54" pad-key="pf7"/>
+            <pin position="55" pad-key="pf6"/>
+            <pin position="56" pad-key="pf5"/>
+            <pin position="57" pad-key="pf4"/>
+            <pin position="58" pad-key="pf3"/>
+            <pin position="59" pad-key="pf2"/>
+            <pin position="60" pad-key="pf1"/>
+            <pin position="61" pad-key="pf0"/>
+            <pin position="62" pad-key="aref"/>
+            <pin position="63" pad-key="gnd"/>
+            <pin position="64" pad-key="avcc"/>
         </pinout>
     </pinouts>
     <variants>
-        <variant name="AT90USB646-AU" pinout-key="qfp_qfn_64" package="TQFP64"/>
-        <variant name="AT90USB646-MU" pinout-key="qfp_qfn_64" package="VQFN64"/>
+        <variant key="at90usb646_au" name="AT90USB646-AU" pinout-key="qfp_qfn_64"/>
+        <variant key="at90usb646_mu" name="AT90USB646-MU" pinout-key="qfp_qfn_64"/>
     </variants>
 </device>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90USB647.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90USB647.xml
index 9919f606..42e10ace 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90USB647.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90USB647.xml
@@ -198,79 +198,79 @@
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pa2" index="2" function="PORTA" group="P"/>
-                <signal pad-id="pa3" index="3" function="PORTA" group="P"/>
-                <signal pad-id="pa4" index="4" function="PORTA" group="P"/>
-                <signal pad-id="pa5" index="5" function="PORTA" group="P"/>
-                <signal pad-id="pa6" index="6" function="PORTA" group="P"/>
-                <signal pad-id="pa7" index="7" function="PORTA" group="P"/>
+                <signal pad-key="pa0" index="0" function="PORTA" group="P"/>
+                <signal pad-key="pa1" index="1" function="PORTA" group="P"/>
+                <signal pad-key="pa2" index="2" function="PORTA" group="P"/>
+                <signal pad-key="pa3" index="3" function="PORTA" group="P"/>
+                <signal pad-key="pa4" index="4" function="PORTA" group="P"/>
+                <signal pad-key="pa5" index="5" function="PORTA" group="P"/>
+                <signal pad-key="pa6" index="6" function="PORTA" group="P"/>
+                <signal pad-key="pa7" index="7" function="PORTA" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pb2" index="2" function="PORTB" group="P"/>
-                <signal pad-id="pb3" index="3" function="PORTB" group="P"/>
-                <signal pad-id="pb4" index="4" function="PORTB" group="P"/>
-                <signal pad-id="pb5" index="5" function="PORTB" group="P"/>
-                <signal pad-id="pb6" index="6" function="PORTB" group="P"/>
-                <signal pad-id="pb7" index="7" function="PORTB" group="P"/>
+                <signal pad-key="pb0" index="0" function="PORTB" group="P"/>
+                <signal pad-key="pb1" index="1" function="PORTB" group="P"/>
+                <signal pad-key="pb2" index="2" function="PORTB" group="P"/>
+                <signal pad-key="pb3" index="3" function="PORTB" group="P"/>
+                <signal pad-key="pb4" index="4" function="PORTB" group="P"/>
+                <signal pad-key="pb5" index="5" function="PORTB" group="P"/>
+                <signal pad-key="pb6" index="6" function="PORTB" group="P"/>
+                <signal pad-key="pb7" index="7" function="PORTB" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pc2" index="2" function="PORTC" group="P"/>
-                <signal pad-id="pc3" index="3" function="PORTC" group="P"/>
-                <signal pad-id="pc4" index="4" function="PORTC" group="P"/>
-                <signal pad-id="pc5" index="5" function="PORTC" group="P"/>
-                <signal pad-id="pc6" index="6" function="PORTC" group="P"/>
-                <signal pad-id="pc7" index="7" function="PORTC" group="P"/>
+                <signal pad-key="pc0" index="0" function="PORTC" group="P"/>
+                <signal pad-key="pc1" index="1" function="PORTC" group="P"/>
+                <signal pad-key="pc2" index="2" function="PORTC" group="P"/>
+                <signal pad-key="pc3" index="3" function="PORTC" group="P"/>
+                <signal pad-key="pc4" index="4" function="PORTC" group="P"/>
+                <signal pad-key="pc5" index="5" function="PORTC" group="P"/>
+                <signal pad-key="pc6" index="6" function="PORTC" group="P"/>
+                <signal pad-key="pc7" index="7" function="PORTC" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pd2" index="2" function="PORTD" group="P"/>
-                <signal pad-id="pd3" index="3" function="PORTD" group="P"/>
-                <signal pad-id="pd4" index="4" function="PORTD" group="P"/>
-                <signal pad-id="pd5" index="5" function="PORTD" group="P"/>
-                <signal pad-id="pd6" index="6" function="PORTD" group="P"/>
-                <signal pad-id="pd7" index="7" function="PORTD" group="P"/>
+                <signal pad-key="pd0" index="0" function="PORTD" group="P"/>
+                <signal pad-key="pd1" index="1" function="PORTD" group="P"/>
+                <signal pad-key="pd2" index="2" function="PORTD" group="P"/>
+                <signal pad-key="pd3" index="3" function="PORTD" group="P"/>
+                <signal pad-key="pd4" index="4" function="PORTD" group="P"/>
+                <signal pad-key="pd5" index="5" function="PORTD" group="P"/>
+                <signal pad-key="pd6" index="6" function="PORTD" group="P"/>
+                <signal pad-key="pd7" index="7" function="PORTD" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="porte" name="PORTE" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pe2" index="2" function="PORTE" group="P"/>
-                <signal pad-id="pe3" index="3" function="PORTE" group="P"/>
-                <signal pad-id="pe4" index="4" function="PORTE" group="P"/>
-                <signal pad-id="pe5" index="5" function="PORTE" group="P"/>
-                <signal pad-id="pe6" index="6" function="PORTE" group="P"/>
-                <signal pad-id="pe7" index="7" function="PORTE" group="P"/>
+                <signal pad-key="pe0" index="0" function="PORTE" group="P"/>
+                <signal pad-key="pe1" index="1" function="PORTE" group="P"/>
+                <signal pad-key="pe2" index="2" function="PORTE" group="P"/>
+                <signal pad-key="pe3" index="3" function="PORTE" group="P"/>
+                <signal pad-key="pe4" index="4" function="PORTE" group="P"/>
+                <signal pad-key="pe5" index="5" function="PORTE" group="P"/>
+                <signal pad-key="pe6" index="6" function="PORTE" group="P"/>
+                <signal pad-key="pe7" index="7" function="PORTE" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portf" name="PORTF" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pf2" index="2" function="PORTF" group="P"/>
-                <signal pad-id="pf3" index="3" function="PORTF" group="P"/>
-                <signal pad-id="pf4" index="4" function="PORTF" group="P"/>
-                <signal pad-id="pf5" index="5" function="PORTF" group="P"/>
-                <signal pad-id="pf6" index="6" function="PORTF" group="P"/>
-                <signal pad-id="pf7" index="7" function="PORTF" group="P"/>
+                <signal pad-key="pf0" index="0" function="PORTF" group="P"/>
+                <signal pad-key="pf1" index="1" function="PORTF" group="P"/>
+                <signal pad-key="pf2" index="2" function="PORTF" group="P"/>
+                <signal pad-key="pf3" index="3" function="PORTF" group="P"/>
+                <signal pad-key="pf4" index="4" function="PORTF" group="P"/>
+                <signal pad-key="pf5" index="5" function="PORTF" group="P"/>
+                <signal pad-key="pf6" index="6" function="PORTF" group="P"/>
+                <signal pad-key="pf7" index="7" function="PORTF" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="cpu">
@@ -1079,76 +1079,140 @@
             </register-group>
         </module>
     </modules>
+    <pads>
+        <pad key="pe6" name="PE6"/>
+        <pad key="pe7" name="PE7"/>
+        <pad key="uvcc" name="UVCC"/>
+        <pad key="d-" name="D-"/>
+        <pad key="d+" name="D+"/>
+        <pad key="ugnd" name="UGND"/>
+        <pad key="ucap" name="UCAP"/>
+        <pad key="vbus" name="VBUS"/>
+        <pad key="pe3" name="PE3"/>
+        <pad key="pb0" name="PB0"/>
+        <pad key="pb1" name="PB1"/>
+        <pad key="pb2" name="PB2"/>
+        <pad key="pb3" name="PB3"/>
+        <pad key="pb4" name="PB4"/>
+        <pad key="pb5" name="PB5"/>
+        <pad key="pb6" name="PB6"/>
+        <pad key="pb7" name="PB7"/>
+        <pad key="pe4" name="PE4"/>
+        <pad key="pe5" name="PE5"/>
+        <pad key="reset" name="RESET"/>
+        <pad key="vcc" name="VCC"/>
+        <pad key="gdn" name="GDN"/>
+        <pad key="xtal2" name="XTAL2"/>
+        <pad key="xtal1" name="XTAL1"/>
+        <pad key="pd0" name="PD0"/>
+        <pad key="pd1" name="PD1"/>
+        <pad key="pd2" name="PD2"/>
+        <pad key="pd3" name="PD3"/>
+        <pad key="pd4" name="PD4"/>
+        <pad key="pd5" name="PD5"/>
+        <pad key="pd6" name="PD6"/>
+        <pad key="pd7" name="PD7"/>
+        <pad key="pe0" name="PE0"/>
+        <pad key="pe1" name="PE1"/>
+        <pad key="pc0" name="PC0"/>
+        <pad key="pc1" name="PC1"/>
+        <pad key="pc2" name="PC2"/>
+        <pad key="pc3" name="PC3"/>
+        <pad key="pc4" name="PC4"/>
+        <pad key="pc5" name="PC5"/>
+        <pad key="pc6" name="PC6"/>
+        <pad key="pc7" name="PC7"/>
+        <pad key="pe2" name="PE2"/>
+        <pad key="pa7" name="PA7"/>
+        <pad key="pa6" name="PA6"/>
+        <pad key="pa5" name="PA5"/>
+        <pad key="pa4" name="PA4"/>
+        <pad key="pa3" name="PA3"/>
+        <pad key="pa2" name="PA2"/>
+        <pad key="pa1" name="PA1"/>
+        <pad key="pa0" name="PA0"/>
+        <pad key="gnd" name="GND"/>
+        <pad key="pf7" name="PF7"/>
+        <pad key="pf6" name="PF6"/>
+        <pad key="pf5" name="PF5"/>
+        <pad key="pf4" name="PF4"/>
+        <pad key="pf3" name="PF3"/>
+        <pad key="pf2" name="PF2"/>
+        <pad key="pf1" name="PF1"/>
+        <pad key="pf0" name="PF0"/>
+        <pad key="aref" name="AREF"/>
+        <pad key="avcc" name="AVCC"/>
+    </pads>
     <pinouts>
         <pinout key="qfp_qfn_64" name="QFP_QFN_64" type="qfn">
-            <pin position="1" pad="PE6"/>
-            <pin position="2" pad="PE7"/>
-            <pin position="3" pad="UVCC"/>
-            <pin position="4" pad="D-"/>
-            <pin position="5" pad="D+"/>
-            <pin position="6" pad="UGND"/>
-            <pin position="7" pad="UCAP"/>
-            <pin position="8" pad="VBUS"/>
-            <pin position="9" pad="PE3"/>
-            <pin position="10" pad="PB0"/>
-            <pin position="11" pad="PB1"/>
-            <pin position="12" pad="PB2"/>
-            <pin position="13" pad="PB3"/>
-            <pin position="14" pad="PB4"/>
-            <pin position="15" pad="PB5"/>
-            <pin position="16" pad="PB6"/>
-            <pin position="17" pad="PB7"/>
-            <pin position="18" pad="PE4"/>
-            <pin position="19" pad="PE5"/>
-            <pin position="20" pad="RESET"/>
-            <pin position="21" pad="VCC"/>
-            <pin position="22" pad="GDN"/>
-            <pin position="23" pad="XTAL2"/>
-            <pin position="24" pad="XTAL1"/>
-            <pin position="25" pad="PD0"/>
-            <pin position="26" pad="PD1"/>
-            <pin position="27" pad="PD2"/>
-            <pin position="28" pad="PD3"/>
-            <pin position="29" pad="PD4"/>
-            <pin position="30" pad="PD5"/>
-            <pin position="31" pad="PD6"/>
-            <pin position="32" pad="PD7"/>
-            <pin position="33" pad="PE0"/>
-            <pin position="34" pad="PE1"/>
-            <pin position="35" pad="PC0"/>
-            <pin position="36" pad="PC1"/>
-            <pin position="37" pad="PC2"/>
-            <pin position="38" pad="PC3"/>
-            <pin position="39" pad="PC4"/>
-            <pin position="40" pad="PC5"/>
-            <pin position="41" pad="PC6"/>
-            <pin position="42" pad="PC7"/>
-            <pin position="43" pad="PE2"/>
-            <pin position="44" pad="PA7"/>
-            <pin position="45" pad="PA6"/>
-            <pin position="46" pad="PA5"/>
-            <pin position="47" pad="PA4"/>
-            <pin position="48" pad="PA3"/>
-            <pin position="49" pad="PA2"/>
-            <pin position="50" pad="PA1"/>
-            <pin position="51" pad="PA0"/>
-            <pin position="52" pad="VCC"/>
-            <pin position="53" pad="GND"/>
-            <pin position="54" pad="PF7"/>
-            <pin position="55" pad="PF6"/>
-            <pin position="56" pad="PF5"/>
-            <pin position="57" pad="PF4"/>
-            <pin position="58" pad="PF3"/>
-            <pin position="59" pad="PF2"/>
-            <pin position="60" pad="PF1"/>
-            <pin position="61" pad="PF0"/>
-            <pin position="62" pad="AREF"/>
-            <pin position="63" pad="GND"/>
-            <pin position="64" pad="AVCC"/>
+            <pin position="1" pad-key="pe6"/>
+            <pin position="2" pad-key="pe7"/>
+            <pin position="3" pad-key="uvcc"/>
+            <pin position="4" pad-key="d-"/>
+            <pin position="5" pad-key="d+"/>
+            <pin position="6" pad-key="ugnd"/>
+            <pin position="7" pad-key="ucap"/>
+            <pin position="8" pad-key="vbus"/>
+            <pin position="9" pad-key="pe3"/>
+            <pin position="10" pad-key="pb0"/>
+            <pin position="11" pad-key="pb1"/>
+            <pin position="12" pad-key="pb2"/>
+            <pin position="13" pad-key="pb3"/>
+            <pin position="14" pad-key="pb4"/>
+            <pin position="15" pad-key="pb5"/>
+            <pin position="16" pad-key="pb6"/>
+            <pin position="17" pad-key="pb7"/>
+            <pin position="18" pad-key="pe4"/>
+            <pin position="19" pad-key="pe5"/>
+            <pin position="20" pad-key="reset"/>
+            <pin position="21" pad-key="vcc"/>
+            <pin position="22" pad-key="gdn"/>
+            <pin position="23" pad-key="xtal2"/>
+            <pin position="24" pad-key="xtal1"/>
+            <pin position="25" pad-key="pd0"/>
+            <pin position="26" pad-key="pd1"/>
+            <pin position="27" pad-key="pd2"/>
+            <pin position="28" pad-key="pd3"/>
+            <pin position="29" pad-key="pd4"/>
+            <pin position="30" pad-key="pd5"/>
+            <pin position="31" pad-key="pd6"/>
+            <pin position="32" pad-key="pd7"/>
+            <pin position="33" pad-key="pe0"/>
+            <pin position="34" pad-key="pe1"/>
+            <pin position="35" pad-key="pc0"/>
+            <pin position="36" pad-key="pc1"/>
+            <pin position="37" pad-key="pc2"/>
+            <pin position="38" pad-key="pc3"/>
+            <pin position="39" pad-key="pc4"/>
+            <pin position="40" pad-key="pc5"/>
+            <pin position="41" pad-key="pc6"/>
+            <pin position="42" pad-key="pc7"/>
+            <pin position="43" pad-key="pe2"/>
+            <pin position="44" pad-key="pa7"/>
+            <pin position="45" pad-key="pa6"/>
+            <pin position="46" pad-key="pa5"/>
+            <pin position="47" pad-key="pa4"/>
+            <pin position="48" pad-key="pa3"/>
+            <pin position="49" pad-key="pa2"/>
+            <pin position="50" pad-key="pa1"/>
+            <pin position="51" pad-key="pa0"/>
+            <pin position="52" pad-key="vcc"/>
+            <pin position="53" pad-key="gnd"/>
+            <pin position="54" pad-key="pf7"/>
+            <pin position="55" pad-key="pf6"/>
+            <pin position="56" pad-key="pf5"/>
+            <pin position="57" pad-key="pf4"/>
+            <pin position="58" pad-key="pf3"/>
+            <pin position="59" pad-key="pf2"/>
+            <pin position="60" pad-key="pf1"/>
+            <pin position="61" pad-key="pf0"/>
+            <pin position="62" pad-key="aref"/>
+            <pin position="63" pad-key="gnd"/>
+            <pin position="64" pad-key="avcc"/>
         </pinout>
     </pinouts>
     <variants>
-        <variant name="AT90USB647-AU" pinout-key="qfp_qfn_64" package="TQFP64"/>
-        <variant name="AT90USB647-MU" pinout-key="qfp_qfn_64" package="VQFN64"/>
+        <variant key="at90usb647_au" name="AT90USB647-AU" pinout-key="qfp_qfn_64"/>
+        <variant key="at90usb647_mu" name="AT90USB647-MU" pinout-key="qfp_qfn_64"/>
     </variants>
 </device>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90USB82.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90USB82.xml
index 49317ad1..4ba2e708 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90USB82.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90USB82.xml
@@ -194,40 +194,38 @@
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pb2" index="2" function="PORTB" group="P"/>
-                <signal pad-id="pb3" index="3" function="PORTB" group="P"/>
-                <signal pad-id="pb4" index="4" function="PORTB" group="P"/>
-                <signal pad-id="pb5" index="5" function="PORTB" group="P"/>
-                <signal pad-id="pb6" index="6" function="PORTB" group="P"/>
-                <signal pad-id="pb7" index="7" function="PORTB" group="P"/>
+                <signal pad-key="pb0" index="0" function="PORTB" group="P"/>
+                <signal pad-key="pb1" index="1" function="PORTB" group="P"/>
+                <signal pad-key="pb2" index="2" function="PORTB" group="P"/>
+                <signal pad-key="pb3" index="3" function="PORTB" group="P"/>
+                <signal pad-key="pb4" index="4" function="PORTB" group="P"/>
+                <signal pad-key="pb5" index="5" function="PORTB" group="P"/>
+                <signal pad-key="pb6" index="6" function="PORTB" group="P"/>
+                <signal pad-key="pb7" index="7" function="PORTB" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pd2" index="2" function="PORTD" group="P"/>
-                <signal pad-id="pd3" index="3" function="PORTD" group="P"/>
-                <signal pad-id="pd4" index="4" function="PORTD" group="P"/>
-                <signal pad-id="pd5" index="5" function="PORTD" group="P"/>
-                <signal pad-id="pd6" index="6" function="PORTD" group="P"/>
-                <signal pad-id="pd7" index="7" function="PORTD" group="P"/>
+                <signal pad-key="pd0" index="0" function="PORTD" group="P"/>
+                <signal pad-key="pd1" index="1" function="PORTD" group="P"/>
+                <signal pad-key="pd2" index="2" function="PORTD" group="P"/>
+                <signal pad-key="pd3" index="3" function="PORTD" group="P"/>
+                <signal pad-key="pd4" index="4" function="PORTD" group="P"/>
+                <signal pad-key="pd5" index="5" function="PORTD" group="P"/>
+                <signal pad-key="pd6" index="6" function="PORTD" group="P"/>
+                <signal pad-key="pd7" index="7" function="PORTD" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pc2" index="2" function="PORTC" group="P"/>
-                <signal pad-id="pc3" index="3" function="PORTC" group="P"/>
-                <signal pad-id="pc4" index="4" function="PORTC" group="P"/>
-                <signal pad-id="pc5" index="5" function="PORTC" group="P"/>
-                <signal pad-id="pc6" index="6" function="PORTC" group="P"/>
-                <signal pad-id="pc7" index="7" function="PORTC" group="P"/>
+                <signal pad-key="pc0" index="0" function="PORTC" group="P"/>
+                <signal pad-key="pc2" index="2" function="PORTC" group="P"/>
+                <signal pad-key="pc4" index="4" function="PORTC" group="P"/>
+                <signal pad-key="pc5" index="5" function="PORTC" group="P"/>
+                <signal pad-key="pc6" index="6" function="PORTC" group="P"/>
+                <signal pad-key="pc7" index="7" function="PORTC" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="spi" name="SPI" module-key="spi">
@@ -744,43 +742,77 @@
             </register-group>
         </module>
     </modules>
+    <pads>
+        <pad key="xtal1" name="XTAL1"/>
+        <pad key="pc0" name="PC0"/>
+        <pad key="gnd" name="GND"/>
+        <pad key="vcc" name="VCC"/>
+        <pad key="pc2" name="PC2"/>
+        <pad key="pd0" name="PD0"/>
+        <pad key="pd1" name="PD1"/>
+        <pad key="pd2" name="PD2"/>
+        <pad key="pd3" name="PD3"/>
+        <pad key="pd4" name="PD4"/>
+        <pad key="pd5" name="PD5"/>
+        <pad key="pd6" name="PD6"/>
+        <pad key="pd7" name="PD7"/>
+        <pad key="pb0" name="PB0"/>
+        <pad key="pb1" name="PB1"/>
+        <pad key="pb2" name="PB2"/>
+        <pad key="pb3" name="PB3"/>
+        <pad key="pb4" name="PB4"/>
+        <pad key="pb5" name="PB5"/>
+        <pad key="pb6" name="PB6"/>
+        <pad key="pb7" name="PB7"/>
+        <pad key="pc7" name="PC7"/>
+        <pad key="pc6" name="PC6"/>
+        <pad key="reset" name="RESET"/>
+        <pad key="pc5" name="PC5"/>
+        <pad key="pc4" name="PC4"/>
+        <pad key="ucap" name="UCAP"/>
+        <pad key="ugnd" name="UGND"/>
+        <pad key="d+" name="D+"/>
+        <pad key="d-" name="D-"/>
+        <pad key="uvcc" name="UVCC"/>
+        <pad key="avcc" name="AVCC"/>
+    </pads>
     <pinouts>
         <pinout key="qfn32" name="QFN32" type="qfn">
-            <pin position="1" pad="XTAL1"/>
-            <pin position="2" pad="PC0"/>
-            <pin position="3" pad="GND"/>
-            <pin position="4" pad="VCC"/>
-            <pin position="5" pad="PC2"/>
-            <pin position="6" pad="PD0"/>
-            <pin position="7" pad="PD1"/>
-            <pin position="8" pad="PD2"/>
-            <pin position="9" pad="PD3"/>
-            <pin position="10" pad="PD4"/>
-            <pin position="11" pad="PD5"/>
-            <pin position="12" pad="PD6"/>
-            <pin position="13" pad="PD7"/>
-            <pin position="14" pad="PB0"/>
-            <pin position="15" pad="PB1"/>
-            <pin position="16" pad="PB2"/>
-            <pin position="17" pad="PB3"/>
-            <pin position="18" pad="PB4"/>
-            <pin position="19" pad="PB5"/>
-            <pin position="20" pad="PB6"/>
-            <pin position="21" pad="PB7"/>
-            <pin position="22" pad="PC7"/>
-            <pin position="23" pad="PC6"/>
-            <pin position="24" pad="RESET"/>
-            <pin position="25" pad="PC5"/>
-            <pin position="26" pad="PC4"/>
-            <pin position="27" pad="UCAP"/>
-            <pin position="28" pad="UGND"/>
-            <pin position="29" pad="D+"/>
-            <pin position="30" pad="D-"/>
-            <pin position="31" pad="UVCC"/>
-            <pin position="32" pad="AVCC"/>
+            <pin position="1" pad-key="xtal1"/>
+            <pin position="2" pad-key="pc0"/>
+            <pin position="3" pad-key="gnd"/>
+            <pin position="4" pad-key="vcc"/>
+            <pin position="5" pad-key="pc2"/>
+            <pin position="6" pad-key="pd0"/>
+            <pin position="7" pad-key="pd1"/>
+            <pin position="8" pad-key="pd2"/>
+            <pin position="9" pad-key="pd3"/>
+            <pin position="10" pad-key="pd4"/>
+            <pin position="11" pad-key="pd5"/>
+            <pin position="12" pad-key="pd6"/>
+            <pin position="13" pad-key="pd7"/>
+            <pin position="14" pad-key="pb0"/>
+            <pin position="15" pad-key="pb1"/>
+            <pin position="16" pad-key="pb2"/>
+            <pin position="17" pad-key="pb3"/>
+            <pin position="18" pad-key="pb4"/>
+            <pin position="19" pad-key="pb5"/>
+            <pin position="20" pad-key="pb6"/>
+            <pin position="21" pad-key="pb7"/>
+            <pin position="22" pad-key="pc7"/>
+            <pin position="23" pad-key="pc6"/>
+            <pin position="24" pad-key="reset"/>
+            <pin position="25" pad-key="pc5"/>
+            <pin position="26" pad-key="pc4"/>
+            <pin position="27" pad-key="ucap"/>
+            <pin position="28" pad-key="ugnd"/>
+            <pin position="29" pad-key="d+"/>
+            <pin position="30" pad-key="d-"/>
+            <pin position="31" pad-key="uvcc"/>
+            <pin position="32" pad-key="avcc"/>
         </pinout>
     </pinouts>
     <variants>
-        <variant name="AT90USB82-MU" pinout-key="qfn32" package="VQFN32"/>
+        <variant key="at90usb82_mu" name="AT90USB82-MU" pinout-key="qfn32"/>
     </variants>
 </device>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA128.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA128.xml
index 2aa6864a..a5f555da 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA128.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA128.xml
@@ -195,40 +195,40 @@
         <peripheral key="ac" name="AC" module-key="ac">
             <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"/>
+                <signal pad-key="pe3" index="1" function="default" group="AIN"/>
+                <signal pad-key="pe2" index="0" function="default" group="AIN"/>
             </signals>
         </peripheral>
         <peripheral key="spi" name="SPI" module-key="spi">
             <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"/>
-                <signal pad-id="pb1" function="default" group="SCK"/>
-                <signal pad-id="pb0" function="default" group="SS"/>
+                <signal pad-key="pb3" function="default" group="MISO"/>
+                <signal pad-key="pb2" function="default" group="MOSI"/>
+                <signal pad-key="pb1" function="default" group="SCK"/>
+                <signal pad-key="pb0" function="default" group="SS"/>
             </signals>
         </peripheral>
         <peripheral key="twi" name="TWI" module-key="twi">
             <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"/>
+                <signal pad-key="pd1" function="default" group="SDA"/>
+                <signal pad-key="pd0" function="default" group="SCL"/>
             </signals>
         </peripheral>
         <peripheral key="usart0" name="USART0" module-key="usart">
             <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"/>
-                <signal pad-id="pe0" function="default" group="RXD"/>
+                <signal pad-key="pe2" function="default" group="XCK"/>
+                <signal pad-key="pe1" function="default" group="TXD"/>
+                <signal pad-key="pe0" function="default" group="RXD"/>
             </signals>
         </peripheral>
         <peripheral key="usart1" name="USART1" module-key="usart">
             <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"/>
-                <signal pad-id="pd2" function="default" group="RXD"/>
+                <signal pad-key="pd5" function="default" group="XCK"/>
+                <signal pad-key="pd3" function="default" group="TXD"/>
+                <signal pad-key="pd2" function="default" group="RXD"/>
             </signals>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="cpu">
@@ -240,49 +240,49 @@
         <peripheral key="jtag" name="JTAG" module-key="jtag">
             <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"/>
-                <signal pad-id="pf5" function="default" group="TMS"/>
-                <signal pad-id="pf4" function="default" group="TCK"/>
+                <signal pad-key="pf7" function="default" group="TDI"/>
+                <signal pad-key="pf6" function="default" group="TDO"/>
+                <signal pad-key="pf5" function="default" group="TMS"/>
+                <signal pad-key="pf4" function="default" group="TCK"/>
             </signals>
         </peripheral>
         <peripheral key="misc" name="MISC" module-key="misc">
             <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"/>
-                <signal pad-id="pa5" index="5" function="default" group="AD"/>
-                <signal pad-id="pa4" index="4" function="default" group="AD"/>
-                <signal pad-id="pa3" index="3" function="default" group="AD"/>
-                <signal pad-id="pa2" index="2" function="default" group="AD"/>
-                <signal pad-id="pa1" index="1" function="default" group="AD"/>
-                <signal pad-id="pa0" index="0" function="default" group="AD"/>
-                <signal pad-id="pc7" index="15" function="default" group="A"/>
-                <signal pad-id="pc6" index="14" function="default" group="A"/>
-                <signal pad-id="pc5" index="13" function="default" group="A"/>
-                <signal pad-id="pc4" index="12" function="default" group="A"/>
-                <signal pad-id="pc3" index="11" function="default" group="A"/>
-                <signal pad-id="pc2" index="10" function="default" group="A"/>
-                <signal pad-id="pc1" index="9" function="default" group="A"/>
-                <signal pad-id="pc0" index="8" function="default" group="A"/>
-                <signal pad-id="pe1" function="default" group="PDO"/>
-                <signal pad-id="pe0" function="default" group="PDI"/>
-                <signal pad-id="pg2" function="default" group="ALE"/>
-                <signal pad-id="pg1" function="default" group="RD"/>
-                <signal pad-id="pg0" function="default" group="WR"/>
+                <signal pad-key="pa7" index="7" function="default" group="AD"/>
+                <signal pad-key="pa6" index="6" function="default" group="AD"/>
+                <signal pad-key="pa5" index="5" function="default" group="AD"/>
+                <signal pad-key="pa4" index="4" function="default" group="AD"/>
+                <signal pad-key="pa3" index="3" function="default" group="AD"/>
+                <signal pad-key="pa2" index="2" function="default" group="AD"/>
+                <signal pad-key="pa1" index="1" function="default" group="AD"/>
+                <signal pad-key="pa0" index="0" function="default" group="AD"/>
+                <signal pad-key="pc7" index="15" function="default" group="A"/>
+                <signal pad-key="pc6" index="14" function="default" group="A"/>
+                <signal pad-key="pc5" index="13" function="default" group="A"/>
+                <signal pad-key="pc4" index="12" function="default" group="A"/>
+                <signal pad-key="pc3" index="11" function="default" group="A"/>
+                <signal pad-key="pc2" index="10" function="default" group="A"/>
+                <signal pad-key="pc1" index="9" function="default" group="A"/>
+                <signal pad-key="pc0" index="8" function="default" group="A"/>
+                <signal pad-key="pe1" function="default" group="PDO"/>
+                <signal pad-key="pe0" function="default" group="PDI"/>
+                <signal pad-key="pg2" function="default" group="ALE"/>
+                <signal pad-key="pg1" function="default" group="RD"/>
+                <signal pad-key="pg0" function="default" group="WR"/>
             </signals>
         </peripheral>
         <peripheral key="exint" name="EXINT" module-key="exint">
             <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"/>
-                <signal pad-id="pe5" index="5" function="default" group="INT"/>
-                <signal pad-id="pe4" index="4" function="default" group="INT"/>
-                <signal pad-id="pd3" index="3" function="default" group="INT"/>
-                <signal pad-id="pd2" index="2" function="default" group="INT"/>
-                <signal pad-id="pd1" index="1" function="default" group="INT"/>
-                <signal pad-id="pd0" index="0" function="default" group="INT"/>
+                <signal pad-key="pe7" index="7" function="default" group="INT"/>
+                <signal pad-key="pe6" index="6" function="default" group="INT"/>
+                <signal pad-key="pe5" index="5" function="default" group="INT"/>
+                <signal pad-key="pe4" index="4" function="default" group="INT"/>
+                <signal pad-key="pd3" index="3" function="default" group="INT"/>
+                <signal pad-key="pd2" index="2" function="default" group="INT"/>
+                <signal pad-key="pd1" index="1" function="default" group="INT"/>
+                <signal pad-key="pd0" index="0" function="default" group="INT"/>
             </signals>
         </peripheral>
         <peripheral key="eeprom" name="EEPROM" module-key="eeprom">
@@ -291,124 +291,124 @@
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pa2" index="2" function="default" group="P"/>
-                <signal pad-id="pa3" index="3" function="default" group="P"/>
-                <signal pad-id="pa4" index="4" function="default" group="P"/>
-                <signal pad-id="pa5" index="5" function="default" group="P"/>
-                <signal pad-id="pa6" index="6" function="default" group="P"/>
-                <signal pad-id="pa7" index="7" function="default" group="P"/>
+                <signal pad-key="pa0" index="0" function="default" group="P"/>
+                <signal pad-key="pa1" index="1" function="default" group="P"/>
+                <signal pad-key="pa2" index="2" function="default" group="P"/>
+                <signal pad-key="pa3" index="3" function="default" group="P"/>
+                <signal pad-key="pa4" index="4" function="default" group="P"/>
+                <signal pad-key="pa5" index="5" function="default" group="P"/>
+                <signal pad-key="pa6" index="6" function="default" group="P"/>
+                <signal pad-key="pa7" index="7" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pb2" index="2" function="default" group="P"/>
-                <signal pad-id="pb3" index="3" function="default" group="P"/>
-                <signal pad-id="pb4" index="4" function="default" group="P"/>
-                <signal pad-id="pb5" index="5" function="default" group="P"/>
-                <signal pad-id="pb6" index="6" function="default" group="P"/>
-                <signal pad-id="pb7" index="7" function="default" group="P"/>
+                <signal pad-key="pb0" index="0" function="default" group="P"/>
+                <signal pad-key="pb1" index="1" function="default" group="P"/>
+                <signal pad-key="pb2" index="2" function="default" group="P"/>
+                <signal pad-key="pb3" index="3" function="default" group="P"/>
+                <signal pad-key="pb4" index="4" function="default" group="P"/>
+                <signal pad-key="pb5" index="5" function="default" group="P"/>
+                <signal pad-key="pb6" index="6" function="default" group="P"/>
+                <signal pad-key="pb7" index="7" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pc2" index="2" function="default" group="P"/>
-                <signal pad-id="pc3" index="3" function="default" group="P"/>
-                <signal pad-id="pc4" index="4" function="default" group="P"/>
-                <signal pad-id="pc5" index="5" function="default" group="P"/>
-                <signal pad-id="pc6" index="6" function="default" group="P"/>
-                <signal pad-id="pc7" index="7" function="default" group="P"/>
+                <signal pad-key="pc0" index="0" function="default" group="P"/>
+                <signal pad-key="pc1" index="1" function="default" group="P"/>
+                <signal pad-key="pc2" index="2" function="default" group="P"/>
+                <signal pad-key="pc3" index="3" function="default" group="P"/>
+                <signal pad-key="pc4" index="4" function="default" group="P"/>
+                <signal pad-key="pc5" index="5" function="default" group="P"/>
+                <signal pad-key="pc6" index="6" function="default" group="P"/>
+                <signal pad-key="pc7" index="7" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pd2" index="2" function="default" group="P"/>
-                <signal pad-id="pd3" index="3" function="default" group="P"/>
-                <signal pad-id="pd4" index="4" function="default" group="P"/>
-                <signal pad-id="pd5" index="5" function="default" group="P"/>
-                <signal pad-id="pd6" index="6" function="default" group="P"/>
-                <signal pad-id="pd7" index="7" function="default" group="P"/>
+                <signal pad-key="pd0" index="0" function="default" group="P"/>
+                <signal pad-key="pd1" index="1" function="default" group="P"/>
+                <signal pad-key="pd2" index="2" function="default" group="P"/>
+                <signal pad-key="pd3" index="3" function="default" group="P"/>
+                <signal pad-key="pd4" index="4" function="default" group="P"/>
+                <signal pad-key="pd5" index="5" function="default" group="P"/>
+                <signal pad-key="pd6" index="6" function="default" group="P"/>
+                <signal pad-key="pd7" index="7" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="porte" name="PORTE" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pe2" index="2" function="default" group="P"/>
-                <signal pad-id="pe3" index="3" function="default" group="P"/>
-                <signal pad-id="pe4" index="4" function="default" group="P"/>
-                <signal pad-id="pe5" index="5" function="default" group="P"/>
-                <signal pad-id="pe6" index="6" function="default" group="P"/>
-                <signal pad-id="pe7" index="7" function="default" group="P"/>
+                <signal pad-key="pe0" index="0" function="default" group="P"/>
+                <signal pad-key="pe1" index="1" function="default" group="P"/>
+                <signal pad-key="pe2" index="2" function="default" group="P"/>
+                <signal pad-key="pe3" index="3" function="default" group="P"/>
+                <signal pad-key="pe4" index="4" function="default" group="P"/>
+                <signal pad-key="pe5" index="5" function="default" group="P"/>
+                <signal pad-key="pe6" index="6" function="default" group="P"/>
+                <signal pad-key="pe7" index="7" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portf" name="PORTF" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pf2" index="2" function="default" group="P"/>
-                <signal pad-id="pf3" index="3" function="default" group="P"/>
-                <signal pad-id="pf4" index="4" function="default" group="P"/>
-                <signal pad-id="pf5" index="5" function="default" group="P"/>
-                <signal pad-id="pf6" index="6" function="default" group="P"/>
-                <signal pad-id="pf7" index="7" function="default" group="P"/>
+                <signal pad-key="pf0" index="0" function="default" group="P"/>
+                <signal pad-key="pf1" index="1" function="default" group="P"/>
+                <signal pad-key="pf2" index="2" function="default" group="P"/>
+                <signal pad-key="pf3" index="3" function="default" group="P"/>
+                <signal pad-key="pf4" index="4" function="default" group="P"/>
+                <signal pad-key="pf5" index="5" function="default" group="P"/>
+                <signal pad-key="pf6" index="6" function="default" group="P"/>
+                <signal pad-key="pf7" index="7" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portg" name="PORTG" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pg2" index="2" function="default" group="P"/>
-                <signal pad-id="pg3" index="3" function="default" group="P"/>
-                <signal pad-id="pg4" index="4" function="default" group="P"/>
+                <signal pad-key="pg0" index="0" function="default" group="P"/>
+                <signal pad-key="pg1" index="1" function="default" group="P"/>
+                <signal pad-key="pg2" index="2" function="default" group="P"/>
+                <signal pad-key="pg3" index="3" function="default" group="P"/>
+                <signal pad-key="pg4" index="4" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="tc0" name="TC0" module-key="tc8_async">
             <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"/>
-                <signal pad-id="pg3" index="2" function="default" group="TOSC"/>
+                <signal pad-key="pb4" function="default" group="OC"/>
+                <signal pad-key="pg4" index="1" function="default" group="TOSC"/>
+                <signal pad-key="pg3" index="2" function="default" group="TOSC"/>
             </signals>
         </peripheral>
         <peripheral key="tc1" name="TC1" module-key="tc16">
             <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"/>
-                <signal pad-id="pb5" function="default" group="OCA"/>
-                <signal pad-id="pd6" function="default" group="T"/>
-                <signal pad-id="pd4" function="default" group="ICP"/>
+                <signal pad-key="pb7" function="default" group="OCC"/>
+                <signal pad-key="pb6" function="default" group="OCB"/>
+                <signal pad-key="pb5" function="default" group="OCA"/>
+                <signal pad-key="pd6" function="default" group="T"/>
+                <signal pad-key="pd4" function="default" group="ICP"/>
             </signals>
         </peripheral>
         <peripheral key="tc3" name="TC3" module-key="tc16">
             <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"/>
-                <signal pad-id="pe5" function="default" group="OCC"/>
-                <signal pad-id="pe4" function="default" group="OCB"/>
-                <signal pad-id="pe3" function="default" group="OCA"/>
+                <signal pad-key="pe7" function="default" group="ICP"/>
+                <signal pad-key="pe6" function="default" group="T"/>
+                <signal pad-key="pe5" function="default" group="OCC"/>
+                <signal pad-key="pe4" function="default" group="OCB"/>
+                <signal pad-key="pe3" function="default" group="OCA"/>
             </signals>
         </peripheral>
         <peripheral key="tc2" name="TC2" module-key="tc8">
             <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"/>
+                <signal pad-key="pb7" function="default" group="OC"/>
+                <signal pad-key="pd7" function="default" group="T"/>
             </signals>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="wdt">
@@ -417,14 +417,14 @@
         <peripheral key="adc" name="ADC" module-key="adc">
             <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"/>
-                <signal pad-id="pf5" index="5" function="default" group="ADC"/>
-                <signal pad-id="pf4" index="4" function="default" group="ADC"/>
-                <signal pad-id="pf3" index="3" function="default" group="ADC"/>
-                <signal pad-id="pf2" index="2" function="default" group="ADC"/>
-                <signal pad-id="pf1" index="1" function="default" group="ADC"/>
-                <signal pad-id="pf0" index="0" function="default" group="ADC"/>
+                <signal pad-key="pf7" index="7" function="default" group="ADC"/>
+                <signal pad-key="pf6" index="6" function="default" group="ADC"/>
+                <signal pad-key="pf5" index="5" function="default" group="ADC"/>
+                <signal pad-key="pf4" index="4" function="default" group="ADC"/>
+                <signal pad-key="pf3" index="3" function="default" group="ADC"/>
+                <signal pad-key="pf2" index="2" function="default" group="ADC"/>
+                <signal pad-key="pf1" index="1" function="default" group="ADC"/>
+                <signal pad-key="pf0" index="0" function="default" group="ADC"/>
             </signals>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="fuse">
@@ -923,82 +923,145 @@
             </register-group>
         </module>
     </modules>
+    <pads>
+        <pad key="pen" name="PEN"/>
+        <pad key="pe0" name="PE0"/>
+        <pad key="pe1" name="PE1"/>
+        <pad key="pe2" name="PE2"/>
+        <pad key="pe3" name="PE3"/>
+        <pad key="pe4" name="PE4"/>
+        <pad key="pe5" name="PE5"/>
+        <pad key="pe6" name="PE6"/>
+        <pad key="pe7" name="PE7"/>
+        <pad key="pb0" name="PB0"/>
+        <pad key="pb1" name="PB1"/>
+        <pad key="pb2" name="PB2"/>
+        <pad key="pb3" name="PB3"/>
+        <pad key="pb4" name="PB4"/>
+        <pad key="pb5" name="PB5"/>
+        <pad key="pb6" name="PB6"/>
+        <pad key="pb7" name="PB7"/>
+        <pad key="pg3" name="PG3"/>
+        <pad key="pg4" name="PG4"/>
+        <pad key="reset" name="RESET"/>
+        <pad key="vcc" name="VCC"/>
+        <pad key="gnd" name="GND"/>
+        <pad key="xtal2" name="XTAL2"/>
+        <pad key="xtal1" name="XTAL1"/>
+        <pad key="pd0" name="PD0"/>
+        <pad key="pd1" name="PD1"/>
+        <pad key="pd2" name="PD2"/>
+        <pad key="pd3" name="PD3"/>
+        <pad key="pd4" name="PD4"/>
+        <pad key="pd5" name="PD5"/>
+        <pad key="pd6" name="PD6"/>
+        <pad key="pd7" name="PD7"/>
+        <pad key="pg0" name="PG0"/>
+        <pad key="pg1" name="PG1"/>
+        <pad key="pc0" name="PC0"/>
+        <pad key="pc1" name="PC1"/>
+        <pad key="pc2" name="PC2"/>
+        <pad key="pc3" name="PC3"/>
+        <pad key="pc4" name="PC4"/>
+        <pad key="pc5" name="PC5"/>
+        <pad key="pc6" name="PC6"/>
+        <pad key="pc7" name="PC7"/>
+        <pad key="pg2" name="PG2"/>
+        <pad key="pa7" name="PA7"/>
+        <pad key="pa6" name="PA6"/>
+        <pad key="pa5" name="PA5"/>
+        <pad key="pa4" name="PA4"/>
+        <pad key="pa3" name="PA3"/>
+        <pad key="pa2" name="PA2"/>
+        <pad key="pa1" name="PA1"/>
+        <pad key="pa0" name="PA0"/>
+        <pad key="pf7" name="PF7"/>
+        <pad key="pf6" name="PF6"/>
+        <pad key="pf5" name="PF5"/>
+        <pad key="pf4" name="PF4"/>
+        <pad key="pf3" name="PF3"/>
+        <pad key="pf2" name="PF2"/>
+        <pad key="pf1" name="PF1"/>
+        <pad key="pf0" name="PF0"/>
+        <pad key="aref" name="AREF"/>
+        <pad key="avcc" name="AVCC"/>
+    </pads>
     <pinouts>
         <pinout key="tqfpqfn64" name="TQFPQFN64" type="qfn">
-            <pin position="1" pad="PEN"/>
-            <pin position="2" pad="PE0"/>
-            <pin position="3" pad="PE1"/>
-            <pin position="4" pad="PE2"/>
-            <pin position="5" pad="PE3"/>
-            <pin position="6" pad="PE4"/>
-            <pin position="7" pad="PE5"/>
-            <pin position="8" pad="PE6"/>
-            <pin position="9" pad="PE7"/>
-            <pin position="10" pad="PB0"/>
-            <pin position="11" pad="PB1"/>
-            <pin position="12" pad="PB2"/>
-            <pin position="13" pad="PB3"/>
-            <pin position="14" pad="PB4"/>
-            <pin position="15" pad="PB5"/>
-            <pin position="16" pad="PB6"/>
-            <pin position="17" pad="PB7"/>
-            <pin position="18" pad="PG3"/>
-            <pin position="19" pad="PG4"/>
-            <pin position="20" pad="RESET"/>
-            <pin position="21" pad="VCC"/>
-            <pin position="22" pad="GND"/>
-            <pin position="23" pad="XTAL2"/>
-            <pin position="24" pad="XTAL1"/>
-            <pin position="25" pad="PD0"/>
-            <pin position="26" pad="PD1"/>
-            <pin position="27" pad="PD2"/>
-            <pin position="28" pad="PD3"/>
-            <pin position="29" pad="PD4"/>
-            <pin position="30" pad="PD5"/>
-            <pin position="31" pad="PD6"/>
-            <pin position="32" pad="PD7"/>
-            <pin position="33" pad="PG0"/>
-            <pin position="34" pad="PG1"/>
-            <pin position="35" pad="PC0"/>
-            <pin position="36" pad="PC1"/>
-            <pin position="37" pad="PC2"/>
-            <pin position="38" pad="PC3"/>
-            <pin position="39" pad="PC4"/>
-            <pin position="40" pad="PC5"/>
-            <pin position="41" pad="PC6"/>
-            <pin position="42" pad="PC7"/>
-            <pin position="43" pad="PG2"/>
-            <pin position="44" pad="PA7"/>
-            <pin position="45" pad="PA6"/>
-            <pin position="46" pad="PA5"/>
-            <pin position="47" pad="PA4"/>
-            <pin position="48" pad="PA3"/>
-            <pin position="49" pad="PA2"/>
-            <pin position="50" pad="PA1"/>
-            <pin position="51" pad="PA0"/>
-            <pin position="52" pad="VCC"/>
-            <pin position="53" pad="GND"/>
-            <pin position="54" pad="PF7"/>
-            <pin position="55" pad="PF6"/>
-            <pin position="56" pad="PF5"/>
-            <pin position="57" pad="PF4"/>
-            <pin position="58" pad="PF3"/>
-            <pin position="59" pad="PF2"/>
-            <pin position="60" pad="PF1"/>
-            <pin position="61" pad="PF0"/>
-            <pin position="62" pad="AREF"/>
-            <pin position="63" pad="GND"/>
-            <pin position="64" pad="AVCC"/>
+            <pin position="1" pad-key="pen"/>
+            <pin position="2" pad-key="pe0"/>
+            <pin position="3" pad-key="pe1"/>
+            <pin position="4" pad-key="pe2"/>
+            <pin position="5" pad-key="pe3"/>
+            <pin position="6" pad-key="pe4"/>
+            <pin position="7" pad-key="pe5"/>
+            <pin position="8" pad-key="pe6"/>
+            <pin position="9" pad-key="pe7"/>
+            <pin position="10" pad-key="pb0"/>
+            <pin position="11" pad-key="pb1"/>
+            <pin position="12" pad-key="pb2"/>
+            <pin position="13" pad-key="pb3"/>
+            <pin position="14" pad-key="pb4"/>
+            <pin position="15" pad-key="pb5"/>
+            <pin position="16" pad-key="pb6"/>
+            <pin position="17" pad-key="pb7"/>
+            <pin position="18" pad-key="pg3"/>
+            <pin position="19" pad-key="pg4"/>
+            <pin position="20" pad-key="reset"/>
+            <pin position="21" pad-key="vcc"/>
+            <pin position="22" pad-key="gnd"/>
+            <pin position="23" pad-key="xtal2"/>
+            <pin position="24" pad-key="xtal1"/>
+            <pin position="25" pad-key="pd0"/>
+            <pin position="26" pad-key="pd1"/>
+            <pin position="27" pad-key="pd2"/>
+            <pin position="28" pad-key="pd3"/>
+            <pin position="29" pad-key="pd4"/>
+            <pin position="30" pad-key="pd5"/>
+            <pin position="31" pad-key="pd6"/>
+            <pin position="32" pad-key="pd7"/>
+            <pin position="33" pad-key="pg0"/>
+            <pin position="34" pad-key="pg1"/>
+            <pin position="35" pad-key="pc0"/>
+            <pin position="36" pad-key="pc1"/>
+            <pin position="37" pad-key="pc2"/>
+            <pin position="38" pad-key="pc3"/>
+            <pin position="39" pad-key="pc4"/>
+            <pin position="40" pad-key="pc5"/>
+            <pin position="41" pad-key="pc6"/>
+            <pin position="42" pad-key="pc7"/>
+            <pin position="43" pad-key="pg2"/>
+            <pin position="44" pad-key="pa7"/>
+            <pin position="45" pad-key="pa6"/>
+            <pin position="46" pad-key="pa5"/>
+            <pin position="47" pad-key="pa4"/>
+            <pin position="48" pad-key="pa3"/>
+            <pin position="49" pad-key="pa2"/>
+            <pin position="50" pad-key="pa1"/>
+            <pin position="51" pad-key="pa0"/>
+            <pin position="52" pad-key="vcc"/>
+            <pin position="53" pad-key="gnd"/>
+            <pin position="54" pad-key="pf7"/>
+            <pin position="55" pad-key="pf6"/>
+            <pin position="56" pad-key="pf5"/>
+            <pin position="57" pad-key="pf4"/>
+            <pin position="58" pad-key="pf3"/>
+            <pin position="59" pad-key="pf2"/>
+            <pin position="60" pad-key="pf1"/>
+            <pin position="61" pad-key="pf0"/>
+            <pin position="62" pad-key="aref"/>
+            <pin position="63" pad-key="gnd"/>
+            <pin position="64" pad-key="avcc"/>
         </pinout>
     </pinouts>
     <variants>
-        <variant name="ATmega128L-8AU" pinout-key="tqfpqfn64" package="TQFP64"/>
-        <variant name="ATmega128L-8MU" pinout-key="tqfpqfn64" package="QFN64"/>
-        <variant name="ATmega128-16AU" pinout-key="tqfpqfn64" package="TQFP64"/>
-        <variant name="ATmega128-16MU" pinout-key="tqfpqfn64" package="QFN64"/>
-        <variant name="ATmega128L-8AN" pinout-key="tqfpqfn64" package="TQFP64"/>
-        <variant name="ATmega128L-8MN" pinout-key="tqfpqfn64" package="QFN64"/>
-        <variant name="ATmega128-16AN" pinout-key="tqfpqfn64" package="TQFP64"/>
-        <variant name="ATmega128-16MN" pinout-key="tqfpqfn64" package="QFN64"/>
+        <variant key="atmega128l_8au" name="ATmega128L-8AU" pinout-key="tqfpqfn64"/>
+        <variant key="atmega128l_8mu" name="ATmega128L-8MU" pinout-key="tqfpqfn64"/>
+        <variant key="atmega128_16au" name="ATmega128-16AU" pinout-key="tqfpqfn64"/>
+        <variant key="atmega128_16mu" name="ATmega128-16MU" pinout-key="tqfpqfn64"/>
+        <variant key="atmega128l_8an" name="ATmega128L-8AN" pinout-key="tqfpqfn64"/>
+        <variant key="atmega128l_8mn" name="ATmega128L-8MN" pinout-key="tqfpqfn64"/>
+        <variant key="atmega128_16an" name="ATmega128-16AN" pinout-key="tqfpqfn64"/>
+        <variant key="atmega128_16mn" name="ATmega128-16MN" pinout-key="tqfpqfn64"/>
     </variants>
 </device>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA1280.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA1280.xml
index 2c017615..3236dd9e 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA1280.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA1280.xml
@@ -195,216 +195,214 @@
         <peripheral key="ac" name="AC" module-key="ac">
             <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"/>
+                <signal pad-key="pe2" index="0" function="default" group="AIN"/>
+                <signal pad-key="pe3" index="1" function="default" group="AIN"/>
             </signals>
         </peripheral>
         <peripheral key="usart0" name="USART0" module-key="usart">
             <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"/>
-                <signal pad-id="pe2" function="default" group="XCK"/>
+                <signal pad-key="pe1" function="default" group="TXD"/>
+                <signal pad-key="pe0" function="default" group="RXD"/>
+                <signal pad-key="pe2" function="default" group="XCK"/>
             </signals>
         </peripheral>
         <peripheral key="usart1" name="USART1" module-key="usart">
             <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"/>
-                <signal pad-id="pd5" function="default" group="XCK"/>
+                <signal pad-key="pd3" function="default" group="TXD"/>
+                <signal pad-key="pd2" function="default" group="RXD"/>
+                <signal pad-key="pd5" function="default" group="XCK"/>
             </signals>
         </peripheral>
         <peripheral key="usart2" name="USART2" module-key="usart">
             <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"/>
-                <signal pad-id="ph0" function="default" group="RXD"/>
+                <signal pad-key="ph2" function="default" group="XCK"/>
+                <signal pad-key="ph1" function="default" group="TXD"/>
+                <signal pad-key="ph0" function="default" group="RXD"/>
             </signals>
         </peripheral>
         <peripheral key="usart3" name="USART3" module-key="usart">
             <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"/>
-                <signal pad-id="pj0" function="default" group="RXD"/>
+                <signal pad-key="pj2" function="default" group="XCK"/>
+                <signal pad-key="pj1" function="default" group="TXD"/>
+                <signal pad-key="pj0" function="default" group="RXD"/>
             </signals>
         </peripheral>
         <peripheral key="twi" name="TWI" module-key="twi">
             <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"/>
+                <signal pad-key="pd1" function="default" group="SDA"/>
+                <signal pad-key="pd0" function="default" group="SCL"/>
             </signals>
         </peripheral>
         <peripheral key="spi" name="SPI" module-key="spi">
             <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"/>
-                <signal pad-id="pb3" function="default" group="MISO"/>
-                <signal pad-id="pb1" function="default" group="SCK"/>
+                <signal pad-key="pb0" function="default" group="SS"/>
+                <signal pad-key="pb2" function="default" group="MOSI"/>
+                <signal pad-key="pb3" function="default" group="MISO"/>
+                <signal pad-key="pb1" function="default" group="SCK"/>
             </signals>
         </peripheral>
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pa2" index="2" function="default" group="P"/>
-                <signal pad-id="pa3" index="3" function="default" group="P"/>
-                <signal pad-id="pa4" index="4" function="default" group="P"/>
-                <signal pad-id="pa5" index="5" function="default" group="P"/>
-                <signal pad-id="pa6" index="6" function="default" group="P"/>
-                <signal pad-id="pa7" index="7" function="default" group="P"/>
+                <signal pad-key="pa0" index="0" function="default" group="P"/>
+                <signal pad-key="pa1" index="1" function="default" group="P"/>
+                <signal pad-key="pa2" index="2" function="default" group="P"/>
+                <signal pad-key="pa3" index="3" function="default" group="P"/>
+                <signal pad-key="pa4" index="4" function="default" group="P"/>
+                <signal pad-key="pa5" index="5" function="default" group="P"/>
+                <signal pad-key="pa6" index="6" function="default" group="P"/>
+                <signal pad-key="pa7" index="7" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pb2" index="2" function="default" group="P"/>
-                <signal pad-id="pb3" index="3" function="default" group="P"/>
-                <signal pad-id="pb4" index="4" function="default" group="P"/>
-                <signal pad-id="pb5" index="5" function="default" group="P"/>
-                <signal pad-id="pb6" index="6" function="default" group="P"/>
-                <signal pad-id="pb7" index="7" function="default" group="P"/>
+                <signal pad-key="pb0" index="0" function="default" group="P"/>
+                <signal pad-key="pb1" index="1" function="default" group="P"/>
+                <signal pad-key="pb2" index="2" function="default" group="P"/>
+                <signal pad-key="pb3" index="3" function="default" group="P"/>
+                <signal pad-key="pb4" index="4" function="default" group="P"/>
+                <signal pad-key="pb5" index="5" function="default" group="P"/>
+                <signal pad-key="pb6" index="6" function="default" group="P"/>
+                <signal pad-key="pb7" index="7" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pc2" index="2" function="default" group="P"/>
-                <signal pad-id="pc3" index="3" function="default" group="P"/>
-                <signal pad-id="pc4" index="4" function="default" group="P"/>
-                <signal pad-id="pc5" index="5" function="default" group="P"/>
-                <signal pad-id="pc6" index="6" function="default" group="P"/>
-                <signal pad-id="pc7" index="7" function="default" group="P"/>
+                <signal pad-key="pc0" index="0" function="default" group="P"/>
+                <signal pad-key="pc1" index="1" function="default" group="P"/>
+                <signal pad-key="pc2" index="2" function="default" group="P"/>
+                <signal pad-key="pc3" index="3" function="default" group="P"/>
+                <signal pad-key="pc4" index="4" function="default" group="P"/>
+                <signal pad-key="pc5" index="5" function="default" group="P"/>
+                <signal pad-key="pc6" index="6" function="default" group="P"/>
+                <signal pad-key="pc7" index="7" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pd2" index="2" function="default" group="P"/>
-                <signal pad-id="pd3" index="3" function="default" group="P"/>
-                <signal pad-id="pd4" index="4" function="default" group="P"/>
-                <signal pad-id="pd5" index="5" function="default" group="P"/>
-                <signal pad-id="pd6" index="6" function="default" group="P"/>
-                <signal pad-id="pd7" index="7" function="default" group="P"/>
+                <signal pad-key="pd0" index="0" function="default" group="P"/>
+                <signal pad-key="pd1" index="1" function="default" group="P"/>
+                <signal pad-key="pd2" index="2" function="default" group="P"/>
+                <signal pad-key="pd3" index="3" function="default" group="P"/>
+                <signal pad-key="pd4" index="4" function="default" group="P"/>
+                <signal pad-key="pd5" index="5" function="default" group="P"/>
+                <signal pad-key="pd6" index="6" function="default" group="P"/>
+                <signal pad-key="pd7" index="7" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="porte" name="PORTE" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pe2" index="2" function="default" group="P"/>
-                <signal pad-id="pe3" index="3" function="default" group="P"/>
-                <signal pad-id="pe4" index="4" function="default" group="P"/>
-                <signal pad-id="pe5" index="5" function="default" group="P"/>
-                <signal pad-id="pe6" index="6" function="default" group="P"/>
-                <signal pad-id="pe7" index="7" function="default" group="P"/>
+                <signal pad-key="pe0" index="0" function="default" group="P"/>
+                <signal pad-key="pe1" index="1" function="default" group="P"/>
+                <signal pad-key="pe2" index="2" function="default" group="P"/>
+                <signal pad-key="pe3" index="3" function="default" group="P"/>
+                <signal pad-key="pe4" index="4" function="default" group="P"/>
+                <signal pad-key="pe5" index="5" function="default" group="P"/>
+                <signal pad-key="pe6" index="6" function="default" group="P"/>
+                <signal pad-key="pe7" index="7" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portf" name="PORTF" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pf2" index="2" function="default" group="P"/>
-                <signal pad-id="pf3" index="3" function="default" group="P"/>
-                <signal pad-id="pf4" index="4" function="default" group="P"/>
-                <signal pad-id="pf5" index="5" function="default" group="P"/>
-                <signal pad-id="pf6" index="6" function="default" group="P"/>
-                <signal pad-id="pf7" index="7" function="default" group="P"/>
+                <signal pad-key="pf0" index="0" function="default" group="P"/>
+                <signal pad-key="pf1" index="1" function="default" group="P"/>
+                <signal pad-key="pf2" index="2" function="default" group="P"/>
+                <signal pad-key="pf3" index="3" function="default" group="P"/>
+                <signal pad-key="pf4" index="4" function="default" group="P"/>
+                <signal pad-key="pf5" index="5" function="default" group="P"/>
+                <signal pad-key="pf6" index="6" function="default" group="P"/>
+                <signal pad-key="pf7" index="7" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portg" name="PORTG" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pg2" index="2" function="default" group="P"/>
-                <signal pad-id="pg3" index="3" function="default" group="P"/>
-                <signal pad-id="pg4" index="4" function="default" group="P"/>
-                <signal pad-id="pg5" index="5" function="default" group="P"/>
-                <signal pad-id="pg6" index="6" function="default" group="P"/>
-                <signal pad-id="pg7" index="7" function="default" group="P"/>
+                <signal pad-key="pg0" index="0" function="default" group="P"/>
+                <signal pad-key="pg1" index="1" function="default" group="P"/>
+                <signal pad-key="pg2" index="2" function="default" group="P"/>
+                <signal pad-key="pg3" index="3" function="default" group="P"/>
+                <signal pad-key="pg4" index="4" function="default" group="P"/>
+                <signal pad-key="pg5" index="5" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="porth" name="PORTH" module-key="gpio_port">
             <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"/>
-                <signal pad-id="ph2" index="2" function="default" group="P"/>
-                <signal pad-id="ph3" index="3" function="default" group="P"/>
-                <signal pad-id="ph4" index="4" function="default" group="P"/>
-                <signal pad-id="ph5" index="5" function="default" group="P"/>
-                <signal pad-id="ph6" index="6" function="default" group="P"/>
-                <signal pad-id="ph7" index="7" function="default" group="P"/>
+                <signal pad-key="ph0" index="0" function="default" group="P"/>
+                <signal pad-key="ph1" index="1" function="default" group="P"/>
+                <signal pad-key="ph2" index="2" function="default" group="P"/>
+                <signal pad-key="ph3" index="3" function="default" group="P"/>
+                <signal pad-key="ph4" index="4" function="default" group="P"/>
+                <signal pad-key="ph5" index="5" function="default" group="P"/>
+                <signal pad-key="ph6" index="6" function="default" group="P"/>
+                <signal pad-key="ph7" index="7" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portj" name="PORTJ" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pj2" index="2" function="default" group="P"/>
-                <signal pad-id="pj3" index="3" function="default" group="P"/>
-                <signal pad-id="pj4" index="4" function="default" group="P"/>
-                <signal pad-id="pj5" index="5" function="default" group="P"/>
-                <signal pad-id="pj6" index="6" function="default" group="P"/>
-                <signal pad-id="pj7" index="7" function="default" group="P"/>
+                <signal pad-key="pj0" index="0" function="default" group="P"/>
+                <signal pad-key="pj1" index="1" function="default" group="P"/>
+                <signal pad-key="pj2" index="2" function="default" group="P"/>
+                <signal pad-key="pj3" index="3" function="default" group="P"/>
+                <signal pad-key="pj4" index="4" function="default" group="P"/>
+                <signal pad-key="pj5" index="5" function="default" group="P"/>
+                <signal pad-key="pj6" index="6" function="default" group="P"/>
+                <signal pad-key="pj7" index="7" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portk" name="PORTK" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pk2" index="2" function="default" group="P"/>
-                <signal pad-id="pk3" index="3" function="default" group="P"/>
-                <signal pad-id="pk4" index="4" function="default" group="P"/>
-                <signal pad-id="pk5" index="5" function="default" group="P"/>
-                <signal pad-id="pk6" index="6" function="default" group="P"/>
-                <signal pad-id="pk7" index="7" function="default" group="P"/>
+                <signal pad-key="pk0" index="0" function="default" group="P"/>
+                <signal pad-key="pk1" index="1" function="default" group="P"/>
+                <signal pad-key="pk2" index="2" function="default" group="P"/>
+                <signal pad-key="pk3" index="3" function="default" group="P"/>
+                <signal pad-key="pk4" index="4" function="default" group="P"/>
+                <signal pad-key="pk5" index="5" function="default" group="P"/>
+                <signal pad-key="pk6" index="6" function="default" group="P"/>
+                <signal pad-key="pk7" index="7" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portl" name="PORTL" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pl2" index="2" function="default" group="P"/>
-                <signal pad-id="pl3" index="3" function="default" group="P"/>
-                <signal pad-id="pl4" index="4" function="default" group="P"/>
-                <signal pad-id="pl5" index="5" function="default" group="P"/>
-                <signal pad-id="pl6" index="6" function="default" group="P"/>
-                <signal pad-id="pl7" index="7" function="default" group="P"/>
+                <signal pad-key="pl0" index="0" function="default" group="P"/>
+                <signal pad-key="pl1" index="1" function="default" group="P"/>
+                <signal pad-key="pl2" index="2" function="default" group="P"/>
+                <signal pad-key="pl3" index="3" function="default" group="P"/>
+                <signal pad-key="pl4" index="4" function="default" group="P"/>
+                <signal pad-key="pl5" index="5" function="default" group="P"/>
+                <signal pad-key="pl6" index="6" function="default" group="P"/>
+                <signal pad-key="pl7" index="7" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="tc0" name="TC0" module-key="tc8">
             <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"/>
-                <signal pad-id="pb7" function="default" group="OCA"/>
+                <signal pad-key="pd7" function="default" group="T"/>
+                <signal pad-key="pg5" function="default" group="OCB"/>
+                <signal pad-key="pb7" function="default" group="OCA"/>
             </signals>
         </peripheral>
         <peripheral key="tc2" name="TC2" module-key="tc8_async">
             <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"/>
-                <signal pad-id="ph6" function="default" group="OCB"/>
-                <signal pad-id="pb4" function="default" group="OCA"/>
+                <signal pad-key="pg4" index="1" function="default" group="TOSC"/>
+                <signal pad-key="pg3" index="2" function="default" group="TOSC"/>
+                <signal pad-key="ph6" function="default" group="OCB"/>
+                <signal pad-key="pb4" function="default" group="OCA"/>
             </signals>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="wdt">
@@ -416,114 +414,114 @@
         <peripheral key="tc5" name="TC5" module-key="tc16">
             <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"/>
-                <signal pad-id="pl3" function="default" group="OCA"/>
-                <signal pad-id="pl2" function="default" group="T"/>
-                <signal pad-id="pl1" function="default" group="ICP"/>
+                <signal pad-key="pl5" function="default" group="OCC"/>
+                <signal pad-key="pl4" function="default" group="OCB"/>
+                <signal pad-key="pl3" function="default" group="OCA"/>
+                <signal pad-key="pl2" function="default" group="T"/>
+                <signal pad-key="pl1" function="default" group="ICP"/>
             </signals>
         </peripheral>
         <peripheral key="tc4" name="TC4" module-key="tc16">
             <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"/>
-                <signal pad-id="ph4" function="default" group="OCB"/>
-                <signal pad-id="ph3" function="default" group="OCA"/>
-                <signal pad-id="pl0" function="default" group="ICP"/>
+                <signal pad-key="ph7" function="default" group="T"/>
+                <signal pad-key="ph5" function="default" group="OCC"/>
+                <signal pad-key="ph4" function="default" group="OCB"/>
+                <signal pad-key="ph3" function="default" group="OCA"/>
+                <signal pad-key="pl0" function="default" group="ICP"/>
             </signals>
         </peripheral>
         <peripheral key="tc3" name="TC3" module-key="tc16">
             <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"/>
-                <signal pad-id="pe3" function="default" group="OCA"/>
-                <signal pad-id="pe4" function="default" group="OCB"/>
-                <signal pad-id="pe5" function="default" group="OCC"/>
+                <signal pad-key="pe6" function="default" group="T"/>
+                <signal pad-key="pe7" function="default" group="ICP"/>
+                <signal pad-key="pe3" function="default" group="OCA"/>
+                <signal pad-key="pe4" function="default" group="OCB"/>
+                <signal pad-key="pe5" function="default" group="OCC"/>
             </signals>
         </peripheral>
         <peripheral key="tc1" name="TC1" module-key="tc16">
             <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"/>
-                <signal pad-id="pb5" function="default" group="OCA"/>
-                <signal pad-id="pb6" function="default" group="OCB"/>
-                <signal pad-id="pb7" function="default" group="OCC"/>
+                <signal pad-key="pd6" function="default" group="T"/>
+                <signal pad-key="pd4" function="default" group="ICP"/>
+                <signal pad-key="pb5" function="default" group="OCA"/>
+                <signal pad-key="pb6" function="default" group="OCB"/>
+                <signal pad-key="pb7" function="default" group="OCC"/>
             </signals>
         </peripheral>
         <peripheral key="jtag" name="JTAG" module-key="jtag">
             <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"/>
-                <signal pad-id="pf6" function="default" group="TDO"/>
-                <signal pad-id="pf7" function="default" group="TDI"/>
+                <signal pad-key="pf4" function="default" group="TCK"/>
+                <signal pad-key="pf5" function="default" group="TMS"/>
+                <signal pad-key="pf6" function="default" group="TDO"/>
+                <signal pad-key="pf7" function="default" group="TDI"/>
             </signals>
         </peripheral>
         <peripheral key="exint" name="EXINT" module-key="exint">
             <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"/>
-                <signal pad-id="pb2" index="2" function="default" group="PCINT"/>
-                <signal pad-id="pb3" index="3" function="default" group="PCINT"/>
-                <signal pad-id="pb4" index="4" function="default" group="PCINT"/>
-                <signal pad-id="pb5" index="5" function="default" group="PCINT"/>
-                <signal pad-id="pb6" index="6" function="default" group="PCINT"/>
-                <signal pad-id="pb7" index="7" function="default" group="PCINT"/>
-                <signal pad-id="pe0" index="8" function="default" group="PCINT"/>
-                <signal pad-id="pj0" index="9" function="default" group="PCINT"/>
-                <signal pad-id="pj1" index="10" function="default" group="PCINT"/>
-                <signal pad-id="pj2" index="11" function="default" group="PCINT"/>
-                <signal pad-id="pj3" index="12" function="default" group="PCINT"/>
-                <signal pad-id="pj4" index="13" function="default" group="PCINT"/>
-                <signal pad-id="pj5" index="14" function="default" group="PCINT"/>
-                <signal pad-id="pj6" index="15" function="default" group="PCINT"/>
-                <signal pad-id="pk0" index="16" function="default" group="PCINT"/>
-                <signal pad-id="pk1" index="17" function="default" group="PCINT"/>
-                <signal pad-id="pk2" index="18" function="default" group="PCINT"/>
-                <signal pad-id="pk3" index="19" function="default" group="PCINT"/>
-                <signal pad-id="pk4" index="20" function="default" group="PCINT"/>
-                <signal pad-id="pk5" index="21" function="default" group="PCINT"/>
-                <signal pad-id="pk6" index="22" function="default" group="PCINT"/>
-                <signal pad-id="pk7" index="23" function="default" group="PCINT"/>
-                <signal pad-id="pd0" index="0" function="default" group="INT"/>
-                <signal pad-id="pd1" index="1" function="default" group="INT"/>
-                <signal pad-id="pd2" index="2" function="default" group="INT"/>
-                <signal pad-id="pd3" index="3" function="default" group="INT"/>
-                <signal pad-id="pe4" index="4" function="default" group="INT"/>
-                <signal pad-id="pe5" index="5" function="default" group="INT"/>
-                <signal pad-id="pe6" index="6" function="default" group="INT"/>
-                <signal pad-id="pe7" index="7" function="default" group="INT"/>
+                <signal pad-key="pb0" index="0" function="default" group="PCINT"/>
+                <signal pad-key="pb1" index="1" function="default" group="PCINT"/>
+                <signal pad-key="pb2" index="2" function="default" group="PCINT"/>
+                <signal pad-key="pb3" index="3" function="default" group="PCINT"/>
+                <signal pad-key="pb4" index="4" function="default" group="PCINT"/>
+                <signal pad-key="pb5" index="5" function="default" group="PCINT"/>
+                <signal pad-key="pb6" index="6" function="default" group="PCINT"/>
+                <signal pad-key="pb7" index="7" function="default" group="PCINT"/>
+                <signal pad-key="pe0" index="8" function="default" group="PCINT"/>
+                <signal pad-key="pj0" index="9" function="default" group="PCINT"/>
+                <signal pad-key="pj1" index="10" function="default" group="PCINT"/>
+                <signal pad-key="pj2" index="11" function="default" group="PCINT"/>
+                <signal pad-key="pj3" index="12" function="default" group="PCINT"/>
+                <signal pad-key="pj4" index="13" function="default" group="PCINT"/>
+                <signal pad-key="pj5" index="14" function="default" group="PCINT"/>
+                <signal pad-key="pj6" index="15" function="default" group="PCINT"/>
+                <signal pad-key="pk0" index="16" function="default" group="PCINT"/>
+                <signal pad-key="pk1" index="17" function="default" group="PCINT"/>
+                <signal pad-key="pk2" index="18" function="default" group="PCINT"/>
+                <signal pad-key="pk3" index="19" function="default" group="PCINT"/>
+                <signal pad-key="pk4" index="20" function="default" group="PCINT"/>
+                <signal pad-key="pk5" index="21" function="default" group="PCINT"/>
+                <signal pad-key="pk6" index="22" function="default" group="PCINT"/>
+                <signal pad-key="pk7" index="23" function="default" group="PCINT"/>
+                <signal pad-key="pd0" index="0" function="default" group="INT"/>
+                <signal pad-key="pd1" index="1" function="default" group="INT"/>
+                <signal pad-key="pd2" index="2" function="default" group="INT"/>
+                <signal pad-key="pd3" index="3" function="default" group="INT"/>
+                <signal pad-key="pe4" index="4" function="default" group="INT"/>
+                <signal pad-key="pe5" index="5" function="default" group="INT"/>
+                <signal pad-key="pe6" index="6" function="default" group="INT"/>
+                <signal pad-key="pe7" index="7" function="default" group="INT"/>
             </signals>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="cpu">
             <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"/>
+                <signal pad-key="pe7" index="0" function="default" group="CLKO"/>
             </signals>
         </peripheral>
         <peripheral key="adc" name="ADC" module-key="adc">
             <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"/>
-                <signal pad-id="pf2" index="2" function="default" group="ADC"/>
-                <signal pad-id="pf3" index="3" function="default" group="ADC"/>
-                <signal pad-id="pf4" index="4" function="default" group="ADC"/>
-                <signal pad-id="pf5" index="5" function="default" group="ADC"/>
-                <signal pad-id="pf6" index="6" function="default" group="ADC"/>
-                <signal pad-id="pf7" index="7" function="default" group="ADC"/>
-                <signal pad-id="pk0" index="8" function="default" group="ADC"/>
-                <signal pad-id="pk1" index="9" function="default" group="ADC"/>
-                <signal pad-id="pk2" index="10" function="default" group="ADC"/>
-                <signal pad-id="pk3" index="11" function="default" group="ADC"/>
-                <signal pad-id="pk4" index="12" function="default" group="ADC"/>
-                <signal pad-id="pk5" index="13" function="default" group="ADC"/>
-                <signal pad-id="pk6" index="14" function="default" group="ADC"/>
-                <signal pad-id="pk7" index="15" function="default" group="ADC"/>
+                <signal pad-key="pf0" index="0" function="default" group="ADC"/>
+                <signal pad-key="pf1" index="1" function="default" group="ADC"/>
+                <signal pad-key="pf2" index="2" function="default" group="ADC"/>
+                <signal pad-key="pf3" index="3" function="default" group="ADC"/>
+                <signal pad-key="pf4" index="4" function="default" group="ADC"/>
+                <signal pad-key="pf5" index="5" function="default" group="ADC"/>
+                <signal pad-key="pf6" index="6" function="default" group="ADC"/>
+                <signal pad-key="pf7" index="7" function="default" group="ADC"/>
+                <signal pad-key="pk0" index="8" function="default" group="ADC"/>
+                <signal pad-key="pk1" index="9" function="default" group="ADC"/>
+                <signal pad-key="pk2" index="10" function="default" group="ADC"/>
+                <signal pad-key="pk3" index="11" function="default" group="ADC"/>
+                <signal pad-key="pk4" index="12" function="default" group="ADC"/>
+                <signal pad-key="pk5" index="13" function="default" group="ADC"/>
+                <signal pad-key="pk6" index="14" function="default" group="ADC"/>
+                <signal pad-key="pk7" index="15" function="default" group="ADC"/>
             </signals>
         </peripheral>
         <peripheral key="boot_load" name="BOOT_LOAD" module-key="boot_load">
@@ -1256,216 +1254,311 @@
             </register-group>
         </module>
     </modules>
+    <pads>
+        <pad key="pg5" name="PG5"/>
+        <pad key="pe0" name="PE0"/>
+        <pad key="pe1" name="PE1"/>
+        <pad key="pe2" name="PE2"/>
+        <pad key="pe3" name="PE3"/>
+        <pad key="pe4" name="PE4"/>
+        <pad key="pe5" name="PE5"/>
+        <pad key="pe6" name="PE6"/>
+        <pad key="pe7" name="PE7"/>
+        <pad key="vcc" name="VCC"/>
+        <pad key="gnd" name="GND"/>
+        <pad key="ph0" name="PH0"/>
+        <pad key="ph1" name="PH1"/>
+        <pad key="ph2" name="PH2"/>
+        <pad key="ph3" name="PH3"/>
+        <pad key="ph4" name="PH4"/>
+        <pad key="ph5" name="PH5"/>
+        <pad key="ph6" name="PH6"/>
+        <pad key="pb0" name="PB0"/>
+        <pad key="pb1" name="PB1"/>
+        <pad key="pb2" name="PB2"/>
+        <pad key="pb3" name="PB3"/>
+        <pad key="pb4" name="PB4"/>
+        <pad key="pb5" name="PB5"/>
+        <pad key="pb6" name="PB6"/>
+        <pad key="pb7" name="PB7"/>
+        <pad key="ph7" name="PH7"/>
+        <pad key="pg3" name="PG3"/>
+        <pad key="pg4" name="PG4"/>
+        <pad key="reset" name="RESET"/>
+        <pad key="xtal2" name="XTAL2"/>
+        <pad key="xtal1" name="XTAL1"/>
+        <pad key="pl0" name="PL0"/>
+        <pad key="pl1" name="PL1"/>
+        <pad key="pl2" name="PL2"/>
+        <pad key="pl3" name="PL3"/>
+        <pad key="pl4" name="PL4"/>
+        <pad key="pl5" name="PL5"/>
+        <pad key="pl6" name="PL6"/>
+        <pad key="pl7" name="PL7"/>
+        <pad key="pd0" name="PD0"/>
+        <pad key="pd1" name="PD1"/>
+        <pad key="pd2" name="PD2"/>
+        <pad key="pd3" name="PD3"/>
+        <pad key="pd4" name="PD4"/>
+        <pad key="pd5" name="PD5"/>
+        <pad key="pd6" name="PD6"/>
+        <pad key="pd7" name="PD7"/>
+        <pad key="pg0" name="PG0"/>
+        <pad key="pg1" name="PG1"/>
+        <pad key="pc0" name="PC0"/>
+        <pad key="pc1" name="PC1"/>
+        <pad key="pc2" name="PC2"/>
+        <pad key="pc3" name="PC3"/>
+        <pad key="pc4" name="PC4"/>
+        <pad key="pc5" name="PC5"/>
+        <pad key="pc6" name="PC6"/>
+        <pad key="pc7" name="PC7"/>
+        <pad key="pj0" name="PJ0"/>
+        <pad key="pj1" name="PJ1"/>
+        <pad key="pj2" name="PJ2"/>
+        <pad key="pj3" name="PJ3"/>
+        <pad key="pj4" name="PJ4"/>
+        <pad key="pj5" name="PJ5"/>
+        <pad key="pj6" name="PJ6"/>
+        <pad key="pg2" name="PG2"/>
+        <pad key="pa7" name="PA7"/>
+        <pad key="pa6" name="PA6"/>
+        <pad key="pa5" name="PA5"/>
+        <pad key="pa4" name="PA4"/>
+        <pad key="pa3" name="PA3"/>
+        <pad key="pa2" name="PA2"/>
+        <pad key="pa1" name="PA1"/>
+        <pad key="pa0" name="PA0"/>
+        <pad key="pj7" name="PJ7"/>
+        <pad key="pk7" name="PK7"/>
+        <pad key="pk6" name="PK6"/>
+        <pad key="pk5" name="PK5"/>
+        <pad key="pk4" name="PK4"/>
+        <pad key="pk3" name="PK3"/>
+        <pad key="pk2" name="PK2"/>
+        <pad key="pk1" name="PK1"/>
+        <pad key="pk0" name="PK0"/>
+        <pad key="pf7" name="PF7"/>
+        <pad key="pf6" name="PF6"/>
+        <pad key="pf5" name="PF5"/>
+        <pad key="pf4" name="PF4"/>
+        <pad key="pf3" name="PF3"/>
+        <pad key="pf2" name="PF2"/>
+        <pad key="pf1" name="PF1"/>
+        <pad key="pf0" name="PF0"/>
+        <pad key="aref" name="AREF"/>
+        <pad key="avcc" name="AVCC"/>
+    </pads>
     <pinouts>
         <pinout key="tqfp100" name="TQFP100" type="qfp">
-            <pin position="1" pad="PG5"/>
-            <pin position="2" pad="PE0"/>
-            <pin position="3" pad="PE1"/>
-            <pin position="4" pad="PE2"/>
-            <pin position="5" pad="PE3"/>
-            <pin position="6" pad="PE4"/>
-            <pin position="7" pad="PE5"/>
-            <pin position="8" pad="PE6"/>
-            <pin position="9" pad="PE7"/>
-            <pin position="10" pad="VCC"/>
-            <pin position="11" pad="GND"/>
-            <pin position="12" pad="PH0"/>
-            <pin position="13" pad="PH1"/>
-            <pin position="14" pad="PH2"/>
-            <pin position="15" pad="PH3"/>
-            <pin position="16" pad="PH4"/>
-            <pin position="17" pad="PH5"/>
-            <pin position="18" pad="PH6"/>
-            <pin position="19" pad="PB0"/>
-            <pin position="20" pad="PB1"/>
-            <pin position="21" pad="PB2"/>
-            <pin position="22" pad="PB3"/>
-            <pin position="23" pad="PB4"/>
-            <pin position="24" pad="PB5"/>
-            <pin position="25" pad="PB6"/>
-            <pin position="26" pad="PB7"/>
-            <pin position="27" pad="PH7"/>
-            <pin position="28" pad="PG3"/>
-            <pin position="29" pad="PG4"/>
-            <pin position="30" pad="RESET"/>
-            <pin position="31" pad="VCC"/>
-            <pin position="32" pad="GND"/>
-            <pin position="33" pad="XTAL2"/>
-            <pin position="34" pad="XTAL1"/>
-            <pin position="35" pad="PL0"/>
-            <pin position="36" pad="PL1"/>
-            <pin position="37" pad="PL2"/>
-            <pin position="38" pad="PL3"/>
-            <pin position="39" pad="PL4"/>
-            <pin position="40" pad="PL5"/>
-            <pin position="41" pad="PL6"/>
-            <pin position="42" pad="PL7"/>
-            <pin position="43" pad="PD0"/>
-            <pin position="44" pad="PD1"/>
-            <pin position="45" pad="PD2"/>
-            <pin position="46" pad="PD3"/>
-            <pin position="47" pad="PD4"/>
-            <pin position="48" pad="PD5"/>
-            <pin position="49" pad="PD6"/>
-            <pin position="50" pad="PD7"/>
-            <pin position="51" pad="PG0"/>
-            <pin position="52" pad="PG1"/>
-            <pin position="53" pad="PC0"/>
-            <pin position="54" pad="PC1"/>
-            <pin position="55" pad="PC2"/>
-            <pin position="56" pad="PC3"/>
-            <pin position="57" pad="PC4"/>
-            <pin position="58" pad="PC5"/>
-            <pin position="59" pad="PC6"/>
-            <pin position="60" pad="PC7"/>
-            <pin position="61" pad="VCC"/>
-            <pin position="62" pad="GND"/>
-            <pin position="63" pad="PJ0"/>
-            <pin position="64" pad="PJ1"/>
-            <pin position="65" pad="PJ2"/>
-            <pin position="66" pad="PJ3"/>
-            <pin position="67" pad="PJ4"/>
-            <pin position="68" pad="PJ5"/>
-            <pin position="69" pad="PJ6"/>
-            <pin position="70" pad="PG2"/>
-            <pin position="71" pad="PA7"/>
-            <pin position="72" pad="PA6"/>
-            <pin position="73" pad="PA5"/>
-            <pin position="74" pad="PA4"/>
-            <pin position="75" pad="PA3"/>
-            <pin position="76" pad="PA2"/>
-            <pin position="77" pad="PA1"/>
-            <pin position="78" pad="PA0"/>
-            <pin position="79" pad="PJ7"/>
-            <pin position="80" pad="VCC"/>
-            <pin position="81" pad="GND"/>
-            <pin position="82" pad="PK7"/>
-            <pin position="83" pad="PK6"/>
-            <pin position="84" pad="PK5"/>
-            <pin position="85" pad="PK4"/>
-            <pin position="86" pad="PK3"/>
-            <pin position="87" pad="PK2"/>
-            <pin position="88" pad="PK1"/>
-            <pin position="89" pad="PK0"/>
-            <pin position="90" pad="PF7"/>
-            <pin position="91" pad="PF6"/>
-            <pin position="92" pad="PF5"/>
-            <pin position="93" pad="PF4"/>
-            <pin position="94" pad="PF3"/>
-            <pin position="95" pad="PF2"/>
-            <pin position="96" pad="PF1"/>
-            <pin position="97" pad="PF0"/>
-            <pin position="98" pad="AREF"/>
-            <pin position="99" pad="GND"/>
-            <pin position="100" pad="AVCC"/>
+            <pin position="1" pad-key="pg5"/>
+            <pin position="2" pad-key="pe0"/>
+            <pin position="3" pad-key="pe1"/>
+            <pin position="4" pad-key="pe2"/>
+            <pin position="5" pad-key="pe3"/>
+            <pin position="6" pad-key="pe4"/>
+            <pin position="7" pad-key="pe5"/>
+            <pin position="8" pad-key="pe6"/>
+            <pin position="9" pad-key="pe7"/>
+            <pin position="10" pad-key="vcc"/>
+            <pin position="11" pad-key="gnd"/>
+            <pin position="12" pad-key="ph0"/>
+            <pin position="13" pad-key="ph1"/>
+            <pin position="14" pad-key="ph2"/>
+            <pin position="15" pad-key="ph3"/>
+            <pin position="16" pad-key="ph4"/>
+            <pin position="17" pad-key="ph5"/>
+            <pin position="18" pad-key="ph6"/>
+            <pin position="19" pad-key="pb0"/>
+            <pin position="20" pad-key="pb1"/>
+            <pin position="21" pad-key="pb2"/>
+            <pin position="22" pad-key="pb3"/>
+            <pin position="23" pad-key="pb4"/>
+            <pin position="24" pad-key="pb5"/>
+            <pin position="25" pad-key="pb6"/>
+            <pin position="26" pad-key="pb7"/>
+            <pin position="27" pad-key="ph7"/>
+            <pin position="28" pad-key="pg3"/>
+            <pin position="29" pad-key="pg4"/>
+            <pin position="30" pad-key="reset"/>
+            <pin position="31" pad-key="vcc"/>
+            <pin position="32" pad-key="gnd"/>
+            <pin position="33" pad-key="xtal2"/>
+            <pin position="34" pad-key="xtal1"/>
+            <pin position="35" pad-key="pl0"/>
+            <pin position="36" pad-key="pl1"/>
+            <pin position="37" pad-key="pl2"/>
+            <pin position="38" pad-key="pl3"/>
+            <pin position="39" pad-key="pl4"/>
+            <pin position="40" pad-key="pl5"/>
+            <pin position="41" pad-key="pl6"/>
+            <pin position="42" pad-key="pl7"/>
+            <pin position="43" pad-key="pd0"/>
+            <pin position="44" pad-key="pd1"/>
+            <pin position="45" pad-key="pd2"/>
+            <pin position="46" pad-key="pd3"/>
+            <pin position="47" pad-key="pd4"/>
+            <pin position="48" pad-key="pd5"/>
+            <pin position="49" pad-key="pd6"/>
+            <pin position="50" pad-key="pd7"/>
+            <pin position="51" pad-key="pg0"/>
+            <pin position="52" pad-key="pg1"/>
+            <pin position="53" pad-key="pc0"/>
+            <pin position="54" pad-key="pc1"/>
+            <pin position="55" pad-key="pc2"/>
+            <pin position="56" pad-key="pc3"/>
+            <pin position="57" pad-key="pc4"/>
+            <pin position="58" pad-key="pc5"/>
+            <pin position="59" pad-key="pc6"/>
+            <pin position="60" pad-key="pc7"/>
+            <pin position="61" pad-key="vcc"/>
+            <pin position="62" pad-key="gnd"/>
+            <pin position="63" pad-key="pj0"/>
+            <pin position="64" pad-key="pj1"/>
+            <pin position="65" pad-key="pj2"/>
+            <pin position="66" pad-key="pj3"/>
+            <pin position="67" pad-key="pj4"/>
+            <pin position="68" pad-key="pj5"/>
+            <pin position="69" pad-key="pj6"/>
+            <pin position="70" pad-key="pg2"/>
+            <pin position="71" pad-key="pa7"/>
+            <pin position="72" pad-key="pa6"/>
+            <pin position="73" pad-key="pa5"/>
+            <pin position="74" pad-key="pa4"/>
+            <pin position="75" pad-key="pa3"/>
+            <pin position="76" pad-key="pa2"/>
+            <pin position="77" pad-key="pa1"/>
+            <pin position="78" pad-key="pa0"/>
+            <pin position="79" pad-key="pj7"/>
+            <pin position="80" pad-key="vcc"/>
+            <pin position="81" pad-key="gnd"/>
+            <pin position="82" pad-key="pk7"/>
+            <pin position="83" pad-key="pk6"/>
+            <pin position="84" pad-key="pk5"/>
+            <pin position="85" pad-key="pk4"/>
+            <pin position="86" pad-key="pk3"/>
+            <pin position="87" pad-key="pk2"/>
+            <pin position="88" pad-key="pk1"/>
+            <pin position="89" pad-key="pk0"/>
+            <pin position="90" pad-key="pf7"/>
+            <pin position="91" pad-key="pf6"/>
+            <pin position="92" pad-key="pf5"/>
+            <pin position="93" pad-key="pf4"/>
+            <pin position="94" pad-key="pf3"/>
+            <pin position="95" pad-key="pf2"/>
+            <pin position="96" pad-key="pf1"/>
+            <pin position="97" pad-key="pf0"/>
+            <pin position="98" pad-key="aref"/>
+            <pin position="99" pad-key="gnd"/>
+            <pin position="100" pad-key="avcc"/>
         </pinout>
         <pinout key="cbga100" name="CBGA100" type="bga">
-            <pin position="A1" pad="GND"/>
-            <pin position="B1" pad="AVCC"/>
-            <pin position="C1" pad="PE2"/>
-            <pin position="D1" pad="PE3"/>
-            <pin position="E1" pad="PE7"/>
-            <pin position="F1" pad="VCC"/>
-            <pin position="G1" pad="GND"/>
-            <pin position="H1" pad="PB3"/>
-            <pin position="J1" pad="PH7"/>
-            <pin position="K1" pad="PB7"/>
-            <pin position="A2" pad="AREF"/>
-            <pin position="B2" pad="PG5"/>
-            <pin position="C2" pad="PE0"/>
-            <pin position="D2" pad="PE4"/>
-            <pin position="E2" pad="PH0"/>
-            <pin position="F2" pad="PH4"/>
-            <pin position="G2" pad="PB1"/>
-            <pin position="H2" pad="PB4"/>
-            <pin position="J2" pad="PG3"/>
-            <pin position="K2" pad="PG4"/>
-            <pin position="A3" pad="PF0"/>
-            <pin position="B3" pad="PF1"/>
-            <pin position="C3" pad="PE1"/>
-            <pin position="D3" pad="PE5"/>
-            <pin position="E3" pad="PH1"/>
-            <pin position="F3" pad="PH6"/>
-            <pin position="G3" pad="PB2"/>
-            <pin position="H3" pad="RESET"/>
-            <pin position="J3" pad="PB6"/>
-            <pin position="K3" pad="VCC"/>
-            <pin position="A4" pad="PF2"/>
-            <pin position="B4" pad="PF3"/>
-            <pin position="C4" pad="PF4"/>
-            <pin position="D4" pad="PE6"/>
-            <pin position="E4" pad="PH3"/>
-            <pin position="F4" pad="PB0"/>
-            <pin position="G4" pad="PB5"/>
-            <pin position="H4" pad="PL1"/>
-            <pin position="J4" pad="PL0"/>
-            <pin position="K4" pad="GND"/>
-            <pin position="A5" pad="PF5"/>
-            <pin position="B5" pad="PF6"/>
-            <pin position="C5" pad="PF7"/>
-            <pin position="D5" pad="PH2"/>
-            <pin position="E5" pad="PH5"/>
-            <pin position="F5" pad="PL4"/>
-            <pin position="G5" pad="PL2"/>
-            <pin position="H5" pad="PL3"/>
-            <pin position="J5" pad="XTAL2"/>
-            <pin position="K5" pad="XTAL1"/>
-            <pin position="A6" pad="PK0"/>
-            <pin position="B6" pad="PK1"/>
-            <pin position="C6" pad="PK2"/>
-            <pin position="D6" pad="PA4"/>
-            <pin position="E6" pad="PJ6"/>
-            <pin position="F6" pad="PD1"/>
-            <pin position="G6" pad="PD0"/>
-            <pin position="H6" pad="PL7"/>
-            <pin position="J6" pad="PL6"/>
-            <pin position="K6" pad="PL5"/>
-            <pin position="A7" pad="PK3"/>
-            <pin position="B7" pad="PK4"/>
-            <pin position="C7" pad="PK5"/>
-            <pin position="D7" pad="PA5"/>
-            <pin position="E7" pad="PJ5"/>
-            <pin position="F7" pad="PJ1"/>
-            <pin position="G7" pad="PD5"/>
-            <pin position="H7" pad="PD4"/>
-            <pin position="J7" pad="PD3"/>
-            <pin position="K7" pad="PD2"/>
-            <pin position="A8" pad="PK6"/>
-            <pin position="B8" pad="PK7"/>
-            <pin position="C8" pad="PJ7"/>
-            <pin position="D8" pad="PA6"/>
-            <pin position="E8" pad="PJ4"/>
-            <pin position="F8" pad="PJ0"/>
-            <pin position="G8" pad="PC5"/>
-            <pin position="H8" pad="PC4"/>
-            <pin position="J8" pad="PC1"/>
-            <pin position="K8" pad="PD6"/>
-            <pin position="A9" pad="GND"/>
-            <pin position="B9" pad="PA0"/>
-            <pin position="C9" pad="PA1"/>
-            <pin position="D9" pad="PA7"/>
-            <pin position="E9" pad="PJ3"/>
-            <pin position="F9" pad="PC7"/>
-            <pin position="G9" pad="PC6"/>
-            <pin position="H9" pad="PC3"/>
-            <pin position="J9" pad="PC0"/>
-            <pin position="K9" pad="PD7"/>
-            <pin position="A10" pad="VCC"/>
-            <pin position="B10" pad="PA2"/>
-            <pin position="C10" pad="PA3"/>
-            <pin position="D10" pad="PG2"/>
-            <pin position="E10" pad="PJ2"/>
-            <pin position="F10" pad="GND"/>
-            <pin position="G10" pad="VCC"/>
-            <pin position="H10" pad="PC2"/>
-            <pin position="J10" pad="PG1"/>
-            <pin position="K10" pad="PG0"/>
+            <pin position="A1" pad-key="gnd"/>
+            <pin position="B1" pad-key="avcc"/>
+            <pin position="C1" pad-key="pe2"/>
+            <pin position="D1" pad-key="pe3"/>
+            <pin position="E1" pad-key="pe7"/>
+            <pin position="F1" pad-key="vcc"/>
+            <pin position="G1" pad-key="gnd"/>
+            <pin position="H1" pad-key="pb3"/>
+            <pin position="J1" pad-key="ph7"/>
+            <pin position="K1" pad-key="pb7"/>
+            <pin position="A2" pad-key="aref"/>
+            <pin position="B2" pad-key="pg5"/>
+            <pin position="C2" pad-key="pe0"/>
+            <pin position="D2" pad-key="pe4"/>
+            <pin position="E2" pad-key="ph0"/>
+            <pin position="F2" pad-key="ph4"/>
+            <pin position="G2" pad-key="pb1"/>
+            <pin position="H2" pad-key="pb4"/>
+            <pin position="J2" pad-key="pg3"/>
+            <pin position="K2" pad-key="pg4"/>
+            <pin position="A3" pad-key="pf0"/>
+            <pin position="B3" pad-key="pf1"/>
+            <pin position="C3" pad-key="pe1"/>
+            <pin position="D3" pad-key="pe5"/>
+            <pin position="E3" pad-key="ph1"/>
+            <pin position="F3" pad-key="ph6"/>
+            <pin position="G3" pad-key="pb2"/>
+            <pin position="H3" pad-key="reset"/>
+            <pin position="J3" pad-key="pb6"/>
+            <pin position="K3" pad-key="vcc"/>
+            <pin position="A4" pad-key="pf2"/>
+            <pin position="B4" pad-key="pf3"/>
+            <pin position="C4" pad-key="pf4"/>
+            <pin position="D4" pad-key="pe6"/>
+            <pin position="E4" pad-key="ph3"/>
+            <pin position="F4" pad-key="pb0"/>
+            <pin position="G4" pad-key="pb5"/>
+            <pin position="H4" pad-key="pl1"/>
+            <pin position="J4" pad-key="pl0"/>
+            <pin position="K4" pad-key="gnd"/>
+            <pin position="A5" pad-key="pf5"/>
+            <pin position="B5" pad-key="pf6"/>
+            <pin position="C5" pad-key="pf7"/>
+            <pin position="D5" pad-key="ph2"/>
+            <pin position="E5" pad-key="ph5"/>
+            <pin position="F5" pad-key="pl4"/>
+            <pin position="G5" pad-key="pl2"/>
+            <pin position="H5" pad-key="pl3"/>
+            <pin position="J5" pad-key="xtal2"/>
+            <pin position="K5" pad-key="xtal1"/>
+            <pin position="A6" pad-key="pk0"/>
+            <pin position="B6" pad-key="pk1"/>
+            <pin position="C6" pad-key="pk2"/>
+            <pin position="D6" pad-key="pa4"/>
+            <pin position="E6" pad-key="pj6"/>
+            <pin position="F6" pad-key="pd1"/>
+            <pin position="G6" pad-key="pd0"/>
+            <pin position="H6" pad-key="pl7"/>
+            <pin position="J6" pad-key="pl6"/>
+            <pin position="K6" pad-key="pl5"/>
+            <pin position="A7" pad-key="pk3"/>
+            <pin position="B7" pad-key="pk4"/>
+            <pin position="C7" pad-key="pk5"/>
+            <pin position="D7" pad-key="pa5"/>
+            <pin position="E7" pad-key="pj5"/>
+            <pin position="F7" pad-key="pj1"/>
+            <pin position="G7" pad-key="pd5"/>
+            <pin position="H7" pad-key="pd4"/>
+            <pin position="J7" pad-key="pd3"/>
+            <pin position="K7" pad-key="pd2"/>
+            <pin position="A8" pad-key="pk6"/>
+            <pin position="B8" pad-key="pk7"/>
+            <pin position="C8" pad-key="pj7"/>
+            <pin position="D8" pad-key="pa6"/>
+            <pin position="E8" pad-key="pj4"/>
+            <pin position="F8" pad-key="pj0"/>
+            <pin position="G8" pad-key="pc5"/>
+            <pin position="H8" pad-key="pc4"/>
+            <pin position="J8" pad-key="pc1"/>
+            <pin position="K8" pad-key="pd6"/>
+            <pin position="A9" pad-key="gnd"/>
+            <pin position="B9" pad-key="pa0"/>
+            <pin position="C9" pad-key="pa1"/>
+            <pin position="D9" pad-key="pa7"/>
+            <pin position="E9" pad-key="pj3"/>
+            <pin position="F9" pad-key="pc7"/>
+            <pin position="G9" pad-key="pc6"/>
+            <pin position="H9" pad-key="pc3"/>
+            <pin position="J9" pad-key="pc0"/>
+            <pin position="K9" pad-key="pd7"/>
+            <pin position="A10" pad-key="vcc"/>
+            <pin position="B10" pad-key="pa2"/>
+            <pin position="C10" pad-key="pa3"/>
+            <pin position="D10" pad-key="pg2"/>
+            <pin position="E10" pad-key="pj2"/>
+            <pin position="F10" pad-key="gnd"/>
+            <pin position="G10" pad-key="vcc"/>
+            <pin position="H10" pad-key="pc2"/>
+            <pin position="J10" pad-key="pg1"/>
+            <pin position="K10" pad-key="pg0"/>
         </pinout>
     </pinouts>
     <variants>
-        <variant name="ATmega1280V-8AU" pinout-key="tqfp100" package="TQFP100"/>
-        <variant name="ATmega1280V-8CU" pinout-key="cbga100" package="CBGA100"/>
-        <variant name="ATmega1280-16AU" pinout-key="tqfp100" package="TQFP100"/>
-        <variant name="ATmega1280-16CU" pinout-key="cbga100" package="CBGA100"/>
+        <variant key="atmega1280v_8au" name="ATmega1280V-8AU" pinout-key="tqfp100"/>
+        <variant key="atmega1280v_8cu" name="ATmega1280V-8CU" pinout-key="cbga100"/>
+        <variant key="atmega1280_16au" name="ATmega1280-16AU" pinout-key="tqfp100"/>
+        <variant key="atmega1280_16cu" name="ATmega1280-16CU" pinout-key="cbga100"/>
     </variants>
 </device>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA1281.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA1281.xml
index d454e201..d79506f7 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA1281.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA1281.xml
@@ -195,147 +195,145 @@
         <peripheral key="ac" name="AC" module-key="ac">
             <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"/>
+                <signal pad-key="pe2" index="0" function="default" group="AIN"/>
+                <signal pad-key="pe3" index="1" function="default" group="AIN"/>
             </signals>
         </peripheral>
         <peripheral key="usart0" name="USART0" module-key="usart">
             <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"/>
-                <signal pad-id="pe2" function="default" group="XCK"/>
+                <signal pad-key="pe1" function="default" group="TXD"/>
+                <signal pad-key="pe0" function="default" group="RXD"/>
+                <signal pad-key="pe2" function="default" group="XCK"/>
             </signals>
         </peripheral>
         <peripheral key="usart1" name="USART1" module-key="usart">
             <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"/>
-                <signal pad-id="pd5" function="default" group="XCK"/>
+                <signal pad-key="pd3" function="default" group="TXD"/>
+                <signal pad-key="pd2" function="default" group="RXD"/>
+                <signal pad-key="pd5" function="default" group="XCK"/>
             </signals>
         </peripheral>
         <peripheral key="twi" name="TWI" module-key="twi">
             <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"/>
+                <signal pad-key="pd1" function="default" group="SDA"/>
+                <signal pad-key="pd0" function="default" group="SCL"/>
             </signals>
         </peripheral>
         <peripheral key="spi" name="SPI" module-key="spi">
             <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"/>
-                <signal pad-id="pb3" function="default" group="MISO"/>
-                <signal pad-id="pb1" function="default" group="SCK"/>
+                <signal pad-key="pb0" function="default" group="SS"/>
+                <signal pad-key="pb2" function="default" group="MOSI"/>
+                <signal pad-key="pb3" function="default" group="MISO"/>
+                <signal pad-key="pb1" function="default" group="SCK"/>
             </signals>
         </peripheral>
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pa2" index="2" function="default" group="P"/>
-                <signal pad-id="pa3" index="3" function="default" group="P"/>
-                <signal pad-id="pa4" index="4" function="default" group="P"/>
-                <signal pad-id="pa5" index="5" function="default" group="P"/>
-                <signal pad-id="pa6" index="6" function="default" group="P"/>
-                <signal pad-id="pa7" index="7" function="default" group="P"/>
+                <signal pad-key="pa0" index="0" function="default" group="P"/>
+                <signal pad-key="pa1" index="1" function="default" group="P"/>
+                <signal pad-key="pa2" index="2" function="default" group="P"/>
+                <signal pad-key="pa3" index="3" function="default" group="P"/>
+                <signal pad-key="pa4" index="4" function="default" group="P"/>
+                <signal pad-key="pa5" index="5" function="default" group="P"/>
+                <signal pad-key="pa6" index="6" function="default" group="P"/>
+                <signal pad-key="pa7" index="7" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pb2" index="2" function="default" group="P"/>
-                <signal pad-id="pb3" index="3" function="default" group="P"/>
-                <signal pad-id="pb4" index="4" function="default" group="P"/>
-                <signal pad-id="pb5" index="5" function="default" group="P"/>
-                <signal pad-id="pb6" index="6" function="default" group="P"/>
-                <signal pad-id="pb7" index="7" function="default" group="P"/>
+                <signal pad-key="pb0" index="0" function="default" group="P"/>
+                <signal pad-key="pb1" index="1" function="default" group="P"/>
+                <signal pad-key="pb2" index="2" function="default" group="P"/>
+                <signal pad-key="pb3" index="3" function="default" group="P"/>
+                <signal pad-key="pb4" index="4" function="default" group="P"/>
+                <signal pad-key="pb5" index="5" function="default" group="P"/>
+                <signal pad-key="pb6" index="6" function="default" group="P"/>
+                <signal pad-key="pb7" index="7" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pc2" index="2" function="default" group="P"/>
-                <signal pad-id="pc3" index="3" function="default" group="P"/>
-                <signal pad-id="pc4" index="4" function="default" group="P"/>
-                <signal pad-id="pc5" index="5" function="default" group="P"/>
-                <signal pad-id="pc6" index="6" function="default" group="P"/>
-                <signal pad-id="pc7" index="7" function="default" group="P"/>
+                <signal pad-key="pc0" index="0" function="default" group="P"/>
+                <signal pad-key="pc1" index="1" function="default" group="P"/>
+                <signal pad-key="pc2" index="2" function="default" group="P"/>
+                <signal pad-key="pc3" index="3" function="default" group="P"/>
+                <signal pad-key="pc4" index="4" function="default" group="P"/>
+                <signal pad-key="pc5" index="5" function="default" group="P"/>
+                <signal pad-key="pc6" index="6" function="default" group="P"/>
+                <signal pad-key="pc7" index="7" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pd2" index="2" function="default" group="P"/>
-                <signal pad-id="pd3" index="3" function="default" group="P"/>
-                <signal pad-id="pd4" index="4" function="default" group="P"/>
-                <signal pad-id="pd5" index="5" function="default" group="P"/>
-                <signal pad-id="pd6" index="6" function="default" group="P"/>
-                <signal pad-id="pd7" index="7" function="default" group="P"/>
+                <signal pad-key="pd0" index="0" function="default" group="P"/>
+                <signal pad-key="pd1" index="1" function="default" group="P"/>
+                <signal pad-key="pd2" index="2" function="default" group="P"/>
+                <signal pad-key="pd3" index="3" function="default" group="P"/>
+                <signal pad-key="pd4" index="4" function="default" group="P"/>
+                <signal pad-key="pd5" index="5" function="default" group="P"/>
+                <signal pad-key="pd6" index="6" function="default" group="P"/>
+                <signal pad-key="pd7" index="7" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="porte" name="PORTE" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pe2" index="2" function="default" group="P"/>
-                <signal pad-id="pe3" index="3" function="default" group="P"/>
-                <signal pad-id="pe4" index="4" function="default" group="P"/>
-                <signal pad-id="pe5" index="5" function="default" group="P"/>
-                <signal pad-id="pe6" index="6" function="default" group="P"/>
-                <signal pad-id="pe7" index="7" function="default" group="P"/>
+                <signal pad-key="pe0" index="0" function="default" group="P"/>
+                <signal pad-key="pe1" index="1" function="default" group="P"/>
+                <signal pad-key="pe2" index="2" function="default" group="P"/>
+                <signal pad-key="pe3" index="3" function="default" group="P"/>
+                <signal pad-key="pe4" index="4" function="default" group="P"/>
+                <signal pad-key="pe5" index="5" function="default" group="P"/>
+                <signal pad-key="pe6" index="6" function="default" group="P"/>
+                <signal pad-key="pe7" index="7" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portf" name="PORTF" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pf2" index="2" function="default" group="P"/>
-                <signal pad-id="pf3" index="3" function="default" group="P"/>
-                <signal pad-id="pf4" index="4" function="default" group="P"/>
-                <signal pad-id="pf5" index="5" function="default" group="P"/>
-                <signal pad-id="pf6" index="6" function="default" group="P"/>
-                <signal pad-id="pf7" index="7" function="default" group="P"/>
+                <signal pad-key="pf0" index="0" function="default" group="P"/>
+                <signal pad-key="pf1" index="1" function="default" group="P"/>
+                <signal pad-key="pf2" index="2" function="default" group="P"/>
+                <signal pad-key="pf3" index="3" function="default" group="P"/>
+                <signal pad-key="pf4" index="4" function="default" group="P"/>
+                <signal pad-key="pf5" index="5" function="default" group="P"/>
+                <signal pad-key="pf6" index="6" function="default" group="P"/>
+                <signal pad-key="pf7" index="7" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portg" name="PORTG" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pg2" index="2" function="default" group="P"/>
-                <signal pad-id="pg3" index="3" function="default" group="P"/>
-                <signal pad-id="pg4" index="4" function="default" group="P"/>
-                <signal pad-id="pg5" index="5" function="default" group="P"/>
-                <signal pad-id="pg6" index="6" function="default" group="P"/>
-                <signal pad-id="pg7" index="7" function="default" group="P"/>
+                <signal pad-key="pg0" index="0" function="default" group="P"/>
+                <signal pad-key="pg1" index="1" function="default" group="P"/>
+                <signal pad-key="pg2" index="2" function="default" group="P"/>
+                <signal pad-key="pg3" index="3" function="default" group="P"/>
+                <signal pad-key="pg4" index="4" function="default" group="P"/>
+                <signal pad-key="pg5" index="5" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="tc0" name="TC0" module-key="tc8">
             <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"/>
-                <signal pad-id="pb7" function="default" group="OCA"/>
+                <signal pad-key="pd7" function="default" group="T"/>
+                <signal pad-key="pg5" function="default" group="OCB"/>
+                <signal pad-key="pb7" function="default" group="OCA"/>
             </signals>
         </peripheral>
         <peripheral key="tc2" name="TC2" module-key="tc8_async">
             <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"/>
-                <signal pad-id="pb4" function="default" group="OCA"/>
+                <signal pad-key="pg4" index="1" function="default" group="TOSC"/>
+                <signal pad-key="pg3" index="2" function="default" group="TOSC"/>
+                <signal pad-key="pb4" function="default" group="OCA"/>
             </signals>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="wdt">
@@ -350,21 +348,21 @@
         <peripheral key="tc3" name="TC3" module-key="tc16">
             <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"/>
-                <signal pad-id="pe3" function="default" group="OCA"/>
-                <signal pad-id="pe4" function="default" group="OCB"/>
-                <signal pad-id="pe5" function="default" group="OCC"/>
+                <signal pad-key="pe6" function="default" group="T"/>
+                <signal pad-key="pe7" function="default" group="ICP"/>
+                <signal pad-key="pe3" function="default" group="OCA"/>
+                <signal pad-key="pe4" function="default" group="OCB"/>
+                <signal pad-key="pe5" function="default" group="OCC"/>
             </signals>
         </peripheral>
         <peripheral key="tc1" name="TC1" module-key="tc16">
             <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"/>
-                <signal pad-id="pb5" function="default" group="OCA"/>
-                <signal pad-id="pb6" function="default" group="OCB"/>
-                <signal pad-id="pb7" function="default" group="OCC"/>
+                <signal pad-key="pd6" function="default" group="T"/>
+                <signal pad-key="pd4" function="default" group="ICP"/>
+                <signal pad-key="pb5" function="default" group="OCA"/>
+                <signal pad-key="pb6" function="default" group="OCB"/>
+                <signal pad-key="pb7" function="default" group="OCC"/>
             </signals>
         </peripheral>
         <peripheral key="eeprom" name="EEPROM" module-key="eeprom">
@@ -373,45 +371,45 @@
         <peripheral key="jtag" name="JTAG" module-key="jtag">
             <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"/>
-                <signal pad-id="pf6" function="default" group="TDO"/>
-                <signal pad-id="pf7" function="default" group="TDI"/>
+                <signal pad-key="pf4" function="default" group="TCK"/>
+                <signal pad-key="pf5" function="default" group="TMS"/>
+                <signal pad-key="pf6" function="default" group="TDO"/>
+                <signal pad-key="pf7" function="default" group="TDI"/>
             </signals>
         </peripheral>
         <peripheral key="exint" name="EXINT" module-key="exint">
             <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"/>
-                <signal pad-id="pb2" index="2" function="default" group="PCINT"/>
-                <signal pad-id="pb3" index="3" function="default" group="PCINT"/>
-                <signal pad-id="pb4" index="4" function="default" group="PCINT"/>
-                <signal pad-id="pb5" index="5" function="default" group="PCINT"/>
-                <signal pad-id="pb6" index="6" function="default" group="PCINT"/>
-                <signal pad-id="pb7" index="7" function="default" group="PCINT"/>
-                <signal pad-id="pe0" index="8" function="default" group="PCINT"/>
-                <signal pad-id="pd0" index="0" function="default" group="INT"/>
-                <signal pad-id="pd1" index="1" function="default" group="INT"/>
-                <signal pad-id="pd2" index="2" function="default" group="INT"/>
-                <signal pad-id="pd3" index="3" function="default" group="INT"/>
-                <signal pad-id="pe4" index="4" function="default" group="INT"/>
-                <signal pad-id="pe5" index="5" function="default" group="INT"/>
-                <signal pad-id="pe6" index="6" function="default" group="INT"/>
-                <signal pad-id="pe7" index="7" function="default" group="INT"/>
+                <signal pad-key="pb0" index="0" function="default" group="PCINT"/>
+                <signal pad-key="pb1" index="1" function="default" group="PCINT"/>
+                <signal pad-key="pb2" index="2" function="default" group="PCINT"/>
+                <signal pad-key="pb3" index="3" function="default" group="PCINT"/>
+                <signal pad-key="pb4" index="4" function="default" group="PCINT"/>
+                <signal pad-key="pb5" index="5" function="default" group="PCINT"/>
+                <signal pad-key="pb6" index="6" function="default" group="PCINT"/>
+                <signal pad-key="pb7" index="7" function="default" group="PCINT"/>
+                <signal pad-key="pe0" index="8" function="default" group="PCINT"/>
+                <signal pad-key="pd0" index="0" function="default" group="INT"/>
+                <signal pad-key="pd1" index="1" function="default" group="INT"/>
+                <signal pad-key="pd2" index="2" function="default" group="INT"/>
+                <signal pad-key="pd3" index="3" function="default" group="INT"/>
+                <signal pad-key="pe4" index="4" function="default" group="INT"/>
+                <signal pad-key="pe5" index="5" function="default" group="INT"/>
+                <signal pad-key="pe6" index="6" function="default" group="INT"/>
+                <signal pad-key="pe7" index="7" function="default" group="INT"/>
             </signals>
         </peripheral>
         <peripheral key="adc" name="ADC" module-key="adc">
             <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"/>
-                <signal pad-id="pf2" index="2" function="default" group="ADC"/>
-                <signal pad-id="pf3" index="3" function="default" group="ADC"/>
-                <signal pad-id="pf4" index="4" function="default" group="ADC"/>
-                <signal pad-id="pf5" index="5" function="default" group="ADC"/>
-                <signal pad-id="pf6" index="6" function="default" group="ADC"/>
-                <signal pad-id="pf7" index="7" function="default" group="ADC"/>
+                <signal pad-key="pf0" index="0" function="default" group="ADC"/>
+                <signal pad-key="pf1" index="1" function="default" group="ADC"/>
+                <signal pad-key="pf2" index="2" function="default" group="ADC"/>
+                <signal pad-key="pf3" index="3" function="default" group="ADC"/>
+                <signal pad-key="pf4" index="4" function="default" group="ADC"/>
+                <signal pad-key="pf5" index="5" function="default" group="ADC"/>
+                <signal pad-key="pf6" index="6" function="default" group="ADC"/>
+                <signal pad-key="pf7" index="7" function="default" group="ADC"/>
             </signals>
         </peripheral>
         <peripheral key="boot_load" name="BOOT_LOAD" module-key="boot_load">
@@ -420,7 +418,7 @@
         <peripheral key="cpu" name="CPU" module-key="cpu">
             <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"/>
+                <signal pad-key="pe7" index="0" function="default" group="CLKO"/>
             </signals>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="fuse">
@@ -1067,144 +1065,207 @@
             </register-group>
         </module>
     </modules>
+    <pads>
+        <pad key="pg5" name="PG5"/>
+        <pad key="pe0" name="PE0"/>
+        <pad key="pe1" name="PE1"/>
+        <pad key="pe2" name="PE2"/>
+        <pad key="pe3" name="PE3"/>
+        <pad key="pe4" name="PE4"/>
+        <pad key="pe5" name="PE5"/>
+        <pad key="pe6" name="PE6"/>
+        <pad key="pe7" name="PE7"/>
+        <pad key="pb0" name="PB0"/>
+        <pad key="pb1" name="PB1"/>
+        <pad key="pb2" name="PB2"/>
+        <pad key="pb3" name="PB3"/>
+        <pad key="pb4" name="PB4"/>
+        <pad key="pb5" name="PB5"/>
+        <pad key="pb6" name="PB6"/>
+        <pad key="pb7" name="PB7"/>
+        <pad key="pg3" name="PG3"/>
+        <pad key="pg4" name="PG4"/>
+        <pad key="reset" name="RESET"/>
+        <pad key="vcc" name="VCC"/>
+        <pad key="gnd" name="GND"/>
+        <pad key="xtal2" name="XTAL2"/>
+        <pad key="xtal1" name="XTAL1"/>
+        <pad key="pd0" name="PD0"/>
+        <pad key="pd1" name="PD1"/>
+        <pad key="pd2" name="PD2"/>
+        <pad key="pd3" name="PD3"/>
+        <pad key="pd4" name="PD4"/>
+        <pad key="pd5" name="PD5"/>
+        <pad key="pd6" name="PD6"/>
+        <pad key="pd7" name="PD7"/>
+        <pad key="pg0" name="PG0"/>
+        <pad key="pg1" name="PG1"/>
+        <pad key="pc0" name="PC0"/>
+        <pad key="pc1" name="PC1"/>
+        <pad key="pc2" name="PC2"/>
+        <pad key="pc3" name="PC3"/>
+        <pad key="pc4" name="PC4"/>
+        <pad key="pc5" name="PC5"/>
+        <pad key="pc6" name="PC6"/>
+        <pad key="pc7" name="PC7"/>
+        <pad key="pg2" name="PG2"/>
+        <pad key="pa7" name="PA7"/>
+        <pad key="pa6" name="PA6"/>
+        <pad key="pa5" name="PA5"/>
+        <pad key="pa4" name="PA4"/>
+        <pad key="pa3" name="PA3"/>
+        <pad key="pa2" name="PA2"/>
+        <pad key="pa1" name="PA1"/>
+        <pad key="pa0" name="PA0"/>
+        <pad key="pf7" name="PF7"/>
+        <pad key="pf6" name="PF6"/>
+        <pad key="pf5" name="PF5"/>
+        <pad key="pf4" name="PF4"/>
+        <pad key="pf3" name="PF3"/>
+        <pad key="pf2" name="PF2"/>
+        <pad key="pf1" name="PF1"/>
+        <pad key="pf0" name="PF0"/>
+        <pad key="aref" name="AREF"/>
+        <pad key="avcc" name="AVCC"/>
+    </pads>
     <pinouts>
         <pinout key="tqfp64" name="TQFP64" type="qfp">
-            <pin position="1" pad="PG5"/>
-            <pin position="2" pad="PE0"/>
-            <pin position="3" pad="PE1"/>
-            <pin position="4" pad="PE2"/>
-            <pin position="5" pad="PE3"/>
-            <pin position="6" pad="PE4"/>
-            <pin position="7" pad="PE5"/>
-            <pin position="8" pad="PE6"/>
-            <pin position="9" pad="PE7"/>
-            <pin position="10" pad="PB0"/>
-            <pin position="11" pad="PB1"/>
-            <pin position="12" pad="PB2"/>
-            <pin position="13" pad="PB3"/>
-            <pin position="14" pad="PB4"/>
-            <pin position="15" pad="PB5"/>
-            <pin position="16" pad="PB6"/>
-            <pin position="17" pad="PB7"/>
-            <pin position="18" pad="PG3"/>
-            <pin position="19" pad="PG4"/>
-            <pin position="20" pad="RESET"/>
-            <pin position="21" pad="VCC"/>
-            <pin position="22" pad="GND"/>
-            <pin position="23" pad="XTAL2"/>
-            <pin position="24" pad="XTAL1"/>
-            <pin position="25" pad="PD0"/>
-            <pin position="26" pad="PD1"/>
-            <pin position="27" pad="PD2"/>
-            <pin position="28" pad="PD3"/>
-            <pin position="29" pad="PD4"/>
-            <pin position="30" pad="PD5"/>
-            <pin position="31" pad="PD6"/>
-            <pin position="32" pad="PD7"/>
-            <pin position="33" pad="PG0"/>
-            <pin position="34" pad="PG1"/>
-            <pin position="35" pad="PC0"/>
-            <pin position="36" pad="PC1"/>
-            <pin position="37" pad="PC2"/>
-            <pin position="38" pad="PC3"/>
-            <pin position="39" pad="PC4"/>
-            <pin position="40" pad="PC5"/>
-            <pin position="41" pad="PC6"/>
-            <pin position="42" pad="PC7"/>
-            <pin position="43" pad="PG2"/>
-            <pin position="44" pad="PA7"/>
-            <pin position="45" pad="PA6"/>
-            <pin position="46" pad="PA5"/>
-            <pin position="47" pad="PA4"/>
-            <pin position="48" pad="PA3"/>
-            <pin position="49" pad="PA2"/>
-            <pin position="50" pad="PA1"/>
-            <pin position="51" pad="PA0"/>
-            <pin position="52" pad="VCC"/>
-            <pin position="53" pad="GND"/>
-            <pin position="54" pad="PF7"/>
-            <pin position="55" pad="PF6"/>
-            <pin position="56" pad="PF5"/>
-            <pin position="57" pad="PF4"/>
-            <pin position="58" pad="PF3"/>
-            <pin position="59" pad="PF2"/>
-            <pin position="60" pad="PF1"/>
-            <pin position="61" pad="PF0"/>
-            <pin position="62" pad="AREF"/>
-            <pin position="63" pad="GND"/>
-            <pin position="64" pad="AVCC"/>
+            <pin position="1" pad-key="pg5"/>
+            <pin position="2" pad-key="pe0"/>
+            <pin position="3" pad-key="pe1"/>
+            <pin position="4" pad-key="pe2"/>
+            <pin position="5" pad-key="pe3"/>
+            <pin position="6" pad-key="pe4"/>
+            <pin position="7" pad-key="pe5"/>
+            <pin position="8" pad-key="pe6"/>
+            <pin position="9" pad-key="pe7"/>
+            <pin position="10" pad-key="pb0"/>
+            <pin position="11" pad-key="pb1"/>
+            <pin position="12" pad-key="pb2"/>
+            <pin position="13" pad-key="pb3"/>
+            <pin position="14" pad-key="pb4"/>
+            <pin position="15" pad-key="pb5"/>
+            <pin position="16" pad-key="pb6"/>
+            <pin position="17" pad-key="pb7"/>
+            <pin position="18" pad-key="pg3"/>
+            <pin position="19" pad-key="pg4"/>
+            <pin position="20" pad-key="reset"/>
+            <pin position="21" pad-key="vcc"/>
+            <pin position="22" pad-key="gnd"/>
+            <pin position="23" pad-key="xtal2"/>
+            <pin position="24" pad-key="xtal1"/>
+            <pin position="25" pad-key="pd0"/>
+            <pin position="26" pad-key="pd1"/>
+            <pin position="27" pad-key="pd2"/>
+            <pin position="28" pad-key="pd3"/>
+            <pin position="29" pad-key="pd4"/>
+            <pin position="30" pad-key="pd5"/>
+            <pin position="31" pad-key="pd6"/>
+            <pin position="32" pad-key="pd7"/>
+            <pin position="33" pad-key="pg0"/>
+            <pin position="34" pad-key="pg1"/>
+            <pin position="35" pad-key="pc0"/>
+            <pin position="36" pad-key="pc1"/>
+            <pin position="37" pad-key="pc2"/>
+            <pin position="38" pad-key="pc3"/>
+            <pin position="39" pad-key="pc4"/>
+            <pin position="40" pad-key="pc5"/>
+            <pin position="41" pad-key="pc6"/>
+            <pin position="42" pad-key="pc7"/>
+            <pin position="43" pad-key="pg2"/>
+            <pin position="44" pad-key="pa7"/>
+            <pin position="45" pad-key="pa6"/>
+            <pin position="46" pad-key="pa5"/>
+            <pin position="47" pad-key="pa4"/>
+            <pin position="48" pad-key="pa3"/>
+            <pin position="49" pad-key="pa2"/>
+            <pin position="50" pad-key="pa1"/>
+            <pin position="51" pad-key="pa0"/>
+            <pin position="52" pad-key="vcc"/>
+            <pin position="53" pad-key="gnd"/>
+            <pin position="54" pad-key="pf7"/>
+            <pin position="55" pad-key="pf6"/>
+            <pin position="56" pad-key="pf5"/>
+            <pin position="57" pad-key="pf4"/>
+            <pin position="58" pad-key="pf3"/>
+            <pin position="59" pad-key="pf2"/>
+            <pin position="60" pad-key="pf1"/>
+            <pin position="61" pad-key="pf0"/>
+            <pin position="62" pad-key="aref"/>
+            <pin position="63" pad-key="gnd"/>
+            <pin position="64" pad-key="avcc"/>
         </pinout>
         <pinout key="qfn64" name="QFN64" type="qfn">
-            <pin position="1" pad="PG5"/>
-            <pin position="2" pad="PE0"/>
-            <pin position="3" pad="PE1"/>
-            <pin position="4" pad="PE2"/>
-            <pin position="5" pad="PE3"/>
-            <pin position="6" pad="PE4"/>
-            <pin position="7" pad="PE5"/>
-            <pin position="8" pad="PE6"/>
-            <pin position="9" pad="PE7"/>
-            <pin position="10" pad="PB0"/>
-            <pin position="11" pad="PB1"/>
-            <pin position="12" pad="PB2"/>
-            <pin position="13" pad="PB3"/>
-            <pin position="14" pad="PB4"/>
-            <pin position="15" pad="PB5"/>
-            <pin position="16" pad="PB6"/>
-            <pin position="17" pad="PB7"/>
-            <pin position="18" pad="PG3"/>
-            <pin position="19" pad="PG4"/>
-            <pin position="20" pad="RESET"/>
-            <pin position="21" pad="VCC"/>
-            <pin position="22" pad="GND"/>
-            <pin position="23" pad="XTAL2"/>
-            <pin position="24" pad="XTAL1"/>
-            <pin position="25" pad="PD0"/>
-            <pin position="26" pad="PD1"/>
-            <pin position="27" pad="PD2"/>
-            <pin position="28" pad="PD3"/>
-            <pin position="29" pad="PD4"/>
-            <pin position="30" pad="PD5"/>
-            <pin position="31" pad="PD6"/>
-            <pin position="32" pad="PD7"/>
-            <pin position="33" pad="PG0"/>
-            <pin position="34" pad="PG1"/>
-            <pin position="35" pad="PC0"/>
-            <pin position="36" pad="PC1"/>
-            <pin position="37" pad="PC2"/>
-            <pin position="38" pad="PC3"/>
-            <pin position="39" pad="PC4"/>
-            <pin position="40" pad="PC5"/>
-            <pin position="41" pad="PC6"/>
-            <pin position="42" pad="PC7"/>
-            <pin position="43" pad="PG2"/>
-            <pin position="44" pad="PA7"/>
-            <pin position="45" pad="PA6"/>
-            <pin position="46" pad="PA5"/>
-            <pin position="47" pad="PA4"/>
-            <pin position="48" pad="PA3"/>
-            <pin position="49" pad="PA2"/>
-            <pin position="50" pad="PA1"/>
-            <pin position="51" pad="PA0"/>
-            <pin position="52" pad="VCC"/>
-            <pin position="53" pad="GND"/>
-            <pin position="54" pad="PF7"/>
-            <pin position="55" pad="PF6"/>
-            <pin position="56" pad="PF5"/>
-            <pin position="57" pad="PF4"/>
-            <pin position="58" pad="PF3"/>
-            <pin position="59" pad="PF2"/>
-            <pin position="60" pad="PF1"/>
-            <pin position="61" pad="PF0"/>
-            <pin position="62" pad="AREF"/>
-            <pin position="63" pad="GND"/>
-            <pin position="64" pad="AVCC"/>
+            <pin position="1" pad-key="pg5"/>
+            <pin position="2" pad-key="pe0"/>
+            <pin position="3" pad-key="pe1"/>
+            <pin position="4" pad-key="pe2"/>
+            <pin position="5" pad-key="pe3"/>
+            <pin position="6" pad-key="pe4"/>
+            <pin position="7" pad-key="pe5"/>
+            <pin position="8" pad-key="pe6"/>
+            <pin position="9" pad-key="pe7"/>
+            <pin position="10" pad-key="pb0"/>
+            <pin position="11" pad-key="pb1"/>
+            <pin position="12" pad-key="pb2"/>
+            <pin position="13" pad-key="pb3"/>
+            <pin position="14" pad-key="pb4"/>
+            <pin position="15" pad-key="pb5"/>
+            <pin position="16" pad-key="pb6"/>
+            <pin position="17" pad-key="pb7"/>
+            <pin position="18" pad-key="pg3"/>
+            <pin position="19" pad-key="pg4"/>
+            <pin position="20" pad-key="reset"/>
+            <pin position="21" pad-key="vcc"/>
+            <pin position="22" pad-key="gnd"/>
+            <pin position="23" pad-key="xtal2"/>
+            <pin position="24" pad-key="xtal1"/>
+            <pin position="25" pad-key="pd0"/>
+            <pin position="26" pad-key="pd1"/>
+            <pin position="27" pad-key="pd2"/>
+            <pin position="28" pad-key="pd3"/>
+            <pin position="29" pad-key="pd4"/>
+            <pin position="30" pad-key="pd5"/>
+            <pin position="31" pad-key="pd6"/>
+            <pin position="32" pad-key="pd7"/>
+            <pin position="33" pad-key="pg0"/>
+            <pin position="34" pad-key="pg1"/>
+            <pin position="35" pad-key="pc0"/>
+            <pin position="36" pad-key="pc1"/>
+            <pin position="37" pad-key="pc2"/>
+            <pin position="38" pad-key="pc3"/>
+            <pin position="39" pad-key="pc4"/>
+            <pin position="40" pad-key="pc5"/>
+            <pin position="41" pad-key="pc6"/>
+            <pin position="42" pad-key="pc7"/>
+            <pin position="43" pad-key="pg2"/>
+            <pin position="44" pad-key="pa7"/>
+            <pin position="45" pad-key="pa6"/>
+            <pin position="46" pad-key="pa5"/>
+            <pin position="47" pad-key="pa4"/>
+            <pin position="48" pad-key="pa3"/>
+            <pin position="49" pad-key="pa2"/>
+            <pin position="50" pad-key="pa1"/>
+            <pin position="51" pad-key="pa0"/>
+            <pin position="52" pad-key="vcc"/>
+            <pin position="53" pad-key="gnd"/>
+            <pin position="54" pad-key="pf7"/>
+            <pin position="55" pad-key="pf6"/>
+            <pin position="56" pad-key="pf5"/>
+            <pin position="57" pad-key="pf4"/>
+            <pin position="58" pad-key="pf3"/>
+            <pin position="59" pad-key="pf2"/>
+            <pin position="60" pad-key="pf1"/>
+            <pin position="61" pad-key="pf0"/>
+            <pin position="62" pad-key="aref"/>
+            <pin position="63" pad-key="gnd"/>
+            <pin position="64" pad-key="avcc"/>
         </pinout>
     </pinouts>
     <variants>
-        <variant name="ATmega1281V-8AU" pinout-key="tqfp64" package="TQFP64"/>
-        <variant name="ATmega1281V-8MU" pinout-key="qfn64" package="QFN64"/>
-        <variant name="ATmega1281-16AU" pinout-key="tqfp64" package="TQFP64"/>
-        <variant name="ATmega1281-16MU" pinout-key="qfn64" package="QFN64"/>
+        <variant key="atmega1281v_8au" name="ATmega1281V-8AU" pinout-key="tqfp64"/>
+        <variant key="atmega1281v_8mu" name="ATmega1281V-8MU" pinout-key="qfn64"/>
+        <variant key="atmega1281_16au" name="ATmega1281-16AU" pinout-key="tqfp64"/>
+        <variant key="atmega1281_16mu" name="ATmega1281-16MU" pinout-key="qfn64"/>
     </variants>
 </device>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA1284.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA1284.xml
index 076fe420..b1c0f1a9 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA1284.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA1284.xml
@@ -220,109 +220,109 @@
         <peripheral key="ac" name="AC" module-key="ac">
             <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"/>
+                <signal pad-key="pb2" index="0" function="default" group="AIN"/>
+                <signal pad-key="pb3" index="1" function="default" group="AIN"/>
             </signals>
         </peripheral>
         <peripheral key="usart0" name="USART0" module-key="usart">
             <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"/>
-                <signal pad-id="pb0" function="default" group="XCK"/>
+                <signal pad-key="pd1" function="default" group="TXD"/>
+                <signal pad-key="pd0" function="default" group="RXD"/>
+                <signal pad-key="pb0" function="default" group="XCK"/>
             </signals>
         </peripheral>
         <peripheral key="usart1" name="USART1" module-key="usart">
             <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"/>
-                <signal pad-id="pd4" function="default" group="XCK"/>
+                <signal pad-key="pd3" function="default" group="TXD"/>
+                <signal pad-key="pd2" function="default" group="RXD"/>
+                <signal pad-key="pd4" function="default" group="XCK"/>
             </signals>
         </peripheral>
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pa2" index="2" function="default" group="P"/>
-                <signal pad-id="pa3" index="3" function="default" group="P"/>
-                <signal pad-id="pa4" index="4" function="default" group="P"/>
-                <signal pad-id="pa5" index="5" function="default" group="P"/>
-                <signal pad-id="pa6" index="6" function="default" group="P"/>
-                <signal pad-id="pa7" index="7" function="default" group="P"/>
+                <signal pad-key="pa0" index="0" function="default" group="P"/>
+                <signal pad-key="pa1" index="1" function="default" group="P"/>
+                <signal pad-key="pa2" index="2" function="default" group="P"/>
+                <signal pad-key="pa3" index="3" function="default" group="P"/>
+                <signal pad-key="pa4" index="4" function="default" group="P"/>
+                <signal pad-key="pa5" index="5" function="default" group="P"/>
+                <signal pad-key="pa6" index="6" function="default" group="P"/>
+                <signal pad-key="pa7" index="7" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pb2" index="2" function="default" group="P"/>
-                <signal pad-id="pb3" index="3" function="default" group="P"/>
-                <signal pad-id="pb4" index="4" function="default" group="P"/>
-                <signal pad-id="pb5" index="5" function="default" group="P"/>
-                <signal pad-id="pb6" index="6" function="default" group="P"/>
-                <signal pad-id="pb7" index="7" function="default" group="P"/>
+                <signal pad-key="pb0" index="0" function="default" group="P"/>
+                <signal pad-key="pb1" index="1" function="default" group="P"/>
+                <signal pad-key="pb2" index="2" function="default" group="P"/>
+                <signal pad-key="pb3" index="3" function="default" group="P"/>
+                <signal pad-key="pb4" index="4" function="default" group="P"/>
+                <signal pad-key="pb5" index="5" function="default" group="P"/>
+                <signal pad-key="pb6" index="6" function="default" group="P"/>
+                <signal pad-key="pb7" index="7" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pc2" index="2" function="default" group="P"/>
-                <signal pad-id="pc3" index="3" function="default" group="P"/>
-                <signal pad-id="pc4" index="4" function="default" group="P"/>
-                <signal pad-id="pc5" index="5" function="default" group="P"/>
-                <signal pad-id="pc6" index="6" function="default" group="P"/>
-                <signal pad-id="pc7" index="7" function="default" group="P"/>
+                <signal pad-key="pc0" index="0" function="default" group="P"/>
+                <signal pad-key="pc1" index="1" function="default" group="P"/>
+                <signal pad-key="pc2" index="2" function="default" group="P"/>
+                <signal pad-key="pc3" index="3" function="default" group="P"/>
+                <signal pad-key="pc4" index="4" function="default" group="P"/>
+                <signal pad-key="pc5" index="5" function="default" group="P"/>
+                <signal pad-key="pc6" index="6" function="default" group="P"/>
+                <signal pad-key="pc7" index="7" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pd2" index="2" function="default" group="P"/>
-                <signal pad-id="pd3" index="3" function="default" group="P"/>
-                <signal pad-id="pd4" index="4" function="default" group="P"/>
-                <signal pad-id="pd5" index="5" function="default" group="P"/>
-                <signal pad-id="pd6" index="6" function="default" group="P"/>
-                <signal pad-id="pd7" index="7" function="default" group="P"/>
+                <signal pad-key="pd0" index="0" function="default" group="P"/>
+                <signal pad-key="pd1" index="1" function="default" group="P"/>
+                <signal pad-key="pd2" index="2" function="default" group="P"/>
+                <signal pad-key="pd3" index="3" function="default" group="P"/>
+                <signal pad-key="pd4" index="4" function="default" group="P"/>
+                <signal pad-key="pd5" index="5" function="default" group="P"/>
+                <signal pad-key="pd6" index="6" function="default" group="P"/>
+                <signal pad-key="pd7" index="7" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="tc0" name="TC0" module-key="tc8">
             <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"/>
-                <signal pad-id="pb3" function="default" group="OCA"/>
+                <signal pad-key="pb0" function="default" group="T"/>
+                <signal pad-key="pb4" function="default" group="OCB"/>
+                <signal pad-key="pb3" function="default" group="OCA"/>
             </signals>
         </peripheral>
         <peripheral key="tc1" name="TC1" module-key="tc16">
             <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"/>
-                <signal pad-id="pd5" function="default" group="OCA"/>
-                <signal pad-id="pd4" function="default" group="OCB"/>
+                <signal pad-key="pb1" function="default" group="T"/>
+                <signal pad-key="pd6" function="default" group="ICP"/>
+                <signal pad-key="pd5" function="default" group="OCA"/>
+                <signal pad-key="pd4" function="default" group="OCB"/>
             </signals>
         </peripheral>
         <peripheral key="tc3" name="TC3" module-key="tc16">
             <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"/>
-                <signal pad-id="pb7" function="default" group="OCB"/>
-                <signal pad-id="pb6" function="default" group="OCA"/>
+                <signal pad-key="pd0" function="default" group="T"/>
+                <signal pad-key="pb5" function="default" group="ICP"/>
+                <signal pad-key="pb7" function="default" group="OCB"/>
+                <signal pad-key="pb6" function="default" group="OCA"/>
             </signals>
         </peripheral>
         <peripheral key="tc2" name="TC2" module-key="tc8_async">
             <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"/>
+                <signal pad-key="pd7" function="default" group="OCA"/>
+                <signal pad-key="pd6" function="default" group="OCB"/>
             </signals>
         </peripheral>
         <peripheral key="boot_load" name="BOOT_LOAD" module-key="boot_load">
@@ -331,63 +331,63 @@
         <peripheral key="exint" name="EXINT" module-key="exint">
             <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"/>
-                <signal pad-id="pa2" index="2" function="default" group="PCINT"/>
-                <signal pad-id="pa3" index="3" function="default" group="PCINT"/>
-                <signal pad-id="pa4" index="4" function="default" group="PCINT"/>
-                <signal pad-id="pa5" index="5" function="default" group="PCINT"/>
-                <signal pad-id="pa6" index="6" function="default" group="PCINT"/>
-                <signal pad-id="pa7" index="7" function="default" group="PCINT"/>
-                <signal pad-id="pb0" index="8" function="default" group="PCINT"/>
-                <signal pad-id="pb1" index="9" function="default" group="PCINT"/>
-                <signal pad-id="pb2" index="10" function="default" group="PCINT"/>
-                <signal pad-id="pb2" index="2" function="default" group="INT"/>
-                <signal pad-id="pb3" index="11" function="default" group="PCINT"/>
-                <signal pad-id="pb4" index="12" function="default" group="PCINT"/>
-                <signal pad-id="pb5" index="13" function="default" group="PCINT"/>
-                <signal pad-id="pb6" index="14" function="default" group="PCINT"/>
-                <signal pad-id="pb7" index="15" function="default" group="PCINT"/>
-                <signal pad-id="pc0" index="16" function="default" group="PCINT"/>
-                <signal pad-id="pc1" index="17" function="default" group="PCINT"/>
-                <signal pad-id="pc2" index="18" function="default" group="PCINT"/>
-                <signal pad-id="pc3" index="19" function="default" group="PCINT"/>
-                <signal pad-id="pc4" index="20" function="default" group="PCINT"/>
-                <signal pad-id="pc5" index="21" function="default" group="PCINT"/>
-                <signal pad-id="pc6" index="22" function="default" group="PCINT"/>
-                <signal pad-id="pc7" index="23" function="default" group="PCINT"/>
-                <signal pad-id="pd0" index="24" function="default" group="PCINT"/>
-                <signal pad-id="pd1" index="25" function="default" group="PCINT"/>
-                <signal pad-id="pd2" index="26" function="default" group="PCINT"/>
-                <signal pad-id="pd2" index="0" function="default" group="INT"/>
-                <signal pad-id="pd3" index="27" function="default" group="PCINT"/>
-                <signal pad-id="pd3" index="1" function="default" group="INT"/>
-                <signal pad-id="pd4" index="28" function="default" group="PCINT"/>
-                <signal pad-id="pd5" index="29" function="default" group="PCINT"/>
-                <signal pad-id="pd6" index="30" function="default" group="PCINT"/>
-                <signal pad-id="pd7" index="31" function="default" group="PCINT"/>
+                <signal pad-key="pa0" index="0" function="default" group="PCINT"/>
+                <signal pad-key="pa1" index="1" function="default" group="PCINT"/>
+                <signal pad-key="pa2" index="2" function="default" group="PCINT"/>
+                <signal pad-key="pa3" index="3" function="default" group="PCINT"/>
+                <signal pad-key="pa4" index="4" function="default" group="PCINT"/>
+                <signal pad-key="pa5" index="5" function="default" group="PCINT"/>
+                <signal pad-key="pa6" index="6" function="default" group="PCINT"/>
+                <signal pad-key="pa7" index="7" function="default" group="PCINT"/>
+                <signal pad-key="pb0" index="8" function="default" group="PCINT"/>
+                <signal pad-key="pb1" index="9" function="default" group="PCINT"/>
+                <signal pad-key="pb2" index="10" function="default" group="PCINT"/>
+                <signal pad-key="pb2" index="2" function="default" group="INT"/>
+                <signal pad-key="pb3" index="11" function="default" group="PCINT"/>
+                <signal pad-key="pb4" index="12" function="default" group="PCINT"/>
+                <signal pad-key="pb5" index="13" function="default" group="PCINT"/>
+                <signal pad-key="pb6" index="14" function="default" group="PCINT"/>
+                <signal pad-key="pb7" index="15" function="default" group="PCINT"/>
+                <signal pad-key="pc0" index="16" function="default" group="PCINT"/>
+                <signal pad-key="pc1" index="17" function="default" group="PCINT"/>
+                <signal pad-key="pc2" index="18" function="default" group="PCINT"/>
+                <signal pad-key="pc3" index="19" function="default" group="PCINT"/>
+                <signal pad-key="pc4" index="20" function="default" group="PCINT"/>
+                <signal pad-key="pc5" index="21" function="default" group="PCINT"/>
+                <signal pad-key="pc6" index="22" function="default" group="PCINT"/>
+                <signal pad-key="pc7" index="23" function="default" group="PCINT"/>
+                <signal pad-key="pd0" index="24" function="default" group="PCINT"/>
+                <signal pad-key="pd1" index="25" function="default" group="PCINT"/>
+                <signal pad-key="pd2" index="26" function="default" group="PCINT"/>
+                <signal pad-key="pd2" index="0" function="default" group="INT"/>
+                <signal pad-key="pd3" index="27" function="default" group="PCINT"/>
+                <signal pad-key="pd3" index="1" function="default" group="INT"/>
+                <signal pad-key="pd4" index="28" function="default" group="PCINT"/>
+                <signal pad-key="pd5" index="29" function="default" group="PCINT"/>
+                <signal pad-key="pd6" index="30" function="default" group="PCINT"/>
+                <signal pad-key="pd7" index="31" function="default" group="PCINT"/>
             </signals>
         </peripheral>
         <peripheral key="adc" name="ADC" module-key="adc">
             <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"/>
-                <signal pad-id="pa2" index="2" function="default" group="ADC"/>
-                <signal pad-id="pa3" index="3" function="default" group="ADC"/>
-                <signal pad-id="pa4" index="4" function="default" group="ADC"/>
-                <signal pad-id="pa5" index="5" function="default" group="ADC"/>
-                <signal pad-id="pa6" index="6" function="default" group="ADC"/>
-                <signal pad-id="pa7" index="7" function="default" group="ADC"/>
+                <signal pad-key="pa0" index="0" function="default" group="ADC"/>
+                <signal pad-key="pa1" index="1" function="default" group="ADC"/>
+                <signal pad-key="pa2" index="2" function="default" group="ADC"/>
+                <signal pad-key="pa3" index="3" function="default" group="ADC"/>
+                <signal pad-key="pa4" index="4" function="default" group="ADC"/>
+                <signal pad-key="pa5" index="5" function="default" group="ADC"/>
+                <signal pad-key="pa6" index="6" function="default" group="ADC"/>
+                <signal pad-key="pa7" index="7" function="default" group="ADC"/>
             </signals>
         </peripheral>
         <peripheral key="jtag" name="JTAG" module-key="jtag">
             <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"/>
-                <signal pad-id="pc4" function="default" group="TDO"/>
-                <signal pad-id="pc5" function="default" group="TDI"/>
+                <signal pad-key="pc2" function="default" group="TCK"/>
+                <signal pad-key="pc3" function="default" group="TMS"/>
+                <signal pad-key="pc4" function="default" group="TDO"/>
+                <signal pad-key="pc5" function="default" group="TDI"/>
             </signals>
         </peripheral>
         <peripheral key="eeprom" name="EEPROM" module-key="eeprom">
@@ -396,17 +396,17 @@
         <peripheral key="twi" name="TWI" module-key="twi">
             <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"/>
+                <signal pad-key="pc1" function="default" group="SDA"/>
+                <signal pad-key="pc0" function="default" group="SCL"/>
             </signals>
         </peripheral>
         <peripheral key="spi" name="SPI" module-key="spi">
             <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"/>
-                <signal pad-id="pb6" function="default" group="MISO"/>
-                <signal pad-id="pb7" function="default" group="SCK"/>
+                <signal pad-key="pb4" function="default" group="SS"/>
+                <signal pad-key="pb5" function="default" group="MOSI"/>
+                <signal pad-key="pb6" function="default" group="MISO"/>
+                <signal pad-key="pb7" function="default" group="SCK"/>
             </signals>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="wdt">
@@ -415,7 +415,7 @@
         <peripheral key="cpu" name="CPU" module-key="cpu">
             <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"/>
+                <signal pad-key="pb1" index="0" function="default" group="CLKO"/>
             </signals>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="fuse">
@@ -932,99 +932,141 @@
             </register-group>
         </module>
     </modules>
+    <pads>
+        <pad key="pb0" name="PB0"/>
+        <pad key="pb1" name="PB1"/>
+        <pad key="pb2" name="PB2"/>
+        <pad key="pb3" name="PB3"/>
+        <pad key="pb4" name="PB4"/>
+        <pad key="pb5" name="PB5"/>
+        <pad key="pb6" name="PB6"/>
+        <pad key="pb7" name="PB7"/>
+        <pad key="reset" name="RESET"/>
+        <pad key="vcc" name="VCC"/>
+        <pad key="gnd" name="GND"/>
+        <pad key="xtal2" name="XTAL2"/>
+        <pad key="xtal1" name="XTAL1"/>
+        <pad key="pd0" name="PD0"/>
+        <pad key="pd1" name="PD1"/>
+        <pad key="pd2" name="PD2"/>
+        <pad key="pd3" name="PD3"/>
+        <pad key="pd4" name="PD4"/>
+        <pad key="pd5" name="PD5"/>
+        <pad key="pd6" name="PD6"/>
+        <pad key="pd7" name="PD7"/>
+        <pad key="pc0" name="PC0"/>
+        <pad key="pc1" name="PC1"/>
+        <pad key="pc2" name="PC2"/>
+        <pad key="pc3" name="PC3"/>
+        <pad key="pc4" name="PC4"/>
+        <pad key="pc5" name="PC5"/>
+        <pad key="pc6" name="PC6"/>
+        <pad key="pc7" name="PC7"/>
+        <pad key="avcc" name="AVCC"/>
+        <pad key="aref" name="AREF"/>
+        <pad key="pa7" name="PA7"/>
+        <pad key="pa6" name="PA6"/>
+        <pad key="pa5" name="PA5"/>
+        <pad key="pa4" name="PA4"/>
+        <pad key="pa3" name="PA3"/>
+        <pad key="pa2" name="PA2"/>
+        <pad key="pa1" name="PA1"/>
+        <pad key="pa0" name="PA0"/>
+        <pad key="ref" name="REF"/>
+    </pads>
     <pinouts>
         <pinout key="pdip40" name="PDIP40" type="dip">
-            <pin position="1" pad="PB0"/>
-            <pin position="2" pad="PB1"/>
-            <pin position="3" pad="PB2"/>
-            <pin position="4" pad="PB3"/>
-            <pin position="5" pad="PB4"/>
-            <pin position="6" pad="PB5"/>
-            <pin position="7" pad="PB6"/>
-            <pin position="8" pad="PB7"/>
-            <pin position="9" pad="RESET"/>
-            <pin position="10" pad="VCC"/>
-            <pin position="11" pad="GND"/>
-            <pin position="12" pad="XTAL2"/>
-            <pin position="13" pad="XTAL1"/>
-            <pin position="14" pad="PD0"/>
-            <pin position="15" pad="PD1"/>
-            <pin position="16" pad="PD2"/>
-            <pin position="17" pad="PD3"/>
-            <pin position="18" pad="PD4"/>
-            <pin position="19" pad="PD5"/>
-            <pin position="20" pad="PD6"/>
-            <pin position="21" pad="PD7"/>
-            <pin position="22" pad="PC0"/>
-            <pin position="23" pad="PC1"/>
-            <pin position="24" pad="PC2"/>
-            <pin position="25" pad="PC3"/>
-            <pin position="26" pad="PC4"/>
-            <pin position="27" pad="PC5"/>
-            <pin position="28" pad="PC6"/>
-            <pin position="29" pad="PC7"/>
-            <pin position="30" pad="AVCC"/>
-            <pin position="31" pad="GND"/>
-            <pin position="32" pad="AREF"/>
-            <pin position="33" pad="PA7"/>
-            <pin position="34" pad="PA6"/>
-            <pin position="35" pad="PA5"/>
-            <pin position="36" pad="PA4"/>
-            <pin position="37" pad="PA3"/>
-            <pin position="38" pad="PA2"/>
-            <pin position="39" pad="PA1"/>
-            <pin position="40" pad="PA0"/>
+            <pin position="1" pad-key="pb0"/>
+            <pin position="2" pad-key="pb1"/>
+            <pin position="3" pad-key="pb2"/>
+            <pin position="4" pad-key="pb3"/>
+            <pin position="5" pad-key="pb4"/>
+            <pin position="6" pad-key="pb5"/>
+            <pin position="7" pad-key="pb6"/>
+            <pin position="8" pad-key="pb7"/>
+            <pin position="9" pad-key="reset"/>
+            <pin position="10" pad-key="vcc"/>
+            <pin position="11" pad-key="gnd"/>
+            <pin position="12" pad-key="xtal2"/>
+            <pin position="13" pad-key="xtal1"/>
+            <pin position="14" pad-key="pd0"/>
+            <pin position="15" pad-key="pd1"/>
+            <pin position="16" pad-key="pd2"/>
+            <pin position="17" pad-key="pd3"/>
+            <pin position="18" pad-key="pd4"/>
+            <pin position="19" pad-key="pd5"/>
+            <pin position="20" pad-key="pd6"/>
+            <pin position="21" pad-key="pd7"/>
+            <pin position="22" pad-key="pc0"/>
+            <pin position="23" pad-key="pc1"/>
+            <pin position="24" pad-key="pc2"/>
+            <pin position="25" pad-key="pc3"/>
+            <pin position="26" pad-key="pc4"/>
+            <pin position="27" pad-key="pc5"/>
+            <pin position="28" pad-key="pc6"/>
+            <pin position="29" pad-key="pc7"/>
+            <pin position="30" pad-key="avcc"/>
+            <pin position="31" pad-key="gnd"/>
+            <pin position="32" pad-key="aref"/>
+            <pin position="33" pad-key="pa7"/>
+            <pin position="34" pad-key="pa6"/>
+            <pin position="35" pad-key="pa5"/>
+            <pin position="36" pad-key="pa4"/>
+            <pin position="37" pad-key="pa3"/>
+            <pin position="38" pad-key="pa2"/>
+            <pin position="39" pad-key="pa1"/>
+            <pin position="40" pad-key="pa0"/>
         </pinout>
         <pinout key="tqfp_qfn_44" name="TQFP_QFN_44" type="qfn">
-            <pin position="1" pad="PB5"/>
-            <pin position="2" pad="PB6"/>
-            <pin position="3" pad="PB7"/>
-            <pin position="4" pad="RESET"/>
-            <pin position="5" pad="VCC"/>
-            <pin position="6" pad="GND"/>
-            <pin position="7" pad="XTAL2"/>
-            <pin position="8" pad="XTAL1"/>
-            <pin position="9" pad="PD0"/>
-            <pin position="10" pad="PD1"/>
-            <pin position="11" pad="PD2"/>
-            <pin position="12" pad="PD3"/>
-            <pin position="13" pad="PD4"/>
-            <pin position="14" pad="PD5"/>
-            <pin position="15" pad="PD6"/>
-            <pin position="16" pad="PD7"/>
-            <pin position="17" pad="VCC"/>
-            <pin position="18" pad="GND"/>
-            <pin position="19" pad="PC0"/>
-            <pin position="20" pad="PC1"/>
-            <pin position="21" pad="PC2"/>
-            <pin position="22" pad="PC3"/>
-            <pin position="23" pad="PC4"/>
-            <pin position="24" pad="PC5"/>
-            <pin position="25" pad="PC6"/>
-            <pin position="26" pad="PC7"/>
-            <pin position="27" pad="AVCC"/>
-            <pin position="28" pad="GND"/>
-            <pin position="29" pad="REF"/>
-            <pin position="30" pad="PA7"/>
-            <pin position="31" pad="PA6"/>
-            <pin position="32" pad="PA5"/>
-            <pin position="33" pad="PA4"/>
-            <pin position="34" pad="PA3"/>
-            <pin position="35" pad="PA2"/>
-            <pin position="36" pad="PA1"/>
-            <pin position="37" pad="PA0"/>
-            <pin position="38" pad="VCC"/>
-            <pin position="39" pad="GND"/>
-            <pin position="40" pad="PB0"/>
-            <pin position="41" pad="PB1"/>
-            <pin position="42" pad="PB2"/>
-            <pin position="43" pad="PB3"/>
-            <pin position="44" pad="PB4"/>
+            <pin position="1" pad-key="pb5"/>
+            <pin position="2" pad-key="pb6"/>
+            <pin position="3" pad-key="pb7"/>
+            <pin position="4" pad-key="reset"/>
+            <pin position="5" pad-key="vcc"/>
+            <pin position="6" pad-key="gnd"/>
+            <pin position="7" pad-key="xtal2"/>
+            <pin position="8" pad-key="xtal1"/>
+            <pin position="9" pad-key="pd0"/>
+            <pin position="10" pad-key="pd1"/>
+            <pin position="11" pad-key="pd2"/>
+            <pin position="12" pad-key="pd3"/>
+            <pin position="13" pad-key="pd4"/>
+            <pin position="14" pad-key="pd5"/>
+            <pin position="15" pad-key="pd6"/>
+            <pin position="16" pad-key="pd7"/>
+            <pin position="17" pad-key="vcc"/>
+            <pin position="18" pad-key="gnd"/>
+            <pin position="19" pad-key="pc0"/>
+            <pin position="20" pad-key="pc1"/>
+            <pin position="21" pad-key="pc2"/>
+            <pin position="22" pad-key="pc3"/>
+            <pin position="23" pad-key="pc4"/>
+            <pin position="24" pad-key="pc5"/>
+            <pin position="25" pad-key="pc6"/>
+            <pin position="26" pad-key="pc7"/>
+            <pin position="27" pad-key="avcc"/>
+            <pin position="28" pad-key="gnd"/>
+            <pin position="29" pad-key="ref"/>
+            <pin position="30" pad-key="pa7"/>
+            <pin position="31" pad-key="pa6"/>
+            <pin position="32" pad-key="pa5"/>
+            <pin position="33" pad-key="pa4"/>
+            <pin position="34" pad-key="pa3"/>
+            <pin position="35" pad-key="pa2"/>
+            <pin position="36" pad-key="pa1"/>
+            <pin position="37" pad-key="pa0"/>
+            <pin position="38" pad-key="vcc"/>
+            <pin position="39" pad-key="gnd"/>
+            <pin position="40" pad-key="pb0"/>
+            <pin position="41" pad-key="pb1"/>
+            <pin position="42" pad-key="pb2"/>
+            <pin position="43" pad-key="pb3"/>
+            <pin position="44" pad-key="pb4"/>
         </pinout>
     </pinouts>
     <variants>
-        <variant name="ATmega1284-AU" pinout-key="tqfp_qfn_44" package="TQFP44"/>
-        <variant name="ATmega1284-PU" pinout-key="pdip40" package="PDIP40"/>
-        <variant name="ATmega1284-MU" pinout-key="tqfp_qfn_44" package="QFN44"/>
+        <variant key="atmega1284_au" name="ATmega1284-AU" pinout-key="tqfp_qfn_44"/>
+        <variant key="atmega1284_pu" name="ATmega1284-PU" pinout-key="pdip40"/>
+        <variant key="atmega1284_mu" name="ATmega1284-MU" pinout-key="tqfp_qfn_44"/>
     </variants>
 </device>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA1284P.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA1284P.xml
index b1056531..377a96ab 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA1284P.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA1284P.xml
@@ -220,109 +220,109 @@
         <peripheral key="ac" name="AC" module-key="ac">
             <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"/>
+                <signal pad-key="pb2" index="0" function="default" group="AIN"/>
+                <signal pad-key="pb3" index="1" function="default" group="AIN"/>
             </signals>
         </peripheral>
         <peripheral key="usart0" name="USART0" module-key="usart">
             <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"/>
-                <signal pad-id="pb0" function="default" group="XCK"/>
+                <signal pad-key="pd1" function="default" group="TXD"/>
+                <signal pad-key="pd0" function="default" group="RXD"/>
+                <signal pad-key="pb0" function="default" group="XCK"/>
             </signals>
         </peripheral>
         <peripheral key="usart1" name="USART1" module-key="usart">
             <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"/>
-                <signal pad-id="pd4" function="default" group="XCK"/>
+                <signal pad-key="pd3" function="default" group="TXD"/>
+                <signal pad-key="pd2" function="default" group="RXD"/>
+                <signal pad-key="pd4" function="default" group="XCK"/>
             </signals>
         </peripheral>
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pa2" index="2" function="default" group="P"/>
-                <signal pad-id="pa3" index="3" function="default" group="P"/>
-                <signal pad-id="pa4" index="4" function="default" group="P"/>
-                <signal pad-id="pa5" index="5" function="default" group="P"/>
-                <signal pad-id="pa6" index="6" function="default" group="P"/>
-                <signal pad-id="pa7" index="7" function="default" group="P"/>
+                <signal pad-key="pa0" index="0" function="default" group="P"/>
+                <signal pad-key="pa1" index="1" function="default" group="P"/>
+                <signal pad-key="pa2" index="2" function="default" group="P"/>
+                <signal pad-key="pa3" index="3" function="default" group="P"/>
+                <signal pad-key="pa4" index="4" function="default" group="P"/>
+                <signal pad-key="pa5" index="5" function="default" group="P"/>
+                <signal pad-key="pa6" index="6" function="default" group="P"/>
+                <signal pad-key="pa7" index="7" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pb2" index="2" function="default" group="P"/>
-                <signal pad-id="pb3" index="3" function="default" group="P"/>
-                <signal pad-id="pb4" index="4" function="default" group="P"/>
-                <signal pad-id="pb5" index="5" function="default" group="P"/>
-                <signal pad-id="pb6" index="6" function="default" group="P"/>
-                <signal pad-id="pb7" index="7" function="default" group="P"/>
+                <signal pad-key="pb0" index="0" function="default" group="P"/>
+                <signal pad-key="pb1" index="1" function="default" group="P"/>
+                <signal pad-key="pb2" index="2" function="default" group="P"/>
+                <signal pad-key="pb3" index="3" function="default" group="P"/>
+                <signal pad-key="pb4" index="4" function="default" group="P"/>
+                <signal pad-key="pb5" index="5" function="default" group="P"/>
+                <signal pad-key="pb6" index="6" function="default" group="P"/>
+                <signal pad-key="pb7" index="7" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pc2" index="2" function="default" group="P"/>
-                <signal pad-id="pc3" index="3" function="default" group="P"/>
-                <signal pad-id="pc4" index="4" function="default" group="P"/>
-                <signal pad-id="pc5" index="5" function="default" group="P"/>
-                <signal pad-id="pc6" index="6" function="default" group="P"/>
-                <signal pad-id="pc7" index="7" function="default" group="P"/>
+                <signal pad-key="pc0" index="0" function="default" group="P"/>
+                <signal pad-key="pc1" index="1" function="default" group="P"/>
+                <signal pad-key="pc2" index="2" function="default" group="P"/>
+                <signal pad-key="pc3" index="3" function="default" group="P"/>
+                <signal pad-key="pc4" index="4" function="default" group="P"/>
+                <signal pad-key="pc5" index="5" function="default" group="P"/>
+                <signal pad-key="pc6" index="6" function="default" group="P"/>
+                <signal pad-key="pc7" index="7" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pd2" index="2" function="default" group="P"/>
-                <signal pad-id="pd3" index="3" function="default" group="P"/>
-                <signal pad-id="pd4" index="4" function="default" group="P"/>
-                <signal pad-id="pd5" index="5" function="default" group="P"/>
-                <signal pad-id="pd6" index="6" function="default" group="P"/>
-                <signal pad-id="pd7" index="7" function="default" group="P"/>
+                <signal pad-key="pd0" index="0" function="default" group="P"/>
+                <signal pad-key="pd1" index="1" function="default" group="P"/>
+                <signal pad-key="pd2" index="2" function="default" group="P"/>
+                <signal pad-key="pd3" index="3" function="default" group="P"/>
+                <signal pad-key="pd4" index="4" function="default" group="P"/>
+                <signal pad-key="pd5" index="5" function="default" group="P"/>
+                <signal pad-key="pd6" index="6" function="default" group="P"/>
+                <signal pad-key="pd7" index="7" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="tc0" name="TC0" module-key="tc8">
             <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"/>
-                <signal pad-id="pb3" function="default" group="OCA"/>
+                <signal pad-key="pb0" function="default" group="T"/>
+                <signal pad-key="pb4" function="default" group="OCB"/>
+                <signal pad-key="pb3" function="default" group="OCA"/>
             </signals>
         </peripheral>
         <peripheral key="tc1" name="TC1" module-key="tc16">
             <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"/>
-                <signal pad-id="pd5" function="default" group="OCA"/>
-                <signal pad-id="pd4" function="default" group="OCB"/>
+                <signal pad-key="pb1" function="default" group="T"/>
+                <signal pad-key="pd6" function="default" group="ICP"/>
+                <signal pad-key="pd5" function="default" group="OCA"/>
+                <signal pad-key="pd4" function="default" group="OCB"/>
             </signals>
         </peripheral>
         <peripheral key="tc3" name="TC3" module-key="tc16">
             <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"/>
-                <signal pad-id="pb7" function="default" group="OCB"/>
-                <signal pad-id="pb6" function="default" group="OCA"/>
+                <signal pad-key="pd0" function="default" group="T"/>
+                <signal pad-key="pb5" function="default" group="ICP"/>
+                <signal pad-key="pb7" function="default" group="OCB"/>
+                <signal pad-key="pb6" function="default" group="OCA"/>
             </signals>
         </peripheral>
         <peripheral key="tc2" name="TC2" module-key="tc8_async">
             <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"/>
+                <signal pad-key="pd7" function="default" group="OCA"/>
+                <signal pad-key="pd6" function="default" group="OCB"/>
             </signals>
         </peripheral>
         <peripheral key="boot_load" name="BOOT_LOAD" module-key="boot_load">
@@ -331,63 +331,63 @@
         <peripheral key="exint" name="EXINT" module-key="exint">
             <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"/>
-                <signal pad-id="pa2" index="2" function="default" group="PCINT"/>
-                <signal pad-id="pa3" index="3" function="default" group="PCINT"/>
-                <signal pad-id="pa4" index="4" function="default" group="PCINT"/>
-                <signal pad-id="pa5" index="5" function="default" group="PCINT"/>
-                <signal pad-id="pa6" index="6" function="default" group="PCINT"/>
-                <signal pad-id="pa7" index="7" function="default" group="PCINT"/>
-                <signal pad-id="pb0" index="8" function="default" group="PCINT"/>
-                <signal pad-id="pb1" index="9" function="default" group="PCINT"/>
-                <signal pad-id="pb2" index="10" function="default" group="PCINT"/>
-                <signal pad-id="pb3" index="11" function="default" group="PCINT"/>
-                <signal pad-id="pb4" index="12" function="default" group="PCINT"/>
-                <signal pad-id="pb5" index="13" function="default" group="PCINT"/>
-                <signal pad-id="pb6" index="14" function="default" group="PCINT"/>
-                <signal pad-id="pb7" index="15" function="default" group="PCINT"/>
-                <signal pad-id="pc0" index="16" function="default" group="PCINT"/>
-                <signal pad-id="pc1" index="17" function="default" group="PCINT"/>
-                <signal pad-id="pc2" index="18" function="default" group="PCINT"/>
-                <signal pad-id="pc3" index="19" function="default" group="PCINT"/>
-                <signal pad-id="pc4" index="20" function="default" group="PCINT"/>
-                <signal pad-id="pc5" index="21" function="default" group="PCINT"/>
-                <signal pad-id="pc6" index="22" function="default" group="PCINT"/>
-                <signal pad-id="pc7" index="23" function="default" group="PCINT"/>
-                <signal pad-id="pd0" index="24" function="default" group="PCINT"/>
-                <signal pad-id="pd1" index="25" function="default" group="PCINT"/>
-                <signal pad-id="pd2" index="26" function="default" group="PCINT"/>
-                <signal pad-id="pd3" index="27" function="default" group="PCINT"/>
-                <signal pad-id="pd4" index="28" function="default" group="PCINT"/>
-                <signal pad-id="pd5" index="29" function="default" group="PCINT"/>
-                <signal pad-id="pd6" index="30" function="default" group="PCINT"/>
-                <signal pad-id="pd7" index="31" function="default" group="PCINT"/>
-                <signal pad-id="pd2" index="0" function="default" group="INT"/>
-                <signal pad-id="pd3" index="1" function="default" group="INT"/>
-                <signal pad-id="pb2" index="2" function="default" group="INT"/>
+                <signal pad-key="pa0" index="0" function="default" group="PCINT"/>
+                <signal pad-key="pa1" index="1" function="default" group="PCINT"/>
+                <signal pad-key="pa2" index="2" function="default" group="PCINT"/>
+                <signal pad-key="pa3" index="3" function="default" group="PCINT"/>
+                <signal pad-key="pa4" index="4" function="default" group="PCINT"/>
+                <signal pad-key="pa5" index="5" function="default" group="PCINT"/>
+                <signal pad-key="pa6" index="6" function="default" group="PCINT"/>
+                <signal pad-key="pa7" index="7" function="default" group="PCINT"/>
+                <signal pad-key="pb0" index="8" function="default" group="PCINT"/>
+                <signal pad-key="pb1" index="9" function="default" group="PCINT"/>
+                <signal pad-key="pb2" index="10" function="default" group="PCINT"/>
+                <signal pad-key="pb3" index="11" function="default" group="PCINT"/>
+                <signal pad-key="pb4" index="12" function="default" group="PCINT"/>
+                <signal pad-key="pb5" index="13" function="default" group="PCINT"/>
+                <signal pad-key="pb6" index="14" function="default" group="PCINT"/>
+                <signal pad-key="pb7" index="15" function="default" group="PCINT"/>
+                <signal pad-key="pc0" index="16" function="default" group="PCINT"/>
+                <signal pad-key="pc1" index="17" function="default" group="PCINT"/>
+                <signal pad-key="pc2" index="18" function="default" group="PCINT"/>
+                <signal pad-key="pc3" index="19" function="default" group="PCINT"/>
+                <signal pad-key="pc4" index="20" function="default" group="PCINT"/>
+                <signal pad-key="pc5" index="21" function="default" group="PCINT"/>
+                <signal pad-key="pc6" index="22" function="default" group="PCINT"/>
+                <signal pad-key="pc7" index="23" function="default" group="PCINT"/>
+                <signal pad-key="pd0" index="24" function="default" group="PCINT"/>
+                <signal pad-key="pd1" index="25" function="default" group="PCINT"/>
+                <signal pad-key="pd2" index="26" function="default" group="PCINT"/>
+                <signal pad-key="pd3" index="27" function="default" group="PCINT"/>
+                <signal pad-key="pd4" index="28" function="default" group="PCINT"/>
+                <signal pad-key="pd5" index="29" function="default" group="PCINT"/>
+                <signal pad-key="pd6" index="30" function="default" group="PCINT"/>
+                <signal pad-key="pd7" index="31" function="default" group="PCINT"/>
+                <signal pad-key="pd2" index="0" function="default" group="INT"/>
+                <signal pad-key="pd3" index="1" function="default" group="INT"/>
+                <signal pad-key="pb2" index="2" function="default" group="INT"/>
             </signals>
         </peripheral>
         <peripheral key="adc" name="ADC" module-key="adc">
             <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"/>
-                <signal pad-id="pa2" index="2" function="default" group="ADC"/>
-                <signal pad-id="pa3" index="3" function="default" group="ADC"/>
-                <signal pad-id="pa4" index="4" function="default" group="ADC"/>
-                <signal pad-id="pa5" index="5" function="default" group="ADC"/>
-                <signal pad-id="pa6" index="6" function="default" group="ADC"/>
-                <signal pad-id="pa7" index="7" function="default" group="ADC"/>
+                <signal pad-key="pa0" index="0" function="default" group="ADC"/>
+                <signal pad-key="pa1" index="1" function="default" group="ADC"/>
+                <signal pad-key="pa2" index="2" function="default" group="ADC"/>
+                <signal pad-key="pa3" index="3" function="default" group="ADC"/>
+                <signal pad-key="pa4" index="4" function="default" group="ADC"/>
+                <signal pad-key="pa5" index="5" function="default" group="ADC"/>
+                <signal pad-key="pa6" index="6" function="default" group="ADC"/>
+                <signal pad-key="pa7" index="7" function="default" group="ADC"/>
             </signals>
         </peripheral>
         <peripheral key="jtag" name="JTAG" module-key="jtag">
             <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"/>
-                <signal pad-id="pc4" function="default" group="TDO"/>
-                <signal pad-id="pc5" function="default" group="TDI"/>
+                <signal pad-key="pc2" function="default" group="TCK"/>
+                <signal pad-key="pc3" function="default" group="TMS"/>
+                <signal pad-key="pc4" function="default" group="TDO"/>
+                <signal pad-key="pc5" function="default" group="TDI"/>
             </signals>
         </peripheral>
         <peripheral key="eeprom" name="EEPROM" module-key="eeprom">
@@ -396,17 +396,17 @@
         <peripheral key="twi" name="TWI" module-key="twi">
             <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"/>
+                <signal pad-key="pc1" function="default" group="SDA"/>
+                <signal pad-key="pc0" function="default" group="SCL"/>
             </signals>
         </peripheral>
         <peripheral key="spi" name="SPI" module-key="spi">
             <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"/>
-                <signal pad-id="pb6" function="default" group="MISO"/>
-                <signal pad-id="pb7" function="default" group="SCK"/>
+                <signal pad-key="pb4" function="default" group="SS"/>
+                <signal pad-key="pb5" function="default" group="MOSI"/>
+                <signal pad-key="pb6" function="default" group="MISO"/>
+                <signal pad-key="pb7" function="default" group="SCK"/>
             </signals>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="wdt">
@@ -415,7 +415,7 @@
         <peripheral key="cpu" name="CPU" module-key="cpu">
             <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"/>
+                <signal pad-key="pb1" index="0" function="default" group="CLKO"/>
             </signals>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="fuse">
@@ -982,102 +982,144 @@
             </register-group>
         </module>
     </modules>
+    <pads>
+        <pad key="pb0" name="PB0"/>
+        <pad key="pb1" name="PB1"/>
+        <pad key="pb2" name="PB2"/>
+        <pad key="pb3" name="PB3"/>
+        <pad key="pb4" name="PB4"/>
+        <pad key="pb5" name="PB5"/>
+        <pad key="pb6" name="PB6"/>
+        <pad key="pb7" name="PB7"/>
+        <pad key="reset" name="RESET"/>
+        <pad key="vcc" name="VCC"/>
+        <pad key="gnd" name="GND"/>
+        <pad key="xtal2" name="XTAL2"/>
+        <pad key="xtal1" name="XTAL1"/>
+        <pad key="pd0" name="PD0"/>
+        <pad key="pd1" name="PD1"/>
+        <pad key="pd2" name="PD2"/>
+        <pad key="pd3" name="PD3"/>
+        <pad key="pd4" name="PD4"/>
+        <pad key="pd5" name="PD5"/>
+        <pad key="pd6" name="PD6"/>
+        <pad key="pd7" name="PD7"/>
+        <pad key="pc0" name="PC0"/>
+        <pad key="pc1" name="PC1"/>
+        <pad key="pc2" name="PC2"/>
+        <pad key="pc3" name="PC3"/>
+        <pad key="pc4" name="PC4"/>
+        <pad key="pc5" name="PC5"/>
+        <pad key="pc6" name="PC6"/>
+        <pad key="pc7" name="PC7"/>
+        <pad key="avcc" name="AVCC"/>
+        <pad key="aref" name="AREF"/>
+        <pad key="pa7" name="PA7"/>
+        <pad key="pa6" name="PA6"/>
+        <pad key="pa5" name="PA5"/>
+        <pad key="pa4" name="PA4"/>
+        <pad key="pa3" name="PA3"/>
+        <pad key="pa2" name="PA2"/>
+        <pad key="pa1" name="PA1"/>
+        <pad key="pa0" name="PA0"/>
+        <pad key="ref" name="REF"/>
+    </pads>
     <pinouts>
         <pinout key="pdip40" name="PDIP40" type="dip">
-            <pin position="1" pad="PB0"/>
-            <pin position="2" pad="PB1"/>
-            <pin position="3" pad="PB2"/>
-            <pin position="4" pad="PB3"/>
-            <pin position="5" pad="PB4"/>
-            <pin position="6" pad="PB5"/>
-            <pin position="7" pad="PB6"/>
-            <pin position="8" pad="PB7"/>
-            <pin position="9" pad="RESET"/>
-            <pin position="10" pad="VCC"/>
-            <pin position="11" pad="GND"/>
-            <pin position="12" pad="XTAL2"/>
-            <pin position="13" pad="XTAL1"/>
-            <pin position="14" pad="PD0"/>
-            <pin position="15" pad="PD1"/>
-            <pin position="16" pad="PD2"/>
-            <pin position="17" pad="PD3"/>
-            <pin position="18" pad="PD4"/>
-            <pin position="19" pad="PD5"/>
-            <pin position="20" pad="PD6"/>
-            <pin position="21" pad="PD7"/>
-            <pin position="22" pad="PC0"/>
-            <pin position="23" pad="PC1"/>
-            <pin position="24" pad="PC2"/>
-            <pin position="25" pad="PC3"/>
-            <pin position="26" pad="PC4"/>
-            <pin position="27" pad="PC5"/>
-            <pin position="28" pad="PC6"/>
-            <pin position="29" pad="PC7"/>
-            <pin position="30" pad="AVCC"/>
-            <pin position="31" pad="GND"/>
-            <pin position="32" pad="AREF"/>
-            <pin position="33" pad="PA7"/>
-            <pin position="34" pad="PA6"/>
-            <pin position="35" pad="PA5"/>
-            <pin position="36" pad="PA4"/>
-            <pin position="37" pad="PA3"/>
-            <pin position="38" pad="PA2"/>
-            <pin position="39" pad="PA1"/>
-            <pin position="40" pad="PA0"/>
+            <pin position="1" pad-key="pb0"/>
+            <pin position="2" pad-key="pb1"/>
+            <pin position="3" pad-key="pb2"/>
+            <pin position="4" pad-key="pb3"/>
+            <pin position="5" pad-key="pb4"/>
+            <pin position="6" pad-key="pb5"/>
+            <pin position="7" pad-key="pb6"/>
+            <pin position="8" pad-key="pb7"/>
+            <pin position="9" pad-key="reset"/>
+            <pin position="10" pad-key="vcc"/>
+            <pin position="11" pad-key="gnd"/>
+            <pin position="12" pad-key="xtal2"/>
+            <pin position="13" pad-key="xtal1"/>
+            <pin position="14" pad-key="pd0"/>
+            <pin position="15" pad-key="pd1"/>
+            <pin position="16" pad-key="pd2"/>
+            <pin position="17" pad-key="pd3"/>
+            <pin position="18" pad-key="pd4"/>
+            <pin position="19" pad-key="pd5"/>
+            <pin position="20" pad-key="pd6"/>
+            <pin position="21" pad-key="pd7"/>
+            <pin position="22" pad-key="pc0"/>
+            <pin position="23" pad-key="pc1"/>
+            <pin position="24" pad-key="pc2"/>
+            <pin position="25" pad-key="pc3"/>
+            <pin position="26" pad-key="pc4"/>
+            <pin position="27" pad-key="pc5"/>
+            <pin position="28" pad-key="pc6"/>
+            <pin position="29" pad-key="pc7"/>
+            <pin position="30" pad-key="avcc"/>
+            <pin position="31" pad-key="gnd"/>
+            <pin position="32" pad-key="aref"/>
+            <pin position="33" pad-key="pa7"/>
+            <pin position="34" pad-key="pa6"/>
+            <pin position="35" pad-key="pa5"/>
+            <pin position="36" pad-key="pa4"/>
+            <pin position="37" pad-key="pa3"/>
+            <pin position="38" pad-key="pa2"/>
+            <pin position="39" pad-key="pa1"/>
+            <pin position="40" pad-key="pa0"/>
         </pinout>
         <pinout key="tqfp_qfn_44" name="TQFP_QFN_44" type="qfn">
-            <pin position="1" pad="PB5"/>
-            <pin position="2" pad="PB6"/>
-            <pin position="3" pad="PB7"/>
-            <pin position="4" pad="RESET"/>
-            <pin position="5" pad="VCC"/>
-            <pin position="6" pad="GND"/>
-            <pin position="7" pad="XTAL2"/>
-            <pin position="8" pad="XTAL1"/>
-            <pin position="9" pad="PD0"/>
-            <pin position="10" pad="PD1"/>
-            <pin position="11" pad="PD2"/>
-            <pin position="12" pad="PD3"/>
-            <pin position="13" pad="PD4"/>
-            <pin position="14" pad="PD5"/>
-            <pin position="15" pad="PD6"/>
-            <pin position="16" pad="PD7"/>
-            <pin position="17" pad="VCC"/>
-            <pin position="18" pad="GND"/>
-            <pin position="19" pad="PC0"/>
-            <pin position="20" pad="PC1"/>
-            <pin position="21" pad="PC2"/>
-            <pin position="22" pad="PC3"/>
-            <pin position="23" pad="PC4"/>
-            <pin position="24" pad="PC5"/>
-            <pin position="25" pad="PC6"/>
-            <pin position="26" pad="PC7"/>
-            <pin position="27" pad="AVCC"/>
-            <pin position="28" pad="GND"/>
-            <pin position="29" pad="REF"/>
-            <pin position="30" pad="PA7"/>
-            <pin position="31" pad="PA6"/>
-            <pin position="32" pad="PA5"/>
-            <pin position="33" pad="PA4"/>
-            <pin position="34" pad="PA3"/>
-            <pin position="35" pad="PA2"/>
-            <pin position="36" pad="PA1"/>
-            <pin position="37" pad="PA0"/>
-            <pin position="38" pad="VCC"/>
-            <pin position="39" pad="GND"/>
-            <pin position="40" pad="PB0"/>
-            <pin position="41" pad="PB1"/>
-            <pin position="42" pad="PB2"/>
-            <pin position="43" pad="PB3"/>
-            <pin position="44" pad="PB4"/>
+            <pin position="1" pad-key="pb5"/>
+            <pin position="2" pad-key="pb6"/>
+            <pin position="3" pad-key="pb7"/>
+            <pin position="4" pad-key="reset"/>
+            <pin position="5" pad-key="vcc"/>
+            <pin position="6" pad-key="gnd"/>
+            <pin position="7" pad-key="xtal2"/>
+            <pin position="8" pad-key="xtal1"/>
+            <pin position="9" pad-key="pd0"/>
+            <pin position="10" pad-key="pd1"/>
+            <pin position="11" pad-key="pd2"/>
+            <pin position="12" pad-key="pd3"/>
+            <pin position="13" pad-key="pd4"/>
+            <pin position="14" pad-key="pd5"/>
+            <pin position="15" pad-key="pd6"/>
+            <pin position="16" pad-key="pd7"/>
+            <pin position="17" pad-key="vcc"/>
+            <pin position="18" pad-key="gnd"/>
+            <pin position="19" pad-key="pc0"/>
+            <pin position="20" pad-key="pc1"/>
+            <pin position="21" pad-key="pc2"/>
+            <pin position="22" pad-key="pc3"/>
+            <pin position="23" pad-key="pc4"/>
+            <pin position="24" pad-key="pc5"/>
+            <pin position="25" pad-key="pc6"/>
+            <pin position="26" pad-key="pc7"/>
+            <pin position="27" pad-key="avcc"/>
+            <pin position="28" pad-key="gnd"/>
+            <pin position="29" pad-key="ref"/>
+            <pin position="30" pad-key="pa7"/>
+            <pin position="31" pad-key="pa6"/>
+            <pin position="32" pad-key="pa5"/>
+            <pin position="33" pad-key="pa4"/>
+            <pin position="34" pad-key="pa3"/>
+            <pin position="35" pad-key="pa2"/>
+            <pin position="36" pad-key="pa1"/>
+            <pin position="37" pad-key="pa0"/>
+            <pin position="38" pad-key="vcc"/>
+            <pin position="39" pad-key="gnd"/>
+            <pin position="40" pad-key="pb0"/>
+            <pin position="41" pad-key="pb1"/>
+            <pin position="42" pad-key="pb2"/>
+            <pin position="43" pad-key="pb3"/>
+            <pin position="44" pad-key="pb4"/>
         </pinout>
     </pinouts>
     <variants>
-        <variant name="ATmega1284P-AU" pinout-key="tqfp_qfn_44" package="TQFP44"/>
-        <variant name="ATmega1284P-PU" pinout-key="pdip40" package="PDIP40"/>
-        <variant name="ATmega1284P-MU" pinout-key="tqfp_qfn_44" package="QFN44"/>
-        <variant name="ATmega1284P-AN" pinout-key="tqfp_qfn_44" package="TQFP44"/>
-        <variant name="ATmega1284P-PN" pinout-key="pdip40" package="PDIP40"/>
-        <variant name="ATmega1284P-MN" pinout-key="tqfp_qfn_44" package="QFN44"/>
+        <variant key="atmega1284p_au" name="ATmega1284P-AU" pinout-key="tqfp_qfn_44"/>
+        <variant key="atmega1284p_pu" name="ATmega1284P-PU" pinout-key="pdip40"/>
+        <variant key="atmega1284p_mu" name="ATmega1284P-MU" pinout-key="tqfp_qfn_44"/>
+        <variant key="atmega1284p_an" name="ATmega1284P-AN" pinout-key="tqfp_qfn_44"/>
+        <variant key="atmega1284p_pn" name="ATmega1284P-PN" pinout-key="pdip40"/>
+        <variant key="atmega1284p_mn" name="ATmega1284P-MN" pinout-key="tqfp_qfn_44"/>
     </variants>
 </device>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA1284RFR2.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA1284RFR2.xml
index b766ccba..7e975a70 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA1284RFR2.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA1284RFR2.xml
@@ -218,60 +218,59 @@
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pb2" index="2" function="PORTB" group="P"/>
-                <signal pad-id="pb3" index="3" function="PORTB" group="P"/>
-                <signal pad-id="pb4" index="4" function="PORTB" group="P"/>
-                <signal pad-id="pb5" index="5" function="PORTB" group="P"/>
-                <signal pad-id="pb6" index="6" function="PORTB" group="P"/>
-                <signal pad-id="pb7" index="7" function="PORTB" group="P"/>
+                <signal pad-key="pb0" index="0" function="PORTB" group="P"/>
+                <signal pad-key="pb1" index="1" function="PORTB" group="P"/>
+                <signal pad-key="pb2" index="2" function="PORTB" group="P"/>
+                <signal pad-key="pb3" index="3" function="PORTB" group="P"/>
+                <signal pad-key="pb4" index="4" function="PORTB" group="P"/>
+                <signal pad-key="pb5" index="5" function="PORTB" group="P"/>
+                <signal pad-key="pb6" index="6" function="PORTB" group="P"/>
+                <signal pad-key="pb7" index="7" function="PORTB" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pd2" index="2" function="PORTD" group="P"/>
-                <signal pad-id="pd3" index="3" function="PORTD" group="P"/>
-                <signal pad-id="pd4" index="4" function="PORTD" group="P"/>
-                <signal pad-id="pd5" index="5" function="PORTD" group="P"/>
-                <signal pad-id="pd6" index="6" function="PORTD" group="P"/>
-                <signal pad-id="pd7" index="7" function="PORTD" group="P"/>
+                <signal pad-key="pd0" index="0" function="PORTD" group="P"/>
+                <signal pad-key="pd1" index="1" function="PORTD" group="P"/>
+                <signal pad-key="pd2" index="2" function="PORTD" group="P"/>
+                <signal pad-key="pd3" index="3" function="PORTD" group="P"/>
+                <signal pad-key="pd4" index="4" function="PORTD" group="P"/>
+                <signal pad-key="pd5" index="5" function="PORTD" group="P"/>
+                <signal pad-key="pd6" index="6" function="PORTD" group="P"/>
+                <signal pad-key="pd7" index="7" function="PORTD" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="porte" name="PORTE" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pe2" index="2" function="PORTE" group="P"/>
-                <signal pad-id="pe3" index="3" function="PORTE" group="P"/>
-                <signal pad-id="pe4" index="4" function="PORTE" group="P"/>
-                <signal pad-id="pe5" index="5" function="PORTE" group="P"/>
-                <signal pad-id="pe7" index="7" function="PORTE" group="P"/>
+                <signal pad-key="pe0" index="0" function="PORTE" group="P"/>
+                <signal pad-key="pe1" index="1" function="PORTE" group="P"/>
+                <signal pad-key="pe2" index="2" function="PORTE" group="P"/>
+                <signal pad-key="pe3" index="3" function="PORTE" group="P"/>
+                <signal pad-key="pe4" index="4" function="PORTE" group="P"/>
+                <signal pad-key="pe5" index="5" function="PORTE" group="P"/>
+                <signal pad-key="pe7" index="7" function="PORTE" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portf" name="PORTF" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pf2" index="2" function="PORTF" group="P"/>
-                <signal pad-id="pf3/4" index="3" function="PORTF" group="P"/>
-                <signal pad-id="pf4/4" index="4" function="PORTF" group="P"/>
-                <signal pad-id="pf5" index="5" function="PORTF" group="P"/>
-                <signal pad-id="pf6" index="6" function="PORTF" group="P"/>
-                <signal pad-id="pf7" index="7" function="PORTF" group="P"/>
+                <signal pad-key="pf0" index="0" function="PORTF" group="P"/>
+                <signal pad-key="pf1" index="1" function="PORTF" group="P"/>
+                <signal pad-key="pf2" index="2" function="PORTF" group="P"/>
+                <signal pad-key="pf3/4" index="3" function="PORTF" group="P"/>
+                <signal pad-key="pf5" index="5" function="PORTF" group="P"/>
+                <signal pad-key="pf6" index="6" function="PORTF" group="P"/>
+                <signal pad-key="pf7" index="7" function="PORTF" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portg" name="PORTG" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pg4" index="4" function="PORTG" group="P"/>
+                <signal pad-key="pg1" index="1" function="PORTG" group="P"/>
+                <signal pad-key="pg3" index="3" function="PORTG" group="P"/>
+                <signal pad-key="pg4" index="4" function="PORTG" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="tc0" name="TC0" module-key="tc8">
@@ -1543,62 +1542,112 @@
             </register-group>
         </module>
     </modules>
+    <pads>
+        <pad key="pf3/4" name="PF3/4"/>
+        <pad key="pf5" name="PF5"/>
+        <pad key="pf6" name="PF6"/>
+        <pad key="pf7" name="PF7"/>
+        <pad key="avss_rfp" name="AVSS_RFP"/>
+        <pad key="rfp" name="RFP"/>
+        <pad key="rfn" name="RFN"/>
+        <pad key="avss_rfn" name="AVSS_RFN"/>
+        <pad key="tst" name="TST"/>
+        <pad key="rstn" name="RSTN"/>
+        <pad key="pg1" name="PG1"/>
+        <pad key="pg3" name="PG3"/>
+        <pad key="pg4" name="PG4"/>
+        <pad key="dvss" name="DVSS"/>
+        <pad key="dvdd" name="DVDD"/>
+        <pad key="devdd" name="DEVDD"/>
+        <pad key="pd0" name="PD0"/>
+        <pad key="pd1" name="PD1"/>
+        <pad key="pd2" name="PD2"/>
+        <pad key="pd3" name="PD3"/>
+        <pad key="pd4" name="PD4"/>
+        <pad key="pd5" name="PD5"/>
+        <pad key="pd6" name="PD6"/>
+        <pad key="pd7" name="PD7"/>
+        <pad key="clki" name="CLKI"/>
+        <pad key="pb0" name="PB0"/>
+        <pad key="pb1" name="PB1"/>
+        <pad key="pb2" name="PB2"/>
+        <pad key="pb3" name="PB3"/>
+        <pad key="pb4" name="PB4"/>
+        <pad key="pb5" name="PB5"/>
+        <pad key="pb6" name="PB6"/>
+        <pad key="pb7" name="PB7"/>
+        <pad key="pe0" name="PE0"/>
+        <pad key="pe1" name="PE1"/>
+        <pad key="pe2" name="PE2"/>
+        <pad key="pe3" name="PE3"/>
+        <pad key="pe4" name="PE4"/>
+        <pad key="pe5" name="PE5"/>
+        <pad key="pe7" name="PE7"/>
+        <pad key="xtal2" name="XTAL2"/>
+        <pad key="xtal1" name="XTAL1"/>
+        <pad key="avss" name="AVSS"/>
+        <pad key="evdd" name="EVDD"/>
+        <pad key="avdd" name="AVDD"/>
+        <pad key="pf0" name="PF0"/>
+        <pad key="pf1" name="PF1"/>
+        <pad key="pf2" name="PF2"/>
+    </pads>
     <pinouts>
         <pinout key="qfn48" name="QFN48" type="qfn">
-            <pin position="1" pad="PF3/4"/>
-            <pin position="2" pad="PF5"/>
-            <pin position="3" pad="PF6"/>
-            <pin position="4" pad="PF7"/>
-            <pin position="5" pad="AVSS_RFP"/>
-            <pin position="6" pad="RFP"/>
-            <pin position="7" pad="RFN"/>
-            <pin position="8" pad="AVSS_RFN"/>
-            <pin position="9" pad="TST"/>
-            <pin position="10" pad="RSTN"/>
-            <pin position="11" pad="PG1"/>
-            <pin position="12" pad="PG3"/>
-            <pin position="13" pad="PG4"/>
-            <pin position="14" pad="DVSS"/>
-            <pin position="15" pad="DVDD"/>
-            <pin position="16" pad="DEVDD"/>
-            <pin position="17" pad="PD0"/>
-            <pin position="18" pad="PD1"/>
-            <pin position="19" pad="PD2"/>
-            <pin position="20" pad="PD3"/>
-            <pin position="21" pad="PD4"/>
-            <pin position="22" pad="PD5"/>
-            <pin position="23" pad="PD6"/>
-            <pin position="24" pad="PD7"/>
-            <pin position="25" pad="CLKI"/>
-            <pin position="26" pad="PB0"/>
-            <pin position="27" pad="PB1"/>
-            <pin position="28" pad="PB2"/>
-            <pin position="29" pad="PB3"/>
-            <pin position="30" pad="PB4"/>
-            <pin position="31" pad="PB5"/>
-            <pin position="32" pad="PB6"/>
-            <pin position="33" pad="PB7"/>
-            <pin position="34" pad="PE0"/>
-            <pin position="35" pad="PE1"/>
-            <pin position="36" pad="PE2"/>
-            <pin position="37" pad="PE3"/>
-            <pin position="38" pad="PE4"/>
-            <pin position="39" pad="PE5"/>
-            <pin position="40" pad="PE7"/>
-            <pin position="41" pad="XTAL2"/>
-            <pin position="42" pad="XTAL1"/>
-            <pin position="43" pad="AVSS"/>
-            <pin position="44" pad="EVDD"/>
-            <pin position="45" pad="AVDD"/>
-            <pin position="46" pad="PF0"/>
-            <pin position="47" pad="PF1"/>
-            <pin position="48" pad="PF2"/>
+            <pin position="1" pad-key="pf3/4"/>
+            <pin position="2" pad-key="pf5"/>
+            <pin position="3" pad-key="pf6"/>
+            <pin position="4" pad-key="pf7"/>
+            <pin position="5" pad-key="avss_rfp"/>
+            <pin position="6" pad-key="rfp"/>
+            <pin position="7" pad-key="rfn"/>
+            <pin position="8" pad-key="avss_rfn"/>
+            <pin position="9" pad-key="tst"/>
+            <pin position="10" pad-key="rstn"/>
+            <pin position="11" pad-key="pg1"/>
+            <pin position="12" pad-key="pg3"/>
+            <pin position="13" pad-key="pg4"/>
+            <pin position="14" pad-key="dvss"/>
+            <pin position="15" pad-key="dvdd"/>
+            <pin position="16" pad-key="devdd"/>
+            <pin position="17" pad-key="pd0"/>
+            <pin position="18" pad-key="pd1"/>
+            <pin position="19" pad-key="pd2"/>
+            <pin position="20" pad-key="pd3"/>
+            <pin position="21" pad-key="pd4"/>
+            <pin position="22" pad-key="pd5"/>
+            <pin position="23" pad-key="pd6"/>
+            <pin position="24" pad-key="pd7"/>
+            <pin position="25" pad-key="clki"/>
+            <pin position="26" pad-key="pb0"/>
+            <pin position="27" pad-key="pb1"/>
+            <pin position="28" pad-key="pb2"/>
+            <pin position="29" pad-key="pb3"/>
+            <pin position="30" pad-key="pb4"/>
+            <pin position="31" pad-key="pb5"/>
+            <pin position="32" pad-key="pb6"/>
+            <pin position="33" pad-key="pb7"/>
+            <pin position="34" pad-key="pe0"/>
+            <pin position="35" pad-key="pe1"/>
+            <pin position="36" pad-key="pe2"/>
+            <pin position="37" pad-key="pe3"/>
+            <pin position="38" pad-key="pe4"/>
+            <pin position="39" pad-key="pe5"/>
+            <pin position="40" pad-key="pe7"/>
+            <pin position="41" pad-key="xtal2"/>
+            <pin position="42" pad-key="xtal1"/>
+            <pin position="43" pad-key="avss"/>
+            <pin position="44" pad-key="evdd"/>
+            <pin position="45" pad-key="avdd"/>
+            <pin position="46" pad-key="pf0"/>
+            <pin position="47" pad-key="pf1"/>
+            <pin position="48" pad-key="pf2"/>
         </pinout>
     </pinouts>
     <variants>
-        <variant name="ATmega1284RFR2-ZU" pinout-key="qfn48" package="VQFN48"/>
-        <variant name="ATmega1284RFR2-ZUR" pinout-key="qfn48" package="VQFN48"/>
-        <variant name="ATmega1284RFR2-ZF" pinout-key="qfn48" package="VQFN48"/>
-        <variant name="ATmega1284RFR2-ZFR" pinout-key="qfn48" package="VQFN48"/>
+        <variant key="atmega1284rfr2_zu" name="ATmega1284RFR2-ZU" pinout-key="qfn48"/>
+        <variant key="atmega1284rfr2_zur" name="ATmega1284RFR2-ZUR" pinout-key="qfn48"/>
+        <variant key="atmega1284rfr2_zf" name="ATmega1284RFR2-ZF" pinout-key="qfn48"/>
+        <variant key="atmega1284rfr2_zfr" name="ATmega1284RFR2-ZFR" pinout-key="qfn48"/>
     </variants>
 </device>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA128A.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA128A.xml
index b9ffbd47..8f3bfb4d 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA128A.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA128A.xml
@@ -195,40 +195,40 @@
         <peripheral key="ac" name="AC" module-key="ac">
             <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"/>
+                <signal pad-key="pe2" index="0" function="default" group="AIN"/>
+                <signal pad-key="pe3" index="1" function="default" group="AIN"/>
             </signals>
         </peripheral>
         <peripheral key="spi" name="SPI" module-key="spi">
             <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"/>
-                <signal pad-id="pb1" function="default" group="SCK"/>
-                <signal pad-id="pb0" function="default" group="SS"/>
+                <signal pad-key="pb3" function="default" group="MISO"/>
+                <signal pad-key="pb2" function="default" group="MOSI"/>
+                <signal pad-key="pb1" function="default" group="SCK"/>
+                <signal pad-key="pb0" function="default" group="SS"/>
             </signals>
         </peripheral>
         <peripheral key="twi" name="TWI" module-key="twi">
             <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"/>
+                <signal pad-key="pd1" function="default" group="SDA"/>
+                <signal pad-key="pd0" function="default" group="SCL"/>
             </signals>
         </peripheral>
         <peripheral key="usart0" name="USART0" module-key="usart">
             <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"/>
-                <signal pad-id="pe2" function="default" group="XCK"/>
+                <signal pad-key="pe0" function="default" group="RXD"/>
+                <signal pad-key="pe1" function="default" group="TXD"/>
+                <signal pad-key="pe2" function="default" group="XCK"/>
             </signals>
         </peripheral>
         <peripheral key="usart1" name="USART1" module-key="usart">
             <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"/>
-                <signal pad-id="pd5" function="default" group="XCK"/>
+                <signal pad-key="pd2" function="default" group="RXD"/>
+                <signal pad-key="pd3" function="default" group="TXD"/>
+                <signal pad-key="pd5" function="default" group="XCK"/>
             </signals>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="cpu">
@@ -240,52 +240,52 @@
         <peripheral key="jtag" name="JTAG" module-key="jtag">
             <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"/>
-                <signal pad-id="pf7" function="default" group="TDI"/>
-                <signal pad-id="pf6" function="default" group="TDO"/>
+                <signal pad-key="pf4" function="default" group="TCK"/>
+                <signal pad-key="pf5" function="default" group="TMS"/>
+                <signal pad-key="pf7" function="default" group="TDI"/>
+                <signal pad-key="pf6" function="default" group="TDO"/>
             </signals>
         </peripheral>
         <peripheral key="misc" name="MISC" module-key="misc">
             <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"/>
-                <signal pad-id="pe5" function="default" group="OC3C"/>
-                <signal pad-id="pg3" index="2" function="default" group="TOSC"/>
-                <signal pad-id="pg4" index="1" function="default" group="TOSC"/>
-                <signal pad-id="pg0" function="default" group="WR"/>
-                <signal pad-id="pg1" function="default" group="RD"/>
-                <signal pad-id="pc0" index="8" function="default" group="A"/>
-                <signal pad-id="pc1" index="9" function="default" group="A"/>
-                <signal pad-id="pc2" index="10" function="default" group="A"/>
-                <signal pad-id="pc3" index="11" function="default" group="A"/>
-                <signal pad-id="pc4" index="12" function="default" group="A"/>
-                <signal pad-id="pc5" index="13" function="default" group="A"/>
-                <signal pad-id="pc6" index="14" function="default" group="A"/>
-                <signal pad-id="pc7" index="15" function="default" group="A"/>
-                <signal pad-id="pg2" function="default" group="ALE"/>
-                <signal pad-id="pa7" index="7" function="default" group="AD"/>
-                <signal pad-id="pa6" index="6" function="default" group="AD"/>
-                <signal pad-id="pa5" index="5" function="default" group="AD"/>
-                <signal pad-id="pa4" index="4" function="default" group="AD"/>
-                <signal pad-id="pa3" index="3" function="default" group="AD"/>
-                <signal pad-id="pa2" index="2" function="default" group="AD"/>
-                <signal pad-id="pa1" index="1" function="default" group="AD"/>
-                <signal pad-id="pa0" index="0" function="default" group="AD"/>
+                <signal pad-key="pe0" function="default" group="PDI"/>
+                <signal pad-key="pe1" function="default" group="PDO"/>
+                <signal pad-key="pe5" function="default" group="OC3C"/>
+                <signal pad-key="pg3" index="2" function="default" group="TOSC"/>
+                <signal pad-key="pg4" index="1" function="default" group="TOSC"/>
+                <signal pad-key="pg0" function="default" group="WR"/>
+                <signal pad-key="pg1" function="default" group="RD"/>
+                <signal pad-key="pc0" index="8" function="default" group="A"/>
+                <signal pad-key="pc1" index="9" function="default" group="A"/>
+                <signal pad-key="pc2" index="10" function="default" group="A"/>
+                <signal pad-key="pc3" index="11" function="default" group="A"/>
+                <signal pad-key="pc4" index="12" function="default" group="A"/>
+                <signal pad-key="pc5" index="13" function="default" group="A"/>
+                <signal pad-key="pc6" index="14" function="default" group="A"/>
+                <signal pad-key="pc7" index="15" function="default" group="A"/>
+                <signal pad-key="pg2" function="default" group="ALE"/>
+                <signal pad-key="pa7" index="7" function="default" group="AD"/>
+                <signal pad-key="pa6" index="6" function="default" group="AD"/>
+                <signal pad-key="pa5" index="5" function="default" group="AD"/>
+                <signal pad-key="pa4" index="4" function="default" group="AD"/>
+                <signal pad-key="pa3" index="3" function="default" group="AD"/>
+                <signal pad-key="pa2" index="2" function="default" group="AD"/>
+                <signal pad-key="pa1" index="1" function="default" group="AD"/>
+                <signal pad-key="pa0" index="0" function="default" group="AD"/>
             </signals>
         </peripheral>
         <peripheral key="exint" name="EXINT" module-key="exint">
             <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"/>
-                <signal pad-id="pd2" index="2" function="default" group="INT"/>
-                <signal pad-id="pd3" index="3" function="default" group="INT"/>
-                <signal pad-id="pe4" index="4" function="default" group="INT"/>
-                <signal pad-id="pe5" index="5" function="default" group="INT"/>
-                <signal pad-id="pe6" index="6" function="default" group="INT"/>
-                <signal pad-id="pe7" index="7" function="default" group="INT"/>
+                <signal pad-key="pd0" index="0" function="default" group="INT"/>
+                <signal pad-key="pd1" index="1" function="default" group="INT"/>
+                <signal pad-key="pd2" index="2" function="default" group="INT"/>
+                <signal pad-key="pd3" index="3" function="default" group="INT"/>
+                <signal pad-key="pe4" index="4" function="default" group="INT"/>
+                <signal pad-key="pe5" index="5" function="default" group="INT"/>
+                <signal pad-key="pe6" index="6" function="default" group="INT"/>
+                <signal pad-key="pe7" index="7" function="default" group="INT"/>
             </signals>
         </peripheral>
         <peripheral key="eeprom" name="EEPROM" module-key="eeprom">
@@ -294,121 +294,121 @@
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pa2" index="2" function="default" group="P"/>
-                <signal pad-id="pa3" index="3" function="default" group="P"/>
-                <signal pad-id="pa4" index="4" function="default" group="P"/>
-                <signal pad-id="pa5" index="5" function="default" group="P"/>
-                <signal pad-id="pa6" index="6" function="default" group="P"/>
-                <signal pad-id="pa7" index="7" function="default" group="P"/>
+                <signal pad-key="pa0" index="0" function="default" group="P"/>
+                <signal pad-key="pa1" index="1" function="default" group="P"/>
+                <signal pad-key="pa2" index="2" function="default" group="P"/>
+                <signal pad-key="pa3" index="3" function="default" group="P"/>
+                <signal pad-key="pa4" index="4" function="default" group="P"/>
+                <signal pad-key="pa5" index="5" function="default" group="P"/>
+                <signal pad-key="pa6" index="6" function="default" group="P"/>
+                <signal pad-key="pa7" index="7" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pb2" index="2" function="default" group="P"/>
-                <signal pad-id="pb3" index="3" function="default" group="P"/>
-                <signal pad-id="pb4" index="4" function="default" group="P"/>
-                <signal pad-id="pb5" index="5" function="default" group="P"/>
-                <signal pad-id="pb6" index="6" function="default" group="P"/>
-                <signal pad-id="pb7" index="7" function="default" group="P"/>
+                <signal pad-key="pb0" index="0" function="default" group="P"/>
+                <signal pad-key="pb1" index="1" function="default" group="P"/>
+                <signal pad-key="pb2" index="2" function="default" group="P"/>
+                <signal pad-key="pb3" index="3" function="default" group="P"/>
+                <signal pad-key="pb4" index="4" function="default" group="P"/>
+                <signal pad-key="pb5" index="5" function="default" group="P"/>
+                <signal pad-key="pb6" index="6" function="default" group="P"/>
+                <signal pad-key="pb7" index="7" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pc2" index="2" function="default" group="P"/>
-                <signal pad-id="pc3" index="3" function="default" group="P"/>
-                <signal pad-id="pc4" index="4" function="default" group="P"/>
-                <signal pad-id="pc5" index="5" function="default" group="P"/>
-                <signal pad-id="pc6" index="6" function="default" group="P"/>
-                <signal pad-id="pc7" index="7" function="default" group="P"/>
+                <signal pad-key="pc0" index="0" function="default" group="P"/>
+                <signal pad-key="pc1" index="1" function="default" group="P"/>
+                <signal pad-key="pc2" index="2" function="default" group="P"/>
+                <signal pad-key="pc3" index="3" function="default" group="P"/>
+                <signal pad-key="pc4" index="4" function="default" group="P"/>
+                <signal pad-key="pc5" index="5" function="default" group="P"/>
+                <signal pad-key="pc6" index="6" function="default" group="P"/>
+                <signal pad-key="pc7" index="7" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pd2" index="2" function="default" group="P"/>
-                <signal pad-id="pd3" index="3" function="default" group="P"/>
-                <signal pad-id="pd4" index="4" function="default" group="P"/>
-                <signal pad-id="pd5" index="5" function="default" group="P"/>
-                <signal pad-id="pd6" index="6" function="default" group="P"/>
-                <signal pad-id="pd7" index="7" function="default" group="P"/>
+                <signal pad-key="pd0" index="0" function="default" group="P"/>
+                <signal pad-key="pd1" index="1" function="default" group="P"/>
+                <signal pad-key="pd2" index="2" function="default" group="P"/>
+                <signal pad-key="pd3" index="3" function="default" group="P"/>
+                <signal pad-key="pd4" index="4" function="default" group="P"/>
+                <signal pad-key="pd5" index="5" function="default" group="P"/>
+                <signal pad-key="pd6" index="6" function="default" group="P"/>
+                <signal pad-key="pd7" index="7" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="porte" name="PORTE" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pe2" index="2" function="default" group="P"/>
-                <signal pad-id="pe3" index="3" function="default" group="P"/>
-                <signal pad-id="pe4" index="4" function="default" group="P"/>
-                <signal pad-id="pe5" index="5" function="default" group="P"/>
-                <signal pad-id="pe6" index="6" function="default" group="P"/>
-                <signal pad-id="pe7" index="7" function="default" group="P"/>
+                <signal pad-key="pe0" index="0" function="default" group="P"/>
+                <signal pad-key="pe1" index="1" function="default" group="P"/>
+                <signal pad-key="pe2" index="2" function="default" group="P"/>
+                <signal pad-key="pe3" index="3" function="default" group="P"/>
+                <signal pad-key="pe4" index="4" function="default" group="P"/>
+                <signal pad-key="pe5" index="5" function="default" group="P"/>
+                <signal pad-key="pe6" index="6" function="default" group="P"/>
+                <signal pad-key="pe7" index="7" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portf" name="PORTF" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pf2" index="2" function="default" group="P"/>
-                <signal pad-id="pf3" index="3" function="default" group="P"/>
-                <signal pad-id="pf4" index="4" function="default" group="P"/>
-                <signal pad-id="pf5" index="5" function="default" group="P"/>
-                <signal pad-id="pf6" index="6" function="default" group="P"/>
-                <signal pad-id="pf7" index="7" function="default" group="P"/>
+                <signal pad-key="pf0" index="0" function="default" group="P"/>
+                <signal pad-key="pf1" index="1" function="default" group="P"/>
+                <signal pad-key="pf2" index="2" function="default" group="P"/>
+                <signal pad-key="pf3" index="3" function="default" group="P"/>
+                <signal pad-key="pf4" index="4" function="default" group="P"/>
+                <signal pad-key="pf5" index="5" function="default" group="P"/>
+                <signal pad-key="pf6" index="6" function="default" group="P"/>
+                <signal pad-key="pf7" index="7" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portg" name="PORTG" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pg2" index="2" function="default" group="P"/>
-                <signal pad-id="pg3" index="3" function="default" group="P"/>
-                <signal pad-id="pg4" index="4" function="default" group="P"/>
+                <signal pad-key="pg0" index="0" function="default" group="P"/>
+                <signal pad-key="pg1" index="1" function="default" group="P"/>
+                <signal pad-key="pg2" index="2" function="default" group="P"/>
+                <signal pad-key="pg3" index="3" function="default" group="P"/>
+                <signal pad-key="pg4" index="4" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="tc0" name="TC0" module-key="tc8_async">
             <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-key="pb4" function="default" group="OC"/>
             </signals>
         </peripheral>
         <peripheral key="tc1" name="TC1" module-key="tc16">
             <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"/>
-                <signal pad-id="pb7" function="default" group="OCC"/>
-                <signal pad-id="pd6" function="default" group="T"/>
-                <signal pad-id="pd4" function="default" group="ICP"/>
+                <signal pad-key="pb5" function="default" group="OCA"/>
+                <signal pad-key="pb6" function="default" group="OCB"/>
+                <signal pad-key="pb7" function="default" group="OCC"/>
+                <signal pad-key="pd6" function="default" group="T"/>
+                <signal pad-key="pd4" function="default" group="ICP"/>
             </signals>
         </peripheral>
         <peripheral key="tc3" name="TC3" module-key="tc16">
             <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"/>
-                <signal pad-id="pe6" function="default" group="T"/>
-                <signal pad-id="pe7" function="default" group="ICP"/>
+                <signal pad-key="pe3" function="default" group="OCA"/>
+                <signal pad-key="pe4" function="default" group="OCB"/>
+                <signal pad-key="pe6" function="default" group="T"/>
+                <signal pad-key="pe7" function="default" group="ICP"/>
             </signals>
         </peripheral>
         <peripheral key="tc2" name="TC2" module-key="tc8">
             <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"/>
+                <signal pad-key="pd7" function="default" group="T"/>
+                <signal pad-key="pb7" function="default" group="OC"/>
             </signals>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="wdt">
@@ -417,14 +417,14 @@
         <peripheral key="adc" name="ADC" module-key="adc">
             <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"/>
-                <signal pad-id="pf2" index="2" function="default" group="ADC"/>
-                <signal pad-id="pf3" index="3" function="default" group="ADC"/>
-                <signal pad-id="pf4" index="4" function="default" group="ADC"/>
-                <signal pad-id="pf5" index="5" function="default" group="ADC"/>
-                <signal pad-id="pf6" index="6" function="default" group="ADC"/>
-                <signal pad-id="pf7" index="7" function="default" group="ADC"/>
+                <signal pad-key="pf0" index="0" function="default" group="ADC"/>
+                <signal pad-key="pf1" index="1" function="default" group="ADC"/>
+                <signal pad-key="pf2" index="2" function="default" group="ADC"/>
+                <signal pad-key="pf3" index="3" function="default" group="ADC"/>
+                <signal pad-key="pf4" index="4" function="default" group="ADC"/>
+                <signal pad-key="pf5" index="5" function="default" group="ADC"/>
+                <signal pad-key="pf6" index="6" function="default" group="ADC"/>
+                <signal pad-key="pf7" index="7" function="default" group="ADC"/>
             </signals>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="fuse">
@@ -914,76 +914,139 @@
             </register-group>
         </module>
     </modules>
+    <pads>
+        <pad key="pen" name="PEN"/>
+        <pad key="pe0" name="PE0"/>
+        <pad key="pe1" name="PE1"/>
+        <pad key="pe2" name="PE2"/>
+        <pad key="pe3" name="PE3"/>
+        <pad key="pe4" name="PE4"/>
+        <pad key="pe5" name="PE5"/>
+        <pad key="pe6" name="PE6"/>
+        <pad key="pe7" name="PE7"/>
+        <pad key="pb0" name="PB0"/>
+        <pad key="pb1" name="PB1"/>
+        <pad key="pb2" name="PB2"/>
+        <pad key="pb3" name="PB3"/>
+        <pad key="pb4" name="PB4"/>
+        <pad key="pb5" name="PB5"/>
+        <pad key="pb6" name="PB6"/>
+        <pad key="pb7" name="PB7"/>
+        <pad key="pg3" name="PG3"/>
+        <pad key="pg4" name="PG4"/>
+        <pad key="reset" name="RESET"/>
+        <pad key="vcc" name="VCC"/>
+        <pad key="gnd" name="GND"/>
+        <pad key="xtal2" name="XTAL2"/>
+        <pad key="xtal1" name="XTAL1"/>
+        <pad key="pd0" name="PD0"/>
+        <pad key="pd1" name="PD1"/>
+        <pad key="pd2" name="PD2"/>
+        <pad key="pd3" name="PD3"/>
+        <pad key="pd4" name="PD4"/>
+        <pad key="pd5" name="PD5"/>
+        <pad key="pd6" name="PD6"/>
+        <pad key="pd7" name="PD7"/>
+        <pad key="pg0" name="PG0"/>
+        <pad key="pg1" name="PG1"/>
+        <pad key="pc0" name="PC0"/>
+        <pad key="pc1" name="PC1"/>
+        <pad key="pc2" name="PC2"/>
+        <pad key="pc3" name="PC3"/>
+        <pad key="pc4" name="PC4"/>
+        <pad key="pc5" name="PC5"/>
+        <pad key="pc6" name="PC6"/>
+        <pad key="pc7" name="PC7"/>
+        <pad key="pg2" name="PG2"/>
+        <pad key="pa7" name="PA7"/>
+        <pad key="pa6" name="PA6"/>
+        <pad key="pa5" name="PA5"/>
+        <pad key="pa4" name="PA4"/>
+        <pad key="pa3" name="PA3"/>
+        <pad key="pa2" name="PA2"/>
+        <pad key="pa1" name="PA1"/>
+        <pad key="pa0" name="PA0"/>
+        <pad key="pf7" name="PF7"/>
+        <pad key="pf6" name="PF6"/>
+        <pad key="pf5" name="PF5"/>
+        <pad key="pf4" name="PF4"/>
+        <pad key="pf3" name="PF3"/>
+        <pad key="pf2" name="PF2"/>
+        <pad key="pf1" name="PF1"/>
+        <pad key="pf0" name="PF0"/>
+        <pad key="aref" name="AREF"/>
+        <pad key="avcc" name="AVCC"/>
+    </pads>
     <pinouts>
         <pinout key="tqfpqfn64" name="TQFPQFN64" type="qfn">
-            <pin position="1" pad="PEN"/>
-            <pin position="2" pad="PE0"/>
-            <pin position="3" pad="PE1"/>
-            <pin position="4" pad="PE2"/>
-            <pin position="5" pad="PE3"/>
-            <pin position="6" pad="PE4"/>
-            <pin position="7" pad="PE5"/>
-            <pin position="8" pad="PE6"/>
-            <pin position="9" pad="PE7"/>
-            <pin position="10" pad="PB0"/>
-            <pin position="11" pad="PB1"/>
-            <pin position="12" pad="PB2"/>
-            <pin position="13" pad="PB3"/>
-            <pin position="14" pad="PB4"/>
-            <pin position="15" pad="PB5"/>
-            <pin position="16" pad="PB6"/>
-            <pin position="17" pad="PB7"/>
-            <pin position="18" pad="PG3"/>
-            <pin position="19" pad="PG4"/>
-            <pin position="20" pad="RESET"/>
-            <pin position="21" pad="VCC"/>
-            <pin position="22" pad="GND"/>
-            <pin position="23" pad="XTAL2"/>
-            <pin position="24" pad="XTAL1"/>
-            <pin position="25" pad="PD0"/>
-            <pin position="26" pad="PD1"/>
-            <pin position="27" pad="PD2"/>
-            <pin position="28" pad="PD3"/>
-            <pin position="29" pad="PD4"/>
-            <pin position="30" pad="PD5"/>
-            <pin position="31" pad="PD6"/>
-            <pin position="32" pad="PD7"/>
-            <pin position="33" pad="PG0"/>
-            <pin position="34" pad="PG1"/>
-            <pin position="35" pad="PC0"/>
-            <pin position="36" pad="PC1"/>
-            <pin position="37" pad="PC2"/>
-            <pin position="38" pad="PC3"/>
-            <pin position="39" pad="PC4"/>
-            <pin position="40" pad="PC5"/>
-            <pin position="41" pad="PC6"/>
-            <pin position="42" pad="PC7"/>
-            <pin position="43" pad="PG2"/>
-            <pin position="44" pad="PA7"/>
-            <pin position="45" pad="PA6"/>
-            <pin position="46" pad="PA5"/>
-            <pin position="47" pad="PA4"/>
-            <pin position="48" pad="PA3"/>
-            <pin position="49" pad="PA2"/>
-            <pin position="50" pad="PA1"/>
-            <pin position="51" pad="PA0"/>
-            <pin position="52" pad="VCC"/>
-            <pin position="53" pad="GND"/>
-            <pin position="54" pad="PF7"/>
-            <pin position="55" pad="PF6"/>
-            <pin position="56" pad="PF5"/>
-            <pin position="57" pad="PF4"/>
-            <pin position="58" pad="PF3"/>
-            <pin position="59" pad="PF2"/>
-            <pin position="60" pad="PF1"/>
-            <pin position="61" pad="PF0"/>
-            <pin position="62" pad="AREF"/>
-            <pin position="63" pad="GND"/>
-            <pin position="64" pad="AVCC"/>
+            <pin position="1" pad-key="pen"/>
+            <pin position="2" pad-key="pe0"/>
+            <pin position="3" pad-key="pe1"/>
+            <pin position="4" pad-key="pe2"/>
+            <pin position="5" pad-key="pe3"/>
+            <pin position="6" pad-key="pe4"/>
+            <pin position="7" pad-key="pe5"/>
+            <pin position="8" pad-key="pe6"/>
+            <pin position="9" pad-key="pe7"/>
+            <pin position="10" pad-key="pb0"/>
+            <pin position="11" pad-key="pb1"/>
+            <pin position="12" pad-key="pb2"/>
+            <pin position="13" pad-key="pb3"/>
+            <pin position="14" pad-key="pb4"/>
+            <pin position="15" pad-key="pb5"/>
+            <pin position="16" pad-key="pb6"/>
+            <pin position="17" pad-key="pb7"/>
+            <pin position="18" pad-key="pg3"/>
+            <pin position="19" pad-key="pg4"/>
+            <pin position="20" pad-key="reset"/>
+            <pin position="21" pad-key="vcc"/>
+            <pin position="22" pad-key="gnd"/>
+            <pin position="23" pad-key="xtal2"/>
+            <pin position="24" pad-key="xtal1"/>
+            <pin position="25" pad-key="pd0"/>
+            <pin position="26" pad-key="pd1"/>
+            <pin position="27" pad-key="pd2"/>
+            <pin position="28" pad-key="pd3"/>
+            <pin position="29" pad-key="pd4"/>
+            <pin position="30" pad-key="pd5"/>
+            <pin position="31" pad-key="pd6"/>
+            <pin position="32" pad-key="pd7"/>
+            <pin position="33" pad-key="pg0"/>
+            <pin position="34" pad-key="pg1"/>
+            <pin position="35" pad-key="pc0"/>
+            <pin position="36" pad-key="pc1"/>
+            <pin position="37" pad-key="pc2"/>
+            <pin position="38" pad-key="pc3"/>
+            <pin position="39" pad-key="pc4"/>
+            <pin position="40" pad-key="pc5"/>
+            <pin position="41" pad-key="pc6"/>
+            <pin position="42" pad-key="pc7"/>
+            <pin position="43" pad-key="pg2"/>
+            <pin position="44" pad-key="pa7"/>
+            <pin position="45" pad-key="pa6"/>
+            <pin position="46" pad-key="pa5"/>
+            <pin position="47" pad-key="pa4"/>
+            <pin position="48" pad-key="pa3"/>
+            <pin position="49" pad-key="pa2"/>
+            <pin position="50" pad-key="pa1"/>
+            <pin position="51" pad-key="pa0"/>
+            <pin position="52" pad-key="vcc"/>
+            <pin position="53" pad-key="gnd"/>
+            <pin position="54" pad-key="pf7"/>
+            <pin position="55" pad-key="pf6"/>
+            <pin position="56" pad-key="pf5"/>
+            <pin position="57" pad-key="pf4"/>
+            <pin position="58" pad-key="pf3"/>
+            <pin position="59" pad-key="pf2"/>
+            <pin position="60" pad-key="pf1"/>
+            <pin position="61" pad-key="pf0"/>
+            <pin position="62" pad-key="aref"/>
+            <pin position="63" pad-key="gnd"/>
+            <pin position="64" pad-key="avcc"/>
         </pinout>
     </pinouts>
     <variants>
-        <variant name="ATmega128A-AU" pinout-key="tqfpqfn64" package="TQFP64"/>
-        <variant name="ATmega128A-MU" pinout-key="tqfpqfn64" package="QFN64"/>
+        <variant key="atmega128a_au" name="ATmega128A-AU" pinout-key="tqfpqfn64"/>
+        <variant key="atmega128a_mu" name="ATmega128A-MU" pinout-key="tqfpqfn64"/>
     </variants>
 </device>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA128RFA1.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA128RFA1.xml
index 9aff4780..b4a0d6c2 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA128RFA1.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA128RFA1.xml
@@ -215,64 +215,64 @@
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pb2" index="2" function="PORTB" group="P"/>
-                <signal pad-id="pb3" index="3" function="PORTB" group="P"/>
-                <signal pad-id="pb4" index="4" function="PORTB" group="P"/>
-                <signal pad-id="pb5" index="5" function="PORTB" group="P"/>
-                <signal pad-id="pb6" index="6" function="PORTB" group="P"/>
-                <signal pad-id="pb7" index="7" function="PORTB" group="P"/>
+                <signal pad-key="pb0" index="0" function="PORTB" group="P"/>
+                <signal pad-key="pb1" index="1" function="PORTB" group="P"/>
+                <signal pad-key="pb2" index="2" function="PORTB" group="P"/>
+                <signal pad-key="pb3" index="3" function="PORTB" group="P"/>
+                <signal pad-key="pb4" index="4" function="PORTB" group="P"/>
+                <signal pad-key="pb5" index="5" function="PORTB" group="P"/>
+                <signal pad-key="pb6" index="6" function="PORTB" group="P"/>
+                <signal pad-key="pb7" index="7" function="PORTB" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pd2" index="2" function="PORTD" group="P"/>
-                <signal pad-id="pd3" index="3" function="PORTD" group="P"/>
-                <signal pad-id="pd4" index="4" function="PORTD" group="P"/>
-                <signal pad-id="pd5" index="5" function="PORTD" group="P"/>
-                <signal pad-id="pd6" index="6" function="PORTD" group="P"/>
-                <signal pad-id="pd7" index="7" function="PORTD" group="P"/>
+                <signal pad-key="pd0" index="0" function="PORTD" group="P"/>
+                <signal pad-key="pd1" index="1" function="PORTD" group="P"/>
+                <signal pad-key="pd2" index="2" function="PORTD" group="P"/>
+                <signal pad-key="pd3" index="3" function="PORTD" group="P"/>
+                <signal pad-key="pd4" index="4" function="PORTD" group="P"/>
+                <signal pad-key="pd5" index="5" function="PORTD" group="P"/>
+                <signal pad-key="pd6" index="6" function="PORTD" group="P"/>
+                <signal pad-key="pd7" index="7" function="PORTD" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="porte" name="PORTE" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pe2" index="2" function="PORTE" group="P"/>
-                <signal pad-id="pe3" index="3" function="PORTE" group="P"/>
-                <signal pad-id="pe4" index="4" function="PORTE" group="P"/>
-                <signal pad-id="pe5" index="5" function="PORTE" group="P"/>
-                <signal pad-id="pe6" index="6" function="PORTE" group="P"/>
-                <signal pad-id="pe7" index="7" function="PORTE" group="P"/>
+                <signal pad-key="pe0" index="0" function="PORTE" group="P"/>
+                <signal pad-key="pe1" index="1" function="PORTE" group="P"/>
+                <signal pad-key="pe2" index="2" function="PORTE" group="P"/>
+                <signal pad-key="pe3" index="3" function="PORTE" group="P"/>
+                <signal pad-key="pe4" index="4" function="PORTE" group="P"/>
+                <signal pad-key="pe5" index="5" function="PORTE" group="P"/>
+                <signal pad-key="pe6" index="6" function="PORTE" group="P"/>
+                <signal pad-key="pe7" index="7" function="PORTE" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portf" name="PORTF" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pf2" index="2" function="PORTF" group="P"/>
-                <signal pad-id="pf3" index="3" function="PORTF" group="P"/>
-                <signal pad-id="pf4" index="4" function="PORTF" group="P"/>
-                <signal pad-id="pf5" index="5" function="PORTF" group="P"/>
-                <signal pad-id="pf6" index="6" function="PORTF" group="P"/>
-                <signal pad-id="pf7" index="7" function="PORTF" group="P"/>
+                <signal pad-key="pf0" index="0" function="PORTF" group="P"/>
+                <signal pad-key="pf1" index="1" function="PORTF" group="P"/>
+                <signal pad-key="pf2" index="2" function="PORTF" group="P"/>
+                <signal pad-key="pf3" index="3" function="PORTF" group="P"/>
+                <signal pad-key="pf4" index="4" function="PORTF" group="P"/>
+                <signal pad-key="pf5" index="5" function="PORTF" group="P"/>
+                <signal pad-key="pf6" index="6" function="PORTF" group="P"/>
+                <signal pad-key="pf7" index="7" function="PORTF" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portg" name="PORTG" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pg2" index="2" function="PORTG" group="P"/>
-                <signal pad-id="pg3" index="3" function="PORTG" group="P"/>
-                <signal pad-id="pg4" index="4" function="PORTG" group="P"/>
-                <signal pad-id="pg5" index="5" function="PORTG" group="P"/>
+                <signal pad-key="pg0" index="0" function="PORTG" group="P"/>
+                <signal pad-key="pg1" index="1" function="PORTG" group="P"/>
+                <signal pad-key="pg2" index="2" function="PORTG" group="P"/>
+                <signal pad-key="pg3" index="3" function="PORTG" group="P"/>
+                <signal pad-key="pg4" index="4" function="PORTG" group="P"/>
+                <signal pad-key="pg5" index="5" function="PORTG" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="tc0" name="TC0" module-key="tc8">
@@ -1409,75 +1409,132 @@
             </register-group>
         </module>
     </modules>
+    <pads>
+        <pad key="pf2" name="PF2"/>
+        <pad key="pf3" name="PF3"/>
+        <pad key="pf4" name="PF4"/>
+        <pad key="pf5" name="PF5"/>
+        <pad key="pf6" name="PF6"/>
+        <pad key="pf7" name="PF7"/>
+        <pad key="avss_rfp" name="AVSS_RFP"/>
+        <pad key="rfp" name="RFP"/>
+        <pad key="rfn" name="RFN"/>
+        <pad key="avss_rfn" name="AVSS_RFN"/>
+        <pad key="tst" name="TST"/>
+        <pad key="rstn" name="RSTN"/>
+        <pad key="rston" name="RSTON"/>
+        <pad key="pg0" name="PG0"/>
+        <pad key="pg1" name="PG1"/>
+        <pad key="pg2" name="PG2"/>
+        <pad key="pg3" name="PG3"/>
+        <pad key="pg4" name="PG4"/>
+        <pad key="pg5" name="PG5"/>
+        <pad key="dvss" name="DVSS"/>
+        <pad key="dvdd" name="DVDD"/>
+        <pad key="devdd" name="DEVDD"/>
+        <pad key="pd0" name="PD0"/>
+        <pad key="pd1" name="PD1"/>
+        <pad key="pd2" name="PD2"/>
+        <pad key="pd3" name="PD3"/>
+        <pad key="pd4" name="PD4"/>
+        <pad key="pd5" name="PD5"/>
+        <pad key="pd6" name="PD6"/>
+        <pad key="pd7" name="PD7"/>
+        <pad key="clki" name="CLKI"/>
+        <pad key="pb0" name="PB0"/>
+        <pad key="pb1" name="PB1"/>
+        <pad key="pb2" name="PB2"/>
+        <pad key="pb3" name="PB3"/>
+        <pad key="pb4" name="PB4"/>
+        <pad key="pb5" name="PB5"/>
+        <pad key="pb6" name="PB6"/>
+        <pad key="pb7" name="PB7"/>
+        <pad key="pe0" name="PE0"/>
+        <pad key="pe1" name="PE1"/>
+        <pad key="pe2" name="PE2"/>
+        <pad key="pe3" name="PE3"/>
+        <pad key="pe4" name="PE4"/>
+        <pad key="pe5" name="PE5"/>
+        <pad key="pe6" name="PE6"/>
+        <pad key="pe7" name="PE7"/>
+        <pad key="xtal2" name="XTAL2"/>
+        <pad key="xtal1" name="XTAL1"/>
+        <pad key="avss" name="AVSS"/>
+        <pad key="evdd" name="EVDD"/>
+        <pad key="avdd" name="AVDD"/>
+        <pad key="aref" name="AREF"/>
+        <pad key="pf0" name="PF0"/>
+        <pad key="pf1" name="PF1"/>
+    </pads>
     <pinouts>
         <pinout key="qfn64" name="QFN64" type="qfn">
-            <pin position="1" pad="PF2"/>
-            <pin position="2" pad="PF3"/>
-            <pin position="3" pad="PF4"/>
-            <pin position="4" pad="PF5"/>
-            <pin position="5" pad="PF6"/>
-            <pin position="6" pad="PF7"/>
-            <pin position="7" pad="AVSS_RFP"/>
-            <pin position="8" pad="RFP"/>
-            <pin position="9" pad="RFN"/>
-            <pin position="10" pad="AVSS_RFN"/>
-            <pin position="11" pad="TST"/>
-            <pin position="12" pad="RSTN"/>
-            <pin position="13" pad="RSTON"/>
-            <pin position="14" pad="PG0"/>
-            <pin position="15" pad="PG1"/>
-            <pin position="16" pad="PG2"/>
-            <pin position="17" pad="PG3"/>
-            <pin position="18" pad="PG4"/>
-            <pin position="19" pad="PG5"/>
-            <pin position="20" pad="DVSS"/>
-            <pin position="21" pad="DVDD"/>
-            <pin position="22" pad="DVDD"/>
-            <pin position="23" pad="DEVDD"/>
-            <pin position="24" pad="DVSS"/>
-            <pin position="25" pad="PD0"/>
-            <pin position="26" pad="PD1"/>
-            <pin position="27" pad="PD2"/>
-            <pin position="28" pad="PD3"/>
-            <pin position="29" pad="PD4"/>
-            <pin position="30" pad="PD5"/>
-            <pin position="31" pad="PD6"/>
-            <pin position="32" pad="PD7"/>
-            <pin position="33" pad="CLKI"/>
-            <pin position="34" pad="DEVDD"/>
-            <pin position="35" pad="DVSS"/>
-            <pin position="36" pad="PB0"/>
-            <pin position="37" pad="PB1"/>
-            <pin position="38" pad="PB2"/>
-            <pin position="39" pad="PB3"/>
-            <pin position="40" pad="PB4"/>
-            <pin position="41" pad="PB5"/>
-            <pin position="42" pad="PB6"/>
-            <pin position="43" pad="PB7"/>
-            <pin position="44" pad="DEVDD"/>
-            <pin position="45" pad="DVSS"/>
-            <pin position="46" pad="PE0"/>
-            <pin position="47" pad="PE1"/>
-            <pin position="48" pad="PE2"/>
-            <pin position="49" pad="PE3"/>
-            <pin position="50" pad="PE4"/>
-            <pin position="51" pad="PE5"/>
-            <pin position="52" pad="PE6"/>
-            <pin position="53" pad="PE7"/>
-            <pin position="54" pad="DEVDD"/>
-            <pin position="55" pad="DVSS"/>
-            <pin position="56" pad="XTAL2"/>
-            <pin position="57" pad="XTAL1"/>
-            <pin position="58" pad="AVSS"/>
-            <pin position="59" pad="EVDD"/>
-            <pin position="60" pad="AVDD"/>
-            <pin position="61" pad="AVSS"/>
-            <pin position="62" pad="AREF"/>
-            <pin position="63" pad="PF0"/>
-            <pin position="64" pad="PF1"/>
+            <pin position="1" pad-key="pf2"/>
+            <pin position="2" pad-key="pf3"/>
+            <pin position="3" pad-key="pf4"/>
+            <pin position="4" pad-key="pf5"/>
+            <pin position="5" pad-key="pf6"/>
+            <pin position="6" pad-key="pf7"/>
+            <pin position="7" pad-key="avss_rfp"/>
+            <pin position="8" pad-key="rfp"/>
+            <pin position="9" pad-key="rfn"/>
+            <pin position="10" pad-key="avss_rfn"/>
+            <pin position="11" pad-key="tst"/>
+            <pin position="12" pad-key="rstn"/>
+            <pin position="13" pad-key="rston"/>
+            <pin position="14" pad-key="pg0"/>
+            <pin position="15" pad-key="pg1"/>
+            <pin position="16" pad-key="pg2"/>
+            <pin position="17" pad-key="pg3"/>
+            <pin position="18" pad-key="pg4"/>
+            <pin position="19" pad-key="pg5"/>
+            <pin position="20" pad-key="dvss"/>
+            <pin position="21" pad-key="dvdd"/>
+            <pin position="22" pad-key="dvdd"/>
+            <pin position="23" pad-key="devdd"/>
+            <pin position="24" pad-key="dvss"/>
+            <pin position="25" pad-key="pd0"/>
+            <pin position="26" pad-key="pd1"/>
+            <pin position="27" pad-key="pd2"/>
+            <pin position="28" pad-key="pd3"/>
+            <pin position="29" pad-key="pd4"/>
+            <pin position="30" pad-key="pd5"/>
+            <pin position="31" pad-key="pd6"/>
+            <pin position="32" pad-key="pd7"/>
+            <pin position="33" pad-key="clki"/>
+            <pin position="34" pad-key="devdd"/>
+            <pin position="35" pad-key="dvss"/>
+            <pin position="36" pad-key="pb0"/>
+            <pin position="37" pad-key="pb1"/>
+            <pin position="38" pad-key="pb2"/>
+            <pin position="39" pad-key="pb3"/>
+            <pin position="40" pad-key="pb4"/>
+            <pin position="41" pad-key="pb5"/>
+            <pin position="42" pad-key="pb6"/>
+            <pin position="43" pad-key="pb7"/>
+            <pin position="44" pad-key="devdd"/>
+            <pin position="45" pad-key="dvss"/>
+            <pin position="46" pad-key="pe0"/>
+            <pin position="47" pad-key="pe1"/>
+            <pin position="48" pad-key="pe2"/>
+            <pin position="49" pad-key="pe3"/>
+            <pin position="50" pad-key="pe4"/>
+            <pin position="51" pad-key="pe5"/>
+            <pin position="52" pad-key="pe6"/>
+            <pin position="53" pad-key="pe7"/>
+            <pin position="54" pad-key="devdd"/>
+            <pin position="55" pad-key="dvss"/>
+            <pin position="56" pad-key="xtal2"/>
+            <pin position="57" pad-key="xtal1"/>
+            <pin position="58" pad-key="avss"/>
+            <pin position="59" pad-key="evdd"/>
+            <pin position="60" pad-key="avdd"/>
+            <pin position="61" pad-key="avss"/>
+            <pin position="62" pad-key="aref"/>
+            <pin position="63" pad-key="pf0"/>
+            <pin position="64" pad-key="pf1"/>
         </pinout>
     </pinouts>
     <variants>
-        <variant name="ATmega128RFA1-ZU" pinout-key="qfn64" package="QFN64"/>
+        <variant key="atmega128rfa1_zu" name="ATmega128RFA1-ZU" pinout-key="qfn64"/>
     </variants>
 </device>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA128RFR2.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA128RFR2.xml
index 3e0629d5..0fdbd651 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA128RFR2.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA128RFR2.xml
@@ -218,64 +218,63 @@
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pb2" index="2" function="PORTB" group="P"/>
-                <signal pad-id="pb3" index="3" function="PORTB" group="P"/>
-                <signal pad-id="pb4" index="4" function="PORTB" group="P"/>
-                <signal pad-id="pb5" index="5" function="PORTB" group="P"/>
-                <signal pad-id="pb6" index="6" function="PORTB" group="P"/>
-                <signal pad-id="pb7" index="7" function="PORTB" group="P"/>
+                <signal pad-key="pb0" index="0" function="PORTB" group="P"/>
+                <signal pad-key="pb1" index="1" function="PORTB" group="P"/>
+                <signal pad-key="pb2" index="2" function="PORTB" group="P"/>
+                <signal pad-key="pb3" index="3" function="PORTB" group="P"/>
+                <signal pad-key="pb4" index="4" function="PORTB" group="P"/>
+                <signal pad-key="pb5" index="5" function="PORTB" group="P"/>
+                <signal pad-key="pb6" index="6" function="PORTB" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pd2" index="2" function="PORTD" group="P"/>
-                <signal pad-id="pd3" index="3" function="PORTD" group="P"/>
-                <signal pad-id="pd4" index="4" function="PORTD" group="P"/>
-                <signal pad-id="pd5" index="5" function="PORTD" group="P"/>
-                <signal pad-id="pd6" index="6" function="PORTD" group="P"/>
-                <signal pad-id="pd7" index="7" function="PORTD" group="P"/>
+                <signal pad-key="pd0" index="0" function="PORTD" group="P"/>
+                <signal pad-key="pd1" index="1" function="PORTD" group="P"/>
+                <signal pad-key="pd2" index="2" function="PORTD" group="P"/>
+                <signal pad-key="pd3" index="3" function="PORTD" group="P"/>
+                <signal pad-key="pd4" index="4" function="PORTD" group="P"/>
+                <signal pad-key="pd5" index="5" function="PORTD" group="P"/>
+                <signal pad-key="pd6" index="6" function="PORTD" group="P"/>
+                <signal pad-key="pd7" index="7" function="PORTD" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="porte" name="PORTE" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pe2" index="2" function="PORTE" group="P"/>
-                <signal pad-id="pe3" index="3" function="PORTE" group="P"/>
-                <signal pad-id="pe4" index="4" function="PORTE" group="P"/>
-                <signal pad-id="pe5" index="5" function="PORTE" group="P"/>
-                <signal pad-id="pe6" index="6" function="PORTE" group="P"/>
-                <signal pad-id="pe7" index="7" function="PORTE" group="P"/>
+                <signal pad-key="pe0" index="0" function="PORTE" group="P"/>
+                <signal pad-key="pe1" index="1" function="PORTE" group="P"/>
+                <signal pad-key="pe2" index="2" function="PORTE" group="P"/>
+                <signal pad-key="pe3" index="3" function="PORTE" group="P"/>
+                <signal pad-key="pe4" index="4" function="PORTE" group="P"/>
+                <signal pad-key="pe5" index="5" function="PORTE" group="P"/>
+                <signal pad-key="pe6" index="6" function="PORTE" group="P"/>
+                <signal pad-key="pe7" index="7" function="PORTE" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portf" name="PORTF" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pf2" index="2" function="PORTF" group="P"/>
-                <signal pad-id="pf3" index="3" function="PORTF" group="P"/>
-                <signal pad-id="pf4" index="4" function="PORTF" group="P"/>
-                <signal pad-id="pf5" index="5" function="PORTF" group="P"/>
-                <signal pad-id="pf6" index="6" function="PORTF" group="P"/>
-                <signal pad-id="pf7" index="7" function="PORTF" group="P"/>
+                <signal pad-key="pf0" index="0" function="PORTF" group="P"/>
+                <signal pad-key="pf1" index="1" function="PORTF" group="P"/>
+                <signal pad-key="pf2" index="2" function="PORTF" group="P"/>
+                <signal pad-key="pf3" index="3" function="PORTF" group="P"/>
+                <signal pad-key="pf4" index="4" function="PORTF" group="P"/>
+                <signal pad-key="pf5" index="5" function="PORTF" group="P"/>
+                <signal pad-key="pf6" index="6" function="PORTF" group="P"/>
+                <signal pad-key="pf7" index="7" function="PORTF" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portg" name="PORTG" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pg2" index="2" function="PORTG" group="P"/>
-                <signal pad-id="pg3" index="3" function="PORTG" group="P"/>
-                <signal pad-id="pg4" index="4" function="PORTG" group="P"/>
-                <signal pad-id="pg5" index="5" function="PORTG" group="P"/>
+                <signal pad-key="pg0" index="0" function="PORTG" group="P"/>
+                <signal pad-key="pg1" index="1" function="PORTG" group="P"/>
+                <signal pad-key="pg2" index="2" function="PORTG" group="P"/>
+                <signal pad-key="pg3" index="3" function="PORTG" group="P"/>
+                <signal pad-key="pg4" index="4" function="PORTG" group="P"/>
+                <signal pad-key="pg5" index="5" function="PORTG" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="tc0" name="TC0" module-key="tc8">
@@ -1548,78 +1547,134 @@
             </register-group>
         </module>
     </modules>
+    <pads>
+        <pad key="pf2" name="PF2"/>
+        <pad key="pf3" name="PF3"/>
+        <pad key="pf4" name="PF4"/>
+        <pad key="pf5" name="PF5"/>
+        <pad key="pf6" name="PF6"/>
+        <pad key="pf7" name="PF7"/>
+        <pad key="avss_rfp" name="AVSS_RFP"/>
+        <pad key="rfp" name="RFP"/>
+        <pad key="rfn" name="RFN"/>
+        <pad key="avss_rfn" name="AVSS_RFN"/>
+        <pad key="tst" name="TST"/>
+        <pad key="rstn" name="RSTN"/>
+        <pad key="rston" name="RSTON"/>
+        <pad key="pg0" name="PG0"/>
+        <pad key="pg1" name="PG1"/>
+        <pad key="pg2" name="PG2"/>
+        <pad key="pg3" name="PG3"/>
+        <pad key="pg4" name="PG4"/>
+        <pad key="pg5" name="PG5"/>
+        <pad key="dvss" name="DVSS"/>
+        <pad key="dvdd" name="DVDD"/>
+        <pad key="devdd" name="DEVDD"/>
+        <pad key="pd0" name="PD0"/>
+        <pad key="pd1" name="PD1"/>
+        <pad key="pd2" name="PD2"/>
+        <pad key="pd3" name="PD3"/>
+        <pad key="pd4" name="PD4"/>
+        <pad key="pd5" name="PD5"/>
+        <pad key="pd6" name="PD6"/>
+        <pad key="pd7" name="PD7"/>
+        <pad key="clki" name="CLKI"/>
+        <pad key="pb0" name="PB0"/>
+        <pad key="pb1" name="PB1"/>
+        <pad key="pb2" name="PB2"/>
+        <pad key="pb3" name="PB3"/>
+        <pad key="pb4" name="PB4"/>
+        <pad key="pb5" name="PB5"/>
+        <pad key="pb6" name="PB6"/>
+        <pad key="pe7" name="PE7"/>
+        <pad key="pe0" name="PE0"/>
+        <pad key="pe1" name="PE1"/>
+        <pad key="pe2" name="PE2"/>
+        <pad key="pe3" name="PE3"/>
+        <pad key="pe4" name="PE4"/>
+        <pad key="pe5" name="PE5"/>
+        <pad key="pe6" name="PE6"/>
+        <pad key="xtal2" name="XTAL2"/>
+        <pad key="xtal1" name="XTAL1"/>
+        <pad key="avss" name="AVSS"/>
+        <pad key="evdd" name="EVDD"/>
+        <pad key="avdd" name="AVDD"/>
+        <pad key="aref" name="AREF"/>
+        <pad key="pf0" name="PF0"/>
+        <pad key="pf1" name="PF1"/>
+    </pads>
     <pinouts>
         <pinout key="qfn64" name="QFN64" type="qfn">
-            <pin position="1" pad="PF2"/>
-            <pin position="2" pad="PF3"/>
-            <pin position="3" pad="PF4"/>
-            <pin position="4" pad="PF5"/>
-            <pin position="5" pad="PF6"/>
-            <pin position="6" pad="PF7"/>
-            <pin position="7" pad="AVSS_RFP"/>
-            <pin position="8" pad="RFP"/>
-            <pin position="9" pad="RFN"/>
-            <pin position="10" pad="AVSS_RFN"/>
-            <pin position="11" pad="TST"/>
-            <pin position="12" pad="RSTN"/>
-            <pin position="13" pad="RSTON"/>
-            <pin position="14" pad="PG0"/>
-            <pin position="15" pad="PG1"/>
-            <pin position="16" pad="PG2"/>
-            <pin position="17" pad="PG3"/>
-            <pin position="18" pad="PG4"/>
-            <pin position="19" pad="PG5"/>
-            <pin position="20" pad="DVSS"/>
-            <pin position="21" pad="DVDD"/>
-            <pin position="22" pad="DVDD"/>
-            <pin position="23" pad="DEVDD"/>
-            <pin position="24" pad="DVSS"/>
-            <pin position="25" pad="PD0"/>
-            <pin position="26" pad="PD1"/>
-            <pin position="27" pad="PD2"/>
-            <pin position="28" pad="PD3"/>
-            <pin position="29" pad="PD4"/>
-            <pin position="30" pad="PD5"/>
-            <pin position="31" pad="PD6"/>
-            <pin position="32" pad="PD7"/>
-            <pin position="33" pad="CLKI"/>
-            <pin position="34" pad="DEVDD"/>
-            <pin position="35" pad="DVSS"/>
-            <pin position="36" pad="PB0"/>
-            <pin position="37" pad="PB1"/>
-            <pin position="38" pad="PB2"/>
-            <pin position="39" pad="PB3"/>
-            <pin position="40" pad="PB4"/>
-            <pin position="41" pad="PB5"/>
-            <pin position="42" pad="PB6"/>
-            <pin position="43" pad="PE7"/>
-            <pin position="44" pad="DEVDD"/>
-            <pin position="45" pad="DVSS"/>
-            <pin position="46" pad="PE0"/>
-            <pin position="47" pad="PE1"/>
-            <pin position="48" pad="PE2"/>
-            <pin position="49" pad="PE3"/>
-            <pin position="50" pad="PE4"/>
-            <pin position="51" pad="PE5"/>
-            <pin position="52" pad="PE6"/>
-            <pin position="53" pad="PE7"/>
-            <pin position="54" pad="DEVDD"/>
-            <pin position="55" pad="DVSS"/>
-            <pin position="56" pad="XTAL2"/>
-            <pin position="57" pad="XTAL1"/>
-            <pin position="58" pad="AVSS"/>
-            <pin position="59" pad="EVDD"/>
-            <pin position="60" pad="AVDD"/>
-            <pin position="61" pad="AVSS"/>
-            <pin position="62" pad="AREF"/>
-            <pin position="63" pad="PF0"/>
-            <pin position="64" pad="PF1"/>
+            <pin position="1" pad-key="pf2"/>
+            <pin position="2" pad-key="pf3"/>
+            <pin position="3" pad-key="pf4"/>
+            <pin position="4" pad-key="pf5"/>
+            <pin position="5" pad-key="pf6"/>
+            <pin position="6" pad-key="pf7"/>
+            <pin position="7" pad-key="avss_rfp"/>
+            <pin position="8" pad-key="rfp"/>
+            <pin position="9" pad-key="rfn"/>
+            <pin position="10" pad-key="avss_rfn"/>
+            <pin position="11" pad-key="tst"/>
+            <pin position="12" pad-key="rstn"/>
+            <pin position="13" pad-key="rston"/>
+            <pin position="14" pad-key="pg0"/>
+            <pin position="15" pad-key="pg1"/>
+            <pin position="16" pad-key="pg2"/>
+            <pin position="17" pad-key="pg3"/>
+            <pin position="18" pad-key="pg4"/>
+            <pin position="19" pad-key="pg5"/>
+            <pin position="20" pad-key="dvss"/>
+            <pin position="21" pad-key="dvdd"/>
+            <pin position="22" pad-key="dvdd"/>
+            <pin position="23" pad-key="devdd"/>
+            <pin position="24" pad-key="dvss"/>
+            <pin position="25" pad-key="pd0"/>
+            <pin position="26" pad-key="pd1"/>
+            <pin position="27" pad-key="pd2"/>
+            <pin position="28" pad-key="pd3"/>
+            <pin position="29" pad-key="pd4"/>
+            <pin position="30" pad-key="pd5"/>
+            <pin position="31" pad-key="pd6"/>
+            <pin position="32" pad-key="pd7"/>
+            <pin position="33" pad-key="clki"/>
+            <pin position="34" pad-key="devdd"/>
+            <pin position="35" pad-key="dvss"/>
+            <pin position="36" pad-key="pb0"/>
+            <pin position="37" pad-key="pb1"/>
+            <pin position="38" pad-key="pb2"/>
+            <pin position="39" pad-key="pb3"/>
+            <pin position="40" pad-key="pb4"/>
+            <pin position="41" pad-key="pb5"/>
+            <pin position="42" pad-key="pb6"/>
+            <pin position="43" pad-key="pe7"/>
+            <pin position="44" pad-key="devdd"/>
+            <pin position="45" pad-key="dvss"/>
+            <pin position="46" pad-key="pe0"/>
+            <pin position="47" pad-key="pe1"/>
+            <pin position="48" pad-key="pe2"/>
+            <pin position="49" pad-key="pe3"/>
+            <pin position="50" pad-key="pe4"/>
+            <pin position="51" pad-key="pe5"/>
+            <pin position="52" pad-key="pe6"/>
+            <pin position="53" pad-key="pe7"/>
+            <pin position="54" pad-key="devdd"/>
+            <pin position="55" pad-key="dvss"/>
+            <pin position="56" pad-key="xtal2"/>
+            <pin position="57" pad-key="xtal1"/>
+            <pin position="58" pad-key="avss"/>
+            <pin position="59" pad-key="evdd"/>
+            <pin position="60" pad-key="avdd"/>
+            <pin position="61" pad-key="avss"/>
+            <pin position="62" pad-key="aref"/>
+            <pin position="63" pad-key="pf0"/>
+            <pin position="64" pad-key="pf1"/>
         </pinout>
     </pinouts>
     <variants>
-        <variant name="ATmega128RFR2-ZU" pinout-key="qfn64" package="QFN64"/>
-        <variant name="ATmega128RFR2-ZUR" pinout-key="qfn64" package="QFN64"/>
-        <variant name="ATmega128RFR2-ZF" pinout-key="qfn64" package="QFN64"/>
-        <variant name="ATmega128RFR2-ZFR" pinout-key="qfn64" package="QFN64"/>
+        <variant key="atmega128rfr2_zu" name="ATmega128RFR2-ZU" pinout-key="qfn64"/>
+        <variant key="atmega128rfr2_zur" name="ATmega128RFR2-ZUR" pinout-key="qfn64"/>
+        <variant key="atmega128rfr2_zf" name="ATmega128RFR2-ZF" pinout-key="qfn64"/>
+        <variant key="atmega128rfr2_zfr" name="ATmega128RFR2-ZFR" pinout-key="qfn64"/>
     </variants>
 </device>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA16.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA16.xml
index 8051e4ab..c1408e52 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA16.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA16.xml
@@ -220,25 +220,25 @@
         <peripheral key="tc0" name="TC0" module-key="tc8">
             <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"/>
+                <signal pad-key="pb3" function="default" group="OC"/>
+                <signal pad-key="pb0" function="default" group="T"/>
             </signals>
         </peripheral>
         <peripheral key="tc1" name="TC1" module-key="tc16">
             <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"/>
-                <signal pad-id="pd5" function="default" group="OCA"/>
-                <signal pad-id="pd4" function="default" group="OCB"/>
+                <signal pad-key="pb1" function="default" group="T"/>
+                <signal pad-key="pd6" function="default" group="ICP"/>
+                <signal pad-key="pd5" function="default" group="OCA"/>
+                <signal pad-key="pd4" function="default" group="OCB"/>
             </signals>
         </peripheral>
         <peripheral key="exint" name="EXINT" module-key="exint">
             <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"/>
-                <signal pad-id="pd2" index="0" function="default" group="INT"/>
+                <signal pad-key="pb2" index="2" function="default" group="INT"/>
+                <signal pad-key="pd3" index="1" function="default" group="INT"/>
+                <signal pad-key="pd2" index="0" function="default" group="INT"/>
             </signals>
         </peripheral>
         <peripheral key="eeprom" name="EEPROM" module-key="eeprom">
@@ -250,62 +250,62 @@
         <peripheral key="tc2" name="TC2" module-key="tc8_async">
             <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"/>
-                <signal pad-id="pd7" function="default" group="OC"/>
+                <signal pad-key="pc7" index="2" function="default" group="TOSC"/>
+                <signal pad-key="pc6" index="1" function="default" group="TOSC"/>
+                <signal pad-key="pd7" function="default" group="OC"/>
             </signals>
         </peripheral>
         <peripheral key="spi" name="SPI" module-key="spi">
             <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"/>
-                <signal pad-id="pb5" function="default" group="MOSI"/>
-                <signal pad-id="pb4" function="default" group="SS"/>
+                <signal pad-key="pb7" function="default" group="SCK"/>
+                <signal pad-key="pb6" function="default" group="MISO"/>
+                <signal pad-key="pb5" function="default" group="MOSI"/>
+                <signal pad-key="pb4" function="default" group="SS"/>
             </signals>
         </peripheral>
         <peripheral key="usart" name="USART" module-key="usart">
             <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"/>
-                <signal pad-id="pd0" function="default" group="RXD"/>
+                <signal pad-key="pb0" function="default" group="XCK"/>
+                <signal pad-key="pd1" function="default" group="TXD"/>
+                <signal pad-key="pd0" function="default" group="RXD"/>
             </signals>
         </peripheral>
         <peripheral key="twi" name="TWI" module-key="twi">
             <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"/>
+                <signal pad-key="pc1" function="default" group="SDA"/>
+                <signal pad-key="pc0" function="default" group="SCL"/>
             </signals>
         </peripheral>
         <peripheral key="ac" name="AC" module-key="ac">
             <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"/>
+                <signal pad-key="pb3" index="1" function="default" group="AIN"/>
+                <signal pad-key="pb2" index="0" function="default" group="AIN"/>
             </signals>
         </peripheral>
         <peripheral key="adc" name="ADC" module-key="adc">
             <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"/>
-                <signal pad-id="pa5" index="5" function="default" group="ADC"/>
-                <signal pad-id="pa4" index="4" function="default" group="ADC"/>
-                <signal pad-id="pa3" index="3" function="default" group="ADC"/>
-                <signal pad-id="pa2" index="2" function="default" group="ADC"/>
-                <signal pad-id="pa1" index="1" function="default" group="ADC"/>
-                <signal pad-id="pa0" index="0" function="default" group="ADC"/>
+                <signal pad-key="pa7" index="7" function="default" group="ADC"/>
+                <signal pad-key="pa6" index="6" function="default" group="ADC"/>
+                <signal pad-key="pa5" index="5" function="default" group="ADC"/>
+                <signal pad-key="pa4" index="4" function="default" group="ADC"/>
+                <signal pad-key="pa3" index="3" function="default" group="ADC"/>
+                <signal pad-key="pa2" index="2" function="default" group="ADC"/>
+                <signal pad-key="pa1" index="1" function="default" group="ADC"/>
+                <signal pad-key="pa0" index="0" function="default" group="ADC"/>
             </signals>
         </peripheral>
         <peripheral key="jtag" name="JTAG" module-key="jtag">
             <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"/>
-                <signal pad-id="pc3" function="default" group="TMS"/>
-                <signal pad-id="pc2" function="default" group="TCK"/>
+                <signal pad-key="pc5" function="default" group="TDI"/>
+                <signal pad-key="pc4" function="default" group="TDO"/>
+                <signal pad-key="pc3" function="default" group="TMS"/>
+                <signal pad-key="pc2" function="default" group="TCK"/>
             </signals>
         </peripheral>
         <peripheral key="boot_load" name="BOOT_LOAD" module-key="boot_load">
@@ -314,53 +314,53 @@
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pa2" index="2" function="default" group="P"/>
-                <signal pad-id="pa3" index="3" function="default" group="P"/>
-                <signal pad-id="pa4" index="4" function="default" group="P"/>
-                <signal pad-id="pa5" index="5" function="default" group="P"/>
-                <signal pad-id="pa6" index="6" function="default" group="P"/>
-                <signal pad-id="pa7" index="7" function="default" group="P"/>
+                <signal pad-key="pa0" index="0" function="default" group="P"/>
+                <signal pad-key="pa1" index="1" function="default" group="P"/>
+                <signal pad-key="pa2" index="2" function="default" group="P"/>
+                <signal pad-key="pa3" index="3" function="default" group="P"/>
+                <signal pad-key="pa4" index="4" function="default" group="P"/>
+                <signal pad-key="pa5" index="5" function="default" group="P"/>
+                <signal pad-key="pa6" index="6" function="default" group="P"/>
+                <signal pad-key="pa7" index="7" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pb2" index="2" function="default" group="P"/>
-                <signal pad-id="pb3" index="3" function="default" group="P"/>
-                <signal pad-id="pb4" index="4" function="default" group="P"/>
-                <signal pad-id="pb5" index="5" function="default" group="P"/>
-                <signal pad-id="pb6" index="6" function="default" group="P"/>
-                <signal pad-id="pb7" index="7" function="default" group="P"/>
+                <signal pad-key="pb0" index="0" function="default" group="P"/>
+                <signal pad-key="pb1" index="1" function="default" group="P"/>
+                <signal pad-key="pb2" index="2" function="default" group="P"/>
+                <signal pad-key="pb3" index="3" function="default" group="P"/>
+                <signal pad-key="pb4" index="4" function="default" group="P"/>
+                <signal pad-key="pb5" index="5" function="default" group="P"/>
+                <signal pad-key="pb6" index="6" function="default" group="P"/>
+                <signal pad-key="pb7" index="7" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pc2" index="2" function="default" group="P"/>
-                <signal pad-id="pc3" index="3" function="default" group="P"/>
-                <signal pad-id="pc4" index="4" function="default" group="P"/>
-                <signal pad-id="pc5" index="5" function="default" group="P"/>
-                <signal pad-id="pc6" index="6" function="default" group="P"/>
-                <signal pad-id="pc7" index="7" function="default" group="P"/>
+                <signal pad-key="pc0" index="0" function="default" group="P"/>
+                <signal pad-key="pc1" index="1" function="default" group="P"/>
+                <signal pad-key="pc2" index="2" function="default" group="P"/>
+                <signal pad-key="pc3" index="3" function="default" group="P"/>
+                <signal pad-key="pc4" index="4" function="default" group="P"/>
+                <signal pad-key="pc5" index="5" function="default" group="P"/>
+                <signal pad-key="pc6" index="6" function="default" group="P"/>
+                <signal pad-key="pc7" index="7" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pd2" index="2" function="default" group="P"/>
-                <signal pad-id="pd3" index="3" function="default" group="P"/>
-                <signal pad-id="pd4" index="4" function="default" group="P"/>
-                <signal pad-id="pd5" index="5" function="default" group="P"/>
-                <signal pad-id="pd6" index="6" function="default" group="P"/>
-                <signal pad-id="pd7" index="7" function="default" group="P"/>
+                <signal pad-key="pd0" index="0" function="default" group="P"/>
+                <signal pad-key="pd1" index="1" function="default" group="P"/>
+                <signal pad-key="pd2" index="2" function="default" group="P"/>
+                <signal pad-key="pd3" index="3" function="default" group="P"/>
+                <signal pad-key="pd4" index="4" function="default" group="P"/>
+                <signal pad-key="pd5" index="5" function="default" group="P"/>
+                <signal pad-key="pd6" index="6" function="default" group="P"/>
+                <signal pad-key="pd7" index="7" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="wdt">
@@ -729,102 +729,143 @@
             </register-group>
         </module>
     </modules>
+    <pads>
+        <pad key="pb5" name="PB5"/>
+        <pad key="pb6" name="PB6"/>
+        <pad key="pb7" name="PB7"/>
+        <pad key="reset" name="RESET"/>
+        <pad key="vcc" name="VCC"/>
+        <pad key="gnd" name="GND"/>
+        <pad key="xtal2" name="XTAL2"/>
+        <pad key="xtal1" name="XTAL1"/>
+        <pad key="pd0" name="PD0"/>
+        <pad key="pd1" name="PD1"/>
+        <pad key="pd2" name="PD2"/>
+        <pad key="pd3" name="PD3"/>
+        <pad key="pd4" name="PD4"/>
+        <pad key="pd5" name="PD5"/>
+        <pad key="pd6" name="PD6"/>
+        <pad key="pd7" name="PD7"/>
+        <pad key="pc0" name="PC0"/>
+        <pad key="pc1" name="PC1"/>
+        <pad key="pc2" name="PC2"/>
+        <pad key="pc3" name="PC3"/>
+        <pad key="pc4" name="PC4"/>
+        <pad key="pc5" name="PC5"/>
+        <pad key="pc6" name="PC6"/>
+        <pad key="pc7" name="PC7"/>
+        <pad key="avcc" name="AVCC"/>
+        <pad key="aref" name="AREF"/>
+        <pad key="pa7" name="PA7"/>
+        <pad key="pa6" name="PA6"/>
+        <pad key="pa5" name="PA5"/>
+        <pad key="pa4" name="PA4"/>
+        <pad key="pa3" name="PA3"/>
+        <pad key="pa2" name="PA2"/>
+        <pad key="pa1" name="PA1"/>
+        <pad key="pa0" name="PA0"/>
+        <pad key="pb0" name="PB0"/>
+        <pad key="pb1" name="PB1"/>
+        <pad key="pb2" name="PB2"/>
+        <pad key="pb3" name="PB3"/>
+        <pad key="pb4" name="PB4"/>
+    </pads>
     <pinouts>
         <pinout key="tqfpqfn44" name="TQFPQFN44" type="qfn">
-            <pin position="1" pad="PB5"/>
-            <pin position="2" pad="PB6"/>
-            <pin position="3" pad="PB7"/>
-            <pin position="4" pad="RESET"/>
-            <pin position="5" pad="VCC"/>
-            <pin position="6" pad="GND"/>
-            <pin position="7" pad="XTAL2"/>
-            <pin position="8" pad="XTAL1"/>
-            <pin position="9" pad="PD0"/>
-            <pin position="10" pad="PD1"/>
-            <pin position="11" pad="PD2"/>
-            <pin position="12" pad="PD3"/>
-            <pin position="13" pad="PD4"/>
-            <pin position="14" pad="PD5"/>
-            <pin position="15" pad="PD6"/>
-            <pin position="16" pad="PD7"/>
-            <pin position="17" pad="VCC"/>
-            <pin position="18" pad="GND"/>
-            <pin position="19" pad="PC0"/>
-            <pin position="20" pad="PC1"/>
-            <pin position="21" pad="PC2"/>
-            <pin position="22" pad="PC3"/>
-            <pin position="23" pad="PC4"/>
-            <pin position="24" pad="PC5"/>
-            <pin position="25" pad="PC6"/>
-            <pin position="26" pad="PC7"/>
-            <pin position="27" pad="AVCC"/>
-            <pin position="28" pad="GND"/>
-            <pin position="29" pad="AREF"/>
-            <pin position="30" pad="PA7"/>
-            <pin position="31" pad="PA6"/>
-            <pin position="32" pad="PA5"/>
-            <pin position="33" pad="PA4"/>
-            <pin position="34" pad="PA3"/>
-            <pin position="35" pad="PA2"/>
-            <pin position="36" pad="PA1"/>
-            <pin position="37" pad="PA0"/>
-            <pin position="38" pad="VCC"/>
-            <pin position="39" pad="GND"/>
-            <pin position="40" pad="PB0"/>
-            <pin position="41" pad="PB1"/>
-            <pin position="42" pad="PB2"/>
-            <pin position="43" pad="PB3"/>
-            <pin position="44" pad="PB4"/>
+            <pin position="1" pad-key="pb5"/>
+            <pin position="2" pad-key="pb6"/>
+            <pin position="3" pad-key="pb7"/>
+            <pin position="4" pad-key="reset"/>
+            <pin position="5" pad-key="vcc"/>
+            <pin position="6" pad-key="gnd"/>
+            <pin position="7" pad-key="xtal2"/>
+            <pin position="8" pad-key="xtal1"/>
+            <pin position="9" pad-key="pd0"/>
+            <pin position="10" pad-key="pd1"/>
+            <pin position="11" pad-key="pd2"/>
+            <pin position="12" pad-key="pd3"/>
+            <pin position="13" pad-key="pd4"/>
+            <pin position="14" pad-key="pd5"/>
+            <pin position="15" pad-key="pd6"/>
+            <pin position="16" pad-key="pd7"/>
+            <pin position="17" pad-key="vcc"/>
+            <pin position="18" pad-key="gnd"/>
+            <pin position="19" pad-key="pc0"/>
+            <pin position="20" pad-key="pc1"/>
+            <pin position="21" pad-key="pc2"/>
+            <pin position="22" pad-key="pc3"/>
+            <pin position="23" pad-key="pc4"/>
+            <pin position="24" pad-key="pc5"/>
+            <pin position="25" pad-key="pc6"/>
+            <pin position="26" pad-key="pc7"/>
+            <pin position="27" pad-key="avcc"/>
+            <pin position="28" pad-key="gnd"/>
+            <pin position="29" pad-key="aref"/>
+            <pin position="30" pad-key="pa7"/>
+            <pin position="31" pad-key="pa6"/>
+            <pin position="32" pad-key="pa5"/>
+            <pin position="33" pad-key="pa4"/>
+            <pin position="34" pad-key="pa3"/>
+            <pin position="35" pad-key="pa2"/>
+            <pin position="36" pad-key="pa1"/>
+            <pin position="37" pad-key="pa0"/>
+            <pin position="38" pad-key="vcc"/>
+            <pin position="39" pad-key="gnd"/>
+            <pin position="40" pad-key="pb0"/>
+            <pin position="41" pad-key="pb1"/>
+            <pin position="42" pad-key="pb2"/>
+            <pin position="43" pad-key="pb3"/>
+            <pin position="44" pad-key="pb4"/>
         </pinout>
         <pinout key="pdip40" name="PDIP40" type="dip">
-            <pin position="1" pad="PB0"/>
-            <pin position="2" pad="PB1"/>
-            <pin position="3" pad="PB2"/>
-            <pin position="4" pad="PB3"/>
-            <pin position="5" pad="PB4"/>
-            <pin position="6" pad="PB5"/>
-            <pin position="7" pad="PB6"/>
-            <pin position="8" pad="PB7"/>
-            <pin position="9" pad="RESET"/>
-            <pin position="10" pad="VCC"/>
-            <pin position="11" pad="GND"/>
-            <pin position="12" pad="XTAL2"/>
-            <pin position="13" pad="XTAL1"/>
-            <pin position="14" pad="PD0"/>
-            <pin position="15" pad="PD1"/>
-            <pin position="16" pad="PD2"/>
-            <pin position="17" pad="PD3"/>
-            <pin position="18" pad="PD4"/>
-            <pin position="19" pad="PD5"/>
-            <pin position="20" pad="PD6"/>
-            <pin position="21" pad="PD7"/>
-            <pin position="22" pad="PC0"/>
-            <pin position="23" pad="PC1"/>
-            <pin position="24" pad="PC2"/>
-            <pin position="25" pad="PC3"/>
-            <pin position="26" pad="PC4"/>
-            <pin position="27" pad="PC5"/>
-            <pin position="28" pad="PC6"/>
-            <pin position="29" pad="PC7"/>
-            <pin position="30" pad="AVCC"/>
-            <pin position="31" pad="GND"/>
-            <pin position="32" pad="AREF"/>
-            <pin position="33" pad="PA7"/>
-            <pin position="34" pad="PA6"/>
-            <pin position="35" pad="PA5"/>
-            <pin position="36" pad="PA4"/>
-            <pin position="37" pad="PA3"/>
-            <pin position="38" pad="PA2"/>
-            <pin position="39" pad="PA1"/>
-            <pin position="40" pad="PA0"/>
+            <pin position="1" pad-key="pb0"/>
+            <pin position="2" pad-key="pb1"/>
+            <pin position="3" pad-key="pb2"/>
+            <pin position="4" pad-key="pb3"/>
+            <pin position="5" pad-key="pb4"/>
+            <pin position="6" pad-key="pb5"/>
+            <pin position="7" pad-key="pb6"/>
+            <pin position="8" pad-key="pb7"/>
+            <pin position="9" pad-key="reset"/>
+            <pin position="10" pad-key="vcc"/>
+            <pin position="11" pad-key="gnd"/>
+            <pin position="12" pad-key="xtal2"/>
+            <pin position="13" pad-key="xtal1"/>
+            <pin position="14" pad-key="pd0"/>
+            <pin position="15" pad-key="pd1"/>
+            <pin position="16" pad-key="pd2"/>
+            <pin position="17" pad-key="pd3"/>
+            <pin position="18" pad-key="pd4"/>
+            <pin position="19" pad-key="pd5"/>
+            <pin position="20" pad-key="pd6"/>
+            <pin position="21" pad-key="pd7"/>
+            <pin position="22" pad-key="pc0"/>
+            <pin position="23" pad-key="pc1"/>
+            <pin position="24" pad-key="pc2"/>
+            <pin position="25" pad-key="pc3"/>
+            <pin position="26" pad-key="pc4"/>
+            <pin position="27" pad-key="pc5"/>
+            <pin position="28" pad-key="pc6"/>
+            <pin position="29" pad-key="pc7"/>
+            <pin position="30" pad-key="avcc"/>
+            <pin position="31" pad-key="gnd"/>
+            <pin position="32" pad-key="aref"/>
+            <pin position="33" pad-key="pa7"/>
+            <pin position="34" pad-key="pa6"/>
+            <pin position="35" pad-key="pa5"/>
+            <pin position="36" pad-key="pa4"/>
+            <pin position="37" pad-key="pa3"/>
+            <pin position="38" pad-key="pa2"/>
+            <pin position="39" pad-key="pa1"/>
+            <pin position="40" pad-key="pa0"/>
         </pinout>
     </pinouts>
     <variants>
-        <variant name="ATmega16L-8AU" pinout-key="tqfpqfn44" package="TQFP44"/>
-        <variant name="ATmega16L-8PU" pinout-key="pdip40" package="PDIP40"/>
-        <variant name="ATmega16L-8MU" pinout-key="tqfpqfn44" package="QFN44"/>
-        <variant name="ATmega16-16AU" pinout-key="tqfpqfn44" package="TQFP44"/>
-        <variant name="ATmega16-16PU" pinout-key="pdip40" package="PDIP40"/>
-        <variant name="ATmega16-16MU" pinout-key="tqfpqfn44" package="QFN44"/>
+        <variant key="atmega16l_8au" name="ATmega16L-8AU" pinout-key="tqfpqfn44"/>
+        <variant key="atmega16l_8pu" name="ATmega16L-8PU" pinout-key="pdip40"/>
+        <variant key="atmega16l_8mu" name="ATmega16L-8MU" pinout-key="tqfpqfn44"/>
+        <variant key="atmega16_16au" name="ATmega16-16AU" pinout-key="tqfpqfn44"/>
+        <variant key="atmega16_16pu" name="ATmega16-16PU" pinout-key="pdip40"/>
+        <variant key="atmega16_16mu" name="ATmega16-16MU" pinout-key="tqfpqfn44"/>
     </variants>
 </device>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA1608.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA1608.xml
index 13ea9583..bdda3fb3 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA1608.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA1608.xml
@@ -45,31 +45,31 @@
         <peripheral key="ac0" name="AC0" module-key="i2106">
             <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"/>
-                <signal pad-id="pd7" index="2" function="AC0" group="N"/>
-                <signal pad-id="pa7" index="0" function="AC0" group="OUT"/>
-                <signal pad-id="pd2" index="0" function="AC0" group="P"/>
-                <signal pad-id="pd4" index="1" function="AC0" group="P"/>
-                <signal pad-id="pd6" index="2" function="AC0" group="P"/>
-                <signal pad-id="pd1" index="3" function="AC0" group="P"/>
+                <signal pad-key="pd3" index="0" function="AC0" group="N"/>
+                <signal pad-key="pd5" index="1" function="AC0" group="N"/>
+                <signal pad-key="pd7" index="2" function="AC0" group="N"/>
+                <signal pad-key="pa7" index="0" function="AC0" group="OUT"/>
+                <signal pad-key="pd2" index="0" function="AC0" group="P"/>
+                <signal pad-key="pd4" index="1" function="AC0" group="P"/>
+                <signal pad-key="pd6" index="2" function="AC0" group="P"/>
+                <signal pad-key="pd1" index="3" function="AC0" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="adc0" name="ADC0" module-key="i2132">
             <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"/>
-                <signal pad-id="pd2" index="2" function="AIN0" group="AIN"/>
-                <signal pad-id="pd3" index="3" function="AIN0" group="AIN"/>
-                <signal pad-id="pd4" index="4" function="AIN0" group="AIN"/>
-                <signal pad-id="pd5" index="5" function="AIN0" group="AIN"/>
-                <signal pad-id="pd6" index="6" function="AIN0" group="AIN"/>
-                <signal pad-id="pd7" index="7" function="AIN0" group="AIN"/>
-                <signal pad-id="pf2" index="12" function="AIN0" group="AIN"/>
-                <signal pad-id="pf3" index="13" function="AIN0" group="AIN"/>
-                <signal pad-id="pf4" index="14" function="AIN0" group="AIN"/>
-                <signal pad-id="pf5" index="15" function="AIN0" group="AIN"/>
+                <signal pad-key="pd0" index="0" function="AIN0" group="AIN"/>
+                <signal pad-key="pd1" index="1" function="AIN0" group="AIN"/>
+                <signal pad-key="pd2" index="2" function="AIN0" group="AIN"/>
+                <signal pad-key="pd3" index="3" function="AIN0" group="AIN"/>
+                <signal pad-key="pd4" index="4" function="AIN0" group="AIN"/>
+                <signal pad-key="pd5" index="5" function="AIN0" group="AIN"/>
+                <signal pad-key="pd6" index="6" function="AIN0" group="AIN"/>
+                <signal pad-key="pd7" index="7" function="AIN0" group="AIN"/>
+                <signal pad-key="pf2" index="12" function="AIN0" group="AIN"/>
+                <signal pad-key="pf3" index="13" function="AIN0" group="AIN"/>
+                <signal pad-key="pf4" index="14" function="AIN0" group="AIN"/>
+                <signal pad-key="pf5" index="15" function="AIN0" group="AIN"/>
             </signals>
         </peripheral>
         <peripheral key="bod" name="BOD" module-key="i2114">
@@ -78,34 +78,34 @@
         <peripheral key="ccl" name="CCL" module-key="i2128">
             <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"/>
-                <signal pad-id="pa2" index="2" function="CCL" group="LUT0_IN" field="PORTMUX.CCLROUTEA.LUT0"/>
-                <signal pad-id="pa6" index="0" function="CCL_ALT" group="LUT0_OUT" field="PORTMUX.CCLROUTEA.LUT0"/>
-                <signal pad-id="pa3" index="0" function="CCL" group="LUT0_OUT" field="PORTMUX.CCLROUTEA.LUT0"/>
-                <signal pad-id="pc0" index="0" function="CCL" group="LUT1_IN" field="PORTMUX.CCLROUTEA.LUT1"/>
-                <signal pad-id="pc1" index="1" function="CCL" group="LUT1_IN" field="PORTMUX.CCLROUTEA.LUT1"/>
-                <signal pad-id="pc2" index="2" function="CCL" group="LUT1_IN" field="PORTMUX.CCLROUTEA.LUT1"/>
-                <signal pad-id="pc3" index="0" function="CCL" group="LUT1_OUT" field="PORTMUX.CCLROUTEA.LUT1"/>
-                <signal pad-id="pd0" index="0" function="CCL" group="LUT2_IN" field="PORTMUX.CCLROUTEA.LUT2"/>
-                <signal pad-id="pd1" index="1" function="CCL" group="LUT2_IN" field="PORTMUX.CCLROUTEA.LUT2"/>
-                <signal pad-id="pd2" index="2" function="CCL" group="LUT2_IN" field="PORTMUX.CCLROUTEA.LUT2"/>
-                <signal pad-id="pd3" index="0" function="CCL" group="LUT2_OUT" field="PORTMUX.CCLROUTEA.LUT2"/>
-                <signal pad-id="pd6" index="1" function="CCL_ALT" group="LUT2_OUT" field="PORTMUX.CCLROUTEA.LUT2"/>
-                <signal pad-id="pf0" index="0" function="CCL" group="LUT3_IN" field="PORTMUX.CCLROUTEA.LUT3"/>
-                <signal pad-id="pf1" index="1" function="CCL" group="LUT3_IN" field="PORTMUX.CCLROUTEA.LUT3"/>
-                <signal pad-id="pf2" index="2" function="CCL" group="LUT3_IN" field="PORTMUX.CCLROUTEA.LUT3"/>
-                <signal pad-id="pf6" index="1" function="CCL_ALT" group="LUT3_OUT" field="PORTMUX.CCLROUTEA.LUT3"/>
-                <signal pad-id="pf3" index="1" function="CCL" group="LUT3_OUT" field="PORTMUX.CCLROUTEA.LUT3"/>
+                <signal pad-key="pa0" index="0" function="CCL" group="LUT0_IN" field="PORTMUX.CCLROUTEA.LUT0"/>
+                <signal pad-key="pa1" index="1" function="CCL" group="LUT0_IN" field="PORTMUX.CCLROUTEA.LUT0"/>
+                <signal pad-key="pa2" index="2" function="CCL" group="LUT0_IN" field="PORTMUX.CCLROUTEA.LUT0"/>
+                <signal pad-key="pa6" index="0" function="CCL_ALT" group="LUT0_OUT" field="PORTMUX.CCLROUTEA.LUT0"/>
+                <signal pad-key="pa3" index="0" function="CCL" group="LUT0_OUT" field="PORTMUX.CCLROUTEA.LUT0"/>
+                <signal pad-key="pc0" index="0" function="CCL" group="LUT1_IN" field="PORTMUX.CCLROUTEA.LUT1"/>
+                <signal pad-key="pc1" index="1" function="CCL" group="LUT1_IN" field="PORTMUX.CCLROUTEA.LUT1"/>
+                <signal pad-key="pc2" index="2" function="CCL" group="LUT1_IN" field="PORTMUX.CCLROUTEA.LUT1"/>
+                <signal pad-key="pc3" index="0" function="CCL" group="LUT1_OUT" field="PORTMUX.CCLROUTEA.LUT1"/>
+                <signal pad-key="pd0" index="0" function="CCL" group="LUT2_IN" field="PORTMUX.CCLROUTEA.LUT2"/>
+                <signal pad-key="pd1" index="1" function="CCL" group="LUT2_IN" field="PORTMUX.CCLROUTEA.LUT2"/>
+                <signal pad-key="pd2" index="2" function="CCL" group="LUT2_IN" field="PORTMUX.CCLROUTEA.LUT2"/>
+                <signal pad-key="pd3" index="0" function="CCL" group="LUT2_OUT" field="PORTMUX.CCLROUTEA.LUT2"/>
+                <signal pad-key="pd6" index="1" function="CCL_ALT" group="LUT2_OUT" field="PORTMUX.CCLROUTEA.LUT2"/>
+                <signal pad-key="pf0" index="0" function="CCL" group="LUT3_IN" field="PORTMUX.CCLROUTEA.LUT3"/>
+                <signal pad-key="pf1" index="1" function="CCL" group="LUT3_IN" field="PORTMUX.CCLROUTEA.LUT3"/>
+                <signal pad-key="pf2" index="2" function="CCL" group="LUT3_IN" field="PORTMUX.CCLROUTEA.LUT3"/>
+                <signal pad-key="pf6" index="1" function="CCL_ALT" group="LUT3_OUT" field="PORTMUX.CCLROUTEA.LUT3"/>
+                <signal pad-key="pf3" index="1" function="CCL" group="LUT3_OUT" field="PORTMUX.CCLROUTEA.LUT3"/>
             </signals>
         </peripheral>
         <peripheral key="clkctrl" name="CLKCTRL" module-key="i2113">
             <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"/>
-                <signal pad-id="pf0" function="CLKCTRL" group="TOSC1"/>
-                <signal pad-id="pf1" function="CLKCTRL" group="TOSC2"/>
+                <signal pad-key="pa0" function="CLKCTRL" group="CLKI"/>
+                <signal pad-key="pa7" function="CLKCTRL" group="CLKO"/>
+                <signal pad-key="pf0" function="CLKCTRL" group="TOSC1"/>
+                <signal pad-key="pf1" function="CLKCTRL" group="TOSC2"/>
             </signals>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="i2100">
@@ -120,12 +120,12 @@
         <peripheral key="evsys" name="EVSYS" module-key="i2118">
             <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"/>
-                <signal pad-id="pc2" index="2" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUT2"/>
-                <signal pad-id="pd7" index="3" function="EVSYS_ALT" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUT3"/>
-                <signal pad-id="pd2" index="3" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUT3"/>
-                <signal pad-id="pf2" index="5" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUT5"/>
+                <signal pad-key="pa7" index="0" function="EVSYS_ALT" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUT0"/>
+                <signal pad-key="pa2" index="0" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUT0"/>
+                <signal pad-key="pc2" index="2" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUT2"/>
+                <signal pad-key="pd7" index="3" function="EVSYS_ALT" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUT3"/>
+                <signal pad-key="pd2" index="3" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUT3"/>
+                <signal pad-key="pf2" index="5" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUT5"/>
             </signals>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="i2600_fuse">
@@ -143,48 +143,48 @@
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pa2" index="2" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa3" index="3" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa4" index="4" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa5" index="5" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa6" index="6" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa7" index="7" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa0" index="0" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa1" index="1" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa2" index="2" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa3" index="3" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa4" index="4" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa5" index="5" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa6" index="6" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa7" index="7" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pc2" index="2" function="IOPORT" group="PIN"/>
-                <signal pad-id="pc3" index="3" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc0" index="0" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc1" index="1" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc2" index="2" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc3" index="3" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pd2" index="2" function="IOPORT" group="PIN"/>
-                <signal pad-id="pd3" index="3" function="IOPORT" group="PIN"/>
-                <signal pad-id="pd4" index="4" function="IOPORT" group="PIN"/>
-                <signal pad-id="pd5" index="5" function="IOPORT" group="PIN"/>
-                <signal pad-id="pd6" index="6" function="IOPORT" group="PIN"/>
-                <signal pad-id="pd7" index="7" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd0" index="0" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd1" index="1" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd2" index="2" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd3" index="3" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd4" index="4" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd5" index="5" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd6" index="6" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd7" index="7" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="portf" name="PORTF" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pf2" index="2" function="IOPORT" group="PIN"/>
-                <signal pad-id="pf3" index="3" function="IOPORT" group="PIN"/>
-                <signal pad-id="pf4" index="4" function="IOPORT" group="PIN"/>
-                <signal pad-id="pf5" index="5" function="IOPORT" group="PIN"/>
-                <signal pad-id="pf6" index="6" function="IOPORT" group="PIN"/>
+                <signal pad-key="pf0" index="0" function="IOPORT" group="PIN"/>
+                <signal pad-key="pf1" index="1" function="IOPORT" group="PIN"/>
+                <signal pad-key="pf2" index="2" function="IOPORT" group="PIN"/>
+                <signal pad-key="pf3" index="3" function="IOPORT" group="PIN"/>
+                <signal pad-key="pf4" index="4" function="IOPORT" group="PIN"/>
+                <signal pad-key="pf5" index="5" function="IOPORT" group="PIN"/>
+                <signal pad-key="pf6" index="6" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="portmux" name="PORTMUX" module-key="i2600_portmux">
@@ -193,7 +193,7 @@
         <peripheral key="rstctrl" name="RSTCTRL" module-key="i2111">
             <register-group-instance register-group-key="rstctrl" address-space-key="data" offset="0x40"/>
             <signals>
-                <signal pad-id="pf6" function="OTHER" group="RESET"/>
+                <signal pad-key="pf6" function="OTHER" group="RESET"/>
             </signals>
         </peripheral>
         <peripheral key="rtc" name="RTC" module-key="i2116">
@@ -208,14 +208,14 @@
         <peripheral key="spi0" name="SPI0" module-key="i2107">
             <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"/>
-                <signal pad-id="pc0" function="SPI_ALT" group="MOSI" field="PORTMUX.TWISPIROUTEA.SPI0"/>
-                <signal pad-id="pa4" function="SPI" group="MOSI" field="PORTMUX.TWISPIROUTEA.SPI0"/>
-                <signal pad-id="pc2" function="SPI_ALT" group="SCK" field="PORTMUX.TWISPIROUTEA.SPI0"/>
-                <signal pad-id="pa6" function="SPI" group="SCK" field="PORTMUX.TWISPIROUTEA.SPI0"/>
-                <signal pad-id="pc3" function="SPI_ALT" group="SS" field="PORTMUX.TWISPIROUTEA.SPI0"/>
-                <signal pad-id="pa7" function="SPI" group="SS" field="PORTMUX.TWISPIROUTEA.SPI0"/>
+                <signal pad-key="pc1" function="SPI_ALT" group="MISO" field="PORTMUX.TWISPIROUTEA.SPI0"/>
+                <signal pad-key="pa5" function="SPI" group="MISO" field="PORTMUX.TWISPIROUTEA.SPI0"/>
+                <signal pad-key="pc0" function="SPI_ALT" group="MOSI" field="PORTMUX.TWISPIROUTEA.SPI0"/>
+                <signal pad-key="pa4" function="SPI" group="MOSI" field="PORTMUX.TWISPIROUTEA.SPI0"/>
+                <signal pad-key="pc2" function="SPI_ALT" group="SCK" field="PORTMUX.TWISPIROUTEA.SPI0"/>
+                <signal pad-key="pa6" function="SPI" group="SCK" field="PORTMUX.TWISPIROUTEA.SPI0"/>
+                <signal pad-key="pc3" function="SPI_ALT" group="SS" field="PORTMUX.TWISPIROUTEA.SPI0"/>
+                <signal pad-key="pa7" function="SPI" group="SS" field="PORTMUX.TWISPIROUTEA.SPI0"/>
             </signals>
         </peripheral>
         <peripheral key="syscfg" name="SYSCFG" module-key="i2600_syscfg">
@@ -224,93 +224,93 @@
         <peripheral key="tca0" name="TCA0" module-key="i2117">
             <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"/>
-                <signal pad-id="pc0" index="0" function="TCA_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pa0" index="0" function="TCA" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pf1" index="1" function="TCA_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pd1" index="1" function="TCA_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pc1" index="1" function="TCA_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pa1" index="1" function="TCA" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pf2" index="2" function="TCA_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pd2" index="2" function="TCA_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pc2" index="2" function="TCA_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pa2" index="2" function="TCA" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pf3" index="3" function="TCA_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pd3" index="3" function="TCA_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pc3" index="3" function="TCA_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pa3" index="3" function="TCA" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pf4" index="4" function="TCA_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pd4" index="4" function="TCA_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pa4" index="4" function="TCA" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pf5" index="5" function="TCA_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pd5" index="5" function="TCA_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pa5" index="5" function="TCA" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pf0" index="0" function="TCA_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pd0" index="0" function="TCA_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pc0" index="0" function="TCA_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pa0" index="0" function="TCA" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pf1" index="1" function="TCA_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pd1" index="1" function="TCA_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pc1" index="1" function="TCA_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pa1" index="1" function="TCA" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pf2" index="2" function="TCA_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pd2" index="2" function="TCA_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pc2" index="2" function="TCA_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pa2" index="2" function="TCA" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pf3" index="3" function="TCA_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pd3" index="3" function="TCA_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pc3" index="3" function="TCA_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pa3" index="3" function="TCA" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pf4" index="4" function="TCA_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pd4" index="4" function="TCA_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pa4" index="4" function="TCA" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pf5" index="5" function="TCA_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pd5" index="5" function="TCA_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pa5" index="5" function="TCA" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
             </signals>
         </peripheral>
         <peripheral key="tcb0" name="TCB0" module-key="i2119">
             <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"/>
+                <signal pad-key="pf4" index="0" function="TCB0_ALT" group="WO" field="PORTMUX.TCBROUTEA.TCB0"/>
+                <signal pad-key="pa2" index="0" function="TCB0" group="WO" field="PORTMUX.TCBROUTEA.TCB0"/>
             </signals>
         </peripheral>
         <peripheral key="tcb1" name="TCB1" module-key="i2119">
             <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"/>
+                <signal pad-key="pf5" index="0" function="TCB1_ALT" group="WO" field="PORTMUX.TCBROUTEA.TCB1"/>
+                <signal pad-key="pa3" index="0" function="TCB1" group="WO" field="PORTMUX.TCBROUTEA.TCB1"/>
             </signals>
         </peripheral>
         <peripheral key="tcb2" name="TCB2" module-key="i2119">
             <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"/>
+                <signal pad-key="pc0" index="0" function="TCB2" group="WO" field="PORTMUX.TCBROUTEA.TCB2"/>
             </signals>
         </peripheral>
         <peripheral key="twi0" name="TWI0" module-key="i2110">
             <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"/>
-                <signal pad-id="pa3" function="I2C" group="SCL" field="PORTMUX.TWISPIROUTEA.TWI0"/>
-                <signal pad-id="pf2" function="I2C_ALT2" group="SDA" field="PORTMUX.TWISPIROUTEA.TWI0"/>
-                <signal pad-id="pc2" function="I2C_ALT" group="SDA" field="PORTMUX.TWISPIROUTEA.TWI0"/>
-                <signal pad-id="pa2" function="I2C" group="SDA" field="PORTMUX.TWISPIROUTEA.TWI0"/>
+                <signal pad-key="pf3" function="I2C_ALT2" group="SCL" field="PORTMUX.TWISPIROUTEA.TWI0"/>
+                <signal pad-key="pc3" function="I2C_ALT" group="SCL" field="PORTMUX.TWISPIROUTEA.TWI0"/>
+                <signal pad-key="pa3" function="I2C" group="SCL" field="PORTMUX.TWISPIROUTEA.TWI0"/>
+                <signal pad-key="pf2" function="I2C_ALT2" group="SDA" field="PORTMUX.TWISPIROUTEA.TWI0"/>
+                <signal pad-key="pc2" function="I2C_ALT" group="SDA" field="PORTMUX.TWISPIROUTEA.TWI0"/>
+                <signal pad-key="pa2" function="I2C" group="SDA" field="PORTMUX.TWISPIROUTEA.TWI0"/>
             </signals>
         </peripheral>
         <peripheral key="usart0" name="USART0" module-key="i2108">
             <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"/>
-                <signal pad-id="pa4" function="USART0_ALT" group="TXD" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pa0" function="USART0" group="TXD" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pa6" function="USART0_ALT" group="XCK" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pa2" function="USART0" group="XCK" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pa7" function="USART0_ALT" group="XDIR" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pa3" function="USART0" group="XDIR" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa5" function="USART0_ALT" group="RXD" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa1" function="USART0" group="RXD" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa4" function="USART0_ALT" group="TXD" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa0" function="USART0" group="TXD" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa6" function="USART0_ALT" group="XCK" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa2" function="USART0" group="XCK" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa7" function="USART0_ALT" group="XDIR" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa3" function="USART0" group="XDIR" field="PORTMUX.USARTROUTEA.USART0"/>
             </signals>
         </peripheral>
         <peripheral key="usart1" name="USART1" module-key="i2108">
             <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"/>
-                <signal pad-id="pc2" function="USART1" group="XCK" field="PORTMUX.USARTROUTEA.USART1"/>
-                <signal pad-id="pc3" function="USART1" group="XDIR" field="PORTMUX.USARTROUTEA.USART1"/>
+                <signal pad-key="pc1" function="USART1" group="RXD" field="PORTMUX.USARTROUTEA.USART1"/>
+                <signal pad-key="pc0" function="USART1" group="TXD" field="PORTMUX.USARTROUTEA.USART1"/>
+                <signal pad-key="pc2" function="USART1" group="XCK" field="PORTMUX.USARTROUTEA.USART1"/>
+                <signal pad-key="pc3" function="USART1" group="XDIR" field="PORTMUX.USARTROUTEA.USART1"/>
             </signals>
         </peripheral>
         <peripheral key="usart2" name="USART2" module-key="i2108">
             <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"/>
-                <signal pad-id="pf4" function="USART2_ALT" group="TXD" field="PORTMUX.USARTROUTEA.USART2"/>
-                <signal pad-id="pf0" function="USART2" group="TXD" field="PORTMUX.USARTROUTEA.USART2"/>
-                <signal pad-id="pf6" function="USART2_ALT" group="XCK" field="PORTMUX.USARTROUTEA.USART2"/>
-                <signal pad-id="pf2" function="USART2" group="XCK" field="PORTMUX.USARTROUTEA.USART2"/>
-                <signal pad-id="pf3" function="USART2" group="XDIR" field="PORTMUX.USARTROUTEA.USART2"/>
+                <signal pad-key="pf5" function="USART2_ALT" group="RXD" field="PORTMUX.USARTROUTEA.USART2"/>
+                <signal pad-key="pf1" function="USART2" group="RXD" field="PORTMUX.USARTROUTEA.USART2"/>
+                <signal pad-key="pf4" function="USART2_ALT" group="TXD" field="PORTMUX.USARTROUTEA.USART2"/>
+                <signal pad-key="pf0" function="USART2" group="TXD" field="PORTMUX.USARTROUTEA.USART2"/>
+                <signal pad-key="pf6" function="USART2_ALT" group="XCK" field="PORTMUX.USARTROUTEA.USART2"/>
+                <signal pad-key="pf2" function="USART2" group="XCK" field="PORTMUX.USARTROUTEA.USART2"/>
+                <signal pad-key="pf3" function="USART2" group="XDIR" field="PORTMUX.USARTROUTEA.USART2"/>
             </signals>
         </peripheral>
         <peripheral key="userrow" name="USERROW" module-key="i2603">
@@ -1368,109 +1368,143 @@
             </register-group>
         </module>
     </modules>
+    <pads>
+        <pad key="pa3" name="PA3"/>
+        <pad key="pa4" name="PA4"/>
+        <pad key="pa5" name="PA5"/>
+        <pad key="pa6" name="PA6"/>
+        <pad key="pa7" name="PA7"/>
+        <pad key="pc0" name="PC0"/>
+        <pad key="pc1" name="PC1"/>
+        <pad key="pc2" name="PC2"/>
+        <pad key="pc3" name="PC3"/>
+        <pad key="pd0" name="PD0"/>
+        <pad key="pd1" name="PD1"/>
+        <pad key="pd2" name="PD2"/>
+        <pad key="pd3" name="PD3"/>
+        <pad key="pd4" name="PD4"/>
+        <pad key="pd5" name="PD5"/>
+        <pad key="pd6" name="PD6"/>
+        <pad key="pd7" name="PD7"/>
+        <pad key="avdd" name="AVDD"/>
+        <pad key="gnd0" name="GND0"/>
+        <pad key="pf0" name="PF0"/>
+        <pad key="pf1" name="PF1"/>
+        <pad key="pf2" name="PF2"/>
+        <pad key="pf3" name="PF3"/>
+        <pad key="pf4" name="PF4"/>
+        <pad key="pf5" name="PF5"/>
+        <pad key="pf6" name="PF6"/>
+        <pad key="updi" name="UPDI"/>
+        <pad key="vdd0" name="VDD0"/>
+        <pad key="gnd1" name="GND1"/>
+        <pad key="pa0" name="PA0"/>
+        <pad key="pa1" name="PA1"/>
+        <pad key="pa2" name="PA2"/>
+    </pads>
     <pinouts>
         <pinout key="qfn32" name="QFN32" type="qfn">
-            <pin position="1" pad="PA3"/>
-            <pin position="2" pad="PA4"/>
-            <pin position="3" pad="PA5"/>
-            <pin position="4" pad="PA6"/>
-            <pin position="5" pad="PA7"/>
-            <pin position="6" pad="PC0"/>
-            <pin position="7" pad="PC1"/>
-            <pin position="8" pad="PC2"/>
-            <pin position="9" pad="PC3"/>
-            <pin position="10" pad="PD0"/>
-            <pin position="11" pad="PD1"/>
-            <pin position="12" pad="PD2"/>
-            <pin position="13" pad="PD3"/>
-            <pin position="14" pad="PD4"/>
-            <pin position="15" pad="PD5"/>
-            <pin position="16" pad="PD6"/>
-            <pin position="17" pad="PD7"/>
-            <pin position="18" pad="AVDD"/>
-            <pin position="19" pad="GND0"/>
-            <pin position="20" pad="PF0"/>
-            <pin position="21" pad="PF1"/>
-            <pin position="22" pad="PF2"/>
-            <pin position="23" pad="PF3"/>
-            <pin position="24" pad="PF4"/>
-            <pin position="25" pad="PF5"/>
-            <pin position="26" pad="PF6"/>
-            <pin position="27" pad="UPDI"/>
-            <pin position="28" pad="VDD0"/>
-            <pin position="29" pad="GND1"/>
-            <pin position="30" pad="PA0"/>
-            <pin position="31" pad="PA1"/>
-            <pin position="32" pad="PA2"/>
+            <pin position="1" pad-key="pa3"/>
+            <pin position="2" pad-key="pa4"/>
+            <pin position="3" pad-key="pa5"/>
+            <pin position="4" pad-key="pa6"/>
+            <pin position="5" pad-key="pa7"/>
+            <pin position="6" pad-key="pc0"/>
+            <pin position="7" pad-key="pc1"/>
+            <pin position="8" pad-key="pc2"/>
+            <pin position="9" pad-key="pc3"/>
+            <pin position="10" pad-key="pd0"/>
+            <pin position="11" pad-key="pd1"/>
+            <pin position="12" pad-key="pd2"/>
+            <pin position="13" pad-key="pd3"/>
+            <pin position="14" pad-key="pd4"/>
+            <pin position="15" pad-key="pd5"/>
+            <pin position="16" pad-key="pd6"/>
+            <pin position="17" pad-key="pd7"/>
+            <pin position="18" pad-key="avdd"/>
+            <pin position="19" pad-key="gnd0"/>
+            <pin position="20" pad-key="pf0"/>
+            <pin position="21" pad-key="pf1"/>
+            <pin position="22" pad-key="pf2"/>
+            <pin position="23" pad-key="pf3"/>
+            <pin position="24" pad-key="pf4"/>
+            <pin position="25" pad-key="pf5"/>
+            <pin position="26" pad-key="pf6"/>
+            <pin position="27" pad-key="updi"/>
+            <pin position="28" pad-key="vdd0"/>
+            <pin position="29" pad-key="gnd1"/>
+            <pin position="30" pad-key="pa0"/>
+            <pin position="31" pad-key="pa1"/>
+            <pin position="32" pad-key="pa2"/>
         </pinout>
         <pinout key="qfp32" name="QFP32" type="qfp">
-            <pin position="1" pad="PA3"/>
-            <pin position="2" pad="PA4"/>
-            <pin position="3" pad="PA5"/>
-            <pin position="4" pad="PA6"/>
-            <pin position="5" pad="PA7"/>
-            <pin position="6" pad="PC0"/>
-            <pin position="7" pad="PC1"/>
-            <pin position="8" pad="PC2"/>
-            <pin position="9" pad="PC3"/>
-            <pin position="10" pad="PD0"/>
-            <pin position="11" pad="PD1"/>
-            <pin position="12" pad="PD2"/>
-            <pin position="13" pad="PD3"/>
-            <pin position="14" pad="PD4"/>
-            <pin position="15" pad="PD5"/>
-            <pin position="16" pad="PD6"/>
-            <pin position="17" pad="PD7"/>
-            <pin position="18" pad="AVDD"/>
-            <pin position="19" pad="GND0"/>
-            <pin position="20" pad="PF0"/>
-            <pin position="21" pad="PF1"/>
-            <pin position="22" pad="PF2"/>
-            <pin position="23" pad="PF3"/>
-            <pin position="24" pad="PF4"/>
-            <pin position="25" pad="PF5"/>
-            <pin position="26" pad="PF6"/>
-            <pin position="27" pad="UPDI"/>
-            <pin position="28" pad="VDD0"/>
-            <pin position="29" pad="GND1"/>
-            <pin position="30" pad="PA0"/>
-            <pin position="31" pad="PA1"/>
-            <pin position="32" pad="PA2"/>
+            <pin position="1" pad-key="pa3"/>
+            <pin position="2" pad-key="pa4"/>
+            <pin position="3" pad-key="pa5"/>
+            <pin position="4" pad-key="pa6"/>
+            <pin position="5" pad-key="pa7"/>
+            <pin position="6" pad-key="pc0"/>
+            <pin position="7" pad-key="pc1"/>
+            <pin position="8" pad-key="pc2"/>
+            <pin position="9" pad-key="pc3"/>
+            <pin position="10" pad-key="pd0"/>
+            <pin position="11" pad-key="pd1"/>
+            <pin position="12" pad-key="pd2"/>
+            <pin position="13" pad-key="pd3"/>
+            <pin position="14" pad-key="pd4"/>
+            <pin position="15" pad-key="pd5"/>
+            <pin position="16" pad-key="pd6"/>
+            <pin position="17" pad-key="pd7"/>
+            <pin position="18" pad-key="avdd"/>
+            <pin position="19" pad-key="gnd0"/>
+            <pin position="20" pad-key="pf0"/>
+            <pin position="21" pad-key="pf1"/>
+            <pin position="22" pad-key="pf2"/>
+            <pin position="23" pad-key="pf3"/>
+            <pin position="24" pad-key="pf4"/>
+            <pin position="25" pad-key="pf5"/>
+            <pin position="26" pad-key="pf6"/>
+            <pin position="27" pad-key="updi"/>
+            <pin position="28" pad-key="vdd0"/>
+            <pin position="29" pad-key="gnd1"/>
+            <pin position="30" pad-key="pa0"/>
+            <pin position="31" pad-key="pa1"/>
+            <pin position="32" pad-key="pa2"/>
         </pinout>
         <pinout key="ssop28" name="SSOP28" type="ssop">
-            <pin position="1" pad="PA7"/>
-            <pin position="2" pad="PC0"/>
-            <pin position="3" pad="PC1"/>
-            <pin position="4" pad="PC2"/>
-            <pin position="5" pad="PC3"/>
-            <pin position="6" pad="PD0"/>
-            <pin position="7" pad="PD1"/>
-            <pin position="8" pad="PD2"/>
-            <pin position="9" pad="PD3"/>
-            <pin position="10" pad="PD4"/>
-            <pin position="11" pad="PD5"/>
-            <pin position="12" pad="PD6"/>
-            <pin position="13" pad="PD7"/>
-            <pin position="14" pad="AVDD"/>
-            <pin position="15" pad="GND0"/>
-            <pin position="16" pad="PF0"/>
-            <pin position="17" pad="PF1"/>
-            <pin position="18" pad="PF6"/>
-            <pin position="19" pad="UPDI"/>
-            <pin position="20" pad="VDD0"/>
-            <pin position="21" pad="GND1"/>
-            <pin position="22" pad="PA0"/>
-            <pin position="23" pad="PA1"/>
-            <pin position="24" pad="PA2"/>
-            <pin position="25" pad="PA3"/>
-            <pin position="26" pad="PA4"/>
-            <pin position="27" pad="PA5"/>
-            <pin position="28" pad="PA6"/>
+            <pin position="1" pad-key="pa7"/>
+            <pin position="2" pad-key="pc0"/>
+            <pin position="3" pad-key="pc1"/>
+            <pin position="4" pad-key="pc2"/>
+            <pin position="5" pad-key="pc3"/>
+            <pin position="6" pad-key="pd0"/>
+            <pin position="7" pad-key="pd1"/>
+            <pin position="8" pad-key="pd2"/>
+            <pin position="9" pad-key="pd3"/>
+            <pin position="10" pad-key="pd4"/>
+            <pin position="11" pad-key="pd5"/>
+            <pin position="12" pad-key="pd6"/>
+            <pin position="13" pad-key="pd7"/>
+            <pin position="14" pad-key="avdd"/>
+            <pin position="15" pad-key="gnd0"/>
+            <pin position="16" pad-key="pf0"/>
+            <pin position="17" pad-key="pf1"/>
+            <pin position="18" pad-key="pf6"/>
+            <pin position="19" pad-key="updi"/>
+            <pin position="20" pad-key="vdd0"/>
+            <pin position="21" pad-key="gnd1"/>
+            <pin position="22" pad-key="pa0"/>
+            <pin position="23" pad-key="pa1"/>
+            <pin position="24" pad-key="pa2"/>
+            <pin position="25" pad-key="pa3"/>
+            <pin position="26" pad-key="pa4"/>
+            <pin position="27" pad-key="pa5"/>
+            <pin position="28" pad-key="pa6"/>
         </pinout>
     </pinouts>
     <variants>
-        <variant name="ATmega1608-AFR" pinout-key="qfp32" package="TQFP32"/>
-        <variant name="ATmega1608-MFR" pinout-key="qfn32" package="VQFN32"/>
-        <variant name="ATmega1608-XFR" pinout-key="ssop28" package="SSOP28"/>
+        <variant key="atmega1608_afr" name="ATmega1608-AFR" pinout-key="qfp32"/>
+        <variant key="atmega1608_mfr" name="ATmega1608-MFR" pinout-key="qfn32"/>
+        <variant key="atmega1608_xfr" name="ATmega1608-XFR" pinout-key="ssop28"/>
     </variants>
 </device>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA1609.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA1609.xml
index 9223a251..52adc6e0 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA1609.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA1609.xml
@@ -45,35 +45,35 @@
         <peripheral key="ac0" name="AC0" module-key="i2106">
             <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"/>
-                <signal pad-id="pd7" index="2" function="AC0" group="N"/>
-                <signal pad-id="pa7" index="0" function="AC0" group="OUT"/>
-                <signal pad-id="pd2" index="0" function="AC0" group="P"/>
-                <signal pad-id="pd4" index="1" function="AC0" group="P"/>
-                <signal pad-id="pd6" index="2" function="AC0" group="P"/>
-                <signal pad-id="pd1" index="3" function="AC0" group="P"/>
+                <signal pad-key="pd3" index="0" function="AC0" group="N"/>
+                <signal pad-key="pd5" index="1" function="AC0" group="N"/>
+                <signal pad-key="pd7" index="2" function="AC0" group="N"/>
+                <signal pad-key="pa7" index="0" function="AC0" group="OUT"/>
+                <signal pad-key="pd2" index="0" function="AC0" group="P"/>
+                <signal pad-key="pd4" index="1" function="AC0" group="P"/>
+                <signal pad-key="pd6" index="2" function="AC0" group="P"/>
+                <signal pad-key="pd1" index="3" function="AC0" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="adc0" name="ADC0" module-key="i2132">
             <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"/>
-                <signal pad-id="pd2" index="2" function="AIN0" group="AIN"/>
-                <signal pad-id="pd3" index="3" function="AIN0" group="AIN"/>
-                <signal pad-id="pd4" index="4" function="AIN0" group="AIN"/>
-                <signal pad-id="pd5" index="5" function="AIN0" group="AIN"/>
-                <signal pad-id="pd6" index="6" function="AIN0" group="AIN"/>
-                <signal pad-id="pd7" index="7" function="AIN0" group="AIN"/>
-                <signal pad-id="pe0" index="8" function="AIN0" group="AIN"/>
-                <signal pad-id="pe1" index="9" function="AIN0" group="AIN"/>
-                <signal pad-id="pe2" index="10" function="AIN0" group="AIN"/>
-                <signal pad-id="pe3" index="11" function="AIN0" group="AIN"/>
-                <signal pad-id="pf2" index="12" function="AIN0" group="AIN"/>
-                <signal pad-id="pf3" index="13" function="AIN0" group="AIN"/>
-                <signal pad-id="pf4" index="14" function="AIN0" group="AIN"/>
-                <signal pad-id="pf5" index="15" function="AIN0" group="AIN"/>
+                <signal pad-key="pd0" index="0" function="AIN0" group="AIN"/>
+                <signal pad-key="pd1" index="1" function="AIN0" group="AIN"/>
+                <signal pad-key="pd2" index="2" function="AIN0" group="AIN"/>
+                <signal pad-key="pd3" index="3" function="AIN0" group="AIN"/>
+                <signal pad-key="pd4" index="4" function="AIN0" group="AIN"/>
+                <signal pad-key="pd5" index="5" function="AIN0" group="AIN"/>
+                <signal pad-key="pd6" index="6" function="AIN0" group="AIN"/>
+                <signal pad-key="pd7" index="7" function="AIN0" group="AIN"/>
+                <signal pad-key="pe0" index="8" function="AIN0" group="AIN"/>
+                <signal pad-key="pe1" index="9" function="AIN0" group="AIN"/>
+                <signal pad-key="pe2" index="10" function="AIN0" group="AIN"/>
+                <signal pad-key="pe3" index="11" function="AIN0" group="AIN"/>
+                <signal pad-key="pf2" index="12" function="AIN0" group="AIN"/>
+                <signal pad-key="pf3" index="13" function="AIN0" group="AIN"/>
+                <signal pad-key="pf4" index="14" function="AIN0" group="AIN"/>
+                <signal pad-key="pf5" index="15" function="AIN0" group="AIN"/>
             </signals>
         </peripheral>
         <peripheral key="bod" name="BOD" module-key="i2114">
@@ -82,35 +82,35 @@
         <peripheral key="ccl" name="CCL" module-key="i2128">
             <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"/>
-                <signal pad-id="pa2" index="2" function="CCL" group="LUT0_IN" field="PORTMUX.CCLROUTEA.LUT0"/>
-                <signal pad-id="pa6" index="0" function="CCL_ALT" group="LUT0_OUT" field="PORTMUX.CCLROUTEA.LUT0"/>
-                <signal pad-id="pa3" index="0" function="CCL" group="LUT0_OUT" field="PORTMUX.CCLROUTEA.LUT0"/>
-                <signal pad-id="pc0" index="0" function="CCL" group="LUT1_IN" field="PORTMUX.CCLROUTEA.LUT1"/>
-                <signal pad-id="pc1" index="1" function="CCL" group="LUT1_IN" field="PORTMUX.CCLROUTEA.LUT1"/>
-                <signal pad-id="pc2" index="2" function="CCL" group="LUT1_IN" field="PORTMUX.CCLROUTEA.LUT1"/>
-                <signal pad-id="pc6" index="0" function="CCL_ALT" group="LUT1_OUT" field="PORTMUX.CCLROUTEA.LUT1"/>
-                <signal pad-id="pc3" index="0" function="CCL" group="LUT1_OUT" field="PORTMUX.CCLROUTEA.LUT1"/>
-                <signal pad-id="pd0" index="0" function="CCL" group="LUT2_IN" field="PORTMUX.CCLROUTEA.LUT2"/>
-                <signal pad-id="pd1" index="1" function="CCL" group="LUT2_IN" field="PORTMUX.CCLROUTEA.LUT2"/>
-                <signal pad-id="pd2" index="2" function="CCL" group="LUT2_IN" field="PORTMUX.CCLROUTEA.LUT2"/>
-                <signal pad-id="pd3" index="0" function="CCL" group="LUT2_OUT" field="PORTMUX.CCLROUTEA.LUT2"/>
-                <signal pad-id="pd6" index="1" function="CCL_ALT" group="LUT2_OUT" field="PORTMUX.CCLROUTEA.LUT2"/>
-                <signal pad-id="pf0" index="0" function="CCL" group="LUT3_IN" field="PORTMUX.CCLROUTEA.LUT3"/>
-                <signal pad-id="pf1" index="1" function="CCL" group="LUT3_IN" field="PORTMUX.CCLROUTEA.LUT3"/>
-                <signal pad-id="pf2" index="2" function="CCL" group="LUT3_IN" field="PORTMUX.CCLROUTEA.LUT3"/>
-                <signal pad-id="pf6" index="1" function="CCL_ALT" group="LUT3_OUT" field="PORTMUX.CCLROUTEA.LUT3"/>
-                <signal pad-id="pf3" index="1" function="CCL" group="LUT3_OUT" field="PORTMUX.CCLROUTEA.LUT3"/>
+                <signal pad-key="pa0" index="0" function="CCL" group="LUT0_IN" field="PORTMUX.CCLROUTEA.LUT0"/>
+                <signal pad-key="pa1" index="1" function="CCL" group="LUT0_IN" field="PORTMUX.CCLROUTEA.LUT0"/>
+                <signal pad-key="pa2" index="2" function="CCL" group="LUT0_IN" field="PORTMUX.CCLROUTEA.LUT0"/>
+                <signal pad-key="pa6" index="0" function="CCL_ALT" group="LUT0_OUT" field="PORTMUX.CCLROUTEA.LUT0"/>
+                <signal pad-key="pa3" index="0" function="CCL" group="LUT0_OUT" field="PORTMUX.CCLROUTEA.LUT0"/>
+                <signal pad-key="pc0" index="0" function="CCL" group="LUT1_IN" field="PORTMUX.CCLROUTEA.LUT1"/>
+                <signal pad-key="pc1" index="1" function="CCL" group="LUT1_IN" field="PORTMUX.CCLROUTEA.LUT1"/>
+                <signal pad-key="pc2" index="2" function="CCL" group="LUT1_IN" field="PORTMUX.CCLROUTEA.LUT1"/>
+                <signal pad-key="pc6" index="0" function="CCL_ALT" group="LUT1_OUT" field="PORTMUX.CCLROUTEA.LUT1"/>
+                <signal pad-key="pc3" index="0" function="CCL" group="LUT1_OUT" field="PORTMUX.CCLROUTEA.LUT1"/>
+                <signal pad-key="pd0" index="0" function="CCL" group="LUT2_IN" field="PORTMUX.CCLROUTEA.LUT2"/>
+                <signal pad-key="pd1" index="1" function="CCL" group="LUT2_IN" field="PORTMUX.CCLROUTEA.LUT2"/>
+                <signal pad-key="pd2" index="2" function="CCL" group="LUT2_IN" field="PORTMUX.CCLROUTEA.LUT2"/>
+                <signal pad-key="pd3" index="0" function="CCL" group="LUT2_OUT" field="PORTMUX.CCLROUTEA.LUT2"/>
+                <signal pad-key="pd6" index="1" function="CCL_ALT" group="LUT2_OUT" field="PORTMUX.CCLROUTEA.LUT2"/>
+                <signal pad-key="pf0" index="0" function="CCL" group="LUT3_IN" field="PORTMUX.CCLROUTEA.LUT3"/>
+                <signal pad-key="pf1" index="1" function="CCL" group="LUT3_IN" field="PORTMUX.CCLROUTEA.LUT3"/>
+                <signal pad-key="pf2" index="2" function="CCL" group="LUT3_IN" field="PORTMUX.CCLROUTEA.LUT3"/>
+                <signal pad-key="pf6" index="1" function="CCL_ALT" group="LUT3_OUT" field="PORTMUX.CCLROUTEA.LUT3"/>
+                <signal pad-key="pf3" index="1" function="CCL" group="LUT3_OUT" field="PORTMUX.CCLROUTEA.LUT3"/>
             </signals>
         </peripheral>
         <peripheral key="clkctrl" name="CLKCTRL" module-key="i2113">
             <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"/>
-                <signal pad-id="pf0" function="CLKCTRL" group="TOSC1"/>
-                <signal pad-id="pf1" function="CLKCTRL" group="TOSC2"/>
+                <signal pad-key="pa0" function="CLKCTRL" group="CLKI"/>
+                <signal pad-key="pa7" function="CLKCTRL" group="CLKO"/>
+                <signal pad-key="pf0" function="CLKCTRL" group="TOSC1"/>
+                <signal pad-key="pf1" function="CLKCTRL" group="TOSC2"/>
             </signals>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="i2100">
@@ -125,15 +125,15 @@
         <peripheral key="evsys" name="EVSYS" module-key="i2118">
             <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"/>
-                <signal pad-id="pb2" index="1" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUT1"/>
-                <signal pad-id="pc7" index="2" function="EVSYS_ALT" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUT2"/>
-                <signal pad-id="pc2" index="2" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUT2"/>
-                <signal pad-id="pd7" index="3" function="EVSYS_ALT" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUT3"/>
-                <signal pad-id="pd2" index="3" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUT3"/>
-                <signal pad-id="pe2" index="4" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUT4"/>
-                <signal pad-id="pf2" index="5" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUT5"/>
+                <signal pad-key="pa7" index="0" function="EVSYS_ALT" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUT0"/>
+                <signal pad-key="pa2" index="0" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUT0"/>
+                <signal pad-key="pb2" index="1" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUT1"/>
+                <signal pad-key="pc7" index="2" function="EVSYS_ALT" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUT2"/>
+                <signal pad-key="pc2" index="2" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUT2"/>
+                <signal pad-key="pd7" index="3" function="EVSYS_ALT" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUT3"/>
+                <signal pad-key="pd2" index="3" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUT3"/>
+                <signal pad-key="pe2" index="4" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUT4"/>
+                <signal pad-key="pf2" index="5" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUT5"/>
             </signals>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="i2600_fuse">
@@ -151,72 +151,72 @@
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pa2" index="2" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa3" index="3" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa4" index="4" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa5" index="5" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa6" index="6" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa7" index="7" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa0" index="0" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa1" index="1" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa2" index="2" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa3" index="3" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa4" index="4" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa5" index="5" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa6" index="6" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa7" index="7" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pb2" index="2" function="IOPORT" group="PIN"/>
-                <signal pad-id="pb3" index="3" function="IOPORT" group="PIN"/>
-                <signal pad-id="pb4" index="4" function="IOPORT" group="PIN"/>
-                <signal pad-id="pb5" index="5" function="IOPORT" group="PIN"/>
+                <signal pad-key="pb0" index="0" function="IOPORT" group="PIN"/>
+                <signal pad-key="pb1" index="1" function="IOPORT" group="PIN"/>
+                <signal pad-key="pb2" index="2" function="IOPORT" group="PIN"/>
+                <signal pad-key="pb3" index="3" function="IOPORT" group="PIN"/>
+                <signal pad-key="pb4" index="4" function="IOPORT" group="PIN"/>
+                <signal pad-key="pb5" index="5" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pc2" index="2" function="IOPORT" group="PIN"/>
-                <signal pad-id="pc3" index="3" function="IOPORT" group="PIN"/>
-                <signal pad-id="pc4" index="4" function="IOPORT" group="PIN"/>
-                <signal pad-id="pc5" index="5" function="IOPORT" group="PIN"/>
-                <signal pad-id="pc6" index="6" function="IOPORT" group="PIN"/>
-                <signal pad-id="pc7" index="7" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc0" index="0" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc1" index="1" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc2" index="2" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc3" index="3" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc4" index="4" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc5" index="5" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc6" index="6" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc7" index="7" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pd2" index="2" function="IOPORT" group="PIN"/>
-                <signal pad-id="pd3" index="3" function="IOPORT" group="PIN"/>
-                <signal pad-id="pd4" index="4" function="IOPORT" group="PIN"/>
-                <signal pad-id="pd5" index="5" function="IOPORT" group="PIN"/>
-                <signal pad-id="pd6" index="6" function="IOPORT" group="PIN"/>
-                <signal pad-id="pd7" index="7" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd0" index="0" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd1" index="1" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd2" index="2" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd3" index="3" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd4" index="4" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd5" index="5" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd6" index="6" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd7" index="7" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="porte" name="PORTE" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pe2" index="2" function="IOPORT" group="PIN"/>
-                <signal pad-id="pe3" index="3" function="IOPORT" group="PIN"/>
+                <signal pad-key="pe0" index="0" function="IOPORT" group="PIN"/>
+                <signal pad-key="pe1" index="1" function="IOPORT" group="PIN"/>
+                <signal pad-key="pe2" index="2" function="IOPORT" group="PIN"/>
+                <signal pad-key="pe3" index="3" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="portf" name="PORTF" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pf2" index="2" function="IOPORT" group="PIN"/>
-                <signal pad-id="pf3" index="3" function="IOPORT" group="PIN"/>
-                <signal pad-id="pf4" index="4" function="IOPORT" group="PIN"/>
-                <signal pad-id="pf5" index="5" function="IOPORT" group="PIN"/>
-                <signal pad-id="pf6" index="6" function="IOPORT" group="PIN"/>
+                <signal pad-key="pf0" index="0" function="IOPORT" group="PIN"/>
+                <signal pad-key="pf1" index="1" function="IOPORT" group="PIN"/>
+                <signal pad-key="pf2" index="2" function="IOPORT" group="PIN"/>
+                <signal pad-key="pf3" index="3" function="IOPORT" group="PIN"/>
+                <signal pad-key="pf4" index="4" function="IOPORT" group="PIN"/>
+                <signal pad-key="pf5" index="5" function="IOPORT" group="PIN"/>
+                <signal pad-key="pf6" index="6" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="portmux" name="PORTMUX" module-key="i2600_portmux">
@@ -225,7 +225,7 @@
         <peripheral key="rstctrl" name="RSTCTRL" module-key="i2111">
             <register-group-instance register-group-key="rstctrl" address-space-key="data" offset="0x40"/>
             <signals>
-                <signal pad-id="pf6" function="OTHER" group="RESET"/>
+                <signal pad-key="pf6" function="OTHER" group="RESET"/>
             </signals>
         </peripheral>
         <peripheral key="rtc" name="RTC" module-key="i2116">
@@ -240,18 +240,18 @@
         <peripheral key="spi0" name="SPI0" module-key="i2107">
             <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"/>
-                <signal pad-id="pa5" function="SPI" group="MISO" field="PORTMUX.TWISPIROUTEA.SPI0"/>
-                <signal pad-id="pe0" function="SPI_ALT2" group="MOSI" field="PORTMUX.TWISPIROUTEA.SPI0"/>
-                <signal pad-id="pc0" function="SPI_ALT" group="MOSI" field="PORTMUX.TWISPIROUTEA.SPI0"/>
-                <signal pad-id="pa4" function="SPI" group="MOSI" field="PORTMUX.TWISPIROUTEA.SPI0"/>
-                <signal pad-id="pe2" function="SPI_ALT2" group="SCK" field="PORTMUX.TWISPIROUTEA.SPI0"/>
-                <signal pad-id="pc2" function="SPI_ALT" group="SCK" field="PORTMUX.TWISPIROUTEA.SPI0"/>
-                <signal pad-id="pa6" function="SPI" group="SCK" field="PORTMUX.TWISPIROUTEA.SPI0"/>
-                <signal pad-id="pe3" function="SPI_ALT2" group="SS" field="PORTMUX.TWISPIROUTEA.SPI0"/>
-                <signal pad-id="pc3" function="SPI_ALT" group="SS" field="PORTMUX.TWISPIROUTEA.SPI0"/>
-                <signal pad-id="pa7" function="SPI" group="SS" field="PORTMUX.TWISPIROUTEA.SPI0"/>
+                <signal pad-key="pe1" function="SPI_ALT2" group="MISO" field="PORTMUX.TWISPIROUTEA.SPI0"/>
+                <signal pad-key="pc1" function="SPI_ALT" group="MISO" field="PORTMUX.TWISPIROUTEA.SPI0"/>
+                <signal pad-key="pa5" function="SPI" group="MISO" field="PORTMUX.TWISPIROUTEA.SPI0"/>
+                <signal pad-key="pe0" function="SPI_ALT2" group="MOSI" field="PORTMUX.TWISPIROUTEA.SPI0"/>
+                <signal pad-key="pc0" function="SPI_ALT" group="MOSI" field="PORTMUX.TWISPIROUTEA.SPI0"/>
+                <signal pad-key="pa4" function="SPI" group="MOSI" field="PORTMUX.TWISPIROUTEA.SPI0"/>
+                <signal pad-key="pe2" function="SPI_ALT2" group="SCK" field="PORTMUX.TWISPIROUTEA.SPI0"/>
+                <signal pad-key="pc2" function="SPI_ALT" group="SCK" field="PORTMUX.TWISPIROUTEA.SPI0"/>
+                <signal pad-key="pa6" function="SPI" group="SCK" field="PORTMUX.TWISPIROUTEA.SPI0"/>
+                <signal pad-key="pe3" function="SPI_ALT2" group="SS" field="PORTMUX.TWISPIROUTEA.SPI0"/>
+                <signal pad-key="pc3" function="SPI_ALT" group="SS" field="PORTMUX.TWISPIROUTEA.SPI0"/>
+                <signal pad-key="pa7" function="SPI" group="SS" field="PORTMUX.TWISPIROUTEA.SPI0"/>
             </signals>
         </peripheral>
         <peripheral key="syscfg" name="SYSCFG" module-key="i2600_syscfg">
@@ -260,128 +260,128 @@
         <peripheral key="tca0" name="TCA0" module-key="i2117">
             <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"/>
-                <signal pad-id="pd0" index="0" function="TCA_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pc0" index="0" function="TCA_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pb0" index="0" function="TCA_ALT" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pa0" index="0" function="TCA" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pf1" index="1" function="TCA_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pe1" index="1" function="TCA_ALT4" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pd1" index="1" function="TCA_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pc1" index="1" function="TCA_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pb1" index="1" function="TCA_ALT" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pa1" index="1" function="TCA" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pf2" index="2" function="TCA_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pe2" index="2" function="TCA_ALT4" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pd2" index="2" function="TCA_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pc2" index="2" function="TCA_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pb2" index="2" function="TCA_ALT" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pa2" index="2" function="TCA" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pf3" index="3" function="TCA_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pe3" index="3" function="TCA_ALT4" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pd3" index="3" function="TCA_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pc3" index="3" function="TCA_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pb3" index="3" function="TCA_ALT" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pa3" index="3" function="TCA" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pf4" index="4" function="TCA_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pd4" index="4" function="TCA_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pc4" index="4" function="TCA_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pb4" index="4" function="TCA_ALT" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pa4" index="4" function="TCA" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pf5" index="5" function="TCA_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pd5" index="5" function="TCA_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pc5" index="5" function="TCA_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pb5" index="5" function="TCA_ALT" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pa5" index="5" function="TCA" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pf0" index="0" function="TCA_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pe0" index="0" function="TCA_ALT4" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pd0" index="0" function="TCA_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pc0" index="0" function="TCA_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pb0" index="0" function="TCA_ALT" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pa0" index="0" function="TCA" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pf1" index="1" function="TCA_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pe1" index="1" function="TCA_ALT4" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pd1" index="1" function="TCA_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pc1" index="1" function="TCA_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pb1" index="1" function="TCA_ALT" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pa1" index="1" function="TCA" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pf2" index="2" function="TCA_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pe2" index="2" function="TCA_ALT4" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pd2" index="2" function="TCA_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pc2" index="2" function="TCA_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pb2" index="2" function="TCA_ALT" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pa2" index="2" function="TCA" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pf3" index="3" function="TCA_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pe3" index="3" function="TCA_ALT4" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pd3" index="3" function="TCA_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pc3" index="3" function="TCA_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pb3" index="3" function="TCA_ALT" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pa3" index="3" function="TCA" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pf4" index="4" function="TCA_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pd4" index="4" function="TCA_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pc4" index="4" function="TCA_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pb4" index="4" function="TCA_ALT" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pa4" index="4" function="TCA" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pf5" index="5" function="TCA_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pd5" index="5" function="TCA_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pc5" index="5" function="TCA_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pb5" index="5" function="TCA_ALT" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pa5" index="5" function="TCA" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
             </signals>
         </peripheral>
         <peripheral key="tcb0" name="TCB0" module-key="i2119">
             <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"/>
+                <signal pad-key="pf4" index="0" function="TCB0_ALT" group="WO" field="PORTMUX.TCBROUTEA.TCB0"/>
+                <signal pad-key="pa2" index="0" function="TCB0" group="WO" field="PORTMUX.TCBROUTEA.TCB0"/>
             </signals>
         </peripheral>
         <peripheral key="tcb1" name="TCB1" module-key="i2119">
             <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"/>
+                <signal pad-key="pf5" index="0" function="TCB1_ALT" group="WO" field="PORTMUX.TCBROUTEA.TCB1"/>
+                <signal pad-key="pa3" index="0" function="TCB1" group="WO" field="PORTMUX.TCBROUTEA.TCB1"/>
             </signals>
         </peripheral>
         <peripheral key="tcb2" name="TCB2" module-key="i2119">
             <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"/>
+                <signal pad-key="pb4" index="0" function="TCB2_ALT" group="WO" field="PORTMUX.TCBROUTEA.TCB2"/>
+                <signal pad-key="pc0" index="0" function="TCB2" group="WO" field="PORTMUX.TCBROUTEA.TCB2"/>
             </signals>
         </peripheral>
         <peripheral key="tcb3" name="TCB3" module-key="i2119">
             <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"/>
+                <signal pad-key="pc1" index="0" function="TCB3_ALT" group="WO" field="PORTMUX.TCBROUTEA.TCB3"/>
+                <signal pad-key="pb5" index="0" function="TCB3" group="WO" field="PORTMUX.TCBROUTEA.TCB3"/>
             </signals>
         </peripheral>
         <peripheral key="twi0" name="TWI0" module-key="i2110">
             <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"/>
-                <signal pad-id="pa3" function="I2C" group="SCL" field="PORTMUX.TWISPIROUTEA.TWI0"/>
-                <signal pad-id="pf2" function="I2C_ALT2" group="SDA" field="PORTMUX.TWISPIROUTEA.TWI0"/>
-                <signal pad-id="pc2" function="I2C_ALT" group="SDA" field="PORTMUX.TWISPIROUTEA.TWI0"/>
-                <signal pad-id="pa2" function="I2C" group="SDA" field="PORTMUX.TWISPIROUTEA.TWI0"/>
+                <signal pad-key="pf3" function="I2C_ALT2" group="SCL" field="PORTMUX.TWISPIROUTEA.TWI0"/>
+                <signal pad-key="pc3" function="I2C_ALT" group="SCL" field="PORTMUX.TWISPIROUTEA.TWI0"/>
+                <signal pad-key="pa3" function="I2C" group="SCL" field="PORTMUX.TWISPIROUTEA.TWI0"/>
+                <signal pad-key="pf2" function="I2C_ALT2" group="SDA" field="PORTMUX.TWISPIROUTEA.TWI0"/>
+                <signal pad-key="pc2" function="I2C_ALT" group="SDA" field="PORTMUX.TWISPIROUTEA.TWI0"/>
+                <signal pad-key="pa2" function="I2C" group="SDA" field="PORTMUX.TWISPIROUTEA.TWI0"/>
             </signals>
         </peripheral>
         <peripheral key="usart0" name="USART0" module-key="i2108">
             <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"/>
-                <signal pad-id="pa4" function="USART0_ALT" group="TXD" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pa0" function="USART0" group="TXD" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pa6" function="USART0_ALT" group="XCK" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pa2" function="USART0" group="XCK" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pa7" function="USART0_ALT" group="XDIR" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pa3" function="USART0" group="XDIR" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa5" function="USART0_ALT" group="RXD" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa1" function="USART0" group="RXD" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa4" function="USART0_ALT" group="TXD" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa0" function="USART0" group="TXD" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa6" function="USART0_ALT" group="XCK" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa2" function="USART0" group="XCK" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa7" function="USART0_ALT" group="XDIR" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa3" function="USART0" group="XDIR" field="PORTMUX.USARTROUTEA.USART0"/>
             </signals>
         </peripheral>
         <peripheral key="usart1" name="USART1" module-key="i2108">
             <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"/>
-                <signal pad-id="pc4" function="USART1_ALT" group="TXD" field="PORTMUX.USARTROUTEA.USART1"/>
-                <signal pad-id="pc0" function="USART1" group="TXD" field="PORTMUX.USARTROUTEA.USART1"/>
-                <signal pad-id="pc6" function="USART1_ALT" group="XCK" field="PORTMUX.USARTROUTEA.USART1"/>
-                <signal pad-id="pc2" function="USART1" group="XCK" field="PORTMUX.USARTROUTEA.USART1"/>
-                <signal pad-id="pc7" function="USART1_ALT" group="XDIR" field="PORTMUX.USARTROUTEA.USART1"/>
-                <signal pad-id="pc3" function="USART1" group="XDIR" field="PORTMUX.USARTROUTEA.USART1"/>
+                <signal pad-key="pc5" function="USART1_ALT" group="RXD" field="PORTMUX.USARTROUTEA.USART1"/>
+                <signal pad-key="pc1" function="USART1" group="RXD" field="PORTMUX.USARTROUTEA.USART1"/>
+                <signal pad-key="pc4" function="USART1_ALT" group="TXD" field="PORTMUX.USARTROUTEA.USART1"/>
+                <signal pad-key="pc0" function="USART1" group="TXD" field="PORTMUX.USARTROUTEA.USART1"/>
+                <signal pad-key="pc6" function="USART1_ALT" group="XCK" field="PORTMUX.USARTROUTEA.USART1"/>
+                <signal pad-key="pc2" function="USART1" group="XCK" field="PORTMUX.USARTROUTEA.USART1"/>
+                <signal pad-key="pc7" function="USART1_ALT" group="XDIR" field="PORTMUX.USARTROUTEA.USART1"/>
+                <signal pad-key="pc3" function="USART1" group="XDIR" field="PORTMUX.USARTROUTEA.USART1"/>
             </signals>
         </peripheral>
         <peripheral key="usart2" name="USART2" module-key="i2108">
             <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"/>
-                <signal pad-id="pf4" function="USART2_ALT" group="TXD" field="PORTMUX.USARTROUTEA.USART2"/>
-                <signal pad-id="pf0" function="USART2" group="TXD" field="PORTMUX.USARTROUTEA.USART2"/>
-                <signal pad-id="pf6" function="USART2_ALT" group="XCK" field="PORTMUX.USARTROUTEA.USART2"/>
-                <signal pad-id="pf2" function="USART2" group="XCK" field="PORTMUX.USARTROUTEA.USART2"/>
-                <signal pad-id="pf3" function="USART2" group="XDIR" field="PORTMUX.USARTROUTEA.USART2"/>
+                <signal pad-key="pf5" function="USART2_ALT" group="RXD" field="PORTMUX.USARTROUTEA.USART2"/>
+                <signal pad-key="pf1" function="USART2" group="RXD" field="PORTMUX.USARTROUTEA.USART2"/>
+                <signal pad-key="pf4" function="USART2_ALT" group="TXD" field="PORTMUX.USARTROUTEA.USART2"/>
+                <signal pad-key="pf0" function="USART2" group="TXD" field="PORTMUX.USARTROUTEA.USART2"/>
+                <signal pad-key="pf6" function="USART2_ALT" group="XCK" field="PORTMUX.USARTROUTEA.USART2"/>
+                <signal pad-key="pf2" function="USART2" group="XCK" field="PORTMUX.USARTROUTEA.USART2"/>
+                <signal pad-key="pf3" function="USART2" group="XDIR" field="PORTMUX.USARTROUTEA.USART2"/>
             </signals>
         </peripheral>
         <peripheral key="usart3" name="USART3" module-key="i2108">
             <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"/>
-                <signal pad-id="pb4" function="USART3_ALT" group="TXD" field="PORTMUX.USARTROUTEA.USART3"/>
-                <signal pad-id="pb0" function="USART3" group="TXD" field="PORTMUX.USARTROUTEA.USART3"/>
-                <signal pad-id="pb2" function="USART3" group="XCK" field="PORTMUX.USARTROUTEA.USART3"/>
-                <signal pad-id="pb3" function="USART3" group="XDIR" field="PORTMUX.USARTROUTEA.USART3"/>
+                <signal pad-key="pb5" function="USART3_ALT" group="RXD" field="PORTMUX.USARTROUTEA.USART3"/>
+                <signal pad-key="pb1" function="USART3" group="RXD" field="PORTMUX.USARTROUTEA.USART3"/>
+                <signal pad-key="pb4" function="USART3_ALT" group="TXD" field="PORTMUX.USARTROUTEA.USART3"/>
+                <signal pad-key="pb0" function="USART3" group="TXD" field="PORTMUX.USARTROUTEA.USART3"/>
+                <signal pad-key="pb2" function="USART3" group="XCK" field="PORTMUX.USARTROUTEA.USART3"/>
+                <signal pad-key="pb3" function="USART3" group="XDIR" field="PORTMUX.USARTROUTEA.USART3"/>
             </signals>
         </peripheral>
         <peripheral key="userrow" name="USERROW" module-key="i2603">
@@ -1445,110 +1445,160 @@
             </register-group>
         </module>
     </modules>
+    <pads>
+        <pad key="pa5" name="PA5"/>
+        <pad key="pa6" name="PA6"/>
+        <pad key="pa7" name="PA7"/>
+        <pad key="pb0" name="PB0"/>
+        <pad key="pb1" name="PB1"/>
+        <pad key="pb2" name="PB2"/>
+        <pad key="pb3" name="PB3"/>
+        <pad key="pb4" name="PB4"/>
+        <pad key="pb5" name="PB5"/>
+        <pad key="pc0" name="PC0"/>
+        <pad key="pc1" name="PC1"/>
+        <pad key="pc2" name="PC2"/>
+        <pad key="pc3" name="PC3"/>
+        <pad key="vdd0" name="VDD0"/>
+        <pad key="gnd0" name="GND0"/>
+        <pad key="pc4" name="PC4"/>
+        <pad key="pc5" name="PC5"/>
+        <pad key="pc6" name="PC6"/>
+        <pad key="pc7" name="PC7"/>
+        <pad key="pd0" name="PD0"/>
+        <pad key="pd1" name="PD1"/>
+        <pad key="pd2" name="PD2"/>
+        <pad key="pd3" name="PD3"/>
+        <pad key="pd4" name="PD4"/>
+        <pad key="pd5" name="PD5"/>
+        <pad key="pd6" name="PD6"/>
+        <pad key="pd7" name="PD7"/>
+        <pad key="avdd" name="AVDD"/>
+        <pad key="agnd" name="AGND"/>
+        <pad key="pe0" name="PE0"/>
+        <pad key="pe1" name="PE1"/>
+        <pad key="pe2" name="PE2"/>
+        <pad key="pe3" name="PE3"/>
+        <pad key="pf0" name="PF0"/>
+        <pad key="pf1" name="PF1"/>
+        <pad key="pf2" name="PF2"/>
+        <pad key="pf3" name="PF3"/>
+        <pad key="pf4" name="PF4"/>
+        <pad key="pf5" name="PF5"/>
+        <pad key="pf6" name="PF6"/>
+        <pad key="updi" name="UPDI"/>
+        <pad key="vdd1" name="VDD1"/>
+        <pad key="gnd1" name="GND1"/>
+        <pad key="pa0" name="PA0"/>
+        <pad key="pa1" name="PA1"/>
+        <pad key="pa2" name="PA2"/>
+        <pad key="pa3" name="PA3"/>
+        <pad key="pa4" name="PA4"/>
+    </pads>
     <pinouts>
         <pinout key="qfn48" name="QFN48" type="qfn">
-            <pin position="1" pad="PA5"/>
-            <pin position="2" pad="PA6"/>
-            <pin position="3" pad="PA7"/>
-            <pin position="4" pad="PB0"/>
-            <pin position="5" pad="PB1"/>
-            <pin position="6" pad="PB2"/>
-            <pin position="7" pad="PB3"/>
-            <pin position="8" pad="PB4"/>
-            <pin position="9" pad="PB5"/>
-            <pin position="10" pad="PC0"/>
-            <pin position="11" pad="PC1"/>
-            <pin position="12" pad="PC2"/>
-            <pin position="13" pad="PC3"/>
-            <pin position="14" pad="VDD0"/>
-            <pin position="15" pad="GND0"/>
-            <pin position="16" pad="PC4"/>
-            <pin position="17" pad="PC5"/>
-            <pin position="18" pad="PC6"/>
-            <pin position="19" pad="PC7"/>
-            <pin position="20" pad="PD0"/>
-            <pin position="21" pad="PD1"/>
-            <pin position="22" pad="PD2"/>
-            <pin position="23" pad="PD3"/>
-            <pin position="24" pad="PD4"/>
-            <pin position="25" pad="PD5"/>
-            <pin position="26" pad="PD6"/>
-            <pin position="27" pad="PD7"/>
-            <pin position="28" pad="AVDD"/>
-            <pin position="29" pad="AGND"/>
-            <pin position="30" pad="PE0"/>
-            <pin position="31" pad="PE1"/>
-            <pin position="32" pad="PE2"/>
-            <pin position="33" pad="PE3"/>
-            <pin position="34" pad="PF0"/>
-            <pin position="35" pad="PF1"/>
-            <pin position="36" pad="PF2"/>
-            <pin position="37" pad="PF3"/>
-            <pin position="38" pad="PF4"/>
-            <pin position="39" pad="PF5"/>
-            <pin position="40" pad="PF6"/>
-            <pin position="41" pad="UPDI"/>
-            <pin position="42" pad="VDD1"/>
-            <pin position="43" pad="GND1"/>
-            <pin position="44" pad="PA0"/>
-            <pin position="45" pad="PA1"/>
-            <pin position="46" pad="PA2"/>
-            <pin position="47" pad="PA3"/>
-            <pin position="48" pad="PA4"/>
+            <pin position="1" pad-key="pa5"/>
+            <pin position="2" pad-key="pa6"/>
+            <pin position="3" pad-key="pa7"/>
+            <pin position="4" pad-key="pb0"/>
+            <pin position="5" pad-key="pb1"/>
+            <pin position="6" pad-key="pb2"/>
+            <pin position="7" pad-key="pb3"/>
+            <pin position="8" pad-key="pb4"/>
+            <pin position="9" pad-key="pb5"/>
+            <pin position="10" pad-key="pc0"/>
+            <pin position="11" pad-key="pc1"/>
+            <pin position="12" pad-key="pc2"/>
+            <pin position="13" pad-key="pc3"/>
+            <pin position="14" pad-key="vdd0"/>
+            <pin position="15" pad-key="gnd0"/>
+            <pin position="16" pad-key="pc4"/>
+            <pin position="17" pad-key="pc5"/>
+            <pin position="18" pad-key="pc6"/>
+            <pin position="19" pad-key="pc7"/>
+            <pin position="20" pad-key="pd0"/>
+            <pin position="21" pad-key="pd1"/>
+            <pin position="22" pad-key="pd2"/>
+            <pin position="23" pad-key="pd3"/>
+            <pin position="24" pad-key="pd4"/>
+            <pin position="25" pad-key="pd5"/>
+            <pin position="26" pad-key="pd6"/>
+            <pin position="27" pad-key="pd7"/>
+            <pin position="28" pad-key="avdd"/>
+            <pin position="29" pad-key="agnd"/>
+            <pin position="30" pad-key="pe0"/>
+            <pin position="31" pad-key="pe1"/>
+            <pin position="32" pad-key="pe2"/>
+            <pin position="33" pad-key="pe3"/>
+            <pin position="34" pad-key="pf0"/>
+            <pin position="35" pad-key="pf1"/>
+            <pin position="36" pad-key="pf2"/>
+            <pin position="37" pad-key="pf3"/>
+            <pin position="38" pad-key="pf4"/>
+            <pin position="39" pad-key="pf5"/>
+            <pin position="40" pad-key="pf6"/>
+            <pin position="41" pad-key="updi"/>
+            <pin position="42" pad-key="vdd1"/>
+            <pin position="43" pad-key="gnd1"/>
+            <pin position="44" pad-key="pa0"/>
+            <pin position="45" pad-key="pa1"/>
+            <pin position="46" pad-key="pa2"/>
+            <pin position="47" pad-key="pa3"/>
+            <pin position="48" pad-key="pa4"/>
         </pinout>
         <pinout key="qfp48" name="QFP48" type="qfp">
-            <pin position="1" pad="PA5"/>
-            <pin position="2" pad="PA6"/>
-            <pin position="3" pad="PA7"/>
-            <pin position="4" pad="PB0"/>
-            <pin position="5" pad="PB1"/>
-            <pin position="6" pad="PB2"/>
-            <pin position="7" pad="PB3"/>
-            <pin position="8" pad="PB4"/>
-            <pin position="9" pad="PB5"/>
-            <pin position="10" pad="PC0"/>
-            <pin position="11" pad="PC1"/>
-            <pin position="12" pad="PC2"/>
-            <pin position="13" pad="PC3"/>
-            <pin position="14" pad="VDD0"/>
-            <pin position="15" pad="GND0"/>
-            <pin position="16" pad="PC4"/>
-            <pin position="17" pad="PC5"/>
-            <pin position="18" pad="PC6"/>
-            <pin position="19" pad="PC7"/>
-            <pin position="20" pad="PD0"/>
-            <pin position="21" pad="PD1"/>
-            <pin position="22" pad="PD2"/>
-            <pin position="23" pad="PD3"/>
-            <pin position="24" pad="PD4"/>
-            <pin position="25" pad="PD5"/>
-            <pin position="26" pad="PD6"/>
-            <pin position="27" pad="PD7"/>
-            <pin position="28" pad="AVDD"/>
-            <pin position="29" pad="AGND"/>
-            <pin position="30" pad="PE0"/>
-            <pin position="31" pad="PE1"/>
-            <pin position="32" pad="PE2"/>
-            <pin position="33" pad="PE3"/>
-            <pin position="34" pad="PF0"/>
-            <pin position="35" pad="PF1"/>
-            <pin position="36" pad="PF2"/>
-            <pin position="37" pad="PF3"/>
-            <pin position="38" pad="PF4"/>
-            <pin position="39" pad="PF5"/>
-            <pin position="40" pad="PF6"/>
-            <pin position="41" pad="UPDI"/>
-            <pin position="42" pad="VDD1"/>
-            <pin position="43" pad="GND1"/>
-            <pin position="44" pad="PA0"/>
-            <pin position="45" pad="PA1"/>
-            <pin position="46" pad="PA2"/>
-            <pin position="47" pad="PA3"/>
-            <pin position="48" pad="PA4"/>
+            <pin position="1" pad-key="pa5"/>
+            <pin position="2" pad-key="pa6"/>
+            <pin position="3" pad-key="pa7"/>
+            <pin position="4" pad-key="pb0"/>
+            <pin position="5" pad-key="pb1"/>
+            <pin position="6" pad-key="pb2"/>
+            <pin position="7" pad-key="pb3"/>
+            <pin position="8" pad-key="pb4"/>
+            <pin position="9" pad-key="pb5"/>
+            <pin position="10" pad-key="pc0"/>
+            <pin position="11" pad-key="pc1"/>
+            <pin position="12" pad-key="pc2"/>
+            <pin position="13" pad-key="pc3"/>
+            <pin position="14" pad-key="vdd0"/>
+            <pin position="15" pad-key="gnd0"/>
+            <pin position="16" pad-key="pc4"/>
+            <pin position="17" pad-key="pc5"/>
+            <pin position="18" pad-key="pc6"/>
+            <pin position="19" pad-key="pc7"/>
+            <pin position="20" pad-key="pd0"/>
+            <pin position="21" pad-key="pd1"/>
+            <pin position="22" pad-key="pd2"/>
+            <pin position="23" pad-key="pd3"/>
+            <pin position="24" pad-key="pd4"/>
+            <pin position="25" pad-key="pd5"/>
+            <pin position="26" pad-key="pd6"/>
+            <pin position="27" pad-key="pd7"/>
+            <pin position="28" pad-key="avdd"/>
+            <pin position="29" pad-key="agnd"/>
+            <pin position="30" pad-key="pe0"/>
+            <pin position="31" pad-key="pe1"/>
+            <pin position="32" pad-key="pe2"/>
+            <pin position="33" pad-key="pe3"/>
+            <pin position="34" pad-key="pf0"/>
+            <pin position="35" pad-key="pf1"/>
+            <pin position="36" pad-key="pf2"/>
+            <pin position="37" pad-key="pf3"/>
+            <pin position="38" pad-key="pf4"/>
+            <pin position="39" pad-key="pf5"/>
+            <pin position="40" pad-key="pf6"/>
+            <pin position="41" pad-key="updi"/>
+            <pin position="42" pad-key="vdd1"/>
+            <pin position="43" pad-key="gnd1"/>
+            <pin position="44" pad-key="pa0"/>
+            <pin position="45" pad-key="pa1"/>
+            <pin position="46" pad-key="pa2"/>
+            <pin position="47" pad-key="pa3"/>
+            <pin position="48" pad-key="pa4"/>
         </pinout>
     </pinouts>
     <variants>
-        <variant name="ATmega1609-AFR" pinout-key="qfp48" package="TQFP48"/>
-        <variant name="ATmega1609-MFR" pinout-key="qfn48" package="UQFN48"/>
+        <variant key="atmega1609_afr" name="ATmega1609-AFR" pinout-key="qfp48"/>
+        <variant key="atmega1609_mfr" name="ATmega1609-MFR" pinout-key="qfn48"/>
     </variants>
 </device>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA162.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA162.xml
index 4b22f723..76a55617 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA162.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA162.xml
@@ -254,61 +254,61 @@
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pa2" index="2" function="PORTA" group="P"/>
-                <signal pad-id="pa3" index="3" function="PORTA" group="P"/>
-                <signal pad-id="pa4" index="4" function="PORTA" group="P"/>
-                <signal pad-id="pa5" index="5" function="PORTA" group="P"/>
-                <signal pad-id="pa6" index="6" function="PORTA" group="P"/>
-                <signal pad-id="pa7" index="7" function="PORTA" group="P"/>
+                <signal pad-key="pa0" index="0" function="PORTA" group="P"/>
+                <signal pad-key="pa1" index="1" function="PORTA" group="P"/>
+                <signal pad-key="pa2" index="2" function="PORTA" group="P"/>
+                <signal pad-key="pa3" index="3" function="PORTA" group="P"/>
+                <signal pad-key="pa4" index="4" function="PORTA" group="P"/>
+                <signal pad-key="pa5" index="5" function="PORTA" group="P"/>
+                <signal pad-key="pa6" index="6" function="PORTA" group="P"/>
+                <signal pad-key="pa7" index="7" function="PORTA" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pb2" index="2" function="PORTB" group="P"/>
-                <signal pad-id="pb3" index="3" function="PORTB" group="P"/>
-                <signal pad-id="pb4" index="4" function="PORTB" group="P"/>
-                <signal pad-id="pb5" index="5" function="PORTB" group="P"/>
-                <signal pad-id="pb6" index="6" function="PORTB" group="P"/>
-                <signal pad-id="pb7" index="7" function="PORTB" group="P"/>
+                <signal pad-key="pb0" index="0" function="PORTB" group="P"/>
+                <signal pad-key="pb1" index="1" function="PORTB" group="P"/>
+                <signal pad-key="pb2" index="2" function="PORTB" group="P"/>
+                <signal pad-key="pb3" index="3" function="PORTB" group="P"/>
+                <signal pad-key="pb4" index="4" function="PORTB" group="P"/>
+                <signal pad-key="pb5" index="5" function="PORTB" group="P"/>
+                <signal pad-key="pb6" index="6" function="PORTB" group="P"/>
+                <signal pad-key="pb7" index="7" function="PORTB" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pc2" index="2" function="PORTC" group="P"/>
-                <signal pad-id="pc3" index="3" function="PORTC" group="P"/>
-                <signal pad-id="pc4" index="4" function="PORTC" group="P"/>
-                <signal pad-id="pc5" index="5" function="PORTC" group="P"/>
-                <signal pad-id="pc6" index="6" function="PORTC" group="P"/>
-                <signal pad-id="pc7" index="7" function="PORTC" group="P"/>
+                <signal pad-key="pc0" index="0" function="PORTC" group="P"/>
+                <signal pad-key="pc1" index="1" function="PORTC" group="P"/>
+                <signal pad-key="pc2" index="2" function="PORTC" group="P"/>
+                <signal pad-key="pc3" index="3" function="PORTC" group="P"/>
+                <signal pad-key="pc4" index="4" function="PORTC" group="P"/>
+                <signal pad-key="pc5" index="5" function="PORTC" group="P"/>
+                <signal pad-key="pc6" index="6" function="PORTC" group="P"/>
+                <signal pad-key="pc7" index="7" function="PORTC" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pd2" index="2" function="PORTD" group="P"/>
-                <signal pad-id="pd3" index="3" function="PORTD" group="P"/>
-                <signal pad-id="pd4" index="4" function="PORTD" group="P"/>
-                <signal pad-id="pd5" index="5" function="PORTD" group="P"/>
-                <signal pad-id="pd6" index="6" function="PORTD" group="P"/>
-                <signal pad-id="pd7" index="7" function="PORTD" group="P"/>
+                <signal pad-key="pd0" index="0" function="PORTD" group="P"/>
+                <signal pad-key="pd1" index="1" function="PORTD" group="P"/>
+                <signal pad-key="pd2" index="2" function="PORTD" group="P"/>
+                <signal pad-key="pd3" index="3" function="PORTD" group="P"/>
+                <signal pad-key="pd4" index="4" function="PORTD" group="P"/>
+                <signal pad-key="pd5" index="5" function="PORTD" group="P"/>
+                <signal pad-key="pd6" index="6" function="PORTD" group="P"/>
+                <signal pad-key="pd7" index="7" function="PORTD" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="porte" name="PORTE" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pe2" index="2" function="PORTE" group="P"/>
+                <signal pad-key="pe0" index="0" function="PORTE" group="P"/>
+                <signal pad-key="pe1" index="1" function="PORTE" group="P"/>
+                <signal pad-key="pe2" index="2" function="PORTE" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="tc0" name="TC0" module-key="tc8">
@@ -742,99 +742,141 @@
             </register-group>
         </module>
     </modules>
+    <pads>
+        <pad key="pb0" name="PB0"/>
+        <pad key="pb1" name="PB1"/>
+        <pad key="pb2" name="PB2"/>
+        <pad key="pb3" name="PB3"/>
+        <pad key="pb4" name="PB4"/>
+        <pad key="pb5" name="PB5"/>
+        <pad key="pb6" name="PB6"/>
+        <pad key="pb7" name="PB7"/>
+        <pad key="reset" name="RESET"/>
+        <pad key="pd0" name="PD0"/>
+        <pad key="pd1" name="PD1"/>
+        <pad key="pd2" name="PD2"/>
+        <pad key="pd3" name="PD3"/>
+        <pad key="pd4" name="PD4"/>
+        <pad key="pd5" name="PD5"/>
+        <pad key="pd6" name="PD6"/>
+        <pad key="pd7" name="PD7"/>
+        <pad key="xtal2" name="XTAL2"/>
+        <pad key="xtal1" name="XTAL1"/>
+        <pad key="gnd" name="GND"/>
+        <pad key="pc0" name="PC0"/>
+        <pad key="pc1" name="PC1"/>
+        <pad key="pc2" name="PC2"/>
+        <pad key="pc3" name="PC3"/>
+        <pad key="pc4" name="PC4"/>
+        <pad key="pc5" name="PC5"/>
+        <pad key="pc6" name="PC6"/>
+        <pad key="pc7" name="PC7"/>
+        <pad key="pe2" name="PE2"/>
+        <pad key="pe1" name="PE1"/>
+        <pad key="pe0" name="PE0"/>
+        <pad key="pa7" name="PA7"/>
+        <pad key="pa6" name="PA6"/>
+        <pad key="pa5" name="PA5"/>
+        <pad key="pa4" name="PA4"/>
+        <pad key="pa3" name="PA3"/>
+        <pad key="pa2" name="PA2"/>
+        <pad key="pa1" name="PA1"/>
+        <pad key="pa0" name="PA0"/>
+        <pad key="vcc" name="VCC"/>
+    </pads>
     <pinouts>
         <pinout key="dip40" name="DIP40" type="dip">
-            <pin position="1" pad="PB0"/>
-            <pin position="2" pad="PB1"/>
-            <pin position="3" pad="PB2"/>
-            <pin position="4" pad="PB3"/>
-            <pin position="5" pad="PB4"/>
-            <pin position="6" pad="PB5"/>
-            <pin position="7" pad="PB6"/>
-            <pin position="8" pad="PB7"/>
-            <pin position="9" pad="RESET"/>
-            <pin position="10" pad="PD0"/>
-            <pin position="11" pad="PD1"/>
-            <pin position="12" pad="PD2"/>
-            <pin position="13" pad="PD3"/>
-            <pin position="14" pad="PD4"/>
-            <pin position="15" pad="PD5"/>
-            <pin position="16" pad="PD6"/>
-            <pin position="17" pad="PD7"/>
-            <pin position="18" pad="XTAL2"/>
-            <pin position="19" pad="XTAL1"/>
-            <pin position="20" pad="GND"/>
-            <pin position="21" pad="PC0"/>
-            <pin position="22" pad="PC1"/>
-            <pin position="23" pad="PC2"/>
-            <pin position="24" pad="PC3"/>
-            <pin position="25" pad="PC4"/>
-            <pin position="26" pad="PC5"/>
-            <pin position="27" pad="PC6"/>
-            <pin position="28" pad="PC7"/>
-            <pin position="29" pad="PE2"/>
-            <pin position="30" pad="PE1"/>
-            <pin position="31" pad="PE0"/>
-            <pin position="32" pad="PA7"/>
-            <pin position="33" pad="PA6"/>
-            <pin position="34" pad="PA5"/>
-            <pin position="35" pad="PA4"/>
-            <pin position="36" pad="PA3"/>
-            <pin position="37" pad="PA2"/>
-            <pin position="38" pad="PA1"/>
-            <pin position="39" pad="PA0"/>
-            <pin position="40" pad="VCC"/>
+            <pin position="1" pad-key="pb0"/>
+            <pin position="2" pad-key="pb1"/>
+            <pin position="3" pad-key="pb2"/>
+            <pin position="4" pad-key="pb3"/>
+            <pin position="5" pad-key="pb4"/>
+            <pin position="6" pad-key="pb5"/>
+            <pin position="7" pad-key="pb6"/>
+            <pin position="8" pad-key="pb7"/>
+            <pin position="9" pad-key="reset"/>
+            <pin position="10" pad-key="pd0"/>
+            <pin position="11" pad-key="pd1"/>
+            <pin position="12" pad-key="pd2"/>
+            <pin position="13" pad-key="pd3"/>
+            <pin position="14" pad-key="pd4"/>
+            <pin position="15" pad-key="pd5"/>
+            <pin position="16" pad-key="pd6"/>
+            <pin position="17" pad-key="pd7"/>
+            <pin position="18" pad-key="xtal2"/>
+            <pin position="19" pad-key="xtal1"/>
+            <pin position="20" pad-key="gnd"/>
+            <pin position="21" pad-key="pc0"/>
+            <pin position="22" pad-key="pc1"/>
+            <pin position="23" pad-key="pc2"/>
+            <pin position="24" pad-key="pc3"/>
+            <pin position="25" pad-key="pc4"/>
+            <pin position="26" pad-key="pc5"/>
+            <pin position="27" pad-key="pc6"/>
+            <pin position="28" pad-key="pc7"/>
+            <pin position="29" pad-key="pe2"/>
+            <pin position="30" pad-key="pe1"/>
+            <pin position="31" pad-key="pe0"/>
+            <pin position="32" pad-key="pa7"/>
+            <pin position="33" pad-key="pa6"/>
+            <pin position="34" pad-key="pa5"/>
+            <pin position="35" pad-key="pa4"/>
+            <pin position="36" pad-key="pa3"/>
+            <pin position="37" pad-key="pa2"/>
+            <pin position="38" pad-key="pa1"/>
+            <pin position="39" pad-key="pa0"/>
+            <pin position="40" pad-key="vcc"/>
         </pinout>
         <pinout key="qfp_qfn_44" name="QFP_QFN_44" type="qfn">
-            <pin position="1" pad="PB5"/>
-            <pin position="2" pad="PB6"/>
-            <pin position="3" pad="PB7"/>
-            <pin position="4" pad="RESET"/>
-            <pin position="5" pad="PD0"/>
-            <pin position="6" pad="VCC"/>
-            <pin position="7" pad="PD1"/>
-            <pin position="8" pad="PD2"/>
-            <pin position="9" pad="PD3"/>
-            <pin position="10" pad="PD4"/>
-            <pin position="11" pad="PD5"/>
-            <pin position="12" pad="PD6"/>
-            <pin position="13" pad="PD7"/>
-            <pin position="14" pad="XTAL2"/>
-            <pin position="15" pad="XTAL1"/>
-            <pin position="16" pad="GND"/>
-            <pin position="17" pad="VCC"/>
-            <pin position="18" pad="PC0"/>
-            <pin position="19" pad="PC1"/>
-            <pin position="20" pad="PC2"/>
-            <pin position="21" pad="PC3"/>
-            <pin position="22" pad="PC4"/>
-            <pin position="23" pad="PC5"/>
-            <pin position="24" pad="PC6"/>
-            <pin position="25" pad="PC7"/>
-            <pin position="26" pad="PE2"/>
-            <pin position="27" pad="PE1"/>
-            <pin position="28" pad="GND"/>
-            <pin position="29" pad="PE0"/>
-            <pin position="30" pad="PA7"/>
-            <pin position="31" pad="PA6"/>
-            <pin position="32" pad="PA5"/>
-            <pin position="33" pad="PA4"/>
-            <pin position="34" pad="PA3"/>
-            <pin position="35" pad="PA2"/>
-            <pin position="36" pad="PA1"/>
-            <pin position="37" pad="PA0"/>
-            <pin position="38" pad="VCC"/>
-            <pin position="39" pad="GND"/>
-            <pin position="40" pad="PB0"/>
-            <pin position="41" pad="PB1"/>
-            <pin position="42" pad="PB2"/>
-            <pin position="43" pad="PB3"/>
-            <pin position="44" pad="PB4"/>
+            <pin position="1" pad-key="pb5"/>
+            <pin position="2" pad-key="pb6"/>
+            <pin position="3" pad-key="pb7"/>
+            <pin position="4" pad-key="reset"/>
+            <pin position="5" pad-key="pd0"/>
+            <pin position="6" pad-key="vcc"/>
+            <pin position="7" pad-key="pd1"/>
+            <pin position="8" pad-key="pd2"/>
+            <pin position="9" pad-key="pd3"/>
+            <pin position="10" pad-key="pd4"/>
+            <pin position="11" pad-key="pd5"/>
+            <pin position="12" pad-key="pd6"/>
+            <pin position="13" pad-key="pd7"/>
+            <pin position="14" pad-key="xtal2"/>
+            <pin position="15" pad-key="xtal1"/>
+            <pin position="16" pad-key="gnd"/>
+            <pin position="17" pad-key="vcc"/>
+            <pin position="18" pad-key="pc0"/>
+            <pin position="19" pad-key="pc1"/>
+            <pin position="20" pad-key="pc2"/>
+            <pin position="21" pad-key="pc3"/>
+            <pin position="22" pad-key="pc4"/>
+            <pin position="23" pad-key="pc5"/>
+            <pin position="24" pad-key="pc6"/>
+            <pin position="25" pad-key="pc7"/>
+            <pin position="26" pad-key="pe2"/>
+            <pin position="27" pad-key="pe1"/>
+            <pin position="28" pad-key="gnd"/>
+            <pin position="29" pad-key="pe0"/>
+            <pin position="30" pad-key="pa7"/>
+            <pin position="31" pad-key="pa6"/>
+            <pin position="32" pad-key="pa5"/>
+            <pin position="33" pad-key="pa4"/>
+            <pin position="34" pad-key="pa3"/>
+            <pin position="35" pad-key="pa2"/>
+            <pin position="36" pad-key="pa1"/>
+            <pin position="37" pad-key="pa0"/>
+            <pin position="38" pad-key="vcc"/>
+            <pin position="39" pad-key="gnd"/>
+            <pin position="40" pad-key="pb0"/>
+            <pin position="41" pad-key="pb1"/>
+            <pin position="42" pad-key="pb2"/>
+            <pin position="43" pad-key="pb3"/>
+            <pin position="44" pad-key="pb4"/>
         </pinout>
     </pinouts>
     <variants>
-        <variant name="ATmega162-PU" pinout-key="dip40" package="DIP40"/>
-        <variant name="ATmega162-AU" pinout-key="qfp_qfn_44" package="TQFP44"/>
-        <variant name="ATmega162-MU" pinout-key="qfp_qfn_44" package="VQFN44"/>
+        <variant key="atmega162_pu" name="ATmega162-PU" pinout-key="dip40"/>
+        <variant key="atmega162_au" name="ATmega162-AU" pinout-key="qfp_qfn_44"/>
+        <variant key="atmega162_mu" name="ATmega162-MU" pinout-key="qfp_qfn_44"/>
     </variants>
 </device>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA164A.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA164A.xml
index d47b8804..51a24834 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA164A.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA164A.xml
@@ -220,93 +220,93 @@
         <peripheral key="ac" name="AC" module-key="ac">
             <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"/>
+                <signal pad-key="pb2" index="0" function="default" group="AIN"/>
+                <signal pad-key="pb3" index="1" function="default" group="AIN"/>
             </signals>
         </peripheral>
         <peripheral key="usart0" name="USART0" module-key="usart">
             <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"/>
-                <signal pad-id="pb0" function="default" group="XCK"/>
+                <signal pad-key="pd1" function="default" group="TXD"/>
+                <signal pad-key="pd0" function="default" group="RXD"/>
+                <signal pad-key="pb0" function="default" group="XCK"/>
             </signals>
         </peripheral>
         <peripheral key="usart1" name="USART1" module-key="usart">
             <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"/>
-                <signal pad-id="pd4" function="default" group="XCK"/>
+                <signal pad-key="pd3" function="default" group="TXD"/>
+                <signal pad-key="pd2" function="default" group="RXD"/>
+                <signal pad-key="pd4" function="default" group="XCK"/>
             </signals>
         </peripheral>
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pa2" index="2" function="default" group="P"/>
-                <signal pad-id="pa3" index="3" function="default" group="P"/>
-                <signal pad-id="pa4" index="4" function="default" group="P"/>
-                <signal pad-id="pa5" index="5" function="default" group="P"/>
-                <signal pad-id="pa6" index="6" function="default" group="P"/>
-                <signal pad-id="pa7" index="7" function="default" group="P"/>
+                <signal pad-key="pa0" index="0" function="default" group="P"/>
+                <signal pad-key="pa1" index="1" function="default" group="P"/>
+                <signal pad-key="pa2" index="2" function="default" group="P"/>
+                <signal pad-key="pa3" index="3" function="default" group="P"/>
+                <signal pad-key="pa4" index="4" function="default" group="P"/>
+                <signal pad-key="pa5" index="5" function="default" group="P"/>
+                <signal pad-key="pa6" index="6" function="default" group="P"/>
+                <signal pad-key="pa7" index="7" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pb2" index="2" function="default" group="P"/>
-                <signal pad-id="pb3" index="3" function="default" group="P"/>
-                <signal pad-id="pb4" index="4" function="default" group="P"/>
-                <signal pad-id="pb5" index="5" function="default" group="P"/>
-                <signal pad-id="pb6" index="6" function="default" group="P"/>
-                <signal pad-id="pb7" index="7" function="default" group="P"/>
+                <signal pad-key="pb0" index="0" function="default" group="P"/>
+                <signal pad-key="pb1" index="1" function="default" group="P"/>
+                <signal pad-key="pb2" index="2" function="default" group="P"/>
+                <signal pad-key="pb3" index="3" function="default" group="P"/>
+                <signal pad-key="pb4" index="4" function="default" group="P"/>
+                <signal pad-key="pb5" index="5" function="default" group="P"/>
+                <signal pad-key="pb6" index="6" function="default" group="P"/>
+                <signal pad-key="pb7" index="7" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pc2" index="2" function="default" group="P"/>
-                <signal pad-id="pc3" index="3" function="default" group="P"/>
-                <signal pad-id="pc4" index="4" function="default" group="P"/>
-                <signal pad-id="pc5" index="5" function="default" group="P"/>
-                <signal pad-id="pc6" index="6" function="default" group="P"/>
-                <signal pad-id="pc7" index="7" function="default" group="P"/>
+                <signal pad-key="pc0" index="0" function="default" group="P"/>
+                <signal pad-key="pc1" index="1" function="default" group="P"/>
+                <signal pad-key="pc2" index="2" function="default" group="P"/>
+                <signal pad-key="pc3" index="3" function="default" group="P"/>
+                <signal pad-key="pc4" index="4" function="default" group="P"/>
+                <signal pad-key="pc5" index="5" function="default" group="P"/>
+                <signal pad-key="pc6" index="6" function="default" group="P"/>
+                <signal pad-key="pc7" index="7" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pd2" index="2" function="default" group="P"/>
-                <signal pad-id="pd3" index="3" function="default" group="P"/>
-                <signal pad-id="pd4" index="4" function="default" group="P"/>
-                <signal pad-id="pd5" index="5" function="default" group="P"/>
-                <signal pad-id="pd6" index="6" function="default" group="P"/>
-                <signal pad-id="pd7" index="7" function="default" group="P"/>
+                <signal pad-key="pd0" index="0" function="default" group="P"/>
+                <signal pad-key="pd1" index="1" function="default" group="P"/>
+                <signal pad-key="pd2" index="2" function="default" group="P"/>
+                <signal pad-key="pd3" index="3" function="default" group="P"/>
+                <signal pad-key="pd4" index="4" function="default" group="P"/>
+                <signal pad-key="pd5" index="5" function="default" group="P"/>
+                <signal pad-key="pd6" index="6" function="default" group="P"/>
+                <signal pad-key="pd7" index="7" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="tc0" name="TC0" module-key="tc8">
             <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"/>
-                <signal pad-id="pb3" function="default" group="OCA"/>
+                <signal pad-key="pb0" function="default" group="T"/>
+                <signal pad-key="pb4" function="default" group="OCB"/>
+                <signal pad-key="pb3" function="default" group="OCA"/>
             </signals>
         </peripheral>
         <peripheral key="tc2" name="TC2" module-key="tc8_async">
             <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"/>
-                <signal pad-id="pd7" function="default" group="OCA"/>
-                <signal pad-id="pd6" function="default" group="OCB"/>
+                <signal pad-key="pc6" index="1" function="default" group="TOSC"/>
+                <signal pad-key="pc7" index="2" function="default" group="TOSC"/>
+                <signal pad-key="pd7" function="default" group="OCA"/>
+                <signal pad-key="pd6" function="default" group="OCB"/>
             </signals>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="wdt">
@@ -315,10 +315,10 @@
         <peripheral key="jtag" name="JTAG" module-key="jtag">
             <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"/>
-                <signal pad-id="pc4" function="default" group="TDO"/>
-                <signal pad-id="pc5" function="default" group="TDI"/>
+                <signal pad-key="pc2" function="default" group="TCK"/>
+                <signal pad-key="pc3" function="default" group="TMS"/>
+                <signal pad-key="pc4" function="default" group="TDO"/>
+                <signal pad-key="pc5" function="default" group="TDI"/>
             </signals>
         </peripheral>
         <peripheral key="boot_load" name="BOOT_LOAD" module-key="boot_load">
@@ -327,63 +327,63 @@
         <peripheral key="exint" name="EXINT" module-key="exint">
             <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"/>
-                <signal pad-id="pa2" index="2" function="default" group="PCINT"/>
-                <signal pad-id="pa3" index="3" function="default" group="PCINT"/>
-                <signal pad-id="pa4" index="4" function="default" group="PCINT"/>
-                <signal pad-id="pa5" index="5" function="default" group="PCINT"/>
-                <signal pad-id="pa6" index="6" function="default" group="PCINT"/>
-                <signal pad-id="pa7" index="7" function="default" group="PCINT"/>
-                <signal pad-id="pb0" index="8" function="default" group="PCINT"/>
-                <signal pad-id="pb1" index="9" function="default" group="PCINT"/>
-                <signal pad-id="pb2" index="10" function="default" group="PCINT"/>
-                <signal pad-id="pb3" index="11" function="default" group="PCINT"/>
-                <signal pad-id="pb4" index="12" function="default" group="PCINT"/>
-                <signal pad-id="pb5" index="13" function="default" group="PCINT"/>
-                <signal pad-id="pb6" index="14" function="default" group="PCINT"/>
-                <signal pad-id="pb7" index="15" function="default" group="PCINT"/>
-                <signal pad-id="pc0" index="16" function="default" group="PCINT"/>
-                <signal pad-id="pc1" index="17" function="default" group="PCINT"/>
-                <signal pad-id="pc2" index="18" function="default" group="PCINT"/>
-                <signal pad-id="pc3" index="19" function="default" group="PCINT"/>
-                <signal pad-id="pc4" index="20" function="default" group="PCINT"/>
-                <signal pad-id="pc5" index="21" function="default" group="PCINT"/>
-                <signal pad-id="pc6" index="22" function="default" group="PCINT"/>
-                <signal pad-id="pc7" index="23" function="default" group="PCINT"/>
-                <signal pad-id="pd0" index="24" function="default" group="PCINT"/>
-                <signal pad-id="pd1" index="25" function="default" group="PCINT"/>
-                <signal pad-id="pd2" index="26" function="default" group="PCINT"/>
-                <signal pad-id="pd3" index="27" function="default" group="PCINT"/>
-                <signal pad-id="pd4" index="28" function="default" group="PCINT"/>
-                <signal pad-id="pd5" index="29" function="default" group="PCINT"/>
-                <signal pad-id="pd6" index="30" function="default" group="PCINT"/>
-                <signal pad-id="pd7" index="31" function="default" group="PCINT"/>
-                <signal pad-id="pd2" index="0" function="default" group="INT"/>
-                <signal pad-id="pd3" index="1" function="default" group="INT"/>
-                <signal pad-id="pb2" index="2" function="default" group="INT"/>
+                <signal pad-key="pa0" index="0" function="default" group="PCINT"/>
+                <signal pad-key="pa1" index="1" function="default" group="PCINT"/>
+                <signal pad-key="pa2" index="2" function="default" group="PCINT"/>
+                <signal pad-key="pa3" index="3" function="default" group="PCINT"/>
+                <signal pad-key="pa4" index="4" function="default" group="PCINT"/>
+                <signal pad-key="pa5" index="5" function="default" group="PCINT"/>
+                <signal pad-key="pa6" index="6" function="default" group="PCINT"/>
+                <signal pad-key="pa7" index="7" function="default" group="PCINT"/>
+                <signal pad-key="pb0" index="8" function="default" group="PCINT"/>
+                <signal pad-key="pb1" index="9" function="default" group="PCINT"/>
+                <signal pad-key="pb2" index="10" function="default" group="PCINT"/>
+                <signal pad-key="pb3" index="11" function="default" group="PCINT"/>
+                <signal pad-key="pb4" index="12" function="default" group="PCINT"/>
+                <signal pad-key="pb5" index="13" function="default" group="PCINT"/>
+                <signal pad-key="pb6" index="14" function="default" group="PCINT"/>
+                <signal pad-key="pb7" index="15" function="default" group="PCINT"/>
+                <signal pad-key="pc0" index="16" function="default" group="PCINT"/>
+                <signal pad-key="pc1" index="17" function="default" group="PCINT"/>
+                <signal pad-key="pc2" index="18" function="default" group="PCINT"/>
+                <signal pad-key="pc3" index="19" function="default" group="PCINT"/>
+                <signal pad-key="pc4" index="20" function="default" group="PCINT"/>
+                <signal pad-key="pc5" index="21" function="default" group="PCINT"/>
+                <signal pad-key="pc6" index="22" function="default" group="PCINT"/>
+                <signal pad-key="pc7" index="23" function="default" group="PCINT"/>
+                <signal pad-key="pd0" index="24" function="default" group="PCINT"/>
+                <signal pad-key="pd1" index="25" function="default" group="PCINT"/>
+                <signal pad-key="pd2" index="26" function="default" group="PCINT"/>
+                <signal pad-key="pd3" index="27" function="default" group="PCINT"/>
+                <signal pad-key="pd4" index="28" function="default" group="PCINT"/>
+                <signal pad-key="pd5" index="29" function="default" group="PCINT"/>
+                <signal pad-key="pd6" index="30" function="default" group="PCINT"/>
+                <signal pad-key="pd7" index="31" function="default" group="PCINT"/>
+                <signal pad-key="pd2" index="0" function="default" group="INT"/>
+                <signal pad-key="pd3" index="1" function="default" group="INT"/>
+                <signal pad-key="pb2" index="2" function="default" group="INT"/>
             </signals>
         </peripheral>
         <peripheral key="adc" name="ADC" module-key="adc">
             <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"/>
-                <signal pad-id="pa2" index="2" function="default" group="ADC"/>
-                <signal pad-id="pa3" index="3" function="default" group="ADC"/>
-                <signal pad-id="pa4" index="4" function="default" group="ADC"/>
-                <signal pad-id="pa5" index="5" function="default" group="ADC"/>
-                <signal pad-id="pa6" index="6" function="default" group="ADC"/>
-                <signal pad-id="pa7" index="7" function="default" group="ADC"/>
+                <signal pad-key="pa0" index="0" function="default" group="ADC"/>
+                <signal pad-key="pa1" index="1" function="default" group="ADC"/>
+                <signal pad-key="pa2" index="2" function="default" group="ADC"/>
+                <signal pad-key="pa3" index="3" function="default" group="ADC"/>
+                <signal pad-key="pa4" index="4" function="default" group="ADC"/>
+                <signal pad-key="pa5" index="5" function="default" group="ADC"/>
+                <signal pad-key="pa6" index="6" function="default" group="ADC"/>
+                <signal pad-key="pa7" index="7" function="default" group="ADC"/>
             </signals>
         </peripheral>
         <peripheral key="tc1" name="TC1" module-key="tc16">
             <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"/>
-                <signal pad-id="pd5" function="default" group="OCA"/>
-                <signal pad-id="pd4" function="default" group="OCB"/>
+                <signal pad-key="pb1" function="default" group="T"/>
+                <signal pad-key="pd6" function="default" group="ICP"/>
+                <signal pad-key="pd5" function="default" group="OCA"/>
+                <signal pad-key="pd4" function="default" group="OCB"/>
             </signals>
         </peripheral>
         <peripheral key="eeprom" name="EEPROM" module-key="eeprom">
@@ -392,23 +392,23 @@
         <peripheral key="spi" name="SPI" module-key="spi">
             <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"/>
-                <signal pad-id="pb6" function="default" group="MISO"/>
-                <signal pad-id="pb7" function="default" group="SCK"/>
+                <signal pad-key="pb4" function="default" group="SS"/>
+                <signal pad-key="pb5" function="default" group="MOSI"/>
+                <signal pad-key="pb6" function="default" group="MISO"/>
+                <signal pad-key="pb7" function="default" group="SCK"/>
             </signals>
         </peripheral>
         <peripheral key="twi" name="TWI" module-key="twi">
             <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"/>
+                <signal pad-key="pc1" function="default" group="SDA"/>
+                <signal pad-key="pc0" function="default" group="SCL"/>
             </signals>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="cpu">
             <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"/>
+                <signal pad-key="pb1" index="0" function="default" group="CLKO"/>
             </signals>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="fuse">
@@ -889,198 +889,240 @@
             </register-group>
         </module>
     </modules>
+    <pads>
+        <pad key="pb5" name="PB5"/>
+        <pad key="pb6" name="PB6"/>
+        <pad key="pb7" name="PB7"/>
+        <pad key="reset" name="RESET"/>
+        <pad key="vcc" name="VCC"/>
+        <pad key="gnd" name="GND"/>
+        <pad key="xtal2" name="XTAL2"/>
+        <pad key="xtal1" name="XTAL1"/>
+        <pad key="pd0" name="PD0"/>
+        <pad key="pd1" name="PD1"/>
+        <pad key="pd2" name="PD2"/>
+        <pad key="pd3" name="PD3"/>
+        <pad key="pd4" name="PD4"/>
+        <pad key="pd5" name="PD5"/>
+        <pad key="pd6" name="PD6"/>
+        <pad key="pd7" name="PD7"/>
+        <pad key="pc0" name="PC0"/>
+        <pad key="pc1" name="PC1"/>
+        <pad key="pc2" name="PC2"/>
+        <pad key="pc3" name="PC3"/>
+        <pad key="pc4" name="PC4"/>
+        <pad key="pc5" name="PC5"/>
+        <pad key="pc6" name="PC6"/>
+        <pad key="pc7" name="PC7"/>
+        <pad key="avcc" name="AVCC"/>
+        <pad key="aref" name="AREF"/>
+        <pad key="pa7" name="PA7"/>
+        <pad key="pa6" name="PA6"/>
+        <pad key="pa5" name="PA5"/>
+        <pad key="pa4" name="PA4"/>
+        <pad key="pa3" name="PA3"/>
+        <pad key="pa2" name="PA2"/>
+        <pad key="pa1" name="PA1"/>
+        <pad key="pa0" name="PA0"/>
+        <pad key="pb0" name="PB0"/>
+        <pad key="pb1" name="PB1"/>
+        <pad key="pb2" name="PB2"/>
+        <pad key="pb3" name="PB3"/>
+        <pad key="pb4" name="PB4"/>
+        <pad key="ref" name="REF"/>
+    </pads>
     <pinouts>
         <pinout key="drqfn_44" name="DRQFN_44" type="drqfn">
-            <pin position="A1" pad="PB5"/>
-            <pin position="B1" pad="PB6"/>
-            <pin position="A2" pad="PB7"/>
-            <pin position="B2" pad="RESET"/>
-            <pin position="A3" pad="VCC"/>
-            <pin position="B3" pad="GND"/>
-            <pin position="A4" pad="XTAL2"/>
-            <pin position="B4" pad="XTAL1"/>
-            <pin position="A5" pad="PD0"/>
-            <pin position="B5" pad="PD1"/>
-            <pin position="A6" pad="PD2"/>
-            <pin position="A7" pad="PD3"/>
-            <pin position="B6" pad="PD4"/>
-            <pin position="A8" pad="PD5"/>
-            <pin position="B7" pad="PD6"/>
-            <pin position="A9" pad="PD7"/>
-            <pin position="B8" pad="VCC"/>
-            <pin position="A10" pad="GND"/>
-            <pin position="B9" pad="PC0"/>
-            <pin position="A11" pad="PC1"/>
-            <pin position="B10" pad="PC2"/>
-            <pin position="A12" pad="PC3"/>
-            <pin position="A13" pad="PC4"/>
-            <pin position="B11" pad="PC5"/>
-            <pin position="A14" pad="PC6"/>
-            <pin position="B12" pad="PC7"/>
-            <pin position="A15" pad="AVCC"/>
-            <pin position="B13" pad="GND"/>
-            <pin position="A16" pad="AREF"/>
-            <pin position="B14" pad="PA7"/>
-            <pin position="A17" pad="PA6"/>
-            <pin position="B15" pad="PA5"/>
-            <pin position="A18" pad="PA4"/>
-            <pin position="A19" pad="PA3"/>
-            <pin position="B16" pad="PA2"/>
-            <pin position="A20" pad="PA1"/>
-            <pin position="B17" pad="PA0"/>
-            <pin position="A21" pad="VCC"/>
-            <pin position="B18" pad="GND"/>
-            <pin position="A22" pad="PB0"/>
-            <pin position="B19" pad="PB1"/>
-            <pin position="A23" pad="PB2"/>
-            <pin position="B20" pad="PB3"/>
-            <pin position="A24" pad="PB4"/>
+            <pin position="A1" pad-key="pb5"/>
+            <pin position="B1" pad-key="pb6"/>
+            <pin position="A2" pad-key="pb7"/>
+            <pin position="B2" pad-key="reset"/>
+            <pin position="A3" pad-key="vcc"/>
+            <pin position="B3" pad-key="gnd"/>
+            <pin position="A4" pad-key="xtal2"/>
+            <pin position="B4" pad-key="xtal1"/>
+            <pin position="A5" pad-key="pd0"/>
+            <pin position="B5" pad-key="pd1"/>
+            <pin position="A6" pad-key="pd2"/>
+            <pin position="A7" pad-key="pd3"/>
+            <pin position="B6" pad-key="pd4"/>
+            <pin position="A8" pad-key="pd5"/>
+            <pin position="B7" pad-key="pd6"/>
+            <pin position="A9" pad-key="pd7"/>
+            <pin position="B8" pad-key="vcc"/>
+            <pin position="A10" pad-key="gnd"/>
+            <pin position="B9" pad-key="pc0"/>
+            <pin position="A11" pad-key="pc1"/>
+            <pin position="B10" pad-key="pc2"/>
+            <pin position="A12" pad-key="pc3"/>
+            <pin position="A13" pad-key="pc4"/>
+            <pin position="B11" pad-key="pc5"/>
+            <pin position="A14" pad-key="pc6"/>
+            <pin position="B12" pad-key="pc7"/>
+            <pin position="A15" pad-key="avcc"/>
+            <pin position="B13" pad-key="gnd"/>
+            <pin position="A16" pad-key="aref"/>
+            <pin position="B14" pad-key="pa7"/>
+            <pin position="A17" pad-key="pa6"/>
+            <pin position="B15" pad-key="pa5"/>
+            <pin position="A18" pad-key="pa4"/>
+            <pin position="A19" pad-key="pa3"/>
+            <pin position="B16" pad-key="pa2"/>
+            <pin position="A20" pad-key="pa1"/>
+            <pin position="B17" pad-key="pa0"/>
+            <pin position="A21" pad-key="vcc"/>
+            <pin position="B18" pad-key="gnd"/>
+            <pin position="A22" pad-key="pb0"/>
+            <pin position="B19" pad-key="pb1"/>
+            <pin position="A23" pad-key="pb2"/>
+            <pin position="B20" pad-key="pb3"/>
+            <pin position="A24" pad-key="pb4"/>
         </pinout>
         <pinout key="pdip40" name="PDIP40" type="dip">
-            <pin position="1" pad="PB0"/>
-            <pin position="2" pad="PB1"/>
-            <pin position="3" pad="PB2"/>
-            <pin position="4" pad="PB3"/>
-            <pin position="5" pad="PB4"/>
-            <pin position="6" pad="PB5"/>
-            <pin position="7" pad="PB6"/>
-            <pin position="8" pad="PB7"/>
-            <pin position="9" pad="RESET"/>
-            <pin position="10" pad="VCC"/>
-            <pin position="11" pad="GND"/>
-            <pin position="12" pad="XTAL2"/>
-            <pin position="13" pad="XTAL1"/>
-            <pin position="14" pad="PD0"/>
-            <pin position="15" pad="PD1"/>
-            <pin position="16" pad="PD2"/>
-            <pin position="17" pad="PD3"/>
-            <pin position="18" pad="PD4"/>
-            <pin position="19" pad="PD5"/>
-            <pin position="20" pad="PD6"/>
-            <pin position="21" pad="PD7"/>
-            <pin position="22" pad="PC0"/>
-            <pin position="23" pad="PC1"/>
-            <pin position="24" pad="PC2"/>
-            <pin position="25" pad="PC3"/>
-            <pin position="26" pad="PC4"/>
-            <pin position="27" pad="PC5"/>
-            <pin position="28" pad="PC6"/>
-            <pin position="29" pad="PC7"/>
-            <pin position="30" pad="AVCC"/>
-            <pin position="31" pad="GND"/>
-            <pin position="32" pad="AREF"/>
-            <pin position="33" pad="PA7"/>
-            <pin position="34" pad="PA6"/>
-            <pin position="35" pad="PA5"/>
-            <pin position="36" pad="PA4"/>
-            <pin position="37" pad="PA3"/>
-            <pin position="38" pad="PA2"/>
-            <pin position="39" pad="PA1"/>
-            <pin position="40" pad="PA0"/>
+            <pin position="1" pad-key="pb0"/>
+            <pin position="2" pad-key="pb1"/>
+            <pin position="3" pad-key="pb2"/>
+            <pin position="4" pad-key="pb3"/>
+            <pin position="5" pad-key="pb4"/>
+            <pin position="6" pad-key="pb5"/>
+            <pin position="7" pad-key="pb6"/>
+            <pin position="8" pad-key="pb7"/>
+            <pin position="9" pad-key="reset"/>
+            <pin position="10" pad-key="vcc"/>
+            <pin position="11" pad-key="gnd"/>
+            <pin position="12" pad-key="xtal2"/>
+            <pin position="13" pad-key="xtal1"/>
+            <pin position="14" pad-key="pd0"/>
+            <pin position="15" pad-key="pd1"/>
+            <pin position="16" pad-key="pd2"/>
+            <pin position="17" pad-key="pd3"/>
+            <pin position="18" pad-key="pd4"/>
+            <pin position="19" pad-key="pd5"/>
+            <pin position="20" pad-key="pd6"/>
+            <pin position="21" pad-key="pd7"/>
+            <pin position="22" pad-key="pc0"/>
+            <pin position="23" pad-key="pc1"/>
+            <pin position="24" pad-key="pc2"/>
+            <pin position="25" pad-key="pc3"/>
+            <pin position="26" pad-key="pc4"/>
+            <pin position="27" pad-key="pc5"/>
+            <pin position="28" pad-key="pc6"/>
+            <pin position="29" pad-key="pc7"/>
+            <pin position="30" pad-key="avcc"/>
+            <pin position="31" pad-key="gnd"/>
+            <pin position="32" pad-key="aref"/>
+            <pin position="33" pad-key="pa7"/>
+            <pin position="34" pad-key="pa6"/>
+            <pin position="35" pad-key="pa5"/>
+            <pin position="36" pad-key="pa4"/>
+            <pin position="37" pad-key="pa3"/>
+            <pin position="38" pad-key="pa2"/>
+            <pin position="39" pad-key="pa1"/>
+            <pin position="40" pad-key="pa0"/>
         </pinout>
         <pinout key="tqfp_qfn_44" name="TQFP_QFN_44" type="qfn">
-            <pin position="1" pad="PB5"/>
-            <pin position="2" pad="PB6"/>
-            <pin position="3" pad="PB7"/>
-            <pin position="4" pad="RESET"/>
-            <pin position="5" pad="VCC"/>
-            <pin position="6" pad="GND"/>
-            <pin position="7" pad="XTAL2"/>
-            <pin position="8" pad="XTAL1"/>
-            <pin position="9" pad="PD0"/>
-            <pin position="10" pad="PD1"/>
-            <pin position="11" pad="PD2"/>
-            <pin position="12" pad="PD3"/>
-            <pin position="13" pad="PD4"/>
-            <pin position="14" pad="PD5"/>
-            <pin position="15" pad="PD6"/>
-            <pin position="16" pad="PD7"/>
-            <pin position="17" pad="VCC"/>
-            <pin position="18" pad="GND"/>
-            <pin position="19" pad="PC0"/>
-            <pin position="20" pad="PC1"/>
-            <pin position="21" pad="PC2"/>
-            <pin position="22" pad="PC3"/>
-            <pin position="23" pad="PC4"/>
-            <pin position="24" pad="PC5"/>
-            <pin position="25" pad="PC6"/>
-            <pin position="26" pad="PC7"/>
-            <pin position="27" pad="AVCC"/>
-            <pin position="28" pad="GND"/>
-            <pin position="29" pad="REF"/>
-            <pin position="30" pad="PA7"/>
-            <pin position="31" pad="PA6"/>
-            <pin position="32" pad="PA5"/>
-            <pin position="33" pad="PA4"/>
-            <pin position="34" pad="PA3"/>
-            <pin position="35" pad="PA2"/>
-            <pin position="36" pad="PA1"/>
-            <pin position="37" pad="PA0"/>
-            <pin position="38" pad="VCC"/>
-            <pin position="39" pad="GND"/>
-            <pin position="40" pad="PB0"/>
-            <pin position="41" pad="PB1"/>
-            <pin position="42" pad="PB2"/>
-            <pin position="43" pad="PB3"/>
-            <pin position="44" pad="PB4"/>
+            <pin position="1" pad-key="pb5"/>
+            <pin position="2" pad-key="pb6"/>
+            <pin position="3" pad-key="pb7"/>
+            <pin position="4" pad-key="reset"/>
+            <pin position="5" pad-key="vcc"/>
+            <pin position="6" pad-key="gnd"/>
+            <pin position="7" pad-key="xtal2"/>
+            <pin position="8" pad-key="xtal1"/>
+            <pin position="9" pad-key="pd0"/>
+            <pin position="10" pad-key="pd1"/>
+            <pin position="11" pad-key="pd2"/>
+            <pin position="12" pad-key="pd3"/>
+            <pin position="13" pad-key="pd4"/>
+            <pin position="14" pad-key="pd5"/>
+            <pin position="15" pad-key="pd6"/>
+            <pin position="16" pad-key="pd7"/>
+            <pin position="17" pad-key="vcc"/>
+            <pin position="18" pad-key="gnd"/>
+            <pin position="19" pad-key="pc0"/>
+            <pin position="20" pad-key="pc1"/>
+            <pin position="21" pad-key="pc2"/>
+            <pin position="22" pad-key="pc3"/>
+            <pin position="23" pad-key="pc4"/>
+            <pin position="24" pad-key="pc5"/>
+            <pin position="25" pad-key="pc6"/>
+            <pin position="26" pad-key="pc7"/>
+            <pin position="27" pad-key="avcc"/>
+            <pin position="28" pad-key="gnd"/>
+            <pin position="29" pad-key="ref"/>
+            <pin position="30" pad-key="pa7"/>
+            <pin position="31" pad-key="pa6"/>
+            <pin position="32" pad-key="pa5"/>
+            <pin position="33" pad-key="pa4"/>
+            <pin position="34" pad-key="pa3"/>
+            <pin position="35" pad-key="pa2"/>
+            <pin position="36" pad-key="pa1"/>
+            <pin position="37" pad-key="pa0"/>
+            <pin position="38" pad-key="vcc"/>
+            <pin position="39" pad-key="gnd"/>
+            <pin position="40" pad-key="pb0"/>
+            <pin position="41" pad-key="pb1"/>
+            <pin position="42" pad-key="pb2"/>
+            <pin position="43" pad-key="pb3"/>
+            <pin position="44" pad-key="pb4"/>
         </pinout>
         <pinout key="vfbga49" name="VFBGA49" type="bga">
-            <pin position="A1" pad="GND"/>
-            <pin position="A2" pad="PB4"/>
-            <pin position="A3" pad="PB2"/>
-            <pin position="A4" pad="GND"/>
-            <pin position="A5" pad="VCC"/>
-            <pin position="A6" pad="PA2"/>
-            <pin position="A7" pad="GND"/>
-            <pin position="B1" pad="PB6"/>
-            <pin position="B2" pad="PB5"/>
-            <pin position="B3" pad="PB3"/>
-            <pin position="B4" pad="PB0"/>
-            <pin position="B5" pad="PA0"/>
-            <pin position="B6" pad="PA3"/>
-            <pin position="B7" pad="PA5"/>
-            <pin position="C1" pad="VCC"/>
-            <pin position="C2" pad="RESET"/>
-            <pin position="C3" pad="PB7"/>
-            <pin position="C4" pad="PB1"/>
-            <pin position="C5" pad="PA1"/>
-            <pin position="C6" pad="PA6"/>
-            <pin position="C7" pad="AREF"/>
-            <pin position="D1" pad="GND"/>
-            <pin position="D2" pad="XTAL2"/>
-            <pin position="D3" pad="PD0"/>
-            <pin position="D4" pad="GND"/>
-            <pin position="D5" pad="PA4"/>
-            <pin position="D6" pad="PA7"/>
-            <pin position="D7" pad="GND"/>
-            <pin position="E1" pad="XTAL1"/>
-            <pin position="E2" pad="PD1"/>
-            <pin position="E3" pad="PD5"/>
-            <pin position="E4" pad="PD7"/>
-            <pin position="E5" pad="PC5"/>
-            <pin position="E6" pad="PC7"/>
-            <pin position="E7" pad="AVCC"/>
-            <pin position="F1" pad="PD2"/>
-            <pin position="F2" pad="PD3"/>
-            <pin position="F3" pad="PD6"/>
-            <pin position="F4" pad="PC0"/>
-            <pin position="F5" pad="PC2"/>
-            <pin position="F6" pad="PC4"/>
-            <pin position="F7" pad="PC6"/>
-            <pin position="G1" pad="GND"/>
-            <pin position="G2" pad="PD4"/>
-            <pin position="G3" pad="VCC"/>
-            <pin position="G4" pad="GND"/>
-            <pin position="G5" pad="PC1"/>
-            <pin position="G6" pad="PC3"/>
-            <pin position="G7" pad="GND"/>
+            <pin position="A1" pad-key="gnd"/>
+            <pin position="A2" pad-key="pb4"/>
+            <pin position="A3" pad-key="pb2"/>
+            <pin position="A4" pad-key="gnd"/>
+            <pin position="A5" pad-key="vcc"/>
+            <pin position="A6" pad-key="pa2"/>
+            <pin position="A7" pad-key="gnd"/>
+            <pin position="B1" pad-key="pb6"/>
+            <pin position="B2" pad-key="pb5"/>
+            <pin position="B3" pad-key="pb3"/>
+            <pin position="B4" pad-key="pb0"/>
+            <pin position="B5" pad-key="pa0"/>
+            <pin position="B6" pad-key="pa3"/>
+            <pin position="B7" pad-key="pa5"/>
+            <pin position="C1" pad-key="vcc"/>
+            <pin position="C2" pad-key="reset"/>
+            <pin position="C3" pad-key="pb7"/>
+            <pin position="C4" pad-key="pb1"/>
+            <pin position="C5" pad-key="pa1"/>
+            <pin position="C6" pad-key="pa6"/>
+            <pin position="C7" pad-key="aref"/>
+            <pin position="D1" pad-key="gnd"/>
+            <pin position="D2" pad-key="xtal2"/>
+            <pin position="D3" pad-key="pd0"/>
+            <pin position="D4" pad-key="gnd"/>
+            <pin position="D5" pad-key="pa4"/>
+            <pin position="D6" pad-key="pa7"/>
+            <pin position="D7" pad-key="gnd"/>
+            <pin position="E1" pad-key="xtal1"/>
+            <pin position="E2" pad-key="pd1"/>
+            <pin position="E3" pad-key="pd5"/>
+            <pin position="E4" pad-key="pd7"/>
+            <pin position="E5" pad-key="pc5"/>
+            <pin position="E6" pad-key="pc7"/>
+            <pin position="E7" pad-key="avcc"/>
+            <pin position="F1" pad-key="pd2"/>
+            <pin position="F2" pad-key="pd3"/>
+            <pin position="F3" pad-key="pd6"/>
+            <pin position="F4" pad-key="pc0"/>
+            <pin position="F5" pad-key="pc2"/>
+            <pin position="F6" pad-key="pc4"/>
+            <pin position="F7" pad-key="pc6"/>
+            <pin position="G1" pad-key="gnd"/>
+            <pin position="G2" pad-key="pd4"/>
+            <pin position="G3" pad-key="vcc"/>
+            <pin position="G4" pad-key="gnd"/>
+            <pin position="G5" pad-key="pc1"/>
+            <pin position="G6" pad-key="pc3"/>
+            <pin position="G7" pad-key="gnd"/>
         </pinout>
     </pinouts>
     <variants>
-        <variant name="ATmega164A-AU" pinout-key="tqfp_qfn_44" package="TQFP44"/>
-        <variant name="ATmega164A-PU" pinout-key="pdip40" package="PDIP40"/>
-        <variant name="ATmega164A-MU" pinout-key="tqfp_qfn_44" package="VQFN44"/>
-        <variant name="ATmega164A-MCH" pinout-key="drqfn_44" package="DRQFN44"/>
-        <variant name="ATmega164A-CU" pinout-key="vfbga49" package="VFBGA49"/>
+        <variant key="atmega164a_au" name="ATmega164A-AU" pinout-key="tqfp_qfn_44"/>
+        <variant key="atmega164a_pu" name="ATmega164A-PU" pinout-key="pdip40"/>
+        <variant key="atmega164a_mu" name="ATmega164A-MU" pinout-key="tqfp_qfn_44"/>
+        <variant key="atmega164a_mch" name="ATmega164A-MCH" pinout-key="drqfn_44"/>
+        <variant key="atmega164a_cu" name="ATmega164A-CU" pinout-key="vfbga49"/>
     </variants>
 </device>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA164P.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA164P.xml
index 854799e3..411c17c5 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA164P.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA164P.xml
@@ -220,91 +220,91 @@
         <peripheral key="ac" name="AC" module-key="ac">
             <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"/>
+                <signal pad-key="pb2" index="0" function="default" group="AIN"/>
+                <signal pad-key="pb3" index="1" function="default" group="AIN"/>
             </signals>
         </peripheral>
         <peripheral key="usart0" name="USART0" module-key="usart">
             <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"/>
-                <signal pad-id="pb0" function="default" group="XCK"/>
+                <signal pad-key="pd1" function="default" group="TXD"/>
+                <signal pad-key="pd0" function="default" group="RXD"/>
+                <signal pad-key="pb0" function="default" group="XCK"/>
             </signals>
         </peripheral>
         <peripheral key="usart1" name="USART1" module-key="usart">
             <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"/>
-                <signal pad-id="pd4" function="default" group="XCK"/>
+                <signal pad-key="pd3" function="default" group="TXD"/>
+                <signal pad-key="pd2" function="default" group="RXD"/>
+                <signal pad-key="pd4" function="default" group="XCK"/>
             </signals>
         </peripheral>
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pa2" index="2" function="default" group="P"/>
-                <signal pad-id="pa3" index="3" function="default" group="P"/>
-                <signal pad-id="pa4" index="4" function="default" group="P"/>
-                <signal pad-id="pa5" index="5" function="default" group="P"/>
-                <signal pad-id="pa6" index="6" function="default" group="P"/>
-                <signal pad-id="pa7" index="7" function="default" group="P"/>
+                <signal pad-key="pa0" index="0" function="default" group="P"/>
+                <signal pad-key="pa1" index="1" function="default" group="P"/>
+                <signal pad-key="pa2" index="2" function="default" group="P"/>
+                <signal pad-key="pa3" index="3" function="default" group="P"/>
+                <signal pad-key="pa4" index="4" function="default" group="P"/>
+                <signal pad-key="pa5" index="5" function="default" group="P"/>
+                <signal pad-key="pa6" index="6" function="default" group="P"/>
+                <signal pad-key="pa7" index="7" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pb2" index="2" function="default" group="P"/>
-                <signal pad-id="pb3" index="3" function="default" group="P"/>
-                <signal pad-id="pb4" index="4" function="default" group="P"/>
-                <signal pad-id="pb5" index="5" function="default" group="P"/>
-                <signal pad-id="pb6" index="6" function="default" group="P"/>
-                <signal pad-id="pb7" index="7" function="default" group="P"/>
+                <signal pad-key="pb0" index="0" function="default" group="P"/>
+                <signal pad-key="pb1" index="1" function="default" group="P"/>
+                <signal pad-key="pb2" index="2" function="default" group="P"/>
+                <signal pad-key="pb3" index="3" function="default" group="P"/>
+                <signal pad-key="pb4" index="4" function="default" group="P"/>
+                <signal pad-key="pb5" index="5" function="default" group="P"/>
+                <signal pad-key="pb6" index="6" function="default" group="P"/>
+                <signal pad-key="pb7" index="7" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pc2" index="2" function="default" group="P"/>
-                <signal pad-id="pc3" index="3" function="default" group="P"/>
-                <signal pad-id="pc4" index="4" function="default" group="P"/>
-                <signal pad-id="pc5" index="5" function="default" group="P"/>
-                <signal pad-id="pc6" index="6" function="default" group="P"/>
-                <signal pad-id="pc7" index="7" function="default" group="P"/>
+                <signal pad-key="pc0" index="0" function="default" group="P"/>
+                <signal pad-key="pc1" index="1" function="default" group="P"/>
+                <signal pad-key="pc2" index="2" function="default" group="P"/>
+                <signal pad-key="pc3" index="3" function="default" group="P"/>
+                <signal pad-key="pc4" index="4" function="default" group="P"/>
+                <signal pad-key="pc5" index="5" function="default" group="P"/>
+                <signal pad-key="pc6" index="6" function="default" group="P"/>
+                <signal pad-key="pc7" index="7" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pd2" index="2" function="default" group="P"/>
-                <signal pad-id="pd3" index="3" function="default" group="P"/>
-                <signal pad-id="pd4" index="4" function="default" group="P"/>
-                <signal pad-id="pd5" index="5" function="default" group="P"/>
-                <signal pad-id="pd6" index="6" function="default" group="P"/>
-                <signal pad-id="pd7" index="7" function="default" group="P"/>
+                <signal pad-key="pd0" index="0" function="default" group="P"/>
+                <signal pad-key="pd1" index="1" function="default" group="P"/>
+                <signal pad-key="pd2" index="2" function="default" group="P"/>
+                <signal pad-key="pd3" index="3" function="default" group="P"/>
+                <signal pad-key="pd4" index="4" function="default" group="P"/>
+                <signal pad-key="pd5" index="5" function="default" group="P"/>
+                <signal pad-key="pd6" index="6" function="default" group="P"/>
+                <signal pad-key="pd7" index="7" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="tc0" name="TC0" module-key="tc8">
             <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"/>
-                <signal pad-id="pb3" function="default" group="OCA"/>
+                <signal pad-key="pb0" function="default" group="T"/>
+                <signal pad-key="pb4" function="default" group="OCB"/>
+                <signal pad-key="pb3" function="default" group="OCA"/>
             </signals>
         </peripheral>
         <peripheral key="tc2" name="TC2" module-key="tc8_async">
             <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"/>
+                <signal pad-key="pd7" function="default" group="OCA"/>
+                <signal pad-key="pd6" function="default" group="OCB"/>
             </signals>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="wdt">
@@ -313,10 +313,10 @@
         <peripheral key="jtag" name="JTAG" module-key="jtag">
             <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"/>
-                <signal pad-id="pc4" function="default" group="TDO"/>
-                <signal pad-id="pc5" function="default" group="TDI"/>
+                <signal pad-key="pc2" function="default" group="TCK"/>
+                <signal pad-key="pc3" function="default" group="TMS"/>
+                <signal pad-key="pc4" function="default" group="TDO"/>
+                <signal pad-key="pc5" function="default" group="TDI"/>
             </signals>
         </peripheral>
         <peripheral key="boot_load" name="BOOT_LOAD" module-key="boot_load">
@@ -325,63 +325,63 @@
         <peripheral key="exint" name="EXINT" module-key="exint">
             <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"/>
-                <signal pad-id="pa2" index="2" function="default" group="PCINT"/>
-                <signal pad-id="pa3" index="3" function="default" group="PCINT"/>
-                <signal pad-id="pa4" index="4" function="default" group="PCINT"/>
-                <signal pad-id="pa5" index="5" function="default" group="PCINT"/>
-                <signal pad-id="pa6" index="6" function="default" group="PCINT"/>
-                <signal pad-id="pa7" index="7" function="default" group="PCINT"/>
-                <signal pad-id="pb0" index="8" function="default" group="PCINT"/>
-                <signal pad-id="pb1" index="9" function="default" group="PCINT"/>
-                <signal pad-id="pb2" index="10" function="default" group="PCINT"/>
-                <signal pad-id="pb3" index="11" function="default" group="PCINT"/>
-                <signal pad-id="pb4" index="12" function="default" group="PCINT"/>
-                <signal pad-id="pb5" index="13" function="default" group="PCINT"/>
-                <signal pad-id="pb6" index="14" function="default" group="PCINT"/>
-                <signal pad-id="pb7" index="15" function="default" group="PCINT"/>
-                <signal pad-id="pc0" index="16" function="default" group="PCINT"/>
-                <signal pad-id="pc1" index="17" function="default" group="PCINT"/>
-                <signal pad-id="pc2" index="18" function="default" group="PCINT"/>
-                <signal pad-id="pc3" index="19" function="default" group="PCINT"/>
-                <signal pad-id="pc4" index="20" function="default" group="PCINT"/>
-                <signal pad-id="pc5" index="21" function="default" group="PCINT"/>
-                <signal pad-id="pc6" index="22" function="default" group="PCINT"/>
-                <signal pad-id="pc7" index="23" function="default" group="PCINT"/>
-                <signal pad-id="pd0" index="24" function="default" group="PCINT"/>
-                <signal pad-id="pd1" index="25" function="default" group="PCINT"/>
-                <signal pad-id="pd2" index="26" function="default" group="PCINT"/>
-                <signal pad-id="pd3" index="27" function="default" group="PCINT"/>
-                <signal pad-id="pd4" index="28" function="default" group="PCINT"/>
-                <signal pad-id="pd5" index="29" function="default" group="PCINT"/>
-                <signal pad-id="pd6" index="30" function="default" group="PCINT"/>
-                <signal pad-id="pd7" index="31" function="default" group="PCINT"/>
-                <signal pad-id="pd2" index="0" function="default" group="INT"/>
-                <signal pad-id="pd3" index="1" function="default" group="INT"/>
-                <signal pad-id="pb2" index="2" function="default" group="INT"/>
+                <signal pad-key="pa0" index="0" function="default" group="PCINT"/>
+                <signal pad-key="pa1" index="1" function="default" group="PCINT"/>
+                <signal pad-key="pa2" index="2" function="default" group="PCINT"/>
+                <signal pad-key="pa3" index="3" function="default" group="PCINT"/>
+                <signal pad-key="pa4" index="4" function="default" group="PCINT"/>
+                <signal pad-key="pa5" index="5" function="default" group="PCINT"/>
+                <signal pad-key="pa6" index="6" function="default" group="PCINT"/>
+                <signal pad-key="pa7" index="7" function="default" group="PCINT"/>
+                <signal pad-key="pb0" index="8" function="default" group="PCINT"/>
+                <signal pad-key="pb1" index="9" function="default" group="PCINT"/>
+                <signal pad-key="pb2" index="10" function="default" group="PCINT"/>
+                <signal pad-key="pb3" index="11" function="default" group="PCINT"/>
+                <signal pad-key="pb4" index="12" function="default" group="PCINT"/>
+                <signal pad-key="pb5" index="13" function="default" group="PCINT"/>
+                <signal pad-key="pb6" index="14" function="default" group="PCINT"/>
+                <signal pad-key="pb7" index="15" function="default" group="PCINT"/>
+                <signal pad-key="pc0" index="16" function="default" group="PCINT"/>
+                <signal pad-key="pc1" index="17" function="default" group="PCINT"/>
+                <signal pad-key="pc2" index="18" function="default" group="PCINT"/>
+                <signal pad-key="pc3" index="19" function="default" group="PCINT"/>
+                <signal pad-key="pc4" index="20" function="default" group="PCINT"/>
+                <signal pad-key="pc5" index="21" function="default" group="PCINT"/>
+                <signal pad-key="pc6" index="22" function="default" group="PCINT"/>
+                <signal pad-key="pc7" index="23" function="default" group="PCINT"/>
+                <signal pad-key="pd0" index="24" function="default" group="PCINT"/>
+                <signal pad-key="pd1" index="25" function="default" group="PCINT"/>
+                <signal pad-key="pd2" index="26" function="default" group="PCINT"/>
+                <signal pad-key="pd3" index="27" function="default" group="PCINT"/>
+                <signal pad-key="pd4" index="28" function="default" group="PCINT"/>
+                <signal pad-key="pd5" index="29" function="default" group="PCINT"/>
+                <signal pad-key="pd6" index="30" function="default" group="PCINT"/>
+                <signal pad-key="pd7" index="31" function="default" group="PCINT"/>
+                <signal pad-key="pd2" index="0" function="default" group="INT"/>
+                <signal pad-key="pd3" index="1" function="default" group="INT"/>
+                <signal pad-key="pb2" index="2" function="default" group="INT"/>
             </signals>
         </peripheral>
         <peripheral key="adc" name="ADC" module-key="adc">
             <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"/>
-                <signal pad-id="pa2" index="2" function="default" group="ADC"/>
-                <signal pad-id="pa3" index="3" function="default" group="ADC"/>
-                <signal pad-id="pa4" index="4" function="default" group="ADC"/>
-                <signal pad-id="pa5" index="5" function="default" group="ADC"/>
-                <signal pad-id="pa6" index="6" function="default" group="ADC"/>
-                <signal pad-id="pa7" index="7" function="default" group="ADC"/>
+                <signal pad-key="pa0" index="0" function="default" group="ADC"/>
+                <signal pad-key="pa1" index="1" function="default" group="ADC"/>
+                <signal pad-key="pa2" index="2" function="default" group="ADC"/>
+                <signal pad-key="pa3" index="3" function="default" group="ADC"/>
+                <signal pad-key="pa4" index="4" function="default" group="ADC"/>
+                <signal pad-key="pa5" index="5" function="default" group="ADC"/>
+                <signal pad-key="pa6" index="6" function="default" group="ADC"/>
+                <signal pad-key="pa7" index="7" function="default" group="ADC"/>
             </signals>
         </peripheral>
         <peripheral key="tc1" name="TC1" module-key="tc16">
             <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"/>
-                <signal pad-id="pd5" function="default" group="OCA"/>
-                <signal pad-id="pd4" function="default" group="OCB"/>
+                <signal pad-key="pb1" function="default" group="T"/>
+                <signal pad-key="pd6" function="default" group="ICP"/>
+                <signal pad-key="pd5" function="default" group="OCA"/>
+                <signal pad-key="pd4" function="default" group="OCB"/>
             </signals>
         </peripheral>
         <peripheral key="eeprom" name="EEPROM" module-key="eeprom">
@@ -390,23 +390,23 @@
         <peripheral key="spi" name="SPI" module-key="spi">
             <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"/>
-                <signal pad-id="pb6" function="default" group="MISO"/>
-                <signal pad-id="pb7" function="default" group="SCK"/>
+                <signal pad-key="pb4" function="default" group="SS"/>
+                <signal pad-key="pb5" function="default" group="MOSI"/>
+                <signal pad-key="pb6" function="default" group="MISO"/>
+                <signal pad-key="pb7" function="default" group="SCK"/>
             </signals>
         </peripheral>
         <peripheral key="twi" name="TWI" module-key="twi">
             <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"/>
+                <signal pad-key="pc1" function="default" group="SDA"/>
+                <signal pad-key="pc0" function="default" group="SCL"/>
             </signals>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="cpu">
             <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"/>
+                <signal pad-key="pb1" index="0" function="default" group="CLKO"/>
             </signals>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="fuse">
@@ -889,107 +889,149 @@
             </register-group>
         </module>
     </modules>
+    <pads>
+        <pad key="pb0" name="PB0"/>
+        <pad key="pb1" name="PB1"/>
+        <pad key="pb2" name="PB2"/>
+        <pad key="pb3" name="PB3"/>
+        <pad key="pb4" name="PB4"/>
+        <pad key="pb5" name="PB5"/>
+        <pad key="pb6" name="PB6"/>
+        <pad key="pb7" name="PB7"/>
+        <pad key="reset" name="RESET"/>
+        <pad key="vcc" name="VCC"/>
+        <pad key="gnd" name="GND"/>
+        <pad key="xtal2" name="XTAL2"/>
+        <pad key="xtal1" name="XTAL1"/>
+        <pad key="pd0" name="PD0"/>
+        <pad key="pd1" name="PD1"/>
+        <pad key="pd2" name="PD2"/>
+        <pad key="pd3" name="PD3"/>
+        <pad key="pd4" name="PD4"/>
+        <pad key="pd5" name="PD5"/>
+        <pad key="pd6" name="PD6"/>
+        <pad key="pd7" name="PD7"/>
+        <pad key="pc0" name="PC0"/>
+        <pad key="pc1" name="PC1"/>
+        <pad key="pc2" name="PC2"/>
+        <pad key="pc3" name="PC3"/>
+        <pad key="pc4" name="PC4"/>
+        <pad key="pc5" name="PC5"/>
+        <pad key="pc6" name="PC6"/>
+        <pad key="pc7" name="PC7"/>
+        <pad key="avcc" name="AVCC"/>
+        <pad key="aref" name="AREF"/>
+        <pad key="pa7" name="PA7"/>
+        <pad key="pa6" name="PA6"/>
+        <pad key="pa5" name="PA5"/>
+        <pad key="pa4" name="PA4"/>
+        <pad key="pa3" name="PA3"/>
+        <pad key="pa2" name="PA2"/>
+        <pad key="pa1" name="PA1"/>
+        <pad key="pa0" name="PA0"/>
+        <pad key="ref" name="REF"/>
+    </pads>
     <pinouts>
         <pinout key="pdip40" name="PDIP40" type="dip">
-            <pin position="1" pad="PB0"/>
-            <pin position="2" pad="PB1"/>
-            <pin position="3" pad="PB2"/>
-            <pin position="4" pad="PB3"/>
-            <pin position="5" pad="PB4"/>
-            <pin position="6" pad="PB5"/>
-            <pin position="7" pad="PB6"/>
-            <pin position="8" pad="PB7"/>
-            <pin position="9" pad="RESET"/>
-            <pin position="10" pad="VCC"/>
-            <pin position="11" pad="GND"/>
-            <pin position="12" pad="XTAL2"/>
-            <pin position="13" pad="XTAL1"/>
-            <pin position="14" pad="PD0"/>
-            <pin position="15" pad="PD1"/>
-            <pin position="16" pad="PD2"/>
-            <pin position="17" pad="PD3"/>
-            <pin position="18" pad="PD4"/>
-            <pin position="19" pad="PD5"/>
-            <pin position="20" pad="PD6"/>
-            <pin position="21" pad="PD7"/>
-            <pin position="22" pad="PC0"/>
-            <pin position="23" pad="PC1"/>
-            <pin position="24" pad="PC2"/>
-            <pin position="25" pad="PC3"/>
-            <pin position="26" pad="PC4"/>
-            <pin position="27" pad="PC5"/>
-            <pin position="28" pad="PC6"/>
-            <pin position="29" pad="PC7"/>
-            <pin position="30" pad="AVCC"/>
-            <pin position="31" pad="GND"/>
-            <pin position="32" pad="AREF"/>
-            <pin position="33" pad="PA7"/>
-            <pin position="34" pad="PA6"/>
-            <pin position="35" pad="PA5"/>
-            <pin position="36" pad="PA4"/>
-            <pin position="37" pad="PA3"/>
-            <pin position="38" pad="PA2"/>
-            <pin position="39" pad="PA1"/>
-            <pin position="40" pad="PA0"/>
+            <pin position="1" pad-key="pb0"/>
+            <pin position="2" pad-key="pb1"/>
+            <pin position="3" pad-key="pb2"/>
+            <pin position="4" pad-key="pb3"/>
+            <pin position="5" pad-key="pb4"/>
+            <pin position="6" pad-key="pb5"/>
+            <pin position="7" pad-key="pb6"/>
+            <pin position="8" pad-key="pb7"/>
+            <pin position="9" pad-key="reset"/>
+            <pin position="10" pad-key="vcc"/>
+            <pin position="11" pad-key="gnd"/>
+            <pin position="12" pad-key="xtal2"/>
+            <pin position="13" pad-key="xtal1"/>
+            <pin position="14" pad-key="pd0"/>
+            <pin position="15" pad-key="pd1"/>
+            <pin position="16" pad-key="pd2"/>
+            <pin position="17" pad-key="pd3"/>
+            <pin position="18" pad-key="pd4"/>
+            <pin position="19" pad-key="pd5"/>
+            <pin position="20" pad-key="pd6"/>
+            <pin position="21" pad-key="pd7"/>
+            <pin position="22" pad-key="pc0"/>
+            <pin position="23" pad-key="pc1"/>
+            <pin position="24" pad-key="pc2"/>
+            <pin position="25" pad-key="pc3"/>
+            <pin position="26" pad-key="pc4"/>
+            <pin position="27" pad-key="pc5"/>
+            <pin position="28" pad-key="pc6"/>
+            <pin position="29" pad-key="pc7"/>
+            <pin position="30" pad-key="avcc"/>
+            <pin position="31" pad-key="gnd"/>
+            <pin position="32" pad-key="aref"/>
+            <pin position="33" pad-key="pa7"/>
+            <pin position="34" pad-key="pa6"/>
+            <pin position="35" pad-key="pa5"/>
+            <pin position="36" pad-key="pa4"/>
+            <pin position="37" pad-key="pa3"/>
+            <pin position="38" pad-key="pa2"/>
+            <pin position="39" pad-key="pa1"/>
+            <pin position="40" pad-key="pa0"/>
         </pinout>
         <pinout key="tqfp_vqfn_44" name="TQFP_VQFN_44" type="qfn">
-            <pin position="1" pad="PB5"/>
-            <pin position="2" pad="PB6"/>
-            <pin position="3" pad="PB7"/>
-            <pin position="4" pad="RESET"/>
-            <pin position="5" pad="VCC"/>
-            <pin position="6" pad="GND"/>
-            <pin position="7" pad="XTAL2"/>
-            <pin position="8" pad="XTAL1"/>
-            <pin position="9" pad="PD0"/>
-            <pin position="10" pad="PD1"/>
-            <pin position="11" pad="PD2"/>
-            <pin position="12" pad="PD3"/>
-            <pin position="13" pad="PD4"/>
-            <pin position="14" pad="PD5"/>
-            <pin position="15" pad="PD6"/>
-            <pin position="16" pad="PD7"/>
-            <pin position="17" pad="VCC"/>
-            <pin position="18" pad="GND"/>
-            <pin position="19" pad="PC0"/>
-            <pin position="20" pad="PC1"/>
-            <pin position="21" pad="PC2"/>
-            <pin position="22" pad="PC3"/>
-            <pin position="23" pad="PC4"/>
-            <pin position="24" pad="PC5"/>
-            <pin position="25" pad="PC6"/>
-            <pin position="26" pad="PC7"/>
-            <pin position="27" pad="AVCC"/>
-            <pin position="28" pad="GND"/>
-            <pin position="29" pad="REF"/>
-            <pin position="30" pad="PA7"/>
-            <pin position="31" pad="PA6"/>
-            <pin position="32" pad="PA5"/>
-            <pin position="33" pad="PA4"/>
-            <pin position="34" pad="PA3"/>
-            <pin position="35" pad="PA2"/>
-            <pin position="36" pad="PA1"/>
-            <pin position="37" pad="PA0"/>
-            <pin position="38" pad="VCC"/>
-            <pin position="39" pad="GND"/>
-            <pin position="40" pad="PB0"/>
-            <pin position="41" pad="PB1"/>
-            <pin position="42" pad="PB2"/>
-            <pin position="43" pad="PB3"/>
-            <pin position="44" pad="PB4"/>
+            <pin position="1" pad-key="pb5"/>
+            <pin position="2" pad-key="pb6"/>
+            <pin position="3" pad-key="pb7"/>
+            <pin position="4" pad-key="reset"/>
+            <pin position="5" pad-key="vcc"/>
+            <pin position="6" pad-key="gnd"/>
+            <pin position="7" pad-key="xtal2"/>
+            <pin position="8" pad-key="xtal1"/>
+            <pin position="9" pad-key="pd0"/>
+            <pin position="10" pad-key="pd1"/>
+            <pin position="11" pad-key="pd2"/>
+            <pin position="12" pad-key="pd3"/>
+            <pin position="13" pad-key="pd4"/>
+            <pin position="14" pad-key="pd5"/>
+            <pin position="15" pad-key="pd6"/>
+            <pin position="16" pad-key="pd7"/>
+            <pin position="17" pad-key="vcc"/>
+            <pin position="18" pad-key="gnd"/>
+            <pin position="19" pad-key="pc0"/>
+            <pin position="20" pad-key="pc1"/>
+            <pin position="21" pad-key="pc2"/>
+            <pin position="22" pad-key="pc3"/>
+            <pin position="23" pad-key="pc4"/>
+            <pin position="24" pad-key="pc5"/>
+            <pin position="25" pad-key="pc6"/>
+            <pin position="26" pad-key="pc7"/>
+            <pin position="27" pad-key="avcc"/>
+            <pin position="28" pad-key="gnd"/>
+            <pin position="29" pad-key="ref"/>
+            <pin position="30" pad-key="pa7"/>
+            <pin position="31" pad-key="pa6"/>
+            <pin position="32" pad-key="pa5"/>
+            <pin position="33" pad-key="pa4"/>
+            <pin position="34" pad-key="pa3"/>
+            <pin position="35" pad-key="pa2"/>
+            <pin position="36" pad-key="pa1"/>
+            <pin position="37" pad-key="pa0"/>
+            <pin position="38" pad-key="vcc"/>
+            <pin position="39" pad-key="gnd"/>
+            <pin position="40" pad-key="pb0"/>
+            <pin position="41" pad-key="pb1"/>
+            <pin position="42" pad-key="pb2"/>
+            <pin position="43" pad-key="pb3"/>
+            <pin position="44" pad-key="pb4"/>
         </pinout>
     </pinouts>
     <variants>
-        <variant name="ATmega164PV-10AU" pinout-key="tqfp_vqfn_44" package="TQFP44"/>
-        <variant name="ATmega164PV-10PU" pinout-key="pdip40" package="PDIP40"/>
-        <variant name="ATmega164PV-10MU" pinout-key="tqfp_vqfn_44" package="VQFN44"/>
-        <variant name="ATmega164P-20AU" pinout-key="tqfp_vqfn_44" package="TQFP44"/>
-        <variant name="ATmega164P-20PU" pinout-key="pdip40" package="PDIP40"/>
-        <variant name="ATmega164P-20MU" pinout-key="tqfp_vqfn_44" package="VQFN44"/>
-        <variant name="ATmega164PV-10AN" pinout-key="tqfp_vqfn_44" package="TQFP44"/>
-        <variant name="ATmega164PV-10PN" pinout-key="pdip40" package="PDIP40"/>
-        <variant name="ATmega164P-20AN" pinout-key="tqfp_vqfn_44" package="TQFP44"/>
-        <variant name="ATmega164P-20PN" pinout-key="pdip40" package="PDIP40"/>
-        <variant name="ATmega164P-20MN" pinout-key="tqfp_vqfn_44" package="VQFN44"/>
+        <variant key="atmega164pv_10au" name="ATmega164PV-10AU" pinout-key="tqfp_vqfn_44"/>
+        <variant key="atmega164pv_10pu" name="ATmega164PV-10PU" pinout-key="pdip40"/>
+        <variant key="atmega164pv_10mu" name="ATmega164PV-10MU" pinout-key="tqfp_vqfn_44"/>
+        <variant key="atmega164p_20au" name="ATmega164P-20AU" pinout-key="tqfp_vqfn_44"/>
+        <variant key="atmega164p_20pu" name="ATmega164P-20PU" pinout-key="pdip40"/>
+        <variant key="atmega164p_20mu" name="ATmega164P-20MU" pinout-key="tqfp_vqfn_44"/>
+        <variant key="atmega164pv_10an" name="ATmega164PV-10AN" pinout-key="tqfp_vqfn_44"/>
+        <variant key="atmega164pv_10pn" name="ATmega164PV-10PN" pinout-key="pdip40"/>
+        <variant key="atmega164p_20an" name="ATmega164P-20AN" pinout-key="tqfp_vqfn_44"/>
+        <variant key="atmega164p_20pn" name="ATmega164P-20PN" pinout-key="pdip40"/>
+        <variant key="atmega164p_20mn" name="ATmega164P-20MN" pinout-key="tqfp_vqfn_44"/>
     </variants>
 </device>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA164PA.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA164PA.xml
index fa39e8eb..9430a140 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA164PA.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA164PA.xml
@@ -220,93 +220,93 @@
         <peripheral key="ac" name="AC" module-key="ac">
             <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"/>
+                <signal pad-key="pb2" index="0" function="default" group="AIN"/>
+                <signal pad-key="pb3" index="1" function="default" group="AIN"/>
             </signals>
         </peripheral>
         <peripheral key="usart0" name="USART0" module-key="usart">
             <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"/>
-                <signal pad-id="pb0" function="default" group="XCK"/>
+                <signal pad-key="pd1" function="default" group="TXD"/>
+                <signal pad-key="pd0" function="default" group="RXD"/>
+                <signal pad-key="pb0" function="default" group="XCK"/>
             </signals>
         </peripheral>
         <peripheral key="usart1" name="USART1" module-key="usart">
             <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"/>
-                <signal pad-id="pd4" function="default" group="XCK"/>
+                <signal pad-key="pd3" function="default" group="TXD"/>
+                <signal pad-key="pd2" function="default" group="RXD"/>
+                <signal pad-key="pd4" function="default" group="XCK"/>
             </signals>
         </peripheral>
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pa2" index="2" function="default" group="P"/>
-                <signal pad-id="pa3" index="3" function="default" group="P"/>
-                <signal pad-id="pa4" index="4" function="default" group="P"/>
-                <signal pad-id="pa5" index="5" function="default" group="P"/>
-                <signal pad-id="pa6" index="6" function="default" group="P"/>
-                <signal pad-id="pa7" index="7" function="default" group="P"/>
+                <signal pad-key="pa0" index="0" function="default" group="P"/>
+                <signal pad-key="pa1" index="1" function="default" group="P"/>
+                <signal pad-key="pa2" index="2" function="default" group="P"/>
+                <signal pad-key="pa3" index="3" function="default" group="P"/>
+                <signal pad-key="pa4" index="4" function="default" group="P"/>
+                <signal pad-key="pa5" index="5" function="default" group="P"/>
+                <signal pad-key="pa6" index="6" function="default" group="P"/>
+                <signal pad-key="pa7" index="7" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pb2" index="2" function="default" group="P"/>
-                <signal pad-id="pb3" index="3" function="default" group="P"/>
-                <signal pad-id="pb4" index="4" function="default" group="P"/>
-                <signal pad-id="pb5" index="5" function="default" group="P"/>
-                <signal pad-id="pb6" index="6" function="default" group="P"/>
-                <signal pad-id="pb7" index="7" function="default" group="P"/>
+                <signal pad-key="pb0" index="0" function="default" group="P"/>
+                <signal pad-key="pb1" index="1" function="default" group="P"/>
+                <signal pad-key="pb2" index="2" function="default" group="P"/>
+                <signal pad-key="pb3" index="3" function="default" group="P"/>
+                <signal pad-key="pb4" index="4" function="default" group="P"/>
+                <signal pad-key="pb5" index="5" function="default" group="P"/>
+                <signal pad-key="pb6" index="6" function="default" group="P"/>
+                <signal pad-key="pb7" index="7" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pc2" index="2" function="default" group="P"/>
-                <signal pad-id="pc3" index="3" function="default" group="P"/>
-                <signal pad-id="pc4" index="4" function="default" group="P"/>
-                <signal pad-id="pc5" index="5" function="default" group="P"/>
-                <signal pad-id="pc6" index="6" function="default" group="P"/>
-                <signal pad-id="pc7" index="7" function="default" group="P"/>
+                <signal pad-key="pc0" index="0" function="default" group="P"/>
+                <signal pad-key="pc1" index="1" function="default" group="P"/>
+                <signal pad-key="pc2" index="2" function="default" group="P"/>
+                <signal pad-key="pc3" index="3" function="default" group="P"/>
+                <signal pad-key="pc4" index="4" function="default" group="P"/>
+                <signal pad-key="pc5" index="5" function="default" group="P"/>
+                <signal pad-key="pc6" index="6" function="default" group="P"/>
+                <signal pad-key="pc7" index="7" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pd2" index="2" function="default" group="P"/>
-                <signal pad-id="pd3" index="3" function="default" group="P"/>
-                <signal pad-id="pd4" index="4" function="default" group="P"/>
-                <signal pad-id="pd5" index="5" function="default" group="P"/>
-                <signal pad-id="pd6" index="6" function="default" group="P"/>
-                <signal pad-id="pd7" index="7" function="default" group="P"/>
+                <signal pad-key="pd0" index="0" function="default" group="P"/>
+                <signal pad-key="pd1" index="1" function="default" group="P"/>
+                <signal pad-key="pd2" index="2" function="default" group="P"/>
+                <signal pad-key="pd3" index="3" function="default" group="P"/>
+                <signal pad-key="pd4" index="4" function="default" group="P"/>
+                <signal pad-key="pd5" index="5" function="default" group="P"/>
+                <signal pad-key="pd6" index="6" function="default" group="P"/>
+                <signal pad-key="pd7" index="7" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="tc0" name="TC0" module-key="tc8">
             <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"/>
-                <signal pad-id="pb3" function="default" group="OCA"/>
+                <signal pad-key="pb0" function="default" group="T"/>
+                <signal pad-key="pb4" function="default" group="OCB"/>
+                <signal pad-key="pb3" function="default" group="OCA"/>
             </signals>
         </peripheral>
         <peripheral key="tc2" name="TC2" module-key="tc8_async">
             <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"/>
-                <signal pad-id="pd7" function="default" group="OCA"/>
-                <signal pad-id="pd6" function="default" group="OCB"/>
+                <signal pad-key="pc6" index="1" function="default" group="TOSC"/>
+                <signal pad-key="pc7" index="2" function="default" group="TOSC"/>
+                <signal pad-key="pd7" function="default" group="OCA"/>
+                <signal pad-key="pd6" function="default" group="OCB"/>
             </signals>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="wdt">
@@ -315,10 +315,10 @@
         <peripheral key="jtag" name="JTAG" module-key="jtag">
             <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"/>
-                <signal pad-id="pc4" function="default" group="TDO"/>
-                <signal pad-id="pc5" function="default" group="TDI"/>
+                <signal pad-key="pc2" function="default" group="TCK"/>
+                <signal pad-key="pc3" function="default" group="TMS"/>
+                <signal pad-key="pc4" function="default" group="TDO"/>
+                <signal pad-key="pc5" function="default" group="TDI"/>
             </signals>
         </peripheral>
         <peripheral key="boot_load" name="BOOT_LOAD" module-key="boot_load">
@@ -327,63 +327,63 @@
         <peripheral key="exint" name="EXINT" module-key="exint">
             <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"/>
-                <signal pad-id="pa2" index="2" function="default" group="PCINT"/>
-                <signal pad-id="pa3" index="3" function="default" group="PCINT"/>
-                <signal pad-id="pa4" index="4" function="default" group="PCINT"/>
-                <signal pad-id="pa5" index="5" function="default" group="PCINT"/>
-                <signal pad-id="pa6" index="6" function="default" group="PCINT"/>
-                <signal pad-id="pa7" index="7" function="default" group="PCINT"/>
-                <signal pad-id="pb0" index="8" function="default" group="PCINT"/>
-                <signal pad-id="pb1" index="9" function="default" group="PCINT"/>
-                <signal pad-id="pb2" index="10" function="default" group="PCINT"/>
-                <signal pad-id="pb3" index="11" function="default" group="PCINT"/>
-                <signal pad-id="pb4" index="12" function="default" group="PCINT"/>
-                <signal pad-id="pb5" index="13" function="default" group="PCINT"/>
-                <signal pad-id="pb6" index="14" function="default" group="PCINT"/>
-                <signal pad-id="pb7" index="15" function="default" group="PCINT"/>
-                <signal pad-id="pc0" index="16" function="default" group="PCINT"/>
-                <signal pad-id="pc1" index="17" function="default" group="PCINT"/>
-                <signal pad-id="pc2" index="18" function="default" group="PCINT"/>
-                <signal pad-id="pc3" index="19" function="default" group="PCINT"/>
-                <signal pad-id="pc4" index="20" function="default" group="PCINT"/>
-                <signal pad-id="pc5" index="21" function="default" group="PCINT"/>
-                <signal pad-id="pc6" index="22" function="default" group="PCINT"/>
-                <signal pad-id="pc7" index="23" function="default" group="PCINT"/>
-                <signal pad-id="pd0" index="24" function="default" group="PCINT"/>
-                <signal pad-id="pd1" index="25" function="default" group="PCINT"/>
-                <signal pad-id="pd2" index="26" function="default" group="PCINT"/>
-                <signal pad-id="pd3" index="27" function="default" group="PCINT"/>
-                <signal pad-id="pd4" index="28" function="default" group="PCINT"/>
-                <signal pad-id="pd5" index="29" function="default" group="PCINT"/>
-                <signal pad-id="pd6" index="30" function="default" group="PCINT"/>
-                <signal pad-id="pd7" index="31" function="default" group="PCINT"/>
-                <signal pad-id="pd2" index="0" function="default" group="INT"/>
-                <signal pad-id="pd3" index="1" function="default" group="INT"/>
-                <signal pad-id="pb2" index="2" function="default" group="INT"/>
+                <signal pad-key="pa0" index="0" function="default" group="PCINT"/>
+                <signal pad-key="pa1" index="1" function="default" group="PCINT"/>
+                <signal pad-key="pa2" index="2" function="default" group="PCINT"/>
+                <signal pad-key="pa3" index="3" function="default" group="PCINT"/>
+                <signal pad-key="pa4" index="4" function="default" group="PCINT"/>
+                <signal pad-key="pa5" index="5" function="default" group="PCINT"/>
+                <signal pad-key="pa6" index="6" function="default" group="PCINT"/>
+                <signal pad-key="pa7" index="7" function="default" group="PCINT"/>
+                <signal pad-key="pb0" index="8" function="default" group="PCINT"/>
+                <signal pad-key="pb1" index="9" function="default" group="PCINT"/>
+                <signal pad-key="pb2" index="10" function="default" group="PCINT"/>
+                <signal pad-key="pb3" index="11" function="default" group="PCINT"/>
+                <signal pad-key="pb4" index="12" function="default" group="PCINT"/>
+                <signal pad-key="pb5" index="13" function="default" group="PCINT"/>
+                <signal pad-key="pb6" index="14" function="default" group="PCINT"/>
+                <signal pad-key="pb7" index="15" function="default" group="PCINT"/>
+                <signal pad-key="pc0" index="16" function="default" group="PCINT"/>
+                <signal pad-key="pc1" index="17" function="default" group="PCINT"/>
+                <signal pad-key="pc2" index="18" function="default" group="PCINT"/>
+                <signal pad-key="pc3" index="19" function="default" group="PCINT"/>
+                <signal pad-key="pc4" index="20" function="default" group="PCINT"/>
+                <signal pad-key="pc5" index="21" function="default" group="PCINT"/>
+                <signal pad-key="pc6" index="22" function="default" group="PCINT"/>
+                <signal pad-key="pc7" index="23" function="default" group="PCINT"/>
+                <signal pad-key="pd0" index="24" function="default" group="PCINT"/>
+                <signal pad-key="pd1" index="25" function="default" group="PCINT"/>
+                <signal pad-key="pd2" index="26" function="default" group="PCINT"/>
+                <signal pad-key="pd3" index="27" function="default" group="PCINT"/>
+                <signal pad-key="pd4" index="28" function="default" group="PCINT"/>
+                <signal pad-key="pd5" index="29" function="default" group="PCINT"/>
+                <signal pad-key="pd6" index="30" function="default" group="PCINT"/>
+                <signal pad-key="pd7" index="31" function="default" group="PCINT"/>
+                <signal pad-key="pd2" index="0" function="default" group="INT"/>
+                <signal pad-key="pd3" index="1" function="default" group="INT"/>
+                <signal pad-key="pb2" index="2" function="default" group="INT"/>
             </signals>
         </peripheral>
         <peripheral key="adc" name="ADC" module-key="adc">
             <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"/>
-                <signal pad-id="pa2" index="2" function="default" group="ADC"/>
-                <signal pad-id="pa3" index="3" function="default" group="ADC"/>
-                <signal pad-id="pa4" index="4" function="default" group="ADC"/>
-                <signal pad-id="pa5" index="5" function="default" group="ADC"/>
-                <signal pad-id="pa6" index="6" function="default" group="ADC"/>
-                <signal pad-id="pa7" index="7" function="default" group="ADC"/>
+                <signal pad-key="pa0" index="0" function="default" group="ADC"/>
+                <signal pad-key="pa1" index="1" function="default" group="ADC"/>
+                <signal pad-key="pa2" index="2" function="default" group="ADC"/>
+                <signal pad-key="pa3" index="3" function="default" group="ADC"/>
+                <signal pad-key="pa4" index="4" function="default" group="ADC"/>
+                <signal pad-key="pa5" index="5" function="default" group="ADC"/>
+                <signal pad-key="pa6" index="6" function="default" group="ADC"/>
+                <signal pad-key="pa7" index="7" function="default" group="ADC"/>
             </signals>
         </peripheral>
         <peripheral key="tc1" name="TC1" module-key="tc16">
             <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"/>
-                <signal pad-id="pd5" function="default" group="OCA"/>
-                <signal pad-id="pd4" function="default" group="OCB"/>
+                <signal pad-key="pb1" function="default" group="T"/>
+                <signal pad-key="pd6" function="default" group="ICP"/>
+                <signal pad-key="pd5" function="default" group="OCA"/>
+                <signal pad-key="pd4" function="default" group="OCB"/>
             </signals>
         </peripheral>
         <peripheral key="eeprom" name="EEPROM" module-key="eeprom">
@@ -392,23 +392,23 @@
         <peripheral key="spi" name="SPI" module-key="spi">
             <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"/>
-                <signal pad-id="pb6" function="default" group="MISO"/>
-                <signal pad-id="pb7" function="default" group="SCK"/>
+                <signal pad-key="pb4" function="default" group="SS"/>
+                <signal pad-key="pb5" function="default" group="MOSI"/>
+                <signal pad-key="pb6" function="default" group="MISO"/>
+                <signal pad-key="pb7" function="default" group="SCK"/>
             </signals>
         </peripheral>
         <peripheral key="twi" name="TWI" module-key="twi">
             <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"/>
+                <signal pad-key="pc1" function="default" group="SDA"/>
+                <signal pad-key="pc0" function="default" group="SCL"/>
             </signals>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="cpu">
             <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"/>
+                <signal pad-key="pb1" index="0" function="default" group="CLKO"/>
             </signals>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="fuse">
@@ -891,201 +891,243 @@
             </register-group>
         </module>
     </modules>
+    <pads>
+        <pad key="pb5" name="PB5"/>
+        <pad key="pb6" name="PB6"/>
+        <pad key="pb7" name="PB7"/>
+        <pad key="reset" name="RESET"/>
+        <pad key="vcc" name="VCC"/>
+        <pad key="gnd" name="GND"/>
+        <pad key="xtal2" name="XTAL2"/>
+        <pad key="xtal1" name="XTAL1"/>
+        <pad key="pd0" name="PD0"/>
+        <pad key="pd1" name="PD1"/>
+        <pad key="pd2" name="PD2"/>
+        <pad key="pd3" name="PD3"/>
+        <pad key="pd4" name="PD4"/>
+        <pad key="pd5" name="PD5"/>
+        <pad key="pd6" name="PD6"/>
+        <pad key="pd7" name="PD7"/>
+        <pad key="pc0" name="PC0"/>
+        <pad key="pc1" name="PC1"/>
+        <pad key="pc2" name="PC2"/>
+        <pad key="pc3" name="PC3"/>
+        <pad key="pc4" name="PC4"/>
+        <pad key="pc5" name="PC5"/>
+        <pad key="pc6" name="PC6"/>
+        <pad key="pc7" name="PC7"/>
+        <pad key="avcc" name="AVCC"/>
+        <pad key="aref" name="AREF"/>
+        <pad key="pa7" name="PA7"/>
+        <pad key="pa6" name="PA6"/>
+        <pad key="pa5" name="PA5"/>
+        <pad key="pa4" name="PA4"/>
+        <pad key="pa3" name="PA3"/>
+        <pad key="pa2" name="PA2"/>
+        <pad key="pa1" name="PA1"/>
+        <pad key="pa0" name="PA0"/>
+        <pad key="pb0" name="PB0"/>
+        <pad key="pb1" name="PB1"/>
+        <pad key="pb2" name="PB2"/>
+        <pad key="pb3" name="PB3"/>
+        <pad key="pb4" name="PB4"/>
+        <pad key="ref" name="REF"/>
+    </pads>
     <pinouts>
         <pinout key="drqfn_44" name="DRQFN_44" type="drqfn">
-            <pin position="A1" pad="PB5"/>
-            <pin position="B1" pad="PB6"/>
-            <pin position="A2" pad="PB7"/>
-            <pin position="B2" pad="RESET"/>
-            <pin position="A3" pad="VCC"/>
-            <pin position="B3" pad="GND"/>
-            <pin position="A4" pad="XTAL2"/>
-            <pin position="B4" pad="XTAL1"/>
-            <pin position="A5" pad="PD0"/>
-            <pin position="B5" pad="PD1"/>
-            <pin position="A6" pad="PD2"/>
-            <pin position="A7" pad="PD3"/>
-            <pin position="B6" pad="PD4"/>
-            <pin position="A8" pad="PD5"/>
-            <pin position="B7" pad="PD6"/>
-            <pin position="A9" pad="PD7"/>
-            <pin position="B8" pad="VCC"/>
-            <pin position="A10" pad="GND"/>
-            <pin position="B9" pad="PC0"/>
-            <pin position="A11" pad="PC1"/>
-            <pin position="B10" pad="PC2"/>
-            <pin position="A12" pad="PC3"/>
-            <pin position="A13" pad="PC4"/>
-            <pin position="B11" pad="PC5"/>
-            <pin position="A14" pad="PC6"/>
-            <pin position="B12" pad="PC7"/>
-            <pin position="A15" pad="AVCC"/>
-            <pin position="B13" pad="GND"/>
-            <pin position="A16" pad="AREF"/>
-            <pin position="B14" pad="PA7"/>
-            <pin position="A17" pad="PA6"/>
-            <pin position="B15" pad="PA5"/>
-            <pin position="A18" pad="PA4"/>
-            <pin position="A19" pad="PA3"/>
-            <pin position="B16" pad="PA2"/>
-            <pin position="A20" pad="PA1"/>
-            <pin position="B17" pad="PA0"/>
-            <pin position="A21" pad="VCC"/>
-            <pin position="B18" pad="GND"/>
-            <pin position="A22" pad="PB0"/>
-            <pin position="B19" pad="PB1"/>
-            <pin position="A23" pad="PB2"/>
-            <pin position="B20" pad="PB3"/>
-            <pin position="A24" pad="PB4"/>
+            <pin position="A1" pad-key="pb5"/>
+            <pin position="B1" pad-key="pb6"/>
+            <pin position="A2" pad-key="pb7"/>
+            <pin position="B2" pad-key="reset"/>
+            <pin position="A3" pad-key="vcc"/>
+            <pin position="B3" pad-key="gnd"/>
+            <pin position="A4" pad-key="xtal2"/>
+            <pin position="B4" pad-key="xtal1"/>
+            <pin position="A5" pad-key="pd0"/>
+            <pin position="B5" pad-key="pd1"/>
+            <pin position="A6" pad-key="pd2"/>
+            <pin position="A7" pad-key="pd3"/>
+            <pin position="B6" pad-key="pd4"/>
+            <pin position="A8" pad-key="pd5"/>
+            <pin position="B7" pad-key="pd6"/>
+            <pin position="A9" pad-key="pd7"/>
+            <pin position="B8" pad-key="vcc"/>
+            <pin position="A10" pad-key="gnd"/>
+            <pin position="B9" pad-key="pc0"/>
+            <pin position="A11" pad-key="pc1"/>
+            <pin position="B10" pad-key="pc2"/>
+            <pin position="A12" pad-key="pc3"/>
+            <pin position="A13" pad-key="pc4"/>
+            <pin position="B11" pad-key="pc5"/>
+            <pin position="A14" pad-key="pc6"/>
+            <pin position="B12" pad-key="pc7"/>
+            <pin position="A15" pad-key="avcc"/>
+            <pin position="B13" pad-key="gnd"/>
+            <pin position="A16" pad-key="aref"/>
+            <pin position="B14" pad-key="pa7"/>
+            <pin position="A17" pad-key="pa6"/>
+            <pin position="B15" pad-key="pa5"/>
+            <pin position="A18" pad-key="pa4"/>
+            <pin position="A19" pad-key="pa3"/>
+            <pin position="B16" pad-key="pa2"/>
+            <pin position="A20" pad-key="pa1"/>
+            <pin position="B17" pad-key="pa0"/>
+            <pin position="A21" pad-key="vcc"/>
+            <pin position="B18" pad-key="gnd"/>
+            <pin position="A22" pad-key="pb0"/>
+            <pin position="B19" pad-key="pb1"/>
+            <pin position="A23" pad-key="pb2"/>
+            <pin position="B20" pad-key="pb3"/>
+            <pin position="A24" pad-key="pb4"/>
         </pinout>
         <pinout key="pdip40" name="PDIP40" type="dip">
-            <pin position="1" pad="PB0"/>
-            <pin position="2" pad="PB1"/>
-            <pin position="3" pad="PB2"/>
-            <pin position="4" pad="PB3"/>
-            <pin position="5" pad="PB4"/>
-            <pin position="6" pad="PB5"/>
-            <pin position="7" pad="PB6"/>
-            <pin position="8" pad="PB7"/>
-            <pin position="9" pad="RESET"/>
-            <pin position="10" pad="VCC"/>
-            <pin position="11" pad="GND"/>
-            <pin position="12" pad="XTAL2"/>
-            <pin position="13" pad="XTAL1"/>
-            <pin position="14" pad="PD0"/>
-            <pin position="15" pad="PD1"/>
-            <pin position="16" pad="PD2"/>
-            <pin position="17" pad="PD3"/>
-            <pin position="18" pad="PD4"/>
-            <pin position="19" pad="PD5"/>
-            <pin position="20" pad="PD6"/>
-            <pin position="21" pad="PD7"/>
-            <pin position="22" pad="PC0"/>
-            <pin position="23" pad="PC1"/>
-            <pin position="24" pad="PC2"/>
-            <pin position="25" pad="PC3"/>
-            <pin position="26" pad="PC4"/>
-            <pin position="27" pad="PC5"/>
-            <pin position="28" pad="PC6"/>
-            <pin position="29" pad="PC7"/>
-            <pin position="30" pad="AVCC"/>
-            <pin position="31" pad="GND"/>
-            <pin position="32" pad="AREF"/>
-            <pin position="33" pad="PA7"/>
-            <pin position="34" pad="PA6"/>
-            <pin position="35" pad="PA5"/>
-            <pin position="36" pad="PA4"/>
-            <pin position="37" pad="PA3"/>
-            <pin position="38" pad="PA2"/>
-            <pin position="39" pad="PA1"/>
-            <pin position="40" pad="PA0"/>
+            <pin position="1" pad-key="pb0"/>
+            <pin position="2" pad-key="pb1"/>
+            <pin position="3" pad-key="pb2"/>
+            <pin position="4" pad-key="pb3"/>
+            <pin position="5" pad-key="pb4"/>
+            <pin position="6" pad-key="pb5"/>
+            <pin position="7" pad-key="pb6"/>
+            <pin position="8" pad-key="pb7"/>
+            <pin position="9" pad-key="reset"/>
+            <pin position="10" pad-key="vcc"/>
+            <pin position="11" pad-key="gnd"/>
+            <pin position="12" pad-key="xtal2"/>
+            <pin position="13" pad-key="xtal1"/>
+            <pin position="14" pad-key="pd0"/>
+            <pin position="15" pad-key="pd1"/>
+            <pin position="16" pad-key="pd2"/>
+            <pin position="17" pad-key="pd3"/>
+            <pin position="18" pad-key="pd4"/>
+            <pin position="19" pad-key="pd5"/>
+            <pin position="20" pad-key="pd6"/>
+            <pin position="21" pad-key="pd7"/>
+            <pin position="22" pad-key="pc0"/>
+            <pin position="23" pad-key="pc1"/>
+            <pin position="24" pad-key="pc2"/>
+            <pin position="25" pad-key="pc3"/>
+            <pin position="26" pad-key="pc4"/>
+            <pin position="27" pad-key="pc5"/>
+            <pin position="28" pad-key="pc6"/>
+            <pin position="29" pad-key="pc7"/>
+            <pin position="30" pad-key="avcc"/>
+            <pin position="31" pad-key="gnd"/>
+            <pin position="32" pad-key="aref"/>
+            <pin position="33" pad-key="pa7"/>
+            <pin position="34" pad-key="pa6"/>
+            <pin position="35" pad-key="pa5"/>
+            <pin position="36" pad-key="pa4"/>
+            <pin position="37" pad-key="pa3"/>
+            <pin position="38" pad-key="pa2"/>
+            <pin position="39" pad-key="pa1"/>
+            <pin position="40" pad-key="pa0"/>
         </pinout>
         <pinout key="tqfp_qfn_44" name="TQFP_QFN_44" type="qfn">
-            <pin position="1" pad="PB5"/>
-            <pin position="2" pad="PB6"/>
-            <pin position="3" pad="PB7"/>
-            <pin position="4" pad="RESET"/>
-            <pin position="5" pad="VCC"/>
-            <pin position="6" pad="GND"/>
-            <pin position="7" pad="XTAL2"/>
-            <pin position="8" pad="XTAL1"/>
-            <pin position="9" pad="PD0"/>
-            <pin position="10" pad="PD1"/>
-            <pin position="11" pad="PD2"/>
-            <pin position="12" pad="PD3"/>
-            <pin position="13" pad="PD4"/>
-            <pin position="14" pad="PD5"/>
-            <pin position="15" pad="PD6"/>
-            <pin position="16" pad="PD7"/>
-            <pin position="17" pad="VCC"/>
-            <pin position="18" pad="GND"/>
-            <pin position="19" pad="PC0"/>
-            <pin position="20" pad="PC1"/>
-            <pin position="21" pad="PC2"/>
-            <pin position="22" pad="PC3"/>
-            <pin position="23" pad="PC4"/>
-            <pin position="24" pad="PC5"/>
-            <pin position="25" pad="PC6"/>
-            <pin position="26" pad="PC7"/>
-            <pin position="27" pad="AVCC"/>
-            <pin position="28" pad="GND"/>
-            <pin position="29" pad="REF"/>
-            <pin position="30" pad="PA7"/>
-            <pin position="31" pad="PA6"/>
-            <pin position="32" pad="PA5"/>
-            <pin position="33" pad="PA4"/>
-            <pin position="34" pad="PA3"/>
-            <pin position="35" pad="PA2"/>
-            <pin position="36" pad="PA1"/>
-            <pin position="37" pad="PA0"/>
-            <pin position="38" pad="VCC"/>
-            <pin position="39" pad="GND"/>
-            <pin position="40" pad="PB0"/>
-            <pin position="41" pad="PB1"/>
-            <pin position="42" pad="PB2"/>
-            <pin position="43" pad="PB3"/>
-            <pin position="44" pad="PB4"/>
+            <pin position="1" pad-key="pb5"/>
+            <pin position="2" pad-key="pb6"/>
+            <pin position="3" pad-key="pb7"/>
+            <pin position="4" pad-key="reset"/>
+            <pin position="5" pad-key="vcc"/>
+            <pin position="6" pad-key="gnd"/>
+            <pin position="7" pad-key="xtal2"/>
+            <pin position="8" pad-key="xtal1"/>
+            <pin position="9" pad-key="pd0"/>
+            <pin position="10" pad-key="pd1"/>
+            <pin position="11" pad-key="pd2"/>
+            <pin position="12" pad-key="pd3"/>
+            <pin position="13" pad-key="pd4"/>
+            <pin position="14" pad-key="pd5"/>
+            <pin position="15" pad-key="pd6"/>
+            <pin position="16" pad-key="pd7"/>
+            <pin position="17" pad-key="vcc"/>
+            <pin position="18" pad-key="gnd"/>
+            <pin position="19" pad-key="pc0"/>
+            <pin position="20" pad-key="pc1"/>
+            <pin position="21" pad-key="pc2"/>
+            <pin position="22" pad-key="pc3"/>
+            <pin position="23" pad-key="pc4"/>
+            <pin position="24" pad-key="pc5"/>
+            <pin position="25" pad-key="pc6"/>
+            <pin position="26" pad-key="pc7"/>
+            <pin position="27" pad-key="avcc"/>
+            <pin position="28" pad-key="gnd"/>
+            <pin position="29" pad-key="ref"/>
+            <pin position="30" pad-key="pa7"/>
+            <pin position="31" pad-key="pa6"/>
+            <pin position="32" pad-key="pa5"/>
+            <pin position="33" pad-key="pa4"/>
+            <pin position="34" pad-key="pa3"/>
+            <pin position="35" pad-key="pa2"/>
+            <pin position="36" pad-key="pa1"/>
+            <pin position="37" pad-key="pa0"/>
+            <pin position="38" pad-key="vcc"/>
+            <pin position="39" pad-key="gnd"/>
+            <pin position="40" pad-key="pb0"/>
+            <pin position="41" pad-key="pb1"/>
+            <pin position="42" pad-key="pb2"/>
+            <pin position="43" pad-key="pb3"/>
+            <pin position="44" pad-key="pb4"/>
         </pinout>
         <pinout key="vfbga49" name="VFBGA49" type="bga">
-            <pin position="A1" pad="GND"/>
-            <pin position="A2" pad="PB4"/>
-            <pin position="A3" pad="PB2"/>
-            <pin position="A4" pad="GND"/>
-            <pin position="A5" pad="VCC"/>
-            <pin position="A6" pad="PA2"/>
-            <pin position="A7" pad="GND"/>
-            <pin position="B1" pad="PB6"/>
-            <pin position="B2" pad="PB5"/>
-            <pin position="B3" pad="PB3"/>
-            <pin position="B4" pad="PB0"/>
-            <pin position="B5" pad="PA0"/>
-            <pin position="B6" pad="PA3"/>
-            <pin position="B7" pad="PA5"/>
-            <pin position="C1" pad="VCC"/>
-            <pin position="C2" pad="RESET"/>
-            <pin position="C3" pad="PB7"/>
-            <pin position="C4" pad="PB1"/>
-            <pin position="C5" pad="PA1"/>
-            <pin position="C6" pad="PA6"/>
-            <pin position="C7" pad="AREF"/>
-            <pin position="D1" pad="GND"/>
-            <pin position="D2" pad="XTAL2"/>
-            <pin position="D3" pad="PD0"/>
-            <pin position="D4" pad="GND"/>
-            <pin position="D5" pad="PA4"/>
-            <pin position="D6" pad="PA7"/>
-            <pin position="D7" pad="GND"/>
-            <pin position="E1" pad="XTAL1"/>
-            <pin position="E2" pad="PD1"/>
-            <pin position="E3" pad="PD5"/>
-            <pin position="E4" pad="PD7"/>
-            <pin position="E5" pad="PC5"/>
-            <pin position="E6" pad="PC7"/>
-            <pin position="E7" pad="AVCC"/>
-            <pin position="F1" pad="PD2"/>
-            <pin position="F2" pad="PD3"/>
-            <pin position="F3" pad="PD6"/>
-            <pin position="F4" pad="PC0"/>
-            <pin position="F5" pad="PC2"/>
-            <pin position="F6" pad="PC4"/>
-            <pin position="F7" pad="PC6"/>
-            <pin position="G1" pad="GND"/>
-            <pin position="G2" pad="PD4"/>
-            <pin position="G3" pad="VCC"/>
-            <pin position="G4" pad="GND"/>
-            <pin position="G5" pad="PC1"/>
-            <pin position="G6" pad="PC3"/>
-            <pin position="G7" pad="GND"/>
+            <pin position="A1" pad-key="gnd"/>
+            <pin position="A2" pad-key="pb4"/>
+            <pin position="A3" pad-key="pb2"/>
+            <pin position="A4" pad-key="gnd"/>
+            <pin position="A5" pad-key="vcc"/>
+            <pin position="A6" pad-key="pa2"/>
+            <pin position="A7" pad-key="gnd"/>
+            <pin position="B1" pad-key="pb6"/>
+            <pin position="B2" pad-key="pb5"/>
+            <pin position="B3" pad-key="pb3"/>
+            <pin position="B4" pad-key="pb0"/>
+            <pin position="B5" pad-key="pa0"/>
+            <pin position="B6" pad-key="pa3"/>
+            <pin position="B7" pad-key="pa5"/>
+            <pin position="C1" pad-key="vcc"/>
+            <pin position="C2" pad-key="reset"/>
+            <pin position="C3" pad-key="pb7"/>
+            <pin position="C4" pad-key="pb1"/>
+            <pin position="C5" pad-key="pa1"/>
+            <pin position="C6" pad-key="pa6"/>
+            <pin position="C7" pad-key="aref"/>
+            <pin position="D1" pad-key="gnd"/>
+            <pin position="D2" pad-key="xtal2"/>
+            <pin position="D3" pad-key="pd0"/>
+            <pin position="D4" pad-key="gnd"/>
+            <pin position="D5" pad-key="pa4"/>
+            <pin position="D6" pad-key="pa7"/>
+            <pin position="D7" pad-key="gnd"/>
+            <pin position="E1" pad-key="xtal1"/>
+            <pin position="E2" pad-key="pd1"/>
+            <pin position="E3" pad-key="pd5"/>
+            <pin position="E4" pad-key="pd7"/>
+            <pin position="E5" pad-key="pc5"/>
+            <pin position="E6" pad-key="pc7"/>
+            <pin position="E7" pad-key="avcc"/>
+            <pin position="F1" pad-key="pd2"/>
+            <pin position="F2" pad-key="pd3"/>
+            <pin position="F3" pad-key="pd6"/>
+            <pin position="F4" pad-key="pc0"/>
+            <pin position="F5" pad-key="pc2"/>
+            <pin position="F6" pad-key="pc4"/>
+            <pin position="F7" pad-key="pc6"/>
+            <pin position="G1" pad-key="gnd"/>
+            <pin position="G2" pad-key="pd4"/>
+            <pin position="G3" pad-key="vcc"/>
+            <pin position="G4" pad-key="gnd"/>
+            <pin position="G5" pad-key="pc1"/>
+            <pin position="G6" pad-key="pc3"/>
+            <pin position="G7" pad-key="gnd"/>
         </pinout>
     </pinouts>
     <variants>
-        <variant name="ATmega164PA-AU" pinout-key="tqfp_qfn_44" package="TQFP44"/>
-        <variant name="ATmega164PA-PU" pinout-key="pdip40" package="PDIP40"/>
-        <variant name="ATmega164PA-MU" pinout-key="tqfp_qfn_44" package="VQFN44"/>
-        <variant name="ATmega164PA-MCH" pinout-key="drqfn_44" package="DRQFN44"/>
-        <variant name="ATmega164PA-CU" pinout-key="vfbga49" package="VFBGA49"/>
-        <variant name="ATmega164PA-AN" pinout-key="tqfp_qfn_44" package="TQFP44"/>
-        <variant name="ATmega164PA-PN" pinout-key="pdip40" package="PDIP40"/>
-        <variant name="ATmega164PA-MN" pinout-key="tqfp_qfn_44" package="VQFN44"/>
+        <variant key="atmega164pa_au" name="ATmega164PA-AU" pinout-key="tqfp_qfn_44"/>
+        <variant key="atmega164pa_pu" name="ATmega164PA-PU" pinout-key="pdip40"/>
+        <variant key="atmega164pa_mu" name="ATmega164PA-MU" pinout-key="tqfp_qfn_44"/>
+        <variant key="atmega164pa_mch" name="ATmega164PA-MCH" pinout-key="drqfn_44"/>
+        <variant key="atmega164pa_cu" name="ATmega164PA-CU" pinout-key="vfbga49"/>
+        <variant key="atmega164pa_an" name="ATmega164PA-AN" pinout-key="tqfp_qfn_44"/>
+        <variant key="atmega164pa_pn" name="ATmega164PA-PN" pinout-key="pdip40"/>
+        <variant key="atmega164pa_mn" name="ATmega164PA-MN" pinout-key="tqfp_qfn_44"/>
     </variants>
 </device>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA165A.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA165A.xml
index 47932594..7875faeb 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA165A.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA165A.xml
@@ -212,90 +212,90 @@
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pa2" index="2" function="PORTA" group="P"/>
-                <signal pad-id="pa3" index="3" function="PORTA" group="P"/>
-                <signal pad-id="pa4" index="4" function="PORTA" group="P"/>
-                <signal pad-id="pa5" index="5" function="PORTA" group="P"/>
-                <signal pad-id="pa6" index="6" function="PORTA" group="P"/>
-                <signal pad-id="pa7" index="7" function="PORTA" group="P"/>
+                <signal pad-key="pa0" index="0" function="PORTA" group="P"/>
+                <signal pad-key="pa1" index="1" function="PORTA" group="P"/>
+                <signal pad-key="pa2" index="2" function="PORTA" group="P"/>
+                <signal pad-key="pa3" index="3" function="PORTA" group="P"/>
+                <signal pad-key="pa4" index="4" function="PORTA" group="P"/>
+                <signal pad-key="pa5" index="5" function="PORTA" group="P"/>
+                <signal pad-key="pa6" index="6" function="PORTA" group="P"/>
+                <signal pad-key="pa7" index="7" function="PORTA" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pb2" index="2" function="PORTB" group="P"/>
-                <signal pad-id="pb3" index="3" function="PORTB" group="P"/>
-                <signal pad-id="pb4" index="4" function="PORTB" group="P"/>
-                <signal pad-id="pb5" index="5" function="PORTB" group="P"/>
-                <signal pad-id="pb6" index="6" function="PORTB" group="P"/>
-                <signal pad-id="pb7" index="7" function="PORTB" group="P"/>
+                <signal pad-key="pb0" index="0" function="PORTB" group="P"/>
+                <signal pad-key="pb1" index="1" function="PORTB" group="P"/>
+                <signal pad-key="pb2" index="2" function="PORTB" group="P"/>
+                <signal pad-key="pb3" index="3" function="PORTB" group="P"/>
+                <signal pad-key="pb4" index="4" function="PORTB" group="P"/>
+                <signal pad-key="pb5" index="5" function="PORTB" group="P"/>
+                <signal pad-key="pb6" index="6" function="PORTB" group="P"/>
+                <signal pad-key="pb7" index="7" function="PORTB" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pc2" index="2" function="PORTC" group="P"/>
-                <signal pad-id="pc3" index="3" function="PORTC" group="P"/>
-                <signal pad-id="pc4" index="4" function="PORTC" group="P"/>
-                <signal pad-id="pc5" index="5" function="PORTC" group="P"/>
-                <signal pad-id="pc6" index="6" function="PORTC" group="P"/>
-                <signal pad-id="pc7" index="7" function="PORTC" group="P"/>
+                <signal pad-key="pc0" index="0" function="PORTC" group="P"/>
+                <signal pad-key="pc1" index="1" function="PORTC" group="P"/>
+                <signal pad-key="pc2" index="2" function="PORTC" group="P"/>
+                <signal pad-key="pc3" index="3" function="PORTC" group="P"/>
+                <signal pad-key="pc4" index="4" function="PORTC" group="P"/>
+                <signal pad-key="pc5" index="5" function="PORTC" group="P"/>
+                <signal pad-key="pc6" index="6" function="PORTC" group="P"/>
+                <signal pad-key="pc7" index="7" function="PORTC" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pd2" index="2" function="PORTD" group="P"/>
-                <signal pad-id="pd3" index="3" function="PORTD" group="P"/>
-                <signal pad-id="pd4" index="4" function="PORTD" group="P"/>
-                <signal pad-id="pd5" index="5" function="PORTD" group="P"/>
-                <signal pad-id="pd6" index="6" function="PORTD" group="P"/>
-                <signal pad-id="pd7" index="7" function="PORTD" group="P"/>
+                <signal pad-key="pd0" index="0" function="PORTD" group="P"/>
+                <signal pad-key="pd1" index="1" function="PORTD" group="P"/>
+                <signal pad-key="pd2" index="2" function="PORTD" group="P"/>
+                <signal pad-key="pd3" index="3" function="PORTD" group="P"/>
+                <signal pad-key="pd4" index="4" function="PORTD" group="P"/>
+                <signal pad-key="pd5" index="5" function="PORTD" group="P"/>
+                <signal pad-key="pd6" index="6" function="PORTD" group="P"/>
+                <signal pad-key="pd7" index="7" function="PORTD" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="porte" name="PORTE" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pe2" index="2" function="PORTE" group="P"/>
-                <signal pad-id="pe3" index="3" function="PORTE" group="P"/>
-                <signal pad-id="pe4" index="4" function="PORTE" group="P"/>
-                <signal pad-id="pe5" index="5" function="PORTE" group="P"/>
-                <signal pad-id="pe6" index="6" function="PORTE" group="P"/>
-                <signal pad-id="pe7" index="7" function="PORTE" group="P"/>
+                <signal pad-key="pe0" index="0" function="PORTE" group="P"/>
+                <signal pad-key="pe1" index="1" function="PORTE" group="P"/>
+                <signal pad-key="pe2" index="2" function="PORTE" group="P"/>
+                <signal pad-key="pe3" index="3" function="PORTE" group="P"/>
+                <signal pad-key="pe4" index="4" function="PORTE" group="P"/>
+                <signal pad-key="pe5" index="5" function="PORTE" group="P"/>
+                <signal pad-key="pe6" index="6" function="PORTE" group="P"/>
+                <signal pad-key="pe7" index="7" function="PORTE" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portf" name="PORTF" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pf2" index="2" function="PORTF" group="P"/>
-                <signal pad-id="pf3" index="3" function="PORTF" group="P"/>
-                <signal pad-id="pf4" index="4" function="PORTF" group="P"/>
-                <signal pad-id="pf5" index="5" function="PORTF" group="P"/>
-                <signal pad-id="pf6" index="6" function="PORTF" group="P"/>
-                <signal pad-id="pf7" index="7" function="PORTF" group="P"/>
+                <signal pad-key="pf0" index="0" function="PORTF" group="P"/>
+                <signal pad-key="pf1" index="1" function="PORTF" group="P"/>
+                <signal pad-key="pf2" index="2" function="PORTF" group="P"/>
+                <signal pad-key="pf3" index="3" function="PORTF" group="P"/>
+                <signal pad-key="pf4" index="4" function="PORTF" group="P"/>
+                <signal pad-key="pf5" index="5" function="PORTF" group="P"/>
+                <signal pad-key="pf6" index="6" function="PORTF" group="P"/>
+                <signal pad-key="pf7" index="7" function="PORTF" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portg" name="PORTG" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pg2" index="2" function="PORTG" group="P"/>
-                <signal pad-id="pg3" index="3" function="PORTG" group="P"/>
-                <signal pad-id="pg4" index="4" function="PORTG" group="P"/>
-                <signal pad-id="pg5" index="5" function="PORTG" group="P"/>
+                <signal pad-key="pg0" index="0" function="PORTG" group="P"/>
+                <signal pad-key="pg1" index="1" function="PORTG" group="P"/>
+                <signal pad-key="pg2" index="2" function="PORTG" group="P"/>
+                <signal pad-key="pg3" index="3" function="PORTG" group="P"/>
+                <signal pad-key="pg4" index="4" function="PORTG" group="P"/>
+                <signal pad-key="pg5" index="5" function="PORTG" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="ac" name="AC" module-key="ac">
@@ -727,76 +727,139 @@
             </register-group>
         </module>
     </modules>
+    <pads>
+        <pad key="pe0" name="PE0"/>
+        <pad key="pe1" name="PE1"/>
+        <pad key="pe2" name="PE2"/>
+        <pad key="pe3" name="PE3"/>
+        <pad key="pe4" name="PE4"/>
+        <pad key="pe5" name="PE5"/>
+        <pad key="pe6" name="PE6"/>
+        <pad key="pe7" name="PE7"/>
+        <pad key="pb0" name="PB0"/>
+        <pad key="pb1" name="PB1"/>
+        <pad key="pb2" name="PB2"/>
+        <pad key="pb3" name="PB3"/>
+        <pad key="pb4" name="PB4"/>
+        <pad key="pb5" name="PB5"/>
+        <pad key="pb6" name="PB6"/>
+        <pad key="pb7" name="PB7"/>
+        <pad key="pg3" name="PG3"/>
+        <pad key="pg4" name="PG4"/>
+        <pad key="pg5" name="PG5"/>
+        <pad key="vcc" name="VCC"/>
+        <pad key="gdn" name="GDN"/>
+        <pad key="xtal2" name="XTAL2"/>
+        <pad key="xtal1" name="XTAL1"/>
+        <pad key="pd0" name="PD0"/>
+        <pad key="pd1" name="PD1"/>
+        <pad key="pd2" name="PD2"/>
+        <pad key="pd3" name="PD3"/>
+        <pad key="pd4" name="PD4"/>
+        <pad key="pd5" name="PD5"/>
+        <pad key="pd6" name="PD6"/>
+        <pad key="pd7" name="PD7"/>
+        <pad key="pg0" name="PG0"/>
+        <pad key="pg1" name="PG1"/>
+        <pad key="pc0" name="PC0"/>
+        <pad key="pc1" name="PC1"/>
+        <pad key="pc2" name="PC2"/>
+        <pad key="pc3" name="PC3"/>
+        <pad key="pc4" name="PC4"/>
+        <pad key="pc5" name="PC5"/>
+        <pad key="pc6" name="PC6"/>
+        <pad key="pc7" name="PC7"/>
+        <pad key="pg2" name="PG2"/>
+        <pad key="pa7" name="PA7"/>
+        <pad key="pa6" name="PA6"/>
+        <pad key="pa5" name="PA5"/>
+        <pad key="pa4" name="PA4"/>
+        <pad key="pa3" name="PA3"/>
+        <pad key="pa2" name="PA2"/>
+        <pad key="pa1" name="PA1"/>
+        <pad key="pa0" name="PA0"/>
+        <pad key="gnd" name="GND"/>
+        <pad key="pf7" name="PF7"/>
+        <pad key="pf6" name="PF6"/>
+        <pad key="pf5" name="PF5"/>
+        <pad key="pf4" name="PF4"/>
+        <pad key="pf3" name="PF3"/>
+        <pad key="pf2" name="PF2"/>
+        <pad key="pf1" name="PF1"/>
+        <pad key="pf0" name="PF0"/>
+        <pad key="aref" name="AREF"/>
+        <pad key="avcc" name="AVCC"/>
+    </pads>
     <pinouts>
         <pinout key="qfp_qfn_64" name="QFP_QFN_64" type="qfn">
-            <pin position="1" pad="NC"/>
-            <pin position="2" pad="PE0"/>
-            <pin position="3" pad="PE1"/>
-            <pin position="4" pad="PE2"/>
-            <pin position="5" pad="PE3"/>
-            <pin position="6" pad="PE4"/>
-            <pin position="7" pad="PE5"/>
-            <pin position="8" pad="PE6"/>
-            <pin position="9" pad="PE7"/>
-            <pin position="10" pad="PB0"/>
-            <pin position="11" pad="PB1"/>
-            <pin position="12" pad="PB2"/>
-            <pin position="13" pad="PB3"/>
-            <pin position="14" pad="PB4"/>
-            <pin position="15" pad="PB5"/>
-            <pin position="16" pad="PB6"/>
-            <pin position="17" pad="PB7"/>
-            <pin position="18" pad="PG3"/>
-            <pin position="19" pad="PG4"/>
-            <pin position="20" pad="PG5"/>
-            <pin position="21" pad="VCC"/>
-            <pin position="22" pad="GDN"/>
-            <pin position="23" pad="XTAL2"/>
-            <pin position="24" pad="XTAL1"/>
-            <pin position="25" pad="PD0"/>
-            <pin position="26" pad="PD1"/>
-            <pin position="27" pad="PD2"/>
-            <pin position="28" pad="PD3"/>
-            <pin position="29" pad="PD4"/>
-            <pin position="30" pad="PD5"/>
-            <pin position="31" pad="PD6"/>
-            <pin position="32" pad="PD7"/>
-            <pin position="33" pad="PG0"/>
-            <pin position="34" pad="PG1"/>
-            <pin position="35" pad="PC0"/>
-            <pin position="36" pad="PC1"/>
-            <pin position="37" pad="PC2"/>
-            <pin position="38" pad="PC3"/>
-            <pin position="39" pad="PC4"/>
-            <pin position="40" pad="PC5"/>
-            <pin position="41" pad="PC6"/>
-            <pin position="42" pad="PC7"/>
-            <pin position="43" pad="PG2"/>
-            <pin position="44" pad="PA7"/>
-            <pin position="45" pad="PA6"/>
-            <pin position="46" pad="PA5"/>
-            <pin position="47" pad="PA4"/>
-            <pin position="48" pad="PA3"/>
-            <pin position="49" pad="PA2"/>
-            <pin position="50" pad="PA1"/>
-            <pin position="51" pad="PA0"/>
-            <pin position="52" pad="VCC"/>
-            <pin position="53" pad="GND"/>
-            <pin position="54" pad="PF7"/>
-            <pin position="55" pad="PF6"/>
-            <pin position="56" pad="PF5"/>
-            <pin position="57" pad="PF4"/>
-            <pin position="58" pad="PF3"/>
-            <pin position="59" pad="PF2"/>
-            <pin position="60" pad="PF1"/>
-            <pin position="61" pad="PF0"/>
-            <pin position="62" pad="AREF"/>
-            <pin position="63" pad="GND"/>
-            <pin position="64" pad="AVCC"/>
+            <pin position="1"/>
+            <pin position="2" pad-key="pe0"/>
+            <pin position="3" pad-key="pe1"/>
+            <pin position="4" pad-key="pe2"/>
+            <pin position="5" pad-key="pe3"/>
+            <pin position="6" pad-key="pe4"/>
+            <pin position="7" pad-key="pe5"/>
+            <pin position="8" pad-key="pe6"/>
+            <pin position="9" pad-key="pe7"/>
+            <pin position="10" pad-key="pb0"/>
+            <pin position="11" pad-key="pb1"/>
+            <pin position="12" pad-key="pb2"/>
+            <pin position="13" pad-key="pb3"/>
+            <pin position="14" pad-key="pb4"/>
+            <pin position="15" pad-key="pb5"/>
+            <pin position="16" pad-key="pb6"/>
+            <pin position="17" pad-key="pb7"/>
+            <pin position="18" pad-key="pg3"/>
+            <pin position="19" pad-key="pg4"/>
+            <pin position="20" pad-key="pg5"/>
+            <pin position="21" pad-key="vcc"/>
+            <pin position="22" pad-key="gdn"/>
+            <pin position="23" pad-key="xtal2"/>
+            <pin position="24" pad-key="xtal1"/>
+            <pin position="25" pad-key="pd0"/>
+            <pin position="26" pad-key="pd1"/>
+            <pin position="27" pad-key="pd2"/>
+            <pin position="28" pad-key="pd3"/>
+            <pin position="29" pad-key="pd4"/>
+            <pin position="30" pad-key="pd5"/>
+            <pin position="31" pad-key="pd6"/>
+            <pin position="32" pad-key="pd7"/>
+            <pin position="33" pad-key="pg0"/>
+            <pin position="34" pad-key="pg1"/>
+            <pin position="35" pad-key="pc0"/>
+            <pin position="36" pad-key="pc1"/>
+            <pin position="37" pad-key="pc2"/>
+            <pin position="38" pad-key="pc3"/>
+            <pin position="39" pad-key="pc4"/>
+            <pin position="40" pad-key="pc5"/>
+            <pin position="41" pad-key="pc6"/>
+            <pin position="42" pad-key="pc7"/>
+            <pin position="43" pad-key="pg2"/>
+            <pin position="44" pad-key="pa7"/>
+            <pin position="45" pad-key="pa6"/>
+            <pin position="46" pad-key="pa5"/>
+            <pin position="47" pad-key="pa4"/>
+            <pin position="48" pad-key="pa3"/>
+            <pin position="49" pad-key="pa2"/>
+            <pin position="50" pad-key="pa1"/>
+            <pin position="51" pad-key="pa0"/>
+            <pin position="52" pad-key="vcc"/>
+            <pin position="53" pad-key="gnd"/>
+            <pin position="54" pad-key="pf7"/>
+            <pin position="55" pad-key="pf6"/>
+            <pin position="56" pad-key="pf5"/>
+            <pin position="57" pad-key="pf4"/>
+            <pin position="58" pad-key="pf3"/>
+            <pin position="59" pad-key="pf2"/>
+            <pin position="60" pad-key="pf1"/>
+            <pin position="61" pad-key="pf0"/>
+            <pin position="62" pad-key="aref"/>
+            <pin position="63" pad-key="gnd"/>
+            <pin position="64" pad-key="avcc"/>
         </pinout>
     </pinouts>
     <variants>
-        <variant name="ATmega165A-AU" pinout-key="qfp_qfn_64" package="TQFP64"/>
-        <variant name="ATmega165A-MU" pinout-key="qfp_qfn_64" package="VQFN64"/>
+        <variant key="atmega165a_au" name="ATmega165A-AU" pinout-key="qfp_qfn_64"/>
+        <variant key="atmega165a_mu" name="ATmega165A-MU" pinout-key="qfp_qfn_64"/>
     </variants>
 </device>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA165P.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA165P.xml
index 197d346f..1492d344 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA165P.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA165P.xml
@@ -212,90 +212,90 @@
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pa2" index="2" function="PORTA" group="P"/>
-                <signal pad-id="pa3" index="3" function="PORTA" group="P"/>
-                <signal pad-id="pa4" index="4" function="PORTA" group="P"/>
-                <signal pad-id="pa5" index="5" function="PORTA" group="P"/>
-                <signal pad-id="pa6" index="6" function="PORTA" group="P"/>
-                <signal pad-id="pa7" index="7" function="PORTA" group="P"/>
+                <signal pad-key="pa0" index="0" function="PORTA" group="P"/>
+                <signal pad-key="pa1" index="1" function="PORTA" group="P"/>
+                <signal pad-key="pa2" index="2" function="PORTA" group="P"/>
+                <signal pad-key="pa3" index="3" function="PORTA" group="P"/>
+                <signal pad-key="pa4" index="4" function="PORTA" group="P"/>
+                <signal pad-key="pa5" index="5" function="PORTA" group="P"/>
+                <signal pad-key="pa6" index="6" function="PORTA" group="P"/>
+                <signal pad-key="pa7" index="7" function="PORTA" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pb2" index="2" function="PORTB" group="P"/>
-                <signal pad-id="pb3" index="3" function="PORTB" group="P"/>
-                <signal pad-id="pb4" index="4" function="PORTB" group="P"/>
-                <signal pad-id="pb5" index="5" function="PORTB" group="P"/>
-                <signal pad-id="pb6" index="6" function="PORTB" group="P"/>
-                <signal pad-id="pb7" index="7" function="PORTB" group="P"/>
+                <signal pad-key="pb0" index="0" function="PORTB" group="P"/>
+                <signal pad-key="pb1" index="1" function="PORTB" group="P"/>
+                <signal pad-key="pb2" index="2" function="PORTB" group="P"/>
+                <signal pad-key="pb3" index="3" function="PORTB" group="P"/>
+                <signal pad-key="pb4" index="4" function="PORTB" group="P"/>
+                <signal pad-key="pb5" index="5" function="PORTB" group="P"/>
+                <signal pad-key="pb6" index="6" function="PORTB" group="P"/>
+                <signal pad-key="pb7" index="7" function="PORTB" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pc2" index="2" function="PORTC" group="P"/>
-                <signal pad-id="pc3" index="3" function="PORTC" group="P"/>
-                <signal pad-id="pc4" index="4" function="PORTC" group="P"/>
-                <signal pad-id="pc5" index="5" function="PORTC" group="P"/>
-                <signal pad-id="pc6" index="6" function="PORTC" group="P"/>
-                <signal pad-id="pc7" index="7" function="PORTC" group="P"/>
+                <signal pad-key="pc0" index="0" function="PORTC" group="P"/>
+                <signal pad-key="pc1" index="1" function="PORTC" group="P"/>
+                <signal pad-key="pc2" index="2" function="PORTC" group="P"/>
+                <signal pad-key="pc3" index="3" function="PORTC" group="P"/>
+                <signal pad-key="pc4" index="4" function="PORTC" group="P"/>
+                <signal pad-key="pc5" index="5" function="PORTC" group="P"/>
+                <signal pad-key="pc6" index="6" function="PORTC" group="P"/>
+                <signal pad-key="pc7" index="7" function="PORTC" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pd2" index="2" function="PORTD" group="P"/>
-                <signal pad-id="pd3" index="3" function="PORTD" group="P"/>
-                <signal pad-id="pd4" index="4" function="PORTD" group="P"/>
-                <signal pad-id="pd5" index="5" function="PORTD" group="P"/>
-                <signal pad-id="pd6" index="6" function="PORTD" group="P"/>
-                <signal pad-id="pd7" index="7" function="PORTD" group="P"/>
+                <signal pad-key="pd0" index="0" function="PORTD" group="P"/>
+                <signal pad-key="pd1" index="1" function="PORTD" group="P"/>
+                <signal pad-key="pd2" index="2" function="PORTD" group="P"/>
+                <signal pad-key="pd3" index="3" function="PORTD" group="P"/>
+                <signal pad-key="pd4" index="4" function="PORTD" group="P"/>
+                <signal pad-key="pd5" index="5" function="PORTD" group="P"/>
+                <signal pad-key="pd6" index="6" function="PORTD" group="P"/>
+                <signal pad-key="pd7" index="7" function="PORTD" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="porte" name="PORTE" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pe2" index="2" function="PORTE" group="P"/>
-                <signal pad-id="pe3" index="3" function="PORTE" group="P"/>
-                <signal pad-id="pe4" index="4" function="PORTE" group="P"/>
-                <signal pad-id="pe5" index="5" function="PORTE" group="P"/>
-                <signal pad-id="pe6" index="6" function="PORTE" group="P"/>
-                <signal pad-id="pe7" index="7" function="PORTE" group="P"/>
+                <signal pad-key="pe0" index="0" function="PORTE" group="P"/>
+                <signal pad-key="pe1" index="1" function="PORTE" group="P"/>
+                <signal pad-key="pe2" index="2" function="PORTE" group="P"/>
+                <signal pad-key="pe3" index="3" function="PORTE" group="P"/>
+                <signal pad-key="pe4" index="4" function="PORTE" group="P"/>
+                <signal pad-key="pe5" index="5" function="PORTE" group="P"/>
+                <signal pad-key="pe6" index="6" function="PORTE" group="P"/>
+                <signal pad-key="pe7" index="7" function="PORTE" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portf" name="PORTF" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pf2" index="2" function="PORTF" group="P"/>
-                <signal pad-id="pf3" index="3" function="PORTF" group="P"/>
-                <signal pad-id="pf4" index="4" function="PORTF" group="P"/>
-                <signal pad-id="pf5" index="5" function="PORTF" group="P"/>
-                <signal pad-id="pf6" index="6" function="PORTF" group="P"/>
-                <signal pad-id="pf7" index="7" function="PORTF" group="P"/>
+                <signal pad-key="pf0" index="0" function="PORTF" group="P"/>
+                <signal pad-key="pf1" index="1" function="PORTF" group="P"/>
+                <signal pad-key="pf2" index="2" function="PORTF" group="P"/>
+                <signal pad-key="pf3" index="3" function="PORTF" group="P"/>
+                <signal pad-key="pf4" index="4" function="PORTF" group="P"/>
+                <signal pad-key="pf5" index="5" function="PORTF" group="P"/>
+                <signal pad-key="pf6" index="6" function="PORTF" group="P"/>
+                <signal pad-key="pf7" index="7" function="PORTF" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portg" name="PORTG" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pg2" index="2" function="PORTG" group="P"/>
-                <signal pad-id="pg3" index="3" function="PORTG" group="P"/>
-                <signal pad-id="pg4" index="4" function="PORTG" group="P"/>
-                <signal pad-id="pg5" index="5" function="PORTG" group="P"/>
+                <signal pad-key="pg0" index="0" function="PORTG" group="P"/>
+                <signal pad-key="pg1" index="1" function="PORTG" group="P"/>
+                <signal pad-key="pg2" index="2" function="PORTG" group="P"/>
+                <signal pad-key="pg3" index="3" function="PORTG" group="P"/>
+                <signal pad-key="pg4" index="4" function="PORTG" group="P"/>
+                <signal pad-key="pg5" index="5" function="PORTG" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="ac" name="AC" module-key="ac">
@@ -727,76 +727,138 @@
             </register-group>
         </module>
     </modules>
+    <pads>
+        <pad key="pe0" name="PE0"/>
+        <pad key="pe1" name="PE1"/>
+        <pad key="pe2" name="PE2"/>
+        <pad key="pe3" name="PE3"/>
+        <pad key="pe4" name="PE4"/>
+        <pad key="pe5" name="PE5"/>
+        <pad key="pe6" name="PE6"/>
+        <pad key="pe7" name="PE7"/>
+        <pad key="pb0" name="PB0"/>
+        <pad key="pb1" name="PB1"/>
+        <pad key="pb2" name="PB2"/>
+        <pad key="pb3" name="PB3"/>
+        <pad key="pb4" name="PB4"/>
+        <pad key="pb5" name="PB5"/>
+        <pad key="pb6" name="PB6"/>
+        <pad key="pb7" name="PB7"/>
+        <pad key="pg3" name="PG3"/>
+        <pad key="pg4" name="PG4"/>
+        <pad key="pg5" name="PG5"/>
+        <pad key="vcc" name="VCC"/>
+        <pad key="gnd" name="GND"/>
+        <pad key="xtal2" name="XTAL2"/>
+        <pad key="xtal1" name="XTAL1"/>
+        <pad key="pd0" name="PD0"/>
+        <pad key="pd1" name="PD1"/>
+        <pad key="pd2" name="PD2"/>
+        <pad key="pd3" name="PD3"/>
+        <pad key="pd4" name="PD4"/>
+        <pad key="pd5" name="PD5"/>
+        <pad key="pd6" name="PD6"/>
+        <pad key="pd7" name="PD7"/>
+        <pad key="pg0" name="PG0"/>
+        <pad key="pg1" name="PG1"/>
+        <pad key="pc0" name="PC0"/>
+        <pad key="pc1" name="PC1"/>
+        <pad key="pc2" name="PC2"/>
+        <pad key="pc3" name="PC3"/>
+        <pad key="pc4" name="PC4"/>
+        <pad key="pc5" name="PC5"/>
+        <pad key="pc6" name="PC6"/>
+        <pad key="pc7" name="PC7"/>
+        <pad key="pg2" name="PG2"/>
+        <pad key="pa7" name="PA7"/>
+        <pad key="pa6" name="PA6"/>
+        <pad key="pa5" name="PA5"/>
+        <pad key="pa4" name="PA4"/>
+        <pad key="pa3" name="PA3"/>
+        <pad key="pa2" name="PA2"/>
+        <pad key="pa1" name="PA1"/>
+        <pad key="pa0" name="PA0"/>
+        <pad key="pf7" name="PF7"/>
+        <pad key="pf6" name="PF6"/>
+        <pad key="pf5" name="PF5"/>
+        <pad key="pf4" name="PF4"/>
+        <pad key="pf3" name="PF3"/>
+        <pad key="pf2" name="PF2"/>
+        <pad key="pf1" name="PF1"/>
+        <pad key="pf0" name="PF0"/>
+        <pad key="aref" name="AREF"/>
+        <pad key="avcc" name="AVCC"/>
+    </pads>
     <pinouts>
         <pinout key="qfp_qfn_64" name="QFP_QFN_64" type="qfn">
-            <pin position="1" pad="NC"/>
-            <pin position="2" pad="PE0"/>
-            <pin position="3" pad="PE1"/>
-            <pin position="4" pad="PE2"/>
-            <pin position="5" pad="PE3"/>
-            <pin position="6" pad="PE4"/>
-            <pin position="7" pad="PE5"/>
-            <pin position="8" pad="PE6"/>
-            <pin position="9" pad="PE7"/>
-            <pin position="10" pad="PB0"/>
-            <pin position="11" pad="PB1"/>
-            <pin position="12" pad="PB2"/>
-            <pin position="13" pad="PB3"/>
-            <pin position="14" pad="PB4"/>
-            <pin position="15" pad="PB5"/>
-            <pin position="16" pad="PB6"/>
-            <pin position="17" pad="PB7"/>
-            <pin position="18" pad="PG3"/>
-            <pin position="19" pad="PG4"/>
-            <pin position="20" pad="PG5"/>
-            <pin position="21" pad="VCC"/>
-            <pin position="22" pad="GND"/>
-            <pin position="23" pad="XTAL2"/>
-            <pin position="24" pad="XTAL1"/>
-            <pin position="25" pad="PD0"/>
-            <pin position="26" pad="PD1"/>
-            <pin position="27" pad="PD2"/>
-            <pin position="28" pad="PD3"/>
-            <pin position="29" pad="PD4"/>
-            <pin position="30" pad="PD5"/>
-            <pin position="31" pad="PD6"/>
-            <pin position="32" pad="PD7"/>
-            <pin position="33" pad="PG0"/>
-            <pin position="34" pad="PG1"/>
-            <pin position="35" pad="PC0"/>
-            <pin position="36" pad="PC1"/>
-            <pin position="37" pad="PC2"/>
-            <pin position="38" pad="PC3"/>
-            <pin position="39" pad="PC4"/>
-            <pin position="40" pad="PC5"/>
-            <pin position="41" pad="PC6"/>
-            <pin position="42" pad="PC7"/>
-            <pin position="43" pad="PG2"/>
-            <pin position="44" pad="PA7"/>
-            <pin position="45" pad="PA6"/>
-            <pin position="46" pad="PA5"/>
-            <pin position="47" pad="PA4"/>
-            <pin position="48" pad="PA3"/>
-            <pin position="49" pad="PA2"/>
-            <pin position="50" pad="PA1"/>
-            <pin position="51" pad="PA0"/>
-            <pin position="52" pad="VCC"/>
-            <pin position="53" pad="GND"/>
-            <pin position="54" pad="PF7"/>
-            <pin position="55" pad="PF6"/>
-            <pin position="56" pad="PF5"/>
-            <pin position="57" pad="PF4"/>
-            <pin position="58" pad="PF3"/>
-            <pin position="59" pad="PF2"/>
-            <pin position="60" pad="PF1"/>
-            <pin position="61" pad="PF0"/>
-            <pin position="62" pad="AREF"/>
-            <pin position="63" pad="GND"/>
-            <pin position="64" pad="AVCC"/>
+            <pin position="1"/>
+            <pin position="2" pad-key="pe0"/>
+            <pin position="3" pad-key="pe1"/>
+            <pin position="4" pad-key="pe2"/>
+            <pin position="5" pad-key="pe3"/>
+            <pin position="6" pad-key="pe4"/>
+            <pin position="7" pad-key="pe5"/>
+            <pin position="8" pad-key="pe6"/>
+            <pin position="9" pad-key="pe7"/>
+            <pin position="10" pad-key="pb0"/>
+            <pin position="11" pad-key="pb1"/>
+            <pin position="12" pad-key="pb2"/>
+            <pin position="13" pad-key="pb3"/>
+            <pin position="14" pad-key="pb4"/>
+            <pin position="15" pad-key="pb5"/>
+            <pin position="16" pad-key="pb6"/>
+            <pin position="17" pad-key="pb7"/>
+            <pin position="18" pad-key="pg3"/>
+            <pin position="19" pad-key="pg4"/>
+            <pin position="20" pad-key="pg5"/>
+            <pin position="21" pad-key="vcc"/>
+            <pin position="22" pad-key="gnd"/>
+            <pin position="23" pad-key="xtal2"/>
+            <pin position="24" pad-key="xtal1"/>
+            <pin position="25" pad-key="pd0"/>
+            <pin position="26" pad-key="pd1"/>
+            <pin position="27" pad-key="pd2"/>
+            <pin position="28" pad-key="pd3"/>
+            <pin position="29" pad-key="pd4"/>
+            <pin position="30" pad-key="pd5"/>
+            <pin position="31" pad-key="pd6"/>
+            <pin position="32" pad-key="pd7"/>
+            <pin position="33" pad-key="pg0"/>
+            <pin position="34" pad-key="pg1"/>
+            <pin position="35" pad-key="pc0"/>
+            <pin position="36" pad-key="pc1"/>
+            <pin position="37" pad-key="pc2"/>
+            <pin position="38" pad-key="pc3"/>
+            <pin position="39" pad-key="pc4"/>
+            <pin position="40" pad-key="pc5"/>
+            <pin position="41" pad-key="pc6"/>
+            <pin position="42" pad-key="pc7"/>
+            <pin position="43" pad-key="pg2"/>
+            <pin position="44" pad-key="pa7"/>
+            <pin position="45" pad-key="pa6"/>
+            <pin position="46" pad-key="pa5"/>
+            <pin position="47" pad-key="pa4"/>
+            <pin position="48" pad-key="pa3"/>
+            <pin position="49" pad-key="pa2"/>
+            <pin position="50" pad-key="pa1"/>
+            <pin position="51" pad-key="pa0"/>
+            <pin position="52" pad-key="vcc"/>
+            <pin position="53" pad-key="gnd"/>
+            <pin position="54" pad-key="pf7"/>
+            <pin position="55" pad-key="pf6"/>
+            <pin position="56" pad-key="pf5"/>
+            <pin position="57" pad-key="pf4"/>
+            <pin position="58" pad-key="pf3"/>
+            <pin position="59" pad-key="pf2"/>
+            <pin position="60" pad-key="pf1"/>
+            <pin position="61" pad-key="pf0"/>
+            <pin position="62" pad-key="aref"/>
+            <pin position="63" pad-key="gnd"/>
+            <pin position="64" pad-key="avcc"/>
         </pinout>
     </pinouts>
     <variants>
-        <variant name="ATmega165P-AU" pinout-key="qfp_qfn_64" package="TQFP64"/>
-        <variant name="ATmega165P-MU" pinout-key="qfp_qfn_64" package="VQFN64"/>
+        <variant key="atmega165p_au" name="ATmega165P-AU" pinout-key="qfp_qfn_64"/>
+        <variant key="atmega165p_mu" name="ATmega165P-MU" pinout-key="qfp_qfn_64"/>
     </variants>
 </device>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA165PA.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA165PA.xml
index b2007265..6ad8ff63 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA165PA.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA165PA.xml
@@ -212,90 +212,90 @@
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pa2" index="2" function="PORTA" group="P"/>
-                <signal pad-id="pa3" index="3" function="PORTA" group="P"/>
-                <signal pad-id="pa4" index="4" function="PORTA" group="P"/>
-                <signal pad-id="pa5" index="5" function="PORTA" group="P"/>
-                <signal pad-id="pa6" index="6" function="PORTA" group="P"/>
-                <signal pad-id="pa7" index="7" function="PORTA" group="P"/>
+                <signal pad-key="pa0" index="0" function="PORTA" group="P"/>
+                <signal pad-key="pa1" index="1" function="PORTA" group="P"/>
+                <signal pad-key="pa2" index="2" function="PORTA" group="P"/>
+                <signal pad-key="pa3" index="3" function="PORTA" group="P"/>
+                <signal pad-key="pa4" index="4" function="PORTA" group="P"/>
+                <signal pad-key="pa5" index="5" function="PORTA" group="P"/>
+                <signal pad-key="pa6" index="6" function="PORTA" group="P"/>
+                <signal pad-key="pa7" index="7" function="PORTA" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pb2" index="2" function="PORTB" group="P"/>
-                <signal pad-id="pb3" index="3" function="PORTB" group="P"/>
-                <signal pad-id="pb4" index="4" function="PORTB" group="P"/>
-                <signal pad-id="pb5" index="5" function="PORTB" group="P"/>
-                <signal pad-id="pb6" index="6" function="PORTB" group="P"/>
-                <signal pad-id="pb7" index="7" function="PORTB" group="P"/>
+                <signal pad-key="pb0" index="0" function="PORTB" group="P"/>
+                <signal pad-key="pb1" index="1" function="PORTB" group="P"/>
+                <signal pad-key="pb2" index="2" function="PORTB" group="P"/>
+                <signal pad-key="pb3" index="3" function="PORTB" group="P"/>
+                <signal pad-key="pb4" index="4" function="PORTB" group="P"/>
+                <signal pad-key="pb5" index="5" function="PORTB" group="P"/>
+                <signal pad-key="pb6" index="6" function="PORTB" group="P"/>
+                <signal pad-key="pb7" index="7" function="PORTB" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pc2" index="2" function="PORTC" group="P"/>
-                <signal pad-id="pc3" index="3" function="PORTC" group="P"/>
-                <signal pad-id="pc4" index="4" function="PORTC" group="P"/>
-                <signal pad-id="pc5" index="5" function="PORTC" group="P"/>
-                <signal pad-id="pc6" index="6" function="PORTC" group="P"/>
-                <signal pad-id="pc7" index="7" function="PORTC" group="P"/>
+                <signal pad-key="pc0" index="0" function="PORTC" group="P"/>
+                <signal pad-key="pc1" index="1" function="PORTC" group="P"/>
+                <signal pad-key="pc2" index="2" function="PORTC" group="P"/>
+                <signal pad-key="pc3" index="3" function="PORTC" group="P"/>
+                <signal pad-key="pc4" index="4" function="PORTC" group="P"/>
+                <signal pad-key="pc5" index="5" function="PORTC" group="P"/>
+                <signal pad-key="pc6" index="6" function="PORTC" group="P"/>
+                <signal pad-key="pc7" index="7" function="PORTC" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pd2" index="2" function="PORTD" group="P"/>
-                <signal pad-id="pd3" index="3" function="PORTD" group="P"/>
-                <signal pad-id="pd4" index="4" function="PORTD" group="P"/>
-                <signal pad-id="pd5" index="5" function="PORTD" group="P"/>
-                <signal pad-id="pd6" index="6" function="PORTD" group="P"/>
-                <signal pad-id="pd7" index="7" function="PORTD" group="P"/>
+                <signal pad-key="pd0" index="0" function="PORTD" group="P"/>
+                <signal pad-key="pd1" index="1" function="PORTD" group="P"/>
+                <signal pad-key="pd2" index="2" function="PORTD" group="P"/>
+                <signal pad-key="pd3" index="3" function="PORTD" group="P"/>
+                <signal pad-key="pd4" index="4" function="PORTD" group="P"/>
+                <signal pad-key="pd5" index="5" function="PORTD" group="P"/>
+                <signal pad-key="pd6" index="6" function="PORTD" group="P"/>
+                <signal pad-key="pd7" index="7" function="PORTD" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="porte" name="PORTE" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pe2" index="2" function="PORTE" group="P"/>
-                <signal pad-id="pe3" index="3" function="PORTE" group="P"/>
-                <signal pad-id="pe4" index="4" function="PORTE" group="P"/>
-                <signal pad-id="pe5" index="5" function="PORTE" group="P"/>
-                <signal pad-id="pe6" index="6" function="PORTE" group="P"/>
-                <signal pad-id="pe7" index="7" function="PORTE" group="P"/>
+                <signal pad-key="pe0" index="0" function="PORTE" group="P"/>
+                <signal pad-key="pe1" index="1" function="PORTE" group="P"/>
+                <signal pad-key="pe2" index="2" function="PORTE" group="P"/>
+                <signal pad-key="pe3" index="3" function="PORTE" group="P"/>
+                <signal pad-key="pe4" index="4" function="PORTE" group="P"/>
+                <signal pad-key="pe5" index="5" function="PORTE" group="P"/>
+                <signal pad-key="pe6" index="6" function="PORTE" group="P"/>
+                <signal pad-key="pe7" index="7" function="PORTE" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portf" name="PORTF" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pf2" index="2" function="PORTF" group="P"/>
-                <signal pad-id="pf3" index="3" function="PORTF" group="P"/>
-                <signal pad-id="pf4" index="4" function="PORTF" group="P"/>
-                <signal pad-id="pf5" index="5" function="PORTF" group="P"/>
-                <signal pad-id="pf6" index="6" function="PORTF" group="P"/>
-                <signal pad-id="pf7" index="7" function="PORTF" group="P"/>
+                <signal pad-key="pf0" index="0" function="PORTF" group="P"/>
+                <signal pad-key="pf1" index="1" function="PORTF" group="P"/>
+                <signal pad-key="pf2" index="2" function="PORTF" group="P"/>
+                <signal pad-key="pf3" index="3" function="PORTF" group="P"/>
+                <signal pad-key="pf4" index="4" function="PORTF" group="P"/>
+                <signal pad-key="pf5" index="5" function="PORTF" group="P"/>
+                <signal pad-key="pf6" index="6" function="PORTF" group="P"/>
+                <signal pad-key="pf7" index="7" function="PORTF" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portg" name="PORTG" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pg2" index="2" function="PORTG" group="P"/>
-                <signal pad-id="pg3" index="3" function="PORTG" group="P"/>
-                <signal pad-id="pg4" index="4" function="PORTG" group="P"/>
-                <signal pad-id="pg5" index="5" function="PORTG" group="P"/>
+                <signal pad-key="pg0" index="0" function="PORTG" group="P"/>
+                <signal pad-key="pg1" index="1" function="PORTG" group="P"/>
+                <signal pad-key="pg2" index="2" function="PORTG" group="P"/>
+                <signal pad-key="pg3" index="3" function="PORTG" group="P"/>
+                <signal pad-key="pg4" index="4" function="PORTG" group="P"/>
+                <signal pad-key="pg5" index="5" function="PORTG" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="ac" name="AC" module-key="ac">
@@ -729,76 +729,139 @@
             </register-group>
         </module>
     </modules>
+    <pads>
+        <pad key="pe0" name="PE0"/>
+        <pad key="pe1" name="PE1"/>
+        <pad key="pe2" name="PE2"/>
+        <pad key="pe3" name="PE3"/>
+        <pad key="pe4" name="PE4"/>
+        <pad key="pe5" name="PE5"/>
+        <pad key="pe6" name="PE6"/>
+        <pad key="pe7" name="PE7"/>
+        <pad key="pb0" name="PB0"/>
+        <pad key="pb1" name="PB1"/>
+        <pad key="pb2" name="PB2"/>
+        <pad key="pb3" name="PB3"/>
+        <pad key="pb4" name="PB4"/>
+        <pad key="pb5" name="PB5"/>
+        <pad key="pb6" name="PB6"/>
+        <pad key="pb7" name="PB7"/>
+        <pad key="pg3" name="PG3"/>
+        <pad key="pg4" name="PG4"/>
+        <pad key="pg5" name="PG5"/>
+        <pad key="vcc" name="VCC"/>
+        <pad key="gdn" name="GDN"/>
+        <pad key="xtal2" name="XTAL2"/>
+        <pad key="xtal1" name="XTAL1"/>
+        <pad key="pd0" name="PD0"/>
+        <pad key="pd1" name="PD1"/>
+        <pad key="pd2" name="PD2"/>
+        <pad key="pd3" name="PD3"/>
+        <pad key="pd4" name="PD4"/>
+        <pad key="pd5" name="PD5"/>
+        <pad key="pd6" name="PD6"/>
+        <pad key="pd7" name="PD7"/>
+        <pad key="pg0" name="PG0"/>
+        <pad key="pg1" name="PG1"/>
+        <pad key="pc0" name="PC0"/>
+        <pad key="pc1" name="PC1"/>
+        <pad key="pc2" name="PC2"/>
+        <pad key="pc3" name="PC3"/>
+        <pad key="pc4" name="PC4"/>
+        <pad key="pc5" name="PC5"/>
+        <pad key="pc6" name="PC6"/>
+        <pad key="pc7" name="PC7"/>
+        <pad key="pg2" name="PG2"/>
+        <pad key="pa7" name="PA7"/>
+        <pad key="pa6" name="PA6"/>
+        <pad key="pa5" name="PA5"/>
+        <pad key="pa4" name="PA4"/>
+        <pad key="pa3" name="PA3"/>
+        <pad key="pa2" name="PA2"/>
+        <pad key="pa1" name="PA1"/>
+        <pad key="pa0" name="PA0"/>
+        <pad key="gnd" name="GND"/>
+        <pad key="pf7" name="PF7"/>
+        <pad key="pf6" name="PF6"/>
+        <pad key="pf5" name="PF5"/>
+        <pad key="pf4" name="PF4"/>
+        <pad key="pf3" name="PF3"/>
+        <pad key="pf2" name="PF2"/>
+        <pad key="pf1" name="PF1"/>
+        <pad key="pf0" name="PF0"/>
+        <pad key="aref" name="AREF"/>
+        <pad key="avcc" name="AVCC"/>
+    </pads>
     <pinouts>
         <pinout key="qfp_qfn_64" name="QFP_QFN_64" type="qfn">
-            <pin position="1" pad="NC"/>
-            <pin position="2" pad="PE0"/>
-            <pin position="3" pad="PE1"/>
-            <pin position="4" pad="PE2"/>
-            <pin position="5" pad="PE3"/>
-            <pin position="6" pad="PE4"/>
-            <pin position="7" pad="PE5"/>
-            <pin position="8" pad="PE6"/>
-            <pin position="9" pad="PE7"/>
-            <pin position="10" pad="PB0"/>
-            <pin position="11" pad="PB1"/>
-            <pin position="12" pad="PB2"/>
-            <pin position="13" pad="PB3"/>
-            <pin position="14" pad="PB4"/>
-            <pin position="15" pad="PB5"/>
-            <pin position="16" pad="PB6"/>
-            <pin position="17" pad="PB7"/>
-            <pin position="18" pad="PG3"/>
-            <pin position="19" pad="PG4"/>
-            <pin position="20" pad="PG5"/>
-            <pin position="21" pad="VCC"/>
-            <pin position="22" pad="GDN"/>
-            <pin position="23" pad="XTAL2"/>
-            <pin position="24" pad="XTAL1"/>
-            <pin position="25" pad="PD0"/>
-            <pin position="26" pad="PD1"/>
-            <pin position="27" pad="PD2"/>
-            <pin position="28" pad="PD3"/>
-            <pin position="29" pad="PD4"/>
-            <pin position="30" pad="PD5"/>
-            <pin position="31" pad="PD6"/>
-            <pin position="32" pad="PD7"/>
-            <pin position="33" pad="PG0"/>
-            <pin position="34" pad="PG1"/>
-            <pin position="35" pad="PC0"/>
-            <pin position="36" pad="PC1"/>
-            <pin position="37" pad="PC2"/>
-            <pin position="38" pad="PC3"/>
-            <pin position="39" pad="PC4"/>
-            <pin position="40" pad="PC5"/>
-            <pin position="41" pad="PC6"/>
-            <pin position="42" pad="PC7"/>
-            <pin position="43" pad="PG2"/>
-            <pin position="44" pad="PA7"/>
-            <pin position="45" pad="PA6"/>
-            <pin position="46" pad="PA5"/>
-            <pin position="47" pad="PA4"/>
-            <pin position="48" pad="PA3"/>
-            <pin position="49" pad="PA2"/>
-            <pin position="50" pad="PA1"/>
-            <pin position="51" pad="PA0"/>
-            <pin position="52" pad="VCC"/>
-            <pin position="53" pad="GND"/>
-            <pin position="54" pad="PF7"/>
-            <pin position="55" pad="PF6"/>
-            <pin position="56" pad="PF5"/>
-            <pin position="57" pad="PF4"/>
-            <pin position="58" pad="PF3"/>
-            <pin position="59" pad="PF2"/>
-            <pin position="60" pad="PF1"/>
-            <pin position="61" pad="PF0"/>
-            <pin position="62" pad="AREF"/>
-            <pin position="63" pad="GND"/>
-            <pin position="64" pad="AVCC"/>
+            <pin position="1"/>
+            <pin position="2" pad-key="pe0"/>
+            <pin position="3" pad-key="pe1"/>
+            <pin position="4" pad-key="pe2"/>
+            <pin position="5" pad-key="pe3"/>
+            <pin position="6" pad-key="pe4"/>
+            <pin position="7" pad-key="pe5"/>
+            <pin position="8" pad-key="pe6"/>
+            <pin position="9" pad-key="pe7"/>
+            <pin position="10" pad-key="pb0"/>
+            <pin position="11" pad-key="pb1"/>
+            <pin position="12" pad-key="pb2"/>
+            <pin position="13" pad-key="pb3"/>
+            <pin position="14" pad-key="pb4"/>
+            <pin position="15" pad-key="pb5"/>
+            <pin position="16" pad-key="pb6"/>
+            <pin position="17" pad-key="pb7"/>
+            <pin position="18" pad-key="pg3"/>
+            <pin position="19" pad-key="pg4"/>
+            <pin position="20" pad-key="pg5"/>
+            <pin position="21" pad-key="vcc"/>
+            <pin position="22" pad-key="gdn"/>
+            <pin position="23" pad-key="xtal2"/>
+            <pin position="24" pad-key="xtal1"/>
+            <pin position="25" pad-key="pd0"/>
+            <pin position="26" pad-key="pd1"/>
+            <pin position="27" pad-key="pd2"/>
+            <pin position="28" pad-key="pd3"/>
+            <pin position="29" pad-key="pd4"/>
+            <pin position="30" pad-key="pd5"/>
+            <pin position="31" pad-key="pd6"/>
+            <pin position="32" pad-key="pd7"/>
+            <pin position="33" pad-key="pg0"/>
+            <pin position="34" pad-key="pg1"/>
+            <pin position="35" pad-key="pc0"/>
+            <pin position="36" pad-key="pc1"/>
+            <pin position="37" pad-key="pc2"/>
+            <pin position="38" pad-key="pc3"/>
+            <pin position="39" pad-key="pc4"/>
+            <pin position="40" pad-key="pc5"/>
+            <pin position="41" pad-key="pc6"/>
+            <pin position="42" pad-key="pc7"/>
+            <pin position="43" pad-key="pg2"/>
+            <pin position="44" pad-key="pa7"/>
+            <pin position="45" pad-key="pa6"/>
+            <pin position="46" pad-key="pa5"/>
+            <pin position="47" pad-key="pa4"/>
+            <pin position="48" pad-key="pa3"/>
+            <pin position="49" pad-key="pa2"/>
+            <pin position="50" pad-key="pa1"/>
+            <pin position="51" pad-key="pa0"/>
+            <pin position="52" pad-key="vcc"/>
+            <pin position="53" pad-key="gnd"/>
+            <pin position="54" pad-key="pf7"/>
+            <pin position="55" pad-key="pf6"/>
+            <pin position="56" pad-key="pf5"/>
+            <pin position="57" pad-key="pf4"/>
+            <pin position="58" pad-key="pf3"/>
+            <pin position="59" pad-key="pf2"/>
+            <pin position="60" pad-key="pf1"/>
+            <pin position="61" pad-key="pf0"/>
+            <pin position="62" pad-key="aref"/>
+            <pin position="63" pad-key="gnd"/>
+            <pin position="64" pad-key="avcc"/>
         </pinout>
     </pinouts>
     <variants>
-        <variant name="ATmega165PA-AU" pinout-key="qfp_qfn_64" package="TQFP64"/>
-        <variant name="ATmega165PA-MU" pinout-key="qfp_qfn_64" package="VQFN64"/>
+        <variant key="atmega165pa_au" name="ATmega165PA-AU" pinout-key="qfp_qfn_64"/>
+        <variant key="atmega165pa_mu" name="ATmega165PA-MU" pinout-key="qfp_qfn_64"/>
     </variants>
 </device>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA168.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA168.xml
index f60c2a7b..8a04b3ba 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA168.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA168.xml
@@ -220,141 +220,141 @@
         <peripheral key="usart0" name="USART0" module-key="usart">
             <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"/>
-                <signal pad-id="pd4" function="default" group="XCK"/>
+                <signal pad-key="pd1" function="default" group="TXD"/>
+                <signal pad-key="pd0" function="default" group="RXD"/>
+                <signal pad-key="pd4" function="default" group="XCK"/>
             </signals>
         </peripheral>
         <peripheral key="twi" name="TWI" module-key="twi">
             <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"/>
+                <signal pad-key="pc4" function="default" group="SDA"/>
+                <signal pad-key="pc5" function="default" group="SCL"/>
             </signals>
         </peripheral>
         <peripheral key="tc1" name="TC1" module-key="tc16">
             <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"/>
-                <signal pad-id="pb1" function="default" group="OCA"/>
-                <signal pad-id="pb2" function="default" group="OCB"/>
+                <signal pad-key="pd5" function="default" group="T"/>
+                <signal pad-key="pb0" function="default" group="ICP"/>
+                <signal pad-key="pb1" function="default" group="OCA"/>
+                <signal pad-key="pb2" function="default" group="OCB"/>
             </signals>
         </peripheral>
         <peripheral key="tc2" name="TC2" module-key="tc8_async">
             <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"/>
+                <signal pad-key="pb3" function="default" group="OCA"/>
+                <signal pad-key="pd3" function="default" group="OCB"/>
             </signals>
         </peripheral>
         <peripheral key="adc" name="ADC" module-key="adc">
             <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"/>
-                <signal pad-id="pc2" index="2" function="default" group="ADC"/>
-                <signal pad-id="pc3" index="3" function="default" group="ADC"/>
-                <signal pad-id="pc4" index="4" function="default" group="ADC"/>
-                <signal pad-id="pc5" index="5" function="default" group="ADC"/>
+                <signal pad-key="pc0" index="0" function="default" group="ADC"/>
+                <signal pad-key="pc1" index="1" function="default" group="ADC"/>
+                <signal pad-key="pc2" index="2" function="default" group="ADC"/>
+                <signal pad-key="pc3" index="3" function="default" group="ADC"/>
+                <signal pad-key="pc4" index="4" function="default" group="ADC"/>
+                <signal pad-key="pc5" index="5" function="default" group="ADC"/>
             </signals>
         </peripheral>
         <peripheral key="ac" name="AC" module-key="ac">
             <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"/>
+                <signal pad-key="pd6" index="0" function="default" group="AIN"/>
+                <signal pad-key="pd7" index="1" function="default" group="AIN"/>
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pb2" index="2" function="default" group="P"/>
-                <signal pad-id="pb3" index="3" function="default" group="P"/>
-                <signal pad-id="pb4" index="4" function="default" group="P"/>
-                <signal pad-id="pb5" index="5" function="default" group="P"/>
-                <signal pad-id="pb6" index="6" function="default" group="P"/>
-                <signal pad-id="pb7" index="7" function="default" group="P"/>
+                <signal pad-key="pb0" index="0" function="default" group="P"/>
+                <signal pad-key="pb1" index="1" function="default" group="P"/>
+                <signal pad-key="pb2" index="2" function="default" group="P"/>
+                <signal pad-key="pb3" index="3" function="default" group="P"/>
+                <signal pad-key="pb4" index="4" function="default" group="P"/>
+                <signal pad-key="pb5" index="5" function="default" group="P"/>
+                <signal pad-key="pb6" index="6" function="default" group="P"/>
+                <signal pad-key="pb7" index="7" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pc2" index="2" function="default" group="P"/>
-                <signal pad-id="pc3" index="3" function="default" group="P"/>
-                <signal pad-id="pc4" index="4" function="default" group="P"/>
-                <signal pad-id="pc5" index="5" function="default" group="P"/>
-                <signal pad-id="pc6" index="6" function="default" group="P"/>
+                <signal pad-key="pc0" index="0" function="default" group="P"/>
+                <signal pad-key="pc1" index="1" function="default" group="P"/>
+                <signal pad-key="pc2" index="2" function="default" group="P"/>
+                <signal pad-key="pc3" index="3" function="default" group="P"/>
+                <signal pad-key="pc4" index="4" function="default" group="P"/>
+                <signal pad-key="pc5" index="5" function="default" group="P"/>
+                <signal pad-key="pc6" index="6" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pd2" index="2" function="default" group="P"/>
-                <signal pad-id="pd3" index="3" function="default" group="P"/>
-                <signal pad-id="pd4" index="4" function="default" group="P"/>
-                <signal pad-id="pd5" index="5" function="default" group="P"/>
-                <signal pad-id="pd6" index="6" function="default" group="P"/>
-                <signal pad-id="pd7" index="7" function="default" group="P"/>
+                <signal pad-key="pd0" index="0" function="default" group="P"/>
+                <signal pad-key="pd1" index="1" function="default" group="P"/>
+                <signal pad-key="pd2" index="2" function="default" group="P"/>
+                <signal pad-key="pd3" index="3" function="default" group="P"/>
+                <signal pad-key="pd4" index="4" function="default" group="P"/>
+                <signal pad-key="pd5" index="5" function="default" group="P"/>
+                <signal pad-key="pd6" index="6" function="default" group="P"/>
+                <signal pad-key="pd7" index="7" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="tc0" name="TC0" module-key="tc8">
             <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"/>
-                <signal pad-id="pd6" function="default" group="OCA"/>
+                <signal pad-key="pd4" function="default" group="T"/>
+                <signal pad-key="pd5" function="default" group="OCB"/>
+                <signal pad-key="pd6" function="default" group="OCA"/>
             </signals>
         </peripheral>
         <peripheral key="exint" name="EXINT" module-key="exint">
             <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"/>
-                <signal pad-id="pd4" index="20" function="default" group="PCINT"/>
-                <signal pad-id="pb6" index="6" function="default" group="PCINT"/>
-                <signal pad-id="pb7" index="7" function="default" group="PCINT"/>
-                <signal pad-id="pd5" index="21" function="default" group="PCINT"/>
-                <signal pad-id="pd6" index="22" function="default" group="PCINT"/>
-                <signal pad-id="pd7" index="23" function="default" group="PCINT"/>
-                <signal pad-id="pb0" index="0" function="default" group="PCINT"/>
-                <signal pad-id="pb1" index="1" function="default" group="PCINT"/>
-                <signal pad-id="pb2" index="2" function="default" group="PCINT"/>
-                <signal pad-id="pb3" index="3" function="default" group="PCINT"/>
-                <signal pad-id="pb4" index="4" function="default" group="PCINT"/>
-                <signal pad-id="pb5" index="5" function="default" group="PCINT"/>
-                <signal pad-id="pc0" index="8" function="default" group="PCINT"/>
-                <signal pad-id="pc1" index="9" function="default" group="PCINT"/>
-                <signal pad-id="pc2" index="10" function="default" group="PCINT"/>
-                <signal pad-id="pc3" index="11" function="default" group="PCINT"/>
-                <signal pad-id="pc4" index="12" function="default" group="PCINT"/>
-                <signal pad-id="pc5" index="13" function="default" group="PCINT"/>
-                <signal pad-id="pc6" index="14" function="default" group="PCINT"/>
-                <signal pad-id="pd0" index="16" function="default" group="PCINT"/>
-                <signal pad-id="pd1" index="17" function="default" group="PCINT"/>
-                <signal pad-id="pd2" index="18" function="default" group="PCINT"/>
-                <signal pad-id="pd2" index="0" function="default" group="INT"/>
+                <signal pad-key="pd3" index="1" function="default" group="INT"/>
+                <signal pad-key="pd3" index="19" function="default" group="PCINT"/>
+                <signal pad-key="pd4" index="20" function="default" group="PCINT"/>
+                <signal pad-key="pb6" index="6" function="default" group="PCINT"/>
+                <signal pad-key="pb7" index="7" function="default" group="PCINT"/>
+                <signal pad-key="pd5" index="21" function="default" group="PCINT"/>
+                <signal pad-key="pd6" index="22" function="default" group="PCINT"/>
+                <signal pad-key="pd7" index="23" function="default" group="PCINT"/>
+                <signal pad-key="pb0" index="0" function="default" group="PCINT"/>
+                <signal pad-key="pb1" index="1" function="default" group="PCINT"/>
+                <signal pad-key="pb2" index="2" function="default" group="PCINT"/>
+                <signal pad-key="pb3" index="3" function="default" group="PCINT"/>
+                <signal pad-key="pb4" index="4" function="default" group="PCINT"/>
+                <signal pad-key="pb5" index="5" function="default" group="PCINT"/>
+                <signal pad-key="pc0" index="8" function="default" group="PCINT"/>
+                <signal pad-key="pc1" index="9" function="default" group="PCINT"/>
+                <signal pad-key="pc2" index="10" function="default" group="PCINT"/>
+                <signal pad-key="pc3" index="11" function="default" group="PCINT"/>
+                <signal pad-key="pc4" index="12" function="default" group="PCINT"/>
+                <signal pad-key="pc5" index="13" function="default" group="PCINT"/>
+                <signal pad-key="pc6" index="14" function="default" group="PCINT"/>
+                <signal pad-key="pd0" index="16" function="default" group="PCINT"/>
+                <signal pad-key="pd1" index="17" function="default" group="PCINT"/>
+                <signal pad-key="pd2" index="18" function="default" group="PCINT"/>
+                <signal pad-key="pd2" index="0" function="default" group="INT"/>
             </signals>
         </peripheral>
         <peripheral key="spi" name="SPI" module-key="spi">
             <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"/>
-                <signal pad-id="pb4" function="default" group="MISO"/>
-                <signal pad-id="pb5" function="default" group="SCK"/>
+                <signal pad-key="pb2" function="default" group="SS"/>
+                <signal pad-key="pb3" function="default" group="MOSI"/>
+                <signal pad-key="pb4" function="default" group="MISO"/>
+                <signal pad-key="pb5" function="default" group="SCK"/>
             </signals>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="cpu">
             <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"/>
+                <signal pad-key="pb0" index="0" function="default" group="CLK"/>
             </signals>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="wdt">
@@ -767,112 +767,143 @@
             </register-group>
         </module>
     </modules>
+    <pads>
+        <pad key="pd3" name="PD3"/>
+        <pad key="pd4" name="PD4"/>
+        <pad key="gnd" name="GND"/>
+        <pad key="vcc" name="VCC"/>
+        <pad key="pb6" name="PB6"/>
+        <pad key="pb7" name="PB7"/>
+        <pad key="pd5" name="PD5"/>
+        <pad key="pd6" name="PD6"/>
+        <pad key="pd7" name="PD7"/>
+        <pad key="pb0" name="PB0"/>
+        <pad key="pb1" name="PB1"/>
+        <pad key="pb2" name="PB2"/>
+        <pad key="pb3" name="PB3"/>
+        <pad key="pb4" name="PB4"/>
+        <pad key="pb5" name="PB5"/>
+        <pad key="avcc" name="AVCC"/>
+        <pad key="adc6" name="ADC6"/>
+        <pad key="aref" name="AREF"/>
+        <pad key="adc7" name="ADC7"/>
+        <pad key="pc0" name="PC0"/>
+        <pad key="pc1" name="PC1"/>
+        <pad key="pc2" name="PC2"/>
+        <pad key="pc3" name="PC3"/>
+        <pad key="pc4" name="PC4"/>
+        <pad key="pc5" name="PC5"/>
+        <pad key="pc6" name="PC6"/>
+        <pad key="pd0" name="PD0"/>
+        <pad key="pd1" name="PD1"/>
+        <pad key="pd2" name="PD2"/>
+    </pads>
     <pinouts>
         <pinout key="tqfp32" name="TQFP32" type="qfp">
-            <pin position="1" pad="PD3"/>
-            <pin position="2" pad="PD4"/>
-            <pin position="3" pad="GND"/>
-            <pin position="4" pad="VCC"/>
-            <pin position="5" pad="GND"/>
-            <pin position="6" pad="VCC"/>
-            <pin position="7" pad="PB6"/>
-            <pin position="8" pad="PB7"/>
-            <pin position="9" pad="PD5"/>
-            <pin position="10" pad="PD6"/>
-            <pin position="11" pad="PD7"/>
-            <pin position="12" pad="PB0"/>
-            <pin position="13" pad="PB1"/>
-            <pin position="14" pad="PB2"/>
-            <pin position="15" pad="PB3"/>
-            <pin position="16" pad="PB4"/>
-            <pin position="17" pad="PB5"/>
-            <pin position="18" pad="AVCC"/>
-            <pin position="19" pad="ADC6"/>
-            <pin position="20" pad="AREF"/>
-            <pin position="21" pad="GND"/>
-            <pin position="22" pad="ADC7"/>
-            <pin position="23" pad="PC0"/>
-            <pin position="24" pad="PC1"/>
-            <pin position="25" pad="PC2"/>
-            <pin position="26" pad="PC3"/>
-            <pin position="27" pad="PC4"/>
-            <pin position="28" pad="PC5"/>
-            <pin position="29" pad="PC6"/>
-            <pin position="30" pad="PD0"/>
-            <pin position="31" pad="PD1"/>
-            <pin position="32" pad="PD2"/>
+            <pin position="1" pad-key="pd3"/>
+            <pin position="2" pad-key="pd4"/>
+            <pin position="3" pad-key="gnd"/>
+            <pin position="4" pad-key="vcc"/>
+            <pin position="5" pad-key="gnd"/>
+            <pin position="6" pad-key="vcc"/>
+            <pin position="7" pad-key="pb6"/>
+            <pin position="8" pad-key="pb7"/>
+            <pin position="9" pad-key="pd5"/>
+            <pin position="10" pad-key="pd6"/>
+            <pin position="11" pad-key="pd7"/>
+            <pin position="12" pad-key="pb0"/>
+            <pin position="13" pad-key="pb1"/>
+            <pin position="14" pad-key="pb2"/>
+            <pin position="15" pad-key="pb3"/>
+            <pin position="16" pad-key="pb4"/>
+            <pin position="17" pad-key="pb5"/>
+            <pin position="18" pad-key="avcc"/>
+            <pin position="19" pad-key="adc6"/>
+            <pin position="20" pad-key="aref"/>
+            <pin position="21" pad-key="gnd"/>
+            <pin position="22" pad-key="adc7"/>
+            <pin position="23" pad-key="pc0"/>
+            <pin position="24" pad-key="pc1"/>
+            <pin position="25" pad-key="pc2"/>
+            <pin position="26" pad-key="pc3"/>
+            <pin position="27" pad-key="pc4"/>
+            <pin position="28" pad-key="pc5"/>
+            <pin position="29" pad-key="pc6"/>
+            <pin position="30" pad-key="pd0"/>
+            <pin position="31" pad-key="pd1"/>
+            <pin position="32" pad-key="pd2"/>
         </pinout>
         <pinout key="qfn32" name="QFN32" type="qfn">
-            <pin position="1" pad="PD3"/>
-            <pin position="2" pad="PD4"/>
-            <pin position="3" pad="GND"/>
-            <pin position="4" pad="VCC"/>
-            <pin position="5" pad="GND"/>
-            <pin position="6" pad="VCC"/>
-            <pin position="7" pad="PB6"/>
-            <pin position="8" pad="PB7"/>
-            <pin position="9" pad="PD5"/>
-            <pin position="10" pad="PD6"/>
-            <pin position="11" pad="PD7"/>
-            <pin position="12" pad="PB0"/>
-            <pin position="13" pad="PB1"/>
-            <pin position="14" pad="PB2"/>
-            <pin position="15" pad="PB3"/>
-            <pin position="16" pad="PB4"/>
-            <pin position="17" pad="PB5"/>
-            <pin position="18" pad="AVCC"/>
-            <pin position="19" pad="ADC6"/>
-            <pin position="20" pad="AREF"/>
-            <pin position="21" pad="GND"/>
-            <pin position="22" pad="ADC7"/>
-            <pin position="23" pad="PC0"/>
-            <pin position="24" pad="PC1"/>
-            <pin position="25" pad="PC2"/>
-            <pin position="26" pad="PC3"/>
-            <pin position="27" pad="PC4"/>
-            <pin position="28" pad="PC5"/>
-            <pin position="29" pad="PC6"/>
-            <pin position="30" pad="PD0"/>
-            <pin position="31" pad="PD1"/>
-            <pin position="32" pad="PD2"/>
+            <pin position="1" pad-key="pd3"/>
+            <pin position="2" pad-key="pd4"/>
+            <pin position="3" pad-key="gnd"/>
+            <pin position="4" pad-key="vcc"/>
+            <pin position="5" pad-key="gnd"/>
+            <pin position="6" pad-key="vcc"/>
+            <pin position="7" pad-key="pb6"/>
+            <pin position="8" pad-key="pb7"/>
+            <pin position="9" pad-key="pd5"/>
+            <pin position="10" pad-key="pd6"/>
+            <pin position="11" pad-key="pd7"/>
+            <pin position="12" pad-key="pb0"/>
+            <pin position="13" pad-key="pb1"/>
+            <pin position="14" pad-key="pb2"/>
+            <pin position="15" pad-key="pb3"/>
+            <pin position="16" pad-key="pb4"/>
+            <pin position="17" pad-key="pb5"/>
+            <pin position="18" pad-key="avcc"/>
+            <pin position="19" pad-key="adc6"/>
+            <pin position="20" pad-key="aref"/>
+            <pin position="21" pad-key="gnd"/>
+            <pin position="22" pad-key="adc7"/>
+            <pin position="23" pad-key="pc0"/>
+            <pin position="24" pad-key="pc1"/>
+            <pin position="25" pad-key="pc2"/>
+            <pin position="26" pad-key="pc3"/>
+            <pin position="27" pad-key="pc4"/>
+            <pin position="28" pad-key="pc5"/>
+            <pin position="29" pad-key="pc6"/>
+            <pin position="30" pad-key="pd0"/>
+            <pin position="31" pad-key="pd1"/>
+            <pin position="32" pad-key="pd2"/>
         </pinout>
         <pinout key="pdip28" name="PDIP28" type="dip">
-            <pin position="1" pad="PC6"/>
-            <pin position="2" pad="PD0"/>
-            <pin position="3" pad="PD1"/>
-            <pin position="4" pad="PD2"/>
-            <pin position="5" pad="PD3"/>
-            <pin position="6" pad="PD4"/>
-            <pin position="7" pad="VCC"/>
-            <pin position="8" pad="GND"/>
-            <pin position="9" pad="PB6"/>
-            <pin position="10" pad="PB7"/>
-            <pin position="11" pad="PD5"/>
-            <pin position="12" pad="PD6"/>
-            <pin position="13" pad="PD7"/>
-            <pin position="14" pad="PB0"/>
-            <pin position="15" pad="PB1"/>
-            <pin position="16" pad="PB2"/>
-            <pin position="17" pad="PB3"/>
-            <pin position="18" pad="PB4"/>
-            <pin position="19" pad="PB5"/>
-            <pin position="20" pad="AVCC"/>
-            <pin position="21" pad="AREF"/>
-            <pin position="22" pad="GND"/>
-            <pin position="23" pad="PC0"/>
-            <pin position="24" pad="PC1"/>
-            <pin position="25" pad="PC2"/>
-            <pin position="26" pad="PC3"/>
-            <pin position="27" pad="PC4"/>
-            <pin position="28" pad="PC5"/>
+            <pin position="1" pad-key="pc6"/>
+            <pin position="2" pad-key="pd0"/>
+            <pin position="3" pad-key="pd1"/>
+            <pin position="4" pad-key="pd2"/>
+            <pin position="5" pad-key="pd3"/>
+            <pin position="6" pad-key="pd4"/>
+            <pin position="7" pad-key="vcc"/>
+            <pin position="8" pad-key="gnd"/>
+            <pin position="9" pad-key="pb6"/>
+            <pin position="10" pad-key="pb7"/>
+            <pin position="11" pad-key="pd5"/>
+            <pin position="12" pad-key="pd6"/>
+            <pin position="13" pad-key="pd7"/>
+            <pin position="14" pad-key="pb0"/>
+            <pin position="15" pad-key="pb1"/>
+            <pin position="16" pad-key="pb2"/>
+            <pin position="17" pad-key="pb3"/>
+            <pin position="18" pad-key="pb4"/>
+            <pin position="19" pad-key="pb5"/>
+            <pin position="20" pad-key="avcc"/>
+            <pin position="21" pad-key="aref"/>
+            <pin position="22" pad-key="gnd"/>
+            <pin position="23" pad-key="pc0"/>
+            <pin position="24" pad-key="pc1"/>
+            <pin position="25" pad-key="pc2"/>
+            <pin position="26" pad-key="pc3"/>
+            <pin position="27" pad-key="pc4"/>
+            <pin position="28" pad-key="pc5"/>
         </pinout>
     </pinouts>
     <variants>
-        <variant name="ATmega168V-10AU" pinout-key="tqfp32" package="TQFP32"/>
-        <variant name="ATmega168V-10MU" pinout-key="qfn32" package="QFN32"/>
-        <variant name="ATmega168V-10PU" pinout-key="pdip28" package="PDIP28"/>
-        <variant name="ATmega168-20AU" pinout-key="tqfp32" package="TQFP32"/>
-        <variant name="ATmega168-20MU" pinout-key="qfn32" package="QFN32"/>
-        <variant name="ATmega168-20PU" pinout-key="pdip28" package="PDIP28"/>
+        <variant key="atmega168v_10au" name="ATmega168V-10AU" pinout-key="tqfp32"/>
+        <variant key="atmega168v_10mu" name="ATmega168V-10MU" pinout-key="qfn32"/>
+        <variant key="atmega168v_10pu" name="ATmega168V-10PU" pinout-key="pdip28"/>
+        <variant key="atmega168_20au" name="ATmega168-20AU" pinout-key="tqfp32"/>
+        <variant key="atmega168_20mu" name="ATmega168-20MU" pinout-key="qfn32"/>
+        <variant key="atmega168_20pu" name="ATmega168-20PU" pinout-key="pdip28"/>
     </variants>
 </device>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA168A.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA168A.xml
index 14f12117..fbeec010 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA168A.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA168A.xml
@@ -220,135 +220,135 @@
         <peripheral key="usart0" name="USART0" module-key="usart">
             <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"/>
-                <signal pad-id="pd4" function="default" group="XCK"/>
+                <signal pad-key="pd1" function="default" group="TXD"/>
+                <signal pad-key="pd0" function="default" group="RXD"/>
+                <signal pad-key="pd4" function="default" group="XCK"/>
             </signals>
         </peripheral>
         <peripheral key="twi" name="TWI" module-key="twi">
             <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"/>
+                <signal pad-key="pc4" function="default" group="SDA"/>
+                <signal pad-key="pc5" function="default" group="SCL"/>
             </signals>
         </peripheral>
         <peripheral key="tc1" name="TC1" module-key="tc16">
             <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"/>
-                <signal pad-id="pb1" function="default" group="OCA"/>
-                <signal pad-id="pb2" function="default" group="OCB"/>
+                <signal pad-key="pd5" function="default" group="T"/>
+                <signal pad-key="pb0" function="default" group="ICP"/>
+                <signal pad-key="pb1" function="default" group="OCA"/>
+                <signal pad-key="pb2" function="default" group="OCB"/>
             </signals>
         </peripheral>
         <peripheral key="tc2" name="TC2" module-key="tc8_async">
             <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"/>
+                <signal pad-key="pb3" function="default" group="OCA"/>
+                <signal pad-key="pd3" function="default" group="OCB"/>
             </signals>
         </peripheral>
         <peripheral key="adc" name="ADC" module-key="adc">
             <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"/>
-                <signal pad-id="pc2" index="2" function="default" group="ADC"/>
-                <signal pad-id="pc3" index="3" function="default" group="ADC"/>
-                <signal pad-id="pc4" index="4" function="default" group="ADC"/>
-                <signal pad-id="pc5" index="5" function="default" group="ADC"/>
+                <signal pad-key="pc0" index="0" function="default" group="ADC"/>
+                <signal pad-key="pc1" index="1" function="default" group="ADC"/>
+                <signal pad-key="pc2" index="2" function="default" group="ADC"/>
+                <signal pad-key="pc3" index="3" function="default" group="ADC"/>
+                <signal pad-key="pc4" index="4" function="default" group="ADC"/>
+                <signal pad-key="pc5" index="5" function="default" group="ADC"/>
             </signals>
         </peripheral>
         <peripheral key="ac" name="AC" module-key="ac">
             <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"/>
+                <signal pad-key="pd6" index="0" function="default" group="AIN"/>
+                <signal pad-key="pd7" index="1" function="default" group="AIN"/>
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pb2" index="2" function="default" group="P"/>
-                <signal pad-id="pb3" index="3" function="default" group="P"/>
-                <signal pad-id="pb4" index="4" function="default" group="P"/>
-                <signal pad-id="pb5" index="5" function="default" group="P"/>
-                <signal pad-id="pb6" index="6" function="default" group="P"/>
-                <signal pad-id="pb7" index="7" function="default" group="P"/>
+                <signal pad-key="pb0" index="0" function="default" group="P"/>
+                <signal pad-key="pb1" index="1" function="default" group="P"/>
+                <signal pad-key="pb2" index="2" function="default" group="P"/>
+                <signal pad-key="pb3" index="3" function="default" group="P"/>
+                <signal pad-key="pb4" index="4" function="default" group="P"/>
+                <signal pad-key="pb5" index="5" function="default" group="P"/>
+                <signal pad-key="pb6" index="6" function="default" group="P"/>
+                <signal pad-key="pb7" index="7" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pc2" index="2" function="default" group="P"/>
-                <signal pad-id="pc3" index="3" function="default" group="P"/>
-                <signal pad-id="pc4" index="4" function="default" group="P"/>
-                <signal pad-id="pc5" index="5" function="default" group="P"/>
-                <signal pad-id="pc6" index="6" function="default" group="P"/>
+                <signal pad-key="pc0" index="0" function="default" group="P"/>
+                <signal pad-key="pc1" index="1" function="default" group="P"/>
+                <signal pad-key="pc2" index="2" function="default" group="P"/>
+                <signal pad-key="pc3" index="3" function="default" group="P"/>
+                <signal pad-key="pc4" index="4" function="default" group="P"/>
+                <signal pad-key="pc5" index="5" function="default" group="P"/>
+                <signal pad-key="pc6" index="6" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pd2" index="2" function="default" group="P"/>
-                <signal pad-id="pd3" index="3" function="default" group="P"/>
-                <signal pad-id="pd4" index="4" function="default" group="P"/>
-                <signal pad-id="pd5" index="5" function="default" group="P"/>
-                <signal pad-id="pd6" index="6" function="default" group="P"/>
-                <signal pad-id="pd7" index="7" function="default" group="P"/>
+                <signal pad-key="pd0" index="0" function="default" group="P"/>
+                <signal pad-key="pd1" index="1" function="default" group="P"/>
+                <signal pad-key="pd2" index="2" function="default" group="P"/>
+                <signal pad-key="pd3" index="3" function="default" group="P"/>
+                <signal pad-key="pd4" index="4" function="default" group="P"/>
+                <signal pad-key="pd5" index="5" function="default" group="P"/>
+                <signal pad-key="pd6" index="6" function="default" group="P"/>
+                <signal pad-key="pd7" index="7" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="tc0" name="TC0" module-key="tc8">
             <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"/>
-                <signal pad-id="pd6" function="default" group="OCA"/>
+                <signal pad-key="pd4" function="default" group="T"/>
+                <signal pad-key="pd5" function="default" group="OCB"/>
+                <signal pad-key="pd6" function="default" group="OCA"/>
             </signals>
         </peripheral>
         <peripheral key="exint" name="EXINT" module-key="exint">
             <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"/>
-                <signal pad-id="pd4" index="20" function="default" group="PCINT"/>
-                <signal pad-id="pb6" index="6" function="default" group="PCINT"/>
-                <signal pad-id="pb7" index="7" function="default" group="PCINT"/>
-                <signal pad-id="pd5" index="21" function="default" group="PCINT"/>
-                <signal pad-id="pd6" index="22" function="default" group="PCINT"/>
-                <signal pad-id="pd7" index="23" function="default" group="PCINT"/>
-                <signal pad-id="pb0" index="0" function="default" group="PCINT"/>
-                <signal pad-id="pb1" index="1" function="default" group="PCINT"/>
-                <signal pad-id="pb2" index="2" function="default" group="PCINT"/>
-                <signal pad-id="pb3" index="3" function="default" group="PCINT"/>
-                <signal pad-id="pb4" index="4" function="default" group="PCINT"/>
-                <signal pad-id="pb5" index="5" function="default" group="PCINT"/>
-                <signal pad-id="pc0" index="8" function="default" group="PCINT"/>
-                <signal pad-id="pc1" index="9" function="default" group="PCINT"/>
-                <signal pad-id="pc2" index="10" function="default" group="PCINT"/>
-                <signal pad-id="pc3" index="11" function="default" group="PCINT"/>
-                <signal pad-id="pc4" index="12" function="default" group="PCINT"/>
-                <signal pad-id="pc5" index="13" function="default" group="PCINT"/>
-                <signal pad-id="pc6" index="14" function="default" group="PCINT"/>
-                <signal pad-id="pd0" index="16" function="default" group="PCINT"/>
-                <signal pad-id="pd1" index="17" function="default" group="PCINT"/>
-                <signal pad-id="pd2" index="18" function="default" group="PCINT"/>
-                <signal pad-id="pd2" index="0" function="default" group="INT"/>
+                <signal pad-key="pd3" index="1" function="default" group="INT"/>
+                <signal pad-key="pd3" index="19" function="default" group="PCINT"/>
+                <signal pad-key="pd4" index="20" function="default" group="PCINT"/>
+                <signal pad-key="pb6" index="6" function="default" group="PCINT"/>
+                <signal pad-key="pb7" index="7" function="default" group="PCINT"/>
+                <signal pad-key="pd5" index="21" function="default" group="PCINT"/>
+                <signal pad-key="pd6" index="22" function="default" group="PCINT"/>
+                <signal pad-key="pd7" index="23" function="default" group="PCINT"/>
+                <signal pad-key="pb0" index="0" function="default" group="PCINT"/>
+                <signal pad-key="pb1" index="1" function="default" group="PCINT"/>
+                <signal pad-key="pb2" index="2" function="default" group="PCINT"/>
+                <signal pad-key="pb3" index="3" function="default" group="PCINT"/>
+                <signal pad-key="pb4" index="4" function="default" group="PCINT"/>
+                <signal pad-key="pb5" index="5" function="default" group="PCINT"/>
+                <signal pad-key="pc0" index="8" function="default" group="PCINT"/>
+                <signal pad-key="pc1" index="9" function="default" group="PCINT"/>
+                <signal pad-key="pc2" index="10" function="default" group="PCINT"/>
+                <signal pad-key="pc3" index="11" function="default" group="PCINT"/>
+                <signal pad-key="pc4" index="12" function="default" group="PCINT"/>
+                <signal pad-key="pc5" index="13" function="default" group="PCINT"/>
+                <signal pad-key="pc6" index="14" function="default" group="PCINT"/>
+                <signal pad-key="pd0" index="16" function="default" group="PCINT"/>
+                <signal pad-key="pd1" index="17" function="default" group="PCINT"/>
+                <signal pad-key="pd2" index="18" function="default" group="PCINT"/>
+                <signal pad-key="pd2" index="0" function="default" group="INT"/>
             </signals>
         </peripheral>
         <peripheral key="spi" name="SPI" module-key="spi">
             <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"/>
-                <signal pad-id="pb4" function="default" group="MISO"/>
-                <signal pad-id="pb5" function="default" group="SCK"/>
+                <signal pad-key="pb2" function="default" group="SS"/>
+                <signal pad-key="pb3" function="default" group="MOSI"/>
+                <signal pad-key="pb4" function="default" group="MISO"/>
+                <signal pad-key="pb5" function="default" group="SCK"/>
             </signals>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="wdt">
@@ -360,7 +360,7 @@
         <peripheral key="cpu" name="CPU" module-key="cpu">
             <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"/>
+                <signal pad-key="pb0" index="0" function="default" group="CLK"/>
             </signals>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="fuse">
@@ -768,140 +768,171 @@
             </register-group>
         </module>
     </modules>
+    <pads>
+        <pad key="pd3" name="PD3"/>
+        <pad key="pd4" name="PD4"/>
+        <pad key="gnd" name="GND"/>
+        <pad key="vcc" name="VCC"/>
+        <pad key="pb6" name="PB6"/>
+        <pad key="pb7" name="PB7"/>
+        <pad key="pd5" name="PD5"/>
+        <pad key="pd6" name="PD6"/>
+        <pad key="pd7" name="PD7"/>
+        <pad key="pb0" name="PB0"/>
+        <pad key="pb1" name="PB1"/>
+        <pad key="pb2" name="PB2"/>
+        <pad key="pb3" name="PB3"/>
+        <pad key="pb4" name="PB4"/>
+        <pad key="pb5" name="PB5"/>
+        <pad key="avcc" name="AVCC"/>
+        <pad key="adc6" name="ADC6"/>
+        <pad key="aref" name="AREF"/>
+        <pad key="adc7" name="ADC7"/>
+        <pad key="pc0" name="PC0"/>
+        <pad key="pc1" name="PC1"/>
+        <pad key="pc2" name="PC2"/>
+        <pad key="pc3" name="PC3"/>
+        <pad key="pc4" name="PC4"/>
+        <pad key="pc5" name="PC5"/>
+        <pad key="pc6" name="PC6"/>
+        <pad key="pd0" name="PD0"/>
+        <pad key="pd1" name="PD1"/>
+        <pad key="pd2" name="PD2"/>
+    </pads>
     <pinouts>
         <pinout key="tqfp32" name="TQFP32" type="qfp">
-            <pin position="1" pad="PD3"/>
-            <pin position="2" pad="PD4"/>
-            <pin position="3" pad="GND"/>
-            <pin position="4" pad="VCC"/>
-            <pin position="5" pad="GND"/>
-            <pin position="6" pad="VCC"/>
-            <pin position="7" pad="PB6"/>
-            <pin position="8" pad="PB7"/>
-            <pin position="9" pad="PD5"/>
-            <pin position="10" pad="PD6"/>
-            <pin position="11" pad="PD7"/>
-            <pin position="12" pad="PB0"/>
-            <pin position="13" pad="PB1"/>
-            <pin position="14" pad="PB2"/>
-            <pin position="15" pad="PB3"/>
-            <pin position="16" pad="PB4"/>
-            <pin position="17" pad="PB5"/>
-            <pin position="18" pad="AVCC"/>
-            <pin position="19" pad="ADC6"/>
-            <pin position="20" pad="AREF"/>
-            <pin position="21" pad="GND"/>
-            <pin position="22" pad="ADC7"/>
-            <pin position="23" pad="PC0"/>
-            <pin position="24" pad="PC1"/>
-            <pin position="25" pad="PC2"/>
-            <pin position="26" pad="PC3"/>
-            <pin position="27" pad="PC4"/>
-            <pin position="28" pad="PC5"/>
-            <pin position="29" pad="PC6"/>
-            <pin position="30" pad="PD0"/>
-            <pin position="31" pad="PD1"/>
-            <pin position="32" pad="PD2"/>
+            <pin position="1" pad-key="pd3"/>
+            <pin position="2" pad-key="pd4"/>
+            <pin position="3" pad-key="gnd"/>
+            <pin position="4" pad-key="vcc"/>
+            <pin position="5" pad-key="gnd"/>
+            <pin position="6" pad-key="vcc"/>
+            <pin position="7" pad-key="pb6"/>
+            <pin position="8" pad-key="pb7"/>
+            <pin position="9" pad-key="pd5"/>
+            <pin position="10" pad-key="pd6"/>
+            <pin position="11" pad-key="pd7"/>
+            <pin position="12" pad-key="pb0"/>
+            <pin position="13" pad-key="pb1"/>
+            <pin position="14" pad-key="pb2"/>
+            <pin position="15" pad-key="pb3"/>
+            <pin position="16" pad-key="pb4"/>
+            <pin position="17" pad-key="pb5"/>
+            <pin position="18" pad-key="avcc"/>
+            <pin position="19" pad-key="adc6"/>
+            <pin position="20" pad-key="aref"/>
+            <pin position="21" pad-key="gnd"/>
+            <pin position="22" pad-key="adc7"/>
+            <pin position="23" pad-key="pc0"/>
+            <pin position="24" pad-key="pc1"/>
+            <pin position="25" pad-key="pc2"/>
+            <pin position="26" pad-key="pc3"/>
+            <pin position="27" pad-key="pc4"/>
+            <pin position="28" pad-key="pc5"/>
+            <pin position="29" pad-key="pc6"/>
+            <pin position="30" pad-key="pd0"/>
+            <pin position="31" pad-key="pd1"/>
+            <pin position="32" pad-key="pd2"/>
         </pinout>
         <pinout key="qfn32" name="QFN32" type="qfn">
-            <pin position="1" pad="PD3"/>
-            <pin position="2" pad="PD4"/>
-            <pin position="3" pad="GND"/>
-            <pin position="4" pad="VCC"/>
-            <pin position="5" pad="GND"/>
-            <pin position="6" pad="VCC"/>
-            <pin position="7" pad="PB6"/>
-            <pin position="8" pad="PB7"/>
-            <pin position="9" pad="PD5"/>
-            <pin position="10" pad="PD6"/>
-            <pin position="11" pad="PD7"/>
-            <pin position="12" pad="PB0"/>
-            <pin position="13" pad="PB1"/>
-            <pin position="14" pad="PB2"/>
-            <pin position="15" pad="PB3"/>
-            <pin position="16" pad="PB4"/>
-            <pin position="17" pad="PB5"/>
-            <pin position="18" pad="AVCC"/>
-            <pin position="19" pad="ADC6"/>
-            <pin position="20" pad="AREF"/>
-            <pin position="21" pad="GND"/>
-            <pin position="22" pad="ADC7"/>
-            <pin position="23" pad="PC0"/>
-            <pin position="24" pad="PC1"/>
-            <pin position="25" pad="PC2"/>
-            <pin position="26" pad="PC3"/>
-            <pin position="27" pad="PC4"/>
-            <pin position="28" pad="PC5"/>
-            <pin position="29" pad="PC6"/>
-            <pin position="30" pad="PD0"/>
-            <pin position="31" pad="PD1"/>
-            <pin position="32" pad="PD2"/>
+            <pin position="1" pad-key="pd3"/>
+            <pin position="2" pad-key="pd4"/>
+            <pin position="3" pad-key="gnd"/>
+            <pin position="4" pad-key="vcc"/>
+            <pin position="5" pad-key="gnd"/>
+            <pin position="6" pad-key="vcc"/>
+            <pin position="7" pad-key="pb6"/>
+            <pin position="8" pad-key="pb7"/>
+            <pin position="9" pad-key="pd5"/>
+            <pin position="10" pad-key="pd6"/>
+            <pin position="11" pad-key="pd7"/>
+            <pin position="12" pad-key="pb0"/>
+            <pin position="13" pad-key="pb1"/>
+            <pin position="14" pad-key="pb2"/>
+            <pin position="15" pad-key="pb3"/>
+            <pin position="16" pad-key="pb4"/>
+            <pin position="17" pad-key="pb5"/>
+            <pin position="18" pad-key="avcc"/>
+            <pin position="19" pad-key="adc6"/>
+            <pin position="20" pad-key="aref"/>
+            <pin position="21" pad-key="gnd"/>
+            <pin position="22" pad-key="adc7"/>
+            <pin position="23" pad-key="pc0"/>
+            <pin position="24" pad-key="pc1"/>
+            <pin position="25" pad-key="pc2"/>
+            <pin position="26" pad-key="pc3"/>
+            <pin position="27" pad-key="pc4"/>
+            <pin position="28" pad-key="pc5"/>
+            <pin position="29" pad-key="pc6"/>
+            <pin position="30" pad-key="pd0"/>
+            <pin position="31" pad-key="pd1"/>
+            <pin position="32" pad-key="pd2"/>
         </pinout>
         <pinout key="qfn28" name="QFN28" type="qfn">
-            <pin position="1" pad="PD3"/>
-            <pin position="2" pad="PD4"/>
-            <pin position="3" pad="VCC"/>
-            <pin position="4" pad="GND"/>
-            <pin position="5" pad="PB6"/>
-            <pin position="6" pad="PB7"/>
-            <pin position="7" pad="PD5"/>
-            <pin position="8" pad="PD6"/>
-            <pin position="9" pad="PD7"/>
-            <pin position="10" pad="PB0"/>
-            <pin position="11" pad="PB1"/>
-            <pin position="12" pad="PB2"/>
-            <pin position="13" pad="PB3"/>
-            <pin position="14" pad="PB4"/>
-            <pin position="15" pad="PB5"/>
-            <pin position="16" pad="AVCC"/>
-            <pin position="17" pad="AREF"/>
-            <pin position="18" pad="GND"/>
-            <pin position="19" pad="PC0"/>
-            <pin position="20" pad="PC1"/>
-            <pin position="21" pad="PC2"/>
-            <pin position="22" pad="PC3"/>
-            <pin position="23" pad="PC4"/>
-            <pin position="24" pad="PC5"/>
-            <pin position="25" pad="PC6"/>
-            <pin position="26" pad="PD0"/>
-            <pin position="27" pad="PD1"/>
-            <pin position="28" pad="PD2"/>
+            <pin position="1" pad-key="pd3"/>
+            <pin position="2" pad-key="pd4"/>
+            <pin position="3" pad-key="vcc"/>
+            <pin position="4" pad-key="gnd"/>
+            <pin position="5" pad-key="pb6"/>
+            <pin position="6" pad-key="pb7"/>
+            <pin position="7" pad-key="pd5"/>
+            <pin position="8" pad-key="pd6"/>
+            <pin position="9" pad-key="pd7"/>
+            <pin position="10" pad-key="pb0"/>
+            <pin position="11" pad-key="pb1"/>
+            <pin position="12" pad-key="pb2"/>
+            <pin position="13" pad-key="pb3"/>
+            <pin position="14" pad-key="pb4"/>
+            <pin position="15" pad-key="pb5"/>
+            <pin position="16" pad-key="avcc"/>
+            <pin position="17" pad-key="aref"/>
+            <pin position="18" pad-key="gnd"/>
+            <pin position="19" pad-key="pc0"/>
+            <pin position="20" pad-key="pc1"/>
+            <pin position="21" pad-key="pc2"/>
+            <pin position="22" pad-key="pc3"/>
+            <pin position="23" pad-key="pc4"/>
+            <pin position="24" pad-key="pc5"/>
+            <pin position="25" pad-key="pc6"/>
+            <pin position="26" pad-key="pd0"/>
+            <pin position="27" pad-key="pd1"/>
+            <pin position="28" pad-key="pd2"/>
         </pinout>
         <pinout key="pdip28" name="PDIP28" type="dip">
-            <pin position="1" pad="PC6"/>
-            <pin position="2" pad="PD0"/>
-            <pin position="3" pad="PD1"/>
-            <pin position="4" pad="PD2"/>
-            <pin position="5" pad="PD3"/>
-            <pin position="6" pad="PD4"/>
-            <pin position="7" pad="VCC"/>
-            <pin position="8" pad="GND"/>
-            <pin position="9" pad="PB6"/>
-            <pin position="10" pad="PB7"/>
-            <pin position="11" pad="PD5"/>
-            <pin position="12" pad="PD6"/>
-            <pin position="13" pad="PD7"/>
-            <pin position="14" pad="PB0"/>
-            <pin position="15" pad="PB1"/>
-            <pin position="16" pad="PB2"/>
-            <pin position="17" pad="PB3"/>
-            <pin position="18" pad="PB4"/>
-            <pin position="19" pad="PB5"/>
-            <pin position="20" pad="AVCC"/>
-            <pin position="21" pad="AREF"/>
-            <pin position="22" pad="GND"/>
-            <pin position="23" pad="PC0"/>
-            <pin position="24" pad="PC1"/>
-            <pin position="25" pad="PC2"/>
-            <pin position="26" pad="PC3"/>
-            <pin position="27" pad="PC4"/>
-            <pin position="28" pad="PC5"/>
+            <pin position="1" pad-key="pc6"/>
+            <pin position="2" pad-key="pd0"/>
+            <pin position="3" pad-key="pd1"/>
+            <pin position="4" pad-key="pd2"/>
+            <pin position="5" pad-key="pd3"/>
+            <pin position="6" pad-key="pd4"/>
+            <pin position="7" pad-key="vcc"/>
+            <pin position="8" pad-key="gnd"/>
+            <pin position="9" pad-key="pb6"/>
+            <pin position="10" pad-key="pb7"/>
+            <pin position="11" pad-key="pd5"/>
+            <pin position="12" pad-key="pd6"/>
+            <pin position="13" pad-key="pd7"/>
+            <pin position="14" pad-key="pb0"/>
+            <pin position="15" pad-key="pb1"/>
+            <pin position="16" pad-key="pb2"/>
+            <pin position="17" pad-key="pb3"/>
+            <pin position="18" pad-key="pb4"/>
+            <pin position="19" pad-key="pb5"/>
+            <pin position="20" pad-key="avcc"/>
+            <pin position="21" pad-key="aref"/>
+            <pin position="22" pad-key="gnd"/>
+            <pin position="23" pad-key="pc0"/>
+            <pin position="24" pad-key="pc1"/>
+            <pin position="25" pad-key="pc2"/>
+            <pin position="26" pad-key="pc3"/>
+            <pin position="27" pad-key="pc4"/>
+            <pin position="28" pad-key="pc5"/>
         </pinout>
     </pinouts>
     <variants>
-        <variant name="ATmega168A-AU" pinout-key="tqfp32" package="TQFP32"/>
-        <variant name="ATmega168A-MMH" pinout-key="qfn28" package="QFN28"/>
-        <variant name="ATmega168A-MU" pinout-key="qfn32" package="QFN32"/>
-        <variant name="ATmega168A-PU" pinout-key="pdip28" package="PDIP28"/>
+        <variant key="atmega168a_au" name="ATmega168A-AU" pinout-key="tqfp32"/>
+        <variant key="atmega168a_mmh" name="ATmega168A-MMH" pinout-key="qfn28"/>
+        <variant key="atmega168a_mu" name="ATmega168A-MU" pinout-key="qfn32"/>
+        <variant key="atmega168a_pu" name="ATmega168A-PU" pinout-key="pdip28"/>
     </variants>
 </device>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA168P.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA168P.xml
index 535c36df..4d7ee96b 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA168P.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA168P.xml
@@ -220,135 +220,135 @@
         <peripheral key="usart0" name="USART0" module-key="usart">
             <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"/>
-                <signal pad-id="pd4" function="default" group="XCK"/>
+                <signal pad-key="pd1" function="default" group="TXD"/>
+                <signal pad-key="pd0" function="default" group="RXD"/>
+                <signal pad-key="pd4" function="default" group="XCK"/>
             </signals>
         </peripheral>
         <peripheral key="twi" name="TWI" module-key="twi">
             <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"/>
+                <signal pad-key="pc4" function="default" group="SDA"/>
+                <signal pad-key="pc5" function="default" group="SCL"/>
             </signals>
         </peripheral>
         <peripheral key="tc1" name="TC1" module-key="tc16">
             <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"/>
-                <signal pad-id="pb1" function="default" group="OCA"/>
-                <signal pad-id="pb2" function="default" group="OCB"/>
+                <signal pad-key="pd5" function="default" group="T"/>
+                <signal pad-key="pb0" function="default" group="ICP"/>
+                <signal pad-key="pb1" function="default" group="OCA"/>
+                <signal pad-key="pb2" function="default" group="OCB"/>
             </signals>
         </peripheral>
         <peripheral key="tc2" name="TC2" module-key="tc8_async">
             <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"/>
+                <signal pad-key="pb3" function="default" group="OCA"/>
+                <signal pad-key="pd3" function="default" group="OCB"/>
             </signals>
         </peripheral>
         <peripheral key="adc" name="ADC" module-key="adc">
             <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"/>
-                <signal pad-id="pc2" index="2" function="default" group="ADC"/>
-                <signal pad-id="pc3" index="3" function="default" group="ADC"/>
-                <signal pad-id="pc4" index="4" function="default" group="ADC"/>
-                <signal pad-id="pc5" index="5" function="default" group="ADC"/>
+                <signal pad-key="pc0" index="0" function="default" group="ADC"/>
+                <signal pad-key="pc1" index="1" function="default" group="ADC"/>
+                <signal pad-key="pc2" index="2" function="default" group="ADC"/>
+                <signal pad-key="pc3" index="3" function="default" group="ADC"/>
+                <signal pad-key="pc4" index="4" function="default" group="ADC"/>
+                <signal pad-key="pc5" index="5" function="default" group="ADC"/>
             </signals>
         </peripheral>
         <peripheral key="ac" name="AC" module-key="ac">
             <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"/>
+                <signal pad-key="pd6" index="0" function="default" group="AIN"/>
+                <signal pad-key="pd7" index="1" function="default" group="AIN"/>
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pb2" index="2" function="default" group="P"/>
-                <signal pad-id="pb3" index="3" function="default" group="P"/>
-                <signal pad-id="pb4" index="4" function="default" group="P"/>
-                <signal pad-id="pb5" index="5" function="default" group="P"/>
-                <signal pad-id="pb6" index="6" function="default" group="P"/>
-                <signal pad-id="pb7" index="7" function="default" group="P"/>
+                <signal pad-key="pb0" index="0" function="default" group="P"/>
+                <signal pad-key="pb1" index="1" function="default" group="P"/>
+                <signal pad-key="pb2" index="2" function="default" group="P"/>
+                <signal pad-key="pb3" index="3" function="default" group="P"/>
+                <signal pad-key="pb4" index="4" function="default" group="P"/>
+                <signal pad-key="pb5" index="5" function="default" group="P"/>
+                <signal pad-key="pb6" index="6" function="default" group="P"/>
+                <signal pad-key="pb7" index="7" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pc2" index="2" function="default" group="P"/>
-                <signal pad-id="pc3" index="3" function="default" group="P"/>
-                <signal pad-id="pc4" index="4" function="default" group="P"/>
-                <signal pad-id="pc5" index="5" function="default" group="P"/>
-                <signal pad-id="pc6" index="6" function="default" group="P"/>
+                <signal pad-key="pc0" index="0" function="default" group="P"/>
+                <signal pad-key="pc1" index="1" function="default" group="P"/>
+                <signal pad-key="pc2" index="2" function="default" group="P"/>
+                <signal pad-key="pc3" index="3" function="default" group="P"/>
+                <signal pad-key="pc4" index="4" function="default" group="P"/>
+                <signal pad-key="pc5" index="5" function="default" group="P"/>
+                <signal pad-key="pc6" index="6" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pd2" index="2" function="default" group="P"/>
-                <signal pad-id="pd3" index="3" function="default" group="P"/>
-                <signal pad-id="pd4" index="4" function="default" group="P"/>
-                <signal pad-id="pd5" index="5" function="default" group="P"/>
-                <signal pad-id="pd6" index="6" function="default" group="P"/>
-                <signal pad-id="pd7" index="7" function="default" group="P"/>
+                <signal pad-key="pd0" index="0" function="default" group="P"/>
+                <signal pad-key="pd1" index="1" function="default" group="P"/>
+                <signal pad-key="pd2" index="2" function="default" group="P"/>
+                <signal pad-key="pd3" index="3" function="default" group="P"/>
+                <signal pad-key="pd4" index="4" function="default" group="P"/>
+                <signal pad-key="pd5" index="5" function="default" group="P"/>
+                <signal pad-key="pd6" index="6" function="default" group="P"/>
+                <signal pad-key="pd7" index="7" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="tc0" name="TC0" module-key="tc8">
             <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"/>
-                <signal pad-id="pd6" function="default" group="OCA"/>
+                <signal pad-key="pd4" function="default" group="T"/>
+                <signal pad-key="pd5" function="default" group="OCB"/>
+                <signal pad-key="pd6" function="default" group="OCA"/>
             </signals>
         </peripheral>
         <peripheral key="exint" name="EXINT" module-key="exint">
             <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"/>
-                <signal pad-id="pd4" index="20" function="default" group="PCINT"/>
-                <signal pad-id="pb6" index="6" function="default" group="PCINT"/>
-                <signal pad-id="pb7" index="7" function="default" group="PCINT"/>
-                <signal pad-id="pd5" index="21" function="default" group="PCINT"/>
-                <signal pad-id="pd6" index="22" function="default" group="PCINT"/>
-                <signal pad-id="pd7" index="23" function="default" group="PCINT"/>
-                <signal pad-id="pb0" index="0" function="default" group="PCINT"/>
-                <signal pad-id="pb1" index="1" function="default" group="PCINT"/>
-                <signal pad-id="pb2" index="2" function="default" group="PCINT"/>
-                <signal pad-id="pb3" index="3" function="default" group="PCINT"/>
-                <signal pad-id="pb4" index="4" function="default" group="PCINT"/>
-                <signal pad-id="pb5" index="5" function="default" group="PCINT"/>
-                <signal pad-id="pc0" index="8" function="default" group="PCINT"/>
-                <signal pad-id="pc1" index="9" function="default" group="PCINT"/>
-                <signal pad-id="pc2" index="10" function="default" group="PCINT"/>
-                <signal pad-id="pc3" index="11" function="default" group="PCINT"/>
-                <signal pad-id="pc4" index="12" function="default" group="PCINT"/>
-                <signal pad-id="pc5" index="13" function="default" group="PCINT"/>
-                <signal pad-id="pc6" index="14" function="default" group="PCINT"/>
-                <signal pad-id="pd0" index="16" function="default" group="PCINT"/>
-                <signal pad-id="pd1" index="17" function="default" group="PCINT"/>
-                <signal pad-id="pd2" index="18" function="default" group="PCINT"/>
-                <signal pad-id="pd2" index="0" function="default" group="INT"/>
+                <signal pad-key="pd3" index="1" function="default" group="INT"/>
+                <signal pad-key="pd3" index="19" function="default" group="PCINT"/>
+                <signal pad-key="pd4" index="20" function="default" group="PCINT"/>
+                <signal pad-key="pb6" index="6" function="default" group="PCINT"/>
+                <signal pad-key="pb7" index="7" function="default" group="PCINT"/>
+                <signal pad-key="pd5" index="21" function="default" group="PCINT"/>
+                <signal pad-key="pd6" index="22" function="default" group="PCINT"/>
+                <signal pad-key="pd7" index="23" function="default" group="PCINT"/>
+                <signal pad-key="pb0" index="0" function="default" group="PCINT"/>
+                <signal pad-key="pb1" index="1" function="default" group="PCINT"/>
+                <signal pad-key="pb2" index="2" function="default" group="PCINT"/>
+                <signal pad-key="pb3" index="3" function="default" group="PCINT"/>
+                <signal pad-key="pb4" index="4" function="default" group="PCINT"/>
+                <signal pad-key="pb5" index="5" function="default" group="PCINT"/>
+                <signal pad-key="pc0" index="8" function="default" group="PCINT"/>
+                <signal pad-key="pc1" index="9" function="default" group="PCINT"/>
+                <signal pad-key="pc2" index="10" function="default" group="PCINT"/>
+                <signal pad-key="pc3" index="11" function="default" group="PCINT"/>
+                <signal pad-key="pc4" index="12" function="default" group="PCINT"/>
+                <signal pad-key="pc5" index="13" function="default" group="PCINT"/>
+                <signal pad-key="pc6" index="14" function="default" group="PCINT"/>
+                <signal pad-key="pd0" index="16" function="default" group="PCINT"/>
+                <signal pad-key="pd1" index="17" function="default" group="PCINT"/>
+                <signal pad-key="pd2" index="18" function="default" group="PCINT"/>
+                <signal pad-key="pd2" index="0" function="default" group="INT"/>
             </signals>
         </peripheral>
         <peripheral key="spi" name="SPI" module-key="spi">
             <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"/>
-                <signal pad-id="pb4" function="default" group="MISO"/>
-                <signal pad-id="pb5" function="default" group="SCK"/>
+                <signal pad-key="pb2" function="default" group="SS"/>
+                <signal pad-key="pb3" function="default" group="MOSI"/>
+                <signal pad-key="pb4" function="default" group="MISO"/>
+                <signal pad-key="pb5" function="default" group="SCK"/>
             </signals>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="wdt">
@@ -360,7 +360,7 @@
         <peripheral key="cpu" name="CPU" module-key="cpu">
             <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"/>
+                <signal pad-key="pb0" index="0" function="default" group="CLK"/>
             </signals>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="fuse">
@@ -770,142 +770,173 @@
             </register-group>
         </module>
     </modules>
+    <pads>
+        <pad key="pd3" name="PD3"/>
+        <pad key="pd4" name="PD4"/>
+        <pad key="gnd" name="GND"/>
+        <pad key="vcc" name="VCC"/>
+        <pad key="pb6" name="PB6"/>
+        <pad key="pb7" name="PB7"/>
+        <pad key="pd5" name="PD5"/>
+        <pad key="pd6" name="PD6"/>
+        <pad key="pd7" name="PD7"/>
+        <pad key="pb0" name="PB0"/>
+        <pad key="pb1" name="PB1"/>
+        <pad key="pb2" name="PB2"/>
+        <pad key="pb3" name="PB3"/>
+        <pad key="pb4" name="PB4"/>
+        <pad key="pb5" name="PB5"/>
+        <pad key="avcc" name="AVCC"/>
+        <pad key="adc6" name="ADC6"/>
+        <pad key="aref" name="AREF"/>
+        <pad key="adc7" name="ADC7"/>
+        <pad key="pc0" name="PC0"/>
+        <pad key="pc1" name="PC1"/>
+        <pad key="pc2" name="PC2"/>
+        <pad key="pc3" name="PC3"/>
+        <pad key="pc4" name="PC4"/>
+        <pad key="pc5" name="PC5"/>
+        <pad key="pc6" name="PC6"/>
+        <pad key="pd0" name="PD0"/>
+        <pad key="pd1" name="PD1"/>
+        <pad key="pd2" name="PD2"/>
+    </pads>
     <pinouts>
         <pinout key="tqfp32" name="TQFP32" type="qfp">
-            <pin position="1" pad="PD3"/>
-            <pin position="2" pad="PD4"/>
-            <pin position="3" pad="GND"/>
-            <pin position="4" pad="VCC"/>
-            <pin position="5" pad="GND"/>
-            <pin position="6" pad="VCC"/>
-            <pin position="7" pad="PB6"/>
-            <pin position="8" pad="PB7"/>
-            <pin position="9" pad="PD5"/>
-            <pin position="10" pad="PD6"/>
-            <pin position="11" pad="PD7"/>
-            <pin position="12" pad="PB0"/>
-            <pin position="13" pad="PB1"/>
-            <pin position="14" pad="PB2"/>
-            <pin position="15" pad="PB3"/>
-            <pin position="16" pad="PB4"/>
-            <pin position="17" pad="PB5"/>
-            <pin position="18" pad="AVCC"/>
-            <pin position="19" pad="ADC6"/>
-            <pin position="20" pad="AREF"/>
-            <pin position="21" pad="GND"/>
-            <pin position="22" pad="ADC7"/>
-            <pin position="23" pad="PC0"/>
-            <pin position="24" pad="PC1"/>
-            <pin position="25" pad="PC2"/>
-            <pin position="26" pad="PC3"/>
-            <pin position="27" pad="PC4"/>
-            <pin position="28" pad="PC5"/>
-            <pin position="29" pad="PC6"/>
-            <pin position="30" pad="PD0"/>
-            <pin position="31" pad="PD1"/>
-            <pin position="32" pad="PD2"/>
+            <pin position="1" pad-key="pd3"/>
+            <pin position="2" pad-key="pd4"/>
+            <pin position="3" pad-key="gnd"/>
+            <pin position="4" pad-key="vcc"/>
+            <pin position="5" pad-key="gnd"/>
+            <pin position="6" pad-key="vcc"/>
+            <pin position="7" pad-key="pb6"/>
+            <pin position="8" pad-key="pb7"/>
+            <pin position="9" pad-key="pd5"/>
+            <pin position="10" pad-key="pd6"/>
+            <pin position="11" pad-key="pd7"/>
+            <pin position="12" pad-key="pb0"/>
+            <pin position="13" pad-key="pb1"/>
+            <pin position="14" pad-key="pb2"/>
+            <pin position="15" pad-key="pb3"/>
+            <pin position="16" pad-key="pb4"/>
+            <pin position="17" pad-key="pb5"/>
+            <pin position="18" pad-key="avcc"/>
+            <pin position="19" pad-key="adc6"/>
+            <pin position="20" pad-key="aref"/>
+            <pin position="21" pad-key="gnd"/>
+            <pin position="22" pad-key="adc7"/>
+            <pin position="23" pad-key="pc0"/>
+            <pin position="24" pad-key="pc1"/>
+            <pin position="25" pad-key="pc2"/>
+            <pin position="26" pad-key="pc3"/>
+            <pin position="27" pad-key="pc4"/>
+            <pin position="28" pad-key="pc5"/>
+            <pin position="29" pad-key="pc6"/>
+            <pin position="30" pad-key="pd0"/>
+            <pin position="31" pad-key="pd1"/>
+            <pin position="32" pad-key="pd2"/>
         </pinout>
         <pinout key="qfn32" name="QFN32" type="qfn">
-            <pin position="1" pad="PD3"/>
-            <pin position="2" pad="PD4"/>
-            <pin position="3" pad="GND"/>
-            <pin position="4" pad="VCC"/>
-            <pin position="5" pad="GND"/>
-            <pin position="6" pad="VCC"/>
-            <pin position="7" pad="PB6"/>
-            <pin position="8" pad="PB7"/>
-            <pin position="9" pad="PD5"/>
-            <pin position="10" pad="PD6"/>
-            <pin position="11" pad="PD7"/>
-            <pin position="12" pad="PB0"/>
-            <pin position="13" pad="PB1"/>
-            <pin position="14" pad="PB2"/>
-            <pin position="15" pad="PB3"/>
-            <pin position="16" pad="PB4"/>
-            <pin position="17" pad="PB5"/>
-            <pin position="18" pad="AVCC"/>
-            <pin position="19" pad="ADC6"/>
-            <pin position="20" pad="AREF"/>
-            <pin position="21" pad="GND"/>
-            <pin position="22" pad="ADC7"/>
-            <pin position="23" pad="PC0"/>
-            <pin position="24" pad="PC1"/>
-            <pin position="25" pad="PC2"/>
-            <pin position="26" pad="PC3"/>
-            <pin position="27" pad="PC4"/>
-            <pin position="28" pad="PC5"/>
-            <pin position="29" pad="PC6"/>
-            <pin position="30" pad="PD0"/>
-            <pin position="31" pad="PD1"/>
-            <pin position="32" pad="PD2"/>
+            <pin position="1" pad-key="pd3"/>
+            <pin position="2" pad-key="pd4"/>
+            <pin position="3" pad-key="gnd"/>
+            <pin position="4" pad-key="vcc"/>
+            <pin position="5" pad-key="gnd"/>
+            <pin position="6" pad-key="vcc"/>
+            <pin position="7" pad-key="pb6"/>
+            <pin position="8" pad-key="pb7"/>
+            <pin position="9" pad-key="pd5"/>
+            <pin position="10" pad-key="pd6"/>
+            <pin position="11" pad-key="pd7"/>
+            <pin position="12" pad-key="pb0"/>
+            <pin position="13" pad-key="pb1"/>
+            <pin position="14" pad-key="pb2"/>
+            <pin position="15" pad-key="pb3"/>
+            <pin position="16" pad-key="pb4"/>
+            <pin position="17" pad-key="pb5"/>
+            <pin position="18" pad-key="avcc"/>
+            <pin position="19" pad-key="adc6"/>
+            <pin position="20" pad-key="aref"/>
+            <pin position="21" pad-key="gnd"/>
+            <pin position="22" pad-key="adc7"/>
+            <pin position="23" pad-key="pc0"/>
+            <pin position="24" pad-key="pc1"/>
+            <pin position="25" pad-key="pc2"/>
+            <pin position="26" pad-key="pc3"/>
+            <pin position="27" pad-key="pc4"/>
+            <pin position="28" pad-key="pc5"/>
+            <pin position="29" pad-key="pc6"/>
+            <pin position="30" pad-key="pd0"/>
+            <pin position="31" pad-key="pd1"/>
+            <pin position="32" pad-key="pd2"/>
         </pinout>
         <pinout key="qfn28" name="QFN28" type="qfn">
-            <pin position="1" pad="PD3"/>
-            <pin position="2" pad="PD4"/>
-            <pin position="3" pad="VCC"/>
-            <pin position="4" pad="GND"/>
-            <pin position="5" pad="PB6"/>
-            <pin position="6" pad="PB7"/>
-            <pin position="7" pad="PD5"/>
-            <pin position="8" pad="PD6"/>
-            <pin position="9" pad="PD7"/>
-            <pin position="10" pad="PB0"/>
-            <pin position="11" pad="PB1"/>
-            <pin position="12" pad="PB2"/>
-            <pin position="13" pad="PB3"/>
-            <pin position="14" pad="PB4"/>
-            <pin position="15" pad="PB5"/>
-            <pin position="16" pad="AVCC"/>
-            <pin position="17" pad="AREF"/>
-            <pin position="18" pad="GND"/>
-            <pin position="19" pad="PC0"/>
-            <pin position="20" pad="PC1"/>
-            <pin position="21" pad="PC2"/>
-            <pin position="22" pad="PC3"/>
-            <pin position="23" pad="PC4"/>
-            <pin position="24" pad="PC5"/>
-            <pin position="25" pad="PC6"/>
-            <pin position="26" pad="PD0"/>
-            <pin position="27" pad="PD1"/>
-            <pin position="28" pad="PD2"/>
+            <pin position="1" pad-key="pd3"/>
+            <pin position="2" pad-key="pd4"/>
+            <pin position="3" pad-key="vcc"/>
+            <pin position="4" pad-key="gnd"/>
+            <pin position="5" pad-key="pb6"/>
+            <pin position="6" pad-key="pb7"/>
+            <pin position="7" pad-key="pd5"/>
+            <pin position="8" pad-key="pd6"/>
+            <pin position="9" pad-key="pd7"/>
+            <pin position="10" pad-key="pb0"/>
+            <pin position="11" pad-key="pb1"/>
+            <pin position="12" pad-key="pb2"/>
+            <pin position="13" pad-key="pb3"/>
+            <pin position="14" pad-key="pb4"/>
+            <pin position="15" pad-key="pb5"/>
+            <pin position="16" pad-key="avcc"/>
+            <pin position="17" pad-key="aref"/>
+            <pin position="18" pad-key="gnd"/>
+            <pin position="19" pad-key="pc0"/>
+            <pin position="20" pad-key="pc1"/>
+            <pin position="21" pad-key="pc2"/>
+            <pin position="22" pad-key="pc3"/>
+            <pin position="23" pad-key="pc4"/>
+            <pin position="24" pad-key="pc5"/>
+            <pin position="25" pad-key="pc6"/>
+            <pin position="26" pad-key="pd0"/>
+            <pin position="27" pad-key="pd1"/>
+            <pin position="28" pad-key="pd2"/>
         </pinout>
         <pinout key="pdip28" name="PDIP28" type="dip">
-            <pin position="1" pad="PC6"/>
-            <pin position="2" pad="PD0"/>
-            <pin position="3" pad="PD1"/>
-            <pin position="4" pad="PD2"/>
-            <pin position="5" pad="PD3"/>
-            <pin position="6" pad="PD4"/>
-            <pin position="7" pad="VCC"/>
-            <pin position="8" pad="GND"/>
-            <pin position="9" pad="PB6"/>
-            <pin position="10" pad="PB7"/>
-            <pin position="11" pad="PD5"/>
-            <pin position="12" pad="PD6"/>
-            <pin position="13" pad="PD7"/>
-            <pin position="14" pad="PB0"/>
-            <pin position="15" pad="PB1"/>
-            <pin position="16" pad="PB2"/>
-            <pin position="17" pad="PB3"/>
-            <pin position="18" pad="PB4"/>
-            <pin position="19" pad="PB5"/>
-            <pin position="20" pad="AVCC"/>
-            <pin position="21" pad="AREF"/>
-            <pin position="22" pad="GND"/>
-            <pin position="23" pad="PC0"/>
-            <pin position="24" pad="PC1"/>
-            <pin position="25" pad="PC2"/>
-            <pin position="26" pad="PC3"/>
-            <pin position="27" pad="PC4"/>
-            <pin position="28" pad="PC5"/>
+            <pin position="1" pad-key="pc6"/>
+            <pin position="2" pad-key="pd0"/>
+            <pin position="3" pad-key="pd1"/>
+            <pin position="4" pad-key="pd2"/>
+            <pin position="5" pad-key="pd3"/>
+            <pin position="6" pad-key="pd4"/>
+            <pin position="7" pad-key="vcc"/>
+            <pin position="8" pad-key="gnd"/>
+            <pin position="9" pad-key="pb6"/>
+            <pin position="10" pad-key="pb7"/>
+            <pin position="11" pad-key="pd5"/>
+            <pin position="12" pad-key="pd6"/>
+            <pin position="13" pad-key="pd7"/>
+            <pin position="14" pad-key="pb0"/>
+            <pin position="15" pad-key="pb1"/>
+            <pin position="16" pad-key="pb2"/>
+            <pin position="17" pad-key="pb3"/>
+            <pin position="18" pad-key="pb4"/>
+            <pin position="19" pad-key="pb5"/>
+            <pin position="20" pad-key="avcc"/>
+            <pin position="21" pad-key="aref"/>
+            <pin position="22" pad-key="gnd"/>
+            <pin position="23" pad-key="pc0"/>
+            <pin position="24" pad-key="pc1"/>
+            <pin position="25" pad-key="pc2"/>
+            <pin position="26" pad-key="pc3"/>
+            <pin position="27" pad-key="pc4"/>
+            <pin position="28" pad-key="pc5"/>
         </pinout>
     </pinouts>
     <variants>
-        <variant name="ATmega168PV-10AU" pinout-key="tqfp32" package="TQFP32"/>
-        <variant name="ATmega168PV-10MU" pinout-key="qfn32" package="QFN32"/>
-        <variant name="ATmega168PV-10PU" pinout-key="pdip28" package="PDIP28"/>
-        <variant name="ATmega168P-20AU" pinout-key="tqfp32" package="TQFP32"/>
-        <variant name="ATmega168P-20MU" pinout-key="qfn32" package="QFN32"/>
-        <variant name="ATmega168P-20PU" pinout-key="pdip28" package="PDIP28"/>
+        <variant key="atmega168pv_10au" name="ATmega168PV-10AU" pinout-key="tqfp32"/>
+        <variant key="atmega168pv_10mu" name="ATmega168PV-10MU" pinout-key="qfn32"/>
+        <variant key="atmega168pv_10pu" name="ATmega168PV-10PU" pinout-key="pdip28"/>
+        <variant key="atmega168p_20au" name="ATmega168P-20AU" pinout-key="tqfp32"/>
+        <variant key="atmega168p_20mu" name="ATmega168P-20MU" pinout-key="qfn32"/>
+        <variant key="atmega168p_20pu" name="ATmega168P-20PU" pinout-key="pdip28"/>
     </variants>
 </device>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA168PA.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA168PA.xml
index 61b94c09..c3a1ce9e 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA168PA.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA168PA.xml
@@ -220,135 +220,135 @@
         <peripheral key="usart0" name="USART0" module-key="usart">
             <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"/>
-                <signal pad-id="pd4" function="default" group="XCK"/>
+                <signal pad-key="pd1" function="default" group="TXD"/>
+                <signal pad-key="pd0" function="default" group="RXD"/>
+                <signal pad-key="pd4" function="default" group="XCK"/>
             </signals>
         </peripheral>
         <peripheral key="twi" name="TWI" module-key="twi">
             <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"/>
+                <signal pad-key="pc4" function="default" group="SDA"/>
+                <signal pad-key="pc5" function="default" group="SCL"/>
             </signals>
         </peripheral>
         <peripheral key="tc1" name="TC1" module-key="tc16">
             <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"/>
-                <signal pad-id="pb1" function="default" group="OCA"/>
-                <signal pad-id="pb2" function="default" group="OCB"/>
+                <signal pad-key="pd5" function="default" group="T"/>
+                <signal pad-key="pb0" function="default" group="ICP"/>
+                <signal pad-key="pb1" function="default" group="OCA"/>
+                <signal pad-key="pb2" function="default" group="OCB"/>
             </signals>
         </peripheral>
         <peripheral key="tc2" name="TC2" module-key="tc8_async">
             <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"/>
+                <signal pad-key="pb3" function="default" group="OCA"/>
+                <signal pad-key="pd3" function="default" group="OCB"/>
             </signals>
         </peripheral>
         <peripheral key="adc" name="ADC" module-key="adc">
             <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"/>
-                <signal pad-id="pc2" index="2" function="default" group="ADC"/>
-                <signal pad-id="pc3" index="3" function="default" group="ADC"/>
-                <signal pad-id="pc4" index="4" function="default" group="ADC"/>
-                <signal pad-id="pc5" index="5" function="default" group="ADC"/>
+                <signal pad-key="pc0" index="0" function="default" group="ADC"/>
+                <signal pad-key="pc1" index="1" function="default" group="ADC"/>
+                <signal pad-key="pc2" index="2" function="default" group="ADC"/>
+                <signal pad-key="pc3" index="3" function="default" group="ADC"/>
+                <signal pad-key="pc4" index="4" function="default" group="ADC"/>
+                <signal pad-key="pc5" index="5" function="default" group="ADC"/>
             </signals>
         </peripheral>
         <peripheral key="ac" name="AC" module-key="ac">
             <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"/>
+                <signal pad-key="pd6" index="0" function="default" group="AIN"/>
+                <signal pad-key="pd7" index="1" function="default" group="AIN"/>
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pb2" index="2" function="default" group="P"/>
-                <signal pad-id="pb3" index="3" function="default" group="P"/>
-                <signal pad-id="pb4" index="4" function="default" group="P"/>
-                <signal pad-id="pb5" index="5" function="default" group="P"/>
-                <signal pad-id="pb6" index="6" function="default" group="P"/>
-                <signal pad-id="pb7" index="7" function="default" group="P"/>
+                <signal pad-key="pb0" index="0" function="default" group="P"/>
+                <signal pad-key="pb1" index="1" function="default" group="P"/>
+                <signal pad-key="pb2" index="2" function="default" group="P"/>
+                <signal pad-key="pb3" index="3" function="default" group="P"/>
+                <signal pad-key="pb4" index="4" function="default" group="P"/>
+                <signal pad-key="pb5" index="5" function="default" group="P"/>
+                <signal pad-key="pb6" index="6" function="default" group="P"/>
+                <signal pad-key="pb7" index="7" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pc2" index="2" function="default" group="P"/>
-                <signal pad-id="pc3" index="3" function="default" group="P"/>
-                <signal pad-id="pc4" index="4" function="default" group="P"/>
-                <signal pad-id="pc5" index="5" function="default" group="P"/>
-                <signal pad-id="pc6" index="6" function="default" group="P"/>
+                <signal pad-key="pc0" index="0" function="default" group="P"/>
+                <signal pad-key="pc1" index="1" function="default" group="P"/>
+                <signal pad-key="pc2" index="2" function="default" group="P"/>
+                <signal pad-key="pc3" index="3" function="default" group="P"/>
+                <signal pad-key="pc4" index="4" function="default" group="P"/>
+                <signal pad-key="pc5" index="5" function="default" group="P"/>
+                <signal pad-key="pc6" index="6" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pd2" index="2" function="default" group="P"/>
-                <signal pad-id="pd3" index="3" function="default" group="P"/>
-                <signal pad-id="pd4" index="4" function="default" group="P"/>
-                <signal pad-id="pd5" index="5" function="default" group="P"/>
-                <signal pad-id="pd6" index="6" function="default" group="P"/>
-                <signal pad-id="pd7" index="7" function="default" group="P"/>
+                <signal pad-key="pd0" index="0" function="default" group="P"/>
+                <signal pad-key="pd1" index="1" function="default" group="P"/>
+                <signal pad-key="pd2" index="2" function="default" group="P"/>
+                <signal pad-key="pd3" index="3" function="default" group="P"/>
+                <signal pad-key="pd4" index="4" function="default" group="P"/>
+                <signal pad-key="pd5" index="5" function="default" group="P"/>
+                <signal pad-key="pd6" index="6" function="default" group="P"/>
+                <signal pad-key="pd7" index="7" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="tc0" name="TC0" module-key="tc8">
             <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"/>
-                <signal pad-id="pd6" function="default" group="OCA"/>
+                <signal pad-key="pd4" function="default" group="T"/>
+                <signal pad-key="pd5" function="default" group="OCB"/>
+                <signal pad-key="pd6" function="default" group="OCA"/>
             </signals>
         </peripheral>
         <peripheral key="exint" name="EXINT" module-key="exint">
             <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"/>
-                <signal pad-id="pd4" index="20" function="default" group="PCINT"/>
-                <signal pad-id="pb6" index="6" function="default" group="PCINT"/>
-                <signal pad-id="pb7" index="7" function="default" group="PCINT"/>
-                <signal pad-id="pd5" index="21" function="default" group="PCINT"/>
-                <signal pad-id="pd6" index="22" function="default" group="PCINT"/>
-                <signal pad-id="pd7" index="23" function="default" group="PCINT"/>
-                <signal pad-id="pb0" index="0" function="default" group="PCINT"/>
-                <signal pad-id="pb1" index="1" function="default" group="PCINT"/>
-                <signal pad-id="pb2" index="2" function="default" group="PCINT"/>
-                <signal pad-id="pb3" index="3" function="default" group="PCINT"/>
-                <signal pad-id="pb4" index="4" function="default" group="PCINT"/>
-                <signal pad-id="pb5" index="5" function="default" group="PCINT"/>
-                <signal pad-id="pc0" index="8" function="default" group="PCINT"/>
-                <signal pad-id="pc1" index="9" function="default" group="PCINT"/>
-                <signal pad-id="pc2" index="10" function="default" group="PCINT"/>
-                <signal pad-id="pc3" index="11" function="default" group="PCINT"/>
-                <signal pad-id="pc4" index="12" function="default" group="PCINT"/>
-                <signal pad-id="pc5" index="13" function="default" group="PCINT"/>
-                <signal pad-id="pc6" index="14" function="default" group="PCINT"/>
-                <signal pad-id="pd0" index="16" function="default" group="PCINT"/>
-                <signal pad-id="pd1" index="17" function="default" group="PCINT"/>
-                <signal pad-id="pd2" index="18" function="default" group="PCINT"/>
-                <signal pad-id="pd2" index="0" function="default" group="INT"/>
+                <signal pad-key="pd3" index="1" function="default" group="INT"/>
+                <signal pad-key="pd3" index="19" function="default" group="PCINT"/>
+                <signal pad-key="pd4" index="20" function="default" group="PCINT"/>
+                <signal pad-key="pb6" index="6" function="default" group="PCINT"/>
+                <signal pad-key="pb7" index="7" function="default" group="PCINT"/>
+                <signal pad-key="pd5" index="21" function="default" group="PCINT"/>
+                <signal pad-key="pd6" index="22" function="default" group="PCINT"/>
+                <signal pad-key="pd7" index="23" function="default" group="PCINT"/>
+                <signal pad-key="pb0" index="0" function="default" group="PCINT"/>
+                <signal pad-key="pb1" index="1" function="default" group="PCINT"/>
+                <signal pad-key="pb2" index="2" function="default" group="PCINT"/>
+                <signal pad-key="pb3" index="3" function="default" group="PCINT"/>
+                <signal pad-key="pb4" index="4" function="default" group="PCINT"/>
+                <signal pad-key="pb5" index="5" function="default" group="PCINT"/>
+                <signal pad-key="pc0" index="8" function="default" group="PCINT"/>
+                <signal pad-key="pc1" index="9" function="default" group="PCINT"/>
+                <signal pad-key="pc2" index="10" function="default" group="PCINT"/>
+                <signal pad-key="pc3" index="11" function="default" group="PCINT"/>
+                <signal pad-key="pc4" index="12" function="default" group="PCINT"/>
+                <signal pad-key="pc5" index="13" function="default" group="PCINT"/>
+                <signal pad-key="pc6" index="14" function="default" group="PCINT"/>
+                <signal pad-key="pd0" index="16" function="default" group="PCINT"/>
+                <signal pad-key="pd1" index="17" function="default" group="PCINT"/>
+                <signal pad-key="pd2" index="18" function="default" group="PCINT"/>
+                <signal pad-key="pd2" index="0" function="default" group="INT"/>
             </signals>
         </peripheral>
         <peripheral key="spi" name="SPI" module-key="spi">
             <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"/>
-                <signal pad-id="pb4" function="default" group="MISO"/>
-                <signal pad-id="pb5" function="default" group="SCK"/>
+                <signal pad-key="pb2" function="default" group="SS"/>
+                <signal pad-key="pb3" function="default" group="MOSI"/>
+                <signal pad-key="pb4" function="default" group="MISO"/>
+                <signal pad-key="pb5" function="default" group="SCK"/>
             </signals>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="wdt">
@@ -360,7 +360,7 @@
         <peripheral key="cpu" name="CPU" module-key="cpu">
             <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"/>
+                <signal pad-key="pb0" index="0" function="default" group="CLK"/>
             </signals>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="fuse">
@@ -770,143 +770,174 @@
             </register-group>
         </module>
     </modules>
+    <pads>
+        <pad key="pd3" name="PD3"/>
+        <pad key="pd4" name="PD4"/>
+        <pad key="gnd" name="GND"/>
+        <pad key="vcc" name="VCC"/>
+        <pad key="pb6" name="PB6"/>
+        <pad key="pb7" name="PB7"/>
+        <pad key="pd5" name="PD5"/>
+        <pad key="pd6" name="PD6"/>
+        <pad key="pd7" name="PD7"/>
+        <pad key="pb0" name="PB0"/>
+        <pad key="pb1" name="PB1"/>
+        <pad key="pb2" name="PB2"/>
+        <pad key="pb3" name="PB3"/>
+        <pad key="pb4" name="PB4"/>
+        <pad key="pb5" name="PB5"/>
+        <pad key="avcc" name="AVCC"/>
+        <pad key="adc6" name="ADC6"/>
+        <pad key="aref" name="AREF"/>
+        <pad key="adc7" name="ADC7"/>
+        <pad key="pc0" name="PC0"/>
+        <pad key="pc1" name="PC1"/>
+        <pad key="pc2" name="PC2"/>
+        <pad key="pc3" name="PC3"/>
+        <pad key="pc4" name="PC4"/>
+        <pad key="pc5" name="PC5"/>
+        <pad key="pc6" name="PC6"/>
+        <pad key="pd0" name="PD0"/>
+        <pad key="pd1" name="PD1"/>
+        <pad key="pd2" name="PD2"/>
+    </pads>
     <pinouts>
         <pinout key="tqfp32" name="TQFP32" type="qfp">
-            <pin position="1" pad="PD3"/>
-            <pin position="2" pad="PD4"/>
-            <pin position="3" pad="GND"/>
-            <pin position="4" pad="VCC"/>
-            <pin position="5" pad="GND"/>
-            <pin position="6" pad="VCC"/>
-            <pin position="7" pad="PB6"/>
-            <pin position="8" pad="PB7"/>
-            <pin position="9" pad="PD5"/>
-            <pin position="10" pad="PD6"/>
-            <pin position="11" pad="PD7"/>
-            <pin position="12" pad="PB0"/>
-            <pin position="13" pad="PB1"/>
-            <pin position="14" pad="PB2"/>
-            <pin position="15" pad="PB3"/>
-            <pin position="16" pad="PB4"/>
-            <pin position="17" pad="PB5"/>
-            <pin position="18" pad="AVCC"/>
-            <pin position="19" pad="ADC6"/>
-            <pin position="20" pad="AREF"/>
-            <pin position="21" pad="GND"/>
-            <pin position="22" pad="ADC7"/>
-            <pin position="23" pad="PC0"/>
-            <pin position="24" pad="PC1"/>
-            <pin position="25" pad="PC2"/>
-            <pin position="26" pad="PC3"/>
-            <pin position="27" pad="PC4"/>
-            <pin position="28" pad="PC5"/>
-            <pin position="29" pad="PC6"/>
-            <pin position="30" pad="PD0"/>
-            <pin position="31" pad="PD1"/>
-            <pin position="32" pad="PD2"/>
+            <pin position="1" pad-key="pd3"/>
+            <pin position="2" pad-key="pd4"/>
+            <pin position="3" pad-key="gnd"/>
+            <pin position="4" pad-key="vcc"/>
+            <pin position="5" pad-key="gnd"/>
+            <pin position="6" pad-key="vcc"/>
+            <pin position="7" pad-key="pb6"/>
+            <pin position="8" pad-key="pb7"/>
+            <pin position="9" pad-key="pd5"/>
+            <pin position="10" pad-key="pd6"/>
+            <pin position="11" pad-key="pd7"/>
+            <pin position="12" pad-key="pb0"/>
+            <pin position="13" pad-key="pb1"/>
+            <pin position="14" pad-key="pb2"/>
+            <pin position="15" pad-key="pb3"/>
+            <pin position="16" pad-key="pb4"/>
+            <pin position="17" pad-key="pb5"/>
+            <pin position="18" pad-key="avcc"/>
+            <pin position="19" pad-key="adc6"/>
+            <pin position="20" pad-key="aref"/>
+            <pin position="21" pad-key="gnd"/>
+            <pin position="22" pad-key="adc7"/>
+            <pin position="23" pad-key="pc0"/>
+            <pin position="24" pad-key="pc1"/>
+            <pin position="25" pad-key="pc2"/>
+            <pin position="26" pad-key="pc3"/>
+            <pin position="27" pad-key="pc4"/>
+            <pin position="28" pad-key="pc5"/>
+            <pin position="29" pad-key="pc6"/>
+            <pin position="30" pad-key="pd0"/>
+            <pin position="31" pad-key="pd1"/>
+            <pin position="32" pad-key="pd2"/>
         </pinout>
         <pinout key="qfn32" name="QFN32" type="qfn">
-            <pin position="1" pad="PD3"/>
-            <pin position="2" pad="PD4"/>
-            <pin position="3" pad="GND"/>
-            <pin position="4" pad="VCC"/>
-            <pin position="5" pad="GND"/>
-            <pin position="6" pad="VCC"/>
-            <pin position="7" pad="PB6"/>
-            <pin position="8" pad="PB7"/>
-            <pin position="9" pad="PD5"/>
-            <pin position="10" pad="PD6"/>
-            <pin position="11" pad="PD7"/>
-            <pin position="12" pad="PB0"/>
-            <pin position="13" pad="PB1"/>
-            <pin position="14" pad="PB2"/>
-            <pin position="15" pad="PB3"/>
-            <pin position="16" pad="PB4"/>
-            <pin position="17" pad="PB5"/>
-            <pin position="18" pad="AVCC"/>
-            <pin position="19" pad="ADC6"/>
-            <pin position="20" pad="AREF"/>
-            <pin position="21" pad="GND"/>
-            <pin position="22" pad="ADC7"/>
-            <pin position="23" pad="PC0"/>
-            <pin position="24" pad="PC1"/>
-            <pin position="25" pad="PC2"/>
-            <pin position="26" pad="PC3"/>
-            <pin position="27" pad="PC4"/>
-            <pin position="28" pad="PC5"/>
-            <pin position="29" pad="PC6"/>
-            <pin position="30" pad="PD0"/>
-            <pin position="31" pad="PD1"/>
-            <pin position="32" pad="PD2"/>
+            <pin position="1" pad-key="pd3"/>
+            <pin position="2" pad-key="pd4"/>
+            <pin position="3" pad-key="gnd"/>
+            <pin position="4" pad-key="vcc"/>
+            <pin position="5" pad-key="gnd"/>
+            <pin position="6" pad-key="vcc"/>
+            <pin position="7" pad-key="pb6"/>
+            <pin position="8" pad-key="pb7"/>
+            <pin position="9" pad-key="pd5"/>
+            <pin position="10" pad-key="pd6"/>
+            <pin position="11" pad-key="pd7"/>
+            <pin position="12" pad-key="pb0"/>
+            <pin position="13" pad-key="pb1"/>
+            <pin position="14" pad-key="pb2"/>
+            <pin position="15" pad-key="pb3"/>
+            <pin position="16" pad-key="pb4"/>
+            <pin position="17" pad-key="pb5"/>
+            <pin position="18" pad-key="avcc"/>
+            <pin position="19" pad-key="adc6"/>
+            <pin position="20" pad-key="aref"/>
+            <pin position="21" pad-key="gnd"/>
+            <pin position="22" pad-key="adc7"/>
+            <pin position="23" pad-key="pc0"/>
+            <pin position="24" pad-key="pc1"/>
+            <pin position="25" pad-key="pc2"/>
+            <pin position="26" pad-key="pc3"/>
+            <pin position="27" pad-key="pc4"/>
+            <pin position="28" pad-key="pc5"/>
+            <pin position="29" pad-key="pc6"/>
+            <pin position="30" pad-key="pd0"/>
+            <pin position="31" pad-key="pd1"/>
+            <pin position="32" pad-key="pd2"/>
         </pinout>
         <pinout key="qfn28" name="QFN28" type="qfn">
-            <pin position="1" pad="PD3"/>
-            <pin position="2" pad="PD4"/>
-            <pin position="3" pad="VCC"/>
-            <pin position="4" pad="GND"/>
-            <pin position="5" pad="PB6"/>
-            <pin position="6" pad="PB7"/>
-            <pin position="7" pad="PD5"/>
-            <pin position="8" pad="PD6"/>
-            <pin position="9" pad="PD7"/>
-            <pin position="10" pad="PB0"/>
-            <pin position="11" pad="PB1"/>
-            <pin position="12" pad="PB2"/>
-            <pin position="13" pad="PB3"/>
-            <pin position="14" pad="PB4"/>
-            <pin position="15" pad="PB5"/>
-            <pin position="16" pad="AVCC"/>
-            <pin position="17" pad="AREF"/>
-            <pin position="18" pad="GND"/>
-            <pin position="19" pad="PC0"/>
-            <pin position="20" pad="PC1"/>
-            <pin position="21" pad="PC2"/>
-            <pin position="22" pad="PC3"/>
-            <pin position="23" pad="PC4"/>
-            <pin position="24" pad="PC5"/>
-            <pin position="25" pad="PC6"/>
-            <pin position="26" pad="PD0"/>
-            <pin position="27" pad="PD1"/>
-            <pin position="28" pad="PD2"/>
+            <pin position="1" pad-key="pd3"/>
+            <pin position="2" pad-key="pd4"/>
+            <pin position="3" pad-key="vcc"/>
+            <pin position="4" pad-key="gnd"/>
+            <pin position="5" pad-key="pb6"/>
+            <pin position="6" pad-key="pb7"/>
+            <pin position="7" pad-key="pd5"/>
+            <pin position="8" pad-key="pd6"/>
+            <pin position="9" pad-key="pd7"/>
+            <pin position="10" pad-key="pb0"/>
+            <pin position="11" pad-key="pb1"/>
+            <pin position="12" pad-key="pb2"/>
+            <pin position="13" pad-key="pb3"/>
+            <pin position="14" pad-key="pb4"/>
+            <pin position="15" pad-key="pb5"/>
+            <pin position="16" pad-key="avcc"/>
+            <pin position="17" pad-key="aref"/>
+            <pin position="18" pad-key="gnd"/>
+            <pin position="19" pad-key="pc0"/>
+            <pin position="20" pad-key="pc1"/>
+            <pin position="21" pad-key="pc2"/>
+            <pin position="22" pad-key="pc3"/>
+            <pin position="23" pad-key="pc4"/>
+            <pin position="24" pad-key="pc5"/>
+            <pin position="25" pad-key="pc6"/>
+            <pin position="26" pad-key="pd0"/>
+            <pin position="27" pad-key="pd1"/>
+            <pin position="28" pad-key="pd2"/>
         </pinout>
         <pinout key="pdip28" name="PDIP28" type="dip">
-            <pin position="1" pad="PC6"/>
-            <pin position="2" pad="PD0"/>
-            <pin position="3" pad="PD1"/>
-            <pin position="4" pad="PD2"/>
-            <pin position="5" pad="PD3"/>
-            <pin position="6" pad="PD4"/>
-            <pin position="7" pad="VCC"/>
-            <pin position="8" pad="GND"/>
-            <pin position="9" pad="PB6"/>
-            <pin position="10" pad="PB7"/>
-            <pin position="11" pad="PD5"/>
-            <pin position="12" pad="PD6"/>
-            <pin position="13" pad="PD7"/>
-            <pin position="14" pad="PB0"/>
-            <pin position="15" pad="PB1"/>
-            <pin position="16" pad="PB2"/>
-            <pin position="17" pad="PB3"/>
-            <pin position="18" pad="PB4"/>
-            <pin position="19" pad="PB5"/>
-            <pin position="20" pad="AVCC"/>
-            <pin position="21" pad="AREF"/>
-            <pin position="22" pad="GND"/>
-            <pin position="23" pad="PC0"/>
-            <pin position="24" pad="PC1"/>
-            <pin position="25" pad="PC2"/>
-            <pin position="26" pad="PC3"/>
-            <pin position="27" pad="PC4"/>
-            <pin position="28" pad="PC5"/>
+            <pin position="1" pad-key="pc6"/>
+            <pin position="2" pad-key="pd0"/>
+            <pin position="3" pad-key="pd1"/>
+            <pin position="4" pad-key="pd2"/>
+            <pin position="5" pad-key="pd3"/>
+            <pin position="6" pad-key="pd4"/>
+            <pin position="7" pad-key="vcc"/>
+            <pin position="8" pad-key="gnd"/>
+            <pin position="9" pad-key="pb6"/>
+            <pin position="10" pad-key="pb7"/>
+            <pin position="11" pad-key="pd5"/>
+            <pin position="12" pad-key="pd6"/>
+            <pin position="13" pad-key="pd7"/>
+            <pin position="14" pad-key="pb0"/>
+            <pin position="15" pad-key="pb1"/>
+            <pin position="16" pad-key="pb2"/>
+            <pin position="17" pad-key="pb3"/>
+            <pin position="18" pad-key="pb4"/>
+            <pin position="19" pad-key="pb5"/>
+            <pin position="20" pad-key="avcc"/>
+            <pin position="21" pad-key="aref"/>
+            <pin position="22" pad-key="gnd"/>
+            <pin position="23" pad-key="pc0"/>
+            <pin position="24" pad-key="pc1"/>
+            <pin position="25" pad-key="pc2"/>
+            <pin position="26" pad-key="pc3"/>
+            <pin position="27" pad-key="pc4"/>
+            <pin position="28" pad-key="pc5"/>
         </pinout>
     </pinouts>
     <variants>
-        <variant name="ATmega168PA-AU" pinout-key="tqfp32" package="TQFP32"/>
-        <variant name="ATmega168PA-MMH" pinout-key="qfn28" package="QFN28"/>
-        <variant name="ATmega168PA-MU" pinout-key="qfn32" package="QFN32"/>
-        <variant name="ATmega168PA-PU" pinout-key="pdip28" package="PDIP28"/>
-        <variant name="ATmega168PA-AN" pinout-key="tqfp32" package="TQFP32"/>
-        <variant name="ATmega168PA-MN" pinout-key="qfn32" package="QFN32"/>
-        <variant name="ATmega168PA-PN" pinout-key="pdip28" package="PDIP28"/>
+        <variant key="atmega168pa_au" name="ATmega168PA-AU" pinout-key="tqfp32"/>
+        <variant key="atmega168pa_mmh" name="ATmega168PA-MMH" pinout-key="qfn28"/>
+        <variant key="atmega168pa_mu" name="ATmega168PA-MU" pinout-key="qfn32"/>
+        <variant key="atmega168pa_pu" name="ATmega168PA-PU" pinout-key="pdip28"/>
+        <variant key="atmega168pa_an" name="ATmega168PA-AN" pinout-key="tqfp32"/>
+        <variant key="atmega168pa_mn" name="ATmega168PA-MN" pinout-key="qfn32"/>
+        <variant key="atmega168pa_pn" name="ATmega168PA-PN" pinout-key="pdip28"/>
     </variants>
 </device>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA168PB.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA168PB.xml
index a279112b..3778f584 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA168PB.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA168PB.xml
@@ -220,147 +220,147 @@
         <peripheral key="usart0" name="USART0" module-key="usart">
             <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"/>
-                <signal pad-id="pd4" function="default" group="XCK"/>
+                <signal pad-key="pd1" function="default" group="TXD"/>
+                <signal pad-key="pd0" function="default" group="RXD"/>
+                <signal pad-key="pd4" function="default" group="XCK"/>
             </signals>
         </peripheral>
         <peripheral key="twi" name="TWI" module-key="twi">
             <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"/>
+                <signal pad-key="pc4" function="default" group="SDA"/>
+                <signal pad-key="pc5" function="default" group="SCL"/>
             </signals>
         </peripheral>
         <peripheral key="tc1" name="TC1" module-key="tc16">
             <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"/>
-                <signal pad-id="pb1" function="default" group="OCA"/>
-                <signal pad-id="pb2" function="default" group="OCB"/>
+                <signal pad-key="pd5" function="default" group="T"/>
+                <signal pad-key="pb0" function="default" group="ICP"/>
+                <signal pad-key="pb1" function="default" group="OCA"/>
+                <signal pad-key="pb2" function="default" group="OCB"/>
             </signals>
         </peripheral>
         <peripheral key="tc2" name="TC2" module-key="tc8_async">
             <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"/>
+                <signal pad-key="pb3" function="default" group="OCA"/>
+                <signal pad-key="pd3" function="default" group="OCB"/>
             </signals>
         </peripheral>
         <peripheral key="adc" name="ADC" module-key="adc">
             <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"/>
-                <signal pad-id="pc2" index="2" function="default" group="ADC"/>
-                <signal pad-id="pc3" index="3" function="default" group="ADC"/>
-                <signal pad-id="pc4" index="4" function="default" group="ADC"/>
-                <signal pad-id="pc5" index="5" function="default" group="ADC"/>
-                <signal pad-id="pe2" index="6" function="default" group="ADC"/>
-                <signal pad-id="pe3" index="7" function="default" group="ADC"/>
+                <signal pad-key="pc0" index="0" function="default" group="ADC"/>
+                <signal pad-key="pc1" index="1" function="default" group="ADC"/>
+                <signal pad-key="pc2" index="2" function="default" group="ADC"/>
+                <signal pad-key="pc3" index="3" function="default" group="ADC"/>
+                <signal pad-key="pc4" index="4" function="default" group="ADC"/>
+                <signal pad-key="pc5" index="5" function="default" group="ADC"/>
+                <signal pad-key="pe2" index="6" function="default" group="ADC"/>
+                <signal pad-key="pe3" index="7" function="default" group="ADC"/>
             </signals>
         </peripheral>
         <peripheral key="ac" name="AC" module-key="ac">
             <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"/>
-                <signal pad-id="pd7" index="1" function="default" group="AIN"/>
+                <signal pad-key="pe0" function="default" group="AC"/>
+                <signal pad-key="pd6" index="0" function="default" group="AIN"/>
+                <signal pad-key="pd7" index="1" function="default" group="AIN"/>
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pb2" index="2" function="default" group="P"/>
-                <signal pad-id="pb3" index="3" function="default" group="P"/>
-                <signal pad-id="pb4" index="4" function="default" group="P"/>
-                <signal pad-id="pb5" index="5" function="default" group="P"/>
-                <signal pad-id="pb6" index="6" function="default" group="P"/>
-                <signal pad-id="pb7" index="7" function="default" group="P"/>
+                <signal pad-key="pb0" index="0" function="default" group="P"/>
+                <signal pad-key="pb1" index="1" function="default" group="P"/>
+                <signal pad-key="pb2" index="2" function="default" group="P"/>
+                <signal pad-key="pb3" index="3" function="default" group="P"/>
+                <signal pad-key="pb4" index="4" function="default" group="P"/>
+                <signal pad-key="pb5" index="5" function="default" group="P"/>
+                <signal pad-key="pb6" index="6" function="default" group="P"/>
+                <signal pad-key="pb7" index="7" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pc2" index="2" function="default" group="P"/>
-                <signal pad-id="pc3" index="3" function="default" group="P"/>
-                <signal pad-id="pc4" index="4" function="default" group="P"/>
-                <signal pad-id="pc5" index="5" function="default" group="P"/>
-                <signal pad-id="pc6" index="6" function="default" group="P"/>
+                <signal pad-key="pc0" index="0" function="default" group="P"/>
+                <signal pad-key="pc1" index="1" function="default" group="P"/>
+                <signal pad-key="pc2" index="2" function="default" group="P"/>
+                <signal pad-key="pc3" index="3" function="default" group="P"/>
+                <signal pad-key="pc4" index="4" function="default" group="P"/>
+                <signal pad-key="pc5" index="5" function="default" group="P"/>
+                <signal pad-key="pc6" index="6" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pd2" index="2" function="default" group="P"/>
-                <signal pad-id="pd3" index="3" function="default" group="P"/>
-                <signal pad-id="pd4" index="4" function="default" group="P"/>
-                <signal pad-id="pd5" index="5" function="default" group="P"/>
-                <signal pad-id="pd6" index="6" function="default" group="P"/>
-                <signal pad-id="pd7" index="7" function="default" group="P"/>
+                <signal pad-key="pd0" index="0" function="default" group="P"/>
+                <signal pad-key="pd1" index="1" function="default" group="P"/>
+                <signal pad-key="pd2" index="2" function="default" group="P"/>
+                <signal pad-key="pd3" index="3" function="default" group="P"/>
+                <signal pad-key="pd4" index="4" function="default" group="P"/>
+                <signal pad-key="pd5" index="5" function="default" group="P"/>
+                <signal pad-key="pd6" index="6" function="default" group="P"/>
+                <signal pad-key="pd7" index="7" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="porte" name="PORTE" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pe2" index="2" function="default" group="P"/>
-                <signal pad-id="pe3" index="3" function="default" group="P"/>
+                <signal pad-key="pe0" index="0" function="default" group="P"/>
+                <signal pad-key="pe1" index="1" function="default" group="P"/>
+                <signal pad-key="pe2" index="2" function="default" group="P"/>
+                <signal pad-key="pe3" index="3" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="tc0" name="TC0" module-key="tc8">
             <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"/>
-                <signal pad-id="pd6" function="default" group="OCA"/>
+                <signal pad-key="pd4" function="default" group="T"/>
+                <signal pad-key="pd5" function="default" group="OCB"/>
+                <signal pad-key="pd6" function="default" group="OCA"/>
             </signals>
         </peripheral>
         <peripheral key="exint" name="EXINT" module-key="exint">
             <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"/>
-                <signal pad-id="pd4" index="20" function="default" group="PCINT"/>
-                <signal pad-id="pb6" index="6" function="default" group="PCINT"/>
-                <signal pad-id="pb7" index="7" function="default" group="PCINT"/>
-                <signal pad-id="pd5" index="21" function="default" group="PCINT"/>
-                <signal pad-id="pd6" index="22" function="default" group="PCINT"/>
-                <signal pad-id="pd7" index="23" function="default" group="PCINT"/>
-                <signal pad-id="pb0" index="0" function="default" group="PCINT"/>
-                <signal pad-id="pb1" index="1" function="default" group="PCINT"/>
-                <signal pad-id="pb2" index="2" function="default" group="PCINT"/>
-                <signal pad-id="pb3" index="3" function="default" group="PCINT"/>
-                <signal pad-id="pb4" index="4" function="default" group="PCINT"/>
-                <signal pad-id="pb5" index="5" function="default" group="PCINT"/>
-                <signal pad-id="pc0" index="8" function="default" group="PCINT"/>
-                <signal pad-id="pc1" index="9" function="default" group="PCINT"/>
-                <signal pad-id="pc2" index="10" function="default" group="PCINT"/>
-                <signal pad-id="pc3" index="11" function="default" group="PCINT"/>
-                <signal pad-id="pc4" index="12" function="default" group="PCINT"/>
-                <signal pad-id="pc5" index="13" function="default" group="PCINT"/>
-                <signal pad-id="pc6" index="14" function="default" group="PCINT"/>
-                <signal pad-id="pd0" index="16" function="default" group="PCINT"/>
-                <signal pad-id="pd1" index="17" function="default" group="PCINT"/>
-                <signal pad-id="pd2" index="18" function="default" group="PCINT"/>
-                <signal pad-id="pd2" index="0" function="default" group="INT"/>
+                <signal pad-key="pd3" index="1" function="default" group="INT"/>
+                <signal pad-key="pd3" index="19" function="default" group="PCINT"/>
+                <signal pad-key="pd4" index="20" function="default" group="PCINT"/>
+                <signal pad-key="pb6" index="6" function="default" group="PCINT"/>
+                <signal pad-key="pb7" index="7" function="default" group="PCINT"/>
+                <signal pad-key="pd5" index="21" function="default" group="PCINT"/>
+                <signal pad-key="pd6" index="22" function="default" group="PCINT"/>
+                <signal pad-key="pd7" index="23" function="default" group="PCINT"/>
+                <signal pad-key="pb0" index="0" function="default" group="PCINT"/>
+                <signal pad-key="pb1" index="1" function="default" group="PCINT"/>
+                <signal pad-key="pb2" index="2" function="default" group="PCINT"/>
+                <signal pad-key="pb3" index="3" function="default" group="PCINT"/>
+                <signal pad-key="pb4" index="4" function="default" group="PCINT"/>
+                <signal pad-key="pb5" index="5" function="default" group="PCINT"/>
+                <signal pad-key="pc0" index="8" function="default" group="PCINT"/>
+                <signal pad-key="pc1" index="9" function="default" group="PCINT"/>
+                <signal pad-key="pc2" index="10" function="default" group="PCINT"/>
+                <signal pad-key="pc3" index="11" function="default" group="PCINT"/>
+                <signal pad-key="pc4" index="12" function="default" group="PCINT"/>
+                <signal pad-key="pc5" index="13" function="default" group="PCINT"/>
+                <signal pad-key="pc6" index="14" function="default" group="PCINT"/>
+                <signal pad-key="pd0" index="16" function="default" group="PCINT"/>
+                <signal pad-key="pd1" index="17" function="default" group="PCINT"/>
+                <signal pad-key="pd2" index="18" function="default" group="PCINT"/>
+                <signal pad-key="pd2" index="0" function="default" group="INT"/>
             </signals>
         </peripheral>
         <peripheral key="spi" name="SPI" module-key="spi">
             <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"/>
-                <signal pad-id="pb4" function="default" group="MISO"/>
-                <signal pad-id="pb5" function="default" group="SCK"/>
+                <signal pad-key="pb2" function="default" group="SS"/>
+                <signal pad-key="pb3" function="default" group="MOSI"/>
+                <signal pad-key="pb4" function="default" group="MISO"/>
+                <signal pad-key="pb5" function="default" group="SCK"/>
             </signals>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="wdt">
@@ -372,7 +372,7 @@
         <peripheral key="cpu" name="CPU" module-key="cpu">
             <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"/>
+                <signal pad-key="pb0" index="0" function="default" group="CLK"/>
             </signals>
         </peripheral>
         <peripheral key="deviceid" name="DEVICEID" module-key="deviceid">
@@ -811,80 +811,113 @@
             </register-group>
         </module>
     </modules>
+    <pads>
+        <pad key="pd3" name="PD3"/>
+        <pad key="pd4" name="PD4"/>
+        <pad key="pe0" name="PE0"/>
+        <pad key="vcc" name="VCC"/>
+        <pad key="gnd" name="GND"/>
+        <pad key="pe1" name="PE1"/>
+        <pad key="pb6" name="PB6"/>
+        <pad key="pb7" name="PB7"/>
+        <pad key="pd5" name="PD5"/>
+        <pad key="pd6" name="PD6"/>
+        <pad key="pd7" name="PD7"/>
+        <pad key="pb0" name="PB0"/>
+        <pad key="pb1" name="PB1"/>
+        <pad key="pb2" name="PB2"/>
+        <pad key="pb3" name="PB3"/>
+        <pad key="pb4" name="PB4"/>
+        <pad key="pb5" name="PB5"/>
+        <pad key="avcc" name="AVCC"/>
+        <pad key="pe2" name="PE2"/>
+        <pad key="aref" name="AREF"/>
+        <pad key="pe3" name="PE3"/>
+        <pad key="pc0" name="PC0"/>
+        <pad key="pc1" name="PC1"/>
+        <pad key="pc2" name="PC2"/>
+        <pad key="pc3" name="PC3"/>
+        <pad key="pc4" name="PC4"/>
+        <pad key="pc5" name="PC5"/>
+        <pad key="pc6" name="PC6"/>
+        <pad key="pd0" name="PD0"/>
+        <pad key="pd1" name="PD1"/>
+        <pad key="pd2" name="PD2"/>
+    </pads>
     <pinouts>
         <pinout key="tqfp32" name="TQFP32" type="qfp">
-            <pin position="1" pad="PD3"/>
-            <pin position="2" pad="PD4"/>
-            <pin position="3" pad="PE0"/>
-            <pin position="4" pad="VCC"/>
-            <pin position="5" pad="GND"/>
-            <pin position="6" pad="PE1"/>
-            <pin position="7" pad="PB6"/>
-            <pin position="8" pad="PB7"/>
-            <pin position="9" pad="PD5"/>
-            <pin position="10" pad="PD6"/>
-            <pin position="11" pad="PD7"/>
-            <pin position="12" pad="PB0"/>
-            <pin position="13" pad="PB1"/>
-            <pin position="14" pad="PB2"/>
-            <pin position="15" pad="PB3"/>
-            <pin position="16" pad="PB4"/>
-            <pin position="17" pad="PB5"/>
-            <pin position="18" pad="AVCC"/>
-            <pin position="19" pad="PE2"/>
-            <pin position="20" pad="AREF"/>
-            <pin position="21" pad="GND"/>
-            <pin position="22" pad="PE3"/>
-            <pin position="23" pad="PC0"/>
-            <pin position="24" pad="PC1"/>
-            <pin position="25" pad="PC2"/>
-            <pin position="26" pad="PC3"/>
-            <pin position="27" pad="PC4"/>
-            <pin position="28" pad="PC5"/>
-            <pin position="29" pad="PC6"/>
-            <pin position="30" pad="PD0"/>
-            <pin position="31" pad="PD1"/>
-            <pin position="32" pad="PD2"/>
+            <pin position="1" pad-key="pd3"/>
+            <pin position="2" pad-key="pd4"/>
+            <pin position="3" pad-key="pe0"/>
+            <pin position="4" pad-key="vcc"/>
+            <pin position="5" pad-key="gnd"/>
+            <pin position="6" pad-key="pe1"/>
+            <pin position="7" pad-key="pb6"/>
+            <pin position="8" pad-key="pb7"/>
+            <pin position="9" pad-key="pd5"/>
+            <pin position="10" pad-key="pd6"/>
+            <pin position="11" pad-key="pd7"/>
+            <pin position="12" pad-key="pb0"/>
+            <pin position="13" pad-key="pb1"/>
+            <pin position="14" pad-key="pb2"/>
+            <pin position="15" pad-key="pb3"/>
+            <pin position="16" pad-key="pb4"/>
+            <pin position="17" pad-key="pb5"/>
+            <pin position="18" pad-key="avcc"/>
+            <pin position="19" pad-key="pe2"/>
+            <pin position="20" pad-key="aref"/>
+            <pin position="21" pad-key="gnd"/>
+            <pin position="22" pad-key="pe3"/>
+            <pin position="23" pad-key="pc0"/>
+            <pin position="24" pad-key="pc1"/>
+            <pin position="25" pad-key="pc2"/>
+            <pin position="26" pad-key="pc3"/>
+            <pin position="27" pad-key="pc4"/>
+            <pin position="28" pad-key="pc5"/>
+            <pin position="29" pad-key="pc6"/>
+            <pin position="30" pad-key="pd0"/>
+            <pin position="31" pad-key="pd1"/>
+            <pin position="32" pad-key="pd2"/>
         </pinout>
         <pinout key="vqfn32" name="VQFN32" type="qfn">
-            <pin position="1" pad="PD3"/>
-            <pin position="2" pad="PD4"/>
-            <pin position="3" pad="PE0"/>
-            <pin position="4" pad="VCC"/>
-            <pin position="5" pad="GND"/>
-            <pin position="6" pad="PE1"/>
-            <pin position="7" pad="PB6"/>
-            <pin position="8" pad="PB7"/>
-            <pin position="9" pad="PD5"/>
-            <pin position="10" pad="PD6"/>
-            <pin position="11" pad="PD7"/>
-            <pin position="12" pad="PB0"/>
-            <pin position="13" pad="PB1"/>
-            <pin position="14" pad="PB2"/>
-            <pin position="15" pad="PB3"/>
-            <pin position="16" pad="PB4"/>
-            <pin position="17" pad="PB5"/>
-            <pin position="18" pad="AVCC"/>
-            <pin position="19" pad="PE2"/>
-            <pin position="20" pad="AREF"/>
-            <pin position="21" pad="GND"/>
-            <pin position="22" pad="PE3"/>
-            <pin position="23" pad="PC0"/>
-            <pin position="24" pad="PC1"/>
-            <pin position="25" pad="PC2"/>
-            <pin position="26" pad="PC3"/>
-            <pin position="27" pad="PC4"/>
-            <pin position="28" pad="PC5"/>
-            <pin position="29" pad="PC6"/>
-            <pin position="30" pad="PD0"/>
-            <pin position="31" pad="PD1"/>
-            <pin position="32" pad="PD2"/>
+            <pin position="1" pad-key="pd3"/>
+            <pin position="2" pad-key="pd4"/>
+            <pin position="3" pad-key="pe0"/>
+            <pin position="4" pad-key="vcc"/>
+            <pin position="5" pad-key="gnd"/>
+            <pin position="6" pad-key="pe1"/>
+            <pin position="7" pad-key="pb6"/>
+            <pin position="8" pad-key="pb7"/>
+            <pin position="9" pad-key="pd5"/>
+            <pin position="10" pad-key="pd6"/>
+            <pin position="11" pad-key="pd7"/>
+            <pin position="12" pad-key="pb0"/>
+            <pin position="13" pad-key="pb1"/>
+            <pin position="14" pad-key="pb2"/>
+            <pin position="15" pad-key="pb3"/>
+            <pin position="16" pad-key="pb4"/>
+            <pin position="17" pad-key="pb5"/>
+            <pin position="18" pad-key="avcc"/>
+            <pin position="19" pad-key="pe2"/>
+            <pin position="20" pad-key="aref"/>
+            <pin position="21" pad-key="gnd"/>
+            <pin position="22" pad-key="pe3"/>
+            <pin position="23" pad-key="pc0"/>
+            <pin position="24" pad-key="pc1"/>
+            <pin position="25" pad-key="pc2"/>
+            <pin position="26" pad-key="pc3"/>
+            <pin position="27" pad-key="pc4"/>
+            <pin position="28" pad-key="pc5"/>
+            <pin position="29" pad-key="pc6"/>
+            <pin position="30" pad-key="pd0"/>
+            <pin position="31" pad-key="pd1"/>
+            <pin position="32" pad-key="pd2"/>
         </pinout>
     </pinouts>
     <variants>
-        <variant name="ATmega168PB-AU" pinout-key="tqfp32" package="TQFP32"/>
-        <variant name="ATmega168PB-MU" pinout-key="vqfn32" package="VQFN32"/>
-        <variant name="ATmega168PB-AN" pinout-key="tqfp32" package="TQFP32"/>
-        <variant name="ATmega168PB-MN" pinout-key="vqfn32" package="VQFN32"/>
+        <variant key="atmega168pb_au" name="ATmega168PB-AU" pinout-key="tqfp32"/>
+        <variant key="atmega168pb_mu" name="ATmega168PB-MU" pinout-key="vqfn32"/>
+        <variant key="atmega168pb_an" name="ATmega168PB-AN" pinout-key="tqfp32"/>
+        <variant key="atmega168pb_mn" name="ATmega168PB-MN" pinout-key="vqfn32"/>
     </variants>
 </device>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA169A.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA169A.xml
index 0f890ef3..f320b73b 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA169A.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA169A.xml
@@ -194,25 +194,25 @@
         <peripheral key="tc0" name="TC0" module-key="tc8">
             <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"/>
+                <signal pad-key="pg4" function="default" group="T"/>
+                <signal pad-key="pb4" function="default" group="OCA"/>
             </signals>
         </peripheral>
         <peripheral key="tc1" name="TC1" module-key="tc16">
             <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"/>
-                <signal pad-id="pb5" function="default" group="OCA"/>
-                <signal pad-id="pb6" function="default" group="OCB"/>
-                <signal pad-id="xtal1" function="default" group="TOSC"/>
+                <signal pad-key="pg3" function="default" group="T"/>
+                <signal pad-key="pd0" function="default" group="ICP"/>
+                <signal pad-key="pb5" function="default" group="OCA"/>
+                <signal pad-key="pb6" function="default" group="OCB"/>
+                <signal pad-key="xtal1" function="default" group="TOSC"/>
             </signals>
         </peripheral>
         <peripheral key="tc2" name="TC2" module-key="tc8_async">
             <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"/>
+                <signal pad-key="pb7" function="default" group="OCA"/>
+                <signal pad-key="xtal2" function="default" group="TOSC"/>
             </signals>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="wdt">
@@ -224,197 +224,197 @@
         <peripheral key="spi" name="SPI" module-key="spi">
             <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"/>
-                <signal pad-id="pb2" function="default" group="MOSI"/>
-                <signal pad-id="pb3" function="default" group="MISO"/>
+                <signal pad-key="pb0" function="default" group="SS"/>
+                <signal pad-key="pb1" function="default" group="SCK"/>
+                <signal pad-key="pb2" function="default" group="MOSI"/>
+                <signal pad-key="pb3" function="default" group="MISO"/>
             </signals>
         </peripheral>
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pa2" index="2" function="default" group="P"/>
-                <signal pad-id="pa3" index="3" function="default" group="P"/>
-                <signal pad-id="pa4" index="4" function="default" group="P"/>
-                <signal pad-id="pa5" index="5" function="default" group="P"/>
-                <signal pad-id="pa6" index="6" function="default" group="P"/>
-                <signal pad-id="pa7" index="7" function="default" group="P"/>
+                <signal pad-key="pa0" index="0" function="default" group="P"/>
+                <signal pad-key="pa1" index="1" function="default" group="P"/>
+                <signal pad-key="pa2" index="2" function="default" group="P"/>
+                <signal pad-key="pa3" index="3" function="default" group="P"/>
+                <signal pad-key="pa4" index="4" function="default" group="P"/>
+                <signal pad-key="pa5" index="5" function="default" group="P"/>
+                <signal pad-key="pa6" index="6" function="default" group="P"/>
+                <signal pad-key="pa7" index="7" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pb2" index="2" function="default" group="P"/>
-                <signal pad-id="pb3" index="3" function="default" group="P"/>
-                <signal pad-id="pb4" index="4" function="default" group="P"/>
-                <signal pad-id="pb5" index="5" function="default" group="P"/>
-                <signal pad-id="pb6" index="6" function="default" group="P"/>
-                <signal pad-id="pb7" index="7" function="default" group="P"/>
+                <signal pad-key="pb0" index="0" function="default" group="P"/>
+                <signal pad-key="pb1" index="1" function="default" group="P"/>
+                <signal pad-key="pb2" index="2" function="default" group="P"/>
+                <signal pad-key="pb3" index="3" function="default" group="P"/>
+                <signal pad-key="pb4" index="4" function="default" group="P"/>
+                <signal pad-key="pb5" index="5" function="default" group="P"/>
+                <signal pad-key="pb6" index="6" function="default" group="P"/>
+                <signal pad-key="pb7" index="7" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pc2" index="2" function="default" group="P"/>
-                <signal pad-id="pc3" index="3" function="default" group="P"/>
-                <signal pad-id="pc4" index="4" function="default" group="P"/>
-                <signal pad-id="pc5" index="5" function="default" group="P"/>
-                <signal pad-id="pc6" index="6" function="default" group="P"/>
-                <signal pad-id="pc7" index="7" function="default" group="P"/>
+                <signal pad-key="pc0" index="0" function="default" group="P"/>
+                <signal pad-key="pc1" index="1" function="default" group="P"/>
+                <signal pad-key="pc2" index="2" function="default" group="P"/>
+                <signal pad-key="pc3" index="3" function="default" group="P"/>
+                <signal pad-key="pc4" index="4" function="default" group="P"/>
+                <signal pad-key="pc5" index="5" function="default" group="P"/>
+                <signal pad-key="pc6" index="6" function="default" group="P"/>
+                <signal pad-key="pc7" index="7" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pd2" index="2" function="default" group="P"/>
-                <signal pad-id="pd3" index="3" function="default" group="P"/>
-                <signal pad-id="pd4" index="4" function="default" group="P"/>
-                <signal pad-id="pd5" index="5" function="default" group="P"/>
-                <signal pad-id="pd6" index="6" function="default" group="P"/>
-                <signal pad-id="pd7" index="7" function="default" group="P"/>
+                <signal pad-key="pd0" index="0" function="default" group="P"/>
+                <signal pad-key="pd1" index="1" function="default" group="P"/>
+                <signal pad-key="pd2" index="2" function="default" group="P"/>
+                <signal pad-key="pd3" index="3" function="default" group="P"/>
+                <signal pad-key="pd4" index="4" function="default" group="P"/>
+                <signal pad-key="pd5" index="5" function="default" group="P"/>
+                <signal pad-key="pd6" index="6" function="default" group="P"/>
+                <signal pad-key="pd7" index="7" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="porte" name="PORTE" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pe2" index="2" function="default" group="P"/>
-                <signal pad-id="pe3" index="3" function="default" group="P"/>
-                <signal pad-id="pe4" index="4" function="default" group="P"/>
-                <signal pad-id="pe5" index="5" function="default" group="P"/>
-                <signal pad-id="pe6" index="6" function="default" group="P"/>
-                <signal pad-id="pe7" index="7" function="default" group="P"/>
+                <signal pad-key="pe0" index="0" function="default" group="P"/>
+                <signal pad-key="pe1" index="1" function="default" group="P"/>
+                <signal pad-key="pe2" index="2" function="default" group="P"/>
+                <signal pad-key="pe3" index="3" function="default" group="P"/>
+                <signal pad-key="pe4" index="4" function="default" group="P"/>
+                <signal pad-key="pe5" index="5" function="default" group="P"/>
+                <signal pad-key="pe6" index="6" function="default" group="P"/>
+                <signal pad-key="pe7" index="7" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portf" name="PORTF" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pf2" index="2" function="default" group="P"/>
-                <signal pad-id="pf3" index="3" function="default" group="P"/>
-                <signal pad-id="pf4" index="4" function="default" group="P"/>
-                <signal pad-id="pf5" index="5" function="default" group="P"/>
-                <signal pad-id="pf6" index="6" function="default" group="P"/>
-                <signal pad-id="pf7" index="7" function="default" group="P"/>
+                <signal pad-key="pf0" index="0" function="default" group="P"/>
+                <signal pad-key="pf1" index="1" function="default" group="P"/>
+                <signal pad-key="pf2" index="2" function="default" group="P"/>
+                <signal pad-key="pf3" index="3" function="default" group="P"/>
+                <signal pad-key="pf4" index="4" function="default" group="P"/>
+                <signal pad-key="pf5" index="5" function="default" group="P"/>
+                <signal pad-key="pf6" index="6" function="default" group="P"/>
+                <signal pad-key="pf7" index="7" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portg" name="PORTG" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pg2" index="2" function="default" group="P"/>
-                <signal pad-id="pg3" index="3" function="default" group="P"/>
-                <signal pad-id="pg4" index="4" function="default" group="P"/>
-                <signal pad-id="pg5" index="4" function="default" group="P"/>
+                <signal pad-key="pg0" index="0" function="default" group="P"/>
+                <signal pad-key="pg1" index="1" function="default" group="P"/>
+                <signal pad-key="pg2" index="2" function="default" group="P"/>
+                <signal pad-key="pg3" index="3" function="default" group="P"/>
+                <signal pad-key="pg4" index="4" function="default" group="P"/>
+                <signal pad-key="pg5" index="4" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="ac" name="AC" module-key="ac">
             <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"/>
+                <signal pad-key="pe2" index="0" function="default" group="AIN"/>
+                <signal pad-key="pe3" index="1" function="default" group="AIN"/>
             </signals>
         </peripheral>
         <peripheral key="jtag" name="JTAG" module-key="jtag">
             <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"/>
-                <signal pad-id="pf6" function="default" group="TDO"/>
-                <signal pad-id="pf7" function="default" group="TDI"/>
+                <signal pad-key="pf4" function="default" group="TCK"/>
+                <signal pad-key="pf5" function="default" group="TMS"/>
+                <signal pad-key="pf6" function="default" group="TDO"/>
+                <signal pad-key="pf7" function="default" group="TDI"/>
             </signals>
         </peripheral>
         <peripheral key="lcd" name="LCD" module-key="lcd">
             <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"/>
-                <signal pad-id="pa6" index="2" function="default" group="SEG"/>
-                <signal pad-id="pa7" index="3" function="default" group="SEG"/>
-                <signal pad-id="pg2" index="4" function="default" group="SEG"/>
-                <signal pad-id="pc7" index="5" function="default" group="SEG"/>
-                <signal pad-id="pc6" index="6" function="default" group="SEG"/>
-                <signal pad-id="pc5" index="7" function="default" group="SEG"/>
-                <signal pad-id="pc4" index="8" function="default" group="SEG"/>
-                <signal pad-id="pc3" index="9" function="default" group="SEG"/>
-                <signal pad-id="pc2" index="10" function="default" group="SEG"/>
-                <signal pad-id="pc1" index="11" function="default" group="SEG"/>
-                <signal pad-id="pc0" index="12" function="default" group="SEG"/>
-                <signal pad-id="pg1" index="13" function="default" group="SEG"/>
-                <signal pad-id="pg2" index="14" function="default" group="SEG"/>
-                <signal pad-id="pd7" index="15" function="default" group="SEG"/>
-                <signal pad-id="pd6" index="16" function="default" group="SEG"/>
-                <signal pad-id="pd5" index="17" function="default" group="SEG"/>
-                <signal pad-id="pd4" index="18" function="default" group="SEG"/>
-                <signal pad-id="pd3" index="19" function="default" group="SEG"/>
-                <signal pad-id="pd2" index="20" function="default" group="SEG"/>
-                <signal pad-id="pd1" index="21" function="default" group="SEG"/>
-                <signal pad-id="pd0" index="22" function="default" group="SEG"/>
-                <signal pad-id="pg4" index="23" function="default" group="SEG"/>
-                <signal pad-id="pg3" index="24" function="default" group="SEG"/>
-                <signal pad-id="pa0" index="0" function="default" group="COM"/>
-                <signal pad-id="pa1" index="1" function="default" group="COM"/>
-                <signal pad-id="pa2" index="2" function="default" group="COM"/>
-                <signal pad-id="pa3" index="3" function="default" group="COM"/>
+                <signal pad-key="pa4" index="0" function="default" group="SEG"/>
+                <signal pad-key="pa5" index="1" function="default" group="SEG"/>
+                <signal pad-key="pa6" index="2" function="default" group="SEG"/>
+                <signal pad-key="pa7" index="3" function="default" group="SEG"/>
+                <signal pad-key="pg2" index="4" function="default" group="SEG"/>
+                <signal pad-key="pc7" index="5" function="default" group="SEG"/>
+                <signal pad-key="pc6" index="6" function="default" group="SEG"/>
+                <signal pad-key="pc5" index="7" function="default" group="SEG"/>
+                <signal pad-key="pc4" index="8" function="default" group="SEG"/>
+                <signal pad-key="pc3" index="9" function="default" group="SEG"/>
+                <signal pad-key="pc2" index="10" function="default" group="SEG"/>
+                <signal pad-key="pc1" index="11" function="default" group="SEG"/>
+                <signal pad-key="pc0" index="12" function="default" group="SEG"/>
+                <signal pad-key="pg1" index="13" function="default" group="SEG"/>
+                <signal pad-key="pg2" index="14" function="default" group="SEG"/>
+                <signal pad-key="pd7" index="15" function="default" group="SEG"/>
+                <signal pad-key="pd6" index="16" function="default" group="SEG"/>
+                <signal pad-key="pd5" index="17" function="default" group="SEG"/>
+                <signal pad-key="pd4" index="18" function="default" group="SEG"/>
+                <signal pad-key="pd3" index="19" function="default" group="SEG"/>
+                <signal pad-key="pd2" index="20" function="default" group="SEG"/>
+                <signal pad-key="pd1" index="21" function="default" group="SEG"/>
+                <signal pad-key="pd0" index="22" function="default" group="SEG"/>
+                <signal pad-key="pg4" index="23" function="default" group="SEG"/>
+                <signal pad-key="pg3" index="24" function="default" group="SEG"/>
+                <signal pad-key="pa0" index="0" function="default" group="COM"/>
+                <signal pad-key="pa1" index="1" function="default" group="COM"/>
+                <signal pad-key="pa2" index="2" function="default" group="COM"/>
+                <signal pad-key="pa3" index="3" function="default" group="COM"/>
             </signals>
         </peripheral>
         <peripheral key="exint" name="EXINT" module-key="exint">
             <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"/>
-                <signal pad-id="pe2" index="2" function="default" group="PCINT"/>
-                <signal pad-id="pe3" index="3" function="default" group="PCINT"/>
-                <signal pad-id="pe4" index="4" function="default" group="PCINT"/>
-                <signal pad-id="pe5" index="5" function="default" group="PCINT"/>
-                <signal pad-id="pe6" index="6" function="default" group="PCINT"/>
-                <signal pad-id="pe7" index="7" function="default" group="PCINT"/>
-                <signal pad-id="pb0" index="8" function="default" group="PCINT"/>
-                <signal pad-id="pb1" index="9" function="default" group="PCINT"/>
-                <signal pad-id="pb2" index="10" function="default" group="PCINT"/>
-                <signal pad-id="pb3" index="11" function="default" group="PCINT"/>
-                <signal pad-id="pb4" index="12" function="default" group="PCINT"/>
-                <signal pad-id="pb5" index="13" function="default" group="PCINT"/>
-                <signal pad-id="pb6" index="14" function="default" group="PCINT"/>
-                <signal pad-id="pb7" index="15" function="default" group="PCINT"/>
-                <signal pad-id="pd1" index="0" function="default" group="INT"/>
+                <signal pad-key="pe0" index="0" function="default" group="PCINT"/>
+                <signal pad-key="pe1" index="1" function="default" group="PCINT"/>
+                <signal pad-key="pe2" index="2" function="default" group="PCINT"/>
+                <signal pad-key="pe3" index="3" function="default" group="PCINT"/>
+                <signal pad-key="pe4" index="4" function="default" group="PCINT"/>
+                <signal pad-key="pe5" index="5" function="default" group="PCINT"/>
+                <signal pad-key="pe6" index="6" function="default" group="PCINT"/>
+                <signal pad-key="pe7" index="7" function="default" group="PCINT"/>
+                <signal pad-key="pb0" index="8" function="default" group="PCINT"/>
+                <signal pad-key="pb1" index="9" function="default" group="PCINT"/>
+                <signal pad-key="pb2" index="10" function="default" group="PCINT"/>
+                <signal pad-key="pb3" index="11" function="default" group="PCINT"/>
+                <signal pad-key="pb4" index="12" function="default" group="PCINT"/>
+                <signal pad-key="pb5" index="13" function="default" group="PCINT"/>
+                <signal pad-key="pb6" index="14" function="default" group="PCINT"/>
+                <signal pad-key="pb7" index="15" function="default" group="PCINT"/>
+                <signal pad-key="pd1" index="0" function="default" group="INT"/>
             </signals>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="cpu">
             <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"/>
+                <signal pad-key="pe7" index="0" function="default" group="CLK"/>
             </signals>
         </peripheral>
         <peripheral key="usi" name="USI" module-key="usi">
             <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"/>
+                <signal pad-key="pe5" function="default" group="DI"/>
+                <signal pad-key="pe6" function="default" group="DO"/>
             </signals>
         </peripheral>
         <peripheral key="adc" name="ADC" module-key="adc">
             <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"/>
-                <signal pad-id="pf2" index="2" function="default" group="ADC"/>
-                <signal pad-id="pf3" index="3" function="default" group="ADC"/>
-                <signal pad-id="pf4" index="4" function="default" group="ADC"/>
-                <signal pad-id="pf5" index="5" function="default" group="ADC"/>
-                <signal pad-id="pf6" index="6" function="default" group="ADC"/>
-                <signal pad-id="pf7" index="7" function="default" group="ADC"/>
+                <signal pad-key="pf0" index="0" function="default" group="ADC"/>
+                <signal pad-key="pf1" index="1" function="default" group="ADC"/>
+                <signal pad-key="pf2" index="2" function="default" group="ADC"/>
+                <signal pad-key="pf3" index="3" function="default" group="ADC"/>
+                <signal pad-key="pf4" index="4" function="default" group="ADC"/>
+                <signal pad-key="pf5" index="5" function="default" group="ADC"/>
+                <signal pad-key="pf6" index="6" function="default" group="ADC"/>
+                <signal pad-key="pf7" index="7" function="default" group="ADC"/>
             </signals>
         </peripheral>
         <peripheral key="boot_load" name="BOOT_LOAD" module-key="boot_load">
@@ -423,10 +423,10 @@
         <peripheral key="usart0" name="USART0" module-key="usart">
             <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"/>
-                <signal pad-id="pe2" function="default" group="XCK"/>
-                <signal pad-id="pe4" function="default" group="USCK"/>
+                <signal pad-key="pe0" function="default" group="RXD"/>
+                <signal pad-key="pe1" function="default" group="TXD"/>
+                <signal pad-key="pe2" function="default" group="XCK"/>
+                <signal pad-key="pe4" function="default" group="USCK"/>
             </signals>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="fuse">
@@ -879,211 +879,274 @@
             </register-group>
         </module>
     </modules>
+    <pads>
+        <pad key="lcdcap" name="LCDCAP"/>
+        <pad key="pe0" name="PE0"/>
+        <pad key="pe1" name="PE1"/>
+        <pad key="pe2" name="PE2"/>
+        <pad key="pe3" name="PE3"/>
+        <pad key="pe4" name="PE4"/>
+        <pad key="pe5" name="PE5"/>
+        <pad key="pe6" name="PE6"/>
+        <pad key="pe7" name="PE7"/>
+        <pad key="pb0" name="PB0"/>
+        <pad key="pb1" name="PB1"/>
+        <pad key="pb2" name="PB2"/>
+        <pad key="pb3" name="PB3"/>
+        <pad key="pb4" name="PB4"/>
+        <pad key="pb5" name="PB5"/>
+        <pad key="pb6" name="PB6"/>
+        <pad key="pb7" name="PB7"/>
+        <pad key="pg3" name="PG3"/>
+        <pad key="pg4" name="PG4"/>
+        <pad key="pg5" name="PG5"/>
+        <pad key="vcc" name="VCC"/>
+        <pad key="gnd" name="GND"/>
+        <pad key="xtal2" name="XTAL2"/>
+        <pad key="xtal1" name="XTAL1"/>
+        <pad key="pd0" name="PD0"/>
+        <pad key="pd1" name="PD1"/>
+        <pad key="pd2" name="PD2"/>
+        <pad key="pd3" name="PD3"/>
+        <pad key="pd4" name="PD4"/>
+        <pad key="pd5" name="PD5"/>
+        <pad key="pd6" name="PD6"/>
+        <pad key="pd7" name="PD7"/>
+        <pad key="pg0" name="PG0"/>
+        <pad key="pg1" name="PG1"/>
+        <pad key="pc0" name="PC0"/>
+        <pad key="pc1" name="PC1"/>
+        <pad key="pc2" name="PC2"/>
+        <pad key="pc3" name="PC3"/>
+        <pad key="pc4" name="PC4"/>
+        <pad key="pc5" name="PC5"/>
+        <pad key="pc6" name="PC6"/>
+        <pad key="pc7" name="PC7"/>
+        <pad key="pg2" name="PG2"/>
+        <pad key="pa7" name="PA7"/>
+        <pad key="pa6" name="PA6"/>
+        <pad key="pa5" name="PA5"/>
+        <pad key="pa4" name="PA4"/>
+        <pad key="pa3" name="PA3"/>
+        <pad key="pa2" name="PA2"/>
+        <pad key="pa1" name="PA1"/>
+        <pad key="pa0" name="PA0"/>
+        <pad key="pf7" name="PF7"/>
+        <pad key="pf6" name="PF6"/>
+        <pad key="pf5" name="PF5"/>
+        <pad key="pf4" name="PF4"/>
+        <pad key="pf3" name="PF3"/>
+        <pad key="pf2" name="PF2"/>
+        <pad key="pf1" name="PF1"/>
+        <pad key="pf0" name="PF0"/>
+        <pad key="aref" name="AREF"/>
+        <pad key="avcc" name="AVCC"/>
+    </pads>
     <pinouts>
         <pinout key="tqfp64" name="TQFP64" type="qfp">
-            <pin position="1" pad="LCDCAP"/>
-            <pin position="2" pad="PE0"/>
-            <pin position="3" pad="PE1"/>
-            <pin position="4" pad="PE2"/>
-            <pin position="5" pad="PE3"/>
-            <pin position="6" pad="PE4"/>
-            <pin position="7" pad="PE5"/>
-            <pin position="8" pad="PE6"/>
-            <pin position="9" pad="PE7"/>
-            <pin position="10" pad="PB0"/>
-            <pin position="11" pad="PB1"/>
-            <pin position="12" pad="PB2"/>
-            <pin position="13" pad="PB3"/>
-            <pin position="14" pad="PB4"/>
-            <pin position="15" pad="PB5"/>
-            <pin position="16" pad="PB6"/>
-            <pin position="17" pad="PB7"/>
-            <pin position="18" pad="PG3"/>
-            <pin position="19" pad="PG4"/>
-            <pin position="20" pad="PG5"/>
-            <pin position="21" pad="VCC"/>
-            <pin position="22" pad="GND"/>
-            <pin position="23" pad="XTAL2"/>
-            <pin position="24" pad="XTAL1"/>
-            <pin position="25" pad="PD0"/>
-            <pin position="26" pad="PD1"/>
-            <pin position="27" pad="PD2"/>
-            <pin position="28" pad="PD3"/>
-            <pin position="29" pad="PD4"/>
-            <pin position="30" pad="PD5"/>
-            <pin position="31" pad="PD6"/>
-            <pin position="32" pad="PD7"/>
-            <pin position="33" pad="PG0"/>
-            <pin position="34" pad="PG1"/>
-            <pin position="35" pad="PC0"/>
-            <pin position="36" pad="PC1"/>
-            <pin position="37" pad="PC2"/>
-            <pin position="38" pad="PC3"/>
-            <pin position="39" pad="PC4"/>
-            <pin position="40" pad="PC5"/>
-            <pin position="41" pad="PC6"/>
-            <pin position="42" pad="PC7"/>
-            <pin position="43" pad="PG2"/>
-            <pin position="44" pad="PA7"/>
-            <pin position="45" pad="PA6"/>
-            <pin position="46" pad="PA5"/>
-            <pin position="47" pad="PA4"/>
-            <pin position="48" pad="PA3"/>
-            <pin position="49" pad="PA2"/>
-            <pin position="50" pad="PA1"/>
-            <pin position="51" pad="PA0"/>
-            <pin position="52" pad="VCC"/>
-            <pin position="53" pad="GND"/>
-            <pin position="54" pad="PF7"/>
-            <pin position="55" pad="PF6"/>
-            <pin position="56" pad="PF5"/>
-            <pin position="57" pad="PF4"/>
-            <pin position="58" pad="PF3"/>
-            <pin position="59" pad="PF2"/>
-            <pin position="60" pad="PF1"/>
-            <pin position="61" pad="PF0"/>
-            <pin position="62" pad="AREF"/>
-            <pin position="63" pad="GND"/>
-            <pin position="64" pad="AVCC"/>
+            <pin position="1" pad-key="lcdcap"/>
+            <pin position="2" pad-key="pe0"/>
+            <pin position="3" pad-key="pe1"/>
+            <pin position="4" pad-key="pe2"/>
+            <pin position="5" pad-key="pe3"/>
+            <pin position="6" pad-key="pe4"/>
+            <pin position="7" pad-key="pe5"/>
+            <pin position="8" pad-key="pe6"/>
+            <pin position="9" pad-key="pe7"/>
+            <pin position="10" pad-key="pb0"/>
+            <pin position="11" pad-key="pb1"/>
+            <pin position="12" pad-key="pb2"/>
+            <pin position="13" pad-key="pb3"/>
+            <pin position="14" pad-key="pb4"/>
+            <pin position="15" pad-key="pb5"/>
+            <pin position="16" pad-key="pb6"/>
+            <pin position="17" pad-key="pb7"/>
+            <pin position="18" pad-key="pg3"/>
+            <pin position="19" pad-key="pg4"/>
+            <pin position="20" pad-key="pg5"/>
+            <pin position="21" pad-key="vcc"/>
+            <pin position="22" pad-key="gnd"/>
+            <pin position="23" pad-key="xtal2"/>
+            <pin position="24" pad-key="xtal1"/>
+            <pin position="25" pad-key="pd0"/>
+            <pin position="26" pad-key="pd1"/>
+            <pin position="27" pad-key="pd2"/>
+            <pin position="28" pad-key="pd3"/>
+            <pin position="29" pad-key="pd4"/>
+            <pin position="30" pad-key="pd5"/>
+            <pin position="31" pad-key="pd6"/>
+            <pin position="32" pad-key="pd7"/>
+            <pin position="33" pad-key="pg0"/>
+            <pin position="34" pad-key="pg1"/>
+            <pin position="35" pad-key="pc0"/>
+            <pin position="36" pad-key="pc1"/>
+            <pin position="37" pad-key="pc2"/>
+            <pin position="38" pad-key="pc3"/>
+            <pin position="39" pad-key="pc4"/>
+            <pin position="40" pad-key="pc5"/>
+            <pin position="41" pad-key="pc6"/>
+            <pin position="42" pad-key="pc7"/>
+            <pin position="43" pad-key="pg2"/>
+            <pin position="44" pad-key="pa7"/>
+            <pin position="45" pad-key="pa6"/>
+            <pin position="46" pad-key="pa5"/>
+            <pin position="47" pad-key="pa4"/>
+            <pin position="48" pad-key="pa3"/>
+            <pin position="49" pad-key="pa2"/>
+            <pin position="50" pad-key="pa1"/>
+            <pin position="51" pad-key="pa0"/>
+            <pin position="52" pad-key="vcc"/>
+            <pin position="53" pad-key="gnd"/>
+            <pin position="54" pad-key="pf7"/>
+            <pin position="55" pad-key="pf6"/>
+            <pin position="56" pad-key="pf5"/>
+            <pin position="57" pad-key="pf4"/>
+            <pin position="58" pad-key="pf3"/>
+            <pin position="59" pad-key="pf2"/>
+            <pin position="60" pad-key="pf1"/>
+            <pin position="61" pad-key="pf0"/>
+            <pin position="62" pad-key="aref"/>
+            <pin position="63" pad-key="gnd"/>
+            <pin position="64" pad-key="avcc"/>
         </pinout>
         <pinout key="qfn64" name="QFN64" type="qfn">
-            <pin position="1" pad="LCDCAP"/>
-            <pin position="2" pad="PE0"/>
-            <pin position="3" pad="PE1"/>
-            <pin position="4" pad="PE2"/>
-            <pin position="5" pad="PE3"/>
-            <pin position="6" pad="PE4"/>
-            <pin position="7" pad="PE5"/>
-            <pin position="8" pad="PE6"/>
-            <pin position="9" pad="PE7"/>
-            <pin position="10" pad="PB0"/>
-            <pin position="11" pad="PB1"/>
-            <pin position="12" pad="PB2"/>
-            <pin position="13" pad="PB3"/>
-            <pin position="14" pad="PB4"/>
-            <pin position="15" pad="PB5"/>
-            <pin position="16" pad="PB6"/>
-            <pin position="17" pad="PB7"/>
-            <pin position="18" pad="PG3"/>
-            <pin position="19" pad="PG4"/>
-            <pin position="20" pad="PG5"/>
-            <pin position="21" pad="VCC"/>
-            <pin position="22" pad="GND"/>
-            <pin position="23" pad="XTAL2"/>
-            <pin position="24" pad="XTAL1"/>
-            <pin position="25" pad="PD0"/>
-            <pin position="26" pad="PD1"/>
-            <pin position="27" pad="PD2"/>
-            <pin position="28" pad="PD3"/>
-            <pin position="29" pad="PD4"/>
-            <pin position="30" pad="PD5"/>
-            <pin position="31" pad="PD6"/>
-            <pin position="32" pad="PD7"/>
-            <pin position="33" pad="PG0"/>
-            <pin position="34" pad="PG1"/>
-            <pin position="35" pad="PC0"/>
-            <pin position="36" pad="PC1"/>
-            <pin position="37" pad="PC2"/>
-            <pin position="38" pad="PC3"/>
-            <pin position="39" pad="PC4"/>
-            <pin position="40" pad="PC5"/>
-            <pin position="41" pad="PC6"/>
-            <pin position="42" pad="PC7"/>
-            <pin position="43" pad="PG2"/>
-            <pin position="44" pad="PA7"/>
-            <pin position="45" pad="PA6"/>
-            <pin position="46" pad="PA5"/>
-            <pin position="47" pad="PA4"/>
-            <pin position="48" pad="PA3"/>
-            <pin position="49" pad="PA2"/>
-            <pin position="50" pad="PA1"/>
-            <pin position="51" pad="PA0"/>
-            <pin position="52" pad="VCC"/>
-            <pin position="53" pad="GND"/>
-            <pin position="54" pad="PF7"/>
-            <pin position="55" pad="PF6"/>
-            <pin position="56" pad="PF5"/>
-            <pin position="57" pad="PF4"/>
-            <pin position="58" pad="PF3"/>
-            <pin position="59" pad="PF2"/>
-            <pin position="60" pad="PF1"/>
-            <pin position="61" pad="PF0"/>
-            <pin position="62" pad="AREF"/>
-            <pin position="63" pad="GND"/>
-            <pin position="64" pad="AVCC"/>
+            <pin position="1" pad-key="lcdcap"/>
+            <pin position="2" pad-key="pe0"/>
+            <pin position="3" pad-key="pe1"/>
+            <pin position="4" pad-key="pe2"/>
+            <pin position="5" pad-key="pe3"/>
+            <pin position="6" pad-key="pe4"/>
+            <pin position="7" pad-key="pe5"/>
+            <pin position="8" pad-key="pe6"/>
+            <pin position="9" pad-key="pe7"/>
+            <pin position="10" pad-key="pb0"/>
+            <pin position="11" pad-key="pb1"/>
+            <pin position="12" pad-key="pb2"/>
+            <pin position="13" pad-key="pb3"/>
+            <pin position="14" pad-key="pb4"/>
+            <pin position="15" pad-key="pb5"/>
+            <pin position="16" pad-key="pb6"/>
+            <pin position="17" pad-key="pb7"/>
+            <pin position="18" pad-key="pg3"/>
+            <pin position="19" pad-key="pg4"/>
+            <pin position="20" pad-key="pg5"/>
+            <pin position="21" pad-key="vcc"/>
+            <pin position="22" pad-key="gnd"/>
+            <pin position="23" pad-key="xtal2"/>
+            <pin position="24" pad-key="xtal1"/>
+            <pin position="25" pad-key="pd0"/>
+            <pin position="26" pad-key="pd1"/>
+            <pin position="27" pad-key="pd2"/>
+            <pin position="28" pad-key="pd3"/>
+            <pin position="29" pad-key="pd4"/>
+            <pin position="30" pad-key="pd5"/>
+            <pin position="31" pad-key="pd6"/>
+            <pin position="32" pad-key="pd7"/>
+            <pin position="33" pad-key="pg0"/>
+            <pin position="34" pad-key="pg1"/>
+            <pin position="35" pad-key="pc0"/>
+            <pin position="36" pad-key="pc1"/>
+            <pin position="37" pad-key="pc2"/>
+            <pin position="38" pad-key="pc3"/>
+            <pin position="39" pad-key="pc4"/>
+            <pin position="40" pad-key="pc5"/>
+            <pin position="41" pad-key="pc6"/>
+            <pin position="42" pad-key="pc7"/>
+            <pin position="43" pad-key="pg2"/>
+            <pin position="44" pad-key="pa7"/>
+            <pin position="45" pad-key="pa6"/>
+            <pin position="46" pad-key="pa5"/>
+            <pin position="47" pad-key="pa4"/>
+            <pin position="48" pad-key="pa3"/>
+            <pin position="49" pad-key="pa2"/>
+            <pin position="50" pad-key="pa1"/>
+            <pin position="51" pad-key="pa0"/>
+            <pin position="52" pad-key="vcc"/>
+            <pin position="53" pad-key="gnd"/>
+            <pin position="54" pad-key="pf7"/>
+            <pin position="55" pad-key="pf6"/>
+            <pin position="56" pad-key="pf5"/>
+            <pin position="57" pad-key="pf4"/>
+            <pin position="58" pad-key="pf3"/>
+            <pin position="59" pad-key="pf2"/>
+            <pin position="60" pad-key="pf1"/>
+            <pin position="61" pad-key="pf0"/>
+            <pin position="62" pad-key="aref"/>
+            <pin position="63" pad-key="gnd"/>
+            <pin position="64" pad-key="avcc"/>
         </pinout>
         <pinout key="drqfn64" name="DRQFN64" type="drqfn">
-            <pin position="B1" pad="LCDCAP"/>
-            <pin position="A1" pad="PE0"/>
-            <pin position="A2" pad="PE1"/>
-            <pin position="B2" pad="PE2"/>
-            <pin position="A3" pad="PE3"/>
-            <pin position="B3" pad="PE4"/>
-            <pin position="A4" pad="PE5"/>
-            <pin position="B4" pad="PE6"/>
-            <pin position="A5" pad="PE7"/>
-            <pin position="B5" pad="PB0"/>
-            <pin position="A6" pad="PB1"/>
-            <pin position="B6" pad="PB2"/>
-            <pin position="A7" pad="PB3"/>
-            <pin position="A8" pad="PB4"/>
-            <pin position="B7" pad="PB5"/>
-            <pin position="B8" pad="PB6"/>
-            <pin position="A9" pad="PB7"/>
-            <pin position="A10" pad="PG3"/>
-            <pin position="B9" pad="PG4"/>
-            <pin position="A11" pad="PG5"/>
-            <pin position="B10" pad="VCC"/>
-            <pin position="A12" pad="GND"/>
-            <pin position="B11" pad="XTAL2"/>
-            <pin position="A13" pad="XTAL1"/>
-            <pin position="B12" pad="PD0"/>
-            <pin position="A14" pad="PD1"/>
-            <pin position="B13" pad="PD2"/>
-            <pin position="A15" pad="PD3"/>
-            <pin position="B14" pad="PD4"/>
-            <pin position="A16" pad="PD5"/>
-            <pin position="A17" pad="PD6"/>
-            <pin position="B15" pad="PD7"/>
-            <pin position="B16" pad="PG0"/>
-            <pin position="A18" pad="PG1"/>
-            <pin position="A19" pad="PC0"/>
-            <pin position="B17" pad="PC1"/>
-            <pin position="A20" pad="PC2"/>
-            <pin position="B18" pad="PC3"/>
-            <pin position="A21" pad="PC4"/>
-            <pin position="B19" pad="PC5"/>
-            <pin position="A22" pad="PC6"/>
-            <pin position="B20" pad="PC7"/>
-            <pin position="A23" pad="PG2"/>
-            <pin position="B21" pad="PA7"/>
-            <pin position="A24" pad="PA6"/>
-            <pin position="A25" pad="PA5"/>
-            <pin position="B22" pad="PA4"/>
-            <pin position="B23" pad="PA3"/>
-            <pin position="A26" pad="PA2"/>
-            <pin position="A27" pad="PA1"/>
-            <pin position="B24" pad="PA0"/>
-            <pin position="A28" pad="VCC"/>
-            <pin position="B25" pad="GND"/>
-            <pin position="A29" pad="PF7"/>
-            <pin position="B26" pad="PF6"/>
-            <pin position="A30" pad="PF5"/>
-            <pin position="B27" pad="PF4"/>
-            <pin position="A31" pad="PF3"/>
-            <pin position="B28" pad="PF2"/>
-            <pin position="A32" pad="PF1"/>
-            <pin position="B29" pad="PF0"/>
-            <pin position="A33" pad="AREF"/>
-            <pin position="A34" pad="GND"/>
-            <pin position="B30" pad="AVCC"/>
+            <pin position="B1" pad-key="lcdcap"/>
+            <pin position="A1" pad-key="pe0"/>
+            <pin position="A2" pad-key="pe1"/>
+            <pin position="B2" pad-key="pe2"/>
+            <pin position="A3" pad-key="pe3"/>
+            <pin position="B3" pad-key="pe4"/>
+            <pin position="A4" pad-key="pe5"/>
+            <pin position="B4" pad-key="pe6"/>
+            <pin position="A5" pad-key="pe7"/>
+            <pin position="B5" pad-key="pb0"/>
+            <pin position="A6" pad-key="pb1"/>
+            <pin position="B6" pad-key="pb2"/>
+            <pin position="A7" pad-key="pb3"/>
+            <pin position="A8" pad-key="pb4"/>
+            <pin position="B7" pad-key="pb5"/>
+            <pin position="B8" pad-key="pb6"/>
+            <pin position="A9" pad-key="pb7"/>
+            <pin position="A10" pad-key="pg3"/>
+            <pin position="B9" pad-key="pg4"/>
+            <pin position="A11" pad-key="pg5"/>
+            <pin position="B10" pad-key="vcc"/>
+            <pin position="A12" pad-key="gnd"/>
+            <pin position="B11" pad-key="xtal2"/>
+            <pin position="A13" pad-key="xtal1"/>
+            <pin position="B12" pad-key="pd0"/>
+            <pin position="A14" pad-key="pd1"/>
+            <pin position="B13" pad-key="pd2"/>
+            <pin position="A15" pad-key="pd3"/>
+            <pin position="B14" pad-key="pd4"/>
+            <pin position="A16" pad-key="pd5"/>
+            <pin position="A17" pad-key="pd6"/>
+            <pin position="B15" pad-key="pd7"/>
+            <pin position="B16" pad-key="pg0"/>
+            <pin position="A18" pad-key="pg1"/>
+            <pin position="A19" pad-key="pc0"/>
+            <pin position="B17" pad-key="pc1"/>
+            <pin position="A20" pad-key="pc2"/>
+            <pin position="B18" pad-key="pc3"/>
+            <pin position="A21" pad-key="pc4"/>
+            <pin position="B19" pad-key="pc5"/>
+            <pin position="A22" pad-key="pc6"/>
+            <pin position="B20" pad-key="pc7"/>
+            <pin position="A23" pad-key="pg2"/>
+            <pin position="B21" pad-key="pa7"/>
+            <pin position="A24" pad-key="pa6"/>
+            <pin position="A25" pad-key="pa5"/>
+            <pin position="B22" pad-key="pa4"/>
+            <pin position="B23" pad-key="pa3"/>
+            <pin position="A26" pad-key="pa2"/>
+            <pin position="A27" pad-key="pa1"/>
+            <pin position="B24" pad-key="pa0"/>
+            <pin position="A28" pad-key="vcc"/>
+            <pin position="B25" pad-key="gnd"/>
+            <pin position="A29" pad-key="pf7"/>
+            <pin position="B26" pad-key="pf6"/>
+            <pin position="A30" pad-key="pf5"/>
+            <pin position="B27" pad-key="pf4"/>
+            <pin position="A31" pad-key="pf3"/>
+            <pin position="B28" pad-key="pf2"/>
+            <pin position="A32" pad-key="pf1"/>
+            <pin position="B29" pad-key="pf0"/>
+            <pin position="A33" pad-key="aref"/>
+            <pin position="A34" pad-key="gnd"/>
+            <pin position="B30" pad-key="avcc"/>
         </pinout>
     </pinouts>
     <variants>
-        <variant name="ATmega169A-AU" pinout-key="tqfp64" package="TQFP64"/>
-        <variant name="ATmega169A-MU" pinout-key="qfn64" package="QFN64"/>
-        <variant name="ATmega169A-MCH" pinout-key="drqfn64" package="DRQFN64"/>
-        <variant name="ATmega169A-AN" pinout-key="tqfp64" package="TQFP64 "/>
-        <variant name="ATmega169A-MN" pinout-key="qfn64" package="QFN64"/>
+        <variant key="atmega169a_au" name="ATmega169A-AU" pinout-key="tqfp64"/>
+        <variant key="atmega169a_mu" name="ATmega169A-MU" pinout-key="qfn64"/>
+        <variant key="atmega169a_mch" name="ATmega169A-MCH" pinout-key="drqfn64"/>
+        <variant key="atmega169a_an" name="ATmega169A-AN" pinout-key="tqfp64"/>
+        <variant key="atmega169a_mn" name="ATmega169A-MN" pinout-key="qfn64"/>
     </variants>
 </device>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA169P.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA169P.xml
index 2419e3c4..2a9461be 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA169P.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA169P.xml
@@ -194,25 +194,25 @@
         <peripheral key="tc0" name="TC0" module-key="tc8">
             <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"/>
+                <signal pad-key="pg4" function="default" group="T"/>
+                <signal pad-key="pb4" function="default" group="OCA"/>
             </signals>
         </peripheral>
         <peripheral key="tc1" name="TC1" module-key="tc16">
             <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"/>
-                <signal pad-id="pb5" function="default" group="OCA"/>
-                <signal pad-id="pb6" function="default" group="OCB"/>
-                <signal pad-id="xtal1" function="default" group="TOSC"/>
+                <signal pad-key="pg3" function="default" group="T"/>
+                <signal pad-key="pd0" function="default" group="ICP"/>
+                <signal pad-key="pb5" function="default" group="OCA"/>
+                <signal pad-key="pb6" function="default" group="OCB"/>
+                <signal pad-key="xtal1" function="default" group="TOSC"/>
             </signals>
         </peripheral>
         <peripheral key="tc2" name="TC2" module-key="tc8_async">
             <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"/>
+                <signal pad-key="pb7" function="default" group="OCA"/>
+                <signal pad-key="xtal2" function="default" group="TOSC"/>
             </signals>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="wdt">
@@ -224,197 +224,197 @@
         <peripheral key="spi" name="SPI" module-key="spi">
             <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"/>
-                <signal pad-id="pb2" function="default" group="MOSI"/>
-                <signal pad-id="pb3" function="default" group="MISO"/>
+                <signal pad-key="pb0" function="default" group="SS"/>
+                <signal pad-key="pb1" function="default" group="SCK"/>
+                <signal pad-key="pb2" function="default" group="MOSI"/>
+                <signal pad-key="pb3" function="default" group="MISO"/>
             </signals>
         </peripheral>
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pa2" index="2" function="default" group="P"/>
-                <signal pad-id="pa3" index="3" function="default" group="P"/>
-                <signal pad-id="pa4" index="4" function="default" group="P"/>
-                <signal pad-id="pa5" index="5" function="default" group="P"/>
-                <signal pad-id="pa6" index="6" function="default" group="P"/>
-                <signal pad-id="pa7" index="7" function="default" group="P"/>
+                <signal pad-key="pa0" index="0" function="default" group="P"/>
+                <signal pad-key="pa1" index="1" function="default" group="P"/>
+                <signal pad-key="pa2" index="2" function="default" group="P"/>
+                <signal pad-key="pa3" index="3" function="default" group="P"/>
+                <signal pad-key="pa4" index="4" function="default" group="P"/>
+                <signal pad-key="pa5" index="5" function="default" group="P"/>
+                <signal pad-key="pa6" index="6" function="default" group="P"/>
+                <signal pad-key="pa7" index="7" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pb2" index="2" function="default" group="P"/>
-                <signal pad-id="pb3" index="3" function="default" group="P"/>
-                <signal pad-id="pb4" index="4" function="default" group="P"/>
-                <signal pad-id="pb5" index="5" function="default" group="P"/>
-                <signal pad-id="pb6" index="6" function="default" group="P"/>
-                <signal pad-id="pb7" index="7" function="default" group="P"/>
+                <signal pad-key="pb0" index="0" function="default" group="P"/>
+                <signal pad-key="pb1" index="1" function="default" group="P"/>
+                <signal pad-key="pb2" index="2" function="default" group="P"/>
+                <signal pad-key="pb3" index="3" function="default" group="P"/>
+                <signal pad-key="pb4" index="4" function="default" group="P"/>
+                <signal pad-key="pb5" index="5" function="default" group="P"/>
+                <signal pad-key="pb6" index="6" function="default" group="P"/>
+                <signal pad-key="pb7" index="7" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pc2" index="2" function="default" group="P"/>
-                <signal pad-id="pc3" index="3" function="default" group="P"/>
-                <signal pad-id="pc4" index="4" function="default" group="P"/>
-                <signal pad-id="pc5" index="5" function="default" group="P"/>
-                <signal pad-id="pc6" index="6" function="default" group="P"/>
-                <signal pad-id="pc7" index="7" function="default" group="P"/>
+                <signal pad-key="pc0" index="0" function="default" group="P"/>
+                <signal pad-key="pc1" index="1" function="default" group="P"/>
+                <signal pad-key="pc2" index="2" function="default" group="P"/>
+                <signal pad-key="pc3" index="3" function="default" group="P"/>
+                <signal pad-key="pc4" index="4" function="default" group="P"/>
+                <signal pad-key="pc5" index="5" function="default" group="P"/>
+                <signal pad-key="pc6" index="6" function="default" group="P"/>
+                <signal pad-key="pc7" index="7" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pd2" index="2" function="default" group="P"/>
-                <signal pad-id="pd3" index="3" function="default" group="P"/>
-                <signal pad-id="pd4" index="4" function="default" group="P"/>
-                <signal pad-id="pd5" index="5" function="default" group="P"/>
-                <signal pad-id="pd6" index="6" function="default" group="P"/>
-                <signal pad-id="pd7" index="7" function="default" group="P"/>
+                <signal pad-key="pd0" index="0" function="default" group="P"/>
+                <signal pad-key="pd1" index="1" function="default" group="P"/>
+                <signal pad-key="pd2" index="2" function="default" group="P"/>
+                <signal pad-key="pd3" index="3" function="default" group="P"/>
+                <signal pad-key="pd4" index="4" function="default" group="P"/>
+                <signal pad-key="pd5" index="5" function="default" group="P"/>
+                <signal pad-key="pd6" index="6" function="default" group="P"/>
+                <signal pad-key="pd7" index="7" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="porte" name="PORTE" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pe2" index="2" function="default" group="P"/>
-                <signal pad-id="pe3" index="3" function="default" group="P"/>
-                <signal pad-id="pe4" index="4" function="default" group="P"/>
-                <signal pad-id="pe5" index="5" function="default" group="P"/>
-                <signal pad-id="pe6" index="6" function="default" group="P"/>
-                <signal pad-id="pe7" index="7" function="default" group="P"/>
+                <signal pad-key="pe0" index="0" function="default" group="P"/>
+                <signal pad-key="pe1" index="1" function="default" group="P"/>
+                <signal pad-key="pe2" index="2" function="default" group="P"/>
+                <signal pad-key="pe3" index="3" function="default" group="P"/>
+                <signal pad-key="pe4" index="4" function="default" group="P"/>
+                <signal pad-key="pe5" index="5" function="default" group="P"/>
+                <signal pad-key="pe6" index="6" function="default" group="P"/>
+                <signal pad-key="pe7" index="7" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portf" name="PORTF" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pf2" index="2" function="default" group="P"/>
-                <signal pad-id="pf3" index="3" function="default" group="P"/>
-                <signal pad-id="pf4" index="4" function="default" group="P"/>
-                <signal pad-id="pf5" index="5" function="default" group="P"/>
-                <signal pad-id="pf6" index="6" function="default" group="P"/>
-                <signal pad-id="pf7" index="7" function="default" group="P"/>
+                <signal pad-key="pf0" index="0" function="default" group="P"/>
+                <signal pad-key="pf1" index="1" function="default" group="P"/>
+                <signal pad-key="pf2" index="2" function="default" group="P"/>
+                <signal pad-key="pf3" index="3" function="default" group="P"/>
+                <signal pad-key="pf4" index="4" function="default" group="P"/>
+                <signal pad-key="pf5" index="5" function="default" group="P"/>
+                <signal pad-key="pf6" index="6" function="default" group="P"/>
+                <signal pad-key="pf7" index="7" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portg" name="PORTG" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pg2" index="2" function="default" group="P"/>
-                <signal pad-id="pg3" index="3" function="default" group="P"/>
-                <signal pad-id="pg4" index="4" function="default" group="P"/>
-                <signal pad-id="pg5" index="4" function="default" group="P"/>
+                <signal pad-key="pg0" index="0" function="default" group="P"/>
+                <signal pad-key="pg1" index="1" function="default" group="P"/>
+                <signal pad-key="pg2" index="2" function="default" group="P"/>
+                <signal pad-key="pg3" index="3" function="default" group="P"/>
+                <signal pad-key="pg4" index="4" function="default" group="P"/>
+                <signal pad-key="pg5" index="4" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="ac" name="AC" module-key="ac">
             <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"/>
+                <signal pad-key="pe2" index="0" function="default" group="AIN"/>
+                <signal pad-key="pe3" index="1" function="default" group="AIN"/>
             </signals>
         </peripheral>
         <peripheral key="jtag" name="JTAG" module-key="jtag">
             <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"/>
-                <signal pad-id="pf6" function="default" group="TDO"/>
-                <signal pad-id="pf7" function="default" group="TDI"/>
+                <signal pad-key="pf4" function="default" group="TCK"/>
+                <signal pad-key="pf5" function="default" group="TMS"/>
+                <signal pad-key="pf6" function="default" group="TDO"/>
+                <signal pad-key="pf7" function="default" group="TDI"/>
             </signals>
         </peripheral>
         <peripheral key="lcd" name="LCD" module-key="lcd">
             <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"/>
-                <signal pad-id="pa6" index="2" function="default" group="SEG"/>
-                <signal pad-id="pa7" index="3" function="default" group="SEG"/>
-                <signal pad-id="pg2" index="4" function="default" group="SEG"/>
-                <signal pad-id="pc7" index="5" function="default" group="SEG"/>
-                <signal pad-id="pc6" index="6" function="default" group="SEG"/>
-                <signal pad-id="pc5" index="7" function="default" group="SEG"/>
-                <signal pad-id="pc4" index="8" function="default" group="SEG"/>
-                <signal pad-id="pc3" index="9" function="default" group="SEG"/>
-                <signal pad-id="pc2" index="10" function="default" group="SEG"/>
-                <signal pad-id="pc1" index="11" function="default" group="SEG"/>
-                <signal pad-id="pc0" index="12" function="default" group="SEG"/>
-                <signal pad-id="pg1" index="13" function="default" group="SEG"/>
-                <signal pad-id="pg2" index="14" function="default" group="SEG"/>
-                <signal pad-id="pd7" index="15" function="default" group="SEG"/>
-                <signal pad-id="pd6" index="16" function="default" group="SEG"/>
-                <signal pad-id="pd5" index="17" function="default" group="SEG"/>
-                <signal pad-id="pd4" index="18" function="default" group="SEG"/>
-                <signal pad-id="pd3" index="19" function="default" group="SEG"/>
-                <signal pad-id="pd2" index="20" function="default" group="SEG"/>
-                <signal pad-id="pd1" index="21" function="default" group="SEG"/>
-                <signal pad-id="pd0" index="22" function="default" group="SEG"/>
-                <signal pad-id="pg4" index="23" function="default" group="SEG"/>
-                <signal pad-id="pg3" index="24" function="default" group="SEG"/>
-                <signal pad-id="pa0" index="0" function="default" group="COM"/>
-                <signal pad-id="pa1" index="1" function="default" group="COM"/>
-                <signal pad-id="pa2" index="2" function="default" group="COM"/>
-                <signal pad-id="pa3" index="3" function="default" group="COM"/>
+                <signal pad-key="pa4" index="0" function="default" group="SEG"/>
+                <signal pad-key="pa5" index="1" function="default" group="SEG"/>
+                <signal pad-key="pa6" index="2" function="default" group="SEG"/>
+                <signal pad-key="pa7" index="3" function="default" group="SEG"/>
+                <signal pad-key="pg2" index="4" function="default" group="SEG"/>
+                <signal pad-key="pc7" index="5" function="default" group="SEG"/>
+                <signal pad-key="pc6" index="6" function="default" group="SEG"/>
+                <signal pad-key="pc5" index="7" function="default" group="SEG"/>
+                <signal pad-key="pc4" index="8" function="default" group="SEG"/>
+                <signal pad-key="pc3" index="9" function="default" group="SEG"/>
+                <signal pad-key="pc2" index="10" function="default" group="SEG"/>
+                <signal pad-key="pc1" index="11" function="default" group="SEG"/>
+                <signal pad-key="pc0" index="12" function="default" group="SEG"/>
+                <signal pad-key="pg1" index="13" function="default" group="SEG"/>
+                <signal pad-key="pg2" index="14" function="default" group="SEG"/>
+                <signal pad-key="pd7" index="15" function="default" group="SEG"/>
+                <signal pad-key="pd6" index="16" function="default" group="SEG"/>
+                <signal pad-key="pd5" index="17" function="default" group="SEG"/>
+                <signal pad-key="pd4" index="18" function="default" group="SEG"/>
+                <signal pad-key="pd3" index="19" function="default" group="SEG"/>
+                <signal pad-key="pd2" index="20" function="default" group="SEG"/>
+                <signal pad-key="pd1" index="21" function="default" group="SEG"/>
+                <signal pad-key="pd0" index="22" function="default" group="SEG"/>
+                <signal pad-key="pg4" index="23" function="default" group="SEG"/>
+                <signal pad-key="pg3" index="24" function="default" group="SEG"/>
+                <signal pad-key="pa0" index="0" function="default" group="COM"/>
+                <signal pad-key="pa1" index="1" function="default" group="COM"/>
+                <signal pad-key="pa2" index="2" function="default" group="COM"/>
+                <signal pad-key="pa3" index="3" function="default" group="COM"/>
             </signals>
         </peripheral>
         <peripheral key="exint" name="EXINT" module-key="exint">
             <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"/>
-                <signal pad-id="pe2" index="2" function="default" group="PCINT"/>
-                <signal pad-id="pe3" index="3" function="default" group="PCINT"/>
-                <signal pad-id="pe4" index="4" function="default" group="PCINT"/>
-                <signal pad-id="pe5" index="5" function="default" group="PCINT"/>
-                <signal pad-id="pe6" index="6" function="default" group="PCINT"/>
-                <signal pad-id="pe7" index="7" function="default" group="PCINT"/>
-                <signal pad-id="pb0" index="8" function="default" group="PCINT"/>
-                <signal pad-id="pb1" index="9" function="default" group="PCINT"/>
-                <signal pad-id="pb2" index="10" function="default" group="PCINT"/>
-                <signal pad-id="pb3" index="11" function="default" group="PCINT"/>
-                <signal pad-id="pb4" index="12" function="default" group="PCINT"/>
-                <signal pad-id="pb5" index="13" function="default" group="PCINT"/>
-                <signal pad-id="pb6" index="14" function="default" group="PCINT"/>
-                <signal pad-id="pb7" index="15" function="default" group="PCINT"/>
-                <signal pad-id="pd1" index="0" function="default" group="INT"/>
+                <signal pad-key="pe0" index="0" function="default" group="PCINT"/>
+                <signal pad-key="pe1" index="1" function="default" group="PCINT"/>
+                <signal pad-key="pe2" index="2" function="default" group="PCINT"/>
+                <signal pad-key="pe3" index="3" function="default" group="PCINT"/>
+                <signal pad-key="pe4" index="4" function="default" group="PCINT"/>
+                <signal pad-key="pe5" index="5" function="default" group="PCINT"/>
+                <signal pad-key="pe6" index="6" function="default" group="PCINT"/>
+                <signal pad-key="pe7" index="7" function="default" group="PCINT"/>
+                <signal pad-key="pb0" index="8" function="default" group="PCINT"/>
+                <signal pad-key="pb1" index="9" function="default" group="PCINT"/>
+                <signal pad-key="pb2" index="10" function="default" group="PCINT"/>
+                <signal pad-key="pb3" index="11" function="default" group="PCINT"/>
+                <signal pad-key="pb4" index="12" function="default" group="PCINT"/>
+                <signal pad-key="pb5" index="13" function="default" group="PCINT"/>
+                <signal pad-key="pb6" index="14" function="default" group="PCINT"/>
+                <signal pad-key="pb7" index="15" function="default" group="PCINT"/>
+                <signal pad-key="pd1" index="0" function="default" group="INT"/>
             </signals>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="cpu">
             <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"/>
+                <signal pad-key="pe7" index="0" function="default" group="CLK"/>
             </signals>
         </peripheral>
         <peripheral key="usi" name="USI" module-key="usi">
             <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"/>
+                <signal pad-key="pe5" function="default" group="DI"/>
+                <signal pad-key="pe6" function="default" group="DO"/>
             </signals>
         </peripheral>
         <peripheral key="adc" name="ADC" module-key="adc">
             <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"/>
-                <signal pad-id="pf2" index="2" function="default" group="ADC"/>
-                <signal pad-id="pf3" index="3" function="default" group="ADC"/>
-                <signal pad-id="pf4" index="4" function="default" group="ADC"/>
-                <signal pad-id="pf5" index="5" function="default" group="ADC"/>
-                <signal pad-id="pf6" index="6" function="default" group="ADC"/>
-                <signal pad-id="pf7" index="7" function="default" group="ADC"/>
+                <signal pad-key="pf0" index="0" function="default" group="ADC"/>
+                <signal pad-key="pf1" index="1" function="default" group="ADC"/>
+                <signal pad-key="pf2" index="2" function="default" group="ADC"/>
+                <signal pad-key="pf3" index="3" function="default" group="ADC"/>
+                <signal pad-key="pf4" index="4" function="default" group="ADC"/>
+                <signal pad-key="pf5" index="5" function="default" group="ADC"/>
+                <signal pad-key="pf6" index="6" function="default" group="ADC"/>
+                <signal pad-key="pf7" index="7" function="default" group="ADC"/>
             </signals>
         </peripheral>
         <peripheral key="boot_load" name="BOOT_LOAD" module-key="boot_load">
@@ -423,10 +423,10 @@
         <peripheral key="usart0" name="USART0" module-key="usart">
             <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"/>
-                <signal pad-id="pe2" function="default" group="XCK"/>
-                <signal pad-id="pe4" function="default" group="USCK"/>
+                <signal pad-key="pe0" function="default" group="RXD"/>
+                <signal pad-key="pe1" function="default" group="TXD"/>
+                <signal pad-key="pe2" function="default" group="XCK"/>
+                <signal pad-key="pe4" function="default" group="USCK"/>
             </signals>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="fuse">
@@ -879,212 +879,275 @@
             </register-group>
         </module>
     </modules>
+    <pads>
+        <pad key="lcdcap" name="LCDCAP"/>
+        <pad key="pe0" name="PE0"/>
+        <pad key="pe1" name="PE1"/>
+        <pad key="pe2" name="PE2"/>
+        <pad key="pe3" name="PE3"/>
+        <pad key="pe4" name="PE4"/>
+        <pad key="pe5" name="PE5"/>
+        <pad key="pe6" name="PE6"/>
+        <pad key="pe7" name="PE7"/>
+        <pad key="pb0" name="PB0"/>
+        <pad key="pb1" name="PB1"/>
+        <pad key="pb2" name="PB2"/>
+        <pad key="pb3" name="PB3"/>
+        <pad key="pb4" name="PB4"/>
+        <pad key="pb5" name="PB5"/>
+        <pad key="pb6" name="PB6"/>
+        <pad key="pb7" name="PB7"/>
+        <pad key="pg3" name="PG3"/>
+        <pad key="pg4" name="PG4"/>
+        <pad key="pg5" name="PG5"/>
+        <pad key="vcc" name="VCC"/>
+        <pad key="gnd" name="GND"/>
+        <pad key="xtal2" name="XTAL2"/>
+        <pad key="xtal1" name="XTAL1"/>
+        <pad key="pd0" name="PD0"/>
+        <pad key="pd1" name="PD1"/>
+        <pad key="pd2" name="PD2"/>
+        <pad key="pd3" name="PD3"/>
+        <pad key="pd4" name="PD4"/>
+        <pad key="pd5" name="PD5"/>
+        <pad key="pd6" name="PD6"/>
+        <pad key="pd7" name="PD7"/>
+        <pad key="pg0" name="PG0"/>
+        <pad key="pg1" name="PG1"/>
+        <pad key="pc0" name="PC0"/>
+        <pad key="pc1" name="PC1"/>
+        <pad key="pc2" name="PC2"/>
+        <pad key="pc3" name="PC3"/>
+        <pad key="pc4" name="PC4"/>
+        <pad key="pc5" name="PC5"/>
+        <pad key="pc6" name="PC6"/>
+        <pad key="pc7" name="PC7"/>
+        <pad key="pg2" name="PG2"/>
+        <pad key="pa7" name="PA7"/>
+        <pad key="pa6" name="PA6"/>
+        <pad key="pa5" name="PA5"/>
+        <pad key="pa4" name="PA4"/>
+        <pad key="pa3" name="PA3"/>
+        <pad key="pa2" name="PA2"/>
+        <pad key="pa1" name="PA1"/>
+        <pad key="pa0" name="PA0"/>
+        <pad key="pf7" name="PF7"/>
+        <pad key="pf6" name="PF6"/>
+        <pad key="pf5" name="PF5"/>
+        <pad key="pf4" name="PF4"/>
+        <pad key="pf3" name="PF3"/>
+        <pad key="pf2" name="PF2"/>
+        <pad key="pf1" name="PF1"/>
+        <pad key="pf0" name="PF0"/>
+        <pad key="aref" name="AREF"/>
+        <pad key="avcc" name="AVCC"/>
+    </pads>
     <pinouts>
         <pinout key="tqfp64" name="TQFP64" type="qfp">
-            <pin position="1" pad="LCDCAP"/>
-            <pin position="2" pad="PE0"/>
-            <pin position="3" pad="PE1"/>
-            <pin position="4" pad="PE2"/>
-            <pin position="5" pad="PE3"/>
-            <pin position="6" pad="PE4"/>
-            <pin position="7" pad="PE5"/>
-            <pin position="8" pad="PE6"/>
-            <pin position="9" pad="PE7"/>
-            <pin position="10" pad="PB0"/>
-            <pin position="11" pad="PB1"/>
-            <pin position="12" pad="PB2"/>
-            <pin position="13" pad="PB3"/>
-            <pin position="14" pad="PB4"/>
-            <pin position="15" pad="PB5"/>
-            <pin position="16" pad="PB6"/>
-            <pin position="17" pad="PB7"/>
-            <pin position="18" pad="PG3"/>
-            <pin position="19" pad="PG4"/>
-            <pin position="20" pad="PG5"/>
-            <pin position="21" pad="VCC"/>
-            <pin position="22" pad="GND"/>
-            <pin position="23" pad="XTAL2"/>
-            <pin position="24" pad="XTAL1"/>
-            <pin position="25" pad="PD0"/>
-            <pin position="26" pad="PD1"/>
-            <pin position="27" pad="PD2"/>
-            <pin position="28" pad="PD3"/>
-            <pin position="29" pad="PD4"/>
-            <pin position="30" pad="PD5"/>
-            <pin position="31" pad="PD6"/>
-            <pin position="32" pad="PD7"/>
-            <pin position="33" pad="PG0"/>
-            <pin position="34" pad="PG1"/>
-            <pin position="35" pad="PC0"/>
-            <pin position="36" pad="PC1"/>
-            <pin position="37" pad="PC2"/>
-            <pin position="38" pad="PC3"/>
-            <pin position="39" pad="PC4"/>
-            <pin position="40" pad="PC5"/>
-            <pin position="41" pad="PC6"/>
-            <pin position="42" pad="PC7"/>
-            <pin position="43" pad="PG2"/>
-            <pin position="44" pad="PA7"/>
-            <pin position="45" pad="PA6"/>
-            <pin position="46" pad="PA5"/>
-            <pin position="47" pad="PA4"/>
-            <pin position="48" pad="PA3"/>
-            <pin position="49" pad="PA2"/>
-            <pin position="50" pad="PA1"/>
-            <pin position="51" pad="PA0"/>
-            <pin position="52" pad="VCC"/>
-            <pin position="53" pad="GND"/>
-            <pin position="54" pad="PF7"/>
-            <pin position="55" pad="PF6"/>
-            <pin position="56" pad="PF5"/>
-            <pin position="57" pad="PF4"/>
-            <pin position="58" pad="PF3"/>
-            <pin position="59" pad="PF2"/>
-            <pin position="60" pad="PF1"/>
-            <pin position="61" pad="PF0"/>
-            <pin position="62" pad="AREF"/>
-            <pin position="63" pad="GND"/>
-            <pin position="64" pad="AVCC"/>
+            <pin position="1" pad-key="lcdcap"/>
+            <pin position="2" pad-key="pe0"/>
+            <pin position="3" pad-key="pe1"/>
+            <pin position="4" pad-key="pe2"/>
+            <pin position="5" pad-key="pe3"/>
+            <pin position="6" pad-key="pe4"/>
+            <pin position="7" pad-key="pe5"/>
+            <pin position="8" pad-key="pe6"/>
+            <pin position="9" pad-key="pe7"/>
+            <pin position="10" pad-key="pb0"/>
+            <pin position="11" pad-key="pb1"/>
+            <pin position="12" pad-key="pb2"/>
+            <pin position="13" pad-key="pb3"/>
+            <pin position="14" pad-key="pb4"/>
+            <pin position="15" pad-key="pb5"/>
+            <pin position="16" pad-key="pb6"/>
+            <pin position="17" pad-key="pb7"/>
+            <pin position="18" pad-key="pg3"/>
+            <pin position="19" pad-key="pg4"/>
+            <pin position="20" pad-key="pg5"/>
+            <pin position="21" pad-key="vcc"/>
+            <pin position="22" pad-key="gnd"/>
+            <pin position="23" pad-key="xtal2"/>
+            <pin position="24" pad-key="xtal1"/>
+            <pin position="25" pad-key="pd0"/>
+            <pin position="26" pad-key="pd1"/>
+            <pin position="27" pad-key="pd2"/>
+            <pin position="28" pad-key="pd3"/>
+            <pin position="29" pad-key="pd4"/>
+            <pin position="30" pad-key="pd5"/>
+            <pin position="31" pad-key="pd6"/>
+            <pin position="32" pad-key="pd7"/>
+            <pin position="33" pad-key="pg0"/>
+            <pin position="34" pad-key="pg1"/>
+            <pin position="35" pad-key="pc0"/>
+            <pin position="36" pad-key="pc1"/>
+            <pin position="37" pad-key="pc2"/>
+            <pin position="38" pad-key="pc3"/>
+            <pin position="39" pad-key="pc4"/>
+            <pin position="40" pad-key="pc5"/>
+            <pin position="41" pad-key="pc6"/>
+            <pin position="42" pad-key="pc7"/>
+            <pin position="43" pad-key="pg2"/>
+            <pin position="44" pad-key="pa7"/>
+            <pin position="45" pad-key="pa6"/>
+            <pin position="46" pad-key="pa5"/>
+            <pin position="47" pad-key="pa4"/>
+            <pin position="48" pad-key="pa3"/>
+            <pin position="49" pad-key="pa2"/>
+            <pin position="50" pad-key="pa1"/>
+            <pin position="51" pad-key="pa0"/>
+            <pin position="52" pad-key="vcc"/>
+            <pin position="53" pad-key="gnd"/>
+            <pin position="54" pad-key="pf7"/>
+            <pin position="55" pad-key="pf6"/>
+            <pin position="56" pad-key="pf5"/>
+            <pin position="57" pad-key="pf4"/>
+            <pin position="58" pad-key="pf3"/>
+            <pin position="59" pad-key="pf2"/>
+            <pin position="60" pad-key="pf1"/>
+            <pin position="61" pad-key="pf0"/>
+            <pin position="62" pad-key="aref"/>
+            <pin position="63" pad-key="gnd"/>
+            <pin position="64" pad-key="avcc"/>
         </pinout>
         <pinout key="qfn64" name="QFN64" type="qfn">
-            <pin position="1" pad="LCDCAP"/>
-            <pin position="2" pad="PE0"/>
-            <pin position="3" pad="PE1"/>
-            <pin position="4" pad="PE2"/>
-            <pin position="5" pad="PE3"/>
-            <pin position="6" pad="PE4"/>
-            <pin position="7" pad="PE5"/>
-            <pin position="8" pad="PE6"/>
-            <pin position="9" pad="PE7"/>
-            <pin position="10" pad="PB0"/>
-            <pin position="11" pad="PB1"/>
-            <pin position="12" pad="PB2"/>
-            <pin position="13" pad="PB3"/>
-            <pin position="14" pad="PB4"/>
-            <pin position="15" pad="PB5"/>
-            <pin position="16" pad="PB6"/>
-            <pin position="17" pad="PB7"/>
-            <pin position="18" pad="PG3"/>
-            <pin position="19" pad="PG4"/>
-            <pin position="20" pad="PG5"/>
-            <pin position="21" pad="VCC"/>
-            <pin position="22" pad="GND"/>
-            <pin position="23" pad="XTAL2"/>
-            <pin position="24" pad="XTAL1"/>
-            <pin position="25" pad="PD0"/>
-            <pin position="26" pad="PD1"/>
-            <pin position="27" pad="PD2"/>
-            <pin position="28" pad="PD3"/>
-            <pin position="29" pad="PD4"/>
-            <pin position="30" pad="PD5"/>
-            <pin position="31" pad="PD6"/>
-            <pin position="32" pad="PD7"/>
-            <pin position="33" pad="PG0"/>
-            <pin position="34" pad="PG1"/>
-            <pin position="35" pad="PC0"/>
-            <pin position="36" pad="PC1"/>
-            <pin position="37" pad="PC2"/>
-            <pin position="38" pad="PC3"/>
-            <pin position="39" pad="PC4"/>
-            <pin position="40" pad="PC5"/>
-            <pin position="41" pad="PC6"/>
-            <pin position="42" pad="PC7"/>
-            <pin position="43" pad="PG2"/>
-            <pin position="44" pad="PA7"/>
-            <pin position="45" pad="PA6"/>
-            <pin position="46" pad="PA5"/>
-            <pin position="47" pad="PA4"/>
-            <pin position="48" pad="PA3"/>
-            <pin position="49" pad="PA2"/>
-            <pin position="50" pad="PA1"/>
-            <pin position="51" pad="PA0"/>
-            <pin position="52" pad="VCC"/>
-            <pin position="53" pad="GND"/>
-            <pin position="54" pad="PF7"/>
-            <pin position="55" pad="PF6"/>
-            <pin position="56" pad="PF5"/>
-            <pin position="57" pad="PF4"/>
-            <pin position="58" pad="PF3"/>
-            <pin position="59" pad="PF2"/>
-            <pin position="60" pad="PF1"/>
-            <pin position="61" pad="PF0"/>
-            <pin position="62" pad="AREF"/>
-            <pin position="63" pad="GND"/>
-            <pin position="64" pad="AVCC"/>
+            <pin position="1" pad-key="lcdcap"/>
+            <pin position="2" pad-key="pe0"/>
+            <pin position="3" pad-key="pe1"/>
+            <pin position="4" pad-key="pe2"/>
+            <pin position="5" pad-key="pe3"/>
+            <pin position="6" pad-key="pe4"/>
+            <pin position="7" pad-key="pe5"/>
+            <pin position="8" pad-key="pe6"/>
+            <pin position="9" pad-key="pe7"/>
+            <pin position="10" pad-key="pb0"/>
+            <pin position="11" pad-key="pb1"/>
+            <pin position="12" pad-key="pb2"/>
+            <pin position="13" pad-key="pb3"/>
+            <pin position="14" pad-key="pb4"/>
+            <pin position="15" pad-key="pb5"/>
+            <pin position="16" pad-key="pb6"/>
+            <pin position="17" pad-key="pb7"/>
+            <pin position="18" pad-key="pg3"/>
+            <pin position="19" pad-key="pg4"/>
+            <pin position="20" pad-key="pg5"/>
+            <pin position="21" pad-key="vcc"/>
+            <pin position="22" pad-key="gnd"/>
+            <pin position="23" pad-key="xtal2"/>
+            <pin position="24" pad-key="xtal1"/>
+            <pin position="25" pad-key="pd0"/>
+            <pin position="26" pad-key="pd1"/>
+            <pin position="27" pad-key="pd2"/>
+            <pin position="28" pad-key="pd3"/>
+            <pin position="29" pad-key="pd4"/>
+            <pin position="30" pad-key="pd5"/>
+            <pin position="31" pad-key="pd6"/>
+            <pin position="32" pad-key="pd7"/>
+            <pin position="33" pad-key="pg0"/>
+            <pin position="34" pad-key="pg1"/>
+            <pin position="35" pad-key="pc0"/>
+            <pin position="36" pad-key="pc1"/>
+            <pin position="37" pad-key="pc2"/>
+            <pin position="38" pad-key="pc3"/>
+            <pin position="39" pad-key="pc4"/>
+            <pin position="40" pad-key="pc5"/>
+            <pin position="41" pad-key="pc6"/>
+            <pin position="42" pad-key="pc7"/>
+            <pin position="43" pad-key="pg2"/>
+            <pin position="44" pad-key="pa7"/>
+            <pin position="45" pad-key="pa6"/>
+            <pin position="46" pad-key="pa5"/>
+            <pin position="47" pad-key="pa4"/>
+            <pin position="48" pad-key="pa3"/>
+            <pin position="49" pad-key="pa2"/>
+            <pin position="50" pad-key="pa1"/>
+            <pin position="51" pad-key="pa0"/>
+            <pin position="52" pad-key="vcc"/>
+            <pin position="53" pad-key="gnd"/>
+            <pin position="54" pad-key="pf7"/>
+            <pin position="55" pad-key="pf6"/>
+            <pin position="56" pad-key="pf5"/>
+            <pin position="57" pad-key="pf4"/>
+            <pin position="58" pad-key="pf3"/>
+            <pin position="59" pad-key="pf2"/>
+            <pin position="60" pad-key="pf1"/>
+            <pin position="61" pad-key="pf0"/>
+            <pin position="62" pad-key="aref"/>
+            <pin position="63" pad-key="gnd"/>
+            <pin position="64" pad-key="avcc"/>
         </pinout>
         <pinout key="drqfn64" name="DRQFN64" type="drqfn">
-            <pin position="B1" pad="LCDCAP"/>
-            <pin position="A1" pad="PE0"/>
-            <pin position="A2" pad="PE1"/>
-            <pin position="B2" pad="PE2"/>
-            <pin position="A3" pad="PE3"/>
-            <pin position="B3" pad="PE4"/>
-            <pin position="A4" pad="PE5"/>
-            <pin position="B4" pad="PE6"/>
-            <pin position="A5" pad="PE7"/>
-            <pin position="B5" pad="PB0"/>
-            <pin position="A6" pad="PB1"/>
-            <pin position="B6" pad="PB2"/>
-            <pin position="A7" pad="PB3"/>
-            <pin position="A8" pad="PB4"/>
-            <pin position="B7" pad="PB5"/>
-            <pin position="B8" pad="PB6"/>
-            <pin position="A9" pad="PB7"/>
-            <pin position="A10" pad="PG3"/>
-            <pin position="B9" pad="PG4"/>
-            <pin position="A11" pad="PG5"/>
-            <pin position="B10" pad="VCC"/>
-            <pin position="A12" pad="GND"/>
-            <pin position="B11" pad="XTAL2"/>
-            <pin position="A13" pad="XTAL1"/>
-            <pin position="B12" pad="PD0"/>
-            <pin position="A14" pad="PD1"/>
-            <pin position="B13" pad="PD2"/>
-            <pin position="A15" pad="PD3"/>
-            <pin position="B14" pad="PD4"/>
-            <pin position="A16" pad="PD5"/>
-            <pin position="A17" pad="PD6"/>
-            <pin position="B15" pad="PD7"/>
-            <pin position="B16" pad="PG0"/>
-            <pin position="A18" pad="PG1"/>
-            <pin position="A19" pad="PC0"/>
-            <pin position="B17" pad="PC1"/>
-            <pin position="A20" pad="PC2"/>
-            <pin position="B18" pad="PC3"/>
-            <pin position="A21" pad="PC4"/>
-            <pin position="B19" pad="PC5"/>
-            <pin position="A22" pad="PC6"/>
-            <pin position="B20" pad="PC7"/>
-            <pin position="A23" pad="PG2"/>
-            <pin position="B21" pad="PA7"/>
-            <pin position="A24" pad="PA6"/>
-            <pin position="A25" pad="PA5"/>
-            <pin position="B22" pad="PA4"/>
-            <pin position="B23" pad="PA3"/>
-            <pin position="A26" pad="PA2"/>
-            <pin position="A27" pad="PA1"/>
-            <pin position="B24" pad="PA0"/>
-            <pin position="A28" pad="VCC"/>
-            <pin position="B25" pad="GND"/>
-            <pin position="A29" pad="PF7"/>
-            <pin position="B26" pad="PF6"/>
-            <pin position="A30" pad="PF5"/>
-            <pin position="B27" pad="PF4"/>
-            <pin position="A31" pad="PF3"/>
-            <pin position="B28" pad="PF2"/>
-            <pin position="A32" pad="PF1"/>
-            <pin position="B29" pad="PF0"/>
-            <pin position="A33" pad="AREF"/>
-            <pin position="A34" pad="GND"/>
-            <pin position="B30" pad="AVCC"/>
+            <pin position="B1" pad-key="lcdcap"/>
+            <pin position="A1" pad-key="pe0"/>
+            <pin position="A2" pad-key="pe1"/>
+            <pin position="B2" pad-key="pe2"/>
+            <pin position="A3" pad-key="pe3"/>
+            <pin position="B3" pad-key="pe4"/>
+            <pin position="A4" pad-key="pe5"/>
+            <pin position="B4" pad-key="pe6"/>
+            <pin position="A5" pad-key="pe7"/>
+            <pin position="B5" pad-key="pb0"/>
+            <pin position="A6" pad-key="pb1"/>
+            <pin position="B6" pad-key="pb2"/>
+            <pin position="A7" pad-key="pb3"/>
+            <pin position="A8" pad-key="pb4"/>
+            <pin position="B7" pad-key="pb5"/>
+            <pin position="B8" pad-key="pb6"/>
+            <pin position="A9" pad-key="pb7"/>
+            <pin position="A10" pad-key="pg3"/>
+            <pin position="B9" pad-key="pg4"/>
+            <pin position="A11" pad-key="pg5"/>
+            <pin position="B10" pad-key="vcc"/>
+            <pin position="A12" pad-key="gnd"/>
+            <pin position="B11" pad-key="xtal2"/>
+            <pin position="A13" pad-key="xtal1"/>
+            <pin position="B12" pad-key="pd0"/>
+            <pin position="A14" pad-key="pd1"/>
+            <pin position="B13" pad-key="pd2"/>
+            <pin position="A15" pad-key="pd3"/>
+            <pin position="B14" pad-key="pd4"/>
+            <pin position="A16" pad-key="pd5"/>
+            <pin position="A17" pad-key="pd6"/>
+            <pin position="B15" pad-key="pd7"/>
+            <pin position="B16" pad-key="pg0"/>
+            <pin position="A18" pad-key="pg1"/>
+            <pin position="A19" pad-key="pc0"/>
+            <pin position="B17" pad-key="pc1"/>
+            <pin position="A20" pad-key="pc2"/>
+            <pin position="B18" pad-key="pc3"/>
+            <pin position="A21" pad-key="pc4"/>
+            <pin position="B19" pad-key="pc5"/>
+            <pin position="A22" pad-key="pc6"/>
+            <pin position="B20" pad-key="pc7"/>
+            <pin position="A23" pad-key="pg2"/>
+            <pin position="B21" pad-key="pa7"/>
+            <pin position="A24" pad-key="pa6"/>
+            <pin position="A25" pad-key="pa5"/>
+            <pin position="B22" pad-key="pa4"/>
+            <pin position="B23" pad-key="pa3"/>
+            <pin position="A26" pad-key="pa2"/>
+            <pin position="A27" pad-key="pa1"/>
+            <pin position="B24" pad-key="pa0"/>
+            <pin position="A28" pad-key="vcc"/>
+            <pin position="B25" pad-key="gnd"/>
+            <pin position="A29" pad-key="pf7"/>
+            <pin position="B26" pad-key="pf6"/>
+            <pin position="A30" pad-key="pf5"/>
+            <pin position="B27" pad-key="pf4"/>
+            <pin position="A31" pad-key="pf3"/>
+            <pin position="B28" pad-key="pf2"/>
+            <pin position="A32" pad-key="pf1"/>
+            <pin position="B29" pad-key="pf0"/>
+            <pin position="A33" pad-key="aref"/>
+            <pin position="A34" pad-key="gnd"/>
+            <pin position="B30" pad-key="avcc"/>
         </pinout>
     </pinouts>
     <variants>
-        <variant name="ATmega169PV-8AU" pinout-key="tqfp64" package="TQFP64"/>
-        <variant name="ATmega169PV-8MU" pinout-key="qfn64" package="QFN64"/>
-        <variant name="ATmega169PV-8MCH" pinout-key="drqfn64" package="DRQFN64"/>
-        <variant name="ATmega169P-16AU" pinout-key="tqfp64" package="TQFP64"/>
-        <variant name="ATmega169P-16MU" pinout-key="qfn64" package="QFN64"/>
-        <variant name="ATmega169P-16MCH" pinout-key="drqfn64" package="DRQFN64"/>
+        <variant key="atmega169pv_8au" name="ATmega169PV-8AU" pinout-key="tqfp64"/>
+        <variant key="atmega169pv_8mu" name="ATmega169PV-8MU" pinout-key="qfn64"/>
+        <variant key="atmega169pv_8mch" name="ATmega169PV-8MCH" pinout-key="drqfn64"/>
+        <variant key="atmega169p_16au" name="ATmega169P-16AU" pinout-key="tqfp64"/>
+        <variant key="atmega169p_16mu" name="ATmega169P-16MU" pinout-key="qfn64"/>
+        <variant key="atmega169p_16mch" name="ATmega169P-16MCH" pinout-key="drqfn64"/>
     </variants>
 </device>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA169PA.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA169PA.xml
index 3499ce5a..2d8c1a4a 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA169PA.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA169PA.xml
@@ -194,25 +194,25 @@
         <peripheral key="tc0" name="TC0" module-key="tc8">
             <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"/>
+                <signal pad-key="pg4" function="default" group="T"/>
+                <signal pad-key="pb4" function="default" group="OCA"/>
             </signals>
         </peripheral>
         <peripheral key="tc1" name="TC1" module-key="tc16">
             <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"/>
-                <signal pad-id="pb5" function="default" group="OCA"/>
-                <signal pad-id="pb6" function="default" group="OCB"/>
-                <signal pad-id="xtal1" function="default" group="TOSC"/>
+                <signal pad-key="pg3" function="default" group="T"/>
+                <signal pad-key="pd0" function="default" group="ICP"/>
+                <signal pad-key="pb5" function="default" group="OCA"/>
+                <signal pad-key="pb6" function="default" group="OCB"/>
+                <signal pad-key="xtal1" function="default" group="TOSC"/>
             </signals>
         </peripheral>
         <peripheral key="tc2" name="TC2" module-key="tc8_async">
             <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"/>
+                <signal pad-key="pb7" function="default" group="OCA"/>
+                <signal pad-key="xtal2" function="default" group="TOSC"/>
             </signals>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="wdt">
@@ -224,197 +224,197 @@
         <peripheral key="spi" name="SPI" module-key="spi">
             <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"/>
-                <signal pad-id="pb2" function="default" group="MOSI"/>
-                <signal pad-id="pb3" function="default" group="MISO"/>
+                <signal pad-key="pb0" function="default" group="SS"/>
+                <signal pad-key="pb1" function="default" group="SCK"/>
+                <signal pad-key="pb2" function="default" group="MOSI"/>
+                <signal pad-key="pb3" function="default" group="MISO"/>
             </signals>
         </peripheral>
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pa2" index="2" function="default" group="P"/>
-                <signal pad-id="pa3" index="3" function="default" group="P"/>
-                <signal pad-id="pa4" index="4" function="default" group="P"/>
-                <signal pad-id="pa5" index="5" function="default" group="P"/>
-                <signal pad-id="pa6" index="6" function="default" group="P"/>
-                <signal pad-id="pa7" index="7" function="default" group="P"/>
+                <signal pad-key="pa0" index="0" function="default" group="P"/>
+                <signal pad-key="pa1" index="1" function="default" group="P"/>
+                <signal pad-key="pa2" index="2" function="default" group="P"/>
+                <signal pad-key="pa3" index="3" function="default" group="P"/>
+                <signal pad-key="pa4" index="4" function="default" group="P"/>
+                <signal pad-key="pa5" index="5" function="default" group="P"/>
+                <signal pad-key="pa6" index="6" function="default" group="P"/>
+                <signal pad-key="pa7" index="7" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pb2" index="2" function="default" group="P"/>
-                <signal pad-id="pb3" index="3" function="default" group="P"/>
-                <signal pad-id="pb4" index="4" function="default" group="P"/>
-                <signal pad-id="pb5" index="5" function="default" group="P"/>
-                <signal pad-id="pb6" index="6" function="default" group="P"/>
-                <signal pad-id="pb7" index="7" function="default" group="P"/>
+                <signal pad-key="pb0" index="0" function="default" group="P"/>
+                <signal pad-key="pb1" index="1" function="default" group="P"/>
+                <signal pad-key="pb2" index="2" function="default" group="P"/>
+                <signal pad-key="pb3" index="3" function="default" group="P"/>
+                <signal pad-key="pb4" index="4" function="default" group="P"/>
+                <signal pad-key="pb5" index="5" function="default" group="P"/>
+                <signal pad-key="pb6" index="6" function="default" group="P"/>
+                <signal pad-key="pb7" index="7" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pc2" index="2" function="default" group="P"/>
-                <signal pad-id="pc3" index="3" function="default" group="P"/>
-                <signal pad-id="pc4" index="4" function="default" group="P"/>
-                <signal pad-id="pc5" index="5" function="default" group="P"/>
-                <signal pad-id="pc6" index="6" function="default" group="P"/>
-                <signal pad-id="pc7" index="7" function="default" group="P"/>
+                <signal pad-key="pc0" index="0" function="default" group="P"/>
+                <signal pad-key="pc1" index="1" function="default" group="P"/>
+                <signal pad-key="pc2" index="2" function="default" group="P"/>
+                <signal pad-key="pc3" index="3" function="default" group="P"/>
+                <signal pad-key="pc4" index="4" function="default" group="P"/>
+                <signal pad-key="pc5" index="5" function="default" group="P"/>
+                <signal pad-key="pc6" index="6" function="default" group="P"/>
+                <signal pad-key="pc7" index="7" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pd2" index="2" function="default" group="P"/>
-                <signal pad-id="pd3" index="3" function="default" group="P"/>
-                <signal pad-id="pd4" index="4" function="default" group="P"/>
-                <signal pad-id="pd5" index="5" function="default" group="P"/>
-                <signal pad-id="pd6" index="6" function="default" group="P"/>
-                <signal pad-id="pd7" index="7" function="default" group="P"/>
+                <signal pad-key="pd0" index="0" function="default" group="P"/>
+                <signal pad-key="pd1" index="1" function="default" group="P"/>
+                <signal pad-key="pd2" index="2" function="default" group="P"/>
+                <signal pad-key="pd3" index="3" function="default" group="P"/>
+                <signal pad-key="pd4" index="4" function="default" group="P"/>
+                <signal pad-key="pd5" index="5" function="default" group="P"/>
+                <signal pad-key="pd6" index="6" function="default" group="P"/>
+                <signal pad-key="pd7" index="7" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="porte" name="PORTE" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pe2" index="2" function="default" group="P"/>
-                <signal pad-id="pe3" index="3" function="default" group="P"/>
-                <signal pad-id="pe4" index="4" function="default" group="P"/>
-                <signal pad-id="pe5" index="5" function="default" group="P"/>
-                <signal pad-id="pe6" index="6" function="default" group="P"/>
-                <signal pad-id="pe7" index="7" function="default" group="P"/>
+                <signal pad-key="pe0" index="0" function="default" group="P"/>
+                <signal pad-key="pe1" index="1" function="default" group="P"/>
+                <signal pad-key="pe2" index="2" function="default" group="P"/>
+                <signal pad-key="pe3" index="3" function="default" group="P"/>
+                <signal pad-key="pe4" index="4" function="default" group="P"/>
+                <signal pad-key="pe5" index="5" function="default" group="P"/>
+                <signal pad-key="pe6" index="6" function="default" group="P"/>
+                <signal pad-key="pe7" index="7" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portf" name="PORTF" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pf2" index="2" function="default" group="P"/>
-                <signal pad-id="pf3" index="3" function="default" group="P"/>
-                <signal pad-id="pf4" index="4" function="default" group="P"/>
-                <signal pad-id="pf5" index="5" function="default" group="P"/>
-                <signal pad-id="pf6" index="6" function="default" group="P"/>
-                <signal pad-id="pf7" index="7" function="default" group="P"/>
+                <signal pad-key="pf0" index="0" function="default" group="P"/>
+                <signal pad-key="pf1" index="1" function="default" group="P"/>
+                <signal pad-key="pf2" index="2" function="default" group="P"/>
+                <signal pad-key="pf3" index="3" function="default" group="P"/>
+                <signal pad-key="pf4" index="4" function="default" group="P"/>
+                <signal pad-key="pf5" index="5" function="default" group="P"/>
+                <signal pad-key="pf6" index="6" function="default" group="P"/>
+                <signal pad-key="pf7" index="7" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portg" name="PORTG" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pg2" index="2" function="default" group="P"/>
-                <signal pad-id="pg3" index="3" function="default" group="P"/>
-                <signal pad-id="pg4" index="4" function="default" group="P"/>
-                <signal pad-id="pg5" index="4" function="default" group="P"/>
+                <signal pad-key="pg0" index="0" function="default" group="P"/>
+                <signal pad-key="pg1" index="1" function="default" group="P"/>
+                <signal pad-key="pg2" index="2" function="default" group="P"/>
+                <signal pad-key="pg3" index="3" function="default" group="P"/>
+                <signal pad-key="pg4" index="4" function="default" group="P"/>
+                <signal pad-key="pg5" index="4" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="ac" name="AC" module-key="ac">
             <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"/>
+                <signal pad-key="pe2" index="0" function="default" group="AIN"/>
+                <signal pad-key="pe3" index="1" function="default" group="AIN"/>
             </signals>
         </peripheral>
         <peripheral key="jtag" name="JTAG" module-key="jtag">
             <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"/>
-                <signal pad-id="pf6" function="default" group="TDO"/>
-                <signal pad-id="pf7" function="default" group="TDI"/>
+                <signal pad-key="pf4" function="default" group="TCK"/>
+                <signal pad-key="pf5" function="default" group="TMS"/>
+                <signal pad-key="pf6" function="default" group="TDO"/>
+                <signal pad-key="pf7" function="default" group="TDI"/>
             </signals>
         </peripheral>
         <peripheral key="lcd" name="LCD" module-key="lcd">
             <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"/>
-                <signal pad-id="pa6" index="2" function="default" group="SEG"/>
-                <signal pad-id="pa7" index="3" function="default" group="SEG"/>
-                <signal pad-id="pg2" index="4" function="default" group="SEG"/>
-                <signal pad-id="pc7" index="5" function="default" group="SEG"/>
-                <signal pad-id="pc6" index="6" function="default" group="SEG"/>
-                <signal pad-id="pc5" index="7" function="default" group="SEG"/>
-                <signal pad-id="pc4" index="8" function="default" group="SEG"/>
-                <signal pad-id="pc3" index="9" function="default" group="SEG"/>
-                <signal pad-id="pc2" index="10" function="default" group="SEG"/>
-                <signal pad-id="pc1" index="11" function="default" group="SEG"/>
-                <signal pad-id="pc0" index="12" function="default" group="SEG"/>
-                <signal pad-id="pg1" index="13" function="default" group="SEG"/>
-                <signal pad-id="pg2" index="14" function="default" group="SEG"/>
-                <signal pad-id="pd7" index="15" function="default" group="SEG"/>
-                <signal pad-id="pd6" index="16" function="default" group="SEG"/>
-                <signal pad-id="pd5" index="17" function="default" group="SEG"/>
-                <signal pad-id="pd4" index="18" function="default" group="SEG"/>
-                <signal pad-id="pd3" index="19" function="default" group="SEG"/>
-                <signal pad-id="pd2" index="20" function="default" group="SEG"/>
-                <signal pad-id="pd1" index="21" function="default" group="SEG"/>
-                <signal pad-id="pd0" index="22" function="default" group="SEG"/>
-                <signal pad-id="pg4" index="23" function="default" group="SEG"/>
-                <signal pad-id="pg3" index="24" function="default" group="SEG"/>
-                <signal pad-id="pa0" index="0" function="default" group="COM"/>
-                <signal pad-id="pa1" index="1" function="default" group="COM"/>
-                <signal pad-id="pa2" index="2" function="default" group="COM"/>
-                <signal pad-id="pa3" index="3" function="default" group="COM"/>
+                <signal pad-key="pa4" index="0" function="default" group="SEG"/>
+                <signal pad-key="pa5" index="1" function="default" group="SEG"/>
+                <signal pad-key="pa6" index="2" function="default" group="SEG"/>
+                <signal pad-key="pa7" index="3" function="default" group="SEG"/>
+                <signal pad-key="pg2" index="4" function="default" group="SEG"/>
+                <signal pad-key="pc7" index="5" function="default" group="SEG"/>
+                <signal pad-key="pc6" index="6" function="default" group="SEG"/>
+                <signal pad-key="pc5" index="7" function="default" group="SEG"/>
+                <signal pad-key="pc4" index="8" function="default" group="SEG"/>
+                <signal pad-key="pc3" index="9" function="default" group="SEG"/>
+                <signal pad-key="pc2" index="10" function="default" group="SEG"/>
+                <signal pad-key="pc1" index="11" function="default" group="SEG"/>
+                <signal pad-key="pc0" index="12" function="default" group="SEG"/>
+                <signal pad-key="pg1" index="13" function="default" group="SEG"/>
+                <signal pad-key="pg2" index="14" function="default" group="SEG"/>
+                <signal pad-key="pd7" index="15" function="default" group="SEG"/>
+                <signal pad-key="pd6" index="16" function="default" group="SEG"/>
+                <signal pad-key="pd5" index="17" function="default" group="SEG"/>
+                <signal pad-key="pd4" index="18" function="default" group="SEG"/>
+                <signal pad-key="pd3" index="19" function="default" group="SEG"/>
+                <signal pad-key="pd2" index="20" function="default" group="SEG"/>
+                <signal pad-key="pd1" index="21" function="default" group="SEG"/>
+                <signal pad-key="pd0" index="22" function="default" group="SEG"/>
+                <signal pad-key="pg4" index="23" function="default" group="SEG"/>
+                <signal pad-key="pg3" index="24" function="default" group="SEG"/>
+                <signal pad-key="pa0" index="0" function="default" group="COM"/>
+                <signal pad-key="pa1" index="1" function="default" group="COM"/>
+                <signal pad-key="pa2" index="2" function="default" group="COM"/>
+                <signal pad-key="pa3" index="3" function="default" group="COM"/>
             </signals>
         </peripheral>
         <peripheral key="exint" name="EXINT" module-key="exint">
             <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"/>
-                <signal pad-id="pe2" index="2" function="default" group="PCINT"/>
-                <signal pad-id="pe3" index="3" function="default" group="PCINT"/>
-                <signal pad-id="pe4" index="4" function="default" group="PCINT"/>
-                <signal pad-id="pe5" index="5" function="default" group="PCINT"/>
-                <signal pad-id="pe6" index="6" function="default" group="PCINT"/>
-                <signal pad-id="pe7" index="7" function="default" group="PCINT"/>
-                <signal pad-id="pb0" index="8" function="default" group="PCINT"/>
-                <signal pad-id="pb1" index="9" function="default" group="PCINT"/>
-                <signal pad-id="pb2" index="10" function="default" group="PCINT"/>
-                <signal pad-id="pb3" index="11" function="default" group="PCINT"/>
-                <signal pad-id="pb4" index="12" function="default" group="PCINT"/>
-                <signal pad-id="pb5" index="13" function="default" group="PCINT"/>
-                <signal pad-id="pb6" index="14" function="default" group="PCINT"/>
-                <signal pad-id="pb7" index="15" function="default" group="PCINT"/>
-                <signal pad-id="pd1" index="0" function="default" group="INT"/>
+                <signal pad-key="pe0" index="0" function="default" group="PCINT"/>
+                <signal pad-key="pe1" index="1" function="default" group="PCINT"/>
+                <signal pad-key="pe2" index="2" function="default" group="PCINT"/>
+                <signal pad-key="pe3" index="3" function="default" group="PCINT"/>
+                <signal pad-key="pe4" index="4" function="default" group="PCINT"/>
+                <signal pad-key="pe5" index="5" function="default" group="PCINT"/>
+                <signal pad-key="pe6" index="6" function="default" group="PCINT"/>
+                <signal pad-key="pe7" index="7" function="default" group="PCINT"/>
+                <signal pad-key="pb0" index="8" function="default" group="PCINT"/>
+                <signal pad-key="pb1" index="9" function="default" group="PCINT"/>
+                <signal pad-key="pb2" index="10" function="default" group="PCINT"/>
+                <signal pad-key="pb3" index="11" function="default" group="PCINT"/>
+                <signal pad-key="pb4" index="12" function="default" group="PCINT"/>
+                <signal pad-key="pb5" index="13" function="default" group="PCINT"/>
+                <signal pad-key="pb6" index="14" function="default" group="PCINT"/>
+                <signal pad-key="pb7" index="15" function="default" group="PCINT"/>
+                <signal pad-key="pd1" index="0" function="default" group="INT"/>
             </signals>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="cpu">
             <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"/>
+                <signal pad-key="pe7" index="0" function="default" group="CLK"/>
             </signals>
         </peripheral>
         <peripheral key="usi" name="USI" module-key="usi">
             <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"/>
+                <signal pad-key="pe5" function="default" group="DI"/>
+                <signal pad-key="pe6" function="default" group="DO"/>
             </signals>
         </peripheral>
         <peripheral key="adc" name="ADC" module-key="adc">
             <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"/>
-                <signal pad-id="pf2" index="2" function="default" group="ADC"/>
-                <signal pad-id="pf3" index="3" function="default" group="ADC"/>
-                <signal pad-id="pf4" index="4" function="default" group="ADC"/>
-                <signal pad-id="pf5" index="5" function="default" group="ADC"/>
-                <signal pad-id="pf6" index="6" function="default" group="ADC"/>
-                <signal pad-id="pf7" index="7" function="default" group="ADC"/>
+                <signal pad-key="pf0" index="0" function="default" group="ADC"/>
+                <signal pad-key="pf1" index="1" function="default" group="ADC"/>
+                <signal pad-key="pf2" index="2" function="default" group="ADC"/>
+                <signal pad-key="pf3" index="3" function="default" group="ADC"/>
+                <signal pad-key="pf4" index="4" function="default" group="ADC"/>
+                <signal pad-key="pf5" index="5" function="default" group="ADC"/>
+                <signal pad-key="pf6" index="6" function="default" group="ADC"/>
+                <signal pad-key="pf7" index="7" function="default" group="ADC"/>
             </signals>
         </peripheral>
         <peripheral key="boot_load" name="BOOT_LOAD" module-key="boot_load">
@@ -423,10 +423,10 @@
         <peripheral key="usart0" name="USART0" module-key="usart">
             <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"/>
-                <signal pad-id="pe2" function="default" group="XCK"/>
-                <signal pad-id="pe4" function="default" group="USCK"/>
+                <signal pad-key="pe0" function="default" group="RXD"/>
+                <signal pad-key="pe1" function="default" group="TXD"/>
+                <signal pad-key="pe2" function="default" group="XCK"/>
+                <signal pad-key="pe4" function="default" group="USCK"/>
             </signals>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="fuse">
@@ -917,211 +917,274 @@
             </register-group>
         </module>
     </modules>
+    <pads>
+        <pad key="lcdcap" name="LCDCAP"/>
+        <pad key="pe0" name="PE0"/>
+        <pad key="pe1" name="PE1"/>
+        <pad key="pe2" name="PE2"/>
+        <pad key="pe3" name="PE3"/>
+        <pad key="pe4" name="PE4"/>
+        <pad key="pe5" name="PE5"/>
+        <pad key="pe6" name="PE6"/>
+        <pad key="pe7" name="PE7"/>
+        <pad key="pb0" name="PB0"/>
+        <pad key="pb1" name="PB1"/>
+        <pad key="pb2" name="PB2"/>
+        <pad key="pb3" name="PB3"/>
+        <pad key="pb4" name="PB4"/>
+        <pad key="pb5" name="PB5"/>
+        <pad key="pb6" name="PB6"/>
+        <pad key="pb7" name="PB7"/>
+        <pad key="pg3" name="PG3"/>
+        <pad key="pg4" name="PG4"/>
+        <pad key="pg5" name="PG5"/>
+        <pad key="vcc" name="VCC"/>
+        <pad key="gnd" name="GND"/>
+        <pad key="xtal2" name="XTAL2"/>
+        <pad key="xtal1" name="XTAL1"/>
+        <pad key="pd0" name="PD0"/>
+        <pad key="pd1" name="PD1"/>
+        <pad key="pd2" name="PD2"/>
+        <pad key="pd3" name="PD3"/>
+        <pad key="pd4" name="PD4"/>
+        <pad key="pd5" name="PD5"/>
+        <pad key="pd6" name="PD6"/>
+        <pad key="pd7" name="PD7"/>
+        <pad key="pg0" name="PG0"/>
+        <pad key="pg1" name="PG1"/>
+        <pad key="pc0" name="PC0"/>
+        <pad key="pc1" name="PC1"/>
+        <pad key="pc2" name="PC2"/>
+        <pad key="pc3" name="PC3"/>
+        <pad key="pc4" name="PC4"/>
+        <pad key="pc5" name="PC5"/>
+        <pad key="pc6" name="PC6"/>
+        <pad key="pc7" name="PC7"/>
+        <pad key="pg2" name="PG2"/>
+        <pad key="pa7" name="PA7"/>
+        <pad key="pa6" name="PA6"/>
+        <pad key="pa5" name="PA5"/>
+        <pad key="pa4" name="PA4"/>
+        <pad key="pa3" name="PA3"/>
+        <pad key="pa2" name="PA2"/>
+        <pad key="pa1" name="PA1"/>
+        <pad key="pa0" name="PA0"/>
+        <pad key="pf7" name="PF7"/>
+        <pad key="pf6" name="PF6"/>
+        <pad key="pf5" name="PF5"/>
+        <pad key="pf4" name="PF4"/>
+        <pad key="pf3" name="PF3"/>
+        <pad key="pf2" name="PF2"/>
+        <pad key="pf1" name="PF1"/>
+        <pad key="pf0" name="PF0"/>
+        <pad key="aref" name="AREF"/>
+        <pad key="avcc" name="AVCC"/>
+    </pads>
     <pinouts>
         <pinout key="tqfp64" name="TQFP64" type="qfp">
-            <pin position="1" pad="LCDCAP"/>
-            <pin position="2" pad="PE0"/>
-            <pin position="3" pad="PE1"/>
-            <pin position="4" pad="PE2"/>
-            <pin position="5" pad="PE3"/>
-            <pin position="6" pad="PE4"/>
-            <pin position="7" pad="PE5"/>
-            <pin position="8" pad="PE6"/>
-            <pin position="9" pad="PE7"/>
-            <pin position="10" pad="PB0"/>
-            <pin position="11" pad="PB1"/>
-            <pin position="12" pad="PB2"/>
-            <pin position="13" pad="PB3"/>
-            <pin position="14" pad="PB4"/>
-            <pin position="15" pad="PB5"/>
-            <pin position="16" pad="PB6"/>
-            <pin position="17" pad="PB7"/>
-            <pin position="18" pad="PG3"/>
-            <pin position="19" pad="PG4"/>
-            <pin position="20" pad="PG5"/>
-            <pin position="21" pad="VCC"/>
-            <pin position="22" pad="GND"/>
-            <pin position="23" pad="XTAL2"/>
-            <pin position="24" pad="XTAL1"/>
-            <pin position="25" pad="PD0"/>
-            <pin position="26" pad="PD1"/>
-            <pin position="27" pad="PD2"/>
-            <pin position="28" pad="PD3"/>
-            <pin position="29" pad="PD4"/>
-            <pin position="30" pad="PD5"/>
-            <pin position="31" pad="PD6"/>
-            <pin position="32" pad="PD7"/>
-            <pin position="33" pad="PG0"/>
-            <pin position="34" pad="PG1"/>
-            <pin position="35" pad="PC0"/>
-            <pin position="36" pad="PC1"/>
-            <pin position="37" pad="PC2"/>
-            <pin position="38" pad="PC3"/>
-            <pin position="39" pad="PC4"/>
-            <pin position="40" pad="PC5"/>
-            <pin position="41" pad="PC6"/>
-            <pin position="42" pad="PC7"/>
-            <pin position="43" pad="PG2"/>
-            <pin position="44" pad="PA7"/>
-            <pin position="45" pad="PA6"/>
-            <pin position="46" pad="PA5"/>
-            <pin position="47" pad="PA4"/>
-            <pin position="48" pad="PA3"/>
-            <pin position="49" pad="PA2"/>
-            <pin position="50" pad="PA1"/>
-            <pin position="51" pad="PA0"/>
-            <pin position="52" pad="VCC"/>
-            <pin position="53" pad="GND"/>
-            <pin position="54" pad="PF7"/>
-            <pin position="55" pad="PF6"/>
-            <pin position="56" pad="PF5"/>
-            <pin position="57" pad="PF4"/>
-            <pin position="58" pad="PF3"/>
-            <pin position="59" pad="PF2"/>
-            <pin position="60" pad="PF1"/>
-            <pin position="61" pad="PF0"/>
-            <pin position="62" pad="AREF"/>
-            <pin position="63" pad="GND"/>
-            <pin position="64" pad="AVCC"/>
+            <pin position="1" pad-key="lcdcap"/>
+            <pin position="2" pad-key="pe0"/>
+            <pin position="3" pad-key="pe1"/>
+            <pin position="4" pad-key="pe2"/>
+            <pin position="5" pad-key="pe3"/>
+            <pin position="6" pad-key="pe4"/>
+            <pin position="7" pad-key="pe5"/>
+            <pin position="8" pad-key="pe6"/>
+            <pin position="9" pad-key="pe7"/>
+            <pin position="10" pad-key="pb0"/>
+            <pin position="11" pad-key="pb1"/>
+            <pin position="12" pad-key="pb2"/>
+            <pin position="13" pad-key="pb3"/>
+            <pin position="14" pad-key="pb4"/>
+            <pin position="15" pad-key="pb5"/>
+            <pin position="16" pad-key="pb6"/>
+            <pin position="17" pad-key="pb7"/>
+            <pin position="18" pad-key="pg3"/>
+            <pin position="19" pad-key="pg4"/>
+            <pin position="20" pad-key="pg5"/>
+            <pin position="21" pad-key="vcc"/>
+            <pin position="22" pad-key="gnd"/>
+            <pin position="23" pad-key="xtal2"/>
+            <pin position="24" pad-key="xtal1"/>
+            <pin position="25" pad-key="pd0"/>
+            <pin position="26" pad-key="pd1"/>
+            <pin position="27" pad-key="pd2"/>
+            <pin position="28" pad-key="pd3"/>
+            <pin position="29" pad-key="pd4"/>
+            <pin position="30" pad-key="pd5"/>
+            <pin position="31" pad-key="pd6"/>
+            <pin position="32" pad-key="pd7"/>
+            <pin position="33" pad-key="pg0"/>
+            <pin position="34" pad-key="pg1"/>
+            <pin position="35" pad-key="pc0"/>
+            <pin position="36" pad-key="pc1"/>
+            <pin position="37" pad-key="pc2"/>
+            <pin position="38" pad-key="pc3"/>
+            <pin position="39" pad-key="pc4"/>
+            <pin position="40" pad-key="pc5"/>
+            <pin position="41" pad-key="pc6"/>
+            <pin position="42" pad-key="pc7"/>
+            <pin position="43" pad-key="pg2"/>
+            <pin position="44" pad-key="pa7"/>
+            <pin position="45" pad-key="pa6"/>
+            <pin position="46" pad-key="pa5"/>
+            <pin position="47" pad-key="pa4"/>
+            <pin position="48" pad-key="pa3"/>
+            <pin position="49" pad-key="pa2"/>
+            <pin position="50" pad-key="pa1"/>
+            <pin position="51" pad-key="pa0"/>
+            <pin position="52" pad-key="vcc"/>
+            <pin position="53" pad-key="gnd"/>
+            <pin position="54" pad-key="pf7"/>
+            <pin position="55" pad-key="pf6"/>
+            <pin position="56" pad-key="pf5"/>
+            <pin position="57" pad-key="pf4"/>
+            <pin position="58" pad-key="pf3"/>
+            <pin position="59" pad-key="pf2"/>
+            <pin position="60" pad-key="pf1"/>
+            <pin position="61" pad-key="pf0"/>
+            <pin position="62" pad-key="aref"/>
+            <pin position="63" pad-key="gnd"/>
+            <pin position="64" pad-key="avcc"/>
         </pinout>
         <pinout key="qfn64" name="QFN64" type="qfn">
-            <pin position="1" pad="LCDCAP"/>
-            <pin position="2" pad="PE0"/>
-            <pin position="3" pad="PE1"/>
-            <pin position="4" pad="PE2"/>
-            <pin position="5" pad="PE3"/>
-            <pin position="6" pad="PE4"/>
-            <pin position="7" pad="PE5"/>
-            <pin position="8" pad="PE6"/>
-            <pin position="9" pad="PE7"/>
-            <pin position="10" pad="PB0"/>
-            <pin position="11" pad="PB1"/>
-            <pin position="12" pad="PB2"/>
-            <pin position="13" pad="PB3"/>
-            <pin position="14" pad="PB4"/>
-            <pin position="15" pad="PB5"/>
-            <pin position="16" pad="PB6"/>
-            <pin position="17" pad="PB7"/>
-            <pin position="18" pad="PG3"/>
-            <pin position="19" pad="PG4"/>
-            <pin position="20" pad="PG5"/>
-            <pin position="21" pad="VCC"/>
-            <pin position="22" pad="GND"/>
-            <pin position="23" pad="XTAL2"/>
-            <pin position="24" pad="XTAL1"/>
-            <pin position="25" pad="PD0"/>
-            <pin position="26" pad="PD1"/>
-            <pin position="27" pad="PD2"/>
-            <pin position="28" pad="PD3"/>
-            <pin position="29" pad="PD4"/>
-            <pin position="30" pad="PD5"/>
-            <pin position="31" pad="PD6"/>
-            <pin position="32" pad="PD7"/>
-            <pin position="33" pad="PG0"/>
-            <pin position="34" pad="PG1"/>
-            <pin position="35" pad="PC0"/>
-            <pin position="36" pad="PC1"/>
-            <pin position="37" pad="PC2"/>
-            <pin position="38" pad="PC3"/>
-            <pin position="39" pad="PC4"/>
-            <pin position="40" pad="PC5"/>
-            <pin position="41" pad="PC6"/>
-            <pin position="42" pad="PC7"/>
-            <pin position="43" pad="PG2"/>
-            <pin position="44" pad="PA7"/>
-            <pin position="45" pad="PA6"/>
-            <pin position="46" pad="PA5"/>
-            <pin position="47" pad="PA4"/>
-            <pin position="48" pad="PA3"/>
-            <pin position="49" pad="PA2"/>
-            <pin position="50" pad="PA1"/>
-            <pin position="51" pad="PA0"/>
-            <pin position="52" pad="VCC"/>
-            <pin position="53" pad="GND"/>
-            <pin position="54" pad="PF7"/>
-            <pin position="55" pad="PF6"/>
-            <pin position="56" pad="PF5"/>
-            <pin position="57" pad="PF4"/>
-            <pin position="58" pad="PF3"/>
-            <pin position="59" pad="PF2"/>
-            <pin position="60" pad="PF1"/>
-            <pin position="61" pad="PF0"/>
-            <pin position="62" pad="AREF"/>
-            <pin position="63" pad="GND"/>
-            <pin position="64" pad="AVCC"/>
+            <pin position="1" pad-key="lcdcap"/>
+            <pin position="2" pad-key="pe0"/>
+            <pin position="3" pad-key="pe1"/>
+            <pin position="4" pad-key="pe2"/>
+            <pin position="5" pad-key="pe3"/>
+            <pin position="6" pad-key="pe4"/>
+            <pin position="7" pad-key="pe5"/>
+            <pin position="8" pad-key="pe6"/>
+            <pin position="9" pad-key="pe7"/>
+            <pin position="10" pad-key="pb0"/>
+            <pin position="11" pad-key="pb1"/>
+            <pin position="12" pad-key="pb2"/>
+            <pin position="13" pad-key="pb3"/>
+            <pin position="14" pad-key="pb4"/>
+            <pin position="15" pad-key="pb5"/>
+            <pin position="16" pad-key="pb6"/>
+            <pin position="17" pad-key="pb7"/>
+            <pin position="18" pad-key="pg3"/>
+            <pin position="19" pad-key="pg4"/>
+            <pin position="20" pad-key="pg5"/>
+            <pin position="21" pad-key="vcc"/>
+            <pin position="22" pad-key="gnd"/>
+            <pin position="23" pad-key="xtal2"/>
+            <pin position="24" pad-key="xtal1"/>
+            <pin position="25" pad-key="pd0"/>
+            <pin position="26" pad-key="pd1"/>
+            <pin position="27" pad-key="pd2"/>
+            <pin position="28" pad-key="pd3"/>
+            <pin position="29" pad-key="pd4"/>
+            <pin position="30" pad-key="pd5"/>
+            <pin position="31" pad-key="pd6"/>
+            <pin position="32" pad-key="pd7"/>
+            <pin position="33" pad-key="pg0"/>
+            <pin position="34" pad-key="pg1"/>
+            <pin position="35" pad-key="pc0"/>
+            <pin position="36" pad-key="pc1"/>
+            <pin position="37" pad-key="pc2"/>
+            <pin position="38" pad-key="pc3"/>
+            <pin position="39" pad-key="pc4"/>
+            <pin position="40" pad-key="pc5"/>
+            <pin position="41" pad-key="pc6"/>
+            <pin position="42" pad-key="pc7"/>
+            <pin position="43" pad-key="pg2"/>
+            <pin position="44" pad-key="pa7"/>
+            <pin position="45" pad-key="pa6"/>
+            <pin position="46" pad-key="pa5"/>
+            <pin position="47" pad-key="pa4"/>
+            <pin position="48" pad-key="pa3"/>
+            <pin position="49" pad-key="pa2"/>
+            <pin position="50" pad-key="pa1"/>
+            <pin position="51" pad-key="pa0"/>
+            <pin position="52" pad-key="vcc"/>
+            <pin position="53" pad-key="gnd"/>
+            <pin position="54" pad-key="pf7"/>
+            <pin position="55" pad-key="pf6"/>
+            <pin position="56" pad-key="pf5"/>
+            <pin position="57" pad-key="pf4"/>
+            <pin position="58" pad-key="pf3"/>
+            <pin position="59" pad-key="pf2"/>
+            <pin position="60" pad-key="pf1"/>
+            <pin position="61" pad-key="pf0"/>
+            <pin position="62" pad-key="aref"/>
+            <pin position="63" pad-key="gnd"/>
+            <pin position="64" pad-key="avcc"/>
         </pinout>
         <pinout key="drqfn64" name="DRQFN64" type="drqfn">
-            <pin position="B1" pad="LCDCAP"/>
-            <pin position="A1" pad="PE0"/>
-            <pin position="A2" pad="PE1"/>
-            <pin position="B2" pad="PE2"/>
-            <pin position="A3" pad="PE3"/>
-            <pin position="B3" pad="PE4"/>
-            <pin position="A4" pad="PE5"/>
-            <pin position="B4" pad="PE6"/>
-            <pin position="A5" pad="PE7"/>
-            <pin position="B5" pad="PB0"/>
-            <pin position="A6" pad="PB1"/>
-            <pin position="B6" pad="PB2"/>
-            <pin position="A7" pad="PB3"/>
-            <pin position="A8" pad="PB4"/>
-            <pin position="B7" pad="PB5"/>
-            <pin position="B8" pad="PB6"/>
-            <pin position="A9" pad="PB7"/>
-            <pin position="A10" pad="PG3"/>
-            <pin position="B9" pad="PG4"/>
-            <pin position="A11" pad="PG5"/>
-            <pin position="B10" pad="VCC"/>
-            <pin position="A12" pad="GND"/>
-            <pin position="B11" pad="XTAL2"/>
-            <pin position="A13" pad="XTAL1"/>
-            <pin position="B12" pad="PD0"/>
-            <pin position="A14" pad="PD1"/>
-            <pin position="B13" pad="PD2"/>
-            <pin position="A15" pad="PD3"/>
-            <pin position="B14" pad="PD4"/>
-            <pin position="A16" pad="PD5"/>
-            <pin position="A17" pad="PD6"/>
-            <pin position="B15" pad="PD7"/>
-            <pin position="B16" pad="PG0"/>
-            <pin position="A18" pad="PG1"/>
-            <pin position="A19" pad="PC0"/>
-            <pin position="B17" pad="PC1"/>
-            <pin position="A20" pad="PC2"/>
-            <pin position="B18" pad="PC3"/>
-            <pin position="A21" pad="PC4"/>
-            <pin position="B19" pad="PC5"/>
-            <pin position="A22" pad="PC6"/>
-            <pin position="B20" pad="PC7"/>
-            <pin position="A23" pad="PG2"/>
-            <pin position="B21" pad="PA7"/>
-            <pin position="A24" pad="PA6"/>
-            <pin position="A25" pad="PA5"/>
-            <pin position="B22" pad="PA4"/>
-            <pin position="B23" pad="PA3"/>
-            <pin position="A26" pad="PA2"/>
-            <pin position="A27" pad="PA1"/>
-            <pin position="B24" pad="PA0"/>
-            <pin position="A28" pad="VCC"/>
-            <pin position="B25" pad="GND"/>
-            <pin position="A29" pad="PF7"/>
-            <pin position="B26" pad="PF6"/>
-            <pin position="A30" pad="PF5"/>
-            <pin position="B27" pad="PF4"/>
-            <pin position="A31" pad="PF3"/>
-            <pin position="B28" pad="PF2"/>
-            <pin position="A32" pad="PF1"/>
-            <pin position="B29" pad="PF0"/>
-            <pin position="A33" pad="AREF"/>
-            <pin position="A34" pad="GND"/>
-            <pin position="B30" pad="AVCC"/>
+            <pin position="B1" pad-key="lcdcap"/>
+            <pin position="A1" pad-key="pe0"/>
+            <pin position="A2" pad-key="pe1"/>
+            <pin position="B2" pad-key="pe2"/>
+            <pin position="A3" pad-key="pe3"/>
+            <pin position="B3" pad-key="pe4"/>
+            <pin position="A4" pad-key="pe5"/>
+            <pin position="B4" pad-key="pe6"/>
+            <pin position="A5" pad-key="pe7"/>
+            <pin position="B5" pad-key="pb0"/>
+            <pin position="A6" pad-key="pb1"/>
+            <pin position="B6" pad-key="pb2"/>
+            <pin position="A7" pad-key="pb3"/>
+            <pin position="A8" pad-key="pb4"/>
+            <pin position="B7" pad-key="pb5"/>
+            <pin position="B8" pad-key="pb6"/>
+            <pin position="A9" pad-key="pb7"/>
+            <pin position="A10" pad-key="pg3"/>
+            <pin position="B9" pad-key="pg4"/>
+            <pin position="A11" pad-key="pg5"/>
+            <pin position="B10" pad-key="vcc"/>
+            <pin position="A12" pad-key="gnd"/>
+            <pin position="B11" pad-key="xtal2"/>
+            <pin position="A13" pad-key="xtal1"/>
+            <pin position="B12" pad-key="pd0"/>
+            <pin position="A14" pad-key="pd1"/>
+            <pin position="B13" pad-key="pd2"/>
+            <pin position="A15" pad-key="pd3"/>
+            <pin position="B14" pad-key="pd4"/>
+            <pin position="A16" pad-key="pd5"/>
+            <pin position="A17" pad-key="pd6"/>
+            <pin position="B15" pad-key="pd7"/>
+            <pin position="B16" pad-key="pg0"/>
+            <pin position="A18" pad-key="pg1"/>
+            <pin position="A19" pad-key="pc0"/>
+            <pin position="B17" pad-key="pc1"/>
+            <pin position="A20" pad-key="pc2"/>
+            <pin position="B18" pad-key="pc3"/>
+            <pin position="A21" pad-key="pc4"/>
+            <pin position="B19" pad-key="pc5"/>
+            <pin position="A22" pad-key="pc6"/>
+            <pin position="B20" pad-key="pc7"/>
+            <pin position="A23" pad-key="pg2"/>
+            <pin position="B21" pad-key="pa7"/>
+            <pin position="A24" pad-key="pa6"/>
+            <pin position="A25" pad-key="pa5"/>
+            <pin position="B22" pad-key="pa4"/>
+            <pin position="B23" pad-key="pa3"/>
+            <pin position="A26" pad-key="pa2"/>
+            <pin position="A27" pad-key="pa1"/>
+            <pin position="B24" pad-key="pa0"/>
+            <pin position="A28" pad-key="vcc"/>
+            <pin position="B25" pad-key="gnd"/>
+            <pin position="A29" pad-key="pf7"/>
+            <pin position="B26" pad-key="pf6"/>
+            <pin position="A30" pad-key="pf5"/>
+            <pin position="B27" pad-key="pf4"/>
+            <pin position="A31" pad-key="pf3"/>
+            <pin position="B28" pad-key="pf2"/>
+            <pin position="A32" pad-key="pf1"/>
+            <pin position="B29" pad-key="pf0"/>
+            <pin position="A33" pad-key="aref"/>
+            <pin position="A34" pad-key="gnd"/>
+            <pin position="B30" pad-key="avcc"/>
         </pinout>
     </pinouts>
     <variants>
-        <variant name="ATmega169PA-AU" pinout-key="tqfp64" package="TQFP64"/>
-        <variant name="ATmega169PA-MU" pinout-key="qfn64" package="QFN64"/>
-        <variant name="ATmega169PA-MCH" pinout-key="drqfn64" package="DRQFN64"/>
-        <variant name="ATmega169PA-AN" pinout-key="tqfp64" package="TQFP64 "/>
-        <variant name="ATmega169PA-MN" pinout-key="qfn64" package="QFN64"/>
+        <variant key="atmega169pa_au" name="ATmega169PA-AU" pinout-key="tqfp64"/>
+        <variant key="atmega169pa_mu" name="ATmega169PA-MU" pinout-key="qfn64"/>
+        <variant key="atmega169pa_mch" name="ATmega169PA-MCH" pinout-key="drqfn64"/>
+        <variant key="atmega169pa_an" name="ATmega169PA-AN" pinout-key="tqfp64"/>
+        <variant key="atmega169pa_mn" name="ATmega169PA-MN" pinout-key="qfn64"/>
     </variants>
 </device>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA16A.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA16A.xml
index 4301ea98..a56450e7 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA16A.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA16A.xml
@@ -220,25 +220,25 @@
         <peripheral key="tc0" name="TC0" module-key="tc8">
             <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"/>
+                <signal pad-key="pb3" function="default" group="OC"/>
+                <signal pad-key="pb0" function="default" group="T"/>
             </signals>
         </peripheral>
         <peripheral key="tc1" name="TC1" module-key="tc16">
             <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"/>
-                <signal pad-id="pd5" function="default" group="OCA"/>
-                <signal pad-id="pd4" function="default" group="OCB"/>
+                <signal pad-key="pb1" function="default" group="T"/>
+                <signal pad-key="pd6" function="default" group="ICP"/>
+                <signal pad-key="pd5" function="default" group="OCA"/>
+                <signal pad-key="pd4" function="default" group="OCB"/>
             </signals>
         </peripheral>
         <peripheral key="exint" name="EXINT" module-key="exint">
             <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"/>
-                <signal pad-id="pd2" index="0" function="default" group="INT"/>
+                <signal pad-key="pb2" index="2" function="default" group="INT"/>
+                <signal pad-key="pd3" index="1" function="default" group="INT"/>
+                <signal pad-key="pd2" index="0" function="default" group="INT"/>
             </signals>
         </peripheral>
         <peripheral key="eeprom" name="EEPROM" module-key="eeprom">
@@ -250,62 +250,62 @@
         <peripheral key="tc2" name="TC2" module-key="tc8_async">
             <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"/>
-                <signal pad-id="pd7" function="default" group="OC"/>
+                <signal pad-key="pc7" index="2" function="default" group="TOSC"/>
+                <signal pad-key="pc6" index="1" function="default" group="TOSC"/>
+                <signal pad-key="pd7" function="default" group="OC"/>
             </signals>
         </peripheral>
         <peripheral key="spi" name="SPI" module-key="spi">
             <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"/>
-                <signal pad-id="pb5" function="default" group="MOSI"/>
-                <signal pad-id="pb4" function="default" group="SS"/>
+                <signal pad-key="pb7" function="default" group="SCK"/>
+                <signal pad-key="pb6" function="default" group="MISO"/>
+                <signal pad-key="pb5" function="default" group="MOSI"/>
+                <signal pad-key="pb4" function="default" group="SS"/>
             </signals>
         </peripheral>
         <peripheral key="usart" name="USART" module-key="usart">
             <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"/>
-                <signal pad-id="pd0" function="default" group="RXD"/>
+                <signal pad-key="pb0" function="default" group="XCK"/>
+                <signal pad-key="pd1" function="default" group="TXD"/>
+                <signal pad-key="pd0" function="default" group="RXD"/>
             </signals>
         </peripheral>
         <peripheral key="twi" name="TWI" module-key="twi">
             <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"/>
+                <signal pad-key="pc1" function="default" group="SDA"/>
+                <signal pad-key="pc0" function="default" group="SCL"/>
             </signals>
         </peripheral>
         <peripheral key="ac" name="AC" module-key="ac">
             <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"/>
+                <signal pad-key="pb2" index="0" function="default" group="AIN"/>
+                <signal pad-key="pb3" index="1" function="default" group="AIN"/>
             </signals>
         </peripheral>
         <peripheral key="adc" name="ADC" module-key="adc">
             <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"/>
-                <signal pad-id="pa2" index="2" function="default" group="ADC"/>
-                <signal pad-id="pa3" index="3" function="default" group="ADC"/>
-                <signal pad-id="pa4" index="4" function="default" group="ADC"/>
-                <signal pad-id="pa5" index="5" function="default" group="ADC"/>
-                <signal pad-id="pa6" index="6" function="default" group="ADC"/>
-                <signal pad-id="pa7" index="7" function="default" group="ADC"/>
+                <signal pad-key="pa0" index="0" function="default" group="ADC"/>
+                <signal pad-key="pa1" index="1" function="default" group="ADC"/>
+                <signal pad-key="pa2" index="2" function="default" group="ADC"/>
+                <signal pad-key="pa3" index="3" function="default" group="ADC"/>
+                <signal pad-key="pa4" index="4" function="default" group="ADC"/>
+                <signal pad-key="pa5" index="5" function="default" group="ADC"/>
+                <signal pad-key="pa6" index="6" function="default" group="ADC"/>
+                <signal pad-key="pa7" index="7" function="default" group="ADC"/>
             </signals>
         </peripheral>
         <peripheral key="jtag" name="JTAG" module-key="jtag">
             <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"/>
-                <signal pad-id="pc3" function="default" group="TMS"/>
-                <signal pad-id="pc2" function="default" group="TCK"/>
+                <signal pad-key="pc5" function="default" group="TDI"/>
+                <signal pad-key="pc4" function="default" group="TDO"/>
+                <signal pad-key="pc3" function="default" group="TMS"/>
+                <signal pad-key="pc2" function="default" group="TCK"/>
             </signals>
         </peripheral>
         <peripheral key="boot_load" name="BOOT_LOAD" module-key="boot_load">
@@ -314,53 +314,53 @@
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pa2" index="2" function="default" group="P"/>
-                <signal pad-id="pa3" index="3" function="default" group="P"/>
-                <signal pad-id="pa4" index="4" function="default" group="P"/>
-                <signal pad-id="pa5" index="5" function="default" group="P"/>
-                <signal pad-id="pa6" index="6" function="default" group="P"/>
-                <signal pad-id="pa7" index="7" function="default" group="P"/>
+                <signal pad-key="pa0" index="0" function="default" group="P"/>
+                <signal pad-key="pa1" index="1" function="default" group="P"/>
+                <signal pad-key="pa2" index="2" function="default" group="P"/>
+                <signal pad-key="pa3" index="3" function="default" group="P"/>
+                <signal pad-key="pa4" index="4" function="default" group="P"/>
+                <signal pad-key="pa5" index="5" function="default" group="P"/>
+                <signal pad-key="pa6" index="6" function="default" group="P"/>
+                <signal pad-key="pa7" index="7" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pb2" index="2" function="default" group="P"/>
-                <signal pad-id="pb3" index="3" function="default" group="P"/>
-                <signal pad-id="pb4" index="4" function="default" group="P"/>
-                <signal pad-id="pb5" index="5" function="default" group="P"/>
-                <signal pad-id="pb6" index="6" function="default" group="P"/>
-                <signal pad-id="pb7" index="7" function="default" group="P"/>
+                <signal pad-key="pb0" index="0" function="default" group="P"/>
+                <signal pad-key="pb1" index="1" function="default" group="P"/>
+                <signal pad-key="pb2" index="2" function="default" group="P"/>
+                <signal pad-key="pb3" index="3" function="default" group="P"/>
+                <signal pad-key="pb4" index="4" function="default" group="P"/>
+                <signal pad-key="pb5" index="5" function="default" group="P"/>
+                <signal pad-key="pb6" index="6" function="default" group="P"/>
+                <signal pad-key="pb7" index="7" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pc2" index="2" function="default" group="P"/>
-                <signal pad-id="pc3" index="3" function="default" group="P"/>
-                <signal pad-id="pc4" index="4" function="default" group="P"/>
-                <signal pad-id="pc5" index="5" function="default" group="P"/>
-                <signal pad-id="pc6" index="6" function="default" group="P"/>
-                <signal pad-id="pc7" index="7" function="default" group="P"/>
+                <signal pad-key="pc0" index="0" function="default" group="P"/>
+                <signal pad-key="pc1" index="1" function="default" group="P"/>
+                <signal pad-key="pc2" index="2" function="default" group="P"/>
+                <signal pad-key="pc3" index="3" function="default" group="P"/>
+                <signal pad-key="pc4" index="4" function="default" group="P"/>
+                <signal pad-key="pc5" index="5" function="default" group="P"/>
+                <signal pad-key="pc6" index="6" function="default" group="P"/>
+                <signal pad-key="pc7" index="7" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pd2" index="2" function="default" group="P"/>
-                <signal pad-id="pd3" index="3" function="default" group="P"/>
-                <signal pad-id="pd4" index="4" function="default" group="P"/>
-                <signal pad-id="pd5" index="5" function="default" group="P"/>
-                <signal pad-id="pd6" index="6" function="default" group="P"/>
-                <signal pad-id="pd7" index="7" function="default" group="P"/>
+                <signal pad-key="pd0" index="0" function="default" group="P"/>
+                <signal pad-key="pd1" index="1" function="default" group="P"/>
+                <signal pad-key="pd2" index="2" function="default" group="P"/>
+                <signal pad-key="pd3" index="3" function="default" group="P"/>
+                <signal pad-key="pd4" index="4" function="default" group="P"/>
+                <signal pad-key="pd5" index="5" function="default" group="P"/>
+                <signal pad-key="pd6" index="6" function="default" group="P"/>
+                <signal pad-key="pd7" index="7" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="wdt">
@@ -764,99 +764,140 @@
             </register-group>
         </module>
     </modules>
+    <pads>
+        <pad key="pb5" name="PB5"/>
+        <pad key="pb6" name="PB6"/>
+        <pad key="pb7" name="PB7"/>
+        <pad key="reset" name="RESET"/>
+        <pad key="vcc" name="VCC"/>
+        <pad key="gnd" name="GND"/>
+        <pad key="xtal2" name="XTAL2"/>
+        <pad key="xtal1" name="XTAL1"/>
+        <pad key="pd0" name="PD0"/>
+        <pad key="pd1" name="PD1"/>
+        <pad key="pd2" name="PD2"/>
+        <pad key="pd3" name="PD3"/>
+        <pad key="pd4" name="PD4"/>
+        <pad key="pd5" name="PD5"/>
+        <pad key="pd6" name="PD6"/>
+        <pad key="pd7" name="PD7"/>
+        <pad key="pc0" name="PC0"/>
+        <pad key="pc1" name="PC1"/>
+        <pad key="pc2" name="PC2"/>
+        <pad key="pc3" name="PC3"/>
+        <pad key="pc4" name="PC4"/>
+        <pad key="pc5" name="PC5"/>
+        <pad key="pc6" name="PC6"/>
+        <pad key="pc7" name="PC7"/>
+        <pad key="avcc" name="AVCC"/>
+        <pad key="aref" name="AREF"/>
+        <pad key="pa7" name="PA7"/>
+        <pad key="pa6" name="PA6"/>
+        <pad key="pa5" name="PA5"/>
+        <pad key="pa4" name="PA4"/>
+        <pad key="pa3" name="PA3"/>
+        <pad key="pa2" name="PA2"/>
+        <pad key="pa1" name="PA1"/>
+        <pad key="pa0" name="PA0"/>
+        <pad key="pb0" name="PB0"/>
+        <pad key="pb1" name="PB1"/>
+        <pad key="pb2" name="PB2"/>
+        <pad key="pb3" name="PB3"/>
+        <pad key="pb4" name="PB4"/>
+    </pads>
     <pinouts>
         <pinout key="tqfpqfn44" name="TQFPQFN44" type="qfn">
-            <pin position="1" pad="PB5"/>
-            <pin position="2" pad="PB6"/>
-            <pin position="3" pad="PB7"/>
-            <pin position="4" pad="RESET"/>
-            <pin position="5" pad="VCC"/>
-            <pin position="6" pad="GND"/>
-            <pin position="7" pad="XTAL2"/>
-            <pin position="8" pad="XTAL1"/>
-            <pin position="9" pad="PD0"/>
-            <pin position="10" pad="PD1"/>
-            <pin position="11" pad="PD2"/>
-            <pin position="12" pad="PD3"/>
-            <pin position="13" pad="PD4"/>
-            <pin position="14" pad="PD5"/>
-            <pin position="15" pad="PD6"/>
-            <pin position="16" pad="PD7"/>
-            <pin position="17" pad="VCC"/>
-            <pin position="18" pad="GND"/>
-            <pin position="19" pad="PC0"/>
-            <pin position="20" pad="PC1"/>
-            <pin position="21" pad="PC2"/>
-            <pin position="22" pad="PC3"/>
-            <pin position="23" pad="PC4"/>
-            <pin position="24" pad="PC5"/>
-            <pin position="25" pad="PC6"/>
-            <pin position="26" pad="PC7"/>
-            <pin position="27" pad="AVCC"/>
-            <pin position="28" pad="GND"/>
-            <pin position="29" pad="AREF"/>
-            <pin position="30" pad="PA7"/>
-            <pin position="31" pad="PA6"/>
-            <pin position="32" pad="PA5"/>
-            <pin position="33" pad="PA4"/>
-            <pin position="34" pad="PA3"/>
-            <pin position="35" pad="PA2"/>
-            <pin position="36" pad="PA1"/>
-            <pin position="37" pad="PA0"/>
-            <pin position="38" pad="VCC"/>
-            <pin position="39" pad="GND"/>
-            <pin position="40" pad="PB0"/>
-            <pin position="41" pad="PB1"/>
-            <pin position="42" pad="PB2"/>
-            <pin position="43" pad="PB3"/>
-            <pin position="44" pad="PB4"/>
+            <pin position="1" pad-key="pb5"/>
+            <pin position="2" pad-key="pb6"/>
+            <pin position="3" pad-key="pb7"/>
+            <pin position="4" pad-key="reset"/>
+            <pin position="5" pad-key="vcc"/>
+            <pin position="6" pad-key="gnd"/>
+            <pin position="7" pad-key="xtal2"/>
+            <pin position="8" pad-key="xtal1"/>
+            <pin position="9" pad-key="pd0"/>
+            <pin position="10" pad-key="pd1"/>
+            <pin position="11" pad-key="pd2"/>
+            <pin position="12" pad-key="pd3"/>
+            <pin position="13" pad-key="pd4"/>
+            <pin position="14" pad-key="pd5"/>
+            <pin position="15" pad-key="pd6"/>
+            <pin position="16" pad-key="pd7"/>
+            <pin position="17" pad-key="vcc"/>
+            <pin position="18" pad-key="gnd"/>
+            <pin position="19" pad-key="pc0"/>
+            <pin position="20" pad-key="pc1"/>
+            <pin position="21" pad-key="pc2"/>
+            <pin position="22" pad-key="pc3"/>
+            <pin position="23" pad-key="pc4"/>
+            <pin position="24" pad-key="pc5"/>
+            <pin position="25" pad-key="pc6"/>
+            <pin position="26" pad-key="pc7"/>
+            <pin position="27" pad-key="avcc"/>
+            <pin position="28" pad-key="gnd"/>
+            <pin position="29" pad-key="aref"/>
+            <pin position="30" pad-key="pa7"/>
+            <pin position="31" pad-key="pa6"/>
+            <pin position="32" pad-key="pa5"/>
+            <pin position="33" pad-key="pa4"/>
+            <pin position="34" pad-key="pa3"/>
+            <pin position="35" pad-key="pa2"/>
+            <pin position="36" pad-key="pa1"/>
+            <pin position="37" pad-key="pa0"/>
+            <pin position="38" pad-key="vcc"/>
+            <pin position="39" pad-key="gnd"/>
+            <pin position="40" pad-key="pb0"/>
+            <pin position="41" pad-key="pb1"/>
+            <pin position="42" pad-key="pb2"/>
+            <pin position="43" pad-key="pb3"/>
+            <pin position="44" pad-key="pb4"/>
         </pinout>
         <pinout key="pdip40" name="PDIP40" type="dip">
-            <pin position="1" pad="PB0"/>
-            <pin position="2" pad="PB1"/>
-            <pin position="3" pad="PB2"/>
-            <pin position="4" pad="PB3"/>
-            <pin position="5" pad="PB4"/>
-            <pin position="6" pad="PB5"/>
-            <pin position="7" pad="PB6"/>
-            <pin position="8" pad="PB7"/>
-            <pin position="9" pad="RESET"/>
-            <pin position="10" pad="VCC"/>
-            <pin position="11" pad="GND"/>
-            <pin position="12" pad="XTAL2"/>
-            <pin position="13" pad="XTAL1"/>
-            <pin position="14" pad="PD0"/>
-            <pin position="15" pad="PD1"/>
-            <pin position="16" pad="PD2"/>
-            <pin position="17" pad="PD3"/>
-            <pin position="18" pad="PD4"/>
-            <pin position="19" pad="PD5"/>
-            <pin position="20" pad="PD6"/>
-            <pin position="21" pad="PD7"/>
-            <pin position="22" pad="PC0"/>
-            <pin position="23" pad="PC1"/>
-            <pin position="24" pad="PC2"/>
-            <pin position="25" pad="PC3"/>
-            <pin position="26" pad="PC4"/>
-            <pin position="27" pad="PC5"/>
-            <pin position="28" pad="PC6"/>
-            <pin position="29" pad="PC7"/>
-            <pin position="30" pad="AVCC"/>
-            <pin position="31" pad="GND"/>
-            <pin position="32" pad="AREF"/>
-            <pin position="33" pad="PA7"/>
-            <pin position="34" pad="PA6"/>
-            <pin position="35" pad="PA5"/>
-            <pin position="36" pad="PA4"/>
-            <pin position="37" pad="PA3"/>
-            <pin position="38" pad="PA2"/>
-            <pin position="39" pad="PA1"/>
-            <pin position="40" pad="PA0"/>
+            <pin position="1" pad-key="pb0"/>
+            <pin position="2" pad-key="pb1"/>
+            <pin position="3" pad-key="pb2"/>
+            <pin position="4" pad-key="pb3"/>
+            <pin position="5" pad-key="pb4"/>
+            <pin position="6" pad-key="pb5"/>
+            <pin position="7" pad-key="pb6"/>
+            <pin position="8" pad-key="pb7"/>
+            <pin position="9" pad-key="reset"/>
+            <pin position="10" pad-key="vcc"/>
+            <pin position="11" pad-key="gnd"/>
+            <pin position="12" pad-key="xtal2"/>
+            <pin position="13" pad-key="xtal1"/>
+            <pin position="14" pad-key="pd0"/>
+            <pin position="15" pad-key="pd1"/>
+            <pin position="16" pad-key="pd2"/>
+            <pin position="17" pad-key="pd3"/>
+            <pin position="18" pad-key="pd4"/>
+            <pin position="19" pad-key="pd5"/>
+            <pin position="20" pad-key="pd6"/>
+            <pin position="21" pad-key="pd7"/>
+            <pin position="22" pad-key="pc0"/>
+            <pin position="23" pad-key="pc1"/>
+            <pin position="24" pad-key="pc2"/>
+            <pin position="25" pad-key="pc3"/>
+            <pin position="26" pad-key="pc4"/>
+            <pin position="27" pad-key="pc5"/>
+            <pin position="28" pad-key="pc6"/>
+            <pin position="29" pad-key="pc7"/>
+            <pin position="30" pad-key="avcc"/>
+            <pin position="31" pad-key="gnd"/>
+            <pin position="32" pad-key="aref"/>
+            <pin position="33" pad-key="pa7"/>
+            <pin position="34" pad-key="pa6"/>
+            <pin position="35" pad-key="pa5"/>
+            <pin position="36" pad-key="pa4"/>
+            <pin position="37" pad-key="pa3"/>
+            <pin position="38" pad-key="pa2"/>
+            <pin position="39" pad-key="pa1"/>
+            <pin position="40" pad-key="pa0"/>
         </pinout>
     </pinouts>
     <variants>
-        <variant name="ATmega16A-AU" pinout-key="tqfpqfn44" package="TQFP44"/>
-        <variant name="ATmega16A-PU" pinout-key="pdip40" package="PDIP40"/>
-        <variant name="ATmega16A-MU" pinout-key="tqfpqfn44" package="QFN44"/>
+        <variant key="atmega16a_au" name="ATmega16A-AU" pinout-key="tqfpqfn44"/>
+        <variant key="atmega16a_pu" name="ATmega16A-PU" pinout-key="pdip40"/>
+        <variant key="atmega16a_mu" name="ATmega16A-MU" pinout-key="tqfpqfn44"/>
     </variants>
 </device>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA16M1.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA16M1.xml
index 75c0ae5d..d0f6b800 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA16M1.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA16M1.xml
@@ -194,48 +194,48 @@
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pb2" index="2" function="IOPORT" group="PIN"/>
-                <signal pad-id="pb3" index="3" function="IOPORT" group="PIN"/>
-                <signal pad-id="pb4" index="4" function="IOPORT" group="PIN"/>
-                <signal pad-id="pb5" index="5" function="IOPORT" group="PIN"/>
-                <signal pad-id="pb6" index="6" function="IOPORT" group="PIN"/>
-                <signal pad-id="pb7" index="7" function="IOPORT" group="PIN"/>
+                <signal pad-key="pb0" index="0" function="IOPORT" group="PIN"/>
+                <signal pad-key="pb1" index="1" function="IOPORT" group="PIN"/>
+                <signal pad-key="pb2" index="2" function="IOPORT" group="PIN"/>
+                <signal pad-key="pb3" index="3" function="IOPORT" group="PIN"/>
+                <signal pad-key="pb4" index="4" function="IOPORT" group="PIN"/>
+                <signal pad-key="pb5" index="5" function="IOPORT" group="PIN"/>
+                <signal pad-key="pb6" index="6" function="IOPORT" group="PIN"/>
+                <signal pad-key="pb7" index="7" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pc2" index="2" function="IOPORT" group="PIN"/>
-                <signal pad-id="pc3" index="3" function="IOPORT" group="PIN"/>
-                <signal pad-id="pc4" index="4" function="IOPORT" group="PIN"/>
-                <signal pad-id="pc5" index="5" function="IOPORT" group="PIN"/>
-                <signal pad-id="pc6" index="6" function="IOPORT" group="PIN"/>
-                <signal pad-id="pc7" index="7" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc0" index="0" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc1" index="1" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc2" index="2" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc3" index="3" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc4" index="4" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc5" index="5" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc6" index="6" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc7" index="7" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pd2" index="2" function="IOPORT" group="PIN"/>
-                <signal pad-id="pd3" index="3" function="IOPORT" group="PIN"/>
-                <signal pad-id="pd4" index="4" function="IOPORT" group="PIN"/>
-                <signal pad-id="pd5" index="5" function="IOPORT" group="PIN"/>
-                <signal pad-id="pd6" index="6" function="IOPORT" group="PIN"/>
-                <signal pad-id="pd7" index="7" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd0" index="0" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd1" index="1" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd2" index="2" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd3" index="3" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd4" index="4" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd5" index="5" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd6" index="6" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd7" index="7" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="porte" name="PORTE" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pe2" index="2" function="IOPORT" group="PIN"/>
+                <signal pad-key="pe0" index="0" function="IOPORT" group="PIN"/>
+                <signal pad-key="pe1" index="1" function="IOPORT" group="PIN"/>
+                <signal pad-key="pe2" index="2" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="can" name="CAN" module-key="can">
@@ -244,20 +244,20 @@
         <peripheral key="ac" name="AC" module-key="ac">
             <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"/>
-                <signal pad-id="pd5" index="2" function="AC" group="ACMP"/>
-                <signal pad-id="pc5" index="3" function="AC" group="ACMP"/>
-                <signal pad-id="pb2" index="0" function="AC" group="ACMPN"/>
-                <signal pad-id="pb5" index="1" function="AC" group="ACMPN"/>
-                <signal pad-id="pd6" index="2" function="AC" group="ACMPN"/>
-                <signal pad-id="pc4" index="3" function="AC" group="ACMPN"/>
+                <signal pad-key="pd7" index="0" function="AC" group="ACMP"/>
+                <signal pad-key="pc6" index="1" function="AC" group="ACMP"/>
+                <signal pad-key="pd5" index="2" function="AC" group="ACMP"/>
+                <signal pad-key="pc5" index="3" function="AC" group="ACMP"/>
+                <signal pad-key="pb2" index="0" function="AC" group="ACMPN"/>
+                <signal pad-key="pb5" index="1" function="AC" group="ACMPN"/>
+                <signal pad-key="pd6" index="2" function="AC" group="ACMPN"/>
+                <signal pad-key="pc4" index="3" function="AC" group="ACMPN"/>
             </signals>
         </peripheral>
         <peripheral key="dac" name="DAC" module-key="dac">
             <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"/>
+                <signal pad-key="pc7" function="DAC" group="D2A"/>
             </signals>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="cpu">
@@ -266,55 +266,55 @@
         <peripheral key="tc0" name="TC0" module-key="tc8">
             <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"/>
-                <signal pad-id="pe1" function="TC0" group="OC0B"/>
+                <signal pad-key="pc2" function="TC0" group="T0"/>
+                <signal pad-key="pd3" function="TC0" group="OC0A"/>
+                <signal pad-key="pe1" function="TC0" group="OC0B"/>
             </signals>
         </peripheral>
         <peripheral key="tc1" name="TC1" module-key="tc16">
             <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"/>
-                <signal pad-id="pc3" function="TC1" group="ICP1B"/>
-                <signal pad-id="pd2" function="TC1" group="OC1A"/>
-                <signal pad-id="pc1" function="TC1" group="OC1B"/>
+                <signal pad-key="pc3" function="TC1" group="T1"/>
+                <signal pad-key="pd4" function="TC1" group="ICP1A"/>
+                <signal pad-key="pc3" function="TC1" group="ICP1B"/>
+                <signal pad-key="pd2" function="TC1" group="OC1A"/>
+                <signal pad-key="pc1" function="TC1" group="OC1B"/>
             </signals>
         </peripheral>
         <peripheral key="adc" name="ADC" module-key="adc">
             <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"/>
-                <signal pad-id="pd5" index="2" function="ADC" group="ADC"/>
-                <signal pad-id="pd6" index="3" function="ADC" group="ADC"/>
-                <signal pad-id="pb7" index="4" function="ADC" group="ADC"/>
-                <signal pad-id="pb2" index="5" function="ADC" group="ADC"/>
-                <signal pad-id="pb5" index="6" function="ADC" group="ADC"/>
-                <signal pad-id="pb6" index="7" function="ADC" group="ADC"/>
-                <signal pad-id="pc4" index="8" function="ADC" group="ADC"/>
-                <signal pad-id="pc5" index="9" function="ADC" group="ADC"/>
-                <signal pad-id="pc6" index="10" function="ADC" group="ADC"/>
+                <signal pad-key="pe2" index="0" function="ADC" group="ADC"/>
+                <signal pad-key="pd4" index="1" function="ADC" group="ADC"/>
+                <signal pad-key="pd5" index="2" function="ADC" group="ADC"/>
+                <signal pad-key="pd6" index="3" function="ADC" group="ADC"/>
+                <signal pad-key="pb7" index="4" function="ADC" group="ADC"/>
+                <signal pad-key="pb2" index="5" function="ADC" group="ADC"/>
+                <signal pad-key="pb5" index="6" function="ADC" group="ADC"/>
+                <signal pad-key="pb6" index="7" function="ADC" group="ADC"/>
+                <signal pad-key="pc4" index="8" function="ADC" group="ADC"/>
+                <signal pad-key="pc5" index="9" function="ADC" group="ADC"/>
+                <signal pad-key="pc6" index="10" function="ADC" group="ADC"/>
             </signals>
         </peripheral>
         <peripheral key="linuart" name="LINUART" module-key="linuart">
             <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"/>
+                <signal pad-key="pd3" function="LIN" group="TXLIN"/>
+                <signal pad-key="pd4" function="LIN" group="RXLIN"/>
             </signals>
         </peripheral>
         <peripheral key="spi" name="SPI" module-key="spi">
             <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"/>
-                <signal pad-id="pb1" function="SPI" group="MOSI"/>
-                <signal pad-id="pd3" function="SPI_ALT" group="MOSI"/>
-                <signal pad-id="pb7" function="SPI" group="SCK"/>
-                <signal pad-id="pd4" function="SPI_ALT" group="SCK"/>
-                <signal pad-id="pd3" function="SPI" group="SS"/>
-                <signal pad-id="pc1" function="SPI_ALT" group="SS"/>
+                <signal pad-key="pb0" function="SPI" group="MISO"/>
+                <signal pad-key="pd2" function="SPI_ALT" group="MISO"/>
+                <signal pad-key="pb1" function="SPI" group="MOSI"/>
+                <signal pad-key="pd3" function="SPI_ALT" group="MOSI"/>
+                <signal pad-key="pb7" function="SPI" group="SCK"/>
+                <signal pad-key="pd4" function="SPI_ALT" group="SCK"/>
+                <signal pad-key="pd3" function="SPI" group="SS"/>
+                <signal pad-key="pc1" function="SPI_ALT" group="SS"/>
             </signals>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="wdt">
@@ -323,37 +323,37 @@
         <peripheral key="exint" name="EXINT" module-key="exint">
             <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"/>
-                <signal pad-id="pb5" index="2" function="EXINT" group="INT"/>
-                <signal pad-id="pc0" index="3" function="EXINT" group="INT"/>
-                <signal pad-id="pb0" index="0" function="EXINT" group="PCINT"/>
-                <signal pad-id="pb1" index="1" function="EXINT" group="PCINT"/>
-                <signal pad-id="pb2" index="2" function="EXINT" group="PCINT"/>
-                <signal pad-id="pb3" index="3" function="EXINT" group="PCINT"/>
-                <signal pad-id="pb4" index="4" function="EXINT" group="PCINT"/>
-                <signal pad-id="pb5" index="5" function="EXINT" group="PCINT"/>
-                <signal pad-id="pb6" index="6" function="EXINT" group="PCINT"/>
-                <signal pad-id="pb7" index="7" function="EXINT" group="PCINT"/>
-                <signal pad-id="pc0" index="8" function="EXINT" group="PCINT"/>
-                <signal pad-id="pc1" index="9" function="EXINT" group="PCINT"/>
-                <signal pad-id="pc2" index="10" function="EXINT" group="PCINT"/>
-                <signal pad-id="pc3" index="11" function="EXINT" group="PCINT"/>
-                <signal pad-id="pc4" index="12" function="EXINT" group="PCINT"/>
-                <signal pad-id="pc5" index="13" function="EXINT" group="PCINT"/>
-                <signal pad-id="pc6" index="14" function="EXINT" group="PCINT"/>
-                <signal pad-id="pc7" index="15" function="EXINT" group="PCINT"/>
-                <signal pad-id="pd0" index="16" function="EXINT" group="PCINT"/>
-                <signal pad-id="pd1" index="17" function="EXINT" group="PCINT"/>
-                <signal pad-id="pd2" index="18" function="EXINT" group="PCINT"/>
-                <signal pad-id="pd3" index="19" function="EXINT" group="PCINT"/>
-                <signal pad-id="pd4" index="20" function="EXINT" group="PCINT"/>
-                <signal pad-id="pd5" index="21" function="EXINT" group="PCINT"/>
-                <signal pad-id="pd6" index="22" function="EXINT" group="PCINT"/>
-                <signal pad-id="pd7" index="23" function="EXINT" group="PCINT"/>
-                <signal pad-id="pe0" index="24" function="EXINT" group="PCINT"/>
-                <signal pad-id="pe1" index="25" function="EXINT" group="PCINT"/>
-                <signal pad-id="pe2" index="26" function="EXINT" group="PCINT"/>
+                <signal pad-key="pd6" index="0" function="EXINT" group="INT"/>
+                <signal pad-key="pb2" index="1" function="EXINT" group="INT"/>
+                <signal pad-key="pb5" index="2" function="EXINT" group="INT"/>
+                <signal pad-key="pc0" index="3" function="EXINT" group="INT"/>
+                <signal pad-key="pb0" index="0" function="EXINT" group="PCINT"/>
+                <signal pad-key="pb1" index="1" function="EXINT" group="PCINT"/>
+                <signal pad-key="pb2" index="2" function="EXINT" group="PCINT"/>
+                <signal pad-key="pb3" index="3" function="EXINT" group="PCINT"/>
+                <signal pad-key="pb4" index="4" function="EXINT" group="PCINT"/>
+                <signal pad-key="pb5" index="5" function="EXINT" group="PCINT"/>
+                <signal pad-key="pb6" index="6" function="EXINT" group="PCINT"/>
+                <signal pad-key="pb7" index="7" function="EXINT" group="PCINT"/>
+                <signal pad-key="pc0" index="8" function="EXINT" group="PCINT"/>
+                <signal pad-key="pc1" index="9" function="EXINT" group="PCINT"/>
+                <signal pad-key="pc2" index="10" function="EXINT" group="PCINT"/>
+                <signal pad-key="pc3" index="11" function="EXINT" group="PCINT"/>
+                <signal pad-key="pc4" index="12" function="EXINT" group="PCINT"/>
+                <signal pad-key="pc5" index="13" function="EXINT" group="PCINT"/>
+                <signal pad-key="pc6" index="14" function="EXINT" group="PCINT"/>
+                <signal pad-key="pc7" index="15" function="EXINT" group="PCINT"/>
+                <signal pad-key="pd0" index="16" function="EXINT" group="PCINT"/>
+                <signal pad-key="pd1" index="17" function="EXINT" group="PCINT"/>
+                <signal pad-key="pd2" index="18" function="EXINT" group="PCINT"/>
+                <signal pad-key="pd3" index="19" function="EXINT" group="PCINT"/>
+                <signal pad-key="pd4" index="20" function="EXINT" group="PCINT"/>
+                <signal pad-key="pd5" index="21" function="EXINT" group="PCINT"/>
+                <signal pad-key="pd6" index="22" function="EXINT" group="PCINT"/>
+                <signal pad-key="pd7" index="23" function="EXINT" group="PCINT"/>
+                <signal pad-key="pe0" index="24" function="EXINT" group="PCINT"/>
+                <signal pad-key="pe1" index="25" function="EXINT" group="PCINT"/>
+                <signal pad-key="pe2" index="26" function="EXINT" group="PCINT"/>
             </signals>
         </peripheral>
         <peripheral key="eeprom" name="EEPROM" module-key="eeprom">
@@ -362,15 +362,15 @@
         <peripheral key="psc" name="PSC" module-key="psc">
             <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"/>
-                <signal pad-id="pb1" function="PSC" group="PSCOUT2B"/>
-                <signal pad-id="pc1" function="PSC" group="PSCIN1"/>
-                <signal pad-id="pc0" function="PSC" group="PSCOUT1A"/>
-                <signal pad-id="pb6" function="PSC" group="PSCOUT1B"/>
-                <signal pad-id="pd1" function="PSC" group="PSCIN0"/>
-                <signal pad-id="pd0" function="PSC" group="PSCOUT0A"/>
-                <signal pad-id="pb7" function="PSC" group="PSCOUT0B"/>
+                <signal pad-key="pd2" function="PSC" group="PSCIN2"/>
+                <signal pad-key="pb0" function="PSC" group="PSCOUT2A"/>
+                <signal pad-key="pb1" function="PSC" group="PSCOUT2B"/>
+                <signal pad-key="pc1" function="PSC" group="PSCIN1"/>
+                <signal pad-key="pc0" function="PSC" group="PSCOUT1A"/>
+                <signal pad-key="pb6" function="PSC" group="PSCOUT1B"/>
+                <signal pad-key="pd1" function="PSC" group="PSCIN0"/>
+                <signal pad-key="pd0" function="PSC" group="PSCOUT0A"/>
+                <signal pad-key="pb7" function="PSC" group="PSCOUT0B"/>
             </signals>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="fuse">
@@ -1092,44 +1092,78 @@
             </register-group>
         </module>
     </modules>
+    <pads>
+        <pad key="pd2" name="PD2"/>
+        <pad key="pd3" name="PD3"/>
+        <pad key="pc1" name="PC1"/>
+        <pad key="vcc" name="VCC"/>
+        <pad key="gnd" name="GND"/>
+        <pad key="pc2" name="PC2"/>
+        <pad key="pc3" name="PC3"/>
+        <pad key="pb0" name="PB0"/>
+        <pad key="pb1" name="PB1"/>
+        <pad key="pe1" name="PE1"/>
+        <pad key="pe2" name="PE2"/>
+        <pad key="pd4" name="PD4"/>
+        <pad key="pd5" name="PD5"/>
+        <pad key="pd6" name="PD6"/>
+        <pad key="pd7" name="PD7"/>
+        <pad key="pb2" name="PB2"/>
+        <pad key="pc4" name="PC4"/>
+        <pad key="pc5" name="PC5"/>
+        <pad key="avcc" name="AVCC"/>
+        <pad key="agnd" name="AGND"/>
+        <pad key="aref" name="AREF"/>
+        <pad key="pc6" name="PC6"/>
+        <pad key="pb3" name="PB3"/>
+        <pad key="pb4" name="PB4"/>
+        <pad key="pc7" name="PC7"/>
+        <pad key="pb5" name="PB5"/>
+        <pad key="pb6" name="PB6"/>
+        <pad key="pb7" name="PB7"/>
+        <pad key="pd0" name="PD0"/>
+        <pad key="pc0" name="PC0"/>
+        <pad key="pe0" name="PE0"/>
+        <pad key="pd1" name="PD1"/>
+    </pads>
     <pinouts>
         <pinout key="tqfpqfn32" name="TQFPQFN32" type="qfn">
-            <pin position="1" pad="PD2"/>
-            <pin position="2" pad="PD3"/>
-            <pin position="3" pad="PC1"/>
-            <pin position="4" pad="VCC"/>
-            <pin position="5" pad="GND"/>
-            <pin position="6" pad="PC2"/>
-            <pin position="7" pad="PC3"/>
-            <pin position="8" pad="PB0"/>
-            <pin position="9" pad="PB1"/>
-            <pin position="10" pad="PE1"/>
-            <pin position="11" pad="PE2"/>
-            <pin position="12" pad="PD4"/>
-            <pin position="13" pad="PD5"/>
-            <pin position="14" pad="PD6"/>
-            <pin position="15" pad="PD7"/>
-            <pin position="16" pad="PB2"/>
-            <pin position="17" pad="PC4"/>
-            <pin position="18" pad="PC5"/>
-            <pin position="19" pad="AVCC"/>
-            <pin position="20" pad="AGND"/>
-            <pin position="21" pad="AREF"/>
-            <pin position="22" pad="PC6"/>
-            <pin position="23" pad="PB3"/>
-            <pin position="24" pad="PB4"/>
-            <pin position="25" pad="PC7"/>
-            <pin position="26" pad="PB5"/>
-            <pin position="27" pad="PB6"/>
-            <pin position="28" pad="PB7"/>
-            <pin position="29" pad="PD0"/>
-            <pin position="30" pad="PC0"/>
-            <pin position="31" pad="PE0"/>
-            <pin position="32" pad="PD1"/>
+            <pin position="1" pad-key="pd2"/>
+            <pin position="2" pad-key="pd3"/>
+            <pin position="3" pad-key="pc1"/>
+            <pin position="4" pad-key="vcc"/>
+            <pin position="5" pad-key="gnd"/>
+            <pin position="6" pad-key="pc2"/>
+            <pin position="7" pad-key="pc3"/>
+            <pin position="8" pad-key="pb0"/>
+            <pin position="9" pad-key="pb1"/>
+            <pin position="10" pad-key="pe1"/>
+            <pin position="11" pad-key="pe2"/>
+            <pin position="12" pad-key="pd4"/>
+            <pin position="13" pad-key="pd5"/>
+            <pin position="14" pad-key="pd6"/>
+            <pin position="15" pad-key="pd7"/>
+            <pin position="16" pad-key="pb2"/>
+            <pin position="17" pad-key="pc4"/>
+            <pin position="18" pad-key="pc5"/>
+            <pin position="19" pad-key="avcc"/>
+            <pin position="20" pad-key="agnd"/>
+            <pin position="21" pad-key="aref"/>
+            <pin position="22" pad-key="pc6"/>
+            <pin position="23" pad-key="pb3"/>
+            <pin position="24" pad-key="pb4"/>
+            <pin position="25" pad-key="pc7"/>
+            <pin position="26" pad-key="pb5"/>
+            <pin position="27" pad-key="pb6"/>
+            <pin position="28" pad-key="pb7"/>
+            <pin position="29" pad-key="pd0"/>
+            <pin position="30" pad-key="pc0"/>
+            <pin position="31" pad-key="pe0"/>
+            <pin position="32" pad-key="pd1"/>
         </pinout>
     </pinouts>
     <variants>
-        <variant name="ATmega16M1-AU" pinout-key="tqfpqfn32" package="TQFP32"/>
-        <variant name="ATmega16M1-MU" pinout-key="tqfpqfn32" package="QFN32"/>
+        <variant key="atmega16m1_au" name="ATmega16M1-AU" pinout-key="tqfpqfn32"/>
+        <variant key="atmega16m1_mu" name="ATmega16M1-MU" pinout-key="tqfpqfn32"/>
     </variants>
 </device>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA16U2.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA16U2.xml
index 09830be0..4d4a0b61 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA16U2.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA16U2.xml
@@ -194,49 +194,48 @@
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pb2" index="2" function="default" group="P"/>
-                <signal pad-id="pb3" index="3" function="default" group="P"/>
-                <signal pad-id="pb4" index="4" function="default" group="P"/>
-                <signal pad-id="pb5" index="5" function="default" group="P"/>
-                <signal pad-id="pb6" index="6" function="default" group="P"/>
-                <signal pad-id="pb7" index="7" function="default" group="P"/>
+                <signal pad-key="pb0" index="0" function="default" group="P"/>
+                <signal pad-key="pb1" index="1" function="default" group="P"/>
+                <signal pad-key="pb2" index="2" function="default" group="P"/>
+                <signal pad-key="pb3" index="3" function="default" group="P"/>
+                <signal pad-key="pb4" index="4" function="default" group="P"/>
+                <signal pad-key="pb5" index="5" function="default" group="P"/>
+                <signal pad-key="pb6" index="6" function="default" group="P"/>
+                <signal pad-key="pb7" index="7" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pd2" index="2" function="default" group="P"/>
-                <signal pad-id="pd3" index="3" function="default" group="P"/>
-                <signal pad-id="pd4" index="4" function="default" group="P"/>
-                <signal pad-id="pd5" index="5" function="default" group="P"/>
-                <signal pad-id="pd6" index="6" function="default" group="P"/>
-                <signal pad-id="pd7" index="7" function="default" group="P"/>
+                <signal pad-key="pd0" index="0" function="default" group="P"/>
+                <signal pad-key="pd1" index="1" function="default" group="P"/>
+                <signal pad-key="pd2" index="2" function="default" group="P"/>
+                <signal pad-key="pd3" index="3" function="default" group="P"/>
+                <signal pad-key="pd4" index="4" function="default" group="P"/>
+                <signal pad-key="pd5" index="5" function="default" group="P"/>
+                <signal pad-key="pd6" index="6" function="default" group="P"/>
+                <signal pad-key="pd7" index="7" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pc2" index="2" function="default" group="P"/>
-                <signal pad-id="pc3" index="3" function="default" group="P"/>
-                <signal pad-id="pc4" index="4" function="default" group="P"/>
-                <signal pad-id="pc5" index="5" function="default" group="P"/>
-                <signal pad-id="pc6" index="6" function="default" group="P"/>
-                <signal pad-id="pc7" index="7" function="default" group="P"/>
+                <signal pad-key="pc0" index="0" function="default" group="P"/>
+                <signal pad-key="pc1" index="1" function="default" group="P"/>
+                <signal pad-key="pc2" index="2" function="default" group="P"/>
+                <signal pad-key="pc4" index="4" function="default" group="P"/>
+                <signal pad-key="pc5" index="5" function="default" group="P"/>
+                <signal pad-key="pc6" index="6" function="default" group="P"/>
+                <signal pad-key="pc7" index="7" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="spi" name="SPI" module-key="spi">
             <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"/>
-                <signal pad-id="pb1" function="default" group="SCLK"/>
-                <signal pad-id="pb0" function="default" group="SS"/>
+                <signal pad-key="pb3" function="default" group="MISO"/>
+                <signal pad-key="pb2" function="default" group="MOSI"/>
+                <signal pad-key="pb1" function="default" group="SCLK"/>
+                <signal pad-key="pb0" function="default" group="SS"/>
             </signals>
         </peripheral>
         <peripheral key="boot_load" name="BOOT_LOAD" module-key="boot_load">
@@ -248,19 +247,19 @@
         <peripheral key="tc0" name="TC0" module-key="tc8">
             <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"/>
-                <signal pad-id="pd7" function="default" group="T"/>
+                <signal pad-key="pb7" function="default" group="OCA"/>
+                <signal pad-key="pd0" function="default" group="OCB"/>
+                <signal pad-key="pd7" function="default" group="T"/>
             </signals>
         </peripheral>
         <peripheral key="tc1" name="TC1" module-key="tc16">
             <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"/>
-                <signal pad-id="pc5" function="default" group="OCB"/>
-                <signal pad-id="pb7" function="default" group="OCC"/>
-                <signal pad-id="pb4" function="default" group="T"/>
+                <signal pad-key="pc7" function="default" group="ICP"/>
+                <signal pad-key="pc6" function="default" group="OCA"/>
+                <signal pad-key="pc5" function="default" group="OCB"/>
+                <signal pad-key="pb7" function="default" group="OCC"/>
+                <signal pad-key="pb4" function="default" group="T"/>
             </signals>
         </peripheral>
         <peripheral key="pll" name="PLL" module-key="pll">
@@ -275,37 +274,37 @@
         <peripheral key="exint" name="EXINT" module-key="exint">
             <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"/>
-                <signal pad-id="pd2" index="2" function="default" group="INT"/>
-                <signal pad-id="pd3" index="3" function="default" group="INT"/>
-                <signal pad-id="pc7" index="4" function="default" group="INT"/>
-                <signal pad-id="pd4" index="5" function="default" group="INT"/>
-                <signal pad-id="pd6" index="6" function="default" group="INT"/>
-                <signal pad-id="pd7" index="7" function="default" group="INT"/>
-                <signal pad-id="pb0" index="0" function="default" group="PCINT"/>
-                <signal pad-id="pb1" index="1" function="default" group="PCINT"/>
-                <signal pad-id="pb2" index="2" function="default" group="PCINT"/>
-                <signal pad-id="pb3" index="3" function="default" group="PCINT"/>
-                <signal pad-id="pb4" index="4" function="default" group="PCINT"/>
-                <signal pad-id="pb5" index="5" function="default" group="PCINT"/>
-                <signal pad-id="pb6" index="6" function="default" group="PCINT"/>
-                <signal pad-id="pb7" index="7" function="default" group="PCINT"/>
-                <signal pad-id="pc6" index="8" function="default" group="PCINT"/>
-                <signal pad-id="pc5" index="9" function="default" group="PCINT"/>
-                <signal pad-id="pc4" index="10" function="default" group="PCINT"/>
-                <signal pad-id="pc2" index="11" function="default" group="PCINT"/>
-                <signal pad-id="pd5" index="12" function="default" group="PCINT"/>
+                <signal pad-key="pd0" index="0" function="default" group="INT"/>
+                <signal pad-key="pd1" index="1" function="default" group="INT"/>
+                <signal pad-key="pd2" index="2" function="default" group="INT"/>
+                <signal pad-key="pd3" index="3" function="default" group="INT"/>
+                <signal pad-key="pc7" index="4" function="default" group="INT"/>
+                <signal pad-key="pd4" index="5" function="default" group="INT"/>
+                <signal pad-key="pd6" index="6" function="default" group="INT"/>
+                <signal pad-key="pd7" index="7" function="default" group="INT"/>
+                <signal pad-key="pb0" index="0" function="default" group="PCINT"/>
+                <signal pad-key="pb1" index="1" function="default" group="PCINT"/>
+                <signal pad-key="pb2" index="2" function="default" group="PCINT"/>
+                <signal pad-key="pb3" index="3" function="default" group="PCINT"/>
+                <signal pad-key="pb4" index="4" function="default" group="PCINT"/>
+                <signal pad-key="pb5" index="5" function="default" group="PCINT"/>
+                <signal pad-key="pb6" index="6" function="default" group="PCINT"/>
+                <signal pad-key="pb7" index="7" function="default" group="PCINT"/>
+                <signal pad-key="pc6" index="8" function="default" group="PCINT"/>
+                <signal pad-key="pc5" index="9" function="default" group="PCINT"/>
+                <signal pad-key="pc4" index="10" function="default" group="PCINT"/>
+                <signal pad-key="pc2" index="11" function="default" group="PCINT"/>
+                <signal pad-key="pd5" index="12" function="default" group="PCINT"/>
             </signals>
         </peripheral>
         <peripheral key="usart1" name="USART1" module-key="usart">
             <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"/>
-                <signal pad-id="pd5" function="default" group="XCK"/>
-                <signal pad-id="pd6" function="default" group="RTS"/>
-                <signal pad-id="pd7" function="default" group="CTS"/>
+                <signal pad-key="pd2" function="default" group="RXD"/>
+                <signal pad-key="pd3" function="default" group="TXD"/>
+                <signal pad-key="pd5" function="default" group="XCK"/>
+                <signal pad-key="pd6" function="default" group="RTS"/>
+                <signal pad-key="pd7" function="default" group="CTS"/>
             </signals>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="wdt">
@@ -314,13 +313,13 @@
         <peripheral key="ac" name="AC" module-key="ac">
             <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"/>
-                <signal pad-id="pc2" index="2" function="default" group="AIN"/>
-                <signal pad-id="pd4" index="3" function="default" group="AIN"/>
-                <signal pad-id="pd5" index="4" function="default" group="AIN"/>
-                <signal pad-id="pd6" index="5" function="default" group="AIN"/>
-                <signal pad-id="pd7" index="6" function="default" group="AIN"/>
+                <signal pad-key="pd1" index="0" function="default" group="AIN"/>
+                <signal pad-key="pd2" index="1" function="default" group="AIN"/>
+                <signal pad-key="pc2" index="2" function="default" group="AIN"/>
+                <signal pad-key="pd4" index="3" function="default" group="AIN"/>
+                <signal pad-key="pd5" index="4" function="default" group="AIN"/>
+                <signal pad-key="pd6" index="5" function="default" group="AIN"/>
+                <signal pad-key="pd7" index="6" function="default" group="AIN"/>
             </signals>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="fuse">
@@ -834,44 +833,78 @@
             </register-group>
         </module>
     </modules>
+    <pads>
+        <pad key="xtal1" name="XTAL1"/>
+        <pad key="pc0" name="PC0"/>
+        <pad key="gnd" name="GND"/>
+        <pad key="vcc" name="VCC"/>
+        <pad key="pc2" name="PC2"/>
+        <pad key="pd0" name="PD0"/>
+        <pad key="pd1" name="PD1"/>
+        <pad key="pd2" name="PD2"/>
+        <pad key="pd3" name="PD3"/>
+        <pad key="pd4" name="PD4"/>
+        <pad key="pd5" name="PD5"/>
+        <pad key="pd6" name="PD6"/>
+        <pad key="pd7" name="PD7"/>
+        <pad key="pb0" name="PB0"/>
+        <pad key="pb1" name="PB1"/>
+        <pad key="pb2" name="PB2"/>
+        <pad key="pb3" name="PB3"/>
+        <pad key="pb4" name="PB4"/>
+        <pad key="pb5" name="PB5"/>
+        <pad key="pb6" name="PB6"/>
+        <pad key="pb7" name="PB7"/>
+        <pad key="pc7" name="PC7"/>
+        <pad key="pc6" name="PC6"/>
+        <pad key="pc1" name="PC1"/>
+        <pad key="pc5" name="PC5"/>
+        <pad key="pc4" name="PC4"/>
+        <pad key="ucap" name="UCAP"/>
+        <pad key="ugnd" name="UGND"/>
+        <pad key="d+" name="D+"/>
+        <pad key="d-" name="D-"/>
+        <pad key="uvcc" name="UVCC"/>
+        <pad key="avcc" name="AVCC"/>
+    </pads>
     <pinouts>
         <pinout key="qfp32" name="QFP32" type="qfp">
-            <pin position="1" pad="XTAL1"/>
-            <pin position="2" pad="PC0"/>
-            <pin position="3" pad="GND"/>
-            <pin position="4" pad="VCC"/>
-            <pin position="5" pad="PC2"/>
-            <pin position="6" pad="PD0"/>
-            <pin position="7" pad="PD1"/>
-            <pin position="8" pad="PD2"/>
-            <pin position="9" pad="PD3"/>
-            <pin position="10" pad="PD4"/>
-            <pin position="11" pad="PD5"/>
-            <pin position="12" pad="PD6"/>
-            <pin position="13" pad="PD7"/>
-            <pin position="14" pad="PB0"/>
-            <pin position="15" pad="PB1"/>
-            <pin position="16" pad="PB2"/>
-            <pin position="17" pad="PB3"/>
-            <pin position="18" pad="PB4"/>
-            <pin position="19" pad="PB5"/>
-            <pin position="20" pad="PB6"/>
-            <pin position="21" pad="PB7"/>
-            <pin position="22" pad="PC7"/>
-            <pin position="23" pad="PC6"/>
-            <pin position="24" pad="PC1"/>
-            <pin position="25" pad="PC5"/>
-            <pin position="26" pad="PC4"/>
-            <pin position="27" pad="UCAP"/>
-            <pin position="28" pad="UGND"/>
-            <pin position="29" pad="D+"/>
-            <pin position="30" pad="D-"/>
-            <pin position="31" pad="UVCC"/>
-            <pin position="32" pad="AVCC"/>
+            <pin position="1" pad-key="xtal1"/>
+            <pin position="2" pad-key="pc0"/>
+            <pin position="3" pad-key="gnd"/>
+            <pin position="4" pad-key="vcc"/>
+            <pin position="5" pad-key="pc2"/>
+            <pin position="6" pad-key="pd0"/>
+            <pin position="7" pad-key="pd1"/>
+            <pin position="8" pad-key="pd2"/>
+            <pin position="9" pad-key="pd3"/>
+            <pin position="10" pad-key="pd4"/>
+            <pin position="11" pad-key="pd5"/>
+            <pin position="12" pad-key="pd6"/>
+            <pin position="13" pad-key="pd7"/>
+            <pin position="14" pad-key="pb0"/>
+            <pin position="15" pad-key="pb1"/>
+            <pin position="16" pad-key="pb2"/>
+            <pin position="17" pad-key="pb3"/>
+            <pin position="18" pad-key="pb4"/>
+            <pin position="19" pad-key="pb5"/>
+            <pin position="20" pad-key="pb6"/>
+            <pin position="21" pad-key="pb7"/>
+            <pin position="22" pad-key="pc7"/>
+            <pin position="23" pad-key="pc6"/>
+            <pin position="24" pad-key="pc1"/>
+            <pin position="25" pad-key="pc5"/>
+            <pin position="26" pad-key="pc4"/>
+            <pin position="27" pad-key="ucap"/>
+            <pin position="28" pad-key="ugnd"/>
+            <pin position="29" pad-key="d+"/>
+            <pin position="30" pad-key="d-"/>
+            <pin position="31" pad-key="uvcc"/>
+            <pin position="32" pad-key="avcc"/>
         </pinout>
     </pinouts>
     <variants>
-        <variant name="ATmega16U2-AU" pinout-key="qfp32" package="TQFP32"/>
-        <variant name="ATmega16U2-MU" pinout-key="qfp32" package="QFN32"/>
+        <variant key="atmega16u2_au" name="ATmega16U2-AU" pinout-key="qfp32"/>
+        <variant key="atmega16u2_mu" name="ATmega16U2-MU" pinout-key="qfp32"/>
     </variants>
 </device>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA16U4.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA16U4.xml
index 67c0e22f..319ab669 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA16U4.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA16U4.xml
@@ -197,78 +197,78 @@
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pb2" index="2" function="default" group="P"/>
-                <signal pad-id="pb3" index="3" function="default" group="P"/>
-                <signal pad-id="pb4" index="4" function="default" group="P"/>
-                <signal pad-id="pb5" index="5" function="default" group="P"/>
-                <signal pad-id="pb6" index="6" function="default" group="P"/>
-                <signal pad-id="pb7" index="7" function="default" group="P"/>
+                <signal pad-key="pb0" index="0" function="default" group="P"/>
+                <signal pad-key="pb1" index="1" function="default" group="P"/>
+                <signal pad-key="pb2" index="2" function="default" group="P"/>
+                <signal pad-key="pb3" index="3" function="default" group="P"/>
+                <signal pad-key="pb4" index="4" function="default" group="P"/>
+                <signal pad-key="pb5" index="5" function="default" group="P"/>
+                <signal pad-key="pb6" index="6" function="default" group="P"/>
+                <signal pad-key="pb7" index="7" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
             <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"/>
+                <signal pad-key="pc6" index="6" function="default" group="P"/>
+                <signal pad-key="pc7" index="7" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pd2" index="2" function="default" group="P"/>
-                <signal pad-id="pd3" index="3" function="default" group="P"/>
-                <signal pad-id="pd4" index="4" function="default" group="P"/>
-                <signal pad-id="pd5" index="5" function="default" group="P"/>
-                <signal pad-id="pd6" index="6" function="default" group="P"/>
-                <signal pad-id="pd7" index="7" function="default" group="P"/>
+                <signal pad-key="pd0" index="0" function="default" group="P"/>
+                <signal pad-key="pd1" index="1" function="default" group="P"/>
+                <signal pad-key="pd2" index="2" function="default" group="P"/>
+                <signal pad-key="pd3" index="3" function="default" group="P"/>
+                <signal pad-key="pd4" index="4" function="default" group="P"/>
+                <signal pad-key="pd5" index="5" function="default" group="P"/>
+                <signal pad-key="pd6" index="6" function="default" group="P"/>
+                <signal pad-key="pd7" index="7" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="porte" name="PORTE" module-key="gpio_port">
             <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"/>
+                <signal pad-key="pe2" index="2" function="default" group="P"/>
+                <signal pad-key="pe6" index="6" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portf" name="PORTF" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pf4" index="4" function="default" group="P"/>
-                <signal pad-id="pf5" index="5" function="default" group="P"/>
-                <signal pad-id="pf6" index="6" function="default" group="P"/>
+                <signal pad-key="pf0" index="0" function="default" group="P"/>
+                <signal pad-key="pf1" index="1" function="default" group="P"/>
+                <signal pad-key="pf4" index="4" function="default" group="P"/>
+                <signal pad-key="pf5" index="5" function="default" group="P"/>
+                <signal pad-key="pf6" index="6" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="spi" name="SPI" module-key="spi">
             <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"/>
-                <signal pad-id="pb2" function="default" group="MOSI"/>
-                <signal pad-id="pb2" function="default" group="PDI"/>
-                <signal pad-id="pb3" function="default" group="MISO"/>
-                <signal pad-id="pb3" function="default" group="PDO"/>
+                <signal pad-key="pb0" function="default" group="SS"/>
+                <signal pad-key="pb1" function="default" group="SCK"/>
+                <signal pad-key="pb2" function="default" group="MOSI"/>
+                <signal pad-key="pb2" function="default" group="PDI"/>
+                <signal pad-key="pb3" function="default" group="MISO"/>
+                <signal pad-key="pb3" function="default" group="PDO"/>
             </signals>
         </peripheral>
         <peripheral key="usart1" name="USART1" module-key="usart">
             <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"/>
-                <signal pad-id="pd5" function="default" group="XCK"/>
-                <signal pad-id="pb7" function="default" group="RTS"/>
-                <signal pad-id="pd5" function="default" group="CTS"/>
+                <signal pad-key="pd3" function="default" group="TXD"/>
+                <signal pad-key="pd2" function="default" group="RXD"/>
+                <signal pad-key="pd5" function="default" group="XCK"/>
+                <signal pad-key="pb7" function="default" group="RTS"/>
+                <signal pad-key="pd5" function="default" group="CTS"/>
             </signals>
         </peripheral>
         <peripheral key="boot_load" name="BOOT_LOAD" module-key="boot_load">
             <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"/>
+                <signal pad-key="pe2" function="default" group="HWB"/>
             </signals>
         </peripheral>
         <peripheral key="eeprom" name="EEPROM" module-key="eeprom">
@@ -277,100 +277,100 @@
         <peripheral key="tc0" name="TC0" module-key="tc8">
             <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"/>
-                <signal pad-id="pb7" function="default" group="OCA"/>
+                <signal pad-key="pd7" function="default" group="T"/>
+                <signal pad-key="pd0" function="default" group="OCB"/>
+                <signal pad-key="pb7" function="default" group="OCA"/>
             </signals>
         </peripheral>
         <peripheral key="tc1" name="TC1" module-key="tc16">
             <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"/>
-                <signal pad-id="pb5" function="default" group="OCA"/>
-                <signal pad-id="pb6" function="default" group="OCB"/>
-                <signal pad-id="pb7" function="default" group="OCC"/>
+                <signal pad-key="pd6" function="default" group="T"/>
+                <signal pad-key="pd4" function="default" group="ICP"/>
+                <signal pad-key="pb5" function="default" group="OCA"/>
+                <signal pad-key="pb6" function="default" group="OCB"/>
+                <signal pad-key="pb7" function="default" group="OCC"/>
             </signals>
         </peripheral>
         <peripheral key="tc3" name="TC3" module-key="tc16">
             <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"/>
+                <signal pad-key="pc7" function="default" group="ICP"/>
+                <signal pad-key="pc6" function="default" group="OCA"/>
             </signals>
         </peripheral>
         <peripheral key="tc4" name="TC4" module-key="tc10">
             <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"/>
-                <signal pad-id="pb5" function="default" group="_OCB"/>
-                <signal pad-id="pb6" function="default" group="OCB"/>
-                <signal pad-id="pd6" function="default" group="_OCD"/>
-                <signal pad-id="pd7" function="default" group="OCD"/>
+                <signal pad-key="pc6" function="default" group="_OCA"/>
+                <signal pad-key="pc7" function="default" group="OCA"/>
+                <signal pad-key="pb5" function="default" group="_OCB"/>
+                <signal pad-key="pb6" function="default" group="OCB"/>
+                <signal pad-key="pd6" function="default" group="_OCD"/>
+                <signal pad-key="pd7" function="default" group="OCD"/>
             </signals>
         </peripheral>
         <peripheral key="jtag" name="JTAG" module-key="jtag">
             <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"/>
-                <signal pad-id="pf6" function="default" group="TDO"/>
-                <signal pad-id="pf7" function="default" group="TDI"/>
+                <signal pad-key="pf4" function="default" group="TCK"/>
+                <signal pad-key="pf5" function="default" group="TMS"/>
+                <signal pad-key="pf6" function="default" group="TDO"/>
+                <signal pad-key="pf7" function="default" group="TDI"/>
             </signals>
         </peripheral>
         <peripheral key="exint" name="EXINT" module-key="exint">
             <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"/>
-                <signal pad-id="pb2" index="2" function="default" group="PCINT"/>
-                <signal pad-id="pb3" index="3" function="default" group="PCINT"/>
-                <signal pad-id="pb4" index="4" function="default" group="PCINT"/>
-                <signal pad-id="pb5" index="5" function="default" group="PCINT"/>
-                <signal pad-id="pb6" index="6" function="default" group="PCINT"/>
-                <signal pad-id="pb7" index="7" function="default" group="PCINT"/>
-                <signal pad-id="pd0" index="0" function="default" group="INT"/>
-                <signal pad-id="pd1" index="1" function="default" group="INT"/>
-                <signal pad-id="pd2" index="2" function="default" group="INT"/>
-                <signal pad-id="pd3" index="3" function="default" group="INT"/>
-                <signal pad-id="pe6" index="6" function="default" group="INT"/>
+                <signal pad-key="pb0" index="0" function="default" group="PCINT"/>
+                <signal pad-key="pb1" index="1" function="default" group="PCINT"/>
+                <signal pad-key="pb2" index="2" function="default" group="PCINT"/>
+                <signal pad-key="pb3" index="3" function="default" group="PCINT"/>
+                <signal pad-key="pb4" index="4" function="default" group="PCINT"/>
+                <signal pad-key="pb5" index="5" function="default" group="PCINT"/>
+                <signal pad-key="pb6" index="6" function="default" group="PCINT"/>
+                <signal pad-key="pb7" index="7" function="default" group="PCINT"/>
+                <signal pad-key="pd0" index="0" function="default" group="INT"/>
+                <signal pad-key="pd1" index="1" function="default" group="INT"/>
+                <signal pad-key="pd2" index="2" function="default" group="INT"/>
+                <signal pad-key="pd3" index="3" function="default" group="INT"/>
+                <signal pad-key="pe6" index="6" function="default" group="INT"/>
             </signals>
         </peripheral>
         <peripheral key="twi" name="TWI" module-key="twi">
             <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"/>
+                <signal pad-key="pd1" function="default" group="SDA"/>
+                <signal pad-key="pd0" function="default" group="SCL"/>
             </signals>
         </peripheral>
         <peripheral key="adc" name="ADC" module-key="adc">
             <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"/>
-                <signal pad-id="pf4" index="4" function="default" group="ADC"/>
-                <signal pad-id="pf5" index="5" function="default" group="ADC"/>
-                <signal pad-id="pf6" index="6" function="default" group="ADC"/>
-                <signal pad-id="pf7" index="7" function="default" group="ADC"/>
-                <signal pad-id="pd4" index="8" function="default" group="ADC"/>
-                <signal pad-id="pd6" index="9" function="default" group="ADC"/>
-                <signal pad-id="pd7" index="10" function="default" group="ADC"/>
-                <signal pad-id="pb4" index="11" function="default" group="ADC"/>
-                <signal pad-id="pb5" index="12" function="default" group="ADC"/>
-                <signal pad-id="pb6" index="13" function="default" group="ADC"/>
+                <signal pad-key="pf0" index="0" function="default" group="ADC"/>
+                <signal pad-key="pf1" index="1" function="default" group="ADC"/>
+                <signal pad-key="pf4" index="4" function="default" group="ADC"/>
+                <signal pad-key="pf5" index="5" function="default" group="ADC"/>
+                <signal pad-key="pf6" index="6" function="default" group="ADC"/>
+                <signal pad-key="pf7" index="7" function="default" group="ADC"/>
+                <signal pad-key="pd4" index="8" function="default" group="ADC"/>
+                <signal pad-key="pd6" index="9" function="default" group="ADC"/>
+                <signal pad-key="pd7" index="10" function="default" group="ADC"/>
+                <signal pad-key="pb4" index="11" function="default" group="ADC"/>
+                <signal pad-key="pb5" index="12" function="default" group="ADC"/>
+                <signal pad-key="pb6" index="13" function="default" group="ADC"/>
             </signals>
         </peripheral>
         <peripheral key="ac" name="AC" module-key="ac">
             <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"/>
+                <signal pad-key="pe6" index="0" function="default" group="AIN"/>
             </signals>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="cpu">
             <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"/>
+                <signal pad-key="pc7" index="0" function="default" group="CLK"/>
             </signals>
         </peripheral>
         <peripheral key="pll" name="PLL" module-key="pll">
@@ -1111,104 +1111,145 @@
             </register-group>
         </module>
     </modules>
+    <pads>
+        <pad key="pe6" name="PE6"/>
+        <pad key="uvcc" name="UVCC"/>
+        <pad key="dm" name="DM"/>
+        <pad key="dp" name="DP"/>
+        <pad key="ugnd" name="UGND"/>
+        <pad key="ucap" name="UCAP"/>
+        <pad key="vbus" name="VBUS"/>
+        <pad key="pb0" name="PB0"/>
+        <pad key="pb1" name="PB1"/>
+        <pad key="pb2" name="PB2"/>
+        <pad key="pb3" name="PB3"/>
+        <pad key="pb7" name="PB7"/>
+        <pad key="reset" name="RESET"/>
+        <pad key="vcc" name="VCC"/>
+        <pad key="gnd" name="GND"/>
+        <pad key="xtal2" name="XTAL2"/>
+        <pad key="xtal1" name="XTAL1"/>
+        <pad key="pd0" name="PD0"/>
+        <pad key="pd1" name="PD1"/>
+        <pad key="pd2" name="PD2"/>
+        <pad key="pd3" name="PD3"/>
+        <pad key="pd5" name="PD5"/>
+        <pad key="avcc" name="AVCC"/>
+        <pad key="pd4" name="PD4"/>
+        <pad key="pd6" name="PD6"/>
+        <pad key="pd7" name="PD7"/>
+        <pad key="pb4" name="PB4"/>
+        <pad key="pb5" name="PB5"/>
+        <pad key="pb6" name="PB6"/>
+        <pad key="pc6" name="PC6"/>
+        <pad key="pc7" name="PC7"/>
+        <pad key="pe2" name="PE2"/>
+        <pad key="pf7" name="PF7"/>
+        <pad key="pf6" name="PF6"/>
+        <pad key="pf5" name="PF5"/>
+        <pad key="pf4" name="PF4"/>
+        <pad key="pf1" name="PF1"/>
+        <pad key="pf0" name="PF0"/>
+        <pad key="aref" name="AREF"/>
+    </pads>
     <pinouts>
         <pinout key="tqfp44" name="TQFP44" type="qfp">
-            <pin position="1" pad="PE6"/>
-            <pin position="2" pad="UVCC"/>
-            <pin position="3" pad="DM"/>
-            <pin position="4" pad="DP"/>
-            <pin position="5" pad="UGND"/>
-            <pin position="6" pad="UCAP"/>
-            <pin position="7" pad="VBUS"/>
-            <pin position="8" pad="PB0"/>
-            <pin position="9" pad="PB1"/>
-            <pin position="10" pad="PB2"/>
-            <pin position="11" pad="PB3"/>
-            <pin position="12" pad="PB7"/>
-            <pin position="13" pad="RESET"/>
-            <pin position="14" pad="VCC"/>
-            <pin position="15" pad="GND"/>
-            <pin position="16" pad="XTAL2"/>
-            <pin position="17" pad="XTAL1"/>
-            <pin position="18" pad="PD0"/>
-            <pin position="19" pad="PD1"/>
-            <pin position="20" pad="PD2"/>
-            <pin position="21" pad="PD3"/>
-            <pin position="22" pad="PD5"/>
-            <pin position="23" pad="GND"/>
-            <pin position="24" pad="AVCC"/>
-            <pin position="25" pad="PD4"/>
-            <pin position="26" pad="PD6"/>
-            <pin position="27" pad="PD7"/>
-            <pin position="28" pad="PB4"/>
-            <pin position="29" pad="PB5"/>
-            <pin position="30" pad="PB6"/>
-            <pin position="31" pad="PC6"/>
-            <pin position="32" pad="PC7"/>
-            <pin position="33" pad="PE2"/>
-            <pin position="34" pad="VCC"/>
-            <pin position="35" pad="GND"/>
-            <pin position="36" pad="PF7"/>
-            <pin position="37" pad="PF6"/>
-            <pin position="38" pad="PF5"/>
-            <pin position="39" pad="PF4"/>
-            <pin position="40" pad="PF1"/>
-            <pin position="41" pad="PF0"/>
-            <pin position="42" pad="AREF"/>
-            <pin position="43" pad="GND"/>
-            <pin position="44" pad="AVCC"/>
+            <pin position="1" pad-key="pe6"/>
+            <pin position="2" pad-key="uvcc"/>
+            <pin position="3" pad-key="dm"/>
+            <pin position="4" pad-key="dp"/>
+            <pin position="5" pad-key="ugnd"/>
+            <pin position="6" pad-key="ucap"/>
+            <pin position="7" pad-key="vbus"/>
+            <pin position="8" pad-key="pb0"/>
+            <pin position="9" pad-key="pb1"/>
+            <pin position="10" pad-key="pb2"/>
+            <pin position="11" pad-key="pb3"/>
+            <pin position="12" pad-key="pb7"/>
+            <pin position="13" pad-key="reset"/>
+            <pin position="14" pad-key="vcc"/>
+            <pin position="15" pad-key="gnd"/>
+            <pin position="16" pad-key="xtal2"/>
+            <pin position="17" pad-key="xtal1"/>
+            <pin position="18" pad-key="pd0"/>
+            <pin position="19" pad-key="pd1"/>
+            <pin position="20" pad-key="pd2"/>
+            <pin position="21" pad-key="pd3"/>
+            <pin position="22" pad-key="pd5"/>
+            <pin position="23" pad-key="gnd"/>
+            <pin position="24" pad-key="avcc"/>
+            <pin position="25" pad-key="pd4"/>
+            <pin position="26" pad-key="pd6"/>
+            <pin position="27" pad-key="pd7"/>
+            <pin position="28" pad-key="pb4"/>
+            <pin position="29" pad-key="pb5"/>
+            <pin position="30" pad-key="pb6"/>
+            <pin position="31" pad-key="pc6"/>
+            <pin position="32" pad-key="pc7"/>
+            <pin position="33" pad-key="pe2"/>
+            <pin position="34" pad-key="vcc"/>
+            <pin position="35" pad-key="gnd"/>
+            <pin position="36" pad-key="pf7"/>
+            <pin position="37" pad-key="pf6"/>
+            <pin position="38" pad-key="pf5"/>
+            <pin position="39" pad-key="pf4"/>
+            <pin position="40" pad-key="pf1"/>
+            <pin position="41" pad-key="pf0"/>
+            <pin position="42" pad-key="aref"/>
+            <pin position="43" pad-key="gnd"/>
+            <pin position="44" pad-key="avcc"/>
         </pinout>
         <pinout key="qfn44" name="QFN44" type="qfn">
-            <pin position="1" pad="PE6"/>
-            <pin position="2" pad="UVCC"/>
-            <pin position="3" pad="DM"/>
-            <pin position="4" pad="DP"/>
-            <pin position="5" pad="UGND"/>
-            <pin position="6" pad="UCAP"/>
-            <pin position="7" pad="VBUS"/>
-            <pin position="8" pad="PB0"/>
-            <pin position="9" pad="PB1"/>
-            <pin position="10" pad="PB2"/>
-            <pin position="11" pad="PB3"/>
-            <pin position="12" pad="PB7"/>
-            <pin position="13" pad="RESET"/>
-            <pin position="14" pad="VCC"/>
-            <pin position="15" pad="GND"/>
-            <pin position="16" pad="XTAL2"/>
-            <pin position="17" pad="XTAL1"/>
-            <pin position="18" pad="PD0"/>
-            <pin position="19" pad="PD1"/>
-            <pin position="20" pad="PD2"/>
-            <pin position="21" pad="PD3"/>
-            <pin position="22" pad="PD5"/>
-            <pin position="23" pad="GND"/>
-            <pin position="24" pad="AVCC"/>
-            <pin position="25" pad="PD4"/>
-            <pin position="26" pad="PD6"/>
-            <pin position="27" pad="PD7"/>
-            <pin position="28" pad="PB4"/>
-            <pin position="29" pad="PB5"/>
-            <pin position="30" pad="PB6"/>
-            <pin position="31" pad="PC6"/>
-            <pin position="32" pad="PC7"/>
-            <pin position="33" pad="PE2"/>
-            <pin position="34" pad="VCC"/>
-            <pin position="35" pad="GND"/>
-            <pin position="36" pad="PF7"/>
-            <pin position="37" pad="PF6"/>
-            <pin position="38" pad="PF5"/>
-            <pin position="39" pad="PF4"/>
-            <pin position="40" pad="PF1"/>
-            <pin position="41" pad="PF0"/>
-            <pin position="42" pad="AREF"/>
-            <pin position="43" pad="GND"/>
-            <pin position="44" pad="AVCC"/>
+            <pin position="1" pad-key="pe6"/>
+            <pin position="2" pad-key="uvcc"/>
+            <pin position="3" pad-key="dm"/>
+            <pin position="4" pad-key="dp"/>
+            <pin position="5" pad-key="ugnd"/>
+            <pin position="6" pad-key="ucap"/>
+            <pin position="7" pad-key="vbus"/>
+            <pin position="8" pad-key="pb0"/>
+            <pin position="9" pad-key="pb1"/>
+            <pin position="10" pad-key="pb2"/>
+            <pin position="11" pad-key="pb3"/>
+            <pin position="12" pad-key="pb7"/>
+            <pin position="13" pad-key="reset"/>
+            <pin position="14" pad-key="vcc"/>
+            <pin position="15" pad-key="gnd"/>
+            <pin position="16" pad-key="xtal2"/>
+            <pin position="17" pad-key="xtal1"/>
+            <pin position="18" pad-key="pd0"/>
+            <pin position="19" pad-key="pd1"/>
+            <pin position="20" pad-key="pd2"/>
+            <pin position="21" pad-key="pd3"/>
+            <pin position="22" pad-key="pd5"/>
+            <pin position="23" pad-key="gnd"/>
+            <pin position="24" pad-key="avcc"/>
+            <pin position="25" pad-key="pd4"/>
+            <pin position="26" pad-key="pd6"/>
+            <pin position="27" pad-key="pd7"/>
+            <pin position="28" pad-key="pb4"/>
+            <pin position="29" pad-key="pb5"/>
+            <pin position="30" pad-key="pb6"/>
+            <pin position="31" pad-key="pc6"/>
+            <pin position="32" pad-key="pc7"/>
+            <pin position="33" pad-key="pe2"/>
+            <pin position="34" pad-key="vcc"/>
+            <pin position="35" pad-key="gnd"/>
+            <pin position="36" pad-key="pf7"/>
+            <pin position="37" pad-key="pf6"/>
+            <pin position="38" pad-key="pf5"/>
+            <pin position="39" pad-key="pf4"/>
+            <pin position="40" pad-key="pf1"/>
+            <pin position="41" pad-key="pf0"/>
+            <pin position="42" pad-key="aref"/>
+            <pin position="43" pad-key="gnd"/>
+            <pin position="44" pad-key="avcc"/>
         </pinout>
     </pinouts>
     <variants>
-        <variant name="ATmega16U4-AU" pinout-key="tqfp44" package="TQFP44"/>
-        <variant name="ATmega16U4RC-AU" pinout-key="tqfp44" package="TQFP44"/>
-        <variant name="ATmega16U4-MU" pinout-key="qfn44" package="QFN44"/>
-        <variant name="ATmega16U4RC-MU" pinout-key="qfn44" package="QFN44"/>
+        <variant key="atmega16u4_au" name="ATmega16U4-AU" pinout-key="tqfp44"/>
+        <variant key="atmega16u4rc_au" name="ATmega16U4RC-AU" pinout-key="tqfp44"/>
+        <variant key="atmega16u4_mu" name="ATmega16U4-MU" pinout-key="qfn44"/>
+        <variant key="atmega16u4rc_mu" name="ATmega16U4RC-MU" pinout-key="qfn44"/>
     </variants>
 </device>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA2560.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA2560.xml
index b577c413..7bb9590f 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA2560.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA2560.xml
@@ -195,216 +195,214 @@
         <peripheral key="ac" name="AC" module-key="ac">
             <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"/>
+                <signal pad-key="pe2" index="0" function="default" group="AIN"/>
+                <signal pad-key="pe3" index="1" function="default" group="AIN"/>
             </signals>
         </peripheral>
         <peripheral key="usart0" name="USART0" module-key="usart">
             <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"/>
-                <signal pad-id="pe2" function="default" group="XCK"/>
+                <signal pad-key="pe1" function="default" group="TXD"/>
+                <signal pad-key="pe0" function="default" group="RXD"/>
+                <signal pad-key="pe2" function="default" group="XCK"/>
             </signals>
         </peripheral>
         <peripheral key="usart1" name="USART1" module-key="usart">
             <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"/>
-                <signal pad-id="pd5" function="default" group="XCK"/>
+                <signal pad-key="pd3" function="default" group="TXD"/>
+                <signal pad-key="pd2" function="default" group="RXD"/>
+                <signal pad-key="pd5" function="default" group="XCK"/>
             </signals>
         </peripheral>
         <peripheral key="usart2" name="USART2" module-key="usart">
             <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"/>
-                <signal pad-id="ph2" function="default" group="XCK"/>
+                <signal pad-key="ph1" function="default" group="TXD"/>
+                <signal pad-key="ph0" function="default" group="RXD"/>
+                <signal pad-key="ph2" function="default" group="XCK"/>
             </signals>
         </peripheral>
         <peripheral key="usart3" name="USART3" module-key="usart">
             <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"/>
-                <signal pad-id="pj2" function="default" group="XCK"/>
+                <signal pad-key="pj1" function="default" group="TXD"/>
+                <signal pad-key="pj0" function="default" group="RXD"/>
+                <signal pad-key="pj2" function="default" group="XCK"/>
             </signals>
         </peripheral>
         <peripheral key="twi" name="TWI" module-key="twi">
             <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"/>
+                <signal pad-key="pd1" function="default" group="SDA"/>
+                <signal pad-key="pd0" function="default" group="SCL"/>
             </signals>
         </peripheral>
         <peripheral key="spi" name="SPI" module-key="spi">
             <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"/>
-                <signal pad-id="pb3" function="default" group="MISO"/>
-                <signal pad-id="pb1" function="default" group="SCK"/>
+                <signal pad-key="pb0" function="default" group="SS"/>
+                <signal pad-key="pb2" function="default" group="MOSI"/>
+                <signal pad-key="pb3" function="default" group="MISO"/>
+                <signal pad-key="pb1" function="default" group="SCK"/>
             </signals>
         </peripheral>
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pa2" index="2" function="default" group="P"/>
-                <signal pad-id="pa3" index="3" function="default" group="P"/>
-                <signal pad-id="pa4" index="4" function="default" group="P"/>
-                <signal pad-id="pa5" index="5" function="default" group="P"/>
-                <signal pad-id="pa6" index="6" function="default" group="P"/>
-                <signal pad-id="pa7" index="7" function="default" group="P"/>
+                <signal pad-key="pa0" index="0" function="default" group="P"/>
+                <signal pad-key="pa1" index="1" function="default" group="P"/>
+                <signal pad-key="pa2" index="2" function="default" group="P"/>
+                <signal pad-key="pa3" index="3" function="default" group="P"/>
+                <signal pad-key="pa4" index="4" function="default" group="P"/>
+                <signal pad-key="pa5" index="5" function="default" group="P"/>
+                <signal pad-key="pa6" index="6" function="default" group="P"/>
+                <signal pad-key="pa7" index="7" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pb2" index="2" function="default" group="P"/>
-                <signal pad-id="pb3" index="3" function="default" group="P"/>
-                <signal pad-id="pb4" index="4" function="default" group="P"/>
-                <signal pad-id="pb5" index="5" function="default" group="P"/>
-                <signal pad-id="pb6" index="6" function="default" group="P"/>
-                <signal pad-id="pb7" index="7" function="default" group="P"/>
+                <signal pad-key="pb0" index="0" function="default" group="P"/>
+                <signal pad-key="pb1" index="1" function="default" group="P"/>
+                <signal pad-key="pb2" index="2" function="default" group="P"/>
+                <signal pad-key="pb3" index="3" function="default" group="P"/>
+                <signal pad-key="pb4" index="4" function="default" group="P"/>
+                <signal pad-key="pb5" index="5" function="default" group="P"/>
+                <signal pad-key="pb6" index="6" function="default" group="P"/>
+                <signal pad-key="pb7" index="7" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pc2" index="2" function="default" group="P"/>
-                <signal pad-id="pc3" index="3" function="default" group="P"/>
-                <signal pad-id="pc4" index="4" function="default" group="P"/>
-                <signal pad-id="pc5" index="5" function="default" group="P"/>
-                <signal pad-id="pc6" index="6" function="default" group="P"/>
-                <signal pad-id="pc7" index="7" function="default" group="P"/>
+                <signal pad-key="pc0" index="0" function="default" group="P"/>
+                <signal pad-key="pc1" index="1" function="default" group="P"/>
+                <signal pad-key="pc2" index="2" function="default" group="P"/>
+                <signal pad-key="pc3" index="3" function="default" group="P"/>
+                <signal pad-key="pc4" index="4" function="default" group="P"/>
+                <signal pad-key="pc5" index="5" function="default" group="P"/>
+                <signal pad-key="pc6" index="6" function="default" group="P"/>
+                <signal pad-key="pc7" index="7" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pd2" index="2" function="default" group="P"/>
-                <signal pad-id="pd3" index="3" function="default" group="P"/>
-                <signal pad-id="pd4" index="4" function="default" group="P"/>
-                <signal pad-id="pd5" index="5" function="default" group="P"/>
-                <signal pad-id="pd6" index="6" function="default" group="P"/>
-                <signal pad-id="pd7" index="7" function="default" group="P"/>
+                <signal pad-key="pd0" index="0" function="default" group="P"/>
+                <signal pad-key="pd1" index="1" function="default" group="P"/>
+                <signal pad-key="pd2" index="2" function="default" group="P"/>
+                <signal pad-key="pd3" index="3" function="default" group="P"/>
+                <signal pad-key="pd4" index="4" function="default" group="P"/>
+                <signal pad-key="pd5" index="5" function="default" group="P"/>
+                <signal pad-key="pd6" index="6" function="default" group="P"/>
+                <signal pad-key="pd7" index="7" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="porte" name="PORTE" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pe2" index="2" function="default" group="P"/>
-                <signal pad-id="pe3" index="3" function="default" group="P"/>
-                <signal pad-id="pe4" index="4" function="default" group="P"/>
-                <signal pad-id="pe5" index="5" function="default" group="P"/>
-                <signal pad-id="pe6" index="6" function="default" group="P"/>
-                <signal pad-id="pe7" index="7" function="default" group="P"/>
+                <signal pad-key="pe0" index="0" function="default" group="P"/>
+                <signal pad-key="pe1" index="1" function="default" group="P"/>
+                <signal pad-key="pe2" index="2" function="default" group="P"/>
+                <signal pad-key="pe3" index="3" function="default" group="P"/>
+                <signal pad-key="pe4" index="4" function="default" group="P"/>
+                <signal pad-key="pe5" index="5" function="default" group="P"/>
+                <signal pad-key="pe6" index="6" function="default" group="P"/>
+                <signal pad-key="pe7" index="7" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portf" name="PORTF" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pf2" index="2" function="default" group="P"/>
-                <signal pad-id="pf3" index="3" function="default" group="P"/>
-                <signal pad-id="pf4" index="4" function="default" group="P"/>
-                <signal pad-id="pf5" index="5" function="default" group="P"/>
-                <signal pad-id="pf6" index="6" function="default" group="P"/>
-                <signal pad-id="pf7" index="7" function="default" group="P"/>
+                <signal pad-key="pf0" index="0" function="default" group="P"/>
+                <signal pad-key="pf1" index="1" function="default" group="P"/>
+                <signal pad-key="pf2" index="2" function="default" group="P"/>
+                <signal pad-key="pf3" index="3" function="default" group="P"/>
+                <signal pad-key="pf4" index="4" function="default" group="P"/>
+                <signal pad-key="pf5" index="5" function="default" group="P"/>
+                <signal pad-key="pf6" index="6" function="default" group="P"/>
+                <signal pad-key="pf7" index="7" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portg" name="PORTG" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pg2" index="2" function="default" group="P"/>
-                <signal pad-id="pg3" index="3" function="default" group="P"/>
-                <signal pad-id="pg4" index="4" function="default" group="P"/>
-                <signal pad-id="pg5" index="5" function="default" group="P"/>
-                <signal pad-id="pg6" index="6" function="default" group="P"/>
-                <signal pad-id="pg7" index="7" function="default" group="P"/>
+                <signal pad-key="pg0" index="0" function="default" group="P"/>
+                <signal pad-key="pg1" index="1" function="default" group="P"/>
+                <signal pad-key="pg2" index="2" function="default" group="P"/>
+                <signal pad-key="pg3" index="3" function="default" group="P"/>
+                <signal pad-key="pg4" index="4" function="default" group="P"/>
+                <signal pad-key="pg5" index="5" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="porth" name="PORTH" module-key="gpio_port">
             <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"/>
-                <signal pad-id="ph2" index="2" function="default" group="P"/>
-                <signal pad-id="ph3" index="3" function="default" group="P"/>
-                <signal pad-id="ph4" index="4" function="default" group="P"/>
-                <signal pad-id="ph5" index="5" function="default" group="P"/>
-                <signal pad-id="ph6" index="6" function="default" group="P"/>
-                <signal pad-id="ph7" index="7" function="default" group="P"/>
+                <signal pad-key="ph0" index="0" function="default" group="P"/>
+                <signal pad-key="ph1" index="1" function="default" group="P"/>
+                <signal pad-key="ph2" index="2" function="default" group="P"/>
+                <signal pad-key="ph3" index="3" function="default" group="P"/>
+                <signal pad-key="ph4" index="4" function="default" group="P"/>
+                <signal pad-key="ph5" index="5" function="default" group="P"/>
+                <signal pad-key="ph6" index="6" function="default" group="P"/>
+                <signal pad-key="ph7" index="7" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portj" name="PORTJ" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pj2" index="2" function="default" group="P"/>
-                <signal pad-id="pj3" index="3" function="default" group="P"/>
-                <signal pad-id="pj4" index="4" function="default" group="P"/>
-                <signal pad-id="pj5" index="5" function="default" group="P"/>
-                <signal pad-id="pj6" index="6" function="default" group="P"/>
-                <signal pad-id="pj7" index="7" function="default" group="P"/>
+                <signal pad-key="pj0" index="0" function="default" group="P"/>
+                <signal pad-key="pj1" index="1" function="default" group="P"/>
+                <signal pad-key="pj2" index="2" function="default" group="P"/>
+                <signal pad-key="pj3" index="3" function="default" group="P"/>
+                <signal pad-key="pj4" index="4" function="default" group="P"/>
+                <signal pad-key="pj5" index="5" function="default" group="P"/>
+                <signal pad-key="pj6" index="6" function="default" group="P"/>
+                <signal pad-key="pj7" index="7" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portk" name="PORTK" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pk2" index="2" function="default" group="P"/>
-                <signal pad-id="pk3" index="3" function="default" group="P"/>
-                <signal pad-id="pk4" index="4" function="default" group="P"/>
-                <signal pad-id="pk5" index="5" function="default" group="P"/>
-                <signal pad-id="pk6" index="6" function="default" group="P"/>
-                <signal pad-id="pk7" index="7" function="default" group="P"/>
+                <signal pad-key="pk0" index="0" function="default" group="P"/>
+                <signal pad-key="pk1" index="1" function="default" group="P"/>
+                <signal pad-key="pk2" index="2" function="default" group="P"/>
+                <signal pad-key="pk3" index="3" function="default" group="P"/>
+                <signal pad-key="pk4" index="4" function="default" group="P"/>
+                <signal pad-key="pk5" index="5" function="default" group="P"/>
+                <signal pad-key="pk6" index="6" function="default" group="P"/>
+                <signal pad-key="pk7" index="7" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portl" name="PORTL" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pl2" index="2" function="default" group="P"/>
-                <signal pad-id="pl3" index="3" function="default" group="P"/>
-                <signal pad-id="pl4" index="4" function="default" group="P"/>
-                <signal pad-id="pl5" index="5" function="default" group="P"/>
-                <signal pad-id="pl6" index="6" function="default" group="P"/>
-                <signal pad-id="pl7" index="7" function="default" group="P"/>
+                <signal pad-key="pl0" index="0" function="default" group="P"/>
+                <signal pad-key="pl1" index="1" function="default" group="P"/>
+                <signal pad-key="pl2" index="2" function="default" group="P"/>
+                <signal pad-key="pl3" index="3" function="default" group="P"/>
+                <signal pad-key="pl4" index="4" function="default" group="P"/>
+                <signal pad-key="pl5" index="5" function="default" group="P"/>
+                <signal pad-key="pl6" index="6" function="default" group="P"/>
+                <signal pad-key="pl7" index="7" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="tc0" name="TC0" module-key="tc8">
             <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"/>
-                <signal pad-id="pb7" function="default" group="OCA"/>
+                <signal pad-key="pd7" function="default" group="T"/>
+                <signal pad-key="pg5" function="default" group="OCB"/>
+                <signal pad-key="pb7" function="default" group="OCA"/>
             </signals>
         </peripheral>
         <peripheral key="tc2" name="TC2" module-key="tc8_async">
             <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"/>
-                <signal pad-id="pb4" function="default" group="OCA"/>
-                <signal pad-id="ph6" function="default" group="OCB"/>
+                <signal pad-key="pg4" index="1" function="default" group="TOSC"/>
+                <signal pad-key="pg3" index="2" function="default" group="TOSC"/>
+                <signal pad-key="pb4" function="default" group="OCA"/>
+                <signal pad-key="ph6" function="default" group="OCB"/>
             </signals>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="wdt">
@@ -416,114 +414,113 @@
         <peripheral key="tc5" name="TC5" module-key="tc16">
             <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"/>
-                <signal pad-id="pl3" function="default" group="OCA"/>
-                <signal pad-id="pl4" function="default" group="OCB"/>
-                <signal pad-id="pl5" function="default" group="OCC"/>
+                <signal pad-key="pl2" function="default" group="T"/>
+                <signal pad-key="pl1" function="default" group="ICP"/>
+                <signal pad-key="pl3" function="default" group="OCA"/>
+                <signal pad-key="pl4" function="default" group="OCB"/>
+                <signal pad-key="pl5" function="default" group="OCC"/>
             </signals>
         </peripheral>
         <peripheral key="tc4" name="TC4" module-key="tc16">
             <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"/>
-                <signal pad-id="ph3" function="default" group="OCA"/>
-                <signal pad-id="ph4" function="default" group="OCB"/>
-                <signal pad-id="ph5" function="default" group="OCC"/>
+                <signal pad-key="pl0" function="default" group="ICP"/>
+                <signal pad-key="ph3" function="default" group="OCA"/>
+                <signal pad-key="ph4" function="default" group="OCB"/>
+                <signal pad-key="ph5" function="default" group="OCC"/>
             </signals>
         </peripheral>
         <peripheral key="tc3" name="TC3" module-key="tc16">
             <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"/>
-                <signal pad-id="pe3" function="default" group="OCA"/>
-                <signal pad-id="pe4" function="default" group="OCB"/>
-                <signal pad-id="pe5" function="default" group="OCC"/>
+                <signal pad-key="pe6" function="default" group="T"/>
+                <signal pad-key="pe7" function="default" group="ICP"/>
+                <signal pad-key="pe3" function="default" group="OCA"/>
+                <signal pad-key="pe4" function="default" group="OCB"/>
+                <signal pad-key="pe5" function="default" group="OCC"/>
             </signals>
         </peripheral>
         <peripheral key="tc1" name="TC1" module-key="tc16">
             <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"/>
-                <signal pad-id="pb5" function="default" group="OCA"/>
-                <signal pad-id="pb6" function="default" group="OCB"/>
-                <signal pad-id="pb7" function="default" group="OCC"/>
+                <signal pad-key="pd6" function="default" group="T"/>
+                <signal pad-key="pd4" function="default" group="ICP"/>
+                <signal pad-key="pb5" function="default" group="OCA"/>
+                <signal pad-key="pb6" function="default" group="OCB"/>
+                <signal pad-key="pb7" function="default" group="OCC"/>
             </signals>
         </peripheral>
         <peripheral key="jtag" name="JTAG" module-key="jtag">
             <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"/>
-                <signal pad-id="pf6" function="default" group="TDO"/>
-                <signal pad-id="pf7" function="default" group="TDI"/>
+                <signal pad-key="pf4" function="default" group="TCK"/>
+                <signal pad-key="pf5" function="default" group="TMS"/>
+                <signal pad-key="pf6" function="default" group="TDO"/>
+                <signal pad-key="pf7" function="default" group="TDI"/>
             </signals>
         </peripheral>
         <peripheral key="exint" name="EXINT" module-key="exint">
             <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"/>
-                <signal pad-id="pb2" index="2" function="default" group="PCINT"/>
-                <signal pad-id="pb3" index="3" function="default" group="PCINT"/>
-                <signal pad-id="pb4" index="4" function="default" group="PCINT"/>
-                <signal pad-id="pb5" index="5" function="default" group="PCINT"/>
-                <signal pad-id="pb6" index="6" function="default" group="PCINT"/>
-                <signal pad-id="pb7" index="7" function="default" group="PCINT"/>
-                <signal pad-id="pe0" index="8" function="default" group="PCINT"/>
-                <signal pad-id="pj0" index="9" function="default" group="PCINT"/>
-                <signal pad-id="pj1" index="10" function="default" group="PCINT"/>
-                <signal pad-id="pj2" index="11" function="default" group="PCINT"/>
-                <signal pad-id="pj3" index="12" function="default" group="PCINT"/>
-                <signal pad-id="pj4" index="13" function="default" group="PCINT"/>
-                <signal pad-id="pj5" index="14" function="default" group="PCINT"/>
-                <signal pad-id="pj6" index="15" function="default" group="PCINT"/>
-                <signal pad-id="pk0" index="16" function="default" group="PCINT"/>
-                <signal pad-id="pk1" index="17" function="default" group="PCINT"/>
-                <signal pad-id="pk2" index="18" function="default" group="PCINT"/>
-                <signal pad-id="pk3" index="19" function="default" group="PCINT"/>
-                <signal pad-id="pk4" index="20" function="default" group="PCINT"/>
-                <signal pad-id="pk5" index="21" function="default" group="PCINT"/>
-                <signal pad-id="pk6" index="22" function="default" group="PCINT"/>
-                <signal pad-id="pk7" index="23" function="default" group="PCINT"/>
-                <signal pad-id="pd0" index="0" function="default" group="INT"/>
-                <signal pad-id="pd1" index="1" function="default" group="INT"/>
-                <signal pad-id="pd2" index="2" function="default" group="INT"/>
-                <signal pad-id="pd3" index="3" function="default" group="INT"/>
-                <signal pad-id="pe4" index="4" function="default" group="INT"/>
-                <signal pad-id="pe5" index="5" function="default" group="INT"/>
-                <signal pad-id="pe6" index="6" function="default" group="INT"/>
-                <signal pad-id="pe7" index="7" function="default" group="INT"/>
+                <signal pad-key="pb0" index="0" function="default" group="PCINT"/>
+                <signal pad-key="pb1" index="1" function="default" group="PCINT"/>
+                <signal pad-key="pb2" index="2" function="default" group="PCINT"/>
+                <signal pad-key="pb3" index="3" function="default" group="PCINT"/>
+                <signal pad-key="pb4" index="4" function="default" group="PCINT"/>
+                <signal pad-key="pb5" index="5" function="default" group="PCINT"/>
+                <signal pad-key="pb6" index="6" function="default" group="PCINT"/>
+                <signal pad-key="pb7" index="7" function="default" group="PCINT"/>
+                <signal pad-key="pe0" index="8" function="default" group="PCINT"/>
+                <signal pad-key="pj0" index="9" function="default" group="PCINT"/>
+                <signal pad-key="pj1" index="10" function="default" group="PCINT"/>
+                <signal pad-key="pj2" index="11" function="default" group="PCINT"/>
+                <signal pad-key="pj3" index="12" function="default" group="PCINT"/>
+                <signal pad-key="pj4" index="13" function="default" group="PCINT"/>
+                <signal pad-key="pj5" index="14" function="default" group="PCINT"/>
+                <signal pad-key="pj6" index="15" function="default" group="PCINT"/>
+                <signal pad-key="pk0" index="16" function="default" group="PCINT"/>
+                <signal pad-key="pk1" index="17" function="default" group="PCINT"/>
+                <signal pad-key="pk2" index="18" function="default" group="PCINT"/>
+                <signal pad-key="pk3" index="19" function="default" group="PCINT"/>
+                <signal pad-key="pk4" index="20" function="default" group="PCINT"/>
+                <signal pad-key="pk5" index="21" function="default" group="PCINT"/>
+                <signal pad-key="pk6" index="22" function="default" group="PCINT"/>
+                <signal pad-key="pk7" index="23" function="default" group="PCINT"/>
+                <signal pad-key="pd0" index="0" function="default" group="INT"/>
+                <signal pad-key="pd1" index="1" function="default" group="INT"/>
+                <signal pad-key="pd2" index="2" function="default" group="INT"/>
+                <signal pad-key="pd3" index="3" function="default" group="INT"/>
+                <signal pad-key="pe4" index="4" function="default" group="INT"/>
+                <signal pad-key="pe5" index="5" function="default" group="INT"/>
+                <signal pad-key="pe6" index="6" function="default" group="INT"/>
+                <signal pad-key="pe7" index="7" function="default" group="INT"/>
             </signals>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="cpu">
             <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"/>
+                <signal pad-key="pe7" index="0" function="default" group="CLKO"/>
             </signals>
         </peripheral>
         <peripheral key="adc" name="ADC" module-key="adc">
             <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"/>
-                <signal pad-id="pf2" index="2" function="default" group="ADC"/>
-                <signal pad-id="pf3" index="3" function="default" group="ADC"/>
-                <signal pad-id="pf4" index="4" function="default" group="ADC"/>
-                <signal pad-id="pf5" index="5" function="default" group="ADC"/>
-                <signal pad-id="pf6" index="6" function="default" group="ADC"/>
-                <signal pad-id="pf7" index="7" function="default" group="ADC"/>
-                <signal pad-id="pk0" index="8" function="default" group="ADC"/>
-                <signal pad-id="pk1" index="9" function="default" group="ADC"/>
-                <signal pad-id="pk2" index="10" function="default" group="ADC"/>
-                <signal pad-id="pk3" index="11" function="default" group="ADC"/>
-                <signal pad-id="pk4" index="12" function="default" group="ADC"/>
-                <signal pad-id="pk5" index="13" function="default" group="ADC"/>
-                <signal pad-id="pk6" index="14" function="default" group="ADC"/>
-                <signal pad-id="pk7" index="15" function="default" group="ADC"/>
+                <signal pad-key="pf0" index="0" function="default" group="ADC"/>
+                <signal pad-key="pf1" index="1" function="default" group="ADC"/>
+                <signal pad-key="pf2" index="2" function="default" group="ADC"/>
+                <signal pad-key="pf3" index="3" function="default" group="ADC"/>
+                <signal pad-key="pf4" index="4" function="default" group="ADC"/>
+                <signal pad-key="pf5" index="5" function="default" group="ADC"/>
+                <signal pad-key="pf6" index="6" function="default" group="ADC"/>
+                <signal pad-key="pf7" index="7" function="default" group="ADC"/>
+                <signal pad-key="pk0" index="8" function="default" group="ADC"/>
+                <signal pad-key="pk1" index="9" function="default" group="ADC"/>
+                <signal pad-key="pk2" index="10" function="default" group="ADC"/>
+                <signal pad-key="pk3" index="11" function="default" group="ADC"/>
+                <signal pad-key="pk4" index="12" function="default" group="ADC"/>
+                <signal pad-key="pk5" index="13" function="default" group="ADC"/>
+                <signal pad-key="pk6" index="14" function="default" group="ADC"/>
+                <signal pad-key="pk7" index="15" function="default" group="ADC"/>
             </signals>
         </peripheral>
         <peripheral key="boot_load" name="BOOT_LOAD" module-key="boot_load">
@@ -1256,216 +1253,311 @@
             </register-group>
         </module>
     </modules>
+    <pads>
+        <pad key="pg5" name="PG5"/>
+        <pad key="pe0" name="PE0"/>
+        <pad key="pe1" name="PE1"/>
+        <pad key="pe2" name="PE2"/>
+        <pad key="pe3" name="PE3"/>
+        <pad key="pe4" name="PE4"/>
+        <pad key="pe5" name="PE5"/>
+        <pad key="pe6" name="PE6"/>
+        <pad key="pe7" name="PE7"/>
+        <pad key="vcc" name="VCC"/>
+        <pad key="gnd" name="GND"/>
+        <pad key="ph0" name="PH0"/>
+        <pad key="ph1" name="PH1"/>
+        <pad key="ph2" name="PH2"/>
+        <pad key="ph3" name="PH3"/>
+        <pad key="ph4" name="PH4"/>
+        <pad key="ph5" name="PH5"/>
+        <pad key="ph6" name="PH6"/>
+        <pad key="pb0" name="PB0"/>
+        <pad key="pb1" name="PB1"/>
+        <pad key="pb2" name="PB2"/>
+        <pad key="pb3" name="PB3"/>
+        <pad key="pb4" name="PB4"/>
+        <pad key="pb5" name="PB5"/>
+        <pad key="pb6" name="PB6"/>
+        <pad key="pb7" name="PB7"/>
+        <pad key="ph7" name="PH7"/>
+        <pad key="pg3" name="PG3"/>
+        <pad key="pg4" name="PG4"/>
+        <pad key="reset" name="RESET"/>
+        <pad key="xtal2" name="XTAL2"/>
+        <pad key="xtal1" name="XTAL1"/>
+        <pad key="pl0" name="PL0"/>
+        <pad key="pl1" name="PL1"/>
+        <pad key="pl2" name="PL2"/>
+        <pad key="pl3" name="PL3"/>
+        <pad key="pl4" name="PL4"/>
+        <pad key="pl5" name="PL5"/>
+        <pad key="pl6" name="PL6"/>
+        <pad key="pl7" name="PL7"/>
+        <pad key="pd0" name="PD0"/>
+        <pad key="pd1" name="PD1"/>
+        <pad key="pd2" name="PD2"/>
+        <pad key="pd3" name="PD3"/>
+        <pad key="pd4" name="PD4"/>
+        <pad key="pd5" name="PD5"/>
+        <pad key="pd6" name="PD6"/>
+        <pad key="pd7" name="PD7"/>
+        <pad key="pg0" name="PG0"/>
+        <pad key="pg1" name="PG1"/>
+        <pad key="pc0" name="PC0"/>
+        <pad key="pc1" name="PC1"/>
+        <pad key="pc2" name="PC2"/>
+        <pad key="pc3" name="PC3"/>
+        <pad key="pc4" name="PC4"/>
+        <pad key="pc5" name="PC5"/>
+        <pad key="pc6" name="PC6"/>
+        <pad key="pc7" name="PC7"/>
+        <pad key="pj0" name="PJ0"/>
+        <pad key="pj1" name="PJ1"/>
+        <pad key="pj2" name="PJ2"/>
+        <pad key="pj3" name="PJ3"/>
+        <pad key="pj4" name="PJ4"/>
+        <pad key="pj5" name="PJ5"/>
+        <pad key="pj6" name="PJ6"/>
+        <pad key="pg2" name="PG2"/>
+        <pad key="pa7" name="PA7"/>
+        <pad key="pa6" name="PA6"/>
+        <pad key="pa5" name="PA5"/>
+        <pad key="pa4" name="PA4"/>
+        <pad key="pa3" name="PA3"/>
+        <pad key="pa2" name="PA2"/>
+        <pad key="pa1" name="PA1"/>
+        <pad key="pa0" name="PA0"/>
+        <pad key="pj7" name="PJ7"/>
+        <pad key="pk7" name="PK7"/>
+        <pad key="pk6" name="PK6"/>
+        <pad key="pk5" name="PK5"/>
+        <pad key="pk4" name="PK4"/>
+        <pad key="pk3" name="PK3"/>
+        <pad key="pk2" name="PK2"/>
+        <pad key="pk1" name="PK1"/>
+        <pad key="pk0" name="PK0"/>
+        <pad key="pf7" name="PF7"/>
+        <pad key="pf6" name="PF6"/>
+        <pad key="pf5" name="PF5"/>
+        <pad key="pf4" name="PF4"/>
+        <pad key="pf3" name="PF3"/>
+        <pad key="pf2" name="PF2"/>
+        <pad key="pf1" name="PF1"/>
+        <pad key="pf0" name="PF0"/>
+        <pad key="aref" name="AREF"/>
+        <pad key="avcc" name="AVCC"/>
+    </pads>
     <pinouts>
         <pinout key="tqfp100" name="TQFP100" type="qfp">
-            <pin position="1" pad="PG5"/>
-            <pin position="2" pad="PE0"/>
-            <pin position="3" pad="PE1"/>
-            <pin position="4" pad="PE2"/>
-            <pin position="5" pad="PE3"/>
-            <pin position="6" pad="PE4"/>
-            <pin position="7" pad="PE5"/>
-            <pin position="8" pad="PE6"/>
-            <pin position="9" pad="PE7"/>
-            <pin position="10" pad="VCC"/>
-            <pin position="11" pad="GND"/>
-            <pin position="12" pad="PH0"/>
-            <pin position="13" pad="PH1"/>
-            <pin position="14" pad="PH2"/>
-            <pin position="15" pad="PH3"/>
-            <pin position="16" pad="PH4"/>
-            <pin position="17" pad="PH5"/>
-            <pin position="18" pad="PH6"/>
-            <pin position="19" pad="PB0"/>
-            <pin position="20" pad="PB1"/>
-            <pin position="21" pad="PB2"/>
-            <pin position="22" pad="PB3"/>
-            <pin position="23" pad="PB4"/>
-            <pin position="24" pad="PB5"/>
-            <pin position="25" pad="PB6"/>
-            <pin position="26" pad="PB7"/>
-            <pin position="27" pad="PH7"/>
-            <pin position="28" pad="PG3"/>
-            <pin position="29" pad="PG4"/>
-            <pin position="30" pad="RESET"/>
-            <pin position="31" pad="VCC"/>
-            <pin position="32" pad="GND"/>
-            <pin position="33" pad="XTAL2"/>
-            <pin position="34" pad="XTAL1"/>
-            <pin position="35" pad="PL0"/>
-            <pin position="36" pad="PL1"/>
-            <pin position="37" pad="PL2"/>
-            <pin position="38" pad="PL3"/>
-            <pin position="39" pad="PL4"/>
-            <pin position="40" pad="PL5"/>
-            <pin position="41" pad="PL6"/>
-            <pin position="42" pad="PL7"/>
-            <pin position="43" pad="PD0"/>
-            <pin position="44" pad="PD1"/>
-            <pin position="45" pad="PD2"/>
-            <pin position="46" pad="PD3"/>
-            <pin position="47" pad="PD4"/>
-            <pin position="48" pad="PD5"/>
-            <pin position="49" pad="PD6"/>
-            <pin position="50" pad="PD7"/>
-            <pin position="51" pad="PG0"/>
-            <pin position="52" pad="PG1"/>
-            <pin position="53" pad="PC0"/>
-            <pin position="54" pad="PC1"/>
-            <pin position="55" pad="PC2"/>
-            <pin position="56" pad="PC3"/>
-            <pin position="57" pad="PC4"/>
-            <pin position="58" pad="PC5"/>
-            <pin position="59" pad="PC6"/>
-            <pin position="60" pad="PC7"/>
-            <pin position="61" pad="VCC"/>
-            <pin position="62" pad="GND"/>
-            <pin position="63" pad="PJ0"/>
-            <pin position="64" pad="PJ1"/>
-            <pin position="65" pad="PJ2"/>
-            <pin position="66" pad="PJ3"/>
-            <pin position="67" pad="PJ4"/>
-            <pin position="68" pad="PJ5"/>
-            <pin position="69" pad="PJ6"/>
-            <pin position="70" pad="PG2"/>
-            <pin position="71" pad="PA7"/>
-            <pin position="72" pad="PA6"/>
-            <pin position="73" pad="PA5"/>
-            <pin position="74" pad="PA4"/>
-            <pin position="75" pad="PA3"/>
-            <pin position="76" pad="PA2"/>
-            <pin position="77" pad="PA1"/>
-            <pin position="78" pad="PA0"/>
-            <pin position="79" pad="PJ7"/>
-            <pin position="80" pad="VCC"/>
-            <pin position="81" pad="GND"/>
-            <pin position="82" pad="PK7"/>
-            <pin position="83" pad="PK6"/>
-            <pin position="84" pad="PK5"/>
-            <pin position="85" pad="PK4"/>
-            <pin position="86" pad="PK3"/>
-            <pin position="87" pad="PK2"/>
-            <pin position="88" pad="PK1"/>
-            <pin position="89" pad="PK0"/>
-            <pin position="90" pad="PF7"/>
-            <pin position="91" pad="PF6"/>
-            <pin position="92" pad="PF5"/>
-            <pin position="93" pad="PF4"/>
-            <pin position="94" pad="PF3"/>
-            <pin position="95" pad="PF2"/>
-            <pin position="96" pad="PF1"/>
-            <pin position="97" pad="PF0"/>
-            <pin position="98" pad="AREF"/>
-            <pin position="99" pad="GND"/>
-            <pin position="100" pad="AVCC"/>
+            <pin position="1" pad-key="pg5"/>
+            <pin position="2" pad-key="pe0"/>
+            <pin position="3" pad-key="pe1"/>
+            <pin position="4" pad-key="pe2"/>
+            <pin position="5" pad-key="pe3"/>
+            <pin position="6" pad-key="pe4"/>
+            <pin position="7" pad-key="pe5"/>
+            <pin position="8" pad-key="pe6"/>
+            <pin position="9" pad-key="pe7"/>
+            <pin position="10" pad-key="vcc"/>
+            <pin position="11" pad-key="gnd"/>
+            <pin position="12" pad-key="ph0"/>
+            <pin position="13" pad-key="ph1"/>
+            <pin position="14" pad-key="ph2"/>
+            <pin position="15" pad-key="ph3"/>
+            <pin position="16" pad-key="ph4"/>
+            <pin position="17" pad-key="ph5"/>
+            <pin position="18" pad-key="ph6"/>
+            <pin position="19" pad-key="pb0"/>
+            <pin position="20" pad-key="pb1"/>
+            <pin position="21" pad-key="pb2"/>
+            <pin position="22" pad-key="pb3"/>
+            <pin position="23" pad-key="pb4"/>
+            <pin position="24" pad-key="pb5"/>
+            <pin position="25" pad-key="pb6"/>
+            <pin position="26" pad-key="pb7"/>
+            <pin position="27" pad-key="ph7"/>
+            <pin position="28" pad-key="pg3"/>
+            <pin position="29" pad-key="pg4"/>
+            <pin position="30" pad-key="reset"/>
+            <pin position="31" pad-key="vcc"/>
+            <pin position="32" pad-key="gnd"/>
+            <pin position="33" pad-key="xtal2"/>
+            <pin position="34" pad-key="xtal1"/>
+            <pin position="35" pad-key="pl0"/>
+            <pin position="36" pad-key="pl1"/>
+            <pin position="37" pad-key="pl2"/>
+            <pin position="38" pad-key="pl3"/>
+            <pin position="39" pad-key="pl4"/>
+            <pin position="40" pad-key="pl5"/>
+            <pin position="41" pad-key="pl6"/>
+            <pin position="42" pad-key="pl7"/>
+            <pin position="43" pad-key="pd0"/>
+            <pin position="44" pad-key="pd1"/>
+            <pin position="45" pad-key="pd2"/>
+            <pin position="46" pad-key="pd3"/>
+            <pin position="47" pad-key="pd4"/>
+            <pin position="48" pad-key="pd5"/>
+            <pin position="49" pad-key="pd6"/>
+            <pin position="50" pad-key="pd7"/>
+            <pin position="51" pad-key="pg0"/>
+            <pin position="52" pad-key="pg1"/>
+            <pin position="53" pad-key="pc0"/>
+            <pin position="54" pad-key="pc1"/>
+            <pin position="55" pad-key="pc2"/>
+            <pin position="56" pad-key="pc3"/>
+            <pin position="57" pad-key="pc4"/>
+            <pin position="58" pad-key="pc5"/>
+            <pin position="59" pad-key="pc6"/>
+            <pin position="60" pad-key="pc7"/>
+            <pin position="61" pad-key="vcc"/>
+            <pin position="62" pad-key="gnd"/>
+            <pin position="63" pad-key="pj0"/>
+            <pin position="64" pad-key="pj1"/>
+            <pin position="65" pad-key="pj2"/>
+            <pin position="66" pad-key="pj3"/>
+            <pin position="67" pad-key="pj4"/>
+            <pin position="68" pad-key="pj5"/>
+            <pin position="69" pad-key="pj6"/>
+            <pin position="70" pad-key="pg2"/>
+            <pin position="71" pad-key="pa7"/>
+            <pin position="72" pad-key="pa6"/>
+            <pin position="73" pad-key="pa5"/>
+            <pin position="74" pad-key="pa4"/>
+            <pin position="75" pad-key="pa3"/>
+            <pin position="76" pad-key="pa2"/>
+            <pin position="77" pad-key="pa1"/>
+            <pin position="78" pad-key="pa0"/>
+            <pin position="79" pad-key="pj7"/>
+            <pin position="80" pad-key="vcc"/>
+            <pin position="81" pad-key="gnd"/>
+            <pin position="82" pad-key="pk7"/>
+            <pin position="83" pad-key="pk6"/>
+            <pin position="84" pad-key="pk5"/>
+            <pin position="85" pad-key="pk4"/>
+            <pin position="86" pad-key="pk3"/>
+            <pin position="87" pad-key="pk2"/>
+            <pin position="88" pad-key="pk1"/>
+            <pin position="89" pad-key="pk0"/>
+            <pin position="90" pad-key="pf7"/>
+            <pin position="91" pad-key="pf6"/>
+            <pin position="92" pad-key="pf5"/>
+            <pin position="93" pad-key="pf4"/>
+            <pin position="94" pad-key="pf3"/>
+            <pin position="95" pad-key="pf2"/>
+            <pin position="96" pad-key="pf1"/>
+            <pin position="97" pad-key="pf0"/>
+            <pin position="98" pad-key="aref"/>
+            <pin position="99" pad-key="gnd"/>
+            <pin position="100" pad-key="avcc"/>
         </pinout>
         <pinout key="cbga100" name="CBGA100" type="bga">
-            <pin position="A1" pad="GND"/>
-            <pin position="A2" pad="AREF"/>
-            <pin position="A3" pad="PF0"/>
-            <pin position="A4" pad="PF5"/>
-            <pin position="A5" pad="PE3"/>
-            <pin position="A6" pad="PK0"/>
-            <pin position="A7" pad="PK3"/>
-            <pin position="A8" pad="PK6"/>
-            <pin position="A9" pad="GND"/>
-            <pin position="A10" pad="VCC"/>
-            <pin position="B1" pad="AVCC"/>
-            <pin position="B2" pad="PG5"/>
-            <pin position="B3" pad="PF1"/>
-            <pin position="B4" pad="PF3"/>
-            <pin position="B5" pad="PF6"/>
-            <pin position="B6" pad="PK1"/>
-            <pin position="B7" pad="PK4"/>
-            <pin position="B8" pad="PK7"/>
-            <pin position="B9" pad="PA0"/>
-            <pin position="B10" pad="PA2"/>
-            <pin position="C1" pad="PE2"/>
-            <pin position="C2" pad="PE0"/>
-            <pin position="C3" pad="PE1"/>
-            <pin position="C4" pad="PF4"/>
-            <pin position="C5" pad="PF7"/>
-            <pin position="C6" pad="PK2"/>
-            <pin position="C7" pad="PK5"/>
-            <pin position="C8" pad="PJ7"/>
-            <pin position="C9" pad="PA1"/>
-            <pin position="C10" pad="PA3"/>
-            <pin position="D1" pad="PE3"/>
-            <pin position="D2" pad="PE4"/>
-            <pin position="D3" pad="PE5"/>
-            <pin position="D4" pad="PE6"/>
-            <pin position="D5" pad="PH2"/>
-            <pin position="D6" pad="PA4"/>
-            <pin position="D7" pad="PA5"/>
-            <pin position="D8" pad="PA6"/>
-            <pin position="D9" pad="PA7"/>
-            <pin position="D10" pad="PG2"/>
-            <pin position="E1" pad="PE7"/>
-            <pin position="E2" pad="PH0"/>
-            <pin position="E3" pad="PH1"/>
-            <pin position="E4" pad="PH3"/>
-            <pin position="E5" pad="PH5"/>
-            <pin position="E6" pad="PJ6"/>
-            <pin position="E7" pad="PJ5"/>
-            <pin position="E8" pad="PJ4"/>
-            <pin position="E9" pad="PJ3"/>
-            <pin position="E10" pad="PJ2"/>
-            <pin position="F1" pad="VCC"/>
-            <pin position="F2" pad="PH4"/>
-            <pin position="F3" pad="PH6"/>
-            <pin position="F4" pad="PB0"/>
-            <pin position="5F" pad="PL4"/>
-            <pin position="F6" pad="PD1"/>
-            <pin position="F7" pad="PJ1"/>
-            <pin position="F8" pad="PJ0"/>
-            <pin position="F9" pad="PC7"/>
-            <pin position="F10" pad="GND"/>
-            <pin position="G1" pad="GND"/>
-            <pin position="G2" pad="PB1"/>
-            <pin position="G3" pad="PB2"/>
-            <pin position="G4" pad="PB5"/>
-            <pin position="G5" pad="PL2"/>
-            <pin position="G6" pad="PD0"/>
-            <pin position="G7" pad="PD5"/>
-            <pin position="G8" pad="PC5"/>
-            <pin position="G9" pad="PC6"/>
-            <pin position="G10" pad="VCC"/>
-            <pin position="H1" pad="PB3"/>
-            <pin position="H2" pad="PB4"/>
-            <pin position="H3" pad="RESET"/>
-            <pin position="H4" pad="PL1"/>
-            <pin position="H5" pad="PL3"/>
-            <pin position="H6" pad="PL7"/>
-            <pin position="H7" pad="PD4"/>
-            <pin position="H8" pad="PC4"/>
-            <pin position="H9" pad="PC3"/>
-            <pin position="H0" pad="PC2"/>
-            <pin position="I1" pad="PH7"/>
-            <pin position="I2" pad="PG3"/>
-            <pin position="I3" pad="PB6"/>
-            <pin position="I4" pad="PL0"/>
-            <pin position="I5" pad="XTAL2"/>
-            <pin position="I6" pad="PL6"/>
-            <pin position="I7" pad="PD3"/>
-            <pin position="I8" pad="PC1"/>
-            <pin position="I9" pad="PC0"/>
-            <pin position="I0" pad="PG1"/>
-            <pin position="J1" pad="PB7"/>
-            <pin position="J2" pad="PG4"/>
-            <pin position="J3" pad="VCC"/>
-            <pin position="J4" pad="GND"/>
-            <pin position="J5" pad="XTAL1"/>
-            <pin position="J6" pad="PL5"/>
-            <pin position="J7" pad="PD2"/>
-            <pin position="J8" pad="PD6"/>
-            <pin position="J9" pad="PD7"/>
-            <pin position="J10" pad="PG0"/>
+            <pin position="A1" pad-key="gnd"/>
+            <pin position="A2" pad-key="aref"/>
+            <pin position="A3" pad-key="pf0"/>
+            <pin position="A4" pad-key="pf5"/>
+            <pin position="A5" pad-key="pe3"/>
+            <pin position="A6" pad-key="pk0"/>
+            <pin position="A7" pad-key="pk3"/>
+            <pin position="A8" pad-key="pk6"/>
+            <pin position="A9" pad-key="gnd"/>
+            <pin position="A10" pad-key="vcc"/>
+            <pin position="B1" pad-key="avcc"/>
+            <pin position="B2" pad-key="pg5"/>
+            <pin position="B3" pad-key="pf1"/>
+            <pin position="B4" pad-key="pf3"/>
+            <pin position="B5" pad-key="pf6"/>
+            <pin position="B6" pad-key="pk1"/>
+            <pin position="B7" pad-key="pk4"/>
+            <pin position="B8" pad-key="pk7"/>
+            <pin position="B9" pad-key="pa0"/>
+            <pin position="B10" pad-key="pa2"/>
+            <pin position="C1" pad-key="pe2"/>
+            <pin position="C2" pad-key="pe0"/>
+            <pin position="C3" pad-key="pe1"/>
+            <pin position="C4" pad-key="pf4"/>
+            <pin position="C5" pad-key="pf7"/>
+            <pin position="C6" pad-key="pk2"/>
+            <pin position="C7" pad-key="pk5"/>
+            <pin position="C8" pad-key="pj7"/>
+            <pin position="C9" pad-key="pa1"/>
+            <pin position="C10" pad-key="pa3"/>
+            <pin position="D1" pad-key="pe3"/>
+            <pin position="D2" pad-key="pe4"/>
+            <pin position="D3" pad-key="pe5"/>
+            <pin position="D4" pad-key="pe6"/>
+            <pin position="D5" pad-key="ph2"/>
+            <pin position="D6" pad-key="pa4"/>
+            <pin position="D7" pad-key="pa5"/>
+            <pin position="D8" pad-key="pa6"/>
+            <pin position="D9" pad-key="pa7"/>
+            <pin position="D10" pad-key="pg2"/>
+            <pin position="E1" pad-key="pe7"/>
+            <pin position="E2" pad-key="ph0"/>
+            <pin position="E3" pad-key="ph1"/>
+            <pin position="E4" pad-key="ph3"/>
+            <pin position="E5" pad-key="ph5"/>
+            <pin position="E6" pad-key="pj6"/>
+            <pin position="E7" pad-key="pj5"/>
+            <pin position="E8" pad-key="pj4"/>
+            <pin position="E9" pad-key="pj3"/>
+            <pin position="E10" pad-key="pj2"/>
+            <pin position="F1" pad-key="vcc"/>
+            <pin position="F2" pad-key="ph4"/>
+            <pin position="F3" pad-key="ph6"/>
+            <pin position="F4" pad-key="pb0"/>
+            <pin position="5F" pad-key="pl4"/>
+            <pin position="F6" pad-key="pd1"/>
+            <pin position="F7" pad-key="pj1"/>
+            <pin position="F8" pad-key="pj0"/>
+            <pin position="F9" pad-key="pc7"/>
+            <pin position="F10" pad-key="gnd"/>
+            <pin position="G1" pad-key="gnd"/>
+            <pin position="G2" pad-key="pb1"/>
+            <pin position="G3" pad-key="pb2"/>
+            <pin position="G4" pad-key="pb5"/>
+            <pin position="G5" pad-key="pl2"/>
+            <pin position="G6" pad-key="pd0"/>
+            <pin position="G7" pad-key="pd5"/>
+            <pin position="G8" pad-key="pc5"/>
+            <pin position="G9" pad-key="pc6"/>
+            <pin position="G10" pad-key="vcc"/>
+            <pin position="H1" pad-key="pb3"/>
+            <pin position="H2" pad-key="pb4"/>
+            <pin position="H3" pad-key="reset"/>
+            <pin position="H4" pad-key="pl1"/>
+            <pin position="H5" pad-key="pl3"/>
+            <pin position="H6" pad-key="pl7"/>
+            <pin position="H7" pad-key="pd4"/>
+            <pin position="H8" pad-key="pc4"/>
+            <pin position="H9" pad-key="pc3"/>
+            <pin position="H0" pad-key="pc2"/>
+            <pin position="I1" pad-key="ph7"/>
+            <pin position="I2" pad-key="pg3"/>
+            <pin position="I3" pad-key="pb6"/>
+            <pin position="I4" pad-key="pl0"/>
+            <pin position="I5" pad-key="xtal2"/>
+            <pin position="I6" pad-key="pl6"/>
+            <pin position="I7" pad-key="pd3"/>
+            <pin position="I8" pad-key="pc1"/>
+            <pin position="I9" pad-key="pc0"/>
+            <pin position="I0" pad-key="pg1"/>
+            <pin position="J1" pad-key="pb7"/>
+            <pin position="J2" pad-key="pg4"/>
+            <pin position="J3" pad-key="vcc"/>
+            <pin position="J4" pad-key="gnd"/>
+            <pin position="J5" pad-key="xtal1"/>
+            <pin position="J6" pad-key="pl5"/>
+            <pin position="J7" pad-key="pd2"/>
+            <pin position="J8" pad-key="pd6"/>
+            <pin position="J9" pad-key="pd7"/>
+            <pin position="J10" pad-key="pg0"/>
         </pinout>
     </pinouts>
     <variants>
-        <variant name="ATmega2560V-8AU" pinout-key="tqfp100" package="TQFP100"/>
-        <variant name="ATmega2560V-8CU" pinout-key="cbga100" package="CBGA100"/>
-        <variant name="ATmega2560-16AU" pinout-key="tqfp100" package="TQFP100"/>
-        <variant name="ATmega2560-16CU" pinout-key="cbga100" package="CBGA100"/>
+        <variant key="atmega2560v_8au" name="ATmega2560V-8AU" pinout-key="tqfp100"/>
+        <variant key="atmega2560v_8cu" name="ATmega2560V-8CU" pinout-key="cbga100"/>
+        <variant key="atmega2560_16au" name="ATmega2560-16AU" pinout-key="tqfp100"/>
+        <variant key="atmega2560_16cu" name="ATmega2560-16CU" pinout-key="cbga100"/>
     </variants>
 </device>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA2561.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA2561.xml
index 3ac5ee13..b26d2ea8 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA2561.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA2561.xml
@@ -195,147 +195,145 @@
         <peripheral key="ac" name="AC" module-key="ac">
             <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"/>
+                <signal pad-key="pe2" index="0" function="default" group="AIN"/>
+                <signal pad-key="pe3" index="1" function="default" group="AIN"/>
             </signals>
         </peripheral>
         <peripheral key="usart0" name="USART0" module-key="usart">
             <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"/>
-                <signal pad-id="pe2" function="default" group="XCK"/>
+                <signal pad-key="pe1" function="default" group="TXD"/>
+                <signal pad-key="pe0" function="default" group="RXD"/>
+                <signal pad-key="pe2" function="default" group="XCK"/>
             </signals>
         </peripheral>
         <peripheral key="usart1" name="USART1" module-key="usart">
             <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"/>
-                <signal pad-id="pd5" function="default" group="XCK"/>
+                <signal pad-key="pd3" function="default" group="TXD"/>
+                <signal pad-key="pd2" function="default" group="RXD"/>
+                <signal pad-key="pd5" function="default" group="XCK"/>
             </signals>
         </peripheral>
         <peripheral key="twi" name="TWI" module-key="twi">
             <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"/>
+                <signal pad-key="pd1" function="default" group="SDA"/>
+                <signal pad-key="pd0" function="default" group="SCL"/>
             </signals>
         </peripheral>
         <peripheral key="spi" name="SPI" module-key="spi">
             <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"/>
-                <signal pad-id="pb3" function="default" group="MISO"/>
-                <signal pad-id="pb1" function="default" group="SCK"/>
+                <signal pad-key="pb0" function="default" group="SS"/>
+                <signal pad-key="pb2" function="default" group="MOSI"/>
+                <signal pad-key="pb3" function="default" group="MISO"/>
+                <signal pad-key="pb1" function="default" group="SCK"/>
             </signals>
         </peripheral>
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pa2" index="2" function="default" group="P"/>
-                <signal pad-id="pa3" index="3" function="default" group="P"/>
-                <signal pad-id="pa4" index="4" function="default" group="P"/>
-                <signal pad-id="pa5" index="5" function="default" group="P"/>
-                <signal pad-id="pa6" index="6" function="default" group="P"/>
-                <signal pad-id="pa7" index="7" function="default" group="P"/>
+                <signal pad-key="pa0" index="0" function="default" group="P"/>
+                <signal pad-key="pa1" index="1" function="default" group="P"/>
+                <signal pad-key="pa2" index="2" function="default" group="P"/>
+                <signal pad-key="pa3" index="3" function="default" group="P"/>
+                <signal pad-key="pa4" index="4" function="default" group="P"/>
+                <signal pad-key="pa5" index="5" function="default" group="P"/>
+                <signal pad-key="pa6" index="6" function="default" group="P"/>
+                <signal pad-key="pa7" index="7" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pb2" index="2" function="default" group="P"/>
-                <signal pad-id="pb3" index="3" function="default" group="P"/>
-                <signal pad-id="pb4" index="4" function="default" group="P"/>
-                <signal pad-id="pb5" index="5" function="default" group="P"/>
-                <signal pad-id="pb6" index="6" function="default" group="P"/>
-                <signal pad-id="pb7" index="7" function="default" group="P"/>
+                <signal pad-key="pb0" index="0" function="default" group="P"/>
+                <signal pad-key="pb1" index="1" function="default" group="P"/>
+                <signal pad-key="pb2" index="2" function="default" group="P"/>
+                <signal pad-key="pb3" index="3" function="default" group="P"/>
+                <signal pad-key="pb4" index="4" function="default" group="P"/>
+                <signal pad-key="pb5" index="5" function="default" group="P"/>
+                <signal pad-key="pb6" index="6" function="default" group="P"/>
+                <signal pad-key="pb7" index="7" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pc2" index="2" function="default" group="P"/>
-                <signal pad-id="pc3" index="3" function="default" group="P"/>
-                <signal pad-id="pc4" index="4" function="default" group="P"/>
-                <signal pad-id="pc5" index="5" function="default" group="P"/>
-                <signal pad-id="pc6" index="6" function="default" group="P"/>
-                <signal pad-id="pc7" index="7" function="default" group="P"/>
+                <signal pad-key="pc0" index="0" function="default" group="P"/>
+                <signal pad-key="pc1" index="1" function="default" group="P"/>
+                <signal pad-key="pc2" index="2" function="default" group="P"/>
+                <signal pad-key="pc3" index="3" function="default" group="P"/>
+                <signal pad-key="pc4" index="4" function="default" group="P"/>
+                <signal pad-key="pc5" index="5" function="default" group="P"/>
+                <signal pad-key="pc6" index="6" function="default" group="P"/>
+                <signal pad-key="pc7" index="7" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pd2" index="2" function="default" group="P"/>
-                <signal pad-id="pd3" index="3" function="default" group="P"/>
-                <signal pad-id="pd4" index="4" function="default" group="P"/>
-                <signal pad-id="pd5" index="5" function="default" group="P"/>
-                <signal pad-id="pd6" index="6" function="default" group="P"/>
-                <signal pad-id="pd7" index="7" function="default" group="P"/>
+                <signal pad-key="pd0" index="0" function="default" group="P"/>
+                <signal pad-key="pd1" index="1" function="default" group="P"/>
+                <signal pad-key="pd2" index="2" function="default" group="P"/>
+                <signal pad-key="pd3" index="3" function="default" group="P"/>
+                <signal pad-key="pd4" index="4" function="default" group="P"/>
+                <signal pad-key="pd5" index="5" function="default" group="P"/>
+                <signal pad-key="pd6" index="6" function="default" group="P"/>
+                <signal pad-key="pd7" index="7" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="porte" name="PORTE" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pe2" index="2" function="default" group="P"/>
-                <signal pad-id="pe3" index="3" function="default" group="P"/>
-                <signal pad-id="pe4" index="4" function="default" group="P"/>
-                <signal pad-id="pe5" index="5" function="default" group="P"/>
-                <signal pad-id="pe6" index="6" function="default" group="P"/>
-                <signal pad-id="pe7" index="7" function="default" group="P"/>
+                <signal pad-key="pe0" index="0" function="default" group="P"/>
+                <signal pad-key="pe1" index="1" function="default" group="P"/>
+                <signal pad-key="pe2" index="2" function="default" group="P"/>
+                <signal pad-key="pe3" index="3" function="default" group="P"/>
+                <signal pad-key="pe4" index="4" function="default" group="P"/>
+                <signal pad-key="pe5" index="5" function="default" group="P"/>
+                <signal pad-key="pe6" index="6" function="default" group="P"/>
+                <signal pad-key="pe7" index="7" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portf" name="PORTF" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pf2" index="2" function="default" group="P"/>
-                <signal pad-id="pf3" index="3" function="default" group="P"/>
-                <signal pad-id="pf4" index="4" function="default" group="P"/>
-                <signal pad-id="pf5" index="5" function="default" group="P"/>
-                <signal pad-id="pf6" index="6" function="default" group="P"/>
-                <signal pad-id="pf7" index="7" function="default" group="P"/>
+                <signal pad-key="pf0" index="0" function="default" group="P"/>
+                <signal pad-key="pf1" index="1" function="default" group="P"/>
+                <signal pad-key="pf2" index="2" function="default" group="P"/>
+                <signal pad-key="pf3" index="3" function="default" group="P"/>
+                <signal pad-key="pf4" index="4" function="default" group="P"/>
+                <signal pad-key="pf5" index="5" function="default" group="P"/>
+                <signal pad-key="pf6" index="6" function="default" group="P"/>
+                <signal pad-key="pf7" index="7" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portg" name="PORTG" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pg2" index="2" function="default" group="P"/>
-                <signal pad-id="pg3" index="3" function="default" group="P"/>
-                <signal pad-id="pg4" index="4" function="default" group="P"/>
-                <signal pad-id="pg5" index="5" function="default" group="P"/>
-                <signal pad-id="pg6" index="6" function="default" group="P"/>
-                <signal pad-id="pg7" index="7" function="default" group="P"/>
+                <signal pad-key="pg0" index="0" function="default" group="P"/>
+                <signal pad-key="pg1" index="1" function="default" group="P"/>
+                <signal pad-key="pg2" index="2" function="default" group="P"/>
+                <signal pad-key="pg3" index="3" function="default" group="P"/>
+                <signal pad-key="pg4" index="4" function="default" group="P"/>
+                <signal pad-key="pg5" index="5" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="tc0" name="TC0" module-key="tc8">
             <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"/>
-                <signal pad-id="pb7" function="default" group="OCA"/>
+                <signal pad-key="pd7" function="default" group="T"/>
+                <signal pad-key="pg5" function="default" group="OCB"/>
+                <signal pad-key="pb7" function="default" group="OCA"/>
             </signals>
         </peripheral>
         <peripheral key="tc2" name="TC2" module-key="tc8_async">
             <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"/>
-                <signal pad-id="pb4" function="default" group="OCA"/>
+                <signal pad-key="pg4" index="1" function="default" group="TOSC"/>
+                <signal pad-key="pg3" index="2" function="default" group="TOSC"/>
+                <signal pad-key="pb4" function="default" group="OCA"/>
             </signals>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="wdt">
@@ -353,71 +351,71 @@
         <peripheral key="tc3" name="TC3" module-key="tc16">
             <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"/>
-                <signal pad-id="pe3" function="default" group="OCA"/>
-                <signal pad-id="pe4" function="default" group="OCB"/>
-                <signal pad-id="pe5" function="default" group="OCC"/>
+                <signal pad-key="pe6" function="default" group="T"/>
+                <signal pad-key="pe7" function="default" group="ICP"/>
+                <signal pad-key="pe3" function="default" group="OCA"/>
+                <signal pad-key="pe4" function="default" group="OCB"/>
+                <signal pad-key="pe5" function="default" group="OCC"/>
             </signals>
         </peripheral>
         <peripheral key="tc1" name="TC1" module-key="tc16">
             <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"/>
-                <signal pad-id="pb5" function="default" group="OCA"/>
-                <signal pad-id="pb6" function="default" group="OCB"/>
-                <signal pad-id="pb7" function="default" group="OCC"/>
+                <signal pad-key="pd6" function="default" group="T"/>
+                <signal pad-key="pd4" function="default" group="ICP"/>
+                <signal pad-key="pb5" function="default" group="OCA"/>
+                <signal pad-key="pb6" function="default" group="OCB"/>
+                <signal pad-key="pb7" function="default" group="OCC"/>
             </signals>
         </peripheral>
         <peripheral key="jtag" name="JTAG" module-key="jtag">
             <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"/>
-                <signal pad-id="pf6" function="default" group="TDO"/>
-                <signal pad-id="pf7" function="default" group="TDI"/>
+                <signal pad-key="pf4" function="default" group="TCK"/>
+                <signal pad-key="pf5" function="default" group="TMS"/>
+                <signal pad-key="pf6" function="default" group="TDO"/>
+                <signal pad-key="pf7" function="default" group="TDI"/>
             </signals>
         </peripheral>
         <peripheral key="exint" name="EXINT" module-key="exint">
             <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"/>
-                <signal pad-id="pb2" index="2" function="default" group="PCINT"/>
-                <signal pad-id="pb3" index="3" function="default" group="PCINT"/>
-                <signal pad-id="pb4" index="4" function="default" group="PCINT"/>
-                <signal pad-id="pb5" index="5" function="default" group="PCINT"/>
-                <signal pad-id="pb6" index="6" function="default" group="PCINT"/>
-                <signal pad-id="pb7" index="7" function="default" group="PCINT"/>
-                <signal pad-id="pe0" index="8" function="default" group="PCINT"/>
-                <signal pad-id="pd0" index="0" function="default" group="INT"/>
-                <signal pad-id="pd1" index="1" function="default" group="INT"/>
-                <signal pad-id="pd2" index="2" function="default" group="INT"/>
-                <signal pad-id="pd3" index="3" function="default" group="INT"/>
-                <signal pad-id="pe4" index="4" function="default" group="INT"/>
-                <signal pad-id="pe5" index="5" function="default" group="INT"/>
-                <signal pad-id="pe6" index="6" function="default" group="INT"/>
-                <signal pad-id="pe7" index="7" function="default" group="INT"/>
+                <signal pad-key="pb0" index="0" function="default" group="PCINT"/>
+                <signal pad-key="pb1" index="1" function="default" group="PCINT"/>
+                <signal pad-key="pb2" index="2" function="default" group="PCINT"/>
+                <signal pad-key="pb3" index="3" function="default" group="PCINT"/>
+                <signal pad-key="pb4" index="4" function="default" group="PCINT"/>
+                <signal pad-key="pb5" index="5" function="default" group="PCINT"/>
+                <signal pad-key="pb6" index="6" function="default" group="PCINT"/>
+                <signal pad-key="pb7" index="7" function="default" group="PCINT"/>
+                <signal pad-key="pe0" index="8" function="default" group="PCINT"/>
+                <signal pad-key="pd0" index="0" function="default" group="INT"/>
+                <signal pad-key="pd1" index="1" function="default" group="INT"/>
+                <signal pad-key="pd2" index="2" function="default" group="INT"/>
+                <signal pad-key="pd3" index="3" function="default" group="INT"/>
+                <signal pad-key="pe4" index="4" function="default" group="INT"/>
+                <signal pad-key="pe5" index="5" function="default" group="INT"/>
+                <signal pad-key="pe6" index="6" function="default" group="INT"/>
+                <signal pad-key="pe7" index="7" function="default" group="INT"/>
             </signals>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="cpu">
             <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"/>
+                <signal pad-key="pe7" index="0" function="default" group="CLKO"/>
             </signals>
         </peripheral>
         <peripheral key="adc" name="ADC" module-key="adc">
             <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"/>
-                <signal pad-id="pf2" index="2" function="default" group="ADC"/>
-                <signal pad-id="pf3" index="3" function="default" group="ADC"/>
-                <signal pad-id="pf4" index="4" function="default" group="ADC"/>
-                <signal pad-id="pf5" index="5" function="default" group="ADC"/>
-                <signal pad-id="pf6" index="6" function="default" group="ADC"/>
-                <signal pad-id="pf7" index="7" function="default" group="ADC"/>
+                <signal pad-key="pf0" index="0" function="default" group="ADC"/>
+                <signal pad-key="pf1" index="1" function="default" group="ADC"/>
+                <signal pad-key="pf2" index="2" function="default" group="ADC"/>
+                <signal pad-key="pf3" index="3" function="default" group="ADC"/>
+                <signal pad-key="pf4" index="4" function="default" group="ADC"/>
+                <signal pad-key="pf5" index="5" function="default" group="ADC"/>
+                <signal pad-key="pf6" index="6" function="default" group="ADC"/>
+                <signal pad-key="pf7" index="7" function="default" group="ADC"/>
             </signals>
         </peripheral>
         <peripheral key="boot_load" name="BOOT_LOAD" module-key="boot_load">
@@ -1068,144 +1066,207 @@
             </register-group>
         </module>
     </modules>
+    <pads>
+        <pad key="pg5" name="PG5"/>
+        <pad key="pe0" name="PE0"/>
+        <pad key="pe1" name="PE1"/>
+        <pad key="pe2" name="PE2"/>
+        <pad key="pe3" name="PE3"/>
+        <pad key="pe4" name="PE4"/>
+        <pad key="pe5" name="PE5"/>
+        <pad key="pe6" name="PE6"/>
+        <pad key="pe7" name="PE7"/>
+        <pad key="pb0" name="PB0"/>
+        <pad key="pb1" name="PB1"/>
+        <pad key="pb2" name="PB2"/>
+        <pad key="pb3" name="PB3"/>
+        <pad key="pb4" name="PB4"/>
+        <pad key="pb5" name="PB5"/>
+        <pad key="pb6" name="PB6"/>
+        <pad key="pb7" name="PB7"/>
+        <pad key="pg3" name="PG3"/>
+        <pad key="pg4" name="PG4"/>
+        <pad key="reset" name="RESET"/>
+        <pad key="vcc" name="VCC"/>
+        <pad key="gnd" name="GND"/>
+        <pad key="xtal2" name="XTAL2"/>
+        <pad key="xtal1" name="XTAL1"/>
+        <pad key="pd0" name="PD0"/>
+        <pad key="pd1" name="PD1"/>
+        <pad key="pd2" name="PD2"/>
+        <pad key="pd3" name="PD3"/>
+        <pad key="pd4" name="PD4"/>
+        <pad key="pd5" name="PD5"/>
+        <pad key="pd6" name="PD6"/>
+        <pad key="pd7" name="PD7"/>
+        <pad key="pg0" name="PG0"/>
+        <pad key="pg1" name="PG1"/>
+        <pad key="pc0" name="PC0"/>
+        <pad key="pc1" name="PC1"/>
+        <pad key="pc2" name="PC2"/>
+        <pad key="pc3" name="PC3"/>
+        <pad key="pc4" name="PC4"/>
+        <pad key="pc5" name="PC5"/>
+        <pad key="pc6" name="PC6"/>
+        <pad key="pc7" name="PC7"/>
+        <pad key="pg2" name="PG2"/>
+        <pad key="pa7" name="PA7"/>
+        <pad key="pa6" name="PA6"/>
+        <pad key="pa5" name="PA5"/>
+        <pad key="pa4" name="PA4"/>
+        <pad key="pa3" name="PA3"/>
+        <pad key="pa2" name="PA2"/>
+        <pad key="pa1" name="PA1"/>
+        <pad key="pa0" name="PA0"/>
+        <pad key="pf7" name="PF7"/>
+        <pad key="pf6" name="PF6"/>
+        <pad key="pf5" name="PF5"/>
+        <pad key="pf4" name="PF4"/>
+        <pad key="pf3" name="PF3"/>
+        <pad key="pf2" name="PF2"/>
+        <pad key="pf1" name="PF1"/>
+        <pad key="pf0" name="PF0"/>
+        <pad key="aref" name="AREF"/>
+        <pad key="avcc" name="AVCC"/>
+    </pads>
     <pinouts>
         <pinout key="tqfp64" name="TQFP64" type="qfp">
-            <pin position="1" pad="PG5"/>
-            <pin position="2" pad="PE0"/>
-            <pin position="3" pad="PE1"/>
-            <pin position="4" pad="PE2"/>
-            <pin position="5" pad="PE3"/>
-            <pin position="6" pad="PE4"/>
-            <pin position="7" pad="PE5"/>
-            <pin position="8" pad="PE6"/>
-            <pin position="9" pad="PE7"/>
-            <pin position="10" pad="PB0"/>
-            <pin position="11" pad="PB1"/>
-            <pin position="12" pad="PB2"/>
-            <pin position="13" pad="PB3"/>
-            <pin position="14" pad="PB4"/>
-            <pin position="15" pad="PB5"/>
-            <pin position="16" pad="PB6"/>
-            <pin position="17" pad="PB7"/>
-            <pin position="18" pad="PG3"/>
-            <pin position="19" pad="PG4"/>
-            <pin position="20" pad="RESET"/>
-            <pin position="21" pad="VCC"/>
-            <pin position="22" pad="GND"/>
-            <pin position="23" pad="XTAL2"/>
-            <pin position="24" pad="XTAL1"/>
-            <pin position="25" pad="PD0"/>
-            <pin position="26" pad="PD1"/>
-            <pin position="27" pad="PD2"/>
-            <pin position="28" pad="PD3"/>
-            <pin position="29" pad="PD4"/>
-            <pin position="30" pad="PD5"/>
-            <pin position="31" pad="PD6"/>
-            <pin position="32" pad="PD7"/>
-            <pin position="33" pad="PG0"/>
-            <pin position="34" pad="PG1"/>
-            <pin position="35" pad="PC0"/>
-            <pin position="36" pad="PC1"/>
-            <pin position="37" pad="PC2"/>
-            <pin position="38" pad="PC3"/>
-            <pin position="39" pad="PC4"/>
-            <pin position="40" pad="PC5"/>
-            <pin position="41" pad="PC6"/>
-            <pin position="42" pad="PC7"/>
-            <pin position="43" pad="PG2"/>
-            <pin position="44" pad="PA7"/>
-            <pin position="45" pad="PA6"/>
-            <pin position="46" pad="PA5"/>
-            <pin position="47" pad="PA4"/>
-            <pin position="48" pad="PA3"/>
-            <pin position="49" pad="PA2"/>
-            <pin position="50" pad="PA1"/>
-            <pin position="51" pad="PA0"/>
-            <pin position="52" pad="VCC"/>
-            <pin position="53" pad="GND"/>
-            <pin position="54" pad="PF7"/>
-            <pin position="55" pad="PF6"/>
-            <pin position="56" pad="PF5"/>
-            <pin position="57" pad="PF4"/>
-            <pin position="58" pad="PF3"/>
-            <pin position="59" pad="PF2"/>
-            <pin position="60" pad="PF1"/>
-            <pin position="61" pad="PF0"/>
-            <pin position="62" pad="AREF"/>
-            <pin position="63" pad="GND"/>
-            <pin position="64" pad="AVCC"/>
+            <pin position="1" pad-key="pg5"/>
+            <pin position="2" pad-key="pe0"/>
+            <pin position="3" pad-key="pe1"/>
+            <pin position="4" pad-key="pe2"/>
+            <pin position="5" pad-key="pe3"/>
+            <pin position="6" pad-key="pe4"/>
+            <pin position="7" pad-key="pe5"/>
+            <pin position="8" pad-key="pe6"/>
+            <pin position="9" pad-key="pe7"/>
+            <pin position="10" pad-key="pb0"/>
+            <pin position="11" pad-key="pb1"/>
+            <pin position="12" pad-key="pb2"/>
+            <pin position="13" pad-key="pb3"/>
+            <pin position="14" pad-key="pb4"/>
+            <pin position="15" pad-key="pb5"/>
+            <pin position="16" pad-key="pb6"/>
+            <pin position="17" pad-key="pb7"/>
+            <pin position="18" pad-key="pg3"/>
+            <pin position="19" pad-key="pg4"/>
+            <pin position="20" pad-key="reset"/>
+            <pin position="21" pad-key="vcc"/>
+            <pin position="22" pad-key="gnd"/>
+            <pin position="23" pad-key="xtal2"/>
+            <pin position="24" pad-key="xtal1"/>
+            <pin position="25" pad-key="pd0"/>
+            <pin position="26" pad-key="pd1"/>
+            <pin position="27" pad-key="pd2"/>
+            <pin position="28" pad-key="pd3"/>
+            <pin position="29" pad-key="pd4"/>
+            <pin position="30" pad-key="pd5"/>
+            <pin position="31" pad-key="pd6"/>
+            <pin position="32" pad-key="pd7"/>
+            <pin position="33" pad-key="pg0"/>
+            <pin position="34" pad-key="pg1"/>
+            <pin position="35" pad-key="pc0"/>
+            <pin position="36" pad-key="pc1"/>
+            <pin position="37" pad-key="pc2"/>
+            <pin position="38" pad-key="pc3"/>
+            <pin position="39" pad-key="pc4"/>
+            <pin position="40" pad-key="pc5"/>
+            <pin position="41" pad-key="pc6"/>
+            <pin position="42" pad-key="pc7"/>
+            <pin position="43" pad-key="pg2"/>
+            <pin position="44" pad-key="pa7"/>
+            <pin position="45" pad-key="pa6"/>
+            <pin position="46" pad-key="pa5"/>
+            <pin position="47" pad-key="pa4"/>
+            <pin position="48" pad-key="pa3"/>
+            <pin position="49" pad-key="pa2"/>
+            <pin position="50" pad-key="pa1"/>
+            <pin position="51" pad-key="pa0"/>
+            <pin position="52" pad-key="vcc"/>
+            <pin position="53" pad-key="gnd"/>
+            <pin position="54" pad-key="pf7"/>
+            <pin position="55" pad-key="pf6"/>
+            <pin position="56" pad-key="pf5"/>
+            <pin position="57" pad-key="pf4"/>
+            <pin position="58" pad-key="pf3"/>
+            <pin position="59" pad-key="pf2"/>
+            <pin position="60" pad-key="pf1"/>
+            <pin position="61" pad-key="pf0"/>
+            <pin position="62" pad-key="aref"/>
+            <pin position="63" pad-key="gnd"/>
+            <pin position="64" pad-key="avcc"/>
         </pinout>
         <pinout key="qfn64" name="QFN64" type="qfn">
-            <pin position="1" pad="PG5"/>
-            <pin position="2" pad="PE0"/>
-            <pin position="3" pad="PE1"/>
-            <pin position="4" pad="PE2"/>
-            <pin position="5" pad="PE3"/>
-            <pin position="6" pad="PE4"/>
-            <pin position="7" pad="PE5"/>
-            <pin position="8" pad="PE6"/>
-            <pin position="9" pad="PE7"/>
-            <pin position="10" pad="PB0"/>
-            <pin position="11" pad="PB1"/>
-            <pin position="12" pad="PB2"/>
-            <pin position="13" pad="PB3"/>
-            <pin position="14" pad="PB4"/>
-            <pin position="15" pad="PB5"/>
-            <pin position="16" pad="PB6"/>
-            <pin position="17" pad="PB7"/>
-            <pin position="18" pad="PG3"/>
-            <pin position="19" pad="PG4"/>
-            <pin position="20" pad="RESET"/>
-            <pin position="21" pad="VCC"/>
-            <pin position="22" pad="GND"/>
-            <pin position="23" pad="XTAL2"/>
-            <pin position="24" pad="XTAL1"/>
-            <pin position="25" pad="PD0"/>
-            <pin position="26" pad="PD1"/>
-            <pin position="27" pad="PD2"/>
-            <pin position="28" pad="PD3"/>
-            <pin position="29" pad="PD4"/>
-            <pin position="30" pad="PD5"/>
-            <pin position="31" pad="PD6"/>
-            <pin position="32" pad="PD7"/>
-            <pin position="33" pad="PG0"/>
-            <pin position="34" pad="PG1"/>
-            <pin position="35" pad="PC0"/>
-            <pin position="36" pad="PC1"/>
-            <pin position="37" pad="PC2"/>
-            <pin position="38" pad="PC3"/>
-            <pin position="39" pad="PC4"/>
-            <pin position="40" pad="PC5"/>
-            <pin position="41" pad="PC6"/>
-            <pin position="42" pad="PC7"/>
-            <pin position="43" pad="PG2"/>
-            <pin position="44" pad="PA7"/>
-            <pin position="45" pad="PA6"/>
-            <pin position="46" pad="PA5"/>
-            <pin position="47" pad="PA4"/>
-            <pin position="48" pad="PA3"/>
-            <pin position="49" pad="PA2"/>
-            <pin position="50" pad="PA1"/>
-            <pin position="51" pad="PA0"/>
-            <pin position="52" pad="VCC"/>
-            <pin position="53" pad="GND"/>
-            <pin position="54" pad="PF7"/>
-            <pin position="55" pad="PF6"/>
-            <pin position="56" pad="PF5"/>
-            <pin position="57" pad="PF4"/>
-            <pin position="58" pad="PF3"/>
-            <pin position="59" pad="PF2"/>
-            <pin position="60" pad="PF1"/>
-            <pin position="61" pad="PF0"/>
-            <pin position="62" pad="AREF"/>
-            <pin position="63" pad="GND"/>
-            <pin position="64" pad="AVCC"/>
+            <pin position="1" pad-key="pg5"/>
+            <pin position="2" pad-key="pe0"/>
+            <pin position="3" pad-key="pe1"/>
+            <pin position="4" pad-key="pe2"/>
+            <pin position="5" pad-key="pe3"/>
+            <pin position="6" pad-key="pe4"/>
+            <pin position="7" pad-key="pe5"/>
+            <pin position="8" pad-key="pe6"/>
+            <pin position="9" pad-key="pe7"/>
+            <pin position="10" pad-key="pb0"/>
+            <pin position="11" pad-key="pb1"/>
+            <pin position="12" pad-key="pb2"/>
+            <pin position="13" pad-key="pb3"/>
+            <pin position="14" pad-key="pb4"/>
+            <pin position="15" pad-key="pb5"/>
+            <pin position="16" pad-key="pb6"/>
+            <pin position="17" pad-key="pb7"/>
+            <pin position="18" pad-key="pg3"/>
+            <pin position="19" pad-key="pg4"/>
+            <pin position="20" pad-key="reset"/>
+            <pin position="21" pad-key="vcc"/>
+            <pin position="22" pad-key="gnd"/>
+            <pin position="23" pad-key="xtal2"/>
+            <pin position="24" pad-key="xtal1"/>
+            <pin position="25" pad-key="pd0"/>
+            <pin position="26" pad-key="pd1"/>
+            <pin position="27" pad-key="pd2"/>
+            <pin position="28" pad-key="pd3"/>
+            <pin position="29" pad-key="pd4"/>
+            <pin position="30" pad-key="pd5"/>
+            <pin position="31" pad-key="pd6"/>
+            <pin position="32" pad-key="pd7"/>
+            <pin position="33" pad-key="pg0"/>
+            <pin position="34" pad-key="pg1"/>
+            <pin position="35" pad-key="pc0"/>
+            <pin position="36" pad-key="pc1"/>
+            <pin position="37" pad-key="pc2"/>
+            <pin position="38" pad-key="pc3"/>
+            <pin position="39" pad-key="pc4"/>
+            <pin position="40" pad-key="pc5"/>
+            <pin position="41" pad-key="pc6"/>
+            <pin position="42" pad-key="pc7"/>
+            <pin position="43" pad-key="pg2"/>
+            <pin position="44" pad-key="pa7"/>
+            <pin position="45" pad-key="pa6"/>
+            <pin position="46" pad-key="pa5"/>
+            <pin position="47" pad-key="pa4"/>
+            <pin position="48" pad-key="pa3"/>
+            <pin position="49" pad-key="pa2"/>
+            <pin position="50" pad-key="pa1"/>
+            <pin position="51" pad-key="pa0"/>
+            <pin position="52" pad-key="vcc"/>
+            <pin position="53" pad-key="gnd"/>
+            <pin position="54" pad-key="pf7"/>
+            <pin position="55" pad-key="pf6"/>
+            <pin position="56" pad-key="pf5"/>
+            <pin position="57" pad-key="pf4"/>
+            <pin position="58" pad-key="pf3"/>
+            <pin position="59" pad-key="pf2"/>
+            <pin position="60" pad-key="pf1"/>
+            <pin position="61" pad-key="pf0"/>
+            <pin position="62" pad-key="aref"/>
+            <pin position="63" pad-key="gnd"/>
+            <pin position="64" pad-key="avcc"/>
         </pinout>
     </pinouts>
     <variants>
-        <variant name="ATmega2561V-8AU" pinout-key="tqfp64" package="TQFP64"/>
-        <variant name="ATmega2561V-8MU" pinout-key="qfn64" package="QFN64"/>
-        <variant name="ATmega2561-16AU" pinout-key="tqfp64" package="TQFP64"/>
-        <variant name="ATmega2561-16MU" pinout-key="qfn64" package="QFN64"/>
+        <variant key="atmega2561v_8au" name="ATmega2561V-8AU" pinout-key="tqfp64"/>
+        <variant key="atmega2561v_8mu" name="ATmega2561V-8MU" pinout-key="qfn64"/>
+        <variant key="atmega2561_16au" name="ATmega2561-16AU" pinout-key="tqfp64"/>
+        <variant key="atmega2561_16mu" name="ATmega2561-16MU" pinout-key="qfn64"/>
     </variants>
 </device>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA2564RFR2.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA2564RFR2.xml
index 895f97c9..9ac0b3aa 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA2564RFR2.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA2564RFR2.xml
@@ -218,60 +218,59 @@
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pb2" index="2" function="PORTB" group="P"/>
-                <signal pad-id="pb3" index="3" function="PORTB" group="P"/>
-                <signal pad-id="pb4" index="4" function="PORTB" group="P"/>
-                <signal pad-id="pb5" index="5" function="PORTB" group="P"/>
-                <signal pad-id="pb6" index="6" function="PORTB" group="P"/>
-                <signal pad-id="pb7" index="7" function="PORTB" group="P"/>
+                <signal pad-key="pb0" index="0" function="PORTB" group="P"/>
+                <signal pad-key="pb1" index="1" function="PORTB" group="P"/>
+                <signal pad-key="pb2" index="2" function="PORTB" group="P"/>
+                <signal pad-key="pb3" index="3" function="PORTB" group="P"/>
+                <signal pad-key="pb4" index="4" function="PORTB" group="P"/>
+                <signal pad-key="pb5" index="5" function="PORTB" group="P"/>
+                <signal pad-key="pb6" index="6" function="PORTB" group="P"/>
+                <signal pad-key="pb7" index="7" function="PORTB" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pd2" index="2" function="PORTD" group="P"/>
-                <signal pad-id="pd3" index="3" function="PORTD" group="P"/>
-                <signal pad-id="pd4" index="4" function="PORTD" group="P"/>
-                <signal pad-id="pd5" index="5" function="PORTD" group="P"/>
-                <signal pad-id="pd6" index="6" function="PORTD" group="P"/>
-                <signal pad-id="pd7" index="7" function="PORTD" group="P"/>
+                <signal pad-key="pd0" index="0" function="PORTD" group="P"/>
+                <signal pad-key="pd1" index="1" function="PORTD" group="P"/>
+                <signal pad-key="pd2" index="2" function="PORTD" group="P"/>
+                <signal pad-key="pd3" index="3" function="PORTD" group="P"/>
+                <signal pad-key="pd4" index="4" function="PORTD" group="P"/>
+                <signal pad-key="pd5" index="5" function="PORTD" group="P"/>
+                <signal pad-key="pd6" index="6" function="PORTD" group="P"/>
+                <signal pad-key="pd7" index="7" function="PORTD" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="porte" name="PORTE" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pe2" index="2" function="PORTE" group="P"/>
-                <signal pad-id="pe3" index="3" function="PORTE" group="P"/>
-                <signal pad-id="pe4" index="4" function="PORTE" group="P"/>
-                <signal pad-id="pe5" index="5" function="PORTE" group="P"/>
-                <signal pad-id="pe7" index="7" function="PORTE" group="P"/>
+                <signal pad-key="pe0" index="0" function="PORTE" group="P"/>
+                <signal pad-key="pe1" index="1" function="PORTE" group="P"/>
+                <signal pad-key="pe2" index="2" function="PORTE" group="P"/>
+                <signal pad-key="pe3" index="3" function="PORTE" group="P"/>
+                <signal pad-key="pe4" index="4" function="PORTE" group="P"/>
+                <signal pad-key="pe5" index="5" function="PORTE" group="P"/>
+                <signal pad-key="pe7" index="7" function="PORTE" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portf" name="PORTF" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pf2" index="2" function="PORTF" group="P"/>
-                <signal pad-id="pf3/4" index="3" function="PORTF" group="P"/>
-                <signal pad-id="pf4/4" index="4" function="PORTF" group="P"/>
-                <signal pad-id="pf5" index="5" function="PORTF" group="P"/>
-                <signal pad-id="pf6" index="6" function="PORTF" group="P"/>
-                <signal pad-id="pf7" index="7" function="PORTF" group="P"/>
+                <signal pad-key="pf0" index="0" function="PORTF" group="P"/>
+                <signal pad-key="pf1" index="1" function="PORTF" group="P"/>
+                <signal pad-key="pf2" index="2" function="PORTF" group="P"/>
+                <signal pad-key="pf3/4" index="3" function="PORTF" group="P"/>
+                <signal pad-key="pf5" index="5" function="PORTF" group="P"/>
+                <signal pad-key="pf6" index="6" function="PORTF" group="P"/>
+                <signal pad-key="pf7" index="7" function="PORTF" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portg" name="PORTG" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pg4" index="4" function="PORTG" group="P"/>
+                <signal pad-key="pg1" index="1" function="PORTG" group="P"/>
+                <signal pad-key="pg3" index="3" function="PORTG" group="P"/>
+                <signal pad-key="pg4" index="4" function="PORTG" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="tc0" name="TC0" module-key="tc8">
@@ -1544,62 +1543,112 @@
             </register-group>
         </module>
     </modules>
+    <pads>
+        <pad key="pf3/4" name="PF3/4"/>
+        <pad key="pf5" name="PF5"/>
+        <pad key="pf6" name="PF6"/>
+        <pad key="pf7" name="PF7"/>
+        <pad key="avss_rfp" name="AVSS_RFP"/>
+        <pad key="rfp" name="RFP"/>
+        <pad key="rfn" name="RFN"/>
+        <pad key="avss_rfn" name="AVSS_RFN"/>
+        <pad key="tst" name="TST"/>
+        <pad key="rstn" name="RSTN"/>
+        <pad key="pg1" name="PG1"/>
+        <pad key="pg3" name="PG3"/>
+        <pad key="pg4" name="PG4"/>
+        <pad key="dvss" name="DVSS"/>
+        <pad key="dvdd" name="DVDD"/>
+        <pad key="devdd" name="DEVDD"/>
+        <pad key="pd0" name="PD0"/>
+        <pad key="pd1" name="PD1"/>
+        <pad key="pd2" name="PD2"/>
+        <pad key="pd3" name="PD3"/>
+        <pad key="pd4" name="PD4"/>
+        <pad key="pd5" name="PD5"/>
+        <pad key="pd6" name="PD6"/>
+        <pad key="pd7" name="PD7"/>
+        <pad key="clki" name="CLKI"/>
+        <pad key="pb0" name="PB0"/>
+        <pad key="pb1" name="PB1"/>
+        <pad key="pb2" name="PB2"/>
+        <pad key="pb3" name="PB3"/>
+        <pad key="pb4" name="PB4"/>
+        <pad key="pb5" name="PB5"/>
+        <pad key="pb6" name="PB6"/>
+        <pad key="pb7" name="PB7"/>
+        <pad key="pe0" name="PE0"/>
+        <pad key="pe1" name="PE1"/>
+        <pad key="pe2" name="PE2"/>
+        <pad key="pe3" name="PE3"/>
+        <pad key="pe4" name="PE4"/>
+        <pad key="pe5" name="PE5"/>
+        <pad key="pe7" name="PE7"/>
+        <pad key="xtal2" name="XTAL2"/>
+        <pad key="xtal1" name="XTAL1"/>
+        <pad key="avss" name="AVSS"/>
+        <pad key="evdd" name="EVDD"/>
+        <pad key="avdd" name="AVDD"/>
+        <pad key="pf0" name="PF0"/>
+        <pad key="pf1" name="PF1"/>
+        <pad key="pf2" name="PF2"/>
+    </pads>
     <pinouts>
         <pinout key="qfn48" name="QFN48" type="qfn">
-            <pin position="1" pad="PF3/4"/>
-            <pin position="2" pad="PF5"/>
-            <pin position="3" pad="PF6"/>
-            <pin position="4" pad="PF7"/>
-            <pin position="5" pad="AVSS_RFP"/>
-            <pin position="6" pad="RFP"/>
-            <pin position="7" pad="RFN"/>
-            <pin position="8" pad="AVSS_RFN"/>
-            <pin position="9" pad="TST"/>
-            <pin position="10" pad="RSTN"/>
-            <pin position="11" pad="PG1"/>
-            <pin position="12" pad="PG3"/>
-            <pin position="13" pad="PG4"/>
-            <pin position="14" pad="DVSS"/>
-            <pin position="15" pad="DVDD"/>
-            <pin position="16" pad="DEVDD"/>
-            <pin position="17" pad="PD0"/>
-            <pin position="18" pad="PD1"/>
-            <pin position="19" pad="PD2"/>
-            <pin position="20" pad="PD3"/>
-            <pin position="21" pad="PD4"/>
-            <pin position="22" pad="PD5"/>
-            <pin position="23" pad="PD6"/>
-            <pin position="24" pad="PD7"/>
-            <pin position="25" pad="CLKI"/>
-            <pin position="26" pad="PB0"/>
-            <pin position="27" pad="PB1"/>
-            <pin position="28" pad="PB2"/>
-            <pin position="29" pad="PB3"/>
-            <pin position="30" pad="PB4"/>
-            <pin position="31" pad="PB5"/>
-            <pin position="32" pad="PB6"/>
-            <pin position="33" pad="PB7"/>
-            <pin position="34" pad="PE0"/>
-            <pin position="35" pad="PE1"/>
-            <pin position="36" pad="PE2"/>
-            <pin position="37" pad="PE3"/>
-            <pin position="38" pad="PE4"/>
-            <pin position="39" pad="PE5"/>
-            <pin position="40" pad="PE7"/>
-            <pin position="41" pad="XTAL2"/>
-            <pin position="42" pad="XTAL1"/>
-            <pin position="43" pad="AVSS"/>
-            <pin position="44" pad="EVDD"/>
-            <pin position="45" pad="AVDD"/>
-            <pin position="46" pad="PF0"/>
-            <pin position="47" pad="PF1"/>
-            <pin position="48" pad="PF2"/>
+            <pin position="1" pad-key="pf3/4"/>
+            <pin position="2" pad-key="pf5"/>
+            <pin position="3" pad-key="pf6"/>
+            <pin position="4" pad-key="pf7"/>
+            <pin position="5" pad-key="avss_rfp"/>
+            <pin position="6" pad-key="rfp"/>
+            <pin position="7" pad-key="rfn"/>
+            <pin position="8" pad-key="avss_rfn"/>
+            <pin position="9" pad-key="tst"/>
+            <pin position="10" pad-key="rstn"/>
+            <pin position="11" pad-key="pg1"/>
+            <pin position="12" pad-key="pg3"/>
+            <pin position="13" pad-key="pg4"/>
+            <pin position="14" pad-key="dvss"/>
+            <pin position="15" pad-key="dvdd"/>
+            <pin position="16" pad-key="devdd"/>
+            <pin position="17" pad-key="pd0"/>
+            <pin position="18" pad-key="pd1"/>
+            <pin position="19" pad-key="pd2"/>
+            <pin position="20" pad-key="pd3"/>
+            <pin position="21" pad-key="pd4"/>
+            <pin position="22" pad-key="pd5"/>
+            <pin position="23" pad-key="pd6"/>
+            <pin position="24" pad-key="pd7"/>
+            <pin position="25" pad-key="clki"/>
+            <pin position="26" pad-key="pb0"/>
+            <pin position="27" pad-key="pb1"/>
+            <pin position="28" pad-key="pb2"/>
+            <pin position="29" pad-key="pb3"/>
+            <pin position="30" pad-key="pb4"/>
+            <pin position="31" pad-key="pb5"/>
+            <pin position="32" pad-key="pb6"/>
+            <pin position="33" pad-key="pb7"/>
+            <pin position="34" pad-key="pe0"/>
+            <pin position="35" pad-key="pe1"/>
+            <pin position="36" pad-key="pe2"/>
+            <pin position="37" pad-key="pe3"/>
+            <pin position="38" pad-key="pe4"/>
+            <pin position="39" pad-key="pe5"/>
+            <pin position="40" pad-key="pe7"/>
+            <pin position="41" pad-key="xtal2"/>
+            <pin position="42" pad-key="xtal1"/>
+            <pin position="43" pad-key="avss"/>
+            <pin position="44" pad-key="evdd"/>
+            <pin position="45" pad-key="avdd"/>
+            <pin position="46" pad-key="pf0"/>
+            <pin position="47" pad-key="pf1"/>
+            <pin position="48" pad-key="pf2"/>
         </pinout>
     </pinouts>
     <variants>
-        <variant name="ATmega2564RFR2-ZU" pinout-key="qfn48" package="VQFN48"/>
-        <variant name="ATmega2564RFR2-ZUR" pinout-key="qfn48" package="VQFN48"/>
-        <variant name="ATmega2564RFR2-ZF" pinout-key="qfn48" package="VQFN48"/>
-        <variant name="ATmega2564RFR2-ZFR" pinout-key="qfn48" package="VQFN48"/>
+        <variant key="atmega2564rfr2_zu" name="ATmega2564RFR2-ZU" pinout-key="qfn48"/>
+        <variant key="atmega2564rfr2_zur" name="ATmega2564RFR2-ZUR" pinout-key="qfn48"/>
+        <variant key="atmega2564rfr2_zf" name="ATmega2564RFR2-ZF" pinout-key="qfn48"/>
+        <variant key="atmega2564rfr2_zfr" name="ATmega2564RFR2-ZFR" pinout-key="qfn48"/>
     </variants>
 </device>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA256RFR2.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA256RFR2.xml
index 2bf30fc0..1075ab23 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA256RFR2.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA256RFR2.xml
@@ -218,64 +218,63 @@
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pb2" index="2" function="PORTB" group="P"/>
-                <signal pad-id="pb3" index="3" function="PORTB" group="P"/>
-                <signal pad-id="pb4" index="4" function="PORTB" group="P"/>
-                <signal pad-id="pb5" index="5" function="PORTB" group="P"/>
-                <signal pad-id="pb6" index="6" function="PORTB" group="P"/>
-                <signal pad-id="pb7" index="7" function="PORTB" group="P"/>
+                <signal pad-key="pb0" index="0" function="PORTB" group="P"/>
+                <signal pad-key="pb1" index="1" function="PORTB" group="P"/>
+                <signal pad-key="pb2" index="2" function="PORTB" group="P"/>
+                <signal pad-key="pb3" index="3" function="PORTB" group="P"/>
+                <signal pad-key="pb4" index="4" function="PORTB" group="P"/>
+                <signal pad-key="pb5" index="5" function="PORTB" group="P"/>
+                <signal pad-key="pb6" index="6" function="PORTB" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pd2" index="2" function="PORTD" group="P"/>
-                <signal pad-id="pd3" index="3" function="PORTD" group="P"/>
-                <signal pad-id="pd4" index="4" function="PORTD" group="P"/>
-                <signal pad-id="pd5" index="5" function="PORTD" group="P"/>
-                <signal pad-id="pd6" index="6" function="PORTD" group="P"/>
-                <signal pad-id="pd7" index="7" function="PORTD" group="P"/>
+                <signal pad-key="pd0" index="0" function="PORTD" group="P"/>
+                <signal pad-key="pd1" index="1" function="PORTD" group="P"/>
+                <signal pad-key="pd2" index="2" function="PORTD" group="P"/>
+                <signal pad-key="pd3" index="3" function="PORTD" group="P"/>
+                <signal pad-key="pd4" index="4" function="PORTD" group="P"/>
+                <signal pad-key="pd5" index="5" function="PORTD" group="P"/>
+                <signal pad-key="pd6" index="6" function="PORTD" group="P"/>
+                <signal pad-key="pd7" index="7" function="PORTD" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="porte" name="PORTE" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pe2" index="2" function="PORTE" group="P"/>
-                <signal pad-id="pe3" index="3" function="PORTE" group="P"/>
-                <signal pad-id="pe4" index="4" function="PORTE" group="P"/>
-                <signal pad-id="pe5" index="5" function="PORTE" group="P"/>
-                <signal pad-id="pe6" index="6" function="PORTE" group="P"/>
-                <signal pad-id="pe7" index="7" function="PORTE" group="P"/>
+                <signal pad-key="pe0" index="0" function="PORTE" group="P"/>
+                <signal pad-key="pe1" index="1" function="PORTE" group="P"/>
+                <signal pad-key="pe2" index="2" function="PORTE" group="P"/>
+                <signal pad-key="pe3" index="3" function="PORTE" group="P"/>
+                <signal pad-key="pe4" index="4" function="PORTE" group="P"/>
+                <signal pad-key="pe5" index="5" function="PORTE" group="P"/>
+                <signal pad-key="pe6" index="6" function="PORTE" group="P"/>
+                <signal pad-key="pe7" index="7" function="PORTE" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portf" name="PORTF" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pf2" index="2" function="PORTF" group="P"/>
-                <signal pad-id="pf3" index="3" function="PORTF" group="P"/>
-                <signal pad-id="pf4" index="4" function="PORTF" group="P"/>
-                <signal pad-id="pf5" index="5" function="PORTF" group="P"/>
-                <signal pad-id="pf6" index="6" function="PORTF" group="P"/>
-                <signal pad-id="pf7" index="7" function="PORTF" group="P"/>
+                <signal pad-key="pf0" index="0" function="PORTF" group="P"/>
+                <signal pad-key="pf1" index="1" function="PORTF" group="P"/>
+                <signal pad-key="pf2" index="2" function="PORTF" group="P"/>
+                <signal pad-key="pf3" index="3" function="PORTF" group="P"/>
+                <signal pad-key="pf4" index="4" function="PORTF" group="P"/>
+                <signal pad-key="pf5" index="5" function="PORTF" group="P"/>
+                <signal pad-key="pf6" index="6" function="PORTF" group="P"/>
+                <signal pad-key="pf7" index="7" function="PORTF" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portg" name="PORTG" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pg2" index="2" function="PORTG" group="P"/>
-                <signal pad-id="pg3" index="3" function="PORTG" group="P"/>
-                <signal pad-id="pg4" index="4" function="PORTG" group="P"/>
-                <signal pad-id="pg5" index="5" function="PORTG" group="P"/>
+                <signal pad-key="pg0" index="0" function="PORTG" group="P"/>
+                <signal pad-key="pg1" index="1" function="PORTG" group="P"/>
+                <signal pad-key="pg2" index="2" function="PORTG" group="P"/>
+                <signal pad-key="pg3" index="3" function="PORTG" group="P"/>
+                <signal pad-key="pg4" index="4" function="PORTG" group="P"/>
+                <signal pad-key="pg5" index="5" function="PORTG" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="tc0" name="TC0" module-key="tc8">
@@ -1549,78 +1548,134 @@
             </register-group>
         </module>
     </modules>
+    <pads>
+        <pad key="pf2" name="PF2"/>
+        <pad key="pf3" name="PF3"/>
+        <pad key="pf4" name="PF4"/>
+        <pad key="pf5" name="PF5"/>
+        <pad key="pf6" name="PF6"/>
+        <pad key="pf7" name="PF7"/>
+        <pad key="avss_rfp" name="AVSS_RFP"/>
+        <pad key="rfp" name="RFP"/>
+        <pad key="rfn" name="RFN"/>
+        <pad key="avss_rfn" name="AVSS_RFN"/>
+        <pad key="tst" name="TST"/>
+        <pad key="rstn" name="RSTN"/>
+        <pad key="rston" name="RSTON"/>
+        <pad key="pg0" name="PG0"/>
+        <pad key="pg1" name="PG1"/>
+        <pad key="pg2" name="PG2"/>
+        <pad key="pg3" name="PG3"/>
+        <pad key="pg4" name="PG4"/>
+        <pad key="pg5" name="PG5"/>
+        <pad key="dvss" name="DVSS"/>
+        <pad key="dvdd" name="DVDD"/>
+        <pad key="devdd" name="DEVDD"/>
+        <pad key="pd0" name="PD0"/>
+        <pad key="pd1" name="PD1"/>
+        <pad key="pd2" name="PD2"/>
+        <pad key="pd3" name="PD3"/>
+        <pad key="pd4" name="PD4"/>
+        <pad key="pd5" name="PD5"/>
+        <pad key="pd6" name="PD6"/>
+        <pad key="pd7" name="PD7"/>
+        <pad key="clki" name="CLKI"/>
+        <pad key="pb0" name="PB0"/>
+        <pad key="pb1" name="PB1"/>
+        <pad key="pb2" name="PB2"/>
+        <pad key="pb3" name="PB3"/>
+        <pad key="pb4" name="PB4"/>
+        <pad key="pb5" name="PB5"/>
+        <pad key="pb6" name="PB6"/>
+        <pad key="pe7" name="PE7"/>
+        <pad key="pe0" name="PE0"/>
+        <pad key="pe1" name="PE1"/>
+        <pad key="pe2" name="PE2"/>
+        <pad key="pe3" name="PE3"/>
+        <pad key="pe4" name="PE4"/>
+        <pad key="pe5" name="PE5"/>
+        <pad key="pe6" name="PE6"/>
+        <pad key="xtal2" name="XTAL2"/>
+        <pad key="xtal1" name="XTAL1"/>
+        <pad key="avss" name="AVSS"/>
+        <pad key="evdd" name="EVDD"/>
+        <pad key="avdd" name="AVDD"/>
+        <pad key="aref" name="AREF"/>
+        <pad key="pf0" name="PF0"/>
+        <pad key="pf1" name="PF1"/>
+    </pads>
     <pinouts>
         <pinout key="qfn64" name="QFN64" type="qfn">
-            <pin position="1" pad="PF2"/>
-            <pin position="2" pad="PF3"/>
-            <pin position="3" pad="PF4"/>
-            <pin position="4" pad="PF5"/>
-            <pin position="5" pad="PF6"/>
-            <pin position="6" pad="PF7"/>
-            <pin position="7" pad="AVSS_RFP"/>
-            <pin position="8" pad="RFP"/>
-            <pin position="9" pad="RFN"/>
-            <pin position="10" pad="AVSS_RFN"/>
-            <pin position="11" pad="TST"/>
-            <pin position="12" pad="RSTN"/>
-            <pin position="13" pad="RSTON"/>
-            <pin position="14" pad="PG0"/>
-            <pin position="15" pad="PG1"/>
-            <pin position="16" pad="PG2"/>
-            <pin position="17" pad="PG3"/>
-            <pin position="18" pad="PG4"/>
-            <pin position="19" pad="PG5"/>
-            <pin position="20" pad="DVSS"/>
-            <pin position="21" pad="DVDD"/>
-            <pin position="22" pad="DVDD"/>
-            <pin position="23" pad="DEVDD"/>
-            <pin position="24" pad="DVSS"/>
-            <pin position="25" pad="PD0"/>
-            <pin position="26" pad="PD1"/>
-            <pin position="27" pad="PD2"/>
-            <pin position="28" pad="PD3"/>
-            <pin position="29" pad="PD4"/>
-            <pin position="30" pad="PD5"/>
-            <pin position="31" pad="PD6"/>
-            <pin position="32" pad="PD7"/>
-            <pin position="33" pad="CLKI"/>
-            <pin position="34" pad="DEVDD"/>
-            <pin position="35" pad="DVSS"/>
-            <pin position="36" pad="PB0"/>
-            <pin position="37" pad="PB1"/>
-            <pin position="38" pad="PB2"/>
-            <pin position="39" pad="PB3"/>
-            <pin position="40" pad="PB4"/>
-            <pin position="41" pad="PB5"/>
-            <pin position="42" pad="PB6"/>
-            <pin position="43" pad="PE7"/>
-            <pin position="44" pad="DEVDD"/>
-            <pin position="45" pad="DVSS"/>
-            <pin position="46" pad="PE0"/>
-            <pin position="47" pad="PE1"/>
-            <pin position="48" pad="PE2"/>
-            <pin position="49" pad="PE3"/>
-            <pin position="50" pad="PE4"/>
-            <pin position="51" pad="PE5"/>
-            <pin position="52" pad="PE6"/>
-            <pin position="53" pad="PE7"/>
-            <pin position="54" pad="DEVDD"/>
-            <pin position="55" pad="DVSS"/>
-            <pin position="56" pad="XTAL2"/>
-            <pin position="57" pad="XTAL1"/>
-            <pin position="58" pad="AVSS"/>
-            <pin position="59" pad="EVDD"/>
-            <pin position="60" pad="AVDD"/>
-            <pin position="61" pad="AVSS"/>
-            <pin position="62" pad="AREF"/>
-            <pin position="63" pad="PF0"/>
-            <pin position="64" pad="PF1"/>
+            <pin position="1" pad-key="pf2"/>
+            <pin position="2" pad-key="pf3"/>
+            <pin position="3" pad-key="pf4"/>
+            <pin position="4" pad-key="pf5"/>
+            <pin position="5" pad-key="pf6"/>
+            <pin position="6" pad-key="pf7"/>
+            <pin position="7" pad-key="avss_rfp"/>
+            <pin position="8" pad-key="rfp"/>
+            <pin position="9" pad-key="rfn"/>
+            <pin position="10" pad-key="avss_rfn"/>
+            <pin position="11" pad-key="tst"/>
+            <pin position="12" pad-key="rstn"/>
+            <pin position="13" pad-key="rston"/>
+            <pin position="14" pad-key="pg0"/>
+            <pin position="15" pad-key="pg1"/>
+            <pin position="16" pad-key="pg2"/>
+            <pin position="17" pad-key="pg3"/>
+            <pin position="18" pad-key="pg4"/>
+            <pin position="19" pad-key="pg5"/>
+            <pin position="20" pad-key="dvss"/>
+            <pin position="21" pad-key="dvdd"/>
+            <pin position="22" pad-key="dvdd"/>
+            <pin position="23" pad-key="devdd"/>
+            <pin position="24" pad-key="dvss"/>
+            <pin position="25" pad-key="pd0"/>
+            <pin position="26" pad-key="pd1"/>
+            <pin position="27" pad-key="pd2"/>
+            <pin position="28" pad-key="pd3"/>
+            <pin position="29" pad-key="pd4"/>
+            <pin position="30" pad-key="pd5"/>
+            <pin position="31" pad-key="pd6"/>
+            <pin position="32" pad-key="pd7"/>
+            <pin position="33" pad-key="clki"/>
+            <pin position="34" pad-key="devdd"/>
+            <pin position="35" pad-key="dvss"/>
+            <pin position="36" pad-key="pb0"/>
+            <pin position="37" pad-key="pb1"/>
+            <pin position="38" pad-key="pb2"/>
+            <pin position="39" pad-key="pb3"/>
+            <pin position="40" pad-key="pb4"/>
+            <pin position="41" pad-key="pb5"/>
+            <pin position="42" pad-key="pb6"/>
+            <pin position="43" pad-key="pe7"/>
+            <pin position="44" pad-key="devdd"/>
+            <pin position="45" pad-key="dvss"/>
+            <pin position="46" pad-key="pe0"/>
+            <pin position="47" pad-key="pe1"/>
+            <pin position="48" pad-key="pe2"/>
+            <pin position="49" pad-key="pe3"/>
+            <pin position="50" pad-key="pe4"/>
+            <pin position="51" pad-key="pe5"/>
+            <pin position="52" pad-key="pe6"/>
+            <pin position="53" pad-key="pe7"/>
+            <pin position="54" pad-key="devdd"/>
+            <pin position="55" pad-key="dvss"/>
+            <pin position="56" pad-key="xtal2"/>
+            <pin position="57" pad-key="xtal1"/>
+            <pin position="58" pad-key="avss"/>
+            <pin position="59" pad-key="evdd"/>
+            <pin position="60" pad-key="avdd"/>
+            <pin position="61" pad-key="avss"/>
+            <pin position="62" pad-key="aref"/>
+            <pin position="63" pad-key="pf0"/>
+            <pin position="64" pad-key="pf1"/>
         </pinout>
     </pinouts>
     <variants>
-        <variant name="ATmega256RFR2-ZU" pinout-key="qfn64" package="QFN64"/>
-        <variant name="ATmega256RFR2-ZUR" pinout-key="qfn64" package="QFN64"/>
-        <variant name="ATmega256RFR2-ZF" pinout-key="qfn64" package="QFN64"/>
-        <variant name="ATmega256RFR2-ZFR" pinout-key="qfn64" package="QFN64"/>
+        <variant key="atmega256rfr2_zu" name="ATmega256RFR2-ZU" pinout-key="qfn64"/>
+        <variant key="atmega256rfr2_zur" name="ATmega256RFR2-ZUR" pinout-key="qfn64"/>
+        <variant key="atmega256rfr2_zf" name="ATmega256RFR2-ZF" pinout-key="qfn64"/>
+        <variant key="atmega256rfr2_zfr" name="ATmega256RFR2-ZFR" pinout-key="qfn64"/>
     </variants>
 </device>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA32.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA32.xml
index 9d586052..d8d08bb9 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA32.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA32.xml
@@ -226,122 +226,122 @@
         <peripheral key="exint" name="EXINT" module-key="exint">
             <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"/>
-                <signal pad-id="pd2" index="0" function="default" group="INT"/>
+                <signal pad-key="pb2" index="2" function="default" group="INT"/>
+                <signal pad-key="pd3" index="1" function="default" group="INT"/>
+                <signal pad-key="pd2" index="0" function="default" group="INT"/>
             </signals>
         </peripheral>
         <peripheral key="tc0" name="TC0" module-key="tc8">
             <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"/>
+                <signal pad-key="pb3" function="default" group="OC"/>
+                <signal pad-key="pb0" function="default" group="T"/>
             </signals>
         </peripheral>
         <peripheral key="tc2" name="TC2" module-key="tc8_async">
             <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"/>
-                <signal pad-id="pd7" function="default" group="OC"/>
+                <signal pad-key="pc7" index="2" function="default" group="TOSC"/>
+                <signal pad-key="pc6" index="1" function="default" group="TOSC"/>
+                <signal pad-key="pd7" function="default" group="OC"/>
             </signals>
         </peripheral>
         <peripheral key="tc1" name="TC1" module-key="tc16">
             <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"/>
-                <signal pad-id="pd5" function="default" group="OCA"/>
-                <signal pad-id="pd4" function="default" group="OCB"/>
+                <signal pad-key="pb1" function="default" group="T"/>
+                <signal pad-key="pd6" function="default" group="ICP"/>
+                <signal pad-key="pd5" function="default" group="OCA"/>
+                <signal pad-key="pd4" function="default" group="OCB"/>
             </signals>
         </peripheral>
         <peripheral key="spi" name="SPI" module-key="spi">
             <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"/>
-                <signal pad-id="pb5" function="default" group="MOSI"/>
-                <signal pad-id="pb4" function="default" group="SS"/>
+                <signal pad-key="pb7" function="default" group="SCK"/>
+                <signal pad-key="pb6" function="default" group="MISO"/>
+                <signal pad-key="pb5" function="default" group="MOSI"/>
+                <signal pad-key="pb4" function="default" group="SS"/>
             </signals>
         </peripheral>
         <peripheral key="usart" name="USART" module-key="usart">
             <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"/>
-                <signal pad-id="pd0" function="default" group="RXD"/>
+                <signal pad-key="pb0" function="default" group="XCK"/>
+                <signal pad-key="pd1" function="default" group="TXD"/>
+                <signal pad-key="pd0" function="default" group="RXD"/>
             </signals>
         </peripheral>
         <peripheral key="ac" name="AC" module-key="ac">
             <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"/>
+                <signal pad-key="pb3" index="1" function="default" group="AIN"/>
+                <signal pad-key="pb2" index="0" function="default" group="AIN"/>
             </signals>
         </peripheral>
         <peripheral key="adc" name="ADC" module-key="adc">
             <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"/>
-                <signal pad-id="pa5" index="5" function="default" group="ADC"/>
-                <signal pad-id="pa4" index="4" function="default" group="ADC"/>
-                <signal pad-id="pa3" index="3" function="default" group="ADC"/>
-                <signal pad-id="pa2" index="2" function="default" group="ADC"/>
-                <signal pad-id="pa1" index="1" function="default" group="ADC"/>
-                <signal pad-id="pa0" index="0" function="default" group="ADC"/>
+                <signal pad-key="pa7" index="7" function="default" group="ADC"/>
+                <signal pad-key="pa6" index="6" function="default" group="ADC"/>
+                <signal pad-key="pa5" index="5" function="default" group="ADC"/>
+                <signal pad-key="pa4" index="4" function="default" group="ADC"/>
+                <signal pad-key="pa3" index="3" function="default" group="ADC"/>
+                <signal pad-key="pa2" index="2" function="default" group="ADC"/>
+                <signal pad-key="pa1" index="1" function="default" group="ADC"/>
+                <signal pad-key="pa0" index="0" function="default" group="ADC"/>
             </signals>
         </peripheral>
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pa2" index="2" function="default" group="P"/>
-                <signal pad-id="pa3" index="3" function="default" group="P"/>
-                <signal pad-id="pa4" index="4" function="default" group="P"/>
-                <signal pad-id="pa5" index="5" function="default" group="P"/>
-                <signal pad-id="pa6" index="6" function="default" group="P"/>
-                <signal pad-id="pa7" index="7" function="default" group="P"/>
+                <signal pad-key="pa0" index="0" function="default" group="P"/>
+                <signal pad-key="pa1" index="1" function="default" group="P"/>
+                <signal pad-key="pa2" index="2" function="default" group="P"/>
+                <signal pad-key="pa3" index="3" function="default" group="P"/>
+                <signal pad-key="pa4" index="4" function="default" group="P"/>
+                <signal pad-key="pa5" index="5" function="default" group="P"/>
+                <signal pad-key="pa6" index="6" function="default" group="P"/>
+                <signal pad-key="pa7" index="7" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pb2" index="2" function="default" group="P"/>
-                <signal pad-id="pb3" index="3" function="default" group="P"/>
-                <signal pad-id="pb4" index="4" function="default" group="P"/>
-                <signal pad-id="pb5" index="5" function="default" group="P"/>
-                <signal pad-id="pb6" index="6" function="default" group="P"/>
-                <signal pad-id="pb7" index="7" function="default" group="P"/>
+                <signal pad-key="pb0" index="0" function="default" group="P"/>
+                <signal pad-key="pb1" index="1" function="default" group="P"/>
+                <signal pad-key="pb2" index="2" function="default" group="P"/>
+                <signal pad-key="pb3" index="3" function="default" group="P"/>
+                <signal pad-key="pb4" index="4" function="default" group="P"/>
+                <signal pad-key="pb5" index="5" function="default" group="P"/>
+                <signal pad-key="pb6" index="6" function="default" group="P"/>
+                <signal pad-key="pb7" index="7" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pc2" index="2" function="default" group="P"/>
-                <signal pad-id="pc3" index="3" function="default" group="P"/>
-                <signal pad-id="pc4" index="4" function="default" group="P"/>
-                <signal pad-id="pc5" index="5" function="default" group="P"/>
-                <signal pad-id="pc6" index="6" function="default" group="P"/>
-                <signal pad-id="pc7" index="7" function="default" group="P"/>
+                <signal pad-key="pc0" index="0" function="default" group="P"/>
+                <signal pad-key="pc1" index="1" function="default" group="P"/>
+                <signal pad-key="pc2" index="2" function="default" group="P"/>
+                <signal pad-key="pc3" index="3" function="default" group="P"/>
+                <signal pad-key="pc4" index="4" function="default" group="P"/>
+                <signal pad-key="pc5" index="5" function="default" group="P"/>
+                <signal pad-key="pc6" index="6" function="default" group="P"/>
+                <signal pad-key="pc7" index="7" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pd2" index="2" function="default" group="P"/>
-                <signal pad-id="pd3" index="3" function="default" group="P"/>
-                <signal pad-id="pd4" index="4" function="default" group="P"/>
-                <signal pad-id="pd5" index="5" function="default" group="P"/>
-                <signal pad-id="pd6" index="6" function="default" group="P"/>
-                <signal pad-id="pd7" index="7" function="default" group="P"/>
+                <signal pad-key="pd0" index="0" function="default" group="P"/>
+                <signal pad-key="pd1" index="1" function="default" group="P"/>
+                <signal pad-key="pd2" index="2" function="default" group="P"/>
+                <signal pad-key="pd3" index="3" function="default" group="P"/>
+                <signal pad-key="pd4" index="4" function="default" group="P"/>
+                <signal pad-key="pd5" index="5" function="default" group="P"/>
+                <signal pad-key="pd6" index="6" function="default" group="P"/>
+                <signal pad-key="pd7" index="7" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="cpu">
@@ -353,8 +353,8 @@
         <peripheral key="twi" name="TWI" module-key="twi">
             <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"/>
+                <signal pad-key="pc1" function="default" group="SDA"/>
+                <signal pad-key="pc0" function="default" group="SCL"/>
             </signals>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="fuse">
@@ -366,10 +366,10 @@
         <peripheral key="jtag" name="JTAG" module-key="jtag">
             <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"/>
-                <signal pad-id="pc3" function="default" group="TMS"/>
-                <signal pad-id="pc2" function="default" group="TCK"/>
+                <signal pad-key="pc5" function="default" group="TDI"/>
+                <signal pad-key="pc4" function="default" group="TDO"/>
+                <signal pad-key="pc3" function="default" group="TMS"/>
+                <signal pad-key="pc2" function="default" group="TCK"/>
             </signals>
         </peripheral>
     </peripherals>
@@ -723,102 +723,143 @@
             </register-group>
         </module>
     </modules>
+    <pads>
+        <pad key="pb5" name="PB5"/>
+        <pad key="pb6" name="PB6"/>
+        <pad key="pb7" name="PB7"/>
+        <pad key="reset" name="RESET"/>
+        <pad key="vcc" name="VCC"/>
+        <pad key="gnd" name="GND"/>
+        <pad key="xtal2" name="XTAL2"/>
+        <pad key="xtal1" name="XTAL1"/>
+        <pad key="pd0" name="PD0"/>
+        <pad key="pd1" name="PD1"/>
+        <pad key="pd2" name="PD2"/>
+        <pad key="pd3" name="PD3"/>
+        <pad key="pd4" name="PD4"/>
+        <pad key="pd5" name="PD5"/>
+        <pad key="pd6" name="PD6"/>
+        <pad key="pd7" name="PD7"/>
+        <pad key="pc0" name="PC0"/>
+        <pad key="pc1" name="PC1"/>
+        <pad key="pc2" name="PC2"/>
+        <pad key="pc3" name="PC3"/>
+        <pad key="pc4" name="PC4"/>
+        <pad key="pc5" name="PC5"/>
+        <pad key="pc6" name="PC6"/>
+        <pad key="pc7" name="PC7"/>
+        <pad key="avcc" name="AVCC"/>
+        <pad key="aref" name="AREF"/>
+        <pad key="pa7" name="PA7"/>
+        <pad key="pa6" name="PA6"/>
+        <pad key="pa5" name="PA5"/>
+        <pad key="pa4" name="PA4"/>
+        <pad key="pa3" name="PA3"/>
+        <pad key="pa2" name="PA2"/>
+        <pad key="pa1" name="PA1"/>
+        <pad key="pa0" name="PA0"/>
+        <pad key="pb0" name="PB0"/>
+        <pad key="pb1" name="PB1"/>
+        <pad key="pb2" name="PB2"/>
+        <pad key="pb3" name="PB3"/>
+        <pad key="pb4" name="PB4"/>
+    </pads>
     <pinouts>
         <pinout key="tqfpqfn44" name="TQFPQFN44" type="qfn">
-            <pin position="1" pad="PB5"/>
-            <pin position="2" pad="PB6"/>
-            <pin position="3" pad="PB7"/>
-            <pin position="4" pad="RESET"/>
-            <pin position="5" pad="VCC"/>
-            <pin position="6" pad="GND"/>
-            <pin position="7" pad="XTAL2"/>
-            <pin position="8" pad="XTAL1"/>
-            <pin position="9" pad="PD0"/>
-            <pin position="10" pad="PD1"/>
-            <pin position="11" pad="PD2"/>
-            <pin position="12" pad="PD3"/>
-            <pin position="13" pad="PD4"/>
-            <pin position="14" pad="PD5"/>
-            <pin position="15" pad="PD6"/>
-            <pin position="16" pad="PD7"/>
-            <pin position="17" pad="VCC"/>
-            <pin position="18" pad="GND"/>
-            <pin position="19" pad="PC0"/>
-            <pin position="20" pad="PC1"/>
-            <pin position="21" pad="PC2"/>
-            <pin position="22" pad="PC3"/>
-            <pin position="23" pad="PC4"/>
-            <pin position="24" pad="PC5"/>
-            <pin position="25" pad="PC6"/>
-            <pin position="26" pad="PC7"/>
-            <pin position="27" pad="AVCC"/>
-            <pin position="28" pad="GND"/>
-            <pin position="29" pad="AREF"/>
-            <pin position="30" pad="PA7"/>
-            <pin position="31" pad="PA6"/>
-            <pin position="32" pad="PA5"/>
-            <pin position="33" pad="PA4"/>
-            <pin position="34" pad="PA3"/>
-            <pin position="35" pad="PA2"/>
-            <pin position="36" pad="PA1"/>
-            <pin position="37" pad="PA0"/>
-            <pin position="38" pad="VCC"/>
-            <pin position="39" pad="GND"/>
-            <pin position="40" pad="PB0"/>
-            <pin position="41" pad="PB1"/>
-            <pin position="42" pad="PB2"/>
-            <pin position="43" pad="PB3"/>
-            <pin position="44" pad="PB4"/>
+            <pin position="1" pad-key="pb5"/>
+            <pin position="2" pad-key="pb6"/>
+            <pin position="3" pad-key="pb7"/>
+            <pin position="4" pad-key="reset"/>
+            <pin position="5" pad-key="vcc"/>
+            <pin position="6" pad-key="gnd"/>
+            <pin position="7" pad-key="xtal2"/>
+            <pin position="8" pad-key="xtal1"/>
+            <pin position="9" pad-key="pd0"/>
+            <pin position="10" pad-key="pd1"/>
+            <pin position="11" pad-key="pd2"/>
+            <pin position="12" pad-key="pd3"/>
+            <pin position="13" pad-key="pd4"/>
+            <pin position="14" pad-key="pd5"/>
+            <pin position="15" pad-key="pd6"/>
+            <pin position="16" pad-key="pd7"/>
+            <pin position="17" pad-key="vcc"/>
+            <pin position="18" pad-key="gnd"/>
+            <pin position="19" pad-key="pc0"/>
+            <pin position="20" pad-key="pc1"/>
+            <pin position="21" pad-key="pc2"/>
+            <pin position="22" pad-key="pc3"/>
+            <pin position="23" pad-key="pc4"/>
+            <pin position="24" pad-key="pc5"/>
+            <pin position="25" pad-key="pc6"/>
+            <pin position="26" pad-key="pc7"/>
+            <pin position="27" pad-key="avcc"/>
+            <pin position="28" pad-key="gnd"/>
+            <pin position="29" pad-key="aref"/>
+            <pin position="30" pad-key="pa7"/>
+            <pin position="31" pad-key="pa6"/>
+            <pin position="32" pad-key="pa5"/>
+            <pin position="33" pad-key="pa4"/>
+            <pin position="34" pad-key="pa3"/>
+            <pin position="35" pad-key="pa2"/>
+            <pin position="36" pad-key="pa1"/>
+            <pin position="37" pad-key="pa0"/>
+            <pin position="38" pad-key="vcc"/>
+            <pin position="39" pad-key="gnd"/>
+            <pin position="40" pad-key="pb0"/>
+            <pin position="41" pad-key="pb1"/>
+            <pin position="42" pad-key="pb2"/>
+            <pin position="43" pad-key="pb3"/>
+            <pin position="44" pad-key="pb4"/>
         </pinout>
         <pinout key="pdip40" name="PDIP40" type="dip">
-            <pin position="1" pad="PB0"/>
-            <pin position="2" pad="PB1"/>
-            <pin position="3" pad="PB2"/>
-            <pin position="4" pad="PB3"/>
-            <pin position="5" pad="PB4"/>
-            <pin position="6" pad="PB5"/>
-            <pin position="7" pad="PB6"/>
-            <pin position="8" pad="PB7"/>
-            <pin position="9" pad="RESET"/>
-            <pin position="10" pad="VCC"/>
-            <pin position="11" pad="GND"/>
-            <pin position="12" pad="XTAL2"/>
-            <pin position="13" pad="XTAL1"/>
-            <pin position="14" pad="PD0"/>
-            <pin position="15" pad="PD1"/>
-            <pin position="16" pad="PD2"/>
-            <pin position="17" pad="PD3"/>
-            <pin position="18" pad="PD4"/>
-            <pin position="19" pad="PD5"/>
-            <pin position="20" pad="PD6"/>
-            <pin position="21" pad="PD7"/>
-            <pin position="22" pad="PC0"/>
-            <pin position="23" pad="PC1"/>
-            <pin position="24" pad="PC2"/>
-            <pin position="25" pad="PC3"/>
-            <pin position="26" pad="PC4"/>
-            <pin position="27" pad="PC5"/>
-            <pin position="28" pad="PC6"/>
-            <pin position="29" pad="PC7"/>
-            <pin position="30" pad="AVCC"/>
-            <pin position="31" pad="GND"/>
-            <pin position="32" pad="AREF"/>
-            <pin position="33" pad="PA7"/>
-            <pin position="34" pad="PA6"/>
-            <pin position="35" pad="PA5"/>
-            <pin position="36" pad="PA4"/>
-            <pin position="37" pad="PA3"/>
-            <pin position="38" pad="PA2"/>
-            <pin position="39" pad="PA1"/>
-            <pin position="40" pad="PA0"/>
+            <pin position="1" pad-key="pb0"/>
+            <pin position="2" pad-key="pb1"/>
+            <pin position="3" pad-key="pb2"/>
+            <pin position="4" pad-key="pb3"/>
+            <pin position="5" pad-key="pb4"/>
+            <pin position="6" pad-key="pb5"/>
+            <pin position="7" pad-key="pb6"/>
+            <pin position="8" pad-key="pb7"/>
+            <pin position="9" pad-key="reset"/>
+            <pin position="10" pad-key="vcc"/>
+            <pin position="11" pad-key="gnd"/>
+            <pin position="12" pad-key="xtal2"/>
+            <pin position="13" pad-key="xtal1"/>
+            <pin position="14" pad-key="pd0"/>
+            <pin position="15" pad-key="pd1"/>
+            <pin position="16" pad-key="pd2"/>
+            <pin position="17" pad-key="pd3"/>
+            <pin position="18" pad-key="pd4"/>
+            <pin position="19" pad-key="pd5"/>
+            <pin position="20" pad-key="pd6"/>
+            <pin position="21" pad-key="pd7"/>
+            <pin position="22" pad-key="pc0"/>
+            <pin position="23" pad-key="pc1"/>
+            <pin position="24" pad-key="pc2"/>
+            <pin position="25" pad-key="pc3"/>
+            <pin position="26" pad-key="pc4"/>
+            <pin position="27" pad-key="pc5"/>
+            <pin position="28" pad-key="pc6"/>
+            <pin position="29" pad-key="pc7"/>
+            <pin position="30" pad-key="avcc"/>
+            <pin position="31" pad-key="gnd"/>
+            <pin position="32" pad-key="aref"/>
+            <pin position="33" pad-key="pa7"/>
+            <pin position="34" pad-key="pa6"/>
+            <pin position="35" pad-key="pa5"/>
+            <pin position="36" pad-key="pa4"/>
+            <pin position="37" pad-key="pa3"/>
+            <pin position="38" pad-key="pa2"/>
+            <pin position="39" pad-key="pa1"/>
+            <pin position="40" pad-key="pa0"/>
         </pinout>
     </pinouts>
     <variants>
-        <variant name="ATmega32L-8AU" pinout-key="tqfpqfn44" package="TQFP44"/>
-        <variant name="ATmega32L-8PU" pinout-key="pdip40" package="PDIP40"/>
-        <variant name="ATmega32L-8MU" pinout-key="tqfpqfn44" package="QFN44"/>
-        <variant name="ATmega32-16AU" pinout-key="tqfpqfn44" package="TQFP44"/>
-        <variant name="ATmega32-16PU" pinout-key="pdip40" package="PDIP40"/>
-        <variant name="ATmega32-16MU" pinout-key="tqfpqfn44" package="QFN44"/>
+        <variant key="atmega32l_8au" name="ATmega32L-8AU" pinout-key="tqfpqfn44"/>
+        <variant key="atmega32l_8pu" name="ATmega32L-8PU" pinout-key="pdip40"/>
+        <variant key="atmega32l_8mu" name="ATmega32L-8MU" pinout-key="tqfpqfn44"/>
+        <variant key="atmega32_16au" name="ATmega32-16AU" pinout-key="tqfpqfn44"/>
+        <variant key="atmega32_16pu" name="ATmega32-16PU" pinout-key="pdip40"/>
+        <variant key="atmega32_16mu" name="ATmega32-16MU" pinout-key="tqfpqfn44"/>
     </variants>
 </device>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA3208.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA3208.xml
index bdc215b5..34e1e1a3 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA3208.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA3208.xml
@@ -44,31 +44,31 @@
         <peripheral key="ac0" name="AC0" module-key="i2106">
             <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"/>
-                <signal pad-id="pd7" index="2" function="AC0" group="N"/>
-                <signal pad-id="pa7" index="0" function="AC0" group="OUT"/>
-                <signal pad-id="pd2" index="0" function="AC0" group="P"/>
-                <signal pad-id="pd4" index="1" function="AC0" group="P"/>
-                <signal pad-id="pd6" index="2" function="AC0" group="P"/>
-                <signal pad-id="pd1" index="3" function="AC0" group="P"/>
+                <signal pad-key="pd3" index="0" function="AC0" group="N"/>
+                <signal pad-key="pd5" index="1" function="AC0" group="N"/>
+                <signal pad-key="pd7" index="2" function="AC0" group="N"/>
+                <signal pad-key="pa7" index="0" function="AC0" group="OUT"/>
+                <signal pad-key="pd2" index="0" function="AC0" group="P"/>
+                <signal pad-key="pd4" index="1" function="AC0" group="P"/>
+                <signal pad-key="pd6" index="2" function="AC0" group="P"/>
+                <signal pad-key="pd1" index="3" function="AC0" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="adc0" name="ADC0" module-key="i2132">
             <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"/>
-                <signal pad-id="pd2" index="2" function="AIN0" group="AIN"/>
-                <signal pad-id="pd3" index="3" function="AIN0" group="AIN"/>
-                <signal pad-id="pd4" index="4" function="AIN0" group="AIN"/>
-                <signal pad-id="pd5" index="5" function="AIN0" group="AIN"/>
-                <signal pad-id="pd6" index="6" function="AIN0" group="AIN"/>
-                <signal pad-id="pd7" index="7" function="AIN0" group="AIN"/>
-                <signal pad-id="pf2" index="12" function="AIN0" group="AIN"/>
-                <signal pad-id="pf3" index="13" function="AIN0" group="AIN"/>
-                <signal pad-id="pf4" index="14" function="AIN0" group="AIN"/>
-                <signal pad-id="pf5" index="15" function="AIN0" group="AIN"/>
+                <signal pad-key="pd0" index="0" function="AIN0" group="AIN"/>
+                <signal pad-key="pd1" index="1" function="AIN0" group="AIN"/>
+                <signal pad-key="pd2" index="2" function="AIN0" group="AIN"/>
+                <signal pad-key="pd3" index="3" function="AIN0" group="AIN"/>
+                <signal pad-key="pd4" index="4" function="AIN0" group="AIN"/>
+                <signal pad-key="pd5" index="5" function="AIN0" group="AIN"/>
+                <signal pad-key="pd6" index="6" function="AIN0" group="AIN"/>
+                <signal pad-key="pd7" index="7" function="AIN0" group="AIN"/>
+                <signal pad-key="pf2" index="12" function="AIN0" group="AIN"/>
+                <signal pad-key="pf3" index="13" function="AIN0" group="AIN"/>
+                <signal pad-key="pf4" index="14" function="AIN0" group="AIN"/>
+                <signal pad-key="pf5" index="15" function="AIN0" group="AIN"/>
             </signals>
         </peripheral>
         <peripheral key="bod" name="BOD" module-key="i2114">
@@ -77,34 +77,34 @@
         <peripheral key="ccl" name="CCL" module-key="i2128">
             <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"/>
-                <signal pad-id="pa2" index="2" function="CCL" group="LUT0_IN"/>
-                <signal pad-id="pa6" index="0" function="CCL_ALT" group="LUT0_OUT" field="PORTMUX.CCLROUTEA.LUT0"/>
-                <signal pad-id="pa3" index="0" function="CCL" group="LUT0_OUT" field="PORTMUX.CCLROUTEA.LUT0"/>
-                <signal pad-id="pc0" index="0" function="CCL" group="LUT1_IN"/>
-                <signal pad-id="pc1" index="1" function="CCL" group="LUT1_IN"/>
-                <signal pad-id="pc2" index="2" function="CCL" group="LUT1_IN"/>
-                <signal pad-id="pc3" index="0" function="CCL" group="LUT1_OUT" field="PORTMUX.CCLROUTEA.LUT1"/>
-                <signal pad-id="pd0" index="0" function="CCL" group="LUT2_IN"/>
-                <signal pad-id="pd1" index="1" function="CCL" group="LUT2_IN"/>
-                <signal pad-id="pd2" index="2" function="CCL" group="LUT2_IN"/>
-                <signal pad-id="pd3" index="0" function="CCL" group="LUT2_OUT" field="PORTMUX.CCLROUTEA.LUT2"/>
-                <signal pad-id="pd6" index="1" function="CCL_ALT" group="LUT2_OUT" field="PORTMUX.CCLROUTEA.LUT2"/>
-                <signal pad-id="pf0" index="0" function="CCL" group="LUT3_IN"/>
-                <signal pad-id="pf1" index="1" function="CCL" group="LUT3_IN"/>
-                <signal pad-id="pf2" index="2" function="CCL" group="LUT3_IN"/>
-                <signal pad-id="pf6" index="1" function="CCL_ALT" group="LUT3_OUT" field="PORTMUX.CCLROUTEA.LUT3"/>
-                <signal pad-id="pf3" index="1" function="CCL" group="LUT3_OUT" field="PORTMUX.CCLROUTEA.LUT3"/>
+                <signal pad-key="pa0" index="0" function="CCL" group="LUT0_IN"/>
+                <signal pad-key="pa1" index="1" function="CCL" group="LUT0_IN"/>
+                <signal pad-key="pa2" index="2" function="CCL" group="LUT0_IN"/>
+                <signal pad-key="pa6" index="0" function="CCL_ALT" group="LUT0_OUT" field="PORTMUX.CCLROUTEA.LUT0"/>
+                <signal pad-key="pa3" index="0" function="CCL" group="LUT0_OUT" field="PORTMUX.CCLROUTEA.LUT0"/>
+                <signal pad-key="pc0" index="0" function="CCL" group="LUT1_IN"/>
+                <signal pad-key="pc1" index="1" function="CCL" group="LUT1_IN"/>
+                <signal pad-key="pc2" index="2" function="CCL" group="LUT1_IN"/>
+                <signal pad-key="pc3" index="0" function="CCL" group="LUT1_OUT" field="PORTMUX.CCLROUTEA.LUT1"/>
+                <signal pad-key="pd0" index="0" function="CCL" group="LUT2_IN"/>
+                <signal pad-key="pd1" index="1" function="CCL" group="LUT2_IN"/>
+                <signal pad-key="pd2" index="2" function="CCL" group="LUT2_IN"/>
+                <signal pad-key="pd3" index="0" function="CCL" group="LUT2_OUT" field="PORTMUX.CCLROUTEA.LUT2"/>
+                <signal pad-key="pd6" index="1" function="CCL_ALT" group="LUT2_OUT" field="PORTMUX.CCLROUTEA.LUT2"/>
+                <signal pad-key="pf0" index="0" function="CCL" group="LUT3_IN"/>
+                <signal pad-key="pf1" index="1" function="CCL" group="LUT3_IN"/>
+                <signal pad-key="pf2" index="2" function="CCL" group="LUT3_IN"/>
+                <signal pad-key="pf6" index="1" function="CCL_ALT" group="LUT3_OUT" field="PORTMUX.CCLROUTEA.LUT3"/>
+                <signal pad-key="pf3" index="1" function="CCL" group="LUT3_OUT" field="PORTMUX.CCLROUTEA.LUT3"/>
             </signals>
         </peripheral>
         <peripheral key="clkctrl" name="CLKCTRL" module-key="i2600_clkctrl">
             <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"/>
-                <signal pad-id="pf0" function="CLKCTRL" group="TOSC1"/>
-                <signal pad-id="pf1" function="CLKCTRL" group="TOSC2"/>
+                <signal pad-key="pa0" function="CLKCTRL" group="CLKI"/>
+                <signal pad-key="pa7" function="CLKCTRL" group="CLKO"/>
+                <signal pad-key="pf0" function="CLKCTRL" group="TOSC1"/>
+                <signal pad-key="pf1" function="CLKCTRL" group="TOSC2"/>
             </signals>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="i2100">
@@ -119,12 +119,12 @@
         <peripheral key="evsys" name="EVSYS" module-key="i2600_evsys">
             <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"/>
-                <signal pad-id="pc2" index="2" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTC"/>
-                <signal pad-id="pd7" index="3" function="EVSYS_ALT" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTD"/>
-                <signal pad-id="pd2" index="3" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTD"/>
-                <signal pad-id="pf2" index="5" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTF"/>
+                <signal pad-key="pa7" index="0" function="EVSYS_ALT" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTA"/>
+                <signal pad-key="pa2" index="0" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTA"/>
+                <signal pad-key="pc2" index="2" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTC"/>
+                <signal pad-key="pd7" index="3" function="EVSYS_ALT" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTD"/>
+                <signal pad-key="pd2" index="3" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTD"/>
+                <signal pad-key="pf2" index="5" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTF"/>
             </signals>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="i2600_fuse">
@@ -142,48 +142,48 @@
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pa2" index="2" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa3" index="3" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa4" index="4" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa5" index="5" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa6" index="6" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa7" index="7" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa0" index="0" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa1" index="1" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa2" index="2" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa3" index="3" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa4" index="4" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa5" index="5" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa6" index="6" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa7" index="7" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pc2" index="2" function="IOPORT" group="PIN"/>
-                <signal pad-id="pc3" index="3" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc0" index="0" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc1" index="1" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc2" index="2" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc3" index="3" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pd2" index="2" function="IOPORT" group="PIN"/>
-                <signal pad-id="pd3" index="3" function="IOPORT" group="PIN"/>
-                <signal pad-id="pd4" index="4" function="IOPORT" group="PIN"/>
-                <signal pad-id="pd5" index="5" function="IOPORT" group="PIN"/>
-                <signal pad-id="pd6" index="6" function="IOPORT" group="PIN"/>
-                <signal pad-id="pd7" index="7" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd0" index="0" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd1" index="1" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd2" index="2" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd3" index="3" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd4" index="4" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd5" index="5" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd6" index="6" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd7" index="7" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="portf" name="PORTF" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pf2" index="2" function="IOPORT" group="PIN"/>
-                <signal pad-id="pf3" index="3" function="IOPORT" group="PIN"/>
-                <signal pad-id="pf4" index="4" function="IOPORT" group="PIN"/>
-                <signal pad-id="pf5" index="5" function="IOPORT" group="PIN"/>
-                <signal pad-id="pf6" index="6" function="IOPORT" group="PIN"/>
+                <signal pad-key="pf0" index="0" function="IOPORT" group="PIN"/>
+                <signal pad-key="pf1" index="1" function="IOPORT" group="PIN"/>
+                <signal pad-key="pf2" index="2" function="IOPORT" group="PIN"/>
+                <signal pad-key="pf3" index="3" function="IOPORT" group="PIN"/>
+                <signal pad-key="pf4" index="4" function="IOPORT" group="PIN"/>
+                <signal pad-key="pf5" index="5" function="IOPORT" group="PIN"/>
+                <signal pad-key="pf6" index="6" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="portmux" name="PORTMUX" module-key="i2600_portmux">
@@ -192,7 +192,7 @@
         <peripheral key="rstctrl" name="RSTCTRL" module-key="i2111">
             <register-group-instance register-group-key="rstctrl" address-space-key="data" offset="0x40"/>
             <signals>
-                <signal pad-id="pf6" function="OTHER" group="RESET"/>
+                <signal pad-key="pf6" function="OTHER" group="RESET"/>
             </signals>
         </peripheral>
         <peripheral key="rtc" name="RTC" module-key="i2116">
@@ -207,14 +207,14 @@
         <peripheral key="spi0" name="SPI0" module-key="i2107">
             <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"/>
-                <signal pad-id="pc0" function="SPI_ALT" group="MOSI" field="PORTMUX.TWISPIROUTEA.SPI0"/>
-                <signal pad-id="pa4" function="SPI" group="MOSI" field="PORTMUX.TWISPIROUTEA.SPI0"/>
-                <signal pad-id="pc2" function="SPI_ALT" group="SCK" field="PORTMUX.TWISPIROUTEA.SPI0"/>
-                <signal pad-id="pa6" function="SPI" group="SCK" field="PORTMUX.TWISPIROUTEA.SPI0"/>
-                <signal pad-id="pc3" function="SPI_ALT" group="SS" field="PORTMUX.TWISPIROUTEA.SPI0"/>
-                <signal pad-id="pa7" function="SPI" group="SS" field="PORTMUX.TWISPIROUTEA.SPI0"/>
+                <signal pad-key="pc1" function="SPI_ALT" group="MISO" field="PORTMUX.TWISPIROUTEA.SPI0"/>
+                <signal pad-key="pa5" function="SPI" group="MISO" field="PORTMUX.TWISPIROUTEA.SPI0"/>
+                <signal pad-key="pc0" function="SPI_ALT" group="MOSI" field="PORTMUX.TWISPIROUTEA.SPI0"/>
+                <signal pad-key="pa4" function="SPI" group="MOSI" field="PORTMUX.TWISPIROUTEA.SPI0"/>
+                <signal pad-key="pc2" function="SPI_ALT" group="SCK" field="PORTMUX.TWISPIROUTEA.SPI0"/>
+                <signal pad-key="pa6" function="SPI" group="SCK" field="PORTMUX.TWISPIROUTEA.SPI0"/>
+                <signal pad-key="pc3" function="SPI_ALT" group="SS" field="PORTMUX.TWISPIROUTEA.SPI0"/>
+                <signal pad-key="pa7" function="SPI" group="SS" field="PORTMUX.TWISPIROUTEA.SPI0"/>
             </signals>
         </peripheral>
         <peripheral key="syscfg" name="SYSCFG" module-key="i2600_syscfg">
@@ -223,93 +223,93 @@
         <peripheral key="tca0" name="TCA0" module-key="i2117">
             <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"/>
-                <signal pad-id="pc0" index="0" function="TCA_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pa0" index="0" function="TCA" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pf1" index="1" function="TCA_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pd1" index="1" function="TCA_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pc1" index="1" function="TCA_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pa1" index="1" function="TCA" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pf2" index="2" function="TCA_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pd2" index="2" function="TCA_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pc2" index="2" function="TCA_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pa2" index="2" function="TCA" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pf3" index="3" function="TCA_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pd3" index="3" function="TCA_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pc3" index="3" function="TCA_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pa3" index="3" function="TCA" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pf4" index="4" function="TCA_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pd4" index="4" function="TCA_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pa4" index="4" function="TCA" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pf5" index="5" function="TCA_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pd5" index="5" function="TCA_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pa5" index="5" function="TCA" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pf0" index="0" function="TCA_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pd0" index="0" function="TCA_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pc0" index="0" function="TCA_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pa0" index="0" function="TCA" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pf1" index="1" function="TCA_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pd1" index="1" function="TCA_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pc1" index="1" function="TCA_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pa1" index="1" function="TCA" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pf2" index="2" function="TCA_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pd2" index="2" function="TCA_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pc2" index="2" function="TCA_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pa2" index="2" function="TCA" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pf3" index="3" function="TCA_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pd3" index="3" function="TCA_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pc3" index="3" function="TCA_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pa3" index="3" function="TCA" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pf4" index="4" function="TCA_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pd4" index="4" function="TCA_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pa4" index="4" function="TCA" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pf5" index="5" function="TCA_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pd5" index="5" function="TCA_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pa5" index="5" function="TCA" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
             </signals>
         </peripheral>
         <peripheral key="tcb0" name="TCB0" module-key="i2119">
             <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"/>
+                <signal pad-key="pf4" index="0" function="TCB0_ALT" group="WO" field="PORTMUX.TCBROUTEA.TCB0"/>
+                <signal pad-key="pa2" index="0" function="TCB0" group="WO" field="PORTMUX.TCBROUTEA.TCB0"/>
             </signals>
         </peripheral>
         <peripheral key="tcb1" name="TCB1" module-key="i2119">
             <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"/>
+                <signal pad-key="pf5" index="0" function="TCB1_ALT" group="WO" field="PORTMUX.TCBROUTEA.TCB1"/>
+                <signal pad-key="pa3" index="0" function="TCB1" group="WO" field="PORTMUX.TCBROUTEA.TCB1"/>
             </signals>
         </peripheral>
         <peripheral key="tcb2" name="TCB2" module-key="i2119">
             <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"/>
+                <signal pad-key="pc0" index="0" function="TCB2" group="WO" field="PORTMUX.TCBROUTEA.TCB2"/>
             </signals>
         </peripheral>
         <peripheral key="twi0" name="TWI0" module-key="i2110">
             <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"/>
-                <signal pad-id="pa3" function="I2C" group="SCL" field="PORTMUX.TWISPIROUTEA.TWI0"/>
-                <signal pad-id="pf2" function="I2C_ALT2" group="SDA" field="PORTMUX.TWISPIROUTEA.TWI0"/>
-                <signal pad-id="pc2" function="I2C_ALT" group="SDA" field="PORTMUX.TWISPIROUTEA.TWI0"/>
-                <signal pad-id="pa2" function="I2C" group="SDA" field="PORTMUX.TWISPIROUTEA.TWI0"/>
+                <signal pad-key="pf3" function="I2C_ALT2" group="SCL" field="PORTMUX.TWISPIROUTEA.TWI0"/>
+                <signal pad-key="pc3" function="I2C_ALT" group="SCL" field="PORTMUX.TWISPIROUTEA.TWI0"/>
+                <signal pad-key="pa3" function="I2C" group="SCL" field="PORTMUX.TWISPIROUTEA.TWI0"/>
+                <signal pad-key="pf2" function="I2C_ALT2" group="SDA" field="PORTMUX.TWISPIROUTEA.TWI0"/>
+                <signal pad-key="pc2" function="I2C_ALT" group="SDA" field="PORTMUX.TWISPIROUTEA.TWI0"/>
+                <signal pad-key="pa2" function="I2C" group="SDA" field="PORTMUX.TWISPIROUTEA.TWI0"/>
             </signals>
         </peripheral>
         <peripheral key="usart0" name="USART0" module-key="i2108">
             <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"/>
-                <signal pad-id="pa4" function="USART0_ALT" group="TXD" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pa0" function="USART0" group="TXD" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pa6" function="USART0_ALT" group="XCK" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pa2" function="USART0" group="XCK" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pa7" function="USART0_ALT" group="XDIR" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pa3" function="USART0" group="XDIR" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa5" function="USART0_ALT" group="RXD" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa1" function="USART0" group="RXD" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa4" function="USART0_ALT" group="TXD" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa0" function="USART0" group="TXD" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa6" function="USART0_ALT" group="XCK" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa2" function="USART0" group="XCK" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa7" function="USART0_ALT" group="XDIR" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa3" function="USART0" group="XDIR" field="PORTMUX.USARTROUTEA.USART0"/>
             </signals>
         </peripheral>
         <peripheral key="usart1" name="USART1" module-key="i2108">
             <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"/>
-                <signal pad-id="pc2" function="USART1" group="XCK" field="PORTMUX.USARTROUTEA.USART1"/>
-                <signal pad-id="pc3" function="USART1" group="XDIR" field="PORTMUX.USARTROUTEA.USART1"/>
+                <signal pad-key="pc1" function="USART1" group="RXD" field="PORTMUX.USARTROUTEA.USART1"/>
+                <signal pad-key="pc0" function="USART1" group="TXD" field="PORTMUX.USARTROUTEA.USART1"/>
+                <signal pad-key="pc2" function="USART1" group="XCK" field="PORTMUX.USARTROUTEA.USART1"/>
+                <signal pad-key="pc3" function="USART1" group="XDIR" field="PORTMUX.USARTROUTEA.USART1"/>
             </signals>
         </peripheral>
         <peripheral key="usart2" name="USART2" module-key="i2108">
             <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"/>
-                <signal pad-id="pf4" function="USART2_ALT" group="TXD" field="PORTMUX.USARTROUTEA.USART2"/>
-                <signal pad-id="pf0" function="USART2" group="TXD" field="PORTMUX.USARTROUTEA.USART2"/>
-                <signal pad-id="pf6" function="USART2_ALT" group="XCK" field="PORTMUX.USARTROUTEA.USART2"/>
-                <signal pad-id="pf2" function="USART2" group="XCK" field="PORTMUX.USARTROUTEA.USART2"/>
-                <signal pad-id="pf3" function="USART2" group="XDIR" field="PORTMUX.USARTROUTEA.USART2"/>
+                <signal pad-key="pf5" function="USART2_ALT" group="RXD" field="PORTMUX.USARTROUTEA.USART2"/>
+                <signal pad-key="pf1" function="USART2" group="RXD" field="PORTMUX.USARTROUTEA.USART2"/>
+                <signal pad-key="pf4" function="USART2_ALT" group="TXD" field="PORTMUX.USARTROUTEA.USART2"/>
+                <signal pad-key="pf0" function="USART2" group="TXD" field="PORTMUX.USARTROUTEA.USART2"/>
+                <signal pad-key="pf6" function="USART2_ALT" group="XCK" field="PORTMUX.USARTROUTEA.USART2"/>
+                <signal pad-key="pf2" function="USART2" group="XCK" field="PORTMUX.USARTROUTEA.USART2"/>
+                <signal pad-key="pf3" function="USART2" group="XDIR" field="PORTMUX.USARTROUTEA.USART2"/>
             </signals>
         </peripheral>
         <peripheral key="userrow" name="USERROW" module-key="i2603">
@@ -1399,109 +1399,143 @@
             </register-group>
         </module>
     </modules>
+    <pads>
+        <pad key="pa3" name="PA3"/>
+        <pad key="pa4" name="PA4"/>
+        <pad key="pa5" name="PA5"/>
+        <pad key="pa6" name="PA6"/>
+        <pad key="pa7" name="PA7"/>
+        <pad key="pc0" name="PC0"/>
+        <pad key="pc1" name="PC1"/>
+        <pad key="pc2" name="PC2"/>
+        <pad key="pc3" name="PC3"/>
+        <pad key="pd0" name="PD0"/>
+        <pad key="pd1" name="PD1"/>
+        <pad key="pd2" name="PD2"/>
+        <pad key="pd3" name="PD3"/>
+        <pad key="pd4" name="PD4"/>
+        <pad key="pd5" name="PD5"/>
+        <pad key="pd6" name="PD6"/>
+        <pad key="pd7" name="PD7"/>
+        <pad key="avdd" name="AVDD"/>
+        <pad key="gnd0" name="GND0"/>
+        <pad key="pf0" name="PF0"/>
+        <pad key="pf1" name="PF1"/>
+        <pad key="pf2" name="PF2"/>
+        <pad key="pf3" name="PF3"/>
+        <pad key="pf4" name="PF4"/>
+        <pad key="pf5" name="PF5"/>
+        <pad key="pf6" name="PF6"/>
+        <pad key="updi" name="UPDI"/>
+        <pad key="vdd0" name="VDD0"/>
+        <pad key="gnd1" name="GND1"/>
+        <pad key="pa0" name="PA0"/>
+        <pad key="pa1" name="PA1"/>
+        <pad key="pa2" name="PA2"/>
+    </pads>
     <pinouts>
         <pinout key="qfn32" name="QFN32" type="qfn">
-            <pin position="1" pad="PA3"/>
-            <pin position="2" pad="PA4"/>
-            <pin position="3" pad="PA5"/>
-            <pin position="4" pad="PA6"/>
-            <pin position="5" pad="PA7"/>
-            <pin position="6" pad="PC0"/>
-            <pin position="7" pad="PC1"/>
-            <pin position="8" pad="PC2"/>
-            <pin position="9" pad="PC3"/>
-            <pin position="10" pad="PD0"/>
-            <pin position="11" pad="PD1"/>
-            <pin position="12" pad="PD2"/>
-            <pin position="13" pad="PD3"/>
-            <pin position="14" pad="PD4"/>
-            <pin position="15" pad="PD5"/>
-            <pin position="16" pad="PD6"/>
-            <pin position="17" pad="PD7"/>
-            <pin position="18" pad="AVDD"/>
-            <pin position="19" pad="GND0"/>
-            <pin position="20" pad="PF0"/>
-            <pin position="21" pad="PF1"/>
-            <pin position="22" pad="PF2"/>
-            <pin position="23" pad="PF3"/>
-            <pin position="24" pad="PF4"/>
-            <pin position="25" pad="PF5"/>
-            <pin position="26" pad="PF6"/>
-            <pin position="27" pad="UPDI"/>
-            <pin position="28" pad="VDD0"/>
-            <pin position="29" pad="GND1"/>
-            <pin position="30" pad="PA0"/>
-            <pin position="31" pad="PA1"/>
-            <pin position="32" pad="PA2"/>
+            <pin position="1" pad-key="pa3"/>
+            <pin position="2" pad-key="pa4"/>
+            <pin position="3" pad-key="pa5"/>
+            <pin position="4" pad-key="pa6"/>
+            <pin position="5" pad-key="pa7"/>
+            <pin position="6" pad-key="pc0"/>
+            <pin position="7" pad-key="pc1"/>
+            <pin position="8" pad-key="pc2"/>
+            <pin position="9" pad-key="pc3"/>
+            <pin position="10" pad-key="pd0"/>
+            <pin position="11" pad-key="pd1"/>
+            <pin position="12" pad-key="pd2"/>
+            <pin position="13" pad-key="pd3"/>
+            <pin position="14" pad-key="pd4"/>
+            <pin position="15" pad-key="pd5"/>
+            <pin position="16" pad-key="pd6"/>
+            <pin position="17" pad-key="pd7"/>
+            <pin position="18" pad-key="avdd"/>
+            <pin position="19" pad-key="gnd0"/>
+            <pin position="20" pad-key="pf0"/>
+            <pin position="21" pad-key="pf1"/>
+            <pin position="22" pad-key="pf2"/>
+            <pin position="23" pad-key="pf3"/>
+            <pin position="24" pad-key="pf4"/>
+            <pin position="25" pad-key="pf5"/>
+            <pin position="26" pad-key="pf6"/>
+            <pin position="27" pad-key="updi"/>
+            <pin position="28" pad-key="vdd0"/>
+            <pin position="29" pad-key="gnd1"/>
+            <pin position="30" pad-key="pa0"/>
+            <pin position="31" pad-key="pa1"/>
+            <pin position="32" pad-key="pa2"/>
         </pinout>
         <pinout key="qfp32" name="QFP32" type="qfp">
-            <pin position="1" pad="PA3"/>
-            <pin position="2" pad="PA4"/>
-            <pin position="3" pad="PA5"/>
-            <pin position="4" pad="PA6"/>
-            <pin position="5" pad="PA7"/>
-            <pin position="6" pad="PC0"/>
-            <pin position="7" pad="PC1"/>
-            <pin position="8" pad="PC2"/>
-            <pin position="9" pad="PC3"/>
-            <pin position="10" pad="PD0"/>
-            <pin position="11" pad="PD1"/>
-            <pin position="12" pad="PD2"/>
-            <pin position="13" pad="PD3"/>
-            <pin position="14" pad="PD4"/>
-            <pin position="15" pad="PD5"/>
-            <pin position="16" pad="PD6"/>
-            <pin position="17" pad="PD7"/>
-            <pin position="18" pad="AVDD"/>
-            <pin position="19" pad="GND0"/>
-            <pin position="20" pad="PF0"/>
-            <pin position="21" pad="PF1"/>
-            <pin position="22" pad="PF2"/>
-            <pin position="23" pad="PF3"/>
-            <pin position="24" pad="PF4"/>
-            <pin position="25" pad="PF5"/>
-            <pin position="26" pad="PF6"/>
-            <pin position="27" pad="UPDI"/>
-            <pin position="28" pad="VDD0"/>
-            <pin position="29" pad="GND1"/>
-            <pin position="30" pad="PA0"/>
-            <pin position="31" pad="PA1"/>
-            <pin position="32" pad="PA2"/>
+            <pin position="1" pad-key="pa3"/>
+            <pin position="2" pad-key="pa4"/>
+            <pin position="3" pad-key="pa5"/>
+            <pin position="4" pad-key="pa6"/>
+            <pin position="5" pad-key="pa7"/>
+            <pin position="6" pad-key="pc0"/>
+            <pin position="7" pad-key="pc1"/>
+            <pin position="8" pad-key="pc2"/>
+            <pin position="9" pad-key="pc3"/>
+            <pin position="10" pad-key="pd0"/>
+            <pin position="11" pad-key="pd1"/>
+            <pin position="12" pad-key="pd2"/>
+            <pin position="13" pad-key="pd3"/>
+            <pin position="14" pad-key="pd4"/>
+            <pin position="15" pad-key="pd5"/>
+            <pin position="16" pad-key="pd6"/>
+            <pin position="17" pad-key="pd7"/>
+            <pin position="18" pad-key="avdd"/>
+            <pin position="19" pad-key="gnd0"/>
+            <pin position="20" pad-key="pf0"/>
+            <pin position="21" pad-key="pf1"/>
+            <pin position="22" pad-key="pf2"/>
+            <pin position="23" pad-key="pf3"/>
+            <pin position="24" pad-key="pf4"/>
+            <pin position="25" pad-key="pf5"/>
+            <pin position="26" pad-key="pf6"/>
+            <pin position="27" pad-key="updi"/>
+            <pin position="28" pad-key="vdd0"/>
+            <pin position="29" pad-key="gnd1"/>
+            <pin position="30" pad-key="pa0"/>
+            <pin position="31" pad-key="pa1"/>
+            <pin position="32" pad-key="pa2"/>
         </pinout>
         <pinout key="ssop28" name="SSOP28" type="ssop">
-            <pin position="1" pad="PA7"/>
-            <pin position="2" pad="PC0"/>
-            <pin position="3" pad="PC1"/>
-            <pin position="4" pad="PC2"/>
-            <pin position="5" pad="PC3"/>
-            <pin position="6" pad="PD0"/>
-            <pin position="7" pad="PD1"/>
-            <pin position="8" pad="PD2"/>
-            <pin position="9" pad="PD3"/>
-            <pin position="10" pad="PD4"/>
-            <pin position="11" pad="PD5"/>
-            <pin position="12" pad="PD6"/>
-            <pin position="13" pad="PD7"/>
-            <pin position="14" pad="AVDD"/>
-            <pin position="15" pad="GND0"/>
-            <pin position="16" pad="PF0"/>
-            <pin position="17" pad="PF1"/>
-            <pin position="18" pad="PF6"/>
-            <pin position="19" pad="UPDI"/>
-            <pin position="20" pad="VDD0"/>
-            <pin position="21" pad="GND1"/>
-            <pin position="22" pad="PA0"/>
-            <pin position="23" pad="PA1"/>
-            <pin position="24" pad="PA2"/>
-            <pin position="25" pad="PA3"/>
-            <pin position="26" pad="PA4"/>
-            <pin position="27" pad="PA5"/>
-            <pin position="28" pad="PA6"/>
+            <pin position="1" pad-key="pa7"/>
+            <pin position="2" pad-key="pc0"/>
+            <pin position="3" pad-key="pc1"/>
+            <pin position="4" pad-key="pc2"/>
+            <pin position="5" pad-key="pc3"/>
+            <pin position="6" pad-key="pd0"/>
+            <pin position="7" pad-key="pd1"/>
+            <pin position="8" pad-key="pd2"/>
+            <pin position="9" pad-key="pd3"/>
+            <pin position="10" pad-key="pd4"/>
+            <pin position="11" pad-key="pd5"/>
+            <pin position="12" pad-key="pd6"/>
+            <pin position="13" pad-key="pd7"/>
+            <pin position="14" pad-key="avdd"/>
+            <pin position="15" pad-key="gnd0"/>
+            <pin position="16" pad-key="pf0"/>
+            <pin position="17" pad-key="pf1"/>
+            <pin position="18" pad-key="pf6"/>
+            <pin position="19" pad-key="updi"/>
+            <pin position="20" pad-key="vdd0"/>
+            <pin position="21" pad-key="gnd1"/>
+            <pin position="22" pad-key="pa0"/>
+            <pin position="23" pad-key="pa1"/>
+            <pin position="24" pad-key="pa2"/>
+            <pin position="25" pad-key="pa3"/>
+            <pin position="26" pad-key="pa4"/>
+            <pin position="27" pad-key="pa5"/>
+            <pin position="28" pad-key="pa6"/>
         </pinout>
     </pinouts>
     <variants>
-        <variant name="ATmega3208-AFR" pinout-key="qfp32" package="TQFP32"/>
-        <variant name="ATmega3208-MFR" pinout-key="qfn32" package="VQFN32"/>
-        <variant name="ATmega3208-XFR" pinout-key="ssop28" package="SSOP28"/>
+        <variant key="atmega3208_afr" name="ATmega3208-AFR" pinout-key="qfp32"/>
+        <variant key="atmega3208_mfr" name="ATmega3208-MFR" pinout-key="qfn32"/>
+        <variant key="atmega3208_xfr" name="ATmega3208-XFR" pinout-key="ssop28"/>
     </variants>
 </device>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA3209.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA3209.xml
index df7881e9..4c0c4496 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA3209.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA3209.xml
@@ -44,35 +44,35 @@
         <peripheral key="ac0" name="AC0" module-key="i2106">
             <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"/>
-                <signal pad-id="pd7" index="2" function="AC0" group="N"/>
-                <signal pad-id="pa7" index="0" function="AC0" group="OUT"/>
-                <signal pad-id="pd2" index="0" function="AC0" group="P"/>
-                <signal pad-id="pd4" index="1" function="AC0" group="P"/>
-                <signal pad-id="pd6" index="2" function="AC0" group="P"/>
-                <signal pad-id="pd1" index="3" function="AC0" group="P"/>
+                <signal pad-key="pd3" index="0" function="AC0" group="N"/>
+                <signal pad-key="pd5" index="1" function="AC0" group="N"/>
+                <signal pad-key="pd7" index="2" function="AC0" group="N"/>
+                <signal pad-key="pa7" index="0" function="AC0" group="OUT"/>
+                <signal pad-key="pd2" index="0" function="AC0" group="P"/>
+                <signal pad-key="pd4" index="1" function="AC0" group="P"/>
+                <signal pad-key="pd6" index="2" function="AC0" group="P"/>
+                <signal pad-key="pd1" index="3" function="AC0" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="adc0" name="ADC0" module-key="i2132">
             <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"/>
-                <signal pad-id="pd2" index="2" function="AIN0" group="AIN"/>
-                <signal pad-id="pd3" index="3" function="AIN0" group="AIN"/>
-                <signal pad-id="pd4" index="4" function="AIN0" group="AIN"/>
-                <signal pad-id="pd5" index="5" function="AIN0" group="AIN"/>
-                <signal pad-id="pd6" index="6" function="AIN0" group="AIN"/>
-                <signal pad-id="pd7" index="7" function="AIN0" group="AIN"/>
-                <signal pad-id="pe0" index="8" function="AIN0" group="AIN"/>
-                <signal pad-id="pe1" index="9" function="AIN0" group="AIN"/>
-                <signal pad-id="pe2" index="10" function="AIN0" group="AIN"/>
-                <signal pad-id="pe3" index="11" function="AIN0" group="AIN"/>
-                <signal pad-id="pf2" index="12" function="AIN0" group="AIN"/>
-                <signal pad-id="pf3" index="13" function="AIN0" group="AIN"/>
-                <signal pad-id="pf4" index="14" function="AIN0" group="AIN"/>
-                <signal pad-id="pf5" index="15" function="AIN0" group="AIN"/>
+                <signal pad-key="pd0" index="0" function="AIN0" group="AIN"/>
+                <signal pad-key="pd1" index="1" function="AIN0" group="AIN"/>
+                <signal pad-key="pd2" index="2" function="AIN0" group="AIN"/>
+                <signal pad-key="pd3" index="3" function="AIN0" group="AIN"/>
+                <signal pad-key="pd4" index="4" function="AIN0" group="AIN"/>
+                <signal pad-key="pd5" index="5" function="AIN0" group="AIN"/>
+                <signal pad-key="pd6" index="6" function="AIN0" group="AIN"/>
+                <signal pad-key="pd7" index="7" function="AIN0" group="AIN"/>
+                <signal pad-key="pe0" index="8" function="AIN0" group="AIN"/>
+                <signal pad-key="pe1" index="9" function="AIN0" group="AIN"/>
+                <signal pad-key="pe2" index="10" function="AIN0" group="AIN"/>
+                <signal pad-key="pe3" index="11" function="AIN0" group="AIN"/>
+                <signal pad-key="pf2" index="12" function="AIN0" group="AIN"/>
+                <signal pad-key="pf3" index="13" function="AIN0" group="AIN"/>
+                <signal pad-key="pf4" index="14" function="AIN0" group="AIN"/>
+                <signal pad-key="pf5" index="15" function="AIN0" group="AIN"/>
             </signals>
         </peripheral>
         <peripheral key="bod" name="BOD" module-key="i2114">
@@ -81,35 +81,35 @@
         <peripheral key="ccl" name="CCL" module-key="i2128">
             <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"/>
-                <signal pad-id="pa2" index="2" function="CCL" group="LUT0_IN"/>
-                <signal pad-id="pa6" index="0" function="CCL_ALT" group="LUT0_OUT" field="PORTMUX.CCLROUTEA.LUT0"/>
-                <signal pad-id="pa3" index="0" function="CCL" group="LUT0_OUT" field="PORTMUX.CCLROUTEA.LUT0"/>
-                <signal pad-id="pc0" index="0" function="CCL" group="LUT1_IN"/>
-                <signal pad-id="pc1" index="1" function="CCL" group="LUT1_IN"/>
-                <signal pad-id="pc2" index="2" function="CCL" group="LUT1_IN"/>
-                <signal pad-id="pc6" index="0" function="CCL_ALT" group="LUT1_OUT" field="PORTMUX.CCLROUTEA.LUT1"/>
-                <signal pad-id="pc3" index="0" function="CCL" group="LUT1_OUT" field="PORTMUX.CCLROUTEA.LUT1"/>
-                <signal pad-id="pd0" index="0" function="CCL" group="LUT2_IN"/>
-                <signal pad-id="pd1" index="1" function="CCL" group="LUT2_IN"/>
-                <signal pad-id="pd2" index="2" function="CCL" group="LUT2_IN"/>
-                <signal pad-id="pd3" index="0" function="CCL" group="LUT2_OUT" field="PORTMUX.CCLROUTEA.LUT2"/>
-                <signal pad-id="pd6" index="1" function="CCL_ALT" group="LUT2_OUT" field="PORTMUX.CCLROUTEA.LUT2"/>
-                <signal pad-id="pf0" index="0" function="CCL" group="LUT3_IN"/>
-                <signal pad-id="pf1" index="1" function="CCL" group="LUT3_IN"/>
-                <signal pad-id="pf2" index="2" function="CCL" group="LUT3_IN"/>
-                <signal pad-id="pf6" index="1" function="CCL_ALT" group="LUT3_OUT" field="PORTMUX.CCLROUTEA.LUT3"/>
-                <signal pad-id="pf3" index="1" function="CCL" group="LUT3_OUT" field="PORTMUX.CCLROUTEA.LUT3"/>
+                <signal pad-key="pa0" index="0" function="CCL" group="LUT0_IN"/>
+                <signal pad-key="pa1" index="1" function="CCL" group="LUT0_IN"/>
+                <signal pad-key="pa2" index="2" function="CCL" group="LUT0_IN"/>
+                <signal pad-key="pa6" index="0" function="CCL_ALT" group="LUT0_OUT" field="PORTMUX.CCLROUTEA.LUT0"/>
+                <signal pad-key="pa3" index="0" function="CCL" group="LUT0_OUT" field="PORTMUX.CCLROUTEA.LUT0"/>
+                <signal pad-key="pc0" index="0" function="CCL" group="LUT1_IN"/>
+                <signal pad-key="pc1" index="1" function="CCL" group="LUT1_IN"/>
+                <signal pad-key="pc2" index="2" function="CCL" group="LUT1_IN"/>
+                <signal pad-key="pc6" index="0" function="CCL_ALT" group="LUT1_OUT" field="PORTMUX.CCLROUTEA.LUT1"/>
+                <signal pad-key="pc3" index="0" function="CCL" group="LUT1_OUT" field="PORTMUX.CCLROUTEA.LUT1"/>
+                <signal pad-key="pd0" index="0" function="CCL" group="LUT2_IN"/>
+                <signal pad-key="pd1" index="1" function="CCL" group="LUT2_IN"/>
+                <signal pad-key="pd2" index="2" function="CCL" group="LUT2_IN"/>
+                <signal pad-key="pd3" index="0" function="CCL" group="LUT2_OUT" field="PORTMUX.CCLROUTEA.LUT2"/>
+                <signal pad-key="pd6" index="1" function="CCL_ALT" group="LUT2_OUT" field="PORTMUX.CCLROUTEA.LUT2"/>
+                <signal pad-key="pf0" index="0" function="CCL" group="LUT3_IN"/>
+                <signal pad-key="pf1" index="1" function="CCL" group="LUT3_IN"/>
+                <signal pad-key="pf2" index="2" function="CCL" group="LUT3_IN"/>
+                <signal pad-key="pf6" index="1" function="CCL_ALT" group="LUT3_OUT" field="PORTMUX.CCLROUTEA.LUT3"/>
+                <signal pad-key="pf3" index="1" function="CCL" group="LUT3_OUT" field="PORTMUX.CCLROUTEA.LUT3"/>
             </signals>
         </peripheral>
         <peripheral key="clkctrl" name="CLKCTRL" module-key="i2600_clkctrl">
             <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"/>
-                <signal pad-id="pf0" function="CLKCTRL" group="TOSC1"/>
-                <signal pad-id="pf1" function="CLKCTRL" group="TOSC2"/>
+                <signal pad-key="pa0" function="CLKCTRL" group="CLKI"/>
+                <signal pad-key="pa7" function="CLKCTRL" group="CLKO"/>
+                <signal pad-key="pf0" function="CLKCTRL" group="TOSC1"/>
+                <signal pad-key="pf1" function="CLKCTRL" group="TOSC2"/>
             </signals>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="i2100">
@@ -124,15 +124,15 @@
         <peripheral key="evsys" name="EVSYS" module-key="i2600_evsys">
             <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"/>
-                <signal pad-id="pb2" index="1" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTB"/>
-                <signal pad-id="pc7" index="2" function="EVSYS_ALT" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTC"/>
-                <signal pad-id="pc2" index="2" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTC"/>
-                <signal pad-id="pd7" index="3" function="EVSYS_ALT" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTD"/>
-                <signal pad-id="pd2" index="3" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTD"/>
-                <signal pad-id="pe2" index="4" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTE"/>
-                <signal pad-id="pf2" index="5" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTF"/>
+                <signal pad-key="pa7" index="0" function="EVSYS_ALT" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTA"/>
+                <signal pad-key="pa2" index="0" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTA"/>
+                <signal pad-key="pb2" index="1" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTB"/>
+                <signal pad-key="pc7" index="2" function="EVSYS_ALT" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTC"/>
+                <signal pad-key="pc2" index="2" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTC"/>
+                <signal pad-key="pd7" index="3" function="EVSYS_ALT" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTD"/>
+                <signal pad-key="pd2" index="3" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTD"/>
+                <signal pad-key="pe2" index="4" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTE"/>
+                <signal pad-key="pf2" index="5" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTF"/>
             </signals>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="i2600_fuse">
@@ -150,72 +150,72 @@
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pa2" index="2" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa3" index="3" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa4" index="4" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa5" index="5" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa6" index="6" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa7" index="7" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa0" index="0" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa1" index="1" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa2" index="2" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa3" index="3" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa4" index="4" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa5" index="5" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa6" index="6" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa7" index="7" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pb2" index="2" function="IOPORT" group="PIN"/>
-                <signal pad-id="pb3" index="3" function="IOPORT" group="PIN"/>
-                <signal pad-id="pb4" index="4" function="IOPORT" group="PIN"/>
-                <signal pad-id="pb5" index="5" function="IOPORT" group="PIN"/>
+                <signal pad-key="pb0" index="0" function="IOPORT" group="PIN"/>
+                <signal pad-key="pb1" index="1" function="IOPORT" group="PIN"/>
+                <signal pad-key="pb2" index="2" function="IOPORT" group="PIN"/>
+                <signal pad-key="pb3" index="3" function="IOPORT" group="PIN"/>
+                <signal pad-key="pb4" index="4" function="IOPORT" group="PIN"/>
+                <signal pad-key="pb5" index="5" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pc2" index="2" function="IOPORT" group="PIN"/>
-                <signal pad-id="pc3" index="3" function="IOPORT" group="PIN"/>
-                <signal pad-id="pc4" index="4" function="IOPORT" group="PIN"/>
-                <signal pad-id="pc5" index="5" function="IOPORT" group="PIN"/>
-                <signal pad-id="pc6" index="6" function="IOPORT" group="PIN"/>
-                <signal pad-id="pc7" index="7" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc0" index="0" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc1" index="1" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc2" index="2" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc3" index="3" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc4" index="4" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc5" index="5" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc6" index="6" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc7" index="7" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pd2" index="2" function="IOPORT" group="PIN"/>
-                <signal pad-id="pd3" index="3" function="IOPORT" group="PIN"/>
-                <signal pad-id="pd4" index="4" function="IOPORT" group="PIN"/>
-                <signal pad-id="pd5" index="5" function="IOPORT" group="PIN"/>
-                <signal pad-id="pd6" index="6" function="IOPORT" group="PIN"/>
-                <signal pad-id="pd7" index="7" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd0" index="0" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd1" index="1" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd2" index="2" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd3" index="3" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd4" index="4" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd5" index="5" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd6" index="6" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd7" index="7" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="porte" name="PORTE" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pe2" index="2" function="IOPORT" group="PIN"/>
-                <signal pad-id="pe3" index="3" function="IOPORT" group="PIN"/>
+                <signal pad-key="pe0" index="0" function="IOPORT" group="PIN"/>
+                <signal pad-key="pe1" index="1" function="IOPORT" group="PIN"/>
+                <signal pad-key="pe2" index="2" function="IOPORT" group="PIN"/>
+                <signal pad-key="pe3" index="3" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="portf" name="PORTF" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pf2" index="2" function="IOPORT" group="PIN"/>
-                <signal pad-id="pf3" index="3" function="IOPORT" group="PIN"/>
-                <signal pad-id="pf4" index="4" function="IOPORT" group="PIN"/>
-                <signal pad-id="pf5" index="5" function="IOPORT" group="PIN"/>
-                <signal pad-id="pf6" index="6" function="IOPORT" group="PIN"/>
+                <signal pad-key="pf0" index="0" function="IOPORT" group="PIN"/>
+                <signal pad-key="pf1" index="1" function="IOPORT" group="PIN"/>
+                <signal pad-key="pf2" index="2" function="IOPORT" group="PIN"/>
+                <signal pad-key="pf3" index="3" function="IOPORT" group="PIN"/>
+                <signal pad-key="pf4" index="4" function="IOPORT" group="PIN"/>
+                <signal pad-key="pf5" index="5" function="IOPORT" group="PIN"/>
+                <signal pad-key="pf6" index="6" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="portmux" name="PORTMUX" module-key="i2600_portmux">
@@ -224,7 +224,7 @@
         <peripheral key="rstctrl" name="RSTCTRL" module-key="i2111">
             <register-group-instance register-group-key="rstctrl" address-space-key="data" offset="0x40"/>
             <signals>
-                <signal pad-id="pf6" function="OTHER" group="RESET"/>
+                <signal pad-key="pf6" function="OTHER" group="RESET"/>
             </signals>
         </peripheral>
         <peripheral key="rtc" name="RTC" module-key="i2116">
@@ -239,18 +239,18 @@
         <peripheral key="spi0" name="SPI0" module-key="i2107">
             <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"/>
-                <signal pad-id="pa5" function="SPI" group="MISO" field="PORTMUX.TWISPIROUTEA.SPI0"/>
-                <signal pad-id="pe0" function="SPI_ALT2" group="MOSI" field="PORTMUX.TWISPIROUTEA.SPI0"/>
-                <signal pad-id="pc0" function="SPI_ALT" group="MOSI" field="PORTMUX.TWISPIROUTEA.SPI0"/>
-                <signal pad-id="pa4" function="SPI" group="MOSI" field="PORTMUX.TWISPIROUTEA.SPI0"/>
-                <signal pad-id="pe2" function="SPI_ALT2" group="SCK" field="PORTMUX.TWISPIROUTEA.SPI0"/>
-                <signal pad-id="pc2" function="SPI_ALT" group="SCK" field="PORTMUX.TWISPIROUTEA.SPI0"/>
-                <signal pad-id="pa6" function="SPI" group="SCK" field="PORTMUX.TWISPIROUTEA.SPI0"/>
-                <signal pad-id="pe3" function="SPI_ALT2" group="SS" field="PORTMUX.TWISPIROUTEA.SPI0"/>
-                <signal pad-id="pc3" function="SPI_ALT" group="SS" field="PORTMUX.TWISPIROUTEA.SPI0"/>
-                <signal pad-id="pa7" function="SPI" group="SS" field="PORTMUX.TWISPIROUTEA.SPI0"/>
+                <signal pad-key="pe1" function="SPI_ALT2" group="MISO" field="PORTMUX.TWISPIROUTEA.SPI0"/>
+                <signal pad-key="pc1" function="SPI_ALT" group="MISO" field="PORTMUX.TWISPIROUTEA.SPI0"/>
+                <signal pad-key="pa5" function="SPI" group="MISO" field="PORTMUX.TWISPIROUTEA.SPI0"/>
+                <signal pad-key="pe0" function="SPI_ALT2" group="MOSI" field="PORTMUX.TWISPIROUTEA.SPI0"/>
+                <signal pad-key="pc0" function="SPI_ALT" group="MOSI" field="PORTMUX.TWISPIROUTEA.SPI0"/>
+                <signal pad-key="pa4" function="SPI" group="MOSI" field="PORTMUX.TWISPIROUTEA.SPI0"/>
+                <signal pad-key="pe2" function="SPI_ALT2" group="SCK" field="PORTMUX.TWISPIROUTEA.SPI0"/>
+                <signal pad-key="pc2" function="SPI_ALT" group="SCK" field="PORTMUX.TWISPIROUTEA.SPI0"/>
+                <signal pad-key="pa6" function="SPI" group="SCK" field="PORTMUX.TWISPIROUTEA.SPI0"/>
+                <signal pad-key="pe3" function="SPI_ALT2" group="SS" field="PORTMUX.TWISPIROUTEA.SPI0"/>
+                <signal pad-key="pc3" function="SPI_ALT" group="SS" field="PORTMUX.TWISPIROUTEA.SPI0"/>
+                <signal pad-key="pa7" function="SPI" group="SS" field="PORTMUX.TWISPIROUTEA.SPI0"/>
             </signals>
         </peripheral>
         <peripheral key="syscfg" name="SYSCFG" module-key="i2600_syscfg">
@@ -259,128 +259,128 @@
         <peripheral key="tca0" name="TCA0" module-key="i2117">
             <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"/>
-                <signal pad-id="pd0" index="0" function="TCA_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pc0" index="0" function="TCA_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pb0" index="0" function="TCA_ALT" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pa0" index="0" function="TCA" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pf1" index="1" function="TCA_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pe1" index="1" function="TCA_ALT4" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pd1" index="1" function="TCA_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pc1" index="1" function="TCA_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pb1" index="1" function="TCA_ALT" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pa1" index="1" function="TCA" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pf2" index="2" function="TCA_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pe2" index="2" function="TCA_ALT4" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pd2" index="2" function="TCA_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pc2" index="2" function="TCA_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pb2" index="2" function="TCA_ALT" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pa2" index="2" function="TCA" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pf3" index="3" function="TCA_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pe3" index="3" function="TCA_ALT4" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pd3" index="3" function="TCA_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pc3" index="3" function="TCA_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pb3" index="3" function="TCA_ALT" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pa3" index="3" function="TCA" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pf4" index="4" function="TCA_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pd4" index="4" function="TCA_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pc4" index="4" function="TCA_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pb4" index="4" function="TCA_ALT" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pa4" index="4" function="TCA" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pf5" index="5" function="TCA_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pd5" index="5" function="TCA_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pc5" index="5" function="TCA_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pb5" index="5" function="TCA_ALT" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pa5" index="5" function="TCA" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pf0" index="0" function="TCA_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pe0" index="0" function="TCA_ALT4" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pd0" index="0" function="TCA_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pc0" index="0" function="TCA_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pb0" index="0" function="TCA_ALT" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pa0" index="0" function="TCA" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pf1" index="1" function="TCA_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pe1" index="1" function="TCA_ALT4" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pd1" index="1" function="TCA_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pc1" index="1" function="TCA_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pb1" index="1" function="TCA_ALT" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pa1" index="1" function="TCA" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pf2" index="2" function="TCA_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pe2" index="2" function="TCA_ALT4" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pd2" index="2" function="TCA_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pc2" index="2" function="TCA_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pb2" index="2" function="TCA_ALT" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pa2" index="2" function="TCA" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pf3" index="3" function="TCA_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pe3" index="3" function="TCA_ALT4" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pd3" index="3" function="TCA_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pc3" index="3" function="TCA_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pb3" index="3" function="TCA_ALT" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pa3" index="3" function="TCA" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pf4" index="4" function="TCA_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pd4" index="4" function="TCA_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pc4" index="4" function="TCA_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pb4" index="4" function="TCA_ALT" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pa4" index="4" function="TCA" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pf5" index="5" function="TCA_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pd5" index="5" function="TCA_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pc5" index="5" function="TCA_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pb5" index="5" function="TCA_ALT" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pa5" index="5" function="TCA" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
             </signals>
         </peripheral>
         <peripheral key="tcb0" name="TCB0" module-key="i2119">
             <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"/>
+                <signal pad-key="pf4" index="0" function="TCB0_ALT" group="WO" field="PORTMUX.TCBROUTEA.TCB0"/>
+                <signal pad-key="pa2" index="0" function="TCB0" group="WO" field="PORTMUX.TCBROUTEA.TCB0"/>
             </signals>
         </peripheral>
         <peripheral key="tcb1" name="TCB1" module-key="i2119">
             <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"/>
+                <signal pad-key="pf5" index="0" function="TCB1_ALT" group="WO" field="PORTMUX.TCBROUTEA.TCB1"/>
+                <signal pad-key="pa3" index="0" function="TCB1" group="WO" field="PORTMUX.TCBROUTEA.TCB1"/>
             </signals>
         </peripheral>
         <peripheral key="tcb2" name="TCB2" module-key="i2119">
             <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"/>
+                <signal pad-key="pb4" index="0" function="TCB2_ALT" group="WO" field="PORTMUX.TCBROUTEA.TCB2"/>
+                <signal pad-key="pc0" index="0" function="TCB2" group="WO" field="PORTMUX.TCBROUTEA.TCB2"/>
             </signals>
         </peripheral>
         <peripheral key="tcb3" name="TCB3" module-key="i2119">
             <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"/>
+                <signal pad-key="pc1" index="0" function="TCB3_ALT" group="WO" field="PORTMUX.TCBROUTEA.TCB3"/>
+                <signal pad-key="pb5" index="0" function="TCB3" group="WO" field="PORTMUX.TCBROUTEA.TCB3"/>
             </signals>
         </peripheral>
         <peripheral key="twi0" name="TWI0" module-key="i2110">
             <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"/>
-                <signal pad-id="pa3" function="I2C" group="SCL" field="PORTMUX.TWISPIROUTEA.TWI0"/>
-                <signal pad-id="pf2" function="I2C_ALT2" group="SDA" field="PORTMUX.TWISPIROUTEA.TWI0"/>
-                <signal pad-id="pc2" function="I2C_ALT" group="SDA" field="PORTMUX.TWISPIROUTEA.TWI0"/>
-                <signal pad-id="pa2" function="I2C" group="SDA" field="PORTMUX.TWISPIROUTEA.TWI0"/>
+                <signal pad-key="pf3" function="I2C_ALT2" group="SCL" field="PORTMUX.TWISPIROUTEA.TWI0"/>
+                <signal pad-key="pc3" function="I2C_ALT" group="SCL" field="PORTMUX.TWISPIROUTEA.TWI0"/>
+                <signal pad-key="pa3" function="I2C" group="SCL" field="PORTMUX.TWISPIROUTEA.TWI0"/>
+                <signal pad-key="pf2" function="I2C_ALT2" group="SDA" field="PORTMUX.TWISPIROUTEA.TWI0"/>
+                <signal pad-key="pc2" function="I2C_ALT" group="SDA" field="PORTMUX.TWISPIROUTEA.TWI0"/>
+                <signal pad-key="pa2" function="I2C" group="SDA" field="PORTMUX.TWISPIROUTEA.TWI0"/>
             </signals>
         </peripheral>
         <peripheral key="usart0" name="USART0" module-key="i2108">
             <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"/>
-                <signal pad-id="pa4" function="USART0_ALT" group="TXD" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pa0" function="USART0" group="TXD" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pa6" function="USART0_ALT" group="XCK" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pa2" function="USART0" group="XCK" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pa7" function="USART0_ALT" group="XDIR" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pa3" function="USART0" group="XDIR" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa5" function="USART0_ALT" group="RXD" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa1" function="USART0" group="RXD" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa4" function="USART0_ALT" group="TXD" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa0" function="USART0" group="TXD" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa6" function="USART0_ALT" group="XCK" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa2" function="USART0" group="XCK" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa7" function="USART0_ALT" group="XDIR" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa3" function="USART0" group="XDIR" field="PORTMUX.USARTROUTEA.USART0"/>
             </signals>
         </peripheral>
         <peripheral key="usart1" name="USART1" module-key="i2108">
             <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"/>
-                <signal pad-id="pc4" function="USART1_ALT" group="TXD" field="PORTMUX.USARTROUTEA.USART1"/>
-                <signal pad-id="pc0" function="USART1" group="TXD" field="PORTMUX.USARTROUTEA.USART1"/>
-                <signal pad-id="pc6" function="USART1_ALT" group="XCK" field="PORTMUX.USARTROUTEA.USART1"/>
-                <signal pad-id="pc2" function="USART1" group="XCK" field="PORTMUX.USARTROUTEA.USART1"/>
-                <signal pad-id="pc7" function="USART1_ALT" group="XDIR" field="PORTMUX.USARTROUTEA.USART1"/>
-                <signal pad-id="pc3" function="USART1" group="XDIR" field="PORTMUX.USARTROUTEA.USART1"/>
+                <signal pad-key="pc5" function="USART1_ALT" group="RXD" field="PORTMUX.USARTROUTEA.USART1"/>
+                <signal pad-key="pc1" function="USART1" group="RXD" field="PORTMUX.USARTROUTEA.USART1"/>
+                <signal pad-key="pc4" function="USART1_ALT" group="TXD" field="PORTMUX.USARTROUTEA.USART1"/>
+                <signal pad-key="pc0" function="USART1" group="TXD" field="PORTMUX.USARTROUTEA.USART1"/>
+                <signal pad-key="pc6" function="USART1_ALT" group="XCK" field="PORTMUX.USARTROUTEA.USART1"/>
+                <signal pad-key="pc2" function="USART1" group="XCK" field="PORTMUX.USARTROUTEA.USART1"/>
+                <signal pad-key="pc7" function="USART1_ALT" group="XDIR" field="PORTMUX.USARTROUTEA.USART1"/>
+                <signal pad-key="pc3" function="USART1" group="XDIR" field="PORTMUX.USARTROUTEA.USART1"/>
             </signals>
         </peripheral>
         <peripheral key="usart2" name="USART2" module-key="i2108">
             <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"/>
-                <signal pad-id="pf4" function="USART2_ALT" group="TXD" field="PORTMUX.USARTROUTEA.USART2"/>
-                <signal pad-id="pf0" function="USART2" group="TXD" field="PORTMUX.USARTROUTEA.USART2"/>
-                <signal pad-id="pf6" function="USART2_ALT" group="XCK" field="PORTMUX.USARTROUTEA.USART2"/>
-                <signal pad-id="pf2" function="USART2" group="XCK" field="PORTMUX.USARTROUTEA.USART2"/>
-                <signal pad-id="pf3" function="USART2" group="XDIR" field="PORTMUX.USARTROUTEA.USART2"/>
+                <signal pad-key="pf5" function="USART2_ALT" group="RXD" field="PORTMUX.USARTROUTEA.USART2"/>
+                <signal pad-key="pf1" function="USART2" group="RXD" field="PORTMUX.USARTROUTEA.USART2"/>
+                <signal pad-key="pf4" function="USART2_ALT" group="TXD" field="PORTMUX.USARTROUTEA.USART2"/>
+                <signal pad-key="pf0" function="USART2" group="TXD" field="PORTMUX.USARTROUTEA.USART2"/>
+                <signal pad-key="pf6" function="USART2_ALT" group="XCK" field="PORTMUX.USARTROUTEA.USART2"/>
+                <signal pad-key="pf2" function="USART2" group="XCK" field="PORTMUX.USARTROUTEA.USART2"/>
+                <signal pad-key="pf3" function="USART2" group="XDIR" field="PORTMUX.USARTROUTEA.USART2"/>
             </signals>
         </peripheral>
         <peripheral key="usart3" name="USART3" module-key="i2108">
             <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"/>
-                <signal pad-id="pb4" function="USART3_ALT" group="TXD" field="PORTMUX.USARTROUTEA.USART3"/>
-                <signal pad-id="pb0" function="USART3" group="TXD" field="PORTMUX.USARTROUTEA.USART3"/>
-                <signal pad-id="pb2" function="USART3" group="XCK" field="PORTMUX.USARTROUTEA.USART3"/>
-                <signal pad-id="pb3" function="USART3" group="XDIR" field="PORTMUX.USARTROUTEA.USART3"/>
+                <signal pad-key="pb5" function="USART3_ALT" group="RXD" field="PORTMUX.USARTROUTEA.USART3"/>
+                <signal pad-key="pb1" function="USART3" group="RXD" field="PORTMUX.USARTROUTEA.USART3"/>
+                <signal pad-key="pb4" function="USART3_ALT" group="TXD" field="PORTMUX.USARTROUTEA.USART3"/>
+                <signal pad-key="pb0" function="USART3" group="TXD" field="PORTMUX.USARTROUTEA.USART3"/>
+                <signal pad-key="pb2" function="USART3" group="XCK" field="PORTMUX.USARTROUTEA.USART3"/>
+                <signal pad-key="pb3" function="USART3" group="XDIR" field="PORTMUX.USARTROUTEA.USART3"/>
             </signals>
         </peripheral>
         <peripheral key="userrow" name="USERROW" module-key="i2603">
@@ -1476,110 +1476,160 @@
             </register-group>
         </module>
     </modules>
+    <pads>
+        <pad key="pa5" name="PA5"/>
+        <pad key="pa6" name="PA6"/>
+        <pad key="pa7" name="PA7"/>
+        <pad key="pb0" name="PB0"/>
+        <pad key="pb1" name="PB1"/>
+        <pad key="pb2" name="PB2"/>
+        <pad key="pb3" name="PB3"/>
+        <pad key="pb4" name="PB4"/>
+        <pad key="pb5" name="PB5"/>
+        <pad key="pc0" name="PC0"/>
+        <pad key="pc1" name="PC1"/>
+        <pad key="pc2" name="PC2"/>
+        <pad key="pc3" name="PC3"/>
+        <pad key="vdd0" name="VDD0"/>
+        <pad key="gnd0" name="GND0"/>
+        <pad key="pc4" name="PC4"/>
+        <pad key="pc5" name="PC5"/>
+        <pad key="pc6" name="PC6"/>
+        <pad key="pc7" name="PC7"/>
+        <pad key="pd0" name="PD0"/>
+        <pad key="pd1" name="PD1"/>
+        <pad key="pd2" name="PD2"/>
+        <pad key="pd3" name="PD3"/>
+        <pad key="pd4" name="PD4"/>
+        <pad key="pd5" name="PD5"/>
+        <pad key="pd6" name="PD6"/>
+        <pad key="pd7" name="PD7"/>
+        <pad key="avdd" name="AVDD"/>
+        <pad key="agnd" name="AGND"/>
+        <pad key="pe0" name="PE0"/>
+        <pad key="pe1" name="PE1"/>
+        <pad key="pe2" name="PE2"/>
+        <pad key="pe3" name="PE3"/>
+        <pad key="pf0" name="PF0"/>
+        <pad key="pf1" name="PF1"/>
+        <pad key="pf2" name="PF2"/>
+        <pad key="pf3" name="PF3"/>
+        <pad key="pf4" name="PF4"/>
+        <pad key="pf5" name="PF5"/>
+        <pad key="pf6" name="PF6"/>
+        <pad key="updi" name="UPDI"/>
+        <pad key="vdd1" name="VDD1"/>
+        <pad key="gnd1" name="GND1"/>
+        <pad key="pa0" name="PA0"/>
+        <pad key="pa1" name="PA1"/>
+        <pad key="pa2" name="PA2"/>
+        <pad key="pa3" name="PA3"/>
+        <pad key="pa4" name="PA4"/>
+    </pads>
     <pinouts>
         <pinout key="qfn48" name="QFN48" type="qfn">
-            <pin position="1" pad="PA5"/>
-            <pin position="2" pad="PA6"/>
-            <pin position="3" pad="PA7"/>
-            <pin position="4" pad="PB0"/>
-            <pin position="5" pad="PB1"/>
-            <pin position="6" pad="PB2"/>
-            <pin position="7" pad="PB3"/>
-            <pin position="8" pad="PB4"/>
-            <pin position="9" pad="PB5"/>
-            <pin position="10" pad="PC0"/>
-            <pin position="11" pad="PC1"/>
-            <pin position="12" pad="PC2"/>
-            <pin position="13" pad="PC3"/>
-            <pin position="14" pad="VDD0"/>
-            <pin position="15" pad="GND0"/>
-            <pin position="16" pad="PC4"/>
-            <pin position="17" pad="PC5"/>
-            <pin position="18" pad="PC6"/>
-            <pin position="19" pad="PC7"/>
-            <pin position="20" pad="PD0"/>
-            <pin position="21" pad="PD1"/>
-            <pin position="22" pad="PD2"/>
-            <pin position="23" pad="PD3"/>
-            <pin position="24" pad="PD4"/>
-            <pin position="25" pad="PD5"/>
-            <pin position="26" pad="PD6"/>
-            <pin position="27" pad="PD7"/>
-            <pin position="28" pad="AVDD"/>
-            <pin position="29" pad="AGND"/>
-            <pin position="30" pad="PE0"/>
-            <pin position="31" pad="PE1"/>
-            <pin position="32" pad="PE2"/>
-            <pin position="33" pad="PE3"/>
-            <pin position="34" pad="PF0"/>
-            <pin position="35" pad="PF1"/>
-            <pin position="36" pad="PF2"/>
-            <pin position="37" pad="PF3"/>
-            <pin position="38" pad="PF4"/>
-            <pin position="39" pad="PF5"/>
-            <pin position="40" pad="PF6"/>
-            <pin position="41" pad="UPDI"/>
-            <pin position="42" pad="VDD1"/>
-            <pin position="43" pad="GND1"/>
-            <pin position="44" pad="PA0"/>
-            <pin position="45" pad="PA1"/>
-            <pin position="46" pad="PA2"/>
-            <pin position="47" pad="PA3"/>
-            <pin position="48" pad="PA4"/>
+            <pin position="1" pad-key="pa5"/>
+            <pin position="2" pad-key="pa6"/>
+            <pin position="3" pad-key="pa7"/>
+            <pin position="4" pad-key="pb0"/>
+            <pin position="5" pad-key="pb1"/>
+            <pin position="6" pad-key="pb2"/>
+            <pin position="7" pad-key="pb3"/>
+            <pin position="8" pad-key="pb4"/>
+            <pin position="9" pad-key="pb5"/>
+            <pin position="10" pad-key="pc0"/>
+            <pin position="11" pad-key="pc1"/>
+            <pin position="12" pad-key="pc2"/>
+            <pin position="13" pad-key="pc3"/>
+            <pin position="14" pad-key="vdd0"/>
+            <pin position="15" pad-key="gnd0"/>
+            <pin position="16" pad-key="pc4"/>
+            <pin position="17" pad-key="pc5"/>
+            <pin position="18" pad-key="pc6"/>
+            <pin position="19" pad-key="pc7"/>
+            <pin position="20" pad-key="pd0"/>
+            <pin position="21" pad-key="pd1"/>
+            <pin position="22" pad-key="pd2"/>
+            <pin position="23" pad-key="pd3"/>
+            <pin position="24" pad-key="pd4"/>
+            <pin position="25" pad-key="pd5"/>
+            <pin position="26" pad-key="pd6"/>
+            <pin position="27" pad-key="pd7"/>
+            <pin position="28" pad-key="avdd"/>
+            <pin position="29" pad-key="agnd"/>
+            <pin position="30" pad-key="pe0"/>
+            <pin position="31" pad-key="pe1"/>
+            <pin position="32" pad-key="pe2"/>
+            <pin position="33" pad-key="pe3"/>
+            <pin position="34" pad-key="pf0"/>
+            <pin position="35" pad-key="pf1"/>
+            <pin position="36" pad-key="pf2"/>
+            <pin position="37" pad-key="pf3"/>
+            <pin position="38" pad-key="pf4"/>
+            <pin position="39" pad-key="pf5"/>
+            <pin position="40" pad-key="pf6"/>
+            <pin position="41" pad-key="updi"/>
+            <pin position="42" pad-key="vdd1"/>
+            <pin position="43" pad-key="gnd1"/>
+            <pin position="44" pad-key="pa0"/>
+            <pin position="45" pad-key="pa1"/>
+            <pin position="46" pad-key="pa2"/>
+            <pin position="47" pad-key="pa3"/>
+            <pin position="48" pad-key="pa4"/>
         </pinout>
         <pinout key="qfp48" name="QFP48" type="qfp">
-            <pin position="1" pad="PA5"/>
-            <pin position="2" pad="PA6"/>
-            <pin position="3" pad="PA7"/>
-            <pin position="4" pad="PB0"/>
-            <pin position="5" pad="PB1"/>
-            <pin position="6" pad="PB2"/>
-            <pin position="7" pad="PB3"/>
-            <pin position="8" pad="PB4"/>
-            <pin position="9" pad="PB5"/>
-            <pin position="10" pad="PC0"/>
-            <pin position="11" pad="PC1"/>
-            <pin position="12" pad="PC2"/>
-            <pin position="13" pad="PC3"/>
-            <pin position="14" pad="VDD0"/>
-            <pin position="15" pad="GND0"/>
-            <pin position="16" pad="PC4"/>
-            <pin position="17" pad="PC5"/>
-            <pin position="18" pad="PC6"/>
-            <pin position="19" pad="PC7"/>
-            <pin position="20" pad="PD0"/>
-            <pin position="21" pad="PD1"/>
-            <pin position="22" pad="PD2"/>
-            <pin position="23" pad="PD3"/>
-            <pin position="24" pad="PD4"/>
-            <pin position="25" pad="PD5"/>
-            <pin position="26" pad="PD6"/>
-            <pin position="27" pad="PD7"/>
-            <pin position="28" pad="AVDD"/>
-            <pin position="29" pad="AGND"/>
-            <pin position="30" pad="PE0"/>
-            <pin position="31" pad="PE1"/>
-            <pin position="32" pad="PE2"/>
-            <pin position="33" pad="PE3"/>
-            <pin position="34" pad="PF0"/>
-            <pin position="35" pad="PF1"/>
-            <pin position="36" pad="PF2"/>
-            <pin position="37" pad="PF3"/>
-            <pin position="38" pad="PF4"/>
-            <pin position="39" pad="PF5"/>
-            <pin position="40" pad="PF6"/>
-            <pin position="41" pad="UPDI"/>
-            <pin position="42" pad="VDD1"/>
-            <pin position="43" pad="GND1"/>
-            <pin position="44" pad="PA0"/>
-            <pin position="45" pad="PA1"/>
-            <pin position="46" pad="PA2"/>
-            <pin position="47" pad="PA3"/>
-            <pin position="48" pad="PA4"/>
+            <pin position="1" pad-key="pa5"/>
+            <pin position="2" pad-key="pa6"/>
+            <pin position="3" pad-key="pa7"/>
+            <pin position="4" pad-key="pb0"/>
+            <pin position="5" pad-key="pb1"/>
+            <pin position="6" pad-key="pb2"/>
+            <pin position="7" pad-key="pb3"/>
+            <pin position="8" pad-key="pb4"/>
+            <pin position="9" pad-key="pb5"/>
+            <pin position="10" pad-key="pc0"/>
+            <pin position="11" pad-key="pc1"/>
+            <pin position="12" pad-key="pc2"/>
+            <pin position="13" pad-key="pc3"/>
+            <pin position="14" pad-key="vdd0"/>
+            <pin position="15" pad-key="gnd0"/>
+            <pin position="16" pad-key="pc4"/>
+            <pin position="17" pad-key="pc5"/>
+            <pin position="18" pad-key="pc6"/>
+            <pin position="19" pad-key="pc7"/>
+            <pin position="20" pad-key="pd0"/>
+            <pin position="21" pad-key="pd1"/>
+            <pin position="22" pad-key="pd2"/>
+            <pin position="23" pad-key="pd3"/>
+            <pin position="24" pad-key="pd4"/>
+            <pin position="25" pad-key="pd5"/>
+            <pin position="26" pad-key="pd6"/>
+            <pin position="27" pad-key="pd7"/>
+            <pin position="28" pad-key="avdd"/>
+            <pin position="29" pad-key="agnd"/>
+            <pin position="30" pad-key="pe0"/>
+            <pin position="31" pad-key="pe1"/>
+            <pin position="32" pad-key="pe2"/>
+            <pin position="33" pad-key="pe3"/>
+            <pin position="34" pad-key="pf0"/>
+            <pin position="35" pad-key="pf1"/>
+            <pin position="36" pad-key="pf2"/>
+            <pin position="37" pad-key="pf3"/>
+            <pin position="38" pad-key="pf4"/>
+            <pin position="39" pad-key="pf5"/>
+            <pin position="40" pad-key="pf6"/>
+            <pin position="41" pad-key="updi"/>
+            <pin position="42" pad-key="vdd1"/>
+            <pin position="43" pad-key="gnd1"/>
+            <pin position="44" pad-key="pa0"/>
+            <pin position="45" pad-key="pa1"/>
+            <pin position="46" pad-key="pa2"/>
+            <pin position="47" pad-key="pa3"/>
+            <pin position="48" pad-key="pa4"/>
         </pinout>
     </pinouts>
     <variants>
-        <variant name="ATmega3209-AFR" pinout-key="qfp48" package="TQFP48"/>
-        <variant name="ATmega3209-MFR" pinout-key="qfn48" package="UQFN48"/>
+        <variant key="atmega3209_afr" name="ATmega3209-AFR" pinout-key="qfp48"/>
+        <variant key="atmega3209_mfr" name="ATmega3209-MFR" pinout-key="qfn48"/>
     </variants>
 </device>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA324A.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA324A.xml
index 41dc0738..bcecc32e 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA324A.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA324A.xml
@@ -220,91 +220,91 @@
         <peripheral key="ac" name="AC" module-key="ac">
             <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"/>
+                <signal pad-key="pb2" index="0" function="default" group="AIN"/>
+                <signal pad-key="pb3" index="1" function="default" group="AIN"/>
             </signals>
         </peripheral>
         <peripheral key="usart0" name="USART0" module-key="usart">
             <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"/>
-                <signal pad-id="pb0" function="default" group="XCK"/>
+                <signal pad-key="pd1" function="default" group="TXD"/>
+                <signal pad-key="pd0" function="default" group="RXD"/>
+                <signal pad-key="pb0" function="default" group="XCK"/>
             </signals>
         </peripheral>
         <peripheral key="usart1" name="USART1" module-key="usart">
             <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"/>
-                <signal pad-id="pd4" function="default" group="XCK"/>
+                <signal pad-key="pd3" function="default" group="TXD"/>
+                <signal pad-key="pd2" function="default" group="RXD"/>
+                <signal pad-key="pd4" function="default" group="XCK"/>
             </signals>
         </peripheral>
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pa2" index="2" function="default" group="P"/>
-                <signal pad-id="pa3" index="3" function="default" group="P"/>
-                <signal pad-id="pa4" index="4" function="default" group="P"/>
-                <signal pad-id="pa5" index="5" function="default" group="P"/>
-                <signal pad-id="pa6" index="6" function="default" group="P"/>
-                <signal pad-id="pa7" index="7" function="default" group="P"/>
+                <signal pad-key="pa0" index="0" function="default" group="P"/>
+                <signal pad-key="pa1" index="1" function="default" group="P"/>
+                <signal pad-key="pa2" index="2" function="default" group="P"/>
+                <signal pad-key="pa3" index="3" function="default" group="P"/>
+                <signal pad-key="pa4" index="4" function="default" group="P"/>
+                <signal pad-key="pa5" index="5" function="default" group="P"/>
+                <signal pad-key="pa6" index="6" function="default" group="P"/>
+                <signal pad-key="pa7" index="7" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pb2" index="2" function="default" group="P"/>
-                <signal pad-id="pb3" index="3" function="default" group="P"/>
-                <signal pad-id="pb4" index="4" function="default" group="P"/>
-                <signal pad-id="pb5" index="5" function="default" group="P"/>
-                <signal pad-id="pb6" index="6" function="default" group="P"/>
-                <signal pad-id="pb7" index="7" function="default" group="P"/>
+                <signal pad-key="pb0" index="0" function="default" group="P"/>
+                <signal pad-key="pb1" index="1" function="default" group="P"/>
+                <signal pad-key="pb2" index="2" function="default" group="P"/>
+                <signal pad-key="pb3" index="3" function="default" group="P"/>
+                <signal pad-key="pb4" index="4" function="default" group="P"/>
+                <signal pad-key="pb5" index="5" function="default" group="P"/>
+                <signal pad-key="pb6" index="6" function="default" group="P"/>
+                <signal pad-key="pb7" index="7" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pc2" index="2" function="default" group="P"/>
-                <signal pad-id="pc3" index="3" function="default" group="P"/>
-                <signal pad-id="pc4" index="4" function="default" group="P"/>
-                <signal pad-id="pc5" index="5" function="default" group="P"/>
-                <signal pad-id="pc6" index="6" function="default" group="P"/>
-                <signal pad-id="pc7" index="7" function="default" group="P"/>
+                <signal pad-key="pc0" index="0" function="default" group="P"/>
+                <signal pad-key="pc1" index="1" function="default" group="P"/>
+                <signal pad-key="pc2" index="2" function="default" group="P"/>
+                <signal pad-key="pc3" index="3" function="default" group="P"/>
+                <signal pad-key="pc4" index="4" function="default" group="P"/>
+                <signal pad-key="pc5" index="5" function="default" group="P"/>
+                <signal pad-key="pc6" index="6" function="default" group="P"/>
+                <signal pad-key="pc7" index="7" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pd2" index="2" function="default" group="P"/>
-                <signal pad-id="pd3" index="3" function="default" group="P"/>
-                <signal pad-id="pd4" index="4" function="default" group="P"/>
-                <signal pad-id="pd5" index="5" function="default" group="P"/>
-                <signal pad-id="pd6" index="6" function="default" group="P"/>
-                <signal pad-id="pd7" index="7" function="default" group="P"/>
+                <signal pad-key="pd0" index="0" function="default" group="P"/>
+                <signal pad-key="pd1" index="1" function="default" group="P"/>
+                <signal pad-key="pd2" index="2" function="default" group="P"/>
+                <signal pad-key="pd3" index="3" function="default" group="P"/>
+                <signal pad-key="pd4" index="4" function="default" group="P"/>
+                <signal pad-key="pd5" index="5" function="default" group="P"/>
+                <signal pad-key="pd6" index="6" function="default" group="P"/>
+                <signal pad-key="pd7" index="7" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="tc0" name="TC0" module-key="tc8">
             <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"/>
-                <signal pad-id="pb3" function="default" group="OCA"/>
+                <signal pad-key="pb0" function="default" group="T"/>
+                <signal pad-key="pb4" function="default" group="OCB"/>
+                <signal pad-key="pb3" function="default" group="OCA"/>
             </signals>
         </peripheral>
         <peripheral key="tc2" name="TC2" module-key="tc8_async">
             <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"/>
+                <signal pad-key="pd7" function="default" group="OCA"/>
+                <signal pad-key="pd6" function="default" group="OCB"/>
             </signals>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="wdt">
@@ -313,10 +313,10 @@
         <peripheral key="jtag" name="JTAG" module-key="jtag">
             <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"/>
-                <signal pad-id="pc4" function="default" group="TDO"/>
-                <signal pad-id="pc5" function="default" group="TDI"/>
+                <signal pad-key="pc2" function="default" group="TCK"/>
+                <signal pad-key="pc3" function="default" group="TMS"/>
+                <signal pad-key="pc4" function="default" group="TDO"/>
+                <signal pad-key="pc5" function="default" group="TDI"/>
             </signals>
         </peripheral>
         <peripheral key="boot_load" name="BOOT_LOAD" module-key="boot_load">
@@ -325,63 +325,63 @@
         <peripheral key="exint" name="EXINT" module-key="exint">
             <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"/>
-                <signal pad-id="pa2" index="2" function="default" group="PCINT"/>
-                <signal pad-id="pa3" index="3" function="default" group="PCINT"/>
-                <signal pad-id="pa4" index="4" function="default" group="PCINT"/>
-                <signal pad-id="pa5" index="5" function="default" group="PCINT"/>
-                <signal pad-id="pa6" index="6" function="default" group="PCINT"/>
-                <signal pad-id="pa7" index="7" function="default" group="PCINT"/>
-                <signal pad-id="pb0" index="8" function="default" group="PCINT"/>
-                <signal pad-id="pb1" index="9" function="default" group="PCINT"/>
-                <signal pad-id="pb2" index="10" function="default" group="PCINT"/>
-                <signal pad-id="pb3" index="11" function="default" group="PCINT"/>
-                <signal pad-id="pb4" index="12" function="default" group="PCINT"/>
-                <signal pad-id="pb5" index="13" function="default" group="PCINT"/>
-                <signal pad-id="pb6" index="14" function="default" group="PCINT"/>
-                <signal pad-id="pb7" index="15" function="default" group="PCINT"/>
-                <signal pad-id="pc0" index="16" function="default" group="PCINT"/>
-                <signal pad-id="pc1" index="17" function="default" group="PCINT"/>
-                <signal pad-id="pc2" index="18" function="default" group="PCINT"/>
-                <signal pad-id="pc3" index="19" function="default" group="PCINT"/>
-                <signal pad-id="pc4" index="20" function="default" group="PCINT"/>
-                <signal pad-id="pc5" index="21" function="default" group="PCINT"/>
-                <signal pad-id="pc6" index="22" function="default" group="PCINT"/>
-                <signal pad-id="pc7" index="23" function="default" group="PCINT"/>
-                <signal pad-id="pd0" index="24" function="default" group="PCINT"/>
-                <signal pad-id="pd1" index="25" function="default" group="PCINT"/>
-                <signal pad-id="pd2" index="26" function="default" group="PCINT"/>
-                <signal pad-id="pd3" index="27" function="default" group="PCINT"/>
-                <signal pad-id="pd4" index="28" function="default" group="PCINT"/>
-                <signal pad-id="pd5" index="29" function="default" group="PCINT"/>
-                <signal pad-id="pd6" index="30" function="default" group="PCINT"/>
-                <signal pad-id="pd7" index="31" function="default" group="PCINT"/>
-                <signal pad-id="pd2" index="0" function="default" group="INT0"/>
-                <signal pad-id="pd3" index="1" function="default" group="INT1"/>
-                <signal pad-id="pb2" index="2" function="default" group="INT2"/>
+                <signal pad-key="pa0" index="0" function="default" group="PCINT"/>
+                <signal pad-key="pa1" index="1" function="default" group="PCINT"/>
+                <signal pad-key="pa2" index="2" function="default" group="PCINT"/>
+                <signal pad-key="pa3" index="3" function="default" group="PCINT"/>
+                <signal pad-key="pa4" index="4" function="default" group="PCINT"/>
+                <signal pad-key="pa5" index="5" function="default" group="PCINT"/>
+                <signal pad-key="pa6" index="6" function="default" group="PCINT"/>
+                <signal pad-key="pa7" index="7" function="default" group="PCINT"/>
+                <signal pad-key="pb0" index="8" function="default" group="PCINT"/>
+                <signal pad-key="pb1" index="9" function="default" group="PCINT"/>
+                <signal pad-key="pb2" index="10" function="default" group="PCINT"/>
+                <signal pad-key="pb3" index="11" function="default" group="PCINT"/>
+                <signal pad-key="pb4" index="12" function="default" group="PCINT"/>
+                <signal pad-key="pb5" index="13" function="default" group="PCINT"/>
+                <signal pad-key="pb6" index="14" function="default" group="PCINT"/>
+                <signal pad-key="pb7" index="15" function="default" group="PCINT"/>
+                <signal pad-key="pc0" index="16" function="default" group="PCINT"/>
+                <signal pad-key="pc1" index="17" function="default" group="PCINT"/>
+                <signal pad-key="pc2" index="18" function="default" group="PCINT"/>
+                <signal pad-key="pc3" index="19" function="default" group="PCINT"/>
+                <signal pad-key="pc4" index="20" function="default" group="PCINT"/>
+                <signal pad-key="pc5" index="21" function="default" group="PCINT"/>
+                <signal pad-key="pc6" index="22" function="default" group="PCINT"/>
+                <signal pad-key="pc7" index="23" function="default" group="PCINT"/>
+                <signal pad-key="pd0" index="24" function="default" group="PCINT"/>
+                <signal pad-key="pd1" index="25" function="default" group="PCINT"/>
+                <signal pad-key="pd2" index="26" function="default" group="PCINT"/>
+                <signal pad-key="pd3" index="27" function="default" group="PCINT"/>
+                <signal pad-key="pd4" index="28" function="default" group="PCINT"/>
+                <signal pad-key="pd5" index="29" function="default" group="PCINT"/>
+                <signal pad-key="pd6" index="30" function="default" group="PCINT"/>
+                <signal pad-key="pd7" index="31" function="default" group="PCINT"/>
+                <signal pad-key="pd2" index="0" function="default" group="INT0"/>
+                <signal pad-key="pd3" index="1" function="default" group="INT1"/>
+                <signal pad-key="pb2" index="2" function="default" group="INT2"/>
             </signals>
         </peripheral>
         <peripheral key="adc" name="ADC" module-key="adc">
             <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"/>
-                <signal pad-id="pa2" index="2" function="default" group="ADC"/>
-                <signal pad-id="pa3" index="3" function="default" group="ADC"/>
-                <signal pad-id="pa4" index="4" function="default" group="ADC"/>
-                <signal pad-id="pa5" index="5" function="default" group="ADC"/>
-                <signal pad-id="pa6" index="6" function="default" group="ADC"/>
-                <signal pad-id="pa7" index="7" function="default" group="ADC"/>
+                <signal pad-key="pa0" index="0" function="default" group="ADC"/>
+                <signal pad-key="pa1" index="1" function="default" group="ADC"/>
+                <signal pad-key="pa2" index="2" function="default" group="ADC"/>
+                <signal pad-key="pa3" index="3" function="default" group="ADC"/>
+                <signal pad-key="pa4" index="4" function="default" group="ADC"/>
+                <signal pad-key="pa5" index="5" function="default" group="ADC"/>
+                <signal pad-key="pa6" index="6" function="default" group="ADC"/>
+                <signal pad-key="pa7" index="7" function="default" group="ADC"/>
             </signals>
         </peripheral>
         <peripheral key="tc1" name="TC1" module-key="tc16">
             <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"/>
-                <signal pad-id="pd5" function="default" group="OCA"/>
-                <signal pad-id="pd4" function="default" group="OCB"/>
+                <signal pad-key="pb1" function="default" group="T"/>
+                <signal pad-key="pd6" function="default" group="ICP"/>
+                <signal pad-key="pd5" function="default" group="OCA"/>
+                <signal pad-key="pd4" function="default" group="OCB"/>
             </signals>
         </peripheral>
         <peripheral key="eeprom" name="EEPROM" module-key="eeprom">
@@ -390,23 +390,23 @@
         <peripheral key="spi" name="SPI" module-key="spi">
             <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"/>
-                <signal pad-id="pb6" function="default" group="MISO"/>
-                <signal pad-id="pb7" function="default" group="SCK"/>
+                <signal pad-key="pb4" function="default" group="SS"/>
+                <signal pad-key="pb5" function="default" group="MOSI"/>
+                <signal pad-key="pb6" function="default" group="MISO"/>
+                <signal pad-key="pb7" function="default" group="SCK"/>
             </signals>
         </peripheral>
         <peripheral key="twi" name="TWI" module-key="twi">
             <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"/>
+                <signal pad-key="pc1" function="default" group="SDA"/>
+                <signal pad-key="pc0" function="default" group="SCL"/>
             </signals>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="cpu">
             <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"/>
+                <signal pad-key="pb1" index="0" function="default" group="CLKO"/>
             </signals>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="fuse">
@@ -887,198 +887,240 @@
             </register-group>
         </module>
     </modules>
+    <pads>
+        <pad key="pb5" name="PB5"/>
+        <pad key="pb6" name="PB6"/>
+        <pad key="pb7" name="PB7"/>
+        <pad key="reset" name="RESET"/>
+        <pad key="vcc" name="VCC"/>
+        <pad key="gnd" name="GND"/>
+        <pad key="xtal2" name="XTAL2"/>
+        <pad key="xtal1" name="XTAL1"/>
+        <pad key="pd0" name="PD0"/>
+        <pad key="pd1" name="PD1"/>
+        <pad key="pd2" name="PD2"/>
+        <pad key="pd3" name="PD3"/>
+        <pad key="pd4" name="PD4"/>
+        <pad key="pd5" name="PD5"/>
+        <pad key="pd6" name="PD6"/>
+        <pad key="pd7" name="PD7"/>
+        <pad key="pc0" name="PC0"/>
+        <pad key="pc1" name="PC1"/>
+        <pad key="pc2" name="PC2"/>
+        <pad key="pc3" name="PC3"/>
+        <pad key="pc4" name="PC4"/>
+        <pad key="pc5" name="PC5"/>
+        <pad key="pc6" name="PC6"/>
+        <pad key="pc7" name="PC7"/>
+        <pad key="avcc" name="AVCC"/>
+        <pad key="aref" name="AREF"/>
+        <pad key="pa7" name="PA7"/>
+        <pad key="pa6" name="PA6"/>
+        <pad key="pa5" name="PA5"/>
+        <pad key="pa4" name="PA4"/>
+        <pad key="pa3" name="PA3"/>
+        <pad key="pa2" name="PA2"/>
+        <pad key="pa1" name="PA1"/>
+        <pad key="pa0" name="PA0"/>
+        <pad key="pb0" name="PB0"/>
+        <pad key="pb1" name="PB1"/>
+        <pad key="pb2" name="PB2"/>
+        <pad key="pb3" name="PB3"/>
+        <pad key="pb4" name="PB4"/>
+        <pad key="ref" name="REF"/>
+    </pads>
     <pinouts>
         <pinout key="drqfn_44" name="DRQFN_44" type="drqfn">
-            <pin position="A1" pad="PB5"/>
-            <pin position="B1" pad="PB6"/>
-            <pin position="A2" pad="PB7"/>
-            <pin position="B2" pad="RESET"/>
-            <pin position="A3" pad="VCC"/>
-            <pin position="B3" pad="GND"/>
-            <pin position="A4" pad="XTAL2"/>
-            <pin position="B4" pad="XTAL1"/>
-            <pin position="A5" pad="PD0"/>
-            <pin position="B5" pad="PD1"/>
-            <pin position="A6" pad="PD2"/>
-            <pin position="A7" pad="PD3"/>
-            <pin position="B6" pad="PD4"/>
-            <pin position="A8" pad="PD5"/>
-            <pin position="B7" pad="PD6"/>
-            <pin position="A9" pad="PD7"/>
-            <pin position="B8" pad="VCC"/>
-            <pin position="A10" pad="GND"/>
-            <pin position="B9" pad="PC0"/>
-            <pin position="A11" pad="PC1"/>
-            <pin position="B10" pad="PC2"/>
-            <pin position="A12" pad="PC3"/>
-            <pin position="A13" pad="PC4"/>
-            <pin position="B11" pad="PC5"/>
-            <pin position="A14" pad="PC6"/>
-            <pin position="B12" pad="PC7"/>
-            <pin position="A15" pad="AVCC"/>
-            <pin position="B13" pad="GND"/>
-            <pin position="A16" pad="AREF"/>
-            <pin position="B14" pad="PA7"/>
-            <pin position="A17" pad="PA6"/>
-            <pin position="B15" pad="PA5"/>
-            <pin position="A18" pad="PA4"/>
-            <pin position="A19" pad="PA3"/>
-            <pin position="B16" pad="PA2"/>
-            <pin position="A20" pad="PA1"/>
-            <pin position="B17" pad="PA0"/>
-            <pin position="A21" pad="VCC"/>
-            <pin position="B18" pad="GND"/>
-            <pin position="A22" pad="PB0"/>
-            <pin position="B19" pad="PB1"/>
-            <pin position="A23" pad="PB2"/>
-            <pin position="B20" pad="PB3"/>
-            <pin position="A24" pad="PB4"/>
+            <pin position="A1" pad-key="pb5"/>
+            <pin position="B1" pad-key="pb6"/>
+            <pin position="A2" pad-key="pb7"/>
+            <pin position="B2" pad-key="reset"/>
+            <pin position="A3" pad-key="vcc"/>
+            <pin position="B3" pad-key="gnd"/>
+            <pin position="A4" pad-key="xtal2"/>
+            <pin position="B4" pad-key="xtal1"/>
+            <pin position="A5" pad-key="pd0"/>
+            <pin position="B5" pad-key="pd1"/>
+            <pin position="A6" pad-key="pd2"/>
+            <pin position="A7" pad-key="pd3"/>
+            <pin position="B6" pad-key="pd4"/>
+            <pin position="A8" pad-key="pd5"/>
+            <pin position="B7" pad-key="pd6"/>
+            <pin position="A9" pad-key="pd7"/>
+            <pin position="B8" pad-key="vcc"/>
+            <pin position="A10" pad-key="gnd"/>
+            <pin position="B9" pad-key="pc0"/>
+            <pin position="A11" pad-key="pc1"/>
+            <pin position="B10" pad-key="pc2"/>
+            <pin position="A12" pad-key="pc3"/>
+            <pin position="A13" pad-key="pc4"/>
+            <pin position="B11" pad-key="pc5"/>
+            <pin position="A14" pad-key="pc6"/>
+            <pin position="B12" pad-key="pc7"/>
+            <pin position="A15" pad-key="avcc"/>
+            <pin position="B13" pad-key="gnd"/>
+            <pin position="A16" pad-key="aref"/>
+            <pin position="B14" pad-key="pa7"/>
+            <pin position="A17" pad-key="pa6"/>
+            <pin position="B15" pad-key="pa5"/>
+            <pin position="A18" pad-key="pa4"/>
+            <pin position="A19" pad-key="pa3"/>
+            <pin position="B16" pad-key="pa2"/>
+            <pin position="A20" pad-key="pa1"/>
+            <pin position="B17" pad-key="pa0"/>
+            <pin position="A21" pad-key="vcc"/>
+            <pin position="B18" pad-key="gnd"/>
+            <pin position="A22" pad-key="pb0"/>
+            <pin position="B19" pad-key="pb1"/>
+            <pin position="A23" pad-key="pb2"/>
+            <pin position="B20" pad-key="pb3"/>
+            <pin position="A24" pad-key="pb4"/>
         </pinout>
         <pinout key="pdip40" name="PDIP40" type="dip">
-            <pin position="1" pad="PB0"/>
-            <pin position="2" pad="PB1"/>
-            <pin position="3" pad="PB2"/>
-            <pin position="4" pad="PB3"/>
-            <pin position="5" pad="PB4"/>
-            <pin position="6" pad="PB5"/>
-            <pin position="7" pad="PB6"/>
-            <pin position="8" pad="PB7"/>
-            <pin position="9" pad="RESET"/>
-            <pin position="10" pad="VCC"/>
-            <pin position="11" pad="GND"/>
-            <pin position="12" pad="XTAL2"/>
-            <pin position="13" pad="XTAL1"/>
-            <pin position="14" pad="PD0"/>
-            <pin position="15" pad="PD1"/>
-            <pin position="16" pad="PD2"/>
-            <pin position="17" pad="PD3"/>
-            <pin position="18" pad="PD4"/>
-            <pin position="19" pad="PD5"/>
-            <pin position="20" pad="PD6"/>
-            <pin position="21" pad="PD7"/>
-            <pin position="22" pad="PC0"/>
-            <pin position="23" pad="PC1"/>
-            <pin position="24" pad="PC2"/>
-            <pin position="25" pad="PC3"/>
-            <pin position="26" pad="PC4"/>
-            <pin position="27" pad="PC5"/>
-            <pin position="28" pad="PC6"/>
-            <pin position="29" pad="PC7"/>
-            <pin position="30" pad="AVCC"/>
-            <pin position="31" pad="GND"/>
-            <pin position="32" pad="AREF"/>
-            <pin position="33" pad="PA7"/>
-            <pin position="34" pad="PA6"/>
-            <pin position="35" pad="PA5"/>
-            <pin position="36" pad="PA4"/>
-            <pin position="37" pad="PA3"/>
-            <pin position="38" pad="PA2"/>
-            <pin position="39" pad="PA1"/>
-            <pin position="40" pad="PA0"/>
+            <pin position="1" pad-key="pb0"/>
+            <pin position="2" pad-key="pb1"/>
+            <pin position="3" pad-key="pb2"/>
+            <pin position="4" pad-key="pb3"/>
+            <pin position="5" pad-key="pb4"/>
+            <pin position="6" pad-key="pb5"/>
+            <pin position="7" pad-key="pb6"/>
+            <pin position="8" pad-key="pb7"/>
+            <pin position="9" pad-key="reset"/>
+            <pin position="10" pad-key="vcc"/>
+            <pin position="11" pad-key="gnd"/>
+            <pin position="12" pad-key="xtal2"/>
+            <pin position="13" pad-key="xtal1"/>
+            <pin position="14" pad-key="pd0"/>
+            <pin position="15" pad-key="pd1"/>
+            <pin position="16" pad-key="pd2"/>
+            <pin position="17" pad-key="pd3"/>
+            <pin position="18" pad-key="pd4"/>
+            <pin position="19" pad-key="pd5"/>
+            <pin position="20" pad-key="pd6"/>
+            <pin position="21" pad-key="pd7"/>
+            <pin position="22" pad-key="pc0"/>
+            <pin position="23" pad-key="pc1"/>
+            <pin position="24" pad-key="pc2"/>
+            <pin position="25" pad-key="pc3"/>
+            <pin position="26" pad-key="pc4"/>
+            <pin position="27" pad-key="pc5"/>
+            <pin position="28" pad-key="pc6"/>
+            <pin position="29" pad-key="pc7"/>
+            <pin position="30" pad-key="avcc"/>
+            <pin position="31" pad-key="gnd"/>
+            <pin position="32" pad-key="aref"/>
+            <pin position="33" pad-key="pa7"/>
+            <pin position="34" pad-key="pa6"/>
+            <pin position="35" pad-key="pa5"/>
+            <pin position="36" pad-key="pa4"/>
+            <pin position="37" pad-key="pa3"/>
+            <pin position="38" pad-key="pa2"/>
+            <pin position="39" pad-key="pa1"/>
+            <pin position="40" pad-key="pa0"/>
         </pinout>
         <pinout key="tqfp_qfn_44" name="TQFP_QFN_44" type="qfn">
-            <pin position="1" pad="PB5"/>
-            <pin position="2" pad="PB6"/>
-            <pin position="3" pad="PB7"/>
-            <pin position="4" pad="RESET"/>
-            <pin position="5" pad="VCC"/>
-            <pin position="6" pad="GND"/>
-            <pin position="7" pad="XTAL2"/>
-            <pin position="8" pad="XTAL1"/>
-            <pin position="9" pad="PD0"/>
-            <pin position="10" pad="PD1"/>
-            <pin position="11" pad="PD2"/>
-            <pin position="12" pad="PD3"/>
-            <pin position="13" pad="PD4"/>
-            <pin position="14" pad="PD5"/>
-            <pin position="15" pad="PD6"/>
-            <pin position="16" pad="PD7"/>
-            <pin position="17" pad="VCC"/>
-            <pin position="18" pad="GND"/>
-            <pin position="19" pad="PC0"/>
-            <pin position="20" pad="PC1"/>
-            <pin position="21" pad="PC2"/>
-            <pin position="22" pad="PC3"/>
-            <pin position="23" pad="PC4"/>
-            <pin position="24" pad="PC5"/>
-            <pin position="25" pad="PC6"/>
-            <pin position="26" pad="PC7"/>
-            <pin position="27" pad="AVCC"/>
-            <pin position="28" pad="GND"/>
-            <pin position="29" pad="REF"/>
-            <pin position="30" pad="PA7"/>
-            <pin position="31" pad="PA6"/>
-            <pin position="32" pad="PA5"/>
-            <pin position="33" pad="PA4"/>
-            <pin position="34" pad="PA3"/>
-            <pin position="35" pad="PA2"/>
-            <pin position="36" pad="PA1"/>
-            <pin position="37" pad="PA0"/>
-            <pin position="38" pad="VCC"/>
-            <pin position="39" pad="GND"/>
-            <pin position="40" pad="PB0"/>
-            <pin position="41" pad="PB1"/>
-            <pin position="42" pad="PB2"/>
-            <pin position="43" pad="PB3"/>
-            <pin position="44" pad="PB4"/>
+            <pin position="1" pad-key="pb5"/>
+            <pin position="2" pad-key="pb6"/>
+            <pin position="3" pad-key="pb7"/>
+            <pin position="4" pad-key="reset"/>
+            <pin position="5" pad-key="vcc"/>
+            <pin position="6" pad-key="gnd"/>
+            <pin position="7" pad-key="xtal2"/>
+            <pin position="8" pad-key="xtal1"/>
+            <pin position="9" pad-key="pd0"/>
+            <pin position="10" pad-key="pd1"/>
+            <pin position="11" pad-key="pd2"/>
+            <pin position="12" pad-key="pd3"/>
+            <pin position="13" pad-key="pd4"/>
+            <pin position="14" pad-key="pd5"/>
+            <pin position="15" pad-key="pd6"/>
+            <pin position="16" pad-key="pd7"/>
+            <pin position="17" pad-key="vcc"/>
+            <pin position="18" pad-key="gnd"/>
+            <pin position="19" pad-key="pc0"/>
+            <pin position="20" pad-key="pc1"/>
+            <pin position="21" pad-key="pc2"/>
+            <pin position="22" pad-key="pc3"/>
+            <pin position="23" pad-key="pc4"/>
+            <pin position="24" pad-key="pc5"/>
+            <pin position="25" pad-key="pc6"/>
+            <pin position="26" pad-key="pc7"/>
+            <pin position="27" pad-key="avcc"/>
+            <pin position="28" pad-key="gnd"/>
+            <pin position="29" pad-key="ref"/>
+            <pin position="30" pad-key="pa7"/>
+            <pin position="31" pad-key="pa6"/>
+            <pin position="32" pad-key="pa5"/>
+            <pin position="33" pad-key="pa4"/>
+            <pin position="34" pad-key="pa3"/>
+            <pin position="35" pad-key="pa2"/>
+            <pin position="36" pad-key="pa1"/>
+            <pin position="37" pad-key="pa0"/>
+            <pin position="38" pad-key="vcc"/>
+            <pin position="39" pad-key="gnd"/>
+            <pin position="40" pad-key="pb0"/>
+            <pin position="41" pad-key="pb1"/>
+            <pin position="42" pad-key="pb2"/>
+            <pin position="43" pad-key="pb3"/>
+            <pin position="44" pad-key="pb4"/>
         </pinout>
         <pinout key="vfbga49" name="VFBGA49" type="bga">
-            <pin position="A1" pad="GND"/>
-            <pin position="A2" pad="PB4"/>
-            <pin position="A3" pad="PB2"/>
-            <pin position="A4" pad="GND"/>
-            <pin position="A5" pad="VCC"/>
-            <pin position="A6" pad="PA2"/>
-            <pin position="A7" pad="GND"/>
-            <pin position="B1" pad="PB6"/>
-            <pin position="B2" pad="PB5"/>
-            <pin position="B3" pad="PB3"/>
-            <pin position="B4" pad="PB0"/>
-            <pin position="B5" pad="PA0"/>
-            <pin position="B6" pad="PA3"/>
-            <pin position="B7" pad="PA5"/>
-            <pin position="C1" pad="VCC"/>
-            <pin position="C2" pad="RESET"/>
-            <pin position="C3" pad="PB7"/>
-            <pin position="C4" pad="PB1"/>
-            <pin position="C5" pad="PA1"/>
-            <pin position="C6" pad="PA6"/>
-            <pin position="C7" pad="AREF"/>
-            <pin position="D1" pad="GND"/>
-            <pin position="D2" pad="XTAL2"/>
-            <pin position="D3" pad="PD0"/>
-            <pin position="D4" pad="GND"/>
-            <pin position="D5" pad="PA4"/>
-            <pin position="D6" pad="PA7"/>
-            <pin position="D7" pad="GND"/>
-            <pin position="E1" pad="XTAL1"/>
-            <pin position="E2" pad="PD1"/>
-            <pin position="E3" pad="PD5"/>
-            <pin position="E4" pad="PD7"/>
-            <pin position="E5" pad="PC5"/>
-            <pin position="E6" pad="PC7"/>
-            <pin position="E7" pad="AVCC"/>
-            <pin position="F1" pad="PD2"/>
-            <pin position="F2" pad="PD3"/>
-            <pin position="F3" pad="PD6"/>
-            <pin position="F4" pad="PC0"/>
-            <pin position="F5" pad="PC2"/>
-            <pin position="F6" pad="PC4"/>
-            <pin position="F7" pad="PC6"/>
-            <pin position="G1" pad="GND"/>
-            <pin position="G2" pad="PD4"/>
-            <pin position="G3" pad="VCC"/>
-            <pin position="G4" pad="GND"/>
-            <pin position="G5" pad="PC1"/>
-            <pin position="G6" pad="PC3"/>
-            <pin position="G7" pad="GND"/>
+            <pin position="A1" pad-key="gnd"/>
+            <pin position="A2" pad-key="pb4"/>
+            <pin position="A3" pad-key="pb2"/>
+            <pin position="A4" pad-key="gnd"/>
+            <pin position="A5" pad-key="vcc"/>
+            <pin position="A6" pad-key="pa2"/>
+            <pin position="A7" pad-key="gnd"/>
+            <pin position="B1" pad-key="pb6"/>
+            <pin position="B2" pad-key="pb5"/>
+            <pin position="B3" pad-key="pb3"/>
+            <pin position="B4" pad-key="pb0"/>
+            <pin position="B5" pad-key="pa0"/>
+            <pin position="B6" pad-key="pa3"/>
+            <pin position="B7" pad-key="pa5"/>
+            <pin position="C1" pad-key="vcc"/>
+            <pin position="C2" pad-key="reset"/>
+            <pin position="C3" pad-key="pb7"/>
+            <pin position="C4" pad-key="pb1"/>
+            <pin position="C5" pad-key="pa1"/>
+            <pin position="C6" pad-key="pa6"/>
+            <pin position="C7" pad-key="aref"/>
+            <pin position="D1" pad-key="gnd"/>
+            <pin position="D2" pad-key="xtal2"/>
+            <pin position="D3" pad-key="pd0"/>
+            <pin position="D4" pad-key="gnd"/>
+            <pin position="D5" pad-key="pa4"/>
+            <pin position="D6" pad-key="pa7"/>
+            <pin position="D7" pad-key="gnd"/>
+            <pin position="E1" pad-key="xtal1"/>
+            <pin position="E2" pad-key="pd1"/>
+            <pin position="E3" pad-key="pd5"/>
+            <pin position="E4" pad-key="pd7"/>
+            <pin position="E5" pad-key="pc5"/>
+            <pin position="E6" pad-key="pc7"/>
+            <pin position="E7" pad-key="avcc"/>
+            <pin position="F1" pad-key="pd2"/>
+            <pin position="F2" pad-key="pd3"/>
+            <pin position="F3" pad-key="pd6"/>
+            <pin position="F4" pad-key="pc0"/>
+            <pin position="F5" pad-key="pc2"/>
+            <pin position="F6" pad-key="pc4"/>
+            <pin position="F7" pad-key="pc6"/>
+            <pin position="G1" pad-key="gnd"/>
+            <pin position="G2" pad-key="pd4"/>
+            <pin position="G3" pad-key="vcc"/>
+            <pin position="G4" pad-key="gnd"/>
+            <pin position="G5" pad-key="pc1"/>
+            <pin position="G6" pad-key="pc3"/>
+            <pin position="G7" pad-key="gnd"/>
         </pinout>
     </pinouts>
     <variants>
-        <variant name="ATmega324A-AU" pinout-key="tqfp_qfn_44" package="TQFP44"/>
-        <variant name="ATmega324A-PU" pinout-key="pdip40" package="PDIP40"/>
-        <variant name="ATmega324A-MU" pinout-key="tqfp_qfn_44" package="VQFN44"/>
-        <variant name="ATmega324A-MCH" pinout-key="drqfn_44" package="DRQFN44"/>
-        <variant name="ATmega324A-CU" pinout-key="vfbga49" package="VFBGA49"/>
+        <variant key="atmega324a_au" name="ATmega324A-AU" pinout-key="tqfp_qfn_44"/>
+        <variant key="atmega324a_pu" name="ATmega324A-PU" pinout-key="pdip40"/>
+        <variant key="atmega324a_mu" name="ATmega324A-MU" pinout-key="tqfp_qfn_44"/>
+        <variant key="atmega324a_mch" name="ATmega324A-MCH" pinout-key="drqfn_44"/>
+        <variant key="atmega324a_cu" name="ATmega324A-CU" pinout-key="vfbga49"/>
     </variants>
 </device>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA324P.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA324P.xml
index e0027895..e43cf08d 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA324P.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA324P.xml
@@ -220,91 +220,91 @@
         <peripheral key="ac" name="AC" module-key="ac">
             <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"/>
+                <signal pad-key="pb2" index="0" function="default" group="AIN"/>
+                <signal pad-key="pb3" index="1" function="default" group="AIN"/>
             </signals>
         </peripheral>
         <peripheral key="usart0" name="USART0" module-key="usart">
             <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"/>
-                <signal pad-id="pb0" function="default" group="XCK"/>
+                <signal pad-key="pd1" function="default" group="TXD"/>
+                <signal pad-key="pd0" function="default" group="RXD"/>
+                <signal pad-key="pb0" function="default" group="XCK"/>
             </signals>
         </peripheral>
         <peripheral key="usart1" name="USART1" module-key="usart">
             <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"/>
-                <signal pad-id="pd4" function="default" group="XCK"/>
+                <signal pad-key="pd3" function="default" group="TXD"/>
+                <signal pad-key="pd2" function="default" group="RXD"/>
+                <signal pad-key="pd4" function="default" group="XCK"/>
             </signals>
         </peripheral>
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pa2" index="2" function="default" group="P"/>
-                <signal pad-id="pa3" index="3" function="default" group="P"/>
-                <signal pad-id="pa4" index="4" function="default" group="P"/>
-                <signal pad-id="pa5" index="5" function="default" group="P"/>
-                <signal pad-id="pa6" index="6" function="default" group="P"/>
-                <signal pad-id="pa7" index="7" function="default" group="P"/>
+                <signal pad-key="pa0" index="0" function="default" group="P"/>
+                <signal pad-key="pa1" index="1" function="default" group="P"/>
+                <signal pad-key="pa2" index="2" function="default" group="P"/>
+                <signal pad-key="pa3" index="3" function="default" group="P"/>
+                <signal pad-key="pa4" index="4" function="default" group="P"/>
+                <signal pad-key="pa5" index="5" function="default" group="P"/>
+                <signal pad-key="pa6" index="6" function="default" group="P"/>
+                <signal pad-key="pa7" index="7" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pb2" index="2" function="default" group="P"/>
-                <signal pad-id="pb3" index="3" function="default" group="P"/>
-                <signal pad-id="pb4" index="4" function="default" group="P"/>
-                <signal pad-id="pb5" index="5" function="default" group="P"/>
-                <signal pad-id="pb6" index="6" function="default" group="P"/>
-                <signal pad-id="pb7" index="7" function="default" group="P"/>
+                <signal pad-key="pb0" index="0" function="default" group="P"/>
+                <signal pad-key="pb1" index="1" function="default" group="P"/>
+                <signal pad-key="pb2" index="2" function="default" group="P"/>
+                <signal pad-key="pb3" index="3" function="default" group="P"/>
+                <signal pad-key="pb4" index="4" function="default" group="P"/>
+                <signal pad-key="pb5" index="5" function="default" group="P"/>
+                <signal pad-key="pb6" index="6" function="default" group="P"/>
+                <signal pad-key="pb7" index="7" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pc2" index="2" function="default" group="P"/>
-                <signal pad-id="pc3" index="3" function="default" group="P"/>
-                <signal pad-id="pc4" index="4" function="default" group="P"/>
-                <signal pad-id="pc5" index="5" function="default" group="P"/>
-                <signal pad-id="pc6" index="6" function="default" group="P"/>
-                <signal pad-id="pc7" index="7" function="default" group="P"/>
+                <signal pad-key="pc0" index="0" function="default" group="P"/>
+                <signal pad-key="pc1" index="1" function="default" group="P"/>
+                <signal pad-key="pc2" index="2" function="default" group="P"/>
+                <signal pad-key="pc3" index="3" function="default" group="P"/>
+                <signal pad-key="pc4" index="4" function="default" group="P"/>
+                <signal pad-key="pc5" index="5" function="default" group="P"/>
+                <signal pad-key="pc6" index="6" function="default" group="P"/>
+                <signal pad-key="pc7" index="7" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pd2" index="2" function="default" group="P"/>
-                <signal pad-id="pd3" index="3" function="default" group="P"/>
-                <signal pad-id="pd4" index="4" function="default" group="P"/>
-                <signal pad-id="pd5" index="5" function="default" group="P"/>
-                <signal pad-id="pd6" index="6" function="default" group="P"/>
-                <signal pad-id="pd7" index="7" function="default" group="P"/>
+                <signal pad-key="pd0" index="0" function="default" group="P"/>
+                <signal pad-key="pd1" index="1" function="default" group="P"/>
+                <signal pad-key="pd2" index="2" function="default" group="P"/>
+                <signal pad-key="pd3" index="3" function="default" group="P"/>
+                <signal pad-key="pd4" index="4" function="default" group="P"/>
+                <signal pad-key="pd5" index="5" function="default" group="P"/>
+                <signal pad-key="pd6" index="6" function="default" group="P"/>
+                <signal pad-key="pd7" index="7" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="tc0" name="TC0" module-key="tc8">
             <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"/>
-                <signal pad-id="pb3" function="default" group="OCA"/>
+                <signal pad-key="pb0" function="default" group="T"/>
+                <signal pad-key="pb4" function="default" group="OCB"/>
+                <signal pad-key="pb3" function="default" group="OCA"/>
             </signals>
         </peripheral>
         <peripheral key="tc2" name="TC2" module-key="tc8_async">
             <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"/>
+                <signal pad-key="pd7" function="default" group="OCA"/>
+                <signal pad-key="pd6" function="default" group="OCB"/>
             </signals>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="wdt">
@@ -313,10 +313,10 @@
         <peripheral key="jtag" name="JTAG" module-key="jtag">
             <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"/>
-                <signal pad-id="pc4" function="default" group="TDO"/>
-                <signal pad-id="pc5" function="default" group="TDI"/>
+                <signal pad-key="pc2" function="default" group="TCK"/>
+                <signal pad-key="pc3" function="default" group="TMS"/>
+                <signal pad-key="pc4" function="default" group="TDO"/>
+                <signal pad-key="pc5" function="default" group="TDI"/>
             </signals>
         </peripheral>
         <peripheral key="boot_load" name="BOOT_LOAD" module-key="boot_load">
@@ -325,63 +325,63 @@
         <peripheral key="exint" name="EXINT" module-key="exint">
             <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"/>
-                <signal pad-id="pa2" index="2" function="default" group="PCINT"/>
-                <signal pad-id="pa3" index="3" function="default" group="PCINT"/>
-                <signal pad-id="pa4" index="4" function="default" group="PCINT"/>
-                <signal pad-id="pa5" index="5" function="default" group="PCINT"/>
-                <signal pad-id="pa6" index="6" function="default" group="PCINT"/>
-                <signal pad-id="pa7" index="7" function="default" group="PCINT"/>
-                <signal pad-id="pb0" index="8" function="default" group="PCINT"/>
-                <signal pad-id="pb1" index="9" function="default" group="PCINT"/>
-                <signal pad-id="pb2" index="10" function="default" group="PCINT"/>
-                <signal pad-id="pb3" index="11" function="default" group="PCINT"/>
-                <signal pad-id="pb4" index="12" function="default" group="PCINT"/>
-                <signal pad-id="pb5" index="13" function="default" group="PCINT"/>
-                <signal pad-id="pb6" index="14" function="default" group="PCINT"/>
-                <signal pad-id="pb7" index="15" function="default" group="PCINT"/>
-                <signal pad-id="pc0" index="16" function="default" group="PCINT"/>
-                <signal pad-id="pc1" index="17" function="default" group="PCINT"/>
-                <signal pad-id="pc2" index="18" function="default" group="PCINT"/>
-                <signal pad-id="pc3" index="19" function="default" group="PCINT"/>
-                <signal pad-id="pc4" index="20" function="default" group="PCINT"/>
-                <signal pad-id="pc5" index="21" function="default" group="PCINT"/>
-                <signal pad-id="pc6" index="22" function="default" group="PCINT"/>
-                <signal pad-id="pc7" index="23" function="default" group="PCINT"/>
-                <signal pad-id="pd0" index="24" function="default" group="PCINT"/>
-                <signal pad-id="pd1" index="25" function="default" group="PCINT"/>
-                <signal pad-id="pd2" index="26" function="default" group="PCINT"/>
-                <signal pad-id="pd3" index="27" function="default" group="PCINT"/>
-                <signal pad-id="pd4" index="28" function="default" group="PCINT"/>
-                <signal pad-id="pd5" index="29" function="default" group="PCINT"/>
-                <signal pad-id="pd6" index="30" function="default" group="PCINT"/>
-                <signal pad-id="pd7" index="31" function="default" group="PCINT"/>
-                <signal pad-id="pd2" index="0" function="default" group="INT"/>
-                <signal pad-id="pd3" index="1" function="default" group="INT"/>
-                <signal pad-id="pb2" index="2" function="default" group="INT"/>
+                <signal pad-key="pa0" index="0" function="default" group="PCINT"/>
+                <signal pad-key="pa1" index="1" function="default" group="PCINT"/>
+                <signal pad-key="pa2" index="2" function="default" group="PCINT"/>
+                <signal pad-key="pa3" index="3" function="default" group="PCINT"/>
+                <signal pad-key="pa4" index="4" function="default" group="PCINT"/>
+                <signal pad-key="pa5" index="5" function="default" group="PCINT"/>
+                <signal pad-key="pa6" index="6" function="default" group="PCINT"/>
+                <signal pad-key="pa7" index="7" function="default" group="PCINT"/>
+                <signal pad-key="pb0" index="8" function="default" group="PCINT"/>
+                <signal pad-key="pb1" index="9" function="default" group="PCINT"/>
+                <signal pad-key="pb2" index="10" function="default" group="PCINT"/>
+                <signal pad-key="pb3" index="11" function="default" group="PCINT"/>
+                <signal pad-key="pb4" index="12" function="default" group="PCINT"/>
+                <signal pad-key="pb5" index="13" function="default" group="PCINT"/>
+                <signal pad-key="pb6" index="14" function="default" group="PCINT"/>
+                <signal pad-key="pb7" index="15" function="default" group="PCINT"/>
+                <signal pad-key="pc0" index="16" function="default" group="PCINT"/>
+                <signal pad-key="pc1" index="17" function="default" group="PCINT"/>
+                <signal pad-key="pc2" index="18" function="default" group="PCINT"/>
+                <signal pad-key="pc3" index="19" function="default" group="PCINT"/>
+                <signal pad-key="pc4" index="20" function="default" group="PCINT"/>
+                <signal pad-key="pc5" index="21" function="default" group="PCINT"/>
+                <signal pad-key="pc6" index="22" function="default" group="PCINT"/>
+                <signal pad-key="pc7" index="23" function="default" group="PCINT"/>
+                <signal pad-key="pd0" index="24" function="default" group="PCINT"/>
+                <signal pad-key="pd1" index="25" function="default" group="PCINT"/>
+                <signal pad-key="pd2" index="26" function="default" group="PCINT"/>
+                <signal pad-key="pd3" index="27" function="default" group="PCINT"/>
+                <signal pad-key="pd4" index="28" function="default" group="PCINT"/>
+                <signal pad-key="pd5" index="29" function="default" group="PCINT"/>
+                <signal pad-key="pd6" index="30" function="default" group="PCINT"/>
+                <signal pad-key="pd7" index="31" function="default" group="PCINT"/>
+                <signal pad-key="pd2" index="0" function="default" group="INT"/>
+                <signal pad-key="pd3" index="1" function="default" group="INT"/>
+                <signal pad-key="pb2" index="2" function="default" group="INT"/>
             </signals>
         </peripheral>
         <peripheral key="adc" name="ADC" module-key="adc">
             <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"/>
-                <signal pad-id="pa2" index="2" function="default" group="ADC"/>
-                <signal pad-id="pa3" index="3" function="default" group="ADC"/>
-                <signal pad-id="pa4" index="4" function="default" group="ADC"/>
-                <signal pad-id="pa5" index="5" function="default" group="ADC"/>
-                <signal pad-id="pa6" index="6" function="default" group="ADC"/>
-                <signal pad-id="pa7" index="7" function="default" group="ADC"/>
+                <signal pad-key="pa0" index="0" function="default" group="ADC"/>
+                <signal pad-key="pa1" index="1" function="default" group="ADC"/>
+                <signal pad-key="pa2" index="2" function="default" group="ADC"/>
+                <signal pad-key="pa3" index="3" function="default" group="ADC"/>
+                <signal pad-key="pa4" index="4" function="default" group="ADC"/>
+                <signal pad-key="pa5" index="5" function="default" group="ADC"/>
+                <signal pad-key="pa6" index="6" function="default" group="ADC"/>
+                <signal pad-key="pa7" index="7" function="default" group="ADC"/>
             </signals>
         </peripheral>
         <peripheral key="tc1" name="TC1" module-key="tc16">
             <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"/>
-                <signal pad-id="pd5" function="default" group="OCA"/>
-                <signal pad-id="pd4" function="default" group="OCB"/>
+                <signal pad-key="pb1" function="default" group="T"/>
+                <signal pad-key="pd6" function="default" group="ICP"/>
+                <signal pad-key="pd5" function="default" group="OCA"/>
+                <signal pad-key="pd4" function="default" group="OCB"/>
             </signals>
         </peripheral>
         <peripheral key="eeprom" name="EEPROM" module-key="eeprom">
@@ -390,23 +390,23 @@
         <peripheral key="spi" name="SPI" module-key="spi">
             <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"/>
-                <signal pad-id="pb6" function="default" group="MISO"/>
-                <signal pad-id="pb7" function="default" group="SCK"/>
+                <signal pad-key="pb4" function="default" group="SS"/>
+                <signal pad-key="pb5" function="default" group="MOSI"/>
+                <signal pad-key="pb6" function="default" group="MISO"/>
+                <signal pad-key="pb7" function="default" group="SCK"/>
             </signals>
         </peripheral>
         <peripheral key="twi" name="TWI" module-key="twi">
             <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"/>
+                <signal pad-key="pc1" function="default" group="SDA"/>
+                <signal pad-key="pc0" function="default" group="SCL"/>
             </signals>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="cpu">
             <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"/>
+                <signal pad-key="pb1" index="0" function="default" group="CLKO"/>
             </signals>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="fuse">
@@ -889,108 +889,150 @@
             </register-group>
         </module>
     </modules>
+    <pads>
+        <pad key="pb0" name="PB0"/>
+        <pad key="pb1" name="PB1"/>
+        <pad key="pb2" name="PB2"/>
+        <pad key="pb3" name="PB3"/>
+        <pad key="pb4" name="PB4"/>
+        <pad key="pb5" name="PB5"/>
+        <pad key="pb6" name="PB6"/>
+        <pad key="pb7" name="PB7"/>
+        <pad key="reset" name="RESET"/>
+        <pad key="vcc" name="VCC"/>
+        <pad key="gnd" name="GND"/>
+        <pad key="xtal2" name="XTAL2"/>
+        <pad key="xtal1" name="XTAL1"/>
+        <pad key="pd0" name="PD0"/>
+        <pad key="pd1" name="PD1"/>
+        <pad key="pd2" name="PD2"/>
+        <pad key="pd3" name="PD3"/>
+        <pad key="pd4" name="PD4"/>
+        <pad key="pd5" name="PD5"/>
+        <pad key="pd6" name="PD6"/>
+        <pad key="pd7" name="PD7"/>
+        <pad key="pc0" name="PC0"/>
+        <pad key="pc1" name="PC1"/>
+        <pad key="pc2" name="PC2"/>
+        <pad key="pc3" name="PC3"/>
+        <pad key="pc4" name="PC4"/>
+        <pad key="pc5" name="PC5"/>
+        <pad key="pc6" name="PC6"/>
+        <pad key="pc7" name="PC7"/>
+        <pad key="avcc" name="AVCC"/>
+        <pad key="aref" name="AREF"/>
+        <pad key="pa7" name="PA7"/>
+        <pad key="pa6" name="PA6"/>
+        <pad key="pa5" name="PA5"/>
+        <pad key="pa4" name="PA4"/>
+        <pad key="pa3" name="PA3"/>
+        <pad key="pa2" name="PA2"/>
+        <pad key="pa1" name="PA1"/>
+        <pad key="pa0" name="PA0"/>
+        <pad key="ref" name="REF"/>
+    </pads>
     <pinouts>
         <pinout key="pdip40" name="PDIP40" type="dip">
-            <pin position="1" pad="PB0"/>
-            <pin position="2" pad="PB1"/>
-            <pin position="3" pad="PB2"/>
-            <pin position="4" pad="PB3"/>
-            <pin position="5" pad="PB4"/>
-            <pin position="6" pad="PB5"/>
-            <pin position="7" pad="PB6"/>
-            <pin position="8" pad="PB7"/>
-            <pin position="9" pad="RESET"/>
-            <pin position="10" pad="VCC"/>
-            <pin position="11" pad="GND"/>
-            <pin position="12" pad="XTAL2"/>
-            <pin position="13" pad="XTAL1"/>
-            <pin position="14" pad="PD0"/>
-            <pin position="15" pad="PD1"/>
-            <pin position="16" pad="PD2"/>
-            <pin position="17" pad="PD3"/>
-            <pin position="18" pad="PD4"/>
-            <pin position="19" pad="PD5"/>
-            <pin position="20" pad="PD6"/>
-            <pin position="21" pad="PD7"/>
-            <pin position="22" pad="PC0"/>
-            <pin position="23" pad="PC1"/>
-            <pin position="24" pad="PC2"/>
-            <pin position="25" pad="PC3"/>
-            <pin position="26" pad="PC4"/>
-            <pin position="27" pad="PC5"/>
-            <pin position="28" pad="PC6"/>
-            <pin position="29" pad="PC7"/>
-            <pin position="30" pad="AVCC"/>
-            <pin position="31" pad="GND"/>
-            <pin position="32" pad="AREF"/>
-            <pin position="33" pad="PA7"/>
-            <pin position="34" pad="PA6"/>
-            <pin position="35" pad="PA5"/>
-            <pin position="36" pad="PA4"/>
-            <pin position="37" pad="PA3"/>
-            <pin position="38" pad="PA2"/>
-            <pin position="39" pad="PA1"/>
-            <pin position="40" pad="PA0"/>
+            <pin position="1" pad-key="pb0"/>
+            <pin position="2" pad-key="pb1"/>
+            <pin position="3" pad-key="pb2"/>
+            <pin position="4" pad-key="pb3"/>
+            <pin position="5" pad-key="pb4"/>
+            <pin position="6" pad-key="pb5"/>
+            <pin position="7" pad-key="pb6"/>
+            <pin position="8" pad-key="pb7"/>
+            <pin position="9" pad-key="reset"/>
+            <pin position="10" pad-key="vcc"/>
+            <pin position="11" pad-key="gnd"/>
+            <pin position="12" pad-key="xtal2"/>
+            <pin position="13" pad-key="xtal1"/>
+            <pin position="14" pad-key="pd0"/>
+            <pin position="15" pad-key="pd1"/>
+            <pin position="16" pad-key="pd2"/>
+            <pin position="17" pad-key="pd3"/>
+            <pin position="18" pad-key="pd4"/>
+            <pin position="19" pad-key="pd5"/>
+            <pin position="20" pad-key="pd6"/>
+            <pin position="21" pad-key="pd7"/>
+            <pin position="22" pad-key="pc0"/>
+            <pin position="23" pad-key="pc1"/>
+            <pin position="24" pad-key="pc2"/>
+            <pin position="25" pad-key="pc3"/>
+            <pin position="26" pad-key="pc4"/>
+            <pin position="27" pad-key="pc5"/>
+            <pin position="28" pad-key="pc6"/>
+            <pin position="29" pad-key="pc7"/>
+            <pin position="30" pad-key="avcc"/>
+            <pin position="31" pad-key="gnd"/>
+            <pin position="32" pad-key="aref"/>
+            <pin position="33" pad-key="pa7"/>
+            <pin position="34" pad-key="pa6"/>
+            <pin position="35" pad-key="pa5"/>
+            <pin position="36" pad-key="pa4"/>
+            <pin position="37" pad-key="pa3"/>
+            <pin position="38" pad-key="pa2"/>
+            <pin position="39" pad-key="pa1"/>
+            <pin position="40" pad-key="pa0"/>
         </pinout>
         <pinout key="tqfp_vqfn_44" name="TQFP_VQFN_44" type="qfn">
-            <pin position="1" pad="PB5"/>
-            <pin position="2" pad="PB6"/>
-            <pin position="3" pad="PB7"/>
-            <pin position="4" pad="RESET"/>
-            <pin position="5" pad="VCC"/>
-            <pin position="6" pad="GND"/>
-            <pin position="7" pad="XTAL2"/>
-            <pin position="8" pad="XTAL1"/>
-            <pin position="9" pad="PD0"/>
-            <pin position="10" pad="PD1"/>
-            <pin position="11" pad="PD2"/>
-            <pin position="12" pad="PD3"/>
-            <pin position="13" pad="PD4"/>
-            <pin position="14" pad="PD5"/>
-            <pin position="15" pad="PD6"/>
-            <pin position="16" pad="PD7"/>
-            <pin position="17" pad="VCC"/>
-            <pin position="18" pad="GND"/>
-            <pin position="19" pad="PC0"/>
-            <pin position="20" pad="PC1"/>
-            <pin position="21" pad="PC2"/>
-            <pin position="22" pad="PC3"/>
-            <pin position="23" pad="PC4"/>
-            <pin position="24" pad="PC5"/>
-            <pin position="25" pad="PC6"/>
-            <pin position="26" pad="PC7"/>
-            <pin position="27" pad="AVCC"/>
-            <pin position="28" pad="GND"/>
-            <pin position="29" pad="REF"/>
-            <pin position="30" pad="PA7"/>
-            <pin position="31" pad="PA6"/>
-            <pin position="32" pad="PA5"/>
-            <pin position="33" pad="PA4"/>
-            <pin position="34" pad="PA3"/>
-            <pin position="35" pad="PA2"/>
-            <pin position="36" pad="PA1"/>
-            <pin position="37" pad="PA0"/>
-            <pin position="38" pad="VCC"/>
-            <pin position="39" pad="GND"/>
-            <pin position="40" pad="PB0"/>
-            <pin position="41" pad="PB1"/>
-            <pin position="42" pad="PB2"/>
-            <pin position="43" pad="PB3"/>
-            <pin position="44" pad="PB4"/>
+            <pin position="1" pad-key="pb5"/>
+            <pin position="2" pad-key="pb6"/>
+            <pin position="3" pad-key="pb7"/>
+            <pin position="4" pad-key="reset"/>
+            <pin position="5" pad-key="vcc"/>
+            <pin position="6" pad-key="gnd"/>
+            <pin position="7" pad-key="xtal2"/>
+            <pin position="8" pad-key="xtal1"/>
+            <pin position="9" pad-key="pd0"/>
+            <pin position="10" pad-key="pd1"/>
+            <pin position="11" pad-key="pd2"/>
+            <pin position="12" pad-key="pd3"/>
+            <pin position="13" pad-key="pd4"/>
+            <pin position="14" pad-key="pd5"/>
+            <pin position="15" pad-key="pd6"/>
+            <pin position="16" pad-key="pd7"/>
+            <pin position="17" pad-key="vcc"/>
+            <pin position="18" pad-key="gnd"/>
+            <pin position="19" pad-key="pc0"/>
+            <pin position="20" pad-key="pc1"/>
+            <pin position="21" pad-key="pc2"/>
+            <pin position="22" pad-key="pc3"/>
+            <pin position="23" pad-key="pc4"/>
+            <pin position="24" pad-key="pc5"/>
+            <pin position="25" pad-key="pc6"/>
+            <pin position="26" pad-key="pc7"/>
+            <pin position="27" pad-key="avcc"/>
+            <pin position="28" pad-key="gnd"/>
+            <pin position="29" pad-key="ref"/>
+            <pin position="30" pad-key="pa7"/>
+            <pin position="31" pad-key="pa6"/>
+            <pin position="32" pad-key="pa5"/>
+            <pin position="33" pad-key="pa4"/>
+            <pin position="34" pad-key="pa3"/>
+            <pin position="35" pad-key="pa2"/>
+            <pin position="36" pad-key="pa1"/>
+            <pin position="37" pad-key="pa0"/>
+            <pin position="38" pad-key="vcc"/>
+            <pin position="39" pad-key="gnd"/>
+            <pin position="40" pad-key="pb0"/>
+            <pin position="41" pad-key="pb1"/>
+            <pin position="42" pad-key="pb2"/>
+            <pin position="43" pad-key="pb3"/>
+            <pin position="44" pad-key="pb4"/>
         </pinout>
     </pinouts>
     <variants>
-        <variant name="ATmega324PV-10AU" pinout-key="tqfp_vqfn_44" package="TQFP44"/>
-        <variant name="ATmega324PV-10PU" pinout-key="pdip40" package="PDIP40"/>
-        <variant name="ATmega324PV-10MU" pinout-key="tqfp_vqfn_44" package="VQFN44"/>
-        <variant name="ATmega324P-20AU" pinout-key="tqfp_vqfn_44" package="TQFP44"/>
-        <variant name="ATmega324P-20PU" pinout-key="pdip40" package="PDIP40"/>
-        <variant name="ATmega324P-20MU" pinout-key="tqfp_vqfn_44" package="VQFN44"/>
-        <variant name="ATmega324PV-10AN" pinout-key="tqfp_vqfn_44" package="TQFP44"/>
-        <variant name="ATmega324PV-10PN" pinout-key="pdip40" package="PDIP40"/>
-        <variant name="ATmega324PV-10MN" pinout-key="tqfp_vqfn_44" package="VQFN44"/>
-        <variant name="ATmega324P-20AN" pinout-key="tqfp_vqfn_44" package="TQFP44"/>
-        <variant name="ATmega324P-20PN" pinout-key="pdip40" package="PDIP40"/>
-        <variant name="ATmega324P-20MN" pinout-key="tqfp_vqfn_44" package="VQFN44"/>
+        <variant key="atmega324pv_10au" name="ATmega324PV-10AU" pinout-key="tqfp_vqfn_44"/>
+        <variant key="atmega324pv_10pu" name="ATmega324PV-10PU" pinout-key="pdip40"/>
+        <variant key="atmega324pv_10mu" name="ATmega324PV-10MU" pinout-key="tqfp_vqfn_44"/>
+        <variant key="atmega324p_20au" name="ATmega324P-20AU" pinout-key="tqfp_vqfn_44"/>
+        <variant key="atmega324p_20pu" name="ATmega324P-20PU" pinout-key="pdip40"/>
+        <variant key="atmega324p_20mu" name="ATmega324P-20MU" pinout-key="tqfp_vqfn_44"/>
+        <variant key="atmega324pv_10an" name="ATmega324PV-10AN" pinout-key="tqfp_vqfn_44"/>
+        <variant key="atmega324pv_10pn" name="ATmega324PV-10PN" pinout-key="pdip40"/>
+        <variant key="atmega324pv_10mn" name="ATmega324PV-10MN" pinout-key="tqfp_vqfn_44"/>
+        <variant key="atmega324p_20an" name="ATmega324P-20AN" pinout-key="tqfp_vqfn_44"/>
+        <variant key="atmega324p_20pn" name="ATmega324P-20PN" pinout-key="pdip40"/>
+        <variant key="atmega324p_20mn" name="ATmega324P-20MN" pinout-key="tqfp_vqfn_44"/>
     </variants>
 </device>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA324PA.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA324PA.xml
index ff69413b..3c0c32ee 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA324PA.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA324PA.xml
@@ -220,91 +220,91 @@
         <peripheral key="ac" name="AC" module-key="ac">
             <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"/>
+                <signal pad-key="pb2" index="0" function="default" group="AIN"/>
+                <signal pad-key="pb3" index="1" function="default" group="AIN"/>
             </signals>
         </peripheral>
         <peripheral key="usart0" name="USART0" module-key="usart">
             <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"/>
-                <signal pad-id="pb0" function="default" group="XCK"/>
+                <signal pad-key="pd1" function="default" group="TXD"/>
+                <signal pad-key="pd0" function="default" group="RXD"/>
+                <signal pad-key="pb0" function="default" group="XCK"/>
             </signals>
         </peripheral>
         <peripheral key="usart1" name="USART1" module-key="usart">
             <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"/>
-                <signal pad-id="pd4" function="default" group="XCK"/>
+                <signal pad-key="pd3" function="default" group="TXD"/>
+                <signal pad-key="pd2" function="default" group="RXD"/>
+                <signal pad-key="pd4" function="default" group="XCK"/>
             </signals>
         </peripheral>
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pa2" index="2" function="default" group="P"/>
-                <signal pad-id="pa3" index="3" function="default" group="P"/>
-                <signal pad-id="pa4" index="4" function="default" group="P"/>
-                <signal pad-id="pa5" index="5" function="default" group="P"/>
-                <signal pad-id="pa6" index="6" function="default" group="P"/>
-                <signal pad-id="pa7" index="7" function="default" group="P"/>
+                <signal pad-key="pa0" index="0" function="default" group="P"/>
+                <signal pad-key="pa1" index="1" function="default" group="P"/>
+                <signal pad-key="pa2" index="2" function="default" group="P"/>
+                <signal pad-key="pa3" index="3" function="default" group="P"/>
+                <signal pad-key="pa4" index="4" function="default" group="P"/>
+                <signal pad-key="pa5" index="5" function="default" group="P"/>
+                <signal pad-key="pa6" index="6" function="default" group="P"/>
+                <signal pad-key="pa7" index="7" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pb2" index="2" function="default" group="P"/>
-                <signal pad-id="pb3" index="3" function="default" group="P"/>
-                <signal pad-id="pb4" index="4" function="default" group="P"/>
-                <signal pad-id="pb5" index="5" function="default" group="P"/>
-                <signal pad-id="pb6" index="6" function="default" group="P"/>
-                <signal pad-id="pb7" index="7" function="default" group="P"/>
+                <signal pad-key="pb0" index="0" function="default" group="P"/>
+                <signal pad-key="pb1" index="1" function="default" group="P"/>
+                <signal pad-key="pb2" index="2" function="default" group="P"/>
+                <signal pad-key="pb3" index="3" function="default" group="P"/>
+                <signal pad-key="pb4" index="4" function="default" group="P"/>
+                <signal pad-key="pb5" index="5" function="default" group="P"/>
+                <signal pad-key="pb6" index="6" function="default" group="P"/>
+                <signal pad-key="pb7" index="7" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pc2" index="2" function="default" group="P"/>
-                <signal pad-id="pc3" index="3" function="default" group="P"/>
-                <signal pad-id="pc4" index="4" function="default" group="P"/>
-                <signal pad-id="pc5" index="5" function="default" group="P"/>
-                <signal pad-id="pc6" index="6" function="default" group="P"/>
-                <signal pad-id="pc7" index="7" function="default" group="P"/>
+                <signal pad-key="pc0" index="0" function="default" group="P"/>
+                <signal pad-key="pc1" index="1" function="default" group="P"/>
+                <signal pad-key="pc2" index="2" function="default" group="P"/>
+                <signal pad-key="pc3" index="3" function="default" group="P"/>
+                <signal pad-key="pc4" index="4" function="default" group="P"/>
+                <signal pad-key="pc5" index="5" function="default" group="P"/>
+                <signal pad-key="pc6" index="6" function="default" group="P"/>
+                <signal pad-key="pc7" index="7" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pd2" index="2" function="default" group="P"/>
-                <signal pad-id="pd3" index="3" function="default" group="P"/>
-                <signal pad-id="pd4" index="4" function="default" group="P"/>
-                <signal pad-id="pd5" index="5" function="default" group="P"/>
-                <signal pad-id="pd6" index="6" function="default" group="P"/>
-                <signal pad-id="pd7" index="7" function="default" group="P"/>
+                <signal pad-key="pd0" index="0" function="default" group="P"/>
+                <signal pad-key="pd1" index="1" function="default" group="P"/>
+                <signal pad-key="pd2" index="2" function="default" group="P"/>
+                <signal pad-key="pd3" index="3" function="default" group="P"/>
+                <signal pad-key="pd4" index="4" function="default" group="P"/>
+                <signal pad-key="pd5" index="5" function="default" group="P"/>
+                <signal pad-key="pd6" index="6" function="default" group="P"/>
+                <signal pad-key="pd7" index="7" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="tc0" name="TC0" module-key="tc8">
             <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"/>
-                <signal pad-id="pb3" function="default" group="OCA"/>
+                <signal pad-key="pb0" function="default" group="T"/>
+                <signal pad-key="pb4" function="default" group="OCB"/>
+                <signal pad-key="pb3" function="default" group="OCA"/>
             </signals>
         </peripheral>
         <peripheral key="tc2" name="TC2" module-key="tc8_async">
             <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"/>
+                <signal pad-key="pd7" function="default" group="OCA"/>
+                <signal pad-key="pd6" function="default" group="OCB"/>
             </signals>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="wdt">
@@ -313,10 +313,10 @@
         <peripheral key="jtag" name="JTAG" module-key="jtag">
             <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"/>
-                <signal pad-id="pc4" function="default" group="TDO"/>
-                <signal pad-id="pc5" function="default" group="TDI"/>
+                <signal pad-key="pc2" function="default" group="TCK"/>
+                <signal pad-key="pc3" function="default" group="TMS"/>
+                <signal pad-key="pc4" function="default" group="TDO"/>
+                <signal pad-key="pc5" function="default" group="TDI"/>
             </signals>
         </peripheral>
         <peripheral key="boot_load" name="BOOT_LOAD" module-key="boot_load">
@@ -325,63 +325,63 @@
         <peripheral key="exint" name="EXINT" module-key="exint">
             <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"/>
-                <signal pad-id="pa2" index="2" function="default" group="PCINT"/>
-                <signal pad-id="pa3" index="3" function="default" group="PCINT"/>
-                <signal pad-id="pa4" index="4" function="default" group="PCINT"/>
-                <signal pad-id="pa5" index="5" function="default" group="PCINT"/>
-                <signal pad-id="pa6" index="6" function="default" group="PCINT"/>
-                <signal pad-id="pa7" index="7" function="default" group="PCINT"/>
-                <signal pad-id="pb0" index="8" function="default" group="PCINT"/>
-                <signal pad-id="pb1" index="9" function="default" group="PCINT"/>
-                <signal pad-id="pb2" index="10" function="default" group="PCINT"/>
-                <signal pad-id="pb3" index="11" function="default" group="PCINT"/>
-                <signal pad-id="pb4" index="12" function="default" group="PCINT"/>
-                <signal pad-id="pb5" index="13" function="default" group="PCINT"/>
-                <signal pad-id="pb6" index="14" function="default" group="PCINT"/>
-                <signal pad-id="pb7" index="15" function="default" group="PCINT"/>
-                <signal pad-id="pc0" index="16" function="default" group="PCINT"/>
-                <signal pad-id="pc1" index="17" function="default" group="PCINT"/>
-                <signal pad-id="pc2" index="18" function="default" group="PCINT"/>
-                <signal pad-id="pc3" index="19" function="default" group="PCINT"/>
-                <signal pad-id="pc4" index="20" function="default" group="PCINT"/>
-                <signal pad-id="pc5" index="21" function="default" group="PCINT"/>
-                <signal pad-id="pc6" index="22" function="default" group="PCINT"/>
-                <signal pad-id="pc7" index="23" function="default" group="PCINT"/>
-                <signal pad-id="pd0" index="24" function="default" group="PCINT"/>
-                <signal pad-id="pd1" index="25" function="default" group="PCINT"/>
-                <signal pad-id="pd2" index="26" function="default" group="PCINT"/>
-                <signal pad-id="pd3" index="27" function="default" group="PCINT"/>
-                <signal pad-id="pd4" index="28" function="default" group="PCINT"/>
-                <signal pad-id="pd5" index="29" function="default" group="PCINT"/>
-                <signal pad-id="pd6" index="30" function="default" group="PCINT"/>
-                <signal pad-id="pd7" index="31" function="default" group="PCINT"/>
-                <signal pad-id="pd2" index="0" function="default" group="INT"/>
-                <signal pad-id="pd3" index="1" function="default" group="INT"/>
-                <signal pad-id="pb2" index="2" function="default" group="INT"/>
+                <signal pad-key="pa0" index="0" function="default" group="PCINT"/>
+                <signal pad-key="pa1" index="1" function="default" group="PCINT"/>
+                <signal pad-key="pa2" index="2" function="default" group="PCINT"/>
+                <signal pad-key="pa3" index="3" function="default" group="PCINT"/>
+                <signal pad-key="pa4" index="4" function="default" group="PCINT"/>
+                <signal pad-key="pa5" index="5" function="default" group="PCINT"/>
+                <signal pad-key="pa6" index="6" function="default" group="PCINT"/>
+                <signal pad-key="pa7" index="7" function="default" group="PCINT"/>
+                <signal pad-key="pb0" index="8" function="default" group="PCINT"/>
+                <signal pad-key="pb1" index="9" function="default" group="PCINT"/>
+                <signal pad-key="pb2" index="10" function="default" group="PCINT"/>
+                <signal pad-key="pb3" index="11" function="default" group="PCINT"/>
+                <signal pad-key="pb4" index="12" function="default" group="PCINT"/>
+                <signal pad-key="pb5" index="13" function="default" group="PCINT"/>
+                <signal pad-key="pb6" index="14" function="default" group="PCINT"/>
+                <signal pad-key="pb7" index="15" function="default" group="PCINT"/>
+                <signal pad-key="pc0" index="16" function="default" group="PCINT"/>
+                <signal pad-key="pc1" index="17" function="default" group="PCINT"/>
+                <signal pad-key="pc2" index="18" function="default" group="PCINT"/>
+                <signal pad-key="pc3" index="19" function="default" group="PCINT"/>
+                <signal pad-key="pc4" index="20" function="default" group="PCINT"/>
+                <signal pad-key="pc5" index="21" function="default" group="PCINT"/>
+                <signal pad-key="pc6" index="22" function="default" group="PCINT"/>
+                <signal pad-key="pc7" index="23" function="default" group="PCINT"/>
+                <signal pad-key="pd0" index="24" function="default" group="PCINT"/>
+                <signal pad-key="pd1" index="25" function="default" group="PCINT"/>
+                <signal pad-key="pd2" index="26" function="default" group="PCINT"/>
+                <signal pad-key="pd3" index="27" function="default" group="PCINT"/>
+                <signal pad-key="pd4" index="28" function="default" group="PCINT"/>
+                <signal pad-key="pd5" index="29" function="default" group="PCINT"/>
+                <signal pad-key="pd6" index="30" function="default" group="PCINT"/>
+                <signal pad-key="pd7" index="31" function="default" group="PCINT"/>
+                <signal pad-key="pd2" index="0" function="default" group="INT"/>
+                <signal pad-key="pd3" index="1" function="default" group="INT"/>
+                <signal pad-key="pb2" index="2" function="default" group="INT"/>
             </signals>
         </peripheral>
         <peripheral key="adc" name="ADC" module-key="adc">
             <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"/>
-                <signal pad-id="pa2" index="2" function="default" group="ADC"/>
-                <signal pad-id="pa3" index="3" function="default" group="ADC"/>
-                <signal pad-id="pa4" index="4" function="default" group="ADC"/>
-                <signal pad-id="pa5" index="5" function="default" group="ADC"/>
-                <signal pad-id="pa6" index="6" function="default" group="ADC"/>
-                <signal pad-id="pa7" index="7" function="default" group="ADC"/>
+                <signal pad-key="pa0" index="0" function="default" group="ADC"/>
+                <signal pad-key="pa1" index="1" function="default" group="ADC"/>
+                <signal pad-key="pa2" index="2" function="default" group="ADC"/>
+                <signal pad-key="pa3" index="3" function="default" group="ADC"/>
+                <signal pad-key="pa4" index="4" function="default" group="ADC"/>
+                <signal pad-key="pa5" index="5" function="default" group="ADC"/>
+                <signal pad-key="pa6" index="6" function="default" group="ADC"/>
+                <signal pad-key="pa7" index="7" function="default" group="ADC"/>
             </signals>
         </peripheral>
         <peripheral key="tc1" name="TC1" module-key="tc16">
             <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"/>
-                <signal pad-id="pd5" function="default" group="OCA"/>
-                <signal pad-id="pd4" function="default" group="OCB"/>
+                <signal pad-key="pb1" function="default" group="T"/>
+                <signal pad-key="pd6" function="default" group="ICP"/>
+                <signal pad-key="pd5" function="default" group="OCA"/>
+                <signal pad-key="pd4" function="default" group="OCB"/>
             </signals>
         </peripheral>
         <peripheral key="eeprom" name="EEPROM" module-key="eeprom">
@@ -390,23 +390,23 @@
         <peripheral key="spi" name="SPI" module-key="spi">
             <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"/>
-                <signal pad-id="pb6" function="default" group="MISO"/>
-                <signal pad-id="pb7" function="default" group="SCK"/>
+                <signal pad-key="pb4" function="default" group="SS"/>
+                <signal pad-key="pb5" function="default" group="MOSI"/>
+                <signal pad-key="pb6" function="default" group="MISO"/>
+                <signal pad-key="pb7" function="default" group="SCK"/>
             </signals>
         </peripheral>
         <peripheral key="twi" name="TWI" module-key="twi">
             <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"/>
+                <signal pad-key="pc1" function="default" group="SDA"/>
+                <signal pad-key="pc0" function="default" group="SCL"/>
             </signals>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="cpu">
             <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"/>
+                <signal pad-key="pb1" index="0" function="default" group="CLKO"/>
             </signals>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="fuse">
@@ -927,198 +927,239 @@
             </register-group>
         </module>
     </modules>
+    <pads>
+        <pad key="pb5" name="PB5"/>
+        <pad key="pb6" name="PB6"/>
+        <pad key="pb7" name="PB7"/>
+        <pad key="reset" name="RESET"/>
+        <pad key="vcc" name="VCC"/>
+        <pad key="gnd" name="GND"/>
+        <pad key="xtal2" name="XTAL2"/>
+        <pad key="xtal1" name="XTAL1"/>
+        <pad key="pd0" name="PD0"/>
+        <pad key="pd1" name="PD1"/>
+        <pad key="pd2" name="PD2"/>
+        <pad key="pd3" name="PD3"/>
+        <pad key="pd4" name="PD4"/>
+        <pad key="pd5" name="PD5"/>
+        <pad key="pd6" name="PD6"/>
+        <pad key="pd7" name="PD7"/>
+        <pad key="pc0" name="PC0"/>
+        <pad key="pc1" name="PC1"/>
+        <pad key="pc2" name="PC2"/>
+        <pad key="pc3" name="PC3"/>
+        <pad key="pc4" name="PC4"/>
+        <pad key="pc5" name="PC5"/>
+        <pad key="pc6" name="PC6"/>
+        <pad key="pc7" name="PC7"/>
+        <pad key="avcc" name="AVCC"/>
+        <pad key="aref" name="AREF"/>
+        <pad key="pa7" name="PA7"/>
+        <pad key="pa6" name="PA6"/>
+        <pad key="pa5" name="PA5"/>
+        <pad key="pa4" name="PA4"/>
+        <pad key="pa3" name="PA3"/>
+        <pad key="pa2" name="PA2"/>
+        <pad key="pa1" name="PA1"/>
+        <pad key="pa0" name="PA0"/>
+        <pad key="pb0" name="PB0"/>
+        <pad key="pb1" name="PB1"/>
+        <pad key="pb2" name="PB2"/>
+        <pad key="pb3" name="PB3"/>
+        <pad key="pb4" name="PB4"/>
+    </pads>
     <pinouts>
         <pinout key="drqfn_44" name="DRQFN_44" type="drqfn">
-            <pin position="A1" pad="PB5"/>
-            <pin position="B1" pad="PB6"/>
-            <pin position="A2" pad="PB7"/>
-            <pin position="B2" pad="RESET"/>
-            <pin position="A3" pad="VCC"/>
-            <pin position="B3" pad="GND"/>
-            <pin position="A4" pad="XTAL2"/>
-            <pin position="B4" pad="XTAL1"/>
-            <pin position="A5" pad="PD0"/>
-            <pin position="B5" pad="PD1"/>
-            <pin position="A6" pad="PD2"/>
-            <pin position="A7" pad="PD3"/>
-            <pin position="B6" pad="PD4"/>
-            <pin position="A8" pad="PD5"/>
-            <pin position="B7" pad="PD6"/>
-            <pin position="A9" pad="PD7"/>
-            <pin position="B8" pad="VCC"/>
-            <pin position="A10" pad="GND"/>
-            <pin position="B9" pad="PC0"/>
-            <pin position="A11" pad="PC1"/>
-            <pin position="B10" pad="PC2"/>
-            <pin position="A12" pad="PC3"/>
-            <pin position="A13" pad="PC4"/>
-            <pin position="B11" pad="PC5"/>
-            <pin position="A14" pad="PC6"/>
-            <pin position="B12" pad="PC7"/>
-            <pin position="A15" pad="AVCC"/>
-            <pin position="B13" pad="GND"/>
-            <pin position="A16" pad="AREF"/>
-            <pin position="B14" pad="PA7"/>
-            <pin position="A17" pad="PA6"/>
-            <pin position="B15" pad="PA5"/>
-            <pin position="A18" pad="PA4"/>
-            <pin position="A19" pad="PA3"/>
-            <pin position="B16" pad="PA2"/>
-            <pin position="A20" pad="PA1"/>
-            <pin position="B17" pad="PA0"/>
-            <pin position="A21" pad="VCC"/>
-            <pin position="B18" pad="GND"/>
-            <pin position="A22" pad="PB0"/>
-            <pin position="B19" pad="PB1"/>
-            <pin position="A23" pad="PB2"/>
-            <pin position="B20" pad="PB3"/>
-            <pin position="A24" pad="PB4"/>
+            <pin position="A1" pad-key="pb5"/>
+            <pin position="B1" pad-key="pb6"/>
+            <pin position="A2" pad-key="pb7"/>
+            <pin position="B2" pad-key="reset"/>
+            <pin position="A3" pad-key="vcc"/>
+            <pin position="B3" pad-key="gnd"/>
+            <pin position="A4" pad-key="xtal2"/>
+            <pin position="B4" pad-key="xtal1"/>
+            <pin position="A5" pad-key="pd0"/>
+            <pin position="B5" pad-key="pd1"/>
+            <pin position="A6" pad-key="pd2"/>
+            <pin position="A7" pad-key="pd3"/>
+            <pin position="B6" pad-key="pd4"/>
+            <pin position="A8" pad-key="pd5"/>
+            <pin position="B7" pad-key="pd6"/>
+            <pin position="A9" pad-key="pd7"/>
+            <pin position="B8" pad-key="vcc"/>
+            <pin position="A10" pad-key="gnd"/>
+            <pin position="B9" pad-key="pc0"/>
+            <pin position="A11" pad-key="pc1"/>
+            <pin position="B10" pad-key="pc2"/>
+            <pin position="A12" pad-key="pc3"/>
+            <pin position="A13" pad-key="pc4"/>
+            <pin position="B11" pad-key="pc5"/>
+            <pin position="A14" pad-key="pc6"/>
+            <pin position="B12" pad-key="pc7"/>
+            <pin position="A15" pad-key="avcc"/>
+            <pin position="B13" pad-key="gnd"/>
+            <pin position="A16" pad-key="aref"/>
+            <pin position="B14" pad-key="pa7"/>
+            <pin position="A17" pad-key="pa6"/>
+            <pin position="B15" pad-key="pa5"/>
+            <pin position="A18" pad-key="pa4"/>
+            <pin position="A19" pad-key="pa3"/>
+            <pin position="B16" pad-key="pa2"/>
+            <pin position="A20" pad-key="pa1"/>
+            <pin position="B17" pad-key="pa0"/>
+            <pin position="A21" pad-key="vcc"/>
+            <pin position="B18" pad-key="gnd"/>
+            <pin position="A22" pad-key="pb0"/>
+            <pin position="B19" pad-key="pb1"/>
+            <pin position="A23" pad-key="pb2"/>
+            <pin position="B20" pad-key="pb3"/>
+            <pin position="A24" pad-key="pb4"/>
         </pinout>
         <pinout key="pdip_40" name="PDIP_40" type="dip">
-            <pin position="1" pad="PB0"/>
-            <pin position="2" pad="PB1"/>
-            <pin position="3" pad="PB2"/>
-            <pin position="4" pad="PB3"/>
-            <pin position="5" pad="PB4"/>
-            <pin position="6" pad="PB5"/>
-            <pin position="7" pad="PB6"/>
-            <pin position="8" pad="PB7"/>
-            <pin position="9" pad="RESET"/>
-            <pin position="10" pad="VCC"/>
-            <pin position="11" pad="GND"/>
-            <pin position="12" pad="XTAL2"/>
-            <pin position="13" pad="XTAL1"/>
-            <pin position="14" pad="PD0"/>
-            <pin position="15" pad="PD1"/>
-            <pin position="16" pad="PD2"/>
-            <pin position="17" pad="PD3"/>
-            <pin position="18" pad="PD4"/>
-            <pin position="19" pad="PD5"/>
-            <pin position="20" pad="PD6"/>
-            <pin position="21" pad="PD7"/>
-            <pin position="22" pad="PC0"/>
-            <pin position="23" pad="PC1"/>
-            <pin position="24" pad="PC2"/>
-            <pin position="25" pad="PC3"/>
-            <pin position="26" pad="PC4"/>
-            <pin position="27" pad="PC5"/>
-            <pin position="28" pad="PC6"/>
-            <pin position="29" pad="PC7"/>
-            <pin position="30" pad="AVCC"/>
-            <pin position="31" pad="GND"/>
-            <pin position="32" pad="AREF"/>
-            <pin position="33" pad="PA7"/>
-            <pin position="34" pad="PA6"/>
-            <pin position="35" pad="PA5"/>
-            <pin position="36" pad="PA4"/>
-            <pin position="37" pad="PA3"/>
-            <pin position="38" pad="PA2"/>
-            <pin position="39" pad="PA1"/>
-            <pin position="40" pad="PA0"/>
+            <pin position="1" pad-key="pb0"/>
+            <pin position="2" pad-key="pb1"/>
+            <pin position="3" pad-key="pb2"/>
+            <pin position="4" pad-key="pb3"/>
+            <pin position="5" pad-key="pb4"/>
+            <pin position="6" pad-key="pb5"/>
+            <pin position="7" pad-key="pb6"/>
+            <pin position="8" pad-key="pb7"/>
+            <pin position="9" pad-key="reset"/>
+            <pin position="10" pad-key="vcc"/>
+            <pin position="11" pad-key="gnd"/>
+            <pin position="12" pad-key="xtal2"/>
+            <pin position="13" pad-key="xtal1"/>
+            <pin position="14" pad-key="pd0"/>
+            <pin position="15" pad-key="pd1"/>
+            <pin position="16" pad-key="pd2"/>
+            <pin position="17" pad-key="pd3"/>
+            <pin position="18" pad-key="pd4"/>
+            <pin position="19" pad-key="pd5"/>
+            <pin position="20" pad-key="pd6"/>
+            <pin position="21" pad-key="pd7"/>
+            <pin position="22" pad-key="pc0"/>
+            <pin position="23" pad-key="pc1"/>
+            <pin position="24" pad-key="pc2"/>
+            <pin position="25" pad-key="pc3"/>
+            <pin position="26" pad-key="pc4"/>
+            <pin position="27" pad-key="pc5"/>
+            <pin position="28" pad-key="pc6"/>
+            <pin position="29" pad-key="pc7"/>
+            <pin position="30" pad-key="avcc"/>
+            <pin position="31" pad-key="gnd"/>
+            <pin position="32" pad-key="aref"/>
+            <pin position="33" pad-key="pa7"/>
+            <pin position="34" pad-key="pa6"/>
+            <pin position="35" pad-key="pa5"/>
+            <pin position="36" pad-key="pa4"/>
+            <pin position="37" pad-key="pa3"/>
+            <pin position="38" pad-key="pa2"/>
+            <pin position="39" pad-key="pa1"/>
+            <pin position="40" pad-key="pa0"/>
         </pinout>
         <pinout key="qfn_qfp_44" name="QFN_QFP_44" type="qfn">
-            <pin position="1" pad="PB5"/>
-            <pin position="2" pad="PB6"/>
-            <pin position="3" pad="PB7"/>
-            <pin position="4" pad="RESET"/>
-            <pin position="5" pad="VCC"/>
-            <pin position="6" pad="GND"/>
-            <pin position="7" pad="XTAL2"/>
-            <pin position="8" pad="XTAL1"/>
-            <pin position="9" pad="PD0"/>
-            <pin position="10" pad="PD1"/>
-            <pin position="11" pad="PD2"/>
-            <pin position="12" pad="PD3"/>
-            <pin position="13" pad="PD4"/>
-            <pin position="14" pad="PD5"/>
-            <pin position="15" pad="PD6"/>
-            <pin position="16" pad="PD7"/>
-            <pin position="17" pad="VCC"/>
-            <pin position="18" pad="GND"/>
-            <pin position="19" pad="PC0"/>
-            <pin position="20" pad="PC1"/>
-            <pin position="21" pad="PC2"/>
-            <pin position="22" pad="PC3"/>
-            <pin position="23" pad="PC4"/>
-            <pin position="24" pad="PC5"/>
-            <pin position="25" pad="PC6"/>
-            <pin position="26" pad="PC7"/>
-            <pin position="27" pad="AVCC"/>
-            <pin position="28" pad="GND"/>
-            <pin position="29" pad="AREF"/>
-            <pin position="30" pad="PA7"/>
-            <pin position="31" pad="PA6"/>
-            <pin position="32" pad="PA5"/>
-            <pin position="33" pad="PA4"/>
-            <pin position="34" pad="PA3"/>
-            <pin position="35" pad="PA2"/>
-            <pin position="36" pad="PA1"/>
-            <pin position="37" pad="PA0"/>
-            <pin position="38" pad="VCC"/>
-            <pin position="39" pad="GND"/>
-            <pin position="40" pad="PB0"/>
-            <pin position="41" pad="PB1"/>
-            <pin position="42" pad="PB2"/>
-            <pin position="43" pad="PB3"/>
-            <pin position="44" pad="PB4"/>
+            <pin position="1" pad-key="pb5"/>
+            <pin position="2" pad-key="pb6"/>
+            <pin position="3" pad-key="pb7"/>
+            <pin position="4" pad-key="reset"/>
+            <pin position="5" pad-key="vcc"/>
+            <pin position="6" pad-key="gnd"/>
+            <pin position="7" pad-key="xtal2"/>
+            <pin position="8" pad-key="xtal1"/>
+            <pin position="9" pad-key="pd0"/>
+            <pin position="10" pad-key="pd1"/>
+            <pin position="11" pad-key="pd2"/>
+            <pin position="12" pad-key="pd3"/>
+            <pin position="13" pad-key="pd4"/>
+            <pin position="14" pad-key="pd5"/>
+            <pin position="15" pad-key="pd6"/>
+            <pin position="16" pad-key="pd7"/>
+            <pin position="17" pad-key="vcc"/>
+            <pin position="18" pad-key="gnd"/>
+            <pin position="19" pad-key="pc0"/>
+            <pin position="20" pad-key="pc1"/>
+            <pin position="21" pad-key="pc2"/>
+            <pin position="22" pad-key="pc3"/>
+            <pin position="23" pad-key="pc4"/>
+            <pin position="24" pad-key="pc5"/>
+            <pin position="25" pad-key="pc6"/>
+            <pin position="26" pad-key="pc7"/>
+            <pin position="27" pad-key="avcc"/>
+            <pin position="28" pad-key="gnd"/>
+            <pin position="29" pad-key="aref"/>
+            <pin position="30" pad-key="pa7"/>
+            <pin position="31" pad-key="pa6"/>
+            <pin position="32" pad-key="pa5"/>
+            <pin position="33" pad-key="pa4"/>
+            <pin position="34" pad-key="pa3"/>
+            <pin position="35" pad-key="pa2"/>
+            <pin position="36" pad-key="pa1"/>
+            <pin position="37" pad-key="pa0"/>
+            <pin position="38" pad-key="vcc"/>
+            <pin position="39" pad-key="gnd"/>
+            <pin position="40" pad-key="pb0"/>
+            <pin position="41" pad-key="pb1"/>
+            <pin position="42" pad-key="pb2"/>
+            <pin position="43" pad-key="pb3"/>
+            <pin position="44" pad-key="pb4"/>
         </pinout>
         <pinout key="bga_49" name="BGA_49" type="bga">
-            <pin position="A1" pad="GND"/>
-            <pin position="A2" pad="PB4"/>
-            <pin position="A3" pad="PB2"/>
-            <pin position="A4" pad="GND"/>
-            <pin position="A5" pad="VCC"/>
-            <pin position="A6" pad="PA2"/>
-            <pin position="A7" pad="GND"/>
-            <pin position="B1" pad="PB6"/>
-            <pin position="B2" pad="PB5"/>
-            <pin position="B3" pad="PB3"/>
-            <pin position="B4" pad="PB0"/>
-            <pin position="B5" pad="PA0"/>
-            <pin position="B6" pad="PA3"/>
-            <pin position="B7" pad="PA5"/>
-            <pin position="C1" pad="VCC"/>
-            <pin position="C2" pad="RESET"/>
-            <pin position="C3" pad="PB7"/>
-            <pin position="C4" pad="PB1"/>
-            <pin position="C5" pad="PA1"/>
-            <pin position="C6" pad="PA6"/>
-            <pin position="C7" pad="AREF"/>
-            <pin position="D1" pad="GND"/>
-            <pin position="D2" pad="XTAL2"/>
-            <pin position="D3" pad="PD0"/>
-            <pin position="D4" pad="GND"/>
-            <pin position="D5" pad="PA4"/>
-            <pin position="D6" pad="PA7"/>
-            <pin position="D7" pad="GND"/>
-            <pin position="E1" pad="XTAL1"/>
-            <pin position="E2" pad="PD1"/>
-            <pin position="E3" pad="PD5"/>
-            <pin position="E4" pad="PD7"/>
-            <pin position="E5" pad="PC5"/>
-            <pin position="E6" pad="PC7"/>
-            <pin position="E7" pad="AVCC"/>
-            <pin position="F1" pad="PD2"/>
-            <pin position="F2" pad="PD3"/>
-            <pin position="F3" pad="PD6"/>
-            <pin position="F4" pad="PC0"/>
-            <pin position="F5" pad="PC2"/>
-            <pin position="F6" pad="PC4"/>
-            <pin position="F7" pad="PC6"/>
-            <pin position="G1" pad="GND"/>
-            <pin position="G2" pad="PD4"/>
-            <pin position="G3" pad="VCC"/>
-            <pin position="G4" pad="GND"/>
-            <pin position="G5" pad="PC1"/>
-            <pin position="G6" pad="PC3"/>
-            <pin position="G7" pad="GND"/>
+            <pin position="A1" pad-key="gnd"/>
+            <pin position="A2" pad-key="pb4"/>
+            <pin position="A3" pad-key="pb2"/>
+            <pin position="A4" pad-key="gnd"/>
+            <pin position="A5" pad-key="vcc"/>
+            <pin position="A6" pad-key="pa2"/>
+            <pin position="A7" pad-key="gnd"/>
+            <pin position="B1" pad-key="pb6"/>
+            <pin position="B2" pad-key="pb5"/>
+            <pin position="B3" pad-key="pb3"/>
+            <pin position="B4" pad-key="pb0"/>
+            <pin position="B5" pad-key="pa0"/>
+            <pin position="B6" pad-key="pa3"/>
+            <pin position="B7" pad-key="pa5"/>
+            <pin position="C1" pad-key="vcc"/>
+            <pin position="C2" pad-key="reset"/>
+            <pin position="C3" pad-key="pb7"/>
+            <pin position="C4" pad-key="pb1"/>
+            <pin position="C5" pad-key="pa1"/>
+            <pin position="C6" pad-key="pa6"/>
+            <pin position="C7" pad-key="aref"/>
+            <pin position="D1" pad-key="gnd"/>
+            <pin position="D2" pad-key="xtal2"/>
+            <pin position="D3" pad-key="pd0"/>
+            <pin position="D4" pad-key="gnd"/>
+            <pin position="D5" pad-key="pa4"/>
+            <pin position="D6" pad-key="pa7"/>
+            <pin position="D7" pad-key="gnd"/>
+            <pin position="E1" pad-key="xtal1"/>
+            <pin position="E2" pad-key="pd1"/>
+            <pin position="E3" pad-key="pd5"/>
+            <pin position="E4" pad-key="pd7"/>
+            <pin position="E5" pad-key="pc5"/>
+            <pin position="E6" pad-key="pc7"/>
+            <pin position="E7" pad-key="avcc"/>
+            <pin position="F1" pad-key="pd2"/>
+            <pin position="F2" pad-key="pd3"/>
+            <pin position="F3" pad-key="pd6"/>
+            <pin position="F4" pad-key="pc0"/>
+            <pin position="F5" pad-key="pc2"/>
+            <pin position="F6" pad-key="pc4"/>
+            <pin position="F7" pad-key="pc6"/>
+            <pin position="G1" pad-key="gnd"/>
+            <pin position="G2" pad-key="pd4"/>
+            <pin position="G3" pad-key="vcc"/>
+            <pin position="G4" pad-key="gnd"/>
+            <pin position="G5" pad-key="pc1"/>
+            <pin position="G6" pad-key="pc3"/>
+            <pin position="G7" pad-key="gnd"/>
         </pinout>
     </pinouts>
     <variants>
-        <variant name="ATmega324PA-AU" pinout-key="qfn_qfp_44" package="TQFP44"/>
-        <variant name="ATmega324PA-PU" pinout-key="pdip_40" package="PDIP40"/>
-        <variant name="ATmega324PA-MU" pinout-key="qfn_qfp_44" package="VQFN44"/>
-        <variant name="ATmega324PA-MCH" pinout-key="drqfn_44" package="DRQFN44"/>
-        <variant name="ATmega324PA-CU" pinout-key="bga_49" package="VFBGA49"/>
+        <variant key="atmega324pa_au" name="ATmega324PA-AU" pinout-key="qfn_qfp_44"/>
+        <variant key="atmega324pa_pu" name="ATmega324PA-PU" pinout-key="pdip_40"/>
+        <variant key="atmega324pa_mu" name="ATmega324PA-MU" pinout-key="qfn_qfp_44"/>
+        <variant key="atmega324pa_mch" name="ATmega324PA-MCH" pinout-key="drqfn_44"/>
+        <variant key="atmega324pa_cu" name="ATmega324PA-CU" pinout-key="bga_49"/>
     </variants>
 </device>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA324PB.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA324PB.xml
index 505c5df9..218a72b7 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA324PB.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA324PB.xml
@@ -220,139 +220,139 @@
         <peripheral key="ac" name="AC" module-key="ac">
             <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"/>
-                <signal pad-id="pb3" function="default" group="AIN1"/>
+                <signal pad-key="pc5" function="default" group="AC"/>
+                <signal pad-key="pb2" function="default" group="AIN0"/>
+                <signal pad-key="pb3" function="default" group="AIN1"/>
             </signals>
         </peripheral>
         <peripheral key="usart0" name="USART0" module-key="usart">
             <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"/>
-                <signal pad-id="pb0" function="default" group="XCK"/>
+                <signal pad-key="pd1" function="default" group="TXD"/>
+                <signal pad-key="pd0" function="default" group="RXD"/>
+                <signal pad-key="pb0" function="default" group="XCK"/>
             </signals>
         </peripheral>
         <peripheral key="usart1" name="USART1" module-key="usart">
             <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"/>
-                <signal pad-id="pd4" function="default" group="XCK"/>
+                <signal pad-key="pd3" function="default" group="TXD"/>
+                <signal pad-key="pd2" function="default" group="RXD"/>
+                <signal pad-key="pd4" function="default" group="XCK"/>
             </signals>
         </peripheral>
         <peripheral key="usart2" name="USART2" module-key="usart">
             <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"/>
-                <signal pad-id="pd7" function="default" group="XCK"/>
+                <signal pad-key="pe3" function="default" group="TXD"/>
+                <signal pad-key="pe2" function="default" group="RXD"/>
+                <signal pad-key="pd7" function="default" group="XCK"/>
             </signals>
         </peripheral>
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pa2" index="2" function="default" group="PORTA"/>
-                <signal pad-id="pa3" index="3" function="default" group="PORTA"/>
-                <signal pad-id="pa4" index="4" function="default" group="PORTA"/>
-                <signal pad-id="pa5" index="5" function="default" group="PORTA"/>
-                <signal pad-id="pa6" index="6" function="default" group="PORTA"/>
-                <signal pad-id="pa7" index="7" function="default" group="PORTA"/>
+                <signal pad-key="pa0" index="0" function="default" group="PORTA"/>
+                <signal pad-key="pa1" index="1" function="default" group="PORTA"/>
+                <signal pad-key="pa2" index="2" function="default" group="PORTA"/>
+                <signal pad-key="pa3" index="3" function="default" group="PORTA"/>
+                <signal pad-key="pa4" index="4" function="default" group="PORTA"/>
+                <signal pad-key="pa5" index="5" function="default" group="PORTA"/>
+                <signal pad-key="pa6" index="6" function="default" group="PORTA"/>
+                <signal pad-key="pa7" index="7" function="default" group="PORTA"/>
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pb2" index="2" function="default" group="PORTB"/>
-                <signal pad-id="pb3" index="3" function="default" group="PORTB"/>
-                <signal pad-id="pb4" index="4" function="default" group="PORTB"/>
-                <signal pad-id="pb5" index="5" function="default" group="PORTB"/>
-                <signal pad-id="pb6" index="6" function="default" group="PORTB"/>
-                <signal pad-id="pb7" index="7" function="default" group="PORTB"/>
+                <signal pad-key="pb0" index="0" function="default" group="PORTB"/>
+                <signal pad-key="pb1" index="1" function="default" group="PORTB"/>
+                <signal pad-key="pb2" index="2" function="default" group="PORTB"/>
+                <signal pad-key="pb3" index="3" function="default" group="PORTB"/>
+                <signal pad-key="pb4" index="4" function="default" group="PORTB"/>
+                <signal pad-key="pb5" index="5" function="default" group="PORTB"/>
+                <signal pad-key="pb6" index="6" function="default" group="PORTB"/>
+                <signal pad-key="pb7" index="7" function="default" group="PORTB"/>
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pc2" index="2" function="default" group="PORTC"/>
-                <signal pad-id="pc3" index="3" function="default" group="PORTC"/>
-                <signal pad-id="pc4" index="4" function="default" group="PORTC"/>
-                <signal pad-id="pc5" index="5" function="default" group="PORTC"/>
-                <signal pad-id="pc6" index="6" function="default" group="PORTC"/>
-                <signal pad-id="pc7" index="7" function="default" group="PORTC"/>
+                <signal pad-key="pc0" index="0" function="default" group="PORTC"/>
+                <signal pad-key="pc1" index="1" function="default" group="PORTC"/>
+                <signal pad-key="pc2" index="2" function="default" group="PORTC"/>
+                <signal pad-key="pc3" index="3" function="default" group="PORTC"/>
+                <signal pad-key="pc4" index="4" function="default" group="PORTC"/>
+                <signal pad-key="pc5" index="5" function="default" group="PORTC"/>
+                <signal pad-key="pc6" index="6" function="default" group="PORTC"/>
+                <signal pad-key="pc7" index="7" function="default" group="PORTC"/>
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pd2" index="2" function="default" group="PORTD"/>
-                <signal pad-id="pd3" index="3" function="default" group="PORTD"/>
-                <signal pad-id="pd4" index="4" function="default" group="PORTD"/>
-                <signal pad-id="pd5" index="5" function="default" group="PORTD"/>
-                <signal pad-id="pd6" index="6" function="default" group="PORTD"/>
-                <signal pad-id="pd7" index="7" function="default" group="PORTD"/>
+                <signal pad-key="pd0" index="0" function="default" group="PORTD"/>
+                <signal pad-key="pd1" index="1" function="default" group="PORTD"/>
+                <signal pad-key="pd2" index="2" function="default" group="PORTD"/>
+                <signal pad-key="pd3" index="3" function="default" group="PORTD"/>
+                <signal pad-key="pd4" index="4" function="default" group="PORTD"/>
+                <signal pad-key="pd5" index="5" function="default" group="PORTD"/>
+                <signal pad-key="pd6" index="6" function="default" group="PORTD"/>
+                <signal pad-key="pd7" index="7" function="default" group="PORTD"/>
             </signals>
         </peripheral>
         <peripheral key="porte" name="PORTE" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pe2" index="2" function="default" group="PORTE"/>
-                <signal pad-id="pe3" index="3" function="default" group="PORTE"/>
-                <signal pad-id="pe4" index="4" function="default" group="PORTE"/>
-                <signal pad-id="pe5" index="5" function="default" group="PORTE"/>
-                <signal pad-id="pe6" index="6" function="default" group="PORTE"/>
+                <signal pad-key="pe0" index="0" function="default" group="PORTE"/>
+                <signal pad-key="pe1" index="1" function="default" group="PORTE"/>
+                <signal pad-key="pe2" index="2" function="default" group="PORTE"/>
+                <signal pad-key="pe3" index="3" function="default" group="PORTE"/>
+                <signal pad-key="pe4" index="4" function="default" group="PORTE"/>
+                <signal pad-key="pe5" index="5" function="default" group="PORTE"/>
+                <signal pad-key="pe6" index="6" function="default" group="PORTE"/>
             </signals>
         </peripheral>
         <peripheral key="tc0" name="TC0" module-key="tc8">
             <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"/>
-                <signal pad-id="pb3" function="default" group="OCA"/>
+                <signal pad-key="pb0" function="default" group="T"/>
+                <signal pad-key="pb4" function="default" group="OCB"/>
+                <signal pad-key="pb3" function="default" group="OCA"/>
             </signals>
         </peripheral>
         <peripheral key="tc1" name="TC1" module-key="tc16">
             <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"/>
-                <signal pad-id="pd5" function="default" group="OCA"/>
-                <signal pad-id="pd4" function="default" group="OCB"/>
+                <signal pad-key="pb1" function="default" group="T"/>
+                <signal pad-key="pd6" function="default" group="ICP"/>
+                <signal pad-key="pd5" function="default" group="OCA"/>
+                <signal pad-key="pd4" function="default" group="OCB"/>
             </signals>
         </peripheral>
         <peripheral key="tc3" name="TC3" module-key="tc16">
             <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"/>
-                <signal pad-id="pb6" function="default" group="OCA"/>
-                <signal pad-id="pb7" function="default" group="OCB"/>
+                <signal pad-key="pd0" function="default" group="T"/>
+                <signal pad-key="pb5" function="default" group="ICP"/>
+                <signal pad-key="pb6" function="default" group="OCA"/>
+                <signal pad-key="pb7" function="default" group="OCB"/>
             </signals>
         </peripheral>
         <peripheral key="tc4" name="TC4" module-key="tc16">
             <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"/>
-                <signal pad-id="pc4" function="default" group="OCA"/>
-                <signal pad-id="pb7" function="default" group="OCB"/>
+                <signal pad-key="pc2" function="default" group="T"/>
+                <signal pad-key="pc3" function="default" group="ICP"/>
+                <signal pad-key="pc4" function="default" group="OCA"/>
+                <signal pad-key="pb7" function="default" group="OCB"/>
             </signals>
         </peripheral>
         <peripheral key="tc2" name="TC2" module-key="tc8_async">
             <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"/>
+                <signal pad-key="pd7" function="default" group="OCA"/>
+                <signal pad-key="pd6" function="default" group="OCB"/>
             </signals>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="wdt">
@@ -360,118 +360,118 @@
         </peripheral>
         <peripheral key="ptc" name="PTC" module-key="ptc">
             <signals>
-                <signal pad-id="pd0" index="0" function="default" group="X"/>
-                <signal pad-id="pd1" index="1" function="default" group="X"/>
-                <signal pad-id="pd2" index="2" function="default" group="X"/>
-                <signal pad-id="pd3" index="3" function="default" group="X"/>
-                <signal pad-id="pd4" index="4" function="default" group="X"/>
-                <signal pad-id="pd5" index="5" function="default" group="X"/>
-                <signal pad-id="pd6" index="6" function="default" group="X"/>
-                <signal pad-id="pd7" index="7" function="default" group="X"/>
-                <signal pad-id="pe2" index="8" function="default" group="X"/>
-                <signal pad-id="pe3" index="9" function="default" group="X"/>
-                <signal pad-id="pc0" index="10" function="default" group="X"/>
-                <signal pad-id="pc1" index="11" function="default" group="X"/>
-                <signal pad-id="pc2" index="12" function="default" group="X"/>
-                <signal pad-id="pc3" index="13" function="default" group="X"/>
-                <signal pad-id="pc4" index="14" function="default" group="X"/>
-                <signal pad-id="pc5" index="15" function="default" group="X"/>
-                <signal pad-id="pa0" index="0" function="default" group="Y"/>
-                <signal pad-id="pa1" index="1" function="default" group="Y"/>
-                <signal pad-id="pa2" index="2" function="default" group="Y"/>
-                <signal pad-id="pa3" index="3" function="default" group="Y"/>
-                <signal pad-id="pa4" index="4" function="default" group="Y"/>
-                <signal pad-id="pa5" index="5" function="default" group="Y"/>
-                <signal pad-id="pa6" index="6" function="default" group="Y"/>
-                <signal pad-id="pa7" index="7" function="default" group="Y"/>
-                <signal pad-id="pd0" index="8" function="default" group="Y"/>
-                <signal pad-id="pd1" index="9" function="default" group="Y"/>
-                <signal pad-id="pd2" index="10" function="default" group="Y"/>
-                <signal pad-id="pd3" index="11" function="default" group="Y"/>
-                <signal pad-id="pd4" index="12" function="default" group="Y"/>
-                <signal pad-id="pd5" index="13" function="default" group="Y"/>
-                <signal pad-id="pd6" index="14" function="default" group="Y"/>
-                <signal pad-id="pd7" index="15" function="default" group="Y"/>
-                <signal pad-id="pe2" index="16" function="default" group="Y"/>
-                <signal pad-id="pe3" index="17" function="default" group="Y"/>
-                <signal pad-id="pc0" index="18" function="default" group="Y"/>
-                <signal pad-id="pc1" index="19" function="default" group="Y"/>
-                <signal pad-id="pc2" index="20" function="default" group="Y"/>
-                <signal pad-id="pc3" index="21" function="default" group="Y"/>
-                <signal pad-id="pc4" index="22" function="default" group="Y"/>
-                <signal pad-id="pc5" index="23" function="default" group="Y"/>
-                <signal pad-id="pb0" index="24" function="default" group="Y"/>
-                <signal pad-id="pb1" index="25" function="default" group="Y"/>
-                <signal pad-id="pb2" index="26" function="default" group="Y"/>
-                <signal pad-id="pb3" index="27" function="default" group="Y"/>
-                <signal pad-id="pb4" index="28" function="default" group="Y"/>
-                <signal pad-id="pb5" index="29" function="default" group="Y"/>
-                <signal pad-id="pb6" index="30" function="default" group="Y"/>
-                <signal pad-id="pb7" index="31" function="default" group="Y"/>
+                <signal pad-key="pd0" index="0" function="default" group="X"/>
+                <signal pad-key="pd1" index="1" function="default" group="X"/>
+                <signal pad-key="pd2" index="2" function="default" group="X"/>
+                <signal pad-key="pd3" index="3" function="default" group="X"/>
+                <signal pad-key="pd4" index="4" function="default" group="X"/>
+                <signal pad-key="pd5" index="5" function="default" group="X"/>
+                <signal pad-key="pd6" index="6" function="default" group="X"/>
+                <signal pad-key="pd7" index="7" function="default" group="X"/>
+                <signal pad-key="pe2" index="8" function="default" group="X"/>
+                <signal pad-key="pe3" index="9" function="default" group="X"/>
+                <signal pad-key="pc0" index="10" function="default" group="X"/>
+                <signal pad-key="pc1" index="11" function="default" group="X"/>
+                <signal pad-key="pc2" index="12" function="default" group="X"/>
+                <signal pad-key="pc3" index="13" function="default" group="X"/>
+                <signal pad-key="pc4" index="14" function="default" group="X"/>
+                <signal pad-key="pc5" index="15" function="default" group="X"/>
+                <signal pad-key="pa0" index="0" function="default" group="Y"/>
+                <signal pad-key="pa1" index="1" function="default" group="Y"/>
+                <signal pad-key="pa2" index="2" function="default" group="Y"/>
+                <signal pad-key="pa3" index="3" function="default" group="Y"/>
+                <signal pad-key="pa4" index="4" function="default" group="Y"/>
+                <signal pad-key="pa5" index="5" function="default" group="Y"/>
+                <signal pad-key="pa6" index="6" function="default" group="Y"/>
+                <signal pad-key="pa7" index="7" function="default" group="Y"/>
+                <signal pad-key="pd0" index="8" function="default" group="Y"/>
+                <signal pad-key="pd1" index="9" function="default" group="Y"/>
+                <signal pad-key="pd2" index="10" function="default" group="Y"/>
+                <signal pad-key="pd3" index="11" function="default" group="Y"/>
+                <signal pad-key="pd4" index="12" function="default" group="Y"/>
+                <signal pad-key="pd5" index="13" function="default" group="Y"/>
+                <signal pad-key="pd6" index="14" function="default" group="Y"/>
+                <signal pad-key="pd7" index="15" function="default" group="Y"/>
+                <signal pad-key="pe2" index="16" function="default" group="Y"/>
+                <signal pad-key="pe3" index="17" function="default" group="Y"/>
+                <signal pad-key="pc0" index="18" function="default" group="Y"/>
+                <signal pad-key="pc1" index="19" function="default" group="Y"/>
+                <signal pad-key="pc2" index="20" function="default" group="Y"/>
+                <signal pad-key="pc3" index="21" function="default" group="Y"/>
+                <signal pad-key="pc4" index="22" function="default" group="Y"/>
+                <signal pad-key="pc5" index="23" function="default" group="Y"/>
+                <signal pad-key="pb0" index="24" function="default" group="Y"/>
+                <signal pad-key="pb1" index="25" function="default" group="Y"/>
+                <signal pad-key="pb2" index="26" function="default" group="Y"/>
+                <signal pad-key="pb3" index="27" function="default" group="Y"/>
+                <signal pad-key="pb4" index="28" function="default" group="Y"/>
+                <signal pad-key="pb5" index="29" function="default" group="Y"/>
+                <signal pad-key="pb6" index="30" function="default" group="Y"/>
+                <signal pad-key="pb7" index="31" function="default" group="Y"/>
             </signals>
         </peripheral>
         <peripheral key="jtag" name="JTAG" module-key="jtag">
             <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"/>
-                <signal pad-id="pc4" function="default" group="TDO"/>
-                <signal pad-id="pc5" function="default" group="TDI"/>
+                <signal pad-key="pc2" function="default" group="TCK"/>
+                <signal pad-key="pc3" function="default" group="TMS"/>
+                <signal pad-key="pc4" function="default" group="TDO"/>
+                <signal pad-key="pc5" function="default" group="TDI"/>
             </signals>
         </peripheral>
         <peripheral key="exint" name="EXINT" module-key="exint">
             <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"/>
-                <signal pad-id="pa2" index="2" function="default" group="PCINT"/>
-                <signal pad-id="pa3" index="3" function="default" group="PCINT"/>
-                <signal pad-id="pa4" index="4" function="default" group="PCINT"/>
-                <signal pad-id="pa5" index="5" function="default" group="PCINT"/>
-                <signal pad-id="pa6" index="6" function="default" group="PCINT"/>
-                <signal pad-id="pa7" index="7" function="default" group="PCINT"/>
-                <signal pad-id="pb0" index="8" function="default" group="PCINT"/>
-                <signal pad-id="pb1" index="9" function="default" group="PCINT"/>
-                <signal pad-id="pb2" index="10" function="default" group="PCINT"/>
-                <signal pad-id="pb3" index="11" function="default" group="PCINT"/>
-                <signal pad-id="pb4" index="12" function="default" group="PCINT"/>
-                <signal pad-id="pb5" index="13" function="default" group="PCINT"/>
-                <signal pad-id="pb6" index="14" function="default" group="PCINT"/>
-                <signal pad-id="pb7" index="15" function="default" group="PCINT"/>
-                <signal pad-id="pc0" index="16" function="default" group="PCINT"/>
-                <signal pad-id="pc1" index="17" function="default" group="PCINT"/>
-                <signal pad-id="pc2" index="18" function="default" group="PCINT"/>
-                <signal pad-id="pc3" index="19" function="default" group="PCINT"/>
-                <signal pad-id="pc4" index="20" function="default" group="PCINT"/>
-                <signal pad-id="pc5" index="21" function="default" group="PCINT"/>
-                <signal pad-id="pc6" index="22" function="default" group="PCINT"/>
-                <signal pad-id="pc7" index="23" function="default" group="PCINT"/>
-                <signal pad-id="pd0" index="24" function="default" group="PCINT"/>
-                <signal pad-id="pd1" index="25" function="default" group="PCINT"/>
-                <signal pad-id="pd2" index="26" function="default" group="PCINT"/>
-                <signal pad-id="pd3" index="27" function="default" group="PCINT"/>
-                <signal pad-id="pd4" index="28" function="default" group="PCINT"/>
-                <signal pad-id="pd5" index="29" function="default" group="PCINT"/>
-                <signal pad-id="pd6" index="30" function="default" group="PCINT"/>
-                <signal pad-id="pd7" index="31" function="default" group="PCINT"/>
-                <signal pad-id="pe0" index="32" function="default" group="PCINT"/>
-                <signal pad-id="pe1" index="33" function="default" group="PCINT"/>
-                <signal pad-id="pd2" index="0" function="default" group="INT"/>
-                <signal pad-id="pd3" index="1" function="default" group="INT"/>
-                <signal pad-id="pb2" index="2" function="default" group="INT"/>
+                <signal pad-key="pa0" index="0" function="default" group="PCINT"/>
+                <signal pad-key="pa1" index="1" function="default" group="PCINT"/>
+                <signal pad-key="pa2" index="2" function="default" group="PCINT"/>
+                <signal pad-key="pa3" index="3" function="default" group="PCINT"/>
+                <signal pad-key="pa4" index="4" function="default" group="PCINT"/>
+                <signal pad-key="pa5" index="5" function="default" group="PCINT"/>
+                <signal pad-key="pa6" index="6" function="default" group="PCINT"/>
+                <signal pad-key="pa7" index="7" function="default" group="PCINT"/>
+                <signal pad-key="pb0" index="8" function="default" group="PCINT"/>
+                <signal pad-key="pb1" index="9" function="default" group="PCINT"/>
+                <signal pad-key="pb2" index="10" function="default" group="PCINT"/>
+                <signal pad-key="pb3" index="11" function="default" group="PCINT"/>
+                <signal pad-key="pb4" index="12" function="default" group="PCINT"/>
+                <signal pad-key="pb5" index="13" function="default" group="PCINT"/>
+                <signal pad-key="pb6" index="14" function="default" group="PCINT"/>
+                <signal pad-key="pb7" index="15" function="default" group="PCINT"/>
+                <signal pad-key="pc0" index="16" function="default" group="PCINT"/>
+                <signal pad-key="pc1" index="17" function="default" group="PCINT"/>
+                <signal pad-key="pc2" index="18" function="default" group="PCINT"/>
+                <signal pad-key="pc3" index="19" function="default" group="PCINT"/>
+                <signal pad-key="pc4" index="20" function="default" group="PCINT"/>
+                <signal pad-key="pc5" index="21" function="default" group="PCINT"/>
+                <signal pad-key="pc6" index="22" function="default" group="PCINT"/>
+                <signal pad-key="pc7" index="23" function="default" group="PCINT"/>
+                <signal pad-key="pd0" index="24" function="default" group="PCINT"/>
+                <signal pad-key="pd1" index="25" function="default" group="PCINT"/>
+                <signal pad-key="pd2" index="26" function="default" group="PCINT"/>
+                <signal pad-key="pd3" index="27" function="default" group="PCINT"/>
+                <signal pad-key="pd4" index="28" function="default" group="PCINT"/>
+                <signal pad-key="pd5" index="29" function="default" group="PCINT"/>
+                <signal pad-key="pd6" index="30" function="default" group="PCINT"/>
+                <signal pad-key="pd7" index="31" function="default" group="PCINT"/>
+                <signal pad-key="pe0" index="32" function="default" group="PCINT"/>
+                <signal pad-key="pe1" index="33" function="default" group="PCINT"/>
+                <signal pad-key="pd2" index="0" function="default" group="INT"/>
+                <signal pad-key="pd3" index="1" function="default" group="INT"/>
+                <signal pad-key="pb2" index="2" function="default" group="INT"/>
             </signals>
         </peripheral>
         <peripheral key="adc" name="ADC" module-key="adc">
             <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"/>
-                <signal pad-id="pa2" function="default" group="ADC2"/>
-                <signal pad-id="pa3" function="default" group="ADC3"/>
-                <signal pad-id="pa4" function="default" group="ADC4"/>
-                <signal pad-id="pa5" function="default" group="ADC5"/>
-                <signal pad-id="pa6" function="default" group="ADC6"/>
-                <signal pad-id="pa7" function="default" group="ADC7"/>
+                <signal pad-key="pa0" function="default" group="ADC0"/>
+                <signal pad-key="pa1" function="default" group="ADC1"/>
+                <signal pad-key="pa2" function="default" group="ADC2"/>
+                <signal pad-key="pa3" function="default" group="ADC3"/>
+                <signal pad-key="pa4" function="default" group="ADC4"/>
+                <signal pad-key="pa5" function="default" group="ADC5"/>
+                <signal pad-key="pa6" function="default" group="ADC6"/>
+                <signal pad-key="pa7" function="default" group="ADC7"/>
             </signals>
         </peripheral>
         <peripheral key="eeprom" name="EEPROM" module-key="eeprom">
@@ -480,33 +480,33 @@
         <peripheral key="spi0" name="SPI0" module-key="spi">
             <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"/>
-                <signal pad-id="pb6" function="default" group="MISO"/>
-                <signal pad-id="pb7" function="default" group="SCK"/>
+                <signal pad-key="pb4" function="default" group="SS"/>
+                <signal pad-key="pb5" function="default" group="MOSI"/>
+                <signal pad-key="pb6" function="default" group="MISO"/>
+                <signal pad-key="pb7" function="default" group="SCK"/>
             </signals>
         </peripheral>
         <peripheral key="spi1" name="SPI1" module-key="spi">
             <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"/>
-                <signal pad-id="pe2" function="default" group="MISO"/>
-                <signal pad-id="pe3" function="default" group="MOSI"/>
+                <signal pad-key="pd6" function="default" group="SS"/>
+                <signal pad-key="pd7" function="default" group="SCK"/>
+                <signal pad-key="pe2" function="default" group="MISO"/>
+                <signal pad-key="pe3" function="default" group="MOSI"/>
             </signals>
         </peripheral>
         <peripheral key="twi0" name="TWI0" module-key="twi">
             <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"/>
+                <signal pad-key="pc1" function="default" group="SDA0"/>
+                <signal pad-key="pc0" function="default" group="SCL0"/>
             </signals>
         </peripheral>
         <peripheral key="twi1" name="TWI1" module-key="twi">
             <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"/>
+                <signal pad-key="pe5" function="default" group="SDA1"/>
+                <signal pad-key="pe6" function="default" group="SCL1"/>
             </signals>
         </peripheral>
         <peripheral key="cfd" name="CFD" module-key="cfd">
@@ -515,7 +515,7 @@
         <peripheral key="cpu" name="CPU" module-key="cpu">
             <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"/>
+                <signal pad-key="pb1" index="0" function="default" group="CLK"/>
             </signals>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="fuse">
@@ -1159,108 +1159,153 @@
             </register-group>
         </module>
     </modules>
+    <pads>
+        <pad key="pb5" name="PB5"/>
+        <pad key="pb6" name="PB6"/>
+        <pad key="pb7" name="PB7"/>
+        <pad key="reset" name="RESET"/>
+        <pad key="vcc" name="VCC"/>
+        <pad key="gnd" name="GND"/>
+        <pad key="pe0" name="PE0"/>
+        <pad key="pe1" name="PE1"/>
+        <pad key="pd0" name="PD0"/>
+        <pad key="pd1" name="PD1"/>
+        <pad key="pd2" name="PD2"/>
+        <pad key="pd3" name="PD3"/>
+        <pad key="pd4" name="PD4"/>
+        <pad key="pd5" name="PD5"/>
+        <pad key="pd6" name="PD6"/>
+        <pad key="pd7" name="PD7"/>
+        <pad key="pe2" name="PE2"/>
+        <pad key="pe3" name="PE3"/>
+        <pad key="pc0" name="PC0"/>
+        <pad key="pc1" name="PC1"/>
+        <pad key="pc2" name="PC2"/>
+        <pad key="pc3" name="PC3"/>
+        <pad key="pc4" name="PC4"/>
+        <pad key="pc5" name="PC5"/>
+        <pad key="pc6" name="PC6"/>
+        <pad key="pc7" name="PC7"/>
+        <pad key="avcc" name="AVCC"/>
+        <pad key="pe4" name="PE4"/>
+        <pad key="pa7" name="PA7"/>
+        <pad key="pa6" name="PA6"/>
+        <pad key="pa5" name="PA5"/>
+        <pad key="pa4" name="PA4"/>
+        <pad key="pa3" name="PA3"/>
+        <pad key="pa2" name="PA2"/>
+        <pad key="pa1" name="PA1"/>
+        <pad key="pa0" name="PA0"/>
+        <pad key="pe5" name="PE5"/>
+        <pad key="pe6" name="PE6"/>
+        <pad key="pb0" name="PB0"/>
+        <pad key="pb1" name="PB1"/>
+        <pad key="pb2" name="PB2"/>
+        <pad key="pb3" name="PB3"/>
+        <pad key="pb4" name="PB4"/>
+    </pads>
     <pinouts>
         <pinout key="tqfp44" name="TQFP44" type="qfp">
-            <pin position="1" pad="PB5"/>
-            <pin position="2" pad="PB6"/>
-            <pin position="3" pad="PB7"/>
-            <pin position="4" pad="RESET"/>
-            <pin position="5" pad="VCC"/>
-            <pin position="6" pad="GND"/>
-            <pin position="7" pad="PE0"/>
-            <pin position="8" pad="PE1"/>
-            <pin position="9" pad="PD0"/>
-            <pin position="10" pad="PD1"/>
-            <pin position="11" pad="PD2"/>
-            <pin position="12" pad="PD3"/>
-            <pin position="13" pad="PD4"/>
-            <pin position="14" pad="PD5"/>
-            <pin position="15" pad="PD6"/>
-            <pin position="16" pad="PD7"/>
-            <pin position="17" pad="PE2"/>
-            <pin position="18" pad="PE3"/>
-            <pin position="19" pad="PC0"/>
-            <pin position="20" pad="PC1"/>
-            <pin position="21" pad="PC2"/>
-            <pin position="22" pad="PC3"/>
-            <pin position="23" pad="PC4"/>
-            <pin position="24" pad="PC5"/>
-            <pin position="25" pad="PC6"/>
-            <pin position="26" pad="PC7"/>
-            <pin position="27" pad="AVCC"/>
-            <pin position="28" pad="GND"/>
-            <pin position="29" pad="PE4"/>
-            <pin position="30" pad="PA7"/>
-            <pin position="31" pad="PA6"/>
-            <pin position="32" pad="PA5"/>
-            <pin position="33" pad="PA4"/>
-            <pin position="34" pad="PA3"/>
-            <pin position="35" pad="PA2"/>
-            <pin position="36" pad="PA1"/>
-            <pin position="37" pad="PA0"/>
-            <pin position="38" pad="PE5"/>
-            <pin position="39" pad="PE6"/>
-            <pin position="40" pad="PB0"/>
-            <pin position="41" pad="PB1"/>
-            <pin position="42" pad="PB2"/>
-            <pin position="43" pad="PB3"/>
-            <pin position="44" pad="PB4"/>
+            <pin position="1" pad-key="pb5"/>
+            <pin position="2" pad-key="pb6"/>
+            <pin position="3" pad-key="pb7"/>
+            <pin position="4" pad-key="reset"/>
+            <pin position="5" pad-key="vcc"/>
+            <pin position="6" pad-key="gnd"/>
+            <pin position="7" pad-key="pe0"/>
+            <pin position="8" pad-key="pe1"/>
+            <pin position="9" pad-key="pd0"/>
+            <pin position="10" pad-key="pd1"/>
+            <pin position="11" pad-key="pd2"/>
+            <pin position="12" pad-key="pd3"/>
+            <pin position="13" pad-key="pd4"/>
+            <pin position="14" pad-key="pd5"/>
+            <pin position="15" pad-key="pd6"/>
+            <pin position="16" pad-key="pd7"/>
+            <pin position="17" pad-key="pe2"/>
+            <pin position="18" pad-key="pe3"/>
+            <pin position="19" pad-key="pc0"/>
+            <pin position="20" pad-key="pc1"/>
+            <pin position="21" pad-key="pc2"/>
+            <pin position="22" pad-key="pc3"/>
+            <pin position="23" pad-key="pc4"/>
+            <pin position="24" pad-key="pc5"/>
+            <pin position="25" pad-key="pc6"/>
+            <pin position="26" pad-key="pc7"/>
+            <pin position="27" pad-key="avcc"/>
+            <pin position="28" pad-key="gnd"/>
+            <pin position="29" pad-key="pe4"/>
+            <pin position="30" pad-key="pa7"/>
+            <pin position="31" pad-key="pa6"/>
+            <pin position="32" pad-key="pa5"/>
+            <pin position="33" pad-key="pa4"/>
+            <pin position="34" pad-key="pa3"/>
+            <pin position="35" pad-key="pa2"/>
+            <pin position="36" pad-key="pa1"/>
+            <pin position="37" pad-key="pa0"/>
+            <pin position="38" pad-key="pe5"/>
+            <pin position="39" pad-key="pe6"/>
+            <pin position="40" pad-key="pb0"/>
+            <pin position="41" pad-key="pb1"/>
+            <pin position="42" pad-key="pb2"/>
+            <pin position="43" pad-key="pb3"/>
+            <pin position="44" pad-key="pb4"/>
         </pinout>
         <pinout key="vqfn44" name="VQFN44" type="qfn">
-            <pin position="1" pad="PB5"/>
-            <pin position="2" pad="PB6"/>
-            <pin position="3" pad="PB7"/>
-            <pin position="4" pad="RESET"/>
-            <pin position="5" pad="VCC"/>
-            <pin position="6" pad="GND"/>
-            <pin position="7" pad="PE0"/>
-            <pin position="8" pad="PE1"/>
-            <pin position="9" pad="PD0"/>
-            <pin position="10" pad="PD1"/>
-            <pin position="11" pad="PD2"/>
-            <pin position="12" pad="PD3"/>
-            <pin position="13" pad="PD4"/>
-            <pin position="14" pad="PD5"/>
-            <pin position="15" pad="PD6"/>
-            <pin position="16" pad="PD7"/>
-            <pin position="17" pad="PE2"/>
-            <pin position="18" pad="PE3"/>
-            <pin position="19" pad="PC0"/>
-            <pin position="20" pad="PC1"/>
-            <pin position="21" pad="PC2"/>
-            <pin position="22" pad="PC3"/>
-            <pin position="23" pad="PC4"/>
-            <pin position="24" pad="PC5"/>
-            <pin position="25" pad="PC6"/>
-            <pin position="26" pad="PC7"/>
-            <pin position="27" pad="AVCC"/>
-            <pin position="28" pad="GND"/>
-            <pin position="29" pad="PE4"/>
-            <pin position="30" pad="PA7"/>
-            <pin position="31" pad="PA6"/>
-            <pin position="32" pad="PA5"/>
-            <pin position="33" pad="PA4"/>
-            <pin position="34" pad="PA3"/>
-            <pin position="35" pad="PA2"/>
-            <pin position="36" pad="PA1"/>
-            <pin position="37" pad="PA0"/>
-            <pin position="38" pad="PE5"/>
-            <pin position="39" pad="PE6"/>
-            <pin position="40" pad="PB0"/>
-            <pin position="41" pad="PB1"/>
-            <pin position="42" pad="PB2"/>
-            <pin position="43" pad="PB3"/>
-            <pin position="44" pad="PB4"/>
+            <pin position="1" pad-key="pb5"/>
+            <pin position="2" pad-key="pb6"/>
+            <pin position="3" pad-key="pb7"/>
+            <pin position="4" pad-key="reset"/>
+            <pin position="5" pad-key="vcc"/>
+            <pin position="6" pad-key="gnd"/>
+            <pin position="7" pad-key="pe0"/>
+            <pin position="8" pad-key="pe1"/>
+            <pin position="9" pad-key="pd0"/>
+            <pin position="10" pad-key="pd1"/>
+            <pin position="11" pad-key="pd2"/>
+            <pin position="12" pad-key="pd3"/>
+            <pin position="13" pad-key="pd4"/>
+            <pin position="14" pad-key="pd5"/>
+            <pin position="15" pad-key="pd6"/>
+            <pin position="16" pad-key="pd7"/>
+            <pin position="17" pad-key="pe2"/>
+            <pin position="18" pad-key="pe3"/>
+            <pin position="19" pad-key="pc0"/>
+            <pin position="20" pad-key="pc1"/>
+            <pin position="21" pad-key="pc2"/>
+            <pin position="22" pad-key="pc3"/>
+            <pin position="23" pad-key="pc4"/>
+            <pin position="24" pad-key="pc5"/>
+            <pin position="25" pad-key="pc6"/>
+            <pin position="26" pad-key="pc7"/>
+            <pin position="27" pad-key="avcc"/>
+            <pin position="28" pad-key="gnd"/>
+            <pin position="29" pad-key="pe4"/>
+            <pin position="30" pad-key="pa7"/>
+            <pin position="31" pad-key="pa6"/>
+            <pin position="32" pad-key="pa5"/>
+            <pin position="33" pad-key="pa4"/>
+            <pin position="34" pad-key="pa3"/>
+            <pin position="35" pad-key="pa2"/>
+            <pin position="36" pad-key="pa1"/>
+            <pin position="37" pad-key="pa0"/>
+            <pin position="38" pad-key="pe5"/>
+            <pin position="39" pad-key="pe6"/>
+            <pin position="40" pad-key="pb0"/>
+            <pin position="41" pad-key="pb1"/>
+            <pin position="42" pad-key="pb2"/>
+            <pin position="43" pad-key="pb3"/>
+            <pin position="44" pad-key="pb4"/>
         </pinout>
     </pinouts>
     <variants>
-        <variant name="ATmega324PB-AU" pinout-key="tqfp44" package="TQFP44"/>
-        <variant name="ATmega324PB-AUR" pinout-key="tqfp44" package="TQFP44"/>
-        <variant name="ATmega324PB-MU" pinout-key="vqfn44" package="VQFN44"/>
-        <variant name="ATmega324PB-MUR" pinout-key="vqfn44" package="VQFN44"/>
-        <variant name="ATmega324PB-AN" pinout-key="tqfp44" package="TQFP44"/>
-        <variant name="ATmega324PB-ANR" pinout-key="tqfp44" package="TQFP44"/>
-        <variant name="ATmega324PB-MN" pinout-key="vqfn44" package="VQFN44"/>
-        <variant name="ATmega324PB-MNR" pinout-key="vqfn44" package="VQFN44"/>
+        <variant key="atmega324pb_au" name="ATmega324PB-AU" pinout-key="tqfp44"/>
+        <variant key="atmega324pb_aur" name="ATmega324PB-AUR" pinout-key="tqfp44"/>
+        <variant key="atmega324pb_mu" name="ATmega324PB-MU" pinout-key="vqfn44"/>
+        <variant key="atmega324pb_mur" name="ATmega324PB-MUR" pinout-key="vqfn44"/>
+        <variant key="atmega324pb_an" name="ATmega324PB-AN" pinout-key="tqfp44"/>
+        <variant key="atmega324pb_anr" name="ATmega324PB-ANR" pinout-key="tqfp44"/>
+        <variant key="atmega324pb_mn" name="ATmega324PB-MN" pinout-key="vqfn44"/>
+        <variant key="atmega324pb_mnr" name="ATmega324PB-MNR" pinout-key="vqfn44"/>
     </variants>
 </device>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA325.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA325.xml
index 63d732bc..6543dc4e 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA325.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA325.xml
@@ -221,90 +221,90 @@
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pa2" index="2" function="PORTA" group="P"/>
-                <signal pad-id="pa3" index="3" function="PORTA" group="P"/>
-                <signal pad-id="pa4" index="4" function="PORTA" group="P"/>
-                <signal pad-id="pa5" index="5" function="PORTA" group="P"/>
-                <signal pad-id="pa6" index="6" function="PORTA" group="P"/>
-                <signal pad-id="pa7" index="7" function="PORTA" group="P"/>
+                <signal pad-key="pa0" index="0" function="PORTA" group="P"/>
+                <signal pad-key="pa1" index="1" function="PORTA" group="P"/>
+                <signal pad-key="pa2" index="2" function="PORTA" group="P"/>
+                <signal pad-key="pa3" index="3" function="PORTA" group="P"/>
+                <signal pad-key="pa4" index="4" function="PORTA" group="P"/>
+                <signal pad-key="pa5" index="5" function="PORTA" group="P"/>
+                <signal pad-key="pa6" index="6" function="PORTA" group="P"/>
+                <signal pad-key="pa7" index="7" function="PORTA" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pb2" index="2" function="PORTB" group="P"/>
-                <signal pad-id="pb3" index="3" function="PORTB" group="P"/>
-                <signal pad-id="pb4" index="4" function="PORTB" group="P"/>
-                <signal pad-id="pb5" index="5" function="PORTB" group="P"/>
-                <signal pad-id="pb6" index="6" function="PORTB" group="P"/>
-                <signal pad-id="pb7" index="7" function="PORTB" group="P"/>
+                <signal pad-key="pb0" index="0" function="PORTB" group="P"/>
+                <signal pad-key="pb1" index="1" function="PORTB" group="P"/>
+                <signal pad-key="pb2" index="2" function="PORTB" group="P"/>
+                <signal pad-key="pb3" index="3" function="PORTB" group="P"/>
+                <signal pad-key="pb4" index="4" function="PORTB" group="P"/>
+                <signal pad-key="pb5" index="5" function="PORTB" group="P"/>
+                <signal pad-key="pb6" index="6" function="PORTB" group="P"/>
+                <signal pad-key="pb7" index="7" function="PORTB" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pc2" index="2" function="PORTC" group="P"/>
-                <signal pad-id="pc3" index="3" function="PORTC" group="P"/>
-                <signal pad-id="pc4" index="4" function="PORTC" group="P"/>
-                <signal pad-id="pc5" index="5" function="PORTC" group="P"/>
-                <signal pad-id="pc6" index="6" function="PORTC" group="P"/>
-                <signal pad-id="pc7" index="7" function="PORTC" group="P"/>
+                <signal pad-key="pc0" index="0" function="PORTC" group="P"/>
+                <signal pad-key="pc1" index="1" function="PORTC" group="P"/>
+                <signal pad-key="pc2" index="2" function="PORTC" group="P"/>
+                <signal pad-key="pc3" index="3" function="PORTC" group="P"/>
+                <signal pad-key="pc4" index="4" function="PORTC" group="P"/>
+                <signal pad-key="pc5" index="5" function="PORTC" group="P"/>
+                <signal pad-key="pc6" index="6" function="PORTC" group="P"/>
+                <signal pad-key="pc7" index="7" function="PORTC" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pd2" index="2" function="PORTD" group="P"/>
-                <signal pad-id="pd3" index="3" function="PORTD" group="P"/>
-                <signal pad-id="pd4" index="4" function="PORTD" group="P"/>
-                <signal pad-id="pd5" index="5" function="PORTD" group="P"/>
-                <signal pad-id="pd6" index="6" function="PORTD" group="P"/>
-                <signal pad-id="pd7" index="7" function="PORTD" group="P"/>
+                <signal pad-key="pd0" index="0" function="PORTD" group="P"/>
+                <signal pad-key="pd1" index="1" function="PORTD" group="P"/>
+                <signal pad-key="pd2" index="2" function="PORTD" group="P"/>
+                <signal pad-key="pd3" index="3" function="PORTD" group="P"/>
+                <signal pad-key="pd4" index="4" function="PORTD" group="P"/>
+                <signal pad-key="pd5" index="5" function="PORTD" group="P"/>
+                <signal pad-key="pd6" index="6" function="PORTD" group="P"/>
+                <signal pad-key="pd7" index="7" function="PORTD" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="porte" name="PORTE" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pe2" index="2" function="PORTE" group="P"/>
-                <signal pad-id="pe3" index="3" function="PORTE" group="P"/>
-                <signal pad-id="pe4" index="4" function="PORTE" group="P"/>
-                <signal pad-id="pe5" index="5" function="PORTE" group="P"/>
-                <signal pad-id="pe6" index="6" function="PORTE" group="P"/>
-                <signal pad-id="pe7" index="7" function="PORTE" group="P"/>
+                <signal pad-key="pe0" index="0" function="PORTE" group="P"/>
+                <signal pad-key="pe1" index="1" function="PORTE" group="P"/>
+                <signal pad-key="pe2" index="2" function="PORTE" group="P"/>
+                <signal pad-key="pe3" index="3" function="PORTE" group="P"/>
+                <signal pad-key="pe4" index="4" function="PORTE" group="P"/>
+                <signal pad-key="pe5" index="5" function="PORTE" group="P"/>
+                <signal pad-key="pe6" index="6" function="PORTE" group="P"/>
+                <signal pad-key="pe7" index="7" function="PORTE" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portf" name="PORTF" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pf2" index="2" function="PORTF" group="P"/>
-                <signal pad-id="pf3" index="3" function="PORTF" group="P"/>
-                <signal pad-id="pf4" index="4" function="PORTF" group="P"/>
-                <signal pad-id="pf5" index="5" function="PORTF" group="P"/>
-                <signal pad-id="pf6" index="6" function="PORTF" group="P"/>
-                <signal pad-id="pf7" index="7" function="PORTF" group="P"/>
+                <signal pad-key="pf0" index="0" function="PORTF" group="P"/>
+                <signal pad-key="pf1" index="1" function="PORTF" group="P"/>
+                <signal pad-key="pf2" index="2" function="PORTF" group="P"/>
+                <signal pad-key="pf3" index="3" function="PORTF" group="P"/>
+                <signal pad-key="pf4" index="4" function="PORTF" group="P"/>
+                <signal pad-key="pf5" index="5" function="PORTF" group="P"/>
+                <signal pad-key="pf6" index="6" function="PORTF" group="P"/>
+                <signal pad-key="pf7" index="7" function="PORTF" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portg" name="PORTG" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pg2" index="2" function="PORTG" group="P"/>
-                <signal pad-id="pg3" index="3" function="PORTG" group="P"/>
-                <signal pad-id="pg4" index="4" function="PORTG" group="P"/>
-                <signal pad-id="pg5" index="5" function="PORTG" group="P"/>
+                <signal pad-key="pg0" index="0" function="PORTG" group="P"/>
+                <signal pad-key="pg1" index="1" function="PORTG" group="P"/>
+                <signal pad-key="pg2" index="2" function="PORTG" group="P"/>
+                <signal pad-key="pg3" index="3" function="PORTG" group="P"/>
+                <signal pad-key="pg4" index="4" function="PORTG" group="P"/>
+                <signal pad-key="pg5" index="5" function="PORTG" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="tc0" name="TC0" module-key="tc8">
@@ -727,76 +727,139 @@
             </register-group>
         </module>
     </modules>
+    <pads>
+        <pad key="pe0" name="PE0"/>
+        <pad key="pe1" name="PE1"/>
+        <pad key="pe2" name="PE2"/>
+        <pad key="pe3" name="PE3"/>
+        <pad key="pe4" name="PE4"/>
+        <pad key="pe5" name="PE5"/>
+        <pad key="pe6" name="PE6"/>
+        <pad key="pe7" name="PE7"/>
+        <pad key="pb0" name="PB0"/>
+        <pad key="pb1" name="PB1"/>
+        <pad key="pb2" name="PB2"/>
+        <pad key="pb3" name="PB3"/>
+        <pad key="pb4" name="PB4"/>
+        <pad key="pb5" name="PB5"/>
+        <pad key="pb6" name="PB6"/>
+        <pad key="pb7" name="PB7"/>
+        <pad key="pg3" name="PG3"/>
+        <pad key="pg4" name="PG4"/>
+        <pad key="pg5" name="PG5"/>
+        <pad key="vcc" name="VCC"/>
+        <pad key="gdn" name="GDN"/>
+        <pad key="xtal2" name="XTAL2"/>
+        <pad key="xtal1" name="XTAL1"/>
+        <pad key="pd0" name="PD0"/>
+        <pad key="pd1" name="PD1"/>
+        <pad key="pd2" name="PD2"/>
+        <pad key="pd3" name="PD3"/>
+        <pad key="pd4" name="PD4"/>
+        <pad key="pd5" name="PD5"/>
+        <pad key="pd6" name="PD6"/>
+        <pad key="pd7" name="PD7"/>
+        <pad key="pg0" name="PG0"/>
+        <pad key="pg1" name="PG1"/>
+        <pad key="pc0" name="PC0"/>
+        <pad key="pc1" name="PC1"/>
+        <pad key="pc2" name="PC2"/>
+        <pad key="pc3" name="PC3"/>
+        <pad key="pc4" name="PC4"/>
+        <pad key="pc5" name="PC5"/>
+        <pad key="pc6" name="PC6"/>
+        <pad key="pc7" name="PC7"/>
+        <pad key="pg2" name="PG2"/>
+        <pad key="pa7" name="PA7"/>
+        <pad key="pa6" name="PA6"/>
+        <pad key="pa5" name="PA5"/>
+        <pad key="pa4" name="PA4"/>
+        <pad key="pa3" name="PA3"/>
+        <pad key="pa2" name="PA2"/>
+        <pad key="pa1" name="PA1"/>
+        <pad key="pa0" name="PA0"/>
+        <pad key="gnd" name="GND"/>
+        <pad key="pf7" name="PF7"/>
+        <pad key="pf6" name="PF6"/>
+        <pad key="pf5" name="PF5"/>
+        <pad key="pf4" name="PF4"/>
+        <pad key="pf3" name="PF3"/>
+        <pad key="pf2" name="PF2"/>
+        <pad key="pf1" name="PF1"/>
+        <pad key="pf0" name="PF0"/>
+        <pad key="aref" name="AREF"/>
+        <pad key="avcc" name="AVCC"/>
+    </pads>
     <pinouts>
         <pinout key="qfp_qfn_64" name="QFP_QFN_64" type="qfn">
-            <pin position="1" pad="NC"/>
-            <pin position="2" pad="PE0"/>
-            <pin position="3" pad="PE1"/>
-            <pin position="4" pad="PE2"/>
-            <pin position="5" pad="PE3"/>
-            <pin position="6" pad="PE4"/>
-            <pin position="7" pad="PE5"/>
-            <pin position="8" pad="PE6"/>
-            <pin position="9" pad="PE7"/>
-            <pin position="10" pad="PB0"/>
-            <pin position="11" pad="PB1"/>
-            <pin position="12" pad="PB2"/>
-            <pin position="13" pad="PB3"/>
-            <pin position="14" pad="PB4"/>
-            <pin position="15" pad="PB5"/>
-            <pin position="16" pad="PB6"/>
-            <pin position="17" pad="PB7"/>
-            <pin position="18" pad="PG3"/>
-            <pin position="19" pad="PG4"/>
-            <pin position="20" pad="PG5"/>
-            <pin position="21" pad="VCC"/>
-            <pin position="22" pad="GDN"/>
-            <pin position="23" pad="XTAL2"/>
-            <pin position="24" pad="XTAL1"/>
-            <pin position="25" pad="PD0"/>
-            <pin position="26" pad="PD1"/>
-            <pin position="27" pad="PD2"/>
-            <pin position="28" pad="PD3"/>
-            <pin position="29" pad="PD4"/>
-            <pin position="30" pad="PD5"/>
-            <pin position="31" pad="PD6"/>
-            <pin position="32" pad="PD7"/>
-            <pin position="33" pad="PG0"/>
-            <pin position="34" pad="PG1"/>
-            <pin position="35" pad="PC0"/>
-            <pin position="36" pad="PC1"/>
-            <pin position="37" pad="PC2"/>
-            <pin position="38" pad="PC3"/>
-            <pin position="39" pad="PC4"/>
-            <pin position="40" pad="PC5"/>
-            <pin position="41" pad="PC6"/>
-            <pin position="42" pad="PC7"/>
-            <pin position="43" pad="PG2"/>
-            <pin position="44" pad="PA7"/>
-            <pin position="45" pad="PA6"/>
-            <pin position="46" pad="PA5"/>
-            <pin position="47" pad="PA4"/>
-            <pin position="48" pad="PA3"/>
-            <pin position="49" pad="PA2"/>
-            <pin position="50" pad="PA1"/>
-            <pin position="51" pad="PA0"/>
-            <pin position="52" pad="VCC"/>
-            <pin position="53" pad="GND"/>
-            <pin position="54" pad="PF7"/>
-            <pin position="55" pad="PF6"/>
-            <pin position="56" pad="PF5"/>
-            <pin position="57" pad="PF4"/>
-            <pin position="58" pad="PF3"/>
-            <pin position="59" pad="PF2"/>
-            <pin position="60" pad="PF1"/>
-            <pin position="61" pad="PF0"/>
-            <pin position="62" pad="AREF"/>
-            <pin position="63" pad="GND"/>
-            <pin position="64" pad="AVCC"/>
+            <pin position="1"/>
+            <pin position="2" pad-key="pe0"/>
+            <pin position="3" pad-key="pe1"/>
+            <pin position="4" pad-key="pe2"/>
+            <pin position="5" pad-key="pe3"/>
+            <pin position="6" pad-key="pe4"/>
+            <pin position="7" pad-key="pe5"/>
+            <pin position="8" pad-key="pe6"/>
+            <pin position="9" pad-key="pe7"/>
+            <pin position="10" pad-key="pb0"/>
+            <pin position="11" pad-key="pb1"/>
+            <pin position="12" pad-key="pb2"/>
+            <pin position="13" pad-key="pb3"/>
+            <pin position="14" pad-key="pb4"/>
+            <pin position="15" pad-key="pb5"/>
+            <pin position="16" pad-key="pb6"/>
+            <pin position="17" pad-key="pb7"/>
+            <pin position="18" pad-key="pg3"/>
+            <pin position="19" pad-key="pg4"/>
+            <pin position="20" pad-key="pg5"/>
+            <pin position="21" pad-key="vcc"/>
+            <pin position="22" pad-key="gdn"/>
+            <pin position="23" pad-key="xtal2"/>
+            <pin position="24" pad-key="xtal1"/>
+            <pin position="25" pad-key="pd0"/>
+            <pin position="26" pad-key="pd1"/>
+            <pin position="27" pad-key="pd2"/>
+            <pin position="28" pad-key="pd3"/>
+            <pin position="29" pad-key="pd4"/>
+            <pin position="30" pad-key="pd5"/>
+            <pin position="31" pad-key="pd6"/>
+            <pin position="32" pad-key="pd7"/>
+            <pin position="33" pad-key="pg0"/>
+            <pin position="34" pad-key="pg1"/>
+            <pin position="35" pad-key="pc0"/>
+            <pin position="36" pad-key="pc1"/>
+            <pin position="37" pad-key="pc2"/>
+            <pin position="38" pad-key="pc3"/>
+            <pin position="39" pad-key="pc4"/>
+            <pin position="40" pad-key="pc5"/>
+            <pin position="41" pad-key="pc6"/>
+            <pin position="42" pad-key="pc7"/>
+            <pin position="43" pad-key="pg2"/>
+            <pin position="44" pad-key="pa7"/>
+            <pin position="45" pad-key="pa6"/>
+            <pin position="46" pad-key="pa5"/>
+            <pin position="47" pad-key="pa4"/>
+            <pin position="48" pad-key="pa3"/>
+            <pin position="49" pad-key="pa2"/>
+            <pin position="50" pad-key="pa1"/>
+            <pin position="51" pad-key="pa0"/>
+            <pin position="52" pad-key="vcc"/>
+            <pin position="53" pad-key="gnd"/>
+            <pin position="54" pad-key="pf7"/>
+            <pin position="55" pad-key="pf6"/>
+            <pin position="56" pad-key="pf5"/>
+            <pin position="57" pad-key="pf4"/>
+            <pin position="58" pad-key="pf3"/>
+            <pin position="59" pad-key="pf2"/>
+            <pin position="60" pad-key="pf1"/>
+            <pin position="61" pad-key="pf0"/>
+            <pin position="62" pad-key="aref"/>
+            <pin position="63" pad-key="gnd"/>
+            <pin position="64" pad-key="avcc"/>
         </pinout>
     </pinouts>
     <variants>
-        <variant name="ATmega325-AU" pinout-key="qfp_qfn_64" package="TQFP64"/>
-        <variant name="ATmega325-MU" pinout-key="qfp_qfn_64" package="VQFN64"/>
+        <variant key="atmega325_au" name="ATmega325-AU" pinout-key="qfp_qfn_64"/>
+        <variant key="atmega325_mu" name="ATmega325-MU" pinout-key="qfp_qfn_64"/>
     </variants>
 </device>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA3250.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA3250.xml
index 30f7e9de..02991738 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA3250.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA3250.xml
@@ -212,115 +212,115 @@
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pa2" index="2" function="PORTA" group="P"/>
-                <signal pad-id="pa3" index="3" function="PORTA" group="P"/>
-                <signal pad-id="pa4" index="4" function="PORTA" group="P"/>
-                <signal pad-id="pa5" index="5" function="PORTA" group="P"/>
-                <signal pad-id="pa6" index="6" function="PORTA" group="P"/>
-                <signal pad-id="pa7" index="7" function="PORTA" group="P"/>
+                <signal pad-key="pa0" index="0" function="PORTA" group="P"/>
+                <signal pad-key="pa1" index="1" function="PORTA" group="P"/>
+                <signal pad-key="pa2" index="2" function="PORTA" group="P"/>
+                <signal pad-key="pa3" index="3" function="PORTA" group="P"/>
+                <signal pad-key="pa4" index="4" function="PORTA" group="P"/>
+                <signal pad-key="pa5" index="5" function="PORTA" group="P"/>
+                <signal pad-key="pa6" index="6" function="PORTA" group="P"/>
+                <signal pad-key="pa7" index="7" function="PORTA" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pb2" index="2" function="PORTB" group="P"/>
-                <signal pad-id="pb3" index="3" function="PORTB" group="P"/>
-                <signal pad-id="pb4" index="4" function="PORTB" group="P"/>
-                <signal pad-id="pb5" index="5" function="PORTB" group="P"/>
-                <signal pad-id="pb6" index="6" function="PORTB" group="P"/>
-                <signal pad-id="pb7" index="7" function="PORTB" group="P"/>
+                <signal pad-key="pb0" index="0" function="PORTB" group="P"/>
+                <signal pad-key="pb1" index="1" function="PORTB" group="P"/>
+                <signal pad-key="pb2" index="2" function="PORTB" group="P"/>
+                <signal pad-key="pb3" index="3" function="PORTB" group="P"/>
+                <signal pad-key="pb4" index="4" function="PORTB" group="P"/>
+                <signal pad-key="pb5" index="5" function="PORTB" group="P"/>
+                <signal pad-key="pb6" index="6" function="PORTB" group="P"/>
+                <signal pad-key="pb7" index="7" function="PORTB" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pc2" index="2" function="PORTC" group="P"/>
-                <signal pad-id="pc3" index="3" function="PORTC" group="P"/>
-                <signal pad-id="pc4" index="4" function="PORTC" group="P"/>
-                <signal pad-id="pc5" index="5" function="PORTC" group="P"/>
-                <signal pad-id="pc6" index="6" function="PORTC" group="P"/>
-                <signal pad-id="pc7" index="7" function="PORTC" group="P"/>
+                <signal pad-key="pc0" index="0" function="PORTC" group="P"/>
+                <signal pad-key="pc1" index="1" function="PORTC" group="P"/>
+                <signal pad-key="pc2" index="2" function="PORTC" group="P"/>
+                <signal pad-key="pc3" index="3" function="PORTC" group="P"/>
+                <signal pad-key="pc4" index="4" function="PORTC" group="P"/>
+                <signal pad-key="pc5" index="5" function="PORTC" group="P"/>
+                <signal pad-key="pc6" index="6" function="PORTC" group="P"/>
+                <signal pad-key="pc7" index="7" function="PORTC" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pd2" index="2" function="PORTD" group="P"/>
-                <signal pad-id="pd3" index="3" function="PORTD" group="P"/>
-                <signal pad-id="pd4" index="4" function="PORTD" group="P"/>
-                <signal pad-id="pd5" index="5" function="PORTD" group="P"/>
-                <signal pad-id="pd6" index="6" function="PORTD" group="P"/>
-                <signal pad-id="pd7" index="7" function="PORTD" group="P"/>
+                <signal pad-key="pd0" index="0" function="PORTD" group="P"/>
+                <signal pad-key="pd1" index="1" function="PORTD" group="P"/>
+                <signal pad-key="pd2" index="2" function="PORTD" group="P"/>
+                <signal pad-key="pd3" index="3" function="PORTD" group="P"/>
+                <signal pad-key="pd4" index="4" function="PORTD" group="P"/>
+                <signal pad-key="pd5" index="5" function="PORTD" group="P"/>
+                <signal pad-key="pd6" index="6" function="PORTD" group="P"/>
+                <signal pad-key="pd7" index="7" function="PORTD" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="porte" name="PORTE" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pe2" index="2" function="PORTE" group="P"/>
-                <signal pad-id="pe3" index="3" function="PORTE" group="P"/>
-                <signal pad-id="pe4" index="4" function="PORTE" group="P"/>
-                <signal pad-id="pe5" index="5" function="PORTE" group="P"/>
-                <signal pad-id="pe6" index="6" function="PORTE" group="P"/>
-                <signal pad-id="pe7" index="7" function="PORTE" group="P"/>
+                <signal pad-key="pe0" index="0" function="PORTE" group="P"/>
+                <signal pad-key="pe1" index="1" function="PORTE" group="P"/>
+                <signal pad-key="pe2" index="2" function="PORTE" group="P"/>
+                <signal pad-key="pe3" index="3" function="PORTE" group="P"/>
+                <signal pad-key="pe4" index="4" function="PORTE" group="P"/>
+                <signal pad-key="pe5" index="5" function="PORTE" group="P"/>
+                <signal pad-key="pe6" index="6" function="PORTE" group="P"/>
+                <signal pad-key="pe7" index="7" function="PORTE" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portf" name="PORTF" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pf2" index="2" function="PORTF" group="P"/>
-                <signal pad-id="pf3" index="3" function="PORTF" group="P"/>
-                <signal pad-id="pf4" index="4" function="PORTF" group="P"/>
-                <signal pad-id="pf5" index="5" function="PORTF" group="P"/>
-                <signal pad-id="pf6" index="6" function="PORTF" group="P"/>
-                <signal pad-id="pf7" index="7" function="PORTF" group="P"/>
+                <signal pad-key="pf0" index="0" function="PORTF" group="P"/>
+                <signal pad-key="pf1" index="1" function="PORTF" group="P"/>
+                <signal pad-key="pf2" index="2" function="PORTF" group="P"/>
+                <signal pad-key="pf3" index="3" function="PORTF" group="P"/>
+                <signal pad-key="pf4" index="4" function="PORTF" group="P"/>
+                <signal pad-key="pf5" index="5" function="PORTF" group="P"/>
+                <signal pad-key="pf6" index="6" function="PORTF" group="P"/>
+                <signal pad-key="pf7" index="7" function="PORTF" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portg" name="PORTG" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pg2" index="2" function="PORTG" group="P"/>
-                <signal pad-id="pg3" index="3" function="PORTG" group="P"/>
-                <signal pad-id="pg4" index="4" function="PORTG" group="P"/>
-                <signal pad-id="pg5" index="5" function="PORTG" group="P"/>
+                <signal pad-key="pg0" index="0" function="PORTG" group="P"/>
+                <signal pad-key="pg1" index="1" function="PORTG" group="P"/>
+                <signal pad-key="pg2" index="2" function="PORTG" group="P"/>
+                <signal pad-key="pg3" index="3" function="PORTG" group="P"/>
+                <signal pad-key="pg4" index="4" function="PORTG" group="P"/>
+                <signal pad-key="pg5" index="5" function="PORTG" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="porth" name="PORTH" module-key="gpio_port">
             <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"/>
-                <signal pad-id="ph2" index="2" function="PORTH" group="P"/>
-                <signal pad-id="ph3" index="3" function="PORTH" group="P"/>
-                <signal pad-id="ph4" index="4" function="PORTH" group="P"/>
-                <signal pad-id="ph5" index="5" function="PORTH" group="P"/>
-                <signal pad-id="ph6" index="6" function="PORTH" group="P"/>
-                <signal pad-id="ph7" index="7" function="PORTH" group="P"/>
+                <signal pad-key="ph0" index="0" function="PORTH" group="P"/>
+                <signal pad-key="ph1" index="1" function="PORTH" group="P"/>
+                <signal pad-key="ph2" index="2" function="PORTH" group="P"/>
+                <signal pad-key="ph3" index="3" function="PORTH" group="P"/>
+                <signal pad-key="ph4" index="4" function="PORTH" group="P"/>
+                <signal pad-key="ph5" index="5" function="PORTH" group="P"/>
+                <signal pad-key="ph6" index="6" function="PORTH" group="P"/>
+                <signal pad-key="ph7" index="7" function="PORTH" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portj" name="PORTJ" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pj2" index="2" function="PORTJ" group="P"/>
-                <signal pad-id="pj3" index="3" function="PORTJ" group="P"/>
-                <signal pad-id="pj4" index="4" function="PORTJ" group="P"/>
-                <signal pad-id="pj5" index="5" function="PORTJ" group="P"/>
-                <signal pad-id="pj6" index="6" function="PORTJ" group="P"/>
+                <signal pad-key="pj0" index="0" function="PORTJ" group="P"/>
+                <signal pad-key="pj1" index="1" function="PORTJ" group="P"/>
+                <signal pad-key="pj2" index="2" function="PORTJ" group="P"/>
+                <signal pad-key="pj3" index="3" function="PORTJ" group="P"/>
+                <signal pad-key="pj4" index="4" function="PORTJ" group="P"/>
+                <signal pad-key="pj5" index="5" function="PORTJ" group="P"/>
+                <signal pad-key="pj6" index="6" function="PORTJ" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="ac" name="AC" module-key="ac">
@@ -768,111 +768,189 @@
             </register-group>
         </module>
     </modules>
+    <pads>
+        <pad key="pe0" name="PE0"/>
+        <pad key="pe1" name="PE1"/>
+        <pad key="pe2" name="PE2"/>
+        <pad key="pe3" name="PE3"/>
+        <pad key="pe4" name="PE4"/>
+        <pad key="pe5" name="PE5"/>
+        <pad key="pe6" name="PE6"/>
+        <pad key="pe7" name="PE7"/>
+        <pad key="vcc" name="VCC"/>
+        <pad key="gnd" name="GND"/>
+        <pad key="pj0" name="PJ0"/>
+        <pad key="pj1" name="PJ1"/>
+        <pad key="pb0" name="PB0"/>
+        <pad key="pb1" name="PB1"/>
+        <pad key="pb2" name="PB2"/>
+        <pad key="pb3" name="PB3"/>
+        <pad key="pb4" name="PB4"/>
+        <pad key="pb5" name="PB5"/>
+        <pad key="pb6" name="PB6"/>
+        <pad key="pb7" name="PB7"/>
+        <pad key="pg3" name="PG3"/>
+        <pad key="pg4" name="PG4"/>
+        <pad key="pg5" name="PG5"/>
+        <pad key="xtal2" name="XTAL2"/>
+        <pad key="xtal1" name="XTAL1"/>
+        <pad key="pj2" name="PJ2"/>
+        <pad key="pj3" name="PJ3"/>
+        <pad key="pj4" name="PJ4"/>
+        <pad key="pj5" name="PJ5"/>
+        <pad key="pj6" name="PJ6"/>
+        <pad key="pd0" name="PD0"/>
+        <pad key="pd1" name="PD1"/>
+        <pad key="pd2" name="PD2"/>
+        <pad key="pd3" name="PD3"/>
+        <pad key="pd4" name="PD4"/>
+        <pad key="pd5" name="PD5"/>
+        <pad key="pd6" name="PD6"/>
+        <pad key="pd7" name="PD7"/>
+        <pad key="pg0" name="PG0"/>
+        <pad key="pg1" name="PG1"/>
+        <pad key="pc0" name="PC0"/>
+        <pad key="pc1" name="PC1"/>
+        <pad key="pc2" name="PC2"/>
+        <pad key="pc3" name="PC3"/>
+        <pad key="pc4" name="PC4"/>
+        <pad key="pc5" name="PC5"/>
+        <pad key="ph0" name="PH0"/>
+        <pad key="ph1" name="PH1"/>
+        <pad key="ph2" name="PH2"/>
+        <pad key="ph3" name="PH3"/>
+        <pad key="pc6" name="PC6"/>
+        <pad key="pc7" name="PC7"/>
+        <pad key="pg2" name="PG2"/>
+        <pad key="pa7" name="PA7"/>
+        <pad key="pa6" name="PA6"/>
+        <pad key="pa5" name="PA5"/>
+        <pad key="pa4" name="PA4"/>
+        <pad key="pa3" name="PA3"/>
+        <pad key="pa2" name="PA2"/>
+        <pad key="pa1" name="PA1"/>
+        <pad key="pa0" name="PA0"/>
+        <pad key="ph4" name="PH4"/>
+        <pad key="ph5" name="PH5"/>
+        <pad key="ph6" name="PH6"/>
+        <pad key="ph7" name="PH7"/>
+        <pad key="pf7" name="PF7"/>
+        <pad key="pf6" name="PF6"/>
+        <pad key="pf5" name="PF5"/>
+        <pad key="pf4" name="PF4"/>
+        <pad key="pf3" name="PF3"/>
+        <pad key="pf2" name="PF2"/>
+        <pad key="pf1" name="PF1"/>
+        <pad key="pf0" name="PF0"/>
+        <pad key="aref" name="AREF"/>
+        <pad key="agnd" name="AGND"/>
+        <pad key="avcc" name="AVCC"/>
+    </pads>
     <pinouts>
         <pinout key="qfp_100" name="QFP_100" type="qfp">
-            <pin position="1" pad="NC"/>
-            <pin position="2" pad="PE0"/>
-            <pin position="3" pad="PE1"/>
-            <pin position="4" pad="PE2"/>
-            <pin position="5" pad="PE3"/>
-            <pin position="6" pad="PE4"/>
-            <pin position="7" pad="PE5"/>
-            <pin position="8" pad="PE6"/>
-            <pin position="9" pad="PE7"/>
-            <pin position="10" pad="VCC"/>
-            <pin position="11" pad="GND"/>
-            <pin position="12" pad="NC"/>
-            <pin position="13" pad="PJ0"/>
-            <pin position="14" pad="PJ1"/>
-            <pin position="15" pad="NC"/>
-            <pin position="16" pad="NC"/>
-            <pin position="17" pad="NC"/>
-            <pin position="18" pad="NC"/>
-            <pin position="19" pad="PB0"/>
-            <pin position="20" pad="PB1"/>
-            <pin position="21" pad="PB2"/>
-            <pin position="22" pad="PB3"/>
-            <pin position="23" pad="PB4"/>
-            <pin position="24" pad="PB5"/>
-            <pin position="25" pad="PB6"/>
-            <pin position="26" pad="PB7"/>
-            <pin position="27" pad="NC"/>
-            <pin position="28" pad="PG3"/>
-            <pin position="29" pad="PG4"/>
-            <pin position="30" pad="PG5"/>
-            <pin position="31" pad="VCC"/>
-            <pin position="32" pad="GND"/>
-            <pin position="33" pad="XTAL2"/>
-            <pin position="34" pad="XTAL1"/>
-            <pin position="35" pad="NC"/>
-            <pin position="36" pad="NC"/>
-            <pin position="37" pad="PJ2"/>
-            <pin position="38" pad="PJ3"/>
-            <pin position="39" pad="PJ4"/>
-            <pin position="40" pad="PJ5"/>
-            <pin position="41" pad="PJ6"/>
-            <pin position="42" pad="NC"/>
-            <pin position="43" pad="PD0"/>
-            <pin position="44" pad="PD1"/>
-            <pin position="45" pad="PD2"/>
-            <pin position="46" pad="PD3"/>
-            <pin position="47" pad="PD4"/>
-            <pin position="48" pad="PD5"/>
-            <pin position="49" pad="PD6"/>
-            <pin position="50" pad="PD7"/>
-            <pin position="51" pad="PG0"/>
-            <pin position="52" pad="PG1"/>
-            <pin position="53" pad="PC0"/>
-            <pin position="54" pad="PC1"/>
-            <pin position="55" pad="PC2"/>
-            <pin position="56" pad="PC3"/>
-            <pin position="57" pad="PC4"/>
-            <pin position="58" pad="PC5"/>
-            <pin position="59" pad="NC"/>
-            <pin position="60" pad="NC"/>
-            <pin position="61" pad="NC"/>
-            <pin position="62" pad="NC"/>
-            <pin position="63" pad="PH0"/>
-            <pin position="64" pad="PH1"/>
-            <pin position="65" pad="PH2"/>
-            <pin position="66" pad="PH3"/>
-            <pin position="67" pad="NC"/>
-            <pin position="68" pad="PC6"/>
-            <pin position="69" pad="PC7"/>
-            <pin position="70" pad="PG2"/>
-            <pin position="71" pad="PA7"/>
-            <pin position="72" pad="PA6"/>
-            <pin position="73" pad="PA5"/>
-            <pin position="74" pad="PA4"/>
-            <pin position="75" pad="PA3"/>
-            <pin position="76" pad="PA2"/>
-            <pin position="77" pad="PA1"/>
-            <pin position="78" pad="PA0"/>
-            <pin position="79" pad="NC"/>
-            <pin position="80" pad="VCC"/>
-            <pin position="81" pad="GND"/>
-            <pin position="82" pad="NC"/>
-            <pin position="83" pad="NC"/>
-            <pin position="84" pad="PH4"/>
-            <pin position="85" pad="PH5"/>
-            <pin position="86" pad="PH6"/>
-            <pin position="87" pad="PH7"/>
-            <pin position="88" pad="NC"/>
-            <pin position="89" pad="NC"/>
-            <pin position="90" pad="PF7"/>
-            <pin position="91" pad="PF6"/>
-            <pin position="92" pad="PF5"/>
-            <pin position="93" pad="PF4"/>
-            <pin position="94" pad="PF3"/>
-            <pin position="95" pad="PF2"/>
-            <pin position="96" pad="PF1"/>
-            <pin position="97" pad="PF0"/>
-            <pin position="98" pad="AREF"/>
-            <pin position="99" pad="AGND"/>
-            <pin position="100" pad="AVCC"/>
+            <pin position="1"/>
+            <pin position="2" pad-key="pe0"/>
+            <pin position="3" pad-key="pe1"/>
+            <pin position="4" pad-key="pe2"/>
+            <pin position="5" pad-key="pe3"/>
+            <pin position="6" pad-key="pe4"/>
+            <pin position="7" pad-key="pe5"/>
+            <pin position="8" pad-key="pe6"/>
+            <pin position="9" pad-key="pe7"/>
+            <pin position="10" pad-key="vcc"/>
+            <pin position="11" pad-key="gnd"/>
+            <pin position="12"/>
+            <pin position="13" pad-key="pj0"/>
+            <pin position="14" pad-key="pj1"/>
+            <pin position="15"/>
+            <pin position="16"/>
+            <pin position="17"/>
+            <pin position="18"/>
+            <pin position="19" pad-key="pb0"/>
+            <pin position="20" pad-key="pb1"/>
+            <pin position="21" pad-key="pb2"/>
+            <pin position="22" pad-key="pb3"/>
+            <pin position="23" pad-key="pb4"/>
+            <pin position="24" pad-key="pb5"/>
+            <pin position="25" pad-key="pb6"/>
+            <pin position="26" pad-key="pb7"/>
+            <pin position="27"/>
+            <pin position="28" pad-key="pg3"/>
+            <pin position="29" pad-key="pg4"/>
+            <pin position="30" pad-key="pg5"/>
+            <pin position="31" pad-key="vcc"/>
+            <pin position="32" pad-key="gnd"/>
+            <pin position="33" pad-key="xtal2"/>
+            <pin position="34" pad-key="xtal1"/>
+            <pin position="35"/>
+            <pin position="36"/>
+            <pin position="37" pad-key="pj2"/>
+            <pin position="38" pad-key="pj3"/>
+            <pin position="39" pad-key="pj4"/>
+            <pin position="40" pad-key="pj5"/>
+            <pin position="41" pad-key="pj6"/>
+            <pin position="42"/>
+            <pin position="43" pad-key="pd0"/>
+            <pin position="44" pad-key="pd1"/>
+            <pin position="45" pad-key="pd2"/>
+            <pin position="46" pad-key="pd3"/>
+            <pin position="47" pad-key="pd4"/>
+            <pin position="48" pad-key="pd5"/>
+            <pin position="49" pad-key="pd6"/>
+            <pin position="50" pad-key="pd7"/>
+            <pin position="51" pad-key="pg0"/>
+            <pin position="52" pad-key="pg1"/>
+            <pin position="53" pad-key="pc0"/>
+            <pin position="54" pad-key="pc1"/>
+            <pin position="55" pad-key="pc2"/>
+            <pin position="56" pad-key="pc3"/>
+            <pin position="57" pad-key="pc4"/>
+            <pin position="58" pad-key="pc5"/>
+            <pin position="59"/>
+            <pin position="60"/>
+            <pin position="61"/>
+            <pin position="62"/>
+            <pin position="63" pad-key="ph0"/>
+            <pin position="64" pad-key="ph1"/>
+            <pin position="65" pad-key="ph2"/>
+            <pin position="66" pad-key="ph3"/>
+            <pin position="67"/>
+            <pin position="68" pad-key="pc6"/>
+            <pin position="69" pad-key="pc7"/>
+            <pin position="70" pad-key="pg2"/>
+            <pin position="71" pad-key="pa7"/>
+            <pin position="72" pad-key="pa6"/>
+            <pin position="73" pad-key="pa5"/>
+            <pin position="74" pad-key="pa4"/>
+            <pin position="75" pad-key="pa3"/>
+            <pin position="76" pad-key="pa2"/>
+            <pin position="77" pad-key="pa1"/>
+            <pin position="78" pad-key="pa0"/>
+            <pin position="79"/>
+            <pin position="80" pad-key="vcc"/>
+            <pin position="81" pad-key="gnd"/>
+            <pin position="82"/>
+            <pin position="83"/>
+            <pin position="84" pad-key="ph4"/>
+            <pin position="85" pad-key="ph5"/>
+            <pin position="86" pad-key="ph6"/>
+            <pin position="87" pad-key="ph7"/>
+            <pin position="88"/>
+            <pin position="89"/>
+            <pin position="90" pad-key="pf7"/>
+            <pin position="91" pad-key="pf6"/>
+            <pin position="92" pad-key="pf5"/>
+            <pin position="93" pad-key="pf4"/>
+            <pin position="94" pad-key="pf3"/>
+            <pin position="95" pad-key="pf2"/>
+            <pin position="96" pad-key="pf1"/>
+            <pin position="97" pad-key="pf0"/>
+            <pin position="98" pad-key="aref"/>
+            <pin position="99" pad-key="agnd"/>
+            <pin position="100" pad-key="avcc"/>
         </pinout>
     </pinouts>
     <variants>
-        <variant name="ATmega3250-AU" pinout-key="qfp_100" package="TQFP100"/>
+        <variant key="atmega3250_au" name="ATmega3250-AU" pinout-key="qfp_100"/>
     </variants>
 </device>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA3250A.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA3250A.xml
index 4d82e6c7..9028135d 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA3250A.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA3250A.xml
@@ -212,115 +212,115 @@
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pa2" index="2" function="PORTA" group="P"/>
-                <signal pad-id="pa3" index="3" function="PORTA" group="P"/>
-                <signal pad-id="pa4" index="4" function="PORTA" group="P"/>
-                <signal pad-id="pa5" index="5" function="PORTA" group="P"/>
-                <signal pad-id="pa6" index="6" function="PORTA" group="P"/>
-                <signal pad-id="pa7" index="7" function="PORTA" group="P"/>
+                <signal pad-key="pa0" index="0" function="PORTA" group="P"/>
+                <signal pad-key="pa1" index="1" function="PORTA" group="P"/>
+                <signal pad-key="pa2" index="2" function="PORTA" group="P"/>
+                <signal pad-key="pa3" index="3" function="PORTA" group="P"/>
+                <signal pad-key="pa4" index="4" function="PORTA" group="P"/>
+                <signal pad-key="pa5" index="5" function="PORTA" group="P"/>
+                <signal pad-key="pa6" index="6" function="PORTA" group="P"/>
+                <signal pad-key="pa7" index="7" function="PORTA" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pb2" index="2" function="PORTB" group="P"/>
-                <signal pad-id="pb3" index="3" function="PORTB" group="P"/>
-                <signal pad-id="pb4" index="4" function="PORTB" group="P"/>
-                <signal pad-id="pb5" index="5" function="PORTB" group="P"/>
-                <signal pad-id="pb6" index="6" function="PORTB" group="P"/>
-                <signal pad-id="pb7" index="7" function="PORTB" group="P"/>
+                <signal pad-key="pb0" index="0" function="PORTB" group="P"/>
+                <signal pad-key="pb1" index="1" function="PORTB" group="P"/>
+                <signal pad-key="pb2" index="2" function="PORTB" group="P"/>
+                <signal pad-key="pb3" index="3" function="PORTB" group="P"/>
+                <signal pad-key="pb4" index="4" function="PORTB" group="P"/>
+                <signal pad-key="pb5" index="5" function="PORTB" group="P"/>
+                <signal pad-key="pb6" index="6" function="PORTB" group="P"/>
+                <signal pad-key="pb7" index="7" function="PORTB" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pc2" index="2" function="PORTC" group="P"/>
-                <signal pad-id="pc3" index="3" function="PORTC" group="P"/>
-                <signal pad-id="pc4" index="4" function="PORTC" group="P"/>
-                <signal pad-id="pc5" index="5" function="PORTC" group="P"/>
-                <signal pad-id="pc6" index="6" function="PORTC" group="P"/>
-                <signal pad-id="pc7" index="7" function="PORTC" group="P"/>
+                <signal pad-key="pc0" index="0" function="PORTC" group="P"/>
+                <signal pad-key="pc1" index="1" function="PORTC" group="P"/>
+                <signal pad-key="pc2" index="2" function="PORTC" group="P"/>
+                <signal pad-key="pc3" index="3" function="PORTC" group="P"/>
+                <signal pad-key="pc4" index="4" function="PORTC" group="P"/>
+                <signal pad-key="pc5" index="5" function="PORTC" group="P"/>
+                <signal pad-key="pc6" index="6" function="PORTC" group="P"/>
+                <signal pad-key="pc7" index="7" function="PORTC" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pd2" index="2" function="PORTD" group="P"/>
-                <signal pad-id="pd3" index="3" function="PORTD" group="P"/>
-                <signal pad-id="pd4" index="4" function="PORTD" group="P"/>
-                <signal pad-id="pd5" index="5" function="PORTD" group="P"/>
-                <signal pad-id="pd6" index="6" function="PORTD" group="P"/>
-                <signal pad-id="pd7" index="7" function="PORTD" group="P"/>
+                <signal pad-key="pd0" index="0" function="PORTD" group="P"/>
+                <signal pad-key="pd1" index="1" function="PORTD" group="P"/>
+                <signal pad-key="pd2" index="2" function="PORTD" group="P"/>
+                <signal pad-key="pd3" index="3" function="PORTD" group="P"/>
+                <signal pad-key="pd4" index="4" function="PORTD" group="P"/>
+                <signal pad-key="pd5" index="5" function="PORTD" group="P"/>
+                <signal pad-key="pd6" index="6" function="PORTD" group="P"/>
+                <signal pad-key="pd7" index="7" function="PORTD" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="porte" name="PORTE" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pe2" index="2" function="PORTE" group="P"/>
-                <signal pad-id="pe3" index="3" function="PORTE" group="P"/>
-                <signal pad-id="pe4" index="4" function="PORTE" group="P"/>
-                <signal pad-id="pe5" index="5" function="PORTE" group="P"/>
-                <signal pad-id="pe6" index="6" function="PORTE" group="P"/>
-                <signal pad-id="pe7" index="7" function="PORTE" group="P"/>
+                <signal pad-key="pe0" index="0" function="PORTE" group="P"/>
+                <signal pad-key="pe1" index="1" function="PORTE" group="P"/>
+                <signal pad-key="pe2" index="2" function="PORTE" group="P"/>
+                <signal pad-key="pe3" index="3" function="PORTE" group="P"/>
+                <signal pad-key="pe4" index="4" function="PORTE" group="P"/>
+                <signal pad-key="pe5" index="5" function="PORTE" group="P"/>
+                <signal pad-key="pe6" index="6" function="PORTE" group="P"/>
+                <signal pad-key="pe7" index="7" function="PORTE" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portf" name="PORTF" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pf2" index="2" function="PORTF" group="P"/>
-                <signal pad-id="pf3" index="3" function="PORTF" group="P"/>
-                <signal pad-id="pf4" index="4" function="PORTF" group="P"/>
-                <signal pad-id="pf5" index="5" function="PORTF" group="P"/>
-                <signal pad-id="pf6" index="6" function="PORTF" group="P"/>
-                <signal pad-id="pf7" index="7" function="PORTF" group="P"/>
+                <signal pad-key="pf0" index="0" function="PORTF" group="P"/>
+                <signal pad-key="pf1" index="1" function="PORTF" group="P"/>
+                <signal pad-key="pf2" index="2" function="PORTF" group="P"/>
+                <signal pad-key="pf3" index="3" function="PORTF" group="P"/>
+                <signal pad-key="pf4" index="4" function="PORTF" group="P"/>
+                <signal pad-key="pf5" index="5" function="PORTF" group="P"/>
+                <signal pad-key="pf6" index="6" function="PORTF" group="P"/>
+                <signal pad-key="pf7" index="7" function="PORTF" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portg" name="PORTG" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pg2" index="2" function="PORTG" group="P"/>
-                <signal pad-id="pg3" index="3" function="PORTG" group="P"/>
-                <signal pad-id="pg4" index="4" function="PORTG" group="P"/>
-                <signal pad-id="pg5" index="5" function="PORTG" group="P"/>
+                <signal pad-key="pg0" index="0" function="PORTG" group="P"/>
+                <signal pad-key="pg1" index="1" function="PORTG" group="P"/>
+                <signal pad-key="pg2" index="2" function="PORTG" group="P"/>
+                <signal pad-key="pg3" index="3" function="PORTG" group="P"/>
+                <signal pad-key="pg4" index="4" function="PORTG" group="P"/>
+                <signal pad-key="pg5" index="5" function="PORTG" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="porth" name="PORTH" module-key="gpio_port">
             <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"/>
-                <signal pad-id="ph2" index="2" function="PORTH" group="P"/>
-                <signal pad-id="ph3" index="3" function="PORTH" group="P"/>
-                <signal pad-id="ph4" index="4" function="PORTH" group="P"/>
-                <signal pad-id="ph5" index="5" function="PORTH" group="P"/>
-                <signal pad-id="ph6" index="6" function="PORTH" group="P"/>
-                <signal pad-id="ph7" index="7" function="PORTH" group="P"/>
+                <signal pad-key="ph0" index="0" function="PORTH" group="P"/>
+                <signal pad-key="ph1" index="1" function="PORTH" group="P"/>
+                <signal pad-key="ph2" index="2" function="PORTH" group="P"/>
+                <signal pad-key="ph3" index="3" function="PORTH" group="P"/>
+                <signal pad-key="ph4" index="4" function="PORTH" group="P"/>
+                <signal pad-key="ph5" index="5" function="PORTH" group="P"/>
+                <signal pad-key="ph6" index="6" function="PORTH" group="P"/>
+                <signal pad-key="ph7" index="7" function="PORTH" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portj" name="PORTJ" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pj2" index="2" function="PORTJ" group="P"/>
-                <signal pad-id="pj3" index="3" function="PORTJ" group="P"/>
-                <signal pad-id="pj4" index="4" function="PORTJ" group="P"/>
-                <signal pad-id="pj5" index="5" function="PORTJ" group="P"/>
-                <signal pad-id="pj6" index="6" function="PORTJ" group="P"/>
+                <signal pad-key="pj0" index="0" function="PORTJ" group="P"/>
+                <signal pad-key="pj1" index="1" function="PORTJ" group="P"/>
+                <signal pad-key="pj2" index="2" function="PORTJ" group="P"/>
+                <signal pad-key="pj3" index="3" function="PORTJ" group="P"/>
+                <signal pad-key="pj4" index="4" function="PORTJ" group="P"/>
+                <signal pad-key="pj5" index="5" function="PORTJ" group="P"/>
+                <signal pad-key="pj6" index="6" function="PORTJ" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="ac" name="AC" module-key="ac">
@@ -768,111 +768,189 @@
             </register-group>
         </module>
     </modules>
+    <pads>
+        <pad key="pe0" name="PE0"/>
+        <pad key="pe1" name="PE1"/>
+        <pad key="pe2" name="PE2"/>
+        <pad key="pe3" name="PE3"/>
+        <pad key="pe4" name="PE4"/>
+        <pad key="pe5" name="PE5"/>
+        <pad key="pe6" name="PE6"/>
+        <pad key="pe7" name="PE7"/>
+        <pad key="vcc" name="VCC"/>
+        <pad key="gnd" name="GND"/>
+        <pad key="pj0" name="PJ0"/>
+        <pad key="pj1" name="PJ1"/>
+        <pad key="pb0" name="PB0"/>
+        <pad key="pb1" name="PB1"/>
+        <pad key="pb2" name="PB2"/>
+        <pad key="pb3" name="PB3"/>
+        <pad key="pb4" name="PB4"/>
+        <pad key="pb5" name="PB5"/>
+        <pad key="pb6" name="PB6"/>
+        <pad key="pb7" name="PB7"/>
+        <pad key="pg3" name="PG3"/>
+        <pad key="pg4" name="PG4"/>
+        <pad key="pg5" name="PG5"/>
+        <pad key="xtal2" name="XTAL2"/>
+        <pad key="xtal1" name="XTAL1"/>
+        <pad key="pj2" name="PJ2"/>
+        <pad key="pj3" name="PJ3"/>
+        <pad key="pj4" name="PJ4"/>
+        <pad key="pj5" name="PJ5"/>
+        <pad key="pj6" name="PJ6"/>
+        <pad key="pd0" name="PD0"/>
+        <pad key="pd1" name="PD1"/>
+        <pad key="pd2" name="PD2"/>
+        <pad key="pd3" name="PD3"/>
+        <pad key="pd4" name="PD4"/>
+        <pad key="pd5" name="PD5"/>
+        <pad key="pd6" name="PD6"/>
+        <pad key="pd7" name="PD7"/>
+        <pad key="pg0" name="PG0"/>
+        <pad key="pg1" name="PG1"/>
+        <pad key="pc0" name="PC0"/>
+        <pad key="pc1" name="PC1"/>
+        <pad key="pc2" name="PC2"/>
+        <pad key="pc3" name="PC3"/>
+        <pad key="pc4" name="PC4"/>
+        <pad key="pc5" name="PC5"/>
+        <pad key="ph0" name="PH0"/>
+        <pad key="ph1" name="PH1"/>
+        <pad key="ph2" name="PH2"/>
+        <pad key="ph3" name="PH3"/>
+        <pad key="pc6" name="PC6"/>
+        <pad key="pc7" name="PC7"/>
+        <pad key="pg2" name="PG2"/>
+        <pad key="pa7" name="PA7"/>
+        <pad key="pa6" name="PA6"/>
+        <pad key="pa5" name="PA5"/>
+        <pad key="pa4" name="PA4"/>
+        <pad key="pa3" name="PA3"/>
+        <pad key="pa2" name="PA2"/>
+        <pad key="pa1" name="PA1"/>
+        <pad key="pa0" name="PA0"/>
+        <pad key="ph4" name="PH4"/>
+        <pad key="ph5" name="PH5"/>
+        <pad key="ph6" name="PH6"/>
+        <pad key="ph7" name="PH7"/>
+        <pad key="pf7" name="PF7"/>
+        <pad key="pf6" name="PF6"/>
+        <pad key="pf5" name="PF5"/>
+        <pad key="pf4" name="PF4"/>
+        <pad key="pf3" name="PF3"/>
+        <pad key="pf2" name="PF2"/>
+        <pad key="pf1" name="PF1"/>
+        <pad key="pf0" name="PF0"/>
+        <pad key="aref" name="AREF"/>
+        <pad key="agnd" name="AGND"/>
+        <pad key="avcc" name="AVCC"/>
+    </pads>
     <pinouts>
         <pinout key="qfp_100" name="QFP_100" type="qfp">
-            <pin position="1" pad="NC"/>
-            <pin position="2" pad="PE0"/>
-            <pin position="3" pad="PE1"/>
-            <pin position="4" pad="PE2"/>
-            <pin position="5" pad="PE3"/>
-            <pin position="6" pad="PE4"/>
-            <pin position="7" pad="PE5"/>
-            <pin position="8" pad="PE6"/>
-            <pin position="9" pad="PE7"/>
-            <pin position="10" pad="VCC"/>
-            <pin position="11" pad="GND"/>
-            <pin position="12" pad="NC"/>
-            <pin position="13" pad="PJ0"/>
-            <pin position="14" pad="PJ1"/>
-            <pin position="15" pad="NC"/>
-            <pin position="16" pad="NC"/>
-            <pin position="17" pad="NC"/>
-            <pin position="18" pad="NC"/>
-            <pin position="19" pad="PB0"/>
-            <pin position="20" pad="PB1"/>
-            <pin position="21" pad="PB2"/>
-            <pin position="22" pad="PB3"/>
-            <pin position="23" pad="PB4"/>
-            <pin position="24" pad="PB5"/>
-            <pin position="25" pad="PB6"/>
-            <pin position="26" pad="PB7"/>
-            <pin position="27" pad="NC"/>
-            <pin position="28" pad="PG3"/>
-            <pin position="29" pad="PG4"/>
-            <pin position="30" pad="PG5"/>
-            <pin position="31" pad="VCC"/>
-            <pin position="32" pad="GND"/>
-            <pin position="33" pad="XTAL2"/>
-            <pin position="34" pad="XTAL1"/>
-            <pin position="35" pad="NC"/>
-            <pin position="36" pad="NC"/>
-            <pin position="37" pad="PJ2"/>
-            <pin position="38" pad="PJ3"/>
-            <pin position="39" pad="PJ4"/>
-            <pin position="40" pad="PJ5"/>
-            <pin position="41" pad="PJ6"/>
-            <pin position="42" pad="NC"/>
-            <pin position="43" pad="PD0"/>
-            <pin position="44" pad="PD1"/>
-            <pin position="45" pad="PD2"/>
-            <pin position="46" pad="PD3"/>
-            <pin position="47" pad="PD4"/>
-            <pin position="48" pad="PD5"/>
-            <pin position="49" pad="PD6"/>
-            <pin position="50" pad="PD7"/>
-            <pin position="51" pad="PG0"/>
-            <pin position="52" pad="PG1"/>
-            <pin position="53" pad="PC0"/>
-            <pin position="54" pad="PC1"/>
-            <pin position="55" pad="PC2"/>
-            <pin position="56" pad="PC3"/>
-            <pin position="57" pad="PC4"/>
-            <pin position="58" pad="PC5"/>
-            <pin position="59" pad="NC"/>
-            <pin position="60" pad="NC"/>
-            <pin position="61" pad="NC"/>
-            <pin position="62" pad="NC"/>
-            <pin position="63" pad="PH0"/>
-            <pin position="64" pad="PH1"/>
-            <pin position="65" pad="PH2"/>
-            <pin position="66" pad="PH3"/>
-            <pin position="67" pad="NC"/>
-            <pin position="68" pad="PC6"/>
-            <pin position="69" pad="PC7"/>
-            <pin position="70" pad="PG2"/>
-            <pin position="71" pad="PA7"/>
-            <pin position="72" pad="PA6"/>
-            <pin position="73" pad="PA5"/>
-            <pin position="74" pad="PA4"/>
-            <pin position="75" pad="PA3"/>
-            <pin position="76" pad="PA2"/>
-            <pin position="77" pad="PA1"/>
-            <pin position="78" pad="PA0"/>
-            <pin position="79" pad="NC"/>
-            <pin position="80" pad="VCC"/>
-            <pin position="81" pad="GND"/>
-            <pin position="82" pad="NC"/>
-            <pin position="83" pad="NC"/>
-            <pin position="84" pad="PH4"/>
-            <pin position="85" pad="PH5"/>
-            <pin position="86" pad="PH6"/>
-            <pin position="87" pad="PH7"/>
-            <pin position="88" pad="NC"/>
-            <pin position="89" pad="NC"/>
-            <pin position="90" pad="PF7"/>
-            <pin position="91" pad="PF6"/>
-            <pin position="92" pad="PF5"/>
-            <pin position="93" pad="PF4"/>
-            <pin position="94" pad="PF3"/>
-            <pin position="95" pad="PF2"/>
-            <pin position="96" pad="PF1"/>
-            <pin position="97" pad="PF0"/>
-            <pin position="98" pad="AREF"/>
-            <pin position="99" pad="AGND"/>
-            <pin position="100" pad="AVCC"/>
+            <pin position="1"/>
+            <pin position="2" pad-key="pe0"/>
+            <pin position="3" pad-key="pe1"/>
+            <pin position="4" pad-key="pe2"/>
+            <pin position="5" pad-key="pe3"/>
+            <pin position="6" pad-key="pe4"/>
+            <pin position="7" pad-key="pe5"/>
+            <pin position="8" pad-key="pe6"/>
+            <pin position="9" pad-key="pe7"/>
+            <pin position="10" pad-key="vcc"/>
+            <pin position="11" pad-key="gnd"/>
+            <pin position="12"/>
+            <pin position="13" pad-key="pj0"/>
+            <pin position="14" pad-key="pj1"/>
+            <pin position="15"/>
+            <pin position="16"/>
+            <pin position="17"/>
+            <pin position="18"/>
+            <pin position="19" pad-key="pb0"/>
+            <pin position="20" pad-key="pb1"/>
+            <pin position="21" pad-key="pb2"/>
+            <pin position="22" pad-key="pb3"/>
+            <pin position="23" pad-key="pb4"/>
+            <pin position="24" pad-key="pb5"/>
+            <pin position="25" pad-key="pb6"/>
+            <pin position="26" pad-key="pb7"/>
+            <pin position="27"/>
+            <pin position="28" pad-key="pg3"/>
+            <pin position="29" pad-key="pg4"/>
+            <pin position="30" pad-key="pg5"/>
+            <pin position="31" pad-key="vcc"/>
+            <pin position="32" pad-key="gnd"/>
+            <pin position="33" pad-key="xtal2"/>
+            <pin position="34" pad-key="xtal1"/>
+            <pin position="35"/>
+            <pin position="36"/>
+            <pin position="37" pad-key="pj2"/>
+            <pin position="38" pad-key="pj3"/>
+            <pin position="39" pad-key="pj4"/>
+            <pin position="40" pad-key="pj5"/>
+            <pin position="41" pad-key="pj6"/>
+            <pin position="42"/>
+            <pin position="43" pad-key="pd0"/>
+            <pin position="44" pad-key="pd1"/>
+            <pin position="45" pad-key="pd2"/>
+            <pin position="46" pad-key="pd3"/>
+            <pin position="47" pad-key="pd4"/>
+            <pin position="48" pad-key="pd5"/>
+            <pin position="49" pad-key="pd6"/>
+            <pin position="50" pad-key="pd7"/>
+            <pin position="51" pad-key="pg0"/>
+            <pin position="52" pad-key="pg1"/>
+            <pin position="53" pad-key="pc0"/>
+            <pin position="54" pad-key="pc1"/>
+            <pin position="55" pad-key="pc2"/>
+            <pin position="56" pad-key="pc3"/>
+            <pin position="57" pad-key="pc4"/>
+            <pin position="58" pad-key="pc5"/>
+            <pin position="59"/>
+            <pin position="60"/>
+            <pin position="61"/>
+            <pin position="62"/>
+            <pin position="63" pad-key="ph0"/>
+            <pin position="64" pad-key="ph1"/>
+            <pin position="65" pad-key="ph2"/>
+            <pin position="66" pad-key="ph3"/>
+            <pin position="67"/>
+            <pin position="68" pad-key="pc6"/>
+            <pin position="69" pad-key="pc7"/>
+            <pin position="70" pad-key="pg2"/>
+            <pin position="71" pad-key="pa7"/>
+            <pin position="72" pad-key="pa6"/>
+            <pin position="73" pad-key="pa5"/>
+            <pin position="74" pad-key="pa4"/>
+            <pin position="75" pad-key="pa3"/>
+            <pin position="76" pad-key="pa2"/>
+            <pin position="77" pad-key="pa1"/>
+            <pin position="78" pad-key="pa0"/>
+            <pin position="79"/>
+            <pin position="80" pad-key="vcc"/>
+            <pin position="81" pad-key="gnd"/>
+            <pin position="82"/>
+            <pin position="83"/>
+            <pin position="84" pad-key="ph4"/>
+            <pin position="85" pad-key="ph5"/>
+            <pin position="86" pad-key="ph6"/>
+            <pin position="87" pad-key="ph7"/>
+            <pin position="88"/>
+            <pin position="89"/>
+            <pin position="90" pad-key="pf7"/>
+            <pin position="91" pad-key="pf6"/>
+            <pin position="92" pad-key="pf5"/>
+            <pin position="93" pad-key="pf4"/>
+            <pin position="94" pad-key="pf3"/>
+            <pin position="95" pad-key="pf2"/>
+            <pin position="96" pad-key="pf1"/>
+            <pin position="97" pad-key="pf0"/>
+            <pin position="98" pad-key="aref"/>
+            <pin position="99" pad-key="agnd"/>
+            <pin position="100" pad-key="avcc"/>
         </pinout>
     </pinouts>
     <variants>
-        <variant name="ATmega3250A-AU" pinout-key="qfp_100" package="TQFP100"/>
+        <variant key="atmega3250a_au" name="ATmega3250A-AU" pinout-key="qfp_100"/>
     </variants>
 </device>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA3250P.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA3250P.xml
index 85113cb3..554d4c93 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA3250P.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA3250P.xml
@@ -212,115 +212,115 @@
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pa2" index="2" function="PORTA" group="P"/>
-                <signal pad-id="pa3" index="3" function="PORTA" group="P"/>
-                <signal pad-id="pa4" index="4" function="PORTA" group="P"/>
-                <signal pad-id="pa5" index="5" function="PORTA" group="P"/>
-                <signal pad-id="pa6" index="6" function="PORTA" group="P"/>
-                <signal pad-id="pa7" index="7" function="PORTA" group="P"/>
+                <signal pad-key="pa0" index="0" function="PORTA" group="P"/>
+                <signal pad-key="pa1" index="1" function="PORTA" group="P"/>
+                <signal pad-key="pa2" index="2" function="PORTA" group="P"/>
+                <signal pad-key="pa3" index="3" function="PORTA" group="P"/>
+                <signal pad-key="pa4" index="4" function="PORTA" group="P"/>
+                <signal pad-key="pa5" index="5" function="PORTA" group="P"/>
+                <signal pad-key="pa6" index="6" function="PORTA" group="P"/>
+                <signal pad-key="pa7" index="7" function="PORTA" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pb2" index="2" function="PORTB" group="P"/>
-                <signal pad-id="pb3" index="3" function="PORTB" group="P"/>
-                <signal pad-id="pb4" index="4" function="PORTB" group="P"/>
-                <signal pad-id="pb5" index="5" function="PORTB" group="P"/>
-                <signal pad-id="pb6" index="6" function="PORTB" group="P"/>
-                <signal pad-id="pb7" index="7" function="PORTB" group="P"/>
+                <signal pad-key="pb0" index="0" function="PORTB" group="P"/>
+                <signal pad-key="pb1" index="1" function="PORTB" group="P"/>
+                <signal pad-key="pb2" index="2" function="PORTB" group="P"/>
+                <signal pad-key="pb3" index="3" function="PORTB" group="P"/>
+                <signal pad-key="pb4" index="4" function="PORTB" group="P"/>
+                <signal pad-key="pb5" index="5" function="PORTB" group="P"/>
+                <signal pad-key="pb6" index="6" function="PORTB" group="P"/>
+                <signal pad-key="pb7" index="7" function="PORTB" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pc2" index="2" function="PORTC" group="P"/>
-                <signal pad-id="pc3" index="3" function="PORTC" group="P"/>
-                <signal pad-id="pc4" index="4" function="PORTC" group="P"/>
-                <signal pad-id="pc5" index="5" function="PORTC" group="P"/>
-                <signal pad-id="pc6" index="6" function="PORTC" group="P"/>
-                <signal pad-id="pc7" index="7" function="PORTC" group="P"/>
+                <signal pad-key="pc0" index="0" function="PORTC" group="P"/>
+                <signal pad-key="pc1" index="1" function="PORTC" group="P"/>
+                <signal pad-key="pc2" index="2" function="PORTC" group="P"/>
+                <signal pad-key="pc3" index="3" function="PORTC" group="P"/>
+                <signal pad-key="pc4" index="4" function="PORTC" group="P"/>
+                <signal pad-key="pc5" index="5" function="PORTC" group="P"/>
+                <signal pad-key="pc6" index="6" function="PORTC" group="P"/>
+                <signal pad-key="pc7" index="7" function="PORTC" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pd2" index="2" function="PORTD" group="P"/>
-                <signal pad-id="pd3" index="3" function="PORTD" group="P"/>
-                <signal pad-id="pd4" index="4" function="PORTD" group="P"/>
-                <signal pad-id="pd5" index="5" function="PORTD" group="P"/>
-                <signal pad-id="pd6" index="6" function="PORTD" group="P"/>
-                <signal pad-id="pd7" index="7" function="PORTD" group="P"/>
+                <signal pad-key="pd0" index="0" function="PORTD" group="P"/>
+                <signal pad-key="pd1" index="1" function="PORTD" group="P"/>
+                <signal pad-key="pd2" index="2" function="PORTD" group="P"/>
+                <signal pad-key="pd3" index="3" function="PORTD" group="P"/>
+                <signal pad-key="pd4" index="4" function="PORTD" group="P"/>
+                <signal pad-key="pd5" index="5" function="PORTD" group="P"/>
+                <signal pad-key="pd6" index="6" function="PORTD" group="P"/>
+                <signal pad-key="pd7" index="7" function="PORTD" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="porte" name="PORTE" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pe2" index="2" function="PORTE" group="P"/>
-                <signal pad-id="pe3" index="3" function="PORTE" group="P"/>
-                <signal pad-id="pe4" index="4" function="PORTE" group="P"/>
-                <signal pad-id="pe5" index="5" function="PORTE" group="P"/>
-                <signal pad-id="pe6" index="6" function="PORTE" group="P"/>
-                <signal pad-id="pe7" index="7" function="PORTE" group="P"/>
+                <signal pad-key="pe0" index="0" function="PORTE" group="P"/>
+                <signal pad-key="pe1" index="1" function="PORTE" group="P"/>
+                <signal pad-key="pe2" index="2" function="PORTE" group="P"/>
+                <signal pad-key="pe3" index="3" function="PORTE" group="P"/>
+                <signal pad-key="pe4" index="4" function="PORTE" group="P"/>
+                <signal pad-key="pe5" index="5" function="PORTE" group="P"/>
+                <signal pad-key="pe6" index="6" function="PORTE" group="P"/>
+                <signal pad-key="pe7" index="7" function="PORTE" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portf" name="PORTF" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pf2" index="2" function="PORTF" group="P"/>
-                <signal pad-id="pf3" index="3" function="PORTF" group="P"/>
-                <signal pad-id="pf4" index="4" function="PORTF" group="P"/>
-                <signal pad-id="pf5" index="5" function="PORTF" group="P"/>
-                <signal pad-id="pf6" index="6" function="PORTF" group="P"/>
-                <signal pad-id="pf7" index="7" function="PORTF" group="P"/>
+                <signal pad-key="pf0" index="0" function="PORTF" group="P"/>
+                <signal pad-key="pf1" index="1" function="PORTF" group="P"/>
+                <signal pad-key="pf2" index="2" function="PORTF" group="P"/>
+                <signal pad-key="pf3" index="3" function="PORTF" group="P"/>
+                <signal pad-key="pf4" index="4" function="PORTF" group="P"/>
+                <signal pad-key="pf5" index="5" function="PORTF" group="P"/>
+                <signal pad-key="pf6" index="6" function="PORTF" group="P"/>
+                <signal pad-key="pf7" index="7" function="PORTF" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portg" name="PORTG" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pg2" index="2" function="PORTG" group="P"/>
-                <signal pad-id="pg3" index="3" function="PORTG" group="P"/>
-                <signal pad-id="pg4" index="4" function="PORTG" group="P"/>
-                <signal pad-id="pg5" index="5" function="PORTG" group="P"/>
+                <signal pad-key="pg0" index="0" function="PORTG" group="P"/>
+                <signal pad-key="pg1" index="1" function="PORTG" group="P"/>
+                <signal pad-key="pg2" index="2" function="PORTG" group="P"/>
+                <signal pad-key="pg3" index="3" function="PORTG" group="P"/>
+                <signal pad-key="pg4" index="4" function="PORTG" group="P"/>
+                <signal pad-key="pg5" index="5" function="PORTG" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="porth" name="PORTH" module-key="gpio_port">
             <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"/>
-                <signal pad-id="ph2" index="2" function="PORTH" group="P"/>
-                <signal pad-id="ph3" index="3" function="PORTH" group="P"/>
-                <signal pad-id="ph4" index="4" function="PORTH" group="P"/>
-                <signal pad-id="ph5" index="5" function="PORTH" group="P"/>
-                <signal pad-id="ph6" index="6" function="PORTH" group="P"/>
-                <signal pad-id="ph7" index="7" function="PORTH" group="P"/>
+                <signal pad-key="ph0" index="0" function="PORTH" group="P"/>
+                <signal pad-key="ph1" index="1" function="PORTH" group="P"/>
+                <signal pad-key="ph2" index="2" function="PORTH" group="P"/>
+                <signal pad-key="ph3" index="3" function="PORTH" group="P"/>
+                <signal pad-key="ph4" index="4" function="PORTH" group="P"/>
+                <signal pad-key="ph5" index="5" function="PORTH" group="P"/>
+                <signal pad-key="ph6" index="6" function="PORTH" group="P"/>
+                <signal pad-key="ph7" index="7" function="PORTH" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portj" name="PORTJ" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pj2" index="2" function="PORTJ" group="P"/>
-                <signal pad-id="pj3" index="3" function="PORTJ" group="P"/>
-                <signal pad-id="pj4" index="4" function="PORTJ" group="P"/>
-                <signal pad-id="pj5" index="5" function="PORTJ" group="P"/>
-                <signal pad-id="pj6" index="6" function="PORTJ" group="P"/>
+                <signal pad-key="pj0" index="0" function="PORTJ" group="P"/>
+                <signal pad-key="pj1" index="1" function="PORTJ" group="P"/>
+                <signal pad-key="pj2" index="2" function="PORTJ" group="P"/>
+                <signal pad-key="pj3" index="3" function="PORTJ" group="P"/>
+                <signal pad-key="pj4" index="4" function="PORTJ" group="P"/>
+                <signal pad-key="pj5" index="5" function="PORTJ" group="P"/>
+                <signal pad-key="pj6" index="6" function="PORTJ" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="ac" name="AC" module-key="ac">
@@ -770,111 +770,189 @@
             </register-group>
         </module>
     </modules>
+    <pads>
+        <pad key="pe0" name="PE0"/>
+        <pad key="pe1" name="PE1"/>
+        <pad key="pe2" name="PE2"/>
+        <pad key="pe3" name="PE3"/>
+        <pad key="pe4" name="PE4"/>
+        <pad key="pe5" name="PE5"/>
+        <pad key="pe6" name="PE6"/>
+        <pad key="pe7" name="PE7"/>
+        <pad key="vcc" name="VCC"/>
+        <pad key="gnd" name="GND"/>
+        <pad key="pj0" name="PJ0"/>
+        <pad key="pj1" name="PJ1"/>
+        <pad key="pb0" name="PB0"/>
+        <pad key="pb1" name="PB1"/>
+        <pad key="pb2" name="PB2"/>
+        <pad key="pb3" name="PB3"/>
+        <pad key="pb4" name="PB4"/>
+        <pad key="pb5" name="PB5"/>
+        <pad key="pb6" name="PB6"/>
+        <pad key="pb7" name="PB7"/>
+        <pad key="pg3" name="PG3"/>
+        <pad key="pg4" name="PG4"/>
+        <pad key="pg5" name="PG5"/>
+        <pad key="xtal2" name="XTAL2"/>
+        <pad key="xtal1" name="XTAL1"/>
+        <pad key="pj2" name="PJ2"/>
+        <pad key="pj3" name="PJ3"/>
+        <pad key="pj4" name="PJ4"/>
+        <pad key="pj5" name="PJ5"/>
+        <pad key="pj6" name="PJ6"/>
+        <pad key="pd0" name="PD0"/>
+        <pad key="pd1" name="PD1"/>
+        <pad key="pd2" name="PD2"/>
+        <pad key="pd3" name="PD3"/>
+        <pad key="pd4" name="PD4"/>
+        <pad key="pd5" name="PD5"/>
+        <pad key="pd6" name="PD6"/>
+        <pad key="pd7" name="PD7"/>
+        <pad key="pg0" name="PG0"/>
+        <pad key="pg1" name="PG1"/>
+        <pad key="pc0" name="PC0"/>
+        <pad key="pc1" name="PC1"/>
+        <pad key="pc2" name="PC2"/>
+        <pad key="pc3" name="PC3"/>
+        <pad key="pc4" name="PC4"/>
+        <pad key="pc5" name="PC5"/>
+        <pad key="ph0" name="PH0"/>
+        <pad key="ph1" name="PH1"/>
+        <pad key="ph2" name="PH2"/>
+        <pad key="ph3" name="PH3"/>
+        <pad key="pc6" name="PC6"/>
+        <pad key="pc7" name="PC7"/>
+        <pad key="pg2" name="PG2"/>
+        <pad key="pa7" name="PA7"/>
+        <pad key="pa6" name="PA6"/>
+        <pad key="pa5" name="PA5"/>
+        <pad key="pa4" name="PA4"/>
+        <pad key="pa3" name="PA3"/>
+        <pad key="pa2" name="PA2"/>
+        <pad key="pa1" name="PA1"/>
+        <pad key="pa0" name="PA0"/>
+        <pad key="ph4" name="PH4"/>
+        <pad key="ph5" name="PH5"/>
+        <pad key="ph6" name="PH6"/>
+        <pad key="ph7" name="PH7"/>
+        <pad key="pf7" name="PF7"/>
+        <pad key="pf6" name="PF6"/>
+        <pad key="pf5" name="PF5"/>
+        <pad key="pf4" name="PF4"/>
+        <pad key="pf3" name="PF3"/>
+        <pad key="pf2" name="PF2"/>
+        <pad key="pf1" name="PF1"/>
+        <pad key="pf0" name="PF0"/>
+        <pad key="aref" name="AREF"/>
+        <pad key="agnd" name="AGND"/>
+        <pad key="avcc" name="AVCC"/>
+    </pads>
     <pinouts>
         <pinout key="qfp_100" name="QFP_100" type="qfp">
-            <pin position="1" pad="NC"/>
-            <pin position="2" pad="PE0"/>
-            <pin position="3" pad="PE1"/>
-            <pin position="4" pad="PE2"/>
-            <pin position="5" pad="PE3"/>
-            <pin position="6" pad="PE4"/>
-            <pin position="7" pad="PE5"/>
-            <pin position="8" pad="PE6"/>
-            <pin position="9" pad="PE7"/>
-            <pin position="10" pad="VCC"/>
-            <pin position="11" pad="GND"/>
-            <pin position="12" pad="NC"/>
-            <pin position="13" pad="PJ0"/>
-            <pin position="14" pad="PJ1"/>
-            <pin position="15" pad="NC"/>
-            <pin position="16" pad="NC"/>
-            <pin position="17" pad="NC"/>
-            <pin position="18" pad="NC"/>
-            <pin position="19" pad="PB0"/>
-            <pin position="20" pad="PB1"/>
-            <pin position="21" pad="PB2"/>
-            <pin position="22" pad="PB3"/>
-            <pin position="23" pad="PB4"/>
-            <pin position="24" pad="PB5"/>
-            <pin position="25" pad="PB6"/>
-            <pin position="26" pad="PB7"/>
-            <pin position="27" pad="NC"/>
-            <pin position="28" pad="PG3"/>
-            <pin position="29" pad="PG4"/>
-            <pin position="30" pad="PG5"/>
-            <pin position="31" pad="VCC"/>
-            <pin position="32" pad="GND"/>
-            <pin position="33" pad="XTAL2"/>
-            <pin position="34" pad="XTAL1"/>
-            <pin position="35" pad="NC"/>
-            <pin position="36" pad="NC"/>
-            <pin position="37" pad="PJ2"/>
-            <pin position="38" pad="PJ3"/>
-            <pin position="39" pad="PJ4"/>
-            <pin position="40" pad="PJ5"/>
-            <pin position="41" pad="PJ6"/>
-            <pin position="42" pad="NC"/>
-            <pin position="43" pad="PD0"/>
-            <pin position="44" pad="PD1"/>
-            <pin position="45" pad="PD2"/>
-            <pin position="46" pad="PD3"/>
-            <pin position="47" pad="PD4"/>
-            <pin position="48" pad="PD5"/>
-            <pin position="49" pad="PD6"/>
-            <pin position="50" pad="PD7"/>
-            <pin position="51" pad="PG0"/>
-            <pin position="52" pad="PG1"/>
-            <pin position="53" pad="PC0"/>
-            <pin position="54" pad="PC1"/>
-            <pin position="55" pad="PC2"/>
-            <pin position="56" pad="PC3"/>
-            <pin position="57" pad="PC4"/>
-            <pin position="58" pad="PC5"/>
-            <pin position="59" pad="NC"/>
-            <pin position="60" pad="NC"/>
-            <pin position="61" pad="NC"/>
-            <pin position="62" pad="NC"/>
-            <pin position="63" pad="PH0"/>
-            <pin position="64" pad="PH1"/>
-            <pin position="65" pad="PH2"/>
-            <pin position="66" pad="PH3"/>
-            <pin position="67" pad="NC"/>
-            <pin position="68" pad="PC6"/>
-            <pin position="69" pad="PC7"/>
-            <pin position="70" pad="PG2"/>
-            <pin position="71" pad="PA7"/>
-            <pin position="72" pad="PA6"/>
-            <pin position="73" pad="PA5"/>
-            <pin position="74" pad="PA4"/>
-            <pin position="75" pad="PA3"/>
-            <pin position="76" pad="PA2"/>
-            <pin position="77" pad="PA1"/>
-            <pin position="78" pad="PA0"/>
-            <pin position="79" pad="NC"/>
-            <pin position="80" pad="VCC"/>
-            <pin position="81" pad="GND"/>
-            <pin position="82" pad="NC"/>
-            <pin position="83" pad="NC"/>
-            <pin position="84" pad="PH4"/>
-            <pin position="85" pad="PH5"/>
-            <pin position="86" pad="PH6"/>
-            <pin position="87" pad="PH7"/>
-            <pin position="88" pad="NC"/>
-            <pin position="89" pad="NC"/>
-            <pin position="90" pad="PF7"/>
-            <pin position="91" pad="PF6"/>
-            <pin position="92" pad="PF5"/>
-            <pin position="93" pad="PF4"/>
-            <pin position="94" pad="PF3"/>
-            <pin position="95" pad="PF2"/>
-            <pin position="96" pad="PF1"/>
-            <pin position="97" pad="PF0"/>
-            <pin position="98" pad="AREF"/>
-            <pin position="99" pad="AGND"/>
-            <pin position="100" pad="AVCC"/>
+            <pin position="1"/>
+            <pin position="2" pad-key="pe0"/>
+            <pin position="3" pad-key="pe1"/>
+            <pin position="4" pad-key="pe2"/>
+            <pin position="5" pad-key="pe3"/>
+            <pin position="6" pad-key="pe4"/>
+            <pin position="7" pad-key="pe5"/>
+            <pin position="8" pad-key="pe6"/>
+            <pin position="9" pad-key="pe7"/>
+            <pin position="10" pad-key="vcc"/>
+            <pin position="11" pad-key="gnd"/>
+            <pin position="12"/>
+            <pin position="13" pad-key="pj0"/>
+            <pin position="14" pad-key="pj1"/>
+            <pin position="15"/>
+            <pin position="16"/>
+            <pin position="17"/>
+            <pin position="18"/>
+            <pin position="19" pad-key="pb0"/>
+            <pin position="20" pad-key="pb1"/>
+            <pin position="21" pad-key="pb2"/>
+            <pin position="22" pad-key="pb3"/>
+            <pin position="23" pad-key="pb4"/>
+            <pin position="24" pad-key="pb5"/>
+            <pin position="25" pad-key="pb6"/>
+            <pin position="26" pad-key="pb7"/>
+            <pin position="27"/>
+            <pin position="28" pad-key="pg3"/>
+            <pin position="29" pad-key="pg4"/>
+            <pin position="30" pad-key="pg5"/>
+            <pin position="31" pad-key="vcc"/>
+            <pin position="32" pad-key="gnd"/>
+            <pin position="33" pad-key="xtal2"/>
+            <pin position="34" pad-key="xtal1"/>
+            <pin position="35"/>
+            <pin position="36"/>
+            <pin position="37" pad-key="pj2"/>
+            <pin position="38" pad-key="pj3"/>
+            <pin position="39" pad-key="pj4"/>
+            <pin position="40" pad-key="pj5"/>
+            <pin position="41" pad-key="pj6"/>
+            <pin position="42"/>
+            <pin position="43" pad-key="pd0"/>
+            <pin position="44" pad-key="pd1"/>
+            <pin position="45" pad-key="pd2"/>
+            <pin position="46" pad-key="pd3"/>
+            <pin position="47" pad-key="pd4"/>
+            <pin position="48" pad-key="pd5"/>
+            <pin position="49" pad-key="pd6"/>
+            <pin position="50" pad-key="pd7"/>
+            <pin position="51" pad-key="pg0"/>
+            <pin position="52" pad-key="pg1"/>
+            <pin position="53" pad-key="pc0"/>
+            <pin position="54" pad-key="pc1"/>
+            <pin position="55" pad-key="pc2"/>
+            <pin position="56" pad-key="pc3"/>
+            <pin position="57" pad-key="pc4"/>
+            <pin position="58" pad-key="pc5"/>
+            <pin position="59"/>
+            <pin position="60"/>
+            <pin position="61"/>
+            <pin position="62"/>
+            <pin position="63" pad-key="ph0"/>
+            <pin position="64" pad-key="ph1"/>
+            <pin position="65" pad-key="ph2"/>
+            <pin position="66" pad-key="ph3"/>
+            <pin position="67"/>
+            <pin position="68" pad-key="pc6"/>
+            <pin position="69" pad-key="pc7"/>
+            <pin position="70" pad-key="pg2"/>
+            <pin position="71" pad-key="pa7"/>
+            <pin position="72" pad-key="pa6"/>
+            <pin position="73" pad-key="pa5"/>
+            <pin position="74" pad-key="pa4"/>
+            <pin position="75" pad-key="pa3"/>
+            <pin position="76" pad-key="pa2"/>
+            <pin position="77" pad-key="pa1"/>
+            <pin position="78" pad-key="pa0"/>
+            <pin position="79"/>
+            <pin position="80" pad-key="vcc"/>
+            <pin position="81" pad-key="gnd"/>
+            <pin position="82"/>
+            <pin position="83"/>
+            <pin position="84" pad-key="ph4"/>
+            <pin position="85" pad-key="ph5"/>
+            <pin position="86" pad-key="ph6"/>
+            <pin position="87" pad-key="ph7"/>
+            <pin position="88"/>
+            <pin position="89"/>
+            <pin position="90" pad-key="pf7"/>
+            <pin position="91" pad-key="pf6"/>
+            <pin position="92" pad-key="pf5"/>
+            <pin position="93" pad-key="pf4"/>
+            <pin position="94" pad-key="pf3"/>
+            <pin position="95" pad-key="pf2"/>
+            <pin position="96" pad-key="pf1"/>
+            <pin position="97" pad-key="pf0"/>
+            <pin position="98" pad-key="aref"/>
+            <pin position="99" pad-key="agnd"/>
+            <pin position="100" pad-key="avcc"/>
         </pinout>
     </pinouts>
     <variants>
-        <variant name="ATmega3250P-AU" pinout-key="qfp_100" package="TQFP100"/>
+        <variant key="atmega3250p_au" name="ATmega3250P-AU" pinout-key="qfp_100"/>
     </variants>
 </device>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA3250PA.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA3250PA.xml
index 888f763d..c57292af 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA3250PA.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA3250PA.xml
@@ -212,115 +212,115 @@
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pa2" index="2" function="PORTA" group="P"/>
-                <signal pad-id="pa3" index="3" function="PORTA" group="P"/>
-                <signal pad-id="pa4" index="4" function="PORTA" group="P"/>
-                <signal pad-id="pa5" index="5" function="PORTA" group="P"/>
-                <signal pad-id="pa6" index="6" function="PORTA" group="P"/>
-                <signal pad-id="pa7" index="7" function="PORTA" group="P"/>
+                <signal pad-key="pa0" index="0" function="PORTA" group="P"/>
+                <signal pad-key="pa1" index="1" function="PORTA" group="P"/>
+                <signal pad-key="pa2" index="2" function="PORTA" group="P"/>
+                <signal pad-key="pa3" index="3" function="PORTA" group="P"/>
+                <signal pad-key="pa4" index="4" function="PORTA" group="P"/>
+                <signal pad-key="pa5" index="5" function="PORTA" group="P"/>
+                <signal pad-key="pa6" index="6" function="PORTA" group="P"/>
+                <signal pad-key="pa7" index="7" function="PORTA" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pb2" index="2" function="PORTB" group="P"/>
-                <signal pad-id="pb3" index="3" function="PORTB" group="P"/>
-                <signal pad-id="pb4" index="4" function="PORTB" group="P"/>
-                <signal pad-id="pb5" index="5" function="PORTB" group="P"/>
-                <signal pad-id="pb6" index="6" function="PORTB" group="P"/>
-                <signal pad-id="pb7" index="7" function="PORTB" group="P"/>
+                <signal pad-key="pb0" index="0" function="PORTB" group="P"/>
+                <signal pad-key="pb1" index="1" function="PORTB" group="P"/>
+                <signal pad-key="pb2" index="2" function="PORTB" group="P"/>
+                <signal pad-key="pb3" index="3" function="PORTB" group="P"/>
+                <signal pad-key="pb4" index="4" function="PORTB" group="P"/>
+                <signal pad-key="pb5" index="5" function="PORTB" group="P"/>
+                <signal pad-key="pb6" index="6" function="PORTB" group="P"/>
+                <signal pad-key="pb7" index="7" function="PORTB" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pc2" index="2" function="PORTC" group="P"/>
-                <signal pad-id="pc3" index="3" function="PORTC" group="P"/>
-                <signal pad-id="pc4" index="4" function="PORTC" group="P"/>
-                <signal pad-id="pc5" index="5" function="PORTC" group="P"/>
-                <signal pad-id="pc6" index="6" function="PORTC" group="P"/>
-                <signal pad-id="pc7" index="7" function="PORTC" group="P"/>
+                <signal pad-key="pc0" index="0" function="PORTC" group="P"/>
+                <signal pad-key="pc1" index="1" function="PORTC" group="P"/>
+                <signal pad-key="pc2" index="2" function="PORTC" group="P"/>
+                <signal pad-key="pc3" index="3" function="PORTC" group="P"/>
+                <signal pad-key="pc4" index="4" function="PORTC" group="P"/>
+                <signal pad-key="pc5" index="5" function="PORTC" group="P"/>
+                <signal pad-key="pc6" index="6" function="PORTC" group="P"/>
+                <signal pad-key="pc7" index="7" function="PORTC" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pd2" index="2" function="PORTD" group="P"/>
-                <signal pad-id="pd3" index="3" function="PORTD" group="P"/>
-                <signal pad-id="pd4" index="4" function="PORTD" group="P"/>
-                <signal pad-id="pd5" index="5" function="PORTD" group="P"/>
-                <signal pad-id="pd6" index="6" function="PORTD" group="P"/>
-                <signal pad-id="pd7" index="7" function="PORTD" group="P"/>
+                <signal pad-key="pd0" index="0" function="PORTD" group="P"/>
+                <signal pad-key="pd1" index="1" function="PORTD" group="P"/>
+                <signal pad-key="pd2" index="2" function="PORTD" group="P"/>
+                <signal pad-key="pd3" index="3" function="PORTD" group="P"/>
+                <signal pad-key="pd4" index="4" function="PORTD" group="P"/>
+                <signal pad-key="pd5" index="5" function="PORTD" group="P"/>
+                <signal pad-key="pd6" index="6" function="PORTD" group="P"/>
+                <signal pad-key="pd7" index="7" function="PORTD" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="porte" name="PORTE" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pe2" index="2" function="PORTE" group="P"/>
-                <signal pad-id="pe3" index="3" function="PORTE" group="P"/>
-                <signal pad-id="pe4" index="4" function="PORTE" group="P"/>
-                <signal pad-id="pe5" index="5" function="PORTE" group="P"/>
-                <signal pad-id="pe6" index="6" function="PORTE" group="P"/>
-                <signal pad-id="pe7" index="7" function="PORTE" group="P"/>
+                <signal pad-key="pe0" index="0" function="PORTE" group="P"/>
+                <signal pad-key="pe1" index="1" function="PORTE" group="P"/>
+                <signal pad-key="pe2" index="2" function="PORTE" group="P"/>
+                <signal pad-key="pe3" index="3" function="PORTE" group="P"/>
+                <signal pad-key="pe4" index="4" function="PORTE" group="P"/>
+                <signal pad-key="pe5" index="5" function="PORTE" group="P"/>
+                <signal pad-key="pe6" index="6" function="PORTE" group="P"/>
+                <signal pad-key="pe7" index="7" function="PORTE" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portf" name="PORTF" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pf2" index="2" function="PORTF" group="P"/>
-                <signal pad-id="pf3" index="3" function="PORTF" group="P"/>
-                <signal pad-id="pf4" index="4" function="PORTF" group="P"/>
-                <signal pad-id="pf5" index="5" function="PORTF" group="P"/>
-                <signal pad-id="pf6" index="6" function="PORTF" group="P"/>
-                <signal pad-id="pf7" index="7" function="PORTF" group="P"/>
+                <signal pad-key="pf0" index="0" function="PORTF" group="P"/>
+                <signal pad-key="pf1" index="1" function="PORTF" group="P"/>
+                <signal pad-key="pf2" index="2" function="PORTF" group="P"/>
+                <signal pad-key="pf3" index="3" function="PORTF" group="P"/>
+                <signal pad-key="pf4" index="4" function="PORTF" group="P"/>
+                <signal pad-key="pf5" index="5" function="PORTF" group="P"/>
+                <signal pad-key="pf6" index="6" function="PORTF" group="P"/>
+                <signal pad-key="pf7" index="7" function="PORTF" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portg" name="PORTG" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pg2" index="2" function="PORTG" group="P"/>
-                <signal pad-id="pg3" index="3" function="PORTG" group="P"/>
-                <signal pad-id="pg4" index="4" function="PORTG" group="P"/>
-                <signal pad-id="pg5" index="5" function="PORTG" group="P"/>
+                <signal pad-key="pg0" index="0" function="PORTG" group="P"/>
+                <signal pad-key="pg1" index="1" function="PORTG" group="P"/>
+                <signal pad-key="pg2" index="2" function="PORTG" group="P"/>
+                <signal pad-key="pg3" index="3" function="PORTG" group="P"/>
+                <signal pad-key="pg4" index="4" function="PORTG" group="P"/>
+                <signal pad-key="pg5" index="5" function="PORTG" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="porth" name="PORTH" module-key="gpio_port">
             <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"/>
-                <signal pad-id="ph2" index="2" function="PORTH" group="P"/>
-                <signal pad-id="ph3" index="3" function="PORTH" group="P"/>
-                <signal pad-id="ph4" index="4" function="PORTH" group="P"/>
-                <signal pad-id="ph5" index="5" function="PORTH" group="P"/>
-                <signal pad-id="ph6" index="6" function="PORTH" group="P"/>
-                <signal pad-id="ph7" index="7" function="PORTH" group="P"/>
+                <signal pad-key="ph0" index="0" function="PORTH" group="P"/>
+                <signal pad-key="ph1" index="1" function="PORTH" group="P"/>
+                <signal pad-key="ph2" index="2" function="PORTH" group="P"/>
+                <signal pad-key="ph3" index="3" function="PORTH" group="P"/>
+                <signal pad-key="ph4" index="4" function="PORTH" group="P"/>
+                <signal pad-key="ph5" index="5" function="PORTH" group="P"/>
+                <signal pad-key="ph6" index="6" function="PORTH" group="P"/>
+                <signal pad-key="ph7" index="7" function="PORTH" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portj" name="PORTJ" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pj2" index="2" function="PORTJ" group="P"/>
-                <signal pad-id="pj3" index="3" function="PORTJ" group="P"/>
-                <signal pad-id="pj4" index="4" function="PORTJ" group="P"/>
-                <signal pad-id="pj5" index="5" function="PORTJ" group="P"/>
-                <signal pad-id="pj6" index="6" function="PORTJ" group="P"/>
+                <signal pad-key="pj0" index="0" function="PORTJ" group="P"/>
+                <signal pad-key="pj1" index="1" function="PORTJ" group="P"/>
+                <signal pad-key="pj2" index="2" function="PORTJ" group="P"/>
+                <signal pad-key="pj3" index="3" function="PORTJ" group="P"/>
+                <signal pad-key="pj4" index="4" function="PORTJ" group="P"/>
+                <signal pad-key="pj5" index="5" function="PORTJ" group="P"/>
+                <signal pad-key="pj6" index="6" function="PORTJ" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="ac" name="AC" module-key="ac">
@@ -764,111 +764,189 @@
             </register-group>
         </module>
     </modules>
+    <pads>
+        <pad key="pe0" name="PE0"/>
+        <pad key="pe1" name="PE1"/>
+        <pad key="pe2" name="PE2"/>
+        <pad key="pe3" name="PE3"/>
+        <pad key="pe4" name="PE4"/>
+        <pad key="pe5" name="PE5"/>
+        <pad key="pe6" name="PE6"/>
+        <pad key="pe7" name="PE7"/>
+        <pad key="vcc" name="VCC"/>
+        <pad key="gnd" name="GND"/>
+        <pad key="pj0" name="PJ0"/>
+        <pad key="pj1" name="PJ1"/>
+        <pad key="pb0" name="PB0"/>
+        <pad key="pb1" name="PB1"/>
+        <pad key="pb2" name="PB2"/>
+        <pad key="pb3" name="PB3"/>
+        <pad key="pb4" name="PB4"/>
+        <pad key="pb5" name="PB5"/>
+        <pad key="pb6" name="PB6"/>
+        <pad key="pb7" name="PB7"/>
+        <pad key="pg3" name="PG3"/>
+        <pad key="pg4" name="PG4"/>
+        <pad key="pg5" name="PG5"/>
+        <pad key="xtal2" name="XTAL2"/>
+        <pad key="xtal1" name="XTAL1"/>
+        <pad key="pj2" name="PJ2"/>
+        <pad key="pj3" name="PJ3"/>
+        <pad key="pj4" name="PJ4"/>
+        <pad key="pj5" name="PJ5"/>
+        <pad key="pj6" name="PJ6"/>
+        <pad key="pd0" name="PD0"/>
+        <pad key="pd1" name="PD1"/>
+        <pad key="pd2" name="PD2"/>
+        <pad key="pd3" name="PD3"/>
+        <pad key="pd4" name="PD4"/>
+        <pad key="pd5" name="PD5"/>
+        <pad key="pd6" name="PD6"/>
+        <pad key="pd7" name="PD7"/>
+        <pad key="pg0" name="PG0"/>
+        <pad key="pg1" name="PG1"/>
+        <pad key="pc0" name="PC0"/>
+        <pad key="pc1" name="PC1"/>
+        <pad key="pc2" name="PC2"/>
+        <pad key="pc3" name="PC3"/>
+        <pad key="pc4" name="PC4"/>
+        <pad key="pc5" name="PC5"/>
+        <pad key="ph0" name="PH0"/>
+        <pad key="ph1" name="PH1"/>
+        <pad key="ph2" name="PH2"/>
+        <pad key="ph3" name="PH3"/>
+        <pad key="pc6" name="PC6"/>
+        <pad key="pc7" name="PC7"/>
+        <pad key="pg2" name="PG2"/>
+        <pad key="pa7" name="PA7"/>
+        <pad key="pa6" name="PA6"/>
+        <pad key="pa5" name="PA5"/>
+        <pad key="pa4" name="PA4"/>
+        <pad key="pa3" name="PA3"/>
+        <pad key="pa2" name="PA2"/>
+        <pad key="pa1" name="PA1"/>
+        <pad key="pa0" name="PA0"/>
+        <pad key="ph4" name="PH4"/>
+        <pad key="ph5" name="PH5"/>
+        <pad key="ph6" name="PH6"/>
+        <pad key="ph7" name="PH7"/>
+        <pad key="pf7" name="PF7"/>
+        <pad key="pf6" name="PF6"/>
+        <pad key="pf5" name="PF5"/>
+        <pad key="pf4" name="PF4"/>
+        <pad key="pf3" name="PF3"/>
+        <pad key="pf2" name="PF2"/>
+        <pad key="pf1" name="PF1"/>
+        <pad key="pf0" name="PF0"/>
+        <pad key="aref" name="AREF"/>
+        <pad key="agnd" name="AGND"/>
+        <pad key="avcc" name="AVCC"/>
+    </pads>
     <pinouts>
         <pinout key="qfp_100" name="QFP_100" type="qfp">
-            <pin position="1" pad="NC"/>
-            <pin position="2" pad="PE0"/>
-            <pin position="3" pad="PE1"/>
-            <pin position="4" pad="PE2"/>
-            <pin position="5" pad="PE3"/>
-            <pin position="6" pad="PE4"/>
-            <pin position="7" pad="PE5"/>
-            <pin position="8" pad="PE6"/>
-            <pin position="9" pad="PE7"/>
-            <pin position="10" pad="VCC"/>
-            <pin position="11" pad="GND"/>
-            <pin position="12" pad="NC"/>
-            <pin position="13" pad="PJ0"/>
-            <pin position="14" pad="PJ1"/>
-            <pin position="15" pad="NC"/>
-            <pin position="16" pad="NC"/>
-            <pin position="17" pad="NC"/>
-            <pin position="18" pad="NC"/>
-            <pin position="19" pad="PB0"/>
-            <pin position="20" pad="PB1"/>
-            <pin position="21" pad="PB2"/>
-            <pin position="22" pad="PB3"/>
-            <pin position="23" pad="PB4"/>
-            <pin position="24" pad="PB5"/>
-            <pin position="25" pad="PB6"/>
-            <pin position="26" pad="PB7"/>
-            <pin position="27" pad="NC"/>
-            <pin position="28" pad="PG3"/>
-            <pin position="29" pad="PG4"/>
-            <pin position="30" pad="PG5"/>
-            <pin position="31" pad="VCC"/>
-            <pin position="32" pad="GND"/>
-            <pin position="33" pad="XTAL2"/>
-            <pin position="34" pad="XTAL1"/>
-            <pin position="35" pad="NC"/>
-            <pin position="36" pad="NC"/>
-            <pin position="37" pad="PJ2"/>
-            <pin position="38" pad="PJ3"/>
-            <pin position="39" pad="PJ4"/>
-            <pin position="40" pad="PJ5"/>
-            <pin position="41" pad="PJ6"/>
-            <pin position="42" pad="NC"/>
-            <pin position="43" pad="PD0"/>
-            <pin position="44" pad="PD1"/>
-            <pin position="45" pad="PD2"/>
-            <pin position="46" pad="PD3"/>
-            <pin position="47" pad="PD4"/>
-            <pin position="48" pad="PD5"/>
-            <pin position="49" pad="PD6"/>
-            <pin position="50" pad="PD7"/>
-            <pin position="51" pad="PG0"/>
-            <pin position="52" pad="PG1"/>
-            <pin position="53" pad="PC0"/>
-            <pin position="54" pad="PC1"/>
-            <pin position="55" pad="PC2"/>
-            <pin position="56" pad="PC3"/>
-            <pin position="57" pad="PC4"/>
-            <pin position="58" pad="PC5"/>
-            <pin position="59" pad="NC"/>
-            <pin position="60" pad="NC"/>
-            <pin position="61" pad="NC"/>
-            <pin position="62" pad="NC"/>
-            <pin position="63" pad="PH0"/>
-            <pin position="64" pad="PH1"/>
-            <pin position="65" pad="PH2"/>
-            <pin position="66" pad="PH3"/>
-            <pin position="67" pad="NC"/>
-            <pin position="68" pad="PC6"/>
-            <pin position="69" pad="PC7"/>
-            <pin position="70" pad="PG2"/>
-            <pin position="71" pad="PA7"/>
-            <pin position="72" pad="PA6"/>
-            <pin position="73" pad="PA5"/>
-            <pin position="74" pad="PA4"/>
-            <pin position="75" pad="PA3"/>
-            <pin position="76" pad="PA2"/>
-            <pin position="77" pad="PA1"/>
-            <pin position="78" pad="PA0"/>
-            <pin position="79" pad="NC"/>
-            <pin position="80" pad="VCC"/>
-            <pin position="81" pad="GND"/>
-            <pin position="82" pad="NC"/>
-            <pin position="83" pad="NC"/>
-            <pin position="84" pad="PH4"/>
-            <pin position="85" pad="PH5"/>
-            <pin position="86" pad="PH6"/>
-            <pin position="87" pad="PH7"/>
-            <pin position="88" pad="NC"/>
-            <pin position="89" pad="NC"/>
-            <pin position="90" pad="PF7"/>
-            <pin position="91" pad="PF6"/>
-            <pin position="92" pad="PF5"/>
-            <pin position="93" pad="PF4"/>
-            <pin position="94" pad="PF3"/>
-            <pin position="95" pad="PF2"/>
-            <pin position="96" pad="PF1"/>
-            <pin position="97" pad="PF0"/>
-            <pin position="98" pad="AREF"/>
-            <pin position="99" pad="AGND"/>
-            <pin position="100" pad="AVCC"/>
+            <pin position="1"/>
+            <pin position="2" pad-key="pe0"/>
+            <pin position="3" pad-key="pe1"/>
+            <pin position="4" pad-key="pe2"/>
+            <pin position="5" pad-key="pe3"/>
+            <pin position="6" pad-key="pe4"/>
+            <pin position="7" pad-key="pe5"/>
+            <pin position="8" pad-key="pe6"/>
+            <pin position="9" pad-key="pe7"/>
+            <pin position="10" pad-key="vcc"/>
+            <pin position="11" pad-key="gnd"/>
+            <pin position="12"/>
+            <pin position="13" pad-key="pj0"/>
+            <pin position="14" pad-key="pj1"/>
+            <pin position="15"/>
+            <pin position="16"/>
+            <pin position="17"/>
+            <pin position="18"/>
+            <pin position="19" pad-key="pb0"/>
+            <pin position="20" pad-key="pb1"/>
+            <pin position="21" pad-key="pb2"/>
+            <pin position="22" pad-key="pb3"/>
+            <pin position="23" pad-key="pb4"/>
+            <pin position="24" pad-key="pb5"/>
+            <pin position="25" pad-key="pb6"/>
+            <pin position="26" pad-key="pb7"/>
+            <pin position="27"/>
+            <pin position="28" pad-key="pg3"/>
+            <pin position="29" pad-key="pg4"/>
+            <pin position="30" pad-key="pg5"/>
+            <pin position="31" pad-key="vcc"/>
+            <pin position="32" pad-key="gnd"/>
+            <pin position="33" pad-key="xtal2"/>
+            <pin position="34" pad-key="xtal1"/>
+            <pin position="35"/>
+            <pin position="36"/>
+            <pin position="37" pad-key="pj2"/>
+            <pin position="38" pad-key="pj3"/>
+            <pin position="39" pad-key="pj4"/>
+            <pin position="40" pad-key="pj5"/>
+            <pin position="41" pad-key="pj6"/>
+            <pin position="42"/>
+            <pin position="43" pad-key="pd0"/>
+            <pin position="44" pad-key="pd1"/>
+            <pin position="45" pad-key="pd2"/>
+            <pin position="46" pad-key="pd3"/>
+            <pin position="47" pad-key="pd4"/>
+            <pin position="48" pad-key="pd5"/>
+            <pin position="49" pad-key="pd6"/>
+            <pin position="50" pad-key="pd7"/>
+            <pin position="51" pad-key="pg0"/>
+            <pin position="52" pad-key="pg1"/>
+            <pin position="53" pad-key="pc0"/>
+            <pin position="54" pad-key="pc1"/>
+            <pin position="55" pad-key="pc2"/>
+            <pin position="56" pad-key="pc3"/>
+            <pin position="57" pad-key="pc4"/>
+            <pin position="58" pad-key="pc5"/>
+            <pin position="59"/>
+            <pin position="60"/>
+            <pin position="61"/>
+            <pin position="62"/>
+            <pin position="63" pad-key="ph0"/>
+            <pin position="64" pad-key="ph1"/>
+            <pin position="65" pad-key="ph2"/>
+            <pin position="66" pad-key="ph3"/>
+            <pin position="67"/>
+            <pin position="68" pad-key="pc6"/>
+            <pin position="69" pad-key="pc7"/>
+            <pin position="70" pad-key="pg2"/>
+            <pin position="71" pad-key="pa7"/>
+            <pin position="72" pad-key="pa6"/>
+            <pin position="73" pad-key="pa5"/>
+            <pin position="74" pad-key="pa4"/>
+            <pin position="75" pad-key="pa3"/>
+            <pin position="76" pad-key="pa2"/>
+            <pin position="77" pad-key="pa1"/>
+            <pin position="78" pad-key="pa0"/>
+            <pin position="79"/>
+            <pin position="80" pad-key="vcc"/>
+            <pin position="81" pad-key="gnd"/>
+            <pin position="82"/>
+            <pin position="83"/>
+            <pin position="84" pad-key="ph4"/>
+            <pin position="85" pad-key="ph5"/>
+            <pin position="86" pad-key="ph6"/>
+            <pin position="87" pad-key="ph7"/>
+            <pin position="88"/>
+            <pin position="89"/>
+            <pin position="90" pad-key="pf7"/>
+            <pin position="91" pad-key="pf6"/>
+            <pin position="92" pad-key="pf5"/>
+            <pin position="93" pad-key="pf4"/>
+            <pin position="94" pad-key="pf3"/>
+            <pin position="95" pad-key="pf2"/>
+            <pin position="96" pad-key="pf1"/>
+            <pin position="97" pad-key="pf0"/>
+            <pin position="98" pad-key="aref"/>
+            <pin position="99" pad-key="agnd"/>
+            <pin position="100" pad-key="avcc"/>
         </pinout>
     </pinouts>
     <variants>
-        <variant name="ATmega3250PA-AU" pinout-key="qfp_100" package="TQFP100"/>
+        <variant key="atmega3250pa_au" name="ATmega3250PA-AU" pinout-key="qfp_100"/>
     </variants>
 </device>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA325A.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA325A.xml
index 9f542309..604ab622 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA325A.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA325A.xml
@@ -221,90 +221,90 @@
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pa2" index="2" function="PORTA" group="P"/>
-                <signal pad-id="pa3" index="3" function="PORTA" group="P"/>
-                <signal pad-id="pa4" index="4" function="PORTA" group="P"/>
-                <signal pad-id="pa5" index="5" function="PORTA" group="P"/>
-                <signal pad-id="pa6" index="6" function="PORTA" group="P"/>
-                <signal pad-id="pa7" index="7" function="PORTA" group="P"/>
+                <signal pad-key="pa0" index="0" function="PORTA" group="P"/>
+                <signal pad-key="pa1" index="1" function="PORTA" group="P"/>
+                <signal pad-key="pa2" index="2" function="PORTA" group="P"/>
+                <signal pad-key="pa3" index="3" function="PORTA" group="P"/>
+                <signal pad-key="pa4" index="4" function="PORTA" group="P"/>
+                <signal pad-key="pa5" index="5" function="PORTA" group="P"/>
+                <signal pad-key="pa6" index="6" function="PORTA" group="P"/>
+                <signal pad-key="pa7" index="7" function="PORTA" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pb2" index="2" function="PORTB" group="P"/>
-                <signal pad-id="pb3" index="3" function="PORTB" group="P"/>
-                <signal pad-id="pb4" index="4" function="PORTB" group="P"/>
-                <signal pad-id="pb5" index="5" function="PORTB" group="P"/>
-                <signal pad-id="pb6" index="6" function="PORTB" group="P"/>
-                <signal pad-id="pb7" index="7" function="PORTB" group="P"/>
+                <signal pad-key="pb0" index="0" function="PORTB" group="P"/>
+                <signal pad-key="pb1" index="1" function="PORTB" group="P"/>
+                <signal pad-key="pb2" index="2" function="PORTB" group="P"/>
+                <signal pad-key="pb3" index="3" function="PORTB" group="P"/>
+                <signal pad-key="pb4" index="4" function="PORTB" group="P"/>
+                <signal pad-key="pb5" index="5" function="PORTB" group="P"/>
+                <signal pad-key="pb6" index="6" function="PORTB" group="P"/>
+                <signal pad-key="pb7" index="7" function="PORTB" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pc2" index="2" function="PORTC" group="P"/>
-                <signal pad-id="pc3" index="3" function="PORTC" group="P"/>
-                <signal pad-id="pc4" index="4" function="PORTC" group="P"/>
-                <signal pad-id="pc5" index="5" function="PORTC" group="P"/>
-                <signal pad-id="pc6" index="6" function="PORTC" group="P"/>
-                <signal pad-id="pc7" index="7" function="PORTC" group="P"/>
+                <signal pad-key="pc0" index="0" function="PORTC" group="P"/>
+                <signal pad-key="pc1" index="1" function="PORTC" group="P"/>
+                <signal pad-key="pc2" index="2" function="PORTC" group="P"/>
+                <signal pad-key="pc3" index="3" function="PORTC" group="P"/>
+                <signal pad-key="pc4" index="4" function="PORTC" group="P"/>
+                <signal pad-key="pc5" index="5" function="PORTC" group="P"/>
+                <signal pad-key="pc6" index="6" function="PORTC" group="P"/>
+                <signal pad-key="pc7" index="7" function="PORTC" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pd2" index="2" function="PORTD" group="P"/>
-                <signal pad-id="pd3" index="3" function="PORTD" group="P"/>
-                <signal pad-id="pd4" index="4" function="PORTD" group="P"/>
-                <signal pad-id="pd5" index="5" function="PORTD" group="P"/>
-                <signal pad-id="pd6" index="6" function="PORTD" group="P"/>
-                <signal pad-id="pd7" index="7" function="PORTD" group="P"/>
+                <signal pad-key="pd0" index="0" function="PORTD" group="P"/>
+                <signal pad-key="pd1" index="1" function="PORTD" group="P"/>
+                <signal pad-key="pd2" index="2" function="PORTD" group="P"/>
+                <signal pad-key="pd3" index="3" function="PORTD" group="P"/>
+                <signal pad-key="pd4" index="4" function="PORTD" group="P"/>
+                <signal pad-key="pd5" index="5" function="PORTD" group="P"/>
+                <signal pad-key="pd6" index="6" function="PORTD" group="P"/>
+                <signal pad-key="pd7" index="7" function="PORTD" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="porte" name="PORTE" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pe2" index="2" function="PORTE" group="P"/>
-                <signal pad-id="pe3" index="3" function="PORTE" group="P"/>
-                <signal pad-id="pe4" index="4" function="PORTE" group="P"/>
-                <signal pad-id="pe5" index="5" function="PORTE" group="P"/>
-                <signal pad-id="pe6" index="6" function="PORTE" group="P"/>
-                <signal pad-id="pe7" index="7" function="PORTE" group="P"/>
+                <signal pad-key="pe0" index="0" function="PORTE" group="P"/>
+                <signal pad-key="pe1" index="1" function="PORTE" group="P"/>
+                <signal pad-key="pe2" index="2" function="PORTE" group="P"/>
+                <signal pad-key="pe3" index="3" function="PORTE" group="P"/>
+                <signal pad-key="pe4" index="4" function="PORTE" group="P"/>
+                <signal pad-key="pe5" index="5" function="PORTE" group="P"/>
+                <signal pad-key="pe6" index="6" function="PORTE" group="P"/>
+                <signal pad-key="pe7" index="7" function="PORTE" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portf" name="PORTF" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pf2" index="2" function="PORTF" group="P"/>
-                <signal pad-id="pf3" index="3" function="PORTF" group="P"/>
-                <signal pad-id="pf4" index="4" function="PORTF" group="P"/>
-                <signal pad-id="pf5" index="5" function="PORTF" group="P"/>
-                <signal pad-id="pf6" index="6" function="PORTF" group="P"/>
-                <signal pad-id="pf7" index="7" function="PORTF" group="P"/>
+                <signal pad-key="pf0" index="0" function="PORTF" group="P"/>
+                <signal pad-key="pf1" index="1" function="PORTF" group="P"/>
+                <signal pad-key="pf2" index="2" function="PORTF" group="P"/>
+                <signal pad-key="pf3" index="3" function="PORTF" group="P"/>
+                <signal pad-key="pf4" index="4" function="PORTF" group="P"/>
+                <signal pad-key="pf5" index="5" function="PORTF" group="P"/>
+                <signal pad-key="pf6" index="6" function="PORTF" group="P"/>
+                <signal pad-key="pf7" index="7" function="PORTF" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portg" name="PORTG" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pg2" index="2" function="PORTG" group="P"/>
-                <signal pad-id="pg3" index="3" function="PORTG" group="P"/>
-                <signal pad-id="pg4" index="4" function="PORTG" group="P"/>
-                <signal pad-id="pg5" index="5" function="PORTG" group="P"/>
+                <signal pad-key="pg0" index="0" function="PORTG" group="P"/>
+                <signal pad-key="pg1" index="1" function="PORTG" group="P"/>
+                <signal pad-key="pg2" index="2" function="PORTG" group="P"/>
+                <signal pad-key="pg3" index="3" function="PORTG" group="P"/>
+                <signal pad-key="pg4" index="4" function="PORTG" group="P"/>
+                <signal pad-key="pg5" index="5" function="PORTG" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="tc0" name="TC0" module-key="tc8">
@@ -729,76 +729,139 @@
             </register-group>
         </module>
     </modules>
+    <pads>
+        <pad key="pe0" name="PE0"/>
+        <pad key="pe1" name="PE1"/>
+        <pad key="pe2" name="PE2"/>
+        <pad key="pe3" name="PE3"/>
+        <pad key="pe4" name="PE4"/>
+        <pad key="pe5" name="PE5"/>
+        <pad key="pe6" name="PE6"/>
+        <pad key="pe7" name="PE7"/>
+        <pad key="pb0" name="PB0"/>
+        <pad key="pb1" name="PB1"/>
+        <pad key="pb2" name="PB2"/>
+        <pad key="pb3" name="PB3"/>
+        <pad key="pb4" name="PB4"/>
+        <pad key="pb5" name="PB5"/>
+        <pad key="pb6" name="PB6"/>
+        <pad key="pb7" name="PB7"/>
+        <pad key="pg3" name="PG3"/>
+        <pad key="pg4" name="PG4"/>
+        <pad key="pg5" name="PG5"/>
+        <pad key="vcc" name="VCC"/>
+        <pad key="gdn" name="GDN"/>
+        <pad key="xtal2" name="XTAL2"/>
+        <pad key="xtal1" name="XTAL1"/>
+        <pad key="pd0" name="PD0"/>
+        <pad key="pd1" name="PD1"/>
+        <pad key="pd2" name="PD2"/>
+        <pad key="pd3" name="PD3"/>
+        <pad key="pd4" name="PD4"/>
+        <pad key="pd5" name="PD5"/>
+        <pad key="pd6" name="PD6"/>
+        <pad key="pd7" name="PD7"/>
+        <pad key="pg0" name="PG0"/>
+        <pad key="pg1" name="PG1"/>
+        <pad key="pc0" name="PC0"/>
+        <pad key="pc1" name="PC1"/>
+        <pad key="pc2" name="PC2"/>
+        <pad key="pc3" name="PC3"/>
+        <pad key="pc4" name="PC4"/>
+        <pad key="pc5" name="PC5"/>
+        <pad key="pc6" name="PC6"/>
+        <pad key="pc7" name="PC7"/>
+        <pad key="pg2" name="PG2"/>
+        <pad key="pa7" name="PA7"/>
+        <pad key="pa6" name="PA6"/>
+        <pad key="pa5" name="PA5"/>
+        <pad key="pa4" name="PA4"/>
+        <pad key="pa3" name="PA3"/>
+        <pad key="pa2" name="PA2"/>
+        <pad key="pa1" name="PA1"/>
+        <pad key="pa0" name="PA0"/>
+        <pad key="gnd" name="GND"/>
+        <pad key="pf7" name="PF7"/>
+        <pad key="pf6" name="PF6"/>
+        <pad key="pf5" name="PF5"/>
+        <pad key="pf4" name="PF4"/>
+        <pad key="pf3" name="PF3"/>
+        <pad key="pf2" name="PF2"/>
+        <pad key="pf1" name="PF1"/>
+        <pad key="pf0" name="PF0"/>
+        <pad key="aref" name="AREF"/>
+        <pad key="avcc" name="AVCC"/>
+    </pads>
     <pinouts>
         <pinout key="qfp_qfn_64" name="QFP_QFN_64" type="qfn">
-            <pin position="1" pad="NC"/>
-            <pin position="2" pad="PE0"/>
-            <pin position="3" pad="PE1"/>
-            <pin position="4" pad="PE2"/>
-            <pin position="5" pad="PE3"/>
-            <pin position="6" pad="PE4"/>
-            <pin position="7" pad="PE5"/>
-            <pin position="8" pad="PE6"/>
-            <pin position="9" pad="PE7"/>
-            <pin position="10" pad="PB0"/>
-            <pin position="11" pad="PB1"/>
-            <pin position="12" pad="PB2"/>
-            <pin position="13" pad="PB3"/>
-            <pin position="14" pad="PB4"/>
-            <pin position="15" pad="PB5"/>
-            <pin position="16" pad="PB6"/>
-            <pin position="17" pad="PB7"/>
-            <pin position="18" pad="PG3"/>
-            <pin position="19" pad="PG4"/>
-            <pin position="20" pad="PG5"/>
-            <pin position="21" pad="VCC"/>
-            <pin position="22" pad="GDN"/>
-            <pin position="23" pad="XTAL2"/>
-            <pin position="24" pad="XTAL1"/>
-            <pin position="25" pad="PD0"/>
-            <pin position="26" pad="PD1"/>
-            <pin position="27" pad="PD2"/>
-            <pin position="28" pad="PD3"/>
-            <pin position="29" pad="PD4"/>
-            <pin position="30" pad="PD5"/>
-            <pin position="31" pad="PD6"/>
-            <pin position="32" pad="PD7"/>
-            <pin position="33" pad="PG0"/>
-            <pin position="34" pad="PG1"/>
-            <pin position="35" pad="PC0"/>
-            <pin position="36" pad="PC1"/>
-            <pin position="37" pad="PC2"/>
-            <pin position="38" pad="PC3"/>
-            <pin position="39" pad="PC4"/>
-            <pin position="40" pad="PC5"/>
-            <pin position="41" pad="PC6"/>
-            <pin position="42" pad="PC7"/>
-            <pin position="43" pad="PG2"/>
-            <pin position="44" pad="PA7"/>
-            <pin position="45" pad="PA6"/>
-            <pin position="46" pad="PA5"/>
-            <pin position="47" pad="PA4"/>
-            <pin position="48" pad="PA3"/>
-            <pin position="49" pad="PA2"/>
-            <pin position="50" pad="PA1"/>
-            <pin position="51" pad="PA0"/>
-            <pin position="52" pad="VCC"/>
-            <pin position="53" pad="GND"/>
-            <pin position="54" pad="PF7"/>
-            <pin position="55" pad="PF6"/>
-            <pin position="56" pad="PF5"/>
-            <pin position="57" pad="PF4"/>
-            <pin position="58" pad="PF3"/>
-            <pin position="59" pad="PF2"/>
-            <pin position="60" pad="PF1"/>
-            <pin position="61" pad="PF0"/>
-            <pin position="62" pad="AREF"/>
-            <pin position="63" pad="GND"/>
-            <pin position="64" pad="AVCC"/>
+            <pin position="1"/>
+            <pin position="2" pad-key="pe0"/>
+            <pin position="3" pad-key="pe1"/>
+            <pin position="4" pad-key="pe2"/>
+            <pin position="5" pad-key="pe3"/>
+            <pin position="6" pad-key="pe4"/>
+            <pin position="7" pad-key="pe5"/>
+            <pin position="8" pad-key="pe6"/>
+            <pin position="9" pad-key="pe7"/>
+            <pin position="10" pad-key="pb0"/>
+            <pin position="11" pad-key="pb1"/>
+            <pin position="12" pad-key="pb2"/>
+            <pin position="13" pad-key="pb3"/>
+            <pin position="14" pad-key="pb4"/>
+            <pin position="15" pad-key="pb5"/>
+            <pin position="16" pad-key="pb6"/>
+            <pin position="17" pad-key="pb7"/>
+            <pin position="18" pad-key="pg3"/>
+            <pin position="19" pad-key="pg4"/>
+            <pin position="20" pad-key="pg5"/>
+            <pin position="21" pad-key="vcc"/>
+            <pin position="22" pad-key="gdn"/>
+            <pin position="23" pad-key="xtal2"/>
+            <pin position="24" pad-key="xtal1"/>
+            <pin position="25" pad-key="pd0"/>
+            <pin position="26" pad-key="pd1"/>
+            <pin position="27" pad-key="pd2"/>
+            <pin position="28" pad-key="pd3"/>
+            <pin position="29" pad-key="pd4"/>
+            <pin position="30" pad-key="pd5"/>
+            <pin position="31" pad-key="pd6"/>
+            <pin position="32" pad-key="pd7"/>
+            <pin position="33" pad-key="pg0"/>
+            <pin position="34" pad-key="pg1"/>
+            <pin position="35" pad-key="pc0"/>
+            <pin position="36" pad-key="pc1"/>
+            <pin position="37" pad-key="pc2"/>
+            <pin position="38" pad-key="pc3"/>
+            <pin position="39" pad-key="pc4"/>
+            <pin position="40" pad-key="pc5"/>
+            <pin position="41" pad-key="pc6"/>
+            <pin position="42" pad-key="pc7"/>
+            <pin position="43" pad-key="pg2"/>
+            <pin position="44" pad-key="pa7"/>
+            <pin position="45" pad-key="pa6"/>
+            <pin position="46" pad-key="pa5"/>
+            <pin position="47" pad-key="pa4"/>
+            <pin position="48" pad-key="pa3"/>
+            <pin position="49" pad-key="pa2"/>
+            <pin position="50" pad-key="pa1"/>
+            <pin position="51" pad-key="pa0"/>
+            <pin position="52" pad-key="vcc"/>
+            <pin position="53" pad-key="gnd"/>
+            <pin position="54" pad-key="pf7"/>
+            <pin position="55" pad-key="pf6"/>
+            <pin position="56" pad-key="pf5"/>
+            <pin position="57" pad-key="pf4"/>
+            <pin position="58" pad-key="pf3"/>
+            <pin position="59" pad-key="pf2"/>
+            <pin position="60" pad-key="pf1"/>
+            <pin position="61" pad-key="pf0"/>
+            <pin position="62" pad-key="aref"/>
+            <pin position="63" pad-key="gnd"/>
+            <pin position="64" pad-key="avcc"/>
         </pinout>
     </pinouts>
     <variants>
-        <variant name="ATmega325A-AU" pinout-key="qfp_qfn_64" package="TQFP64"/>
-        <variant name="ATmega325A-MU" pinout-key="qfp_qfn_64" package="VQFN64"/>
+        <variant key="atmega325a_au" name="ATmega325A-AU" pinout-key="qfp_qfn_64"/>
+        <variant key="atmega325a_mu" name="ATmega325A-MU" pinout-key="qfp_qfn_64"/>
     </variants>
 </device>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA325P.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA325P.xml
index ca12d1e9..c4239ea8 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA325P.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA325P.xml
@@ -221,90 +221,90 @@
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pa2" index="2" function="PORTA" group="P"/>
-                <signal pad-id="pa3" index="3" function="PORTA" group="P"/>
-                <signal pad-id="pa4" index="4" function="PORTA" group="P"/>
-                <signal pad-id="pa5" index="5" function="PORTA" group="P"/>
-                <signal pad-id="pa6" index="6" function="PORTA" group="P"/>
-                <signal pad-id="pa7" index="7" function="PORTA" group="P"/>
+                <signal pad-key="pa0" index="0" function="PORTA" group="P"/>
+                <signal pad-key="pa1" index="1" function="PORTA" group="P"/>
+                <signal pad-key="pa2" index="2" function="PORTA" group="P"/>
+                <signal pad-key="pa3" index="3" function="PORTA" group="P"/>
+                <signal pad-key="pa4" index="4" function="PORTA" group="P"/>
+                <signal pad-key="pa5" index="5" function="PORTA" group="P"/>
+                <signal pad-key="pa6" index="6" function="PORTA" group="P"/>
+                <signal pad-key="pa7" index="7" function="PORTA" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pb2" index="2" function="PORTB" group="P"/>
-                <signal pad-id="pb3" index="3" function="PORTB" group="P"/>
-                <signal pad-id="pb4" index="4" function="PORTB" group="P"/>
-                <signal pad-id="pb5" index="5" function="PORTB" group="P"/>
-                <signal pad-id="pb6" index="6" function="PORTB" group="P"/>
-                <signal pad-id="pb7" index="7" function="PORTB" group="P"/>
+                <signal pad-key="pb0" index="0" function="PORTB" group="P"/>
+                <signal pad-key="pb1" index="1" function="PORTB" group="P"/>
+                <signal pad-key="pb2" index="2" function="PORTB" group="P"/>
+                <signal pad-key="pb3" index="3" function="PORTB" group="P"/>
+                <signal pad-key="pb4" index="4" function="PORTB" group="P"/>
+                <signal pad-key="pb5" index="5" function="PORTB" group="P"/>
+                <signal pad-key="pb6" index="6" function="PORTB" group="P"/>
+                <signal pad-key="pb7" index="7" function="PORTB" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pc2" index="2" function="PORTC" group="P"/>
-                <signal pad-id="pc3" index="3" function="PORTC" group="P"/>
-                <signal pad-id="pc4" index="4" function="PORTC" group="P"/>
-                <signal pad-id="pc5" index="5" function="PORTC" group="P"/>
-                <signal pad-id="pc6" index="6" function="PORTC" group="P"/>
-                <signal pad-id="pc7" index="7" function="PORTC" group="P"/>
+                <signal pad-key="pc0" index="0" function="PORTC" group="P"/>
+                <signal pad-key="pc1" index="1" function="PORTC" group="P"/>
+                <signal pad-key="pc2" index="2" function="PORTC" group="P"/>
+                <signal pad-key="pc3" index="3" function="PORTC" group="P"/>
+                <signal pad-key="pc4" index="4" function="PORTC" group="P"/>
+                <signal pad-key="pc5" index="5" function="PORTC" group="P"/>
+                <signal pad-key="pc6" index="6" function="PORTC" group="P"/>
+                <signal pad-key="pc7" index="7" function="PORTC" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pd2" index="2" function="PORTD" group="P"/>
-                <signal pad-id="pd3" index="3" function="PORTD" group="P"/>
-                <signal pad-id="pd4" index="4" function="PORTD" group="P"/>
-                <signal pad-id="pd5" index="5" function="PORTD" group="P"/>
-                <signal pad-id="pd6" index="6" function="PORTD" group="P"/>
-                <signal pad-id="pd7" index="7" function="PORTD" group="P"/>
+                <signal pad-key="pd0" index="0" function="PORTD" group="P"/>
+                <signal pad-key="pd1" index="1" function="PORTD" group="P"/>
+                <signal pad-key="pd2" index="2" function="PORTD" group="P"/>
+                <signal pad-key="pd3" index="3" function="PORTD" group="P"/>
+                <signal pad-key="pd4" index="4" function="PORTD" group="P"/>
+                <signal pad-key="pd5" index="5" function="PORTD" group="P"/>
+                <signal pad-key="pd6" index="6" function="PORTD" group="P"/>
+                <signal pad-key="pd7" index="7" function="PORTD" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="porte" name="PORTE" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pe2" index="2" function="PORTE" group="P"/>
-                <signal pad-id="pe3" index="3" function="PORTE" group="P"/>
-                <signal pad-id="pe4" index="4" function="PORTE" group="P"/>
-                <signal pad-id="pe5" index="5" function="PORTE" group="P"/>
-                <signal pad-id="pe6" index="6" function="PORTE" group="P"/>
-                <signal pad-id="pe7" index="7" function="PORTE" group="P"/>
+                <signal pad-key="pe0" index="0" function="PORTE" group="P"/>
+                <signal pad-key="pe1" index="1" function="PORTE" group="P"/>
+                <signal pad-key="pe2" index="2" function="PORTE" group="P"/>
+                <signal pad-key="pe3" index="3" function="PORTE" group="P"/>
+                <signal pad-key="pe4" index="4" function="PORTE" group="P"/>
+                <signal pad-key="pe5" index="5" function="PORTE" group="P"/>
+                <signal pad-key="pe6" index="6" function="PORTE" group="P"/>
+                <signal pad-key="pe7" index="7" function="PORTE" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portf" name="PORTF" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pf2" index="2" function="PORTF" group="P"/>
-                <signal pad-id="pf3" index="3" function="PORTF" group="P"/>
-                <signal pad-id="pf4" index="4" function="PORTF" group="P"/>
-                <signal pad-id="pf5" index="5" function="PORTF" group="P"/>
-                <signal pad-id="pf6" index="6" function="PORTF" group="P"/>
-                <signal pad-id="pf7" index="7" function="PORTF" group="P"/>
+                <signal pad-key="pf0" index="0" function="PORTF" group="P"/>
+                <signal pad-key="pf1" index="1" function="PORTF" group="P"/>
+                <signal pad-key="pf2" index="2" function="PORTF" group="P"/>
+                <signal pad-key="pf3" index="3" function="PORTF" group="P"/>
+                <signal pad-key="pf4" index="4" function="PORTF" group="P"/>
+                <signal pad-key="pf5" index="5" function="PORTF" group="P"/>
+                <signal pad-key="pf6" index="6" function="PORTF" group="P"/>
+                <signal pad-key="pf7" index="7" function="PORTF" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portg" name="PORTG" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pg2" index="2" function="PORTG" group="P"/>
-                <signal pad-id="pg3" index="3" function="PORTG" group="P"/>
-                <signal pad-id="pg4" index="4" function="PORTG" group="P"/>
-                <signal pad-id="pg5" index="5" function="PORTG" group="P"/>
+                <signal pad-key="pg0" index="0" function="PORTG" group="P"/>
+                <signal pad-key="pg1" index="1" function="PORTG" group="P"/>
+                <signal pad-key="pg2" index="2" function="PORTG" group="P"/>
+                <signal pad-key="pg3" index="3" function="PORTG" group="P"/>
+                <signal pad-key="pg4" index="4" function="PORTG" group="P"/>
+                <signal pad-key="pg5" index="5" function="PORTG" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="tc0" name="TC0" module-key="tc8">
@@ -731,76 +731,139 @@
             </register-group>
         </module>
     </modules>
+    <pads>
+        <pad key="pe0" name="PE0"/>
+        <pad key="pe1" name="PE1"/>
+        <pad key="pe2" name="PE2"/>
+        <pad key="pe3" name="PE3"/>
+        <pad key="pe4" name="PE4"/>
+        <pad key="pe5" name="PE5"/>
+        <pad key="pe6" name="PE6"/>
+        <pad key="pe7" name="PE7"/>
+        <pad key="pb0" name="PB0"/>
+        <pad key="pb1" name="PB1"/>
+        <pad key="pb2" name="PB2"/>
+        <pad key="pb3" name="PB3"/>
+        <pad key="pb4" name="PB4"/>
+        <pad key="pb5" name="PB5"/>
+        <pad key="pb6" name="PB6"/>
+        <pad key="pb7" name="PB7"/>
+        <pad key="pg3" name="PG3"/>
+        <pad key="pg4" name="PG4"/>
+        <pad key="pg5" name="PG5"/>
+        <pad key="vcc" name="VCC"/>
+        <pad key="gdn" name="GDN"/>
+        <pad key="xtal2" name="XTAL2"/>
+        <pad key="xtal1" name="XTAL1"/>
+        <pad key="pd0" name="PD0"/>
+        <pad key="pd1" name="PD1"/>
+        <pad key="pd2" name="PD2"/>
+        <pad key="pd3" name="PD3"/>
+        <pad key="pd4" name="PD4"/>
+        <pad key="pd5" name="PD5"/>
+        <pad key="pd6" name="PD6"/>
+        <pad key="pd7" name="PD7"/>
+        <pad key="pg0" name="PG0"/>
+        <pad key="pg1" name="PG1"/>
+        <pad key="pc0" name="PC0"/>
+        <pad key="pc1" name="PC1"/>
+        <pad key="pc2" name="PC2"/>
+        <pad key="pc3" name="PC3"/>
+        <pad key="pc4" name="PC4"/>
+        <pad key="pc5" name="PC5"/>
+        <pad key="pc6" name="PC6"/>
+        <pad key="pc7" name="PC7"/>
+        <pad key="pg2" name="PG2"/>
+        <pad key="pa7" name="PA7"/>
+        <pad key="pa6" name="PA6"/>
+        <pad key="pa5" name="PA5"/>
+        <pad key="pa4" name="PA4"/>
+        <pad key="pa3" name="PA3"/>
+        <pad key="pa2" name="PA2"/>
+        <pad key="pa1" name="PA1"/>
+        <pad key="pa0" name="PA0"/>
+        <pad key="gnd" name="GND"/>
+        <pad key="pf7" name="PF7"/>
+        <pad key="pf6" name="PF6"/>
+        <pad key="pf5" name="PF5"/>
+        <pad key="pf4" name="PF4"/>
+        <pad key="pf3" name="PF3"/>
+        <pad key="pf2" name="PF2"/>
+        <pad key="pf1" name="PF1"/>
+        <pad key="pf0" name="PF0"/>
+        <pad key="aref" name="AREF"/>
+        <pad key="avcc" name="AVCC"/>
+    </pads>
     <pinouts>
         <pinout key="qfp_qfn_64" name="QFP_QFN_64" type="qfn">
-            <pin position="1" pad="NC"/>
-            <pin position="2" pad="PE0"/>
-            <pin position="3" pad="PE1"/>
-            <pin position="4" pad="PE2"/>
-            <pin position="5" pad="PE3"/>
-            <pin position="6" pad="PE4"/>
-            <pin position="7" pad="PE5"/>
-            <pin position="8" pad="PE6"/>
-            <pin position="9" pad="PE7"/>
-            <pin position="10" pad="PB0"/>
-            <pin position="11" pad="PB1"/>
-            <pin position="12" pad="PB2"/>
-            <pin position="13" pad="PB3"/>
-            <pin position="14" pad="PB4"/>
-            <pin position="15" pad="PB5"/>
-            <pin position="16" pad="PB6"/>
-            <pin position="17" pad="PB7"/>
-            <pin position="18" pad="PG3"/>
-            <pin position="19" pad="PG4"/>
-            <pin position="20" pad="PG5"/>
-            <pin position="21" pad="VCC"/>
-            <pin position="22" pad="GDN"/>
-            <pin position="23" pad="XTAL2"/>
-            <pin position="24" pad="XTAL1"/>
-            <pin position="25" pad="PD0"/>
-            <pin position="26" pad="PD1"/>
-            <pin position="27" pad="PD2"/>
-            <pin position="28" pad="PD3"/>
-            <pin position="29" pad="PD4"/>
-            <pin position="30" pad="PD5"/>
-            <pin position="31" pad="PD6"/>
-            <pin position="32" pad="PD7"/>
-            <pin position="33" pad="PG0"/>
-            <pin position="34" pad="PG1"/>
-            <pin position="35" pad="PC0"/>
-            <pin position="36" pad="PC1"/>
-            <pin position="37" pad="PC2"/>
-            <pin position="38" pad="PC3"/>
-            <pin position="39" pad="PC4"/>
-            <pin position="40" pad="PC5"/>
-            <pin position="41" pad="PC6"/>
-            <pin position="42" pad="PC7"/>
-            <pin position="43" pad="PG2"/>
-            <pin position="44" pad="PA7"/>
-            <pin position="45" pad="PA6"/>
-            <pin position="46" pad="PA5"/>
-            <pin position="47" pad="PA4"/>
-            <pin position="48" pad="PA3"/>
-            <pin position="49" pad="PA2"/>
-            <pin position="50" pad="PA1"/>
-            <pin position="51" pad="PA0"/>
-            <pin position="52" pad="VCC"/>
-            <pin position="53" pad="GND"/>
-            <pin position="54" pad="PF7"/>
-            <pin position="55" pad="PF6"/>
-            <pin position="56" pad="PF5"/>
-            <pin position="57" pad="PF4"/>
-            <pin position="58" pad="PF3"/>
-            <pin position="59" pad="PF2"/>
-            <pin position="60" pad="PF1"/>
-            <pin position="61" pad="PF0"/>
-            <pin position="62" pad="AREF"/>
-            <pin position="63" pad="GND"/>
-            <pin position="64" pad="AVCC"/>
+            <pin position="1"/>
+            <pin position="2" pad-key="pe0"/>
+            <pin position="3" pad-key="pe1"/>
+            <pin position="4" pad-key="pe2"/>
+            <pin position="5" pad-key="pe3"/>
+            <pin position="6" pad-key="pe4"/>
+            <pin position="7" pad-key="pe5"/>
+            <pin position="8" pad-key="pe6"/>
+            <pin position="9" pad-key="pe7"/>
+            <pin position="10" pad-key="pb0"/>
+            <pin position="11" pad-key="pb1"/>
+            <pin position="12" pad-key="pb2"/>
+            <pin position="13" pad-key="pb3"/>
+            <pin position="14" pad-key="pb4"/>
+            <pin position="15" pad-key="pb5"/>
+            <pin position="16" pad-key="pb6"/>
+            <pin position="17" pad-key="pb7"/>
+            <pin position="18" pad-key="pg3"/>
+            <pin position="19" pad-key="pg4"/>
+            <pin position="20" pad-key="pg5"/>
+            <pin position="21" pad-key="vcc"/>
+            <pin position="22" pad-key="gdn"/>
+            <pin position="23" pad-key="xtal2"/>
+            <pin position="24" pad-key="xtal1"/>
+            <pin position="25" pad-key="pd0"/>
+            <pin position="26" pad-key="pd1"/>
+            <pin position="27" pad-key="pd2"/>
+            <pin position="28" pad-key="pd3"/>
+            <pin position="29" pad-key="pd4"/>
+            <pin position="30" pad-key="pd5"/>
+            <pin position="31" pad-key="pd6"/>
+            <pin position="32" pad-key="pd7"/>
+            <pin position="33" pad-key="pg0"/>
+            <pin position="34" pad-key="pg1"/>
+            <pin position="35" pad-key="pc0"/>
+            <pin position="36" pad-key="pc1"/>
+            <pin position="37" pad-key="pc2"/>
+            <pin position="38" pad-key="pc3"/>
+            <pin position="39" pad-key="pc4"/>
+            <pin position="40" pad-key="pc5"/>
+            <pin position="41" pad-key="pc6"/>
+            <pin position="42" pad-key="pc7"/>
+            <pin position="43" pad-key="pg2"/>
+            <pin position="44" pad-key="pa7"/>
+            <pin position="45" pad-key="pa6"/>
+            <pin position="46" pad-key="pa5"/>
+            <pin position="47" pad-key="pa4"/>
+            <pin position="48" pad-key="pa3"/>
+            <pin position="49" pad-key="pa2"/>
+            <pin position="50" pad-key="pa1"/>
+            <pin position="51" pad-key="pa0"/>
+            <pin position="52" pad-key="vcc"/>
+            <pin position="53" pad-key="gnd"/>
+            <pin position="54" pad-key="pf7"/>
+            <pin position="55" pad-key="pf6"/>
+            <pin position="56" pad-key="pf5"/>
+            <pin position="57" pad-key="pf4"/>
+            <pin position="58" pad-key="pf3"/>
+            <pin position="59" pad-key="pf2"/>
+            <pin position="60" pad-key="pf1"/>
+            <pin position="61" pad-key="pf0"/>
+            <pin position="62" pad-key="aref"/>
+            <pin position="63" pad-key="gnd"/>
+            <pin position="64" pad-key="avcc"/>
         </pinout>
     </pinouts>
     <variants>
-        <variant name="ATmega325P-AU" pinout-key="qfp_qfn_64" package="TQFP64"/>
-        <variant name="ATmega325P-MU" pinout-key="qfp_qfn_64" package="VQFN64"/>
+        <variant key="atmega325p_au" name="ATmega325P-AU" pinout-key="qfp_qfn_64"/>
+        <variant key="atmega325p_mu" name="ATmega325P-MU" pinout-key="qfp_qfn_64"/>
     </variants>
 </device>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA325PA.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA325PA.xml
index 4251f178..215f8fa1 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA325PA.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA325PA.xml
@@ -221,90 +221,90 @@
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pa2" index="2" function="PORTA" group="P"/>
-                <signal pad-id="pa3" index="3" function="PORTA" group="P"/>
-                <signal pad-id="pa4" index="4" function="PORTA" group="P"/>
-                <signal pad-id="pa5" index="5" function="PORTA" group="P"/>
-                <signal pad-id="pa6" index="6" function="PORTA" group="P"/>
-                <signal pad-id="pa7" index="7" function="PORTA" group="P"/>
+                <signal pad-key="pa0" index="0" function="PORTA" group="P"/>
+                <signal pad-key="pa1" index="1" function="PORTA" group="P"/>
+                <signal pad-key="pa2" index="2" function="PORTA" group="P"/>
+                <signal pad-key="pa3" index="3" function="PORTA" group="P"/>
+                <signal pad-key="pa4" index="4" function="PORTA" group="P"/>
+                <signal pad-key="pa5" index="5" function="PORTA" group="P"/>
+                <signal pad-key="pa6" index="6" function="PORTA" group="P"/>
+                <signal pad-key="pa7" index="7" function="PORTA" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pb2" index="2" function="PORTB" group="P"/>
-                <signal pad-id="pb3" index="3" function="PORTB" group="P"/>
-                <signal pad-id="pb4" index="4" function="PORTB" group="P"/>
-                <signal pad-id="pb5" index="5" function="PORTB" group="P"/>
-                <signal pad-id="pb6" index="6" function="PORTB" group="P"/>
-                <signal pad-id="pb7" index="7" function="PORTB" group="P"/>
+                <signal pad-key="pb0" index="0" function="PORTB" group="P"/>
+                <signal pad-key="pb1" index="1" function="PORTB" group="P"/>
+                <signal pad-key="pb2" index="2" function="PORTB" group="P"/>
+                <signal pad-key="pb3" index="3" function="PORTB" group="P"/>
+                <signal pad-key="pb4" index="4" function="PORTB" group="P"/>
+                <signal pad-key="pb5" index="5" function="PORTB" group="P"/>
+                <signal pad-key="pb6" index="6" function="PORTB" group="P"/>
+                <signal pad-key="pb7" index="7" function="PORTB" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pc2" index="2" function="PORTC" group="P"/>
-                <signal pad-id="pc3" index="3" function="PORTC" group="P"/>
-                <signal pad-id="pc4" index="4" function="PORTC" group="P"/>
-                <signal pad-id="pc5" index="5" function="PORTC" group="P"/>
-                <signal pad-id="pc6" index="6" function="PORTC" group="P"/>
-                <signal pad-id="pc7" index="7" function="PORTC" group="P"/>
+                <signal pad-key="pc0" index="0" function="PORTC" group="P"/>
+                <signal pad-key="pc1" index="1" function="PORTC" group="P"/>
+                <signal pad-key="pc2" index="2" function="PORTC" group="P"/>
+                <signal pad-key="pc3" index="3" function="PORTC" group="P"/>
+                <signal pad-key="pc4" index="4" function="PORTC" group="P"/>
+                <signal pad-key="pc5" index="5" function="PORTC" group="P"/>
+                <signal pad-key="pc6" index="6" function="PORTC" group="P"/>
+                <signal pad-key="pc7" index="7" function="PORTC" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pd2" index="2" function="PORTD" group="P"/>
-                <signal pad-id="pd3" index="3" function="PORTD" group="P"/>
-                <signal pad-id="pd4" index="4" function="PORTD" group="P"/>
-                <signal pad-id="pd5" index="5" function="PORTD" group="P"/>
-                <signal pad-id="pd6" index="6" function="PORTD" group="P"/>
-                <signal pad-id="pd7" index="7" function="PORTD" group="P"/>
+                <signal pad-key="pd0" index="0" function="PORTD" group="P"/>
+                <signal pad-key="pd1" index="1" function="PORTD" group="P"/>
+                <signal pad-key="pd2" index="2" function="PORTD" group="P"/>
+                <signal pad-key="pd3" index="3" function="PORTD" group="P"/>
+                <signal pad-key="pd4" index="4" function="PORTD" group="P"/>
+                <signal pad-key="pd5" index="5" function="PORTD" group="P"/>
+                <signal pad-key="pd6" index="6" function="PORTD" group="P"/>
+                <signal pad-key="pd7" index="7" function="PORTD" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="porte" name="PORTE" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pe2" index="2" function="PORTE" group="P"/>
-                <signal pad-id="pe3" index="3" function="PORTE" group="P"/>
-                <signal pad-id="pe4" index="4" function="PORTE" group="P"/>
-                <signal pad-id="pe5" index="5" function="PORTE" group="P"/>
-                <signal pad-id="pe6" index="6" function="PORTE" group="P"/>
-                <signal pad-id="pe7" index="7" function="PORTE" group="P"/>
+                <signal pad-key="pe0" index="0" function="PORTE" group="P"/>
+                <signal pad-key="pe1" index="1" function="PORTE" group="P"/>
+                <signal pad-key="pe2" index="2" function="PORTE" group="P"/>
+                <signal pad-key="pe3" index="3" function="PORTE" group="P"/>
+                <signal pad-key="pe4" index="4" function="PORTE" group="P"/>
+                <signal pad-key="pe5" index="5" function="PORTE" group="P"/>
+                <signal pad-key="pe6" index="6" function="PORTE" group="P"/>
+                <signal pad-key="pe7" index="7" function="PORTE" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portf" name="PORTF" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pf2" index="2" function="PORTF" group="P"/>
-                <signal pad-id="pf3" index="3" function="PORTF" group="P"/>
-                <signal pad-id="pf4" index="4" function="PORTF" group="P"/>
-                <signal pad-id="pf5" index="5" function="PORTF" group="P"/>
-                <signal pad-id="pf6" index="6" function="PORTF" group="P"/>
-                <signal pad-id="pf7" index="7" function="PORTF" group="P"/>
+                <signal pad-key="pf0" index="0" function="PORTF" group="P"/>
+                <signal pad-key="pf1" index="1" function="PORTF" group="P"/>
+                <signal pad-key="pf2" index="2" function="PORTF" group="P"/>
+                <signal pad-key="pf3" index="3" function="PORTF" group="P"/>
+                <signal pad-key="pf4" index="4" function="PORTF" group="P"/>
+                <signal pad-key="pf5" index="5" function="PORTF" group="P"/>
+                <signal pad-key="pf6" index="6" function="PORTF" group="P"/>
+                <signal pad-key="pf7" index="7" function="PORTF" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portg" name="PORTG" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pg2" index="2" function="PORTG" group="P"/>
-                <signal pad-id="pg3" index="3" function="PORTG" group="P"/>
-                <signal pad-id="pg4" index="4" function="PORTG" group="P"/>
-                <signal pad-id="pg5" index="5" function="PORTG" group="P"/>
+                <signal pad-key="pg0" index="0" function="PORTG" group="P"/>
+                <signal pad-key="pg1" index="1" function="PORTG" group="P"/>
+                <signal pad-key="pg2" index="2" function="PORTG" group="P"/>
+                <signal pad-key="pg3" index="3" function="PORTG" group="P"/>
+                <signal pad-key="pg4" index="4" function="PORTG" group="P"/>
+                <signal pad-key="pg5" index="5" function="PORTG" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="tc0" name="TC0" module-key="tc8">
@@ -727,76 +727,139 @@
             </register-group>
         </module>
     </modules>
+    <pads>
+        <pad key="pe0" name="PE0"/>
+        <pad key="pe1" name="PE1"/>
+        <pad key="pe2" name="PE2"/>
+        <pad key="pe3" name="PE3"/>
+        <pad key="pe4" name="PE4"/>
+        <pad key="pe5" name="PE5"/>
+        <pad key="pe6" name="PE6"/>
+        <pad key="pe7" name="PE7"/>
+        <pad key="pb0" name="PB0"/>
+        <pad key="pb1" name="PB1"/>
+        <pad key="pb2" name="PB2"/>
+        <pad key="pb3" name="PB3"/>
+        <pad key="pb4" name="PB4"/>
+        <pad key="pb5" name="PB5"/>
+        <pad key="pb6" name="PB6"/>
+        <pad key="pb7" name="PB7"/>
+        <pad key="pg3" name="PG3"/>
+        <pad key="pg4" name="PG4"/>
+        <pad key="pg5" name="PG5"/>
+        <pad key="vcc" name="VCC"/>
+        <pad key="gdn" name="GDN"/>
+        <pad key="xtal2" name="XTAL2"/>
+        <pad key="xtal1" name="XTAL1"/>
+        <pad key="pd0" name="PD0"/>
+        <pad key="pd1" name="PD1"/>
+        <pad key="pd2" name="PD2"/>
+        <pad key="pd3" name="PD3"/>
+        <pad key="pd4" name="PD4"/>
+        <pad key="pd5" name="PD5"/>
+        <pad key="pd6" name="PD6"/>
+        <pad key="pd7" name="PD7"/>
+        <pad key="pg0" name="PG0"/>
+        <pad key="pg1" name="PG1"/>
+        <pad key="pc0" name="PC0"/>
+        <pad key="pc1" name="PC1"/>
+        <pad key="pc2" name="PC2"/>
+        <pad key="pc3" name="PC3"/>
+        <pad key="pc4" name="PC4"/>
+        <pad key="pc5" name="PC5"/>
+        <pad key="pc6" name="PC6"/>
+        <pad key="pc7" name="PC7"/>
+        <pad key="pg2" name="PG2"/>
+        <pad key="pa7" name="PA7"/>
+        <pad key="pa6" name="PA6"/>
+        <pad key="pa5" name="PA5"/>
+        <pad key="pa4" name="PA4"/>
+        <pad key="pa3" name="PA3"/>
+        <pad key="pa2" name="PA2"/>
+        <pad key="pa1" name="PA1"/>
+        <pad key="pa0" name="PA0"/>
+        <pad key="gnd" name="GND"/>
+        <pad key="pf7" name="PF7"/>
+        <pad key="pf6" name="PF6"/>
+        <pad key="pf5" name="PF5"/>
+        <pad key="pf4" name="PF4"/>
+        <pad key="pf3" name="PF3"/>
+        <pad key="pf2" name="PF2"/>
+        <pad key="pf1" name="PF1"/>
+        <pad key="pf0" name="PF0"/>
+        <pad key="aref" name="AREF"/>
+        <pad key="avcc" name="AVCC"/>
+    </pads>
     <pinouts>
         <pinout key="qfp_qfn_64" name="QFP_QFN_64" type="qfn">
-            <pin position="1" pad="NC"/>
-            <pin position="2" pad="PE0"/>
-            <pin position="3" pad="PE1"/>
-            <pin position="4" pad="PE2"/>
-            <pin position="5" pad="PE3"/>
-            <pin position="6" pad="PE4"/>
-            <pin position="7" pad="PE5"/>
-            <pin position="8" pad="PE6"/>
-            <pin position="9" pad="PE7"/>
-            <pin position="10" pad="PB0"/>
-            <pin position="11" pad="PB1"/>
-            <pin position="12" pad="PB2"/>
-            <pin position="13" pad="PB3"/>
-            <pin position="14" pad="PB4"/>
-            <pin position="15" pad="PB5"/>
-            <pin position="16" pad="PB6"/>
-            <pin position="17" pad="PB7"/>
-            <pin position="18" pad="PG3"/>
-            <pin position="19" pad="PG4"/>
-            <pin position="20" pad="PG5"/>
-            <pin position="21" pad="VCC"/>
-            <pin position="22" pad="GDN"/>
-            <pin position="23" pad="XTAL2"/>
-            <pin position="24" pad="XTAL1"/>
-            <pin position="25" pad="PD0"/>
-            <pin position="26" pad="PD1"/>
-            <pin position="27" pad="PD2"/>
-            <pin position="28" pad="PD3"/>
-            <pin position="29" pad="PD4"/>
-            <pin position="30" pad="PD5"/>
-            <pin position="31" pad="PD6"/>
-            <pin position="32" pad="PD7"/>
-            <pin position="33" pad="PG0"/>
-            <pin position="34" pad="PG1"/>
-            <pin position="35" pad="PC0"/>
-            <pin position="36" pad="PC1"/>
-            <pin position="37" pad="PC2"/>
-            <pin position="38" pad="PC3"/>
-            <pin position="39" pad="PC4"/>
-            <pin position="40" pad="PC5"/>
-            <pin position="41" pad="PC6"/>
-            <pin position="42" pad="PC7"/>
-            <pin position="43" pad="PG2"/>
-            <pin position="44" pad="PA7"/>
-            <pin position="45" pad="PA6"/>
-            <pin position="46" pad="PA5"/>
-            <pin position="47" pad="PA4"/>
-            <pin position="48" pad="PA3"/>
-            <pin position="49" pad="PA2"/>
-            <pin position="50" pad="PA1"/>
-            <pin position="51" pad="PA0"/>
-            <pin position="52" pad="VCC"/>
-            <pin position="53" pad="GND"/>
-            <pin position="54" pad="PF7"/>
-            <pin position="55" pad="PF6"/>
-            <pin position="56" pad="PF5"/>
-            <pin position="57" pad="PF4"/>
-            <pin position="58" pad="PF3"/>
-            <pin position="59" pad="PF2"/>
-            <pin position="60" pad="PF1"/>
-            <pin position="61" pad="PF0"/>
-            <pin position="62" pad="AREF"/>
-            <pin position="63" pad="GND"/>
-            <pin position="64" pad="AVCC"/>
+            <pin position="1"/>
+            <pin position="2" pad-key="pe0"/>
+            <pin position="3" pad-key="pe1"/>
+            <pin position="4" pad-key="pe2"/>
+            <pin position="5" pad-key="pe3"/>
+            <pin position="6" pad-key="pe4"/>
+            <pin position="7" pad-key="pe5"/>
+            <pin position="8" pad-key="pe6"/>
+            <pin position="9" pad-key="pe7"/>
+            <pin position="10" pad-key="pb0"/>
+            <pin position="11" pad-key="pb1"/>
+            <pin position="12" pad-key="pb2"/>
+            <pin position="13" pad-key="pb3"/>
+            <pin position="14" pad-key="pb4"/>
+            <pin position="15" pad-key="pb5"/>
+            <pin position="16" pad-key="pb6"/>
+            <pin position="17" pad-key="pb7"/>
+            <pin position="18" pad-key="pg3"/>
+            <pin position="19" pad-key="pg4"/>
+            <pin position="20" pad-key="pg5"/>
+            <pin position="21" pad-key="vcc"/>
+            <pin position="22" pad-key="gdn"/>
+            <pin position="23" pad-key="xtal2"/>
+            <pin position="24" pad-key="xtal1"/>
+            <pin position="25" pad-key="pd0"/>
+            <pin position="26" pad-key="pd1"/>
+            <pin position="27" pad-key="pd2"/>
+            <pin position="28" pad-key="pd3"/>
+            <pin position="29" pad-key="pd4"/>
+            <pin position="30" pad-key="pd5"/>
+            <pin position="31" pad-key="pd6"/>
+            <pin position="32" pad-key="pd7"/>
+            <pin position="33" pad-key="pg0"/>
+            <pin position="34" pad-key="pg1"/>
+            <pin position="35" pad-key="pc0"/>
+            <pin position="36" pad-key="pc1"/>
+            <pin position="37" pad-key="pc2"/>
+            <pin position="38" pad-key="pc3"/>
+            <pin position="39" pad-key="pc4"/>
+            <pin position="40" pad-key="pc5"/>
+            <pin position="41" pad-key="pc6"/>
+            <pin position="42" pad-key="pc7"/>
+            <pin position="43" pad-key="pg2"/>
+            <pin position="44" pad-key="pa7"/>
+            <pin position="45" pad-key="pa6"/>
+            <pin position="46" pad-key="pa5"/>
+            <pin position="47" pad-key="pa4"/>
+            <pin position="48" pad-key="pa3"/>
+            <pin position="49" pad-key="pa2"/>
+            <pin position="50" pad-key="pa1"/>
+            <pin position="51" pad-key="pa0"/>
+            <pin position="52" pad-key="vcc"/>
+            <pin position="53" pad-key="gnd"/>
+            <pin position="54" pad-key="pf7"/>
+            <pin position="55" pad-key="pf6"/>
+            <pin position="56" pad-key="pf5"/>
+            <pin position="57" pad-key="pf4"/>
+            <pin position="58" pad-key="pf3"/>
+            <pin position="59" pad-key="pf2"/>
+            <pin position="60" pad-key="pf1"/>
+            <pin position="61" pad-key="pf0"/>
+            <pin position="62" pad-key="aref"/>
+            <pin position="63" pad-key="gnd"/>
+            <pin position="64" pad-key="avcc"/>
         </pinout>
     </pinouts>
     <variants>
-        <variant name="ATmega325PA-AU" pinout-key="qfp_qfn_64" package="TQFP64"/>
-        <variant name="ATmega325PA-MU" pinout-key="qfp_qfn_64" package="VQFN64"/>
+        <variant key="atmega325pa_au" name="ATmega325PA-AU" pinout-key="qfp_qfn_64"/>
+        <variant key="atmega325pa_mu" name="ATmega325PA-MU" pinout-key="qfp_qfn_64"/>
     </variants>
 </device>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA328.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA328.xml
index 8895f0f9..1da37e39 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA328.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA328.xml
@@ -220,135 +220,135 @@
         <peripheral key="usart0" name="USART0" module-key="usart">
             <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"/>
-                <signal pad-id="pd4" function="default" group="XCK"/>
+                <signal pad-key="pd1" function="default" group="TXD"/>
+                <signal pad-key="pd0" function="default" group="RXD"/>
+                <signal pad-key="pd4" function="default" group="XCK"/>
             </signals>
         </peripheral>
         <peripheral key="twi" name="TWI" module-key="twi">
             <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"/>
+                <signal pad-key="pc4" function="default" group="SDA"/>
+                <signal pad-key="pc5" function="default" group="SCL"/>
             </signals>
         </peripheral>
         <peripheral key="tc1" name="TC1" module-key="tc16">
             <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"/>
-                <signal pad-id="pb1" function="default" group="OCA"/>
-                <signal pad-id="pb2" function="default" group="OCB"/>
+                <signal pad-key="pd5" function="default" group="T"/>
+                <signal pad-key="pb0" function="default" group="ICP"/>
+                <signal pad-key="pb1" function="default" group="OCA"/>
+                <signal pad-key="pb2" function="default" group="OCB"/>
             </signals>
         </peripheral>
         <peripheral key="tc2" name="TC2" module-key="tc8_async">
             <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"/>
+                <signal pad-key="pb3" function="default" group="OCA"/>
+                <signal pad-key="pd3" function="default" group="OCB"/>
             </signals>
         </peripheral>
         <peripheral key="adc" name="ADC" module-key="adc">
             <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"/>
-                <signal pad-id="pc2" index="2" function="default" group="ADC"/>
-                <signal pad-id="pc3" index="3" function="default" group="ADC"/>
-                <signal pad-id="pc4" index="4" function="default" group="ADC"/>
-                <signal pad-id="pc5" index="5" function="default" group="ADC"/>
+                <signal pad-key="pc0" index="0" function="default" group="ADC"/>
+                <signal pad-key="pc1" index="1" function="default" group="ADC"/>
+                <signal pad-key="pc2" index="2" function="default" group="ADC"/>
+                <signal pad-key="pc3" index="3" function="default" group="ADC"/>
+                <signal pad-key="pc4" index="4" function="default" group="ADC"/>
+                <signal pad-key="pc5" index="5" function="default" group="ADC"/>
             </signals>
         </peripheral>
         <peripheral key="ac" name="AC" module-key="ac">
             <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"/>
+                <signal pad-key="pd6" index="0" function="default" group="AIN"/>
+                <signal pad-key="pd7" index="1" function="default" group="AIN"/>
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pb2" index="2" function="default" group="P"/>
-                <signal pad-id="pb3" index="3" function="default" group="P"/>
-                <signal pad-id="pb4" index="4" function="default" group="P"/>
-                <signal pad-id="pb5" index="5" function="default" group="P"/>
-                <signal pad-id="pb6" index="6" function="default" group="P"/>
-                <signal pad-id="pb7" index="7" function="default" group="P"/>
+                <signal pad-key="pb0" index="0" function="default" group="P"/>
+                <signal pad-key="pb1" index="1" function="default" group="P"/>
+                <signal pad-key="pb2" index="2" function="default" group="P"/>
+                <signal pad-key="pb3" index="3" function="default" group="P"/>
+                <signal pad-key="pb4" index="4" function="default" group="P"/>
+                <signal pad-key="pb5" index="5" function="default" group="P"/>
+                <signal pad-key="pb6" index="6" function="default" group="P"/>
+                <signal pad-key="pb7" index="7" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pc2" index="2" function="default" group="P"/>
-                <signal pad-id="pc3" index="3" function="default" group="P"/>
-                <signal pad-id="pc4" index="4" function="default" group="P"/>
-                <signal pad-id="pc5" index="5" function="default" group="P"/>
-                <signal pad-id="pc6" index="6" function="default" group="P"/>
+                <signal pad-key="pc0" index="0" function="default" group="P"/>
+                <signal pad-key="pc1" index="1" function="default" group="P"/>
+                <signal pad-key="pc2" index="2" function="default" group="P"/>
+                <signal pad-key="pc3" index="3" function="default" group="P"/>
+                <signal pad-key="pc4" index="4" function="default" group="P"/>
+                <signal pad-key="pc5" index="5" function="default" group="P"/>
+                <signal pad-key="pc6" index="6" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pd2" index="2" function="default" group="P"/>
-                <signal pad-id="pd3" index="3" function="default" group="P"/>
-                <signal pad-id="pd4" index="4" function="default" group="P"/>
-                <signal pad-id="pd5" index="5" function="default" group="P"/>
-                <signal pad-id="pd6" index="6" function="default" group="P"/>
-                <signal pad-id="pd7" index="7" function="default" group="P"/>
+                <signal pad-key="pd0" index="0" function="default" group="P"/>
+                <signal pad-key="pd1" index="1" function="default" group="P"/>
+                <signal pad-key="pd2" index="2" function="default" group="P"/>
+                <signal pad-key="pd3" index="3" function="default" group="P"/>
+                <signal pad-key="pd4" index="4" function="default" group="P"/>
+                <signal pad-key="pd5" index="5" function="default" group="P"/>
+                <signal pad-key="pd6" index="6" function="default" group="P"/>
+                <signal pad-key="pd7" index="7" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="tc0" name="TC0" module-key="tc8">
             <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"/>
-                <signal pad-id="pd6" function="default" group="OCA"/>
+                <signal pad-key="pd4" function="default" group="T"/>
+                <signal pad-key="pd5" function="default" group="OCB"/>
+                <signal pad-key="pd6" function="default" group="OCA"/>
             </signals>
         </peripheral>
         <peripheral key="exint" name="EXINT" module-key="exint">
             <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"/>
-                <signal pad-id="pd4" index="20" function="default" group="PCINT"/>
-                <signal pad-id="pb6" index="6" function="default" group="PCINT"/>
-                <signal pad-id="pb7" index="7" function="default" group="PCINT"/>
-                <signal pad-id="pd5" index="21" function="default" group="PCINT"/>
-                <signal pad-id="pd6" index="22" function="default" group="PCINT"/>
-                <signal pad-id="pd7" index="23" function="default" group="PCINT"/>
-                <signal pad-id="pb0" index="0" function="default" group="PCINT"/>
-                <signal pad-id="pb1" index="1" function="default" group="PCINT"/>
-                <signal pad-id="pb2" index="2" function="default" group="PCINT"/>
-                <signal pad-id="pb3" index="3" function="default" group="PCINT"/>
-                <signal pad-id="pb4" index="4" function="default" group="PCINT"/>
-                <signal pad-id="pb5" index="5" function="default" group="PCINT"/>
-                <signal pad-id="pc0" index="8" function="default" group="PCINT"/>
-                <signal pad-id="pc1" index="9" function="default" group="PCINT"/>
-                <signal pad-id="pc2" index="10" function="default" group="PCINT"/>
-                <signal pad-id="pc3" index="11" function="default" group="PCINT"/>
-                <signal pad-id="pc4" index="12" function="default" group="PCINT"/>
-                <signal pad-id="pc5" index="13" function="default" group="PCINT"/>
-                <signal pad-id="pc6" index="14" function="default" group="PCINT"/>
-                <signal pad-id="pd0" index="16" function="default" group="PCINT"/>
-                <signal pad-id="pd1" index="17" function="default" group="PCINT"/>
-                <signal pad-id="pd2" index="18" function="default" group="PCINT"/>
-                <signal pad-id="pd2" index="0" function="default" group="INT"/>
+                <signal pad-key="pd3" index="1" function="default" group="INT"/>
+                <signal pad-key="pd3" index="19" function="default" group="PCINT"/>
+                <signal pad-key="pd4" index="20" function="default" group="PCINT"/>
+                <signal pad-key="pb6" index="6" function="default" group="PCINT"/>
+                <signal pad-key="pb7" index="7" function="default" group="PCINT"/>
+                <signal pad-key="pd5" index="21" function="default" group="PCINT"/>
+                <signal pad-key="pd6" index="22" function="default" group="PCINT"/>
+                <signal pad-key="pd7" index="23" function="default" group="PCINT"/>
+                <signal pad-key="pb0" index="0" function="default" group="PCINT"/>
+                <signal pad-key="pb1" index="1" function="default" group="PCINT"/>
+                <signal pad-key="pb2" index="2" function="default" group="PCINT"/>
+                <signal pad-key="pb3" index="3" function="default" group="PCINT"/>
+                <signal pad-key="pb4" index="4" function="default" group="PCINT"/>
+                <signal pad-key="pb5" index="5" function="default" group="PCINT"/>
+                <signal pad-key="pc0" index="8" function="default" group="PCINT"/>
+                <signal pad-key="pc1" index="9" function="default" group="PCINT"/>
+                <signal pad-key="pc2" index="10" function="default" group="PCINT"/>
+                <signal pad-key="pc3" index="11" function="default" group="PCINT"/>
+                <signal pad-key="pc4" index="12" function="default" group="PCINT"/>
+                <signal pad-key="pc5" index="13" function="default" group="PCINT"/>
+                <signal pad-key="pc6" index="14" function="default" group="PCINT"/>
+                <signal pad-key="pd0" index="16" function="default" group="PCINT"/>
+                <signal pad-key="pd1" index="17" function="default" group="PCINT"/>
+                <signal pad-key="pd2" index="18" function="default" group="PCINT"/>
+                <signal pad-key="pd2" index="0" function="default" group="INT"/>
             </signals>
         </peripheral>
         <peripheral key="spi" name="SPI" module-key="spi">
             <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"/>
-                <signal pad-id="pb4" function="default" group="MISO"/>
-                <signal pad-id="pb5" function="default" group="SCK"/>
+                <signal pad-key="pb2" function="default" group="SS"/>
+                <signal pad-key="pb3" function="default" group="MOSI"/>
+                <signal pad-key="pb4" function="default" group="MISO"/>
+                <signal pad-key="pb5" function="default" group="SCK"/>
             </signals>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="wdt">
@@ -360,7 +360,7 @@
         <peripheral key="cpu" name="CPU" module-key="cpu">
             <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"/>
+                <signal pad-key="pb0" index="0" function="default" group="CLK"/>
             </signals>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="fuse">
@@ -810,140 +810,171 @@
             </register-group>
         </module>
     </modules>
+    <pads>
+        <pad key="pd3" name="PD3"/>
+        <pad key="pd4" name="PD4"/>
+        <pad key="gnd" name="GND"/>
+        <pad key="vcc" name="VCC"/>
+        <pad key="pb6" name="PB6"/>
+        <pad key="pb7" name="PB7"/>
+        <pad key="pd5" name="PD5"/>
+        <pad key="pd6" name="PD6"/>
+        <pad key="pd7" name="PD7"/>
+        <pad key="pb0" name="PB0"/>
+        <pad key="pb1" name="PB1"/>
+        <pad key="pb2" name="PB2"/>
+        <pad key="pb3" name="PB3"/>
+        <pad key="pb4" name="PB4"/>
+        <pad key="pb5" name="PB5"/>
+        <pad key="avcc" name="AVCC"/>
+        <pad key="adc6" name="ADC6"/>
+        <pad key="aref" name="AREF"/>
+        <pad key="adc7" name="ADC7"/>
+        <pad key="pc0" name="PC0"/>
+        <pad key="pc1" name="PC1"/>
+        <pad key="pc2" name="PC2"/>
+        <pad key="pc3" name="PC3"/>
+        <pad key="pc4" name="PC4"/>
+        <pad key="pc5" name="PC5"/>
+        <pad key="pc6" name="PC6"/>
+        <pad key="pd0" name="PD0"/>
+        <pad key="pd1" name="PD1"/>
+        <pad key="pd2" name="PD2"/>
+    </pads>
     <pinouts>
         <pinout key="tqfp32" name="TQFP32" type="qfp">
-            <pin position="1" pad="PD3"/>
-            <pin position="2" pad="PD4"/>
-            <pin position="3" pad="GND"/>
-            <pin position="4" pad="VCC"/>
-            <pin position="5" pad="GND"/>
-            <pin position="6" pad="VCC"/>
-            <pin position="7" pad="PB6"/>
-            <pin position="8" pad="PB7"/>
-            <pin position="9" pad="PD5"/>
-            <pin position="10" pad="PD6"/>
-            <pin position="11" pad="PD7"/>
-            <pin position="12" pad="PB0"/>
-            <pin position="13" pad="PB1"/>
-            <pin position="14" pad="PB2"/>
-            <pin position="15" pad="PB3"/>
-            <pin position="16" pad="PB4"/>
-            <pin position="17" pad="PB5"/>
-            <pin position="18" pad="AVCC"/>
-            <pin position="19" pad="ADC6"/>
-            <pin position="20" pad="AREF"/>
-            <pin position="21" pad="GND"/>
-            <pin position="22" pad="ADC7"/>
-            <pin position="23" pad="PC0"/>
-            <pin position="24" pad="PC1"/>
-            <pin position="25" pad="PC2"/>
-            <pin position="26" pad="PC3"/>
-            <pin position="27" pad="PC4"/>
-            <pin position="28" pad="PC5"/>
-            <pin position="29" pad="PC6"/>
-            <pin position="30" pad="PD0"/>
-            <pin position="31" pad="PD1"/>
-            <pin position="32" pad="PD2"/>
+            <pin position="1" pad-key="pd3"/>
+            <pin position="2" pad-key="pd4"/>
+            <pin position="3" pad-key="gnd"/>
+            <pin position="4" pad-key="vcc"/>
+            <pin position="5" pad-key="gnd"/>
+            <pin position="6" pad-key="vcc"/>
+            <pin position="7" pad-key="pb6"/>
+            <pin position="8" pad-key="pb7"/>
+            <pin position="9" pad-key="pd5"/>
+            <pin position="10" pad-key="pd6"/>
+            <pin position="11" pad-key="pd7"/>
+            <pin position="12" pad-key="pb0"/>
+            <pin position="13" pad-key="pb1"/>
+            <pin position="14" pad-key="pb2"/>
+            <pin position="15" pad-key="pb3"/>
+            <pin position="16" pad-key="pb4"/>
+            <pin position="17" pad-key="pb5"/>
+            <pin position="18" pad-key="avcc"/>
+            <pin position="19" pad-key="adc6"/>
+            <pin position="20" pad-key="aref"/>
+            <pin position="21" pad-key="gnd"/>
+            <pin position="22" pad-key="adc7"/>
+            <pin position="23" pad-key="pc0"/>
+            <pin position="24" pad-key="pc1"/>
+            <pin position="25" pad-key="pc2"/>
+            <pin position="26" pad-key="pc3"/>
+            <pin position="27" pad-key="pc4"/>
+            <pin position="28" pad-key="pc5"/>
+            <pin position="29" pad-key="pc6"/>
+            <pin position="30" pad-key="pd0"/>
+            <pin position="31" pad-key="pd1"/>
+            <pin position="32" pad-key="pd2"/>
         </pinout>
         <pinout key="qfn32" name="QFN32" type="qfn">
-            <pin position="1" pad="PD3"/>
-            <pin position="2" pad="PD4"/>
-            <pin position="3" pad="GND"/>
-            <pin position="4" pad="VCC"/>
-            <pin position="5" pad="GND"/>
-            <pin position="6" pad="VCC"/>
-            <pin position="7" pad="PB6"/>
-            <pin position="8" pad="PB7"/>
-            <pin position="9" pad="PD5"/>
-            <pin position="10" pad="PD6"/>
-            <pin position="11" pad="PD7"/>
-            <pin position="12" pad="PB0"/>
-            <pin position="13" pad="PB1"/>
-            <pin position="14" pad="PB2"/>
-            <pin position="15" pad="PB3"/>
-            <pin position="16" pad="PB4"/>
-            <pin position="17" pad="PB5"/>
-            <pin position="18" pad="AVCC"/>
-            <pin position="19" pad="ADC6"/>
-            <pin position="20" pad="AREF"/>
-            <pin position="21" pad="GND"/>
-            <pin position="22" pad="ADC7"/>
-            <pin position="23" pad="PC0"/>
-            <pin position="24" pad="PC1"/>
-            <pin position="25" pad="PC2"/>
-            <pin position="26" pad="PC3"/>
-            <pin position="27" pad="PC4"/>
-            <pin position="28" pad="PC5"/>
-            <pin position="29" pad="PC6"/>
-            <pin position="30" pad="PD0"/>
-            <pin position="31" pad="PD1"/>
-            <pin position="32" pad="PD2"/>
+            <pin position="1" pad-key="pd3"/>
+            <pin position="2" pad-key="pd4"/>
+            <pin position="3" pad-key="gnd"/>
+            <pin position="4" pad-key="vcc"/>
+            <pin position="5" pad-key="gnd"/>
+            <pin position="6" pad-key="vcc"/>
+            <pin position="7" pad-key="pb6"/>
+            <pin position="8" pad-key="pb7"/>
+            <pin position="9" pad-key="pd5"/>
+            <pin position="10" pad-key="pd6"/>
+            <pin position="11" pad-key="pd7"/>
+            <pin position="12" pad-key="pb0"/>
+            <pin position="13" pad-key="pb1"/>
+            <pin position="14" pad-key="pb2"/>
+            <pin position="15" pad-key="pb3"/>
+            <pin position="16" pad-key="pb4"/>
+            <pin position="17" pad-key="pb5"/>
+            <pin position="18" pad-key="avcc"/>
+            <pin position="19" pad-key="adc6"/>
+            <pin position="20" pad-key="aref"/>
+            <pin position="21" pad-key="gnd"/>
+            <pin position="22" pad-key="adc7"/>
+            <pin position="23" pad-key="pc0"/>
+            <pin position="24" pad-key="pc1"/>
+            <pin position="25" pad-key="pc2"/>
+            <pin position="26" pad-key="pc3"/>
+            <pin position="27" pad-key="pc4"/>
+            <pin position="28" pad-key="pc5"/>
+            <pin position="29" pad-key="pc6"/>
+            <pin position="30" pad-key="pd0"/>
+            <pin position="31" pad-key="pd1"/>
+            <pin position="32" pad-key="pd2"/>
         </pinout>
         <pinout key="qfn28" name="QFN28" type="qfn">
-            <pin position="1" pad="PD3"/>
-            <pin position="2" pad="PD4"/>
-            <pin position="3" pad="VCC"/>
-            <pin position="4" pad="GND"/>
-            <pin position="5" pad="PB6"/>
-            <pin position="6" pad="PB7"/>
-            <pin position="7" pad="PD5"/>
-            <pin position="8" pad="PD6"/>
-            <pin position="9" pad="PD7"/>
-            <pin position="10" pad="PB0"/>
-            <pin position="11" pad="PB1"/>
-            <pin position="12" pad="PB2"/>
-            <pin position="13" pad="PB3"/>
-            <pin position="14" pad="PB4"/>
-            <pin position="15" pad="PB5"/>
-            <pin position="16" pad="AVCC"/>
-            <pin position="17" pad="AREF"/>
-            <pin position="18" pad="GND"/>
-            <pin position="19" pad="PC0"/>
-            <pin position="20" pad="PC1"/>
-            <pin position="21" pad="PC2"/>
-            <pin position="22" pad="PC3"/>
-            <pin position="23" pad="PC4"/>
-            <pin position="24" pad="PC5"/>
-            <pin position="25" pad="PC6"/>
-            <pin position="26" pad="PD0"/>
-            <pin position="27" pad="PD1"/>
-            <pin position="28" pad="PD2"/>
+            <pin position="1" pad-key="pd3"/>
+            <pin position="2" pad-key="pd4"/>
+            <pin position="3" pad-key="vcc"/>
+            <pin position="4" pad-key="gnd"/>
+            <pin position="5" pad-key="pb6"/>
+            <pin position="6" pad-key="pb7"/>
+            <pin position="7" pad-key="pd5"/>
+            <pin position="8" pad-key="pd6"/>
+            <pin position="9" pad-key="pd7"/>
+            <pin position="10" pad-key="pb0"/>
+            <pin position="11" pad-key="pb1"/>
+            <pin position="12" pad-key="pb2"/>
+            <pin position="13" pad-key="pb3"/>
+            <pin position="14" pad-key="pb4"/>
+            <pin position="15" pad-key="pb5"/>
+            <pin position="16" pad-key="avcc"/>
+            <pin position="17" pad-key="aref"/>
+            <pin position="18" pad-key="gnd"/>
+            <pin position="19" pad-key="pc0"/>
+            <pin position="20" pad-key="pc1"/>
+            <pin position="21" pad-key="pc2"/>
+            <pin position="22" pad-key="pc3"/>
+            <pin position="23" pad-key="pc4"/>
+            <pin position="24" pad-key="pc5"/>
+            <pin position="25" pad-key="pc6"/>
+            <pin position="26" pad-key="pd0"/>
+            <pin position="27" pad-key="pd1"/>
+            <pin position="28" pad-key="pd2"/>
         </pinout>
         <pinout key="pdip28" name="PDIP28" type="dip">
-            <pin position="1" pad="PC6"/>
-            <pin position="2" pad="PD0"/>
-            <pin position="3" pad="PD1"/>
-            <pin position="4" pad="PD2"/>
-            <pin position="5" pad="PD3"/>
-            <pin position="6" pad="PD4"/>
-            <pin position="7" pad="VCC"/>
-            <pin position="8" pad="GND"/>
-            <pin position="9" pad="PB6"/>
-            <pin position="10" pad="PB7"/>
-            <pin position="11" pad="PD5"/>
-            <pin position="12" pad="PD6"/>
-            <pin position="13" pad="PD7"/>
-            <pin position="14" pad="PB0"/>
-            <pin position="15" pad="PB1"/>
-            <pin position="16" pad="PB2"/>
-            <pin position="17" pad="PB3"/>
-            <pin position="18" pad="PB4"/>
-            <pin position="19" pad="PB5"/>
-            <pin position="20" pad="AVCC"/>
-            <pin position="21" pad="AREF"/>
-            <pin position="22" pad="GND"/>
-            <pin position="23" pad="PC0"/>
-            <pin position="24" pad="PC1"/>
-            <pin position="25" pad="PC2"/>
-            <pin position="26" pad="PC3"/>
-            <pin position="27" pad="PC4"/>
-            <pin position="28" pad="PC5"/>
+            <pin position="1" pad-key="pc6"/>
+            <pin position="2" pad-key="pd0"/>
+            <pin position="3" pad-key="pd1"/>
+            <pin position="4" pad-key="pd2"/>
+            <pin position="5" pad-key="pd3"/>
+            <pin position="6" pad-key="pd4"/>
+            <pin position="7" pad-key="vcc"/>
+            <pin position="8" pad-key="gnd"/>
+            <pin position="9" pad-key="pb6"/>
+            <pin position="10" pad-key="pb7"/>
+            <pin position="11" pad-key="pd5"/>
+            <pin position="12" pad-key="pd6"/>
+            <pin position="13" pad-key="pd7"/>
+            <pin position="14" pad-key="pb0"/>
+            <pin position="15" pad-key="pb1"/>
+            <pin position="16" pad-key="pb2"/>
+            <pin position="17" pad-key="pb3"/>
+            <pin position="18" pad-key="pb4"/>
+            <pin position="19" pad-key="pb5"/>
+            <pin position="20" pad-key="avcc"/>
+            <pin position="21" pad-key="aref"/>
+            <pin position="22" pad-key="gnd"/>
+            <pin position="23" pad-key="pc0"/>
+            <pin position="24" pad-key="pc1"/>
+            <pin position="25" pad-key="pc2"/>
+            <pin position="26" pad-key="pc3"/>
+            <pin position="27" pad-key="pc4"/>
+            <pin position="28" pad-key="pc5"/>
         </pinout>
     </pinouts>
     <variants>
-        <variant name="ATmega328-AU" pinout-key="tqfp32" package="TQFP32"/>
-        <variant name="ATmega328-MMH" pinout-key="qfn28" package="QFN28"/>
-        <variant name="ATmega328-MU" pinout-key="qfn32" package="QFN32"/>
-        <variant name="ATmega328-PU" pinout-key="pdip28" package="PDIP28"/>
+        <variant key="atmega328_au" name="ATmega328-AU" pinout-key="tqfp32"/>
+        <variant key="atmega328_mmh" name="ATmega328-MMH" pinout-key="qfn28"/>
+        <variant key="atmega328_mu" name="ATmega328-MU" pinout-key="qfn32"/>
+        <variant key="atmega328_pu" name="ATmega328-PU" pinout-key="pdip28"/>
     </variants>
 </device>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA328P.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA328P.xml
index 4b76652b..3bb581b3 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA328P.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA328P.xml
@@ -220,135 +220,135 @@
         <peripheral key="usart0" name="USART0" module-key="usart">
             <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"/>
-                <signal pad-id="pd4" function="default" group="XCK"/>
+                <signal pad-key="pd1" function="default" group="TXD"/>
+                <signal pad-key="pd0" function="default" group="RXD"/>
+                <signal pad-key="pd4" function="default" group="XCK"/>
             </signals>
         </peripheral>
         <peripheral key="twi" name="TWI" module-key="twi">
             <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"/>
+                <signal pad-key="pc4" function="default" group="SDA"/>
+                <signal pad-key="pc5" function="default" group="SCL"/>
             </signals>
         </peripheral>
         <peripheral key="tc1" name="TC1" module-key="tc16">
             <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"/>
-                <signal pad-id="pb1" function="default" group="OCA"/>
-                <signal pad-id="pb2" function="default" group="OCB"/>
+                <signal pad-key="pd5" function="default" group="T"/>
+                <signal pad-key="pb0" function="default" group="ICP"/>
+                <signal pad-key="pb1" function="default" group="OCA"/>
+                <signal pad-key="pb2" function="default" group="OCB"/>
             </signals>
         </peripheral>
         <peripheral key="tc2" name="TC2" module-key="tc8_async">
             <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"/>
+                <signal pad-key="pb3" function="default" group="OCA"/>
+                <signal pad-key="pd3" function="default" group="OCB"/>
             </signals>
         </peripheral>
         <peripheral key="adc" name="ADC" module-key="adc">
             <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"/>
-                <signal pad-id="pc2" index="2" function="default" group="ADC"/>
-                <signal pad-id="pc3" index="3" function="default" group="ADC"/>
-                <signal pad-id="pc4" index="4" function="default" group="ADC"/>
-                <signal pad-id="pc5" index="5" function="default" group="ADC"/>
+                <signal pad-key="pc0" index="0" function="default" group="ADC"/>
+                <signal pad-key="pc1" index="1" function="default" group="ADC"/>
+                <signal pad-key="pc2" index="2" function="default" group="ADC"/>
+                <signal pad-key="pc3" index="3" function="default" group="ADC"/>
+                <signal pad-key="pc4" index="4" function="default" group="ADC"/>
+                <signal pad-key="pc5" index="5" function="default" group="ADC"/>
             </signals>
         </peripheral>
         <peripheral key="ac" name="AC" module-key="ac">
             <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"/>
+                <signal pad-key="pd6" index="0" function="default" group="AIN"/>
+                <signal pad-key="pd7" index="1" function="default" group="AIN"/>
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pb2" index="2" function="default" group="P"/>
-                <signal pad-id="pb3" index="3" function="default" group="P"/>
-                <signal pad-id="pb4" index="4" function="default" group="P"/>
-                <signal pad-id="pb5" index="5" function="default" group="P"/>
-                <signal pad-id="pb6" index="6" function="default" group="P"/>
-                <signal pad-id="pb7" index="7" function="default" group="P"/>
+                <signal pad-key="pb0" index="0" function="default" group="P"/>
+                <signal pad-key="pb1" index="1" function="default" group="P"/>
+                <signal pad-key="pb2" index="2" function="default" group="P"/>
+                <signal pad-key="pb3" index="3" function="default" group="P"/>
+                <signal pad-key="pb4" index="4" function="default" group="P"/>
+                <signal pad-key="pb5" index="5" function="default" group="P"/>
+                <signal pad-key="pb6" index="6" function="default" group="P"/>
+                <signal pad-key="pb7" index="7" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pc2" index="2" function="default" group="P"/>
-                <signal pad-id="pc3" index="3" function="default" group="P"/>
-                <signal pad-id="pc4" index="4" function="default" group="P"/>
-                <signal pad-id="pc5" index="5" function="default" group="P"/>
-                <signal pad-id="pc6" index="6" function="default" group="P"/>
+                <signal pad-key="pc0" index="0" function="default" group="P"/>
+                <signal pad-key="pc1" index="1" function="default" group="P"/>
+                <signal pad-key="pc2" index="2" function="default" group="P"/>
+                <signal pad-key="pc3" index="3" function="default" group="P"/>
+                <signal pad-key="pc4" index="4" function="default" group="P"/>
+                <signal pad-key="pc5" index="5" function="default" group="P"/>
+                <signal pad-key="pc6" index="6" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pd2" index="2" function="default" group="P"/>
-                <signal pad-id="pd3" index="3" function="default" group="P"/>
-                <signal pad-id="pd4" index="4" function="default" group="P"/>
-                <signal pad-id="pd5" index="5" function="default" group="P"/>
-                <signal pad-id="pd6" index="6" function="default" group="P"/>
-                <signal pad-id="pd7" index="7" function="default" group="P"/>
+                <signal pad-key="pd0" index="0" function="default" group="P"/>
+                <signal pad-key="pd1" index="1" function="default" group="P"/>
+                <signal pad-key="pd2" index="2" function="default" group="P"/>
+                <signal pad-key="pd3" index="3" function="default" group="P"/>
+                <signal pad-key="pd4" index="4" function="default" group="P"/>
+                <signal pad-key="pd5" index="5" function="default" group="P"/>
+                <signal pad-key="pd6" index="6" function="default" group="P"/>
+                <signal pad-key="pd7" index="7" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="tc0" name="TC0" module-key="tc8">
             <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"/>
-                <signal pad-id="pd6" function="default" group="OCA"/>
+                <signal pad-key="pd4" function="default" group="T"/>
+                <signal pad-key="pd5" function="default" group="OCB"/>
+                <signal pad-key="pd6" function="default" group="OCA"/>
             </signals>
         </peripheral>
         <peripheral key="exint" name="EXINT" module-key="exint">
             <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"/>
-                <signal pad-id="pd4" index="20" function="default" group="PCINT"/>
-                <signal pad-id="pb6" index="6" function="default" group="PCINT"/>
-                <signal pad-id="pb7" index="7" function="default" group="PCINT"/>
-                <signal pad-id="pd5" index="21" function="default" group="PCINT"/>
-                <signal pad-id="pd6" index="22" function="default" group="PCINT"/>
-                <signal pad-id="pd7" index="23" function="default" group="PCINT"/>
-                <signal pad-id="pb0" index="0" function="default" group="PCINT"/>
-                <signal pad-id="pb1" index="1" function="default" group="PCINT"/>
-                <signal pad-id="pb2" index="2" function="default" group="PCINT"/>
-                <signal pad-id="pb3" index="3" function="default" group="PCINT"/>
-                <signal pad-id="pb4" index="4" function="default" group="PCINT"/>
-                <signal pad-id="pb5" index="5" function="default" group="PCINT"/>
-                <signal pad-id="pc0" index="8" function="default" group="PCINT"/>
-                <signal pad-id="pc1" index="9" function="default" group="PCINT"/>
-                <signal pad-id="pc2" index="10" function="default" group="PCINT"/>
-                <signal pad-id="pc3" index="11" function="default" group="PCINT"/>
-                <signal pad-id="pc4" index="12" function="default" group="PCINT"/>
-                <signal pad-id="pc5" index="13" function="default" group="PCINT"/>
-                <signal pad-id="pc6" index="14" function="default" group="PCINT"/>
-                <signal pad-id="pd0" index="16" function="default" group="PCINT"/>
-                <signal pad-id="pd1" index="17" function="default" group="PCINT"/>
-                <signal pad-id="pd2" index="18" function="default" group="PCINT"/>
-                <signal pad-id="pd2" index="0" function="default" group="INT"/>
+                <signal pad-key="pd3" index="1" function="default" group="INT"/>
+                <signal pad-key="pd3" index="19" function="default" group="PCINT"/>
+                <signal pad-key="pd4" index="20" function="default" group="PCINT"/>
+                <signal pad-key="pb6" index="6" function="default" group="PCINT"/>
+                <signal pad-key="pb7" index="7" function="default" group="PCINT"/>
+                <signal pad-key="pd5" index="21" function="default" group="PCINT"/>
+                <signal pad-key="pd6" index="22" function="default" group="PCINT"/>
+                <signal pad-key="pd7" index="23" function="default" group="PCINT"/>
+                <signal pad-key="pb0" index="0" function="default" group="PCINT"/>
+                <signal pad-key="pb1" index="1" function="default" group="PCINT"/>
+                <signal pad-key="pb2" index="2" function="default" group="PCINT"/>
+                <signal pad-key="pb3" index="3" function="default" group="PCINT"/>
+                <signal pad-key="pb4" index="4" function="default" group="PCINT"/>
+                <signal pad-key="pb5" index="5" function="default" group="PCINT"/>
+                <signal pad-key="pc0" index="8" function="default" group="PCINT"/>
+                <signal pad-key="pc1" index="9" function="default" group="PCINT"/>
+                <signal pad-key="pc2" index="10" function="default" group="PCINT"/>
+                <signal pad-key="pc3" index="11" function="default" group="PCINT"/>
+                <signal pad-key="pc4" index="12" function="default" group="PCINT"/>
+                <signal pad-key="pc5" index="13" function="default" group="PCINT"/>
+                <signal pad-key="pc6" index="14" function="default" group="PCINT"/>
+                <signal pad-key="pd0" index="16" function="default" group="PCINT"/>
+                <signal pad-key="pd1" index="17" function="default" group="PCINT"/>
+                <signal pad-key="pd2" index="18" function="default" group="PCINT"/>
+                <signal pad-key="pd2" index="0" function="default" group="INT"/>
             </signals>
         </peripheral>
         <peripheral key="spi" name="SPI" module-key="spi">
             <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"/>
-                <signal pad-id="pb4" function="default" group="MISO"/>
-                <signal pad-id="pb5" function="default" group="SCK"/>
+                <signal pad-key="pb2" function="default" group="SS"/>
+                <signal pad-key="pb3" function="default" group="MOSI"/>
+                <signal pad-key="pb4" function="default" group="MISO"/>
+                <signal pad-key="pb5" function="default" group="SCK"/>
             </signals>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="wdt">
@@ -360,7 +360,7 @@
         <peripheral key="cpu" name="CPU" module-key="cpu">
             <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"/>
+                <signal pad-key="pb0" index="0" function="default" group="CLK"/>
             </signals>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="fuse">
@@ -770,143 +770,174 @@
             </register-group>
         </module>
     </modules>
+    <pads>
+        <pad key="pd3" name="PD3"/>
+        <pad key="pd4" name="PD4"/>
+        <pad key="gnd" name="GND"/>
+        <pad key="vcc" name="VCC"/>
+        <pad key="pb6" name="PB6"/>
+        <pad key="pb7" name="PB7"/>
+        <pad key="pd5" name="PD5"/>
+        <pad key="pd6" name="PD6"/>
+        <pad key="pd7" name="PD7"/>
+        <pad key="pb0" name="PB0"/>
+        <pad key="pb1" name="PB1"/>
+        <pad key="pb2" name="PB2"/>
+        <pad key="pb3" name="PB3"/>
+        <pad key="pb4" name="PB4"/>
+        <pad key="pb5" name="PB5"/>
+        <pad key="avcc" name="AVCC"/>
+        <pad key="adc6" name="ADC6"/>
+        <pad key="aref" name="AREF"/>
+        <pad key="adc7" name="ADC7"/>
+        <pad key="pc0" name="PC0"/>
+        <pad key="pc1" name="PC1"/>
+        <pad key="pc2" name="PC2"/>
+        <pad key="pc3" name="PC3"/>
+        <pad key="pc4" name="PC4"/>
+        <pad key="pc5" name="PC5"/>
+        <pad key="pc6" name="PC6"/>
+        <pad key="pd0" name="PD0"/>
+        <pad key="pd1" name="PD1"/>
+        <pad key="pd2" name="PD2"/>
+    </pads>
     <pinouts>
         <pinout key="tqfp32" name="TQFP32" type="qfp">
-            <pin position="1" pad="PD3"/>
-            <pin position="2" pad="PD4"/>
-            <pin position="3" pad="GND"/>
-            <pin position="4" pad="VCC"/>
-            <pin position="5" pad="GND"/>
-            <pin position="6" pad="VCC"/>
-            <pin position="7" pad="PB6"/>
-            <pin position="8" pad="PB7"/>
-            <pin position="9" pad="PD5"/>
-            <pin position="10" pad="PD6"/>
-            <pin position="11" pad="PD7"/>
-            <pin position="12" pad="PB0"/>
-            <pin position="13" pad="PB1"/>
-            <pin position="14" pad="PB2"/>
-            <pin position="15" pad="PB3"/>
-            <pin position="16" pad="PB4"/>
-            <pin position="17" pad="PB5"/>
-            <pin position="18" pad="AVCC"/>
-            <pin position="19" pad="ADC6"/>
-            <pin position="20" pad="AREF"/>
-            <pin position="21" pad="GND"/>
-            <pin position="22" pad="ADC7"/>
-            <pin position="23" pad="PC0"/>
-            <pin position="24" pad="PC1"/>
-            <pin position="25" pad="PC2"/>
-            <pin position="26" pad="PC3"/>
-            <pin position="27" pad="PC4"/>
-            <pin position="28" pad="PC5"/>
-            <pin position="29" pad="PC6"/>
-            <pin position="30" pad="PD0"/>
-            <pin position="31" pad="PD1"/>
-            <pin position="32" pad="PD2"/>
+            <pin position="1" pad-key="pd3"/>
+            <pin position="2" pad-key="pd4"/>
+            <pin position="3" pad-key="gnd"/>
+            <pin position="4" pad-key="vcc"/>
+            <pin position="5" pad-key="gnd"/>
+            <pin position="6" pad-key="vcc"/>
+            <pin position="7" pad-key="pb6"/>
+            <pin position="8" pad-key="pb7"/>
+            <pin position="9" pad-key="pd5"/>
+            <pin position="10" pad-key="pd6"/>
+            <pin position="11" pad-key="pd7"/>
+            <pin position="12" pad-key="pb0"/>
+            <pin position="13" pad-key="pb1"/>
+            <pin position="14" pad-key="pb2"/>
+            <pin position="15" pad-key="pb3"/>
+            <pin position="16" pad-key="pb4"/>
+            <pin position="17" pad-key="pb5"/>
+            <pin position="18" pad-key="avcc"/>
+            <pin position="19" pad-key="adc6"/>
+            <pin position="20" pad-key="aref"/>
+            <pin position="21" pad-key="gnd"/>
+            <pin position="22" pad-key="adc7"/>
+            <pin position="23" pad-key="pc0"/>
+            <pin position="24" pad-key="pc1"/>
+            <pin position="25" pad-key="pc2"/>
+            <pin position="26" pad-key="pc3"/>
+            <pin position="27" pad-key="pc4"/>
+            <pin position="28" pad-key="pc5"/>
+            <pin position="29" pad-key="pc6"/>
+            <pin position="30" pad-key="pd0"/>
+            <pin position="31" pad-key="pd1"/>
+            <pin position="32" pad-key="pd2"/>
         </pinout>
         <pinout key="qfn32" name="QFN32" type="qfn">
-            <pin position="1" pad="PD3"/>
-            <pin position="2" pad="PD4"/>
-            <pin position="3" pad="GND"/>
-            <pin position="4" pad="VCC"/>
-            <pin position="5" pad="GND"/>
-            <pin position="6" pad="VCC"/>
-            <pin position="7" pad="PB6"/>
-            <pin position="8" pad="PB7"/>
-            <pin position="9" pad="PD5"/>
-            <pin position="10" pad="PD6"/>
-            <pin position="11" pad="PD7"/>
-            <pin position="12" pad="PB0"/>
-            <pin position="13" pad="PB1"/>
-            <pin position="14" pad="PB2"/>
-            <pin position="15" pad="PB3"/>
-            <pin position="16" pad="PB4"/>
-            <pin position="17" pad="PB5"/>
-            <pin position="18" pad="AVCC"/>
-            <pin position="19" pad="ADC6"/>
-            <pin position="20" pad="AREF"/>
-            <pin position="21" pad="GND"/>
-            <pin position="22" pad="ADC7"/>
-            <pin position="23" pad="PC0"/>
-            <pin position="24" pad="PC1"/>
-            <pin position="25" pad="PC2"/>
-            <pin position="26" pad="PC3"/>
-            <pin position="27" pad="PC4"/>
-            <pin position="28" pad="PC5"/>
-            <pin position="29" pad="PC6"/>
-            <pin position="30" pad="PD0"/>
-            <pin position="31" pad="PD1"/>
-            <pin position="32" pad="PD2"/>
+            <pin position="1" pad-key="pd3"/>
+            <pin position="2" pad-key="pd4"/>
+            <pin position="3" pad-key="gnd"/>
+            <pin position="4" pad-key="vcc"/>
+            <pin position="5" pad-key="gnd"/>
+            <pin position="6" pad-key="vcc"/>
+            <pin position="7" pad-key="pb6"/>
+            <pin position="8" pad-key="pb7"/>
+            <pin position="9" pad-key="pd5"/>
+            <pin position="10" pad-key="pd6"/>
+            <pin position="11" pad-key="pd7"/>
+            <pin position="12" pad-key="pb0"/>
+            <pin position="13" pad-key="pb1"/>
+            <pin position="14" pad-key="pb2"/>
+            <pin position="15" pad-key="pb3"/>
+            <pin position="16" pad-key="pb4"/>
+            <pin position="17" pad-key="pb5"/>
+            <pin position="18" pad-key="avcc"/>
+            <pin position="19" pad-key="adc6"/>
+            <pin position="20" pad-key="aref"/>
+            <pin position="21" pad-key="gnd"/>
+            <pin position="22" pad-key="adc7"/>
+            <pin position="23" pad-key="pc0"/>
+            <pin position="24" pad-key="pc1"/>
+            <pin position="25" pad-key="pc2"/>
+            <pin position="26" pad-key="pc3"/>
+            <pin position="27" pad-key="pc4"/>
+            <pin position="28" pad-key="pc5"/>
+            <pin position="29" pad-key="pc6"/>
+            <pin position="30" pad-key="pd0"/>
+            <pin position="31" pad-key="pd1"/>
+            <pin position="32" pad-key="pd2"/>
         </pinout>
         <pinout key="qfn28" name="QFN28" type="qfn">
-            <pin position="1" pad="PD3"/>
-            <pin position="2" pad="PD4"/>
-            <pin position="3" pad="VCC"/>
-            <pin position="4" pad="GND"/>
-            <pin position="5" pad="PB6"/>
-            <pin position="6" pad="PB7"/>
-            <pin position="7" pad="PD5"/>
-            <pin position="8" pad="PD6"/>
-            <pin position="9" pad="PD7"/>
-            <pin position="10" pad="PB0"/>
-            <pin position="11" pad="PB1"/>
-            <pin position="12" pad="PB2"/>
-            <pin position="13" pad="PB3"/>
-            <pin position="14" pad="PB4"/>
-            <pin position="15" pad="PB5"/>
-            <pin position="16" pad="AVCC"/>
-            <pin position="17" pad="AREF"/>
-            <pin position="18" pad="GND"/>
-            <pin position="19" pad="PC0"/>
-            <pin position="20" pad="PC1"/>
-            <pin position="21" pad="PC2"/>
-            <pin position="22" pad="PC3"/>
-            <pin position="23" pad="PC4"/>
-            <pin position="24" pad="PC5"/>
-            <pin position="25" pad="PC6"/>
-            <pin position="26" pad="PD0"/>
-            <pin position="27" pad="PD1"/>
-            <pin position="28" pad="PD2"/>
+            <pin position="1" pad-key="pd3"/>
+            <pin position="2" pad-key="pd4"/>
+            <pin position="3" pad-key="vcc"/>
+            <pin position="4" pad-key="gnd"/>
+            <pin position="5" pad-key="pb6"/>
+            <pin position="6" pad-key="pb7"/>
+            <pin position="7" pad-key="pd5"/>
+            <pin position="8" pad-key="pd6"/>
+            <pin position="9" pad-key="pd7"/>
+            <pin position="10" pad-key="pb0"/>
+            <pin position="11" pad-key="pb1"/>
+            <pin position="12" pad-key="pb2"/>
+            <pin position="13" pad-key="pb3"/>
+            <pin position="14" pad-key="pb4"/>
+            <pin position="15" pad-key="pb5"/>
+            <pin position="16" pad-key="avcc"/>
+            <pin position="17" pad-key="aref"/>
+            <pin position="18" pad-key="gnd"/>
+            <pin position="19" pad-key="pc0"/>
+            <pin position="20" pad-key="pc1"/>
+            <pin position="21" pad-key="pc2"/>
+            <pin position="22" pad-key="pc3"/>
+            <pin position="23" pad-key="pc4"/>
+            <pin position="24" pad-key="pc5"/>
+            <pin position="25" pad-key="pc6"/>
+            <pin position="26" pad-key="pd0"/>
+            <pin position="27" pad-key="pd1"/>
+            <pin position="28" pad-key="pd2"/>
         </pinout>
         <pinout key="pdip28" name="PDIP28" type="dip">
-            <pin position="1" pad="PC6"/>
-            <pin position="2" pad="PD0"/>
-            <pin position="3" pad="PD1"/>
-            <pin position="4" pad="PD2"/>
-            <pin position="5" pad="PD3"/>
-            <pin position="6" pad="PD4"/>
-            <pin position="7" pad="VCC"/>
-            <pin position="8" pad="GND"/>
-            <pin position="9" pad="PB6"/>
-            <pin position="10" pad="PB7"/>
-            <pin position="11" pad="PD5"/>
-            <pin position="12" pad="PD6"/>
-            <pin position="13" pad="PD7"/>
-            <pin position="14" pad="PB0"/>
-            <pin position="15" pad="PB1"/>
-            <pin position="16" pad="PB2"/>
-            <pin position="17" pad="PB3"/>
-            <pin position="18" pad="PB4"/>
-            <pin position="19" pad="PB5"/>
-            <pin position="20" pad="AVCC"/>
-            <pin position="21" pad="AREF"/>
-            <pin position="22" pad="GND"/>
-            <pin position="23" pad="PC0"/>
-            <pin position="24" pad="PC1"/>
-            <pin position="25" pad="PC2"/>
-            <pin position="26" pad="PC3"/>
-            <pin position="27" pad="PC4"/>
-            <pin position="28" pad="PC5"/>
+            <pin position="1" pad-key="pc6"/>
+            <pin position="2" pad-key="pd0"/>
+            <pin position="3" pad-key="pd1"/>
+            <pin position="4" pad-key="pd2"/>
+            <pin position="5" pad-key="pd3"/>
+            <pin position="6" pad-key="pd4"/>
+            <pin position="7" pad-key="vcc"/>
+            <pin position="8" pad-key="gnd"/>
+            <pin position="9" pad-key="pb6"/>
+            <pin position="10" pad-key="pb7"/>
+            <pin position="11" pad-key="pd5"/>
+            <pin position="12" pad-key="pd6"/>
+            <pin position="13" pad-key="pd7"/>
+            <pin position="14" pad-key="pb0"/>
+            <pin position="15" pad-key="pb1"/>
+            <pin position="16" pad-key="pb2"/>
+            <pin position="17" pad-key="pb3"/>
+            <pin position="18" pad-key="pb4"/>
+            <pin position="19" pad-key="pb5"/>
+            <pin position="20" pad-key="avcc"/>
+            <pin position="21" pad-key="aref"/>
+            <pin position="22" pad-key="gnd"/>
+            <pin position="23" pad-key="pc0"/>
+            <pin position="24" pad-key="pc1"/>
+            <pin position="25" pad-key="pc2"/>
+            <pin position="26" pad-key="pc3"/>
+            <pin position="27" pad-key="pc4"/>
+            <pin position="28" pad-key="pc5"/>
         </pinout>
     </pinouts>
     <variants>
-        <variant name="ATmega328P-AU" pinout-key="tqfp32" package="TQFP32"/>
-        <variant name="ATmega328P-MMH" pinout-key="qfn28" package="QFN28"/>
-        <variant name="ATmega328P-MU" pinout-key="qfn32" package="QFN32"/>
-        <variant name="ATmega328P-PU" pinout-key="pdip28" package="PDIP28"/>
-        <variant name="ATmega328P-AN" pinout-key="tqfp32" package="TQFP32"/>
-        <variant name="ATmega328P-MN" pinout-key="qfn32" package="QFN32"/>
-        <variant name="ATmega328P-PN" pinout-key="pdip28" package="PDIP28"/>
+        <variant key="atmega328p_au" name="ATmega328P-AU" pinout-key="tqfp32"/>
+        <variant key="atmega328p_mmh" name="ATmega328P-MMH" pinout-key="qfn28"/>
+        <variant key="atmega328p_mu" name="ATmega328P-MU" pinout-key="qfn32"/>
+        <variant key="atmega328p_pu" name="ATmega328P-PU" pinout-key="pdip28"/>
+        <variant key="atmega328p_an" name="ATmega328P-AN" pinout-key="tqfp32"/>
+        <variant key="atmega328p_mn" name="ATmega328P-MN" pinout-key="qfn32"/>
+        <variant key="atmega328p_pn" name="ATmega328P-PN" pinout-key="pdip28"/>
     </variants>
 </device>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA328PB.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA328PB.xml
index 31a6db92..e41d08ff 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA328PB.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA328PB.xml
@@ -217,192 +217,192 @@
         <peripheral key="usart0" name="USART0" module-key="usart">
             <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"/>
-                <signal pad-id="pd4" function="default" group="XCK"/>
+                <signal pad-key="pd1" function="default" group="TXD"/>
+                <signal pad-key="pd0" function="default" group="RXD"/>
+                <signal pad-key="pd4" function="default" group="XCK"/>
             </signals>
         </peripheral>
         <peripheral key="usart1" name="USART1" module-key="usart">
             <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"/>
-                <signal pad-id="pb5" function="default" group="XCK"/>
+                <signal pad-key="pb3" function="default" group="TXD"/>
+                <signal pad-key="pb4" function="default" group="RXD"/>
+                <signal pad-key="pb5" function="default" group="XCK"/>
             </signals>
         </peripheral>
         <peripheral key="twi0" name="TWI0" module-key="twi">
             <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"/>
+                <signal pad-key="pc4" function="default" group="SDA"/>
+                <signal pad-key="pc5" function="default" group="SCL"/>
             </signals>
         </peripheral>
         <peripheral key="twi1" name="TWI1" module-key="twi">
             <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"/>
+                <signal pad-key="pe0" function="default" group="SDA"/>
+                <signal pad-key="pe1" function="default" group="SCL"/>
             </signals>
         </peripheral>
         <peripheral key="tc1" name="TC1" module-key="tc16">
             <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"/>
-                <signal pad-id="pb1" function="default" group="OCA"/>
-                <signal pad-id="pb2" function="default" group="OCB"/>
+                <signal pad-key="pd5" function="default" group="T"/>
+                <signal pad-key="pb0" function="default" group="ICP"/>
+                <signal pad-key="pb1" function="default" group="OCA"/>
+                <signal pad-key="pb2" function="default" group="OCB"/>
             </signals>
         </peripheral>
         <peripheral key="tc3" name="TC3" module-key="tc16">
             <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"/>
-                <signal pad-id="pd0" function="default" group="OCA"/>
-                <signal pad-id="pd2" function="default" group="OCB"/>
+                <signal pad-key="pe3" function="default" group="T"/>
+                <signal pad-key="pe2" function="default" group="ICP"/>
+                <signal pad-key="pd0" function="default" group="OCA"/>
+                <signal pad-key="pd2" function="default" group="OCB"/>
             </signals>
         </peripheral>
         <peripheral key="tc4" name="TC4" module-key="tc16">
             <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"/>
-                <signal pad-id="pd1" function="default" group="OCA"/>
-                <signal pad-id="pd2" function="default" group="OCB"/>
+                <signal pad-key="pe1" function="default" group="T"/>
+                <signal pad-key="pe0" function="default" group="ICP"/>
+                <signal pad-key="pd1" function="default" group="OCA"/>
+                <signal pad-key="pd2" function="default" group="OCB"/>
             </signals>
         </peripheral>
         <peripheral key="tc2" name="TC2" module-key="tc8_async">
             <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"/>
+                <signal pad-key="pb3" function="default" group="OCA"/>
+                <signal pad-key="pd3" function="default" group="OCB"/>
             </signals>
         </peripheral>
         <peripheral key="adc" name="ADC" module-key="adc">
             <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"/>
-                <signal pad-id="pc2" index="2" function="default" group="ADC"/>
-                <signal pad-id="pc3" index="3" function="default" group="ADC"/>
-                <signal pad-id="pc4" index="4" function="default" group="ADC"/>
-                <signal pad-id="pc5" index="5" function="default" group="ADC"/>
-                <signal pad-id="pe2" index="6" function="default" group="ADC"/>
-                <signal pad-id="pe3" index="7" function="default" group="ADC"/>
+                <signal pad-key="pc0" index="0" function="default" group="ADC"/>
+                <signal pad-key="pc1" index="1" function="default" group="ADC"/>
+                <signal pad-key="pc2" index="2" function="default" group="ADC"/>
+                <signal pad-key="pc3" index="3" function="default" group="ADC"/>
+                <signal pad-key="pc4" index="4" function="default" group="ADC"/>
+                <signal pad-key="pc5" index="5" function="default" group="ADC"/>
+                <signal pad-key="pe2" index="6" function="default" group="ADC"/>
+                <signal pad-key="pe3" index="7" function="default" group="ADC"/>
             </signals>
         </peripheral>
         <peripheral key="ac" name="AC" module-key="ac">
             <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"/>
-                <signal pad-id="pd7" index="1" function="default" group="AIN"/>
+                <signal pad-key="pe0" function="default" group="AC"/>
+                <signal pad-key="pd6" index="0" function="default" group="AIN"/>
+                <signal pad-key="pd7" index="1" function="default" group="AIN"/>
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pb2" index="2" function="default" group="P"/>
-                <signal pad-id="pb3" index="3" function="default" group="P"/>
-                <signal pad-id="pb4" index="4" function="default" group="P"/>
-                <signal pad-id="pb5" index="5" function="default" group="P"/>
-                <signal pad-id="pb6" index="6" function="default" group="P"/>
-                <signal pad-id="pb7" index="7" function="default" group="P"/>
+                <signal pad-key="pb0" index="0" function="default" group="P"/>
+                <signal pad-key="pb1" index="1" function="default" group="P"/>
+                <signal pad-key="pb2" index="2" function="default" group="P"/>
+                <signal pad-key="pb3" index="3" function="default" group="P"/>
+                <signal pad-key="pb4" index="4" function="default" group="P"/>
+                <signal pad-key="pb5" index="5" function="default" group="P"/>
+                <signal pad-key="pb6" index="6" function="default" group="P"/>
+                <signal pad-key="pb7" index="7" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pc2" index="2" function="default" group="P"/>
-                <signal pad-id="pc3" index="3" function="default" group="P"/>
-                <signal pad-id="pc4" index="4" function="default" group="P"/>
-                <signal pad-id="pc5" index="5" function="default" group="P"/>
-                <signal pad-id="pc6" index="6" function="default" group="P"/>
+                <signal pad-key="pc0" index="0" function="default" group="P"/>
+                <signal pad-key="pc1" index="1" function="default" group="P"/>
+                <signal pad-key="pc2" index="2" function="default" group="P"/>
+                <signal pad-key="pc3" index="3" function="default" group="P"/>
+                <signal pad-key="pc4" index="4" function="default" group="P"/>
+                <signal pad-key="pc5" index="5" function="default" group="P"/>
+                <signal pad-key="pc6" index="6" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pd2" index="2" function="default" group="P"/>
-                <signal pad-id="pd3" index="3" function="default" group="P"/>
-                <signal pad-id="pd4" index="4" function="default" group="P"/>
-                <signal pad-id="pd5" index="5" function="default" group="P"/>
-                <signal pad-id="pd6" index="6" function="default" group="P"/>
-                <signal pad-id="pd7" index="7" function="default" group="P"/>
+                <signal pad-key="pd0" index="0" function="default" group="P"/>
+                <signal pad-key="pd1" index="1" function="default" group="P"/>
+                <signal pad-key="pd2" index="2" function="default" group="P"/>
+                <signal pad-key="pd3" index="3" function="default" group="P"/>
+                <signal pad-key="pd4" index="4" function="default" group="P"/>
+                <signal pad-key="pd5" index="5" function="default" group="P"/>
+                <signal pad-key="pd6" index="6" function="default" group="P"/>
+                <signal pad-key="pd7" index="7" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="porte" name="PORTE" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pe2" index="2" function="default" group="P"/>
-                <signal pad-id="pe3" index="3" function="default" group="P"/>
+                <signal pad-key="pe0" index="0" function="default" group="P"/>
+                <signal pad-key="pe1" index="1" function="default" group="P"/>
+                <signal pad-key="pe2" index="2" function="default" group="P"/>
+                <signal pad-key="pe3" index="3" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="tc0" name="TC0" module-key="tc8">
             <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"/>
-                <signal pad-id="pd6" function="default" group="OCA"/>
+                <signal pad-key="pd4" function="default" group="T"/>
+                <signal pad-key="pd5" function="default" group="OCB"/>
+                <signal pad-key="pd6" function="default" group="OCA"/>
             </signals>
         </peripheral>
         <peripheral key="exint" name="EXINT" module-key="exint">
             <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"/>
-                <signal pad-id="pd4" index="20" function="default" group="PCINT"/>
-                <signal pad-id="pe0" index="24" function="default" group="PCINT"/>
-                <signal pad-id="pe1" index="25" function="default" group="PCINT"/>
-                <signal pad-id="pb6" index="6" function="default" group="PCINT"/>
-                <signal pad-id="pb7" index="7" function="default" group="PCINT"/>
-                <signal pad-id="pd5" index="21" function="default" group="PCINT"/>
-                <signal pad-id="pd6" index="22" function="default" group="PCINT"/>
-                <signal pad-id="pd7" index="23" function="default" group="PCINT"/>
-                <signal pad-id="pb0" index="0" function="default" group="PCINT"/>
-                <signal pad-id="pb1" index="1" function="default" group="PCINT"/>
-                <signal pad-id="pb2" index="2" function="default" group="PCINT"/>
-                <signal pad-id="pb3" index="3" function="default" group="PCINT"/>
-                <signal pad-id="pb4" index="4" function="default" group="PCINT"/>
-                <signal pad-id="pb5" index="5" function="default" group="PCINT"/>
-                <signal pad-id="pe2" index="27" function="default" group="PCINT"/>
-                <signal pad-id="pc0" index="8" function="default" group="PCINT"/>
-                <signal pad-id="pc1" index="9" function="default" group="PCINT"/>
-                <signal pad-id="pc2" index="10" function="default" group="PCINT"/>
-                <signal pad-id="pc3" index="11" function="default" group="PCINT"/>
-                <signal pad-id="pc4" index="12" function="default" group="PCINT"/>
-                <signal pad-id="pc5" index="13" function="default" group="PCINT"/>
-                <signal pad-id="pc6" index="14" function="default" group="PCINT"/>
-                <signal pad-id="pd0" index="16" function="default" group="PCINT"/>
-                <signal pad-id="pd1" index="17" function="default" group="PCINT"/>
-                <signal pad-id="pd2" index="18" function="default" group="PCINT"/>
-                <signal pad-id="pd2" index="0" function="default" group="INT"/>
+                <signal pad-key="pd3" index="1" function="default" group="INT"/>
+                <signal pad-key="pd3" index="19" function="default" group="PCINT"/>
+                <signal pad-key="pd4" index="20" function="default" group="PCINT"/>
+                <signal pad-key="pe0" index="24" function="default" group="PCINT"/>
+                <signal pad-key="pe1" index="25" function="default" group="PCINT"/>
+                <signal pad-key="pb6" index="6" function="default" group="PCINT"/>
+                <signal pad-key="pb7" index="7" function="default" group="PCINT"/>
+                <signal pad-key="pd5" index="21" function="default" group="PCINT"/>
+                <signal pad-key="pd6" index="22" function="default" group="PCINT"/>
+                <signal pad-key="pd7" index="23" function="default" group="PCINT"/>
+                <signal pad-key="pb0" index="0" function="default" group="PCINT"/>
+                <signal pad-key="pb1" index="1" function="default" group="PCINT"/>
+                <signal pad-key="pb2" index="2" function="default" group="PCINT"/>
+                <signal pad-key="pb3" index="3" function="default" group="PCINT"/>
+                <signal pad-key="pb4" index="4" function="default" group="PCINT"/>
+                <signal pad-key="pb5" index="5" function="default" group="PCINT"/>
+                <signal pad-key="pe2" index="27" function="default" group="PCINT"/>
+                <signal pad-key="pc0" index="8" function="default" group="PCINT"/>
+                <signal pad-key="pc1" index="9" function="default" group="PCINT"/>
+                <signal pad-key="pc2" index="10" function="default" group="PCINT"/>
+                <signal pad-key="pc3" index="11" function="default" group="PCINT"/>
+                <signal pad-key="pc4" index="12" function="default" group="PCINT"/>
+                <signal pad-key="pc5" index="13" function="default" group="PCINT"/>
+                <signal pad-key="pc6" index="14" function="default" group="PCINT"/>
+                <signal pad-key="pd0" index="16" function="default" group="PCINT"/>
+                <signal pad-key="pd1" index="17" function="default" group="PCINT"/>
+                <signal pad-key="pd2" index="18" function="default" group="PCINT"/>
+                <signal pad-key="pd2" index="0" function="default" group="INT"/>
             </signals>
         </peripheral>
         <peripheral key="spi0" name="SPI0" module-key="spi">
             <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"/>
-                <signal pad-id="pb4" function="default" group="MISO"/>
-                <signal pad-id="pb5" function="default" group="SCK"/>
+                <signal pad-key="pb2" function="default" group="SS"/>
+                <signal pad-key="pb3" function="default" group="MOSI"/>
+                <signal pad-key="pb4" function="default" group="MISO"/>
+                <signal pad-key="pb5" function="default" group="SCK"/>
             </signals>
         </peripheral>
         <peripheral key="spi1" name="SPI1" module-key="spi">
             <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"/>
-                <signal pad-id="pc0" function="default" group="MISO"/>
-                <signal pad-id="pe3" function="default" group="MOSI"/>
+                <signal pad-key="pe2" function="default" group="SS"/>
+                <signal pad-key="pc1" function="default" group="SCK"/>
+                <signal pad-key="pc0" function="default" group="MISO"/>
+                <signal pad-key="pe3" function="default" group="MOSI"/>
             </signals>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="wdt">
@@ -410,52 +410,52 @@
         </peripheral>
         <peripheral key="ptc" name="PTC" module-key="ptc">
             <signals>
-                <signal pad-id="pd0" index="0" function="default" group="X"/>
-                <signal pad-id="pd1" index="1" function="default" group="X"/>
-                <signal pad-id="pd2" index="2" function="default" group="X"/>
-                <signal pad-id="pd3" index="3" function="default" group="X"/>
-                <signal pad-id="pd4" index="4" function="default" group="X"/>
-                <signal pad-id="pd5" index="5" function="default" group="X"/>
-                <signal pad-id="pd6" index="6" function="default" group="X"/>
-                <signal pad-id="pd7" index="7" function="default" group="X"/>
-                <signal pad-id="pe0" index="8" function="default" group="X"/>
-                <signal pad-id="pe1" index="9" function="default" group="X"/>
-                <signal pad-id="pb0" index="10" function="default" group="X"/>
-                <signal pad-id="pb1" index="11" function="default" group="X"/>
-                <signal pad-id="pb2" index="12" function="default" group="X"/>
-                <signal pad-id="pb3" index="13" function="default" group="X"/>
-                <signal pad-id="pb4" index="14" function="default" group="X"/>
-                <signal pad-id="pb5" index="15" function="default" group="X"/>
-                <signal pad-id="pc0" index="0" function="default" group="Y"/>
-                <signal pad-id="pc1" index="1" function="default" group="Y"/>
-                <signal pad-id="pc2" index="2" function="default" group="Y"/>
-                <signal pad-id="pc3" index="3" function="default" group="Y"/>
-                <signal pad-id="pc4" index="4" function="default" group="Y"/>
-                <signal pad-id="pc5" index="5" function="default" group="Y"/>
-                <signal pad-id="pe2" index="6" function="default" group="Y"/>
-                <signal pad-id="pe3" index="7" function="default" group="Y"/>
-                <signal pad-id="pd0" index="8" function="default" group="Y"/>
-                <signal pad-id="pd1" index="9" function="default" group="Y"/>
-                <signal pad-id="pd2" index="10" function="default" group="Y"/>
-                <signal pad-id="pd3" index="11" function="default" group="Y"/>
-                <signal pad-id="pd4" index="12" function="default" group="Y"/>
-                <signal pad-id="pd5" index="13" function="default" group="Y"/>
-                <signal pad-id="pd6" index="14" function="default" group="Y"/>
-                <signal pad-id="pd7" index="15" function="default" group="Y"/>
-                <signal pad-id="pe0" index="16" function="default" group="Y"/>
-                <signal pad-id="pe1" index="17" function="default" group="Y"/>
-                <signal pad-id="pb0" index="18" function="default" group="Y"/>
-                <signal pad-id="pb1" index="19" function="default" group="Y"/>
-                <signal pad-id="pb2" index="20" function="default" group="Y"/>
-                <signal pad-id="pb3" index="21" function="default" group="Y"/>
-                <signal pad-id="pb4" index="22" function="default" group="Y"/>
-                <signal pad-id="pb5" index="23" function="default" group="Y"/>
+                <signal pad-key="pd0" index="0" function="default" group="X"/>
+                <signal pad-key="pd1" index="1" function="default" group="X"/>
+                <signal pad-key="pd2" index="2" function="default" group="X"/>
+                <signal pad-key="pd3" index="3" function="default" group="X"/>
+                <signal pad-key="pd4" index="4" function="default" group="X"/>
+                <signal pad-key="pd5" index="5" function="default" group="X"/>
+                <signal pad-key="pd6" index="6" function="default" group="X"/>
+                <signal pad-key="pd7" index="7" function="default" group="X"/>
+                <signal pad-key="pe0" index="8" function="default" group="X"/>
+                <signal pad-key="pe1" index="9" function="default" group="X"/>
+                <signal pad-key="pb0" index="10" function="default" group="X"/>
+                <signal pad-key="pb1" index="11" function="default" group="X"/>
+                <signal pad-key="pb2" index="12" function="default" group="X"/>
+                <signal pad-key="pb3" index="13" function="default" group="X"/>
+                <signal pad-key="pb4" index="14" function="default" group="X"/>
+                <signal pad-key="pb5" index="15" function="default" group="X"/>
+                <signal pad-key="pc0" index="0" function="default" group="Y"/>
+                <signal pad-key="pc1" index="1" function="default" group="Y"/>
+                <signal pad-key="pc2" index="2" function="default" group="Y"/>
+                <signal pad-key="pc3" index="3" function="default" group="Y"/>
+                <signal pad-key="pc4" index="4" function="default" group="Y"/>
+                <signal pad-key="pc5" index="5" function="default" group="Y"/>
+                <signal pad-key="pe2" index="6" function="default" group="Y"/>
+                <signal pad-key="pe3" index="7" function="default" group="Y"/>
+                <signal pad-key="pd0" index="8" function="default" group="Y"/>
+                <signal pad-key="pd1" index="9" function="default" group="Y"/>
+                <signal pad-key="pd2" index="10" function="default" group="Y"/>
+                <signal pad-key="pd3" index="11" function="default" group="Y"/>
+                <signal pad-key="pd4" index="12" function="default" group="Y"/>
+                <signal pad-key="pd5" index="13" function="default" group="Y"/>
+                <signal pad-key="pd6" index="14" function="default" group="Y"/>
+                <signal pad-key="pd7" index="15" function="default" group="Y"/>
+                <signal pad-key="pe0" index="16" function="default" group="Y"/>
+                <signal pad-key="pe1" index="17" function="default" group="Y"/>
+                <signal pad-key="pb0" index="18" function="default" group="Y"/>
+                <signal pad-key="pb1" index="19" function="default" group="Y"/>
+                <signal pad-key="pb2" index="20" function="default" group="Y"/>
+                <signal pad-key="pb3" index="21" function="default" group="Y"/>
+                <signal pad-key="pb4" index="22" function="default" group="Y"/>
+                <signal pad-key="pb5" index="23" function="default" group="Y"/>
             </signals>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="cpu">
             <register-group-instance register-group-key="cpu" address-space-key="data" offset="0x0"/>
             <signals>
-                <signal pad-id="pb0" index="0" function="default" group="CLK"/>
+                <signal pad-key="pb0" index="0" function="default" group="CLK"/>
             </signals>
         </peripheral>
         <peripheral key="eeprom" name="EEPROM" module-key="eeprom">
@@ -1046,80 +1046,113 @@
             </register-group>
         </module>
     </modules>
+    <pads>
+        <pad key="pd3" name="PD3"/>
+        <pad key="pd4" name="PD4"/>
+        <pad key="pe0" name="PE0"/>
+        <pad key="vcc" name="VCC"/>
+        <pad key="gnd" name="GND"/>
+        <pad key="pe1" name="PE1"/>
+        <pad key="pb6" name="PB6"/>
+        <pad key="pb7" name="PB7"/>
+        <pad key="pd5" name="PD5"/>
+        <pad key="pd6" name="PD6"/>
+        <pad key="pd7" name="PD7"/>
+        <pad key="pb0" name="PB0"/>
+        <pad key="pb1" name="PB1"/>
+        <pad key="pb2" name="PB2"/>
+        <pad key="pb3" name="PB3"/>
+        <pad key="pb4" name="PB4"/>
+        <pad key="pb5" name="PB5"/>
+        <pad key="avcc" name="AVCC"/>
+        <pad key="pe2" name="PE2"/>
+        <pad key="aref" name="AREF"/>
+        <pad key="pe3" name="PE3"/>
+        <pad key="pc0" name="PC0"/>
+        <pad key="pc1" name="PC1"/>
+        <pad key="pc2" name="PC2"/>
+        <pad key="pc3" name="PC3"/>
+        <pad key="pc4" name="PC4"/>
+        <pad key="pc5" name="PC5"/>
+        <pad key="pc6" name="PC6"/>
+        <pad key="pd0" name="PD0"/>
+        <pad key="pd1" name="PD1"/>
+        <pad key="pd2" name="PD2"/>
+    </pads>
     <pinouts>
         <pinout key="tqfp32" name="TQFP32" type="qfp">
-            <pin position="1" pad="PD3"/>
-            <pin position="2" pad="PD4"/>
-            <pin position="3" pad="PE0"/>
-            <pin position="4" pad="VCC"/>
-            <pin position="5" pad="GND"/>
-            <pin position="6" pad="PE1"/>
-            <pin position="7" pad="PB6"/>
-            <pin position="8" pad="PB7"/>
-            <pin position="9" pad="PD5"/>
-            <pin position="10" pad="PD6"/>
-            <pin position="11" pad="PD7"/>
-            <pin position="12" pad="PB0"/>
-            <pin position="13" pad="PB1"/>
-            <pin position="14" pad="PB2"/>
-            <pin position="15" pad="PB3"/>
-            <pin position="16" pad="PB4"/>
-            <pin position="17" pad="PB5"/>
-            <pin position="18" pad="AVCC"/>
-            <pin position="19" pad="PE2"/>
-            <pin position="20" pad="AREF"/>
-            <pin position="21" pad="GND"/>
-            <pin position="22" pad="PE3"/>
-            <pin position="23" pad="PC0"/>
-            <pin position="24" pad="PC1"/>
-            <pin position="25" pad="PC2"/>
-            <pin position="26" pad="PC3"/>
-            <pin position="27" pad="PC4"/>
-            <pin position="28" pad="PC5"/>
-            <pin position="29" pad="PC6"/>
-            <pin position="30" pad="PD0"/>
-            <pin position="31" pad="PD1"/>
-            <pin position="32" pad="PD2"/>
+            <pin position="1" pad-key="pd3"/>
+            <pin position="2" pad-key="pd4"/>
+            <pin position="3" pad-key="pe0"/>
+            <pin position="4" pad-key="vcc"/>
+            <pin position="5" pad-key="gnd"/>
+            <pin position="6" pad-key="pe1"/>
+            <pin position="7" pad-key="pb6"/>
+            <pin position="8" pad-key="pb7"/>
+            <pin position="9" pad-key="pd5"/>
+            <pin position="10" pad-key="pd6"/>
+            <pin position="11" pad-key="pd7"/>
+            <pin position="12" pad-key="pb0"/>
+            <pin position="13" pad-key="pb1"/>
+            <pin position="14" pad-key="pb2"/>
+            <pin position="15" pad-key="pb3"/>
+            <pin position="16" pad-key="pb4"/>
+            <pin position="17" pad-key="pb5"/>
+            <pin position="18" pad-key="avcc"/>
+            <pin position="19" pad-key="pe2"/>
+            <pin position="20" pad-key="aref"/>
+            <pin position="21" pad-key="gnd"/>
+            <pin position="22" pad-key="pe3"/>
+            <pin position="23" pad-key="pc0"/>
+            <pin position="24" pad-key="pc1"/>
+            <pin position="25" pad-key="pc2"/>
+            <pin position="26" pad-key="pc3"/>
+            <pin position="27" pad-key="pc4"/>
+            <pin position="28" pad-key="pc5"/>
+            <pin position="29" pad-key="pc6"/>
+            <pin position="30" pad-key="pd0"/>
+            <pin position="31" pad-key="pd1"/>
+            <pin position="32" pad-key="pd2"/>
         </pinout>
         <pinout key="vqfn32" name="VQFN32" type="qfn">
-            <pin position="1" pad="PD3"/>
-            <pin position="2" pad="PD4"/>
-            <pin position="3" pad="PE0"/>
-            <pin position="4" pad="VCC"/>
-            <pin position="5" pad="GND"/>
-            <pin position="6" pad="PE1"/>
-            <pin position="7" pad="PB6"/>
-            <pin position="8" pad="PB7"/>
-            <pin position="9" pad="PD5"/>
-            <pin position="10" pad="PD6"/>
-            <pin position="11" pad="PD7"/>
-            <pin position="12" pad="PB0"/>
-            <pin position="13" pad="PB1"/>
-            <pin position="14" pad="PB2"/>
-            <pin position="15" pad="PB3"/>
-            <pin position="16" pad="PB4"/>
-            <pin position="17" pad="PB5"/>
-            <pin position="18" pad="AVCC"/>
-            <pin position="19" pad="PE2"/>
-            <pin position="20" pad="AREF"/>
-            <pin position="21" pad="GND"/>
-            <pin position="22" pad="PE3"/>
-            <pin position="23" pad="PC0"/>
-            <pin position="24" pad="PC1"/>
-            <pin position="25" pad="PC2"/>
-            <pin position="26" pad="PC3"/>
-            <pin position="27" pad="PC4"/>
-            <pin position="28" pad="PC5"/>
-            <pin position="29" pad="PC6"/>
-            <pin position="30" pad="PD0"/>
-            <pin position="31" pad="PD1"/>
-            <pin position="32" pad="PD2"/>
+            <pin position="1" pad-key="pd3"/>
+            <pin position="2" pad-key="pd4"/>
+            <pin position="3" pad-key="pe0"/>
+            <pin position="4" pad-key="vcc"/>
+            <pin position="5" pad-key="gnd"/>
+            <pin position="6" pad-key="pe1"/>
+            <pin position="7" pad-key="pb6"/>
+            <pin position="8" pad-key="pb7"/>
+            <pin position="9" pad-key="pd5"/>
+            <pin position="10" pad-key="pd6"/>
+            <pin position="11" pad-key="pd7"/>
+            <pin position="12" pad-key="pb0"/>
+            <pin position="13" pad-key="pb1"/>
+            <pin position="14" pad-key="pb2"/>
+            <pin position="15" pad-key="pb3"/>
+            <pin position="16" pad-key="pb4"/>
+            <pin position="17" pad-key="pb5"/>
+            <pin position="18" pad-key="avcc"/>
+            <pin position="19" pad-key="pe2"/>
+            <pin position="20" pad-key="aref"/>
+            <pin position="21" pad-key="gnd"/>
+            <pin position="22" pad-key="pe3"/>
+            <pin position="23" pad-key="pc0"/>
+            <pin position="24" pad-key="pc1"/>
+            <pin position="25" pad-key="pc2"/>
+            <pin position="26" pad-key="pc3"/>
+            <pin position="27" pad-key="pc4"/>
+            <pin position="28" pad-key="pc5"/>
+            <pin position="29" pad-key="pc6"/>
+            <pin position="30" pad-key="pd0"/>
+            <pin position="31" pad-key="pd1"/>
+            <pin position="32" pad-key="pd2"/>
         </pinout>
     </pinouts>
     <variants>
-        <variant name="ATmega328PB-AU" pinout-key="tqfp32" package="TQFP32"/>
-        <variant name="ATmega328PB-MU" pinout-key="vqfn32" package="VQFN32"/>
-        <variant name="ATmega328PB-AN" pinout-key="tqfp32" package="TQFP32"/>
-        <variant name="ATmega328PB-MN" pinout-key="vqfn32" package="VQFN32"/>
+        <variant key="atmega328pb_au" name="ATmega328PB-AU" pinout-key="tqfp32"/>
+        <variant key="atmega328pb_mu" name="ATmega328PB-MU" pinout-key="vqfn32"/>
+        <variant key="atmega328pb_an" name="ATmega328PB-AN" pinout-key="tqfp32"/>
+        <variant key="atmega328pb_mn" name="ATmega328PB-MN" pinout-key="vqfn32"/>
     </variants>
 </device>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA329.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA329.xml
index 3e14bd82..d6c83ccb 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA329.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA329.xml
@@ -194,25 +194,25 @@
         <peripheral key="tc0" name="TC0" module-key="tc8">
             <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"/>
+                <signal pad-key="pg4" function="default" group="T"/>
+                <signal pad-key="pb4" function="default" group="OCA"/>
             </signals>
         </peripheral>
         <peripheral key="tc1" name="TC1" module-key="tc16">
             <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"/>
-                <signal pad-id="pb5" function="default" group="OCA"/>
-                <signal pad-id="pb6" function="default" group="OCB"/>
-                <signal pad-id="xtal1" function="default" group="TOSC"/>
+                <signal pad-key="pg3" function="default" group="T"/>
+                <signal pad-key="pd0" function="default" group="ICP"/>
+                <signal pad-key="pb5" function="default" group="OCA"/>
+                <signal pad-key="pb6" function="default" group="OCB"/>
+                <signal pad-key="xtal1" function="default" group="TOSC"/>
             </signals>
         </peripheral>
         <peripheral key="tc2" name="TC2" module-key="tc8_async">
             <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"/>
+                <signal pad-key="pb7" function="default" group="OCA"/>
+                <signal pad-key="xtal2" function="default" group="TOSC"/>
             </signals>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="wdt">
@@ -224,197 +224,197 @@
         <peripheral key="spi" name="SPI" module-key="spi">
             <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"/>
-                <signal pad-id="pb2" function="default" group="MOSI"/>
-                <signal pad-id="pb3" function="default" group="MISO"/>
+                <signal pad-key="pb0" function="default" group="SS"/>
+                <signal pad-key="pb1" function="default" group="SCK"/>
+                <signal pad-key="pb2" function="default" group="MOSI"/>
+                <signal pad-key="pb3" function="default" group="MISO"/>
             </signals>
         </peripheral>
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pa2" index="2" function="default" group="P"/>
-                <signal pad-id="pa3" index="3" function="default" group="P"/>
-                <signal pad-id="pa4" index="4" function="default" group="P"/>
-                <signal pad-id="pa5" index="5" function="default" group="P"/>
-                <signal pad-id="pa6" index="6" function="default" group="P"/>
-                <signal pad-id="pa7" index="7" function="default" group="P"/>
+                <signal pad-key="pa0" index="0" function="default" group="P"/>
+                <signal pad-key="pa1" index="1" function="default" group="P"/>
+                <signal pad-key="pa2" index="2" function="default" group="P"/>
+                <signal pad-key="pa3" index="3" function="default" group="P"/>
+                <signal pad-key="pa4" index="4" function="default" group="P"/>
+                <signal pad-key="pa5" index="5" function="default" group="P"/>
+                <signal pad-key="pa6" index="6" function="default" group="P"/>
+                <signal pad-key="pa7" index="7" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pb2" index="2" function="default" group="P"/>
-                <signal pad-id="pb3" index="3" function="default" group="P"/>
-                <signal pad-id="pb4" index="4" function="default" group="P"/>
-                <signal pad-id="pb5" index="5" function="default" group="P"/>
-                <signal pad-id="pb6" index="6" function="default" group="P"/>
-                <signal pad-id="pb7" index="7" function="default" group="P"/>
+                <signal pad-key="pb0" index="0" function="default" group="P"/>
+                <signal pad-key="pb1" index="1" function="default" group="P"/>
+                <signal pad-key="pb2" index="2" function="default" group="P"/>
+                <signal pad-key="pb3" index="3" function="default" group="P"/>
+                <signal pad-key="pb4" index="4" function="default" group="P"/>
+                <signal pad-key="pb5" index="5" function="default" group="P"/>
+                <signal pad-key="pb6" index="6" function="default" group="P"/>
+                <signal pad-key="pb7" index="7" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pc2" index="2" function="default" group="P"/>
-                <signal pad-id="pc3" index="3" function="default" group="P"/>
-                <signal pad-id="pc4" index="4" function="default" group="P"/>
-                <signal pad-id="pc5" index="5" function="default" group="P"/>
-                <signal pad-id="pc6" index="6" function="default" group="P"/>
-                <signal pad-id="pc7" index="7" function="default" group="P"/>
+                <signal pad-key="pc0" index="0" function="default" group="P"/>
+                <signal pad-key="pc1" index="1" function="default" group="P"/>
+                <signal pad-key="pc2" index="2" function="default" group="P"/>
+                <signal pad-key="pc3" index="3" function="default" group="P"/>
+                <signal pad-key="pc4" index="4" function="default" group="P"/>
+                <signal pad-key="pc5" index="5" function="default" group="P"/>
+                <signal pad-key="pc6" index="6" function="default" group="P"/>
+                <signal pad-key="pc7" index="7" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pd2" index="2" function="default" group="P"/>
-                <signal pad-id="pd3" index="3" function="default" group="P"/>
-                <signal pad-id="pd4" index="4" function="default" group="P"/>
-                <signal pad-id="pd5" index="5" function="default" group="P"/>
-                <signal pad-id="pd6" index="6" function="default" group="P"/>
-                <signal pad-id="pd7" index="7" function="default" group="P"/>
+                <signal pad-key="pd0" index="0" function="default" group="P"/>
+                <signal pad-key="pd1" index="1" function="default" group="P"/>
+                <signal pad-key="pd2" index="2" function="default" group="P"/>
+                <signal pad-key="pd3" index="3" function="default" group="P"/>
+                <signal pad-key="pd4" index="4" function="default" group="P"/>
+                <signal pad-key="pd5" index="5" function="default" group="P"/>
+                <signal pad-key="pd6" index="6" function="default" group="P"/>
+                <signal pad-key="pd7" index="7" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="porte" name="PORTE" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pe2" index="2" function="default" group="P"/>
-                <signal pad-id="pe3" index="3" function="default" group="P"/>
-                <signal pad-id="pe4" index="4" function="default" group="P"/>
-                <signal pad-id="pe5" index="5" function="default" group="P"/>
-                <signal pad-id="pe6" index="6" function="default" group="P"/>
-                <signal pad-id="pe7" index="7" function="default" group="P"/>
+                <signal pad-key="pe0" index="0" function="default" group="P"/>
+                <signal pad-key="pe1" index="1" function="default" group="P"/>
+                <signal pad-key="pe2" index="2" function="default" group="P"/>
+                <signal pad-key="pe3" index="3" function="default" group="P"/>
+                <signal pad-key="pe4" index="4" function="default" group="P"/>
+                <signal pad-key="pe5" index="5" function="default" group="P"/>
+                <signal pad-key="pe6" index="6" function="default" group="P"/>
+                <signal pad-key="pe7" index="7" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portf" name="PORTF" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pf2" index="2" function="default" group="P"/>
-                <signal pad-id="pf3" index="3" function="default" group="P"/>
-                <signal pad-id="pf4" index="4" function="default" group="P"/>
-                <signal pad-id="pf5" index="5" function="default" group="P"/>
-                <signal pad-id="pf6" index="6" function="default" group="P"/>
-                <signal pad-id="pf7" index="7" function="default" group="P"/>
+                <signal pad-key="pf0" index="0" function="default" group="P"/>
+                <signal pad-key="pf1" index="1" function="default" group="P"/>
+                <signal pad-key="pf2" index="2" function="default" group="P"/>
+                <signal pad-key="pf3" index="3" function="default" group="P"/>
+                <signal pad-key="pf4" index="4" function="default" group="P"/>
+                <signal pad-key="pf5" index="5" function="default" group="P"/>
+                <signal pad-key="pf6" index="6" function="default" group="P"/>
+                <signal pad-key="pf7" index="7" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portg" name="PORTG" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pg2" index="2" function="default" group="P"/>
-                <signal pad-id="pg3" index="3" function="default" group="P"/>
-                <signal pad-id="pg4" index="4" function="default" group="P"/>
-                <signal pad-id="pg5" index="4" function="default" group="P"/>
+                <signal pad-key="pg0" index="0" function="default" group="P"/>
+                <signal pad-key="pg1" index="1" function="default" group="P"/>
+                <signal pad-key="pg2" index="2" function="default" group="P"/>
+                <signal pad-key="pg3" index="3" function="default" group="P"/>
+                <signal pad-key="pg4" index="4" function="default" group="P"/>
+                <signal pad-key="pg5" index="4" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="ac" name="AC" module-key="ac">
             <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"/>
+                <signal pad-key="pe2" index="0" function="default" group="AIN"/>
+                <signal pad-key="pe3" index="1" function="default" group="AIN"/>
             </signals>
         </peripheral>
         <peripheral key="jtag" name="JTAG" module-key="jtag">
             <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"/>
-                <signal pad-id="pf6" function="default" group="TDO"/>
-                <signal pad-id="pf7" function="default" group="TDI"/>
+                <signal pad-key="pf4" function="default" group="TCK"/>
+                <signal pad-key="pf5" function="default" group="TMS"/>
+                <signal pad-key="pf6" function="default" group="TDO"/>
+                <signal pad-key="pf7" function="default" group="TDI"/>
             </signals>
         </peripheral>
         <peripheral key="lcd" name="LCD" module-key="lcd">
             <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"/>
-                <signal pad-id="pa6" index="2" function="default" group="SEG"/>
-                <signal pad-id="pa7" index="3" function="default" group="SEG"/>
-                <signal pad-id="pg2" index="4" function="default" group="SEG"/>
-                <signal pad-id="pc7" index="5" function="default" group="SEG"/>
-                <signal pad-id="pc6" index="6" function="default" group="SEG"/>
-                <signal pad-id="pc5" index="7" function="default" group="SEG"/>
-                <signal pad-id="pc4" index="8" function="default" group="SEG"/>
-                <signal pad-id="pc3" index="9" function="default" group="SEG"/>
-                <signal pad-id="pc2" index="10" function="default" group="SEG"/>
-                <signal pad-id="pc1" index="11" function="default" group="SEG"/>
-                <signal pad-id="pc0" index="12" function="default" group="SEG"/>
-                <signal pad-id="pg1" index="13" function="default" group="SEG"/>
-                <signal pad-id="pg2" index="14" function="default" group="SEG"/>
-                <signal pad-id="pd7" index="15" function="default" group="SEG"/>
-                <signal pad-id="pd6" index="16" function="default" group="SEG"/>
-                <signal pad-id="pd5" index="17" function="default" group="SEG"/>
-                <signal pad-id="pd4" index="18" function="default" group="SEG"/>
-                <signal pad-id="pd3" index="19" function="default" group="SEG"/>
-                <signal pad-id="pd2" index="20" function="default" group="SEG"/>
-                <signal pad-id="pd1" index="21" function="default" group="SEG"/>
-                <signal pad-id="pd0" index="22" function="default" group="SEG"/>
-                <signal pad-id="pg4" index="23" function="default" group="SEG"/>
-                <signal pad-id="pg3" index="24" function="default" group="SEG"/>
-                <signal pad-id="pa0" index="0" function="default" group="COM"/>
-                <signal pad-id="pa1" index="1" function="default" group="COM"/>
-                <signal pad-id="pa2" index="2" function="default" group="COM"/>
-                <signal pad-id="pa3" index="3" function="default" group="COM"/>
+                <signal pad-key="pa4" index="0" function="default" group="SEG"/>
+                <signal pad-key="pa5" index="1" function="default" group="SEG"/>
+                <signal pad-key="pa6" index="2" function="default" group="SEG"/>
+                <signal pad-key="pa7" index="3" function="default" group="SEG"/>
+                <signal pad-key="pg2" index="4" function="default" group="SEG"/>
+                <signal pad-key="pc7" index="5" function="default" group="SEG"/>
+                <signal pad-key="pc6" index="6" function="default" group="SEG"/>
+                <signal pad-key="pc5" index="7" function="default" group="SEG"/>
+                <signal pad-key="pc4" index="8" function="default" group="SEG"/>
+                <signal pad-key="pc3" index="9" function="default" group="SEG"/>
+                <signal pad-key="pc2" index="10" function="default" group="SEG"/>
+                <signal pad-key="pc1" index="11" function="default" group="SEG"/>
+                <signal pad-key="pc0" index="12" function="default" group="SEG"/>
+                <signal pad-key="pg1" index="13" function="default" group="SEG"/>
+                <signal pad-key="pg2" index="14" function="default" group="SEG"/>
+                <signal pad-key="pd7" index="15" function="default" group="SEG"/>
+                <signal pad-key="pd6" index="16" function="default" group="SEG"/>
+                <signal pad-key="pd5" index="17" function="default" group="SEG"/>
+                <signal pad-key="pd4" index="18" function="default" group="SEG"/>
+                <signal pad-key="pd3" index="19" function="default" group="SEG"/>
+                <signal pad-key="pd2" index="20" function="default" group="SEG"/>
+                <signal pad-key="pd1" index="21" function="default" group="SEG"/>
+                <signal pad-key="pd0" index="22" function="default" group="SEG"/>
+                <signal pad-key="pg4" index="23" function="default" group="SEG"/>
+                <signal pad-key="pg3" index="24" function="default" group="SEG"/>
+                <signal pad-key="pa0" index="0" function="default" group="COM"/>
+                <signal pad-key="pa1" index="1" function="default" group="COM"/>
+                <signal pad-key="pa2" index="2" function="default" group="COM"/>
+                <signal pad-key="pa3" index="3" function="default" group="COM"/>
             </signals>
         </peripheral>
         <peripheral key="exint" name="EXINT" module-key="exint">
             <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"/>
-                <signal pad-id="pe2" index="2" function="default" group="PCINT"/>
-                <signal pad-id="pe3" index="3" function="default" group="PCINT"/>
-                <signal pad-id="pe4" index="4" function="default" group="PCINT"/>
-                <signal pad-id="pe5" index="5" function="default" group="PCINT"/>
-                <signal pad-id="pe6" index="6" function="default" group="PCINT"/>
-                <signal pad-id="pe7" index="7" function="default" group="PCINT"/>
-                <signal pad-id="pb0" index="8" function="default" group="PCINT"/>
-                <signal pad-id="pb1" index="9" function="default" group="PCINT"/>
-                <signal pad-id="pb2" index="10" function="default" group="PCINT"/>
-                <signal pad-id="pb3" index="11" function="default" group="PCINT"/>
-                <signal pad-id="pb4" index="12" function="default" group="PCINT"/>
-                <signal pad-id="pb5" index="13" function="default" group="PCINT"/>
-                <signal pad-id="pb6" index="14" function="default" group="PCINT"/>
-                <signal pad-id="pb7" index="15" function="default" group="PCINT"/>
-                <signal pad-id="pd1" index="0" function="default" group="INT"/>
+                <signal pad-key="pe0" index="0" function="default" group="PCINT"/>
+                <signal pad-key="pe1" index="1" function="default" group="PCINT"/>
+                <signal pad-key="pe2" index="2" function="default" group="PCINT"/>
+                <signal pad-key="pe3" index="3" function="default" group="PCINT"/>
+                <signal pad-key="pe4" index="4" function="default" group="PCINT"/>
+                <signal pad-key="pe5" index="5" function="default" group="PCINT"/>
+                <signal pad-key="pe6" index="6" function="default" group="PCINT"/>
+                <signal pad-key="pe7" index="7" function="default" group="PCINT"/>
+                <signal pad-key="pb0" index="8" function="default" group="PCINT"/>
+                <signal pad-key="pb1" index="9" function="default" group="PCINT"/>
+                <signal pad-key="pb2" index="10" function="default" group="PCINT"/>
+                <signal pad-key="pb3" index="11" function="default" group="PCINT"/>
+                <signal pad-key="pb4" index="12" function="default" group="PCINT"/>
+                <signal pad-key="pb5" index="13" function="default" group="PCINT"/>
+                <signal pad-key="pb6" index="14" function="default" group="PCINT"/>
+                <signal pad-key="pb7" index="15" function="default" group="PCINT"/>
+                <signal pad-key="pd1" index="0" function="default" group="INT"/>
             </signals>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="cpu">
             <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"/>
+                <signal pad-key="pe7" index="0" function="default" group="CLK"/>
             </signals>
         </peripheral>
         <peripheral key="usi" name="USI" module-key="usi">
             <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"/>
+                <signal pad-key="pe5" function="default" group="DI"/>
+                <signal pad-key="pe6" function="default" group="DO"/>
             </signals>
         </peripheral>
         <peripheral key="adc" name="ADC" module-key="adc">
             <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"/>
-                <signal pad-id="pf2" index="2" function="default" group="ADC"/>
-                <signal pad-id="pf3" index="3" function="default" group="ADC"/>
-                <signal pad-id="pf4" index="4" function="default" group="ADC"/>
-                <signal pad-id="pf5" index="5" function="default" group="ADC"/>
-                <signal pad-id="pf6" index="6" function="default" group="ADC"/>
-                <signal pad-id="pf7" index="7" function="default" group="ADC"/>
+                <signal pad-key="pf0" index="0" function="default" group="ADC"/>
+                <signal pad-key="pf1" index="1" function="default" group="ADC"/>
+                <signal pad-key="pf2" index="2" function="default" group="ADC"/>
+                <signal pad-key="pf3" index="3" function="default" group="ADC"/>
+                <signal pad-key="pf4" index="4" function="default" group="ADC"/>
+                <signal pad-key="pf5" index="5" function="default" group="ADC"/>
+                <signal pad-key="pf6" index="6" function="default" group="ADC"/>
+                <signal pad-key="pf7" index="7" function="default" group="ADC"/>
             </signals>
         </peripheral>
         <peripheral key="boot_load" name="BOOT_LOAD" module-key="boot_load">
@@ -423,10 +423,10 @@
         <peripheral key="usart0" name="USART0" module-key="usart">
             <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"/>
-                <signal pad-id="pe2" function="default" group="XCK"/>
-                <signal pad-id="pe4" function="default" group="USCK"/>
+                <signal pad-key="pe0" function="default" group="RXD"/>
+                <signal pad-key="pe1" function="default" group="TXD"/>
+                <signal pad-key="pe2" function="default" group="XCK"/>
+                <signal pad-key="pe4" function="default" group="USCK"/>
             </signals>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="fuse">
@@ -876,144 +876,207 @@
             </register-group>
         </module>
     </modules>
+    <pads>
+        <pad key="lcdcap" name="LCDCAP"/>
+        <pad key="pe0" name="PE0"/>
+        <pad key="pe1" name="PE1"/>
+        <pad key="pe2" name="PE2"/>
+        <pad key="pe3" name="PE3"/>
+        <pad key="pe4" name="PE4"/>
+        <pad key="pe5" name="PE5"/>
+        <pad key="pe6" name="PE6"/>
+        <pad key="pe7" name="PE7"/>
+        <pad key="pb0" name="PB0"/>
+        <pad key="pb1" name="PB1"/>
+        <pad key="pb2" name="PB2"/>
+        <pad key="pb3" name="PB3"/>
+        <pad key="pb4" name="PB4"/>
+        <pad key="pb5" name="PB5"/>
+        <pad key="pb6" name="PB6"/>
+        <pad key="pb7" name="PB7"/>
+        <pad key="pg3" name="PG3"/>
+        <pad key="pg4" name="PG4"/>
+        <pad key="pg5" name="PG5"/>
+        <pad key="vcc" name="VCC"/>
+        <pad key="gnd" name="GND"/>
+        <pad key="xtal2" name="XTAL2"/>
+        <pad key="xtal1" name="XTAL1"/>
+        <pad key="pd0" name="PD0"/>
+        <pad key="pd1" name="PD1"/>
+        <pad key="pd2" name="PD2"/>
+        <pad key="pd3" name="PD3"/>
+        <pad key="pd4" name="PD4"/>
+        <pad key="pd5" name="PD5"/>
+        <pad key="pd6" name="PD6"/>
+        <pad key="pd7" name="PD7"/>
+        <pad key="pg0" name="PG0"/>
+        <pad key="pg1" name="PG1"/>
+        <pad key="pc0" name="PC0"/>
+        <pad key="pc1" name="PC1"/>
+        <pad key="pc2" name="PC2"/>
+        <pad key="pc3" name="PC3"/>
+        <pad key="pc4" name="PC4"/>
+        <pad key="pc5" name="PC5"/>
+        <pad key="pc6" name="PC6"/>
+        <pad key="pc7" name="PC7"/>
+        <pad key="pg2" name="PG2"/>
+        <pad key="pa7" name="PA7"/>
+        <pad key="pa6" name="PA6"/>
+        <pad key="pa5" name="PA5"/>
+        <pad key="pa4" name="PA4"/>
+        <pad key="pa3" name="PA3"/>
+        <pad key="pa2" name="PA2"/>
+        <pad key="pa1" name="PA1"/>
+        <pad key="pa0" name="PA0"/>
+        <pad key="pf7" name="PF7"/>
+        <pad key="pf6" name="PF6"/>
+        <pad key="pf5" name="PF5"/>
+        <pad key="pf4" name="PF4"/>
+        <pad key="pf3" name="PF3"/>
+        <pad key="pf2" name="PF2"/>
+        <pad key="pf1" name="PF1"/>
+        <pad key="pf0" name="PF0"/>
+        <pad key="aref" name="AREF"/>
+        <pad key="avcc" name="AVCC"/>
+    </pads>
     <pinouts>
         <pinout key="tqfp64" name="TQFP64" type="qfp">
-            <pin position="1" pad="LCDCAP"/>
-            <pin position="2" pad="PE0"/>
-            <pin position="3" pad="PE1"/>
-            <pin position="4" pad="PE2"/>
-            <pin position="5" pad="PE3"/>
-            <pin position="6" pad="PE4"/>
-            <pin position="7" pad="PE5"/>
-            <pin position="8" pad="PE6"/>
-            <pin position="9" pad="PE7"/>
-            <pin position="10" pad="PB0"/>
-            <pin position="11" pad="PB1"/>
-            <pin position="12" pad="PB2"/>
-            <pin position="13" pad="PB3"/>
-            <pin position="14" pad="PB4"/>
-            <pin position="15" pad="PB5"/>
-            <pin position="16" pad="PB6"/>
-            <pin position="17" pad="PB7"/>
-            <pin position="18" pad="PG3"/>
-            <pin position="19" pad="PG4"/>
-            <pin position="20" pad="PG5"/>
-            <pin position="21" pad="VCC"/>
-            <pin position="22" pad="GND"/>
-            <pin position="23" pad="XTAL2"/>
-            <pin position="24" pad="XTAL1"/>
-            <pin position="25" pad="PD0"/>
-            <pin position="26" pad="PD1"/>
-            <pin position="27" pad="PD2"/>
-            <pin position="28" pad="PD3"/>
-            <pin position="29" pad="PD4"/>
-            <pin position="30" pad="PD5"/>
-            <pin position="31" pad="PD6"/>
-            <pin position="32" pad="PD7"/>
-            <pin position="33" pad="PG0"/>
-            <pin position="34" pad="PG1"/>
-            <pin position="35" pad="PC0"/>
-            <pin position="36" pad="PC1"/>
-            <pin position="37" pad="PC2"/>
-            <pin position="38" pad="PC3"/>
-            <pin position="39" pad="PC4"/>
-            <pin position="40" pad="PC5"/>
-            <pin position="41" pad="PC6"/>
-            <pin position="42" pad="PC7"/>
-            <pin position="43" pad="PG2"/>
-            <pin position="44" pad="PA7"/>
-            <pin position="45" pad="PA6"/>
-            <pin position="46" pad="PA5"/>
-            <pin position="47" pad="PA4"/>
-            <pin position="48" pad="PA3"/>
-            <pin position="49" pad="PA2"/>
-            <pin position="50" pad="PA1"/>
-            <pin position="51" pad="PA0"/>
-            <pin position="52" pad="VCC"/>
-            <pin position="53" pad="GND"/>
-            <pin position="54" pad="PF7"/>
-            <pin position="55" pad="PF6"/>
-            <pin position="56" pad="PF5"/>
-            <pin position="57" pad="PF4"/>
-            <pin position="58" pad="PF3"/>
-            <pin position="59" pad="PF2"/>
-            <pin position="60" pad="PF1"/>
-            <pin position="61" pad="PF0"/>
-            <pin position="62" pad="AREF"/>
-            <pin position="63" pad="GND"/>
-            <pin position="64" pad="AVCC"/>
+            <pin position="1" pad-key="lcdcap"/>
+            <pin position="2" pad-key="pe0"/>
+            <pin position="3" pad-key="pe1"/>
+            <pin position="4" pad-key="pe2"/>
+            <pin position="5" pad-key="pe3"/>
+            <pin position="6" pad-key="pe4"/>
+            <pin position="7" pad-key="pe5"/>
+            <pin position="8" pad-key="pe6"/>
+            <pin position="9" pad-key="pe7"/>
+            <pin position="10" pad-key="pb0"/>
+            <pin position="11" pad-key="pb1"/>
+            <pin position="12" pad-key="pb2"/>
+            <pin position="13" pad-key="pb3"/>
+            <pin position="14" pad-key="pb4"/>
+            <pin position="15" pad-key="pb5"/>
+            <pin position="16" pad-key="pb6"/>
+            <pin position="17" pad-key="pb7"/>
+            <pin position="18" pad-key="pg3"/>
+            <pin position="19" pad-key="pg4"/>
+            <pin position="20" pad-key="pg5"/>
+            <pin position="21" pad-key="vcc"/>
+            <pin position="22" pad-key="gnd"/>
+            <pin position="23" pad-key="xtal2"/>
+            <pin position="24" pad-key="xtal1"/>
+            <pin position="25" pad-key="pd0"/>
+            <pin position="26" pad-key="pd1"/>
+            <pin position="27" pad-key="pd2"/>
+            <pin position="28" pad-key="pd3"/>
+            <pin position="29" pad-key="pd4"/>
+            <pin position="30" pad-key="pd5"/>
+            <pin position="31" pad-key="pd6"/>
+            <pin position="32" pad-key="pd7"/>
+            <pin position="33" pad-key="pg0"/>
+            <pin position="34" pad-key="pg1"/>
+            <pin position="35" pad-key="pc0"/>
+            <pin position="36" pad-key="pc1"/>
+            <pin position="37" pad-key="pc2"/>
+            <pin position="38" pad-key="pc3"/>
+            <pin position="39" pad-key="pc4"/>
+            <pin position="40" pad-key="pc5"/>
+            <pin position="41" pad-key="pc6"/>
+            <pin position="42" pad-key="pc7"/>
+            <pin position="43" pad-key="pg2"/>
+            <pin position="44" pad-key="pa7"/>
+            <pin position="45" pad-key="pa6"/>
+            <pin position="46" pad-key="pa5"/>
+            <pin position="47" pad-key="pa4"/>
+            <pin position="48" pad-key="pa3"/>
+            <pin position="49" pad-key="pa2"/>
+            <pin position="50" pad-key="pa1"/>
+            <pin position="51" pad-key="pa0"/>
+            <pin position="52" pad-key="vcc"/>
+            <pin position="53" pad-key="gnd"/>
+            <pin position="54" pad-key="pf7"/>
+            <pin position="55" pad-key="pf6"/>
+            <pin position="56" pad-key="pf5"/>
+            <pin position="57" pad-key="pf4"/>
+            <pin position="58" pad-key="pf3"/>
+            <pin position="59" pad-key="pf2"/>
+            <pin position="60" pad-key="pf1"/>
+            <pin position="61" pad-key="pf0"/>
+            <pin position="62" pad-key="aref"/>
+            <pin position="63" pad-key="gnd"/>
+            <pin position="64" pad-key="avcc"/>
         </pinout>
         <pinout key="qfn64" name="QFN64" type="qfn">
-            <pin position="1" pad="LCDCAP"/>
-            <pin position="2" pad="PE0"/>
-            <pin position="3" pad="PE1"/>
-            <pin position="4" pad="PE2"/>
-            <pin position="5" pad="PE3"/>
-            <pin position="6" pad="PE4"/>
-            <pin position="7" pad="PE5"/>
-            <pin position="8" pad="PE6"/>
-            <pin position="9" pad="PE7"/>
-            <pin position="10" pad="PB0"/>
-            <pin position="11" pad="PB1"/>
-            <pin position="12" pad="PB2"/>
-            <pin position="13" pad="PB3"/>
-            <pin position="14" pad="PB4"/>
-            <pin position="15" pad="PB5"/>
-            <pin position="16" pad="PB6"/>
-            <pin position="17" pad="PB7"/>
-            <pin position="18" pad="PG3"/>
-            <pin position="19" pad="PG4"/>
-            <pin position="20" pad="PG5"/>
-            <pin position="21" pad="VCC"/>
-            <pin position="22" pad="GND"/>
-            <pin position="23" pad="XTAL2"/>
-            <pin position="24" pad="XTAL1"/>
-            <pin position="25" pad="PD0"/>
-            <pin position="26" pad="PD1"/>
-            <pin position="27" pad="PD2"/>
-            <pin position="28" pad="PD3"/>
-            <pin position="29" pad="PD4"/>
-            <pin position="30" pad="PD5"/>
-            <pin position="31" pad="PD6"/>
-            <pin position="32" pad="PD7"/>
-            <pin position="33" pad="PG0"/>
-            <pin position="34" pad="PG1"/>
-            <pin position="35" pad="PC0"/>
-            <pin position="36" pad="PC1"/>
-            <pin position="37" pad="PC2"/>
-            <pin position="38" pad="PC3"/>
-            <pin position="39" pad="PC4"/>
-            <pin position="40" pad="PC5"/>
-            <pin position="41" pad="PC6"/>
-            <pin position="42" pad="PC7"/>
-            <pin position="43" pad="PG2"/>
-            <pin position="44" pad="PA7"/>
-            <pin position="45" pad="PA6"/>
-            <pin position="46" pad="PA5"/>
-            <pin position="47" pad="PA4"/>
-            <pin position="48" pad="PA3"/>
-            <pin position="49" pad="PA2"/>
-            <pin position="50" pad="PA1"/>
-            <pin position="51" pad="PA0"/>
-            <pin position="52" pad="VCC"/>
-            <pin position="53" pad="GND"/>
-            <pin position="54" pad="PF7"/>
-            <pin position="55" pad="PF6"/>
-            <pin position="56" pad="PF5"/>
-            <pin position="57" pad="PF4"/>
-            <pin position="58" pad="PF3"/>
-            <pin position="59" pad="PF2"/>
-            <pin position="60" pad="PF1"/>
-            <pin position="61" pad="PF0"/>
-            <pin position="62" pad="AREF"/>
-            <pin position="63" pad="GND"/>
-            <pin position="64" pad="AVCC"/>
+            <pin position="1" pad-key="lcdcap"/>
+            <pin position="2" pad-key="pe0"/>
+            <pin position="3" pad-key="pe1"/>
+            <pin position="4" pad-key="pe2"/>
+            <pin position="5" pad-key="pe3"/>
+            <pin position="6" pad-key="pe4"/>
+            <pin position="7" pad-key="pe5"/>
+            <pin position="8" pad-key="pe6"/>
+            <pin position="9" pad-key="pe7"/>
+            <pin position="10" pad-key="pb0"/>
+            <pin position="11" pad-key="pb1"/>
+            <pin position="12" pad-key="pb2"/>
+            <pin position="13" pad-key="pb3"/>
+            <pin position="14" pad-key="pb4"/>
+            <pin position="15" pad-key="pb5"/>
+            <pin position="16" pad-key="pb6"/>
+            <pin position="17" pad-key="pb7"/>
+            <pin position="18" pad-key="pg3"/>
+            <pin position="19" pad-key="pg4"/>
+            <pin position="20" pad-key="pg5"/>
+            <pin position="21" pad-key="vcc"/>
+            <pin position="22" pad-key="gnd"/>
+            <pin position="23" pad-key="xtal2"/>
+            <pin position="24" pad-key="xtal1"/>
+            <pin position="25" pad-key="pd0"/>
+            <pin position="26" pad-key="pd1"/>
+            <pin position="27" pad-key="pd2"/>
+            <pin position="28" pad-key="pd3"/>
+            <pin position="29" pad-key="pd4"/>
+            <pin position="30" pad-key="pd5"/>
+            <pin position="31" pad-key="pd6"/>
+            <pin position="32" pad-key="pd7"/>
+            <pin position="33" pad-key="pg0"/>
+            <pin position="34" pad-key="pg1"/>
+            <pin position="35" pad-key="pc0"/>
+            <pin position="36" pad-key="pc1"/>
+            <pin position="37" pad-key="pc2"/>
+            <pin position="38" pad-key="pc3"/>
+            <pin position="39" pad-key="pc4"/>
+            <pin position="40" pad-key="pc5"/>
+            <pin position="41" pad-key="pc6"/>
+            <pin position="42" pad-key="pc7"/>
+            <pin position="43" pad-key="pg2"/>
+            <pin position="44" pad-key="pa7"/>
+            <pin position="45" pad-key="pa6"/>
+            <pin position="46" pad-key="pa5"/>
+            <pin position="47" pad-key="pa4"/>
+            <pin position="48" pad-key="pa3"/>
+            <pin position="49" pad-key="pa2"/>
+            <pin position="50" pad-key="pa1"/>
+            <pin position="51" pad-key="pa0"/>
+            <pin position="52" pad-key="vcc"/>
+            <pin position="53" pad-key="gnd"/>
+            <pin position="54" pad-key="pf7"/>
+            <pin position="55" pad-key="pf6"/>
+            <pin position="56" pad-key="pf5"/>
+            <pin position="57" pad-key="pf4"/>
+            <pin position="58" pad-key="pf3"/>
+            <pin position="59" pad-key="pf2"/>
+            <pin position="60" pad-key="pf1"/>
+            <pin position="61" pad-key="pf0"/>
+            <pin position="62" pad-key="aref"/>
+            <pin position="63" pad-key="gnd"/>
+            <pin position="64" pad-key="avcc"/>
         </pinout>
     </pinouts>
     <variants>
-        <variant name="ATmega329V-8AU" pinout-key="tqfp64" package="TQFP64"/>
-        <variant name="ATmega329V-8MU" pinout-key="qfn64" package="QFN64"/>
-        <variant name="ATmega329-16AU" pinout-key="tqfp64" package="TQFP64 "/>
-        <variant name="ATmega329-16MU" pinout-key="qfn64" package="QFN64"/>
+        <variant key="atmega329v_8au" name="ATmega329V-8AU" pinout-key="tqfp64"/>
+        <variant key="atmega329v_8mu" name="ATmega329V-8MU" pinout-key="qfn64"/>
+        <variant key="atmega329_16au" name="ATmega329-16AU" pinout-key="tqfp64"/>
+        <variant key="atmega329_16mu" name="ATmega329-16MU" pinout-key="qfn64"/>
     </variants>
 </device>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA3290.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA3290.xml
index d7263f48..be30e645 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA3290.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA3290.xml
@@ -212,115 +212,115 @@
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pa2" index="2" function="PORTA" group="P"/>
-                <signal pad-id="pa3" index="3" function="PORTA" group="P"/>
-                <signal pad-id="pa4" index="4" function="PORTA" group="P"/>
-                <signal pad-id="pa5" index="5" function="PORTA" group="P"/>
-                <signal pad-id="pa6" index="6" function="PORTA" group="P"/>
-                <signal pad-id="pa7" index="7" function="PORTA" group="P"/>
+                <signal pad-key="pa0" index="0" function="PORTA" group="P"/>
+                <signal pad-key="pa1" index="1" function="PORTA" group="P"/>
+                <signal pad-key="pa2" index="2" function="PORTA" group="P"/>
+                <signal pad-key="pa3" index="3" function="PORTA" group="P"/>
+                <signal pad-key="pa4" index="4" function="PORTA" group="P"/>
+                <signal pad-key="pa5" index="5" function="PORTA" group="P"/>
+                <signal pad-key="pa6" index="6" function="PORTA" group="P"/>
+                <signal pad-key="pa7" index="7" function="PORTA" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pb2" index="2" function="PORTB" group="P"/>
-                <signal pad-id="pb3" index="3" function="PORTB" group="P"/>
-                <signal pad-id="pb4" index="4" function="PORTB" group="P"/>
-                <signal pad-id="pb5" index="5" function="PORTB" group="P"/>
-                <signal pad-id="pb6" index="6" function="PORTB" group="P"/>
-                <signal pad-id="pb7" index="7" function="PORTB" group="P"/>
+                <signal pad-key="pb0" index="0" function="PORTB" group="P"/>
+                <signal pad-key="pb1" index="1" function="PORTB" group="P"/>
+                <signal pad-key="pb2" index="2" function="PORTB" group="P"/>
+                <signal pad-key="pb3" index="3" function="PORTB" group="P"/>
+                <signal pad-key="pb4" index="4" function="PORTB" group="P"/>
+                <signal pad-key="pb5" index="5" function="PORTB" group="P"/>
+                <signal pad-key="pb6" index="6" function="PORTB" group="P"/>
+                <signal pad-key="pb7" index="7" function="PORTB" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pc2" index="2" function="PORTC" group="P"/>
-                <signal pad-id="pc3" index="3" function="PORTC" group="P"/>
-                <signal pad-id="pc4" index="4" function="PORTC" group="P"/>
-                <signal pad-id="pc5" index="5" function="PORTC" group="P"/>
-                <signal pad-id="pc6" index="6" function="PORTC" group="P"/>
-                <signal pad-id="pc7" index="7" function="PORTC" group="P"/>
+                <signal pad-key="pc0" index="0" function="PORTC" group="P"/>
+                <signal pad-key="pc1" index="1" function="PORTC" group="P"/>
+                <signal pad-key="pc2" index="2" function="PORTC" group="P"/>
+                <signal pad-key="pc3" index="3" function="PORTC" group="P"/>
+                <signal pad-key="pc4" index="4" function="PORTC" group="P"/>
+                <signal pad-key="pc5" index="5" function="PORTC" group="P"/>
+                <signal pad-key="pc6" index="6" function="PORTC" group="P"/>
+                <signal pad-key="pc7" index="7" function="PORTC" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pd2" index="2" function="PORTD" group="P"/>
-                <signal pad-id="pd3" index="3" function="PORTD" group="P"/>
-                <signal pad-id="pd4" index="4" function="PORTD" group="P"/>
-                <signal pad-id="pd5" index="5" function="PORTD" group="P"/>
-                <signal pad-id="pd6" index="6" function="PORTD" group="P"/>
-                <signal pad-id="pd7" index="7" function="PORTD" group="P"/>
+                <signal pad-key="pd0" index="0" function="PORTD" group="P"/>
+                <signal pad-key="pd1" index="1" function="PORTD" group="P"/>
+                <signal pad-key="pd2" index="2" function="PORTD" group="P"/>
+                <signal pad-key="pd3" index="3" function="PORTD" group="P"/>
+                <signal pad-key="pd4" index="4" function="PORTD" group="P"/>
+                <signal pad-key="pd5" index="5" function="PORTD" group="P"/>
+                <signal pad-key="pd6" index="6" function="PORTD" group="P"/>
+                <signal pad-key="pd7" index="7" function="PORTD" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="porte" name="PORTE" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pe2" index="2" function="PORTE" group="P"/>
-                <signal pad-id="pe3" index="3" function="PORTE" group="P"/>
-                <signal pad-id="pe4" index="4" function="PORTE" group="P"/>
-                <signal pad-id="pe5" index="5" function="PORTE" group="P"/>
-                <signal pad-id="pe6" index="6" function="PORTE" group="P"/>
-                <signal pad-id="pe7" index="7" function="PORTE" group="P"/>
+                <signal pad-key="pe0" index="0" function="PORTE" group="P"/>
+                <signal pad-key="pe1" index="1" function="PORTE" group="P"/>
+                <signal pad-key="pe2" index="2" function="PORTE" group="P"/>
+                <signal pad-key="pe3" index="3" function="PORTE" group="P"/>
+                <signal pad-key="pe4" index="4" function="PORTE" group="P"/>
+                <signal pad-key="pe5" index="5" function="PORTE" group="P"/>
+                <signal pad-key="pe6" index="6" function="PORTE" group="P"/>
+                <signal pad-key="pe7" index="7" function="PORTE" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portf" name="PORTF" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pf2" index="2" function="PORTF" group="P"/>
-                <signal pad-id="pf3" index="3" function="PORTF" group="P"/>
-                <signal pad-id="pf4" index="4" function="PORTF" group="P"/>
-                <signal pad-id="pf5" index="5" function="PORTF" group="P"/>
-                <signal pad-id="pf6" index="6" function="PORTF" group="P"/>
-                <signal pad-id="pf7" index="7" function="PORTF" group="P"/>
+                <signal pad-key="pf0" index="0" function="PORTF" group="P"/>
+                <signal pad-key="pf1" index="1" function="PORTF" group="P"/>
+                <signal pad-key="pf2" index="2" function="PORTF" group="P"/>
+                <signal pad-key="pf3" index="3" function="PORTF" group="P"/>
+                <signal pad-key="pf4" index="4" function="PORTF" group="P"/>
+                <signal pad-key="pf5" index="5" function="PORTF" group="P"/>
+                <signal pad-key="pf6" index="6" function="PORTF" group="P"/>
+                <signal pad-key="pf7" index="7" function="PORTF" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portg" name="PORTG" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pg2" index="2" function="PORTG" group="P"/>
-                <signal pad-id="pg3" index="3" function="PORTG" group="P"/>
-                <signal pad-id="pg4" index="4" function="PORTG" group="P"/>
-                <signal pad-id="pg5" index="5" function="PORTG" group="P"/>
+                <signal pad-key="pg0" index="0" function="PORTG" group="P"/>
+                <signal pad-key="pg1" index="1" function="PORTG" group="P"/>
+                <signal pad-key="pg2" index="2" function="PORTG" group="P"/>
+                <signal pad-key="pg3" index="3" function="PORTG" group="P"/>
+                <signal pad-key="pg4" index="4" function="PORTG" group="P"/>
+                <signal pad-key="pg5" index="5" function="PORTG" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="porth" name="PORTH" module-key="gpio_port">
             <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"/>
-                <signal pad-id="ph2" index="2" function="PORTH" group="P"/>
-                <signal pad-id="ph3" index="3" function="PORTH" group="P"/>
-                <signal pad-id="ph4" index="4" function="PORTH" group="P"/>
-                <signal pad-id="ph5" index="5" function="PORTH" group="P"/>
-                <signal pad-id="ph6" index="6" function="PORTH" group="P"/>
-                <signal pad-id="ph7" index="7" function="PORTH" group="P"/>
+                <signal pad-key="ph0" index="0" function="PORTH" group="P"/>
+                <signal pad-key="ph1" index="1" function="PORTH" group="P"/>
+                <signal pad-key="ph2" index="2" function="PORTH" group="P"/>
+                <signal pad-key="ph3" index="3" function="PORTH" group="P"/>
+                <signal pad-key="ph4" index="4" function="PORTH" group="P"/>
+                <signal pad-key="ph5" index="5" function="PORTH" group="P"/>
+                <signal pad-key="ph6" index="6" function="PORTH" group="P"/>
+                <signal pad-key="ph7" index="7" function="PORTH" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portj" name="PORTJ" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pj2" index="2" function="PORTJ" group="P"/>
-                <signal pad-id="pj3" index="3" function="PORTJ" group="P"/>
-                <signal pad-id="pj4" index="4" function="PORTJ" group="P"/>
-                <signal pad-id="pj5" index="5" function="PORTJ" group="P"/>
-                <signal pad-id="pj6" index="6" function="PORTJ" group="P"/>
+                <signal pad-key="pj0" index="0" function="PORTJ" group="P"/>
+                <signal pad-key="pj1" index="1" function="PORTJ" group="P"/>
+                <signal pad-key="pj2" index="2" function="PORTJ" group="P"/>
+                <signal pad-key="pj3" index="3" function="PORTJ" group="P"/>
+                <signal pad-key="pj4" index="4" function="PORTJ" group="P"/>
+                <signal pad-key="pj5" index="5" function="PORTJ" group="P"/>
+                <signal pad-key="pj6" index="6" function="PORTJ" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="ac" name="AC" module-key="ac">
@@ -817,111 +817,190 @@
             </register-group>
         </module>
     </modules>
+    <pads>
+        <pad key="lcdcap" name="LCDCAP"/>
+        <pad key="pe0" name="PE0"/>
+        <pad key="pe1" name="PE1"/>
+        <pad key="pe2" name="PE2"/>
+        <pad key="pe3" name="PE3"/>
+        <pad key="pe4" name="PE4"/>
+        <pad key="pe5" name="PE5"/>
+        <pad key="pe6" name="PE6"/>
+        <pad key="pe7" name="PE7"/>
+        <pad key="vcc" name="VCC"/>
+        <pad key="gnd" name="GND"/>
+        <pad key="pj0" name="PJ0"/>
+        <pad key="pj1" name="PJ1"/>
+        <pad key="pb0" name="PB0"/>
+        <pad key="pb1" name="PB1"/>
+        <pad key="pb2" name="PB2"/>
+        <pad key="pb3" name="PB3"/>
+        <pad key="pb4" name="PB4"/>
+        <pad key="pb5" name="PB5"/>
+        <pad key="pb6" name="PB6"/>
+        <pad key="pb7" name="PB7"/>
+        <pad key="pg3" name="PG3"/>
+        <pad key="pg4" name="PG4"/>
+        <pad key="pg5" name="PG5"/>
+        <pad key="xtal2" name="XTAL2"/>
+        <pad key="xtal1" name="XTAL1"/>
+        <pad key="pj2" name="PJ2"/>
+        <pad key="pj3" name="PJ3"/>
+        <pad key="pj4" name="PJ4"/>
+        <pad key="pj5" name="PJ5"/>
+        <pad key="pj6" name="PJ6"/>
+        <pad key="pd0" name="PD0"/>
+        <pad key="pd1" name="PD1"/>
+        <pad key="pd2" name="PD2"/>
+        <pad key="pd3" name="PD3"/>
+        <pad key="pd4" name="PD4"/>
+        <pad key="pd5" name="PD5"/>
+        <pad key="pd6" name="PD6"/>
+        <pad key="pd7" name="PD7"/>
+        <pad key="pg0" name="PG0"/>
+        <pad key="pg1" name="PG1"/>
+        <pad key="pc0" name="PC0"/>
+        <pad key="pc1" name="PC1"/>
+        <pad key="pc2" name="PC2"/>
+        <pad key="pc3" name="PC3"/>
+        <pad key="pc4" name="PC4"/>
+        <pad key="pc5" name="PC5"/>
+        <pad key="ph0" name="PH0"/>
+        <pad key="ph1" name="PH1"/>
+        <pad key="ph2" name="PH2"/>
+        <pad key="ph3" name="PH3"/>
+        <pad key="pc6" name="PC6"/>
+        <pad key="pc7" name="PC7"/>
+        <pad key="pg2" name="PG2"/>
+        <pad key="pa7" name="PA7"/>
+        <pad key="pa6" name="PA6"/>
+        <pad key="pa5" name="PA5"/>
+        <pad key="pa4" name="PA4"/>
+        <pad key="pa3" name="PA3"/>
+        <pad key="pa2" name="PA2"/>
+        <pad key="pa1" name="PA1"/>
+        <pad key="pa0" name="PA0"/>
+        <pad key="ph4" name="PH4"/>
+        <pad key="ph5" name="PH5"/>
+        <pad key="ph6" name="PH6"/>
+        <pad key="ph7" name="PH7"/>
+        <pad key="pf7" name="PF7"/>
+        <pad key="pf6" name="PF6"/>
+        <pad key="pf5" name="PF5"/>
+        <pad key="pf4" name="PF4"/>
+        <pad key="pf3" name="PF3"/>
+        <pad key="pf2" name="PF2"/>
+        <pad key="pf1" name="PF1"/>
+        <pad key="pf0" name="PF0"/>
+        <pad key="aref" name="AREF"/>
+        <pad key="agnd" name="AGND"/>
+        <pad key="avcc" name="AVCC"/>
+    </pads>
     <pinouts>
         <pinout key="qfp100" name="QFP100" type="qfp">
-            <pin position="1" pad="LCDCAP"/>
-            <pin position="2" pad="PE0"/>
-            <pin position="3" pad="PE1"/>
-            <pin position="4" pad="PE2"/>
-            <pin position="5" pad="PE3"/>
-            <pin position="6" pad="PE4"/>
-            <pin position="7" pad="PE5"/>
-            <pin position="8" pad="PE6"/>
-            <pin position="9" pad="PE7"/>
-            <pin position="10" pad="VCC"/>
-            <pin position="11" pad="GND"/>
-            <pin position="12" pad="NC"/>
-            <pin position="13" pad="PJ0"/>
-            <pin position="14" pad="PJ1"/>
-            <pin position="15" pad="NC"/>
-            <pin position="16" pad="NC"/>
-            <pin position="17" pad="NC"/>
-            <pin position="18" pad="NC"/>
-            <pin position="19" pad="PB0"/>
-            <pin position="20" pad="PB1"/>
-            <pin position="21" pad="PB2"/>
-            <pin position="22" pad="PB3"/>
-            <pin position="23" pad="PB4"/>
-            <pin position="24" pad="PB5"/>
-            <pin position="25" pad="PB6"/>
-            <pin position="26" pad="PB7"/>
-            <pin position="27" pad="NC"/>
-            <pin position="28" pad="PG3"/>
-            <pin position="29" pad="PG4"/>
-            <pin position="30" pad="PG5"/>
-            <pin position="31" pad="VCC"/>
-            <pin position="32" pad="GND"/>
-            <pin position="33" pad="XTAL2"/>
-            <pin position="34" pad="XTAL1"/>
-            <pin position="35" pad="NC"/>
-            <pin position="36" pad="NC"/>
-            <pin position="37" pad="PJ2"/>
-            <pin position="38" pad="PJ3"/>
-            <pin position="39" pad="PJ4"/>
-            <pin position="40" pad="PJ5"/>
-            <pin position="41" pad="PJ6"/>
-            <pin position="42" pad="NC"/>
-            <pin position="43" pad="PD0"/>
-            <pin position="44" pad="PD1"/>
-            <pin position="45" pad="PD2"/>
-            <pin position="46" pad="PD3"/>
-            <pin position="47" pad="PD4"/>
-            <pin position="48" pad="PD5"/>
-            <pin position="49" pad="PD6"/>
-            <pin position="50" pad="PD7"/>
-            <pin position="51" pad="PG0"/>
-            <pin position="52" pad="PG1"/>
-            <pin position="53" pad="PC0"/>
-            <pin position="54" pad="PC1"/>
-            <pin position="55" pad="PC2"/>
-            <pin position="56" pad="PC3"/>
-            <pin position="57" pad="PC4"/>
-            <pin position="58" pad="PC5"/>
-            <pin position="59" pad="NC"/>
-            <pin position="60" pad="NC"/>
-            <pin position="61" pad="NC"/>
-            <pin position="62" pad="NC"/>
-            <pin position="63" pad="PH0"/>
-            <pin position="64" pad="PH1"/>
-            <pin position="65" pad="PH2"/>
-            <pin position="66" pad="PH3"/>
-            <pin position="67" pad="NC"/>
-            <pin position="68" pad="PC6"/>
-            <pin position="69" pad="PC7"/>
-            <pin position="70" pad="PG2"/>
-            <pin position="71" pad="PA7"/>
-            <pin position="72" pad="PA6"/>
-            <pin position="73" pad="PA5"/>
-            <pin position="74" pad="PA4"/>
-            <pin position="75" pad="PA3"/>
-            <pin position="76" pad="PA2"/>
-            <pin position="77" pad="PA1"/>
-            <pin position="78" pad="PA0"/>
-            <pin position="79" pad="NC"/>
-            <pin position="80" pad="VCC"/>
-            <pin position="81" pad="GND"/>
-            <pin position="82" pad="NC"/>
-            <pin position="83" pad="NC"/>
-            <pin position="84" pad="PH4"/>
-            <pin position="85" pad="PH5"/>
-            <pin position="86" pad="PH6"/>
-            <pin position="87" pad="PH7"/>
-            <pin position="88" pad="NC"/>
-            <pin position="89" pad="NC"/>
-            <pin position="90" pad="PF7"/>
-            <pin position="91" pad="PF6"/>
-            <pin position="92" pad="PF5"/>
-            <pin position="93" pad="PF4"/>
-            <pin position="94" pad="PF3"/>
-            <pin position="95" pad="PF2"/>
-            <pin position="96" pad="PF1"/>
-            <pin position="97" pad="PF0"/>
-            <pin position="98" pad="AREF"/>
-            <pin position="99" pad="AGND"/>
-            <pin position="100" pad="AVCC"/>
+            <pin position="1" pad-key="lcdcap"/>
+            <pin position="2" pad-key="pe0"/>
+            <pin position="3" pad-key="pe1"/>
+            <pin position="4" pad-key="pe2"/>
+            <pin position="5" pad-key="pe3"/>
+            <pin position="6" pad-key="pe4"/>
+            <pin position="7" pad-key="pe5"/>
+            <pin position="8" pad-key="pe6"/>
+            <pin position="9" pad-key="pe7"/>
+            <pin position="10" pad-key="vcc"/>
+            <pin position="11" pad-key="gnd"/>
+            <pin position="12"/>
+            <pin position="13" pad-key="pj0"/>
+            <pin position="14" pad-key="pj1"/>
+            <pin position="15"/>
+            <pin position="16"/>
+            <pin position="17"/>
+            <pin position="18"/>
+            <pin position="19" pad-key="pb0"/>
+            <pin position="20" pad-key="pb1"/>
+            <pin position="21" pad-key="pb2"/>
+            <pin position="22" pad-key="pb3"/>
+            <pin position="23" pad-key="pb4"/>
+            <pin position="24" pad-key="pb5"/>
+            <pin position="25" pad-key="pb6"/>
+            <pin position="26" pad-key="pb7"/>
+            <pin position="27"/>
+            <pin position="28" pad-key="pg3"/>
+            <pin position="29" pad-key="pg4"/>
+            <pin position="30" pad-key="pg5"/>
+            <pin position="31" pad-key="vcc"/>
+            <pin position="32" pad-key="gnd"/>
+            <pin position="33" pad-key="xtal2"/>
+            <pin position="34" pad-key="xtal1"/>
+            <pin position="35"/>
+            <pin position="36"/>
+            <pin position="37" pad-key="pj2"/>
+            <pin position="38" pad-key="pj3"/>
+            <pin position="39" pad-key="pj4"/>
+            <pin position="40" pad-key="pj5"/>
+            <pin position="41" pad-key="pj6"/>
+            <pin position="42"/>
+            <pin position="43" pad-key="pd0"/>
+            <pin position="44" pad-key="pd1"/>
+            <pin position="45" pad-key="pd2"/>
+            <pin position="46" pad-key="pd3"/>
+            <pin position="47" pad-key="pd4"/>
+            <pin position="48" pad-key="pd5"/>
+            <pin position="49" pad-key="pd6"/>
+            <pin position="50" pad-key="pd7"/>
+            <pin position="51" pad-key="pg0"/>
+            <pin position="52" pad-key="pg1"/>
+            <pin position="53" pad-key="pc0"/>
+            <pin position="54" pad-key="pc1"/>
+            <pin position="55" pad-key="pc2"/>
+            <pin position="56" pad-key="pc3"/>
+            <pin position="57" pad-key="pc4"/>
+            <pin position="58" pad-key="pc5"/>
+            <pin position="59"/>
+            <pin position="60"/>
+            <pin position="61"/>
+            <pin position="62"/>
+            <pin position="63" pad-key="ph0"/>
+            <pin position="64" pad-key="ph1"/>
+            <pin position="65" pad-key="ph2"/>
+            <pin position="66" pad-key="ph3"/>
+            <pin position="67"/>
+            <pin position="68" pad-key="pc6"/>
+            <pin position="69" pad-key="pc7"/>
+            <pin position="70" pad-key="pg2"/>
+            <pin position="71" pad-key="pa7"/>
+            <pin position="72" pad-key="pa6"/>
+            <pin position="73" pad-key="pa5"/>
+            <pin position="74" pad-key="pa4"/>
+            <pin position="75" pad-key="pa3"/>
+            <pin position="76" pad-key="pa2"/>
+            <pin position="77" pad-key="pa1"/>
+            <pin position="78" pad-key="pa0"/>
+            <pin position="79"/>
+            <pin position="80" pad-key="vcc"/>
+            <pin position="81" pad-key="gnd"/>
+            <pin position="82"/>
+            <pin position="83"/>
+            <pin position="84" pad-key="ph4"/>
+            <pin position="85" pad-key="ph5"/>
+            <pin position="86" pad-key="ph6"/>
+            <pin position="87" pad-key="ph7"/>
+            <pin position="88"/>
+            <pin position="89"/>
+            <pin position="90" pad-key="pf7"/>
+            <pin position="91" pad-key="pf6"/>
+            <pin position="92" pad-key="pf5"/>
+            <pin position="93" pad-key="pf4"/>
+            <pin position="94" pad-key="pf3"/>
+            <pin position="95" pad-key="pf2"/>
+            <pin position="96" pad-key="pf1"/>
+            <pin position="97" pad-key="pf0"/>
+            <pin position="98" pad-key="aref"/>
+            <pin position="99" pad-key="agnd"/>
+            <pin position="100" pad-key="avcc"/>
         </pinout>
     </pinouts>
     <variants>
-        <variant name="ATmega3290-16AU" pinout-key="qfp100" package="TQFP100"/>
+        <variant key="atmega3290_16au" name="ATmega3290-16AU" pinout-key="qfp100"/>
     </variants>
 </device>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA3290A.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA3290A.xml
index 188b73c7..0c481e0a 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA3290A.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA3290A.xml
@@ -212,115 +212,115 @@
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pa2" index="2" function="PORTA" group="P"/>
-                <signal pad-id="pa3" index="3" function="PORTA" group="P"/>
-                <signal pad-id="pa4" index="4" function="PORTA" group="P"/>
-                <signal pad-id="pa5" index="5" function="PORTA" group="P"/>
-                <signal pad-id="pa6" index="6" function="PORTA" group="P"/>
-                <signal pad-id="pa7" index="7" function="PORTA" group="P"/>
+                <signal pad-key="pa0" index="0" function="PORTA" group="P"/>
+                <signal pad-key="pa1" index="1" function="PORTA" group="P"/>
+                <signal pad-key="pa2" index="2" function="PORTA" group="P"/>
+                <signal pad-key="pa3" index="3" function="PORTA" group="P"/>
+                <signal pad-key="pa4" index="4" function="PORTA" group="P"/>
+                <signal pad-key="pa5" index="5" function="PORTA" group="P"/>
+                <signal pad-key="pa6" index="6" function="PORTA" group="P"/>
+                <signal pad-key="pa7" index="7" function="PORTA" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pb2" index="2" function="PORTB" group="P"/>
-                <signal pad-id="pb3" index="3" function="PORTB" group="P"/>
-                <signal pad-id="pb4" index="4" function="PORTB" group="P"/>
-                <signal pad-id="pb5" index="5" function="PORTB" group="P"/>
-                <signal pad-id="pb6" index="6" function="PORTB" group="P"/>
-                <signal pad-id="pb7" index="7" function="PORTB" group="P"/>
+                <signal pad-key="pb0" index="0" function="PORTB" group="P"/>
+                <signal pad-key="pb1" index="1" function="PORTB" group="P"/>
+                <signal pad-key="pb2" index="2" function="PORTB" group="P"/>
+                <signal pad-key="pb3" index="3" function="PORTB" group="P"/>
+                <signal pad-key="pb4" index="4" function="PORTB" group="P"/>
+                <signal pad-key="pb5" index="5" function="PORTB" group="P"/>
+                <signal pad-key="pb6" index="6" function="PORTB" group="P"/>
+                <signal pad-key="pb7" index="7" function="PORTB" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pc2" index="2" function="PORTC" group="P"/>
-                <signal pad-id="pc3" index="3" function="PORTC" group="P"/>
-                <signal pad-id="pc4" index="4" function="PORTC" group="P"/>
-                <signal pad-id="pc5" index="5" function="PORTC" group="P"/>
-                <signal pad-id="pc6" index="6" function="PORTC" group="P"/>
-                <signal pad-id="pc7" index="7" function="PORTC" group="P"/>
+                <signal pad-key="pc0" index="0" function="PORTC" group="P"/>
+                <signal pad-key="pc1" index="1" function="PORTC" group="P"/>
+                <signal pad-key="pc2" index="2" function="PORTC" group="P"/>
+                <signal pad-key="pc3" index="3" function="PORTC" group="P"/>
+                <signal pad-key="pc4" index="4" function="PORTC" group="P"/>
+                <signal pad-key="pc5" index="5" function="PORTC" group="P"/>
+                <signal pad-key="pc6" index="6" function="PORTC" group="P"/>
+                <signal pad-key="pc7" index="7" function="PORTC" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pd2" index="2" function="PORTD" group="P"/>
-                <signal pad-id="pd3" index="3" function="PORTD" group="P"/>
-                <signal pad-id="pd4" index="4" function="PORTD" group="P"/>
-                <signal pad-id="pd5" index="5" function="PORTD" group="P"/>
-                <signal pad-id="pd6" index="6" function="PORTD" group="P"/>
-                <signal pad-id="pd7" index="7" function="PORTD" group="P"/>
+                <signal pad-key="pd0" index="0" function="PORTD" group="P"/>
+                <signal pad-key="pd1" index="1" function="PORTD" group="P"/>
+                <signal pad-key="pd2" index="2" function="PORTD" group="P"/>
+                <signal pad-key="pd3" index="3" function="PORTD" group="P"/>
+                <signal pad-key="pd4" index="4" function="PORTD" group="P"/>
+                <signal pad-key="pd5" index="5" function="PORTD" group="P"/>
+                <signal pad-key="pd6" index="6" function="PORTD" group="P"/>
+                <signal pad-key="pd7" index="7" function="PORTD" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="porte" name="PORTE" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pe2" index="2" function="PORTE" group="P"/>
-                <signal pad-id="pe3" index="3" function="PORTE" group="P"/>
-                <signal pad-id="pe4" index="4" function="PORTE" group="P"/>
-                <signal pad-id="pe5" index="5" function="PORTE" group="P"/>
-                <signal pad-id="pe6" index="6" function="PORTE" group="P"/>
-                <signal pad-id="pe7" index="7" function="PORTE" group="P"/>
+                <signal pad-key="pe0" index="0" function="PORTE" group="P"/>
+                <signal pad-key="pe1" index="1" function="PORTE" group="P"/>
+                <signal pad-key="pe2" index="2" function="PORTE" group="P"/>
+                <signal pad-key="pe3" index="3" function="PORTE" group="P"/>
+                <signal pad-key="pe4" index="4" function="PORTE" group="P"/>
+                <signal pad-key="pe5" index="5" function="PORTE" group="P"/>
+                <signal pad-key="pe6" index="6" function="PORTE" group="P"/>
+                <signal pad-key="pe7" index="7" function="PORTE" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portf" name="PORTF" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pf2" index="2" function="PORTF" group="P"/>
-                <signal pad-id="pf3" index="3" function="PORTF" group="P"/>
-                <signal pad-id="pf4" index="4" function="PORTF" group="P"/>
-                <signal pad-id="pf5" index="5" function="PORTF" group="P"/>
-                <signal pad-id="pf6" index="6" function="PORTF" group="P"/>
-                <signal pad-id="pf7" index="7" function="PORTF" group="P"/>
+                <signal pad-key="pf0" index="0" function="PORTF" group="P"/>
+                <signal pad-key="pf1" index="1" function="PORTF" group="P"/>
+                <signal pad-key="pf2" index="2" function="PORTF" group="P"/>
+                <signal pad-key="pf3" index="3" function="PORTF" group="P"/>
+                <signal pad-key="pf4" index="4" function="PORTF" group="P"/>
+                <signal pad-key="pf5" index="5" function="PORTF" group="P"/>
+                <signal pad-key="pf6" index="6" function="PORTF" group="P"/>
+                <signal pad-key="pf7" index="7" function="PORTF" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portg" name="PORTG" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pg2" index="2" function="PORTG" group="P"/>
-                <signal pad-id="pg3" index="3" function="PORTG" group="P"/>
-                <signal pad-id="pg4" index="4" function="PORTG" group="P"/>
-                <signal pad-id="pg5" index="5" function="PORTG" group="P"/>
+                <signal pad-key="pg0" index="0" function="PORTG" group="P"/>
+                <signal pad-key="pg1" index="1" function="PORTG" group="P"/>
+                <signal pad-key="pg2" index="2" function="PORTG" group="P"/>
+                <signal pad-key="pg3" index="3" function="PORTG" group="P"/>
+                <signal pad-key="pg4" index="4" function="PORTG" group="P"/>
+                <signal pad-key="pg5" index="5" function="PORTG" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="porth" name="PORTH" module-key="gpio_port">
             <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"/>
-                <signal pad-id="ph2" index="2" function="PORTH" group="P"/>
-                <signal pad-id="ph3" index="3" function="PORTH" group="P"/>
-                <signal pad-id="ph4" index="4" function="PORTH" group="P"/>
-                <signal pad-id="ph5" index="5" function="PORTH" group="P"/>
-                <signal pad-id="ph6" index="6" function="PORTH" group="P"/>
-                <signal pad-id="ph7" index="7" function="PORTH" group="P"/>
+                <signal pad-key="ph0" index="0" function="PORTH" group="P"/>
+                <signal pad-key="ph1" index="1" function="PORTH" group="P"/>
+                <signal pad-key="ph2" index="2" function="PORTH" group="P"/>
+                <signal pad-key="ph3" index="3" function="PORTH" group="P"/>
+                <signal pad-key="ph4" index="4" function="PORTH" group="P"/>
+                <signal pad-key="ph5" index="5" function="PORTH" group="P"/>
+                <signal pad-key="ph6" index="6" function="PORTH" group="P"/>
+                <signal pad-key="ph7" index="7" function="PORTH" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portj" name="PORTJ" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pj2" index="2" function="PORTJ" group="P"/>
-                <signal pad-id="pj3" index="3" function="PORTJ" group="P"/>
-                <signal pad-id="pj4" index="4" function="PORTJ" group="P"/>
-                <signal pad-id="pj5" index="5" function="PORTJ" group="P"/>
-                <signal pad-id="pj6" index="6" function="PORTJ" group="P"/>
+                <signal pad-key="pj0" index="0" function="PORTJ" group="P"/>
+                <signal pad-key="pj1" index="1" function="PORTJ" group="P"/>
+                <signal pad-key="pj2" index="2" function="PORTJ" group="P"/>
+                <signal pad-key="pj3" index="3" function="PORTJ" group="P"/>
+                <signal pad-key="pj4" index="4" function="PORTJ" group="P"/>
+                <signal pad-key="pj5" index="5" function="PORTJ" group="P"/>
+                <signal pad-key="pj6" index="6" function="PORTJ" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="ac" name="AC" module-key="ac">
@@ -817,111 +817,190 @@
             </register-group>
         </module>
     </modules>
+    <pads>
+        <pad key="lcdcap" name="LCDCAP"/>
+        <pad key="pe0" name="PE0"/>
+        <pad key="pe1" name="PE1"/>
+        <pad key="pe2" name="PE2"/>
+        <pad key="pe3" name="PE3"/>
+        <pad key="pe4" name="PE4"/>
+        <pad key="pe5" name="PE5"/>
+        <pad key="pe6" name="PE6"/>
+        <pad key="pe7" name="PE7"/>
+        <pad key="vcc" name="VCC"/>
+        <pad key="gnd" name="GND"/>
+        <pad key="pj0" name="PJ0"/>
+        <pad key="pj1" name="PJ1"/>
+        <pad key="pb0" name="PB0"/>
+        <pad key="pb1" name="PB1"/>
+        <pad key="pb2" name="PB2"/>
+        <pad key="pb3" name="PB3"/>
+        <pad key="pb4" name="PB4"/>
+        <pad key="pb5" name="PB5"/>
+        <pad key="pb6" name="PB6"/>
+        <pad key="pb7" name="PB7"/>
+        <pad key="pg3" name="PG3"/>
+        <pad key="pg4" name="PG4"/>
+        <pad key="pg5" name="PG5"/>
+        <pad key="xtal2" name="XTAL2"/>
+        <pad key="xtal1" name="XTAL1"/>
+        <pad key="pj2" name="PJ2"/>
+        <pad key="pj3" name="PJ3"/>
+        <pad key="pj4" name="PJ4"/>
+        <pad key="pj5" name="PJ5"/>
+        <pad key="pj6" name="PJ6"/>
+        <pad key="pd0" name="PD0"/>
+        <pad key="pd1" name="PD1"/>
+        <pad key="pd2" name="PD2"/>
+        <pad key="pd3" name="PD3"/>
+        <pad key="pd4" name="PD4"/>
+        <pad key="pd5" name="PD5"/>
+        <pad key="pd6" name="PD6"/>
+        <pad key="pd7" name="PD7"/>
+        <pad key="pg0" name="PG0"/>
+        <pad key="pg1" name="PG1"/>
+        <pad key="pc0" name="PC0"/>
+        <pad key="pc1" name="PC1"/>
+        <pad key="pc2" name="PC2"/>
+        <pad key="pc3" name="PC3"/>
+        <pad key="pc4" name="PC4"/>
+        <pad key="pc5" name="PC5"/>
+        <pad key="ph0" name="PH0"/>
+        <pad key="ph1" name="PH1"/>
+        <pad key="ph2" name="PH2"/>
+        <pad key="ph3" name="PH3"/>
+        <pad key="pc6" name="PC6"/>
+        <pad key="pc7" name="PC7"/>
+        <pad key="pg2" name="PG2"/>
+        <pad key="pa7" name="PA7"/>
+        <pad key="pa6" name="PA6"/>
+        <pad key="pa5" name="PA5"/>
+        <pad key="pa4" name="PA4"/>
+        <pad key="pa3" name="PA3"/>
+        <pad key="pa2" name="PA2"/>
+        <pad key="pa1" name="PA1"/>
+        <pad key="pa0" name="PA0"/>
+        <pad key="ph4" name="PH4"/>
+        <pad key="ph5" name="PH5"/>
+        <pad key="ph6" name="PH6"/>
+        <pad key="ph7" name="PH7"/>
+        <pad key="pf7" name="PF7"/>
+        <pad key="pf6" name="PF6"/>
+        <pad key="pf5" name="PF5"/>
+        <pad key="pf4" name="PF4"/>
+        <pad key="pf3" name="PF3"/>
+        <pad key="pf2" name="PF2"/>
+        <pad key="pf1" name="PF1"/>
+        <pad key="pf0" name="PF0"/>
+        <pad key="aref" name="AREF"/>
+        <pad key="agnd" name="AGND"/>
+        <pad key="avcc" name="AVCC"/>
+    </pads>
     <pinouts>
         <pinout key="qfp100" name="QFP100" type="qfp">
-            <pin position="1" pad="LCDCAP"/>
-            <pin position="2" pad="PE0"/>
-            <pin position="3" pad="PE1"/>
-            <pin position="4" pad="PE2"/>
-            <pin position="5" pad="PE3"/>
-            <pin position="6" pad="PE4"/>
-            <pin position="7" pad="PE5"/>
-            <pin position="8" pad="PE6"/>
-            <pin position="9" pad="PE7"/>
-            <pin position="10" pad="VCC"/>
-            <pin position="11" pad="GND"/>
-            <pin position="12" pad="NC"/>
-            <pin position="13" pad="PJ0"/>
-            <pin position="14" pad="PJ1"/>
-            <pin position="15" pad="NC"/>
-            <pin position="16" pad="NC"/>
-            <pin position="17" pad="NC"/>
-            <pin position="18" pad="NC"/>
-            <pin position="19" pad="PB0"/>
-            <pin position="20" pad="PB1"/>
-            <pin position="21" pad="PB2"/>
-            <pin position="22" pad="PB3"/>
-            <pin position="23" pad="PB4"/>
-            <pin position="24" pad="PB5"/>
-            <pin position="25" pad="PB6"/>
-            <pin position="26" pad="PB7"/>
-            <pin position="27" pad="NC"/>
-            <pin position="28" pad="PG3"/>
-            <pin position="29" pad="PG4"/>
-            <pin position="30" pad="PG5"/>
-            <pin position="31" pad="VCC"/>
-            <pin position="32" pad="GND"/>
-            <pin position="33" pad="XTAL2"/>
-            <pin position="34" pad="XTAL1"/>
-            <pin position="35" pad="NC"/>
-            <pin position="36" pad="NC"/>
-            <pin position="37" pad="PJ2"/>
-            <pin position="38" pad="PJ3"/>
-            <pin position="39" pad="PJ4"/>
-            <pin position="40" pad="PJ5"/>
-            <pin position="41" pad="PJ6"/>
-            <pin position="42" pad="NC"/>
-            <pin position="43" pad="PD0"/>
-            <pin position="44" pad="PD1"/>
-            <pin position="45" pad="PD2"/>
-            <pin position="46" pad="PD3"/>
-            <pin position="47" pad="PD4"/>
-            <pin position="48" pad="PD5"/>
-            <pin position="49" pad="PD6"/>
-            <pin position="50" pad="PD7"/>
-            <pin position="51" pad="PG0"/>
-            <pin position="52" pad="PG1"/>
-            <pin position="53" pad="PC0"/>
-            <pin position="54" pad="PC1"/>
-            <pin position="55" pad="PC2"/>
-            <pin position="56" pad="PC3"/>
-            <pin position="57" pad="PC4"/>
-            <pin position="58" pad="PC5"/>
-            <pin position="59" pad="NC"/>
-            <pin position="60" pad="NC"/>
-            <pin position="61" pad="NC"/>
-            <pin position="62" pad="NC"/>
-            <pin position="63" pad="PH0"/>
-            <pin position="64" pad="PH1"/>
-            <pin position="65" pad="PH2"/>
-            <pin position="66" pad="PH3"/>
-            <pin position="67" pad="NC"/>
-            <pin position="68" pad="PC6"/>
-            <pin position="69" pad="PC7"/>
-            <pin position="70" pad="PG2"/>
-            <pin position="71" pad="PA7"/>
-            <pin position="72" pad="PA6"/>
-            <pin position="73" pad="PA5"/>
-            <pin position="74" pad="PA4"/>
-            <pin position="75" pad="PA3"/>
-            <pin position="76" pad="PA2"/>
-            <pin position="77" pad="PA1"/>
-            <pin position="78" pad="PA0"/>
-            <pin position="79" pad="NC"/>
-            <pin position="80" pad="VCC"/>
-            <pin position="81" pad="GND"/>
-            <pin position="82" pad="NC"/>
-            <pin position="83" pad="NC"/>
-            <pin position="84" pad="PH4"/>
-            <pin position="85" pad="PH5"/>
-            <pin position="86" pad="PH6"/>
-            <pin position="87" pad="PH7"/>
-            <pin position="88" pad="NC"/>
-            <pin position="89" pad="NC"/>
-            <pin position="90" pad="PF7"/>
-            <pin position="91" pad="PF6"/>
-            <pin position="92" pad="PF5"/>
-            <pin position="93" pad="PF4"/>
-            <pin position="94" pad="PF3"/>
-            <pin position="95" pad="PF2"/>
-            <pin position="96" pad="PF1"/>
-            <pin position="97" pad="PF0"/>
-            <pin position="98" pad="AREF"/>
-            <pin position="99" pad="AGND"/>
-            <pin position="100" pad="AVCC"/>
+            <pin position="1" pad-key="lcdcap"/>
+            <pin position="2" pad-key="pe0"/>
+            <pin position="3" pad-key="pe1"/>
+            <pin position="4" pad-key="pe2"/>
+            <pin position="5" pad-key="pe3"/>
+            <pin position="6" pad-key="pe4"/>
+            <pin position="7" pad-key="pe5"/>
+            <pin position="8" pad-key="pe6"/>
+            <pin position="9" pad-key="pe7"/>
+            <pin position="10" pad-key="vcc"/>
+            <pin position="11" pad-key="gnd"/>
+            <pin position="12"/>
+            <pin position="13" pad-key="pj0"/>
+            <pin position="14" pad-key="pj1"/>
+            <pin position="15"/>
+            <pin position="16"/>
+            <pin position="17"/>
+            <pin position="18"/>
+            <pin position="19" pad-key="pb0"/>
+            <pin position="20" pad-key="pb1"/>
+            <pin position="21" pad-key="pb2"/>
+            <pin position="22" pad-key="pb3"/>
+            <pin position="23" pad-key="pb4"/>
+            <pin position="24" pad-key="pb5"/>
+            <pin position="25" pad-key="pb6"/>
+            <pin position="26" pad-key="pb7"/>
+            <pin position="27"/>
+            <pin position="28" pad-key="pg3"/>
+            <pin position="29" pad-key="pg4"/>
+            <pin position="30" pad-key="pg5"/>
+            <pin position="31" pad-key="vcc"/>
+            <pin position="32" pad-key="gnd"/>
+            <pin position="33" pad-key="xtal2"/>
+            <pin position="34" pad-key="xtal1"/>
+            <pin position="35"/>
+            <pin position="36"/>
+            <pin position="37" pad-key="pj2"/>
+            <pin position="38" pad-key="pj3"/>
+            <pin position="39" pad-key="pj4"/>
+            <pin position="40" pad-key="pj5"/>
+            <pin position="41" pad-key="pj6"/>
+            <pin position="42"/>
+            <pin position="43" pad-key="pd0"/>
+            <pin position="44" pad-key="pd1"/>
+            <pin position="45" pad-key="pd2"/>
+            <pin position="46" pad-key="pd3"/>
+            <pin position="47" pad-key="pd4"/>
+            <pin position="48" pad-key="pd5"/>
+            <pin position="49" pad-key="pd6"/>
+            <pin position="50" pad-key="pd7"/>
+            <pin position="51" pad-key="pg0"/>
+            <pin position="52" pad-key="pg1"/>
+            <pin position="53" pad-key="pc0"/>
+            <pin position="54" pad-key="pc1"/>
+            <pin position="55" pad-key="pc2"/>
+            <pin position="56" pad-key="pc3"/>
+            <pin position="57" pad-key="pc4"/>
+            <pin position="58" pad-key="pc5"/>
+            <pin position="59"/>
+            <pin position="60"/>
+            <pin position="61"/>
+            <pin position="62"/>
+            <pin position="63" pad-key="ph0"/>
+            <pin position="64" pad-key="ph1"/>
+            <pin position="65" pad-key="ph2"/>
+            <pin position="66" pad-key="ph3"/>
+            <pin position="67"/>
+            <pin position="68" pad-key="pc6"/>
+            <pin position="69" pad-key="pc7"/>
+            <pin position="70" pad-key="pg2"/>
+            <pin position="71" pad-key="pa7"/>
+            <pin position="72" pad-key="pa6"/>
+            <pin position="73" pad-key="pa5"/>
+            <pin position="74" pad-key="pa4"/>
+            <pin position="75" pad-key="pa3"/>
+            <pin position="76" pad-key="pa2"/>
+            <pin position="77" pad-key="pa1"/>
+            <pin position="78" pad-key="pa0"/>
+            <pin position="79"/>
+            <pin position="80" pad-key="vcc"/>
+            <pin position="81" pad-key="gnd"/>
+            <pin position="82"/>
+            <pin position="83"/>
+            <pin position="84" pad-key="ph4"/>
+            <pin position="85" pad-key="ph5"/>
+            <pin position="86" pad-key="ph6"/>
+            <pin position="87" pad-key="ph7"/>
+            <pin position="88"/>
+            <pin position="89"/>
+            <pin position="90" pad-key="pf7"/>
+            <pin position="91" pad-key="pf6"/>
+            <pin position="92" pad-key="pf5"/>
+            <pin position="93" pad-key="pf4"/>
+            <pin position="94" pad-key="pf3"/>
+            <pin position="95" pad-key="pf2"/>
+            <pin position="96" pad-key="pf1"/>
+            <pin position="97" pad-key="pf0"/>
+            <pin position="98" pad-key="aref"/>
+            <pin position="99" pad-key="agnd"/>
+            <pin position="100" pad-key="avcc"/>
         </pinout>
     </pinouts>
     <variants>
-        <variant name="ATmega3290A-AU" pinout-key="qfp100" package="TQFP100"/>
+        <variant key="atmega3290a_au" name="ATmega3290A-AU" pinout-key="qfp100"/>
     </variants>
 </device>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA3290P.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA3290P.xml
index c0cbf860..92345f00 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA3290P.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA3290P.xml
@@ -212,115 +212,115 @@
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pa2" index="2" function="PORTA" group="P"/>
-                <signal pad-id="pa3" index="3" function="PORTA" group="P"/>
-                <signal pad-id="pa4" index="4" function="PORTA" group="P"/>
-                <signal pad-id="pa5" index="5" function="PORTA" group="P"/>
-                <signal pad-id="pa6" index="6" function="PORTA" group="P"/>
-                <signal pad-id="pa7" index="7" function="PORTA" group="P"/>
+                <signal pad-key="pa0" index="0" function="PORTA" group="P"/>
+                <signal pad-key="pa1" index="1" function="PORTA" group="P"/>
+                <signal pad-key="pa2" index="2" function="PORTA" group="P"/>
+                <signal pad-key="pa3" index="3" function="PORTA" group="P"/>
+                <signal pad-key="pa4" index="4" function="PORTA" group="P"/>
+                <signal pad-key="pa5" index="5" function="PORTA" group="P"/>
+                <signal pad-key="pa6" index="6" function="PORTA" group="P"/>
+                <signal pad-key="pa7" index="7" function="PORTA" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pb2" index="2" function="PORTB" group="P"/>
-                <signal pad-id="pb3" index="3" function="PORTB" group="P"/>
-                <signal pad-id="pb4" index="4" function="PORTB" group="P"/>
-                <signal pad-id="pb5" index="5" function="PORTB" group="P"/>
-                <signal pad-id="pb6" index="6" function="PORTB" group="P"/>
-                <signal pad-id="pb7" index="7" function="PORTB" group="P"/>
+                <signal pad-key="pb0" index="0" function="PORTB" group="P"/>
+                <signal pad-key="pb1" index="1" function="PORTB" group="P"/>
+                <signal pad-key="pb2" index="2" function="PORTB" group="P"/>
+                <signal pad-key="pb3" index="3" function="PORTB" group="P"/>
+                <signal pad-key="pb4" index="4" function="PORTB" group="P"/>
+                <signal pad-key="pb5" index="5" function="PORTB" group="P"/>
+                <signal pad-key="pb6" index="6" function="PORTB" group="P"/>
+                <signal pad-key="pb7" index="7" function="PORTB" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pc2" index="2" function="PORTC" group="P"/>
-                <signal pad-id="pc3" index="3" function="PORTC" group="P"/>
-                <signal pad-id="pc4" index="4" function="PORTC" group="P"/>
-                <signal pad-id="pc5" index="5" function="PORTC" group="P"/>
-                <signal pad-id="pc6" index="6" function="PORTC" group="P"/>
-                <signal pad-id="pc7" index="7" function="PORTC" group="P"/>
+                <signal pad-key="pc0" index="0" function="PORTC" group="P"/>
+                <signal pad-key="pc1" index="1" function="PORTC" group="P"/>
+                <signal pad-key="pc2" index="2" function="PORTC" group="P"/>
+                <signal pad-key="pc3" index="3" function="PORTC" group="P"/>
+                <signal pad-key="pc4" index="4" function="PORTC" group="P"/>
+                <signal pad-key="pc5" index="5" function="PORTC" group="P"/>
+                <signal pad-key="pc6" index="6" function="PORTC" group="P"/>
+                <signal pad-key="pc7" index="7" function="PORTC" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pd2" index="2" function="PORTD" group="P"/>
-                <signal pad-id="pd3" index="3" function="PORTD" group="P"/>
-                <signal pad-id="pd4" index="4" function="PORTD" group="P"/>
-                <signal pad-id="pd5" index="5" function="PORTD" group="P"/>
-                <signal pad-id="pd6" index="6" function="PORTD" group="P"/>
-                <signal pad-id="pd7" index="7" function="PORTD" group="P"/>
+                <signal pad-key="pd0" index="0" function="PORTD" group="P"/>
+                <signal pad-key="pd1" index="1" function="PORTD" group="P"/>
+                <signal pad-key="pd2" index="2" function="PORTD" group="P"/>
+                <signal pad-key="pd3" index="3" function="PORTD" group="P"/>
+                <signal pad-key="pd4" index="4" function="PORTD" group="P"/>
+                <signal pad-key="pd5" index="5" function="PORTD" group="P"/>
+                <signal pad-key="pd6" index="6" function="PORTD" group="P"/>
+                <signal pad-key="pd7" index="7" function="PORTD" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="porte" name="PORTE" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pe2" index="2" function="PORTE" group="P"/>
-                <signal pad-id="pe3" index="3" function="PORTE" group="P"/>
-                <signal pad-id="pe4" index="4" function="PORTE" group="P"/>
-                <signal pad-id="pe5" index="5" function="PORTE" group="P"/>
-                <signal pad-id="pe6" index="6" function="PORTE" group="P"/>
-                <signal pad-id="pe7" index="7" function="PORTE" group="P"/>
+                <signal pad-key="pe0" index="0" function="PORTE" group="P"/>
+                <signal pad-key="pe1" index="1" function="PORTE" group="P"/>
+                <signal pad-key="pe2" index="2" function="PORTE" group="P"/>
+                <signal pad-key="pe3" index="3" function="PORTE" group="P"/>
+                <signal pad-key="pe4" index="4" function="PORTE" group="P"/>
+                <signal pad-key="pe5" index="5" function="PORTE" group="P"/>
+                <signal pad-key="pe6" index="6" function="PORTE" group="P"/>
+                <signal pad-key="pe7" index="7" function="PORTE" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portf" name="PORTF" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pf2" index="2" function="PORTF" group="P"/>
-                <signal pad-id="pf3" index="3" function="PORTF" group="P"/>
-                <signal pad-id="pf4" index="4" function="PORTF" group="P"/>
-                <signal pad-id="pf5" index="5" function="PORTF" group="P"/>
-                <signal pad-id="pf6" index="6" function="PORTF" group="P"/>
-                <signal pad-id="pf7" index="7" function="PORTF" group="P"/>
+                <signal pad-key="pf0" index="0" function="PORTF" group="P"/>
+                <signal pad-key="pf1" index="1" function="PORTF" group="P"/>
+                <signal pad-key="pf2" index="2" function="PORTF" group="P"/>
+                <signal pad-key="pf3" index="3" function="PORTF" group="P"/>
+                <signal pad-key="pf4" index="4" function="PORTF" group="P"/>
+                <signal pad-key="pf5" index="5" function="PORTF" group="P"/>
+                <signal pad-key="pf6" index="6" function="PORTF" group="P"/>
+                <signal pad-key="pf7" index="7" function="PORTF" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portg" name="PORTG" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pg2" index="2" function="PORTG" group="P"/>
-                <signal pad-id="pg3" index="3" function="PORTG" group="P"/>
-                <signal pad-id="pg4" index="4" function="PORTG" group="P"/>
-                <signal pad-id="pg5" index="5" function="PORTG" group="P"/>
+                <signal pad-key="pg0" index="0" function="PORTG" group="P"/>
+                <signal pad-key="pg1" index="1" function="PORTG" group="P"/>
+                <signal pad-key="pg2" index="2" function="PORTG" group="P"/>
+                <signal pad-key="pg3" index="3" function="PORTG" group="P"/>
+                <signal pad-key="pg4" index="4" function="PORTG" group="P"/>
+                <signal pad-key="pg5" index="5" function="PORTG" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="porth" name="PORTH" module-key="gpio_port">
             <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"/>
-                <signal pad-id="ph2" index="2" function="PORTH" group="P"/>
-                <signal pad-id="ph3" index="3" function="PORTH" group="P"/>
-                <signal pad-id="ph4" index="4" function="PORTH" group="P"/>
-                <signal pad-id="ph5" index="5" function="PORTH" group="P"/>
-                <signal pad-id="ph6" index="6" function="PORTH" group="P"/>
-                <signal pad-id="ph7" index="7" function="PORTH" group="P"/>
+                <signal pad-key="ph0" index="0" function="PORTH" group="P"/>
+                <signal pad-key="ph1" index="1" function="PORTH" group="P"/>
+                <signal pad-key="ph2" index="2" function="PORTH" group="P"/>
+                <signal pad-key="ph3" index="3" function="PORTH" group="P"/>
+                <signal pad-key="ph4" index="4" function="PORTH" group="P"/>
+                <signal pad-key="ph5" index="5" function="PORTH" group="P"/>
+                <signal pad-key="ph6" index="6" function="PORTH" group="P"/>
+                <signal pad-key="ph7" index="7" function="PORTH" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portj" name="PORTJ" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pj2" index="2" function="PORTJ" group="P"/>
-                <signal pad-id="pj3" index="3" function="PORTJ" group="P"/>
-                <signal pad-id="pj4" index="4" function="PORTJ" group="P"/>
-                <signal pad-id="pj5" index="5" function="PORTJ" group="P"/>
-                <signal pad-id="pj6" index="6" function="PORTJ" group="P"/>
+                <signal pad-key="pj0" index="0" function="PORTJ" group="P"/>
+                <signal pad-key="pj1" index="1" function="PORTJ" group="P"/>
+                <signal pad-key="pj2" index="2" function="PORTJ" group="P"/>
+                <signal pad-key="pj3" index="3" function="PORTJ" group="P"/>
+                <signal pad-key="pj4" index="4" function="PORTJ" group="P"/>
+                <signal pad-key="pj5" index="5" function="PORTJ" group="P"/>
+                <signal pad-key="pj6" index="6" function="PORTJ" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="ac" name="AC" module-key="ac">
@@ -823,111 +823,190 @@
             </register-group>
         </module>
     </modules>
+    <pads>
+        <pad key="lcdcap" name="LCDCAP"/>
+        <pad key="pe0" name="PE0"/>
+        <pad key="pe1" name="PE1"/>
+        <pad key="pe2" name="PE2"/>
+        <pad key="pe3" name="PE3"/>
+        <pad key="pe4" name="PE4"/>
+        <pad key="pe5" name="PE5"/>
+        <pad key="pe6" name="PE6"/>
+        <pad key="pe7" name="PE7"/>
+        <pad key="vcc" name="VCC"/>
+        <pad key="gnd" name="GND"/>
+        <pad key="pj0" name="PJ0"/>
+        <pad key="pj1" name="PJ1"/>
+        <pad key="pb0" name="PB0"/>
+        <pad key="pb1" name="PB1"/>
+        <pad key="pb2" name="PB2"/>
+        <pad key="pb3" name="PB3"/>
+        <pad key="pb4" name="PB4"/>
+        <pad key="pb5" name="PB5"/>
+        <pad key="pb6" name="PB6"/>
+        <pad key="pb7" name="PB7"/>
+        <pad key="pg3" name="PG3"/>
+        <pad key="pg4" name="PG4"/>
+        <pad key="pg5" name="PG5"/>
+        <pad key="xtal2" name="XTAL2"/>
+        <pad key="xtal1" name="XTAL1"/>
+        <pad key="pj2" name="PJ2"/>
+        <pad key="pj3" name="PJ3"/>
+        <pad key="pj4" name="PJ4"/>
+        <pad key="pj5" name="PJ5"/>
+        <pad key="pj6" name="PJ6"/>
+        <pad key="pd0" name="PD0"/>
+        <pad key="pd1" name="PD1"/>
+        <pad key="pd2" name="PD2"/>
+        <pad key="pd3" name="PD3"/>
+        <pad key="pd4" name="PD4"/>
+        <pad key="pd5" name="PD5"/>
+        <pad key="pd6" name="PD6"/>
+        <pad key="pd7" name="PD7"/>
+        <pad key="pg0" name="PG0"/>
+        <pad key="pg1" name="PG1"/>
+        <pad key="pc0" name="PC0"/>
+        <pad key="pc1" name="PC1"/>
+        <pad key="pc2" name="PC2"/>
+        <pad key="pc3" name="PC3"/>
+        <pad key="pc4" name="PC4"/>
+        <pad key="pc5" name="PC5"/>
+        <pad key="ph0" name="PH0"/>
+        <pad key="ph1" name="PH1"/>
+        <pad key="ph2" name="PH2"/>
+        <pad key="ph3" name="PH3"/>
+        <pad key="pc6" name="PC6"/>
+        <pad key="pc7" name="PC7"/>
+        <pad key="pg2" name="PG2"/>
+        <pad key="pa7" name="PA7"/>
+        <pad key="pa6" name="PA6"/>
+        <pad key="pa5" name="PA5"/>
+        <pad key="pa4" name="PA4"/>
+        <pad key="pa3" name="PA3"/>
+        <pad key="pa2" name="PA2"/>
+        <pad key="pa1" name="PA1"/>
+        <pad key="pa0" name="PA0"/>
+        <pad key="ph4" name="PH4"/>
+        <pad key="ph5" name="PH5"/>
+        <pad key="ph6" name="PH6"/>
+        <pad key="ph7" name="PH7"/>
+        <pad key="pf7" name="PF7"/>
+        <pad key="pf6" name="PF6"/>
+        <pad key="pf5" name="PF5"/>
+        <pad key="pf4" name="PF4"/>
+        <pad key="pf3" name="PF3"/>
+        <pad key="pf2" name="PF2"/>
+        <pad key="pf1" name="PF1"/>
+        <pad key="pf0" name="PF0"/>
+        <pad key="aref" name="AREF"/>
+        <pad key="agnd" name="AGND"/>
+        <pad key="avcc" name="AVCC"/>
+    </pads>
     <pinouts>
         <pinout key="qfp100" name="QFP100" type="qfp">
-            <pin position="1" pad="LCDCAP"/>
-            <pin position="2" pad="PE0"/>
-            <pin position="3" pad="PE1"/>
-            <pin position="4" pad="PE2"/>
-            <pin position="5" pad="PE3"/>
-            <pin position="6" pad="PE4"/>
-            <pin position="7" pad="PE5"/>
-            <pin position="8" pad="PE6"/>
-            <pin position="9" pad="PE7"/>
-            <pin position="10" pad="VCC"/>
-            <pin position="11" pad="GND"/>
-            <pin position="12" pad="NC"/>
-            <pin position="13" pad="PJ0"/>
-            <pin position="14" pad="PJ1"/>
-            <pin position="15" pad="NC"/>
-            <pin position="16" pad="NC"/>
-            <pin position="17" pad="NC"/>
-            <pin position="18" pad="NC"/>
-            <pin position="19" pad="PB0"/>
-            <pin position="20" pad="PB1"/>
-            <pin position="21" pad="PB2"/>
-            <pin position="22" pad="PB3"/>
-            <pin position="23" pad="PB4"/>
-            <pin position="24" pad="PB5"/>
-            <pin position="25" pad="PB6"/>
-            <pin position="26" pad="PB7"/>
-            <pin position="27" pad="NC"/>
-            <pin position="28" pad="PG3"/>
-            <pin position="29" pad="PG4"/>
-            <pin position="30" pad="PG5"/>
-            <pin position="31" pad="VCC"/>
-            <pin position="32" pad="GND"/>
-            <pin position="33" pad="XTAL2"/>
-            <pin position="34" pad="XTAL1"/>
-            <pin position="35" pad="NC"/>
-            <pin position="36" pad="NC"/>
-            <pin position="37" pad="PJ2"/>
-            <pin position="38" pad="PJ3"/>
-            <pin position="39" pad="PJ4"/>
-            <pin position="40" pad="PJ5"/>
-            <pin position="41" pad="PJ6"/>
-            <pin position="42" pad="NC"/>
-            <pin position="43" pad="PD0"/>
-            <pin position="44" pad="PD1"/>
-            <pin position="45" pad="PD2"/>
-            <pin position="46" pad="PD3"/>
-            <pin position="47" pad="PD4"/>
-            <pin position="48" pad="PD5"/>
-            <pin position="49" pad="PD6"/>
-            <pin position="50" pad="PD7"/>
-            <pin position="51" pad="PG0"/>
-            <pin position="52" pad="PG1"/>
-            <pin position="53" pad="PC0"/>
-            <pin position="54" pad="PC1"/>
-            <pin position="55" pad="PC2"/>
-            <pin position="56" pad="PC3"/>
-            <pin position="57" pad="PC4"/>
-            <pin position="58" pad="PC5"/>
-            <pin position="59" pad="NC"/>
-            <pin position="60" pad="NC"/>
-            <pin position="61" pad="NC"/>
-            <pin position="62" pad="NC"/>
-            <pin position="63" pad="PH0"/>
-            <pin position="64" pad="PH1"/>
-            <pin position="65" pad="PH2"/>
-            <pin position="66" pad="PH3"/>
-            <pin position="67" pad="NC"/>
-            <pin position="68" pad="PC6"/>
-            <pin position="69" pad="PC7"/>
-            <pin position="70" pad="PG2"/>
-            <pin position="71" pad="PA7"/>
-            <pin position="72" pad="PA6"/>
-            <pin position="73" pad="PA5"/>
-            <pin position="74" pad="PA4"/>
-            <pin position="75" pad="PA3"/>
-            <pin position="76" pad="PA2"/>
-            <pin position="77" pad="PA1"/>
-            <pin position="78" pad="PA0"/>
-            <pin position="79" pad="NC"/>
-            <pin position="80" pad="VCC"/>
-            <pin position="81" pad="GND"/>
-            <pin position="82" pad="NC"/>
-            <pin position="83" pad="NC"/>
-            <pin position="84" pad="PH4"/>
-            <pin position="85" pad="PH5"/>
-            <pin position="86" pad="PH6"/>
-            <pin position="87" pad="PH7"/>
-            <pin position="88" pad="NC"/>
-            <pin position="89" pad="NC"/>
-            <pin position="90" pad="PF7"/>
-            <pin position="91" pad="PF6"/>
-            <pin position="92" pad="PF5"/>
-            <pin position="93" pad="PF4"/>
-            <pin position="94" pad="PF3"/>
-            <pin position="95" pad="PF2"/>
-            <pin position="96" pad="PF1"/>
-            <pin position="97" pad="PF0"/>
-            <pin position="98" pad="AREF"/>
-            <pin position="99" pad="AGND"/>
-            <pin position="100" pad="AVCC"/>
+            <pin position="1" pad-key="lcdcap"/>
+            <pin position="2" pad-key="pe0"/>
+            <pin position="3" pad-key="pe1"/>
+            <pin position="4" pad-key="pe2"/>
+            <pin position="5" pad-key="pe3"/>
+            <pin position="6" pad-key="pe4"/>
+            <pin position="7" pad-key="pe5"/>
+            <pin position="8" pad-key="pe6"/>
+            <pin position="9" pad-key="pe7"/>
+            <pin position="10" pad-key="vcc"/>
+            <pin position="11" pad-key="gnd"/>
+            <pin position="12"/>
+            <pin position="13" pad-key="pj0"/>
+            <pin position="14" pad-key="pj1"/>
+            <pin position="15"/>
+            <pin position="16"/>
+            <pin position="17"/>
+            <pin position="18"/>
+            <pin position="19" pad-key="pb0"/>
+            <pin position="20" pad-key="pb1"/>
+            <pin position="21" pad-key="pb2"/>
+            <pin position="22" pad-key="pb3"/>
+            <pin position="23" pad-key="pb4"/>
+            <pin position="24" pad-key="pb5"/>
+            <pin position="25" pad-key="pb6"/>
+            <pin position="26" pad-key="pb7"/>
+            <pin position="27"/>
+            <pin position="28" pad-key="pg3"/>
+            <pin position="29" pad-key="pg4"/>
+            <pin position="30" pad-key="pg5"/>
+            <pin position="31" pad-key="vcc"/>
+            <pin position="32" pad-key="gnd"/>
+            <pin position="33" pad-key="xtal2"/>
+            <pin position="34" pad-key="xtal1"/>
+            <pin position="35"/>
+            <pin position="36"/>
+            <pin position="37" pad-key="pj2"/>
+            <pin position="38" pad-key="pj3"/>
+            <pin position="39" pad-key="pj4"/>
+            <pin position="40" pad-key="pj5"/>
+            <pin position="41" pad-key="pj6"/>
+            <pin position="42"/>
+            <pin position="43" pad-key="pd0"/>
+            <pin position="44" pad-key="pd1"/>
+            <pin position="45" pad-key="pd2"/>
+            <pin position="46" pad-key="pd3"/>
+            <pin position="47" pad-key="pd4"/>
+            <pin position="48" pad-key="pd5"/>
+            <pin position="49" pad-key="pd6"/>
+            <pin position="50" pad-key="pd7"/>
+            <pin position="51" pad-key="pg0"/>
+            <pin position="52" pad-key="pg1"/>
+            <pin position="53" pad-key="pc0"/>
+            <pin position="54" pad-key="pc1"/>
+            <pin position="55" pad-key="pc2"/>
+            <pin position="56" pad-key="pc3"/>
+            <pin position="57" pad-key="pc4"/>
+            <pin position="58" pad-key="pc5"/>
+            <pin position="59"/>
+            <pin position="60"/>
+            <pin position="61"/>
+            <pin position="62"/>
+            <pin position="63" pad-key="ph0"/>
+            <pin position="64" pad-key="ph1"/>
+            <pin position="65" pad-key="ph2"/>
+            <pin position="66" pad-key="ph3"/>
+            <pin position="67"/>
+            <pin position="68" pad-key="pc6"/>
+            <pin position="69" pad-key="pc7"/>
+            <pin position="70" pad-key="pg2"/>
+            <pin position="71" pad-key="pa7"/>
+            <pin position="72" pad-key="pa6"/>
+            <pin position="73" pad-key="pa5"/>
+            <pin position="74" pad-key="pa4"/>
+            <pin position="75" pad-key="pa3"/>
+            <pin position="76" pad-key="pa2"/>
+            <pin position="77" pad-key="pa1"/>
+            <pin position="78" pad-key="pa0"/>
+            <pin position="79"/>
+            <pin position="80" pad-key="vcc"/>
+            <pin position="81" pad-key="gnd"/>
+            <pin position="82"/>
+            <pin position="83"/>
+            <pin position="84" pad-key="ph4"/>
+            <pin position="85" pad-key="ph5"/>
+            <pin position="86" pad-key="ph6"/>
+            <pin position="87" pad-key="ph7"/>
+            <pin position="88"/>
+            <pin position="89"/>
+            <pin position="90" pad-key="pf7"/>
+            <pin position="91" pad-key="pf6"/>
+            <pin position="92" pad-key="pf5"/>
+            <pin position="93" pad-key="pf4"/>
+            <pin position="94" pad-key="pf3"/>
+            <pin position="95" pad-key="pf2"/>
+            <pin position="96" pad-key="pf1"/>
+            <pin position="97" pad-key="pf0"/>
+            <pin position="98" pad-key="aref"/>
+            <pin position="99" pad-key="agnd"/>
+            <pin position="100" pad-key="avcc"/>
         </pinout>
     </pinouts>
     <variants>
-        <variant name="ATmega3290P-AU" pinout-key="qfp100" package="TQFP100"/>
+        <variant key="atmega3290p_au" name="ATmega3290P-AU" pinout-key="qfp100"/>
     </variants>
 </device>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA3290PA.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA3290PA.xml
index fd9b1bfb..64654db4 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA3290PA.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA3290PA.xml
@@ -212,115 +212,115 @@
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pa2" index="2" function="PORTA" group="P"/>
-                <signal pad-id="pa3" index="3" function="PORTA" group="P"/>
-                <signal pad-id="pa4" index="4" function="PORTA" group="P"/>
-                <signal pad-id="pa5" index="5" function="PORTA" group="P"/>
-                <signal pad-id="pa6" index="6" function="PORTA" group="P"/>
-                <signal pad-id="pa7" index="7" function="PORTA" group="P"/>
+                <signal pad-key="pa0" index="0" function="PORTA" group="P"/>
+                <signal pad-key="pa1" index="1" function="PORTA" group="P"/>
+                <signal pad-key="pa2" index="2" function="PORTA" group="P"/>
+                <signal pad-key="pa3" index="3" function="PORTA" group="P"/>
+                <signal pad-key="pa4" index="4" function="PORTA" group="P"/>
+                <signal pad-key="pa5" index="5" function="PORTA" group="P"/>
+                <signal pad-key="pa6" index="6" function="PORTA" group="P"/>
+                <signal pad-key="pa7" index="7" function="PORTA" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pb2" index="2" function="PORTB" group="P"/>
-                <signal pad-id="pb3" index="3" function="PORTB" group="P"/>
-                <signal pad-id="pb4" index="4" function="PORTB" group="P"/>
-                <signal pad-id="pb5" index="5" function="PORTB" group="P"/>
-                <signal pad-id="pb6" index="6" function="PORTB" group="P"/>
-                <signal pad-id="pb7" index="7" function="PORTB" group="P"/>
+                <signal pad-key="pb0" index="0" function="PORTB" group="P"/>
+                <signal pad-key="pb1" index="1" function="PORTB" group="P"/>
+                <signal pad-key="pb2" index="2" function="PORTB" group="P"/>
+                <signal pad-key="pb3" index="3" function="PORTB" group="P"/>
+                <signal pad-key="pb4" index="4" function="PORTB" group="P"/>
+                <signal pad-key="pb5" index="5" function="PORTB" group="P"/>
+                <signal pad-key="pb6" index="6" function="PORTB" group="P"/>
+                <signal pad-key="pb7" index="7" function="PORTB" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pc2" index="2" function="PORTC" group="P"/>
-                <signal pad-id="pc3" index="3" function="PORTC" group="P"/>
-                <signal pad-id="pc4" index="4" function="PORTC" group="P"/>
-                <signal pad-id="pc5" index="5" function="PORTC" group="P"/>
-                <signal pad-id="pc6" index="6" function="PORTC" group="P"/>
-                <signal pad-id="pc7" index="7" function="PORTC" group="P"/>
+                <signal pad-key="pc0" index="0" function="PORTC" group="P"/>
+                <signal pad-key="pc1" index="1" function="PORTC" group="P"/>
+                <signal pad-key="pc2" index="2" function="PORTC" group="P"/>
+                <signal pad-key="pc3" index="3" function="PORTC" group="P"/>
+                <signal pad-key="pc4" index="4" function="PORTC" group="P"/>
+                <signal pad-key="pc5" index="5" function="PORTC" group="P"/>
+                <signal pad-key="pc6" index="6" function="PORTC" group="P"/>
+                <signal pad-key="pc7" index="7" function="PORTC" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pd2" index="2" function="PORTD" group="P"/>
-                <signal pad-id="pd3" index="3" function="PORTD" group="P"/>
-                <signal pad-id="pd4" index="4" function="PORTD" group="P"/>
-                <signal pad-id="pd5" index="5" function="PORTD" group="P"/>
-                <signal pad-id="pd6" index="6" function="PORTD" group="P"/>
-                <signal pad-id="pd7" index="7" function="PORTD" group="P"/>
+                <signal pad-key="pd0" index="0" function="PORTD" group="P"/>
+                <signal pad-key="pd1" index="1" function="PORTD" group="P"/>
+                <signal pad-key="pd2" index="2" function="PORTD" group="P"/>
+                <signal pad-key="pd3" index="3" function="PORTD" group="P"/>
+                <signal pad-key="pd4" index="4" function="PORTD" group="P"/>
+                <signal pad-key="pd5" index="5" function="PORTD" group="P"/>
+                <signal pad-key="pd6" index="6" function="PORTD" group="P"/>
+                <signal pad-key="pd7" index="7" function="PORTD" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="porte" name="PORTE" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pe2" index="2" function="PORTE" group="P"/>
-                <signal pad-id="pe3" index="3" function="PORTE" group="P"/>
-                <signal pad-id="pe4" index="4" function="PORTE" group="P"/>
-                <signal pad-id="pe5" index="5" function="PORTE" group="P"/>
-                <signal pad-id="pe6" index="6" function="PORTE" group="P"/>
-                <signal pad-id="pe7" index="7" function="PORTE" group="P"/>
+                <signal pad-key="pe0" index="0" function="PORTE" group="P"/>
+                <signal pad-key="pe1" index="1" function="PORTE" group="P"/>
+                <signal pad-key="pe2" index="2" function="PORTE" group="P"/>
+                <signal pad-key="pe3" index="3" function="PORTE" group="P"/>
+                <signal pad-key="pe4" index="4" function="PORTE" group="P"/>
+                <signal pad-key="pe5" index="5" function="PORTE" group="P"/>
+                <signal pad-key="pe6" index="6" function="PORTE" group="P"/>
+                <signal pad-key="pe7" index="7" function="PORTE" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portf" name="PORTF" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pf2" index="2" function="PORTF" group="P"/>
-                <signal pad-id="pf3" index="3" function="PORTF" group="P"/>
-                <signal pad-id="pf4" index="4" function="PORTF" group="P"/>
-                <signal pad-id="pf5" index="5" function="PORTF" group="P"/>
-                <signal pad-id="pf6" index="6" function="PORTF" group="P"/>
-                <signal pad-id="pf7" index="7" function="PORTF" group="P"/>
+                <signal pad-key="pf0" index="0" function="PORTF" group="P"/>
+                <signal pad-key="pf1" index="1" function="PORTF" group="P"/>
+                <signal pad-key="pf2" index="2" function="PORTF" group="P"/>
+                <signal pad-key="pf3" index="3" function="PORTF" group="P"/>
+                <signal pad-key="pf4" index="4" function="PORTF" group="P"/>
+                <signal pad-key="pf5" index="5" function="PORTF" group="P"/>
+                <signal pad-key="pf6" index="6" function="PORTF" group="P"/>
+                <signal pad-key="pf7" index="7" function="PORTF" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portg" name="PORTG" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pg2" index="2" function="PORTG" group="P"/>
-                <signal pad-id="pg3" index="3" function="PORTG" group="P"/>
-                <signal pad-id="pg4" index="4" function="PORTG" group="P"/>
-                <signal pad-id="pg5" index="5" function="PORTG" group="P"/>
+                <signal pad-key="pg0" index="0" function="PORTG" group="P"/>
+                <signal pad-key="pg1" index="1" function="PORTG" group="P"/>
+                <signal pad-key="pg2" index="2" function="PORTG" group="P"/>
+                <signal pad-key="pg3" index="3" function="PORTG" group="P"/>
+                <signal pad-key="pg4" index="4" function="PORTG" group="P"/>
+                <signal pad-key="pg5" index="5" function="PORTG" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="porth" name="PORTH" module-key="gpio_port">
             <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"/>
-                <signal pad-id="ph2" index="2" function="PORTH" group="P"/>
-                <signal pad-id="ph3" index="3" function="PORTH" group="P"/>
-                <signal pad-id="ph4" index="4" function="PORTH" group="P"/>
-                <signal pad-id="ph5" index="5" function="PORTH" group="P"/>
-                <signal pad-id="ph6" index="6" function="PORTH" group="P"/>
-                <signal pad-id="ph7" index="7" function="PORTH" group="P"/>
+                <signal pad-key="ph0" index="0" function="PORTH" group="P"/>
+                <signal pad-key="ph1" index="1" function="PORTH" group="P"/>
+                <signal pad-key="ph2" index="2" function="PORTH" group="P"/>
+                <signal pad-key="ph3" index="3" function="PORTH" group="P"/>
+                <signal pad-key="ph4" index="4" function="PORTH" group="P"/>
+                <signal pad-key="ph5" index="5" function="PORTH" group="P"/>
+                <signal pad-key="ph6" index="6" function="PORTH" group="P"/>
+                <signal pad-key="ph7" index="7" function="PORTH" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portj" name="PORTJ" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pj2" index="2" function="PORTJ" group="P"/>
-                <signal pad-id="pj3" index="3" function="PORTJ" group="P"/>
-                <signal pad-id="pj4" index="4" function="PORTJ" group="P"/>
-                <signal pad-id="pj5" index="5" function="PORTJ" group="P"/>
-                <signal pad-id="pj6" index="6" function="PORTJ" group="P"/>
+                <signal pad-key="pj0" index="0" function="PORTJ" group="P"/>
+                <signal pad-key="pj1" index="1" function="PORTJ" group="P"/>
+                <signal pad-key="pj2" index="2" function="PORTJ" group="P"/>
+                <signal pad-key="pj3" index="3" function="PORTJ" group="P"/>
+                <signal pad-key="pj4" index="4" function="PORTJ" group="P"/>
+                <signal pad-key="pj5" index="5" function="PORTJ" group="P"/>
+                <signal pad-key="pj6" index="6" function="PORTJ" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="ac" name="AC" module-key="ac">
@@ -815,111 +815,190 @@
             </register-group>
         </module>
     </modules>
+    <pads>
+        <pad key="lcdcap" name="LCDCAP"/>
+        <pad key="pe0" name="PE0"/>
+        <pad key="pe1" name="PE1"/>
+        <pad key="pe2" name="PE2"/>
+        <pad key="pe3" name="PE3"/>
+        <pad key="pe4" name="PE4"/>
+        <pad key="pe5" name="PE5"/>
+        <pad key="pe6" name="PE6"/>
+        <pad key="pe7" name="PE7"/>
+        <pad key="vcc" name="VCC"/>
+        <pad key="gnd" name="GND"/>
+        <pad key="pj0" name="PJ0"/>
+        <pad key="pj1" name="PJ1"/>
+        <pad key="pb0" name="PB0"/>
+        <pad key="pb1" name="PB1"/>
+        <pad key="pb2" name="PB2"/>
+        <pad key="pb3" name="PB3"/>
+        <pad key="pb4" name="PB4"/>
+        <pad key="pb5" name="PB5"/>
+        <pad key="pb6" name="PB6"/>
+        <pad key="pb7" name="PB7"/>
+        <pad key="pg3" name="PG3"/>
+        <pad key="pg4" name="PG4"/>
+        <pad key="pg5" name="PG5"/>
+        <pad key="xtal2" name="XTAL2"/>
+        <pad key="xtal1" name="XTAL1"/>
+        <pad key="pj2" name="PJ2"/>
+        <pad key="pj3" name="PJ3"/>
+        <pad key="pj4" name="PJ4"/>
+        <pad key="pj5" name="PJ5"/>
+        <pad key="pj6" name="PJ6"/>
+        <pad key="pd0" name="PD0"/>
+        <pad key="pd1" name="PD1"/>
+        <pad key="pd2" name="PD2"/>
+        <pad key="pd3" name="PD3"/>
+        <pad key="pd4" name="PD4"/>
+        <pad key="pd5" name="PD5"/>
+        <pad key="pd6" name="PD6"/>
+        <pad key="pd7" name="PD7"/>
+        <pad key="pg0" name="PG0"/>
+        <pad key="pg1" name="PG1"/>
+        <pad key="pc0" name="PC0"/>
+        <pad key="pc1" name="PC1"/>
+        <pad key="pc2" name="PC2"/>
+        <pad key="pc3" name="PC3"/>
+        <pad key="pc4" name="PC4"/>
+        <pad key="pc5" name="PC5"/>
+        <pad key="ph0" name="PH0"/>
+        <pad key="ph1" name="PH1"/>
+        <pad key="ph2" name="PH2"/>
+        <pad key="ph3" name="PH3"/>
+        <pad key="pc6" name="PC6"/>
+        <pad key="pc7" name="PC7"/>
+        <pad key="pg2" name="PG2"/>
+        <pad key="pa7" name="PA7"/>
+        <pad key="pa6" name="PA6"/>
+        <pad key="pa5" name="PA5"/>
+        <pad key="pa4" name="PA4"/>
+        <pad key="pa3" name="PA3"/>
+        <pad key="pa2" name="PA2"/>
+        <pad key="pa1" name="PA1"/>
+        <pad key="pa0" name="PA0"/>
+        <pad key="ph4" name="PH4"/>
+        <pad key="ph5" name="PH5"/>
+        <pad key="ph6" name="PH6"/>
+        <pad key="ph7" name="PH7"/>
+        <pad key="pf7" name="PF7"/>
+        <pad key="pf6" name="PF6"/>
+        <pad key="pf5" name="PF5"/>
+        <pad key="pf4" name="PF4"/>
+        <pad key="pf3" name="PF3"/>
+        <pad key="pf2" name="PF2"/>
+        <pad key="pf1" name="PF1"/>
+        <pad key="pf0" name="PF0"/>
+        <pad key="aref" name="AREF"/>
+        <pad key="agnd" name="AGND"/>
+        <pad key="avcc" name="AVCC"/>
+    </pads>
     <pinouts>
         <pinout key="qfp100" name="QFP100" type="qfp">
-            <pin position="1" pad="LCDCAP"/>
-            <pin position="2" pad="PE0"/>
-            <pin position="3" pad="PE1"/>
-            <pin position="4" pad="PE2"/>
-            <pin position="5" pad="PE3"/>
-            <pin position="6" pad="PE4"/>
-            <pin position="7" pad="PE5"/>
-            <pin position="8" pad="PE6"/>
-            <pin position="9" pad="PE7"/>
-            <pin position="10" pad="VCC"/>
-            <pin position="11" pad="GND"/>
-            <pin position="12" pad="NC"/>
-            <pin position="13" pad="PJ0"/>
-            <pin position="14" pad="PJ1"/>
-            <pin position="15" pad="NC"/>
-            <pin position="16" pad="NC"/>
-            <pin position="17" pad="NC"/>
-            <pin position="18" pad="NC"/>
-            <pin position="19" pad="PB0"/>
-            <pin position="20" pad="PB1"/>
-            <pin position="21" pad="PB2"/>
-            <pin position="22" pad="PB3"/>
-            <pin position="23" pad="PB4"/>
-            <pin position="24" pad="PB5"/>
-            <pin position="25" pad="PB6"/>
-            <pin position="26" pad="PB7"/>
-            <pin position="27" pad="NC"/>
-            <pin position="28" pad="PG3"/>
-            <pin position="29" pad="PG4"/>
-            <pin position="30" pad="PG5"/>
-            <pin position="31" pad="VCC"/>
-            <pin position="32" pad="GND"/>
-            <pin position="33" pad="XTAL2"/>
-            <pin position="34" pad="XTAL1"/>
-            <pin position="35" pad="NC"/>
-            <pin position="36" pad="NC"/>
-            <pin position="37" pad="PJ2"/>
-            <pin position="38" pad="PJ3"/>
-            <pin position="39" pad="PJ4"/>
-            <pin position="40" pad="PJ5"/>
-            <pin position="41" pad="PJ6"/>
-            <pin position="42" pad="NC"/>
-            <pin position="43" pad="PD0"/>
-            <pin position="44" pad="PD1"/>
-            <pin position="45" pad="PD2"/>
-            <pin position="46" pad="PD3"/>
-            <pin position="47" pad="PD4"/>
-            <pin position="48" pad="PD5"/>
-            <pin position="49" pad="PD6"/>
-            <pin position="50" pad="PD7"/>
-            <pin position="51" pad="PG0"/>
-            <pin position="52" pad="PG1"/>
-            <pin position="53" pad="PC0"/>
-            <pin position="54" pad="PC1"/>
-            <pin position="55" pad="PC2"/>
-            <pin position="56" pad="PC3"/>
-            <pin position="57" pad="PC4"/>
-            <pin position="58" pad="PC5"/>
-            <pin position="59" pad="NC"/>
-            <pin position="60" pad="NC"/>
-            <pin position="61" pad="NC"/>
-            <pin position="62" pad="NC"/>
-            <pin position="63" pad="PH0"/>
-            <pin position="64" pad="PH1"/>
-            <pin position="65" pad="PH2"/>
-            <pin position="66" pad="PH3"/>
-            <pin position="67" pad="NC"/>
-            <pin position="68" pad="PC6"/>
-            <pin position="69" pad="PC7"/>
-            <pin position="70" pad="PG2"/>
-            <pin position="71" pad="PA7"/>
-            <pin position="72" pad="PA6"/>
-            <pin position="73" pad="PA5"/>
-            <pin position="74" pad="PA4"/>
-            <pin position="75" pad="PA3"/>
-            <pin position="76" pad="PA2"/>
-            <pin position="77" pad="PA1"/>
-            <pin position="78" pad="PA0"/>
-            <pin position="79" pad="NC"/>
-            <pin position="80" pad="VCC"/>
-            <pin position="81" pad="GND"/>
-            <pin position="82" pad="NC"/>
-            <pin position="83" pad="NC"/>
-            <pin position="84" pad="PH4"/>
-            <pin position="85" pad="PH5"/>
-            <pin position="86" pad="PH6"/>
-            <pin position="87" pad="PH7"/>
-            <pin position="88" pad="NC"/>
-            <pin position="89" pad="NC"/>
-            <pin position="90" pad="PF7"/>
-            <pin position="91" pad="PF6"/>
-            <pin position="92" pad="PF5"/>
-            <pin position="93" pad="PF4"/>
-            <pin position="94" pad="PF3"/>
-            <pin position="95" pad="PF2"/>
-            <pin position="96" pad="PF1"/>
-            <pin position="97" pad="PF0"/>
-            <pin position="98" pad="AREF"/>
-            <pin position="99" pad="AGND"/>
-            <pin position="100" pad="AVCC"/>
+            <pin position="1" pad-key="lcdcap"/>
+            <pin position="2" pad-key="pe0"/>
+            <pin position="3" pad-key="pe1"/>
+            <pin position="4" pad-key="pe2"/>
+            <pin position="5" pad-key="pe3"/>
+            <pin position="6" pad-key="pe4"/>
+            <pin position="7" pad-key="pe5"/>
+            <pin position="8" pad-key="pe6"/>
+            <pin position="9" pad-key="pe7"/>
+            <pin position="10" pad-key="vcc"/>
+            <pin position="11" pad-key="gnd"/>
+            <pin position="12"/>
+            <pin position="13" pad-key="pj0"/>
+            <pin position="14" pad-key="pj1"/>
+            <pin position="15"/>
+            <pin position="16"/>
+            <pin position="17"/>
+            <pin position="18"/>
+            <pin position="19" pad-key="pb0"/>
+            <pin position="20" pad-key="pb1"/>
+            <pin position="21" pad-key="pb2"/>
+            <pin position="22" pad-key="pb3"/>
+            <pin position="23" pad-key="pb4"/>
+            <pin position="24" pad-key="pb5"/>
+            <pin position="25" pad-key="pb6"/>
+            <pin position="26" pad-key="pb7"/>
+            <pin position="27"/>
+            <pin position="28" pad-key="pg3"/>
+            <pin position="29" pad-key="pg4"/>
+            <pin position="30" pad-key="pg5"/>
+            <pin position="31" pad-key="vcc"/>
+            <pin position="32" pad-key="gnd"/>
+            <pin position="33" pad-key="xtal2"/>
+            <pin position="34" pad-key="xtal1"/>
+            <pin position="35"/>
+            <pin position="36"/>
+            <pin position="37" pad-key="pj2"/>
+            <pin position="38" pad-key="pj3"/>
+            <pin position="39" pad-key="pj4"/>
+            <pin position="40" pad-key="pj5"/>
+            <pin position="41" pad-key="pj6"/>
+            <pin position="42"/>
+            <pin position="43" pad-key="pd0"/>
+            <pin position="44" pad-key="pd1"/>
+            <pin position="45" pad-key="pd2"/>
+            <pin position="46" pad-key="pd3"/>
+            <pin position="47" pad-key="pd4"/>
+            <pin position="48" pad-key="pd5"/>
+            <pin position="49" pad-key="pd6"/>
+            <pin position="50" pad-key="pd7"/>
+            <pin position="51" pad-key="pg0"/>
+            <pin position="52" pad-key="pg1"/>
+            <pin position="53" pad-key="pc0"/>
+            <pin position="54" pad-key="pc1"/>
+            <pin position="55" pad-key="pc2"/>
+            <pin position="56" pad-key="pc3"/>
+            <pin position="57" pad-key="pc4"/>
+            <pin position="58" pad-key="pc5"/>
+            <pin position="59"/>
+            <pin position="60"/>
+            <pin position="61"/>
+            <pin position="62"/>
+            <pin position="63" pad-key="ph0"/>
+            <pin position="64" pad-key="ph1"/>
+            <pin position="65" pad-key="ph2"/>
+            <pin position="66" pad-key="ph3"/>
+            <pin position="67"/>
+            <pin position="68" pad-key="pc6"/>
+            <pin position="69" pad-key="pc7"/>
+            <pin position="70" pad-key="pg2"/>
+            <pin position="71" pad-key="pa7"/>
+            <pin position="72" pad-key="pa6"/>
+            <pin position="73" pad-key="pa5"/>
+            <pin position="74" pad-key="pa4"/>
+            <pin position="75" pad-key="pa3"/>
+            <pin position="76" pad-key="pa2"/>
+            <pin position="77" pad-key="pa1"/>
+            <pin position="78" pad-key="pa0"/>
+            <pin position="79"/>
+            <pin position="80" pad-key="vcc"/>
+            <pin position="81" pad-key="gnd"/>
+            <pin position="82"/>
+            <pin position="83"/>
+            <pin position="84" pad-key="ph4"/>
+            <pin position="85" pad-key="ph5"/>
+            <pin position="86" pad-key="ph6"/>
+            <pin position="87" pad-key="ph7"/>
+            <pin position="88"/>
+            <pin position="89"/>
+            <pin position="90" pad-key="pf7"/>
+            <pin position="91" pad-key="pf6"/>
+            <pin position="92" pad-key="pf5"/>
+            <pin position="93" pad-key="pf4"/>
+            <pin position="94" pad-key="pf3"/>
+            <pin position="95" pad-key="pf2"/>
+            <pin position="96" pad-key="pf1"/>
+            <pin position="97" pad-key="pf0"/>
+            <pin position="98" pad-key="aref"/>
+            <pin position="99" pad-key="agnd"/>
+            <pin position="100" pad-key="avcc"/>
         </pinout>
     </pinouts>
     <variants>
-        <variant name="ATmega3290PA-AU" pinout-key="qfp100" package="TQFP100"/>
+        <variant key="atmega3290pa_au" name="ATmega3290PA-AU" pinout-key="qfp100"/>
     </variants>
 </device>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA329A.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA329A.xml
index 115f3065..deb34023 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA329A.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA329A.xml
@@ -194,25 +194,25 @@
         <peripheral key="tc0" name="TC0" module-key="tc8">
             <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"/>
+                <signal pad-key="pg4" function="default" group="T"/>
+                <signal pad-key="pb4" function="default" group="OCA"/>
             </signals>
         </peripheral>
         <peripheral key="tc1" name="TC1" module-key="tc16">
             <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"/>
-                <signal pad-id="pb5" function="default" group="OCA"/>
-                <signal pad-id="pb6" function="default" group="OCB"/>
-                <signal pad-id="xtal1" function="default" group="TOSC"/>
+                <signal pad-key="pg3" function="default" group="T"/>
+                <signal pad-key="pd0" function="default" group="ICP"/>
+                <signal pad-key="pb5" function="default" group="OCA"/>
+                <signal pad-key="pb6" function="default" group="OCB"/>
+                <signal pad-key="xtal1" function="default" group="TOSC"/>
             </signals>
         </peripheral>
         <peripheral key="tc2" name="TC2" module-key="tc8_async">
             <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"/>
+                <signal pad-key="pb7" function="default" group="OCA"/>
+                <signal pad-key="xtal2" function="default" group="TOSC"/>
             </signals>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="wdt">
@@ -224,197 +224,197 @@
         <peripheral key="spi" name="SPI" module-key="spi">
             <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"/>
-                <signal pad-id="pb2" function="default" group="MOSI"/>
-                <signal pad-id="pb3" function="default" group="MISO"/>
+                <signal pad-key="pb0" function="default" group="SS"/>
+                <signal pad-key="pb1" function="default" group="SCK"/>
+                <signal pad-key="pb2" function="default" group="MOSI"/>
+                <signal pad-key="pb3" function="default" group="MISO"/>
             </signals>
         </peripheral>
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pa2" index="2" function="default" group="P"/>
-                <signal pad-id="pa3" index="3" function="default" group="P"/>
-                <signal pad-id="pa4" index="4" function="default" group="P"/>
-                <signal pad-id="pa5" index="5" function="default" group="P"/>
-                <signal pad-id="pa6" index="6" function="default" group="P"/>
-                <signal pad-id="pa7" index="7" function="default" group="P"/>
+                <signal pad-key="pa0" index="0" function="default" group="P"/>
+                <signal pad-key="pa1" index="1" function="default" group="P"/>
+                <signal pad-key="pa2" index="2" function="default" group="P"/>
+                <signal pad-key="pa3" index="3" function="default" group="P"/>
+                <signal pad-key="pa4" index="4" function="default" group="P"/>
+                <signal pad-key="pa5" index="5" function="default" group="P"/>
+                <signal pad-key="pa6" index="6" function="default" group="P"/>
+                <signal pad-key="pa7" index="7" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pb2" index="2" function="default" group="P"/>
-                <signal pad-id="pb3" index="3" function="default" group="P"/>
-                <signal pad-id="pb4" index="4" function="default" group="P"/>
-                <signal pad-id="pb5" index="5" function="default" group="P"/>
-                <signal pad-id="pb6" index="6" function="default" group="P"/>
-                <signal pad-id="pb7" index="7" function="default" group="P"/>
+                <signal pad-key="pb0" index="0" function="default" group="P"/>
+                <signal pad-key="pb1" index="1" function="default" group="P"/>
+                <signal pad-key="pb2" index="2" function="default" group="P"/>
+                <signal pad-key="pb3" index="3" function="default" group="P"/>
+                <signal pad-key="pb4" index="4" function="default" group="P"/>
+                <signal pad-key="pb5" index="5" function="default" group="P"/>
+                <signal pad-key="pb6" index="6" function="default" group="P"/>
+                <signal pad-key="pb7" index="7" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pc2" index="2" function="default" group="P"/>
-                <signal pad-id="pc3" index="3" function="default" group="P"/>
-                <signal pad-id="pc4" index="4" function="default" group="P"/>
-                <signal pad-id="pc5" index="5" function="default" group="P"/>
-                <signal pad-id="pc6" index="6" function="default" group="P"/>
-                <signal pad-id="pc7" index="7" function="default" group="P"/>
+                <signal pad-key="pc0" index="0" function="default" group="P"/>
+                <signal pad-key="pc1" index="1" function="default" group="P"/>
+                <signal pad-key="pc2" index="2" function="default" group="P"/>
+                <signal pad-key="pc3" index="3" function="default" group="P"/>
+                <signal pad-key="pc4" index="4" function="default" group="P"/>
+                <signal pad-key="pc5" index="5" function="default" group="P"/>
+                <signal pad-key="pc6" index="6" function="default" group="P"/>
+                <signal pad-key="pc7" index="7" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pd2" index="2" function="default" group="P"/>
-                <signal pad-id="pd3" index="3" function="default" group="P"/>
-                <signal pad-id="pd4" index="4" function="default" group="P"/>
-                <signal pad-id="pd5" index="5" function="default" group="P"/>
-                <signal pad-id="pd6" index="6" function="default" group="P"/>
-                <signal pad-id="pd7" index="7" function="default" group="P"/>
+                <signal pad-key="pd0" index="0" function="default" group="P"/>
+                <signal pad-key="pd1" index="1" function="default" group="P"/>
+                <signal pad-key="pd2" index="2" function="default" group="P"/>
+                <signal pad-key="pd3" index="3" function="default" group="P"/>
+                <signal pad-key="pd4" index="4" function="default" group="P"/>
+                <signal pad-key="pd5" index="5" function="default" group="P"/>
+                <signal pad-key="pd6" index="6" function="default" group="P"/>
+                <signal pad-key="pd7" index="7" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="porte" name="PORTE" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pe2" index="2" function="default" group="P"/>
-                <signal pad-id="pe3" index="3" function="default" group="P"/>
-                <signal pad-id="pe4" index="4" function="default" group="P"/>
-                <signal pad-id="pe5" index="5" function="default" group="P"/>
-                <signal pad-id="pe6" index="6" function="default" group="P"/>
-                <signal pad-id="pe7" index="7" function="default" group="P"/>
+                <signal pad-key="pe0" index="0" function="default" group="P"/>
+                <signal pad-key="pe1" index="1" function="default" group="P"/>
+                <signal pad-key="pe2" index="2" function="default" group="P"/>
+                <signal pad-key="pe3" index="3" function="default" group="P"/>
+                <signal pad-key="pe4" index="4" function="default" group="P"/>
+                <signal pad-key="pe5" index="5" function="default" group="P"/>
+                <signal pad-key="pe6" index="6" function="default" group="P"/>
+                <signal pad-key="pe7" index="7" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portf" name="PORTF" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pf2" index="2" function="default" group="P"/>
-                <signal pad-id="pf3" index="3" function="default" group="P"/>
-                <signal pad-id="pf4" index="4" function="default" group="P"/>
-                <signal pad-id="pf5" index="5" function="default" group="P"/>
-                <signal pad-id="pf6" index="6" function="default" group="P"/>
-                <signal pad-id="pf7" index="7" function="default" group="P"/>
+                <signal pad-key="pf0" index="0" function="default" group="P"/>
+                <signal pad-key="pf1" index="1" function="default" group="P"/>
+                <signal pad-key="pf2" index="2" function="default" group="P"/>
+                <signal pad-key="pf3" index="3" function="default" group="P"/>
+                <signal pad-key="pf4" index="4" function="default" group="P"/>
+                <signal pad-key="pf5" index="5" function="default" group="P"/>
+                <signal pad-key="pf6" index="6" function="default" group="P"/>
+                <signal pad-key="pf7" index="7" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portg" name="PORTG" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pg2" index="2" function="default" group="P"/>
-                <signal pad-id="pg3" index="3" function="default" group="P"/>
-                <signal pad-id="pg4" index="4" function="default" group="P"/>
-                <signal pad-id="pg5" index="4" function="default" group="P"/>
+                <signal pad-key="pg0" index="0" function="default" group="P"/>
+                <signal pad-key="pg1" index="1" function="default" group="P"/>
+                <signal pad-key="pg2" index="2" function="default" group="P"/>
+                <signal pad-key="pg3" index="3" function="default" group="P"/>
+                <signal pad-key="pg4" index="4" function="default" group="P"/>
+                <signal pad-key="pg5" index="4" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="ac" name="AC" module-key="ac">
             <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"/>
+                <signal pad-key="pe2" index="0" function="default" group="AIN"/>
+                <signal pad-key="pe3" index="1" function="default" group="AIN"/>
             </signals>
         </peripheral>
         <peripheral key="jtag" name="JTAG" module-key="jtag">
             <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"/>
-                <signal pad-id="pf6" function="default" group="TDO"/>
-                <signal pad-id="pf7" function="default" group="TDI"/>
+                <signal pad-key="pf4" function="default" group="TCK"/>
+                <signal pad-key="pf5" function="default" group="TMS"/>
+                <signal pad-key="pf6" function="default" group="TDO"/>
+                <signal pad-key="pf7" function="default" group="TDI"/>
             </signals>
         </peripheral>
         <peripheral key="lcd" name="LCD" module-key="lcd">
             <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"/>
-                <signal pad-id="pa6" index="2" function="default" group="SEG"/>
-                <signal pad-id="pa7" index="3" function="default" group="SEG"/>
-                <signal pad-id="pg2" index="4" function="default" group="SEG"/>
-                <signal pad-id="pc7" index="5" function="default" group="SEG"/>
-                <signal pad-id="pc6" index="6" function="default" group="SEG"/>
-                <signal pad-id="pc5" index="7" function="default" group="SEG"/>
-                <signal pad-id="pc4" index="8" function="default" group="SEG"/>
-                <signal pad-id="pc3" index="9" function="default" group="SEG"/>
-                <signal pad-id="pc2" index="10" function="default" group="SEG"/>
-                <signal pad-id="pc1" index="11" function="default" group="SEG"/>
-                <signal pad-id="pc0" index="12" function="default" group="SEG"/>
-                <signal pad-id="pg1" index="13" function="default" group="SEG"/>
-                <signal pad-id="pg2" index="14" function="default" group="SEG"/>
-                <signal pad-id="pd7" index="15" function="default" group="SEG"/>
-                <signal pad-id="pd6" index="16" function="default" group="SEG"/>
-                <signal pad-id="pd5" index="17" function="default" group="SEG"/>
-                <signal pad-id="pd4" index="18" function="default" group="SEG"/>
-                <signal pad-id="pd3" index="19" function="default" group="SEG"/>
-                <signal pad-id="pd2" index="20" function="default" group="SEG"/>
-                <signal pad-id="pd1" index="21" function="default" group="SEG"/>
-                <signal pad-id="pd0" index="22" function="default" group="SEG"/>
-                <signal pad-id="pg4" index="23" function="default" group="SEG"/>
-                <signal pad-id="pg3" index="24" function="default" group="SEG"/>
-                <signal pad-id="pa0" index="0" function="default" group="COM"/>
-                <signal pad-id="pa1" index="1" function="default" group="COM"/>
-                <signal pad-id="pa2" index="2" function="default" group="COM"/>
-                <signal pad-id="pa3" index="3" function="default" group="COM"/>
+                <signal pad-key="pa4" index="0" function="default" group="SEG"/>
+                <signal pad-key="pa5" index="1" function="default" group="SEG"/>
+                <signal pad-key="pa6" index="2" function="default" group="SEG"/>
+                <signal pad-key="pa7" index="3" function="default" group="SEG"/>
+                <signal pad-key="pg2" index="4" function="default" group="SEG"/>
+                <signal pad-key="pc7" index="5" function="default" group="SEG"/>
+                <signal pad-key="pc6" index="6" function="default" group="SEG"/>
+                <signal pad-key="pc5" index="7" function="default" group="SEG"/>
+                <signal pad-key="pc4" index="8" function="default" group="SEG"/>
+                <signal pad-key="pc3" index="9" function="default" group="SEG"/>
+                <signal pad-key="pc2" index="10" function="default" group="SEG"/>
+                <signal pad-key="pc1" index="11" function="default" group="SEG"/>
+                <signal pad-key="pc0" index="12" function="default" group="SEG"/>
+                <signal pad-key="pg1" index="13" function="default" group="SEG"/>
+                <signal pad-key="pg2" index="14" function="default" group="SEG"/>
+                <signal pad-key="pd7" index="15" function="default" group="SEG"/>
+                <signal pad-key="pd6" index="16" function="default" group="SEG"/>
+                <signal pad-key="pd5" index="17" function="default" group="SEG"/>
+                <signal pad-key="pd4" index="18" function="default" group="SEG"/>
+                <signal pad-key="pd3" index="19" function="default" group="SEG"/>
+                <signal pad-key="pd2" index="20" function="default" group="SEG"/>
+                <signal pad-key="pd1" index="21" function="default" group="SEG"/>
+                <signal pad-key="pd0" index="22" function="default" group="SEG"/>
+                <signal pad-key="pg4" index="23" function="default" group="SEG"/>
+                <signal pad-key="pg3" index="24" function="default" group="SEG"/>
+                <signal pad-key="pa0" index="0" function="default" group="COM"/>
+                <signal pad-key="pa1" index="1" function="default" group="COM"/>
+                <signal pad-key="pa2" index="2" function="default" group="COM"/>
+                <signal pad-key="pa3" index="3" function="default" group="COM"/>
             </signals>
         </peripheral>
         <peripheral key="exint" name="EXINT" module-key="exint">
             <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"/>
-                <signal pad-id="pe2" index="2" function="default" group="PCINT"/>
-                <signal pad-id="pe3" index="3" function="default" group="PCINT"/>
-                <signal pad-id="pe4" index="4" function="default" group="PCINT"/>
-                <signal pad-id="pe5" index="5" function="default" group="PCINT"/>
-                <signal pad-id="pe6" index="6" function="default" group="PCINT"/>
-                <signal pad-id="pe7" index="7" function="default" group="PCINT"/>
-                <signal pad-id="pb0" index="8" function="default" group="PCINT"/>
-                <signal pad-id="pb1" index="9" function="default" group="PCINT"/>
-                <signal pad-id="pb2" index="10" function="default" group="PCINT"/>
-                <signal pad-id="pb3" index="11" function="default" group="PCINT"/>
-                <signal pad-id="pb4" index="12" function="default" group="PCINT"/>
-                <signal pad-id="pb5" index="13" function="default" group="PCINT"/>
-                <signal pad-id="pb6" index="14" function="default" group="PCINT"/>
-                <signal pad-id="pb7" index="15" function="default" group="PCINT"/>
-                <signal pad-id="pd1" index="0" function="default" group="INT"/>
+                <signal pad-key="pe0" index="0" function="default" group="PCINT"/>
+                <signal pad-key="pe1" index="1" function="default" group="PCINT"/>
+                <signal pad-key="pe2" index="2" function="default" group="PCINT"/>
+                <signal pad-key="pe3" index="3" function="default" group="PCINT"/>
+                <signal pad-key="pe4" index="4" function="default" group="PCINT"/>
+                <signal pad-key="pe5" index="5" function="default" group="PCINT"/>
+                <signal pad-key="pe6" index="6" function="default" group="PCINT"/>
+                <signal pad-key="pe7" index="7" function="default" group="PCINT"/>
+                <signal pad-key="pb0" index="8" function="default" group="PCINT"/>
+                <signal pad-key="pb1" index="9" function="default" group="PCINT"/>
+                <signal pad-key="pb2" index="10" function="default" group="PCINT"/>
+                <signal pad-key="pb3" index="11" function="default" group="PCINT"/>
+                <signal pad-key="pb4" index="12" function="default" group="PCINT"/>
+                <signal pad-key="pb5" index="13" function="default" group="PCINT"/>
+                <signal pad-key="pb6" index="14" function="default" group="PCINT"/>
+                <signal pad-key="pb7" index="15" function="default" group="PCINT"/>
+                <signal pad-key="pd1" index="0" function="default" group="INT"/>
             </signals>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="cpu">
             <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"/>
+                <signal pad-key="pe7" index="0" function="default" group="CLK"/>
             </signals>
         </peripheral>
         <peripheral key="usi" name="USI" module-key="usi">
             <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"/>
+                <signal pad-key="pe5" function="default" group="DI"/>
+                <signal pad-key="pe6" function="default" group="DO"/>
             </signals>
         </peripheral>
         <peripheral key="adc" name="ADC" module-key="adc">
             <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"/>
-                <signal pad-id="pf2" index="2" function="default" group="ADC"/>
-                <signal pad-id="pf3" index="3" function="default" group="ADC"/>
-                <signal pad-id="pf4" index="4" function="default" group="ADC"/>
-                <signal pad-id="pf5" index="5" function="default" group="ADC"/>
-                <signal pad-id="pf6" index="6" function="default" group="ADC"/>
-                <signal pad-id="pf7" index="7" function="default" group="ADC"/>
+                <signal pad-key="pf0" index="0" function="default" group="ADC"/>
+                <signal pad-key="pf1" index="1" function="default" group="ADC"/>
+                <signal pad-key="pf2" index="2" function="default" group="ADC"/>
+                <signal pad-key="pf3" index="3" function="default" group="ADC"/>
+                <signal pad-key="pf4" index="4" function="default" group="ADC"/>
+                <signal pad-key="pf5" index="5" function="default" group="ADC"/>
+                <signal pad-key="pf6" index="6" function="default" group="ADC"/>
+                <signal pad-key="pf7" index="7" function="default" group="ADC"/>
             </signals>
         </peripheral>
         <peripheral key="boot_load" name="BOOT_LOAD" module-key="boot_load">
@@ -423,10 +423,10 @@
         <peripheral key="usart0" name="USART0" module-key="usart">
             <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"/>
-                <signal pad-id="pe2" function="default" group="XCK"/>
-                <signal pad-id="pe4" function="default" group="USCK"/>
+                <signal pad-key="pe0" function="default" group="RXD"/>
+                <signal pad-key="pe1" function="default" group="TXD"/>
+                <signal pad-key="pe2" function="default" group="XCK"/>
+                <signal pad-key="pe4" function="default" group="USCK"/>
             </signals>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="fuse">
@@ -1024,144 +1024,207 @@
             </register-group>
         </module>
     </modules>
+    <pads>
+        <pad key="lcdcap" name="LCDCAP"/>
+        <pad key="pe0" name="PE0"/>
+        <pad key="pe1" name="PE1"/>
+        <pad key="pe2" name="PE2"/>
+        <pad key="pe3" name="PE3"/>
+        <pad key="pe4" name="PE4"/>
+        <pad key="pe5" name="PE5"/>
+        <pad key="pe6" name="PE6"/>
+        <pad key="pe7" name="PE7"/>
+        <pad key="pb0" name="PB0"/>
+        <pad key="pb1" name="PB1"/>
+        <pad key="pb2" name="PB2"/>
+        <pad key="pb3" name="PB3"/>
+        <pad key="pb4" name="PB4"/>
+        <pad key="pb5" name="PB5"/>
+        <pad key="pb6" name="PB6"/>
+        <pad key="pb7" name="PB7"/>
+        <pad key="pg3" name="PG3"/>
+        <pad key="pg4" name="PG4"/>
+        <pad key="pg5" name="PG5"/>
+        <pad key="vcc" name="VCC"/>
+        <pad key="gnd" name="GND"/>
+        <pad key="xtal2" name="XTAL2"/>
+        <pad key="xtal1" name="XTAL1"/>
+        <pad key="pd0" name="PD0"/>
+        <pad key="pd1" name="PD1"/>
+        <pad key="pd2" name="PD2"/>
+        <pad key="pd3" name="PD3"/>
+        <pad key="pd4" name="PD4"/>
+        <pad key="pd5" name="PD5"/>
+        <pad key="pd6" name="PD6"/>
+        <pad key="pd7" name="PD7"/>
+        <pad key="pg0" name="PG0"/>
+        <pad key="pg1" name="PG1"/>
+        <pad key="pc0" name="PC0"/>
+        <pad key="pc1" name="PC1"/>
+        <pad key="pc2" name="PC2"/>
+        <pad key="pc3" name="PC3"/>
+        <pad key="pc4" name="PC4"/>
+        <pad key="pc5" name="PC5"/>
+        <pad key="pc6" name="PC6"/>
+        <pad key="pc7" name="PC7"/>
+        <pad key="pg2" name="PG2"/>
+        <pad key="pa7" name="PA7"/>
+        <pad key="pa6" name="PA6"/>
+        <pad key="pa5" name="PA5"/>
+        <pad key="pa4" name="PA4"/>
+        <pad key="pa3" name="PA3"/>
+        <pad key="pa2" name="PA2"/>
+        <pad key="pa1" name="PA1"/>
+        <pad key="pa0" name="PA0"/>
+        <pad key="pf7" name="PF7"/>
+        <pad key="pf6" name="PF6"/>
+        <pad key="pf5" name="PF5"/>
+        <pad key="pf4" name="PF4"/>
+        <pad key="pf3" name="PF3"/>
+        <pad key="pf2" name="PF2"/>
+        <pad key="pf1" name="PF1"/>
+        <pad key="pf0" name="PF0"/>
+        <pad key="aref" name="AREF"/>
+        <pad key="avcc" name="AVCC"/>
+    </pads>
     <pinouts>
         <pinout key="tqfp64" name="TQFP64" type="qfp">
-            <pin position="1" pad="LCDCAP"/>
-            <pin position="2" pad="PE0"/>
-            <pin position="3" pad="PE1"/>
-            <pin position="4" pad="PE2"/>
-            <pin position="5" pad="PE3"/>
-            <pin position="6" pad="PE4"/>
-            <pin position="7" pad="PE5"/>
-            <pin position="8" pad="PE6"/>
-            <pin position="9" pad="PE7"/>
-            <pin position="10" pad="PB0"/>
-            <pin position="11" pad="PB1"/>
-            <pin position="12" pad="PB2"/>
-            <pin position="13" pad="PB3"/>
-            <pin position="14" pad="PB4"/>
-            <pin position="15" pad="PB5"/>
-            <pin position="16" pad="PB6"/>
-            <pin position="17" pad="PB7"/>
-            <pin position="18" pad="PG3"/>
-            <pin position="19" pad="PG4"/>
-            <pin position="20" pad="PG5"/>
-            <pin position="21" pad="VCC"/>
-            <pin position="22" pad="GND"/>
-            <pin position="23" pad="XTAL2"/>
-            <pin position="24" pad="XTAL1"/>
-            <pin position="25" pad="PD0"/>
-            <pin position="26" pad="PD1"/>
-            <pin position="27" pad="PD2"/>
-            <pin position="28" pad="PD3"/>
-            <pin position="29" pad="PD4"/>
-            <pin position="30" pad="PD5"/>
-            <pin position="31" pad="PD6"/>
-            <pin position="32" pad="PD7"/>
-            <pin position="33" pad="PG0"/>
-            <pin position="34" pad="PG1"/>
-            <pin position="35" pad="PC0"/>
-            <pin position="36" pad="PC1"/>
-            <pin position="37" pad="PC2"/>
-            <pin position="38" pad="PC3"/>
-            <pin position="39" pad="PC4"/>
-            <pin position="40" pad="PC5"/>
-            <pin position="41" pad="PC6"/>
-            <pin position="42" pad="PC7"/>
-            <pin position="43" pad="PG2"/>
-            <pin position="44" pad="PA7"/>
-            <pin position="45" pad="PA6"/>
-            <pin position="46" pad="PA5"/>
-            <pin position="47" pad="PA4"/>
-            <pin position="48" pad="PA3"/>
-            <pin position="49" pad="PA2"/>
-            <pin position="50" pad="PA1"/>
-            <pin position="51" pad="PA0"/>
-            <pin position="52" pad="VCC"/>
-            <pin position="53" pad="GND"/>
-            <pin position="54" pad="PF7"/>
-            <pin position="55" pad="PF6"/>
-            <pin position="56" pad="PF5"/>
-            <pin position="57" pad="PF4"/>
-            <pin position="58" pad="PF3"/>
-            <pin position="59" pad="PF2"/>
-            <pin position="60" pad="PF1"/>
-            <pin position="61" pad="PF0"/>
-            <pin position="62" pad="AREF"/>
-            <pin position="63" pad="GND"/>
-            <pin position="64" pad="AVCC"/>
+            <pin position="1" pad-key="lcdcap"/>
+            <pin position="2" pad-key="pe0"/>
+            <pin position="3" pad-key="pe1"/>
+            <pin position="4" pad-key="pe2"/>
+            <pin position="5" pad-key="pe3"/>
+            <pin position="6" pad-key="pe4"/>
+            <pin position="7" pad-key="pe5"/>
+            <pin position="8" pad-key="pe6"/>
+            <pin position="9" pad-key="pe7"/>
+            <pin position="10" pad-key="pb0"/>
+            <pin position="11" pad-key="pb1"/>
+            <pin position="12" pad-key="pb2"/>
+            <pin position="13" pad-key="pb3"/>
+            <pin position="14" pad-key="pb4"/>
+            <pin position="15" pad-key="pb5"/>
+            <pin position="16" pad-key="pb6"/>
+            <pin position="17" pad-key="pb7"/>
+            <pin position="18" pad-key="pg3"/>
+            <pin position="19" pad-key="pg4"/>
+            <pin position="20" pad-key="pg5"/>
+            <pin position="21" pad-key="vcc"/>
+            <pin position="22" pad-key="gnd"/>
+            <pin position="23" pad-key="xtal2"/>
+            <pin position="24" pad-key="xtal1"/>
+            <pin position="25" pad-key="pd0"/>
+            <pin position="26" pad-key="pd1"/>
+            <pin position="27" pad-key="pd2"/>
+            <pin position="28" pad-key="pd3"/>
+            <pin position="29" pad-key="pd4"/>
+            <pin position="30" pad-key="pd5"/>
+            <pin position="31" pad-key="pd6"/>
+            <pin position="32" pad-key="pd7"/>
+            <pin position="33" pad-key="pg0"/>
+            <pin position="34" pad-key="pg1"/>
+            <pin position="35" pad-key="pc0"/>
+            <pin position="36" pad-key="pc1"/>
+            <pin position="37" pad-key="pc2"/>
+            <pin position="38" pad-key="pc3"/>
+            <pin position="39" pad-key="pc4"/>
+            <pin position="40" pad-key="pc5"/>
+            <pin position="41" pad-key="pc6"/>
+            <pin position="42" pad-key="pc7"/>
+            <pin position="43" pad-key="pg2"/>
+            <pin position="44" pad-key="pa7"/>
+            <pin position="45" pad-key="pa6"/>
+            <pin position="46" pad-key="pa5"/>
+            <pin position="47" pad-key="pa4"/>
+            <pin position="48" pad-key="pa3"/>
+            <pin position="49" pad-key="pa2"/>
+            <pin position="50" pad-key="pa1"/>
+            <pin position="51" pad-key="pa0"/>
+            <pin position="52" pad-key="vcc"/>
+            <pin position="53" pad-key="gnd"/>
+            <pin position="54" pad-key="pf7"/>
+            <pin position="55" pad-key="pf6"/>
+            <pin position="56" pad-key="pf5"/>
+            <pin position="57" pad-key="pf4"/>
+            <pin position="58" pad-key="pf3"/>
+            <pin position="59" pad-key="pf2"/>
+            <pin position="60" pad-key="pf1"/>
+            <pin position="61" pad-key="pf0"/>
+            <pin position="62" pad-key="aref"/>
+            <pin position="63" pad-key="gnd"/>
+            <pin position="64" pad-key="avcc"/>
         </pinout>
         <pinout key="qfn64" name="QFN64" type="qfn">
-            <pin position="1" pad="LCDCAP"/>
-            <pin position="2" pad="PE0"/>
-            <pin position="3" pad="PE1"/>
-            <pin position="4" pad="PE2"/>
-            <pin position="5" pad="PE3"/>
-            <pin position="6" pad="PE4"/>
-            <pin position="7" pad="PE5"/>
-            <pin position="8" pad="PE6"/>
-            <pin position="9" pad="PE7"/>
-            <pin position="10" pad="PB0"/>
-            <pin position="11" pad="PB1"/>
-            <pin position="12" pad="PB2"/>
-            <pin position="13" pad="PB3"/>
-            <pin position="14" pad="PB4"/>
-            <pin position="15" pad="PB5"/>
-            <pin position="16" pad="PB6"/>
-            <pin position="17" pad="PB7"/>
-            <pin position="18" pad="PG3"/>
-            <pin position="19" pad="PG4"/>
-            <pin position="20" pad="PG5"/>
-            <pin position="21" pad="VCC"/>
-            <pin position="22" pad="GND"/>
-            <pin position="23" pad="XTAL2"/>
-            <pin position="24" pad="XTAL1"/>
-            <pin position="25" pad="PD0"/>
-            <pin position="26" pad="PD1"/>
-            <pin position="27" pad="PD2"/>
-            <pin position="28" pad="PD3"/>
-            <pin position="29" pad="PD4"/>
-            <pin position="30" pad="PD5"/>
-            <pin position="31" pad="PD6"/>
-            <pin position="32" pad="PD7"/>
-            <pin position="33" pad="PG0"/>
-            <pin position="34" pad="PG1"/>
-            <pin position="35" pad="PC0"/>
-            <pin position="36" pad="PC1"/>
-            <pin position="37" pad="PC2"/>
-            <pin position="38" pad="PC3"/>
-            <pin position="39" pad="PC4"/>
-            <pin position="40" pad="PC5"/>
-            <pin position="41" pad="PC6"/>
-            <pin position="42" pad="PC7"/>
-            <pin position="43" pad="PG2"/>
-            <pin position="44" pad="PA7"/>
-            <pin position="45" pad="PA6"/>
-            <pin position="46" pad="PA5"/>
-            <pin position="47" pad="PA4"/>
-            <pin position="48" pad="PA3"/>
-            <pin position="49" pad="PA2"/>
-            <pin position="50" pad="PA1"/>
-            <pin position="51" pad="PA0"/>
-            <pin position="52" pad="VCC"/>
-            <pin position="53" pad="GND"/>
-            <pin position="54" pad="PF7"/>
-            <pin position="55" pad="PF6"/>
-            <pin position="56" pad="PF5"/>
-            <pin position="57" pad="PF4"/>
-            <pin position="58" pad="PF3"/>
-            <pin position="59" pad="PF2"/>
-            <pin position="60" pad="PF1"/>
-            <pin position="61" pad="PF0"/>
-            <pin position="62" pad="AREF"/>
-            <pin position="63" pad="GND"/>
-            <pin position="64" pad="AVCC"/>
+            <pin position="1" pad-key="lcdcap"/>
+            <pin position="2" pad-key="pe0"/>
+            <pin position="3" pad-key="pe1"/>
+            <pin position="4" pad-key="pe2"/>
+            <pin position="5" pad-key="pe3"/>
+            <pin position="6" pad-key="pe4"/>
+            <pin position="7" pad-key="pe5"/>
+            <pin position="8" pad-key="pe6"/>
+            <pin position="9" pad-key="pe7"/>
+            <pin position="10" pad-key="pb0"/>
+            <pin position="11" pad-key="pb1"/>
+            <pin position="12" pad-key="pb2"/>
+            <pin position="13" pad-key="pb3"/>
+            <pin position="14" pad-key="pb4"/>
+            <pin position="15" pad-key="pb5"/>
+            <pin position="16" pad-key="pb6"/>
+            <pin position="17" pad-key="pb7"/>
+            <pin position="18" pad-key="pg3"/>
+            <pin position="19" pad-key="pg4"/>
+            <pin position="20" pad-key="pg5"/>
+            <pin position="21" pad-key="vcc"/>
+            <pin position="22" pad-key="gnd"/>
+            <pin position="23" pad-key="xtal2"/>
+            <pin position="24" pad-key="xtal1"/>
+            <pin position="25" pad-key="pd0"/>
+            <pin position="26" pad-key="pd1"/>
+            <pin position="27" pad-key="pd2"/>
+            <pin position="28" pad-key="pd3"/>
+            <pin position="29" pad-key="pd4"/>
+            <pin position="30" pad-key="pd5"/>
+            <pin position="31" pad-key="pd6"/>
+            <pin position="32" pad-key="pd7"/>
+            <pin position="33" pad-key="pg0"/>
+            <pin position="34" pad-key="pg1"/>
+            <pin position="35" pad-key="pc0"/>
+            <pin position="36" pad-key="pc1"/>
+            <pin position="37" pad-key="pc2"/>
+            <pin position="38" pad-key="pc3"/>
+            <pin position="39" pad-key="pc4"/>
+            <pin position="40" pad-key="pc5"/>
+            <pin position="41" pad-key="pc6"/>
+            <pin position="42" pad-key="pc7"/>
+            <pin position="43" pad-key="pg2"/>
+            <pin position="44" pad-key="pa7"/>
+            <pin position="45" pad-key="pa6"/>
+            <pin position="46" pad-key="pa5"/>
+            <pin position="47" pad-key="pa4"/>
+            <pin position="48" pad-key="pa3"/>
+            <pin position="49" pad-key="pa2"/>
+            <pin position="50" pad-key="pa1"/>
+            <pin position="51" pad-key="pa0"/>
+            <pin position="52" pad-key="vcc"/>
+            <pin position="53" pad-key="gnd"/>
+            <pin position="54" pad-key="pf7"/>
+            <pin position="55" pad-key="pf6"/>
+            <pin position="56" pad-key="pf5"/>
+            <pin position="57" pad-key="pf4"/>
+            <pin position="58" pad-key="pf3"/>
+            <pin position="59" pad-key="pf2"/>
+            <pin position="60" pad-key="pf1"/>
+            <pin position="61" pad-key="pf0"/>
+            <pin position="62" pad-key="aref"/>
+            <pin position="63" pad-key="gnd"/>
+            <pin position="64" pad-key="avcc"/>
         </pinout>
     </pinouts>
     <variants>
-        <variant name="ATmega329A-AU" pinout-key="tqfp64" package="TQFP64"/>
-        <variant name="ATmega329A-MU" pinout-key="qfn64" package="QFN64"/>
-        <variant name="ATmega329A-AN" pinout-key="tqfp64" package="TQFP64 "/>
-        <variant name="ATmega329A-MN" pinout-key="qfn64" package="QFN64"/>
+        <variant key="atmega329a_au" name="ATmega329A-AU" pinout-key="tqfp64"/>
+        <variant key="atmega329a_mu" name="ATmega329A-MU" pinout-key="qfn64"/>
+        <variant key="atmega329a_an" name="ATmega329A-AN" pinout-key="tqfp64"/>
+        <variant key="atmega329a_mn" name="ATmega329A-MN" pinout-key="qfn64"/>
     </variants>
 </device>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA329P.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA329P.xml
index 93826ed3..bde9326f 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA329P.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA329P.xml
@@ -194,25 +194,25 @@
         <peripheral key="tc0" name="TC0" module-key="tc8">
             <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"/>
+                <signal pad-key="pg4" function="default" group="T"/>
+                <signal pad-key="pb4" function="default" group="OCA"/>
             </signals>
         </peripheral>
         <peripheral key="tc1" name="TC1" module-key="tc16">
             <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"/>
-                <signal pad-id="pb5" function="default" group="OCA"/>
-                <signal pad-id="pb6" function="default" group="OCB"/>
-                <signal pad-id="xtal1" function="default" group="TOSC"/>
+                <signal pad-key="pg3" function="default" group="T"/>
+                <signal pad-key="pd0" function="default" group="ICP"/>
+                <signal pad-key="pb5" function="default" group="OCA"/>
+                <signal pad-key="pb6" function="default" group="OCB"/>
+                <signal pad-key="xtal1" function="default" group="TOSC"/>
             </signals>
         </peripheral>
         <peripheral key="tc2" name="TC2" module-key="tc8_async">
             <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"/>
+                <signal pad-key="pb7" function="default" group="OCA"/>
+                <signal pad-key="xtal2" function="default" group="TOSC"/>
             </signals>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="wdt">
@@ -224,197 +224,197 @@
         <peripheral key="spi" name="SPI" module-key="spi">
             <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"/>
-                <signal pad-id="pb2" function="default" group="MOSI"/>
-                <signal pad-id="pb3" function="default" group="MISO"/>
+                <signal pad-key="pb0" function="default" group="SS"/>
+                <signal pad-key="pb1" function="default" group="SCK"/>
+                <signal pad-key="pb2" function="default" group="MOSI"/>
+                <signal pad-key="pb3" function="default" group="MISO"/>
             </signals>
         </peripheral>
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pa2" index="2" function="default" group="P"/>
-                <signal pad-id="pa3" index="3" function="default" group="P"/>
-                <signal pad-id="pa4" index="4" function="default" group="P"/>
-                <signal pad-id="pa5" index="5" function="default" group="P"/>
-                <signal pad-id="pa6" index="6" function="default" group="P"/>
-                <signal pad-id="pa7" index="7" function="default" group="P"/>
+                <signal pad-key="pa0" index="0" function="default" group="P"/>
+                <signal pad-key="pa1" index="1" function="default" group="P"/>
+                <signal pad-key="pa2" index="2" function="default" group="P"/>
+                <signal pad-key="pa3" index="3" function="default" group="P"/>
+                <signal pad-key="pa4" index="4" function="default" group="P"/>
+                <signal pad-key="pa5" index="5" function="default" group="P"/>
+                <signal pad-key="pa6" index="6" function="default" group="P"/>
+                <signal pad-key="pa7" index="7" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pb2" index="2" function="default" group="P"/>
-                <signal pad-id="pb3" index="3" function="default" group="P"/>
-                <signal pad-id="pb4" index="4" function="default" group="P"/>
-                <signal pad-id="pb5" index="5" function="default" group="P"/>
-                <signal pad-id="pb6" index="6" function="default" group="P"/>
-                <signal pad-id="pb7" index="7" function="default" group="P"/>
+                <signal pad-key="pb0" index="0" function="default" group="P"/>
+                <signal pad-key="pb1" index="1" function="default" group="P"/>
+                <signal pad-key="pb2" index="2" function="default" group="P"/>
+                <signal pad-key="pb3" index="3" function="default" group="P"/>
+                <signal pad-key="pb4" index="4" function="default" group="P"/>
+                <signal pad-key="pb5" index="5" function="default" group="P"/>
+                <signal pad-key="pb6" index="6" function="default" group="P"/>
+                <signal pad-key="pb7" index="7" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pc2" index="2" function="default" group="P"/>
-                <signal pad-id="pc3" index="3" function="default" group="P"/>
-                <signal pad-id="pc4" index="4" function="default" group="P"/>
-                <signal pad-id="pc5" index="5" function="default" group="P"/>
-                <signal pad-id="pc6" index="6" function="default" group="P"/>
-                <signal pad-id="pc7" index="7" function="default" group="P"/>
+                <signal pad-key="pc0" index="0" function="default" group="P"/>
+                <signal pad-key="pc1" index="1" function="default" group="P"/>
+                <signal pad-key="pc2" index="2" function="default" group="P"/>
+                <signal pad-key="pc3" index="3" function="default" group="P"/>
+                <signal pad-key="pc4" index="4" function="default" group="P"/>
+                <signal pad-key="pc5" index="5" function="default" group="P"/>
+                <signal pad-key="pc6" index="6" function="default" group="P"/>
+                <signal pad-key="pc7" index="7" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pd2" index="2" function="default" group="P"/>
-                <signal pad-id="pd3" index="3" function="default" group="P"/>
-                <signal pad-id="pd4" index="4" function="default" group="P"/>
-                <signal pad-id="pd5" index="5" function="default" group="P"/>
-                <signal pad-id="pd6" index="6" function="default" group="P"/>
-                <signal pad-id="pd7" index="7" function="default" group="P"/>
+                <signal pad-key="pd0" index="0" function="default" group="P"/>
+                <signal pad-key="pd1" index="1" function="default" group="P"/>
+                <signal pad-key="pd2" index="2" function="default" group="P"/>
+                <signal pad-key="pd3" index="3" function="default" group="P"/>
+                <signal pad-key="pd4" index="4" function="default" group="P"/>
+                <signal pad-key="pd5" index="5" function="default" group="P"/>
+                <signal pad-key="pd6" index="6" function="default" group="P"/>
+                <signal pad-key="pd7" index="7" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="porte" name="PORTE" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pe2" index="2" function="default" group="P"/>
-                <signal pad-id="pe3" index="3" function="default" group="P"/>
-                <signal pad-id="pe4" index="4" function="default" group="P"/>
-                <signal pad-id="pe5" index="5" function="default" group="P"/>
-                <signal pad-id="pe6" index="6" function="default" group="P"/>
-                <signal pad-id="pe7" index="7" function="default" group="P"/>
+                <signal pad-key="pe0" index="0" function="default" group="P"/>
+                <signal pad-key="pe1" index="1" function="default" group="P"/>
+                <signal pad-key="pe2" index="2" function="default" group="P"/>
+                <signal pad-key="pe3" index="3" function="default" group="P"/>
+                <signal pad-key="pe4" index="4" function="default" group="P"/>
+                <signal pad-key="pe5" index="5" function="default" group="P"/>
+                <signal pad-key="pe6" index="6" function="default" group="P"/>
+                <signal pad-key="pe7" index="7" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portf" name="PORTF" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pf2" index="2" function="default" group="P"/>
-                <signal pad-id="pf3" index="3" function="default" group="P"/>
-                <signal pad-id="pf4" index="4" function="default" group="P"/>
-                <signal pad-id="pf5" index="5" function="default" group="P"/>
-                <signal pad-id="pf6" index="6" function="default" group="P"/>
-                <signal pad-id="pf7" index="7" function="default" group="P"/>
+                <signal pad-key="pf0" index="0" function="default" group="P"/>
+                <signal pad-key="pf1" index="1" function="default" group="P"/>
+                <signal pad-key="pf2" index="2" function="default" group="P"/>
+                <signal pad-key="pf3" index="3" function="default" group="P"/>
+                <signal pad-key="pf4" index="4" function="default" group="P"/>
+                <signal pad-key="pf5" index="5" function="default" group="P"/>
+                <signal pad-key="pf6" index="6" function="default" group="P"/>
+                <signal pad-key="pf7" index="7" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portg" name="PORTG" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pg2" index="2" function="default" group="P"/>
-                <signal pad-id="pg3" index="3" function="default" group="P"/>
-                <signal pad-id="pg4" index="4" function="default" group="P"/>
-                <signal pad-id="pg5" index="4" function="default" group="P"/>
+                <signal pad-key="pg0" index="0" function="default" group="P"/>
+                <signal pad-key="pg1" index="1" function="default" group="P"/>
+                <signal pad-key="pg2" index="2" function="default" group="P"/>
+                <signal pad-key="pg3" index="3" function="default" group="P"/>
+                <signal pad-key="pg4" index="4" function="default" group="P"/>
+                <signal pad-key="pg5" index="4" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="ac" name="AC" module-key="ac">
             <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"/>
+                <signal pad-key="pe2" index="0" function="default" group="AIN"/>
+                <signal pad-key="pe3" index="1" function="default" group="AIN"/>
             </signals>
         </peripheral>
         <peripheral key="jtag" name="JTAG" module-key="jtag">
             <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"/>
-                <signal pad-id="pf6" function="default" group="TDO"/>
-                <signal pad-id="pf7" function="default" group="TDI"/>
+                <signal pad-key="pf4" function="default" group="TCK"/>
+                <signal pad-key="pf5" function="default" group="TMS"/>
+                <signal pad-key="pf6" function="default" group="TDO"/>
+                <signal pad-key="pf7" function="default" group="TDI"/>
             </signals>
         </peripheral>
         <peripheral key="lcd" name="LCD" module-key="lcd">
             <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"/>
-                <signal pad-id="pa6" index="2" function="default" group="SEG"/>
-                <signal pad-id="pa7" index="3" function="default" group="SEG"/>
-                <signal pad-id="pg2" index="4" function="default" group="SEG"/>
-                <signal pad-id="pc7" index="5" function="default" group="SEG"/>
-                <signal pad-id="pc6" index="6" function="default" group="SEG"/>
-                <signal pad-id="pc5" index="7" function="default" group="SEG"/>
-                <signal pad-id="pc4" index="8" function="default" group="SEG"/>
-                <signal pad-id="pc3" index="9" function="default" group="SEG"/>
-                <signal pad-id="pc2" index="10" function="default" group="SEG"/>
-                <signal pad-id="pc1" index="11" function="default" group="SEG"/>
-                <signal pad-id="pc0" index="12" function="default" group="SEG"/>
-                <signal pad-id="pg1" index="13" function="default" group="SEG"/>
-                <signal pad-id="pg2" index="14" function="default" group="SEG"/>
-                <signal pad-id="pd7" index="15" function="default" group="SEG"/>
-                <signal pad-id="pd6" index="16" function="default" group="SEG"/>
-                <signal pad-id="pd5" index="17" function="default" group="SEG"/>
-                <signal pad-id="pd4" index="18" function="default" group="SEG"/>
-                <signal pad-id="pd3" index="19" function="default" group="SEG"/>
-                <signal pad-id="pd2" index="20" function="default" group="SEG"/>
-                <signal pad-id="pd1" index="21" function="default" group="SEG"/>
-                <signal pad-id="pd0" index="22" function="default" group="SEG"/>
-                <signal pad-id="pg4" index="23" function="default" group="SEG"/>
-                <signal pad-id="pg3" index="24" function="default" group="SEG"/>
-                <signal pad-id="pa0" index="0" function="default" group="COM"/>
-                <signal pad-id="pa1" index="1" function="default" group="COM"/>
-                <signal pad-id="pa2" index="2" function="default" group="COM"/>
-                <signal pad-id="pa3" index="3" function="default" group="COM"/>
+                <signal pad-key="pa4" index="0" function="default" group="SEG"/>
+                <signal pad-key="pa5" index="1" function="default" group="SEG"/>
+                <signal pad-key="pa6" index="2" function="default" group="SEG"/>
+                <signal pad-key="pa7" index="3" function="default" group="SEG"/>
+                <signal pad-key="pg2" index="4" function="default" group="SEG"/>
+                <signal pad-key="pc7" index="5" function="default" group="SEG"/>
+                <signal pad-key="pc6" index="6" function="default" group="SEG"/>
+                <signal pad-key="pc5" index="7" function="default" group="SEG"/>
+                <signal pad-key="pc4" index="8" function="default" group="SEG"/>
+                <signal pad-key="pc3" index="9" function="default" group="SEG"/>
+                <signal pad-key="pc2" index="10" function="default" group="SEG"/>
+                <signal pad-key="pc1" index="11" function="default" group="SEG"/>
+                <signal pad-key="pc0" index="12" function="default" group="SEG"/>
+                <signal pad-key="pg1" index="13" function="default" group="SEG"/>
+                <signal pad-key="pg2" index="14" function="default" group="SEG"/>
+                <signal pad-key="pd7" index="15" function="default" group="SEG"/>
+                <signal pad-key="pd6" index="16" function="default" group="SEG"/>
+                <signal pad-key="pd5" index="17" function="default" group="SEG"/>
+                <signal pad-key="pd4" index="18" function="default" group="SEG"/>
+                <signal pad-key="pd3" index="19" function="default" group="SEG"/>
+                <signal pad-key="pd2" index="20" function="default" group="SEG"/>
+                <signal pad-key="pd1" index="21" function="default" group="SEG"/>
+                <signal pad-key="pd0" index="22" function="default" group="SEG"/>
+                <signal pad-key="pg4" index="23" function="default" group="SEG"/>
+                <signal pad-key="pg3" index="24" function="default" group="SEG"/>
+                <signal pad-key="pa0" index="0" function="default" group="COM"/>
+                <signal pad-key="pa1" index="1" function="default" group="COM"/>
+                <signal pad-key="pa2" index="2" function="default" group="COM"/>
+                <signal pad-key="pa3" index="3" function="default" group="COM"/>
             </signals>
         </peripheral>
         <peripheral key="exint" name="EXINT" module-key="exint">
             <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"/>
-                <signal pad-id="pe2" index="2" function="default" group="PCINT"/>
-                <signal pad-id="pe3" index="3" function="default" group="PCINT"/>
-                <signal pad-id="pe4" index="4" function="default" group="PCINT"/>
-                <signal pad-id="pe5" index="5" function="default" group="PCINT"/>
-                <signal pad-id="pe6" index="6" function="default" group="PCINT"/>
-                <signal pad-id="pe7" index="7" function="default" group="PCINT"/>
-                <signal pad-id="pb0" index="8" function="default" group="PCINT"/>
-                <signal pad-id="pb1" index="9" function="default" group="PCINT"/>
-                <signal pad-id="pb2" index="10" function="default" group="PCINT"/>
-                <signal pad-id="pb3" index="11" function="default" group="PCINT"/>
-                <signal pad-id="pb4" index="12" function="default" group="PCINT"/>
-                <signal pad-id="pb5" index="13" function="default" group="PCINT"/>
-                <signal pad-id="pb6" index="14" function="default" group="PCINT"/>
-                <signal pad-id="pb7" index="15" function="default" group="PCINT"/>
-                <signal pad-id="pd1" index="0" function="default" group="INT"/>
+                <signal pad-key="pe0" index="0" function="default" group="PCINT"/>
+                <signal pad-key="pe1" index="1" function="default" group="PCINT"/>
+                <signal pad-key="pe2" index="2" function="default" group="PCINT"/>
+                <signal pad-key="pe3" index="3" function="default" group="PCINT"/>
+                <signal pad-key="pe4" index="4" function="default" group="PCINT"/>
+                <signal pad-key="pe5" index="5" function="default" group="PCINT"/>
+                <signal pad-key="pe6" index="6" function="default" group="PCINT"/>
+                <signal pad-key="pe7" index="7" function="default" group="PCINT"/>
+                <signal pad-key="pb0" index="8" function="default" group="PCINT"/>
+                <signal pad-key="pb1" index="9" function="default" group="PCINT"/>
+                <signal pad-key="pb2" index="10" function="default" group="PCINT"/>
+                <signal pad-key="pb3" index="11" function="default" group="PCINT"/>
+                <signal pad-key="pb4" index="12" function="default" group="PCINT"/>
+                <signal pad-key="pb5" index="13" function="default" group="PCINT"/>
+                <signal pad-key="pb6" index="14" function="default" group="PCINT"/>
+                <signal pad-key="pb7" index="15" function="default" group="PCINT"/>
+                <signal pad-key="pd1" index="0" function="default" group="INT"/>
             </signals>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="cpu">
             <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"/>
+                <signal pad-key="pe7" index="0" function="default" group="CLK"/>
             </signals>
         </peripheral>
         <peripheral key="usi" name="USI" module-key="usi">
             <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"/>
+                <signal pad-key="pe5" function="default" group="DI"/>
+                <signal pad-key="pe6" function="default" group="DO"/>
             </signals>
         </peripheral>
         <peripheral key="adc" name="ADC" module-key="adc">
             <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"/>
-                <signal pad-id="pf2" index="2" function="default" group="ADC"/>
-                <signal pad-id="pf3" index="3" function="default" group="ADC"/>
-                <signal pad-id="pf4" index="4" function="default" group="ADC"/>
-                <signal pad-id="pf5" index="5" function="default" group="ADC"/>
-                <signal pad-id="pf6" index="6" function="default" group="ADC"/>
-                <signal pad-id="pf7" index="7" function="default" group="ADC"/>
+                <signal pad-key="pf0" index="0" function="default" group="ADC"/>
+                <signal pad-key="pf1" index="1" function="default" group="ADC"/>
+                <signal pad-key="pf2" index="2" function="default" group="ADC"/>
+                <signal pad-key="pf3" index="3" function="default" group="ADC"/>
+                <signal pad-key="pf4" index="4" function="default" group="ADC"/>
+                <signal pad-key="pf5" index="5" function="default" group="ADC"/>
+                <signal pad-key="pf6" index="6" function="default" group="ADC"/>
+                <signal pad-key="pf7" index="7" function="default" group="ADC"/>
             </signals>
         </peripheral>
         <peripheral key="boot_load" name="BOOT_LOAD" module-key="boot_load">
@@ -423,10 +423,10 @@
         <peripheral key="usart0" name="USART0" module-key="usart">
             <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"/>
-                <signal pad-id="pe2" function="default" group="XCK"/>
-                <signal pad-id="pe4" function="default" group="USCK"/>
+                <signal pad-key="pe0" function="default" group="RXD"/>
+                <signal pad-key="pe1" function="default" group="TXD"/>
+                <signal pad-key="pe2" function="default" group="XCK"/>
+                <signal pad-key="pe4" function="default" group="USCK"/>
             </signals>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="fuse">
@@ -1040,146 +1040,209 @@
             </register-group>
         </module>
     </modules>
+    <pads>
+        <pad key="lcdcap" name="LCDCAP"/>
+        <pad key="pe0" name="PE0"/>
+        <pad key="pe1" name="PE1"/>
+        <pad key="pe2" name="PE2"/>
+        <pad key="pe3" name="PE3"/>
+        <pad key="pe4" name="PE4"/>
+        <pad key="pe5" name="PE5"/>
+        <pad key="pe6" name="PE6"/>
+        <pad key="pe7" name="PE7"/>
+        <pad key="pb0" name="PB0"/>
+        <pad key="pb1" name="PB1"/>
+        <pad key="pb2" name="PB2"/>
+        <pad key="pb3" name="PB3"/>
+        <pad key="pb4" name="PB4"/>
+        <pad key="pb5" name="PB5"/>
+        <pad key="pb6" name="PB6"/>
+        <pad key="pb7" name="PB7"/>
+        <pad key="pg3" name="PG3"/>
+        <pad key="pg4" name="PG4"/>
+        <pad key="pg5" name="PG5"/>
+        <pad key="vcc" name="VCC"/>
+        <pad key="gnd" name="GND"/>
+        <pad key="xtal2" name="XTAL2"/>
+        <pad key="xtal1" name="XTAL1"/>
+        <pad key="pd0" name="PD0"/>
+        <pad key="pd1" name="PD1"/>
+        <pad key="pd2" name="PD2"/>
+        <pad key="pd3" name="PD3"/>
+        <pad key="pd4" name="PD4"/>
+        <pad key="pd5" name="PD5"/>
+        <pad key="pd6" name="PD6"/>
+        <pad key="pd7" name="PD7"/>
+        <pad key="pg0" name="PG0"/>
+        <pad key="pg1" name="PG1"/>
+        <pad key="pc0" name="PC0"/>
+        <pad key="pc1" name="PC1"/>
+        <pad key="pc2" name="PC2"/>
+        <pad key="pc3" name="PC3"/>
+        <pad key="pc4" name="PC4"/>
+        <pad key="pc5" name="PC5"/>
+        <pad key="pc6" name="PC6"/>
+        <pad key="pc7" name="PC7"/>
+        <pad key="pg2" name="PG2"/>
+        <pad key="pa7" name="PA7"/>
+        <pad key="pa6" name="PA6"/>
+        <pad key="pa5" name="PA5"/>
+        <pad key="pa4" name="PA4"/>
+        <pad key="pa3" name="PA3"/>
+        <pad key="pa2" name="PA2"/>
+        <pad key="pa1" name="PA1"/>
+        <pad key="pa0" name="PA0"/>
+        <pad key="pf7" name="PF7"/>
+        <pad key="pf6" name="PF6"/>
+        <pad key="pf5" name="PF5"/>
+        <pad key="pf4" name="PF4"/>
+        <pad key="pf3" name="PF3"/>
+        <pad key="pf2" name="PF2"/>
+        <pad key="pf1" name="PF1"/>
+        <pad key="pf0" name="PF0"/>
+        <pad key="aref" name="AREF"/>
+        <pad key="avcc" name="AVCC"/>
+    </pads>
     <pinouts>
         <pinout key="tqfp64" name="TQFP64" type="qfp">
-            <pin position="1" pad="LCDCAP"/>
-            <pin position="2" pad="PE0"/>
-            <pin position="3" pad="PE1"/>
-            <pin position="4" pad="PE2"/>
-            <pin position="5" pad="PE3"/>
-            <pin position="6" pad="PE4"/>
-            <pin position="7" pad="PE5"/>
-            <pin position="8" pad="PE6"/>
-            <pin position="9" pad="PE7"/>
-            <pin position="10" pad="PB0"/>
-            <pin position="11" pad="PB1"/>
-            <pin position="12" pad="PB2"/>
-            <pin position="13" pad="PB3"/>
-            <pin position="14" pad="PB4"/>
-            <pin position="15" pad="PB5"/>
-            <pin position="16" pad="PB6"/>
-            <pin position="17" pad="PB7"/>
-            <pin position="18" pad="PG3"/>
-            <pin position="19" pad="PG4"/>
-            <pin position="20" pad="PG5"/>
-            <pin position="21" pad="VCC"/>
-            <pin position="22" pad="GND"/>
-            <pin position="23" pad="XTAL2"/>
-            <pin position="24" pad="XTAL1"/>
-            <pin position="25" pad="PD0"/>
-            <pin position="26" pad="PD1"/>
-            <pin position="27" pad="PD2"/>
-            <pin position="28" pad="PD3"/>
-            <pin position="29" pad="PD4"/>
-            <pin position="30" pad="PD5"/>
-            <pin position="31" pad="PD6"/>
-            <pin position="32" pad="PD7"/>
-            <pin position="33" pad="PG0"/>
-            <pin position="34" pad="PG1"/>
-            <pin position="35" pad="PC0"/>
-            <pin position="36" pad="PC1"/>
-            <pin position="37" pad="PC2"/>
-            <pin position="38" pad="PC3"/>
-            <pin position="39" pad="PC4"/>
-            <pin position="40" pad="PC5"/>
-            <pin position="41" pad="PC6"/>
-            <pin position="42" pad="PC7"/>
-            <pin position="43" pad="PG2"/>
-            <pin position="44" pad="PA7"/>
-            <pin position="45" pad="PA6"/>
-            <pin position="46" pad="PA5"/>
-            <pin position="47" pad="PA4"/>
-            <pin position="48" pad="PA3"/>
-            <pin position="49" pad="PA2"/>
-            <pin position="50" pad="PA1"/>
-            <pin position="51" pad="PA0"/>
-            <pin position="52" pad="VCC"/>
-            <pin position="53" pad="GND"/>
-            <pin position="54" pad="PF7"/>
-            <pin position="55" pad="PF6"/>
-            <pin position="56" pad="PF5"/>
-            <pin position="57" pad="PF4"/>
-            <pin position="58" pad="PF3"/>
-            <pin position="59" pad="PF2"/>
-            <pin position="60" pad="PF1"/>
-            <pin position="61" pad="PF0"/>
-            <pin position="62" pad="AREF"/>
-            <pin position="63" pad="GND"/>
-            <pin position="64" pad="AVCC"/>
+            <pin position="1" pad-key="lcdcap"/>
+            <pin position="2" pad-key="pe0"/>
+            <pin position="3" pad-key="pe1"/>
+            <pin position="4" pad-key="pe2"/>
+            <pin position="5" pad-key="pe3"/>
+            <pin position="6" pad-key="pe4"/>
+            <pin position="7" pad-key="pe5"/>
+            <pin position="8" pad-key="pe6"/>
+            <pin position="9" pad-key="pe7"/>
+            <pin position="10" pad-key="pb0"/>
+            <pin position="11" pad-key="pb1"/>
+            <pin position="12" pad-key="pb2"/>
+            <pin position="13" pad-key="pb3"/>
+            <pin position="14" pad-key="pb4"/>
+            <pin position="15" pad-key="pb5"/>
+            <pin position="16" pad-key="pb6"/>
+            <pin position="17" pad-key="pb7"/>
+            <pin position="18" pad-key="pg3"/>
+            <pin position="19" pad-key="pg4"/>
+            <pin position="20" pad-key="pg5"/>
+            <pin position="21" pad-key="vcc"/>
+            <pin position="22" pad-key="gnd"/>
+            <pin position="23" pad-key="xtal2"/>
+            <pin position="24" pad-key="xtal1"/>
+            <pin position="25" pad-key="pd0"/>
+            <pin position="26" pad-key="pd1"/>
+            <pin position="27" pad-key="pd2"/>
+            <pin position="28" pad-key="pd3"/>
+            <pin position="29" pad-key="pd4"/>
+            <pin position="30" pad-key="pd5"/>
+            <pin position="31" pad-key="pd6"/>
+            <pin position="32" pad-key="pd7"/>
+            <pin position="33" pad-key="pg0"/>
+            <pin position="34" pad-key="pg1"/>
+            <pin position="35" pad-key="pc0"/>
+            <pin position="36" pad-key="pc1"/>
+            <pin position="37" pad-key="pc2"/>
+            <pin position="38" pad-key="pc3"/>
+            <pin position="39" pad-key="pc4"/>
+            <pin position="40" pad-key="pc5"/>
+            <pin position="41" pad-key="pc6"/>
+            <pin position="42" pad-key="pc7"/>
+            <pin position="43" pad-key="pg2"/>
+            <pin position="44" pad-key="pa7"/>
+            <pin position="45" pad-key="pa6"/>
+            <pin position="46" pad-key="pa5"/>
+            <pin position="47" pad-key="pa4"/>
+            <pin position="48" pad-key="pa3"/>
+            <pin position="49" pad-key="pa2"/>
+            <pin position="50" pad-key="pa1"/>
+            <pin position="51" pad-key="pa0"/>
+            <pin position="52" pad-key="vcc"/>
+            <pin position="53" pad-key="gnd"/>
+            <pin position="54" pad-key="pf7"/>
+            <pin position="55" pad-key="pf6"/>
+            <pin position="56" pad-key="pf5"/>
+            <pin position="57" pad-key="pf4"/>
+            <pin position="58" pad-key="pf3"/>
+            <pin position="59" pad-key="pf2"/>
+            <pin position="60" pad-key="pf1"/>
+            <pin position="61" pad-key="pf0"/>
+            <pin position="62" pad-key="aref"/>
+            <pin position="63" pad-key="gnd"/>
+            <pin position="64" pad-key="avcc"/>
         </pinout>
         <pinout key="qfn64" name="QFN64" type="qfn">
-            <pin position="1" pad="LCDCAP"/>
-            <pin position="2" pad="PE0"/>
-            <pin position="3" pad="PE1"/>
-            <pin position="4" pad="PE2"/>
-            <pin position="5" pad="PE3"/>
-            <pin position="6" pad="PE4"/>
-            <pin position="7" pad="PE5"/>
-            <pin position="8" pad="PE6"/>
-            <pin position="9" pad="PE7"/>
-            <pin position="10" pad="PB0"/>
-            <pin position="11" pad="PB1"/>
-            <pin position="12" pad="PB2"/>
-            <pin position="13" pad="PB3"/>
-            <pin position="14" pad="PB4"/>
-            <pin position="15" pad="PB5"/>
-            <pin position="16" pad="PB6"/>
-            <pin position="17" pad="PB7"/>
-            <pin position="18" pad="PG3"/>
-            <pin position="19" pad="PG4"/>
-            <pin position="20" pad="PG5"/>
-            <pin position="21" pad="VCC"/>
-            <pin position="22" pad="GND"/>
-            <pin position="23" pad="XTAL2"/>
-            <pin position="24" pad="XTAL1"/>
-            <pin position="25" pad="PD0"/>
-            <pin position="26" pad="PD1"/>
-            <pin position="27" pad="PD2"/>
-            <pin position="28" pad="PD3"/>
-            <pin position="29" pad="PD4"/>
-            <pin position="30" pad="PD5"/>
-            <pin position="31" pad="PD6"/>
-            <pin position="32" pad="PD7"/>
-            <pin position="33" pad="PG0"/>
-            <pin position="34" pad="PG1"/>
-            <pin position="35" pad="PC0"/>
-            <pin position="36" pad="PC1"/>
-            <pin position="37" pad="PC2"/>
-            <pin position="38" pad="PC3"/>
-            <pin position="39" pad="PC4"/>
-            <pin position="40" pad="PC5"/>
-            <pin position="41" pad="PC6"/>
-            <pin position="42" pad="PC7"/>
-            <pin position="43" pad="PG2"/>
-            <pin position="44" pad="PA7"/>
-            <pin position="45" pad="PA6"/>
-            <pin position="46" pad="PA5"/>
-            <pin position="47" pad="PA4"/>
-            <pin position="48" pad="PA3"/>
-            <pin position="49" pad="PA2"/>
-            <pin position="50" pad="PA1"/>
-            <pin position="51" pad="PA0"/>
-            <pin position="52" pad="VCC"/>
-            <pin position="53" pad="GND"/>
-            <pin position="54" pad="PF7"/>
-            <pin position="55" pad="PF6"/>
-            <pin position="56" pad="PF5"/>
-            <pin position="57" pad="PF4"/>
-            <pin position="58" pad="PF3"/>
-            <pin position="59" pad="PF2"/>
-            <pin position="60" pad="PF1"/>
-            <pin position="61" pad="PF0"/>
-            <pin position="62" pad="AREF"/>
-            <pin position="63" pad="GND"/>
-            <pin position="64" pad="AVCC"/>
+            <pin position="1" pad-key="lcdcap"/>
+            <pin position="2" pad-key="pe0"/>
+            <pin position="3" pad-key="pe1"/>
+            <pin position="4" pad-key="pe2"/>
+            <pin position="5" pad-key="pe3"/>
+            <pin position="6" pad-key="pe4"/>
+            <pin position="7" pad-key="pe5"/>
+            <pin position="8" pad-key="pe6"/>
+            <pin position="9" pad-key="pe7"/>
+            <pin position="10" pad-key="pb0"/>
+            <pin position="11" pad-key="pb1"/>
+            <pin position="12" pad-key="pb2"/>
+            <pin position="13" pad-key="pb3"/>
+            <pin position="14" pad-key="pb4"/>
+            <pin position="15" pad-key="pb5"/>
+            <pin position="16" pad-key="pb6"/>
+            <pin position="17" pad-key="pb7"/>
+            <pin position="18" pad-key="pg3"/>
+            <pin position="19" pad-key="pg4"/>
+            <pin position="20" pad-key="pg5"/>
+            <pin position="21" pad-key="vcc"/>
+            <pin position="22" pad-key="gnd"/>
+            <pin position="23" pad-key="xtal2"/>
+            <pin position="24" pad-key="xtal1"/>
+            <pin position="25" pad-key="pd0"/>
+            <pin position="26" pad-key="pd1"/>
+            <pin position="27" pad-key="pd2"/>
+            <pin position="28" pad-key="pd3"/>
+            <pin position="29" pad-key="pd4"/>
+            <pin position="30" pad-key="pd5"/>
+            <pin position="31" pad-key="pd6"/>
+            <pin position="32" pad-key="pd7"/>
+            <pin position="33" pad-key="pg0"/>
+            <pin position="34" pad-key="pg1"/>
+            <pin position="35" pad-key="pc0"/>
+            <pin position="36" pad-key="pc1"/>
+            <pin position="37" pad-key="pc2"/>
+            <pin position="38" pad-key="pc3"/>
+            <pin position="39" pad-key="pc4"/>
+            <pin position="40" pad-key="pc5"/>
+            <pin position="41" pad-key="pc6"/>
+            <pin position="42" pad-key="pc7"/>
+            <pin position="43" pad-key="pg2"/>
+            <pin position="44" pad-key="pa7"/>
+            <pin position="45" pad-key="pa6"/>
+            <pin position="46" pad-key="pa5"/>
+            <pin position="47" pad-key="pa4"/>
+            <pin position="48" pad-key="pa3"/>
+            <pin position="49" pad-key="pa2"/>
+            <pin position="50" pad-key="pa1"/>
+            <pin position="51" pad-key="pa0"/>
+            <pin position="52" pad-key="vcc"/>
+            <pin position="53" pad-key="gnd"/>
+            <pin position="54" pad-key="pf7"/>
+            <pin position="55" pad-key="pf6"/>
+            <pin position="56" pad-key="pf5"/>
+            <pin position="57" pad-key="pf4"/>
+            <pin position="58" pad-key="pf3"/>
+            <pin position="59" pad-key="pf2"/>
+            <pin position="60" pad-key="pf1"/>
+            <pin position="61" pad-key="pf0"/>
+            <pin position="62" pad-key="aref"/>
+            <pin position="63" pad-key="gnd"/>
+            <pin position="64" pad-key="avcc"/>
         </pinout>
     </pinouts>
     <variants>
-        <variant name="ATmega329PV-10AU" pinout-key="tqfp64" package="TQFP64"/>
-        <variant name="ATmega329PV-10MU" pinout-key="qfn64" package="QFN64"/>
-        <variant name="ATmega329P-20AU" pinout-key="tqfp64" package="TQFP64"/>
-        <variant name="ATmega329P-20MU" pinout-key="qfn64" package="QFN64"/>
-        <variant name="ATmega329P-20AN" pinout-key="tqfp64" package="TQFP64 "/>
-        <variant name="ATmega329P-20MN" pinout-key="qfn64" package="QFN64"/>
+        <variant key="atmega329pv_10au" name="ATmega329PV-10AU" pinout-key="tqfp64"/>
+        <variant key="atmega329pv_10mu" name="ATmega329PV-10MU" pinout-key="qfn64"/>
+        <variant key="atmega329p_20au" name="ATmega329P-20AU" pinout-key="tqfp64"/>
+        <variant key="atmega329p_20mu" name="ATmega329P-20MU" pinout-key="qfn64"/>
+        <variant key="atmega329p_20an" name="ATmega329P-20AN" pinout-key="tqfp64"/>
+        <variant key="atmega329p_20mn" name="ATmega329P-20MN" pinout-key="qfn64"/>
     </variants>
 </device>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA329PA.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA329PA.xml
index 5ab770f8..69b2f82c 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA329PA.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA329PA.xml
@@ -194,25 +194,25 @@
         <peripheral key="tc0" name="TC0" module-key="tc8">
             <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"/>
+                <signal pad-key="pg4" function="default" group="T"/>
+                <signal pad-key="pb4" function="default" group="OCA"/>
             </signals>
         </peripheral>
         <peripheral key="tc1" name="TC1" module-key="tc16">
             <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"/>
-                <signal pad-id="pb5" function="default" group="OCA"/>
-                <signal pad-id="pb6" function="default" group="OCB"/>
-                <signal pad-id="xtal1" function="default" group="TOSC"/>
+                <signal pad-key="pg3" function="default" group="T"/>
+                <signal pad-key="pd0" function="default" group="ICP"/>
+                <signal pad-key="pb5" function="default" group="OCA"/>
+                <signal pad-key="pb6" function="default" group="OCB"/>
+                <signal pad-key="xtal1" function="default" group="TOSC"/>
             </signals>
         </peripheral>
         <peripheral key="tc2" name="TC2" module-key="tc8_async">
             <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"/>
+                <signal pad-key="pb7" function="default" group="OCA"/>
+                <signal pad-key="xtal2" function="default" group="TOSC"/>
             </signals>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="wdt">
@@ -224,197 +224,197 @@
         <peripheral key="spi" name="SPI" module-key="spi">
             <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"/>
-                <signal pad-id="pb2" function="default" group="MOSI"/>
-                <signal pad-id="pb3" function="default" group="MISO"/>
+                <signal pad-key="pb0" function="default" group="SS"/>
+                <signal pad-key="pb1" function="default" group="SCK"/>
+                <signal pad-key="pb2" function="default" group="MOSI"/>
+                <signal pad-key="pb3" function="default" group="MISO"/>
             </signals>
         </peripheral>
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pa2" index="2" function="default" group="P"/>
-                <signal pad-id="pa3" index="3" function="default" group="P"/>
-                <signal pad-id="pa4" index="4" function="default" group="P"/>
-                <signal pad-id="pa5" index="5" function="default" group="P"/>
-                <signal pad-id="pa6" index="6" function="default" group="P"/>
-                <signal pad-id="pa7" index="7" function="default" group="P"/>
+                <signal pad-key="pa0" index="0" function="default" group="P"/>
+                <signal pad-key="pa1" index="1" function="default" group="P"/>
+                <signal pad-key="pa2" index="2" function="default" group="P"/>
+                <signal pad-key="pa3" index="3" function="default" group="P"/>
+                <signal pad-key="pa4" index="4" function="default" group="P"/>
+                <signal pad-key="pa5" index="5" function="default" group="P"/>
+                <signal pad-key="pa6" index="6" function="default" group="P"/>
+                <signal pad-key="pa7" index="7" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pb2" index="2" function="default" group="P"/>
-                <signal pad-id="pb3" index="3" function="default" group="P"/>
-                <signal pad-id="pb4" index="4" function="default" group="P"/>
-                <signal pad-id="pb5" index="5" function="default" group="P"/>
-                <signal pad-id="pb6" index="6" function="default" group="P"/>
-                <signal pad-id="pb7" index="7" function="default" group="P"/>
+                <signal pad-key="pb0" index="0" function="default" group="P"/>
+                <signal pad-key="pb1" index="1" function="default" group="P"/>
+                <signal pad-key="pb2" index="2" function="default" group="P"/>
+                <signal pad-key="pb3" index="3" function="default" group="P"/>
+                <signal pad-key="pb4" index="4" function="default" group="P"/>
+                <signal pad-key="pb5" index="5" function="default" group="P"/>
+                <signal pad-key="pb6" index="6" function="default" group="P"/>
+                <signal pad-key="pb7" index="7" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pc2" index="2" function="default" group="P"/>
-                <signal pad-id="pc3" index="3" function="default" group="P"/>
-                <signal pad-id="pc4" index="4" function="default" group="P"/>
-                <signal pad-id="pc5" index="5" function="default" group="P"/>
-                <signal pad-id="pc6" index="6" function="default" group="P"/>
-                <signal pad-id="pc7" index="7" function="default" group="P"/>
+                <signal pad-key="pc0" index="0" function="default" group="P"/>
+                <signal pad-key="pc1" index="1" function="default" group="P"/>
+                <signal pad-key="pc2" index="2" function="default" group="P"/>
+                <signal pad-key="pc3" index="3" function="default" group="P"/>
+                <signal pad-key="pc4" index="4" function="default" group="P"/>
+                <signal pad-key="pc5" index="5" function="default" group="P"/>
+                <signal pad-key="pc6" index="6" function="default" group="P"/>
+                <signal pad-key="pc7" index="7" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pd2" index="2" function="default" group="P"/>
-                <signal pad-id="pd3" index="3" function="default" group="P"/>
-                <signal pad-id="pd4" index="4" function="default" group="P"/>
-                <signal pad-id="pd5" index="5" function="default" group="P"/>
-                <signal pad-id="pd6" index="6" function="default" group="P"/>
-                <signal pad-id="pd7" index="7" function="default" group="P"/>
+                <signal pad-key="pd0" index="0" function="default" group="P"/>
+                <signal pad-key="pd1" index="1" function="default" group="P"/>
+                <signal pad-key="pd2" index="2" function="default" group="P"/>
+                <signal pad-key="pd3" index="3" function="default" group="P"/>
+                <signal pad-key="pd4" index="4" function="default" group="P"/>
+                <signal pad-key="pd5" index="5" function="default" group="P"/>
+                <signal pad-key="pd6" index="6" function="default" group="P"/>
+                <signal pad-key="pd7" index="7" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="porte" name="PORTE" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pe2" index="2" function="default" group="P"/>
-                <signal pad-id="pe3" index="3" function="default" group="P"/>
-                <signal pad-id="pe4" index="4" function="default" group="P"/>
-                <signal pad-id="pe5" index="5" function="default" group="P"/>
-                <signal pad-id="pe6" index="6" function="default" group="P"/>
-                <signal pad-id="pe7" index="7" function="default" group="P"/>
+                <signal pad-key="pe0" index="0" function="default" group="P"/>
+                <signal pad-key="pe1" index="1" function="default" group="P"/>
+                <signal pad-key="pe2" index="2" function="default" group="P"/>
+                <signal pad-key="pe3" index="3" function="default" group="P"/>
+                <signal pad-key="pe4" index="4" function="default" group="P"/>
+                <signal pad-key="pe5" index="5" function="default" group="P"/>
+                <signal pad-key="pe6" index="6" function="default" group="P"/>
+                <signal pad-key="pe7" index="7" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portf" name="PORTF" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pf2" index="2" function="default" group="P"/>
-                <signal pad-id="pf3" index="3" function="default" group="P"/>
-                <signal pad-id="pf4" index="4" function="default" group="P"/>
-                <signal pad-id="pf5" index="5" function="default" group="P"/>
-                <signal pad-id="pf6" index="6" function="default" group="P"/>
-                <signal pad-id="pf7" index="7" function="default" group="P"/>
+                <signal pad-key="pf0" index="0" function="default" group="P"/>
+                <signal pad-key="pf1" index="1" function="default" group="P"/>
+                <signal pad-key="pf2" index="2" function="default" group="P"/>
+                <signal pad-key="pf3" index="3" function="default" group="P"/>
+                <signal pad-key="pf4" index="4" function="default" group="P"/>
+                <signal pad-key="pf5" index="5" function="default" group="P"/>
+                <signal pad-key="pf6" index="6" function="default" group="P"/>
+                <signal pad-key="pf7" index="7" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portg" name="PORTG" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pg2" index="2" function="default" group="P"/>
-                <signal pad-id="pg3" index="3" function="default" group="P"/>
-                <signal pad-id="pg4" index="4" function="default" group="P"/>
-                <signal pad-id="pg5" index="4" function="default" group="P"/>
+                <signal pad-key="pg0" index="0" function="default" group="P"/>
+                <signal pad-key="pg1" index="1" function="default" group="P"/>
+                <signal pad-key="pg2" index="2" function="default" group="P"/>
+                <signal pad-key="pg3" index="3" function="default" group="P"/>
+                <signal pad-key="pg4" index="4" function="default" group="P"/>
+                <signal pad-key="pg5" index="4" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="ac" name="AC" module-key="ac">
             <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"/>
+                <signal pad-key="pe2" index="0" function="default" group="AIN"/>
+                <signal pad-key="pe3" index="1" function="default" group="AIN"/>
             </signals>
         </peripheral>
         <peripheral key="jtag" name="JTAG" module-key="jtag">
             <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"/>
-                <signal pad-id="pf6" function="default" group="TDO"/>
-                <signal pad-id="pf7" function="default" group="TDI"/>
+                <signal pad-key="pf4" function="default" group="TCK"/>
+                <signal pad-key="pf5" function="default" group="TMS"/>
+                <signal pad-key="pf6" function="default" group="TDO"/>
+                <signal pad-key="pf7" function="default" group="TDI"/>
             </signals>
         </peripheral>
         <peripheral key="lcd" name="LCD" module-key="lcd">
             <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"/>
-                <signal pad-id="pa6" index="2" function="default" group="SEG"/>
-                <signal pad-id="pa7" index="3" function="default" group="SEG"/>
-                <signal pad-id="pg2" index="4" function="default" group="SEG"/>
-                <signal pad-id="pc7" index="5" function="default" group="SEG"/>
-                <signal pad-id="pc6" index="6" function="default" group="SEG"/>
-                <signal pad-id="pc5" index="7" function="default" group="SEG"/>
-                <signal pad-id="pc4" index="8" function="default" group="SEG"/>
-                <signal pad-id="pc3" index="9" function="default" group="SEG"/>
-                <signal pad-id="pc2" index="10" function="default" group="SEG"/>
-                <signal pad-id="pc1" index="11" function="default" group="SEG"/>
-                <signal pad-id="pc0" index="12" function="default" group="SEG"/>
-                <signal pad-id="pg1" index="13" function="default" group="SEG"/>
-                <signal pad-id="pg2" index="14" function="default" group="SEG"/>
-                <signal pad-id="pd7" index="15" function="default" group="SEG"/>
-                <signal pad-id="pd6" index="16" function="default" group="SEG"/>
-                <signal pad-id="pd5" index="17" function="default" group="SEG"/>
-                <signal pad-id="pd4" index="18" function="default" group="SEG"/>
-                <signal pad-id="pd3" index="19" function="default" group="SEG"/>
-                <signal pad-id="pd2" index="20" function="default" group="SEG"/>
-                <signal pad-id="pd1" index="21" function="default" group="SEG"/>
-                <signal pad-id="pd0" index="22" function="default" group="SEG"/>
-                <signal pad-id="pg4" index="23" function="default" group="SEG"/>
-                <signal pad-id="pg3" index="24" function="default" group="SEG"/>
-                <signal pad-id="pa0" index="0" function="default" group="COM"/>
-                <signal pad-id="pa1" index="1" function="default" group="COM"/>
-                <signal pad-id="pa2" index="2" function="default" group="COM"/>
-                <signal pad-id="pa3" index="3" function="default" group="COM"/>
+                <signal pad-key="pa4" index="0" function="default" group="SEG"/>
+                <signal pad-key="pa5" index="1" function="default" group="SEG"/>
+                <signal pad-key="pa6" index="2" function="default" group="SEG"/>
+                <signal pad-key="pa7" index="3" function="default" group="SEG"/>
+                <signal pad-key="pg2" index="4" function="default" group="SEG"/>
+                <signal pad-key="pc7" index="5" function="default" group="SEG"/>
+                <signal pad-key="pc6" index="6" function="default" group="SEG"/>
+                <signal pad-key="pc5" index="7" function="default" group="SEG"/>
+                <signal pad-key="pc4" index="8" function="default" group="SEG"/>
+                <signal pad-key="pc3" index="9" function="default" group="SEG"/>
+                <signal pad-key="pc2" index="10" function="default" group="SEG"/>
+                <signal pad-key="pc1" index="11" function="default" group="SEG"/>
+                <signal pad-key="pc0" index="12" function="default" group="SEG"/>
+                <signal pad-key="pg1" index="13" function="default" group="SEG"/>
+                <signal pad-key="pg2" index="14" function="default" group="SEG"/>
+                <signal pad-key="pd7" index="15" function="default" group="SEG"/>
+                <signal pad-key="pd6" index="16" function="default" group="SEG"/>
+                <signal pad-key="pd5" index="17" function="default" group="SEG"/>
+                <signal pad-key="pd4" index="18" function="default" group="SEG"/>
+                <signal pad-key="pd3" index="19" function="default" group="SEG"/>
+                <signal pad-key="pd2" index="20" function="default" group="SEG"/>
+                <signal pad-key="pd1" index="21" function="default" group="SEG"/>
+                <signal pad-key="pd0" index="22" function="default" group="SEG"/>
+                <signal pad-key="pg4" index="23" function="default" group="SEG"/>
+                <signal pad-key="pg3" index="24" function="default" group="SEG"/>
+                <signal pad-key="pa0" index="0" function="default" group="COM"/>
+                <signal pad-key="pa1" index="1" function="default" group="COM"/>
+                <signal pad-key="pa2" index="2" function="default" group="COM"/>
+                <signal pad-key="pa3" index="3" function="default" group="COM"/>
             </signals>
         </peripheral>
         <peripheral key="exint" name="EXINT" module-key="exint">
             <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"/>
-                <signal pad-id="pe2" index="2" function="default" group="PCINT"/>
-                <signal pad-id="pe3" index="3" function="default" group="PCINT"/>
-                <signal pad-id="pe4" index="4" function="default" group="PCINT"/>
-                <signal pad-id="pe5" index="5" function="default" group="PCINT"/>
-                <signal pad-id="pe6" index="6" function="default" group="PCINT"/>
-                <signal pad-id="pe7" index="7" function="default" group="PCINT"/>
-                <signal pad-id="pb0" index="8" function="default" group="PCINT"/>
-                <signal pad-id="pb1" index="9" function="default" group="PCINT"/>
-                <signal pad-id="pb2" index="10" function="default" group="PCINT"/>
-                <signal pad-id="pb3" index="11" function="default" group="PCINT"/>
-                <signal pad-id="pb4" index="12" function="default" group="PCINT"/>
-                <signal pad-id="pb5" index="13" function="default" group="PCINT"/>
-                <signal pad-id="pb6" index="14" function="default" group="PCINT"/>
-                <signal pad-id="pb7" index="15" function="default" group="PCINT"/>
-                <signal pad-id="pd1" index="0" function="default" group="INT"/>
+                <signal pad-key="pe0" index="0" function="default" group="PCINT"/>
+                <signal pad-key="pe1" index="1" function="default" group="PCINT"/>
+                <signal pad-key="pe2" index="2" function="default" group="PCINT"/>
+                <signal pad-key="pe3" index="3" function="default" group="PCINT"/>
+                <signal pad-key="pe4" index="4" function="default" group="PCINT"/>
+                <signal pad-key="pe5" index="5" function="default" group="PCINT"/>
+                <signal pad-key="pe6" index="6" function="default" group="PCINT"/>
+                <signal pad-key="pe7" index="7" function="default" group="PCINT"/>
+                <signal pad-key="pb0" index="8" function="default" group="PCINT"/>
+                <signal pad-key="pb1" index="9" function="default" group="PCINT"/>
+                <signal pad-key="pb2" index="10" function="default" group="PCINT"/>
+                <signal pad-key="pb3" index="11" function="default" group="PCINT"/>
+                <signal pad-key="pb4" index="12" function="default" group="PCINT"/>
+                <signal pad-key="pb5" index="13" function="default" group="PCINT"/>
+                <signal pad-key="pb6" index="14" function="default" group="PCINT"/>
+                <signal pad-key="pb7" index="15" function="default" group="PCINT"/>
+                <signal pad-key="pd1" index="0" function="default" group="INT"/>
             </signals>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="cpu">
             <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"/>
+                <signal pad-key="pe7" index="0" function="default" group="CLK"/>
             </signals>
         </peripheral>
         <peripheral key="usi" name="USI" module-key="usi">
             <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"/>
+                <signal pad-key="pe5" function="default" group="DI"/>
+                <signal pad-key="pe6" function="default" group="DO"/>
             </signals>
         </peripheral>
         <peripheral key="adc" name="ADC" module-key="adc">
             <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"/>
-                <signal pad-id="pf2" index="2" function="default" group="ADC"/>
-                <signal pad-id="pf3" index="3" function="default" group="ADC"/>
-                <signal pad-id="pf4" index="4" function="default" group="ADC"/>
-                <signal pad-id="pf5" index="5" function="default" group="ADC"/>
-                <signal pad-id="pf6" index="6" function="default" group="ADC"/>
-                <signal pad-id="pf7" index="7" function="default" group="ADC"/>
+                <signal pad-key="pf0" index="0" function="default" group="ADC"/>
+                <signal pad-key="pf1" index="1" function="default" group="ADC"/>
+                <signal pad-key="pf2" index="2" function="default" group="ADC"/>
+                <signal pad-key="pf3" index="3" function="default" group="ADC"/>
+                <signal pad-key="pf4" index="4" function="default" group="ADC"/>
+                <signal pad-key="pf5" index="5" function="default" group="ADC"/>
+                <signal pad-key="pf6" index="6" function="default" group="ADC"/>
+                <signal pad-key="pf7" index="7" function="default" group="ADC"/>
             </signals>
         </peripheral>
         <peripheral key="boot_load" name="BOOT_LOAD" module-key="boot_load">
@@ -423,10 +423,10 @@
         <peripheral key="usart0" name="USART0" module-key="usart">
             <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"/>
-                <signal pad-id="pe2" function="default" group="XCK"/>
-                <signal pad-id="pe4" function="default" group="USCK"/>
+                <signal pad-key="pe0" function="default" group="RXD"/>
+                <signal pad-key="pe1" function="default" group="TXD"/>
+                <signal pad-key="pe2" function="default" group="XCK"/>
+                <signal pad-key="pe4" function="default" group="USCK"/>
             </signals>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="fuse">
@@ -1026,144 +1026,207 @@
             </register-group>
         </module>
     </modules>
+    <pads>
+        <pad key="lcdcap" name="LCDCAP"/>
+        <pad key="pe0" name="PE0"/>
+        <pad key="pe1" name="PE1"/>
+        <pad key="pe2" name="PE2"/>
+        <pad key="pe3" name="PE3"/>
+        <pad key="pe4" name="PE4"/>
+        <pad key="pe5" name="PE5"/>
+        <pad key="pe6" name="PE6"/>
+        <pad key="pe7" name="PE7"/>
+        <pad key="pb0" name="PB0"/>
+        <pad key="pb1" name="PB1"/>
+        <pad key="pb2" name="PB2"/>
+        <pad key="pb3" name="PB3"/>
+        <pad key="pb4" name="PB4"/>
+        <pad key="pb5" name="PB5"/>
+        <pad key="pb6" name="PB6"/>
+        <pad key="pb7" name="PB7"/>
+        <pad key="pg3" name="PG3"/>
+        <pad key="pg4" name="PG4"/>
+        <pad key="pg5" name="PG5"/>
+        <pad key="vcc" name="VCC"/>
+        <pad key="gnd" name="GND"/>
+        <pad key="xtal2" name="XTAL2"/>
+        <pad key="xtal1" name="XTAL1"/>
+        <pad key="pd0" name="PD0"/>
+        <pad key="pd1" name="PD1"/>
+        <pad key="pd2" name="PD2"/>
+        <pad key="pd3" name="PD3"/>
+        <pad key="pd4" name="PD4"/>
+        <pad key="pd5" name="PD5"/>
+        <pad key="pd6" name="PD6"/>
+        <pad key="pd7" name="PD7"/>
+        <pad key="pg0" name="PG0"/>
+        <pad key="pg1" name="PG1"/>
+        <pad key="pc0" name="PC0"/>
+        <pad key="pc1" name="PC1"/>
+        <pad key="pc2" name="PC2"/>
+        <pad key="pc3" name="PC3"/>
+        <pad key="pc4" name="PC4"/>
+        <pad key="pc5" name="PC5"/>
+        <pad key="pc6" name="PC6"/>
+        <pad key="pc7" name="PC7"/>
+        <pad key="pg2" name="PG2"/>
+        <pad key="pa7" name="PA7"/>
+        <pad key="pa6" name="PA6"/>
+        <pad key="pa5" name="PA5"/>
+        <pad key="pa4" name="PA4"/>
+        <pad key="pa3" name="PA3"/>
+        <pad key="pa2" name="PA2"/>
+        <pad key="pa1" name="PA1"/>
+        <pad key="pa0" name="PA0"/>
+        <pad key="pf7" name="PF7"/>
+        <pad key="pf6" name="PF6"/>
+        <pad key="pf5" name="PF5"/>
+        <pad key="pf4" name="PF4"/>
+        <pad key="pf3" name="PF3"/>
+        <pad key="pf2" name="PF2"/>
+        <pad key="pf1" name="PF1"/>
+        <pad key="pf0" name="PF0"/>
+        <pad key="aref" name="AREF"/>
+        <pad key="avcc" name="AVCC"/>
+    </pads>
     <pinouts>
         <pinout key="tqfp64" name="TQFP64" type="qfp">
-            <pin position="1" pad="LCDCAP"/>
-            <pin position="2" pad="PE0"/>
-            <pin position="3" pad="PE1"/>
-            <pin position="4" pad="PE2"/>
-            <pin position="5" pad="PE3"/>
-            <pin position="6" pad="PE4"/>
-            <pin position="7" pad="PE5"/>
-            <pin position="8" pad="PE6"/>
-            <pin position="9" pad="PE7"/>
-            <pin position="10" pad="PB0"/>
-            <pin position="11" pad="PB1"/>
-            <pin position="12" pad="PB2"/>
-            <pin position="13" pad="PB3"/>
-            <pin position="14" pad="PB4"/>
-            <pin position="15" pad="PB5"/>
-            <pin position="16" pad="PB6"/>
-            <pin position="17" pad="PB7"/>
-            <pin position="18" pad="PG3"/>
-            <pin position="19" pad="PG4"/>
-            <pin position="20" pad="PG5"/>
-            <pin position="21" pad="VCC"/>
-            <pin position="22" pad="GND"/>
-            <pin position="23" pad="XTAL2"/>
-            <pin position="24" pad="XTAL1"/>
-            <pin position="25" pad="PD0"/>
-            <pin position="26" pad="PD1"/>
-            <pin position="27" pad="PD2"/>
-            <pin position="28" pad="PD3"/>
-            <pin position="29" pad="PD4"/>
-            <pin position="30" pad="PD5"/>
-            <pin position="31" pad="PD6"/>
-            <pin position="32" pad="PD7"/>
-            <pin position="33" pad="PG0"/>
-            <pin position="34" pad="PG1"/>
-            <pin position="35" pad="PC0"/>
-            <pin position="36" pad="PC1"/>
-            <pin position="37" pad="PC2"/>
-            <pin position="38" pad="PC3"/>
-            <pin position="39" pad="PC4"/>
-            <pin position="40" pad="PC5"/>
-            <pin position="41" pad="PC6"/>
-            <pin position="42" pad="PC7"/>
-            <pin position="43" pad="PG2"/>
-            <pin position="44" pad="PA7"/>
-            <pin position="45" pad="PA6"/>
-            <pin position="46" pad="PA5"/>
-            <pin position="47" pad="PA4"/>
-            <pin position="48" pad="PA3"/>
-            <pin position="49" pad="PA2"/>
-            <pin position="50" pad="PA1"/>
-            <pin position="51" pad="PA0"/>
-            <pin position="52" pad="VCC"/>
-            <pin position="53" pad="GND"/>
-            <pin position="54" pad="PF7"/>
-            <pin position="55" pad="PF6"/>
-            <pin position="56" pad="PF5"/>
-            <pin position="57" pad="PF4"/>
-            <pin position="58" pad="PF3"/>
-            <pin position="59" pad="PF2"/>
-            <pin position="60" pad="PF1"/>
-            <pin position="61" pad="PF0"/>
-            <pin position="62" pad="AREF"/>
-            <pin position="63" pad="GND"/>
-            <pin position="64" pad="AVCC"/>
+            <pin position="1" pad-key="lcdcap"/>
+            <pin position="2" pad-key="pe0"/>
+            <pin position="3" pad-key="pe1"/>
+            <pin position="4" pad-key="pe2"/>
+            <pin position="5" pad-key="pe3"/>
+            <pin position="6" pad-key="pe4"/>
+            <pin position="7" pad-key="pe5"/>
+            <pin position="8" pad-key="pe6"/>
+            <pin position="9" pad-key="pe7"/>
+            <pin position="10" pad-key="pb0"/>
+            <pin position="11" pad-key="pb1"/>
+            <pin position="12" pad-key="pb2"/>
+            <pin position="13" pad-key="pb3"/>
+            <pin position="14" pad-key="pb4"/>
+            <pin position="15" pad-key="pb5"/>
+            <pin position="16" pad-key="pb6"/>
+            <pin position="17" pad-key="pb7"/>
+            <pin position="18" pad-key="pg3"/>
+            <pin position="19" pad-key="pg4"/>
+            <pin position="20" pad-key="pg5"/>
+            <pin position="21" pad-key="vcc"/>
+            <pin position="22" pad-key="gnd"/>
+            <pin position="23" pad-key="xtal2"/>
+            <pin position="24" pad-key="xtal1"/>
+            <pin position="25" pad-key="pd0"/>
+            <pin position="26" pad-key="pd1"/>
+            <pin position="27" pad-key="pd2"/>
+            <pin position="28" pad-key="pd3"/>
+            <pin position="29" pad-key="pd4"/>
+            <pin position="30" pad-key="pd5"/>
+            <pin position="31" pad-key="pd6"/>
+            <pin position="32" pad-key="pd7"/>
+            <pin position="33" pad-key="pg0"/>
+            <pin position="34" pad-key="pg1"/>
+            <pin position="35" pad-key="pc0"/>
+            <pin position="36" pad-key="pc1"/>
+            <pin position="37" pad-key="pc2"/>
+            <pin position="38" pad-key="pc3"/>
+            <pin position="39" pad-key="pc4"/>
+            <pin position="40" pad-key="pc5"/>
+            <pin position="41" pad-key="pc6"/>
+            <pin position="42" pad-key="pc7"/>
+            <pin position="43" pad-key="pg2"/>
+            <pin position="44" pad-key="pa7"/>
+            <pin position="45" pad-key="pa6"/>
+            <pin position="46" pad-key="pa5"/>
+            <pin position="47" pad-key="pa4"/>
+            <pin position="48" pad-key="pa3"/>
+            <pin position="49" pad-key="pa2"/>
+            <pin position="50" pad-key="pa1"/>
+            <pin position="51" pad-key="pa0"/>
+            <pin position="52" pad-key="vcc"/>
+            <pin position="53" pad-key="gnd"/>
+            <pin position="54" pad-key="pf7"/>
+            <pin position="55" pad-key="pf6"/>
+            <pin position="56" pad-key="pf5"/>
+            <pin position="57" pad-key="pf4"/>
+            <pin position="58" pad-key="pf3"/>
+            <pin position="59" pad-key="pf2"/>
+            <pin position="60" pad-key="pf1"/>
+            <pin position="61" pad-key="pf0"/>
+            <pin position="62" pad-key="aref"/>
+            <pin position="63" pad-key="gnd"/>
+            <pin position="64" pad-key="avcc"/>
         </pinout>
         <pinout key="qfn64" name="QFN64" type="qfn">
-            <pin position="1" pad="LCDCAP"/>
-            <pin position="2" pad="PE0"/>
-            <pin position="3" pad="PE1"/>
-            <pin position="4" pad="PE2"/>
-            <pin position="5" pad="PE3"/>
-            <pin position="6" pad="PE4"/>
-            <pin position="7" pad="PE5"/>
-            <pin position="8" pad="PE6"/>
-            <pin position="9" pad="PE7"/>
-            <pin position="10" pad="PB0"/>
-            <pin position="11" pad="PB1"/>
-            <pin position="12" pad="PB2"/>
-            <pin position="13" pad="PB3"/>
-            <pin position="14" pad="PB4"/>
-            <pin position="15" pad="PB5"/>
-            <pin position="16" pad="PB6"/>
-            <pin position="17" pad="PB7"/>
-            <pin position="18" pad="PG3"/>
-            <pin position="19" pad="PG4"/>
-            <pin position="20" pad="PG5"/>
-            <pin position="21" pad="VCC"/>
-            <pin position="22" pad="GND"/>
-            <pin position="23" pad="XTAL2"/>
-            <pin position="24" pad="XTAL1"/>
-            <pin position="25" pad="PD0"/>
-            <pin position="26" pad="PD1"/>
-            <pin position="27" pad="PD2"/>
-            <pin position="28" pad="PD3"/>
-            <pin position="29" pad="PD4"/>
-            <pin position="30" pad="PD5"/>
-            <pin position="31" pad="PD6"/>
-            <pin position="32" pad="PD7"/>
-            <pin position="33" pad="PG0"/>
-            <pin position="34" pad="PG1"/>
-            <pin position="35" pad="PC0"/>
-            <pin position="36" pad="PC1"/>
-            <pin position="37" pad="PC2"/>
-            <pin position="38" pad="PC3"/>
-            <pin position="39" pad="PC4"/>
-            <pin position="40" pad="PC5"/>
-            <pin position="41" pad="PC6"/>
-            <pin position="42" pad="PC7"/>
-            <pin position="43" pad="PG2"/>
-            <pin position="44" pad="PA7"/>
-            <pin position="45" pad="PA6"/>
-            <pin position="46" pad="PA5"/>
-            <pin position="47" pad="PA4"/>
-            <pin position="48" pad="PA3"/>
-            <pin position="49" pad="PA2"/>
-            <pin position="50" pad="PA1"/>
-            <pin position="51" pad="PA0"/>
-            <pin position="52" pad="VCC"/>
-            <pin position="53" pad="GND"/>
-            <pin position="54" pad="PF7"/>
-            <pin position="55" pad="PF6"/>
-            <pin position="56" pad="PF5"/>
-            <pin position="57" pad="PF4"/>
-            <pin position="58" pad="PF3"/>
-            <pin position="59" pad="PF2"/>
-            <pin position="60" pad="PF1"/>
-            <pin position="61" pad="PF0"/>
-            <pin position="62" pad="AREF"/>
-            <pin position="63" pad="GND"/>
-            <pin position="64" pad="AVCC"/>
+            <pin position="1" pad-key="lcdcap"/>
+            <pin position="2" pad-key="pe0"/>
+            <pin position="3" pad-key="pe1"/>
+            <pin position="4" pad-key="pe2"/>
+            <pin position="5" pad-key="pe3"/>
+            <pin position="6" pad-key="pe4"/>
+            <pin position="7" pad-key="pe5"/>
+            <pin position="8" pad-key="pe6"/>
+            <pin position="9" pad-key="pe7"/>
+            <pin position="10" pad-key="pb0"/>
+            <pin position="11" pad-key="pb1"/>
+            <pin position="12" pad-key="pb2"/>
+            <pin position="13" pad-key="pb3"/>
+            <pin position="14" pad-key="pb4"/>
+            <pin position="15" pad-key="pb5"/>
+            <pin position="16" pad-key="pb6"/>
+            <pin position="17" pad-key="pb7"/>
+            <pin position="18" pad-key="pg3"/>
+            <pin position="19" pad-key="pg4"/>
+            <pin position="20" pad-key="pg5"/>
+            <pin position="21" pad-key="vcc"/>
+            <pin position="22" pad-key="gnd"/>
+            <pin position="23" pad-key="xtal2"/>
+            <pin position="24" pad-key="xtal1"/>
+            <pin position="25" pad-key="pd0"/>
+            <pin position="26" pad-key="pd1"/>
+            <pin position="27" pad-key="pd2"/>
+            <pin position="28" pad-key="pd3"/>
+            <pin position="29" pad-key="pd4"/>
+            <pin position="30" pad-key="pd5"/>
+            <pin position="31" pad-key="pd6"/>
+            <pin position="32" pad-key="pd7"/>
+            <pin position="33" pad-key="pg0"/>
+            <pin position="34" pad-key="pg1"/>
+            <pin position="35" pad-key="pc0"/>
+            <pin position="36" pad-key="pc1"/>
+            <pin position="37" pad-key="pc2"/>
+            <pin position="38" pad-key="pc3"/>
+            <pin position="39" pad-key="pc4"/>
+            <pin position="40" pad-key="pc5"/>
+            <pin position="41" pad-key="pc6"/>
+            <pin position="42" pad-key="pc7"/>
+            <pin position="43" pad-key="pg2"/>
+            <pin position="44" pad-key="pa7"/>
+            <pin position="45" pad-key="pa6"/>
+            <pin position="46" pad-key="pa5"/>
+            <pin position="47" pad-key="pa4"/>
+            <pin position="48" pad-key="pa3"/>
+            <pin position="49" pad-key="pa2"/>
+            <pin position="50" pad-key="pa1"/>
+            <pin position="51" pad-key="pa0"/>
+            <pin position="52" pad-key="vcc"/>
+            <pin position="53" pad-key="gnd"/>
+            <pin position="54" pad-key="pf7"/>
+            <pin position="55" pad-key="pf6"/>
+            <pin position="56" pad-key="pf5"/>
+            <pin position="57" pad-key="pf4"/>
+            <pin position="58" pad-key="pf3"/>
+            <pin position="59" pad-key="pf2"/>
+            <pin position="60" pad-key="pf1"/>
+            <pin position="61" pad-key="pf0"/>
+            <pin position="62" pad-key="aref"/>
+            <pin position="63" pad-key="gnd"/>
+            <pin position="64" pad-key="avcc"/>
         </pinout>
     </pinouts>
     <variants>
-        <variant name="ATmega329PA-AU" pinout-key="tqfp64" package="TQFP64"/>
-        <variant name="ATmega329PA-MU" pinout-key="qfn64" package="QFN64"/>
-        <variant name="ATmega329PA-AN" pinout-key="tqfp64" package="TQFP64 "/>
-        <variant name="ATmega329PA-MN" pinout-key="qfn64" package="QFN64"/>
+        <variant key="atmega329pa_au" name="ATmega329PA-AU" pinout-key="tqfp64"/>
+        <variant key="atmega329pa_mu" name="ATmega329PA-MU" pinout-key="qfn64"/>
+        <variant key="atmega329pa_an" name="ATmega329PA-AN" pinout-key="tqfp64"/>
+        <variant key="atmega329pa_mn" name="ATmega329PA-MN" pinout-key="qfn64"/>
     </variants>
 </device>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA32A.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA32A.xml
index 17b4021a..372d4b9a 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA32A.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA32A.xml
@@ -226,119 +226,119 @@
         <peripheral key="exint" name="EXINT" module-key="exint">
             <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"/>
+                <signal pad-key="pd2" index="1" function="default" group="INT"/>
+                <signal pad-key="pd3" index="0" function="default" group="INT"/>
             </signals>
         </peripheral>
         <peripheral key="tc0" name="TC0" module-key="tc8">
             <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"/>
+                <signal pad-key="pb0" function="default" group="T"/>
+                <signal pad-key="pb3" function="default" group="OC"/>
             </signals>
         </peripheral>
         <peripheral key="tc2" name="TC2" module-key="tc8_async">
             <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"/>
+                <signal pad-key="pd7" function="default" group="OC"/>
             </signals>
         </peripheral>
         <peripheral key="tc1" name="TC1" module-key="tc16">
             <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"/>
-                <signal pad-id="pb1" function="default" group="T"/>
-                <signal pad-id="pd6" function="default" group="ICP"/>
+                <signal pad-key="pd5" function="default" group="OCA"/>
+                <signal pad-key="pd4" function="default" group="OCB"/>
+                <signal pad-key="pb1" function="default" group="T"/>
+                <signal pad-key="pd6" function="default" group="ICP"/>
             </signals>
         </peripheral>
         <peripheral key="spi" name="SPI" module-key="spi">
             <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"/>
-                <signal pad-id="pb7" function="default" group="SCK"/>
-                <signal pad-id="pb4" function="default" group="SS"/>
+                <signal pad-key="pb6" function="default" group="MISO"/>
+                <signal pad-key="pb5" function="default" group="MOSI"/>
+                <signal pad-key="pb7" function="default" group="SCK"/>
+                <signal pad-key="pb4" function="default" group="SS"/>
             </signals>
         </peripheral>
         <peripheral key="usart" name="USART" module-key="usart">
             <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"/>
-                <signal pad-id="pb0" function="default" group="XCK"/>
+                <signal pad-key="pd0" function="default" group="RXD"/>
+                <signal pad-key="pd1" function="default" group="TXD"/>
+                <signal pad-key="pb0" function="default" group="XCK"/>
             </signals>
         </peripheral>
         <peripheral key="ac" name="AC" module-key="ac">
             <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"/>
+                <signal pad-key="pb2" index="0" function="default" group="AIN"/>
+                <signal pad-key="pb3" index="1" function="default" group="AIN"/>
             </signals>
         </peripheral>
         <peripheral key="adc" name="ADC" module-key="adc">
             <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"/>
-                <signal pad-id="pa2" index="2" function="default" group="ADC"/>
-                <signal pad-id="pa3" index="3" function="default" group="ADC"/>
-                <signal pad-id="pa4" index="4" function="default" group="ADC"/>
-                <signal pad-id="pa5" index="5" function="default" group="ADC"/>
-                <signal pad-id="pa6" index="6" function="default" group="ADC"/>
-                <signal pad-id="pa7" index="7" function="default" group="ADC"/>
+                <signal pad-key="pa0" index="0" function="default" group="ADC"/>
+                <signal pad-key="pa1" index="1" function="default" group="ADC"/>
+                <signal pad-key="pa2" index="2" function="default" group="ADC"/>
+                <signal pad-key="pa3" index="3" function="default" group="ADC"/>
+                <signal pad-key="pa4" index="4" function="default" group="ADC"/>
+                <signal pad-key="pa5" index="5" function="default" group="ADC"/>
+                <signal pad-key="pa6" index="6" function="default" group="ADC"/>
+                <signal pad-key="pa7" index="7" function="default" group="ADC"/>
             </signals>
         </peripheral>
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pa2" index="2" function="default" group="P"/>
-                <signal pad-id="pa3" index="3" function="default" group="P"/>
-                <signal pad-id="pa4" index="4" function="default" group="P"/>
-                <signal pad-id="pa5" index="5" function="default" group="P"/>
-                <signal pad-id="pa6" index="6" function="default" group="P"/>
-                <signal pad-id="pa7" index="7" function="default" group="P"/>
+                <signal pad-key="pa0" index="0" function="default" group="P"/>
+                <signal pad-key="pa1" index="1" function="default" group="P"/>
+                <signal pad-key="pa2" index="2" function="default" group="P"/>
+                <signal pad-key="pa3" index="3" function="default" group="P"/>
+                <signal pad-key="pa4" index="4" function="default" group="P"/>
+                <signal pad-key="pa5" index="5" function="default" group="P"/>
+                <signal pad-key="pa6" index="6" function="default" group="P"/>
+                <signal pad-key="pa7" index="7" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pb2" index="2" function="default" group="P"/>
-                <signal pad-id="pb3" index="3" function="default" group="P"/>
-                <signal pad-id="pb4" index="4" function="default" group="P"/>
-                <signal pad-id="pb5" index="5" function="default" group="P"/>
-                <signal pad-id="pb6" index="6" function="default" group="P"/>
-                <signal pad-id="pb7" index="7" function="default" group="P"/>
+                <signal pad-key="pb0" index="0" function="default" group="P"/>
+                <signal pad-key="pb1" index="1" function="default" group="P"/>
+                <signal pad-key="pb2" index="2" function="default" group="P"/>
+                <signal pad-key="pb3" index="3" function="default" group="P"/>
+                <signal pad-key="pb4" index="4" function="default" group="P"/>
+                <signal pad-key="pb5" index="5" function="default" group="P"/>
+                <signal pad-key="pb6" index="6" function="default" group="P"/>
+                <signal pad-key="pb7" index="7" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pc2" index="2" function="default" group="P"/>
-                <signal pad-id="pc3" index="3" function="default" group="P"/>
-                <signal pad-id="pc4" index="4" function="default" group="P"/>
-                <signal pad-id="pc5" index="5" function="default" group="P"/>
-                <signal pad-id="pc6" index="6" function="default" group="P"/>
-                <signal pad-id="pc7" index="7" function="default" group="P"/>
+                <signal pad-key="pc0" index="0" function="default" group="P"/>
+                <signal pad-key="pc1" index="1" function="default" group="P"/>
+                <signal pad-key="pc2" index="2" function="default" group="P"/>
+                <signal pad-key="pc3" index="3" function="default" group="P"/>
+                <signal pad-key="pc4" index="4" function="default" group="P"/>
+                <signal pad-key="pc5" index="5" function="default" group="P"/>
+                <signal pad-key="pc6" index="6" function="default" group="P"/>
+                <signal pad-key="pc7" index="7" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pd2" index="2" function="default" group="P"/>
-                <signal pad-id="pd3" index="3" function="default" group="P"/>
-                <signal pad-id="pd4" index="4" function="default" group="P"/>
-                <signal pad-id="pd5" index="5" function="default" group="P"/>
-                <signal pad-id="pd6" index="6" function="default" group="P"/>
-                <signal pad-id="pd7" index="7" function="default" group="P"/>
+                <signal pad-key="pd0" index="0" function="default" group="P"/>
+                <signal pad-key="pd1" index="1" function="default" group="P"/>
+                <signal pad-key="pd2" index="2" function="default" group="P"/>
+                <signal pad-key="pd3" index="3" function="default" group="P"/>
+                <signal pad-key="pd4" index="4" function="default" group="P"/>
+                <signal pad-key="pd5" index="5" function="default" group="P"/>
+                <signal pad-key="pd6" index="6" function="default" group="P"/>
+                <signal pad-key="pd7" index="7" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="cpu">
@@ -350,8 +350,8 @@
         <peripheral key="twi" name="TWI" module-key="twi">
             <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"/>
+                <signal pad-key="pc1" function="default" group="SDA"/>
+                <signal pad-key="pc0" function="default" group="SCL"/>
             </signals>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="fuse">
@@ -697,101 +697,142 @@
             </register-group>
         </module>
     </modules>
+    <pads>
+        <pad key="pb5" name="PB5"/>
+        <pad key="pb6" name="PB6"/>
+        <pad key="pb7" name="PB7"/>
+        <pad key="reset" name="RESET"/>
+        <pad key="vcc" name="VCC"/>
+        <pad key="gnd" name="GND"/>
+        <pad key="xtal1" name="XTAL1"/>
+        <pad key="xtal2" name="XTAL2"/>
+        <pad key="pd0" name="PD0"/>
+        <pad key="pd1" name="PD1"/>
+        <pad key="pd2" name="PD2"/>
+        <pad key="pd3" name="PD3"/>
+        <pad key="pd4" name="PD4"/>
+        <pad key="pd5" name="PD5"/>
+        <pad key="pd6" name="PD6"/>
+        <pad key="pd7" name="PD7"/>
+        <pad key="pc0" name="PC0"/>
+        <pad key="pc1" name="PC1"/>
+        <pad key="pc2" name="PC2"/>
+        <pad key="pc3" name="PC3"/>
+        <pad key="pc4" name="PC4"/>
+        <pad key="pc5" name="PC5"/>
+        <pad key="pc6" name="PC6"/>
+        <pad key="pc7" name="PC7"/>
+        <pad key="avcc" name="AVCC"/>
+        <pad key="aref" name="AREF"/>
+        <pad key="pa7" name="PA7"/>
+        <pad key="pa6" name="PA6"/>
+        <pad key="pa5" name="PA5"/>
+        <pad key="pa4" name="PA4"/>
+        <pad key="pa3" name="PA3"/>
+        <pad key="pa2" name="PA2"/>
+        <pad key="pa1" name="PA1"/>
+        <pad key="pa0" name="PA0"/>
+        <pad key="pb0" name="PB0"/>
+        <pad key="pb1" name="PB1"/>
+        <pad key="pb2" name="PB2"/>
+        <pad key="pb3" name="PB3"/>
+        <pad key="pb4" name="PB4"/>
+    </pads>
     <pinouts>
         <pinout key="tqfpqfn44" name="TQFPQFN44" type="qfn">
-            <pin position="1" pad="PB5"/>
-            <pin position="2" pad="PB6"/>
-            <pin position="3" pad="PB7"/>
-            <pin position="4" pad="RESET"/>
-            <pin position="5" pad="VCC"/>
-            <pin position="6" pad="GND"/>
-            <pin position="7" pad="XTAL1"/>
-            <pin position="8" pad="XTAL2"/>
-            <pin position="9" pad="PD0"/>
-            <pin position="10" pad="PD1"/>
-            <pin position="11" pad="PD2"/>
-            <pin position="12" pad="PD3"/>
-            <pin position="13" pad="PD4"/>
-            <pin position="14" pad="PD5"/>
-            <pin position="15" pad="PD6"/>
-            <pin position="16" pad="PD7"/>
-            <pin position="17" pad="VCC"/>
-            <pin position="18" pad="GND"/>
-            <pin position="19" pad="PC0"/>
-            <pin position="20" pad="PC1"/>
-            <pin position="21" pad="PC2"/>
-            <pin position="22" pad="PC3"/>
-            <pin position="23" pad="PC4"/>
-            <pin position="24" pad="PC5"/>
-            <pin position="25" pad="PC6"/>
-            <pin position="26" pad="PC7"/>
-            <pin position="27" pad="AVCC"/>
-            <pin position="28" pad="GND"/>
-            <pin position="29" pad="AREF"/>
-            <pin position="30" pad="PA7"/>
-            <pin position="31" pad="PA6"/>
-            <pin position="32" pad="PA5"/>
-            <pin position="33" pad="PA4"/>
-            <pin position="34" pad="PA3"/>
-            <pin position="35" pad="PA2"/>
-            <pin position="36" pad="PA1"/>
-            <pin position="37" pad="PA0"/>
-            <pin position="38" pad="VCC"/>
-            <pin position="39" pad="GND"/>
-            <pin position="40" pad="PB0"/>
-            <pin position="41" pad="PB1"/>
-            <pin position="42" pad="PB2"/>
-            <pin position="43" pad="PB3"/>
-            <pin position="44" pad="PB4"/>
+            <pin position="1" pad-key="pb5"/>
+            <pin position="2" pad-key="pb6"/>
+            <pin position="3" pad-key="pb7"/>
+            <pin position="4" pad-key="reset"/>
+            <pin position="5" pad-key="vcc"/>
+            <pin position="6" pad-key="gnd"/>
+            <pin position="7" pad-key="xtal1"/>
+            <pin position="8" pad-key="xtal2"/>
+            <pin position="9" pad-key="pd0"/>
+            <pin position="10" pad-key="pd1"/>
+            <pin position="11" pad-key="pd2"/>
+            <pin position="12" pad-key="pd3"/>
+            <pin position="13" pad-key="pd4"/>
+            <pin position="14" pad-key="pd5"/>
+            <pin position="15" pad-key="pd6"/>
+            <pin position="16" pad-key="pd7"/>
+            <pin position="17" pad-key="vcc"/>
+            <pin position="18" pad-key="gnd"/>
+            <pin position="19" pad-key="pc0"/>
+            <pin position="20" pad-key="pc1"/>
+            <pin position="21" pad-key="pc2"/>
+            <pin position="22" pad-key="pc3"/>
+            <pin position="23" pad-key="pc4"/>
+            <pin position="24" pad-key="pc5"/>
+            <pin position="25" pad-key="pc6"/>
+            <pin position="26" pad-key="pc7"/>
+            <pin position="27" pad-key="avcc"/>
+            <pin position="28" pad-key="gnd"/>
+            <pin position="29" pad-key="aref"/>
+            <pin position="30" pad-key="pa7"/>
+            <pin position="31" pad-key="pa6"/>
+            <pin position="32" pad-key="pa5"/>
+            <pin position="33" pad-key="pa4"/>
+            <pin position="34" pad-key="pa3"/>
+            <pin position="35" pad-key="pa2"/>
+            <pin position="36" pad-key="pa1"/>
+            <pin position="37" pad-key="pa0"/>
+            <pin position="38" pad-key="vcc"/>
+            <pin position="39" pad-key="gnd"/>
+            <pin position="40" pad-key="pb0"/>
+            <pin position="41" pad-key="pb1"/>
+            <pin position="42" pad-key="pb2"/>
+            <pin position="43" pad-key="pb3"/>
+            <pin position="44" pad-key="pb4"/>
         </pinout>
         <pinout key="pdip40" name="PDIP40" type="dip">
-            <pin position="1" pad="PB0"/>
-            <pin position="2" pad="PB1"/>
-            <pin position="3" pad="PB2"/>
-            <pin position="4" pad="PB3"/>
-            <pin position="5" pad="PB4"/>
-            <pin position="6" pad="PB5"/>
-            <pin position="7" pad="PB6"/>
-            <pin position="8" pad="PB7"/>
-            <pin position="9" pad="RESET"/>
-            <pin position="10" pad="VCC"/>
-            <pin position="11" pad="GND"/>
-            <pin position="12" pad="XTAL1"/>
-            <pin position="13" pad="XTAL2"/>
-            <pin position="14" pad="PD0"/>
-            <pin position="15" pad="PD1"/>
-            <pin position="16" pad="PD2"/>
-            <pin position="17" pad="PD3"/>
-            <pin position="18" pad="PD4"/>
-            <pin position="19" pad="PD5"/>
-            <pin position="20" pad="PD6"/>
-            <pin position="21" pad="PD7"/>
-            <pin position="22" pad="PC0"/>
-            <pin position="23" pad="PC1"/>
-            <pin position="24" pad="PC2"/>
-            <pin position="25" pad="PC3"/>
-            <pin position="26" pad="PC4"/>
-            <pin position="27" pad="PC5"/>
-            <pin position="28" pad="PC6"/>
-            <pin position="29" pad="PC7"/>
-            <pin position="30" pad="AVCC"/>
-            <pin position="31" pad="GND"/>
-            <pin position="32" pad="AREF"/>
-            <pin position="33" pad="PA7"/>
-            <pin position="34" pad="PA6"/>
-            <pin position="35" pad="PA5"/>
-            <pin position="36" pad="PA4"/>
-            <pin position="37" pad="PA3"/>
-            <pin position="38" pad="PA2"/>
-            <pin position="39" pad="PA1"/>
-            <pin position="40" pad="PA0"/>
+            <pin position="1" pad-key="pb0"/>
+            <pin position="2" pad-key="pb1"/>
+            <pin position="3" pad-key="pb2"/>
+            <pin position="4" pad-key="pb3"/>
+            <pin position="5" pad-key="pb4"/>
+            <pin position="6" pad-key="pb5"/>
+            <pin position="7" pad-key="pb6"/>
+            <pin position="8" pad-key="pb7"/>
+            <pin position="9" pad-key="reset"/>
+            <pin position="10" pad-key="vcc"/>
+            <pin position="11" pad-key="gnd"/>
+            <pin position="12" pad-key="xtal1"/>
+            <pin position="13" pad-key="xtal2"/>
+            <pin position="14" pad-key="pd0"/>
+            <pin position="15" pad-key="pd1"/>
+            <pin position="16" pad-key="pd2"/>
+            <pin position="17" pad-key="pd3"/>
+            <pin position="18" pad-key="pd4"/>
+            <pin position="19" pad-key="pd5"/>
+            <pin position="20" pad-key="pd6"/>
+            <pin position="21" pad-key="pd7"/>
+            <pin position="22" pad-key="pc0"/>
+            <pin position="23" pad-key="pc1"/>
+            <pin position="24" pad-key="pc2"/>
+            <pin position="25" pad-key="pc3"/>
+            <pin position="26" pad-key="pc4"/>
+            <pin position="27" pad-key="pc5"/>
+            <pin position="28" pad-key="pc6"/>
+            <pin position="29" pad-key="pc7"/>
+            <pin position="30" pad-key="avcc"/>
+            <pin position="31" pad-key="gnd"/>
+            <pin position="32" pad-key="aref"/>
+            <pin position="33" pad-key="pa7"/>
+            <pin position="34" pad-key="pa6"/>
+            <pin position="35" pad-key="pa5"/>
+            <pin position="36" pad-key="pa4"/>
+            <pin position="37" pad-key="pa3"/>
+            <pin position="38" pad-key="pa2"/>
+            <pin position="39" pad-key="pa1"/>
+            <pin position="40" pad-key="pa0"/>
         </pinout>
     </pinouts>
     <variants>
-        <variant name="ATmega32A-AU" pinout-key="tqfpqfn44" package="TQFP44"/>
-        <variant name="ATmega32A-PU" pinout-key="pdip40" package="PDIP40"/>
-        <variant name="ATmega32A-MU" pinout-key="tqfpqfn44" package="QFN44"/>
-        <variant name="ATmega32A-AN" pinout-key="tqfpqfn44" package="TQFP44"/>
-        <variant name="ATmega32A-MN" pinout-key="tqfpqfn44" package="QFN44"/>
+        <variant key="atmega32a_au" name="ATmega32A-AU" pinout-key="tqfpqfn44"/>
+        <variant key="atmega32a_pu" name="ATmega32A-PU" pinout-key="pdip40"/>
+        <variant key="atmega32a_mu" name="ATmega32A-MU" pinout-key="tqfpqfn44"/>
+        <variant key="atmega32a_an" name="ATmega32A-AN" pinout-key="tqfpqfn44"/>
+        <variant key="atmega32a_mn" name="ATmega32A-MN" pinout-key="tqfpqfn44"/>
     </variants>
 </device>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA32C1.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA32C1.xml
index 16eccc1a..7f550d7e 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA32C1.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA32C1.xml
@@ -194,48 +194,48 @@
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pb2" index="2" function="IOPORT" group="PIN"/>
-                <signal pad-id="pb3" index="3" function="IOPORT" group="PIN"/>
-                <signal pad-id="pb4" index="4" function="IOPORT" group="PIN"/>
-                <signal pad-id="pb5" index="5" function="IOPORT" group="PIN"/>
-                <signal pad-id="pb6" index="6" function="IOPORT" group="PIN"/>
-                <signal pad-id="pb7" index="7" function="IOPORT" group="PIN"/>
+                <signal pad-key="pb0" index="0" function="IOPORT" group="PIN"/>
+                <signal pad-key="pb1" index="1" function="IOPORT" group="PIN"/>
+                <signal pad-key="pb2" index="2" function="IOPORT" group="PIN"/>
+                <signal pad-key="pb3" index="3" function="IOPORT" group="PIN"/>
+                <signal pad-key="pb4" index="4" function="IOPORT" group="PIN"/>
+                <signal pad-key="pb5" index="5" function="IOPORT" group="PIN"/>
+                <signal pad-key="pb6" index="6" function="IOPORT" group="PIN"/>
+                <signal pad-key="pb7" index="7" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pc2" index="2" function="IOPORT" group="PIN"/>
-                <signal pad-id="pc3" index="3" function="IOPORT" group="PIN"/>
-                <signal pad-id="pc4" index="4" function="IOPORT" group="PIN"/>
-                <signal pad-id="pc5" index="5" function="IOPORT" group="PIN"/>
-                <signal pad-id="pc6" index="6" function="IOPORT" group="PIN"/>
-                <signal pad-id="pc7" index="7" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc0" index="0" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc1" index="1" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc2" index="2" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc3" index="3" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc4" index="4" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc5" index="5" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc6" index="6" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc7" index="7" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pd2" index="2" function="IOPORT" group="PIN"/>
-                <signal pad-id="pd3" index="3" function="IOPORT" group="PIN"/>
-                <signal pad-id="pd4" index="4" function="IOPORT" group="PIN"/>
-                <signal pad-id="pd5" index="5" function="IOPORT" group="PIN"/>
-                <signal pad-id="pd6" index="6" function="IOPORT" group="PIN"/>
-                <signal pad-id="pd7" index="7" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd0" index="0" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd1" index="1" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd2" index="2" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd3" index="3" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd4" index="4" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd5" index="5" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd6" index="6" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd7" index="7" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="porte" name="PORTE" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pe2" index="2" function="IOPORT" group="PIN"/>
+                <signal pad-key="pe0" index="0" function="IOPORT" group="PIN"/>
+                <signal pad-key="pe1" index="1" function="IOPORT" group="PIN"/>
+                <signal pad-key="pe2" index="2" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="can" name="CAN" module-key="can">
@@ -244,20 +244,20 @@
         <peripheral key="ac" name="AC" module-key="ac">
             <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"/>
-                <signal pad-id="pd5" index="2" function="AC" group="ACMP"/>
-                <signal pad-id="pc5" index="3" function="AC" group="ACMP"/>
-                <signal pad-id="pb2" index="0" function="AC" group="ACMPN"/>
-                <signal pad-id="pb5" index="1" function="AC" group="ACMPN"/>
-                <signal pad-id="pd6" index="2" function="AC" group="ACMPN"/>
-                <signal pad-id="pc4" index="3" function="AC" group="ACMPN"/>
+                <signal pad-key="pd7" index="0" function="AC" group="ACMP"/>
+                <signal pad-key="pc6" index="1" function="AC" group="ACMP"/>
+                <signal pad-key="pd5" index="2" function="AC" group="ACMP"/>
+                <signal pad-key="pc5" index="3" function="AC" group="ACMP"/>
+                <signal pad-key="pb2" index="0" function="AC" group="ACMPN"/>
+                <signal pad-key="pb5" index="1" function="AC" group="ACMPN"/>
+                <signal pad-key="pd6" index="2" function="AC" group="ACMPN"/>
+                <signal pad-key="pc4" index="3" function="AC" group="ACMPN"/>
             </signals>
         </peripheral>
         <peripheral key="dac" name="DAC" module-key="dac">
             <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"/>
+                <signal pad-key="pc7" function="DAC" group="D2A"/>
             </signals>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="cpu">
@@ -266,55 +266,55 @@
         <peripheral key="tc0" name="TC0" module-key="tc8">
             <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"/>
-                <signal pad-id="pe1" function="TC0" group="OC0B"/>
+                <signal pad-key="pc2" function="TC0" group="T0"/>
+                <signal pad-key="pd3" function="TC0" group="OC0A"/>
+                <signal pad-key="pe1" function="TC0" group="OC0B"/>
             </signals>
         </peripheral>
         <peripheral key="tc1" name="TC1" module-key="tc16">
             <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"/>
-                <signal pad-id="pc3" function="TC1" group="ICP1B"/>
-                <signal pad-id="pd2" function="TC1" group="OC1A"/>
-                <signal pad-id="pc1" function="TC1" group="OC1B"/>
+                <signal pad-key="pc3" function="TC1" group="T1"/>
+                <signal pad-key="pd4" function="TC1" group="ICP1A"/>
+                <signal pad-key="pc3" function="TC1" group="ICP1B"/>
+                <signal pad-key="pd2" function="TC1" group="OC1A"/>
+                <signal pad-key="pc1" function="TC1" group="OC1B"/>
             </signals>
         </peripheral>
         <peripheral key="adc" name="ADC" module-key="adc">
             <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"/>
-                <signal pad-id="pd5" index="2" function="ADC" group="ADC"/>
-                <signal pad-id="pd6" index="3" function="ADC" group="ADC"/>
-                <signal pad-id="pb7" index="4" function="ADC" group="ADC"/>
-                <signal pad-id="pb2" index="5" function="ADC" group="ADC"/>
-                <signal pad-id="pb5" index="6" function="ADC" group="ADC"/>
-                <signal pad-id="pb6" index="7" function="ADC" group="ADC"/>
-                <signal pad-id="pc4" index="8" function="ADC" group="ADC"/>
-                <signal pad-id="pc5" index="9" function="ADC" group="ADC"/>
-                <signal pad-id="pc6" index="10" function="ADC" group="ADC"/>
+                <signal pad-key="pe2" index="0" function="ADC" group="ADC"/>
+                <signal pad-key="pd4" index="1" function="ADC" group="ADC"/>
+                <signal pad-key="pd5" index="2" function="ADC" group="ADC"/>
+                <signal pad-key="pd6" index="3" function="ADC" group="ADC"/>
+                <signal pad-key="pb7" index="4" function="ADC" group="ADC"/>
+                <signal pad-key="pb2" index="5" function="ADC" group="ADC"/>
+                <signal pad-key="pb5" index="6" function="ADC" group="ADC"/>
+                <signal pad-key="pb6" index="7" function="ADC" group="ADC"/>
+                <signal pad-key="pc4" index="8" function="ADC" group="ADC"/>
+                <signal pad-key="pc5" index="9" function="ADC" group="ADC"/>
+                <signal pad-key="pc6" index="10" function="ADC" group="ADC"/>
             </signals>
         </peripheral>
         <peripheral key="linuart" name="LINUART" module-key="linuart">
             <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"/>
+                <signal pad-key="pd3" function="LIN" group="TXLIN"/>
+                <signal pad-key="pd4" function="LIN" group="RXLIN"/>
             </signals>
         </peripheral>
         <peripheral key="spi" name="SPI" module-key="spi">
             <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"/>
-                <signal pad-id="pb1" function="SPI" group="MOSI"/>
-                <signal pad-id="pd3" function="SPI_ALT" group="MOSI"/>
-                <signal pad-id="pb7" function="SPI" group="SCK"/>
-                <signal pad-id="pd4" function="SPI_ALT" group="SCK"/>
-                <signal pad-id="pd3" function="SPI" group="SS"/>
-                <signal pad-id="pc1" function="SPI_ALT" group="SS"/>
+                <signal pad-key="pb0" function="SPI" group="MISO"/>
+                <signal pad-key="pd2" function="SPI_ALT" group="MISO"/>
+                <signal pad-key="pb1" function="SPI" group="MOSI"/>
+                <signal pad-key="pd3" function="SPI_ALT" group="MOSI"/>
+                <signal pad-key="pb7" function="SPI" group="SCK"/>
+                <signal pad-key="pd4" function="SPI_ALT" group="SCK"/>
+                <signal pad-key="pd3" function="SPI" group="SS"/>
+                <signal pad-key="pc1" function="SPI_ALT" group="SS"/>
             </signals>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="wdt">
@@ -323,37 +323,37 @@
         <peripheral key="exint" name="EXINT" module-key="exint">
             <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"/>
-                <signal pad-id="pb5" index="2" function="EXINT" group="INT"/>
-                <signal pad-id="pc0" index="3" function="EXINT" group="INT"/>
-                <signal pad-id="pb0" index="0" function="EXINT" group="PCINT"/>
-                <signal pad-id="pb1" index="1" function="EXINT" group="PCINT"/>
-                <signal pad-id="pb2" index="2" function="EXINT" group="PCINT"/>
-                <signal pad-id="pb3" index="3" function="EXINT" group="PCINT"/>
-                <signal pad-id="pb4" index="4" function="EXINT" group="PCINT"/>
-                <signal pad-id="pb5" index="5" function="EXINT" group="PCINT"/>
-                <signal pad-id="pb6" index="6" function="EXINT" group="PCINT"/>
-                <signal pad-id="pb7" index="7" function="EXINT" group="PCINT"/>
-                <signal pad-id="pc0" index="8" function="EXINT" group="PCINT"/>
-                <signal pad-id="pc1" index="9" function="EXINT" group="PCINT"/>
-                <signal pad-id="pc2" index="10" function="EXINT" group="PCINT"/>
-                <signal pad-id="pc3" index="11" function="EXINT" group="PCINT"/>
-                <signal pad-id="pc4" index="12" function="EXINT" group="PCINT"/>
-                <signal pad-id="pc5" index="13" function="EXINT" group="PCINT"/>
-                <signal pad-id="pc6" index="14" function="EXINT" group="PCINT"/>
-                <signal pad-id="pc7" index="15" function="EXINT" group="PCINT"/>
-                <signal pad-id="pd0" index="16" function="EXINT" group="PCINT"/>
-                <signal pad-id="pd1" index="17" function="EXINT" group="PCINT"/>
-                <signal pad-id="pd2" index="18" function="EXINT" group="PCINT"/>
-                <signal pad-id="pd3" index="19" function="EXINT" group="PCINT"/>
-                <signal pad-id="pd4" index="20" function="EXINT" group="PCINT"/>
-                <signal pad-id="pd5" index="21" function="EXINT" group="PCINT"/>
-                <signal pad-id="pd6" index="22" function="EXINT" group="PCINT"/>
-                <signal pad-id="pd7" index="23" function="EXINT" group="PCINT"/>
-                <signal pad-id="pe0" index="24" function="EXINT" group="PCINT"/>
-                <signal pad-id="pe1" index="25" function="EXINT" group="PCINT"/>
-                <signal pad-id="pe2" index="26" function="EXINT" group="PCINT"/>
+                <signal pad-key="pd6" index="0" function="EXINT" group="INT"/>
+                <signal pad-key="pb2" index="1" function="EXINT" group="INT"/>
+                <signal pad-key="pb5" index="2" function="EXINT" group="INT"/>
+                <signal pad-key="pc0" index="3" function="EXINT" group="INT"/>
+                <signal pad-key="pb0" index="0" function="EXINT" group="PCINT"/>
+                <signal pad-key="pb1" index="1" function="EXINT" group="PCINT"/>
+                <signal pad-key="pb2" index="2" function="EXINT" group="PCINT"/>
+                <signal pad-key="pb3" index="3" function="EXINT" group="PCINT"/>
+                <signal pad-key="pb4" index="4" function="EXINT" group="PCINT"/>
+                <signal pad-key="pb5" index="5" function="EXINT" group="PCINT"/>
+                <signal pad-key="pb6" index="6" function="EXINT" group="PCINT"/>
+                <signal pad-key="pb7" index="7" function="EXINT" group="PCINT"/>
+                <signal pad-key="pc0" index="8" function="EXINT" group="PCINT"/>
+                <signal pad-key="pc1" index="9" function="EXINT" group="PCINT"/>
+                <signal pad-key="pc2" index="10" function="EXINT" group="PCINT"/>
+                <signal pad-key="pc3" index="11" function="EXINT" group="PCINT"/>
+                <signal pad-key="pc4" index="12" function="EXINT" group="PCINT"/>
+                <signal pad-key="pc5" index="13" function="EXINT" group="PCINT"/>
+                <signal pad-key="pc6" index="14" function="EXINT" group="PCINT"/>
+                <signal pad-key="pc7" index="15" function="EXINT" group="PCINT"/>
+                <signal pad-key="pd0" index="16" function="EXINT" group="PCINT"/>
+                <signal pad-key="pd1" index="17" function="EXINT" group="PCINT"/>
+                <signal pad-key="pd2" index="18" function="EXINT" group="PCINT"/>
+                <signal pad-key="pd3" index="19" function="EXINT" group="PCINT"/>
+                <signal pad-key="pd4" index="20" function="EXINT" group="PCINT"/>
+                <signal pad-key="pd5" index="21" function="EXINT" group="PCINT"/>
+                <signal pad-key="pd6" index="22" function="EXINT" group="PCINT"/>
+                <signal pad-key="pd7" index="23" function="EXINT" group="PCINT"/>
+                <signal pad-key="pe0" index="24" function="EXINT" group="PCINT"/>
+                <signal pad-key="pe1" index="25" function="EXINT" group="PCINT"/>
+                <signal pad-key="pe2" index="26" function="EXINT" group="PCINT"/>
             </signals>
         </peripheral>
         <peripheral key="eeprom" name="EEPROM" module-key="eeprom">
@@ -989,44 +989,78 @@
             </register-group>
         </module>
     </modules>
+    <pads>
+        <pad key="pd2" name="PD2"/>
+        <pad key="pd3" name="PD3"/>
+        <pad key="pc1" name="PC1"/>
+        <pad key="vcc" name="VCC"/>
+        <pad key="gnd" name="GND"/>
+        <pad key="pc2" name="PC2"/>
+        <pad key="pc3" name="PC3"/>
+        <pad key="pb0" name="PB0"/>
+        <pad key="pb1" name="PB1"/>
+        <pad key="pe1" name="PE1"/>
+        <pad key="pe2" name="PE2"/>
+        <pad key="pd4" name="PD4"/>
+        <pad key="pd5" name="PD5"/>
+        <pad key="pd6" name="PD6"/>
+        <pad key="pd7" name="PD7"/>
+        <pad key="pb2" name="PB2"/>
+        <pad key="pc4" name="PC4"/>
+        <pad key="pc5" name="PC5"/>
+        <pad key="avcc" name="AVCC"/>
+        <pad key="agnd" name="AGND"/>
+        <pad key="aref" name="AREF"/>
+        <pad key="pc6" name="PC6"/>
+        <pad key="pb3" name="PB3"/>
+        <pad key="pb4" name="PB4"/>
+        <pad key="pc7" name="PC7"/>
+        <pad key="pb5" name="PB5"/>
+        <pad key="pb6" name="PB6"/>
+        <pad key="pb7" name="PB7"/>
+        <pad key="pd0" name="PD0"/>
+        <pad key="pc0" name="PC0"/>
+        <pad key="pe0" name="PE0"/>
+        <pad key="pd1" name="PD1"/>
+    </pads>
     <pinouts>
         <pinout key="tqfpqfn32" name="TQFPQFN32" type="qfn">
-            <pin position="1" pad="PD2"/>
-            <pin position="2" pad="PD3"/>
-            <pin position="3" pad="PC1"/>
-            <pin position="4" pad="VCC"/>
-            <pin position="5" pad="GND"/>
-            <pin position="6" pad="PC2"/>
-            <pin position="7" pad="PC3"/>
-            <pin position="8" pad="PB0"/>
-            <pin position="9" pad="PB1"/>
-            <pin position="10" pad="PE1"/>
-            <pin position="11" pad="PE2"/>
-            <pin position="12" pad="PD4"/>
-            <pin position="13" pad="PD5"/>
-            <pin position="14" pad="PD6"/>
-            <pin position="15" pad="PD7"/>
-            <pin position="16" pad="PB2"/>
-            <pin position="17" pad="PC4"/>
-            <pin position="18" pad="PC5"/>
-            <pin position="19" pad="AVCC"/>
-            <pin position="20" pad="AGND"/>
-            <pin position="21" pad="AREF"/>
-            <pin position="22" pad="PC6"/>
-            <pin position="23" pad="PB3"/>
-            <pin position="24" pad="PB4"/>
-            <pin position="25" pad="PC7"/>
-            <pin position="26" pad="PB5"/>
-            <pin position="27" pad="PB6"/>
-            <pin position="28" pad="PB7"/>
-            <pin position="29" pad="PD0"/>
-            <pin position="30" pad="PC0"/>
-            <pin position="31" pad="PE0"/>
-            <pin position="32" pad="PD1"/>
+            <pin position="1" pad-key="pd2"/>
+            <pin position="2" pad-key="pd3"/>
+            <pin position="3" pad-key="pc1"/>
+            <pin position="4" pad-key="vcc"/>
+            <pin position="5" pad-key="gnd"/>
+            <pin position="6" pad-key="pc2"/>
+            <pin position="7" pad-key="pc3"/>
+            <pin position="8" pad-key="pb0"/>
+            <pin position="9" pad-key="pb1"/>
+            <pin position="10" pad-key="pe1"/>
+            <pin position="11" pad-key="pe2"/>
+            <pin position="12" pad-key="pd4"/>
+            <pin position="13" pad-key="pd5"/>
+            <pin position="14" pad-key="pd6"/>
+            <pin position="15" pad-key="pd7"/>
+            <pin position="16" pad-key="pb2"/>
+            <pin position="17" pad-key="pc4"/>
+            <pin position="18" pad-key="pc5"/>
+            <pin position="19" pad-key="avcc"/>
+            <pin position="20" pad-key="agnd"/>
+            <pin position="21" pad-key="aref"/>
+            <pin position="22" pad-key="pc6"/>
+            <pin position="23" pad-key="pb3"/>
+            <pin position="24" pad-key="pb4"/>
+            <pin position="25" pad-key="pc7"/>
+            <pin position="26" pad-key="pb5"/>
+            <pin position="27" pad-key="pb6"/>
+            <pin position="28" pad-key="pb7"/>
+            <pin position="29" pad-key="pd0"/>
+            <pin position="30" pad-key="pc0"/>
+            <pin position="31" pad-key="pe0"/>
+            <pin position="32" pad-key="pd1"/>
         </pinout>
     </pinouts>
     <variants>
-        <variant name="ATmega32C1-AU" pinout-key="tqfpqfn32" package="TQFP32"/>
-        <variant name="ATmega32C1-MU" pinout-key="tqfpqfn32" package="QFN32"/>
+        <variant key="atmega32c1_au" name="ATmega32C1-AU" pinout-key="tqfpqfn32"/>
+        <variant key="atmega32c1_mu" name="ATmega32C1-MU" pinout-key="tqfpqfn32"/>
     </variants>
 </device>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA32M1.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA32M1.xml
index 92840a21..796ba416 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA32M1.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA32M1.xml
@@ -194,48 +194,48 @@
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pb2" index="2" function="IOPORT" group="PIN"/>
-                <signal pad-id="pb3" index="3" function="IOPORT" group="PIN"/>
-                <signal pad-id="pb4" index="4" function="IOPORT" group="PIN"/>
-                <signal pad-id="pb5" index="5" function="IOPORT" group="PIN"/>
-                <signal pad-id="pb6" index="6" function="IOPORT" group="PIN"/>
-                <signal pad-id="pb7" index="7" function="IOPORT" group="PIN"/>
+                <signal pad-key="pb0" index="0" function="IOPORT" group="PIN"/>
+                <signal pad-key="pb1" index="1" function="IOPORT" group="PIN"/>
+                <signal pad-key="pb2" index="2" function="IOPORT" group="PIN"/>
+                <signal pad-key="pb3" index="3" function="IOPORT" group="PIN"/>
+                <signal pad-key="pb4" index="4" function="IOPORT" group="PIN"/>
+                <signal pad-key="pb5" index="5" function="IOPORT" group="PIN"/>
+                <signal pad-key="pb6" index="6" function="IOPORT" group="PIN"/>
+                <signal pad-key="pb7" index="7" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pc2" index="2" function="IOPORT" group="PIN"/>
-                <signal pad-id="pc3" index="3" function="IOPORT" group="PIN"/>
-                <signal pad-id="pc4" index="4" function="IOPORT" group="PIN"/>
-                <signal pad-id="pc5" index="5" function="IOPORT" group="PIN"/>
-                <signal pad-id="pc6" index="6" function="IOPORT" group="PIN"/>
-                <signal pad-id="pc7" index="7" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc0" index="0" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc1" index="1" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc2" index="2" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc3" index="3" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc4" index="4" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc5" index="5" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc6" index="6" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc7" index="7" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pd2" index="2" function="IOPORT" group="PIN"/>
-                <signal pad-id="pd3" index="3" function="IOPORT" group="PIN"/>
-                <signal pad-id="pd4" index="4" function="IOPORT" group="PIN"/>
-                <signal pad-id="pd5" index="5" function="IOPORT" group="PIN"/>
-                <signal pad-id="pd6" index="6" function="IOPORT" group="PIN"/>
-                <signal pad-id="pd7" index="7" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd0" index="0" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd1" index="1" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd2" index="2" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd3" index="3" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd4" index="4" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd5" index="5" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd6" index="6" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd7" index="7" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="porte" name="PORTE" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pe2" index="2" function="IOPORT" group="PIN"/>
+                <signal pad-key="pe0" index="0" function="IOPORT" group="PIN"/>
+                <signal pad-key="pe1" index="1" function="IOPORT" group="PIN"/>
+                <signal pad-key="pe2" index="2" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="can" name="CAN" module-key="can">
@@ -244,20 +244,20 @@
         <peripheral key="ac" name="AC" module-key="ac">
             <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"/>
-                <signal pad-id="pd5" index="2" function="AC" group="ACMP"/>
-                <signal pad-id="pc5" index="3" function="AC" group="ACMP"/>
-                <signal pad-id="pb2" index="0" function="AC" group="ACMPN"/>
-                <signal pad-id="pb5" index="1" function="AC" group="ACMPN"/>
-                <signal pad-id="pd6" index="2" function="AC" group="ACMPN"/>
-                <signal pad-id="pc4" index="3" function="AC" group="ACMPN"/>
+                <signal pad-key="pd7" index="0" function="AC" group="ACMP"/>
+                <signal pad-key="pc6" index="1" function="AC" group="ACMP"/>
+                <signal pad-key="pd5" index="2" function="AC" group="ACMP"/>
+                <signal pad-key="pc5" index="3" function="AC" group="ACMP"/>
+                <signal pad-key="pb2" index="0" function="AC" group="ACMPN"/>
+                <signal pad-key="pb5" index="1" function="AC" group="ACMPN"/>
+                <signal pad-key="pd6" index="2" function="AC" group="ACMPN"/>
+                <signal pad-key="pc4" index="3" function="AC" group="ACMPN"/>
             </signals>
         </peripheral>
         <peripheral key="dac" name="DAC" module-key="dac">
             <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"/>
+                <signal pad-key="pc7" function="DAC" group="D2A"/>
             </signals>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="cpu">
@@ -266,55 +266,55 @@
         <peripheral key="tc0" name="TC0" module-key="tc8">
             <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"/>
-                <signal pad-id="pe1" function="TC0" group="OC0B"/>
+                <signal pad-key="pc2" function="TC0" group="T0"/>
+                <signal pad-key="pd3" function="TC0" group="OC0A"/>
+                <signal pad-key="pe1" function="TC0" group="OC0B"/>
             </signals>
         </peripheral>
         <peripheral key="tc1" name="TC1" module-key="tc16">
             <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"/>
-                <signal pad-id="pc3" function="TC1" group="ICP1B"/>
-                <signal pad-id="pd2" function="TC1" group="OC1A"/>
-                <signal pad-id="pc1" function="TC1" group="OC1B"/>
+                <signal pad-key="pc3" function="TC1" group="T1"/>
+                <signal pad-key="pd4" function="TC1" group="ICP1A"/>
+                <signal pad-key="pc3" function="TC1" group="ICP1B"/>
+                <signal pad-key="pd2" function="TC1" group="OC1A"/>
+                <signal pad-key="pc1" function="TC1" group="OC1B"/>
             </signals>
         </peripheral>
         <peripheral key="adc" name="ADC" module-key="adc">
             <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"/>
-                <signal pad-id="pd5" index="2" function="ADC" group="ADC"/>
-                <signal pad-id="pd6" index="3" function="ADC" group="ADC"/>
-                <signal pad-id="pb7" index="4" function="ADC" group="ADC"/>
-                <signal pad-id="pb2" index="5" function="ADC" group="ADC"/>
-                <signal pad-id="pb5" index="6" function="ADC" group="ADC"/>
-                <signal pad-id="pb6" index="7" function="ADC" group="ADC"/>
-                <signal pad-id="pc4" index="8" function="ADC" group="ADC"/>
-                <signal pad-id="pc5" index="9" function="ADC" group="ADC"/>
-                <signal pad-id="pc6" index="10" function="ADC" group="ADC"/>
+                <signal pad-key="pe2" index="0" function="ADC" group="ADC"/>
+                <signal pad-key="pd4" index="1" function="ADC" group="ADC"/>
+                <signal pad-key="pd5" index="2" function="ADC" group="ADC"/>
+                <signal pad-key="pd6" index="3" function="ADC" group="ADC"/>
+                <signal pad-key="pb7" index="4" function="ADC" group="ADC"/>
+                <signal pad-key="pb2" index="5" function="ADC" group="ADC"/>
+                <signal pad-key="pb5" index="6" function="ADC" group="ADC"/>
+                <signal pad-key="pb6" index="7" function="ADC" group="ADC"/>
+                <signal pad-key="pc4" index="8" function="ADC" group="ADC"/>
+                <signal pad-key="pc5" index="9" function="ADC" group="ADC"/>
+                <signal pad-key="pc6" index="10" function="ADC" group="ADC"/>
             </signals>
         </peripheral>
         <peripheral key="linuart" name="LINUART" module-key="linuart">
             <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"/>
+                <signal pad-key="pd3" function="LIN" group="TXLIN"/>
+                <signal pad-key="pd4" function="LIN" group="RXLIN"/>
             </signals>
         </peripheral>
         <peripheral key="spi" name="SPI" module-key="spi">
             <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"/>
-                <signal pad-id="pb1" function="SPI" group="MOSI"/>
-                <signal pad-id="pd3" function="SPI_ALT" group="MOSI"/>
-                <signal pad-id="pb7" function="SPI" group="SCK"/>
-                <signal pad-id="pd4" function="SPI_ALT" group="SCK"/>
-                <signal pad-id="pd3" function="SPI" group="SS"/>
-                <signal pad-id="pc1" function="SPI_ALT" group="SS"/>
+                <signal pad-key="pb0" function="SPI" group="MISO"/>
+                <signal pad-key="pd2" function="SPI_ALT" group="MISO"/>
+                <signal pad-key="pb1" function="SPI" group="MOSI"/>
+                <signal pad-key="pd3" function="SPI_ALT" group="MOSI"/>
+                <signal pad-key="pb7" function="SPI" group="SCK"/>
+                <signal pad-key="pd4" function="SPI_ALT" group="SCK"/>
+                <signal pad-key="pd3" function="SPI" group="SS"/>
+                <signal pad-key="pc1" function="SPI_ALT" group="SS"/>
             </signals>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="wdt">
@@ -323,37 +323,37 @@
         <peripheral key="exint" name="EXINT" module-key="exint">
             <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"/>
-                <signal pad-id="pb5" index="2" function="EXINT" group="INT"/>
-                <signal pad-id="pc0" index="3" function="EXINT" group="INT"/>
-                <signal pad-id="pb0" index="0" function="EXINT" group="PCINT"/>
-                <signal pad-id="pb1" index="1" function="EXINT" group="PCINT"/>
-                <signal pad-id="pb2" index="2" function="EXINT" group="PCINT"/>
-                <signal pad-id="pb3" index="3" function="EXINT" group="PCINT"/>
-                <signal pad-id="pb4" index="4" function="EXINT" group="PCINT"/>
-                <signal pad-id="pb5" index="5" function="EXINT" group="PCINT"/>
-                <signal pad-id="pb6" index="6" function="EXINT" group="PCINT"/>
-                <signal pad-id="pb7" index="7" function="EXINT" group="PCINT"/>
-                <signal pad-id="pc0" index="8" function="EXINT" group="PCINT"/>
-                <signal pad-id="pc1" index="9" function="EXINT" group="PCINT"/>
-                <signal pad-id="pc2" index="10" function="EXINT" group="PCINT"/>
-                <signal pad-id="pc3" index="11" function="EXINT" group="PCINT"/>
-                <signal pad-id="pc4" index="12" function="EXINT" group="PCINT"/>
-                <signal pad-id="pc5" index="13" function="EXINT" group="PCINT"/>
-                <signal pad-id="pc6" index="14" function="EXINT" group="PCINT"/>
-                <signal pad-id="pc7" index="15" function="EXINT" group="PCINT"/>
-                <signal pad-id="pd0" index="16" function="EXINT" group="PCINT"/>
-                <signal pad-id="pd1" index="17" function="EXINT" group="PCINT"/>
-                <signal pad-id="pd2" index="18" function="EXINT" group="PCINT"/>
-                <signal pad-id="pd3" index="19" function="EXINT" group="PCINT"/>
-                <signal pad-id="pd4" index="20" function="EXINT" group="PCINT"/>
-                <signal pad-id="pd5" index="21" function="EXINT" group="PCINT"/>
-                <signal pad-id="pd6" index="22" function="EXINT" group="PCINT"/>
-                <signal pad-id="pd7" index="23" function="EXINT" group="PCINT"/>
-                <signal pad-id="pe0" index="24" function="EXINT" group="PCINT"/>
-                <signal pad-id="pe1" index="25" function="EXINT" group="PCINT"/>
-                <signal pad-id="pe2" index="26" function="EXINT" group="PCINT"/>
+                <signal pad-key="pd6" index="0" function="EXINT" group="INT"/>
+                <signal pad-key="pb2" index="1" function="EXINT" group="INT"/>
+                <signal pad-key="pb5" index="2" function="EXINT" group="INT"/>
+                <signal pad-key="pc0" index="3" function="EXINT" group="INT"/>
+                <signal pad-key="pb0" index="0" function="EXINT" group="PCINT"/>
+                <signal pad-key="pb1" index="1" function="EXINT" group="PCINT"/>
+                <signal pad-key="pb2" index="2" function="EXINT" group="PCINT"/>
+                <signal pad-key="pb3" index="3" function="EXINT" group="PCINT"/>
+                <signal pad-key="pb4" index="4" function="EXINT" group="PCINT"/>
+                <signal pad-key="pb5" index="5" function="EXINT" group="PCINT"/>
+                <signal pad-key="pb6" index="6" function="EXINT" group="PCINT"/>
+                <signal pad-key="pb7" index="7" function="EXINT" group="PCINT"/>
+                <signal pad-key="pc0" index="8" function="EXINT" group="PCINT"/>
+                <signal pad-key="pc1" index="9" function="EXINT" group="PCINT"/>
+                <signal pad-key="pc2" index="10" function="EXINT" group="PCINT"/>
+                <signal pad-key="pc3" index="11" function="EXINT" group="PCINT"/>
+                <signal pad-key="pc4" index="12" function="EXINT" group="PCINT"/>
+                <signal pad-key="pc5" index="13" function="EXINT" group="PCINT"/>
+                <signal pad-key="pc6" index="14" function="EXINT" group="PCINT"/>
+                <signal pad-key="pc7" index="15" function="EXINT" group="PCINT"/>
+                <signal pad-key="pd0" index="16" function="EXINT" group="PCINT"/>
+                <signal pad-key="pd1" index="17" function="EXINT" group="PCINT"/>
+                <signal pad-key="pd2" index="18" function="EXINT" group="PCINT"/>
+                <signal pad-key="pd3" index="19" function="EXINT" group="PCINT"/>
+                <signal pad-key="pd4" index="20" function="EXINT" group="PCINT"/>
+                <signal pad-key="pd5" index="21" function="EXINT" group="PCINT"/>
+                <signal pad-key="pd6" index="22" function="EXINT" group="PCINT"/>
+                <signal pad-key="pd7" index="23" function="EXINT" group="PCINT"/>
+                <signal pad-key="pe0" index="24" function="EXINT" group="PCINT"/>
+                <signal pad-key="pe1" index="25" function="EXINT" group="PCINT"/>
+                <signal pad-key="pe2" index="26" function="EXINT" group="PCINT"/>
             </signals>
         </peripheral>
         <peripheral key="eeprom" name="EEPROM" module-key="eeprom">
@@ -362,15 +362,15 @@
         <peripheral key="psc" name="PSC" module-key="psc">
             <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"/>
-                <signal pad-id="pb1" function="PSC" group="PSCOUT2B"/>
-                <signal pad-id="pc1" function="PSC" group="PSCIN1"/>
-                <signal pad-id="pc0" function="PSC" group="PSCOUT1A"/>
-                <signal pad-id="pb6" function="PSC" group="PSCOUT1B"/>
-                <signal pad-id="pd1" function="PSC" group="PSCIN0"/>
-                <signal pad-id="pd0" function="PSC" group="PSCOUT0A"/>
-                <signal pad-id="pb7" function="PSC" group="PSCOUT0B"/>
+                <signal pad-key="pd2" function="PSC" group="PSCIN2"/>
+                <signal pad-key="pb0" function="PSC" group="PSCOUT2A"/>
+                <signal pad-key="pb1" function="PSC" group="PSCOUT2B"/>
+                <signal pad-key="pc1" function="PSC" group="PSCIN1"/>
+                <signal pad-key="pc0" function="PSC" group="PSCOUT1A"/>
+                <signal pad-key="pb6" function="PSC" group="PSCOUT1B"/>
+                <signal pad-key="pd1" function="PSC" group="PSCIN0"/>
+                <signal pad-key="pd0" function="PSC" group="PSCOUT0A"/>
+                <signal pad-key="pb7" function="PSC" group="PSCOUT0B"/>
             </signals>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="fuse">
@@ -1038,44 +1038,78 @@
             </register-group>
         </module>
     </modules>
+    <pads>
+        <pad key="pd2" name="PD2"/>
+        <pad key="pd3" name="PD3"/>
+        <pad key="pc1" name="PC1"/>
+        <pad key="vcc" name="VCC"/>
+        <pad key="gnd" name="GND"/>
+        <pad key="pc2" name="PC2"/>
+        <pad key="pc3" name="PC3"/>
+        <pad key="pb0" name="PB0"/>
+        <pad key="pb1" name="PB1"/>
+        <pad key="pe1" name="PE1"/>
+        <pad key="pe2" name="PE2"/>
+        <pad key="pd4" name="PD4"/>
+        <pad key="pd5" name="PD5"/>
+        <pad key="pd6" name="PD6"/>
+        <pad key="pd7" name="PD7"/>
+        <pad key="pb2" name="PB2"/>
+        <pad key="pc4" name="PC4"/>
+        <pad key="pc5" name="PC5"/>
+        <pad key="avcc" name="AVCC"/>
+        <pad key="agnd" name="AGND"/>
+        <pad key="aref" name="AREF"/>
+        <pad key="pc6" name="PC6"/>
+        <pad key="pb3" name="PB3"/>
+        <pad key="pb4" name="PB4"/>
+        <pad key="pc7" name="PC7"/>
+        <pad key="pb5" name="PB5"/>
+        <pad key="pb6" name="PB6"/>
+        <pad key="pb7" name="PB7"/>
+        <pad key="pd0" name="PD0"/>
+        <pad key="pc0" name="PC0"/>
+        <pad key="pe0" name="PE0"/>
+        <pad key="pd1" name="PD1"/>
+    </pads>
     <pinouts>
         <pinout key="tqfpqfn32" name="TQFPQFN32" type="qfn">
-            <pin position="1" pad="PD2"/>
-            <pin position="2" pad="PD3"/>
-            <pin position="3" pad="PC1"/>
-            <pin position="4" pad="VCC"/>
-            <pin position="5" pad="GND"/>
-            <pin position="6" pad="PC2"/>
-            <pin position="7" pad="PC3"/>
-            <pin position="8" pad="PB0"/>
-            <pin position="9" pad="PB1"/>
-            <pin position="10" pad="PE1"/>
-            <pin position="11" pad="PE2"/>
-            <pin position="12" pad="PD4"/>
-            <pin position="13" pad="PD5"/>
-            <pin position="14" pad="PD6"/>
-            <pin position="15" pad="PD7"/>
-            <pin position="16" pad="PB2"/>
-            <pin position="17" pad="PC4"/>
-            <pin position="18" pad="PC5"/>
-            <pin position="19" pad="AVCC"/>
-            <pin position="20" pad="AGND"/>
-            <pin position="21" pad="AREF"/>
-            <pin position="22" pad="PC6"/>
-            <pin position="23" pad="PB3"/>
-            <pin position="24" pad="PB4"/>
-            <pin position="25" pad="PC7"/>
-            <pin position="26" pad="PB5"/>
-            <pin position="27" pad="PB6"/>
-            <pin position="28" pad="PB7"/>
-            <pin position="29" pad="PD0"/>
-            <pin position="30" pad="PC0"/>
-            <pin position="31" pad="PE0"/>
-            <pin position="32" pad="PD1"/>
+            <pin position="1" pad-key="pd2"/>
+            <pin position="2" pad-key="pd3"/>
+            <pin position="3" pad-key="pc1"/>
+            <pin position="4" pad-key="vcc"/>
+            <pin position="5" pad-key="gnd"/>
+            <pin position="6" pad-key="pc2"/>
+            <pin position="7" pad-key="pc3"/>
+            <pin position="8" pad-key="pb0"/>
+            <pin position="9" pad-key="pb1"/>
+            <pin position="10" pad-key="pe1"/>
+            <pin position="11" pad-key="pe2"/>
+            <pin position="12" pad-key="pd4"/>
+            <pin position="13" pad-key="pd5"/>
+            <pin position="14" pad-key="pd6"/>
+            <pin position="15" pad-key="pd7"/>
+            <pin position="16" pad-key="pb2"/>
+            <pin position="17" pad-key="pc4"/>
+            <pin position="18" pad-key="pc5"/>
+            <pin position="19" pad-key="avcc"/>
+            <pin position="20" pad-key="agnd"/>
+            <pin position="21" pad-key="aref"/>
+            <pin position="22" pad-key="pc6"/>
+            <pin position="23" pad-key="pb3"/>
+            <pin position="24" pad-key="pb4"/>
+            <pin position="25" pad-key="pc7"/>
+            <pin position="26" pad-key="pb5"/>
+            <pin position="27" pad-key="pb6"/>
+            <pin position="28" pad-key="pb7"/>
+            <pin position="29" pad-key="pd0"/>
+            <pin position="30" pad-key="pc0"/>
+            <pin position="31" pad-key="pe0"/>
+            <pin position="32" pad-key="pd1"/>
         </pinout>
     </pinouts>
     <variants>
-        <variant name="ATmega32M1-AU" pinout-key="tqfpqfn32" package="TQFP32"/>
-        <variant name="ATmega32M1-MU" pinout-key="tqfpqfn32" package="QFN32"/>
+        <variant key="atmega32m1_au" name="ATmega32M1-AU" pinout-key="tqfpqfn32"/>
+        <variant key="atmega32m1_mu" name="ATmega32M1-MU" pinout-key="tqfpqfn32"/>
     </variants>
 </device>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA32U2.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA32U2.xml
index 0743fa6c..5b5abcbb 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA32U2.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA32U2.xml
@@ -194,49 +194,48 @@
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pb2" index="2" function="default" group="P"/>
-                <signal pad-id="pb3" index="3" function="default" group="P"/>
-                <signal pad-id="pb4" index="4" function="default" group="P"/>
-                <signal pad-id="pb5" index="5" function="default" group="P"/>
-                <signal pad-id="pb6" index="6" function="default" group="P"/>
-                <signal pad-id="pb7" index="7" function="default" group="P"/>
+                <signal pad-key="pb0" index="0" function="default" group="P"/>
+                <signal pad-key="pb1" index="1" function="default" group="P"/>
+                <signal pad-key="pb2" index="2" function="default" group="P"/>
+                <signal pad-key="pb3" index="3" function="default" group="P"/>
+                <signal pad-key="pb4" index="4" function="default" group="P"/>
+                <signal pad-key="pb5" index="5" function="default" group="P"/>
+                <signal pad-key="pb6" index="6" function="default" group="P"/>
+                <signal pad-key="pb7" index="7" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pd2" index="2" function="default" group="P"/>
-                <signal pad-id="pd3" index="3" function="default" group="P"/>
-                <signal pad-id="pd4" index="4" function="default" group="P"/>
-                <signal pad-id="pd5" index="5" function="default" group="P"/>
-                <signal pad-id="pd6" index="6" function="default" group="P"/>
-                <signal pad-id="pd7" index="7" function="default" group="P"/>
+                <signal pad-key="pd0" index="0" function="default" group="P"/>
+                <signal pad-key="pd1" index="1" function="default" group="P"/>
+                <signal pad-key="pd2" index="2" function="default" group="P"/>
+                <signal pad-key="pd3" index="3" function="default" group="P"/>
+                <signal pad-key="pd4" index="4" function="default" group="P"/>
+                <signal pad-key="pd5" index="5" function="default" group="P"/>
+                <signal pad-key="pd6" index="6" function="default" group="P"/>
+                <signal pad-key="pd7" index="7" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pc2" index="2" function="default" group="P"/>
-                <signal pad-id="pc3" index="3" function="default" group="P"/>
-                <signal pad-id="pc4" index="4" function="default" group="P"/>
-                <signal pad-id="pc5" index="5" function="default" group="P"/>
-                <signal pad-id="pc6" index="6" function="default" group="P"/>
-                <signal pad-id="pc7" index="7" function="default" group="P"/>
+                <signal pad-key="pc0" index="0" function="default" group="P"/>
+                <signal pad-key="pc1" index="1" function="default" group="P"/>
+                <signal pad-key="pc2" index="2" function="default" group="P"/>
+                <signal pad-key="pc4" index="4" function="default" group="P"/>
+                <signal pad-key="pc5" index="5" function="default" group="P"/>
+                <signal pad-key="pc6" index="6" function="default" group="P"/>
+                <signal pad-key="pc7" index="7" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="spi" name="SPI" module-key="spi">
             <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"/>
-                <signal pad-id="pb1" function="default" group="SCLK"/>
-                <signal pad-id="pb0" function="default" group="SS"/>
+                <signal pad-key="pb3" function="default" group="MISO"/>
+                <signal pad-key="pb2" function="default" group="MOSI"/>
+                <signal pad-key="pb1" function="default" group="SCLK"/>
+                <signal pad-key="pb0" function="default" group="SS"/>
             </signals>
         </peripheral>
         <peripheral key="boot_load" name="BOOT_LOAD" module-key="boot_load">
@@ -248,19 +247,19 @@
         <peripheral key="tc0" name="TC0" module-key="tc8">
             <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"/>
-                <signal pad-id="pd7" function="default" group="T"/>
+                <signal pad-key="pb7" function="default" group="OCA"/>
+                <signal pad-key="pd0" function="default" group="OCB"/>
+                <signal pad-key="pd7" function="default" group="T"/>
             </signals>
         </peripheral>
         <peripheral key="tc1" name="TC1" module-key="tc16">
             <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"/>
-                <signal pad-id="pc5" function="default" group="OCB"/>
-                <signal pad-id="pb7" function="default" group="OCC"/>
-                <signal pad-id="pb4" function="default" group="T"/>
+                <signal pad-key="pc7" function="default" group="ICP"/>
+                <signal pad-key="pc6" function="default" group="OCA"/>
+                <signal pad-key="pc5" function="default" group="OCB"/>
+                <signal pad-key="pb7" function="default" group="OCC"/>
+                <signal pad-key="pb4" function="default" group="T"/>
             </signals>
         </peripheral>
         <peripheral key="pll" name="PLL" module-key="pll">
@@ -275,37 +274,37 @@
         <peripheral key="exint" name="EXINT" module-key="exint">
             <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"/>
-                <signal pad-id="pd2" index="2" function="default" group="INT"/>
-                <signal pad-id="pd3" index="3" function="default" group="INT"/>
-                <signal pad-id="pc7" index="4" function="default" group="INT"/>
-                <signal pad-id="pd4" index="5" function="default" group="INT"/>
-                <signal pad-id="pd6" index="6" function="default" group="INT"/>
-                <signal pad-id="pd7" index="7" function="default" group="INT"/>
-                <signal pad-id="pb0" index="0" function="default" group="PCINT"/>
-                <signal pad-id="pb1" index="1" function="default" group="PCINT"/>
-                <signal pad-id="pb2" index="2" function="default" group="PCINT"/>
-                <signal pad-id="pb3" index="3" function="default" group="PCINT"/>
-                <signal pad-id="pb4" index="4" function="default" group="PCINT"/>
-                <signal pad-id="pb5" index="5" function="default" group="PCINT"/>
-                <signal pad-id="pb6" index="6" function="default" group="PCINT"/>
-                <signal pad-id="pb7" index="7" function="default" group="PCINT"/>
-                <signal pad-id="pc6" index="8" function="default" group="PCINT"/>
-                <signal pad-id="pc5" index="9" function="default" group="PCINT"/>
-                <signal pad-id="pc4" index="10" function="default" group="PCINT"/>
-                <signal pad-id="pc2" index="11" function="default" group="PCINT"/>
-                <signal pad-id="pd5" index="12" function="default" group="PCINT"/>
+                <signal pad-key="pd0" index="0" function="default" group="INT"/>
+                <signal pad-key="pd1" index="1" function="default" group="INT"/>
+                <signal pad-key="pd2" index="2" function="default" group="INT"/>
+                <signal pad-key="pd3" index="3" function="default" group="INT"/>
+                <signal pad-key="pc7" index="4" function="default" group="INT"/>
+                <signal pad-key="pd4" index="5" function="default" group="INT"/>
+                <signal pad-key="pd6" index="6" function="default" group="INT"/>
+                <signal pad-key="pd7" index="7" function="default" group="INT"/>
+                <signal pad-key="pb0" index="0" function="default" group="PCINT"/>
+                <signal pad-key="pb1" index="1" function="default" group="PCINT"/>
+                <signal pad-key="pb2" index="2" function="default" group="PCINT"/>
+                <signal pad-key="pb3" index="3" function="default" group="PCINT"/>
+                <signal pad-key="pb4" index="4" function="default" group="PCINT"/>
+                <signal pad-key="pb5" index="5" function="default" group="PCINT"/>
+                <signal pad-key="pb6" index="6" function="default" group="PCINT"/>
+                <signal pad-key="pb7" index="7" function="default" group="PCINT"/>
+                <signal pad-key="pc6" index="8" function="default" group="PCINT"/>
+                <signal pad-key="pc5" index="9" function="default" group="PCINT"/>
+                <signal pad-key="pc4" index="10" function="default" group="PCINT"/>
+                <signal pad-key="pc2" index="11" function="default" group="PCINT"/>
+                <signal pad-key="pd5" index="12" function="default" group="PCINT"/>
             </signals>
         </peripheral>
         <peripheral key="usart1" name="USART1" module-key="usart">
             <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"/>
-                <signal pad-id="pd5" function="default" group="XCK"/>
-                <signal pad-id="pd6" function="default" group="RTS"/>
-                <signal pad-id="pd7" function="default" group="CTS"/>
+                <signal pad-key="pd2" function="default" group="RXD"/>
+                <signal pad-key="pd3" function="default" group="TXD"/>
+                <signal pad-key="pd5" function="default" group="XCK"/>
+                <signal pad-key="pd6" function="default" group="RTS"/>
+                <signal pad-key="pd7" function="default" group="CTS"/>
             </signals>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="wdt">
@@ -314,13 +313,13 @@
         <peripheral key="ac" name="AC" module-key="ac">
             <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"/>
-                <signal pad-id="pc2" index="2" function="default" group="AIN"/>
-                <signal pad-id="pd4" index="3" function="default" group="AIN"/>
-                <signal pad-id="pd5" index="4" function="default" group="AIN"/>
-                <signal pad-id="pd6" index="5" function="default" group="AIN"/>
-                <signal pad-id="pd7" index="6" function="default" group="AIN"/>
+                <signal pad-key="pd1" index="0" function="default" group="AIN"/>
+                <signal pad-key="pd2" index="1" function="default" group="AIN"/>
+                <signal pad-key="pc2" index="2" function="default" group="AIN"/>
+                <signal pad-key="pd4" index="3" function="default" group="AIN"/>
+                <signal pad-key="pd5" index="4" function="default" group="AIN"/>
+                <signal pad-key="pd6" index="5" function="default" group="AIN"/>
+                <signal pad-key="pd7" index="6" function="default" group="AIN"/>
             </signals>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="fuse">
@@ -808,44 +807,78 @@
             </register-group>
         </module>
     </modules>
+    <pads>
+        <pad key="xtal1" name="XTAL1"/>
+        <pad key="pc0" name="PC0"/>
+        <pad key="gnd" name="GND"/>
+        <pad key="vcc" name="VCC"/>
+        <pad key="pc2" name="PC2"/>
+        <pad key="pd0" name="PD0"/>
+        <pad key="pd1" name="PD1"/>
+        <pad key="pd2" name="PD2"/>
+        <pad key="pd3" name="PD3"/>
+        <pad key="pd4" name="PD4"/>
+        <pad key="pd5" name="PD5"/>
+        <pad key="pd6" name="PD6"/>
+        <pad key="pd7" name="PD7"/>
+        <pad key="pb0" name="PB0"/>
+        <pad key="pb1" name="PB1"/>
+        <pad key="pb2" name="PB2"/>
+        <pad key="pb3" name="PB3"/>
+        <pad key="pb4" name="PB4"/>
+        <pad key="pb5" name="PB5"/>
+        <pad key="pb6" name="PB6"/>
+        <pad key="pb7" name="PB7"/>
+        <pad key="pc7" name="PC7"/>
+        <pad key="pc6" name="PC6"/>
+        <pad key="pc1" name="PC1"/>
+        <pad key="pc5" name="PC5"/>
+        <pad key="pc4" name="PC4"/>
+        <pad key="ucap" name="UCAP"/>
+        <pad key="ugnd" name="UGND"/>
+        <pad key="d+" name="D+"/>
+        <pad key="d-" name="D-"/>
+        <pad key="uvcc" name="UVCC"/>
+        <pad key="avcc" name="AVCC"/>
+    </pads>
     <pinouts>
         <pinout key="qfp32" name="QFP32" type="qfp">
-            <pin position="1" pad="XTAL1"/>
-            <pin position="2" pad="PC0"/>
-            <pin position="3" pad="GND"/>
-            <pin position="4" pad="VCC"/>
-            <pin position="5" pad="PC2"/>
-            <pin position="6" pad="PD0"/>
-            <pin position="7" pad="PD1"/>
-            <pin position="8" pad="PD2"/>
-            <pin position="9" pad="PD3"/>
-            <pin position="10" pad="PD4"/>
-            <pin position="11" pad="PD5"/>
-            <pin position="12" pad="PD6"/>
-            <pin position="13" pad="PD7"/>
-            <pin position="14" pad="PB0"/>
-            <pin position="15" pad="PB1"/>
-            <pin position="16" pad="PB2"/>
-            <pin position="17" pad="PB3"/>
-            <pin position="18" pad="PB4"/>
-            <pin position="19" pad="PB5"/>
-            <pin position="20" pad="PB6"/>
-            <pin position="21" pad="PB7"/>
-            <pin position="22" pad="PC7"/>
-            <pin position="23" pad="PC6"/>
-            <pin position="24" pad="PC1"/>
-            <pin position="25" pad="PC5"/>
-            <pin position="26" pad="PC4"/>
-            <pin position="27" pad="UCAP"/>
-            <pin position="28" pad="UGND"/>
-            <pin position="29" pad="D+"/>
-            <pin position="30" pad="D-"/>
-            <pin position="31" pad="UVCC"/>
-            <pin position="32" pad="AVCC"/>
+            <pin position="1" pad-key="xtal1"/>
+            <pin position="2" pad-key="pc0"/>
+            <pin position="3" pad-key="gnd"/>
+            <pin position="4" pad-key="vcc"/>
+            <pin position="5" pad-key="pc2"/>
+            <pin position="6" pad-key="pd0"/>
+            <pin position="7" pad-key="pd1"/>
+            <pin position="8" pad-key="pd2"/>
+            <pin position="9" pad-key="pd3"/>
+            <pin position="10" pad-key="pd4"/>
+            <pin position="11" pad-key="pd5"/>
+            <pin position="12" pad-key="pd6"/>
+            <pin position="13" pad-key="pd7"/>
+            <pin position="14" pad-key="pb0"/>
+            <pin position="15" pad-key="pb1"/>
+            <pin position="16" pad-key="pb2"/>
+            <pin position="17" pad-key="pb3"/>
+            <pin position="18" pad-key="pb4"/>
+            <pin position="19" pad-key="pb5"/>
+            <pin position="20" pad-key="pb6"/>
+            <pin position="21" pad-key="pb7"/>
+            <pin position="22" pad-key="pc7"/>
+            <pin position="23" pad-key="pc6"/>
+            <pin position="24" pad-key="pc1"/>
+            <pin position="25" pad-key="pc5"/>
+            <pin position="26" pad-key="pc4"/>
+            <pin position="27" pad-key="ucap"/>
+            <pin position="28" pad-key="ugnd"/>
+            <pin position="29" pad-key="d+"/>
+            <pin position="30" pad-key="d-"/>
+            <pin position="31" pad-key="uvcc"/>
+            <pin position="32" pad-key="avcc"/>
         </pinout>
     </pinouts>
     <variants>
-        <variant name="ATmega32U2-AU" pinout-key="qfp32" package="TQFP32"/>
-        <variant name="ATmega32U2-MU" pinout-key="qfp32" package="QFN32"/>
+        <variant key="atmega32u2_au" name="ATmega32U2-AU" pinout-key="qfp32"/>
+        <variant key="atmega32u2_mu" name="ATmega32U2-MU" pinout-key="qfp32"/>
     </variants>
 </device>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA32U4.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA32U4.xml
index 9a3caaa0..173f2ab4 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA32U4.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA32U4.xml
@@ -197,78 +197,78 @@
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pb2" index="2" function="default" group="P"/>
-                <signal pad-id="pb3" index="3" function="default" group="P"/>
-                <signal pad-id="pb4" index="4" function="default" group="P"/>
-                <signal pad-id="pb5" index="5" function="default" group="P"/>
-                <signal pad-id="pb6" index="6" function="default" group="P"/>
-                <signal pad-id="pb7" index="7" function="default" group="P"/>
+                <signal pad-key="pb0" index="0" function="default" group="P"/>
+                <signal pad-key="pb1" index="1" function="default" group="P"/>
+                <signal pad-key="pb2" index="2" function="default" group="P"/>
+                <signal pad-key="pb3" index="3" function="default" group="P"/>
+                <signal pad-key="pb4" index="4" function="default" group="P"/>
+                <signal pad-key="pb5" index="5" function="default" group="P"/>
+                <signal pad-key="pb6" index="6" function="default" group="P"/>
+                <signal pad-key="pb7" index="7" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
             <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"/>
+                <signal pad-key="pc6" index="6" function="default" group="P"/>
+                <signal pad-key="pc7" index="7" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pd2" index="2" function="default" group="P"/>
-                <signal pad-id="pd3" index="3" function="default" group="P"/>
-                <signal pad-id="pd4" index="4" function="default" group="P"/>
-                <signal pad-id="pd5" index="5" function="default" group="P"/>
-                <signal pad-id="pd6" index="6" function="default" group="P"/>
-                <signal pad-id="pd7" index="7" function="default" group="P"/>
+                <signal pad-key="pd0" index="0" function="default" group="P"/>
+                <signal pad-key="pd1" index="1" function="default" group="P"/>
+                <signal pad-key="pd2" index="2" function="default" group="P"/>
+                <signal pad-key="pd3" index="3" function="default" group="P"/>
+                <signal pad-key="pd4" index="4" function="default" group="P"/>
+                <signal pad-key="pd5" index="5" function="default" group="P"/>
+                <signal pad-key="pd6" index="6" function="default" group="P"/>
+                <signal pad-key="pd7" index="7" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="porte" name="PORTE" module-key="gpio_port">
             <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"/>
+                <signal pad-key="pe2" index="2" function="default" group="P"/>
+                <signal pad-key="pe6" index="6" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portf" name="PORTF" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pf4" index="4" function="default" group="P"/>
-                <signal pad-id="pf5" index="5" function="default" group="P"/>
-                <signal pad-id="pf6" index="6" function="default" group="P"/>
+                <signal pad-key="pf0" index="0" function="default" group="P"/>
+                <signal pad-key="pf1" index="1" function="default" group="P"/>
+                <signal pad-key="pf4" index="4" function="default" group="P"/>
+                <signal pad-key="pf5" index="5" function="default" group="P"/>
+                <signal pad-key="pf6" index="6" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="spi" name="SPI" module-key="spi">
             <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"/>
-                <signal pad-id="pb2" function="default" group="MOSI"/>
-                <signal pad-id="pb2" function="default" group="PDI"/>
-                <signal pad-id="pb3" function="default" group="MISO"/>
-                <signal pad-id="pb3" function="default" group="PDO"/>
+                <signal pad-key="pb0" function="default" group="SS"/>
+                <signal pad-key="pb1" function="default" group="SCK"/>
+                <signal pad-key="pb2" function="default" group="MOSI"/>
+                <signal pad-key="pb2" function="default" group="PDI"/>
+                <signal pad-key="pb3" function="default" group="MISO"/>
+                <signal pad-key="pb3" function="default" group="PDO"/>
             </signals>
         </peripheral>
         <peripheral key="usart1" name="USART1" module-key="usart">
             <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"/>
-                <signal pad-id="pd5" function="default" group="XCK"/>
-                <signal pad-id="pb7" function="default" group="RTS"/>
-                <signal pad-id="pd5" function="default" group="CTS"/>
+                <signal pad-key="pd3" function="default" group="TXD"/>
+                <signal pad-key="pd2" function="default" group="RXD"/>
+                <signal pad-key="pd5" function="default" group="XCK"/>
+                <signal pad-key="pb7" function="default" group="RTS"/>
+                <signal pad-key="pd5" function="default" group="CTS"/>
             </signals>
         </peripheral>
         <peripheral key="boot_load" name="BOOT_LOAD" module-key="boot_load">
             <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"/>
+                <signal pad-key="pe2" function="default" group="HWB"/>
             </signals>
         </peripheral>
         <peripheral key="eeprom" name="EEPROM" module-key="eeprom">
@@ -277,100 +277,100 @@
         <peripheral key="tc0" name="TC0" module-key="tc8">
             <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"/>
-                <signal pad-id="pb7" function="default" group="OCA"/>
+                <signal pad-key="pd7" function="default" group="T"/>
+                <signal pad-key="pd0" function="default" group="OCB"/>
+                <signal pad-key="pb7" function="default" group="OCA"/>
             </signals>
         </peripheral>
         <peripheral key="tc1" name="TC1" module-key="tc16">
             <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"/>
-                <signal pad-id="pb5" function="default" group="OCA"/>
-                <signal pad-id="pb6" function="default" group="OCB"/>
-                <signal pad-id="pb7" function="default" group="OCC"/>
+                <signal pad-key="pd6" function="default" group="T"/>
+                <signal pad-key="pd4" function="default" group="ICP"/>
+                <signal pad-key="pb5" function="default" group="OCA"/>
+                <signal pad-key="pb6" function="default" group="OCB"/>
+                <signal pad-key="pb7" function="default" group="OCC"/>
             </signals>
         </peripheral>
         <peripheral key="tc3" name="TC3" module-key="tc16">
             <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"/>
+                <signal pad-key="pc7" function="default" group="ICP"/>
+                <signal pad-key="pc6" function="default" group="OCA"/>
             </signals>
         </peripheral>
         <peripheral key="tc4" name="TC4" module-key="tc10">
             <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"/>
-                <signal pad-id="pb5" function="default" group="_OCB"/>
-                <signal pad-id="pb6" function="default" group="OCB"/>
-                <signal pad-id="pd6" function="default" group="_OCD"/>
-                <signal pad-id="pd7" function="default" group="OCD"/>
+                <signal pad-key="pc6" function="default" group="_OCA"/>
+                <signal pad-key="pc7" function="default" group="OCA"/>
+                <signal pad-key="pb5" function="default" group="_OCB"/>
+                <signal pad-key="pb6" function="default" group="OCB"/>
+                <signal pad-key="pd6" function="default" group="_OCD"/>
+                <signal pad-key="pd7" function="default" group="OCD"/>
             </signals>
         </peripheral>
         <peripheral key="jtag" name="JTAG" module-key="jtag">
             <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"/>
-                <signal pad-id="pf6" function="default" group="TDO"/>
-                <signal pad-id="pf7" function="default" group="TDI"/>
+                <signal pad-key="pf4" function="default" group="TCK"/>
+                <signal pad-key="pf5" function="default" group="TMS"/>
+                <signal pad-key="pf6" function="default" group="TDO"/>
+                <signal pad-key="pf7" function="default" group="TDI"/>
             </signals>
         </peripheral>
         <peripheral key="exint" name="EXINT" module-key="exint">
             <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"/>
-                <signal pad-id="pb2" index="2" function="default" group="PCINT"/>
-                <signal pad-id="pb3" index="3" function="default" group="PCINT"/>
-                <signal pad-id="pb4" index="4" function="default" group="PCINT"/>
-                <signal pad-id="pb5" index="5" function="default" group="PCINT"/>
-                <signal pad-id="pb6" index="6" function="default" group="PCINT"/>
-                <signal pad-id="pb7" index="7" function="default" group="PCINT"/>
-                <signal pad-id="pd0" index="0" function="default" group="INT"/>
-                <signal pad-id="pd1" index="1" function="default" group="INT"/>
-                <signal pad-id="pd2" index="2" function="default" group="INT"/>
-                <signal pad-id="pd3" index="3" function="default" group="INT"/>
-                <signal pad-id="pe6" index="6" function="default" group="INT"/>
+                <signal pad-key="pb0" index="0" function="default" group="PCINT"/>
+                <signal pad-key="pb1" index="1" function="default" group="PCINT"/>
+                <signal pad-key="pb2" index="2" function="default" group="PCINT"/>
+                <signal pad-key="pb3" index="3" function="default" group="PCINT"/>
+                <signal pad-key="pb4" index="4" function="default" group="PCINT"/>
+                <signal pad-key="pb5" index="5" function="default" group="PCINT"/>
+                <signal pad-key="pb6" index="6" function="default" group="PCINT"/>
+                <signal pad-key="pb7" index="7" function="default" group="PCINT"/>
+                <signal pad-key="pd0" index="0" function="default" group="INT"/>
+                <signal pad-key="pd1" index="1" function="default" group="INT"/>
+                <signal pad-key="pd2" index="2" function="default" group="INT"/>
+                <signal pad-key="pd3" index="3" function="default" group="INT"/>
+                <signal pad-key="pe6" index="6" function="default" group="INT"/>
             </signals>
         </peripheral>
         <peripheral key="twi" name="TWI" module-key="twi">
             <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"/>
+                <signal pad-key="pd1" function="default" group="SDA"/>
+                <signal pad-key="pd0" function="default" group="SCL"/>
             </signals>
         </peripheral>
         <peripheral key="adc" name="ADC" module-key="adc">
             <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"/>
-                <signal pad-id="pf4" index="4" function="default" group="ADC"/>
-                <signal pad-id="pf5" index="5" function="default" group="ADC"/>
-                <signal pad-id="pf6" index="6" function="default" group="ADC"/>
-                <signal pad-id="pf7" index="7" function="default" group="ADC"/>
-                <signal pad-id="pd4" index="8" function="default" group="ADC"/>
-                <signal pad-id="pd6" index="9" function="default" group="ADC"/>
-                <signal pad-id="pd7" index="10" function="default" group="ADC"/>
-                <signal pad-id="pb4" index="11" function="default" group="ADC"/>
-                <signal pad-id="pb5" index="12" function="default" group="ADC"/>
-                <signal pad-id="pb6" index="13" function="default" group="ADC"/>
+                <signal pad-key="pf0" index="0" function="default" group="ADC"/>
+                <signal pad-key="pf1" index="1" function="default" group="ADC"/>
+                <signal pad-key="pf4" index="4" function="default" group="ADC"/>
+                <signal pad-key="pf5" index="5" function="default" group="ADC"/>
+                <signal pad-key="pf6" index="6" function="default" group="ADC"/>
+                <signal pad-key="pf7" index="7" function="default" group="ADC"/>
+                <signal pad-key="pd4" index="8" function="default" group="ADC"/>
+                <signal pad-key="pd6" index="9" function="default" group="ADC"/>
+                <signal pad-key="pd7" index="10" function="default" group="ADC"/>
+                <signal pad-key="pb4" index="11" function="default" group="ADC"/>
+                <signal pad-key="pb5" index="12" function="default" group="ADC"/>
+                <signal pad-key="pb6" index="13" function="default" group="ADC"/>
             </signals>
         </peripheral>
         <peripheral key="ac" name="AC" module-key="ac">
             <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"/>
+                <signal pad-key="pe6" index="0" function="default" group="AIN"/>
             </signals>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="cpu">
             <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"/>
+                <signal pad-key="pc7" index="0" function="default" group="CLK"/>
             </signals>
         </peripheral>
         <peripheral key="pll" name="PLL" module-key="pll">
@@ -1051,104 +1051,145 @@
             </register-group>
         </module>
     </modules>
+    <pads>
+        <pad key="pe6" name="PE6"/>
+        <pad key="uvcc" name="UVCC"/>
+        <pad key="dm" name="DM"/>
+        <pad key="dp" name="DP"/>
+        <pad key="ugnd" name="UGND"/>
+        <pad key="ucap" name="UCAP"/>
+        <pad key="vbus" name="VBUS"/>
+        <pad key="pb0" name="PB0"/>
+        <pad key="pb1" name="PB1"/>
+        <pad key="pb2" name="PB2"/>
+        <pad key="pb3" name="PB3"/>
+        <pad key="pb7" name="PB7"/>
+        <pad key="reset" name="RESET"/>
+        <pad key="vcc" name="VCC"/>
+        <pad key="gnd" name="GND"/>
+        <pad key="xtal2" name="XTAL2"/>
+        <pad key="xtal1" name="XTAL1"/>
+        <pad key="pd0" name="PD0"/>
+        <pad key="pd1" name="PD1"/>
+        <pad key="pd2" name="PD2"/>
+        <pad key="pd3" name="PD3"/>
+        <pad key="pd5" name="PD5"/>
+        <pad key="avcc" name="AVCC"/>
+        <pad key="pd4" name="PD4"/>
+        <pad key="pd6" name="PD6"/>
+        <pad key="pd7" name="PD7"/>
+        <pad key="pb4" name="PB4"/>
+        <pad key="pb5" name="PB5"/>
+        <pad key="pb6" name="PB6"/>
+        <pad key="pc6" name="PC6"/>
+        <pad key="pc7" name="PC7"/>
+        <pad key="pe2" name="PE2"/>
+        <pad key="pf7" name="PF7"/>
+        <pad key="pf6" name="PF6"/>
+        <pad key="pf5" name="PF5"/>
+        <pad key="pf4" name="PF4"/>
+        <pad key="pf1" name="PF1"/>
+        <pad key="pf0" name="PF0"/>
+        <pad key="aref" name="AREF"/>
+    </pads>
     <pinouts>
         <pinout key="tqfp44" name="TQFP44" type="qfp">
-            <pin position="1" pad="PE6"/>
-            <pin position="2" pad="UVCC"/>
-            <pin position="3" pad="DM"/>
-            <pin position="4" pad="DP"/>
-            <pin position="5" pad="UGND"/>
-            <pin position="6" pad="UCAP"/>
-            <pin position="7" pad="VBUS"/>
-            <pin position="8" pad="PB0"/>
-            <pin position="9" pad="PB1"/>
-            <pin position="10" pad="PB2"/>
-            <pin position="11" pad="PB3"/>
-            <pin position="12" pad="PB7"/>
-            <pin position="13" pad="RESET"/>
-            <pin position="14" pad="VCC"/>
-            <pin position="15" pad="GND"/>
-            <pin position="16" pad="XTAL2"/>
-            <pin position="17" pad="XTAL1"/>
-            <pin position="18" pad="PD0"/>
-            <pin position="19" pad="PD1"/>
-            <pin position="20" pad="PD2"/>
-            <pin position="21" pad="PD3"/>
-            <pin position="22" pad="PD5"/>
-            <pin position="23" pad="GND"/>
-            <pin position="24" pad="AVCC"/>
-            <pin position="25" pad="PD4"/>
-            <pin position="26" pad="PD6"/>
-            <pin position="27" pad="PD7"/>
-            <pin position="28" pad="PB4"/>
-            <pin position="29" pad="PB5"/>
-            <pin position="30" pad="PB6"/>
-            <pin position="31" pad="PC6"/>
-            <pin position="32" pad="PC7"/>
-            <pin position="33" pad="PE2"/>
-            <pin position="34" pad="VCC"/>
-            <pin position="35" pad="GND"/>
-            <pin position="36" pad="PF7"/>
-            <pin position="37" pad="PF6"/>
-            <pin position="38" pad="PF5"/>
-            <pin position="39" pad="PF4"/>
-            <pin position="40" pad="PF1"/>
-            <pin position="41" pad="PF0"/>
-            <pin position="42" pad="AREF"/>
-            <pin position="43" pad="GND"/>
-            <pin position="44" pad="AVCC"/>
+            <pin position="1" pad-key="pe6"/>
+            <pin position="2" pad-key="uvcc"/>
+            <pin position="3" pad-key="dm"/>
+            <pin position="4" pad-key="dp"/>
+            <pin position="5" pad-key="ugnd"/>
+            <pin position="6" pad-key="ucap"/>
+            <pin position="7" pad-key="vbus"/>
+            <pin position="8" pad-key="pb0"/>
+            <pin position="9" pad-key="pb1"/>
+            <pin position="10" pad-key="pb2"/>
+            <pin position="11" pad-key="pb3"/>
+            <pin position="12" pad-key="pb7"/>
+            <pin position="13" pad-key="reset"/>
+            <pin position="14" pad-key="vcc"/>
+            <pin position="15" pad-key="gnd"/>
+            <pin position="16" pad-key="xtal2"/>
+            <pin position="17" pad-key="xtal1"/>
+            <pin position="18" pad-key="pd0"/>
+            <pin position="19" pad-key="pd1"/>
+            <pin position="20" pad-key="pd2"/>
+            <pin position="21" pad-key="pd3"/>
+            <pin position="22" pad-key="pd5"/>
+            <pin position="23" pad-key="gnd"/>
+            <pin position="24" pad-key="avcc"/>
+            <pin position="25" pad-key="pd4"/>
+            <pin position="26" pad-key="pd6"/>
+            <pin position="27" pad-key="pd7"/>
+            <pin position="28" pad-key="pb4"/>
+            <pin position="29" pad-key="pb5"/>
+            <pin position="30" pad-key="pb6"/>
+            <pin position="31" pad-key="pc6"/>
+            <pin position="32" pad-key="pc7"/>
+            <pin position="33" pad-key="pe2"/>
+            <pin position="34" pad-key="vcc"/>
+            <pin position="35" pad-key="gnd"/>
+            <pin position="36" pad-key="pf7"/>
+            <pin position="37" pad-key="pf6"/>
+            <pin position="38" pad-key="pf5"/>
+            <pin position="39" pad-key="pf4"/>
+            <pin position="40" pad-key="pf1"/>
+            <pin position="41" pad-key="pf0"/>
+            <pin position="42" pad-key="aref"/>
+            <pin position="43" pad-key="gnd"/>
+            <pin position="44" pad-key="avcc"/>
         </pinout>
         <pinout key="qfn44" name="QFN44" type="qfn">
-            <pin position="1" pad="PE6"/>
-            <pin position="2" pad="UVCC"/>
-            <pin position="3" pad="DM"/>
-            <pin position="4" pad="DP"/>
-            <pin position="5" pad="UGND"/>
-            <pin position="6" pad="UCAP"/>
-            <pin position="7" pad="VBUS"/>
-            <pin position="8" pad="PB0"/>
-            <pin position="9" pad="PB1"/>
-            <pin position="10" pad="PB2"/>
-            <pin position="11" pad="PB3"/>
-            <pin position="12" pad="PB7"/>
-            <pin position="13" pad="RESET"/>
-            <pin position="14" pad="VCC"/>
-            <pin position="15" pad="GND"/>
-            <pin position="16" pad="XTAL2"/>
-            <pin position="17" pad="XTAL1"/>
-            <pin position="18" pad="PD0"/>
-            <pin position="19" pad="PD1"/>
-            <pin position="20" pad="PD2"/>
-            <pin position="21" pad="PD3"/>
-            <pin position="22" pad="PD5"/>
-            <pin position="23" pad="GND"/>
-            <pin position="24" pad="AVCC"/>
-            <pin position="25" pad="PD4"/>
-            <pin position="26" pad="PD6"/>
-            <pin position="27" pad="PD7"/>
-            <pin position="28" pad="PB4"/>
-            <pin position="29" pad="PB5"/>
-            <pin position="30" pad="PB6"/>
-            <pin position="31" pad="PC6"/>
-            <pin position="32" pad="PC7"/>
-            <pin position="33" pad="PE2"/>
-            <pin position="34" pad="VCC"/>
-            <pin position="35" pad="GND"/>
-            <pin position="36" pad="PF7"/>
-            <pin position="37" pad="PF6"/>
-            <pin position="38" pad="PF5"/>
-            <pin position="39" pad="PF4"/>
-            <pin position="40" pad="PF1"/>
-            <pin position="41" pad="PF0"/>
-            <pin position="42" pad="AREF"/>
-            <pin position="43" pad="GND"/>
-            <pin position="44" pad="AVCC"/>
+            <pin position="1" pad-key="pe6"/>
+            <pin position="2" pad-key="uvcc"/>
+            <pin position="3" pad-key="dm"/>
+            <pin position="4" pad-key="dp"/>
+            <pin position="5" pad-key="ugnd"/>
+            <pin position="6" pad-key="ucap"/>
+            <pin position="7" pad-key="vbus"/>
+            <pin position="8" pad-key="pb0"/>
+            <pin position="9" pad-key="pb1"/>
+            <pin position="10" pad-key="pb2"/>
+            <pin position="11" pad-key="pb3"/>
+            <pin position="12" pad-key="pb7"/>
+            <pin position="13" pad-key="reset"/>
+            <pin position="14" pad-key="vcc"/>
+            <pin position="15" pad-key="gnd"/>
+            <pin position="16" pad-key="xtal2"/>
+            <pin position="17" pad-key="xtal1"/>
+            <pin position="18" pad-key="pd0"/>
+            <pin position="19" pad-key="pd1"/>
+            <pin position="20" pad-key="pd2"/>
+            <pin position="21" pad-key="pd3"/>
+            <pin position="22" pad-key="pd5"/>
+            <pin position="23" pad-key="gnd"/>
+            <pin position="24" pad-key="avcc"/>
+            <pin position="25" pad-key="pd4"/>
+            <pin position="26" pad-key="pd6"/>
+            <pin position="27" pad-key="pd7"/>
+            <pin position="28" pad-key="pb4"/>
+            <pin position="29" pad-key="pb5"/>
+            <pin position="30" pad-key="pb6"/>
+            <pin position="31" pad-key="pc6"/>
+            <pin position="32" pad-key="pc7"/>
+            <pin position="33" pad-key="pe2"/>
+            <pin position="34" pad-key="vcc"/>
+            <pin position="35" pad-key="gnd"/>
+            <pin position="36" pad-key="pf7"/>
+            <pin position="37" pad-key="pf6"/>
+            <pin position="38" pad-key="pf5"/>
+            <pin position="39" pad-key="pf4"/>
+            <pin position="40" pad-key="pf1"/>
+            <pin position="41" pad-key="pf0"/>
+            <pin position="42" pad-key="aref"/>
+            <pin position="43" pad-key="gnd"/>
+            <pin position="44" pad-key="avcc"/>
         </pinout>
     </pinouts>
     <variants>
-        <variant name="ATmega32U4-AU" pinout-key="tqfp44" package="TQFP44"/>
-        <variant name="ATmega32U4RC-AU" pinout-key="tqfp44" package="TQFP44"/>
-        <variant name="ATmega32U4-MU" pinout-key="qfn44" package="QFN44"/>
-        <variant name="ATmega32U4RC-MU" pinout-key="qfn44" package="QFN44"/>
+        <variant key="atmega32u4_au" name="ATmega32U4-AU" pinout-key="tqfp44"/>
+        <variant key="atmega32u4rc_au" name="ATmega32U4RC-AU" pinout-key="tqfp44"/>
+        <variant key="atmega32u4_mu" name="ATmega32U4-MU" pinout-key="qfn44"/>
+        <variant key="atmega32u4rc_mu" name="ATmega32U4RC-MU" pinout-key="qfn44"/>
     </variants>
 </device>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA406.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA406.xml
index dfa619a6..aac393b6 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA406.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA406.xml
@@ -127,40 +127,40 @@
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pa2" index="2" function="PORTA" group="P"/>
-                <signal pad-id="pa3" index="3" function="PORTA" group="P"/>
-                <signal pad-id="pa4" index="4" function="PORTA" group="P"/>
-                <signal pad-id="pa5" index="5" function="PORTA" group="P"/>
-                <signal pad-id="pa6" index="6" function="PORTA" group="P"/>
-                <signal pad-id="pa7" index="7" function="PORTA" group="P"/>
+                <signal pad-key="pa0" index="0" function="PORTA" group="P"/>
+                <signal pad-key="pa1" index="1" function="PORTA" group="P"/>
+                <signal pad-key="pa2" index="2" function="PORTA" group="P"/>
+                <signal pad-key="pa3" index="3" function="PORTA" group="P"/>
+                <signal pad-key="pa4" index="4" function="PORTA" group="P"/>
+                <signal pad-key="pa5" index="5" function="PORTA" group="P"/>
+                <signal pad-key="pa6" index="6" function="PORTA" group="P"/>
+                <signal pad-key="pa7" index="7" function="PORTA" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pb2" index="2" function="PORTB" group="P"/>
-                <signal pad-id="pb3" index="3" function="PORTB" group="P"/>
-                <signal pad-id="pb4" index="4" function="PORTB" group="P"/>
-                <signal pad-id="pb5" index="5" function="PORTB" group="P"/>
-                <signal pad-id="pb6" index="6" function="PORTB" group="P"/>
-                <signal pad-id="pb7" index="7" function="PORTB" group="P"/>
+                <signal pad-key="pb0" index="0" function="PORTB" group="P"/>
+                <signal pad-key="pb1" index="1" function="PORTB" group="P"/>
+                <signal pad-key="pb2" index="2" function="PORTB" group="P"/>
+                <signal pad-key="pb3" index="3" function="PORTB" group="P"/>
+                <signal pad-key="pb4" index="4" function="PORTB" group="P"/>
+                <signal pad-key="pb5" index="5" function="PORTB" group="P"/>
+                <signal pad-key="pb6" index="6" function="PORTB" group="P"/>
+                <signal pad-key="pb7" index="7" function="PORTB" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
             <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-key="pc0" index="0" function="PORTC" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
             <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"/>
+                <signal pad-key="pd0" index="0" function="PORTD" group="P"/>
+                <signal pad-key="pd1" index="1" function="PORTD" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="boot_load" name="BOOT_LOAD" module-key="boot_load">
@@ -543,59 +543,106 @@
             </register-group>
         </module>
     </modules>
+    <pads>
+        <pad key="sgnd" name="SGND"/>
+        <pad key="pa0" name="PA0"/>
+        <pad key="pa1" name="PA1"/>
+        <pad key="pa2" name="PA2"/>
+        <pad key="pa3" name="PA3"/>
+        <pad key="vreg" name="VREG"/>
+        <pad key="vcc" name="VCC"/>
+        <pad key="gnd" name="GND"/>
+        <pad key="pa4" name="PA4"/>
+        <pad key="pa5" name="PA5"/>
+        <pad key="pa6" name="PA6"/>
+        <pad key="pa7" name="PA7"/>
+        <pad key="reset" name="RESET"/>
+        <pad key="xtal1" name="XTAL1"/>
+        <pad key="xtal2" name="XTAL2"/>
+        <pad key="pb0" name="PB0"/>
+        <pad key="pb1" name="PB1"/>
+        <pad key="pb2" name="PB2"/>
+        <pad key="pb3" name="PB3"/>
+        <pad key="pb4" name="PB4"/>
+        <pad key="pb5" name="PB5"/>
+        <pad key="scl" name="SCL"/>
+        <pad key="sda" name="SDA"/>
+        <pad key="pb6" name="PB6"/>
+        <pad key="pb7" name="PB7"/>
+        <pad key="pd0" name="PD0"/>
+        <pad key="pd1" name="PD1"/>
+        <pad key="pc0" name="PC0"/>
+        <pad key="batt" name="BATT"/>
+        <pad key="opc" name="OPC"/>
+        <pad key="oc" name="OC"/>
+        <pad key="vfet" name="VFET"/>
+        <pad key="od" name="OD"/>
+        <pad key="pvt1" name="PVT1"/>
+        <pad key="pv4" name="PV4"/>
+        <pad key="pv3" name="PV3"/>
+        <pad key="pv2" name="PV2"/>
+        <pad key="pv1" name="PV1"/>
+        <pad key="nv" name="NV"/>
+        <pad key="vref" name="VREF"/>
+        <pad key="vrefgnd" name="VREFGND"/>
+        <pad key="ppi" name="PPI"/>
+        <pad key="pi" name="PI"/>
+        <pad key="ni" name="NI"/>
+        <pad key="nni" name="NNI"/>
+    </pads>
     <pinouts>
         <pinout key="qfp48" name="QFP48" type="qfp">
-            <pin position="1" pad="SGND"/>
-            <pin position="2" pad="PA0"/>
-            <pin position="3" pad="PA1"/>
-            <pin position="4" pad="PA2"/>
-            <pin position="5" pad="PA3"/>
-            <pin position="6" pad="VREG"/>
-            <pin position="7" pad="VCC"/>
-            <pin position="8" pad="GND"/>
-            <pin position="9" pad="PA4"/>
-            <pin position="10" pad="PA5"/>
-            <pin position="11" pad="PA6"/>
-            <pin position="12" pad="PA7"/>
-            <pin position="13" pad="RESET"/>
-            <pin position="14" pad="XTAL1"/>
-            <pin position="15" pad="XTAL2"/>
-            <pin position="16" pad="GND"/>
-            <pin position="17" pad="PB0"/>
-            <pin position="18" pad="PB1"/>
-            <pin position="19" pad="PB2"/>
-            <pin position="20" pad="PB3"/>
-            <pin position="21" pad="PB4"/>
-            <pin position="22" pad="PB5"/>
-            <pin position="23" pad="SCL"/>
-            <pin position="24" pad="SDA"/>
-            <pin position="25" pad="PB6"/>
-            <pin position="26" pad="PB7"/>
-            <pin position="27" pad="PD0"/>
-            <pin position="28" pad="PD1"/>
-            <pin position="29" pad="GND"/>
-            <pin position="30" pad="PC0"/>
-            <pin position="31" pad="BATT"/>
-            <pin position="32" pad="OPC"/>
-            <pin position="33" pad="OC"/>
-            <pin position="34" pad="VFET"/>
-            <pin position="35" pad="OD"/>
-            <pin position="36" pad="PVT1"/>
-            <pin position="37" pad="GND"/>
-            <pin position="38" pad="PV4"/>
-            <pin position="39" pad="PV3"/>
-            <pin position="40" pad="PV2"/>
-            <pin position="41" pad="PV1"/>
-            <pin position="42" pad="NV"/>
-            <pin position="43" pad="VREF"/>
-            <pin position="44" pad="VREFGND"/>
-            <pin position="45" pad="PPI"/>
-            <pin position="46" pad="PI"/>
-            <pin position="47" pad="NI"/>
-            <pin position="48" pad="NNI"/>
+            <pin position="1" pad-key="sgnd"/>
+            <pin position="2" pad-key="pa0"/>
+            <pin position="3" pad-key="pa1"/>
+            <pin position="4" pad-key="pa2"/>
+            <pin position="5" pad-key="pa3"/>
+            <pin position="6" pad-key="vreg"/>
+            <pin position="7" pad-key="vcc"/>
+            <pin position="8" pad-key="gnd"/>
+            <pin position="9" pad-key="pa4"/>
+            <pin position="10" pad-key="pa5"/>
+            <pin position="11" pad-key="pa6"/>
+            <pin position="12" pad-key="pa7"/>
+            <pin position="13" pad-key="reset"/>
+            <pin position="14" pad-key="xtal1"/>
+            <pin position="15" pad-key="xtal2"/>
+            <pin position="16" pad-key="gnd"/>
+            <pin position="17" pad-key="pb0"/>
+            <pin position="18" pad-key="pb1"/>
+            <pin position="19" pad-key="pb2"/>
+            <pin position="20" pad-key="pb3"/>
+            <pin position="21" pad-key="pb4"/>
+            <pin position="22" pad-key="pb5"/>
+            <pin position="23" pad-key="scl"/>
+            <pin position="24" pad-key="sda"/>
+            <pin position="25" pad-key="pb6"/>
+            <pin position="26" pad-key="pb7"/>
+            <pin position="27" pad-key="pd0"/>
+            <pin position="28" pad-key="pd1"/>
+            <pin position="29" pad-key="gnd"/>
+            <pin position="30" pad-key="pc0"/>
+            <pin position="31" pad-key="batt"/>
+            <pin position="32" pad-key="opc"/>
+            <pin position="33" pad-key="oc"/>
+            <pin position="34" pad-key="vfet"/>
+            <pin position="35" pad-key="od"/>
+            <pin position="36" pad-key="pvt1"/>
+            <pin position="37" pad-key="gnd"/>
+            <pin position="38" pad-key="pv4"/>
+            <pin position="39" pad-key="pv3"/>
+            <pin position="40" pad-key="pv2"/>
+            <pin position="41" pad-key="pv1"/>
+            <pin position="42" pad-key="nv"/>
+            <pin position="43" pad-key="vref"/>
+            <pin position="44" pad-key="vrefgnd"/>
+            <pin position="45" pad-key="ppi"/>
+            <pin position="46" pad-key="pi"/>
+            <pin position="47" pad-key="ni"/>
+            <pin position="48" pad-key="nni"/>
         </pinout>
     </pinouts>
     <variants>
-        <variant name="ATmega406-1AAU" pinout-key="qfp48" package="LQFP48"/>
+        <variant key="atmega406_1aau" name="ATmega406-1AAU" pinout-key="qfp48"/>
     </variants>
 </device>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA48.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA48.xml
index b8a733a9..f691605a 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA48.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA48.xml
@@ -198,141 +198,141 @@
         <peripheral key="usart0" name="USART0" module-key="usart">
             <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"/>
-                <signal pad-id="pd4" function="default" group="XCK"/>
+                <signal pad-key="pd1" function="default" group="TXD"/>
+                <signal pad-key="pd0" function="default" group="RXD"/>
+                <signal pad-key="pd4" function="default" group="XCK"/>
             </signals>
         </peripheral>
         <peripheral key="twi" name="TWI" module-key="twi">
             <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"/>
+                <signal pad-key="pc4" function="default" group="SDA"/>
+                <signal pad-key="pc5" function="default" group="SCL"/>
             </signals>
         </peripheral>
         <peripheral key="tc1" name="TC1" module-key="tc16">
             <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"/>
-                <signal pad-id="pb1" function="default" group="OCA"/>
-                <signal pad-id="pb2" function="default" group="OCB"/>
+                <signal pad-key="pd5" function="default" group="T"/>
+                <signal pad-key="pb0" function="default" group="ICP"/>
+                <signal pad-key="pb1" function="default" group="OCA"/>
+                <signal pad-key="pb2" function="default" group="OCB"/>
             </signals>
         </peripheral>
         <peripheral key="tc2" name="TC2" module-key="tc8_async">
             <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"/>
+                <signal pad-key="pb3" function="default" group="OCA"/>
+                <signal pad-key="pd3" function="default" group="OCB"/>
             </signals>
         </peripheral>
         <peripheral key="adc" name="ADC" module-key="adc">
             <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"/>
-                <signal pad-id="pc2" index="2" function="default" group="ADC"/>
-                <signal pad-id="pc3" index="3" function="default" group="ADC"/>
-                <signal pad-id="pc4" index="4" function="default" group="ADC"/>
-                <signal pad-id="pc5" index="5" function="default" group="ADC"/>
+                <signal pad-key="pc0" index="0" function="default" group="ADC"/>
+                <signal pad-key="pc1" index="1" function="default" group="ADC"/>
+                <signal pad-key="pc2" index="2" function="default" group="ADC"/>
+                <signal pad-key="pc3" index="3" function="default" group="ADC"/>
+                <signal pad-key="pc4" index="4" function="default" group="ADC"/>
+                <signal pad-key="pc5" index="5" function="default" group="ADC"/>
             </signals>
         </peripheral>
         <peripheral key="ac" name="AC" module-key="ac">
             <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"/>
+                <signal pad-key="pd6" index="0" function="default" group="AIN"/>
+                <signal pad-key="pd7" index="1" function="default" group="AIN"/>
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pb2" index="2" function="default" group="P"/>
-                <signal pad-id="pb3" index="3" function="default" group="P"/>
-                <signal pad-id="pb4" index="4" function="default" group="P"/>
-                <signal pad-id="pb5" index="5" function="default" group="P"/>
-                <signal pad-id="pb6" index="6" function="default" group="P"/>
-                <signal pad-id="pb7" index="7" function="default" group="P"/>
+                <signal pad-key="pb0" index="0" function="default" group="P"/>
+                <signal pad-key="pb1" index="1" function="default" group="P"/>
+                <signal pad-key="pb2" index="2" function="default" group="P"/>
+                <signal pad-key="pb3" index="3" function="default" group="P"/>
+                <signal pad-key="pb4" index="4" function="default" group="P"/>
+                <signal pad-key="pb5" index="5" function="default" group="P"/>
+                <signal pad-key="pb6" index="6" function="default" group="P"/>
+                <signal pad-key="pb7" index="7" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pc2" index="2" function="default" group="P"/>
-                <signal pad-id="pc3" index="3" function="default" group="P"/>
-                <signal pad-id="pc4" index="4" function="default" group="P"/>
-                <signal pad-id="pc5" index="5" function="default" group="P"/>
-                <signal pad-id="pc6" index="6" function="default" group="P"/>
+                <signal pad-key="pc0" index="0" function="default" group="P"/>
+                <signal pad-key="pc1" index="1" function="default" group="P"/>
+                <signal pad-key="pc2" index="2" function="default" group="P"/>
+                <signal pad-key="pc3" index="3" function="default" group="P"/>
+                <signal pad-key="pc4" index="4" function="default" group="P"/>
+                <signal pad-key="pc5" index="5" function="default" group="P"/>
+                <signal pad-key="pc6" index="6" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pd2" index="2" function="default" group="P"/>
-                <signal pad-id="pd3" index="3" function="default" group="P"/>
-                <signal pad-id="pd4" index="4" function="default" group="P"/>
-                <signal pad-id="pd5" index="5" function="default" group="P"/>
-                <signal pad-id="pd6" index="6" function="default" group="P"/>
-                <signal pad-id="pd7" index="7" function="default" group="P"/>
+                <signal pad-key="pd0" index="0" function="default" group="P"/>
+                <signal pad-key="pd1" index="1" function="default" group="P"/>
+                <signal pad-key="pd2" index="2" function="default" group="P"/>
+                <signal pad-key="pd3" index="3" function="default" group="P"/>
+                <signal pad-key="pd4" index="4" function="default" group="P"/>
+                <signal pad-key="pd5" index="5" function="default" group="P"/>
+                <signal pad-key="pd6" index="6" function="default" group="P"/>
+                <signal pad-key="pd7" index="7" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="tc0" name="TC0" module-key="tc8">
             <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"/>
-                <signal pad-id="pd6" function="default" group="OCA"/>
+                <signal pad-key="pd4" function="default" group="T"/>
+                <signal pad-key="pd5" function="default" group="OCB"/>
+                <signal pad-key="pd6" function="default" group="OCA"/>
             </signals>
         </peripheral>
         <peripheral key="exint" name="EXINT" module-key="exint">
             <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"/>
-                <signal pad-id="pd4" index="20" function="default" group="PCINT"/>
-                <signal pad-id="pb6" index="6" function="default" group="PCINT"/>
-                <signal pad-id="pb7" index="7" function="default" group="PCINT"/>
-                <signal pad-id="pd5" index="21" function="default" group="PCINT"/>
-                <signal pad-id="pd6" index="22" function="default" group="PCINT"/>
-                <signal pad-id="pd7" index="23" function="default" group="PCINT"/>
-                <signal pad-id="pb0" index="0" function="default" group="PCINT"/>
-                <signal pad-id="pb1" index="1" function="default" group="PCINT"/>
-                <signal pad-id="pb2" index="2" function="default" group="PCINT"/>
-                <signal pad-id="pb3" index="3" function="default" group="PCINT"/>
-                <signal pad-id="pb4" index="4" function="default" group="PCINT"/>
-                <signal pad-id="pb5" index="5" function="default" group="PCINT"/>
-                <signal pad-id="pc0" index="8" function="default" group="PCINT"/>
-                <signal pad-id="pc1" index="9" function="default" group="PCINT"/>
-                <signal pad-id="pc2" index="10" function="default" group="PCINT"/>
-                <signal pad-id="pc3" index="11" function="default" group="PCINT"/>
-                <signal pad-id="pc4" index="12" function="default" group="PCINT"/>
-                <signal pad-id="pc5" index="13" function="default" group="PCINT"/>
-                <signal pad-id="pc6" index="14" function="default" group="PCINT"/>
-                <signal pad-id="pd0" index="16" function="default" group="PCINT"/>
-                <signal pad-id="pd1" index="17" function="default" group="PCINT"/>
-                <signal pad-id="pd2" index="18" function="default" group="PCINT"/>
-                <signal pad-id="pd2" index="0" function="default" group="INT"/>
+                <signal pad-key="pd3" index="1" function="default" group="INT"/>
+                <signal pad-key="pd3" index="19" function="default" group="PCINT"/>
+                <signal pad-key="pd4" index="20" function="default" group="PCINT"/>
+                <signal pad-key="pb6" index="6" function="default" group="PCINT"/>
+                <signal pad-key="pb7" index="7" function="default" group="PCINT"/>
+                <signal pad-key="pd5" index="21" function="default" group="PCINT"/>
+                <signal pad-key="pd6" index="22" function="default" group="PCINT"/>
+                <signal pad-key="pd7" index="23" function="default" group="PCINT"/>
+                <signal pad-key="pb0" index="0" function="default" group="PCINT"/>
+                <signal pad-key="pb1" index="1" function="default" group="PCINT"/>
+                <signal pad-key="pb2" index="2" function="default" group="PCINT"/>
+                <signal pad-key="pb3" index="3" function="default" group="PCINT"/>
+                <signal pad-key="pb4" index="4" function="default" group="PCINT"/>
+                <signal pad-key="pb5" index="5" function="default" group="PCINT"/>
+                <signal pad-key="pc0" index="8" function="default" group="PCINT"/>
+                <signal pad-key="pc1" index="9" function="default" group="PCINT"/>
+                <signal pad-key="pc2" index="10" function="default" group="PCINT"/>
+                <signal pad-key="pc3" index="11" function="default" group="PCINT"/>
+                <signal pad-key="pc4" index="12" function="default" group="PCINT"/>
+                <signal pad-key="pc5" index="13" function="default" group="PCINT"/>
+                <signal pad-key="pc6" index="14" function="default" group="PCINT"/>
+                <signal pad-key="pd0" index="16" function="default" group="PCINT"/>
+                <signal pad-key="pd1" index="17" function="default" group="PCINT"/>
+                <signal pad-key="pd2" index="18" function="default" group="PCINT"/>
+                <signal pad-key="pd2" index="0" function="default" group="INT"/>
             </signals>
         </peripheral>
         <peripheral key="spi" name="SPI" module-key="spi">
             <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"/>
-                <signal pad-id="pb4" function="default" group="MISO"/>
-                <signal pad-id="pb5" function="default" group="SCK"/>
+                <signal pad-key="pb2" function="default" group="SS"/>
+                <signal pad-key="pb3" function="default" group="MOSI"/>
+                <signal pad-key="pb4" function="default" group="MISO"/>
+                <signal pad-key="pb5" function="default" group="SCK"/>
             </signals>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="cpu">
             <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"/>
+                <signal pad-key="pb0" index="0" function="default" group="CLK"/>
             </signals>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="wdt">
@@ -740,146 +740,177 @@
             </register-group>
         </module>
     </modules>
+    <pads>
+        <pad key="pd3" name="PD3"/>
+        <pad key="pd4" name="PD4"/>
+        <pad key="gnd" name="GND"/>
+        <pad key="vcc" name="VCC"/>
+        <pad key="pb6" name="PB6"/>
+        <pad key="pb7" name="PB7"/>
+        <pad key="pd5" name="PD5"/>
+        <pad key="pd6" name="PD6"/>
+        <pad key="pd7" name="PD7"/>
+        <pad key="pb0" name="PB0"/>
+        <pad key="pb1" name="PB1"/>
+        <pad key="pb2" name="PB2"/>
+        <pad key="pb3" name="PB3"/>
+        <pad key="pb4" name="PB4"/>
+        <pad key="pb5" name="PB5"/>
+        <pad key="avcc" name="AVCC"/>
+        <pad key="adc6" name="ADC6"/>
+        <pad key="aref" name="AREF"/>
+        <pad key="adc7" name="ADC7"/>
+        <pad key="pc0" name="PC0"/>
+        <pad key="pc1" name="PC1"/>
+        <pad key="pc2" name="PC2"/>
+        <pad key="pc3" name="PC3"/>
+        <pad key="pc4" name="PC4"/>
+        <pad key="pc5" name="PC5"/>
+        <pad key="pc6" name="PC6"/>
+        <pad key="pd0" name="PD0"/>
+        <pad key="pd1" name="PD1"/>
+        <pad key="pd2" name="PD2"/>
+    </pads>
     <pinouts>
         <pinout key="tqfp32" name="TQFP32" type="qfp">
-            <pin position="1" pad="PD3"/>
-            <pin position="2" pad="PD4"/>
-            <pin position="3" pad="GND"/>
-            <pin position="4" pad="VCC"/>
-            <pin position="5" pad="GND"/>
-            <pin position="6" pad="VCC"/>
-            <pin position="7" pad="PB6"/>
-            <pin position="8" pad="PB7"/>
-            <pin position="9" pad="PD5"/>
-            <pin position="10" pad="PD6"/>
-            <pin position="11" pad="PD7"/>
-            <pin position="12" pad="PB0"/>
-            <pin position="13" pad="PB1"/>
-            <pin position="14" pad="PB2"/>
-            <pin position="15" pad="PB3"/>
-            <pin position="16" pad="PB4"/>
-            <pin position="17" pad="PB5"/>
-            <pin position="18" pad="AVCC"/>
-            <pin position="19" pad="ADC6"/>
-            <pin position="20" pad="AREF"/>
-            <pin position="21" pad="GND"/>
-            <pin position="22" pad="ADC7"/>
-            <pin position="23" pad="PC0"/>
-            <pin position="24" pad="PC1"/>
-            <pin position="25" pad="PC2"/>
-            <pin position="26" pad="PC3"/>
-            <pin position="27" pad="PC4"/>
-            <pin position="28" pad="PC5"/>
-            <pin position="29" pad="PC6"/>
-            <pin position="30" pad="PD0"/>
-            <pin position="31" pad="PD1"/>
-            <pin position="32" pad="PD2"/>
+            <pin position="1" pad-key="pd3"/>
+            <pin position="2" pad-key="pd4"/>
+            <pin position="3" pad-key="gnd"/>
+            <pin position="4" pad-key="vcc"/>
+            <pin position="5" pad-key="gnd"/>
+            <pin position="6" pad-key="vcc"/>
+            <pin position="7" pad-key="pb6"/>
+            <pin position="8" pad-key="pb7"/>
+            <pin position="9" pad-key="pd5"/>
+            <pin position="10" pad-key="pd6"/>
+            <pin position="11" pad-key="pd7"/>
+            <pin position="12" pad-key="pb0"/>
+            <pin position="13" pad-key="pb1"/>
+            <pin position="14" pad-key="pb2"/>
+            <pin position="15" pad-key="pb3"/>
+            <pin position="16" pad-key="pb4"/>
+            <pin position="17" pad-key="pb5"/>
+            <pin position="18" pad-key="avcc"/>
+            <pin position="19" pad-key="adc6"/>
+            <pin position="20" pad-key="aref"/>
+            <pin position="21" pad-key="gnd"/>
+            <pin position="22" pad-key="adc7"/>
+            <pin position="23" pad-key="pc0"/>
+            <pin position="24" pad-key="pc1"/>
+            <pin position="25" pad-key="pc2"/>
+            <pin position="26" pad-key="pc3"/>
+            <pin position="27" pad-key="pc4"/>
+            <pin position="28" pad-key="pc5"/>
+            <pin position="29" pad-key="pc6"/>
+            <pin position="30" pad-key="pd0"/>
+            <pin position="31" pad-key="pd1"/>
+            <pin position="32" pad-key="pd2"/>
         </pinout>
         <pinout key="qfn32" name="QFN32" type="qfn">
-            <pin position="1" pad="PD3"/>
-            <pin position="2" pad="PD4"/>
-            <pin position="3" pad="GND"/>
-            <pin position="4" pad="VCC"/>
-            <pin position="5" pad="GND"/>
-            <pin position="6" pad="VCC"/>
-            <pin position="7" pad="PB6"/>
-            <pin position="8" pad="PB7"/>
-            <pin position="9" pad="PD5"/>
-            <pin position="10" pad="PD6"/>
-            <pin position="11" pad="PD7"/>
-            <pin position="12" pad="PB0"/>
-            <pin position="13" pad="PB1"/>
-            <pin position="14" pad="PB2"/>
-            <pin position="15" pad="PB3"/>
-            <pin position="16" pad="PB4"/>
-            <pin position="17" pad="PB5"/>
-            <pin position="18" pad="AVCC"/>
-            <pin position="19" pad="ADC6"/>
-            <pin position="20" pad="AREF"/>
-            <pin position="21" pad="GND"/>
-            <pin position="22" pad="ADC7"/>
-            <pin position="23" pad="PC0"/>
-            <pin position="24" pad="PC1"/>
-            <pin position="25" pad="PC2"/>
-            <pin position="26" pad="PC3"/>
-            <pin position="27" pad="PC4"/>
-            <pin position="28" pad="PC5"/>
-            <pin position="29" pad="PC6"/>
-            <pin position="30" pad="PD0"/>
-            <pin position="31" pad="PD1"/>
-            <pin position="32" pad="PD2"/>
+            <pin position="1" pad-key="pd3"/>
+            <pin position="2" pad-key="pd4"/>
+            <pin position="3" pad-key="gnd"/>
+            <pin position="4" pad-key="vcc"/>
+            <pin position="5" pad-key="gnd"/>
+            <pin position="6" pad-key="vcc"/>
+            <pin position="7" pad-key="pb6"/>
+            <pin position="8" pad-key="pb7"/>
+            <pin position="9" pad-key="pd5"/>
+            <pin position="10" pad-key="pd6"/>
+            <pin position="11" pad-key="pd7"/>
+            <pin position="12" pad-key="pb0"/>
+            <pin position="13" pad-key="pb1"/>
+            <pin position="14" pad-key="pb2"/>
+            <pin position="15" pad-key="pb3"/>
+            <pin position="16" pad-key="pb4"/>
+            <pin position="17" pad-key="pb5"/>
+            <pin position="18" pad-key="avcc"/>
+            <pin position="19" pad-key="adc6"/>
+            <pin position="20" pad-key="aref"/>
+            <pin position="21" pad-key="gnd"/>
+            <pin position="22" pad-key="adc7"/>
+            <pin position="23" pad-key="pc0"/>
+            <pin position="24" pad-key="pc1"/>
+            <pin position="25" pad-key="pc2"/>
+            <pin position="26" pad-key="pc3"/>
+            <pin position="27" pad-key="pc4"/>
+            <pin position="28" pad-key="pc5"/>
+            <pin position="29" pad-key="pc6"/>
+            <pin position="30" pad-key="pd0"/>
+            <pin position="31" pad-key="pd1"/>
+            <pin position="32" pad-key="pd2"/>
         </pinout>
         <pinout key="qfn28" name="QFN28" type="qfn">
-            <pin position="1" pad="PD3"/>
-            <pin position="2" pad="PD4"/>
-            <pin position="3" pad="VCC"/>
-            <pin position="4" pad="GND"/>
-            <pin position="5" pad="PB6"/>
-            <pin position="6" pad="PB7"/>
-            <pin position="7" pad="PD5"/>
-            <pin position="8" pad="PD6"/>
-            <pin position="9" pad="PD7"/>
-            <pin position="10" pad="PB0"/>
-            <pin position="11" pad="PB1"/>
-            <pin position="12" pad="PB2"/>
-            <pin position="13" pad="PB3"/>
-            <pin position="14" pad="PB4"/>
-            <pin position="15" pad="PB5"/>
-            <pin position="16" pad="AVCC"/>
-            <pin position="17" pad="AREF"/>
-            <pin position="18" pad="GND"/>
-            <pin position="19" pad="PC0"/>
-            <pin position="20" pad="PC1"/>
-            <pin position="21" pad="PC2"/>
-            <pin position="22" pad="PC3"/>
-            <pin position="23" pad="PC4"/>
-            <pin position="24" pad="PC5"/>
-            <pin position="25" pad="PC6"/>
-            <pin position="26" pad="PD0"/>
-            <pin position="27" pad="PD1"/>
-            <pin position="28" pad="PD2"/>
+            <pin position="1" pad-key="pd3"/>
+            <pin position="2" pad-key="pd4"/>
+            <pin position="3" pad-key="vcc"/>
+            <pin position="4" pad-key="gnd"/>
+            <pin position="5" pad-key="pb6"/>
+            <pin position="6" pad-key="pb7"/>
+            <pin position="7" pad-key="pd5"/>
+            <pin position="8" pad-key="pd6"/>
+            <pin position="9" pad-key="pd7"/>
+            <pin position="10" pad-key="pb0"/>
+            <pin position="11" pad-key="pb1"/>
+            <pin position="12" pad-key="pb2"/>
+            <pin position="13" pad-key="pb3"/>
+            <pin position="14" pad-key="pb4"/>
+            <pin position="15" pad-key="pb5"/>
+            <pin position="16" pad-key="avcc"/>
+            <pin position="17" pad-key="aref"/>
+            <pin position="18" pad-key="gnd"/>
+            <pin position="19" pad-key="pc0"/>
+            <pin position="20" pad-key="pc1"/>
+            <pin position="21" pad-key="pc2"/>
+            <pin position="22" pad-key="pc3"/>
+            <pin position="23" pad-key="pc4"/>
+            <pin position="24" pad-key="pc5"/>
+            <pin position="25" pad-key="pc6"/>
+            <pin position="26" pad-key="pd0"/>
+            <pin position="27" pad-key="pd1"/>
+            <pin position="28" pad-key="pd2"/>
         </pinout>
         <pinout key="pdip28" name="PDIP28" type="dip">
-            <pin position="1" pad="PC6"/>
-            <pin position="2" pad="PD0"/>
-            <pin position="3" pad="PD1"/>
-            <pin position="4" pad="PD2"/>
-            <pin position="5" pad="PD3"/>
-            <pin position="6" pad="PD4"/>
-            <pin position="7" pad="VCC"/>
-            <pin position="8" pad="GND"/>
-            <pin position="9" pad="PB6"/>
-            <pin position="10" pad="PB7"/>
-            <pin position="11" pad="PD5"/>
-            <pin position="12" pad="PD6"/>
-            <pin position="13" pad="PD7"/>
-            <pin position="14" pad="PB0"/>
-            <pin position="15" pad="PB1"/>
-            <pin position="16" pad="PB2"/>
-            <pin position="17" pad="PB3"/>
-            <pin position="18" pad="PB4"/>
-            <pin position="19" pad="PB5"/>
-            <pin position="20" pad="AVCC"/>
-            <pin position="21" pad="AREF"/>
-            <pin position="22" pad="GND"/>
-            <pin position="23" pad="PC0"/>
-            <pin position="24" pad="PC1"/>
-            <pin position="25" pad="PC2"/>
-            <pin position="26" pad="PC3"/>
-            <pin position="27" pad="PC4"/>
-            <pin position="28" pad="PC5"/>
+            <pin position="1" pad-key="pc6"/>
+            <pin position="2" pad-key="pd0"/>
+            <pin position="3" pad-key="pd1"/>
+            <pin position="4" pad-key="pd2"/>
+            <pin position="5" pad-key="pd3"/>
+            <pin position="6" pad-key="pd4"/>
+            <pin position="7" pad-key="vcc"/>
+            <pin position="8" pad-key="gnd"/>
+            <pin position="9" pad-key="pb6"/>
+            <pin position="10" pad-key="pb7"/>
+            <pin position="11" pad-key="pd5"/>
+            <pin position="12" pad-key="pd6"/>
+            <pin position="13" pad-key="pd7"/>
+            <pin position="14" pad-key="pb0"/>
+            <pin position="15" pad-key="pb1"/>
+            <pin position="16" pad-key="pb2"/>
+            <pin position="17" pad-key="pb3"/>
+            <pin position="18" pad-key="pb4"/>
+            <pin position="19" pad-key="pb5"/>
+            <pin position="20" pad-key="avcc"/>
+            <pin position="21" pad-key="aref"/>
+            <pin position="22" pad-key="gnd"/>
+            <pin position="23" pad-key="pc0"/>
+            <pin position="24" pad-key="pc1"/>
+            <pin position="25" pad-key="pc2"/>
+            <pin position="26" pad-key="pc3"/>
+            <pin position="27" pad-key="pc4"/>
+            <pin position="28" pad-key="pc5"/>
         </pinout>
     </pinouts>
     <variants>
-        <variant name="ATmega48V-10AU" pinout-key="tqfp32" package="TQFP32"/>
-        <variant name="ATmega48V-10MU" pinout-key="qfn32" package="QFN32"/>
-        <variant name="ATmega48V-10MMU" pinout-key="qfn28" package="QFN28"/>
-        <variant name="ATmega48V-10MMH" pinout-key="qfn28" package="QFN28"/>
-        <variant name="ATmega48V-10PU" pinout-key="pdip28" package="PDIP28"/>
-        <variant name="ATmega48-20AU" pinout-key="tqfp32" package="TQFP32"/>
-        <variant name="ATmega48-20MU" pinout-key="qfn32" package="QFN32"/>
-        <variant name="ATmega48-20MMU" pinout-key="qfn28" package="QFN28"/>
-        <variant name="ATmega48-20MMH" pinout-key="qfn28" package="QFN28"/>
-        <variant name="ATmega48-20PU" pinout-key="pdip28" package="PDIP28"/>
+        <variant key="atmega48v_10au" name="ATmega48V-10AU" pinout-key="tqfp32"/>
+        <variant key="atmega48v_10mu" name="ATmega48V-10MU" pinout-key="qfn32"/>
+        <variant key="atmega48v_10mmu" name="ATmega48V-10MMU" pinout-key="qfn28"/>
+        <variant key="atmega48v_10mmh" name="ATmega48V-10MMH" pinout-key="qfn28"/>
+        <variant key="atmega48v_10pu" name="ATmega48V-10PU" pinout-key="pdip28"/>
+        <variant key="atmega48_20au" name="ATmega48-20AU" pinout-key="tqfp32"/>
+        <variant key="atmega48_20mu" name="ATmega48-20MU" pinout-key="qfn32"/>
+        <variant key="atmega48_20mmu" name="ATmega48-20MMU" pinout-key="qfn28"/>
+        <variant key="atmega48_20mmh" name="ATmega48-20MMH" pinout-key="qfn28"/>
+        <variant key="atmega48_20pu" name="ATmega48-20PU" pinout-key="pdip28"/>
     </variants>
 </device>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA4808.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA4808.xml
index 6da3c0bd..3cbfa063 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA4808.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA4808.xml
@@ -44,31 +44,31 @@
         <peripheral key="ac0" name="AC0" module-key="i2106">
             <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"/>
-                <signal pad-id="pd7" index="2" function="AC0" group="N"/>
-                <signal pad-id="pa7" index="0" function="AC0" group="OUT"/>
-                <signal pad-id="pd2" index="0" function="AC0" group="P"/>
-                <signal pad-id="pd4" index="1" function="AC0" group="P"/>
-                <signal pad-id="pd6" index="2" function="AC0" group="P"/>
-                <signal pad-id="pd1" index="3" function="AC0" group="P"/>
+                <signal pad-key="pd3" index="0" function="AC0" group="N"/>
+                <signal pad-key="pd5" index="1" function="AC0" group="N"/>
+                <signal pad-key="pd7" index="2" function="AC0" group="N"/>
+                <signal pad-key="pa7" index="0" function="AC0" group="OUT"/>
+                <signal pad-key="pd2" index="0" function="AC0" group="P"/>
+                <signal pad-key="pd4" index="1" function="AC0" group="P"/>
+                <signal pad-key="pd6" index="2" function="AC0" group="P"/>
+                <signal pad-key="pd1" index="3" function="AC0" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="adc0" name="ADC0" module-key="i2132">
             <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"/>
-                <signal pad-id="pd2" index="2" function="AIN0" group="AIN"/>
-                <signal pad-id="pd3" index="3" function="AIN0" group="AIN"/>
-                <signal pad-id="pd4" index="4" function="AIN0" group="AIN"/>
-                <signal pad-id="pd5" index="5" function="AIN0" group="AIN"/>
-                <signal pad-id="pd6" index="6" function="AIN0" group="AIN"/>
-                <signal pad-id="pd7" index="7" function="AIN0" group="AIN"/>
-                <signal pad-id="pf2" index="12" function="AIN0" group="AIN"/>
-                <signal pad-id="pf3" index="13" function="AIN0" group="AIN"/>
-                <signal pad-id="pf4" index="14" function="AIN0" group="AIN"/>
-                <signal pad-id="pf5" index="15" function="AIN0" group="AIN"/>
+                <signal pad-key="pd0" index="0" function="AIN0" group="AIN"/>
+                <signal pad-key="pd1" index="1" function="AIN0" group="AIN"/>
+                <signal pad-key="pd2" index="2" function="AIN0" group="AIN"/>
+                <signal pad-key="pd3" index="3" function="AIN0" group="AIN"/>
+                <signal pad-key="pd4" index="4" function="AIN0" group="AIN"/>
+                <signal pad-key="pd5" index="5" function="AIN0" group="AIN"/>
+                <signal pad-key="pd6" index="6" function="AIN0" group="AIN"/>
+                <signal pad-key="pd7" index="7" function="AIN0" group="AIN"/>
+                <signal pad-key="pf2" index="12" function="AIN0" group="AIN"/>
+                <signal pad-key="pf3" index="13" function="AIN0" group="AIN"/>
+                <signal pad-key="pf4" index="14" function="AIN0" group="AIN"/>
+                <signal pad-key="pf5" index="15" function="AIN0" group="AIN"/>
             </signals>
         </peripheral>
         <peripheral key="bod" name="BOD" module-key="i2114">
@@ -77,34 +77,34 @@
         <peripheral key="ccl" name="CCL" module-key="i2128">
             <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"/>
-                <signal pad-id="pa2" index="2" function="CCL" group="LUT0_IN"/>
-                <signal pad-id="pa6" index="0" function="CCL_ALT" group="LUT0_OUT" field="PORTMUX.CCLROUTEA.LUT0"/>
-                <signal pad-id="pa3" index="0" function="CCL" group="LUT0_OUT" field="PORTMUX.CCLROUTEA.LUT0"/>
-                <signal pad-id="pc0" index="0" function="CCL" group="LUT1_IN"/>
-                <signal pad-id="pc1" index="1" function="CCL" group="LUT1_IN"/>
-                <signal pad-id="pc2" index="2" function="CCL" group="LUT1_IN"/>
-                <signal pad-id="pc3" index="0" function="CCL" group="LUT1_OUT" field="PORTMUX.CCLROUTEA.LUT1"/>
-                <signal pad-id="pd0" index="0" function="CCL" group="LUT2_IN"/>
-                <signal pad-id="pd1" index="1" function="CCL" group="LUT2_IN"/>
-                <signal pad-id="pd2" index="2" function="CCL" group="LUT2_IN"/>
-                <signal pad-id="pd3" index="0" function="CCL" group="LUT2_OUT" field="PORTMUX.CCLROUTEA.LUT2"/>
-                <signal pad-id="pd6" index="1" function="CCL_ALT" group="LUT2_OUT" field="PORTMUX.CCLROUTEA.LUT2"/>
-                <signal pad-id="pf0" index="0" function="CCL" group="LUT3_IN"/>
-                <signal pad-id="pf1" index="1" function="CCL" group="LUT3_IN"/>
-                <signal pad-id="pf2" index="2" function="CCL" group="LUT3_IN"/>
-                <signal pad-id="pf6" index="1" function="CCL_ALT" group="LUT3_OUT" field="PORTMUX.CCLROUTEA.LUT3"/>
-                <signal pad-id="pf3" index="1" function="CCL" group="LUT3_OUT" field="PORTMUX.CCLROUTEA.LUT3"/>
+                <signal pad-key="pa0" index="0" function="CCL" group="LUT0_IN"/>
+                <signal pad-key="pa1" index="1" function="CCL" group="LUT0_IN"/>
+                <signal pad-key="pa2" index="2" function="CCL" group="LUT0_IN"/>
+                <signal pad-key="pa6" index="0" function="CCL_ALT" group="LUT0_OUT" field="PORTMUX.CCLROUTEA.LUT0"/>
+                <signal pad-key="pa3" index="0" function="CCL" group="LUT0_OUT" field="PORTMUX.CCLROUTEA.LUT0"/>
+                <signal pad-key="pc0" index="0" function="CCL" group="LUT1_IN"/>
+                <signal pad-key="pc1" index="1" function="CCL" group="LUT1_IN"/>
+                <signal pad-key="pc2" index="2" function="CCL" group="LUT1_IN"/>
+                <signal pad-key="pc3" index="0" function="CCL" group="LUT1_OUT" field="PORTMUX.CCLROUTEA.LUT1"/>
+                <signal pad-key="pd0" index="0" function="CCL" group="LUT2_IN"/>
+                <signal pad-key="pd1" index="1" function="CCL" group="LUT2_IN"/>
+                <signal pad-key="pd2" index="2" function="CCL" group="LUT2_IN"/>
+                <signal pad-key="pd3" index="0" function="CCL" group="LUT2_OUT" field="PORTMUX.CCLROUTEA.LUT2"/>
+                <signal pad-key="pd6" index="1" function="CCL_ALT" group="LUT2_OUT" field="PORTMUX.CCLROUTEA.LUT2"/>
+                <signal pad-key="pf0" index="0" function="CCL" group="LUT3_IN"/>
+                <signal pad-key="pf1" index="1" function="CCL" group="LUT3_IN"/>
+                <signal pad-key="pf2" index="2" function="CCL" group="LUT3_IN"/>
+                <signal pad-key="pf6" index="1" function="CCL_ALT" group="LUT3_OUT" field="PORTMUX.CCLROUTEA.LUT3"/>
+                <signal pad-key="pf3" index="1" function="CCL" group="LUT3_OUT" field="PORTMUX.CCLROUTEA.LUT3"/>
             </signals>
         </peripheral>
         <peripheral key="clkctrl" name="CLKCTRL" module-key="i2600_clkctrl">
             <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"/>
-                <signal pad-id="pf0" function="CLKCTRL" group="TOSC1"/>
-                <signal pad-id="pf1" function="CLKCTRL" group="TOSC2"/>
+                <signal pad-key="pa0" function="CLKCTRL" group="CLKI"/>
+                <signal pad-key="pa7" function="CLKCTRL" group="CLKO"/>
+                <signal pad-key="pf0" function="CLKCTRL" group="TOSC1"/>
+                <signal pad-key="pf1" function="CLKCTRL" group="TOSC2"/>
             </signals>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="i2100">
@@ -119,12 +119,12 @@
         <peripheral key="evsys" name="EVSYS" module-key="i2600_evsys">
             <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"/>
-                <signal pad-id="pc2" index="2" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTC"/>
-                <signal pad-id="pd7" index="3" function="EVSYS_ALT" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTD"/>
-                <signal pad-id="pd2" index="3" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTD"/>
-                <signal pad-id="pf2" index="5" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTF"/>
+                <signal pad-key="pa7" index="0" function="EVSYS_ALT" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTA"/>
+                <signal pad-key="pa2" index="0" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTA"/>
+                <signal pad-key="pc2" index="2" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTC"/>
+                <signal pad-key="pd7" index="3" function="EVSYS_ALT" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTD"/>
+                <signal pad-key="pd2" index="3" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTD"/>
+                <signal pad-key="pf2" index="5" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTF"/>
             </signals>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="i2600_fuse">
@@ -142,48 +142,48 @@
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pa2" index="2" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa3" index="3" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa4" index="4" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa5" index="5" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa6" index="6" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa7" index="7" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa0" index="0" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa1" index="1" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa2" index="2" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa3" index="3" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa4" index="4" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa5" index="5" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa6" index="6" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa7" index="7" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pc2" index="2" function="IOPORT" group="PIN"/>
-                <signal pad-id="pc3" index="3" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc0" index="0" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc1" index="1" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc2" index="2" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc3" index="3" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pd2" index="2" function="IOPORT" group="PIN"/>
-                <signal pad-id="pd3" index="3" function="IOPORT" group="PIN"/>
-                <signal pad-id="pd4" index="4" function="IOPORT" group="PIN"/>
-                <signal pad-id="pd5" index="5" function="IOPORT" group="PIN"/>
-                <signal pad-id="pd6" index="6" function="IOPORT" group="PIN"/>
-                <signal pad-id="pd7" index="7" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd0" index="0" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd1" index="1" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd2" index="2" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd3" index="3" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd4" index="4" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd5" index="5" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd6" index="6" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd7" index="7" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="portf" name="PORTF" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pf2" index="2" function="IOPORT" group="PIN"/>
-                <signal pad-id="pf3" index="3" function="IOPORT" group="PIN"/>
-                <signal pad-id="pf4" index="4" function="IOPORT" group="PIN"/>
-                <signal pad-id="pf5" index="5" function="IOPORT" group="PIN"/>
-                <signal pad-id="pf6" index="6" function="IOPORT" group="PIN"/>
+                <signal pad-key="pf0" index="0" function="IOPORT" group="PIN"/>
+                <signal pad-key="pf1" index="1" function="IOPORT" group="PIN"/>
+                <signal pad-key="pf2" index="2" function="IOPORT" group="PIN"/>
+                <signal pad-key="pf3" index="3" function="IOPORT" group="PIN"/>
+                <signal pad-key="pf4" index="4" function="IOPORT" group="PIN"/>
+                <signal pad-key="pf5" index="5" function="IOPORT" group="PIN"/>
+                <signal pad-key="pf6" index="6" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="portmux" name="PORTMUX" module-key="i2600_portmux">
@@ -192,7 +192,7 @@
         <peripheral key="rstctrl" name="RSTCTRL" module-key="i2111">
             <register-group-instance register-group-key="rstctrl" address-space-key="data" offset="0x40"/>
             <signals>
-                <signal pad-id="pf6" function="OTHER" group="RESET"/>
+                <signal pad-key="pf6" function="OTHER" group="RESET"/>
             </signals>
         </peripheral>
         <peripheral key="rtc" name="RTC" module-key="i2116">
@@ -207,14 +207,14 @@
         <peripheral key="spi0" name="SPI0" module-key="i2107">
             <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"/>
-                <signal pad-id="pc0" function="SPI_ALT" group="MOSI" field="PORTMUX.TWISPIROUTEA.SPI0"/>
-                <signal pad-id="pa4" function="SPI" group="MOSI" field="PORTMUX.TWISPIROUTEA.SPI0"/>
-                <signal pad-id="pc2" function="SPI_ALT" group="SCK" field="PORTMUX.TWISPIROUTEA.SPI0"/>
-                <signal pad-id="pa6" function="SPI" group="SCK" field="PORTMUX.TWISPIROUTEA.SPI0"/>
-                <signal pad-id="pc3" function="SPI_ALT" group="SS" field="PORTMUX.TWISPIROUTEA.SPI0"/>
-                <signal pad-id="pa7" function="SPI" group="SS" field="PORTMUX.TWISPIROUTEA.SPI0"/>
+                <signal pad-key="pc1" function="SPI_ALT" group="MISO" field="PORTMUX.TWISPIROUTEA.SPI0"/>
+                <signal pad-key="pa5" function="SPI" group="MISO" field="PORTMUX.TWISPIROUTEA.SPI0"/>
+                <signal pad-key="pc0" function="SPI_ALT" group="MOSI" field="PORTMUX.TWISPIROUTEA.SPI0"/>
+                <signal pad-key="pa4" function="SPI" group="MOSI" field="PORTMUX.TWISPIROUTEA.SPI0"/>
+                <signal pad-key="pc2" function="SPI_ALT" group="SCK" field="PORTMUX.TWISPIROUTEA.SPI0"/>
+                <signal pad-key="pa6" function="SPI" group="SCK" field="PORTMUX.TWISPIROUTEA.SPI0"/>
+                <signal pad-key="pc3" function="SPI_ALT" group="SS" field="PORTMUX.TWISPIROUTEA.SPI0"/>
+                <signal pad-key="pa7" function="SPI" group="SS" field="PORTMUX.TWISPIROUTEA.SPI0"/>
             </signals>
         </peripheral>
         <peripheral key="syscfg" name="SYSCFG" module-key="i2600_syscfg">
@@ -223,93 +223,93 @@
         <peripheral key="tca0" name="TCA0" module-key="i2117">
             <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"/>
-                <signal pad-id="pc0" index="0" function="TCA_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pa0" index="0" function="TCA" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pf1" index="1" function="TCA_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pd1" index="1" function="TCA_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pc1" index="1" function="TCA_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pa1" index="1" function="TCA" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pf2" index="2" function="TCA_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pd2" index="2" function="TCA_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pc2" index="2" function="TCA_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pa2" index="2" function="TCA" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pf3" index="3" function="TCA_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pd3" index="3" function="TCA_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pc3" index="3" function="TCA_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pa3" index="3" function="TCA" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pf4" index="4" function="TCA_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pd4" index="4" function="TCA_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pa4" index="4" function="TCA" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pf5" index="5" function="TCA_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pd5" index="5" function="TCA_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pa5" index="5" function="TCA" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pf0" index="0" function="TCA_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pd0" index="0" function="TCA_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pc0" index="0" function="TCA_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pa0" index="0" function="TCA" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pf1" index="1" function="TCA_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pd1" index="1" function="TCA_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pc1" index="1" function="TCA_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pa1" index="1" function="TCA" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pf2" index="2" function="TCA_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pd2" index="2" function="TCA_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pc2" index="2" function="TCA_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pa2" index="2" function="TCA" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pf3" index="3" function="TCA_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pd3" index="3" function="TCA_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pc3" index="3" function="TCA_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pa3" index="3" function="TCA" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pf4" index="4" function="TCA_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pd4" index="4" function="TCA_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pa4" index="4" function="TCA" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pf5" index="5" function="TCA_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pd5" index="5" function="TCA_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pa5" index="5" function="TCA" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
             </signals>
         </peripheral>
         <peripheral key="tcb0" name="TCB0" module-key="i2119">
             <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"/>
+                <signal pad-key="pf4" index="0" function="TCB0_ALT" group="WO" field="PORTMUX.TCBROUTEA.TCB0"/>
+                <signal pad-key="pa2" index="0" function="TCB0" group="WO" field="PORTMUX.TCBROUTEA.TCB0"/>
             </signals>
         </peripheral>
         <peripheral key="tcb1" name="TCB1" module-key="i2119">
             <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"/>
+                <signal pad-key="pf5" index="0" function="TCB1_ALT" group="WO" field="PORTMUX.TCBROUTEA.TCB1"/>
+                <signal pad-key="pa3" index="0" function="TCB1" group="WO" field="PORTMUX.TCBROUTEA.TCB1"/>
             </signals>
         </peripheral>
         <peripheral key="tcb2" name="TCB2" module-key="i2119">
             <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"/>
+                <signal pad-key="pc0" index="0" function="TCB2" group="WO" field="PORTMUX.TCBROUTEA.TCB2"/>
             </signals>
         </peripheral>
         <peripheral key="twi0" name="TWI0" module-key="i2110">
             <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"/>
-                <signal pad-id="pa3" function="I2C" group="SCL" field="PORTMUX.TWISPIROUTEA.TWI0"/>
-                <signal pad-id="pf2" function="I2C_ALT2" group="SDA" field="PORTMUX.TWISPIROUTEA.TWI0"/>
-                <signal pad-id="pc2" function="I2C_ALT" group="SDA" field="PORTMUX.TWISPIROUTEA.TWI0"/>
-                <signal pad-id="pa2" function="I2C" group="SDA" field="PORTMUX.TWISPIROUTEA.TWI0"/>
+                <signal pad-key="pf3" function="I2C_ALT2" group="SCL" field="PORTMUX.TWISPIROUTEA.TWI0"/>
+                <signal pad-key="pc3" function="I2C_ALT" group="SCL" field="PORTMUX.TWISPIROUTEA.TWI0"/>
+                <signal pad-key="pa3" function="I2C" group="SCL" field="PORTMUX.TWISPIROUTEA.TWI0"/>
+                <signal pad-key="pf2" function="I2C_ALT2" group="SDA" field="PORTMUX.TWISPIROUTEA.TWI0"/>
+                <signal pad-key="pc2" function="I2C_ALT" group="SDA" field="PORTMUX.TWISPIROUTEA.TWI0"/>
+                <signal pad-key="pa2" function="I2C" group="SDA" field="PORTMUX.TWISPIROUTEA.TWI0"/>
             </signals>
         </peripheral>
         <peripheral key="usart0" name="USART0" module-key="i2108">
             <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"/>
-                <signal pad-id="pa4" function="USART0_ALT" group="TXD" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pa0" function="USART0" group="TXD" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pa6" function="USART0_ALT" group="XCK" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pa2" function="USART0" group="XCK" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pa7" function="USART0_ALT" group="XDIR" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pa3" function="USART0" group="XDIR" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa5" function="USART0_ALT" group="RXD" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa1" function="USART0" group="RXD" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa4" function="USART0_ALT" group="TXD" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa0" function="USART0" group="TXD" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa6" function="USART0_ALT" group="XCK" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa2" function="USART0" group="XCK" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa7" function="USART0_ALT" group="XDIR" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa3" function="USART0" group="XDIR" field="PORTMUX.USARTROUTEA.USART0"/>
             </signals>
         </peripheral>
         <peripheral key="usart1" name="USART1" module-key="i2108">
             <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"/>
-                <signal pad-id="pc2" function="USART1" group="XCK" field="PORTMUX.USARTROUTEA.USART1"/>
-                <signal pad-id="pc3" function="USART1" group="XDIR" field="PORTMUX.USARTROUTEA.USART1"/>
+                <signal pad-key="pc1" function="USART1" group="RXD" field="PORTMUX.USARTROUTEA.USART1"/>
+                <signal pad-key="pc0" function="USART1" group="TXD" field="PORTMUX.USARTROUTEA.USART1"/>
+                <signal pad-key="pc2" function="USART1" group="XCK" field="PORTMUX.USARTROUTEA.USART1"/>
+                <signal pad-key="pc3" function="USART1" group="XDIR" field="PORTMUX.USARTROUTEA.USART1"/>
             </signals>
         </peripheral>
         <peripheral key="usart2" name="USART2" module-key="i2108">
             <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"/>
-                <signal pad-id="pf4" function="USART2_ALT" group="TXD" field="PORTMUX.USARTROUTEA.USART2"/>
-                <signal pad-id="pf0" function="USART2" group="TXD" field="PORTMUX.USARTROUTEA.USART2"/>
-                <signal pad-id="pf6" function="USART2_ALT" group="XCK" field="PORTMUX.USARTROUTEA.USART2"/>
-                <signal pad-id="pf2" function="USART2" group="XCK" field="PORTMUX.USARTROUTEA.USART2"/>
-                <signal pad-id="pf3" function="USART2" group="XDIR" field="PORTMUX.USARTROUTEA.USART2"/>
+                <signal pad-key="pf5" function="USART2_ALT" group="RXD" field="PORTMUX.USARTROUTEA.USART2"/>
+                <signal pad-key="pf1" function="USART2" group="RXD" field="PORTMUX.USARTROUTEA.USART2"/>
+                <signal pad-key="pf4" function="USART2_ALT" group="TXD" field="PORTMUX.USARTROUTEA.USART2"/>
+                <signal pad-key="pf0" function="USART2" group="TXD" field="PORTMUX.USARTROUTEA.USART2"/>
+                <signal pad-key="pf6" function="USART2_ALT" group="XCK" field="PORTMUX.USARTROUTEA.USART2"/>
+                <signal pad-key="pf2" function="USART2" group="XCK" field="PORTMUX.USARTROUTEA.USART2"/>
+                <signal pad-key="pf3" function="USART2" group="XDIR" field="PORTMUX.USARTROUTEA.USART2"/>
             </signals>
         </peripheral>
         <peripheral key="userrow" name="USERROW" module-key="i2603">
@@ -1399,109 +1399,143 @@
             </register-group>
         </module>
     </modules>
+    <pads>
+        <pad key="pa3" name="PA3"/>
+        <pad key="pa4" name="PA4"/>
+        <pad key="pa5" name="PA5"/>
+        <pad key="pa6" name="PA6"/>
+        <pad key="pa7" name="PA7"/>
+        <pad key="pc0" name="PC0"/>
+        <pad key="pc1" name="PC1"/>
+        <pad key="pc2" name="PC2"/>
+        <pad key="pc3" name="PC3"/>
+        <pad key="pd0" name="PD0"/>
+        <pad key="pd1" name="PD1"/>
+        <pad key="pd2" name="PD2"/>
+        <pad key="pd3" name="PD3"/>
+        <pad key="pd4" name="PD4"/>
+        <pad key="pd5" name="PD5"/>
+        <pad key="pd6" name="PD6"/>
+        <pad key="pd7" name="PD7"/>
+        <pad key="avdd" name="AVDD"/>
+        <pad key="gnd0" name="GND0"/>
+        <pad key="pf0" name="PF0"/>
+        <pad key="pf1" name="PF1"/>
+        <pad key="pf2" name="PF2"/>
+        <pad key="pf3" name="PF3"/>
+        <pad key="pf4" name="PF4"/>
+        <pad key="pf5" name="PF5"/>
+        <pad key="pf6" name="PF6"/>
+        <pad key="updi" name="UPDI"/>
+        <pad key="vdd0" name="VDD0"/>
+        <pad key="gnd1" name="GND1"/>
+        <pad key="pa0" name="PA0"/>
+        <pad key="pa1" name="PA1"/>
+        <pad key="pa2" name="PA2"/>
+    </pads>
     <pinouts>
         <pinout key="qfn32" name="QFN32" type="qfn">
-            <pin position="1" pad="PA3"/>
-            <pin position="2" pad="PA4"/>
-            <pin position="3" pad="PA5"/>
-            <pin position="4" pad="PA6"/>
-            <pin position="5" pad="PA7"/>
-            <pin position="6" pad="PC0"/>
-            <pin position="7" pad="PC1"/>
-            <pin position="8" pad="PC2"/>
-            <pin position="9" pad="PC3"/>
-            <pin position="10" pad="PD0"/>
-            <pin position="11" pad="PD1"/>
-            <pin position="12" pad="PD2"/>
-            <pin position="13" pad="PD3"/>
-            <pin position="14" pad="PD4"/>
-            <pin position="15" pad="PD5"/>
-            <pin position="16" pad="PD6"/>
-            <pin position="17" pad="PD7"/>
-            <pin position="18" pad="AVDD"/>
-            <pin position="19" pad="GND0"/>
-            <pin position="20" pad="PF0"/>
-            <pin position="21" pad="PF1"/>
-            <pin position="22" pad="PF2"/>
-            <pin position="23" pad="PF3"/>
-            <pin position="24" pad="PF4"/>
-            <pin position="25" pad="PF5"/>
-            <pin position="26" pad="PF6"/>
-            <pin position="27" pad="UPDI"/>
-            <pin position="28" pad="VDD0"/>
-            <pin position="29" pad="GND1"/>
-            <pin position="30" pad="PA0"/>
-            <pin position="31" pad="PA1"/>
-            <pin position="32" pad="PA2"/>
+            <pin position="1" pad-key="pa3"/>
+            <pin position="2" pad-key="pa4"/>
+            <pin position="3" pad-key="pa5"/>
+            <pin position="4" pad-key="pa6"/>
+            <pin position="5" pad-key="pa7"/>
+            <pin position="6" pad-key="pc0"/>
+            <pin position="7" pad-key="pc1"/>
+            <pin position="8" pad-key="pc2"/>
+            <pin position="9" pad-key="pc3"/>
+            <pin position="10" pad-key="pd0"/>
+            <pin position="11" pad-key="pd1"/>
+            <pin position="12" pad-key="pd2"/>
+            <pin position="13" pad-key="pd3"/>
+            <pin position="14" pad-key="pd4"/>
+            <pin position="15" pad-key="pd5"/>
+            <pin position="16" pad-key="pd6"/>
+            <pin position="17" pad-key="pd7"/>
+            <pin position="18" pad-key="avdd"/>
+            <pin position="19" pad-key="gnd0"/>
+            <pin position="20" pad-key="pf0"/>
+            <pin position="21" pad-key="pf1"/>
+            <pin position="22" pad-key="pf2"/>
+            <pin position="23" pad-key="pf3"/>
+            <pin position="24" pad-key="pf4"/>
+            <pin position="25" pad-key="pf5"/>
+            <pin position="26" pad-key="pf6"/>
+            <pin position="27" pad-key="updi"/>
+            <pin position="28" pad-key="vdd0"/>
+            <pin position="29" pad-key="gnd1"/>
+            <pin position="30" pad-key="pa0"/>
+            <pin position="31" pad-key="pa1"/>
+            <pin position="32" pad-key="pa2"/>
         </pinout>
         <pinout key="qfp32" name="QFP32" type="qfp">
-            <pin position="1" pad="PA3"/>
-            <pin position="2" pad="PA4"/>
-            <pin position="3" pad="PA5"/>
-            <pin position="4" pad="PA6"/>
-            <pin position="5" pad="PA7"/>
-            <pin position="6" pad="PC0"/>
-            <pin position="7" pad="PC1"/>
-            <pin position="8" pad="PC2"/>
-            <pin position="9" pad="PC3"/>
-            <pin position="10" pad="PD0"/>
-            <pin position="11" pad="PD1"/>
-            <pin position="12" pad="PD2"/>
-            <pin position="13" pad="PD3"/>
-            <pin position="14" pad="PD4"/>
-            <pin position="15" pad="PD5"/>
-            <pin position="16" pad="PD6"/>
-            <pin position="17" pad="PD7"/>
-            <pin position="18" pad="AVDD"/>
-            <pin position="19" pad="GND0"/>
-            <pin position="20" pad="PF0"/>
-            <pin position="21" pad="PF1"/>
-            <pin position="22" pad="PF2"/>
-            <pin position="23" pad="PF3"/>
-            <pin position="24" pad="PF4"/>
-            <pin position="25" pad="PF5"/>
-            <pin position="26" pad="PF6"/>
-            <pin position="27" pad="UPDI"/>
-            <pin position="28" pad="VDD0"/>
-            <pin position="29" pad="GND1"/>
-            <pin position="30" pad="PA0"/>
-            <pin position="31" pad="PA1"/>
-            <pin position="32" pad="PA2"/>
+            <pin position="1" pad-key="pa3"/>
+            <pin position="2" pad-key="pa4"/>
+            <pin position="3" pad-key="pa5"/>
+            <pin position="4" pad-key="pa6"/>
+            <pin position="5" pad-key="pa7"/>
+            <pin position="6" pad-key="pc0"/>
+            <pin position="7" pad-key="pc1"/>
+            <pin position="8" pad-key="pc2"/>
+            <pin position="9" pad-key="pc3"/>
+            <pin position="10" pad-key="pd0"/>
+            <pin position="11" pad-key="pd1"/>
+            <pin position="12" pad-key="pd2"/>
+            <pin position="13" pad-key="pd3"/>
+            <pin position="14" pad-key="pd4"/>
+            <pin position="15" pad-key="pd5"/>
+            <pin position="16" pad-key="pd6"/>
+            <pin position="17" pad-key="pd7"/>
+            <pin position="18" pad-key="avdd"/>
+            <pin position="19" pad-key="gnd0"/>
+            <pin position="20" pad-key="pf0"/>
+            <pin position="21" pad-key="pf1"/>
+            <pin position="22" pad-key="pf2"/>
+            <pin position="23" pad-key="pf3"/>
+            <pin position="24" pad-key="pf4"/>
+            <pin position="25" pad-key="pf5"/>
+            <pin position="26" pad-key="pf6"/>
+            <pin position="27" pad-key="updi"/>
+            <pin position="28" pad-key="vdd0"/>
+            <pin position="29" pad-key="gnd1"/>
+            <pin position="30" pad-key="pa0"/>
+            <pin position="31" pad-key="pa1"/>
+            <pin position="32" pad-key="pa2"/>
         </pinout>
         <pinout key="ssop28" name="SSOP28" type="ssop">
-            <pin position="1" pad="PA7"/>
-            <pin position="2" pad="PC0"/>
-            <pin position="3" pad="PC1"/>
-            <pin position="4" pad="PC2"/>
-            <pin position="5" pad="PC3"/>
-            <pin position="6" pad="PD0"/>
-            <pin position="7" pad="PD1"/>
-            <pin position="8" pad="PD2"/>
-            <pin position="9" pad="PD3"/>
-            <pin position="10" pad="PD4"/>
-            <pin position="11" pad="PD5"/>
-            <pin position="12" pad="PD6"/>
-            <pin position="13" pad="PD7"/>
-            <pin position="14" pad="AVDD"/>
-            <pin position="15" pad="GND0"/>
-            <pin position="16" pad="PF0"/>
-            <pin position="17" pad="PF1"/>
-            <pin position="18" pad="PF6"/>
-            <pin position="19" pad="UPDI"/>
-            <pin position="20" pad="VDD0"/>
-            <pin position="21" pad="GND1"/>
-            <pin position="22" pad="PA0"/>
-            <pin position="23" pad="PA1"/>
-            <pin position="24" pad="PA2"/>
-            <pin position="25" pad="PA3"/>
-            <pin position="26" pad="PA4"/>
-            <pin position="27" pad="PA5"/>
-            <pin position="28" pad="PA6"/>
+            <pin position="1" pad-key="pa7"/>
+            <pin position="2" pad-key="pc0"/>
+            <pin position="3" pad-key="pc1"/>
+            <pin position="4" pad-key="pc2"/>
+            <pin position="5" pad-key="pc3"/>
+            <pin position="6" pad-key="pd0"/>
+            <pin position="7" pad-key="pd1"/>
+            <pin position="8" pad-key="pd2"/>
+            <pin position="9" pad-key="pd3"/>
+            <pin position="10" pad-key="pd4"/>
+            <pin position="11" pad-key="pd5"/>
+            <pin position="12" pad-key="pd6"/>
+            <pin position="13" pad-key="pd7"/>
+            <pin position="14" pad-key="avdd"/>
+            <pin position="15" pad-key="gnd0"/>
+            <pin position="16" pad-key="pf0"/>
+            <pin position="17" pad-key="pf1"/>
+            <pin position="18" pad-key="pf6"/>
+            <pin position="19" pad-key="updi"/>
+            <pin position="20" pad-key="vdd0"/>
+            <pin position="21" pad-key="gnd1"/>
+            <pin position="22" pad-key="pa0"/>
+            <pin position="23" pad-key="pa1"/>
+            <pin position="24" pad-key="pa2"/>
+            <pin position="25" pad-key="pa3"/>
+            <pin position="26" pad-key="pa4"/>
+            <pin position="27" pad-key="pa5"/>
+            <pin position="28" pad-key="pa6"/>
         </pinout>
     </pinouts>
     <variants>
-        <variant name="ATmega4808-AFR" pinout-key="qfp32" package="TQFP32"/>
-        <variant name="ATmega4808-MFR" pinout-key="qfn32" package="VQFN32"/>
-        <variant name="ATmega4808-XFR" pinout-key="ssop28" package="SSOP28"/>
+        <variant key="atmega4808_afr" name="ATmega4808-AFR" pinout-key="qfp32"/>
+        <variant key="atmega4808_mfr" name="ATmega4808-MFR" pinout-key="qfn32"/>
+        <variant key="atmega4808_xfr" name="ATmega4808-XFR" pinout-key="ssop28"/>
     </variants>
 </device>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA4809.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA4809.xml
index 48952e4b..dd63e3bd 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA4809.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA4809.xml
@@ -44,35 +44,35 @@
         <peripheral key="ac0" name="AC0" module-key="i2106">
             <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"/>
-                <signal pad-id="pd7" index="2" function="AC0" group="N"/>
-                <signal pad-id="pa7" index="0" function="AC0" group="OUT"/>
-                <signal pad-id="pd2" index="0" function="AC0" group="P"/>
-                <signal pad-id="pd4" index="1" function="AC0" group="P"/>
-                <signal pad-id="pd6" index="2" function="AC0" group="P"/>
-                <signal pad-id="pd1" index="3" function="AC0" group="P"/>
+                <signal pad-key="pd3" index="0" function="AC0" group="N"/>
+                <signal pad-key="pd5" index="1" function="AC0" group="N"/>
+                <signal pad-key="pd7" index="2" function="AC0" group="N"/>
+                <signal pad-key="pa7" index="0" function="AC0" group="OUT"/>
+                <signal pad-key="pd2" index="0" function="AC0" group="P"/>
+                <signal pad-key="pd4" index="1" function="AC0" group="P"/>
+                <signal pad-key="pd6" index="2" function="AC0" group="P"/>
+                <signal pad-key="pd1" index="3" function="AC0" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="adc0" name="ADC0" module-key="i2132">
             <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"/>
-                <signal pad-id="pd2" index="2" function="AIN0" group="AIN"/>
-                <signal pad-id="pd3" index="3" function="AIN0" group="AIN"/>
-                <signal pad-id="pd4" index="4" function="AIN0" group="AIN"/>
-                <signal pad-id="pd5" index="5" function="AIN0" group="AIN"/>
-                <signal pad-id="pd6" index="6" function="AIN0" group="AIN"/>
-                <signal pad-id="pd7" index="7" function="AIN0" group="AIN"/>
-                <signal pad-id="pe0" index="8" function="AIN0" group="AIN"/>
-                <signal pad-id="pe1" index="9" function="AIN0" group="AIN"/>
-                <signal pad-id="pe2" index="10" function="AIN0" group="AIN"/>
-                <signal pad-id="pe3" index="11" function="AIN0" group="AIN"/>
-                <signal pad-id="pf2" index="12" function="AIN0" group="AIN"/>
-                <signal pad-id="pf3" index="13" function="AIN0" group="AIN"/>
-                <signal pad-id="pf4" index="14" function="AIN0" group="AIN"/>
-                <signal pad-id="pf5" index="15" function="AIN0" group="AIN"/>
+                <signal pad-key="pd0" index="0" function="AIN0" group="AIN"/>
+                <signal pad-key="pd1" index="1" function="AIN0" group="AIN"/>
+                <signal pad-key="pd2" index="2" function="AIN0" group="AIN"/>
+                <signal pad-key="pd3" index="3" function="AIN0" group="AIN"/>
+                <signal pad-key="pd4" index="4" function="AIN0" group="AIN"/>
+                <signal pad-key="pd5" index="5" function="AIN0" group="AIN"/>
+                <signal pad-key="pd6" index="6" function="AIN0" group="AIN"/>
+                <signal pad-key="pd7" index="7" function="AIN0" group="AIN"/>
+                <signal pad-key="pe0" index="8" function="AIN0" group="AIN"/>
+                <signal pad-key="pe1" index="9" function="AIN0" group="AIN"/>
+                <signal pad-key="pe2" index="10" function="AIN0" group="AIN"/>
+                <signal pad-key="pe3" index="11" function="AIN0" group="AIN"/>
+                <signal pad-key="pf2" index="12" function="AIN0" group="AIN"/>
+                <signal pad-key="pf3" index="13" function="AIN0" group="AIN"/>
+                <signal pad-key="pf4" index="14" function="AIN0" group="AIN"/>
+                <signal pad-key="pf5" index="15" function="AIN0" group="AIN"/>
             </signals>
         </peripheral>
         <peripheral key="bod" name="BOD" module-key="i2114">
@@ -81,35 +81,35 @@
         <peripheral key="ccl" name="CCL" module-key="i2128">
             <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"/>
-                <signal pad-id="pa2" index="2" function="CCL" group="LUT0_IN"/>
-                <signal pad-id="pa6" index="0" function="CCL_ALT" group="LUT0_OUT" field="PORTMUX.CCLROUTEA.LUT0"/>
-                <signal pad-id="pa3" index="0" function="CCL" group="LUT0_OUT" field="PORTMUX.CCLROUTEA.LUT0"/>
-                <signal pad-id="pc0" index="0" function="CCL" group="LUT1_IN"/>
-                <signal pad-id="pc1" index="1" function="CCL" group="LUT1_IN"/>
-                <signal pad-id="pc2" index="2" function="CCL" group="LUT1_IN"/>
-                <signal pad-id="pc6" index="0" function="CCL_ALT" group="LUT1_OUT" field="PORTMUX.CCLROUTEA.LUT1"/>
-                <signal pad-id="pc3" index="0" function="CCL" group="LUT1_OUT" field="PORTMUX.CCLROUTEA.LUT1"/>
-                <signal pad-id="pd0" index="0" function="CCL" group="LUT2_IN"/>
-                <signal pad-id="pd1" index="1" function="CCL" group="LUT2_IN"/>
-                <signal pad-id="pd2" index="2" function="CCL" group="LUT2_IN"/>
-                <signal pad-id="pd3" index="0" function="CCL" group="LUT2_OUT" field="PORTMUX.CCLROUTEA.LUT2"/>
-                <signal pad-id="pd6" index="1" function="CCL_ALT" group="LUT2_OUT" field="PORTMUX.CCLROUTEA.LUT2"/>
-                <signal pad-id="pf0" index="0" function="CCL" group="LUT3_IN"/>
-                <signal pad-id="pf1" index="1" function="CCL" group="LUT3_IN"/>
-                <signal pad-id="pf2" index="2" function="CCL" group="LUT3_IN"/>
-                <signal pad-id="pf6" index="1" function="CCL_ALT" group="LUT3_OUT" field="PORTMUX.CCLROUTEA.LUT3"/>
-                <signal pad-id="pf3" index="1" function="CCL" group="LUT3_OUT" field="PORTMUX.CCLROUTEA.LUT3"/>
+                <signal pad-key="pa0" index="0" function="CCL" group="LUT0_IN"/>
+                <signal pad-key="pa1" index="1" function="CCL" group="LUT0_IN"/>
+                <signal pad-key="pa2" index="2" function="CCL" group="LUT0_IN"/>
+                <signal pad-key="pa6" index="0" function="CCL_ALT" group="LUT0_OUT" field="PORTMUX.CCLROUTEA.LUT0"/>
+                <signal pad-key="pa3" index="0" function="CCL" group="LUT0_OUT" field="PORTMUX.CCLROUTEA.LUT0"/>
+                <signal pad-key="pc0" index="0" function="CCL" group="LUT1_IN"/>
+                <signal pad-key="pc1" index="1" function="CCL" group="LUT1_IN"/>
+                <signal pad-key="pc2" index="2" function="CCL" group="LUT1_IN"/>
+                <signal pad-key="pc6" index="0" function="CCL_ALT" group="LUT1_OUT" field="PORTMUX.CCLROUTEA.LUT1"/>
+                <signal pad-key="pc3" index="0" function="CCL" group="LUT1_OUT" field="PORTMUX.CCLROUTEA.LUT1"/>
+                <signal pad-key="pd0" index="0" function="CCL" group="LUT2_IN"/>
+                <signal pad-key="pd1" index="1" function="CCL" group="LUT2_IN"/>
+                <signal pad-key="pd2" index="2" function="CCL" group="LUT2_IN"/>
+                <signal pad-key="pd3" index="0" function="CCL" group="LUT2_OUT" field="PORTMUX.CCLROUTEA.LUT2"/>
+                <signal pad-key="pd6" index="1" function="CCL_ALT" group="LUT2_OUT" field="PORTMUX.CCLROUTEA.LUT2"/>
+                <signal pad-key="pf0" index="0" function="CCL" group="LUT3_IN"/>
+                <signal pad-key="pf1" index="1" function="CCL" group="LUT3_IN"/>
+                <signal pad-key="pf2" index="2" function="CCL" group="LUT3_IN"/>
+                <signal pad-key="pf6" index="1" function="CCL_ALT" group="LUT3_OUT" field="PORTMUX.CCLROUTEA.LUT3"/>
+                <signal pad-key="pf3" index="1" function="CCL" group="LUT3_OUT" field="PORTMUX.CCLROUTEA.LUT3"/>
             </signals>
         </peripheral>
         <peripheral key="clkctrl" name="CLKCTRL" module-key="i2600_clkctrl">
             <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"/>
-                <signal pad-id="pf0" function="CLKCTRL" group="TOSC1"/>
-                <signal pad-id="pf1" function="CLKCTRL" group="TOSC2"/>
+                <signal pad-key="pa0" function="CLKCTRL" group="CLKI"/>
+                <signal pad-key="pa7" function="CLKCTRL" group="CLKO"/>
+                <signal pad-key="pf0" function="CLKCTRL" group="TOSC1"/>
+                <signal pad-key="pf1" function="CLKCTRL" group="TOSC2"/>
             </signals>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="i2100">
@@ -124,15 +124,15 @@
         <peripheral key="evsys" name="EVSYS" module-key="i2600_evsys">
             <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"/>
-                <signal pad-id="pb2" index="1" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTB"/>
-                <signal pad-id="pc7" index="2" function="EVSYS_ALT" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTC"/>
-                <signal pad-id="pc2" index="2" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTC"/>
-                <signal pad-id="pd7" index="3" function="EVSYS_ALT" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTD"/>
-                <signal pad-id="pd2" index="3" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTD"/>
-                <signal pad-id="pe2" index="4" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTE"/>
-                <signal pad-id="pf2" index="5" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTF"/>
+                <signal pad-key="pa7" index="0" function="EVSYS_ALT" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTA"/>
+                <signal pad-key="pa2" index="0" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTA"/>
+                <signal pad-key="pb2" index="1" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTB"/>
+                <signal pad-key="pc7" index="2" function="EVSYS_ALT" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTC"/>
+                <signal pad-key="pc2" index="2" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTC"/>
+                <signal pad-key="pd7" index="3" function="EVSYS_ALT" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTD"/>
+                <signal pad-key="pd2" index="3" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTD"/>
+                <signal pad-key="pe2" index="4" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTE"/>
+                <signal pad-key="pf2" index="5" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTF"/>
             </signals>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="i2600_fuse">
@@ -150,72 +150,72 @@
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pa2" index="2" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa3" index="3" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa4" index="4" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa5" index="5" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa6" index="6" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa7" index="7" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa0" index="0" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa1" index="1" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa2" index="2" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa3" index="3" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa4" index="4" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa5" index="5" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa6" index="6" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa7" index="7" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pb2" index="2" function="IOPORT" group="PIN"/>
-                <signal pad-id="pb3" index="3" function="IOPORT" group="PIN"/>
-                <signal pad-id="pb4" index="4" function="IOPORT" group="PIN"/>
-                <signal pad-id="pb5" index="5" function="IOPORT" group="PIN"/>
+                <signal pad-key="pb0" index="0" function="IOPORT" group="PIN"/>
+                <signal pad-key="pb1" index="1" function="IOPORT" group="PIN"/>
+                <signal pad-key="pb2" index="2" function="IOPORT" group="PIN"/>
+                <signal pad-key="pb3" index="3" function="IOPORT" group="PIN"/>
+                <signal pad-key="pb4" index="4" function="IOPORT" group="PIN"/>
+                <signal pad-key="pb5" index="5" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pc2" index="2" function="IOPORT" group="PIN"/>
-                <signal pad-id="pc3" index="3" function="IOPORT" group="PIN"/>
-                <signal pad-id="pc4" index="4" function="IOPORT" group="PIN"/>
-                <signal pad-id="pc5" index="5" function="IOPORT" group="PIN"/>
-                <signal pad-id="pc6" index="6" function="IOPORT" group="PIN"/>
-                <signal pad-id="pc7" index="7" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc0" index="0" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc1" index="1" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc2" index="2" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc3" index="3" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc4" index="4" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc5" index="5" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc6" index="6" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc7" index="7" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pd2" index="2" function="IOPORT" group="PIN"/>
-                <signal pad-id="pd3" index="3" function="IOPORT" group="PIN"/>
-                <signal pad-id="pd4" index="4" function="IOPORT" group="PIN"/>
-                <signal pad-id="pd5" index="5" function="IOPORT" group="PIN"/>
-                <signal pad-id="pd6" index="6" function="IOPORT" group="PIN"/>
-                <signal pad-id="pd7" index="7" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd0" index="0" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd1" index="1" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd2" index="2" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd3" index="3" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd4" index="4" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd5" index="5" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd6" index="6" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd7" index="7" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="porte" name="PORTE" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pe2" index="2" function="IOPORT" group="PIN"/>
-                <signal pad-id="pe3" index="3" function="IOPORT" group="PIN"/>
+                <signal pad-key="pe0" index="0" function="IOPORT" group="PIN"/>
+                <signal pad-key="pe1" index="1" function="IOPORT" group="PIN"/>
+                <signal pad-key="pe2" index="2" function="IOPORT" group="PIN"/>
+                <signal pad-key="pe3" index="3" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="portf" name="PORTF" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pf2" index="2" function="IOPORT" group="PIN"/>
-                <signal pad-id="pf3" index="3" function="IOPORT" group="PIN"/>
-                <signal pad-id="pf4" index="4" function="IOPORT" group="PIN"/>
-                <signal pad-id="pf5" index="5" function="IOPORT" group="PIN"/>
-                <signal pad-id="pf6" index="6" function="IOPORT" group="PIN"/>
+                <signal pad-key="pf0" index="0" function="IOPORT" group="PIN"/>
+                <signal pad-key="pf1" index="1" function="IOPORT" group="PIN"/>
+                <signal pad-key="pf2" index="2" function="IOPORT" group="PIN"/>
+                <signal pad-key="pf3" index="3" function="IOPORT" group="PIN"/>
+                <signal pad-key="pf4" index="4" function="IOPORT" group="PIN"/>
+                <signal pad-key="pf5" index="5" function="IOPORT" group="PIN"/>
+                <signal pad-key="pf6" index="6" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="portmux" name="PORTMUX" module-key="i2600_portmux">
@@ -224,7 +224,7 @@
         <peripheral key="rstctrl" name="RSTCTRL" module-key="i2111">
             <register-group-instance register-group-key="rstctrl" address-space-key="data" offset="0x40"/>
             <signals>
-                <signal pad-id="pf6" function="OTHER" group="RESET"/>
+                <signal pad-key="pf6" function="OTHER" group="RESET"/>
             </signals>
         </peripheral>
         <peripheral key="rtc" name="RTC" module-key="i2116">
@@ -239,18 +239,18 @@
         <peripheral key="spi0" name="SPI0" module-key="i2107">
             <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"/>
-                <signal pad-id="pa5" function="SPI" group="MISO" field="PORTMUX.TWISPIROUTEA.SPI0"/>
-                <signal pad-id="pe0" function="SPI_ALT2" group="MOSI" field="PORTMUX.TWISPIROUTEA.SPI0"/>
-                <signal pad-id="pc0" function="SPI_ALT" group="MOSI" field="PORTMUX.TWISPIROUTEA.SPI0"/>
-                <signal pad-id="pa4" function="SPI" group="MOSI" field="PORTMUX.TWISPIROUTEA.SPI0"/>
-                <signal pad-id="pe2" function="SPI_ALT2" group="SCK" field="PORTMUX.TWISPIROUTEA.SPI0"/>
-                <signal pad-id="pc2" function="SPI_ALT" group="SCK" field="PORTMUX.TWISPIROUTEA.SPI0"/>
-                <signal pad-id="pa6" function="SPI" group="SCK" field="PORTMUX.TWISPIROUTEA.SPI0"/>
-                <signal pad-id="pe3" function="SPI_ALT2" group="SS" field="PORTMUX.TWISPIROUTEA.SPI0"/>
-                <signal pad-id="pc3" function="SPI_ALT" group="SS" field="PORTMUX.TWISPIROUTEA.SPI0"/>
-                <signal pad-id="pa7" function="SPI" group="SS" field="PORTMUX.TWISPIROUTEA.SPI0"/>
+                <signal pad-key="pe1" function="SPI_ALT2" group="MISO" field="PORTMUX.TWISPIROUTEA.SPI0"/>
+                <signal pad-key="pc1" function="SPI_ALT" group="MISO" field="PORTMUX.TWISPIROUTEA.SPI0"/>
+                <signal pad-key="pa5" function="SPI" group="MISO" field="PORTMUX.TWISPIROUTEA.SPI0"/>
+                <signal pad-key="pe0" function="SPI_ALT2" group="MOSI" field="PORTMUX.TWISPIROUTEA.SPI0"/>
+                <signal pad-key="pc0" function="SPI_ALT" group="MOSI" field="PORTMUX.TWISPIROUTEA.SPI0"/>
+                <signal pad-key="pa4" function="SPI" group="MOSI" field="PORTMUX.TWISPIROUTEA.SPI0"/>
+                <signal pad-key="pe2" function="SPI_ALT2" group="SCK" field="PORTMUX.TWISPIROUTEA.SPI0"/>
+                <signal pad-key="pc2" function="SPI_ALT" group="SCK" field="PORTMUX.TWISPIROUTEA.SPI0"/>
+                <signal pad-key="pa6" function="SPI" group="SCK" field="PORTMUX.TWISPIROUTEA.SPI0"/>
+                <signal pad-key="pe3" function="SPI_ALT2" group="SS" field="PORTMUX.TWISPIROUTEA.SPI0"/>
+                <signal pad-key="pc3" function="SPI_ALT" group="SS" field="PORTMUX.TWISPIROUTEA.SPI0"/>
+                <signal pad-key="pa7" function="SPI" group="SS" field="PORTMUX.TWISPIROUTEA.SPI0"/>
             </signals>
         </peripheral>
         <peripheral key="syscfg" name="SYSCFG" module-key="i2600_syscfg">
@@ -259,128 +259,128 @@
         <peripheral key="tca0" name="TCA0" module-key="i2117">
             <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"/>
-                <signal pad-id="pd0" index="0" function="TCA_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pc0" index="0" function="TCA_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pb0" index="0" function="TCA_ALT" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pa0" index="0" function="TCA" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pf1" index="1" function="TCA_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pe1" index="1" function="TCA_ALT4" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pd1" index="1" function="TCA_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pc1" index="1" function="TCA_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pb1" index="1" function="TCA_ALT" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pa1" index="1" function="TCA" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pf2" index="2" function="TCA_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pe2" index="2" function="TCA_ALT4" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pd2" index="2" function="TCA_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pc2" index="2" function="TCA_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pb2" index="2" function="TCA_ALT" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pa2" index="2" function="TCA" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pf3" index="3" function="TCA_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pe3" index="3" function="TCA_ALT4" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pd3" index="3" function="TCA_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pc3" index="3" function="TCA_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pb3" index="3" function="TCA_ALT" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pa3" index="3" function="TCA" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pf4" index="4" function="TCA_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pd4" index="4" function="TCA_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pc4" index="4" function="TCA_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pb4" index="4" function="TCA_ALT" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pa4" index="4" function="TCA" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pf5" index="5" function="TCA_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pd5" index="5" function="TCA_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pc5" index="5" function="TCA_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pb5" index="5" function="TCA_ALT" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pa5" index="5" function="TCA" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pf0" index="0" function="TCA_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pe0" index="0" function="TCA_ALT4" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pd0" index="0" function="TCA_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pc0" index="0" function="TCA_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pb0" index="0" function="TCA_ALT" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pa0" index="0" function="TCA" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pf1" index="1" function="TCA_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pe1" index="1" function="TCA_ALT4" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pd1" index="1" function="TCA_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pc1" index="1" function="TCA_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pb1" index="1" function="TCA_ALT" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pa1" index="1" function="TCA" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pf2" index="2" function="TCA_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pe2" index="2" function="TCA_ALT4" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pd2" index="2" function="TCA_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pc2" index="2" function="TCA_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pb2" index="2" function="TCA_ALT" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pa2" index="2" function="TCA" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pf3" index="3" function="TCA_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pe3" index="3" function="TCA_ALT4" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pd3" index="3" function="TCA_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pc3" index="3" function="TCA_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pb3" index="3" function="TCA_ALT" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pa3" index="3" function="TCA" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pf4" index="4" function="TCA_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pd4" index="4" function="TCA_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pc4" index="4" function="TCA_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pb4" index="4" function="TCA_ALT" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pa4" index="4" function="TCA" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pf5" index="5" function="TCA_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pd5" index="5" function="TCA_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pc5" index="5" function="TCA_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pb5" index="5" function="TCA_ALT" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pa5" index="5" function="TCA" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
             </signals>
         </peripheral>
         <peripheral key="tcb0" name="TCB0" module-key="i2119">
             <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"/>
+                <signal pad-key="pf4" index="0" function="TCB0_ALT" group="WO" field="PORTMUX.TCBROUTEA.TCB0"/>
+                <signal pad-key="pa2" index="0" function="TCB0" group="WO" field="PORTMUX.TCBROUTEA.TCB0"/>
             </signals>
         </peripheral>
         <peripheral key="tcb1" name="TCB1" module-key="i2119">
             <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"/>
+                <signal pad-key="pf5" index="0" function="TCB1_ALT" group="WO" field="PORTMUX.TCBROUTEA.TCB1"/>
+                <signal pad-key="pa3" index="0" function="TCB1" group="WO" field="PORTMUX.TCBROUTEA.TCB1"/>
             </signals>
         </peripheral>
         <peripheral key="tcb2" name="TCB2" module-key="i2119">
             <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"/>
+                <signal pad-key="pb4" index="0" function="TCB2_ALT" group="WO" field="PORTMUX.TCBROUTEA.TCB2"/>
+                <signal pad-key="pc0" index="0" function="TCB2" group="WO" field="PORTMUX.TCBROUTEA.TCB2"/>
             </signals>
         </peripheral>
         <peripheral key="tcb3" name="TCB3" module-key="i2119">
             <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"/>
+                <signal pad-key="pc1" index="0" function="TCB3_ALT" group="WO" field="PORTMUX.TCBROUTEA.TCB3"/>
+                <signal pad-key="pb5" index="0" function="TCB3" group="WO" field="PORTMUX.TCBROUTEA.TCB3"/>
             </signals>
         </peripheral>
         <peripheral key="twi0" name="TWI0" module-key="i2110">
             <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"/>
-                <signal pad-id="pa3" function="I2C" group="SCL" field="PORTMUX.TWISPIROUTEA.TWI0"/>
-                <signal pad-id="pf2" function="I2C_ALT2" group="SDA" field="PORTMUX.TWISPIROUTEA.TWI0"/>
-                <signal pad-id="pc2" function="I2C_ALT" group="SDA" field="PORTMUX.TWISPIROUTEA.TWI0"/>
-                <signal pad-id="pa2" function="I2C" group="SDA" field="PORTMUX.TWISPIROUTEA.TWI0"/>
+                <signal pad-key="pf3" function="I2C_ALT2" group="SCL" field="PORTMUX.TWISPIROUTEA.TWI0"/>
+                <signal pad-key="pc3" function="I2C_ALT" group="SCL" field="PORTMUX.TWISPIROUTEA.TWI0"/>
+                <signal pad-key="pa3" function="I2C" group="SCL" field="PORTMUX.TWISPIROUTEA.TWI0"/>
+                <signal pad-key="pf2" function="I2C_ALT2" group="SDA" field="PORTMUX.TWISPIROUTEA.TWI0"/>
+                <signal pad-key="pc2" function="I2C_ALT" group="SDA" field="PORTMUX.TWISPIROUTEA.TWI0"/>
+                <signal pad-key="pa2" function="I2C" group="SDA" field="PORTMUX.TWISPIROUTEA.TWI0"/>
             </signals>
         </peripheral>
         <peripheral key="usart0" name="USART0" module-key="i2108">
             <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"/>
-                <signal pad-id="pa4" function="USART0_ALT" group="TXD" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pa0" function="USART0" group="TXD" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pa6" function="USART0_ALT" group="XCK" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pa2" function="USART0" group="XCK" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pa7" function="USART0_ALT" group="XDIR" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pa3" function="USART0" group="XDIR" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa5" function="USART0_ALT" group="RXD" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa1" function="USART0" group="RXD" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa4" function="USART0_ALT" group="TXD" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa0" function="USART0" group="TXD" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa6" function="USART0_ALT" group="XCK" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa2" function="USART0" group="XCK" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa7" function="USART0_ALT" group="XDIR" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa3" function="USART0" group="XDIR" field="PORTMUX.USARTROUTEA.USART0"/>
             </signals>
         </peripheral>
         <peripheral key="usart1" name="USART1" module-key="i2108">
             <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"/>
-                <signal pad-id="pc4" function="USART1_ALT" group="TXD" field="PORTMUX.USARTROUTEA.USART1"/>
-                <signal pad-id="pc0" function="USART1" group="TXD" field="PORTMUX.USARTROUTEA.USART1"/>
-                <signal pad-id="pc6" function="USART1_ALT" group="XCK" field="PORTMUX.USARTROUTEA.USART1"/>
-                <signal pad-id="pc2" function="USART1" group="XCK" field="PORTMUX.USARTROUTEA.USART1"/>
-                <signal pad-id="pc7" function="USART1_ALT" group="XDIR" field="PORTMUX.USARTROUTEA.USART1"/>
-                <signal pad-id="pc3" function="USART1" group="XDIR" field="PORTMUX.USARTROUTEA.USART1"/>
+                <signal pad-key="pc5" function="USART1_ALT" group="RXD" field="PORTMUX.USARTROUTEA.USART1"/>
+                <signal pad-key="pc1" function="USART1" group="RXD" field="PORTMUX.USARTROUTEA.USART1"/>
+                <signal pad-key="pc4" function="USART1_ALT" group="TXD" field="PORTMUX.USARTROUTEA.USART1"/>
+                <signal pad-key="pc0" function="USART1" group="TXD" field="PORTMUX.USARTROUTEA.USART1"/>
+                <signal pad-key="pc6" function="USART1_ALT" group="XCK" field="PORTMUX.USARTROUTEA.USART1"/>
+                <signal pad-key="pc2" function="USART1" group="XCK" field="PORTMUX.USARTROUTEA.USART1"/>
+                <signal pad-key="pc7" function="USART1_ALT" group="XDIR" field="PORTMUX.USARTROUTEA.USART1"/>
+                <signal pad-key="pc3" function="USART1" group="XDIR" field="PORTMUX.USARTROUTEA.USART1"/>
             </signals>
         </peripheral>
         <peripheral key="usart2" name="USART2" module-key="i2108">
             <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"/>
-                <signal pad-id="pf4" function="USART2_ALT" group="TXD" field="PORTMUX.USARTROUTEA.USART2"/>
-                <signal pad-id="pf0" function="USART2" group="TXD" field="PORTMUX.USARTROUTEA.USART2"/>
-                <signal pad-id="pf6" function="USART2_ALT" group="XCK" field="PORTMUX.USARTROUTEA.USART2"/>
-                <signal pad-id="pf2" function="USART2" group="XCK" field="PORTMUX.USARTROUTEA.USART2"/>
-                <signal pad-id="pf3" function="USART2" group="XDIR" field="PORTMUX.USARTROUTEA.USART2"/>
+                <signal pad-key="pf5" function="USART2_ALT" group="RXD" field="PORTMUX.USARTROUTEA.USART2"/>
+                <signal pad-key="pf1" function="USART2" group="RXD" field="PORTMUX.USARTROUTEA.USART2"/>
+                <signal pad-key="pf4" function="USART2_ALT" group="TXD" field="PORTMUX.USARTROUTEA.USART2"/>
+                <signal pad-key="pf0" function="USART2" group="TXD" field="PORTMUX.USARTROUTEA.USART2"/>
+                <signal pad-key="pf6" function="USART2_ALT" group="XCK" field="PORTMUX.USARTROUTEA.USART2"/>
+                <signal pad-key="pf2" function="USART2" group="XCK" field="PORTMUX.USARTROUTEA.USART2"/>
+                <signal pad-key="pf3" function="USART2" group="XDIR" field="PORTMUX.USARTROUTEA.USART2"/>
             </signals>
         </peripheral>
         <peripheral key="usart3" name="USART3" module-key="i2108">
             <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"/>
-                <signal pad-id="pb4" function="USART3_ALT" group="TXD" field="PORTMUX.USARTROUTEA.USART3"/>
-                <signal pad-id="pb0" function="USART3" group="TXD" field="PORTMUX.USARTROUTEA.USART3"/>
-                <signal pad-id="pb2" function="USART3" group="XCK" field="PORTMUX.USARTROUTEA.USART3"/>
-                <signal pad-id="pb3" function="USART3" group="XDIR" field="PORTMUX.USARTROUTEA.USART3"/>
+                <signal pad-key="pb5" function="USART3_ALT" group="RXD" field="PORTMUX.USARTROUTEA.USART3"/>
+                <signal pad-key="pb1" function="USART3" group="RXD" field="PORTMUX.USARTROUTEA.USART3"/>
+                <signal pad-key="pb4" function="USART3_ALT" group="TXD" field="PORTMUX.USARTROUTEA.USART3"/>
+                <signal pad-key="pb0" function="USART3" group="TXD" field="PORTMUX.USARTROUTEA.USART3"/>
+                <signal pad-key="pb2" function="USART3" group="XCK" field="PORTMUX.USARTROUTEA.USART3"/>
+                <signal pad-key="pb3" function="USART3" group="XDIR" field="PORTMUX.USARTROUTEA.USART3"/>
             </signals>
         </peripheral>
         <peripheral key="userrow" name="USERROW" module-key="i2603">
@@ -1476,153 +1476,205 @@
             </register-group>
         </module>
     </modules>
+    <pads>
+        <pad key="pa5" name="PA5"/>
+        <pad key="pa6" name="PA6"/>
+        <pad key="pa7" name="PA7"/>
+        <pad key="pb0" name="PB0"/>
+        <pad key="pb1" name="PB1"/>
+        <pad key="pb2" name="PB2"/>
+        <pad key="pb3" name="PB3"/>
+        <pad key="pb4" name="PB4"/>
+        <pad key="pb5" name="PB5"/>
+        <pad key="pc0" name="PC0"/>
+        <pad key="pc1" name="PC1"/>
+        <pad key="pc2" name="PC2"/>
+        <pad key="pc3" name="PC3"/>
+        <pad key="vdd0" name="VDD0"/>
+        <pad key="gnd0" name="GND0"/>
+        <pad key="pc4" name="PC4"/>
+        <pad key="pc5" name="PC5"/>
+        <pad key="pc6" name="PC6"/>
+        <pad key="pc7" name="PC7"/>
+        <pad key="pd0" name="PD0"/>
+        <pad key="pd1" name="PD1"/>
+        <pad key="pd2" name="PD2"/>
+        <pad key="pd3" name="PD3"/>
+        <pad key="pd4" name="PD4"/>
+        <pad key="pd5" name="PD5"/>
+        <pad key="pd6" name="PD6"/>
+        <pad key="pd7" name="PD7"/>
+        <pad key="avdd" name="AVDD"/>
+        <pad key="agnd" name="AGND"/>
+        <pad key="pe0" name="PE0"/>
+        <pad key="pe1" name="PE1"/>
+        <pad key="pe2" name="PE2"/>
+        <pad key="pe3" name="PE3"/>
+        <pad key="pf0" name="PF0"/>
+        <pad key="pf1" name="PF1"/>
+        <pad key="pf2" name="PF2"/>
+        <pad key="pf3" name="PF3"/>
+        <pad key="pf4" name="PF4"/>
+        <pad key="pf5" name="PF5"/>
+        <pad key="pf6" name="PF6"/>
+        <pad key="updi" name="UPDI"/>
+        <pad key="vdd1" name="VDD1"/>
+        <pad key="gnd1" name="GND1"/>
+        <pad key="pa0" name="PA0"/>
+        <pad key="pa1" name="PA1"/>
+        <pad key="pa2" name="PA2"/>
+        <pad key="pa3" name="PA3"/>
+        <pad key="pa4" name="PA4"/>
+        <pad key="vdd" name="VDD"/>
+        <pad key="gnd" name="GND"/>
+    </pads>
     <pinouts>
         <pinout key="qfn48" name="QFN48" type="qfn">
-            <pin position="1" pad="PA5"/>
-            <pin position="2" pad="PA6"/>
-            <pin position="3" pad="PA7"/>
-            <pin position="4" pad="PB0"/>
-            <pin position="5" pad="PB1"/>
-            <pin position="6" pad="PB2"/>
-            <pin position="7" pad="PB3"/>
-            <pin position="8" pad="PB4"/>
-            <pin position="9" pad="PB5"/>
-            <pin position="10" pad="PC0"/>
-            <pin position="11" pad="PC1"/>
-            <pin position="12" pad="PC2"/>
-            <pin position="13" pad="PC3"/>
-            <pin position="14" pad="VDD0"/>
-            <pin position="15" pad="GND0"/>
-            <pin position="16" pad="PC4"/>
-            <pin position="17" pad="PC5"/>
-            <pin position="18" pad="PC6"/>
-            <pin position="19" pad="PC7"/>
-            <pin position="20" pad="PD0"/>
-            <pin position="21" pad="PD1"/>
-            <pin position="22" pad="PD2"/>
-            <pin position="23" pad="PD3"/>
-            <pin position="24" pad="PD4"/>
-            <pin position="25" pad="PD5"/>
-            <pin position="26" pad="PD6"/>
-            <pin position="27" pad="PD7"/>
-            <pin position="28" pad="AVDD"/>
-            <pin position="29" pad="AGND"/>
-            <pin position="30" pad="PE0"/>
-            <pin position="31" pad="PE1"/>
-            <pin position="32" pad="PE2"/>
-            <pin position="33" pad="PE3"/>
-            <pin position="34" pad="PF0"/>
-            <pin position="35" pad="PF1"/>
-            <pin position="36" pad="PF2"/>
-            <pin position="37" pad="PF3"/>
-            <pin position="38" pad="PF4"/>
-            <pin position="39" pad="PF5"/>
-            <pin position="40" pad="PF6"/>
-            <pin position="41" pad="UPDI"/>
-            <pin position="42" pad="VDD1"/>
-            <pin position="43" pad="GND1"/>
-            <pin position="44" pad="PA0"/>
-            <pin position="45" pad="PA1"/>
-            <pin position="46" pad="PA2"/>
-            <pin position="47" pad="PA3"/>
-            <pin position="48" pad="PA4"/>
+            <pin position="1" pad-key="pa5"/>
+            <pin position="2" pad-key="pa6"/>
+            <pin position="3" pad-key="pa7"/>
+            <pin position="4" pad-key="pb0"/>
+            <pin position="5" pad-key="pb1"/>
+            <pin position="6" pad-key="pb2"/>
+            <pin position="7" pad-key="pb3"/>
+            <pin position="8" pad-key="pb4"/>
+            <pin position="9" pad-key="pb5"/>
+            <pin position="10" pad-key="pc0"/>
+            <pin position="11" pad-key="pc1"/>
+            <pin position="12" pad-key="pc2"/>
+            <pin position="13" pad-key="pc3"/>
+            <pin position="14" pad-key="vdd0"/>
+            <pin position="15" pad-key="gnd0"/>
+            <pin position="16" pad-key="pc4"/>
+            <pin position="17" pad-key="pc5"/>
+            <pin position="18" pad-key="pc6"/>
+            <pin position="19" pad-key="pc7"/>
+            <pin position="20" pad-key="pd0"/>
+            <pin position="21" pad-key="pd1"/>
+            <pin position="22" pad-key="pd2"/>
+            <pin position="23" pad-key="pd3"/>
+            <pin position="24" pad-key="pd4"/>
+            <pin position="25" pad-key="pd5"/>
+            <pin position="26" pad-key="pd6"/>
+            <pin position="27" pad-key="pd7"/>
+            <pin position="28" pad-key="avdd"/>
+            <pin position="29" pad-key="agnd"/>
+            <pin position="30" pad-key="pe0"/>
+            <pin position="31" pad-key="pe1"/>
+            <pin position="32" pad-key="pe2"/>
+            <pin position="33" pad-key="pe3"/>
+            <pin position="34" pad-key="pf0"/>
+            <pin position="35" pad-key="pf1"/>
+            <pin position="36" pad-key="pf2"/>
+            <pin position="37" pad-key="pf3"/>
+            <pin position="38" pad-key="pf4"/>
+            <pin position="39" pad-key="pf5"/>
+            <pin position="40" pad-key="pf6"/>
+            <pin position="41" pad-key="updi"/>
+            <pin position="42" pad-key="vdd1"/>
+            <pin position="43" pad-key="gnd1"/>
+            <pin position="44" pad-key="pa0"/>
+            <pin position="45" pad-key="pa1"/>
+            <pin position="46" pad-key="pa2"/>
+            <pin position="47" pad-key="pa3"/>
+            <pin position="48" pad-key="pa4"/>
         </pinout>
         <pinout key="qfp48" name="QFP48" type="qfp">
-            <pin position="1" pad="PA5"/>
-            <pin position="2" pad="PA6"/>
-            <pin position="3" pad="PA7"/>
-            <pin position="4" pad="PB0"/>
-            <pin position="5" pad="PB1"/>
-            <pin position="6" pad="PB2"/>
-            <pin position="7" pad="PB3"/>
-            <pin position="8" pad="PB4"/>
-            <pin position="9" pad="PB5"/>
-            <pin position="10" pad="PC0"/>
-            <pin position="11" pad="PC1"/>
-            <pin position="12" pad="PC2"/>
-            <pin position="13" pad="PC3"/>
-            <pin position="14" pad="VDD0"/>
-            <pin position="15" pad="GND0"/>
-            <pin position="16" pad="PC4"/>
-            <pin position="17" pad="PC5"/>
-            <pin position="18" pad="PC6"/>
-            <pin position="19" pad="PC7"/>
-            <pin position="20" pad="PD0"/>
-            <pin position="21" pad="PD1"/>
-            <pin position="22" pad="PD2"/>
-            <pin position="23" pad="PD3"/>
-            <pin position="24" pad="PD4"/>
-            <pin position="25" pad="PD5"/>
-            <pin position="26" pad="PD6"/>
-            <pin position="27" pad="PD7"/>
-            <pin position="28" pad="AVDD"/>
-            <pin position="29" pad="AGND"/>
-            <pin position="30" pad="PE0"/>
-            <pin position="31" pad="PE1"/>
-            <pin position="32" pad="PE2"/>
-            <pin position="33" pad="PE3"/>
-            <pin position="34" pad="PF0"/>
-            <pin position="35" pad="PF1"/>
-            <pin position="36" pad="PF2"/>
-            <pin position="37" pad="PF3"/>
-            <pin position="38" pad="PF4"/>
-            <pin position="39" pad="PF5"/>
-            <pin position="40" pad="PF6"/>
-            <pin position="41" pad="UPDI"/>
-            <pin position="42" pad="VDD1"/>
-            <pin position="43" pad="GND1"/>
-            <pin position="44" pad="PA0"/>
-            <pin position="45" pad="PA1"/>
-            <pin position="46" pad="PA2"/>
-            <pin position="47" pad="PA3"/>
-            <pin position="48" pad="PA4"/>
+            <pin position="1" pad-key="pa5"/>
+            <pin position="2" pad-key="pa6"/>
+            <pin position="3" pad-key="pa7"/>
+            <pin position="4" pad-key="pb0"/>
+            <pin position="5" pad-key="pb1"/>
+            <pin position="6" pad-key="pb2"/>
+            <pin position="7" pad-key="pb3"/>
+            <pin position="8" pad-key="pb4"/>
+            <pin position="9" pad-key="pb5"/>
+            <pin position="10" pad-key="pc0"/>
+            <pin position="11" pad-key="pc1"/>
+            <pin position="12" pad-key="pc2"/>
+            <pin position="13" pad-key="pc3"/>
+            <pin position="14" pad-key="vdd0"/>
+            <pin position="15" pad-key="gnd0"/>
+            <pin position="16" pad-key="pc4"/>
+            <pin position="17" pad-key="pc5"/>
+            <pin position="18" pad-key="pc6"/>
+            <pin position="19" pad-key="pc7"/>
+            <pin position="20" pad-key="pd0"/>
+            <pin position="21" pad-key="pd1"/>
+            <pin position="22" pad-key="pd2"/>
+            <pin position="23" pad-key="pd3"/>
+            <pin position="24" pad-key="pd4"/>
+            <pin position="25" pad-key="pd5"/>
+            <pin position="26" pad-key="pd6"/>
+            <pin position="27" pad-key="pd7"/>
+            <pin position="28" pad-key="avdd"/>
+            <pin position="29" pad-key="agnd"/>
+            <pin position="30" pad-key="pe0"/>
+            <pin position="31" pad-key="pe1"/>
+            <pin position="32" pad-key="pe2"/>
+            <pin position="33" pad-key="pe3"/>
+            <pin position="34" pad-key="pf0"/>
+            <pin position="35" pad-key="pf1"/>
+            <pin position="36" pad-key="pf2"/>
+            <pin position="37" pad-key="pf3"/>
+            <pin position="38" pad-key="pf4"/>
+            <pin position="39" pad-key="pf5"/>
+            <pin position="40" pad-key="pf6"/>
+            <pin position="41" pad-key="updi"/>
+            <pin position="42" pad-key="vdd1"/>
+            <pin position="43" pad-key="gnd1"/>
+            <pin position="44" pad-key="pa0"/>
+            <pin position="45" pad-key="pa1"/>
+            <pin position="46" pad-key="pa2"/>
+            <pin position="47" pad-key="pa3"/>
+            <pin position="48" pad-key="pa4"/>
         </pinout>
         <pinout key="pdip40" name="PDIP40" type="dip">
-            <pin position="1" pad="PC0"/>
-            <pin position="2" pad="PC1"/>
-            <pin position="3" pad="PC2"/>
-            <pin position="4" pad="PC3"/>
-            <pin position="5" pad="VDD"/>
-            <pin position="6" pad="GND"/>
-            <pin position="7" pad="PC4"/>
-            <pin position="8" pad="PC5"/>
-            <pin position="9" pad="PD0"/>
-            <pin position="10" pad="PD1"/>
-            <pin position="11" pad="PD2"/>
-            <pin position="12" pad="PD3"/>
-            <pin position="13" pad="PD4"/>
-            <pin position="14" pad="PD5"/>
-            <pin position="15" pad="PD6"/>
-            <pin position="16" pad="PD7"/>
-            <pin position="17" pad="AVDD"/>
-            <pin position="18" pad="GND"/>
-            <pin position="19" pad="PE0"/>
-            <pin position="20" pad="PE1"/>
-            <pin position="21" pad="PE2"/>
-            <pin position="22" pad="PE3"/>
-            <pin position="23" pad="PF0"/>
-            <pin position="24" pad="PF1"/>
-            <pin position="25" pad="PF2"/>
-            <pin position="26" pad="PF3"/>
-            <pin position="27" pad="PF4"/>
-            <pin position="28" pad="PF5"/>
-            <pin position="29" pad="PF6"/>
-            <pin position="30" pad="UPDI"/>
-            <pin position="31" pad="VDD"/>
-            <pin position="32" pad="GND"/>
-            <pin position="33" pad="PA0"/>
-            <pin position="34" pad="PA1"/>
-            <pin position="35" pad="PA2"/>
-            <pin position="36" pad="PA3"/>
-            <pin position="37" pad="PA4"/>
-            <pin position="38" pad="PA5"/>
-            <pin position="39" pad="PA6"/>
-            <pin position="40" pad="PA7"/>
+            <pin position="1" pad-key="pc0"/>
+            <pin position="2" pad-key="pc1"/>
+            <pin position="3" pad-key="pc2"/>
+            <pin position="4" pad-key="pc3"/>
+            <pin position="5" pad-key="vdd"/>
+            <pin position="6" pad-key="gnd"/>
+            <pin position="7" pad-key="pc4"/>
+            <pin position="8" pad-key="pc5"/>
+            <pin position="9" pad-key="pd0"/>
+            <pin position="10" pad-key="pd1"/>
+            <pin position="11" pad-key="pd2"/>
+            <pin position="12" pad-key="pd3"/>
+            <pin position="13" pad-key="pd4"/>
+            <pin position="14" pad-key="pd5"/>
+            <pin position="15" pad-key="pd6"/>
+            <pin position="16" pad-key="pd7"/>
+            <pin position="17" pad-key="avdd"/>
+            <pin position="18" pad-key="gnd"/>
+            <pin position="19" pad-key="pe0"/>
+            <pin position="20" pad-key="pe1"/>
+            <pin position="21" pad-key="pe2"/>
+            <pin position="22" pad-key="pe3"/>
+            <pin position="23" pad-key="pf0"/>
+            <pin position="24" pad-key="pf1"/>
+            <pin position="25" pad-key="pf2"/>
+            <pin position="26" pad-key="pf3"/>
+            <pin position="27" pad-key="pf4"/>
+            <pin position="28" pad-key="pf5"/>
+            <pin position="29" pad-key="pf6"/>
+            <pin position="30" pad-key="updi"/>
+            <pin position="31" pad-key="vdd"/>
+            <pin position="32" pad-key="gnd"/>
+            <pin position="33" pad-key="pa0"/>
+            <pin position="34" pad-key="pa1"/>
+            <pin position="35" pad-key="pa2"/>
+            <pin position="36" pad-key="pa3"/>
+            <pin position="37" pad-key="pa4"/>
+            <pin position="38" pad-key="pa5"/>
+            <pin position="39" pad-key="pa6"/>
+            <pin position="40" pad-key="pa7"/>
         </pinout>
     </pinouts>
     <variants>
-        <variant name="ATmega4809-AFR" pinout-key="qfp48" package="TQFP48"/>
-        <variant name="ATmega4809-MFR" pinout-key="qfn48" package="UQFN48"/>
-        <variant name="ATmega4809-PF" pinout-key="pdip40" package="PDIP40"/>
+        <variant key="atmega4809_afr" name="ATmega4809-AFR" pinout-key="qfp48"/>
+        <variant key="atmega4809_mfr" name="ATmega4809-MFR" pinout-key="qfn48"/>
+        <variant key="atmega4809_pf" name="ATmega4809-PF" pinout-key="pdip40"/>
     </variants>
 </device>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA48A.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA48A.xml
index 7df0b2c7..7d5dfd46 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA48A.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA48A.xml
@@ -198,135 +198,135 @@
         <peripheral key="usart0" name="USART0" module-key="usart">
             <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"/>
-                <signal pad-id="pd4" function="default" group="XCK"/>
+                <signal pad-key="pd1" function="default" group="TXD"/>
+                <signal pad-key="pd0" function="default" group="RXD"/>
+                <signal pad-key="pd4" function="default" group="XCK"/>
             </signals>
         </peripheral>
         <peripheral key="twi" name="TWI" module-key="twi">
             <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"/>
+                <signal pad-key="pc4" function="default" group="SDA"/>
+                <signal pad-key="pc5" function="default" group="SCL"/>
             </signals>
         </peripheral>
         <peripheral key="tc1" name="TC1" module-key="tc16">
             <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"/>
-                <signal pad-id="pb1" function="default" group="OCA"/>
-                <signal pad-id="pb2" function="default" group="OCB"/>
+                <signal pad-key="pd5" function="default" group="T"/>
+                <signal pad-key="pb0" function="default" group="ICP"/>
+                <signal pad-key="pb1" function="default" group="OCA"/>
+                <signal pad-key="pb2" function="default" group="OCB"/>
             </signals>
         </peripheral>
         <peripheral key="tc2" name="TC2" module-key="tc8_async">
             <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"/>
+                <signal pad-key="pb3" function="default" group="OCA"/>
+                <signal pad-key="pd3" function="default" group="OCB"/>
             </signals>
         </peripheral>
         <peripheral key="adc" name="ADC" module-key="adc">
             <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"/>
-                <signal pad-id="pc2" index="2" function="default" group="ADC"/>
-                <signal pad-id="pc3" index="3" function="default" group="ADC"/>
-                <signal pad-id="pc4" index="4" function="default" group="ADC"/>
-                <signal pad-id="pc5" index="5" function="default" group="ADC"/>
+                <signal pad-key="pc0" index="0" function="default" group="ADC"/>
+                <signal pad-key="pc1" index="1" function="default" group="ADC"/>
+                <signal pad-key="pc2" index="2" function="default" group="ADC"/>
+                <signal pad-key="pc3" index="3" function="default" group="ADC"/>
+                <signal pad-key="pc4" index="4" function="default" group="ADC"/>
+                <signal pad-key="pc5" index="5" function="default" group="ADC"/>
             </signals>
         </peripheral>
         <peripheral key="ac" name="AC" module-key="ac">
             <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"/>
+                <signal pad-key="pd6" index="0" function="default" group="AIN"/>
+                <signal pad-key="pd7" index="1" function="default" group="AIN"/>
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pb2" index="2" function="default" group="P"/>
-                <signal pad-id="pb3" index="3" function="default" group="P"/>
-                <signal pad-id="pb4" index="4" function="default" group="P"/>
-                <signal pad-id="pb5" index="5" function="default" group="P"/>
-                <signal pad-id="pb6" index="6" function="default" group="P"/>
-                <signal pad-id="pb7" index="7" function="default" group="P"/>
+                <signal pad-key="pb0" index="0" function="default" group="P"/>
+                <signal pad-key="pb1" index="1" function="default" group="P"/>
+                <signal pad-key="pb2" index="2" function="default" group="P"/>
+                <signal pad-key="pb3" index="3" function="default" group="P"/>
+                <signal pad-key="pb4" index="4" function="default" group="P"/>
+                <signal pad-key="pb5" index="5" function="default" group="P"/>
+                <signal pad-key="pb6" index="6" function="default" group="P"/>
+                <signal pad-key="pb7" index="7" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pc2" index="2" function="default" group="P"/>
-                <signal pad-id="pc3" index="3" function="default" group="P"/>
-                <signal pad-id="pc4" index="4" function="default" group="P"/>
-                <signal pad-id="pc5" index="5" function="default" group="P"/>
-                <signal pad-id="pc6" index="6" function="default" group="P"/>
+                <signal pad-key="pc0" index="0" function="default" group="P"/>
+                <signal pad-key="pc1" index="1" function="default" group="P"/>
+                <signal pad-key="pc2" index="2" function="default" group="P"/>
+                <signal pad-key="pc3" index="3" function="default" group="P"/>
+                <signal pad-key="pc4" index="4" function="default" group="P"/>
+                <signal pad-key="pc5" index="5" function="default" group="P"/>
+                <signal pad-key="pc6" index="6" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pd2" index="2" function="default" group="P"/>
-                <signal pad-id="pd3" index="3" function="default" group="P"/>
-                <signal pad-id="pd4" index="4" function="default" group="P"/>
-                <signal pad-id="pd5" index="5" function="default" group="P"/>
-                <signal pad-id="pd6" index="6" function="default" group="P"/>
-                <signal pad-id="pd7" index="7" function="default" group="P"/>
+                <signal pad-key="pd0" index="0" function="default" group="P"/>
+                <signal pad-key="pd1" index="1" function="default" group="P"/>
+                <signal pad-key="pd2" index="2" function="default" group="P"/>
+                <signal pad-key="pd3" index="3" function="default" group="P"/>
+                <signal pad-key="pd4" index="4" function="default" group="P"/>
+                <signal pad-key="pd5" index="5" function="default" group="P"/>
+                <signal pad-key="pd6" index="6" function="default" group="P"/>
+                <signal pad-key="pd7" index="7" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="tc0" name="TC0" module-key="tc8">
             <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"/>
-                <signal pad-id="pd6" function="default" group="OCA"/>
+                <signal pad-key="pd4" function="default" group="T"/>
+                <signal pad-key="pd5" function="default" group="OCB"/>
+                <signal pad-key="pd6" function="default" group="OCA"/>
             </signals>
         </peripheral>
         <peripheral key="exint" name="EXINT" module-key="exint">
             <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"/>
-                <signal pad-id="pd4" index="20" function="default" group="PCINT"/>
-                <signal pad-id="pb6" index="6" function="default" group="PCINT"/>
-                <signal pad-id="pb7" index="7" function="default" group="PCINT"/>
-                <signal pad-id="pd5" index="21" function="default" group="PCINT"/>
-                <signal pad-id="pd6" index="22" function="default" group="PCINT"/>
-                <signal pad-id="pd7" index="23" function="default" group="PCINT"/>
-                <signal pad-id="pb0" index="0" function="default" group="PCINT"/>
-                <signal pad-id="pb1" index="1" function="default" group="PCINT"/>
-                <signal pad-id="pb2" index="2" function="default" group="PCINT"/>
-                <signal pad-id="pb3" index="3" function="default" group="PCINT"/>
-                <signal pad-id="pb4" index="4" function="default" group="PCINT"/>
-                <signal pad-id="pb5" index="5" function="default" group="PCINT"/>
-                <signal pad-id="pc0" index="8" function="default" group="PCINT"/>
-                <signal pad-id="pc1" index="9" function="default" group="PCINT"/>
-                <signal pad-id="pc2" index="10" function="default" group="PCINT"/>
-                <signal pad-id="pc3" index="11" function="default" group="PCINT"/>
-                <signal pad-id="pc4" index="12" function="default" group="PCINT"/>
-                <signal pad-id="pc5" index="13" function="default" group="PCINT"/>
-                <signal pad-id="pc6" index="14" function="default" group="PCINT"/>
-                <signal pad-id="pd0" index="16" function="default" group="PCINT"/>
-                <signal pad-id="pd1" index="17" function="default" group="PCINT"/>
-                <signal pad-id="pd2" index="18" function="default" group="PCINT"/>
-                <signal pad-id="pd2" index="0" function="default" group="INT"/>
+                <signal pad-key="pd3" index="1" function="default" group="INT"/>
+                <signal pad-key="pd3" index="19" function="default" group="PCINT"/>
+                <signal pad-key="pd4" index="20" function="default" group="PCINT"/>
+                <signal pad-key="pb6" index="6" function="default" group="PCINT"/>
+                <signal pad-key="pb7" index="7" function="default" group="PCINT"/>
+                <signal pad-key="pd5" index="21" function="default" group="PCINT"/>
+                <signal pad-key="pd6" index="22" function="default" group="PCINT"/>
+                <signal pad-key="pd7" index="23" function="default" group="PCINT"/>
+                <signal pad-key="pb0" index="0" function="default" group="PCINT"/>
+                <signal pad-key="pb1" index="1" function="default" group="PCINT"/>
+                <signal pad-key="pb2" index="2" function="default" group="PCINT"/>
+                <signal pad-key="pb3" index="3" function="default" group="PCINT"/>
+                <signal pad-key="pb4" index="4" function="default" group="PCINT"/>
+                <signal pad-key="pb5" index="5" function="default" group="PCINT"/>
+                <signal pad-key="pc0" index="8" function="default" group="PCINT"/>
+                <signal pad-key="pc1" index="9" function="default" group="PCINT"/>
+                <signal pad-key="pc2" index="10" function="default" group="PCINT"/>
+                <signal pad-key="pc3" index="11" function="default" group="PCINT"/>
+                <signal pad-key="pc4" index="12" function="default" group="PCINT"/>
+                <signal pad-key="pc5" index="13" function="default" group="PCINT"/>
+                <signal pad-key="pc6" index="14" function="default" group="PCINT"/>
+                <signal pad-key="pd0" index="16" function="default" group="PCINT"/>
+                <signal pad-key="pd1" index="17" function="default" group="PCINT"/>
+                <signal pad-key="pd2" index="18" function="default" group="PCINT"/>
+                <signal pad-key="pd2" index="0" function="default" group="INT"/>
             </signals>
         </peripheral>
         <peripheral key="spi" name="SPI" module-key="spi">
             <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"/>
-                <signal pad-id="pb4" function="default" group="MISO"/>
-                <signal pad-id="pb5" function="default" group="SCK"/>
+                <signal pad-key="pb2" function="default" group="SS"/>
+                <signal pad-key="pb3" function="default" group="MOSI"/>
+                <signal pad-key="pb4" function="default" group="MISO"/>
+                <signal pad-key="pb5" function="default" group="SCK"/>
             </signals>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="wdt">
@@ -338,7 +338,7 @@
         <peripheral key="cpu" name="CPU" module-key="cpu">
             <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"/>
+                <signal pad-key="pb0" index="0" function="default" group="CLK"/>
             </signals>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="fuse">
@@ -747,140 +747,171 @@
             </register-group>
         </module>
     </modules>
+    <pads>
+        <pad key="pd3" name="PD3"/>
+        <pad key="pd4" name="PD4"/>
+        <pad key="gnd" name="GND"/>
+        <pad key="vcc" name="VCC"/>
+        <pad key="pb6" name="PB6"/>
+        <pad key="pb7" name="PB7"/>
+        <pad key="pd5" name="PD5"/>
+        <pad key="pd6" name="PD6"/>
+        <pad key="pd7" name="PD7"/>
+        <pad key="pb0" name="PB0"/>
+        <pad key="pb1" name="PB1"/>
+        <pad key="pb2" name="PB2"/>
+        <pad key="pb3" name="PB3"/>
+        <pad key="pb4" name="PB4"/>
+        <pad key="pb5" name="PB5"/>
+        <pad key="avcc" name="AVCC"/>
+        <pad key="adc6" name="ADC6"/>
+        <pad key="aref" name="AREF"/>
+        <pad key="adc7" name="ADC7"/>
+        <pad key="pc0" name="PC0"/>
+        <pad key="pc1" name="PC1"/>
+        <pad key="pc2" name="PC2"/>
+        <pad key="pc3" name="PC3"/>
+        <pad key="pc4" name="PC4"/>
+        <pad key="pc5" name="PC5"/>
+        <pad key="pc6" name="PC6"/>
+        <pad key="pd0" name="PD0"/>
+        <pad key="pd1" name="PD1"/>
+        <pad key="pd2" name="PD2"/>
+    </pads>
     <pinouts>
         <pinout key="tqfp32" name="TQFP32" type="qfp">
-            <pin position="1" pad="PD3"/>
-            <pin position="2" pad="PD4"/>
-            <pin position="3" pad="GND"/>
-            <pin position="4" pad="VCC"/>
-            <pin position="5" pad="GND"/>
-            <pin position="6" pad="VCC"/>
-            <pin position="7" pad="PB6"/>
-            <pin position="8" pad="PB7"/>
-            <pin position="9" pad="PD5"/>
-            <pin position="10" pad="PD6"/>
-            <pin position="11" pad="PD7"/>
-            <pin position="12" pad="PB0"/>
-            <pin position="13" pad="PB1"/>
-            <pin position="14" pad="PB2"/>
-            <pin position="15" pad="PB3"/>
-            <pin position="16" pad="PB4"/>
-            <pin position="17" pad="PB5"/>
-            <pin position="18" pad="AVCC"/>
-            <pin position="19" pad="ADC6"/>
-            <pin position="20" pad="AREF"/>
-            <pin position="21" pad="GND"/>
-            <pin position="22" pad="ADC7"/>
-            <pin position="23" pad="PC0"/>
-            <pin position="24" pad="PC1"/>
-            <pin position="25" pad="PC2"/>
-            <pin position="26" pad="PC3"/>
-            <pin position="27" pad="PC4"/>
-            <pin position="28" pad="PC5"/>
-            <pin position="29" pad="PC6"/>
-            <pin position="30" pad="PD0"/>
-            <pin position="31" pad="PD1"/>
-            <pin position="32" pad="PD2"/>
+            <pin position="1" pad-key="pd3"/>
+            <pin position="2" pad-key="pd4"/>
+            <pin position="3" pad-key="gnd"/>
+            <pin position="4" pad-key="vcc"/>
+            <pin position="5" pad-key="gnd"/>
+            <pin position="6" pad-key="vcc"/>
+            <pin position="7" pad-key="pb6"/>
+            <pin position="8" pad-key="pb7"/>
+            <pin position="9" pad-key="pd5"/>
+            <pin position="10" pad-key="pd6"/>
+            <pin position="11" pad-key="pd7"/>
+            <pin position="12" pad-key="pb0"/>
+            <pin position="13" pad-key="pb1"/>
+            <pin position="14" pad-key="pb2"/>
+            <pin position="15" pad-key="pb3"/>
+            <pin position="16" pad-key="pb4"/>
+            <pin position="17" pad-key="pb5"/>
+            <pin position="18" pad-key="avcc"/>
+            <pin position="19" pad-key="adc6"/>
+            <pin position="20" pad-key="aref"/>
+            <pin position="21" pad-key="gnd"/>
+            <pin position="22" pad-key="adc7"/>
+            <pin position="23" pad-key="pc0"/>
+            <pin position="24" pad-key="pc1"/>
+            <pin position="25" pad-key="pc2"/>
+            <pin position="26" pad-key="pc3"/>
+            <pin position="27" pad-key="pc4"/>
+            <pin position="28" pad-key="pc5"/>
+            <pin position="29" pad-key="pc6"/>
+            <pin position="30" pad-key="pd0"/>
+            <pin position="31" pad-key="pd1"/>
+            <pin position="32" pad-key="pd2"/>
         </pinout>
         <pinout key="qfn32" name="QFN32" type="qfn">
-            <pin position="1" pad="PD3"/>
-            <pin position="2" pad="PD4"/>
-            <pin position="3" pad="GND"/>
-            <pin position="4" pad="VCC"/>
-            <pin position="5" pad="GND"/>
-            <pin position="6" pad="VCC"/>
-            <pin position="7" pad="PB6"/>
-            <pin position="8" pad="PB7"/>
-            <pin position="9" pad="PD5"/>
-            <pin position="10" pad="PD6"/>
-            <pin position="11" pad="PD7"/>
-            <pin position="12" pad="PB0"/>
-            <pin position="13" pad="PB1"/>
-            <pin position="14" pad="PB2"/>
-            <pin position="15" pad="PB3"/>
-            <pin position="16" pad="PB4"/>
-            <pin position="17" pad="PB5"/>
-            <pin position="18" pad="AVCC"/>
-            <pin position="19" pad="ADC6"/>
-            <pin position="20" pad="AREF"/>
-            <pin position="21" pad="GND"/>
-            <pin position="22" pad="ADC7"/>
-            <pin position="23" pad="PC0"/>
-            <pin position="24" pad="PC1"/>
-            <pin position="25" pad="PC2"/>
-            <pin position="26" pad="PC3"/>
-            <pin position="27" pad="PC4"/>
-            <pin position="28" pad="PC5"/>
-            <pin position="29" pad="PC6"/>
-            <pin position="30" pad="PD0"/>
-            <pin position="31" pad="PD1"/>
-            <pin position="32" pad="PD2"/>
+            <pin position="1" pad-key="pd3"/>
+            <pin position="2" pad-key="pd4"/>
+            <pin position="3" pad-key="gnd"/>
+            <pin position="4" pad-key="vcc"/>
+            <pin position="5" pad-key="gnd"/>
+            <pin position="6" pad-key="vcc"/>
+            <pin position="7" pad-key="pb6"/>
+            <pin position="8" pad-key="pb7"/>
+            <pin position="9" pad-key="pd5"/>
+            <pin position="10" pad-key="pd6"/>
+            <pin position="11" pad-key="pd7"/>
+            <pin position="12" pad-key="pb0"/>
+            <pin position="13" pad-key="pb1"/>
+            <pin position="14" pad-key="pb2"/>
+            <pin position="15" pad-key="pb3"/>
+            <pin position="16" pad-key="pb4"/>
+            <pin position="17" pad-key="pb5"/>
+            <pin position="18" pad-key="avcc"/>
+            <pin position="19" pad-key="adc6"/>
+            <pin position="20" pad-key="aref"/>
+            <pin position="21" pad-key="gnd"/>
+            <pin position="22" pad-key="adc7"/>
+            <pin position="23" pad-key="pc0"/>
+            <pin position="24" pad-key="pc1"/>
+            <pin position="25" pad-key="pc2"/>
+            <pin position="26" pad-key="pc3"/>
+            <pin position="27" pad-key="pc4"/>
+            <pin position="28" pad-key="pc5"/>
+            <pin position="29" pad-key="pc6"/>
+            <pin position="30" pad-key="pd0"/>
+            <pin position="31" pad-key="pd1"/>
+            <pin position="32" pad-key="pd2"/>
         </pinout>
         <pinout key="qfn28" name="QFN28" type="qfn">
-            <pin position="1" pad="PD3"/>
-            <pin position="2" pad="PD4"/>
-            <pin position="3" pad="VCC"/>
-            <pin position="4" pad="GND"/>
-            <pin position="5" pad="PB6"/>
-            <pin position="6" pad="PB7"/>
-            <pin position="7" pad="PD5"/>
-            <pin position="8" pad="PD6"/>
-            <pin position="9" pad="PD7"/>
-            <pin position="10" pad="PB0"/>
-            <pin position="11" pad="PB1"/>
-            <pin position="12" pad="PB2"/>
-            <pin position="13" pad="PB3"/>
-            <pin position="14" pad="PB4"/>
-            <pin position="15" pad="PB5"/>
-            <pin position="16" pad="AVCC"/>
-            <pin position="17" pad="AREF"/>
-            <pin position="18" pad="GND"/>
-            <pin position="19" pad="PC0"/>
-            <pin position="20" pad="PC1"/>
-            <pin position="21" pad="PC2"/>
-            <pin position="22" pad="PC3"/>
-            <pin position="23" pad="PC4"/>
-            <pin position="24" pad="PC5"/>
-            <pin position="25" pad="PC6"/>
-            <pin position="26" pad="PD0"/>
-            <pin position="27" pad="PD1"/>
-            <pin position="28" pad="PD2"/>
+            <pin position="1" pad-key="pd3"/>
+            <pin position="2" pad-key="pd4"/>
+            <pin position="3" pad-key="vcc"/>
+            <pin position="4" pad-key="gnd"/>
+            <pin position="5" pad-key="pb6"/>
+            <pin position="6" pad-key="pb7"/>
+            <pin position="7" pad-key="pd5"/>
+            <pin position="8" pad-key="pd6"/>
+            <pin position="9" pad-key="pd7"/>
+            <pin position="10" pad-key="pb0"/>
+            <pin position="11" pad-key="pb1"/>
+            <pin position="12" pad-key="pb2"/>
+            <pin position="13" pad-key="pb3"/>
+            <pin position="14" pad-key="pb4"/>
+            <pin position="15" pad-key="pb5"/>
+            <pin position="16" pad-key="avcc"/>
+            <pin position="17" pad-key="aref"/>
+            <pin position="18" pad-key="gnd"/>
+            <pin position="19" pad-key="pc0"/>
+            <pin position="20" pad-key="pc1"/>
+            <pin position="21" pad-key="pc2"/>
+            <pin position="22" pad-key="pc3"/>
+            <pin position="23" pad-key="pc4"/>
+            <pin position="24" pad-key="pc5"/>
+            <pin position="25" pad-key="pc6"/>
+            <pin position="26" pad-key="pd0"/>
+            <pin position="27" pad-key="pd1"/>
+            <pin position="28" pad-key="pd2"/>
         </pinout>
         <pinout key="pdip28" name="PDIP28" type="dip">
-            <pin position="1" pad="PC6"/>
-            <pin position="2" pad="PD0"/>
-            <pin position="3" pad="PD1"/>
-            <pin position="4" pad="PD2"/>
-            <pin position="5" pad="PD3"/>
-            <pin position="6" pad="PD4"/>
-            <pin position="7" pad="VCC"/>
-            <pin position="8" pad="GND"/>
-            <pin position="9" pad="PB6"/>
-            <pin position="10" pad="PB7"/>
-            <pin position="11" pad="PD5"/>
-            <pin position="12" pad="PD6"/>
-            <pin position="13" pad="PD7"/>
-            <pin position="14" pad="PB0"/>
-            <pin position="15" pad="PB1"/>
-            <pin position="16" pad="PB2"/>
-            <pin position="17" pad="PB3"/>
-            <pin position="18" pad="PB4"/>
-            <pin position="19" pad="PB5"/>
-            <pin position="20" pad="AVCC"/>
-            <pin position="21" pad="AREF"/>
-            <pin position="22" pad="GND"/>
-            <pin position="23" pad="PC0"/>
-            <pin position="24" pad="PC1"/>
-            <pin position="25" pad="PC2"/>
-            <pin position="26" pad="PC3"/>
-            <pin position="27" pad="PC4"/>
-            <pin position="28" pad="PC5"/>
+            <pin position="1" pad-key="pc6"/>
+            <pin position="2" pad-key="pd0"/>
+            <pin position="3" pad-key="pd1"/>
+            <pin position="4" pad-key="pd2"/>
+            <pin position="5" pad-key="pd3"/>
+            <pin position="6" pad-key="pd4"/>
+            <pin position="7" pad-key="vcc"/>
+            <pin position="8" pad-key="gnd"/>
+            <pin position="9" pad-key="pb6"/>
+            <pin position="10" pad-key="pb7"/>
+            <pin position="11" pad-key="pd5"/>
+            <pin position="12" pad-key="pd6"/>
+            <pin position="13" pad-key="pd7"/>
+            <pin position="14" pad-key="pb0"/>
+            <pin position="15" pad-key="pb1"/>
+            <pin position="16" pad-key="pb2"/>
+            <pin position="17" pad-key="pb3"/>
+            <pin position="18" pad-key="pb4"/>
+            <pin position="19" pad-key="pb5"/>
+            <pin position="20" pad-key="avcc"/>
+            <pin position="21" pad-key="aref"/>
+            <pin position="22" pad-key="gnd"/>
+            <pin position="23" pad-key="pc0"/>
+            <pin position="24" pad-key="pc1"/>
+            <pin position="25" pad-key="pc2"/>
+            <pin position="26" pad-key="pc3"/>
+            <pin position="27" pad-key="pc4"/>
+            <pin position="28" pad-key="pc5"/>
         </pinout>
     </pinouts>
     <variants>
-        <variant name="ATmega48A-AU" pinout-key="tqfp32" package="TQFP32"/>
-        <variant name="ATmega48A-MMH" pinout-key="qfn28" package="QFN28"/>
-        <variant name="ATmega48A-MU" pinout-key="qfn32" package="QFN32"/>
-        <variant name="ATmega48A-PU" pinout-key="pdip28" package="PDIP28"/>
+        <variant key="atmega48a_au" name="ATmega48A-AU" pinout-key="tqfp32"/>
+        <variant key="atmega48a_mmh" name="ATmega48A-MMH" pinout-key="qfn28"/>
+        <variant key="atmega48a_mu" name="ATmega48A-MU" pinout-key="qfn32"/>
+        <variant key="atmega48a_pu" name="ATmega48A-PU" pinout-key="pdip28"/>
     </variants>
 </device>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA48P.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA48P.xml
index bfea8c31..a5211a84 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA48P.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA48P.xml
@@ -198,135 +198,135 @@
         <peripheral key="usart0" name="USART0" module-key="usart">
             <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"/>
-                <signal pad-id="pd4" function="default" group="XCK"/>
+                <signal pad-key="pd1" function="default" group="TXD"/>
+                <signal pad-key="pd0" function="default" group="RXD"/>
+                <signal pad-key="pd4" function="default" group="XCK"/>
             </signals>
         </peripheral>
         <peripheral key="twi" name="TWI" module-key="twi">
             <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"/>
+                <signal pad-key="pc4" function="default" group="SDA"/>
+                <signal pad-key="pc5" function="default" group="SCL"/>
             </signals>
         </peripheral>
         <peripheral key="tc1" name="TC1" module-key="tc16">
             <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"/>
-                <signal pad-id="pb1" function="default" group="OCA"/>
-                <signal pad-id="pb2" function="default" group="OCB"/>
+                <signal pad-key="pd5" function="default" group="T"/>
+                <signal pad-key="pb0" function="default" group="ICP"/>
+                <signal pad-key="pb1" function="default" group="OCA"/>
+                <signal pad-key="pb2" function="default" group="OCB"/>
             </signals>
         </peripheral>
         <peripheral key="tc2" name="TC2" module-key="tc8_async">
             <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"/>
+                <signal pad-key="pb3" function="default" group="OCA"/>
+                <signal pad-key="pd3" function="default" group="OCB"/>
             </signals>
         </peripheral>
         <peripheral key="adc" name="ADC" module-key="adc">
             <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"/>
-                <signal pad-id="pc2" index="2" function="default" group="ADC"/>
-                <signal pad-id="pc3" index="3" function="default" group="ADC"/>
-                <signal pad-id="pc4" index="4" function="default" group="ADC"/>
-                <signal pad-id="pc5" index="5" function="default" group="ADC"/>
+                <signal pad-key="pc0" index="0" function="default" group="ADC"/>
+                <signal pad-key="pc1" index="1" function="default" group="ADC"/>
+                <signal pad-key="pc2" index="2" function="default" group="ADC"/>
+                <signal pad-key="pc3" index="3" function="default" group="ADC"/>
+                <signal pad-key="pc4" index="4" function="default" group="ADC"/>
+                <signal pad-key="pc5" index="5" function="default" group="ADC"/>
             </signals>
         </peripheral>
         <peripheral key="ac" name="AC" module-key="ac">
             <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"/>
+                <signal pad-key="pd6" index="0" function="default" group="AIN"/>
+                <signal pad-key="pd7" index="1" function="default" group="AIN"/>
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pb2" index="2" function="default" group="P"/>
-                <signal pad-id="pb3" index="3" function="default" group="P"/>
-                <signal pad-id="pb4" index="4" function="default" group="P"/>
-                <signal pad-id="pb5" index="5" function="default" group="P"/>
-                <signal pad-id="pb6" index="6" function="default" group="P"/>
-                <signal pad-id="pb7" index="7" function="default" group="P"/>
+                <signal pad-key="pb0" index="0" function="default" group="P"/>
+                <signal pad-key="pb1" index="1" function="default" group="P"/>
+                <signal pad-key="pb2" index="2" function="default" group="P"/>
+                <signal pad-key="pb3" index="3" function="default" group="P"/>
+                <signal pad-key="pb4" index="4" function="default" group="P"/>
+                <signal pad-key="pb5" index="5" function="default" group="P"/>
+                <signal pad-key="pb6" index="6" function="default" group="P"/>
+                <signal pad-key="pb7" index="7" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pc2" index="2" function="default" group="P"/>
-                <signal pad-id="pc3" index="3" function="default" group="P"/>
-                <signal pad-id="pc4" index="4" function="default" group="P"/>
-                <signal pad-id="pc5" index="5" function="default" group="P"/>
-                <signal pad-id="pc6" index="6" function="default" group="P"/>
+                <signal pad-key="pc0" index="0" function="default" group="P"/>
+                <signal pad-key="pc1" index="1" function="default" group="P"/>
+                <signal pad-key="pc2" index="2" function="default" group="P"/>
+                <signal pad-key="pc3" index="3" function="default" group="P"/>
+                <signal pad-key="pc4" index="4" function="default" group="P"/>
+                <signal pad-key="pc5" index="5" function="default" group="P"/>
+                <signal pad-key="pc6" index="6" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pd2" index="2" function="default" group="P"/>
-                <signal pad-id="pd3" index="3" function="default" group="P"/>
-                <signal pad-id="pd4" index="4" function="default" group="P"/>
-                <signal pad-id="pd5" index="5" function="default" group="P"/>
-                <signal pad-id="pd6" index="6" function="default" group="P"/>
-                <signal pad-id="pd7" index="7" function="default" group="P"/>
+                <signal pad-key="pd0" index="0" function="default" group="P"/>
+                <signal pad-key="pd1" index="1" function="default" group="P"/>
+                <signal pad-key="pd2" index="2" function="default" group="P"/>
+                <signal pad-key="pd3" index="3" function="default" group="P"/>
+                <signal pad-key="pd4" index="4" function="default" group="P"/>
+                <signal pad-key="pd5" index="5" function="default" group="P"/>
+                <signal pad-key="pd6" index="6" function="default" group="P"/>
+                <signal pad-key="pd7" index="7" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="tc0" name="TC0" module-key="tc8">
             <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"/>
-                <signal pad-id="pd6" function="default" group="OCA"/>
+                <signal pad-key="pd4" function="default" group="T"/>
+                <signal pad-key="pd5" function="default" group="OCB"/>
+                <signal pad-key="pd6" function="default" group="OCA"/>
             </signals>
         </peripheral>
         <peripheral key="exint" name="EXINT" module-key="exint">
             <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"/>
-                <signal pad-id="pd4" index="20" function="default" group="PCINT"/>
-                <signal pad-id="pb6" index="6" function="default" group="PCINT"/>
-                <signal pad-id="pb7" index="7" function="default" group="PCINT"/>
-                <signal pad-id="pd5" index="21" function="default" group="PCINT"/>
-                <signal pad-id="pd6" index="22" function="default" group="PCINT"/>
-                <signal pad-id="pd7" index="23" function="default" group="PCINT"/>
-                <signal pad-id="pb0" index="0" function="default" group="PCINT"/>
-                <signal pad-id="pb1" index="1" function="default" group="PCINT"/>
-                <signal pad-id="pb2" index="2" function="default" group="PCINT"/>
-                <signal pad-id="pb3" index="3" function="default" group="PCINT"/>
-                <signal pad-id="pb4" index="4" function="default" group="PCINT"/>
-                <signal pad-id="pb5" index="5" function="default" group="PCINT"/>
-                <signal pad-id="pc0" index="8" function="default" group="PCINT"/>
-                <signal pad-id="pc1" index="9" function="default" group="PCINT"/>
-                <signal pad-id="pc2" index="10" function="default" group="PCINT"/>
-                <signal pad-id="pc3" index="11" function="default" group="PCINT"/>
-                <signal pad-id="pc4" index="12" function="default" group="PCINT"/>
-                <signal pad-id="pc5" index="13" function="default" group="PCINT"/>
-                <signal pad-id="pc6" index="14" function="default" group="PCINT"/>
-                <signal pad-id="pd0" index="16" function="default" group="PCINT"/>
-                <signal pad-id="pd1" index="17" function="default" group="PCINT"/>
-                <signal pad-id="pd2" index="18" function="default" group="PCINT"/>
-                <signal pad-id="pd2" index="0" function="default" group="INT"/>
+                <signal pad-key="pd3" index="1" function="default" group="INT"/>
+                <signal pad-key="pd3" index="19" function="default" group="PCINT"/>
+                <signal pad-key="pd4" index="20" function="default" group="PCINT"/>
+                <signal pad-key="pb6" index="6" function="default" group="PCINT"/>
+                <signal pad-key="pb7" index="7" function="default" group="PCINT"/>
+                <signal pad-key="pd5" index="21" function="default" group="PCINT"/>
+                <signal pad-key="pd6" index="22" function="default" group="PCINT"/>
+                <signal pad-key="pd7" index="23" function="default" group="PCINT"/>
+                <signal pad-key="pb0" index="0" function="default" group="PCINT"/>
+                <signal pad-key="pb1" index="1" function="default" group="PCINT"/>
+                <signal pad-key="pb2" index="2" function="default" group="PCINT"/>
+                <signal pad-key="pb3" index="3" function="default" group="PCINT"/>
+                <signal pad-key="pb4" index="4" function="default" group="PCINT"/>
+                <signal pad-key="pb5" index="5" function="default" group="PCINT"/>
+                <signal pad-key="pc0" index="8" function="default" group="PCINT"/>
+                <signal pad-key="pc1" index="9" function="default" group="PCINT"/>
+                <signal pad-key="pc2" index="10" function="default" group="PCINT"/>
+                <signal pad-key="pc3" index="11" function="default" group="PCINT"/>
+                <signal pad-key="pc4" index="12" function="default" group="PCINT"/>
+                <signal pad-key="pc5" index="13" function="default" group="PCINT"/>
+                <signal pad-key="pc6" index="14" function="default" group="PCINT"/>
+                <signal pad-key="pd0" index="16" function="default" group="PCINT"/>
+                <signal pad-key="pd1" index="17" function="default" group="PCINT"/>
+                <signal pad-key="pd2" index="18" function="default" group="PCINT"/>
+                <signal pad-key="pd2" index="0" function="default" group="INT"/>
             </signals>
         </peripheral>
         <peripheral key="spi" name="SPI" module-key="spi">
             <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"/>
-                <signal pad-id="pb4" function="default" group="MISO"/>
-                <signal pad-id="pb5" function="default" group="SCK"/>
+                <signal pad-key="pb2" function="default" group="SS"/>
+                <signal pad-key="pb3" function="default" group="MOSI"/>
+                <signal pad-key="pb4" function="default" group="MISO"/>
+                <signal pad-key="pb5" function="default" group="SCK"/>
             </signals>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="wdt">
@@ -338,7 +338,7 @@
         <peripheral key="cpu" name="CPU" module-key="cpu">
             <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"/>
+                <signal pad-key="pb0" index="0" function="default" group="CLK"/>
             </signals>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="fuse">
@@ -742,144 +742,175 @@
             </register-group>
         </module>
     </modules>
+    <pads>
+        <pad key="pd3" name="PD3"/>
+        <pad key="pd4" name="PD4"/>
+        <pad key="gnd" name="GND"/>
+        <pad key="vcc" name="VCC"/>
+        <pad key="pb6" name="PB6"/>
+        <pad key="pb7" name="PB7"/>
+        <pad key="pd5" name="PD5"/>
+        <pad key="pd6" name="PD6"/>
+        <pad key="pd7" name="PD7"/>
+        <pad key="pb0" name="PB0"/>
+        <pad key="pb1" name="PB1"/>
+        <pad key="pb2" name="PB2"/>
+        <pad key="pb3" name="PB3"/>
+        <pad key="pb4" name="PB4"/>
+        <pad key="pb5" name="PB5"/>
+        <pad key="avcc" name="AVCC"/>
+        <pad key="adc6" name="ADC6"/>
+        <pad key="aref" name="AREF"/>
+        <pad key="adc7" name="ADC7"/>
+        <pad key="pc0" name="PC0"/>
+        <pad key="pc1" name="PC1"/>
+        <pad key="pc2" name="PC2"/>
+        <pad key="pc3" name="PC3"/>
+        <pad key="pc4" name="PC4"/>
+        <pad key="pc5" name="PC5"/>
+        <pad key="pc6" name="PC6"/>
+        <pad key="pd0" name="PD0"/>
+        <pad key="pd1" name="PD1"/>
+        <pad key="pd2" name="PD2"/>
+    </pads>
     <pinouts>
         <pinout key="tqfp32" name="TQFP32" type="qfp">
-            <pin position="1" pad="PD3"/>
-            <pin position="2" pad="PD4"/>
-            <pin position="3" pad="GND"/>
-            <pin position="4" pad="VCC"/>
-            <pin position="5" pad="GND"/>
-            <pin position="6" pad="VCC"/>
-            <pin position="7" pad="PB6"/>
-            <pin position="8" pad="PB7"/>
-            <pin position="9" pad="PD5"/>
-            <pin position="10" pad="PD6"/>
-            <pin position="11" pad="PD7"/>
-            <pin position="12" pad="PB0"/>
-            <pin position="13" pad="PB1"/>
-            <pin position="14" pad="PB2"/>
-            <pin position="15" pad="PB3"/>
-            <pin position="16" pad="PB4"/>
-            <pin position="17" pad="PB5"/>
-            <pin position="18" pad="AVCC"/>
-            <pin position="19" pad="ADC6"/>
-            <pin position="20" pad="AREF"/>
-            <pin position="21" pad="GND"/>
-            <pin position="22" pad="ADC7"/>
-            <pin position="23" pad="PC0"/>
-            <pin position="24" pad="PC1"/>
-            <pin position="25" pad="PC2"/>
-            <pin position="26" pad="PC3"/>
-            <pin position="27" pad="PC4"/>
-            <pin position="28" pad="PC5"/>
-            <pin position="29" pad="PC6"/>
-            <pin position="30" pad="PD0"/>
-            <pin position="31" pad="PD1"/>
-            <pin position="32" pad="PD2"/>
+            <pin position="1" pad-key="pd3"/>
+            <pin position="2" pad-key="pd4"/>
+            <pin position="3" pad-key="gnd"/>
+            <pin position="4" pad-key="vcc"/>
+            <pin position="5" pad-key="gnd"/>
+            <pin position="6" pad-key="vcc"/>
+            <pin position="7" pad-key="pb6"/>
+            <pin position="8" pad-key="pb7"/>
+            <pin position="9" pad-key="pd5"/>
+            <pin position="10" pad-key="pd6"/>
+            <pin position="11" pad-key="pd7"/>
+            <pin position="12" pad-key="pb0"/>
+            <pin position="13" pad-key="pb1"/>
+            <pin position="14" pad-key="pb2"/>
+            <pin position="15" pad-key="pb3"/>
+            <pin position="16" pad-key="pb4"/>
+            <pin position="17" pad-key="pb5"/>
+            <pin position="18" pad-key="avcc"/>
+            <pin position="19" pad-key="adc6"/>
+            <pin position="20" pad-key="aref"/>
+            <pin position="21" pad-key="gnd"/>
+            <pin position="22" pad-key="adc7"/>
+            <pin position="23" pad-key="pc0"/>
+            <pin position="24" pad-key="pc1"/>
+            <pin position="25" pad-key="pc2"/>
+            <pin position="26" pad-key="pc3"/>
+            <pin position="27" pad-key="pc4"/>
+            <pin position="28" pad-key="pc5"/>
+            <pin position="29" pad-key="pc6"/>
+            <pin position="30" pad-key="pd0"/>
+            <pin position="31" pad-key="pd1"/>
+            <pin position="32" pad-key="pd2"/>
         </pinout>
         <pinout key="qfn32" name="QFN32" type="qfn">
-            <pin position="1" pad="PD3"/>
-            <pin position="2" pad="PD4"/>
-            <pin position="3" pad="GND"/>
-            <pin position="4" pad="VCC"/>
-            <pin position="5" pad="GND"/>
-            <pin position="6" pad="VCC"/>
-            <pin position="7" pad="PB6"/>
-            <pin position="8" pad="PB7"/>
-            <pin position="9" pad="PD5"/>
-            <pin position="10" pad="PD6"/>
-            <pin position="11" pad="PD7"/>
-            <pin position="12" pad="PB0"/>
-            <pin position="13" pad="PB1"/>
-            <pin position="14" pad="PB2"/>
-            <pin position="15" pad="PB3"/>
-            <pin position="16" pad="PB4"/>
-            <pin position="17" pad="PB5"/>
-            <pin position="18" pad="AVCC"/>
-            <pin position="19" pad="ADC6"/>
-            <pin position="20" pad="AREF"/>
-            <pin position="21" pad="GND"/>
-            <pin position="22" pad="ADC7"/>
-            <pin position="23" pad="PC0"/>
-            <pin position="24" pad="PC1"/>
-            <pin position="25" pad="PC2"/>
-            <pin position="26" pad="PC3"/>
-            <pin position="27" pad="PC4"/>
-            <pin position="28" pad="PC5"/>
-            <pin position="29" pad="PC6"/>
-            <pin position="30" pad="PD0"/>
-            <pin position="31" pad="PD1"/>
-            <pin position="32" pad="PD2"/>
+            <pin position="1" pad-key="pd3"/>
+            <pin position="2" pad-key="pd4"/>
+            <pin position="3" pad-key="gnd"/>
+            <pin position="4" pad-key="vcc"/>
+            <pin position="5" pad-key="gnd"/>
+            <pin position="6" pad-key="vcc"/>
+            <pin position="7" pad-key="pb6"/>
+            <pin position="8" pad-key="pb7"/>
+            <pin position="9" pad-key="pd5"/>
+            <pin position="10" pad-key="pd6"/>
+            <pin position="11" pad-key="pd7"/>
+            <pin position="12" pad-key="pb0"/>
+            <pin position="13" pad-key="pb1"/>
+            <pin position="14" pad-key="pb2"/>
+            <pin position="15" pad-key="pb3"/>
+            <pin position="16" pad-key="pb4"/>
+            <pin position="17" pad-key="pb5"/>
+            <pin position="18" pad-key="avcc"/>
+            <pin position="19" pad-key="adc6"/>
+            <pin position="20" pad-key="aref"/>
+            <pin position="21" pad-key="gnd"/>
+            <pin position="22" pad-key="adc7"/>
+            <pin position="23" pad-key="pc0"/>
+            <pin position="24" pad-key="pc1"/>
+            <pin position="25" pad-key="pc2"/>
+            <pin position="26" pad-key="pc3"/>
+            <pin position="27" pad-key="pc4"/>
+            <pin position="28" pad-key="pc5"/>
+            <pin position="29" pad-key="pc6"/>
+            <pin position="30" pad-key="pd0"/>
+            <pin position="31" pad-key="pd1"/>
+            <pin position="32" pad-key="pd2"/>
         </pinout>
         <pinout key="qfn28" name="QFN28" type="qfn">
-            <pin position="1" pad="PD3"/>
-            <pin position="2" pad="PD4"/>
-            <pin position="3" pad="VCC"/>
-            <pin position="4" pad="GND"/>
-            <pin position="5" pad="PB6"/>
-            <pin position="6" pad="PB7"/>
-            <pin position="7" pad="PD5"/>
-            <pin position="8" pad="PD6"/>
-            <pin position="9" pad="PD7"/>
-            <pin position="10" pad="PB0"/>
-            <pin position="11" pad="PB1"/>
-            <pin position="12" pad="PB2"/>
-            <pin position="13" pad="PB3"/>
-            <pin position="14" pad="PB4"/>
-            <pin position="15" pad="PB5"/>
-            <pin position="16" pad="AVCC"/>
-            <pin position="17" pad="AREF"/>
-            <pin position="18" pad="GND"/>
-            <pin position="19" pad="PC0"/>
-            <pin position="20" pad="PC1"/>
-            <pin position="21" pad="PC2"/>
-            <pin position="22" pad="PC3"/>
-            <pin position="23" pad="PC4"/>
-            <pin position="24" pad="PC5"/>
-            <pin position="25" pad="PC6"/>
-            <pin position="26" pad="PD0"/>
-            <pin position="27" pad="PD1"/>
-            <pin position="28" pad="PD2"/>
+            <pin position="1" pad-key="pd3"/>
+            <pin position="2" pad-key="pd4"/>
+            <pin position="3" pad-key="vcc"/>
+            <pin position="4" pad-key="gnd"/>
+            <pin position="5" pad-key="pb6"/>
+            <pin position="6" pad-key="pb7"/>
+            <pin position="7" pad-key="pd5"/>
+            <pin position="8" pad-key="pd6"/>
+            <pin position="9" pad-key="pd7"/>
+            <pin position="10" pad-key="pb0"/>
+            <pin position="11" pad-key="pb1"/>
+            <pin position="12" pad-key="pb2"/>
+            <pin position="13" pad-key="pb3"/>
+            <pin position="14" pad-key="pb4"/>
+            <pin position="15" pad-key="pb5"/>
+            <pin position="16" pad-key="avcc"/>
+            <pin position="17" pad-key="aref"/>
+            <pin position="18" pad-key="gnd"/>
+            <pin position="19" pad-key="pc0"/>
+            <pin position="20" pad-key="pc1"/>
+            <pin position="21" pad-key="pc2"/>
+            <pin position="22" pad-key="pc3"/>
+            <pin position="23" pad-key="pc4"/>
+            <pin position="24" pad-key="pc5"/>
+            <pin position="25" pad-key="pc6"/>
+            <pin position="26" pad-key="pd0"/>
+            <pin position="27" pad-key="pd1"/>
+            <pin position="28" pad-key="pd2"/>
         </pinout>
         <pinout key="pdip28" name="PDIP28" type="dip">
-            <pin position="1" pad="PC6"/>
-            <pin position="2" pad="PD0"/>
-            <pin position="3" pad="PD1"/>
-            <pin position="4" pad="PD2"/>
-            <pin position="5" pad="PD3"/>
-            <pin position="6" pad="PD4"/>
-            <pin position="7" pad="VCC"/>
-            <pin position="8" pad="GND"/>
-            <pin position="9" pad="PB6"/>
-            <pin position="10" pad="PB7"/>
-            <pin position="11" pad="PD5"/>
-            <pin position="12" pad="PD6"/>
-            <pin position="13" pad="PD7"/>
-            <pin position="14" pad="PB0"/>
-            <pin position="15" pad="PB1"/>
-            <pin position="16" pad="PB2"/>
-            <pin position="17" pad="PB3"/>
-            <pin position="18" pad="PB4"/>
-            <pin position="19" pad="PB5"/>
-            <pin position="20" pad="AVCC"/>
-            <pin position="21" pad="AREF"/>
-            <pin position="22" pad="GND"/>
-            <pin position="23" pad="PC0"/>
-            <pin position="24" pad="PC1"/>
-            <pin position="25" pad="PC2"/>
-            <pin position="26" pad="PC3"/>
-            <pin position="27" pad="PC4"/>
-            <pin position="28" pad="PC5"/>
+            <pin position="1" pad-key="pc6"/>
+            <pin position="2" pad-key="pd0"/>
+            <pin position="3" pad-key="pd1"/>
+            <pin position="4" pad-key="pd2"/>
+            <pin position="5" pad-key="pd3"/>
+            <pin position="6" pad-key="pd4"/>
+            <pin position="7" pad-key="vcc"/>
+            <pin position="8" pad-key="gnd"/>
+            <pin position="9" pad-key="pb6"/>
+            <pin position="10" pad-key="pb7"/>
+            <pin position="11" pad-key="pd5"/>
+            <pin position="12" pad-key="pd6"/>
+            <pin position="13" pad-key="pd7"/>
+            <pin position="14" pad-key="pb0"/>
+            <pin position="15" pad-key="pb1"/>
+            <pin position="16" pad-key="pb2"/>
+            <pin position="17" pad-key="pb3"/>
+            <pin position="18" pad-key="pb4"/>
+            <pin position="19" pad-key="pb5"/>
+            <pin position="20" pad-key="avcc"/>
+            <pin position="21" pad-key="aref"/>
+            <pin position="22" pad-key="gnd"/>
+            <pin position="23" pad-key="pc0"/>
+            <pin position="24" pad-key="pc1"/>
+            <pin position="25" pad-key="pc2"/>
+            <pin position="26" pad-key="pc3"/>
+            <pin position="27" pad-key="pc4"/>
+            <pin position="28" pad-key="pc5"/>
         </pinout>
     </pinouts>
     <variants>
-        <variant name="ATmega48PV-10AU" pinout-key="tqfp32" package="TQFP32"/>
-        <variant name="ATmega48PV-10MMU" pinout-key="qfn28" package="QFN28"/>
-        <variant name="ATmega48PV-10MU" pinout-key="qfn32" package="QFN32"/>
-        <variant name="ATmega48PV-10PU" pinout-key="pdip28" package="PDIP28"/>
-        <variant name="ATmega48P-20AU" pinout-key="tqfp32" package="TQFP32"/>
-        <variant name="ATmega48P-20MMU" pinout-key="qfn28" package="QFN28"/>
-        <variant name="ATmega48P-20MU" pinout-key="qfn32" package="QFN32"/>
-        <variant name="ATmega48P-20PU" pinout-key="pdip28" package="PDIP28"/>
+        <variant key="atmega48pv_10au" name="ATmega48PV-10AU" pinout-key="tqfp32"/>
+        <variant key="atmega48pv_10mmu" name="ATmega48PV-10MMU" pinout-key="qfn28"/>
+        <variant key="atmega48pv_10mu" name="ATmega48PV-10MU" pinout-key="qfn32"/>
+        <variant key="atmega48pv_10pu" name="ATmega48PV-10PU" pinout-key="pdip28"/>
+        <variant key="atmega48p_20au" name="ATmega48P-20AU" pinout-key="tqfp32"/>
+        <variant key="atmega48p_20mmu" name="ATmega48P-20MMU" pinout-key="qfn28"/>
+        <variant key="atmega48p_20mu" name="ATmega48P-20MU" pinout-key="qfn32"/>
+        <variant key="atmega48p_20pu" name="ATmega48P-20PU" pinout-key="pdip28"/>
     </variants>
 </device>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA48PA.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA48PA.xml
index 6db0e9cf..53df6a40 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA48PA.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA48PA.xml
@@ -198,135 +198,135 @@
         <peripheral key="usart0" name="USART0" module-key="usart">
             <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"/>
-                <signal pad-id="pd4" function="default" group="XCK"/>
+                <signal pad-key="pd1" function="default" group="TXD"/>
+                <signal pad-key="pd0" function="default" group="RXD"/>
+                <signal pad-key="pd4" function="default" group="XCK"/>
             </signals>
         </peripheral>
         <peripheral key="twi" name="TWI" module-key="twi">
             <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"/>
+                <signal pad-key="pc4" function="default" group="SDA"/>
+                <signal pad-key="pc5" function="default" group="SCL"/>
             </signals>
         </peripheral>
         <peripheral key="tc1" name="TC1" module-key="tc16">
             <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"/>
-                <signal pad-id="pb1" function="default" group="OCA"/>
-                <signal pad-id="pb2" function="default" group="OCB"/>
+                <signal pad-key="pd5" function="default" group="T"/>
+                <signal pad-key="pb0" function="default" group="ICP"/>
+                <signal pad-key="pb1" function="default" group="OCA"/>
+                <signal pad-key="pb2" function="default" group="OCB"/>
             </signals>
         </peripheral>
         <peripheral key="tc2" name="TC2" module-key="tc8_async">
             <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"/>
+                <signal pad-key="pb3" function="default" group="OCA"/>
+                <signal pad-key="pd3" function="default" group="OCB"/>
             </signals>
         </peripheral>
         <peripheral key="adc" name="ADC" module-key="adc">
             <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"/>
-                <signal pad-id="pc2" index="2" function="default" group="ADC"/>
-                <signal pad-id="pc3" index="3" function="default" group="ADC"/>
-                <signal pad-id="pc4" index="4" function="default" group="ADC"/>
-                <signal pad-id="pc5" index="5" function="default" group="ADC"/>
+                <signal pad-key="pc0" index="0" function="default" group="ADC"/>
+                <signal pad-key="pc1" index="1" function="default" group="ADC"/>
+                <signal pad-key="pc2" index="2" function="default" group="ADC"/>
+                <signal pad-key="pc3" index="3" function="default" group="ADC"/>
+                <signal pad-key="pc4" index="4" function="default" group="ADC"/>
+                <signal pad-key="pc5" index="5" function="default" group="ADC"/>
             </signals>
         </peripheral>
         <peripheral key="ac" name="AC" module-key="ac">
             <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"/>
+                <signal pad-key="pd6" index="0" function="default" group="AIN"/>
+                <signal pad-key="pd7" index="1" function="default" group="AIN"/>
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pb2" index="2" function="default" group="P"/>
-                <signal pad-id="pb3" index="3" function="default" group="P"/>
-                <signal pad-id="pb4" index="4" function="default" group="P"/>
-                <signal pad-id="pb5" index="5" function="default" group="P"/>
-                <signal pad-id="pb6" index="6" function="default" group="P"/>
-                <signal pad-id="pb7" index="7" function="default" group="P"/>
+                <signal pad-key="pb0" index="0" function="default" group="P"/>
+                <signal pad-key="pb1" index="1" function="default" group="P"/>
+                <signal pad-key="pb2" index="2" function="default" group="P"/>
+                <signal pad-key="pb3" index="3" function="default" group="P"/>
+                <signal pad-key="pb4" index="4" function="default" group="P"/>
+                <signal pad-key="pb5" index="5" function="default" group="P"/>
+                <signal pad-key="pb6" index="6" function="default" group="P"/>
+                <signal pad-key="pb7" index="7" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pc2" index="2" function="default" group="P"/>
-                <signal pad-id="pc3" index="3" function="default" group="P"/>
-                <signal pad-id="pc4" index="4" function="default" group="P"/>
-                <signal pad-id="pc5" index="5" function="default" group="P"/>
-                <signal pad-id="pc6" index="6" function="default" group="P"/>
+                <signal pad-key="pc0" index="0" function="default" group="P"/>
+                <signal pad-key="pc1" index="1" function="default" group="P"/>
+                <signal pad-key="pc2" index="2" function="default" group="P"/>
+                <signal pad-key="pc3" index="3" function="default" group="P"/>
+                <signal pad-key="pc4" index="4" function="default" group="P"/>
+                <signal pad-key="pc5" index="5" function="default" group="P"/>
+                <signal pad-key="pc6" index="6" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pd2" index="2" function="default" group="P"/>
-                <signal pad-id="pd3" index="3" function="default" group="P"/>
-                <signal pad-id="pd4" index="4" function="default" group="P"/>
-                <signal pad-id="pd5" index="5" function="default" group="P"/>
-                <signal pad-id="pd6" index="6" function="default" group="P"/>
-                <signal pad-id="pd7" index="7" function="default" group="P"/>
+                <signal pad-key="pd0" index="0" function="default" group="P"/>
+                <signal pad-key="pd1" index="1" function="default" group="P"/>
+                <signal pad-key="pd2" index="2" function="default" group="P"/>
+                <signal pad-key="pd3" index="3" function="default" group="P"/>
+                <signal pad-key="pd4" index="4" function="default" group="P"/>
+                <signal pad-key="pd5" index="5" function="default" group="P"/>
+                <signal pad-key="pd6" index="6" function="default" group="P"/>
+                <signal pad-key="pd7" index="7" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="tc0" name="TC0" module-key="tc8">
             <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"/>
-                <signal pad-id="pd6" function="default" group="OCA"/>
+                <signal pad-key="pd4" function="default" group="T"/>
+                <signal pad-key="pd5" function="default" group="OCB"/>
+                <signal pad-key="pd6" function="default" group="OCA"/>
             </signals>
         </peripheral>
         <peripheral key="exint" name="EXINT" module-key="exint">
             <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"/>
-                <signal pad-id="pd4" index="20" function="default" group="PCINT"/>
-                <signal pad-id="pb6" index="6" function="default" group="PCINT"/>
-                <signal pad-id="pb7" index="7" function="default" group="PCINT"/>
-                <signal pad-id="pd5" index="21" function="default" group="PCINT"/>
-                <signal pad-id="pd6" index="22" function="default" group="PCINT"/>
-                <signal pad-id="pd7" index="23" function="default" group="PCINT"/>
-                <signal pad-id="pb0" index="0" function="default" group="PCINT"/>
-                <signal pad-id="pb1" index="1" function="default" group="PCINT"/>
-                <signal pad-id="pb2" index="2" function="default" group="PCINT"/>
-                <signal pad-id="pb3" index="3" function="default" group="PCINT"/>
-                <signal pad-id="pb4" index="4" function="default" group="PCINT"/>
-                <signal pad-id="pb5" index="5" function="default" group="PCINT"/>
-                <signal pad-id="pc0" index="8" function="default" group="PCINT"/>
-                <signal pad-id="pc1" index="9" function="default" group="PCINT"/>
-                <signal pad-id="pc2" index="10" function="default" group="PCINT"/>
-                <signal pad-id="pc3" index="11" function="default" group="PCINT"/>
-                <signal pad-id="pc4" index="12" function="default" group="PCINT"/>
-                <signal pad-id="pc5" index="13" function="default" group="PCINT"/>
-                <signal pad-id="pc6" index="14" function="default" group="PCINT"/>
-                <signal pad-id="pd0" index="16" function="default" group="PCINT"/>
-                <signal pad-id="pd1" index="17" function="default" group="PCINT"/>
-                <signal pad-id="pd2" index="18" function="default" group="PCINT"/>
-                <signal pad-id="pd2" index="0" function="default" group="INT"/>
+                <signal pad-key="pd3" index="1" function="default" group="INT"/>
+                <signal pad-key="pd3" index="19" function="default" group="PCINT"/>
+                <signal pad-key="pd4" index="20" function="default" group="PCINT"/>
+                <signal pad-key="pb6" index="6" function="default" group="PCINT"/>
+                <signal pad-key="pb7" index="7" function="default" group="PCINT"/>
+                <signal pad-key="pd5" index="21" function="default" group="PCINT"/>
+                <signal pad-key="pd6" index="22" function="default" group="PCINT"/>
+                <signal pad-key="pd7" index="23" function="default" group="PCINT"/>
+                <signal pad-key="pb0" index="0" function="default" group="PCINT"/>
+                <signal pad-key="pb1" index="1" function="default" group="PCINT"/>
+                <signal pad-key="pb2" index="2" function="default" group="PCINT"/>
+                <signal pad-key="pb3" index="3" function="default" group="PCINT"/>
+                <signal pad-key="pb4" index="4" function="default" group="PCINT"/>
+                <signal pad-key="pb5" index="5" function="default" group="PCINT"/>
+                <signal pad-key="pc0" index="8" function="default" group="PCINT"/>
+                <signal pad-key="pc1" index="9" function="default" group="PCINT"/>
+                <signal pad-key="pc2" index="10" function="default" group="PCINT"/>
+                <signal pad-key="pc3" index="11" function="default" group="PCINT"/>
+                <signal pad-key="pc4" index="12" function="default" group="PCINT"/>
+                <signal pad-key="pc5" index="13" function="default" group="PCINT"/>
+                <signal pad-key="pc6" index="14" function="default" group="PCINT"/>
+                <signal pad-key="pd0" index="16" function="default" group="PCINT"/>
+                <signal pad-key="pd1" index="17" function="default" group="PCINT"/>
+                <signal pad-key="pd2" index="18" function="default" group="PCINT"/>
+                <signal pad-key="pd2" index="0" function="default" group="INT"/>
             </signals>
         </peripheral>
         <peripheral key="spi" name="SPI" module-key="spi">
             <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"/>
-                <signal pad-id="pb4" function="default" group="MISO"/>
-                <signal pad-id="pb5" function="default" group="SCK"/>
+                <signal pad-key="pb2" function="default" group="SS"/>
+                <signal pad-key="pb3" function="default" group="MOSI"/>
+                <signal pad-key="pb4" function="default" group="MISO"/>
+                <signal pad-key="pb5" function="default" group="SCK"/>
             </signals>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="wdt">
@@ -338,7 +338,7 @@
         <peripheral key="cpu" name="CPU" module-key="cpu">
             <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"/>
+                <signal pad-key="pb0" index="0" function="default" group="CLK"/>
             </signals>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="fuse">
@@ -749,144 +749,175 @@
             </register-group>
         </module>
     </modules>
+    <pads>
+        <pad key="pd3" name="PD3"/>
+        <pad key="pd4" name="PD4"/>
+        <pad key="gnd" name="GND"/>
+        <pad key="vcc" name="VCC"/>
+        <pad key="pb6" name="PB6"/>
+        <pad key="pb7" name="PB7"/>
+        <pad key="pd5" name="PD5"/>
+        <pad key="pd6" name="PD6"/>
+        <pad key="pd7" name="PD7"/>
+        <pad key="pb0" name="PB0"/>
+        <pad key="pb1" name="PB1"/>
+        <pad key="pb2" name="PB2"/>
+        <pad key="pb3" name="PB3"/>
+        <pad key="pb4" name="PB4"/>
+        <pad key="pb5" name="PB5"/>
+        <pad key="avcc" name="AVCC"/>
+        <pad key="adc6" name="ADC6"/>
+        <pad key="aref" name="AREF"/>
+        <pad key="adc7" name="ADC7"/>
+        <pad key="pc0" name="PC0"/>
+        <pad key="pc1" name="PC1"/>
+        <pad key="pc2" name="PC2"/>
+        <pad key="pc3" name="PC3"/>
+        <pad key="pc4" name="PC4"/>
+        <pad key="pc5" name="PC5"/>
+        <pad key="pc6" name="PC6"/>
+        <pad key="pd0" name="PD0"/>
+        <pad key="pd1" name="PD1"/>
+        <pad key="pd2" name="PD2"/>
+    </pads>
     <pinouts>
         <pinout key="tqfp32" name="TQFP32" type="qfp">
-            <pin position="1" pad="PD3"/>
-            <pin position="2" pad="PD4"/>
-            <pin position="3" pad="GND"/>
-            <pin position="4" pad="VCC"/>
-            <pin position="5" pad="GND"/>
-            <pin position="6" pad="VCC"/>
-            <pin position="7" pad="PB6"/>
-            <pin position="8" pad="PB7"/>
-            <pin position="9" pad="PD5"/>
-            <pin position="10" pad="PD6"/>
-            <pin position="11" pad="PD7"/>
-            <pin position="12" pad="PB0"/>
-            <pin position="13" pad="PB1"/>
-            <pin position="14" pad="PB2"/>
-            <pin position="15" pad="PB3"/>
-            <pin position="16" pad="PB4"/>
-            <pin position="17" pad="PB5"/>
-            <pin position="18" pad="AVCC"/>
-            <pin position="19" pad="ADC6"/>
-            <pin position="20" pad="AREF"/>
-            <pin position="21" pad="GND"/>
-            <pin position="22" pad="ADC7"/>
-            <pin position="23" pad="PC0"/>
-            <pin position="24" pad="PC1"/>
-            <pin position="25" pad="PC2"/>
-            <pin position="26" pad="PC3"/>
-            <pin position="27" pad="PC4"/>
-            <pin position="28" pad="PC5"/>
-            <pin position="29" pad="PC6"/>
-            <pin position="30" pad="PD0"/>
-            <pin position="31" pad="PD1"/>
-            <pin position="32" pad="PD2"/>
+            <pin position="1" pad-key="pd3"/>
+            <pin position="2" pad-key="pd4"/>
+            <pin position="3" pad-key="gnd"/>
+            <pin position="4" pad-key="vcc"/>
+            <pin position="5" pad-key="gnd"/>
+            <pin position="6" pad-key="vcc"/>
+            <pin position="7" pad-key="pb6"/>
+            <pin position="8" pad-key="pb7"/>
+            <pin position="9" pad-key="pd5"/>
+            <pin position="10" pad-key="pd6"/>
+            <pin position="11" pad-key="pd7"/>
+            <pin position="12" pad-key="pb0"/>
+            <pin position="13" pad-key="pb1"/>
+            <pin position="14" pad-key="pb2"/>
+            <pin position="15" pad-key="pb3"/>
+            <pin position="16" pad-key="pb4"/>
+            <pin position="17" pad-key="pb5"/>
+            <pin position="18" pad-key="avcc"/>
+            <pin position="19" pad-key="adc6"/>
+            <pin position="20" pad-key="aref"/>
+            <pin position="21" pad-key="gnd"/>
+            <pin position="22" pad-key="adc7"/>
+            <pin position="23" pad-key="pc0"/>
+            <pin position="24" pad-key="pc1"/>
+            <pin position="25" pad-key="pc2"/>
+            <pin position="26" pad-key="pc3"/>
+            <pin position="27" pad-key="pc4"/>
+            <pin position="28" pad-key="pc5"/>
+            <pin position="29" pad-key="pc6"/>
+            <pin position="30" pad-key="pd0"/>
+            <pin position="31" pad-key="pd1"/>
+            <pin position="32" pad-key="pd2"/>
         </pinout>
         <pinout key="qfn32" name="QFN32" type="qfn">
-            <pin position="1" pad="PD3"/>
-            <pin position="2" pad="PD4"/>
-            <pin position="3" pad="GND"/>
-            <pin position="4" pad="VCC"/>
-            <pin position="5" pad="GND"/>
-            <pin position="6" pad="VCC"/>
-            <pin position="7" pad="PB6"/>
-            <pin position="8" pad="PB7"/>
-            <pin position="9" pad="PD5"/>
-            <pin position="10" pad="PD6"/>
-            <pin position="11" pad="PD7"/>
-            <pin position="12" pad="PB0"/>
-            <pin position="13" pad="PB1"/>
-            <pin position="14" pad="PB2"/>
-            <pin position="15" pad="PB3"/>
-            <pin position="16" pad="PB4"/>
-            <pin position="17" pad="PB5"/>
-            <pin position="18" pad="AVCC"/>
-            <pin position="19" pad="ADC6"/>
-            <pin position="20" pad="AREF"/>
-            <pin position="21" pad="GND"/>
-            <pin position="22" pad="ADC7"/>
-            <pin position="23" pad="PC0"/>
-            <pin position="24" pad="PC1"/>
-            <pin position="25" pad="PC2"/>
-            <pin position="26" pad="PC3"/>
-            <pin position="27" pad="PC4"/>
-            <pin position="28" pad="PC5"/>
-            <pin position="29" pad="PC6"/>
-            <pin position="30" pad="PD0"/>
-            <pin position="31" pad="PD1"/>
-            <pin position="32" pad="PD2"/>
+            <pin position="1" pad-key="pd3"/>
+            <pin position="2" pad-key="pd4"/>
+            <pin position="3" pad-key="gnd"/>
+            <pin position="4" pad-key="vcc"/>
+            <pin position="5" pad-key="gnd"/>
+            <pin position="6" pad-key="vcc"/>
+            <pin position="7" pad-key="pb6"/>
+            <pin position="8" pad-key="pb7"/>
+            <pin position="9" pad-key="pd5"/>
+            <pin position="10" pad-key="pd6"/>
+            <pin position="11" pad-key="pd7"/>
+            <pin position="12" pad-key="pb0"/>
+            <pin position="13" pad-key="pb1"/>
+            <pin position="14" pad-key="pb2"/>
+            <pin position="15" pad-key="pb3"/>
+            <pin position="16" pad-key="pb4"/>
+            <pin position="17" pad-key="pb5"/>
+            <pin position="18" pad-key="avcc"/>
+            <pin position="19" pad-key="adc6"/>
+            <pin position="20" pad-key="aref"/>
+            <pin position="21" pad-key="gnd"/>
+            <pin position="22" pad-key="adc7"/>
+            <pin position="23" pad-key="pc0"/>
+            <pin position="24" pad-key="pc1"/>
+            <pin position="25" pad-key="pc2"/>
+            <pin position="26" pad-key="pc3"/>
+            <pin position="27" pad-key="pc4"/>
+            <pin position="28" pad-key="pc5"/>
+            <pin position="29" pad-key="pc6"/>
+            <pin position="30" pad-key="pd0"/>
+            <pin position="31" pad-key="pd1"/>
+            <pin position="32" pad-key="pd2"/>
         </pinout>
         <pinout key="qfn28" name="QFN28" type="qfn">
-            <pin position="1" pad="PD3"/>
-            <pin position="2" pad="PD4"/>
-            <pin position="3" pad="VCC"/>
-            <pin position="4" pad="GND"/>
-            <pin position="5" pad="PB6"/>
-            <pin position="6" pad="PB7"/>
-            <pin position="7" pad="PD5"/>
-            <pin position="8" pad="PD6"/>
-            <pin position="9" pad="PD7"/>
-            <pin position="10" pad="PB0"/>
-            <pin position="11" pad="PB1"/>
-            <pin position="12" pad="PB2"/>
-            <pin position="13" pad="PB3"/>
-            <pin position="14" pad="PB4"/>
-            <pin position="15" pad="PB5"/>
-            <pin position="16" pad="AVCC"/>
-            <pin position="17" pad="AREF"/>
-            <pin position="18" pad="GND"/>
-            <pin position="19" pad="PC0"/>
-            <pin position="20" pad="PC1"/>
-            <pin position="21" pad="PC2"/>
-            <pin position="22" pad="PC3"/>
-            <pin position="23" pad="PC4"/>
-            <pin position="24" pad="PC5"/>
-            <pin position="25" pad="PC6"/>
-            <pin position="26" pad="PD0"/>
-            <pin position="27" pad="PD1"/>
-            <pin position="28" pad="PD2"/>
+            <pin position="1" pad-key="pd3"/>
+            <pin position="2" pad-key="pd4"/>
+            <pin position="3" pad-key="vcc"/>
+            <pin position="4" pad-key="gnd"/>
+            <pin position="5" pad-key="pb6"/>
+            <pin position="6" pad-key="pb7"/>
+            <pin position="7" pad-key="pd5"/>
+            <pin position="8" pad-key="pd6"/>
+            <pin position="9" pad-key="pd7"/>
+            <pin position="10" pad-key="pb0"/>
+            <pin position="11" pad-key="pb1"/>
+            <pin position="12" pad-key="pb2"/>
+            <pin position="13" pad-key="pb3"/>
+            <pin position="14" pad-key="pb4"/>
+            <pin position="15" pad-key="pb5"/>
+            <pin position="16" pad-key="avcc"/>
+            <pin position="17" pad-key="aref"/>
+            <pin position="18" pad-key="gnd"/>
+            <pin position="19" pad-key="pc0"/>
+            <pin position="20" pad-key="pc1"/>
+            <pin position="21" pad-key="pc2"/>
+            <pin position="22" pad-key="pc3"/>
+            <pin position="23" pad-key="pc4"/>
+            <pin position="24" pad-key="pc5"/>
+            <pin position="25" pad-key="pc6"/>
+            <pin position="26" pad-key="pd0"/>
+            <pin position="27" pad-key="pd1"/>
+            <pin position="28" pad-key="pd2"/>
         </pinout>
         <pinout key="pdip28" name="PDIP28" type="dip">
-            <pin position="1" pad="PC6"/>
-            <pin position="2" pad="PD0"/>
-            <pin position="3" pad="PD1"/>
-            <pin position="4" pad="PD2"/>
-            <pin position="5" pad="PD3"/>
-            <pin position="6" pad="PD4"/>
-            <pin position="7" pad="VCC"/>
-            <pin position="8" pad="GND"/>
-            <pin position="9" pad="PB6"/>
-            <pin position="10" pad="PB7"/>
-            <pin position="11" pad="PD5"/>
-            <pin position="12" pad="PD6"/>
-            <pin position="13" pad="PD7"/>
-            <pin position="14" pad="PB0"/>
-            <pin position="15" pad="PB1"/>
-            <pin position="16" pad="PB2"/>
-            <pin position="17" pad="PB3"/>
-            <pin position="18" pad="PB4"/>
-            <pin position="19" pad="PB5"/>
-            <pin position="20" pad="AVCC"/>
-            <pin position="21" pad="AREF"/>
-            <pin position="22" pad="GND"/>
-            <pin position="23" pad="PC0"/>
-            <pin position="24" pad="PC1"/>
-            <pin position="25" pad="PC2"/>
-            <pin position="26" pad="PC3"/>
-            <pin position="27" pad="PC4"/>
-            <pin position="28" pad="PC5"/>
+            <pin position="1" pad-key="pc6"/>
+            <pin position="2" pad-key="pd0"/>
+            <pin position="3" pad-key="pd1"/>
+            <pin position="4" pad-key="pd2"/>
+            <pin position="5" pad-key="pd3"/>
+            <pin position="6" pad-key="pd4"/>
+            <pin position="7" pad-key="vcc"/>
+            <pin position="8" pad-key="gnd"/>
+            <pin position="9" pad-key="pb6"/>
+            <pin position="10" pad-key="pb7"/>
+            <pin position="11" pad-key="pd5"/>
+            <pin position="12" pad-key="pd6"/>
+            <pin position="13" pad-key="pd7"/>
+            <pin position="14" pad-key="pb0"/>
+            <pin position="15" pad-key="pb1"/>
+            <pin position="16" pad-key="pb2"/>
+            <pin position="17" pad-key="pb3"/>
+            <pin position="18" pad-key="pb4"/>
+            <pin position="19" pad-key="pb5"/>
+            <pin position="20" pad-key="avcc"/>
+            <pin position="21" pad-key="aref"/>
+            <pin position="22" pad-key="gnd"/>
+            <pin position="23" pad-key="pc0"/>
+            <pin position="24" pad-key="pc1"/>
+            <pin position="25" pad-key="pc2"/>
+            <pin position="26" pad-key="pc3"/>
+            <pin position="27" pad-key="pc4"/>
+            <pin position="28" pad-key="pc5"/>
         </pinout>
     </pinouts>
     <variants>
-        <variant name="ATmega48PA-AU" pinout-key="tqfp32" package="TQFP32"/>
-        <variant name="ATmega48PA-MMH" pinout-key="qfn28" package="QFN28"/>
-        <variant name="ATmega48PA-MU" pinout-key="qfn32" package="QFN32"/>
-        <variant name="ATmega48PA-PU" pinout-key="pdip28" package="PDIP28"/>
-        <variant name="ATmega48PA-AN" pinout-key="tqfp32" package="TQFP32"/>
-        <variant name="ATmega48PA-MMN" pinout-key="qfn28" package="QFN28"/>
-        <variant name="ATmega48PA-MN" pinout-key="qfn32" package="QFN32"/>
-        <variant name="ATmega48PA-PN" pinout-key="pdip28" package="PDIP28"/>
+        <variant key="atmega48pa_au" name="ATmega48PA-AU" pinout-key="tqfp32"/>
+        <variant key="atmega48pa_mmh" name="ATmega48PA-MMH" pinout-key="qfn28"/>
+        <variant key="atmega48pa_mu" name="ATmega48PA-MU" pinout-key="qfn32"/>
+        <variant key="atmega48pa_pu" name="ATmega48PA-PU" pinout-key="pdip28"/>
+        <variant key="atmega48pa_an" name="ATmega48PA-AN" pinout-key="tqfp32"/>
+        <variant key="atmega48pa_mmn" name="ATmega48PA-MMN" pinout-key="qfn28"/>
+        <variant key="atmega48pa_mn" name="ATmega48PA-MN" pinout-key="qfn32"/>
+        <variant key="atmega48pa_pn" name="ATmega48PA-PN" pinout-key="pdip28"/>
     </variants>
 </device>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA48PB.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA48PB.xml
index 617cef70..e7eab3f0 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA48PB.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA48PB.xml
@@ -198,147 +198,147 @@
         <peripheral key="usart0" name="USART0" module-key="usart">
             <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"/>
-                <signal pad-id="pd4" function="default" group="XCK"/>
+                <signal pad-key="pd1" function="default" group="TXD"/>
+                <signal pad-key="pd0" function="default" group="RXD"/>
+                <signal pad-key="pd4" function="default" group="XCK"/>
             </signals>
         </peripheral>
         <peripheral key="twi" name="TWI" module-key="twi">
             <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"/>
+                <signal pad-key="pc4" function="default" group="SDA"/>
+                <signal pad-key="pc5" function="default" group="SCL"/>
             </signals>
         </peripheral>
         <peripheral key="tc1" name="TC1" module-key="tc16">
             <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"/>
-                <signal pad-id="pb1" function="default" group="OCA"/>
-                <signal pad-id="pb2" function="default" group="OCB"/>
+                <signal pad-key="pd5" function="default" group="T"/>
+                <signal pad-key="pb0" function="default" group="ICP"/>
+                <signal pad-key="pb1" function="default" group="OCA"/>
+                <signal pad-key="pb2" function="default" group="OCB"/>
             </signals>
         </peripheral>
         <peripheral key="tc2" name="TC2" module-key="tc8_async">
             <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"/>
+                <signal pad-key="pb3" function="default" group="OCA"/>
+                <signal pad-key="pd3" function="default" group="OCB"/>
             </signals>
         </peripheral>
         <peripheral key="adc" name="ADC" module-key="adc">
             <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"/>
-                <signal pad-id="pc2" index="2" function="default" group="ADC"/>
-                <signal pad-id="pc3" index="3" function="default" group="ADC"/>
-                <signal pad-id="pc4" index="4" function="default" group="ADC"/>
-                <signal pad-id="pc5" index="5" function="default" group="ADC"/>
-                <signal pad-id="pe2" index="6" function="default" group="ADC"/>
-                <signal pad-id="pe3" index="7" function="default" group="ADC"/>
+                <signal pad-key="pc0" index="0" function="default" group="ADC"/>
+                <signal pad-key="pc1" index="1" function="default" group="ADC"/>
+                <signal pad-key="pc2" index="2" function="default" group="ADC"/>
+                <signal pad-key="pc3" index="3" function="default" group="ADC"/>
+                <signal pad-key="pc4" index="4" function="default" group="ADC"/>
+                <signal pad-key="pc5" index="5" function="default" group="ADC"/>
+                <signal pad-key="pe2" index="6" function="default" group="ADC"/>
+                <signal pad-key="pe3" index="7" function="default" group="ADC"/>
             </signals>
         </peripheral>
         <peripheral key="ac" name="AC" module-key="ac">
             <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"/>
-                <signal pad-id="pd7" index="1" function="default" group="AIN"/>
+                <signal pad-key="pe0" function="default" group="AC"/>
+                <signal pad-key="pd6" index="0" function="default" group="AIN"/>
+                <signal pad-key="pd7" index="1" function="default" group="AIN"/>
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pb2" index="2" function="default" group="P"/>
-                <signal pad-id="pb3" index="3" function="default" group="P"/>
-                <signal pad-id="pb4" index="4" function="default" group="P"/>
-                <signal pad-id="pb5" index="5" function="default" group="P"/>
-                <signal pad-id="pb6" index="6" function="default" group="P"/>
-                <signal pad-id="pb7" index="7" function="default" group="P"/>
+                <signal pad-key="pb0" index="0" function="default" group="P"/>
+                <signal pad-key="pb1" index="1" function="default" group="P"/>
+                <signal pad-key="pb2" index="2" function="default" group="P"/>
+                <signal pad-key="pb3" index="3" function="default" group="P"/>
+                <signal pad-key="pb4" index="4" function="default" group="P"/>
+                <signal pad-key="pb5" index="5" function="default" group="P"/>
+                <signal pad-key="pb6" index="6" function="default" group="P"/>
+                <signal pad-key="pb7" index="7" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pc2" index="2" function="default" group="P"/>
-                <signal pad-id="pc3" index="3" function="default" group="P"/>
-                <signal pad-id="pc4" index="4" function="default" group="P"/>
-                <signal pad-id="pc5" index="5" function="default" group="P"/>
-                <signal pad-id="pc6" index="6" function="default" group="P"/>
+                <signal pad-key="pc0" index="0" function="default" group="P"/>
+                <signal pad-key="pc1" index="1" function="default" group="P"/>
+                <signal pad-key="pc2" index="2" function="default" group="P"/>
+                <signal pad-key="pc3" index="3" function="default" group="P"/>
+                <signal pad-key="pc4" index="4" function="default" group="P"/>
+                <signal pad-key="pc5" index="5" function="default" group="P"/>
+                <signal pad-key="pc6" index="6" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pd2" index="2" function="default" group="P"/>
-                <signal pad-id="pd3" index="3" function="default" group="P"/>
-                <signal pad-id="pd4" index="4" function="default" group="P"/>
-                <signal pad-id="pd5" index="5" function="default" group="P"/>
-                <signal pad-id="pd6" index="6" function="default" group="P"/>
-                <signal pad-id="pd7" index="7" function="default" group="P"/>
+                <signal pad-key="pd0" index="0" function="default" group="P"/>
+                <signal pad-key="pd1" index="1" function="default" group="P"/>
+                <signal pad-key="pd2" index="2" function="default" group="P"/>
+                <signal pad-key="pd3" index="3" function="default" group="P"/>
+                <signal pad-key="pd4" index="4" function="default" group="P"/>
+                <signal pad-key="pd5" index="5" function="default" group="P"/>
+                <signal pad-key="pd6" index="6" function="default" group="P"/>
+                <signal pad-key="pd7" index="7" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="porte" name="PORTE" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pe2" index="2" function="default" group="P"/>
-                <signal pad-id="pe3" index="3" function="default" group="P"/>
+                <signal pad-key="pe0" index="0" function="default" group="P"/>
+                <signal pad-key="pe1" index="1" function="default" group="P"/>
+                <signal pad-key="pe2" index="2" function="default" group="P"/>
+                <signal pad-key="pe3" index="3" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="tc0" name="TC0" module-key="tc8">
             <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"/>
-                <signal pad-id="pd6" function="default" group="OCA"/>
+                <signal pad-key="pd4" function="default" group="T"/>
+                <signal pad-key="pd5" function="default" group="OCB"/>
+                <signal pad-key="pd6" function="default" group="OCA"/>
             </signals>
         </peripheral>
         <peripheral key="exint" name="EXINT" module-key="exint">
             <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"/>
-                <signal pad-id="pd4" index="20" function="default" group="PCINT"/>
-                <signal pad-id="pb6" index="6" function="default" group="PCINT"/>
-                <signal pad-id="pb7" index="7" function="default" group="PCINT"/>
-                <signal pad-id="pd5" index="21" function="default" group="PCINT"/>
-                <signal pad-id="pd6" index="22" function="default" group="PCINT"/>
-                <signal pad-id="pd7" index="23" function="default" group="PCINT"/>
-                <signal pad-id="pb0" index="0" function="default" group="PCINT"/>
-                <signal pad-id="pb1" index="1" function="default" group="PCINT"/>
-                <signal pad-id="pb2" index="2" function="default" group="PCINT"/>
-                <signal pad-id="pb3" index="3" function="default" group="PCINT"/>
-                <signal pad-id="pb4" index="4" function="default" group="PCINT"/>
-                <signal pad-id="pb5" index="5" function="default" group="PCINT"/>
-                <signal pad-id="pc0" index="8" function="default" group="PCINT"/>
-                <signal pad-id="pc1" index="9" function="default" group="PCINT"/>
-                <signal pad-id="pc2" index="10" function="default" group="PCINT"/>
-                <signal pad-id="pc3" index="11" function="default" group="PCINT"/>
-                <signal pad-id="pc4" index="12" function="default" group="PCINT"/>
-                <signal pad-id="pc5" index="13" function="default" group="PCINT"/>
-                <signal pad-id="pc6" index="14" function="default" group="PCINT"/>
-                <signal pad-id="pd0" index="16" function="default" group="PCINT"/>
-                <signal pad-id="pd1" index="17" function="default" group="PCINT"/>
-                <signal pad-id="pd2" index="18" function="default" group="PCINT"/>
-                <signal pad-id="pd2" index="0" function="default" group="INT"/>
+                <signal pad-key="pd3" index="1" function="default" group="INT"/>
+                <signal pad-key="pd3" index="19" function="default" group="PCINT"/>
+                <signal pad-key="pd4" index="20" function="default" group="PCINT"/>
+                <signal pad-key="pb6" index="6" function="default" group="PCINT"/>
+                <signal pad-key="pb7" index="7" function="default" group="PCINT"/>
+                <signal pad-key="pd5" index="21" function="default" group="PCINT"/>
+                <signal pad-key="pd6" index="22" function="default" group="PCINT"/>
+                <signal pad-key="pd7" index="23" function="default" group="PCINT"/>
+                <signal pad-key="pb0" index="0" function="default" group="PCINT"/>
+                <signal pad-key="pb1" index="1" function="default" group="PCINT"/>
+                <signal pad-key="pb2" index="2" function="default" group="PCINT"/>
+                <signal pad-key="pb3" index="3" function="default" group="PCINT"/>
+                <signal pad-key="pb4" index="4" function="default" group="PCINT"/>
+                <signal pad-key="pb5" index="5" function="default" group="PCINT"/>
+                <signal pad-key="pc0" index="8" function="default" group="PCINT"/>
+                <signal pad-key="pc1" index="9" function="default" group="PCINT"/>
+                <signal pad-key="pc2" index="10" function="default" group="PCINT"/>
+                <signal pad-key="pc3" index="11" function="default" group="PCINT"/>
+                <signal pad-key="pc4" index="12" function="default" group="PCINT"/>
+                <signal pad-key="pc5" index="13" function="default" group="PCINT"/>
+                <signal pad-key="pc6" index="14" function="default" group="PCINT"/>
+                <signal pad-key="pd0" index="16" function="default" group="PCINT"/>
+                <signal pad-key="pd1" index="17" function="default" group="PCINT"/>
+                <signal pad-key="pd2" index="18" function="default" group="PCINT"/>
+                <signal pad-key="pd2" index="0" function="default" group="INT"/>
             </signals>
         </peripheral>
         <peripheral key="spi" name="SPI" module-key="spi">
             <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"/>
-                <signal pad-id="pb4" function="default" group="MISO"/>
-                <signal pad-id="pb5" function="default" group="SCK"/>
+                <signal pad-key="pb2" function="default" group="SS"/>
+                <signal pad-key="pb3" function="default" group="MOSI"/>
+                <signal pad-key="pb4" function="default" group="MISO"/>
+                <signal pad-key="pb5" function="default" group="SCK"/>
             </signals>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="wdt">
@@ -350,7 +350,7 @@
         <peripheral key="cpu" name="CPU" module-key="cpu">
             <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"/>
+                <signal pad-key="pb0" index="0" function="default" group="CLK"/>
             </signals>
         </peripheral>
         <peripheral key="deviceid" name="DEVICEID" module-key="deviceid">
@@ -783,80 +783,113 @@
             </register-group>
         </module>
     </modules>
+    <pads>
+        <pad key="pd3" name="PD3"/>
+        <pad key="pd4" name="PD4"/>
+        <pad key="pe0" name="PE0"/>
+        <pad key="vcc" name="VCC"/>
+        <pad key="gnd" name="GND"/>
+        <pad key="pe1" name="PE1"/>
+        <pad key="pb6" name="PB6"/>
+        <pad key="pb7" name="PB7"/>
+        <pad key="pd5" name="PD5"/>
+        <pad key="pd6" name="PD6"/>
+        <pad key="pd7" name="PD7"/>
+        <pad key="pb0" name="PB0"/>
+        <pad key="pb1" name="PB1"/>
+        <pad key="pb2" name="PB2"/>
+        <pad key="pb3" name="PB3"/>
+        <pad key="pb4" name="PB4"/>
+        <pad key="pb5" name="PB5"/>
+        <pad key="avcc" name="AVCC"/>
+        <pad key="pe2" name="PE2"/>
+        <pad key="aref" name="AREF"/>
+        <pad key="pe3" name="PE3"/>
+        <pad key="pc0" name="PC0"/>
+        <pad key="pc1" name="PC1"/>
+        <pad key="pc2" name="PC2"/>
+        <pad key="pc3" name="PC3"/>
+        <pad key="pc4" name="PC4"/>
+        <pad key="pc5" name="PC5"/>
+        <pad key="pc6" name="PC6"/>
+        <pad key="pd0" name="PD0"/>
+        <pad key="pd1" name="PD1"/>
+        <pad key="pd2" name="PD2"/>
+    </pads>
     <pinouts>
         <pinout key="tqfp32" name="TQFP32" type="qfp">
-            <pin position="1" pad="PD3"/>
-            <pin position="2" pad="PD4"/>
-            <pin position="3" pad="PE0"/>
-            <pin position="4" pad="VCC"/>
-            <pin position="5" pad="GND"/>
-            <pin position="6" pad="PE1"/>
-            <pin position="7" pad="PB6"/>
-            <pin position="8" pad="PB7"/>
-            <pin position="9" pad="PD5"/>
-            <pin position="10" pad="PD6"/>
-            <pin position="11" pad="PD7"/>
-            <pin position="12" pad="PB0"/>
-            <pin position="13" pad="PB1"/>
-            <pin position="14" pad="PB2"/>
-            <pin position="15" pad="PB3"/>
-            <pin position="16" pad="PB4"/>
-            <pin position="17" pad="PB5"/>
-            <pin position="18" pad="AVCC"/>
-            <pin position="19" pad="PE2"/>
-            <pin position="20" pad="AREF"/>
-            <pin position="21" pad="GND"/>
-            <pin position="22" pad="PE3"/>
-            <pin position="23" pad="PC0"/>
-            <pin position="24" pad="PC1"/>
-            <pin position="25" pad="PC2"/>
-            <pin position="26" pad="PC3"/>
-            <pin position="27" pad="PC4"/>
-            <pin position="28" pad="PC5"/>
-            <pin position="29" pad="PC6"/>
-            <pin position="30" pad="PD0"/>
-            <pin position="31" pad="PD1"/>
-            <pin position="32" pad="PD2"/>
+            <pin position="1" pad-key="pd3"/>
+            <pin position="2" pad-key="pd4"/>
+            <pin position="3" pad-key="pe0"/>
+            <pin position="4" pad-key="vcc"/>
+            <pin position="5" pad-key="gnd"/>
+            <pin position="6" pad-key="pe1"/>
+            <pin position="7" pad-key="pb6"/>
+            <pin position="8" pad-key="pb7"/>
+            <pin position="9" pad-key="pd5"/>
+            <pin position="10" pad-key="pd6"/>
+            <pin position="11" pad-key="pd7"/>
+            <pin position="12" pad-key="pb0"/>
+            <pin position="13" pad-key="pb1"/>
+            <pin position="14" pad-key="pb2"/>
+            <pin position="15" pad-key="pb3"/>
+            <pin position="16" pad-key="pb4"/>
+            <pin position="17" pad-key="pb5"/>
+            <pin position="18" pad-key="avcc"/>
+            <pin position="19" pad-key="pe2"/>
+            <pin position="20" pad-key="aref"/>
+            <pin position="21" pad-key="gnd"/>
+            <pin position="22" pad-key="pe3"/>
+            <pin position="23" pad-key="pc0"/>
+            <pin position="24" pad-key="pc1"/>
+            <pin position="25" pad-key="pc2"/>
+            <pin position="26" pad-key="pc3"/>
+            <pin position="27" pad-key="pc4"/>
+            <pin position="28" pad-key="pc5"/>
+            <pin position="29" pad-key="pc6"/>
+            <pin position="30" pad-key="pd0"/>
+            <pin position="31" pad-key="pd1"/>
+            <pin position="32" pad-key="pd2"/>
         </pinout>
         <pinout key="vqfn32" name="VQFN32" type="qfn">
-            <pin position="1" pad="PD3"/>
-            <pin position="2" pad="PD4"/>
-            <pin position="3" pad="PE0"/>
-            <pin position="4" pad="VCC"/>
-            <pin position="5" pad="GND"/>
-            <pin position="6" pad="PE1"/>
-            <pin position="7" pad="PB6"/>
-            <pin position="8" pad="PB7"/>
-            <pin position="9" pad="PD5"/>
-            <pin position="10" pad="PD6"/>
-            <pin position="11" pad="PD7"/>
-            <pin position="12" pad="PB0"/>
-            <pin position="13" pad="PB1"/>
-            <pin position="14" pad="PB2"/>
-            <pin position="15" pad="PB3"/>
-            <pin position="16" pad="PB4"/>
-            <pin position="17" pad="PB5"/>
-            <pin position="18" pad="AVCC"/>
-            <pin position="19" pad="PE2"/>
-            <pin position="20" pad="AREF"/>
-            <pin position="21" pad="GND"/>
-            <pin position="22" pad="PE3"/>
-            <pin position="23" pad="PC0"/>
-            <pin position="24" pad="PC1"/>
-            <pin position="25" pad="PC2"/>
-            <pin position="26" pad="PC3"/>
-            <pin position="27" pad="PC4"/>
-            <pin position="28" pad="PC5"/>
-            <pin position="29" pad="PC6"/>
-            <pin position="30" pad="PD0"/>
-            <pin position="31" pad="PD1"/>
-            <pin position="32" pad="PD2"/>
+            <pin position="1" pad-key="pd3"/>
+            <pin position="2" pad-key="pd4"/>
+            <pin position="3" pad-key="pe0"/>
+            <pin position="4" pad-key="vcc"/>
+            <pin position="5" pad-key="gnd"/>
+            <pin position="6" pad-key="pe1"/>
+            <pin position="7" pad-key="pb6"/>
+            <pin position="8" pad-key="pb7"/>
+            <pin position="9" pad-key="pd5"/>
+            <pin position="10" pad-key="pd6"/>
+            <pin position="11" pad-key="pd7"/>
+            <pin position="12" pad-key="pb0"/>
+            <pin position="13" pad-key="pb1"/>
+            <pin position="14" pad-key="pb2"/>
+            <pin position="15" pad-key="pb3"/>
+            <pin position="16" pad-key="pb4"/>
+            <pin position="17" pad-key="pb5"/>
+            <pin position="18" pad-key="avcc"/>
+            <pin position="19" pad-key="pe2"/>
+            <pin position="20" pad-key="aref"/>
+            <pin position="21" pad-key="gnd"/>
+            <pin position="22" pad-key="pe3"/>
+            <pin position="23" pad-key="pc0"/>
+            <pin position="24" pad-key="pc1"/>
+            <pin position="25" pad-key="pc2"/>
+            <pin position="26" pad-key="pc3"/>
+            <pin position="27" pad-key="pc4"/>
+            <pin position="28" pad-key="pc5"/>
+            <pin position="29" pad-key="pc6"/>
+            <pin position="30" pad-key="pd0"/>
+            <pin position="31" pad-key="pd1"/>
+            <pin position="32" pad-key="pd2"/>
         </pinout>
     </pinouts>
     <variants>
-        <variant name="ATmega48PB-AU" pinout-key="tqfp32" package="TQFP32"/>
-        <variant name="ATmega48PB-MU" pinout-key="vqfn32" package="VQFN32"/>
-        <variant name="ATmega48PB-AN" pinout-key="tqfp32" package="TQFP32"/>
-        <variant name="ATmega48PB-MN" pinout-key="vqfn32" package="VQFN32"/>
+        <variant key="atmega48pb_au" name="ATmega48PB-AU" pinout-key="tqfp32"/>
+        <variant key="atmega48pb_mu" name="ATmega48PB-MU" pinout-key="vqfn32"/>
+        <variant key="atmega48pb_an" name="ATmega48PB-AN" pinout-key="tqfp32"/>
+        <variant key="atmega48pb_mn" name="ATmega48PB-MN" pinout-key="vqfn32"/>
     </variants>
 </device>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA64.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA64.xml
index 66c31837..3fcef010 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA64.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA64.xml
@@ -195,53 +195,53 @@
         <peripheral key="ac" name="AC" module-key="ac">
             <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"/>
+                <signal pad-key="pe3" index="1" function="default" group="AIN"/>
+                <signal pad-key="pe2" index="0" function="default" group="AIN"/>
             </signals>
         </peripheral>
         <peripheral key="adc" name="ADC" module-key="adc">
             <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"/>
-                <signal pad-id="pf5" index="5" function="default" group="ADC"/>
-                <signal pad-id="pf4" index="4" function="default" group="ADC"/>
-                <signal pad-id="pf3" index="3" function="default" group="ADC"/>
-                <signal pad-id="pf2" index="2" function="default" group="ADC"/>
-                <signal pad-id="pf1" index="1" function="default" group="ADC"/>
-                <signal pad-id="pf0" index="0" function="default" group="ADC"/>
+                <signal pad-key="pf7" index="7" function="default" group="ADC"/>
+                <signal pad-key="pf6" index="6" function="default" group="ADC"/>
+                <signal pad-key="pf5" index="5" function="default" group="ADC"/>
+                <signal pad-key="pf4" index="4" function="default" group="ADC"/>
+                <signal pad-key="pf3" index="3" function="default" group="ADC"/>
+                <signal pad-key="pf2" index="2" function="default" group="ADC"/>
+                <signal pad-key="pf1" index="1" function="default" group="ADC"/>
+                <signal pad-key="pf0" index="0" function="default" group="ADC"/>
             </signals>
         </peripheral>
         <peripheral key="spi" name="SPI" module-key="spi">
             <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"/>
-                <signal pad-id="pb1" function="default" group="SCK"/>
-                <signal pad-id="pb0" function="default" group="SS"/>
+                <signal pad-key="pb3" function="default" group="MISO"/>
+                <signal pad-key="pb2" function="default" group="MOSI"/>
+                <signal pad-key="pb1" function="default" group="SCK"/>
+                <signal pad-key="pb0" function="default" group="SS"/>
             </signals>
         </peripheral>
         <peripheral key="twi" name="TWI" module-key="twi">
             <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"/>
+                <signal pad-key="pd1" function="default" group="SDA"/>
+                <signal pad-key="pd0" function="default" group="SCL"/>
             </signals>
         </peripheral>
         <peripheral key="usart0" name="USART0" module-key="usart">
             <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"/>
-                <signal pad-id="pe0" function="default" group="RXD"/>
+                <signal pad-key="pe2" function="default" group="XCK"/>
+                <signal pad-key="pe1" function="default" group="TXD"/>
+                <signal pad-key="pe0" function="default" group="RXD"/>
             </signals>
         </peripheral>
         <peripheral key="usart1" name="USART1" module-key="usart">
             <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"/>
-                <signal pad-id="pd2" function="default" group="RXD"/>
+                <signal pad-key="pd5" function="default" group="XCK"/>
+                <signal pad-key="pd3" function="default" group="TXD"/>
+                <signal pad-key="pd2" function="default" group="RXD"/>
             </signals>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="cpu">
@@ -253,49 +253,49 @@
         <peripheral key="jtag" name="JTAG" module-key="jtag">
             <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"/>
-                <signal pad-id="pf5" function="default" group="TMS"/>
-                <signal pad-id="pf4" function="default" group="TCK"/>
+                <signal pad-key="pf7" function="default" group="TDI"/>
+                <signal pad-key="pf6" function="default" group="TDO"/>
+                <signal pad-key="pf5" function="default" group="TMS"/>
+                <signal pad-key="pf4" function="default" group="TCK"/>
             </signals>
         </peripheral>
         <peripheral key="misc" name="MISC" module-key="misc">
             <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"/>
-                <signal pad-id="pa5" index="5" function="default" group="AD"/>
-                <signal pad-id="pa4" index="4" function="default" group="AD"/>
-                <signal pad-id="pa3" index="3" function="default" group="AD"/>
-                <signal pad-id="pa2" index="2" function="default" group="AD"/>
-                <signal pad-id="pa1" index="1" function="default" group="AD"/>
-                <signal pad-id="pa0" index="0" function="default" group="AD"/>
-                <signal pad-id="pc7" index="15" function="default" group="A"/>
-                <signal pad-id="pc6" index="14" function="default" group="A"/>
-                <signal pad-id="pc5" index="13" function="default" group="A"/>
-                <signal pad-id="pc4" index="12" function="default" group="A"/>
-                <signal pad-id="pc3" index="11" function="default" group="A"/>
-                <signal pad-id="pc2" index="10" function="default" group="A"/>
-                <signal pad-id="pc1" index="9" function="default" group="A"/>
-                <signal pad-id="pc0" index="8" function="default" group="A"/>
-                <signal pad-id="pe1" function="default" group="PDO"/>
-                <signal pad-id="pe0" function="default" group="PDI"/>
-                <signal pad-id="pg2" function="default" group="ALE"/>
-                <signal pad-id="pg1" function="default" group="RD"/>
-                <signal pad-id="pg0" function="default" group="WD"/>
+                <signal pad-key="pa7" index="7" function="default" group="AD"/>
+                <signal pad-key="pa6" index="6" function="default" group="AD"/>
+                <signal pad-key="pa5" index="5" function="default" group="AD"/>
+                <signal pad-key="pa4" index="4" function="default" group="AD"/>
+                <signal pad-key="pa3" index="3" function="default" group="AD"/>
+                <signal pad-key="pa2" index="2" function="default" group="AD"/>
+                <signal pad-key="pa1" index="1" function="default" group="AD"/>
+                <signal pad-key="pa0" index="0" function="default" group="AD"/>
+                <signal pad-key="pc7" index="15" function="default" group="A"/>
+                <signal pad-key="pc6" index="14" function="default" group="A"/>
+                <signal pad-key="pc5" index="13" function="default" group="A"/>
+                <signal pad-key="pc4" index="12" function="default" group="A"/>
+                <signal pad-key="pc3" index="11" function="default" group="A"/>
+                <signal pad-key="pc2" index="10" function="default" group="A"/>
+                <signal pad-key="pc1" index="9" function="default" group="A"/>
+                <signal pad-key="pc0" index="8" function="default" group="A"/>
+                <signal pad-key="pe1" function="default" group="PDO"/>
+                <signal pad-key="pe0" function="default" group="PDI"/>
+                <signal pad-key="pg2" function="default" group="ALE"/>
+                <signal pad-key="pg1" function="default" group="RD"/>
+                <signal pad-key="pg0" function="default" group="WD"/>
             </signals>
         </peripheral>
         <peripheral key="exint" name="EXINT" module-key="exint">
             <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"/>
-                <signal pad-id="pe5" index="5" function="default" group="INT"/>
-                <signal pad-id="pe4" index="4" function="default" group="INT"/>
-                <signal pad-id="pd3" index="3" function="default" group="INT"/>
-                <signal pad-id="pd2" index="2" function="default" group="INT"/>
-                <signal pad-id="pd1" index="1" function="default" group="INT"/>
-                <signal pad-id="pd0" index="0" function="default" group="INT"/>
+                <signal pad-key="pe7" index="7" function="default" group="INT"/>
+                <signal pad-key="pe6" index="6" function="default" group="INT"/>
+                <signal pad-key="pe5" index="5" function="default" group="INT"/>
+                <signal pad-key="pe4" index="4" function="default" group="INT"/>
+                <signal pad-key="pd3" index="3" function="default" group="INT"/>
+                <signal pad-key="pd2" index="2" function="default" group="INT"/>
+                <signal pad-key="pd1" index="1" function="default" group="INT"/>
+                <signal pad-key="pd0" index="0" function="default" group="INT"/>
             </signals>
         </peripheral>
         <peripheral key="eeprom" name="EEPROM" module-key="eeprom">
@@ -304,124 +304,124 @@
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pa2" index="2" function="default" group="P"/>
-                <signal pad-id="pa3" index="3" function="default" group="P"/>
-                <signal pad-id="pa4" index="4" function="default" group="P"/>
-                <signal pad-id="pa5" index="5" function="default" group="P"/>
-                <signal pad-id="pa6" index="6" function="default" group="P"/>
-                <signal pad-id="pa7" index="7" function="default" group="P"/>
+                <signal pad-key="pa0" index="0" function="default" group="P"/>
+                <signal pad-key="pa1" index="1" function="default" group="P"/>
+                <signal pad-key="pa2" index="2" function="default" group="P"/>
+                <signal pad-key="pa3" index="3" function="default" group="P"/>
+                <signal pad-key="pa4" index="4" function="default" group="P"/>
+                <signal pad-key="pa5" index="5" function="default" group="P"/>
+                <signal pad-key="pa6" index="6" function="default" group="P"/>
+                <signal pad-key="pa7" index="7" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pb2" index="2" function="default" group="P"/>
-                <signal pad-id="pb3" index="3" function="default" group="P"/>
-                <signal pad-id="pb4" index="4" function="default" group="P"/>
-                <signal pad-id="pb5" index="5" function="default" group="P"/>
-                <signal pad-id="pb6" index="6" function="default" group="P"/>
-                <signal pad-id="pb7" index="7" function="default" group="P"/>
+                <signal pad-key="pb0" index="0" function="default" group="P"/>
+                <signal pad-key="pb1" index="1" function="default" group="P"/>
+                <signal pad-key="pb2" index="2" function="default" group="P"/>
+                <signal pad-key="pb3" index="3" function="default" group="P"/>
+                <signal pad-key="pb4" index="4" function="default" group="P"/>
+                <signal pad-key="pb5" index="5" function="default" group="P"/>
+                <signal pad-key="pb6" index="6" function="default" group="P"/>
+                <signal pad-key="pb7" index="7" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pc2" index="2" function="default" group="P"/>
-                <signal pad-id="pc3" index="3" function="default" group="P"/>
-                <signal pad-id="pc4" index="4" function="default" group="P"/>
-                <signal pad-id="pc5" index="5" function="default" group="P"/>
-                <signal pad-id="pc6" index="6" function="default" group="P"/>
-                <signal pad-id="pc7" index="7" function="default" group="P"/>
+                <signal pad-key="pc0" index="0" function="default" group="P"/>
+                <signal pad-key="pc1" index="1" function="default" group="P"/>
+                <signal pad-key="pc2" index="2" function="default" group="P"/>
+                <signal pad-key="pc3" index="3" function="default" group="P"/>
+                <signal pad-key="pc4" index="4" function="default" group="P"/>
+                <signal pad-key="pc5" index="5" function="default" group="P"/>
+                <signal pad-key="pc6" index="6" function="default" group="P"/>
+                <signal pad-key="pc7" index="7" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pd2" index="2" function="default" group="P"/>
-                <signal pad-id="pd3" index="3" function="default" group="P"/>
-                <signal pad-id="pd4" index="4" function="default" group="P"/>
-                <signal pad-id="pd5" index="5" function="default" group="P"/>
-                <signal pad-id="pd6" index="6" function="default" group="P"/>
-                <signal pad-id="pd7" index="7" function="default" group="P"/>
+                <signal pad-key="pd0" index="0" function="default" group="P"/>
+                <signal pad-key="pd1" index="1" function="default" group="P"/>
+                <signal pad-key="pd2" index="2" function="default" group="P"/>
+                <signal pad-key="pd3" index="3" function="default" group="P"/>
+                <signal pad-key="pd4" index="4" function="default" group="P"/>
+                <signal pad-key="pd5" index="5" function="default" group="P"/>
+                <signal pad-key="pd6" index="6" function="default" group="P"/>
+                <signal pad-key="pd7" index="7" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="porte" name="PORTE" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pe2" index="2" function="default" group="P"/>
-                <signal pad-id="pe3" index="3" function="default" group="P"/>
-                <signal pad-id="pe4" index="4" function="default" group="P"/>
-                <signal pad-id="pe5" index="5" function="default" group="P"/>
-                <signal pad-id="pe6" index="6" function="default" group="P"/>
-                <signal pad-id="pe7" index="7" function="default" group="P"/>
+                <signal pad-key="pe0" index="0" function="default" group="P"/>
+                <signal pad-key="pe1" index="1" function="default" group="P"/>
+                <signal pad-key="pe2" index="2" function="default" group="P"/>
+                <signal pad-key="pe3" index="3" function="default" group="P"/>
+                <signal pad-key="pe4" index="4" function="default" group="P"/>
+                <signal pad-key="pe5" index="5" function="default" group="P"/>
+                <signal pad-key="pe6" index="6" function="default" group="P"/>
+                <signal pad-key="pe7" index="7" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portf" name="PORTF" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pf2" index="2" function="default" group="P"/>
-                <signal pad-id="pf3" index="3" function="default" group="P"/>
-                <signal pad-id="pf4" index="4" function="default" group="P"/>
-                <signal pad-id="pf5" index="5" function="default" group="P"/>
-                <signal pad-id="pf6" index="6" function="default" group="P"/>
-                <signal pad-id="pf7" index="7" function="default" group="P"/>
+                <signal pad-key="pf0" index="0" function="default" group="P"/>
+                <signal pad-key="pf1" index="1" function="default" group="P"/>
+                <signal pad-key="pf2" index="2" function="default" group="P"/>
+                <signal pad-key="pf3" index="3" function="default" group="P"/>
+                <signal pad-key="pf4" index="4" function="default" group="P"/>
+                <signal pad-key="pf5" index="5" function="default" group="P"/>
+                <signal pad-key="pf6" index="6" function="default" group="P"/>
+                <signal pad-key="pf7" index="7" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portg" name="PORTG" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pg2" index="2" function="default" group="P"/>
-                <signal pad-id="pg3" index="3" function="default" group="P"/>
-                <signal pad-id="pg4" index="4" function="default" group="P"/>
+                <signal pad-key="pg0" index="0" function="default" group="P"/>
+                <signal pad-key="pg1" index="1" function="default" group="P"/>
+                <signal pad-key="pg2" index="2" function="default" group="P"/>
+                <signal pad-key="pg3" index="3" function="default" group="P"/>
+                <signal pad-key="pg4" index="4" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="tc0" name="TC0" module-key="tc8_async">
             <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"/>
-                <signal pad-id="pg3" index="2" function="default" group="TOSC"/>
+                <signal pad-key="pb4" function="default" group="OC"/>
+                <signal pad-key="pg4" index="1" function="default" group="TOSC"/>
+                <signal pad-key="pg3" index="2" function="default" group="TOSC"/>
             </signals>
         </peripheral>
         <peripheral key="tc1" name="TC1" module-key="tc16">
             <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"/>
-                <signal pad-id="pb5" function="default" group="OCA"/>
-                <signal pad-id="pd6" function="default" group="T"/>
-                <signal pad-id="pd4" function="default" group="ICP"/>
+                <signal pad-key="pb7" function="default" group="OCC"/>
+                <signal pad-key="pb6" function="default" group="OCB"/>
+                <signal pad-key="pb5" function="default" group="OCA"/>
+                <signal pad-key="pd6" function="default" group="T"/>
+                <signal pad-key="pd4" function="default" group="ICP"/>
             </signals>
         </peripheral>
         <peripheral key="tc3" name="TC3" module-key="tc16">
             <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"/>
-                <signal pad-id="pe5" function="default" group="OCC"/>
-                <signal pad-id="pe4" function="default" group="OCB"/>
-                <signal pad-id="pe3" function="default" group="OCA"/>
+                <signal pad-key="pe7" function="default" group="ICP"/>
+                <signal pad-key="pe6" function="default" group="T"/>
+                <signal pad-key="pe5" function="default" group="OCC"/>
+                <signal pad-key="pe4" function="default" group="OCB"/>
+                <signal pad-key="pe3" function="default" group="OCA"/>
             </signals>
         </peripheral>
         <peripheral key="tc2" name="TC2" module-key="tc8">
             <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"/>
+                <signal pad-key="pb7" function="default" group="OC"/>
+                <signal pad-key="pd7" function="default" group="T"/>
             </signals>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="wdt">
@@ -917,82 +917,145 @@
             </register-group>
         </module>
     </modules>
+    <pads>
+        <pad key="pen" name="PEN"/>
+        <pad key="pe0" name="PE0"/>
+        <pad key="pe1" name="PE1"/>
+        <pad key="pe2" name="PE2"/>
+        <pad key="pe3" name="PE3"/>
+        <pad key="pe4" name="PE4"/>
+        <pad key="pe5" name="PE5"/>
+        <pad key="pe6" name="PE6"/>
+        <pad key="pe7" name="PE7"/>
+        <pad key="pb0" name="PB0"/>
+        <pad key="pb1" name="PB1"/>
+        <pad key="pb2" name="PB2"/>
+        <pad key="pb3" name="PB3"/>
+        <pad key="pb4" name="PB4"/>
+        <pad key="pb5" name="PB5"/>
+        <pad key="pb6" name="PB6"/>
+        <pad key="pb7" name="PB7"/>
+        <pad key="pg3" name="PG3"/>
+        <pad key="pg4" name="PG4"/>
+        <pad key="reset" name="RESET"/>
+        <pad key="vcc" name="VCC"/>
+        <pad key="gnd" name="GND"/>
+        <pad key="xtal2" name="XTAL2"/>
+        <pad key="xtal1" name="XTAL1"/>
+        <pad key="pd0" name="PD0"/>
+        <pad key="pd1" name="PD1"/>
+        <pad key="pd2" name="PD2"/>
+        <pad key="pd3" name="PD3"/>
+        <pad key="pd4" name="PD4"/>
+        <pad key="pd5" name="PD5"/>
+        <pad key="pd6" name="PD6"/>
+        <pad key="pd7" name="PD7"/>
+        <pad key="pg0" name="PG0"/>
+        <pad key="pg1" name="PG1"/>
+        <pad key="pc0" name="PC0"/>
+        <pad key="pc1" name="PC1"/>
+        <pad key="pc2" name="PC2"/>
+        <pad key="pc3" name="PC3"/>
+        <pad key="pc4" name="PC4"/>
+        <pad key="pc5" name="PC5"/>
+        <pad key="pc6" name="PC6"/>
+        <pad key="pc7" name="PC7"/>
+        <pad key="pg2" name="PG2"/>
+        <pad key="pa7" name="PA7"/>
+        <pad key="pa6" name="PA6"/>
+        <pad key="pa5" name="PA5"/>
+        <pad key="pa4" name="PA4"/>
+        <pad key="pa3" name="PA3"/>
+        <pad key="pa2" name="PA2"/>
+        <pad key="pa1" name="PA1"/>
+        <pad key="pa0" name="PA0"/>
+        <pad key="pf7" name="PF7"/>
+        <pad key="pf6" name="PF6"/>
+        <pad key="pf5" name="PF5"/>
+        <pad key="pf4" name="PF4"/>
+        <pad key="pf3" name="PF3"/>
+        <pad key="pf2" name="PF2"/>
+        <pad key="pf1" name="PF1"/>
+        <pad key="pf0" name="PF0"/>
+        <pad key="aref" name="AREF"/>
+        <pad key="avcc" name="AVCC"/>
+    </pads>
     <pinouts>
         <pinout key="tqfpqfn64" name="TQFPQFN64" type="qfn">
-            <pin position="1" pad="PEN"/>
-            <pin position="2" pad="PE0"/>
-            <pin position="3" pad="PE1"/>
-            <pin position="4" pad="PE2"/>
-            <pin position="5" pad="PE3"/>
-            <pin position="6" pad="PE4"/>
-            <pin position="7" pad="PE5"/>
-            <pin position="8" pad="PE6"/>
-            <pin position="9" pad="PE7"/>
-            <pin position="10" pad="PB0"/>
-            <pin position="11" pad="PB1"/>
-            <pin position="12" pad="PB2"/>
-            <pin position="13" pad="PB3"/>
-            <pin position="14" pad="PB4"/>
-            <pin position="15" pad="PB5"/>
-            <pin position="16" pad="PB6"/>
-            <pin position="17" pad="PB7"/>
-            <pin position="18" pad="PG3"/>
-            <pin position="19" pad="PG4"/>
-            <pin position="20" pad="RESET"/>
-            <pin position="21" pad="VCC"/>
-            <pin position="22" pad="GND"/>
-            <pin position="23" pad="XTAL2"/>
-            <pin position="24" pad="XTAL1"/>
-            <pin position="25" pad="PD0"/>
-            <pin position="26" pad="PD1"/>
-            <pin position="27" pad="PD2"/>
-            <pin position="28" pad="PD3"/>
-            <pin position="29" pad="PD4"/>
-            <pin position="30" pad="PD5"/>
-            <pin position="31" pad="PD6"/>
-            <pin position="32" pad="PD7"/>
-            <pin position="33" pad="PG0"/>
-            <pin position="34" pad="PG1"/>
-            <pin position="35" pad="PC0"/>
-            <pin position="36" pad="PC1"/>
-            <pin position="37" pad="PC2"/>
-            <pin position="38" pad="PC3"/>
-            <pin position="39" pad="PC4"/>
-            <pin position="40" pad="PC5"/>
-            <pin position="41" pad="PC6"/>
-            <pin position="42" pad="PC7"/>
-            <pin position="43" pad="PG2"/>
-            <pin position="44" pad="PA7"/>
-            <pin position="45" pad="PA6"/>
-            <pin position="46" pad="PA5"/>
-            <pin position="47" pad="PA4"/>
-            <pin position="48" pad="PA3"/>
-            <pin position="49" pad="PA2"/>
-            <pin position="50" pad="PA1"/>
-            <pin position="51" pad="PA0"/>
-            <pin position="52" pad="VCC"/>
-            <pin position="53" pad="GND"/>
-            <pin position="54" pad="PF7"/>
-            <pin position="55" pad="PF6"/>
-            <pin position="56" pad="PF5"/>
-            <pin position="57" pad="PF4"/>
-            <pin position="58" pad="PF3"/>
-            <pin position="59" pad="PF2"/>
-            <pin position="60" pad="PF1"/>
-            <pin position="61" pad="PF0"/>
-            <pin position="62" pad="AREF"/>
-            <pin position="63" pad="GND"/>
-            <pin position="64" pad="AVCC"/>
+            <pin position="1" pad-key="pen"/>
+            <pin position="2" pad-key="pe0"/>
+            <pin position="3" pad-key="pe1"/>
+            <pin position="4" pad-key="pe2"/>
+            <pin position="5" pad-key="pe3"/>
+            <pin position="6" pad-key="pe4"/>
+            <pin position="7" pad-key="pe5"/>
+            <pin position="8" pad-key="pe6"/>
+            <pin position="9" pad-key="pe7"/>
+            <pin position="10" pad-key="pb0"/>
+            <pin position="11" pad-key="pb1"/>
+            <pin position="12" pad-key="pb2"/>
+            <pin position="13" pad-key="pb3"/>
+            <pin position="14" pad-key="pb4"/>
+            <pin position="15" pad-key="pb5"/>
+            <pin position="16" pad-key="pb6"/>
+            <pin position="17" pad-key="pb7"/>
+            <pin position="18" pad-key="pg3"/>
+            <pin position="19" pad-key="pg4"/>
+            <pin position="20" pad-key="reset"/>
+            <pin position="21" pad-key="vcc"/>
+            <pin position="22" pad-key="gnd"/>
+            <pin position="23" pad-key="xtal2"/>
+            <pin position="24" pad-key="xtal1"/>
+            <pin position="25" pad-key="pd0"/>
+            <pin position="26" pad-key="pd1"/>
+            <pin position="27" pad-key="pd2"/>
+            <pin position="28" pad-key="pd3"/>
+            <pin position="29" pad-key="pd4"/>
+            <pin position="30" pad-key="pd5"/>
+            <pin position="31" pad-key="pd6"/>
+            <pin position="32" pad-key="pd7"/>
+            <pin position="33" pad-key="pg0"/>
+            <pin position="34" pad-key="pg1"/>
+            <pin position="35" pad-key="pc0"/>
+            <pin position="36" pad-key="pc1"/>
+            <pin position="37" pad-key="pc2"/>
+            <pin position="38" pad-key="pc3"/>
+            <pin position="39" pad-key="pc4"/>
+            <pin position="40" pad-key="pc5"/>
+            <pin position="41" pad-key="pc6"/>
+            <pin position="42" pad-key="pc7"/>
+            <pin position="43" pad-key="pg2"/>
+            <pin position="44" pad-key="pa7"/>
+            <pin position="45" pad-key="pa6"/>
+            <pin position="46" pad-key="pa5"/>
+            <pin position="47" pad-key="pa4"/>
+            <pin position="48" pad-key="pa3"/>
+            <pin position="49" pad-key="pa2"/>
+            <pin position="50" pad-key="pa1"/>
+            <pin position="51" pad-key="pa0"/>
+            <pin position="52" pad-key="vcc"/>
+            <pin position="53" pad-key="gnd"/>
+            <pin position="54" pad-key="pf7"/>
+            <pin position="55" pad-key="pf6"/>
+            <pin position="56" pad-key="pf5"/>
+            <pin position="57" pad-key="pf4"/>
+            <pin position="58" pad-key="pf3"/>
+            <pin position="59" pad-key="pf2"/>
+            <pin position="60" pad-key="pf1"/>
+            <pin position="61" pad-key="pf0"/>
+            <pin position="62" pad-key="aref"/>
+            <pin position="63" pad-key="gnd"/>
+            <pin position="64" pad-key="avcc"/>
         </pinout>
     </pinouts>
     <variants>
-        <variant name="ATmega64L-8AU" pinout-key="tqfpqfn64" package="TQFP64"/>
-        <variant name="ATmega64L-8MU" pinout-key="tqfpqfn64" package="QFN64"/>
-        <variant name="ATmega64-16AU" pinout-key="tqfpqfn64" package="TQFP64"/>
-        <variant name="ATmega64-16MU" pinout-key="tqfpqfn64" package="QFN64"/>
-        <variant name="ATmega64L-8AN" pinout-key="tqfpqfn64" package="TQFP64"/>
-        <variant name="ATmega64L-8MN" pinout-key="tqfpqfn64" package="QFN64"/>
-        <variant name="ATmega64-16AN" pinout-key="tqfpqfn64" package="TQFP64"/>
-        <variant name="ATmega64-16MN" pinout-key="tqfpqfn64" package="QFN64"/>
+        <variant key="atmega64l_8au" name="ATmega64L-8AU" pinout-key="tqfpqfn64"/>
+        <variant key="atmega64l_8mu" name="ATmega64L-8MU" pinout-key="tqfpqfn64"/>
+        <variant key="atmega64_16au" name="ATmega64-16AU" pinout-key="tqfpqfn64"/>
+        <variant key="atmega64_16mu" name="ATmega64-16MU" pinout-key="tqfpqfn64"/>
+        <variant key="atmega64l_8an" name="ATmega64L-8AN" pinout-key="tqfpqfn64"/>
+        <variant key="atmega64l_8mn" name="ATmega64L-8MN" pinout-key="tqfpqfn64"/>
+        <variant key="atmega64_16an" name="ATmega64-16AN" pinout-key="tqfpqfn64"/>
+        <variant key="atmega64_16mn" name="ATmega64-16MN" pinout-key="tqfpqfn64"/>
     </variants>
 </device>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA640.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA640.xml
index 65424577..5bb94149 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA640.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA640.xml
@@ -195,216 +195,214 @@
         <peripheral key="ac" name="AC" module-key="ac">
             <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"/>
+                <signal pad-key="pe2" index="0" function="default" group="AIN"/>
+                <signal pad-key="pe3" index="1" function="default" group="AIN"/>
             </signals>
         </peripheral>
         <peripheral key="usart0" name="USART0" module-key="usart">
             <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"/>
-                <signal pad-id="pe2" function="default" group="XCK"/>
+                <signal pad-key="pe1" function="default" group="TXD"/>
+                <signal pad-key="pe0" function="default" group="RXD"/>
+                <signal pad-key="pe2" function="default" group="XCK"/>
             </signals>
         </peripheral>
         <peripheral key="usart1" name="USART1" module-key="usart">
             <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"/>
-                <signal pad-id="pd5" function="default" group="XCK"/>
+                <signal pad-key="pd3" function="default" group="TXD"/>
+                <signal pad-key="pd2" function="default" group="RXD"/>
+                <signal pad-key="pd5" function="default" group="XCK"/>
             </signals>
         </peripheral>
         <peripheral key="usart2" name="USART2" module-key="usart">
             <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"/>
-                <signal pad-id="ph0" function="default" group="RXD"/>
+                <signal pad-key="ph2" function="default" group="XCK"/>
+                <signal pad-key="ph1" function="default" group="TXD"/>
+                <signal pad-key="ph0" function="default" group="RXD"/>
             </signals>
         </peripheral>
         <peripheral key="usart3" name="USART3" module-key="usart">
             <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"/>
-                <signal pad-id="pj0" function="default" group="RXD"/>
+                <signal pad-key="pj2" function="default" group="XCK"/>
+                <signal pad-key="pj1" function="default" group="TXD"/>
+                <signal pad-key="pj0" function="default" group="RXD"/>
             </signals>
         </peripheral>
         <peripheral key="twi" name="TWI" module-key="twi">
             <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"/>
+                <signal pad-key="pd1" function="default" group="SDA"/>
+                <signal pad-key="pd0" function="default" group="SCL"/>
             </signals>
         </peripheral>
         <peripheral key="spi" name="SPI" module-key="spi">
             <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"/>
-                <signal pad-id="pb3" function="default" group="MISO"/>
-                <signal pad-id="pb1" function="default" group="SCK"/>
+                <signal pad-key="pb0" function="default" group="SS"/>
+                <signal pad-key="pb2" function="default" group="MOSI"/>
+                <signal pad-key="pb3" function="default" group="MISO"/>
+                <signal pad-key="pb1" function="default" group="SCK"/>
             </signals>
         </peripheral>
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pa2" index="2" function="default" group="P"/>
-                <signal pad-id="pa3" index="3" function="default" group="P"/>
-                <signal pad-id="pa4" index="4" function="default" group="P"/>
-                <signal pad-id="pa5" index="5" function="default" group="P"/>
-                <signal pad-id="pa6" index="6" function="default" group="P"/>
-                <signal pad-id="pa7" index="7" function="default" group="P"/>
+                <signal pad-key="pa0" index="0" function="default" group="P"/>
+                <signal pad-key="pa1" index="1" function="default" group="P"/>
+                <signal pad-key="pa2" index="2" function="default" group="P"/>
+                <signal pad-key="pa3" index="3" function="default" group="P"/>
+                <signal pad-key="pa4" index="4" function="default" group="P"/>
+                <signal pad-key="pa5" index="5" function="default" group="P"/>
+                <signal pad-key="pa6" index="6" function="default" group="P"/>
+                <signal pad-key="pa7" index="7" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pb2" index="2" function="default" group="P"/>
-                <signal pad-id="pb3" index="3" function="default" group="P"/>
-                <signal pad-id="pb4" index="4" function="default" group="P"/>
-                <signal pad-id="pb5" index="5" function="default" group="P"/>
-                <signal pad-id="pb6" index="6" function="default" group="P"/>
-                <signal pad-id="pb7" index="7" function="default" group="P"/>
+                <signal pad-key="pb0" index="0" function="default" group="P"/>
+                <signal pad-key="pb1" index="1" function="default" group="P"/>
+                <signal pad-key="pb2" index="2" function="default" group="P"/>
+                <signal pad-key="pb3" index="3" function="default" group="P"/>
+                <signal pad-key="pb4" index="4" function="default" group="P"/>
+                <signal pad-key="pb5" index="5" function="default" group="P"/>
+                <signal pad-key="pb6" index="6" function="default" group="P"/>
+                <signal pad-key="pb7" index="7" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pc2" index="2" function="default" group="P"/>
-                <signal pad-id="pc3" index="3" function="default" group="P"/>
-                <signal pad-id="pc4" index="4" function="default" group="P"/>
-                <signal pad-id="pc5" index="5" function="default" group="P"/>
-                <signal pad-id="pc6" index="6" function="default" group="P"/>
-                <signal pad-id="pc7" index="7" function="default" group="P"/>
+                <signal pad-key="pc0" index="0" function="default" group="P"/>
+                <signal pad-key="pc1" index="1" function="default" group="P"/>
+                <signal pad-key="pc2" index="2" function="default" group="P"/>
+                <signal pad-key="pc3" index="3" function="default" group="P"/>
+                <signal pad-key="pc4" index="4" function="default" group="P"/>
+                <signal pad-key="pc5" index="5" function="default" group="P"/>
+                <signal pad-key="pc6" index="6" function="default" group="P"/>
+                <signal pad-key="pc7" index="7" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pd2" index="2" function="default" group="P"/>
-                <signal pad-id="pd3" index="3" function="default" group="P"/>
-                <signal pad-id="pd4" index="4" function="default" group="P"/>
-                <signal pad-id="pd5" index="5" function="default" group="P"/>
-                <signal pad-id="pd6" index="6" function="default" group="P"/>
-                <signal pad-id="pd7" index="7" function="default" group="P"/>
+                <signal pad-key="pd0" index="0" function="default" group="P"/>
+                <signal pad-key="pd1" index="1" function="default" group="P"/>
+                <signal pad-key="pd2" index="2" function="default" group="P"/>
+                <signal pad-key="pd3" index="3" function="default" group="P"/>
+                <signal pad-key="pd4" index="4" function="default" group="P"/>
+                <signal pad-key="pd5" index="5" function="default" group="P"/>
+                <signal pad-key="pd6" index="6" function="default" group="P"/>
+                <signal pad-key="pd7" index="7" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="porte" name="PORTE" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pe2" index="2" function="default" group="P"/>
-                <signal pad-id="pe3" index="3" function="default" group="P"/>
-                <signal pad-id="pe4" index="4" function="default" group="P"/>
-                <signal pad-id="pe5" index="5" function="default" group="P"/>
-                <signal pad-id="pe6" index="6" function="default" group="P"/>
-                <signal pad-id="pe7" index="7" function="default" group="P"/>
+                <signal pad-key="pe0" index="0" function="default" group="P"/>
+                <signal pad-key="pe1" index="1" function="default" group="P"/>
+                <signal pad-key="pe2" index="2" function="default" group="P"/>
+                <signal pad-key="pe3" index="3" function="default" group="P"/>
+                <signal pad-key="pe4" index="4" function="default" group="P"/>
+                <signal pad-key="pe5" index="5" function="default" group="P"/>
+                <signal pad-key="pe6" index="6" function="default" group="P"/>
+                <signal pad-key="pe7" index="7" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portf" name="PORTF" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pf2" index="2" function="default" group="P"/>
-                <signal pad-id="pf3" index="3" function="default" group="P"/>
-                <signal pad-id="pf4" index="4" function="default" group="P"/>
-                <signal pad-id="pf5" index="5" function="default" group="P"/>
-                <signal pad-id="pf6" index="6" function="default" group="P"/>
-                <signal pad-id="pf7" index="7" function="default" group="P"/>
+                <signal pad-key="pf0" index="0" function="default" group="P"/>
+                <signal pad-key="pf1" index="1" function="default" group="P"/>
+                <signal pad-key="pf2" index="2" function="default" group="P"/>
+                <signal pad-key="pf3" index="3" function="default" group="P"/>
+                <signal pad-key="pf4" index="4" function="default" group="P"/>
+                <signal pad-key="pf5" index="5" function="default" group="P"/>
+                <signal pad-key="pf6" index="6" function="default" group="P"/>
+                <signal pad-key="pf7" index="7" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portg" name="PORTG" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pg2" index="2" function="default" group="P"/>
-                <signal pad-id="pg3" index="3" function="default" group="P"/>
-                <signal pad-id="pg4" index="4" function="default" group="P"/>
-                <signal pad-id="pg5" index="5" function="default" group="P"/>
-                <signal pad-id="pg6" index="6" function="default" group="P"/>
-                <signal pad-id="pg7" index="7" function="default" group="P"/>
+                <signal pad-key="pg0" index="0" function="default" group="P"/>
+                <signal pad-key="pg1" index="1" function="default" group="P"/>
+                <signal pad-key="pg2" index="2" function="default" group="P"/>
+                <signal pad-key="pg3" index="3" function="default" group="P"/>
+                <signal pad-key="pg4" index="4" function="default" group="P"/>
+                <signal pad-key="pg5" index="5" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="porth" name="PORTH" module-key="gpio_port">
             <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"/>
-                <signal pad-id="ph2" index="2" function="default" group="P"/>
-                <signal pad-id="ph3" index="3" function="default" group="P"/>
-                <signal pad-id="ph4" index="4" function="default" group="P"/>
-                <signal pad-id="ph5" index="5" function="default" group="P"/>
-                <signal pad-id="ph6" index="6" function="default" group="P"/>
-                <signal pad-id="ph7" index="7" function="default" group="P"/>
+                <signal pad-key="ph0" index="0" function="default" group="P"/>
+                <signal pad-key="ph1" index="1" function="default" group="P"/>
+                <signal pad-key="ph2" index="2" function="default" group="P"/>
+                <signal pad-key="ph3" index="3" function="default" group="P"/>
+                <signal pad-key="ph4" index="4" function="default" group="P"/>
+                <signal pad-key="ph5" index="5" function="default" group="P"/>
+                <signal pad-key="ph6" index="6" function="default" group="P"/>
+                <signal pad-key="ph7" index="7" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portj" name="PORTJ" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pj2" index="2" function="default" group="P"/>
-                <signal pad-id="pj3" index="3" function="default" group="P"/>
-                <signal pad-id="pj4" index="4" function="default" group="P"/>
-                <signal pad-id="pj5" index="5" function="default" group="P"/>
-                <signal pad-id="pj6" index="6" function="default" group="P"/>
-                <signal pad-id="pj7" index="7" function="default" group="P"/>
+                <signal pad-key="pj0" index="0" function="default" group="P"/>
+                <signal pad-key="pj1" index="1" function="default" group="P"/>
+                <signal pad-key="pj2" index="2" function="default" group="P"/>
+                <signal pad-key="pj3" index="3" function="default" group="P"/>
+                <signal pad-key="pj4" index="4" function="default" group="P"/>
+                <signal pad-key="pj5" index="5" function="default" group="P"/>
+                <signal pad-key="pj6" index="6" function="default" group="P"/>
+                <signal pad-key="pj7" index="7" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portk" name="PORTK" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pk2" index="2" function="default" group="P"/>
-                <signal pad-id="pk3" index="3" function="default" group="P"/>
-                <signal pad-id="pk4" index="4" function="default" group="P"/>
-                <signal pad-id="pk5" index="5" function="default" group="P"/>
-                <signal pad-id="pk6" index="6" function="default" group="P"/>
-                <signal pad-id="pk7" index="7" function="default" group="P"/>
+                <signal pad-key="pk0" index="0" function="default" group="P"/>
+                <signal pad-key="pk1" index="1" function="default" group="P"/>
+                <signal pad-key="pk2" index="2" function="default" group="P"/>
+                <signal pad-key="pk3" index="3" function="default" group="P"/>
+                <signal pad-key="pk4" index="4" function="default" group="P"/>
+                <signal pad-key="pk5" index="5" function="default" group="P"/>
+                <signal pad-key="pk6" index="6" function="default" group="P"/>
+                <signal pad-key="pk7" index="7" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portl" name="PORTL" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pl2" index="2" function="default" group="P"/>
-                <signal pad-id="pl3" index="3" function="default" group="P"/>
-                <signal pad-id="pl4" index="4" function="default" group="P"/>
-                <signal pad-id="pl5" index="5" function="default" group="P"/>
-                <signal pad-id="pl6" index="6" function="default" group="P"/>
-                <signal pad-id="pl7" index="7" function="default" group="P"/>
+                <signal pad-key="pl0" index="0" function="default" group="P"/>
+                <signal pad-key="pl1" index="1" function="default" group="P"/>
+                <signal pad-key="pl2" index="2" function="default" group="P"/>
+                <signal pad-key="pl3" index="3" function="default" group="P"/>
+                <signal pad-key="pl4" index="4" function="default" group="P"/>
+                <signal pad-key="pl5" index="5" function="default" group="P"/>
+                <signal pad-key="pl6" index="6" function="default" group="P"/>
+                <signal pad-key="pl7" index="7" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="tc0" name="TC0" module-key="tc8">
             <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"/>
-                <signal pad-id="pb7" function="default" group="OCA"/>
+                <signal pad-key="pd7" function="default" group="T"/>
+                <signal pad-key="pg5" function="default" group="OCB"/>
+                <signal pad-key="pb7" function="default" group="OCA"/>
             </signals>
         </peripheral>
         <peripheral key="tc2" name="TC2" module-key="tc8_async">
             <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"/>
-                <signal pad-id="ph6" function="default" group="OCB"/>
-                <signal pad-id="pb4" function="default" group="OCA"/>
+                <signal pad-key="pg4" index="1" function="default" group="TOSC"/>
+                <signal pad-key="pg3" index="2" function="default" group="TOSC"/>
+                <signal pad-key="ph6" function="default" group="OCB"/>
+                <signal pad-key="pb4" function="default" group="OCA"/>
             </signals>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="wdt">
@@ -416,114 +414,114 @@
         <peripheral key="tc5" name="TC5" module-key="tc16">
             <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"/>
-                <signal pad-id="pl3" function="default" group="OCA"/>
-                <signal pad-id="pl2" function="default" group="T"/>
-                <signal pad-id="pl1" function="default" group="ICP"/>
+                <signal pad-key="pl5" function="default" group="OCC"/>
+                <signal pad-key="pl4" function="default" group="OCB"/>
+                <signal pad-key="pl3" function="default" group="OCA"/>
+                <signal pad-key="pl2" function="default" group="T"/>
+                <signal pad-key="pl1" function="default" group="ICP"/>
             </signals>
         </peripheral>
         <peripheral key="tc4" name="TC4" module-key="tc16">
             <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"/>
-                <signal pad-id="ph4" function="default" group="OCB"/>
-                <signal pad-id="ph3" function="default" group="OCA"/>
-                <signal pad-id="pl0" function="default" group="ICP"/>
+                <signal pad-key="ph7" function="default" group="T"/>
+                <signal pad-key="ph5" function="default" group="OCC"/>
+                <signal pad-key="ph4" function="default" group="OCB"/>
+                <signal pad-key="ph3" function="default" group="OCA"/>
+                <signal pad-key="pl0" function="default" group="ICP"/>
             </signals>
         </peripheral>
         <peripheral key="tc3" name="TC3" module-key="tc16">
             <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"/>
-                <signal pad-id="pe3" function="default" group="OCA"/>
-                <signal pad-id="pe4" function="default" group="OCB"/>
-                <signal pad-id="pe5" function="default" group="OCC"/>
+                <signal pad-key="pe6" function="default" group="T"/>
+                <signal pad-key="pe7" function="default" group="ICP"/>
+                <signal pad-key="pe3" function="default" group="OCA"/>
+                <signal pad-key="pe4" function="default" group="OCB"/>
+                <signal pad-key="pe5" function="default" group="OCC"/>
             </signals>
         </peripheral>
         <peripheral key="tc1" name="TC1" module-key="tc16">
             <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"/>
-                <signal pad-id="pb5" function="default" group="OCA"/>
-                <signal pad-id="pb6" function="default" group="OCB"/>
-                <signal pad-id="pb7" function="default" group="OCC"/>
+                <signal pad-key="pd6" function="default" group="T"/>
+                <signal pad-key="pd4" function="default" group="ICP"/>
+                <signal pad-key="pb5" function="default" group="OCA"/>
+                <signal pad-key="pb6" function="default" group="OCB"/>
+                <signal pad-key="pb7" function="default" group="OCC"/>
             </signals>
         </peripheral>
         <peripheral key="jtag" name="JTAG" module-key="jtag">
             <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"/>
-                <signal pad-id="pf6" function="default" group="TDO"/>
-                <signal pad-id="pf7" function="default" group="TDI"/>
+                <signal pad-key="pf4" function="default" group="TCK"/>
+                <signal pad-key="pf5" function="default" group="TMS"/>
+                <signal pad-key="pf6" function="default" group="TDO"/>
+                <signal pad-key="pf7" function="default" group="TDI"/>
             </signals>
         </peripheral>
         <peripheral key="exint" name="EXINT" module-key="exint">
             <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"/>
-                <signal pad-id="pb2" index="2" function="default" group="PCINT"/>
-                <signal pad-id="pb3" index="3" function="default" group="PCINT"/>
-                <signal pad-id="pb4" index="4" function="default" group="PCINT"/>
-                <signal pad-id="pb5" index="5" function="default" group="PCINT"/>
-                <signal pad-id="pb6" index="6" function="default" group="PCINT"/>
-                <signal pad-id="pb7" index="7" function="default" group="PCINT"/>
-                <signal pad-id="pe0" index="8" function="default" group="PCINT"/>
-                <signal pad-id="pj0" index="9" function="default" group="PCINT"/>
-                <signal pad-id="pj1" index="10" function="default" group="PCINT"/>
-                <signal pad-id="pj2" index="11" function="default" group="PCINT"/>
-                <signal pad-id="pj3" index="12" function="default" group="PCINT"/>
-                <signal pad-id="pj4" index="13" function="default" group="PCINT"/>
-                <signal pad-id="pj5" index="14" function="default" group="PCINT"/>
-                <signal pad-id="pj6" index="15" function="default" group="PCINT"/>
-                <signal pad-id="pk0" index="16" function="default" group="PCINT"/>
-                <signal pad-id="pk1" index="17" function="default" group="PCINT"/>
-                <signal pad-id="pk2" index="18" function="default" group="PCINT"/>
-                <signal pad-id="pk3" index="19" function="default" group="PCINT"/>
-                <signal pad-id="pk4" index="20" function="default" group="PCINT"/>
-                <signal pad-id="pk5" index="21" function="default" group="PCINT"/>
-                <signal pad-id="pk6" index="22" function="default" group="PCINT"/>
-                <signal pad-id="pk7" index="23" function="default" group="PCINT"/>
-                <signal pad-id="pd0" index="0" function="default" group="INT"/>
-                <signal pad-id="pd1" index="1" function="default" group="INT"/>
-                <signal pad-id="pd2" index="2" function="default" group="INT"/>
-                <signal pad-id="pd3" index="3" function="default" group="INT"/>
-                <signal pad-id="pe4" index="4" function="default" group="INT"/>
-                <signal pad-id="pe5" index="5" function="default" group="INT"/>
-                <signal pad-id="pe6" index="6" function="default" group="INT"/>
-                <signal pad-id="pe7" index="7" function="default" group="INT"/>
+                <signal pad-key="pb0" index="0" function="default" group="PCINT"/>
+                <signal pad-key="pb1" index="1" function="default" group="PCINT"/>
+                <signal pad-key="pb2" index="2" function="default" group="PCINT"/>
+                <signal pad-key="pb3" index="3" function="default" group="PCINT"/>
+                <signal pad-key="pb4" index="4" function="default" group="PCINT"/>
+                <signal pad-key="pb5" index="5" function="default" group="PCINT"/>
+                <signal pad-key="pb6" index="6" function="default" group="PCINT"/>
+                <signal pad-key="pb7" index="7" function="default" group="PCINT"/>
+                <signal pad-key="pe0" index="8" function="default" group="PCINT"/>
+                <signal pad-key="pj0" index="9" function="default" group="PCINT"/>
+                <signal pad-key="pj1" index="10" function="default" group="PCINT"/>
+                <signal pad-key="pj2" index="11" function="default" group="PCINT"/>
+                <signal pad-key="pj3" index="12" function="default" group="PCINT"/>
+                <signal pad-key="pj4" index="13" function="default" group="PCINT"/>
+                <signal pad-key="pj5" index="14" function="default" group="PCINT"/>
+                <signal pad-key="pj6" index="15" function="default" group="PCINT"/>
+                <signal pad-key="pk0" index="16" function="default" group="PCINT"/>
+                <signal pad-key="pk1" index="17" function="default" group="PCINT"/>
+                <signal pad-key="pk2" index="18" function="default" group="PCINT"/>
+                <signal pad-key="pk3" index="19" function="default" group="PCINT"/>
+                <signal pad-key="pk4" index="20" function="default" group="PCINT"/>
+                <signal pad-key="pk5" index="21" function="default" group="PCINT"/>
+                <signal pad-key="pk6" index="22" function="default" group="PCINT"/>
+                <signal pad-key="pk7" index="23" function="default" group="PCINT"/>
+                <signal pad-key="pd0" index="0" function="default" group="INT"/>
+                <signal pad-key="pd1" index="1" function="default" group="INT"/>
+                <signal pad-key="pd2" index="2" function="default" group="INT"/>
+                <signal pad-key="pd3" index="3" function="default" group="INT"/>
+                <signal pad-key="pe4" index="4" function="default" group="INT"/>
+                <signal pad-key="pe5" index="5" function="default" group="INT"/>
+                <signal pad-key="pe6" index="6" function="default" group="INT"/>
+                <signal pad-key="pe7" index="7" function="default" group="INT"/>
             </signals>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="cpu">
             <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"/>
+                <signal pad-key="pe7" index="0" function="default" group="CLKO"/>
             </signals>
         </peripheral>
         <peripheral key="adc" name="ADC" module-key="adc">
             <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"/>
-                <signal pad-id="pf2" index="2" function="default" group="ADC"/>
-                <signal pad-id="pf3" index="3" function="default" group="ADC"/>
-                <signal pad-id="pf4" index="4" function="default" group="ADC"/>
-                <signal pad-id="pf5" index="5" function="default" group="ADC"/>
-                <signal pad-id="pf6" index="6" function="default" group="ADC"/>
-                <signal pad-id="pf7" index="7" function="default" group="ADC"/>
-                <signal pad-id="pk0" index="8" function="default" group="ADC"/>
-                <signal pad-id="pk1" index="9" function="default" group="ADC"/>
-                <signal pad-id="pk2" index="10" function="default" group="ADC"/>
-                <signal pad-id="pk3" index="11" function="default" group="ADC"/>
-                <signal pad-id="pk4" index="12" function="default" group="ADC"/>
-                <signal pad-id="pk5" index="13" function="default" group="ADC"/>
-                <signal pad-id="pk6" index="14" function="default" group="ADC"/>
-                <signal pad-id="pk7" index="15" function="default" group="ADC"/>
+                <signal pad-key="pf0" index="0" function="default" group="ADC"/>
+                <signal pad-key="pf1" index="1" function="default" group="ADC"/>
+                <signal pad-key="pf2" index="2" function="default" group="ADC"/>
+                <signal pad-key="pf3" index="3" function="default" group="ADC"/>
+                <signal pad-key="pf4" index="4" function="default" group="ADC"/>
+                <signal pad-key="pf5" index="5" function="default" group="ADC"/>
+                <signal pad-key="pf6" index="6" function="default" group="ADC"/>
+                <signal pad-key="pf7" index="7" function="default" group="ADC"/>
+                <signal pad-key="pk0" index="8" function="default" group="ADC"/>
+                <signal pad-key="pk1" index="9" function="default" group="ADC"/>
+                <signal pad-key="pk2" index="10" function="default" group="ADC"/>
+                <signal pad-key="pk3" index="11" function="default" group="ADC"/>
+                <signal pad-key="pk4" index="12" function="default" group="ADC"/>
+                <signal pad-key="pk5" index="13" function="default" group="ADC"/>
+                <signal pad-key="pk6" index="14" function="default" group="ADC"/>
+                <signal pad-key="pk7" index="15" function="default" group="ADC"/>
             </signals>
         </peripheral>
         <peripheral key="boot_load" name="BOOT_LOAD" module-key="boot_load">
@@ -1249,216 +1247,311 @@
             </register-group>
         </module>
     </modules>
+    <pads>
+        <pad key="pg5" name="PG5"/>
+        <pad key="pe0" name="PE0"/>
+        <pad key="pe1" name="PE1"/>
+        <pad key="pe2" name="PE2"/>
+        <pad key="pe3" name="PE3"/>
+        <pad key="pe4" name="PE4"/>
+        <pad key="pe5" name="PE5"/>
+        <pad key="pe6" name="PE6"/>
+        <pad key="pe7" name="PE7"/>
+        <pad key="vcc" name="VCC"/>
+        <pad key="gnd" name="GND"/>
+        <pad key="ph0" name="PH0"/>
+        <pad key="ph1" name="PH1"/>
+        <pad key="ph2" name="PH2"/>
+        <pad key="ph3" name="PH3"/>
+        <pad key="ph4" name="PH4"/>
+        <pad key="ph5" name="PH5"/>
+        <pad key="ph6" name="PH6"/>
+        <pad key="pb0" name="PB0"/>
+        <pad key="pb1" name="PB1"/>
+        <pad key="pb2" name="PB2"/>
+        <pad key="pb3" name="PB3"/>
+        <pad key="pb4" name="PB4"/>
+        <pad key="pb5" name="PB5"/>
+        <pad key="pb6" name="PB6"/>
+        <pad key="pb7" name="PB7"/>
+        <pad key="ph7" name="PH7"/>
+        <pad key="pg3" name="PG3"/>
+        <pad key="pg4" name="PG4"/>
+        <pad key="reset" name="RESET"/>
+        <pad key="xtal2" name="XTAL2"/>
+        <pad key="xtal1" name="XTAL1"/>
+        <pad key="pl0" name="PL0"/>
+        <pad key="pl1" name="PL1"/>
+        <pad key="pl2" name="PL2"/>
+        <pad key="pl3" name="PL3"/>
+        <pad key="pl4" name="PL4"/>
+        <pad key="pl5" name="PL5"/>
+        <pad key="pl6" name="PL6"/>
+        <pad key="pl7" name="PL7"/>
+        <pad key="pd0" name="PD0"/>
+        <pad key="pd1" name="PD1"/>
+        <pad key="pd2" name="PD2"/>
+        <pad key="pd3" name="PD3"/>
+        <pad key="pd4" name="PD4"/>
+        <pad key="pd5" name="PD5"/>
+        <pad key="pd6" name="PD6"/>
+        <pad key="pd7" name="PD7"/>
+        <pad key="pg0" name="PG0"/>
+        <pad key="pg1" name="PG1"/>
+        <pad key="pc0" name="PC0"/>
+        <pad key="pc1" name="PC1"/>
+        <pad key="pc2" name="PC2"/>
+        <pad key="pc3" name="PC3"/>
+        <pad key="pc4" name="PC4"/>
+        <pad key="pc5" name="PC5"/>
+        <pad key="pc6" name="PC6"/>
+        <pad key="pc7" name="PC7"/>
+        <pad key="pj0" name="PJ0"/>
+        <pad key="pj1" name="PJ1"/>
+        <pad key="pj2" name="PJ2"/>
+        <pad key="pj3" name="PJ3"/>
+        <pad key="pj4" name="PJ4"/>
+        <pad key="pj5" name="PJ5"/>
+        <pad key="pj6" name="PJ6"/>
+        <pad key="pg2" name="PG2"/>
+        <pad key="pa7" name="PA7"/>
+        <pad key="pa6" name="PA6"/>
+        <pad key="pa5" name="PA5"/>
+        <pad key="pa4" name="PA4"/>
+        <pad key="pa3" name="PA3"/>
+        <pad key="pa2" name="PA2"/>
+        <pad key="pa1" name="PA1"/>
+        <pad key="pa0" name="PA0"/>
+        <pad key="pj7" name="PJ7"/>
+        <pad key="pk7" name="PK7"/>
+        <pad key="pk6" name="PK6"/>
+        <pad key="pk5" name="PK5"/>
+        <pad key="pk4" name="PK4"/>
+        <pad key="pk3" name="PK3"/>
+        <pad key="pk2" name="PK2"/>
+        <pad key="pk1" name="PK1"/>
+        <pad key="pk0" name="PK0"/>
+        <pad key="pf7" name="PF7"/>
+        <pad key="pf6" name="PF6"/>
+        <pad key="pf5" name="PF5"/>
+        <pad key="pf4" name="PF4"/>
+        <pad key="pf3" name="PF3"/>
+        <pad key="pf2" name="PF2"/>
+        <pad key="pf1" name="PF1"/>
+        <pad key="pf0" name="PF0"/>
+        <pad key="aref" name="AREF"/>
+        <pad key="avcc" name="AVCC"/>
+    </pads>
     <pinouts>
         <pinout key="tqfp100" name="TQFP100" type="qfp">
-            <pin position="1" pad="PG5"/>
-            <pin position="2" pad="PE0"/>
-            <pin position="3" pad="PE1"/>
-            <pin position="4" pad="PE2"/>
-            <pin position="5" pad="PE3"/>
-            <pin position="6" pad="PE4"/>
-            <pin position="7" pad="PE5"/>
-            <pin position="8" pad="PE6"/>
-            <pin position="9" pad="PE7"/>
-            <pin position="10" pad="VCC"/>
-            <pin position="11" pad="GND"/>
-            <pin position="12" pad="PH0"/>
-            <pin position="13" pad="PH1"/>
-            <pin position="14" pad="PH2"/>
-            <pin position="15" pad="PH3"/>
-            <pin position="16" pad="PH4"/>
-            <pin position="17" pad="PH5"/>
-            <pin position="18" pad="PH6"/>
-            <pin position="19" pad="PB0"/>
-            <pin position="20" pad="PB1"/>
-            <pin position="21" pad="PB2"/>
-            <pin position="22" pad="PB3"/>
-            <pin position="23" pad="PB4"/>
-            <pin position="24" pad="PB5"/>
-            <pin position="25" pad="PB6"/>
-            <pin position="26" pad="PB7"/>
-            <pin position="27" pad="PH7"/>
-            <pin position="28" pad="PG3"/>
-            <pin position="29" pad="PG4"/>
-            <pin position="30" pad="RESET"/>
-            <pin position="31" pad="VCC"/>
-            <pin position="32" pad="GND"/>
-            <pin position="33" pad="XTAL2"/>
-            <pin position="34" pad="XTAL1"/>
-            <pin position="35" pad="PL0"/>
-            <pin position="36" pad="PL1"/>
-            <pin position="37" pad="PL2"/>
-            <pin position="38" pad="PL3"/>
-            <pin position="39" pad="PL4"/>
-            <pin position="40" pad="PL5"/>
-            <pin position="41" pad="PL6"/>
-            <pin position="42" pad="PL7"/>
-            <pin position="43" pad="PD0"/>
-            <pin position="44" pad="PD1"/>
-            <pin position="45" pad="PD2"/>
-            <pin position="46" pad="PD3"/>
-            <pin position="47" pad="PD4"/>
-            <pin position="48" pad="PD5"/>
-            <pin position="49" pad="PD6"/>
-            <pin position="50" pad="PD7"/>
-            <pin position="51" pad="PG0"/>
-            <pin position="52" pad="PG1"/>
-            <pin position="53" pad="PC0"/>
-            <pin position="54" pad="PC1"/>
-            <pin position="55" pad="PC2"/>
-            <pin position="56" pad="PC3"/>
-            <pin position="57" pad="PC4"/>
-            <pin position="58" pad="PC5"/>
-            <pin position="59" pad="PC6"/>
-            <pin position="60" pad="PC7"/>
-            <pin position="61" pad="VCC"/>
-            <pin position="62" pad="GND"/>
-            <pin position="63" pad="PJ0"/>
-            <pin position="64" pad="PJ1"/>
-            <pin position="65" pad="PJ2"/>
-            <pin position="66" pad="PJ3"/>
-            <pin position="67" pad="PJ4"/>
-            <pin position="68" pad="PJ5"/>
-            <pin position="69" pad="PJ6"/>
-            <pin position="70" pad="PG2"/>
-            <pin position="71" pad="PA7"/>
-            <pin position="72" pad="PA6"/>
-            <pin position="73" pad="PA5"/>
-            <pin position="74" pad="PA4"/>
-            <pin position="75" pad="PA3"/>
-            <pin position="76" pad="PA2"/>
-            <pin position="77" pad="PA1"/>
-            <pin position="78" pad="PA0"/>
-            <pin position="79" pad="PJ7"/>
-            <pin position="80" pad="VCC"/>
-            <pin position="81" pad="GND"/>
-            <pin position="82" pad="PK7"/>
-            <pin position="83" pad="PK6"/>
-            <pin position="84" pad="PK5"/>
-            <pin position="85" pad="PK4"/>
-            <pin position="86" pad="PK3"/>
-            <pin position="87" pad="PK2"/>
-            <pin position="88" pad="PK1"/>
-            <pin position="89" pad="PK0"/>
-            <pin position="90" pad="PF7"/>
-            <pin position="91" pad="PF6"/>
-            <pin position="92" pad="PF5"/>
-            <pin position="93" pad="PF4"/>
-            <pin position="94" pad="PF3"/>
-            <pin position="95" pad="PF2"/>
-            <pin position="96" pad="PF1"/>
-            <pin position="97" pad="PF0"/>
-            <pin position="98" pad="AREF"/>
-            <pin position="99" pad="GND"/>
-            <pin position="100" pad="AVCC"/>
+            <pin position="1" pad-key="pg5"/>
+            <pin position="2" pad-key="pe0"/>
+            <pin position="3" pad-key="pe1"/>
+            <pin position="4" pad-key="pe2"/>
+            <pin position="5" pad-key="pe3"/>
+            <pin position="6" pad-key="pe4"/>
+            <pin position="7" pad-key="pe5"/>
+            <pin position="8" pad-key="pe6"/>
+            <pin position="9" pad-key="pe7"/>
+            <pin position="10" pad-key="vcc"/>
+            <pin position="11" pad-key="gnd"/>
+            <pin position="12" pad-key="ph0"/>
+            <pin position="13" pad-key="ph1"/>
+            <pin position="14" pad-key="ph2"/>
+            <pin position="15" pad-key="ph3"/>
+            <pin position="16" pad-key="ph4"/>
+            <pin position="17" pad-key="ph5"/>
+            <pin position="18" pad-key="ph6"/>
+            <pin position="19" pad-key="pb0"/>
+            <pin position="20" pad-key="pb1"/>
+            <pin position="21" pad-key="pb2"/>
+            <pin position="22" pad-key="pb3"/>
+            <pin position="23" pad-key="pb4"/>
+            <pin position="24" pad-key="pb5"/>
+            <pin position="25" pad-key="pb6"/>
+            <pin position="26" pad-key="pb7"/>
+            <pin position="27" pad-key="ph7"/>
+            <pin position="28" pad-key="pg3"/>
+            <pin position="29" pad-key="pg4"/>
+            <pin position="30" pad-key="reset"/>
+            <pin position="31" pad-key="vcc"/>
+            <pin position="32" pad-key="gnd"/>
+            <pin position="33" pad-key="xtal2"/>
+            <pin position="34" pad-key="xtal1"/>
+            <pin position="35" pad-key="pl0"/>
+            <pin position="36" pad-key="pl1"/>
+            <pin position="37" pad-key="pl2"/>
+            <pin position="38" pad-key="pl3"/>
+            <pin position="39" pad-key="pl4"/>
+            <pin position="40" pad-key="pl5"/>
+            <pin position="41" pad-key="pl6"/>
+            <pin position="42" pad-key="pl7"/>
+            <pin position="43" pad-key="pd0"/>
+            <pin position="44" pad-key="pd1"/>
+            <pin position="45" pad-key="pd2"/>
+            <pin position="46" pad-key="pd3"/>
+            <pin position="47" pad-key="pd4"/>
+            <pin position="48" pad-key="pd5"/>
+            <pin position="49" pad-key="pd6"/>
+            <pin position="50" pad-key="pd7"/>
+            <pin position="51" pad-key="pg0"/>
+            <pin position="52" pad-key="pg1"/>
+            <pin position="53" pad-key="pc0"/>
+            <pin position="54" pad-key="pc1"/>
+            <pin position="55" pad-key="pc2"/>
+            <pin position="56" pad-key="pc3"/>
+            <pin position="57" pad-key="pc4"/>
+            <pin position="58" pad-key="pc5"/>
+            <pin position="59" pad-key="pc6"/>
+            <pin position="60" pad-key="pc7"/>
+            <pin position="61" pad-key="vcc"/>
+            <pin position="62" pad-key="gnd"/>
+            <pin position="63" pad-key="pj0"/>
+            <pin position="64" pad-key="pj1"/>
+            <pin position="65" pad-key="pj2"/>
+            <pin position="66" pad-key="pj3"/>
+            <pin position="67" pad-key="pj4"/>
+            <pin position="68" pad-key="pj5"/>
+            <pin position="69" pad-key="pj6"/>
+            <pin position="70" pad-key="pg2"/>
+            <pin position="71" pad-key="pa7"/>
+            <pin position="72" pad-key="pa6"/>
+            <pin position="73" pad-key="pa5"/>
+            <pin position="74" pad-key="pa4"/>
+            <pin position="75" pad-key="pa3"/>
+            <pin position="76" pad-key="pa2"/>
+            <pin position="77" pad-key="pa1"/>
+            <pin position="78" pad-key="pa0"/>
+            <pin position="79" pad-key="pj7"/>
+            <pin position="80" pad-key="vcc"/>
+            <pin position="81" pad-key="gnd"/>
+            <pin position="82" pad-key="pk7"/>
+            <pin position="83" pad-key="pk6"/>
+            <pin position="84" pad-key="pk5"/>
+            <pin position="85" pad-key="pk4"/>
+            <pin position="86" pad-key="pk3"/>
+            <pin position="87" pad-key="pk2"/>
+            <pin position="88" pad-key="pk1"/>
+            <pin position="89" pad-key="pk0"/>
+            <pin position="90" pad-key="pf7"/>
+            <pin position="91" pad-key="pf6"/>
+            <pin position="92" pad-key="pf5"/>
+            <pin position="93" pad-key="pf4"/>
+            <pin position="94" pad-key="pf3"/>
+            <pin position="95" pad-key="pf2"/>
+            <pin position="96" pad-key="pf1"/>
+            <pin position="97" pad-key="pf0"/>
+            <pin position="98" pad-key="aref"/>
+            <pin position="99" pad-key="gnd"/>
+            <pin position="100" pad-key="avcc"/>
         </pinout>
         <pinout key="cbga100" name="CBGA100" type="bga">
-            <pin position="A1" pad="GND"/>
-            <pin position="B1" pad="AVCC"/>
-            <pin position="C1" pad="PE2"/>
-            <pin position="D1" pad="PE3"/>
-            <pin position="E1" pad="PE7"/>
-            <pin position="F1" pad="VCC"/>
-            <pin position="G1" pad="GND"/>
-            <pin position="H1" pad="PB3"/>
-            <pin position="J1" pad="PH7"/>
-            <pin position="K1" pad="PB7"/>
-            <pin position="A2" pad="AREF"/>
-            <pin position="B2" pad="PG5"/>
-            <pin position="C2" pad="PE0"/>
-            <pin position="D2" pad="PE4"/>
-            <pin position="E2" pad="PH0"/>
-            <pin position="F2" pad="PH4"/>
-            <pin position="G2" pad="PB1"/>
-            <pin position="H2" pad="PB4"/>
-            <pin position="J2" pad="PG3"/>
-            <pin position="K2" pad="PG4"/>
-            <pin position="A3" pad="PF0"/>
-            <pin position="B3" pad="PF1"/>
-            <pin position="C3" pad="PE1"/>
-            <pin position="D3" pad="PE5"/>
-            <pin position="E3" pad="PH1"/>
-            <pin position="F3" pad="PH6"/>
-            <pin position="G3" pad="PB2"/>
-            <pin position="H3" pad="RESET"/>
-            <pin position="J3" pad="PB6"/>
-            <pin position="K3" pad="VCC"/>
-            <pin position="A4" pad="PF2"/>
-            <pin position="B4" pad="PF3"/>
-            <pin position="C4" pad="PF4"/>
-            <pin position="D4" pad="PE6"/>
-            <pin position="E4" pad="PH3"/>
-            <pin position="F4" pad="PB0"/>
-            <pin position="G4" pad="PB5"/>
-            <pin position="H4" pad="PL1"/>
-            <pin position="J4" pad="PL0"/>
-            <pin position="K4" pad="GND"/>
-            <pin position="A5" pad="PF5"/>
-            <pin position="B5" pad="PF6"/>
-            <pin position="C5" pad="PF7"/>
-            <pin position="D5" pad="PH2"/>
-            <pin position="E5" pad="PH5"/>
-            <pin position="F5" pad="PL4"/>
-            <pin position="G5" pad="PL2"/>
-            <pin position="H5" pad="PL3"/>
-            <pin position="J5" pad="XTAL2"/>
-            <pin position="K5" pad="XTAL1"/>
-            <pin position="A6" pad="PK0"/>
-            <pin position="B6" pad="PK1"/>
-            <pin position="C6" pad="PK2"/>
-            <pin position="D6" pad="PA4"/>
-            <pin position="E6" pad="PJ6"/>
-            <pin position="F6" pad="PD1"/>
-            <pin position="G6" pad="PD0"/>
-            <pin position="H6" pad="PL7"/>
-            <pin position="J6" pad="PL6"/>
-            <pin position="K6" pad="PL5"/>
-            <pin position="A7" pad="PK3"/>
-            <pin position="B7" pad="PK4"/>
-            <pin position="C7" pad="PK5"/>
-            <pin position="D7" pad="PA5"/>
-            <pin position="E7" pad="PJ5"/>
-            <pin position="F7" pad="PJ1"/>
-            <pin position="G7" pad="PD5"/>
-            <pin position="H7" pad="PD4"/>
-            <pin position="J7" pad="PD3"/>
-            <pin position="K7" pad="PD2"/>
-            <pin position="A8" pad="PK6"/>
-            <pin position="B8" pad="PK7"/>
-            <pin position="C8" pad="PJ7"/>
-            <pin position="D8" pad="PA6"/>
-            <pin position="E8" pad="PJ4"/>
-            <pin position="F8" pad="PJ0"/>
-            <pin position="G8" pad="PC5"/>
-            <pin position="H8" pad="PC4"/>
-            <pin position="J8" pad="PC1"/>
-            <pin position="K8" pad="PD6"/>
-            <pin position="A9" pad="GND"/>
-            <pin position="B9" pad="PA0"/>
-            <pin position="C9" pad="PA1"/>
-            <pin position="D9" pad="PA7"/>
-            <pin position="E9" pad="PJ3"/>
-            <pin position="F9" pad="PC7"/>
-            <pin position="G9" pad="PC6"/>
-            <pin position="H9" pad="PC3"/>
-            <pin position="J9" pad="PC0"/>
-            <pin position="K9" pad="PD7"/>
-            <pin position="A10" pad="VCC"/>
-            <pin position="B10" pad="PA2"/>
-            <pin position="C10" pad="PA3"/>
-            <pin position="D10" pad="PG2"/>
-            <pin position="E10" pad="PJ2"/>
-            <pin position="F10" pad="GND"/>
-            <pin position="G10" pad="VCC"/>
-            <pin position="H10" pad="PC2"/>
-            <pin position="J10" pad="PG1"/>
-            <pin position="K10" pad="PG0"/>
+            <pin position="A1" pad-key="gnd"/>
+            <pin position="B1" pad-key="avcc"/>
+            <pin position="C1" pad-key="pe2"/>
+            <pin position="D1" pad-key="pe3"/>
+            <pin position="E1" pad-key="pe7"/>
+            <pin position="F1" pad-key="vcc"/>
+            <pin position="G1" pad-key="gnd"/>
+            <pin position="H1" pad-key="pb3"/>
+            <pin position="J1" pad-key="ph7"/>
+            <pin position="K1" pad-key="pb7"/>
+            <pin position="A2" pad-key="aref"/>
+            <pin position="B2" pad-key="pg5"/>
+            <pin position="C2" pad-key="pe0"/>
+            <pin position="D2" pad-key="pe4"/>
+            <pin position="E2" pad-key="ph0"/>
+            <pin position="F2" pad-key="ph4"/>
+            <pin position="G2" pad-key="pb1"/>
+            <pin position="H2" pad-key="pb4"/>
+            <pin position="J2" pad-key="pg3"/>
+            <pin position="K2" pad-key="pg4"/>
+            <pin position="A3" pad-key="pf0"/>
+            <pin position="B3" pad-key="pf1"/>
+            <pin position="C3" pad-key="pe1"/>
+            <pin position="D3" pad-key="pe5"/>
+            <pin position="E3" pad-key="ph1"/>
+            <pin position="F3" pad-key="ph6"/>
+            <pin position="G3" pad-key="pb2"/>
+            <pin position="H3" pad-key="reset"/>
+            <pin position="J3" pad-key="pb6"/>
+            <pin position="K3" pad-key="vcc"/>
+            <pin position="A4" pad-key="pf2"/>
+            <pin position="B4" pad-key="pf3"/>
+            <pin position="C4" pad-key="pf4"/>
+            <pin position="D4" pad-key="pe6"/>
+            <pin position="E4" pad-key="ph3"/>
+            <pin position="F4" pad-key="pb0"/>
+            <pin position="G4" pad-key="pb5"/>
+            <pin position="H4" pad-key="pl1"/>
+            <pin position="J4" pad-key="pl0"/>
+            <pin position="K4" pad-key="gnd"/>
+            <pin position="A5" pad-key="pf5"/>
+            <pin position="B5" pad-key="pf6"/>
+            <pin position="C5" pad-key="pf7"/>
+            <pin position="D5" pad-key="ph2"/>
+            <pin position="E5" pad-key="ph5"/>
+            <pin position="F5" pad-key="pl4"/>
+            <pin position="G5" pad-key="pl2"/>
+            <pin position="H5" pad-key="pl3"/>
+            <pin position="J5" pad-key="xtal2"/>
+            <pin position="K5" pad-key="xtal1"/>
+            <pin position="A6" pad-key="pk0"/>
+            <pin position="B6" pad-key="pk1"/>
+            <pin position="C6" pad-key="pk2"/>
+            <pin position="D6" pad-key="pa4"/>
+            <pin position="E6" pad-key="pj6"/>
+            <pin position="F6" pad-key="pd1"/>
+            <pin position="G6" pad-key="pd0"/>
+            <pin position="H6" pad-key="pl7"/>
+            <pin position="J6" pad-key="pl6"/>
+            <pin position="K6" pad-key="pl5"/>
+            <pin position="A7" pad-key="pk3"/>
+            <pin position="B7" pad-key="pk4"/>
+            <pin position="C7" pad-key="pk5"/>
+            <pin position="D7" pad-key="pa5"/>
+            <pin position="E7" pad-key="pj5"/>
+            <pin position="F7" pad-key="pj1"/>
+            <pin position="G7" pad-key="pd5"/>
+            <pin position="H7" pad-key="pd4"/>
+            <pin position="J7" pad-key="pd3"/>
+            <pin position="K7" pad-key="pd2"/>
+            <pin position="A8" pad-key="pk6"/>
+            <pin position="B8" pad-key="pk7"/>
+            <pin position="C8" pad-key="pj7"/>
+            <pin position="D8" pad-key="pa6"/>
+            <pin position="E8" pad-key="pj4"/>
+            <pin position="F8" pad-key="pj0"/>
+            <pin position="G8" pad-key="pc5"/>
+            <pin position="H8" pad-key="pc4"/>
+            <pin position="J8" pad-key="pc1"/>
+            <pin position="K8" pad-key="pd6"/>
+            <pin position="A9" pad-key="gnd"/>
+            <pin position="B9" pad-key="pa0"/>
+            <pin position="C9" pad-key="pa1"/>
+            <pin position="D9" pad-key="pa7"/>
+            <pin position="E9" pad-key="pj3"/>
+            <pin position="F9" pad-key="pc7"/>
+            <pin position="G9" pad-key="pc6"/>
+            <pin position="H9" pad-key="pc3"/>
+            <pin position="J9" pad-key="pc0"/>
+            <pin position="K9" pad-key="pd7"/>
+            <pin position="A10" pad-key="vcc"/>
+            <pin position="B10" pad-key="pa2"/>
+            <pin position="C10" pad-key="pa3"/>
+            <pin position="D10" pad-key="pg2"/>
+            <pin position="E10" pad-key="pj2"/>
+            <pin position="F10" pad-key="gnd"/>
+            <pin position="G10" pad-key="vcc"/>
+            <pin position="H10" pad-key="pc2"/>
+            <pin position="J10" pad-key="pg1"/>
+            <pin position="K10" pad-key="pg0"/>
         </pinout>
     </pinouts>
     <variants>
-        <variant name="ATmega640V-8AU" pinout-key="tqfp100" package="TQFP100"/>
-        <variant name="ATmega640V-8CU" pinout-key="cbga100" package="CBGA100"/>
-        <variant name="ATmega640-16AU" pinout-key="tqfp100" package="TQFP100"/>
-        <variant name="ATmega640-16CU" pinout-key="cbga100" package="CBGA100"/>
+        <variant key="atmega640v_8au" name="ATmega640V-8AU" pinout-key="tqfp100"/>
+        <variant key="atmega640v_8cu" name="ATmega640V-8CU" pinout-key="cbga100"/>
+        <variant key="atmega640_16au" name="ATmega640-16AU" pinout-key="tqfp100"/>
+        <variant key="atmega640_16cu" name="ATmega640-16CU" pinout-key="cbga100"/>
     </variants>
 </device>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA644.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA644.xml
index 5db64cbc..5e64fc8f 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA644.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA644.xml
@@ -220,84 +220,84 @@
         <peripheral key="ac" name="AC" module-key="ac">
             <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"/>
+                <signal pad-key="pb2" index="0" function="default" group="AIN"/>
+                <signal pad-key="pb3" index="1" function="default" group="AIN"/>
             </signals>
         </peripheral>
         <peripheral key="usart0" name="USART0" module-key="usart">
             <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"/>
-                <signal pad-id="pb0" index="0" function="default" group="XCK"/>
+                <signal pad-key="pd1" index="0" function="default" group="TXD"/>
+                <signal pad-key="pd0" index="0" function="default" group="RXD"/>
+                <signal pad-key="pb0" index="0" function="default" group="XCK"/>
             </signals>
         </peripheral>
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pa2" index="2" function="default" group="P"/>
-                <signal pad-id="pa3" index="3" function="default" group="P"/>
-                <signal pad-id="pa4" index="4" function="default" group="P"/>
-                <signal pad-id="pa5" index="5" function="default" group="P"/>
-                <signal pad-id="pa6" index="6" function="default" group="P"/>
-                <signal pad-id="pa7" index="7" function="default" group="P"/>
+                <signal pad-key="pa0" index="0" function="default" group="P"/>
+                <signal pad-key="pa1" index="1" function="default" group="P"/>
+                <signal pad-key="pa2" index="2" function="default" group="P"/>
+                <signal pad-key="pa3" index="3" function="default" group="P"/>
+                <signal pad-key="pa4" index="4" function="default" group="P"/>
+                <signal pad-key="pa5" index="5" function="default" group="P"/>
+                <signal pad-key="pa6" index="6" function="default" group="P"/>
+                <signal pad-key="pa7" index="7" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pb2" index="2" function="default" group="P"/>
-                <signal pad-id="pb3" index="3" function="default" group="P"/>
-                <signal pad-id="pb4" index="4" function="default" group="P"/>
-                <signal pad-id="pb5" index="5" function="default" group="P"/>
-                <signal pad-id="pb6" index="6" function="default" group="P"/>
-                <signal pad-id="pb7" index="7" function="default" group="P"/>
+                <signal pad-key="pb0" index="0" function="default" group="P"/>
+                <signal pad-key="pb1" index="1" function="default" group="P"/>
+                <signal pad-key="pb2" index="2" function="default" group="P"/>
+                <signal pad-key="pb3" index="3" function="default" group="P"/>
+                <signal pad-key="pb4" index="4" function="default" group="P"/>
+                <signal pad-key="pb5" index="5" function="default" group="P"/>
+                <signal pad-key="pb6" index="6" function="default" group="P"/>
+                <signal pad-key="pb7" index="7" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pc2" index="2" function="default" group="P"/>
-                <signal pad-id="pc3" index="3" function="default" group="P"/>
-                <signal pad-id="pc4" index="4" function="default" group="P"/>
-                <signal pad-id="pc5" index="5" function="default" group="P"/>
-                <signal pad-id="pc6" index="6" function="default" group="P"/>
-                <signal pad-id="pc7" index="7" function="default" group="P"/>
+                <signal pad-key="pc0" index="0" function="default" group="P"/>
+                <signal pad-key="pc1" index="1" function="default" group="P"/>
+                <signal pad-key="pc2" index="2" function="default" group="P"/>
+                <signal pad-key="pc3" index="3" function="default" group="P"/>
+                <signal pad-key="pc4" index="4" function="default" group="P"/>
+                <signal pad-key="pc5" index="5" function="default" group="P"/>
+                <signal pad-key="pc6" index="6" function="default" group="P"/>
+                <signal pad-key="pc7" index="7" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pd2" index="2" function="default" group="P"/>
-                <signal pad-id="pd3" index="3" function="default" group="P"/>
-                <signal pad-id="pd4" index="4" function="default" group="P"/>
-                <signal pad-id="pd5" index="5" function="default" group="P"/>
-                <signal pad-id="pd6" index="6" function="default" group="P"/>
-                <signal pad-id="pd7" index="7" function="default" group="P"/>
+                <signal pad-key="pd0" index="0" function="default" group="P"/>
+                <signal pad-key="pd1" index="1" function="default" group="P"/>
+                <signal pad-key="pd2" index="2" function="default" group="P"/>
+                <signal pad-key="pd3" index="3" function="default" group="P"/>
+                <signal pad-key="pd4" index="4" function="default" group="P"/>
+                <signal pad-key="pd5" index="5" function="default" group="P"/>
+                <signal pad-key="pd6" index="6" function="default" group="P"/>
+                <signal pad-key="pd7" index="7" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="tc0" name="TC0" module-key="tc8">
             <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"/>
-                <signal pad-id="pb3" function="default" group="OCA"/>
-                <signal pad-id="pd6" function="default" group="ICP"/>
+                <signal pad-key="pb0" function="default" group="T"/>
+                <signal pad-key="pb4" function="default" group="OCB"/>
+                <signal pad-key="pb3" function="default" group="OCA"/>
+                <signal pad-key="pd6" function="default" group="ICP"/>
             </signals>
         </peripheral>
         <peripheral key="tc2" name="TC2" module-key="tc8_async">
             <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"/>
+                <signal pad-key="pd7" function="default" group="OCA"/>
+                <signal pad-key="pd6" function="default" group="OCB"/>
             </signals>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="wdt">
@@ -306,10 +306,10 @@
         <peripheral key="jtag" name="JTAG" module-key="jtag">
             <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"/>
-                <signal pad-id="pc4" function="default" group="TDO"/>
-                <signal pad-id="pc5" function="default" group="TDI"/>
+                <signal pad-key="pc2" function="default" group="TCK"/>
+                <signal pad-key="pc3" function="default" group="TMS"/>
+                <signal pad-key="pc4" function="default" group="TDO"/>
+                <signal pad-key="pc5" function="default" group="TDI"/>
             </signals>
         </peripheral>
         <peripheral key="boot_load" name="BOOT_LOAD" module-key="boot_load">
@@ -318,63 +318,63 @@
         <peripheral key="exint" name="EXINT" module-key="exint">
             <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"/>
-                <signal pad-id="pa2" index="2" function="default" group="PCINT"/>
-                <signal pad-id="pa3" index="3" function="default" group="PCINT"/>
-                <signal pad-id="pa4" index="4" function="default" group="PCINT"/>
-                <signal pad-id="pa5" index="5" function="default" group="PCINT"/>
-                <signal pad-id="pa6" index="6" function="default" group="PCINT"/>
-                <signal pad-id="pa7" index="7" function="default" group="PCINT"/>
-                <signal pad-id="pb0" index="8" function="default" group="PCINT"/>
-                <signal pad-id="pb1" index="9" function="default" group="PCINT"/>
-                <signal pad-id="pb2" index="10" function="default" group="PCINT"/>
-                <signal pad-id="pb2" index="2" function="default" group="INT"/>
-                <signal pad-id="pb3" index="11" function="default" group="PCINT"/>
-                <signal pad-id="pb4" index="12" function="default" group="PCINT"/>
-                <signal pad-id="pb5" index="13" function="default" group="PCINT"/>
-                <signal pad-id="pb6" index="14" function="default" group="PCINT"/>
-                <signal pad-id="pb7" index="15" function="default" group="PCINT"/>
-                <signal pad-id="pc0" index="16" function="default" group="PCINT"/>
-                <signal pad-id="pc1" index="17" function="default" group="PCINT"/>
-                <signal pad-id="pc2" index="18" function="default" group="PCINT"/>
-                <signal pad-id="pc3" index="19" function="default" group="PCINT"/>
-                <signal pad-id="pc4" index="20" function="default" group="PCINT"/>
-                <signal pad-id="pc5" index="21" function="default" group="PCINT"/>
-                <signal pad-id="pc6" index="22" function="default" group="PCINT"/>
-                <signal pad-id="pc7" index="23" function="default" group="PCINT"/>
-                <signal pad-id="pd0" index="24" function="default" group="PCINT"/>
-                <signal pad-id="pd1" index="25" function="default" group="PCINT"/>
-                <signal pad-id="pd2" index="26" function="default" group="PCINT"/>
-                <signal pad-id="pd2" index="0" function="default" group="INT"/>
-                <signal pad-id="pd3" index="27" function="default" group="PCINT27"/>
-                <signal pad-id="pd3" index="1" function="default" group="INT"/>
-                <signal pad-id="pd4" index="28" function="default" group="PCINT28"/>
-                <signal pad-id="pd5" index="29" function="default" group="PCINT29"/>
-                <signal pad-id="pd6" index="30" function="default" group="PCINT30"/>
-                <signal pad-id="pd7" index="31" function="default" group="PCINT31"/>
+                <signal pad-key="pa0" index="0" function="default" group="PCINT"/>
+                <signal pad-key="pa1" index="1" function="default" group="PCINT"/>
+                <signal pad-key="pa2" index="2" function="default" group="PCINT"/>
+                <signal pad-key="pa3" index="3" function="default" group="PCINT"/>
+                <signal pad-key="pa4" index="4" function="default" group="PCINT"/>
+                <signal pad-key="pa5" index="5" function="default" group="PCINT"/>
+                <signal pad-key="pa6" index="6" function="default" group="PCINT"/>
+                <signal pad-key="pa7" index="7" function="default" group="PCINT"/>
+                <signal pad-key="pb0" index="8" function="default" group="PCINT"/>
+                <signal pad-key="pb1" index="9" function="default" group="PCINT"/>
+                <signal pad-key="pb2" index="10" function="default" group="PCINT"/>
+                <signal pad-key="pb2" index="2" function="default" group="INT"/>
+                <signal pad-key="pb3" index="11" function="default" group="PCINT"/>
+                <signal pad-key="pb4" index="12" function="default" group="PCINT"/>
+                <signal pad-key="pb5" index="13" function="default" group="PCINT"/>
+                <signal pad-key="pb6" index="14" function="default" group="PCINT"/>
+                <signal pad-key="pb7" index="15" function="default" group="PCINT"/>
+                <signal pad-key="pc0" index="16" function="default" group="PCINT"/>
+                <signal pad-key="pc1" index="17" function="default" group="PCINT"/>
+                <signal pad-key="pc2" index="18" function="default" group="PCINT"/>
+                <signal pad-key="pc3" index="19" function="default" group="PCINT"/>
+                <signal pad-key="pc4" index="20" function="default" group="PCINT"/>
+                <signal pad-key="pc5" index="21" function="default" group="PCINT"/>
+                <signal pad-key="pc6" index="22" function="default" group="PCINT"/>
+                <signal pad-key="pc7" index="23" function="default" group="PCINT"/>
+                <signal pad-key="pd0" index="24" function="default" group="PCINT"/>
+                <signal pad-key="pd1" index="25" function="default" group="PCINT"/>
+                <signal pad-key="pd2" index="26" function="default" group="PCINT"/>
+                <signal pad-key="pd2" index="0" function="default" group="INT"/>
+                <signal pad-key="pd3" index="27" function="default" group="PCINT27"/>
+                <signal pad-key="pd3" index="1" function="default" group="INT"/>
+                <signal pad-key="pd4" index="28" function="default" group="PCINT28"/>
+                <signal pad-key="pd5" index="29" function="default" group="PCINT29"/>
+                <signal pad-key="pd6" index="30" function="default" group="PCINT30"/>
+                <signal pad-key="pd7" index="31" function="default" group="PCINT31"/>
             </signals>
         </peripheral>
         <peripheral key="adc" name="ADC" module-key="adc">
             <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"/>
-                <signal pad-id="pa2" index="2" function="default" group="ADC"/>
-                <signal pad-id="pa3" index="3" function="default" group="ADC"/>
-                <signal pad-id="pa4" index="4" function="default" group="ADC"/>
-                <signal pad-id="pa5" index="5" function="default" group="ADC"/>
-                <signal pad-id="pa6" index="6" function="default" group="ADC"/>
-                <signal pad-id="pa7" index="7" function="default" group="ADC"/>
+                <signal pad-key="pa0" index="0" function="default" group="ADC"/>
+                <signal pad-key="pa1" index="1" function="default" group="ADC"/>
+                <signal pad-key="pa2" index="2" function="default" group="ADC"/>
+                <signal pad-key="pa3" index="3" function="default" group="ADC"/>
+                <signal pad-key="pa4" index="4" function="default" group="ADC"/>
+                <signal pad-key="pa5" index="5" function="default" group="ADC"/>
+                <signal pad-key="pa6" index="6" function="default" group="ADC"/>
+                <signal pad-key="pa7" index="7" function="default" group="ADC"/>
             </signals>
         </peripheral>
         <peripheral key="tc1" name="TC1" module-key="tc16">
             <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"/>
-                <signal pad-id="pd5" function="default" group="OCA"/>
-                <signal pad-id="pd4" function="default" group="OCB"/>
+                <signal pad-key="pb1" function="default" group="T"/>
+                <signal pad-key="pd6" function="default" group="ICP"/>
+                <signal pad-key="pd5" function="default" group="OCA"/>
+                <signal pad-key="pd4" function="default" group="OCB"/>
             </signals>
         </peripheral>
         <peripheral key="eeprom" name="EEPROM" module-key="eeprom">
@@ -383,23 +383,23 @@
         <peripheral key="twi" name="TWI" module-key="twi">
             <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"/>
+                <signal pad-key="pc1" function="default" group="SDA"/>
+                <signal pad-key="pc0" function="default" group="SCL"/>
             </signals>
         </peripheral>
         <peripheral key="spi" name="SPI" module-key="spi">
             <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"/>
-                <signal pad-id="pb6" function="default" group="MISO"/>
-                <signal pad-id="pb7" function="default" group="SCK"/>
+                <signal pad-key="pb4" function="default" group="SS"/>
+                <signal pad-key="pb5" function="default" group="MOSI"/>
+                <signal pad-key="pb6" function="default" group="MISO"/>
+                <signal pad-key="pb7" function="default" group="SCK"/>
             </signals>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="cpu">
             <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"/>
+                <signal pad-key="pb1" index="0" function="default" group="CLKO"/>
             </signals>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="fuse">
@@ -847,102 +847,144 @@
             </register-group>
         </module>
     </modules>
+    <pads>
+        <pad key="pb0" name="PB0"/>
+        <pad key="pb1" name="PB1"/>
+        <pad key="pb2" name="PB2"/>
+        <pad key="pb3" name="PB3"/>
+        <pad key="pb4" name="PB4"/>
+        <pad key="pb5" name="PB5"/>
+        <pad key="pb6" name="PB6"/>
+        <pad key="pb7" name="PB7"/>
+        <pad key="reset" name="RESET"/>
+        <pad key="vcc" name="VCC"/>
+        <pad key="gnd" name="GND"/>
+        <pad key="xtal2" name="XTAL2"/>
+        <pad key="xtal1" name="XTAL1"/>
+        <pad key="pd0" name="PD0"/>
+        <pad key="pd1" name="PD1"/>
+        <pad key="pd2" name="PD2"/>
+        <pad key="pd3" name="PD3"/>
+        <pad key="pd4" name="PD4"/>
+        <pad key="pd5" name="PD5"/>
+        <pad key="pd6" name="PD6"/>
+        <pad key="pd7" name="PD7"/>
+        <pad key="pc0" name="PC0"/>
+        <pad key="pc1" name="PC1"/>
+        <pad key="pc2" name="PC2"/>
+        <pad key="pc3" name="PC3"/>
+        <pad key="pc4" name="PC4"/>
+        <pad key="pc5" name="PC5"/>
+        <pad key="pc6" name="PC6"/>
+        <pad key="pc7" name="PC7"/>
+        <pad key="avcc" name="AVCC"/>
+        <pad key="aref" name="AREF"/>
+        <pad key="pa7" name="PA7"/>
+        <pad key="pa6" name="PA6"/>
+        <pad key="pa5" name="PA5"/>
+        <pad key="pa4" name="PA4"/>
+        <pad key="pa3" name="PA3"/>
+        <pad key="pa2" name="PA2"/>
+        <pad key="pa1" name="PA1"/>
+        <pad key="pa0" name="PA0"/>
+        <pad key="ref" name="REF"/>
+    </pads>
     <pinouts>
         <pinout key="pdip40" name="PDIP40" type="dip">
-            <pin position="1" pad="PB0"/>
-            <pin position="2" pad="PB1"/>
-            <pin position="3" pad="PB2"/>
-            <pin position="4" pad="PB3"/>
-            <pin position="5" pad="PB4"/>
-            <pin position="6" pad="PB5"/>
-            <pin position="7" pad="PB6"/>
-            <pin position="8" pad="PB7"/>
-            <pin position="9" pad="RESET"/>
-            <pin position="10" pad="VCC"/>
-            <pin position="11" pad="GND"/>
-            <pin position="12" pad="XTAL2"/>
-            <pin position="13" pad="XTAL1"/>
-            <pin position="14" pad="PD0"/>
-            <pin position="15" pad="PD1"/>
-            <pin position="16" pad="PD2"/>
-            <pin position="17" pad="PD3"/>
-            <pin position="18" pad="PD4"/>
-            <pin position="19" pad="PD5"/>
-            <pin position="20" pad="PD6"/>
-            <pin position="21" pad="PD7"/>
-            <pin position="22" pad="PC0"/>
-            <pin position="23" pad="PC1"/>
-            <pin position="24" pad="PC2"/>
-            <pin position="25" pad="PC3"/>
-            <pin position="26" pad="PC4"/>
-            <pin position="27" pad="PC5"/>
-            <pin position="28" pad="PC6"/>
-            <pin position="29" pad="PC7"/>
-            <pin position="30" pad="AVCC"/>
-            <pin position="31" pad="GND"/>
-            <pin position="32" pad="AREF"/>
-            <pin position="33" pad="PA7"/>
-            <pin position="34" pad="PA6"/>
-            <pin position="35" pad="PA5"/>
-            <pin position="36" pad="PA4"/>
-            <pin position="37" pad="PA3"/>
-            <pin position="38" pad="PA2"/>
-            <pin position="39" pad="PA1"/>
-            <pin position="40" pad="PA0"/>
+            <pin position="1" pad-key="pb0"/>
+            <pin position="2" pad-key="pb1"/>
+            <pin position="3" pad-key="pb2"/>
+            <pin position="4" pad-key="pb3"/>
+            <pin position="5" pad-key="pb4"/>
+            <pin position="6" pad-key="pb5"/>
+            <pin position="7" pad-key="pb6"/>
+            <pin position="8" pad-key="pb7"/>
+            <pin position="9" pad-key="reset"/>
+            <pin position="10" pad-key="vcc"/>
+            <pin position="11" pad-key="gnd"/>
+            <pin position="12" pad-key="xtal2"/>
+            <pin position="13" pad-key="xtal1"/>
+            <pin position="14" pad-key="pd0"/>
+            <pin position="15" pad-key="pd1"/>
+            <pin position="16" pad-key="pd2"/>
+            <pin position="17" pad-key="pd3"/>
+            <pin position="18" pad-key="pd4"/>
+            <pin position="19" pad-key="pd5"/>
+            <pin position="20" pad-key="pd6"/>
+            <pin position="21" pad-key="pd7"/>
+            <pin position="22" pad-key="pc0"/>
+            <pin position="23" pad-key="pc1"/>
+            <pin position="24" pad-key="pc2"/>
+            <pin position="25" pad-key="pc3"/>
+            <pin position="26" pad-key="pc4"/>
+            <pin position="27" pad-key="pc5"/>
+            <pin position="28" pad-key="pc6"/>
+            <pin position="29" pad-key="pc7"/>
+            <pin position="30" pad-key="avcc"/>
+            <pin position="31" pad-key="gnd"/>
+            <pin position="32" pad-key="aref"/>
+            <pin position="33" pad-key="pa7"/>
+            <pin position="34" pad-key="pa6"/>
+            <pin position="35" pad-key="pa5"/>
+            <pin position="36" pad-key="pa4"/>
+            <pin position="37" pad-key="pa3"/>
+            <pin position="38" pad-key="pa2"/>
+            <pin position="39" pad-key="pa1"/>
+            <pin position="40" pad-key="pa0"/>
         </pinout>
         <pinout key="tqfp_qfn_44" name="TQFP_QFN_44" type="qfn">
-            <pin position="1" pad="PB5"/>
-            <pin position="2" pad="PB6"/>
-            <pin position="3" pad="PB7"/>
-            <pin position="4" pad="RESET"/>
-            <pin position="5" pad="VCC"/>
-            <pin position="6" pad="GND"/>
-            <pin position="7" pad="XTAL2"/>
-            <pin position="8" pad="XTAL1"/>
-            <pin position="9" pad="PD0"/>
-            <pin position="10" pad="PD1"/>
-            <pin position="11" pad="PD2"/>
-            <pin position="12" pad="PD3"/>
-            <pin position="13" pad="PD4"/>
-            <pin position="14" pad="PD5"/>
-            <pin position="15" pad="PD6"/>
-            <pin position="16" pad="PD7"/>
-            <pin position="17" pad="VCC"/>
-            <pin position="18" pad="GND"/>
-            <pin position="19" pad="PC0"/>
-            <pin position="20" pad="PC1"/>
-            <pin position="21" pad="PC2"/>
-            <pin position="22" pad="PC3"/>
-            <pin position="23" pad="PC4"/>
-            <pin position="24" pad="PC5"/>
-            <pin position="25" pad="PC6"/>
-            <pin position="26" pad="PC7"/>
-            <pin position="27" pad="AVCC"/>
-            <pin position="28" pad="GND"/>
-            <pin position="29" pad="REF"/>
-            <pin position="30" pad="PA7"/>
-            <pin position="31" pad="PA6"/>
-            <pin position="32" pad="PA5"/>
-            <pin position="33" pad="PA4"/>
-            <pin position="34" pad="PA3"/>
-            <pin position="35" pad="PA2"/>
-            <pin position="36" pad="PA1"/>
-            <pin position="37" pad="PA0"/>
-            <pin position="38" pad="VCC"/>
-            <pin position="39" pad="GND"/>
-            <pin position="40" pad="PB0"/>
-            <pin position="41" pad="PB1"/>
-            <pin position="42" pad="PB2"/>
-            <pin position="43" pad="PB3"/>
-            <pin position="44" pad="PB4"/>
+            <pin position="1" pad-key="pb5"/>
+            <pin position="2" pad-key="pb6"/>
+            <pin position="3" pad-key="pb7"/>
+            <pin position="4" pad-key="reset"/>
+            <pin position="5" pad-key="vcc"/>
+            <pin position="6" pad-key="gnd"/>
+            <pin position="7" pad-key="xtal2"/>
+            <pin position="8" pad-key="xtal1"/>
+            <pin position="9" pad-key="pd0"/>
+            <pin position="10" pad-key="pd1"/>
+            <pin position="11" pad-key="pd2"/>
+            <pin position="12" pad-key="pd3"/>
+            <pin position="13" pad-key="pd4"/>
+            <pin position="14" pad-key="pd5"/>
+            <pin position="15" pad-key="pd6"/>
+            <pin position="16" pad-key="pd7"/>
+            <pin position="17" pad-key="vcc"/>
+            <pin position="18" pad-key="gnd"/>
+            <pin position="19" pad-key="pc0"/>
+            <pin position="20" pad-key="pc1"/>
+            <pin position="21" pad-key="pc2"/>
+            <pin position="22" pad-key="pc3"/>
+            <pin position="23" pad-key="pc4"/>
+            <pin position="24" pad-key="pc5"/>
+            <pin position="25" pad-key="pc6"/>
+            <pin position="26" pad-key="pc7"/>
+            <pin position="27" pad-key="avcc"/>
+            <pin position="28" pad-key="gnd"/>
+            <pin position="29" pad-key="ref"/>
+            <pin position="30" pad-key="pa7"/>
+            <pin position="31" pad-key="pa6"/>
+            <pin position="32" pad-key="pa5"/>
+            <pin position="33" pad-key="pa4"/>
+            <pin position="34" pad-key="pa3"/>
+            <pin position="35" pad-key="pa2"/>
+            <pin position="36" pad-key="pa1"/>
+            <pin position="37" pad-key="pa0"/>
+            <pin position="38" pad-key="vcc"/>
+            <pin position="39" pad-key="gnd"/>
+            <pin position="40" pad-key="pb0"/>
+            <pin position="41" pad-key="pb1"/>
+            <pin position="42" pad-key="pb2"/>
+            <pin position="43" pad-key="pb3"/>
+            <pin position="44" pad-key="pb4"/>
         </pinout>
     </pinouts>
     <variants>
-        <variant name="ATmega644V-10AU" pinout-key="tqfp_qfn_44" package="TQFP44"/>
-        <variant name="ATmega644V-10PU" pinout-key="pdip40" package="PDIP40"/>
-        <variant name="ATmega644V-10MU" pinout-key="tqfp_qfn_44" package="QFN44"/>
-        <variant name="ATmega644-20AU" pinout-key="tqfp_qfn_44" package="TQFP44"/>
-        <variant name="ATmega644-20PU" pinout-key="pdip40" package="PDIP40"/>
-        <variant name="ATmega644-20MU" pinout-key="tqfp_qfn_44" package="QFN44"/>
+        <variant key="atmega644v_10au" name="ATmega644V-10AU" pinout-key="tqfp_qfn_44"/>
+        <variant key="atmega644v_10pu" name="ATmega644V-10PU" pinout-key="pdip40"/>
+        <variant key="atmega644v_10mu" name="ATmega644V-10MU" pinout-key="tqfp_qfn_44"/>
+        <variant key="atmega644_20au" name="ATmega644-20AU" pinout-key="tqfp_qfn_44"/>
+        <variant key="atmega644_20pu" name="ATmega644-20PU" pinout-key="pdip40"/>
+        <variant key="atmega644_20mu" name="ATmega644-20MU" pinout-key="tqfp_qfn_44"/>
     </variants>
 </device>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA644A.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA644A.xml
index c84a26b6..7c614918 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA644A.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA644A.xml
@@ -220,93 +220,93 @@
         <peripheral key="ac" name="AC" module-key="ac">
             <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"/>
+                <signal pad-key="pb2" index="0" function="default" group="AIN"/>
+                <signal pad-key="pb3" index="1" function="default" group="AIN"/>
             </signals>
         </peripheral>
         <peripheral key="usart0" name="USART0" module-key="usart">
             <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"/>
-                <signal pad-id="pb0" function="default" group="XCK"/>
+                <signal pad-key="pd1" function="default" group="TXD"/>
+                <signal pad-key="pd0" function="default" group="RXD"/>
+                <signal pad-key="pb0" function="default" group="XCK"/>
             </signals>
         </peripheral>
         <peripheral key="usart1" name="USART1" module-key="usart">
             <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"/>
-                <signal pad-id="pd4" function="default" group="XCK"/>
+                <signal pad-key="pd3" function="default" group="TXD"/>
+                <signal pad-key="pd2" function="default" group="RXD"/>
+                <signal pad-key="pd4" function="default" group="XCK"/>
             </signals>
         </peripheral>
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pa2" index="2" function="default" group="P"/>
-                <signal pad-id="pa3" index="3" function="default" group="P"/>
-                <signal pad-id="pa4" index="4" function="default" group="P"/>
-                <signal pad-id="pa5" index="5" function="default" group="P"/>
-                <signal pad-id="pa6" index="6" function="default" group="P"/>
-                <signal pad-id="pa7" index="7" function="default" group="P"/>
+                <signal pad-key="pa0" index="0" function="default" group="P"/>
+                <signal pad-key="pa1" index="1" function="default" group="P"/>
+                <signal pad-key="pa2" index="2" function="default" group="P"/>
+                <signal pad-key="pa3" index="3" function="default" group="P"/>
+                <signal pad-key="pa4" index="4" function="default" group="P"/>
+                <signal pad-key="pa5" index="5" function="default" group="P"/>
+                <signal pad-key="pa6" index="6" function="default" group="P"/>
+                <signal pad-key="pa7" index="7" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pb2" index="2" function="default" group="P"/>
-                <signal pad-id="pb3" index="3" function="default" group="P"/>
-                <signal pad-id="pb4" index="4" function="default" group="P"/>
-                <signal pad-id="pb5" index="5" function="default" group="P"/>
-                <signal pad-id="pb6" index="6" function="default" group="P"/>
-                <signal pad-id="pb7" index="7" function="default" group="P"/>
+                <signal pad-key="pb0" index="0" function="default" group="P"/>
+                <signal pad-key="pb1" index="1" function="default" group="P"/>
+                <signal pad-key="pb2" index="2" function="default" group="P"/>
+                <signal pad-key="pb3" index="3" function="default" group="P"/>
+                <signal pad-key="pb4" index="4" function="default" group="P"/>
+                <signal pad-key="pb5" index="5" function="default" group="P"/>
+                <signal pad-key="pb6" index="6" function="default" group="P"/>
+                <signal pad-key="pb7" index="7" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pc2" index="2" function="default" group="P"/>
-                <signal pad-id="pc3" index="3" function="default" group="P"/>
-                <signal pad-id="pc4" index="4" function="default" group="P"/>
-                <signal pad-id="pc5" index="5" function="default" group="P"/>
-                <signal pad-id="pc6" index="6" function="default" group="P"/>
-                <signal pad-id="pc7" index="7" function="default" group="P"/>
+                <signal pad-key="pc0" index="0" function="default" group="P"/>
+                <signal pad-key="pc1" index="1" function="default" group="P"/>
+                <signal pad-key="pc2" index="2" function="default" group="P"/>
+                <signal pad-key="pc3" index="3" function="default" group="P"/>
+                <signal pad-key="pc4" index="4" function="default" group="P"/>
+                <signal pad-key="pc5" index="5" function="default" group="P"/>
+                <signal pad-key="pc6" index="6" function="default" group="P"/>
+                <signal pad-key="pc7" index="7" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pd2" index="2" function="default" group="P"/>
-                <signal pad-id="pd3" index="3" function="default" group="P"/>
-                <signal pad-id="pd4" index="4" function="default" group="P"/>
-                <signal pad-id="pd5" index="5" function="default" group="P"/>
-                <signal pad-id="pd6" index="6" function="default" group="P"/>
-                <signal pad-id="pd7" index="7" function="default" group="P"/>
+                <signal pad-key="pd0" index="0" function="default" group="P"/>
+                <signal pad-key="pd1" index="1" function="default" group="P"/>
+                <signal pad-key="pd2" index="2" function="default" group="P"/>
+                <signal pad-key="pd3" index="3" function="default" group="P"/>
+                <signal pad-key="pd4" index="4" function="default" group="P"/>
+                <signal pad-key="pd5" index="5" function="default" group="P"/>
+                <signal pad-key="pd6" index="6" function="default" group="P"/>
+                <signal pad-key="pd7" index="7" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="tc0" name="TC0" module-key="tc8">
             <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"/>
-                <signal pad-id="pb3" function="default" group="OCA"/>
+                <signal pad-key="pb0" function="default" group="T"/>
+                <signal pad-key="pb4" function="default" group="OCB"/>
+                <signal pad-key="pb3" function="default" group="OCA"/>
             </signals>
         </peripheral>
         <peripheral key="tc2" name="TC2" module-key="tc8_async">
             <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"/>
-                <signal pad-id="pd7" function="default" group="OCA"/>
-                <signal pad-id="pd6" function="default" group="OCB"/>
+                <signal pad-key="pc6" index="1" function="default" group="TOSC"/>
+                <signal pad-key="pc7" index="2" function="default" group="TOSC"/>
+                <signal pad-key="pd7" function="default" group="OCA"/>
+                <signal pad-key="pd6" function="default" group="OCB"/>
             </signals>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="wdt">
@@ -315,10 +315,10 @@
         <peripheral key="jtag" name="JTAG" module-key="jtag">
             <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"/>
-                <signal pad-id="pc4" function="default" group="TDO"/>
-                <signal pad-id="pc5" function="default" group="TDI"/>
+                <signal pad-key="pc2" function="default" group="TCK"/>
+                <signal pad-key="pc3" function="default" group="TMS"/>
+                <signal pad-key="pc4" function="default" group="TDO"/>
+                <signal pad-key="pc5" function="default" group="TDI"/>
             </signals>
         </peripheral>
         <peripheral key="boot_load" name="BOOT_LOAD" module-key="boot_load">
@@ -327,63 +327,63 @@
         <peripheral key="exint" name="EXINT" module-key="exint">
             <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"/>
-                <signal pad-id="pa2" index="2" function="default" group="PCINT"/>
-                <signal pad-id="pa3" index="3" function="default" group="PCINT"/>
-                <signal pad-id="pa4" index="4" function="default" group="PCINT"/>
-                <signal pad-id="pa5" index="5" function="default" group="PCINT"/>
-                <signal pad-id="pa6" index="6" function="default" group="PCINT"/>
-                <signal pad-id="pa7" index="7" function="default" group="PCINT"/>
-                <signal pad-id="pb0" index="8" function="default" group="PCINT"/>
-                <signal pad-id="pb1" index="9" function="default" group="PCINT"/>
-                <signal pad-id="pb2" index="10" function="default" group="PCINT"/>
-                <signal pad-id="pb3" index="11" function="default" group="PCINT"/>
-                <signal pad-id="pb4" index="12" function="default" group="PCINT"/>
-                <signal pad-id="pb5" index="13" function="default" group="PCINT"/>
-                <signal pad-id="pb6" index="14" function="default" group="PCINT"/>
-                <signal pad-id="pb7" index="15" function="default" group="PCINT"/>
-                <signal pad-id="pc0" index="16" function="default" group="PCINT"/>
-                <signal pad-id="pc1" index="17" function="default" group="PCINT"/>
-                <signal pad-id="pc2" index="18" function="default" group="PCINT"/>
-                <signal pad-id="pc3" index="19" function="default" group="PCINT"/>
-                <signal pad-id="pc4" index="20" function="default" group="PCINT"/>
-                <signal pad-id="pc5" index="21" function="default" group="PCINT"/>
-                <signal pad-id="pc6" index="22" function="default" group="PCINT"/>
-                <signal pad-id="pc7" index="23" function="default" group="PCINT"/>
-                <signal pad-id="pd0" index="24" function="default" group="PCINT"/>
-                <signal pad-id="pd1" index="25" function="default" group="PCINT"/>
-                <signal pad-id="pd2" index="26" function="default" group="PCINT"/>
-                <signal pad-id="pd3" index="27" function="default" group="PCINT"/>
-                <signal pad-id="pd4" index="28" function="default" group="PCINT"/>
-                <signal pad-id="pd5" index="29" function="default" group="PCINT"/>
-                <signal pad-id="pd6" index="30" function="default" group="PCINT"/>
-                <signal pad-id="pd7" index="31" function="default" group="PCINT"/>
-                <signal pad-id="pd2" index="0" function="default" group="INT"/>
-                <signal pad-id="pd3" index="1" function="default" group="INT"/>
-                <signal pad-id="pb2" index="2" function="default" group="INT"/>
+                <signal pad-key="pa0" index="0" function="default" group="PCINT"/>
+                <signal pad-key="pa1" index="1" function="default" group="PCINT"/>
+                <signal pad-key="pa2" index="2" function="default" group="PCINT"/>
+                <signal pad-key="pa3" index="3" function="default" group="PCINT"/>
+                <signal pad-key="pa4" index="4" function="default" group="PCINT"/>
+                <signal pad-key="pa5" index="5" function="default" group="PCINT"/>
+                <signal pad-key="pa6" index="6" function="default" group="PCINT"/>
+                <signal pad-key="pa7" index="7" function="default" group="PCINT"/>
+                <signal pad-key="pb0" index="8" function="default" group="PCINT"/>
+                <signal pad-key="pb1" index="9" function="default" group="PCINT"/>
+                <signal pad-key="pb2" index="10" function="default" group="PCINT"/>
+                <signal pad-key="pb3" index="11" function="default" group="PCINT"/>
+                <signal pad-key="pb4" index="12" function="default" group="PCINT"/>
+                <signal pad-key="pb5" index="13" function="default" group="PCINT"/>
+                <signal pad-key="pb6" index="14" function="default" group="PCINT"/>
+                <signal pad-key="pb7" index="15" function="default" group="PCINT"/>
+                <signal pad-key="pc0" index="16" function="default" group="PCINT"/>
+                <signal pad-key="pc1" index="17" function="default" group="PCINT"/>
+                <signal pad-key="pc2" index="18" function="default" group="PCINT"/>
+                <signal pad-key="pc3" index="19" function="default" group="PCINT"/>
+                <signal pad-key="pc4" index="20" function="default" group="PCINT"/>
+                <signal pad-key="pc5" index="21" function="default" group="PCINT"/>
+                <signal pad-key="pc6" index="22" function="default" group="PCINT"/>
+                <signal pad-key="pc7" index="23" function="default" group="PCINT"/>
+                <signal pad-key="pd0" index="24" function="default" group="PCINT"/>
+                <signal pad-key="pd1" index="25" function="default" group="PCINT"/>
+                <signal pad-key="pd2" index="26" function="default" group="PCINT"/>
+                <signal pad-key="pd3" index="27" function="default" group="PCINT"/>
+                <signal pad-key="pd4" index="28" function="default" group="PCINT"/>
+                <signal pad-key="pd5" index="29" function="default" group="PCINT"/>
+                <signal pad-key="pd6" index="30" function="default" group="PCINT"/>
+                <signal pad-key="pd7" index="31" function="default" group="PCINT"/>
+                <signal pad-key="pd2" index="0" function="default" group="INT"/>
+                <signal pad-key="pd3" index="1" function="default" group="INT"/>
+                <signal pad-key="pb2" index="2" function="default" group="INT"/>
             </signals>
         </peripheral>
         <peripheral key="adc" name="ADC" module-key="adc">
             <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"/>
-                <signal pad-id="pa2" index="2" function="default" group="ADC"/>
-                <signal pad-id="pa3" index="3" function="default" group="ADC"/>
-                <signal pad-id="pa4" index="4" function="default" group="ADC"/>
-                <signal pad-id="pa5" index="5" function="default" group="ADC"/>
-                <signal pad-id="pa6" index="6" function="default" group="ADC"/>
-                <signal pad-id="pa7" index="7" function="default" group="ADC"/>
+                <signal pad-key="pa0" index="0" function="default" group="ADC"/>
+                <signal pad-key="pa1" index="1" function="default" group="ADC"/>
+                <signal pad-key="pa2" index="2" function="default" group="ADC"/>
+                <signal pad-key="pa3" index="3" function="default" group="ADC"/>
+                <signal pad-key="pa4" index="4" function="default" group="ADC"/>
+                <signal pad-key="pa5" index="5" function="default" group="ADC"/>
+                <signal pad-key="pa6" index="6" function="default" group="ADC"/>
+                <signal pad-key="pa7" index="7" function="default" group="ADC"/>
             </signals>
         </peripheral>
         <peripheral key="tc1" name="TC1" module-key="tc16">
             <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"/>
-                <signal pad-id="pd5" function="default" group="OCA"/>
-                <signal pad-id="pd4" function="default" group="OCB"/>
+                <signal pad-key="pb1" function="default" group="T"/>
+                <signal pad-key="pd6" function="default" group="ICP"/>
+                <signal pad-key="pd5" function="default" group="OCA"/>
+                <signal pad-key="pd4" function="default" group="OCB"/>
             </signals>
         </peripheral>
         <peripheral key="eeprom" name="EEPROM" module-key="eeprom">
@@ -392,23 +392,23 @@
         <peripheral key="twi" name="TWI" module-key="twi">
             <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"/>
+                <signal pad-key="pc1" function="default" group="SDA"/>
+                <signal pad-key="pc0" function="default" group="SCL"/>
             </signals>
         </peripheral>
         <peripheral key="spi" name="SPI" module-key="spi">
             <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"/>
-                <signal pad-id="pb6" function="default" group="MISO"/>
-                <signal pad-id="pb7" function="default" group="SCK"/>
+                <signal pad-key="pb4" function="default" group="SS"/>
+                <signal pad-key="pb5" function="default" group="MOSI"/>
+                <signal pad-key="pb6" function="default" group="MISO"/>
+                <signal pad-key="pb7" function="default" group="SCK"/>
             </signals>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="cpu">
             <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"/>
+                <signal pad-key="pb1" index="0" function="default" group="CLKO"/>
             </signals>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="fuse">
@@ -888,99 +888,141 @@
             </register-group>
         </module>
     </modules>
+    <pads>
+        <pad key="pb0" name="PB0"/>
+        <pad key="pb1" name="PB1"/>
+        <pad key="pb2" name="PB2"/>
+        <pad key="pb3" name="PB3"/>
+        <pad key="pb4" name="PB4"/>
+        <pad key="pb5" name="PB5"/>
+        <pad key="pb6" name="PB6"/>
+        <pad key="pb7" name="PB7"/>
+        <pad key="reset" name="RESET"/>
+        <pad key="vcc" name="VCC"/>
+        <pad key="gnd" name="GND"/>
+        <pad key="xtal2" name="XTAL2"/>
+        <pad key="xtal1" name="XTAL1"/>
+        <pad key="pd0" name="PD0"/>
+        <pad key="pd1" name="PD1"/>
+        <pad key="pd2" name="PD2"/>
+        <pad key="pd3" name="PD3"/>
+        <pad key="pd4" name="PD4"/>
+        <pad key="pd5" name="PD5"/>
+        <pad key="pd6" name="PD6"/>
+        <pad key="pd7" name="PD7"/>
+        <pad key="pc0" name="PC0"/>
+        <pad key="pc1" name="PC1"/>
+        <pad key="pc2" name="PC2"/>
+        <pad key="pc3" name="PC3"/>
+        <pad key="pc4" name="PC4"/>
+        <pad key="pc5" name="PC5"/>
+        <pad key="pc6" name="PC6"/>
+        <pad key="pc7" name="PC7"/>
+        <pad key="avcc" name="AVCC"/>
+        <pad key="aref" name="AREF"/>
+        <pad key="pa7" name="PA7"/>
+        <pad key="pa6" name="PA6"/>
+        <pad key="pa5" name="PA5"/>
+        <pad key="pa4" name="PA4"/>
+        <pad key="pa3" name="PA3"/>
+        <pad key="pa2" name="PA2"/>
+        <pad key="pa1" name="PA1"/>
+        <pad key="pa0" name="PA0"/>
+        <pad key="ref" name="REF"/>
+    </pads>
     <pinouts>
         <pinout key="pdip40" name="PDIP40" type="dip">
-            <pin position="1" pad="PB0"/>
-            <pin position="2" pad="PB1"/>
-            <pin position="3" pad="PB2"/>
-            <pin position="4" pad="PB3"/>
-            <pin position="5" pad="PB4"/>
-            <pin position="6" pad="PB5"/>
-            <pin position="7" pad="PB6"/>
-            <pin position="8" pad="PB7"/>
-            <pin position="9" pad="RESET"/>
-            <pin position="10" pad="VCC"/>
-            <pin position="11" pad="GND"/>
-            <pin position="12" pad="XTAL2"/>
-            <pin position="13" pad="XTAL1"/>
-            <pin position="14" pad="PD0"/>
-            <pin position="15" pad="PD1"/>
-            <pin position="16" pad="PD2"/>
-            <pin position="17" pad="PD3"/>
-            <pin position="18" pad="PD4"/>
-            <pin position="19" pad="PD5"/>
-            <pin position="20" pad="PD6"/>
-            <pin position="21" pad="PD7"/>
-            <pin position="22" pad="PC0"/>
-            <pin position="23" pad="PC1"/>
-            <pin position="24" pad="PC2"/>
-            <pin position="25" pad="PC3"/>
-            <pin position="26" pad="PC4"/>
-            <pin position="27" pad="PC5"/>
-            <pin position="28" pad="PC6"/>
-            <pin position="29" pad="PC7"/>
-            <pin position="30" pad="AVCC"/>
-            <pin position="31" pad="GND"/>
-            <pin position="32" pad="AREF"/>
-            <pin position="33" pad="PA7"/>
-            <pin position="34" pad="PA6"/>
-            <pin position="35" pad="PA5"/>
-            <pin position="36" pad="PA4"/>
-            <pin position="37" pad="PA3"/>
-            <pin position="38" pad="PA2"/>
-            <pin position="39" pad="PA1"/>
-            <pin position="40" pad="PA0"/>
+            <pin position="1" pad-key="pb0"/>
+            <pin position="2" pad-key="pb1"/>
+            <pin position="3" pad-key="pb2"/>
+            <pin position="4" pad-key="pb3"/>
+            <pin position="5" pad-key="pb4"/>
+            <pin position="6" pad-key="pb5"/>
+            <pin position="7" pad-key="pb6"/>
+            <pin position="8" pad-key="pb7"/>
+            <pin position="9" pad-key="reset"/>
+            <pin position="10" pad-key="vcc"/>
+            <pin position="11" pad-key="gnd"/>
+            <pin position="12" pad-key="xtal2"/>
+            <pin position="13" pad-key="xtal1"/>
+            <pin position="14" pad-key="pd0"/>
+            <pin position="15" pad-key="pd1"/>
+            <pin position="16" pad-key="pd2"/>
+            <pin position="17" pad-key="pd3"/>
+            <pin position="18" pad-key="pd4"/>
+            <pin position="19" pad-key="pd5"/>
+            <pin position="20" pad-key="pd6"/>
+            <pin position="21" pad-key="pd7"/>
+            <pin position="22" pad-key="pc0"/>
+            <pin position="23" pad-key="pc1"/>
+            <pin position="24" pad-key="pc2"/>
+            <pin position="25" pad-key="pc3"/>
+            <pin position="26" pad-key="pc4"/>
+            <pin position="27" pad-key="pc5"/>
+            <pin position="28" pad-key="pc6"/>
+            <pin position="29" pad-key="pc7"/>
+            <pin position="30" pad-key="avcc"/>
+            <pin position="31" pad-key="gnd"/>
+            <pin position="32" pad-key="aref"/>
+            <pin position="33" pad-key="pa7"/>
+            <pin position="34" pad-key="pa6"/>
+            <pin position="35" pad-key="pa5"/>
+            <pin position="36" pad-key="pa4"/>
+            <pin position="37" pad-key="pa3"/>
+            <pin position="38" pad-key="pa2"/>
+            <pin position="39" pad-key="pa1"/>
+            <pin position="40" pad-key="pa0"/>
         </pinout>
         <pinout key="tqfp_qfn_44" name="TQFP_QFN_44" type="qfn">
-            <pin position="1" pad="PB5"/>
-            <pin position="2" pad="PB6"/>
-            <pin position="3" pad="PB7"/>
-            <pin position="4" pad="RESET"/>
-            <pin position="5" pad="VCC"/>
-            <pin position="6" pad="GND"/>
-            <pin position="7" pad="XTAL2"/>
-            <pin position="8" pad="XTAL1"/>
-            <pin position="9" pad="PD0"/>
-            <pin position="10" pad="PD1"/>
-            <pin position="11" pad="PD2"/>
-            <pin position="12" pad="PD3"/>
-            <pin position="13" pad="PD4"/>
-            <pin position="14" pad="PD5"/>
-            <pin position="15" pad="PD6"/>
-            <pin position="16" pad="PD7"/>
-            <pin position="17" pad="VCC"/>
-            <pin position="18" pad="GND"/>
-            <pin position="19" pad="PC0"/>
-            <pin position="20" pad="PC1"/>
-            <pin position="21" pad="PC2"/>
-            <pin position="22" pad="PC3"/>
-            <pin position="23" pad="PC4"/>
-            <pin position="24" pad="PC5"/>
-            <pin position="25" pad="PC6"/>
-            <pin position="26" pad="PC7"/>
-            <pin position="27" pad="AVCC"/>
-            <pin position="28" pad="GND"/>
-            <pin position="29" pad="REF"/>
-            <pin position="30" pad="PA7"/>
-            <pin position="31" pad="PA6"/>
-            <pin position="32" pad="PA5"/>
-            <pin position="33" pad="PA4"/>
-            <pin position="34" pad="PA3"/>
-            <pin position="35" pad="PA2"/>
-            <pin position="36" pad="PA1"/>
-            <pin position="37" pad="PA0"/>
-            <pin position="38" pad="VCC"/>
-            <pin position="39" pad="GND"/>
-            <pin position="40" pad="PB0"/>
-            <pin position="41" pad="PB1"/>
-            <pin position="42" pad="PB2"/>
-            <pin position="43" pad="PB3"/>
-            <pin position="44" pad="PB4"/>
+            <pin position="1" pad-key="pb5"/>
+            <pin position="2" pad-key="pb6"/>
+            <pin position="3" pad-key="pb7"/>
+            <pin position="4" pad-key="reset"/>
+            <pin position="5" pad-key="vcc"/>
+            <pin position="6" pad-key="gnd"/>
+            <pin position="7" pad-key="xtal2"/>
+            <pin position="8" pad-key="xtal1"/>
+            <pin position="9" pad-key="pd0"/>
+            <pin position="10" pad-key="pd1"/>
+            <pin position="11" pad-key="pd2"/>
+            <pin position="12" pad-key="pd3"/>
+            <pin position="13" pad-key="pd4"/>
+            <pin position="14" pad-key="pd5"/>
+            <pin position="15" pad-key="pd6"/>
+            <pin position="16" pad-key="pd7"/>
+            <pin position="17" pad-key="vcc"/>
+            <pin position="18" pad-key="gnd"/>
+            <pin position="19" pad-key="pc0"/>
+            <pin position="20" pad-key="pc1"/>
+            <pin position="21" pad-key="pc2"/>
+            <pin position="22" pad-key="pc3"/>
+            <pin position="23" pad-key="pc4"/>
+            <pin position="24" pad-key="pc5"/>
+            <pin position="25" pad-key="pc6"/>
+            <pin position="26" pad-key="pc7"/>
+            <pin position="27" pad-key="avcc"/>
+            <pin position="28" pad-key="gnd"/>
+            <pin position="29" pad-key="ref"/>
+            <pin position="30" pad-key="pa7"/>
+            <pin position="31" pad-key="pa6"/>
+            <pin position="32" pad-key="pa5"/>
+            <pin position="33" pad-key="pa4"/>
+            <pin position="34" pad-key="pa3"/>
+            <pin position="35" pad-key="pa2"/>
+            <pin position="36" pad-key="pa1"/>
+            <pin position="37" pad-key="pa0"/>
+            <pin position="38" pad-key="vcc"/>
+            <pin position="39" pad-key="gnd"/>
+            <pin position="40" pad-key="pb0"/>
+            <pin position="41" pad-key="pb1"/>
+            <pin position="42" pad-key="pb2"/>
+            <pin position="43" pad-key="pb3"/>
+            <pin position="44" pad-key="pb4"/>
         </pinout>
     </pinouts>
     <variants>
-        <variant name="ATmega644A-AU" pinout-key="tqfp_qfn_44" package="TQFP44"/>
-        <variant name="ATmega644A-PU" pinout-key="pdip40" package="PDIP40"/>
-        <variant name="ATmega644A-MU" pinout-key="tqfp_qfn_44" package="VQFN44"/>
+        <variant key="atmega644a_au" name="ATmega644A-AU" pinout-key="tqfp_qfn_44"/>
+        <variant key="atmega644a_pu" name="ATmega644A-PU" pinout-key="pdip40"/>
+        <variant key="atmega644a_mu" name="ATmega644A-MU" pinout-key="tqfp_qfn_44"/>
     </variants>
 </device>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA644P.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA644P.xml
index 131cc208..1dcd22d6 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA644P.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA644P.xml
@@ -220,93 +220,93 @@
         <peripheral key="ac" name="AC" module-key="ac">
             <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"/>
+                <signal pad-key="pb2" index="0" function="default" group="AIN"/>
+                <signal pad-key="pb3" index="1" function="default" group="AIN"/>
             </signals>
         </peripheral>
         <peripheral key="usart0" name="USART0" module-key="usart">
             <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"/>
-                <signal pad-id="pb0" function="default" group="XCK"/>
+                <signal pad-key="pd1" function="default" group="TXD"/>
+                <signal pad-key="pd0" function="default" group="RXD"/>
+                <signal pad-key="pb0" function="default" group="XCK"/>
             </signals>
         </peripheral>
         <peripheral key="usart1" name="USART1" module-key="usart">
             <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"/>
-                <signal pad-id="pd4" function="default" group="XCK"/>
+                <signal pad-key="pd3" function="default" group="TXD"/>
+                <signal pad-key="pd2" function="default" group="RXD"/>
+                <signal pad-key="pd4" function="default" group="XCK"/>
             </signals>
         </peripheral>
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pa2" index="2" function="default" group="P"/>
-                <signal pad-id="pa3" index="3" function="default" group="P"/>
-                <signal pad-id="pa4" index="4" function="default" group="P"/>
-                <signal pad-id="pa5" index="5" function="default" group="P"/>
-                <signal pad-id="pa6" index="6" function="default" group="P"/>
-                <signal pad-id="pa7" index="7" function="default" group="P"/>
+                <signal pad-key="pa0" index="0" function="default" group="P"/>
+                <signal pad-key="pa1" index="1" function="default" group="P"/>
+                <signal pad-key="pa2" index="2" function="default" group="P"/>
+                <signal pad-key="pa3" index="3" function="default" group="P"/>
+                <signal pad-key="pa4" index="4" function="default" group="P"/>
+                <signal pad-key="pa5" index="5" function="default" group="P"/>
+                <signal pad-key="pa6" index="6" function="default" group="P"/>
+                <signal pad-key="pa7" index="7" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pb2" index="2" function="default" group="P"/>
-                <signal pad-id="pb3" index="3" function="default" group="P"/>
-                <signal pad-id="pb4" index="4" function="default" group="P"/>
-                <signal pad-id="pb5" index="5" function="default" group="P"/>
-                <signal pad-id="pb6" index="6" function="default" group="P"/>
-                <signal pad-id="pb7" index="7" function="default" group="P"/>
+                <signal pad-key="pb0" index="0" function="default" group="P"/>
+                <signal pad-key="pb1" index="1" function="default" group="P"/>
+                <signal pad-key="pb2" index="2" function="default" group="P"/>
+                <signal pad-key="pb3" index="3" function="default" group="P"/>
+                <signal pad-key="pb4" index="4" function="default" group="P"/>
+                <signal pad-key="pb5" index="5" function="default" group="P"/>
+                <signal pad-key="pb6" index="6" function="default" group="P"/>
+                <signal pad-key="pb7" index="7" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pc2" index="2" function="default" group="P"/>
-                <signal pad-id="pc3" index="3" function="default" group="P"/>
-                <signal pad-id="pc4" index="4" function="default" group="P"/>
-                <signal pad-id="pc5" index="5" function="default" group="P"/>
-                <signal pad-id="pc6" index="6" function="default" group="P"/>
-                <signal pad-id="pc7" index="7" function="default" group="P"/>
+                <signal pad-key="pc0" index="0" function="default" group="P"/>
+                <signal pad-key="pc1" index="1" function="default" group="P"/>
+                <signal pad-key="pc2" index="2" function="default" group="P"/>
+                <signal pad-key="pc3" index="3" function="default" group="P"/>
+                <signal pad-key="pc4" index="4" function="default" group="P"/>
+                <signal pad-key="pc5" index="5" function="default" group="P"/>
+                <signal pad-key="pc6" index="6" function="default" group="P"/>
+                <signal pad-key="pc7" index="7" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pd2" index="2" function="default" group="P"/>
-                <signal pad-id="pd3" index="3" function="default" group="P"/>
-                <signal pad-id="pd4" index="4" function="default" group="P"/>
-                <signal pad-id="pd5" index="5" function="default" group="P"/>
-                <signal pad-id="pd6" index="6" function="default" group="P"/>
-                <signal pad-id="pd7" index="7" function="default" group="P"/>
+                <signal pad-key="pd0" index="0" function="default" group="P"/>
+                <signal pad-key="pd1" index="1" function="default" group="P"/>
+                <signal pad-key="pd2" index="2" function="default" group="P"/>
+                <signal pad-key="pd3" index="3" function="default" group="P"/>
+                <signal pad-key="pd4" index="4" function="default" group="P"/>
+                <signal pad-key="pd5" index="5" function="default" group="P"/>
+                <signal pad-key="pd6" index="6" function="default" group="P"/>
+                <signal pad-key="pd7" index="7" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="tc0" name="TC0" module-key="tc8">
             <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"/>
-                <signal pad-id="pb3" function="default" group="OCA"/>
+                <signal pad-key="pb0" function="default" group="T"/>
+                <signal pad-key="pb4" function="default" group="OCB"/>
+                <signal pad-key="pb3" function="default" group="OCA"/>
             </signals>
         </peripheral>
         <peripheral key="tc2" name="TC2" module-key="tc8_async">
             <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"/>
-                <signal pad-id="pd6" function="default" group="OCB"/>
-                <signal pad-id="pd7" function="default" group="OCA"/>
+                <signal pad-key="pc6" index="1" function="default" group="TOSC"/>
+                <signal pad-key="pc7" index="2" function="default" group="TOSC"/>
+                <signal pad-key="pd6" function="default" group="OCB"/>
+                <signal pad-key="pd7" function="default" group="OCA"/>
             </signals>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="wdt">
@@ -315,10 +315,10 @@
         <peripheral key="jtag" name="JTAG" module-key="jtag">
             <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"/>
-                <signal pad-id="pc4" function="default" group="TDO"/>
-                <signal pad-id="pc5" function="default" group="TDI"/>
+                <signal pad-key="pc2" function="default" group="TCK"/>
+                <signal pad-key="pc3" function="default" group="TMS"/>
+                <signal pad-key="pc4" function="default" group="TDO"/>
+                <signal pad-key="pc5" function="default" group="TDI"/>
             </signals>
         </peripheral>
         <peripheral key="boot_load" name="BOOT_LOAD" module-key="boot_load">
@@ -327,63 +327,63 @@
         <peripheral key="exint" name="EXINT" module-key="exint">
             <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"/>
-                <signal pad-id="pa2" index="2" function="default" group="PCINT"/>
-                <signal pad-id="pa3" index="3" function="default" group="PCINT"/>
-                <signal pad-id="pa4" index="4" function="default" group="PCINT"/>
-                <signal pad-id="pa5" index="5" function="default" group="PCINT"/>
-                <signal pad-id="pa6" index="6" function="default" group="PCINT"/>
-                <signal pad-id="pa7" index="7" function="default" group="PCINT"/>
-                <signal pad-id="pb0" index="8" function="default" group="PCINT"/>
-                <signal pad-id="pb1" index="9" function="default" group="PCINT"/>
-                <signal pad-id="pb2" index="10" function="default" group="PCINT"/>
-                <signal pad-id="pb3" index="11" function="default" group="PCINT"/>
-                <signal pad-id="pb4" index="12" function="default" group="PCINT"/>
-                <signal pad-id="pb5" index="13" function="default" group="PCINT"/>
-                <signal pad-id="pb6" index="14" function="default" group="PCINT"/>
-                <signal pad-id="pb7" index="15" function="default" group="PCINT"/>
-                <signal pad-id="pc0" index="16" function="default" group="PCINT"/>
-                <signal pad-id="pc1" index="17" function="default" group="PCINT"/>
-                <signal pad-id="pc2" index="18" function="default" group="PCINT"/>
-                <signal pad-id="pc3" index="19" function="default" group="PCINT"/>
-                <signal pad-id="pc4" index="20" function="default" group="PCINT"/>
-                <signal pad-id="pc5" index="21" function="default" group="PCINT"/>
-                <signal pad-id="pc6" index="22" function="default" group="PCINT"/>
-                <signal pad-id="pc7" index="23" function="default" group="PCINT"/>
-                <signal pad-id="pd0" index="24" function="default" group="PCINT"/>
-                <signal pad-id="pd1" index="25" function="default" group="PCINT"/>
-                <signal pad-id="pd2" index="26" function="default" group="PCINT"/>
-                <signal pad-id="pd3" index="27" function="default" group="PCINT"/>
-                <signal pad-id="pd4" index="28" function="default" group="PCINT"/>
-                <signal pad-id="pd5" index="29" function="default" group="PCINT"/>
-                <signal pad-id="pd6" index="30" function="default" group="PCINT"/>
-                <signal pad-id="pd7" index="31" function="default" group="PCINT"/>
-                <signal pad-id="pd2" index="0" function="default" group="INT"/>
-                <signal pad-id="pd3" index="1" function="default" group="INT"/>
-                <signal pad-id="pb2" index="2" function="default" group="INT"/>
+                <signal pad-key="pa0" index="0" function="default" group="PCINT"/>
+                <signal pad-key="pa1" index="1" function="default" group="PCINT"/>
+                <signal pad-key="pa2" index="2" function="default" group="PCINT"/>
+                <signal pad-key="pa3" index="3" function="default" group="PCINT"/>
+                <signal pad-key="pa4" index="4" function="default" group="PCINT"/>
+                <signal pad-key="pa5" index="5" function="default" group="PCINT"/>
+                <signal pad-key="pa6" index="6" function="default" group="PCINT"/>
+                <signal pad-key="pa7" index="7" function="default" group="PCINT"/>
+                <signal pad-key="pb0" index="8" function="default" group="PCINT"/>
+                <signal pad-key="pb1" index="9" function="default" group="PCINT"/>
+                <signal pad-key="pb2" index="10" function="default" group="PCINT"/>
+                <signal pad-key="pb3" index="11" function="default" group="PCINT"/>
+                <signal pad-key="pb4" index="12" function="default" group="PCINT"/>
+                <signal pad-key="pb5" index="13" function="default" group="PCINT"/>
+                <signal pad-key="pb6" index="14" function="default" group="PCINT"/>
+                <signal pad-key="pb7" index="15" function="default" group="PCINT"/>
+                <signal pad-key="pc0" index="16" function="default" group="PCINT"/>
+                <signal pad-key="pc1" index="17" function="default" group="PCINT"/>
+                <signal pad-key="pc2" index="18" function="default" group="PCINT"/>
+                <signal pad-key="pc3" index="19" function="default" group="PCINT"/>
+                <signal pad-key="pc4" index="20" function="default" group="PCINT"/>
+                <signal pad-key="pc5" index="21" function="default" group="PCINT"/>
+                <signal pad-key="pc6" index="22" function="default" group="PCINT"/>
+                <signal pad-key="pc7" index="23" function="default" group="PCINT"/>
+                <signal pad-key="pd0" index="24" function="default" group="PCINT"/>
+                <signal pad-key="pd1" index="25" function="default" group="PCINT"/>
+                <signal pad-key="pd2" index="26" function="default" group="PCINT"/>
+                <signal pad-key="pd3" index="27" function="default" group="PCINT"/>
+                <signal pad-key="pd4" index="28" function="default" group="PCINT"/>
+                <signal pad-key="pd5" index="29" function="default" group="PCINT"/>
+                <signal pad-key="pd6" index="30" function="default" group="PCINT"/>
+                <signal pad-key="pd7" index="31" function="default" group="PCINT"/>
+                <signal pad-key="pd2" index="0" function="default" group="INT"/>
+                <signal pad-key="pd3" index="1" function="default" group="INT"/>
+                <signal pad-key="pb2" index="2" function="default" group="INT"/>
             </signals>
         </peripheral>
         <peripheral key="adc" name="ADC" module-key="adc">
             <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"/>
-                <signal pad-id="pa2" index="2" function="default" group="ADC"/>
-                <signal pad-id="pa3" index="3" function="default" group="ADC"/>
-                <signal pad-id="pa4" index="4" function="default" group="ADC"/>
-                <signal pad-id="pa5" index="5" function="default" group="ADC"/>
-                <signal pad-id="pa6" index="6" function="default" group="ADC"/>
-                <signal pad-id="pa7" index="7" function="default" group="ADC"/>
+                <signal pad-key="pa0" index="0" function="default" group="ADC"/>
+                <signal pad-key="pa1" index="1" function="default" group="ADC"/>
+                <signal pad-key="pa2" index="2" function="default" group="ADC"/>
+                <signal pad-key="pa3" index="3" function="default" group="ADC"/>
+                <signal pad-key="pa4" index="4" function="default" group="ADC"/>
+                <signal pad-key="pa5" index="5" function="default" group="ADC"/>
+                <signal pad-key="pa6" index="6" function="default" group="ADC"/>
+                <signal pad-key="pa7" index="7" function="default" group="ADC"/>
             </signals>
         </peripheral>
         <peripheral key="tc1" name="TC1" module-key="tc16">
             <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"/>
-                <signal pad-id="pd5" function="default" group="OCA"/>
-                <signal pad-id="pd4" function="default" group="OCB"/>
+                <signal pad-key="pb1" function="default" group="T"/>
+                <signal pad-key="pd6" function="default" group="ICP"/>
+                <signal pad-key="pd5" function="default" group="OCA"/>
+                <signal pad-key="pd4" function="default" group="OCB"/>
             </signals>
         </peripheral>
         <peripheral key="eeprom" name="EEPROM" module-key="eeprom">
@@ -392,23 +392,23 @@
         <peripheral key="twi" name="TWI" module-key="twi">
             <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"/>
+                <signal pad-key="pc1" function="default" group="SDA"/>
+                <signal pad-key="pc0" function="default" group="SCL"/>
             </signals>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="cpu">
             <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"/>
+                <signal pad-key="pb1" index="0" function="default" group="CLKO"/>
             </signals>
         </peripheral>
         <peripheral key="spi" name="SPI" module-key="spi">
             <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"/>
-                <signal pad-id="pb6" function="default" group="MISO"/>
-                <signal pad-id="pb7" function="default" group="SCK"/>
+                <signal pad-key="pb4" function="default" group="SS"/>
+                <signal pad-key="pb5" function="default" group="MOSI"/>
+                <signal pad-key="pb6" function="default" group="MISO"/>
+                <signal pad-key="pb7" function="default" group="SCK"/>
             </signals>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="fuse">
@@ -890,108 +890,150 @@
             </register-group>
         </module>
     </modules>
+    <pads>
+        <pad key="pb0" name="PB0"/>
+        <pad key="pb1" name="PB1"/>
+        <pad key="pb2" name="PB2"/>
+        <pad key="pb3" name="PB3"/>
+        <pad key="pb4" name="PB4"/>
+        <pad key="pb5" name="PB5"/>
+        <pad key="pb6" name="PB6"/>
+        <pad key="pb7" name="PB7"/>
+        <pad key="reset" name="RESET"/>
+        <pad key="vcc" name="VCC"/>
+        <pad key="gnd" name="GND"/>
+        <pad key="xtal2" name="XTAL2"/>
+        <pad key="xtal1" name="XTAL1"/>
+        <pad key="pd0" name="PD0"/>
+        <pad key="pd1" name="PD1"/>
+        <pad key="pd2" name="PD2"/>
+        <pad key="pd3" name="PD3"/>
+        <pad key="pd4" name="PD4"/>
+        <pad key="pd5" name="PD5"/>
+        <pad key="pd6" name="PD6"/>
+        <pad key="pd7" name="PD7"/>
+        <pad key="pc0" name="PC0"/>
+        <pad key="pc1" name="PC1"/>
+        <pad key="pc2" name="PC2"/>
+        <pad key="pc3" name="PC3"/>
+        <pad key="pc4" name="PC4"/>
+        <pad key="pc5" name="PC5"/>
+        <pad key="pc6" name="PC6"/>
+        <pad key="pc7" name="PC7"/>
+        <pad key="avcc" name="AVCC"/>
+        <pad key="aref" name="AREF"/>
+        <pad key="pa7" name="PA7"/>
+        <pad key="pa6" name="PA6"/>
+        <pad key="pa5" name="PA5"/>
+        <pad key="pa4" name="PA4"/>
+        <pad key="pa3" name="PA3"/>
+        <pad key="pa2" name="PA2"/>
+        <pad key="pa1" name="PA1"/>
+        <pad key="pa0" name="PA0"/>
+        <pad key="ref" name="REF"/>
+    </pads>
     <pinouts>
         <pinout key="pdip40" name="PDIP40" type="dip">
-            <pin position="1" pad="PB0"/>
-            <pin position="2" pad="PB1"/>
-            <pin position="3" pad="PB2"/>
-            <pin position="4" pad="PB3"/>
-            <pin position="5" pad="PB4"/>
-            <pin position="6" pad="PB5"/>
-            <pin position="7" pad="PB6"/>
-            <pin position="8" pad="PB7"/>
-            <pin position="9" pad="RESET"/>
-            <pin position="10" pad="VCC"/>
-            <pin position="11" pad="GND"/>
-            <pin position="12" pad="XTAL2"/>
-            <pin position="13" pad="XTAL1"/>
-            <pin position="14" pad="PD0"/>
-            <pin position="15" pad="PD1"/>
-            <pin position="16" pad="PD2"/>
-            <pin position="17" pad="PD3"/>
-            <pin position="18" pad="PD4"/>
-            <pin position="19" pad="PD5"/>
-            <pin position="20" pad="PD6"/>
-            <pin position="21" pad="PD7"/>
-            <pin position="22" pad="PC0"/>
-            <pin position="23" pad="PC1"/>
-            <pin position="24" pad="PC2"/>
-            <pin position="25" pad="PC3"/>
-            <pin position="26" pad="PC4"/>
-            <pin position="27" pad="PC5"/>
-            <pin position="28" pad="PC6"/>
-            <pin position="29" pad="PC7"/>
-            <pin position="30" pad="AVCC"/>
-            <pin position="31" pad="GND"/>
-            <pin position="32" pad="AREF"/>
-            <pin position="33" pad="PA7"/>
-            <pin position="34" pad="PA6"/>
-            <pin position="35" pad="PA5"/>
-            <pin position="36" pad="PA4"/>
-            <pin position="37" pad="PA3"/>
-            <pin position="38" pad="PA2"/>
-            <pin position="39" pad="PA1"/>
-            <pin position="40" pad="PA0"/>
+            <pin position="1" pad-key="pb0"/>
+            <pin position="2" pad-key="pb1"/>
+            <pin position="3" pad-key="pb2"/>
+            <pin position="4" pad-key="pb3"/>
+            <pin position="5" pad-key="pb4"/>
+            <pin position="6" pad-key="pb5"/>
+            <pin position="7" pad-key="pb6"/>
+            <pin position="8" pad-key="pb7"/>
+            <pin position="9" pad-key="reset"/>
+            <pin position="10" pad-key="vcc"/>
+            <pin position="11" pad-key="gnd"/>
+            <pin position="12" pad-key="xtal2"/>
+            <pin position="13" pad-key="xtal1"/>
+            <pin position="14" pad-key="pd0"/>
+            <pin position="15" pad-key="pd1"/>
+            <pin position="16" pad-key="pd2"/>
+            <pin position="17" pad-key="pd3"/>
+            <pin position="18" pad-key="pd4"/>
+            <pin position="19" pad-key="pd5"/>
+            <pin position="20" pad-key="pd6"/>
+            <pin position="21" pad-key="pd7"/>
+            <pin position="22" pad-key="pc0"/>
+            <pin position="23" pad-key="pc1"/>
+            <pin position="24" pad-key="pc2"/>
+            <pin position="25" pad-key="pc3"/>
+            <pin position="26" pad-key="pc4"/>
+            <pin position="27" pad-key="pc5"/>
+            <pin position="28" pad-key="pc6"/>
+            <pin position="29" pad-key="pc7"/>
+            <pin position="30" pad-key="avcc"/>
+            <pin position="31" pad-key="gnd"/>
+            <pin position="32" pad-key="aref"/>
+            <pin position="33" pad-key="pa7"/>
+            <pin position="34" pad-key="pa6"/>
+            <pin position="35" pad-key="pa5"/>
+            <pin position="36" pad-key="pa4"/>
+            <pin position="37" pad-key="pa3"/>
+            <pin position="38" pad-key="pa2"/>
+            <pin position="39" pad-key="pa1"/>
+            <pin position="40" pad-key="pa0"/>
         </pinout>
         <pinout key="tqfp_vqfn_44" name="TQFP_VQFN_44" type="qfn">
-            <pin position="1" pad="PB5"/>
-            <pin position="2" pad="PB6"/>
-            <pin position="3" pad="PB7"/>
-            <pin position="4" pad="RESET"/>
-            <pin position="5" pad="VCC"/>
-            <pin position="6" pad="GND"/>
-            <pin position="7" pad="XTAL2"/>
-            <pin position="8" pad="XTAL1"/>
-            <pin position="9" pad="PD0"/>
-            <pin position="10" pad="PD1"/>
-            <pin position="11" pad="PD2"/>
-            <pin position="12" pad="PD3"/>
-            <pin position="13" pad="PD4"/>
-            <pin position="14" pad="PD5"/>
-            <pin position="15" pad="PD6"/>
-            <pin position="16" pad="PD7"/>
-            <pin position="17" pad="VCC"/>
-            <pin position="18" pad="GND"/>
-            <pin position="19" pad="PC0"/>
-            <pin position="20" pad="PC1"/>
-            <pin position="21" pad="PC2"/>
-            <pin position="22" pad="PC3"/>
-            <pin position="23" pad="PC4"/>
-            <pin position="24" pad="PC5"/>
-            <pin position="25" pad="PC6"/>
-            <pin position="26" pad="PC7"/>
-            <pin position="27" pad="AVCC"/>
-            <pin position="28" pad="GND"/>
-            <pin position="29" pad="REF"/>
-            <pin position="30" pad="PA7"/>
-            <pin position="31" pad="PA6"/>
-            <pin position="32" pad="PA5"/>
-            <pin position="33" pad="PA4"/>
-            <pin position="34" pad="PA3"/>
-            <pin position="35" pad="PA2"/>
-            <pin position="36" pad="PA1"/>
-            <pin position="37" pad="PA0"/>
-            <pin position="38" pad="VCC"/>
-            <pin position="39" pad="GND"/>
-            <pin position="40" pad="PB0"/>
-            <pin position="41" pad="PB1"/>
-            <pin position="42" pad="PB2"/>
-            <pin position="43" pad="PB3"/>
-            <pin position="44" pad="PB4"/>
+            <pin position="1" pad-key="pb5"/>
+            <pin position="2" pad-key="pb6"/>
+            <pin position="3" pad-key="pb7"/>
+            <pin position="4" pad-key="reset"/>
+            <pin position="5" pad-key="vcc"/>
+            <pin position="6" pad-key="gnd"/>
+            <pin position="7" pad-key="xtal2"/>
+            <pin position="8" pad-key="xtal1"/>
+            <pin position="9" pad-key="pd0"/>
+            <pin position="10" pad-key="pd1"/>
+            <pin position="11" pad-key="pd2"/>
+            <pin position="12" pad-key="pd3"/>
+            <pin position="13" pad-key="pd4"/>
+            <pin position="14" pad-key="pd5"/>
+            <pin position="15" pad-key="pd6"/>
+            <pin position="16" pad-key="pd7"/>
+            <pin position="17" pad-key="vcc"/>
+            <pin position="18" pad-key="gnd"/>
+            <pin position="19" pad-key="pc0"/>
+            <pin position="20" pad-key="pc1"/>
+            <pin position="21" pad-key="pc2"/>
+            <pin position="22" pad-key="pc3"/>
+            <pin position="23" pad-key="pc4"/>
+            <pin position="24" pad-key="pc5"/>
+            <pin position="25" pad-key="pc6"/>
+            <pin position="26" pad-key="pc7"/>
+            <pin position="27" pad-key="avcc"/>
+            <pin position="28" pad-key="gnd"/>
+            <pin position="29" pad-key="ref"/>
+            <pin position="30" pad-key="pa7"/>
+            <pin position="31" pad-key="pa6"/>
+            <pin position="32" pad-key="pa5"/>
+            <pin position="33" pad-key="pa4"/>
+            <pin position="34" pad-key="pa3"/>
+            <pin position="35" pad-key="pa2"/>
+            <pin position="36" pad-key="pa1"/>
+            <pin position="37" pad-key="pa0"/>
+            <pin position="38" pad-key="vcc"/>
+            <pin position="39" pad-key="gnd"/>
+            <pin position="40" pad-key="pb0"/>
+            <pin position="41" pad-key="pb1"/>
+            <pin position="42" pad-key="pb2"/>
+            <pin position="43" pad-key="pb3"/>
+            <pin position="44" pad-key="pb4"/>
         </pinout>
     </pinouts>
     <variants>
-        <variant name="ATmega644PV-10AU" pinout-key="tqfp_vqfn_44" package="TQFP44"/>
-        <variant name="ATmega644PV-10PU" pinout-key="pdip40" package="PDIP40"/>
-        <variant name="ATmega644PV-10MU" pinout-key="tqfp_vqfn_44" package="VQFN44"/>
-        <variant name="ATmega644P-20AU" pinout-key="tqfp_vqfn_44" package="TQFP44"/>
-        <variant name="ATmega644P-20PU" pinout-key="pdip40" package="PDIP40"/>
-        <variant name="ATmega644P-20MU" pinout-key="tqfp_vqfn_44" package="VQFN44"/>
-        <variant name="ATmega644PV-10AN" pinout-key="tqfp_vqfn_44" package="TQFP44"/>
-        <variant name="ATmega644PV-10PN" pinout-key="pdip40" package="PDIP40"/>
-        <variant name="ATmega644PV-10MN" pinout-key="tqfp_vqfn_44" package="VQFN44"/>
-        <variant name="ATmega644P-20AN" pinout-key="tqfp_vqfn_44" package="TQFP44"/>
-        <variant name="ATmega644P-20PN" pinout-key="pdip40" package="PDIP40"/>
-        <variant name="ATmega644P-20MN" pinout-key="tqfp_vqfn_44" package="VQFN44"/>
+        <variant key="atmega644pv_10au" name="ATmega644PV-10AU" pinout-key="tqfp_vqfn_44"/>
+        <variant key="atmega644pv_10pu" name="ATmega644PV-10PU" pinout-key="pdip40"/>
+        <variant key="atmega644pv_10mu" name="ATmega644PV-10MU" pinout-key="tqfp_vqfn_44"/>
+        <variant key="atmega644p_20au" name="ATmega644P-20AU" pinout-key="tqfp_vqfn_44"/>
+        <variant key="atmega644p_20pu" name="ATmega644P-20PU" pinout-key="pdip40"/>
+        <variant key="atmega644p_20mu" name="ATmega644P-20MU" pinout-key="tqfp_vqfn_44"/>
+        <variant key="atmega644pv_10an" name="ATmega644PV-10AN" pinout-key="tqfp_vqfn_44"/>
+        <variant key="atmega644pv_10pn" name="ATmega644PV-10PN" pinout-key="pdip40"/>
+        <variant key="atmega644pv_10mn" name="ATmega644PV-10MN" pinout-key="tqfp_vqfn_44"/>
+        <variant key="atmega644p_20an" name="ATmega644P-20AN" pinout-key="tqfp_vqfn_44"/>
+        <variant key="atmega644p_20pn" name="ATmega644P-20PN" pinout-key="pdip40"/>
+        <variant key="atmega644p_20mn" name="ATmega644P-20MN" pinout-key="tqfp_vqfn_44"/>
     </variants>
 </device>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA644PA.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA644PA.xml
index b30b91a5..b61c1623 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA644PA.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA644PA.xml
@@ -220,91 +220,91 @@
         <peripheral key="ac" name="AC" module-key="ac">
             <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"/>
+                <signal pad-key="pb2" index="0" function="default" group="AIN"/>
+                <signal pad-key="pb3" index="1" function="default" group="AIN"/>
             </signals>
         </peripheral>
         <peripheral key="usart0" name="USART0" module-key="usart">
             <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"/>
-                <signal pad-id="pb0" function="default" group="XCK"/>
+                <signal pad-key="pd1" function="default" group="TXD"/>
+                <signal pad-key="pd0" function="default" group="RXD"/>
+                <signal pad-key="pb0" function="default" group="XCK"/>
             </signals>
         </peripheral>
         <peripheral key="usart1" name="USART1" module-key="usart">
             <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"/>
-                <signal pad-id="pd4" function="default" group="XCK"/>
+                <signal pad-key="pd3" function="default" group="TXD"/>
+                <signal pad-key="pd2" function="default" group="RXD"/>
+                <signal pad-key="pd4" function="default" group="XCK"/>
             </signals>
         </peripheral>
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pa2" index="2" function="default" group="P"/>
-                <signal pad-id="pa3" index="3" function="default" group="P"/>
-                <signal pad-id="pa4" index="4" function="default" group="P"/>
-                <signal pad-id="pa5" index="5" function="default" group="P"/>
-                <signal pad-id="pa6" index="6" function="default" group="P"/>
-                <signal pad-id="pa7" index="7" function="default" group="P"/>
+                <signal pad-key="pa0" index="0" function="default" group="P"/>
+                <signal pad-key="pa1" index="1" function="default" group="P"/>
+                <signal pad-key="pa2" index="2" function="default" group="P"/>
+                <signal pad-key="pa3" index="3" function="default" group="P"/>
+                <signal pad-key="pa4" index="4" function="default" group="P"/>
+                <signal pad-key="pa5" index="5" function="default" group="P"/>
+                <signal pad-key="pa6" index="6" function="default" group="P"/>
+                <signal pad-key="pa7" index="7" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pb2" index="2" function="default" group="P"/>
-                <signal pad-id="pb3" index="3" function="default" group="P"/>
-                <signal pad-id="pb4" index="4" function="default" group="P"/>
-                <signal pad-id="pb5" index="5" function="default" group="P"/>
-                <signal pad-id="pb6" index="6" function="default" group="P"/>
-                <signal pad-id="pb7" index="7" function="default" group="P"/>
+                <signal pad-key="pb0" index="0" function="default" group="P"/>
+                <signal pad-key="pb1" index="1" function="default" group="P"/>
+                <signal pad-key="pb2" index="2" function="default" group="P"/>
+                <signal pad-key="pb3" index="3" function="default" group="P"/>
+                <signal pad-key="pb4" index="4" function="default" group="P"/>
+                <signal pad-key="pb5" index="5" function="default" group="P"/>
+                <signal pad-key="pb6" index="6" function="default" group="P"/>
+                <signal pad-key="pb7" index="7" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pc2" index="2" function="default" group="P"/>
-                <signal pad-id="pc3" index="3" function="default" group="P"/>
-                <signal pad-id="pc4" index="4" function="default" group="P"/>
-                <signal pad-id="pc5" index="5" function="default" group="P"/>
-                <signal pad-id="pc6" index="6" function="default" group="P"/>
-                <signal pad-id="pc7" index="7" function="default" group="P"/>
+                <signal pad-key="pc0" index="0" function="default" group="P"/>
+                <signal pad-key="pc1" index="1" function="default" group="P"/>
+                <signal pad-key="pc2" index="2" function="default" group="P"/>
+                <signal pad-key="pc3" index="3" function="default" group="P"/>
+                <signal pad-key="pc4" index="4" function="default" group="P"/>
+                <signal pad-key="pc5" index="5" function="default" group="P"/>
+                <signal pad-key="pc6" index="6" function="default" group="P"/>
+                <signal pad-key="pc7" index="7" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pd2" index="2" function="default" group="P"/>
-                <signal pad-id="pd3" index="3" function="default" group="P"/>
-                <signal pad-id="pd4" index="4" function="default" group="P"/>
-                <signal pad-id="pd5" index="5" function="default" group="P"/>
-                <signal pad-id="pd6" index="6" function="default" group="P"/>
-                <signal pad-id="pd7" index="7" function="default" group="P"/>
+                <signal pad-key="pd0" index="0" function="default" group="P"/>
+                <signal pad-key="pd1" index="1" function="default" group="P"/>
+                <signal pad-key="pd2" index="2" function="default" group="P"/>
+                <signal pad-key="pd3" index="3" function="default" group="P"/>
+                <signal pad-key="pd4" index="4" function="default" group="P"/>
+                <signal pad-key="pd5" index="5" function="default" group="P"/>
+                <signal pad-key="pd6" index="6" function="default" group="P"/>
+                <signal pad-key="pd7" index="7" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="tc0" name="TC0" module-key="tc8">
             <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"/>
-                <signal pad-id="pb3" function="default" group="OCA"/>
+                <signal pad-key="pb0" function="default" group="T"/>
+                <signal pad-key="pb4" function="default" group="OCB"/>
+                <signal pad-key="pb3" function="default" group="OCA"/>
             </signals>
         </peripheral>
         <peripheral key="tc2" name="TC2" module-key="tc8_async">
             <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"/>
+                <signal pad-key="pd7" function="default" group="OCA"/>
+                <signal pad-key="pd6" function="default" group="OCB"/>
             </signals>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="wdt">
@@ -313,10 +313,10 @@
         <peripheral key="jtag" name="JTAG" module-key="jtag">
             <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"/>
-                <signal pad-id="pc4" function="default" group="TDO"/>
-                <signal pad-id="pc5" function="default" group="TDI"/>
+                <signal pad-key="pc2" function="default" group="TCK"/>
+                <signal pad-key="pc3" function="default" group="TMS"/>
+                <signal pad-key="pc4" function="default" group="TDO"/>
+                <signal pad-key="pc5" function="default" group="TDI"/>
             </signals>
         </peripheral>
         <peripheral key="boot_load" name="BOOT_LOAD" module-key="boot_load">
@@ -325,63 +325,63 @@
         <peripheral key="exint" name="EXINT" module-key="exint">
             <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"/>
-                <signal pad-id="pa2" index="2" function="default" group="PCINT"/>
-                <signal pad-id="pa3" index="3" function="default" group="PCINT"/>
-                <signal pad-id="pa4" index="4" function="default" group="PCINT"/>
-                <signal pad-id="pa5" index="5" function="default" group="PCINT"/>
-                <signal pad-id="pa6" index="6" function="default" group="PCINT"/>
-                <signal pad-id="pa7" index="7" function="default" group="PCINT"/>
-                <signal pad-id="pb0" index="8" function="default" group="PCINT"/>
-                <signal pad-id="pb1" index="9" function="default" group="PCINT"/>
-                <signal pad-id="pb2" index="10" function="default" group="PCINT"/>
-                <signal pad-id="pb3" index="11" function="default" group="PCINT"/>
-                <signal pad-id="pb4" index="12" function="default" group="PCINT"/>
-                <signal pad-id="pb5" index="13" function="default" group="PCINT"/>
-                <signal pad-id="pb6" index="14" function="default" group="PCINT"/>
-                <signal pad-id="pb7" index="15" function="default" group="PCINT"/>
-                <signal pad-id="pc0" index="16" function="default" group="PCINT"/>
-                <signal pad-id="pc1" index="17" function="default" group="PCINT"/>
-                <signal pad-id="pc2" index="18" function="default" group="PCINT"/>
-                <signal pad-id="pc3" index="19" function="default" group="PCINT"/>
-                <signal pad-id="pc4" index="20" function="default" group="PCINT"/>
-                <signal pad-id="pc5" index="21" function="default" group="PCINT"/>
-                <signal pad-id="pc6" index="22" function="default" group="PCINT"/>
-                <signal pad-id="pc7" index="23" function="default" group="PCINT"/>
-                <signal pad-id="pd0" index="24" function="default" group="PCINT"/>
-                <signal pad-id="pd1" index="25" function="default" group="PCINT"/>
-                <signal pad-id="pd2" index="26" function="default" group="PCINT"/>
-                <signal pad-id="pd3" index="27" function="default" group="PCINT"/>
-                <signal pad-id="pd4" index="28" function="default" group="PCINT"/>
-                <signal pad-id="pd5" index="29" function="default" group="PCINT"/>
-                <signal pad-id="pd6" index="30" function="default" group="PCINT"/>
-                <signal pad-id="pd7" index="31" function="default" group="PCINT"/>
-                <signal pad-id="pd2" index="0" function="default" group="INT"/>
-                <signal pad-id="pd3" index="1" function="default" group="INT"/>
-                <signal pad-id="pb2" index="2" function="default" group="INT"/>
+                <signal pad-key="pa0" index="0" function="default" group="PCINT"/>
+                <signal pad-key="pa1" index="1" function="default" group="PCINT"/>
+                <signal pad-key="pa2" index="2" function="default" group="PCINT"/>
+                <signal pad-key="pa3" index="3" function="default" group="PCINT"/>
+                <signal pad-key="pa4" index="4" function="default" group="PCINT"/>
+                <signal pad-key="pa5" index="5" function="default" group="PCINT"/>
+                <signal pad-key="pa6" index="6" function="default" group="PCINT"/>
+                <signal pad-key="pa7" index="7" function="default" group="PCINT"/>
+                <signal pad-key="pb0" index="8" function="default" group="PCINT"/>
+                <signal pad-key="pb1" index="9" function="default" group="PCINT"/>
+                <signal pad-key="pb2" index="10" function="default" group="PCINT"/>
+                <signal pad-key="pb3" index="11" function="default" group="PCINT"/>
+                <signal pad-key="pb4" index="12" function="default" group="PCINT"/>
+                <signal pad-key="pb5" index="13" function="default" group="PCINT"/>
+                <signal pad-key="pb6" index="14" function="default" group="PCINT"/>
+                <signal pad-key="pb7" index="15" function="default" group="PCINT"/>
+                <signal pad-key="pc0" index="16" function="default" group="PCINT"/>
+                <signal pad-key="pc1" index="17" function="default" group="PCINT"/>
+                <signal pad-key="pc2" index="18" function="default" group="PCINT"/>
+                <signal pad-key="pc3" index="19" function="default" group="PCINT"/>
+                <signal pad-key="pc4" index="20" function="default" group="PCINT"/>
+                <signal pad-key="pc5" index="21" function="default" group="PCINT"/>
+                <signal pad-key="pc6" index="22" function="default" group="PCINT"/>
+                <signal pad-key="pc7" index="23" function="default" group="PCINT"/>
+                <signal pad-key="pd0" index="24" function="default" group="PCINT"/>
+                <signal pad-key="pd1" index="25" function="default" group="PCINT"/>
+                <signal pad-key="pd2" index="26" function="default" group="PCINT"/>
+                <signal pad-key="pd3" index="27" function="default" group="PCINT"/>
+                <signal pad-key="pd4" index="28" function="default" group="PCINT"/>
+                <signal pad-key="pd5" index="29" function="default" group="PCINT"/>
+                <signal pad-key="pd6" index="30" function="default" group="PCINT"/>
+                <signal pad-key="pd7" index="31" function="default" group="PCINT"/>
+                <signal pad-key="pd2" index="0" function="default" group="INT"/>
+                <signal pad-key="pd3" index="1" function="default" group="INT"/>
+                <signal pad-key="pb2" index="2" function="default" group="INT"/>
             </signals>
         </peripheral>
         <peripheral key="adc" name="ADC" module-key="adc">
             <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"/>
-                <signal pad-id="pa2" index="2" function="default" group="ADC"/>
-                <signal pad-id="pa3" index="3" function="default" group="ADC"/>
-                <signal pad-id="pa4" index="4" function="default" group="ADC"/>
-                <signal pad-id="pa5" index="5" function="default" group="ADC"/>
-                <signal pad-id="pa6" index="6" function="default" group="ADC"/>
-                <signal pad-id="pa7" index="7" function="default" group="ADC"/>
+                <signal pad-key="pa0" index="0" function="default" group="ADC"/>
+                <signal pad-key="pa1" index="1" function="default" group="ADC"/>
+                <signal pad-key="pa2" index="2" function="default" group="ADC"/>
+                <signal pad-key="pa3" index="3" function="default" group="ADC"/>
+                <signal pad-key="pa4" index="4" function="default" group="ADC"/>
+                <signal pad-key="pa5" index="5" function="default" group="ADC"/>
+                <signal pad-key="pa6" index="6" function="default" group="ADC"/>
+                <signal pad-key="pa7" index="7" function="default" group="ADC"/>
             </signals>
         </peripheral>
         <peripheral key="tc1" name="TC1" module-key="tc16">
             <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"/>
-                <signal pad-id="pd5" function="default" group="OCA"/>
-                <signal pad-id="pd4" function="default" group="OCB"/>
+                <signal pad-key="pb1" function="default" group="T"/>
+                <signal pad-key="pd6" function="default" group="ICP"/>
+                <signal pad-key="pd5" function="default" group="OCA"/>
+                <signal pad-key="pd4" function="default" group="OCB"/>
             </signals>
         </peripheral>
         <peripheral key="eeprom" name="EEPROM" module-key="eeprom">
@@ -390,23 +390,23 @@
         <peripheral key="twi" name="TWI" module-key="twi">
             <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"/>
+                <signal pad-key="pc1" function="default" group="SDA"/>
+                <signal pad-key="pc0" function="default" group="SCL"/>
             </signals>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="cpu">
             <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"/>
+                <signal pad-key="pb1" index="0" function="default" group="CLKO"/>
             </signals>
         </peripheral>
         <peripheral key="spi" name="SPI" module-key="spi">
             <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"/>
-                <signal pad-id="pb6" function="default" group="MISO"/>
-                <signal pad-id="pb7" function="default" group="SCK"/>
+                <signal pad-key="pb4" function="default" group="SS"/>
+                <signal pad-key="pb5" function="default" group="MOSI"/>
+                <signal pad-key="pb6" function="default" group="MISO"/>
+                <signal pad-key="pb7" function="default" group="SCK"/>
             </signals>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="fuse">
@@ -888,102 +888,144 @@
             </register-group>
         </module>
     </modules>
+    <pads>
+        <pad key="pb0" name="PB0"/>
+        <pad key="pb1" name="PB1"/>
+        <pad key="pb2" name="PB2"/>
+        <pad key="pb3" name="PB3"/>
+        <pad key="pb4" name="PB4"/>
+        <pad key="pb5" name="PB5"/>
+        <pad key="pb6" name="PB6"/>
+        <pad key="pb7" name="PB7"/>
+        <pad key="reset" name="RESET"/>
+        <pad key="vcc" name="VCC"/>
+        <pad key="gnd" name="GND"/>
+        <pad key="xtal2" name="XTAL2"/>
+        <pad key="xtal1" name="XTAL1"/>
+        <pad key="pd0" name="PD0"/>
+        <pad key="pd1" name="PD1"/>
+        <pad key="pd2" name="PD2"/>
+        <pad key="pd3" name="PD3"/>
+        <pad key="pd4" name="PD4"/>
+        <pad key="pd5" name="PD5"/>
+        <pad key="pd6" name="PD6"/>
+        <pad key="pd7" name="PD7"/>
+        <pad key="pc0" name="PC0"/>
+        <pad key="pc1" name="PC1"/>
+        <pad key="pc2" name="PC2"/>
+        <pad key="pc3" name="PC3"/>
+        <pad key="pc4" name="PC4"/>
+        <pad key="pc5" name="PC5"/>
+        <pad key="pc6" name="PC6"/>
+        <pad key="pc7" name="PC7"/>
+        <pad key="avcc" name="AVCC"/>
+        <pad key="aref" name="AREF"/>
+        <pad key="pa7" name="PA7"/>
+        <pad key="pa6" name="PA6"/>
+        <pad key="pa5" name="PA5"/>
+        <pad key="pa4" name="PA4"/>
+        <pad key="pa3" name="PA3"/>
+        <pad key="pa2" name="PA2"/>
+        <pad key="pa1" name="PA1"/>
+        <pad key="pa0" name="PA0"/>
+        <pad key="ref" name="REF"/>
+    </pads>
     <pinouts>
         <pinout key="pdip40" name="PDIP40" type="dip">
-            <pin position="1" pad="PB0"/>
-            <pin position="2" pad="PB1"/>
-            <pin position="3" pad="PB2"/>
-            <pin position="4" pad="PB3"/>
-            <pin position="5" pad="PB4"/>
-            <pin position="6" pad="PB5"/>
-            <pin position="7" pad="PB6"/>
-            <pin position="8" pad="PB7"/>
-            <pin position="9" pad="RESET"/>
-            <pin position="10" pad="VCC"/>
-            <pin position="11" pad="GND"/>
-            <pin position="12" pad="XTAL2"/>
-            <pin position="13" pad="XTAL1"/>
-            <pin position="14" pad="PD0"/>
-            <pin position="15" pad="PD1"/>
-            <pin position="16" pad="PD2"/>
-            <pin position="17" pad="PD3"/>
-            <pin position="18" pad="PD4"/>
-            <pin position="19" pad="PD5"/>
-            <pin position="20" pad="PD6"/>
-            <pin position="21" pad="PD7"/>
-            <pin position="22" pad="PC0"/>
-            <pin position="23" pad="PC1"/>
-            <pin position="24" pad="PC2"/>
-            <pin position="25" pad="PC3"/>
-            <pin position="26" pad="PC4"/>
-            <pin position="27" pad="PC5"/>
-            <pin position="28" pad="PC6"/>
-            <pin position="29" pad="PC7"/>
-            <pin position="30" pad="AVCC"/>
-            <pin position="31" pad="GND"/>
-            <pin position="32" pad="AREF"/>
-            <pin position="33" pad="PA7"/>
-            <pin position="34" pad="PA6"/>
-            <pin position="35" pad="PA5"/>
-            <pin position="36" pad="PA4"/>
-            <pin position="37" pad="PA3"/>
-            <pin position="38" pad="PA2"/>
-            <pin position="39" pad="PA1"/>
-            <pin position="40" pad="PA0"/>
+            <pin position="1" pad-key="pb0"/>
+            <pin position="2" pad-key="pb1"/>
+            <pin position="3" pad-key="pb2"/>
+            <pin position="4" pad-key="pb3"/>
+            <pin position="5" pad-key="pb4"/>
+            <pin position="6" pad-key="pb5"/>
+            <pin position="7" pad-key="pb6"/>
+            <pin position="8" pad-key="pb7"/>
+            <pin position="9" pad-key="reset"/>
+            <pin position="10" pad-key="vcc"/>
+            <pin position="11" pad-key="gnd"/>
+            <pin position="12" pad-key="xtal2"/>
+            <pin position="13" pad-key="xtal1"/>
+            <pin position="14" pad-key="pd0"/>
+            <pin position="15" pad-key="pd1"/>
+            <pin position="16" pad-key="pd2"/>
+            <pin position="17" pad-key="pd3"/>
+            <pin position="18" pad-key="pd4"/>
+            <pin position="19" pad-key="pd5"/>
+            <pin position="20" pad-key="pd6"/>
+            <pin position="21" pad-key="pd7"/>
+            <pin position="22" pad-key="pc0"/>
+            <pin position="23" pad-key="pc1"/>
+            <pin position="24" pad-key="pc2"/>
+            <pin position="25" pad-key="pc3"/>
+            <pin position="26" pad-key="pc4"/>
+            <pin position="27" pad-key="pc5"/>
+            <pin position="28" pad-key="pc6"/>
+            <pin position="29" pad-key="pc7"/>
+            <pin position="30" pad-key="avcc"/>
+            <pin position="31" pad-key="gnd"/>
+            <pin position="32" pad-key="aref"/>
+            <pin position="33" pad-key="pa7"/>
+            <pin position="34" pad-key="pa6"/>
+            <pin position="35" pad-key="pa5"/>
+            <pin position="36" pad-key="pa4"/>
+            <pin position="37" pad-key="pa3"/>
+            <pin position="38" pad-key="pa2"/>
+            <pin position="39" pad-key="pa1"/>
+            <pin position="40" pad-key="pa0"/>
         </pinout>
         <pinout key="tqfp_qfn_44" name="TQFP_QFN_44" type="qfn">
-            <pin position="1" pad="PB5"/>
-            <pin position="2" pad="PB6"/>
-            <pin position="3" pad="PB7"/>
-            <pin position="4" pad="RESET"/>
-            <pin position="5" pad="VCC"/>
-            <pin position="6" pad="GND"/>
-            <pin position="7" pad="XTAL2"/>
-            <pin position="8" pad="XTAL1"/>
-            <pin position="9" pad="PD0"/>
-            <pin position="10" pad="PD1"/>
-            <pin position="11" pad="PD2"/>
-            <pin position="12" pad="PD3"/>
-            <pin position="13" pad="PD4"/>
-            <pin position="14" pad="PD5"/>
-            <pin position="15" pad="PD6"/>
-            <pin position="16" pad="PD7"/>
-            <pin position="17" pad="VCC"/>
-            <pin position="18" pad="GND"/>
-            <pin position="19" pad="PC0"/>
-            <pin position="20" pad="PC1"/>
-            <pin position="21" pad="PC2"/>
-            <pin position="22" pad="PC3"/>
-            <pin position="23" pad="PC4"/>
-            <pin position="24" pad="PC5"/>
-            <pin position="25" pad="PC6"/>
-            <pin position="26" pad="PC7"/>
-            <pin position="27" pad="AVCC"/>
-            <pin position="28" pad="GND"/>
-            <pin position="29" pad="REF"/>
-            <pin position="30" pad="PA7"/>
-            <pin position="31" pad="PA6"/>
-            <pin position="32" pad="PA5"/>
-            <pin position="33" pad="PA4"/>
-            <pin position="34" pad="PA3"/>
-            <pin position="35" pad="PA2"/>
-            <pin position="36" pad="PA1"/>
-            <pin position="37" pad="PA0"/>
-            <pin position="38" pad="VCC"/>
-            <pin position="39" pad="GND"/>
-            <pin position="40" pad="PB0"/>
-            <pin position="41" pad="PB1"/>
-            <pin position="42" pad="PB2"/>
-            <pin position="43" pad="PB3"/>
-            <pin position="44" pad="PB4"/>
+            <pin position="1" pad-key="pb5"/>
+            <pin position="2" pad-key="pb6"/>
+            <pin position="3" pad-key="pb7"/>
+            <pin position="4" pad-key="reset"/>
+            <pin position="5" pad-key="vcc"/>
+            <pin position="6" pad-key="gnd"/>
+            <pin position="7" pad-key="xtal2"/>
+            <pin position="8" pad-key="xtal1"/>
+            <pin position="9" pad-key="pd0"/>
+            <pin position="10" pad-key="pd1"/>
+            <pin position="11" pad-key="pd2"/>
+            <pin position="12" pad-key="pd3"/>
+            <pin position="13" pad-key="pd4"/>
+            <pin position="14" pad-key="pd5"/>
+            <pin position="15" pad-key="pd6"/>
+            <pin position="16" pad-key="pd7"/>
+            <pin position="17" pad-key="vcc"/>
+            <pin position="18" pad-key="gnd"/>
+            <pin position="19" pad-key="pc0"/>
+            <pin position="20" pad-key="pc1"/>
+            <pin position="21" pad-key="pc2"/>
+            <pin position="22" pad-key="pc3"/>
+            <pin position="23" pad-key="pc4"/>
+            <pin position="24" pad-key="pc5"/>
+            <pin position="25" pad-key="pc6"/>
+            <pin position="26" pad-key="pc7"/>
+            <pin position="27" pad-key="avcc"/>
+            <pin position="28" pad-key="gnd"/>
+            <pin position="29" pad-key="ref"/>
+            <pin position="30" pad-key="pa7"/>
+            <pin position="31" pad-key="pa6"/>
+            <pin position="32" pad-key="pa5"/>
+            <pin position="33" pad-key="pa4"/>
+            <pin position="34" pad-key="pa3"/>
+            <pin position="35" pad-key="pa2"/>
+            <pin position="36" pad-key="pa1"/>
+            <pin position="37" pad-key="pa0"/>
+            <pin position="38" pad-key="vcc"/>
+            <pin position="39" pad-key="gnd"/>
+            <pin position="40" pad-key="pb0"/>
+            <pin position="41" pad-key="pb1"/>
+            <pin position="42" pad-key="pb2"/>
+            <pin position="43" pad-key="pb3"/>
+            <pin position="44" pad-key="pb4"/>
         </pinout>
     </pinouts>
     <variants>
-        <variant name="ATmega644PA-AU" pinout-key="tqfp_qfn_44" package="TQFP44"/>
-        <variant name="ATmega644PA-PU" pinout-key="pdip40" package="PDIP40"/>
-        <variant name="ATmega644PA-MU" pinout-key="tqfp_qfn_44" package="VQFN44"/>
-        <variant name="ATmega644PA-AN" pinout-key="tqfp_qfn_44" package="TQFP44"/>
-        <variant name="ATmega644PA-PN" pinout-key="pdip40" package="PDIP40"/>
-        <variant name="ATmega644PA-MN" pinout-key="tqfp_qfn_44" package="VQFN44"/>
+        <variant key="atmega644pa_au" name="ATmega644PA-AU" pinout-key="tqfp_qfn_44"/>
+        <variant key="atmega644pa_pu" name="ATmega644PA-PU" pinout-key="pdip40"/>
+        <variant key="atmega644pa_mu" name="ATmega644PA-MU" pinout-key="tqfp_qfn_44"/>
+        <variant key="atmega644pa_an" name="ATmega644PA-AN" pinout-key="tqfp_qfn_44"/>
+        <variant key="atmega644pa_pn" name="ATmega644PA-PN" pinout-key="pdip40"/>
+        <variant key="atmega644pa_mn" name="ATmega644PA-MN" pinout-key="tqfp_qfn_44"/>
     </variants>
 </device>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA644RFR2.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA644RFR2.xml
index 7d807902..9706b660 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA644RFR2.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA644RFR2.xml
@@ -218,60 +218,59 @@
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pb2" index="2" function="PORTB" group="P"/>
-                <signal pad-id="pb3" index="3" function="PORTB" group="P"/>
-                <signal pad-id="pb4" index="4" function="PORTB" group="P"/>
-                <signal pad-id="pb5" index="5" function="PORTB" group="P"/>
-                <signal pad-id="pb6" index="6" function="PORTB" group="P"/>
-                <signal pad-id="pb7" index="7" function="PORTB" group="P"/>
+                <signal pad-key="pb0" index="0" function="PORTB" group="P"/>
+                <signal pad-key="pb1" index="1" function="PORTB" group="P"/>
+                <signal pad-key="pb2" index="2" function="PORTB" group="P"/>
+                <signal pad-key="pb3" index="3" function="PORTB" group="P"/>
+                <signal pad-key="pb4" index="4" function="PORTB" group="P"/>
+                <signal pad-key="pb5" index="5" function="PORTB" group="P"/>
+                <signal pad-key="pb6" index="6" function="PORTB" group="P"/>
+                <signal pad-key="pb7" index="7" function="PORTB" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pd2" index="2" function="PORTD" group="P"/>
-                <signal pad-id="pd3" index="3" function="PORTD" group="P"/>
-                <signal pad-id="pd4" index="4" function="PORTD" group="P"/>
-                <signal pad-id="pd5" index="5" function="PORTD" group="P"/>
-                <signal pad-id="pd6" index="6" function="PORTD" group="P"/>
-                <signal pad-id="pd7" index="7" function="PORTD" group="P"/>
+                <signal pad-key="pd0" index="0" function="PORTD" group="P"/>
+                <signal pad-key="pd1" index="1" function="PORTD" group="P"/>
+                <signal pad-key="pd2" index="2" function="PORTD" group="P"/>
+                <signal pad-key="pd3" index="3" function="PORTD" group="P"/>
+                <signal pad-key="pd4" index="4" function="PORTD" group="P"/>
+                <signal pad-key="pd5" index="5" function="PORTD" group="P"/>
+                <signal pad-key="pd6" index="6" function="PORTD" group="P"/>
+                <signal pad-key="pd7" index="7" function="PORTD" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="porte" name="PORTE" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pe2" index="2" function="PORTE" group="P"/>
-                <signal pad-id="pe3" index="3" function="PORTE" group="P"/>
-                <signal pad-id="pe4" index="4" function="PORTE" group="P"/>
-                <signal pad-id="pe5" index="5" function="PORTE" group="P"/>
-                <signal pad-id="pe7" index="7" function="PORTE" group="P"/>
+                <signal pad-key="pe0" index="0" function="PORTE" group="P"/>
+                <signal pad-key="pe1" index="1" function="PORTE" group="P"/>
+                <signal pad-key="pe2" index="2" function="PORTE" group="P"/>
+                <signal pad-key="pe3" index="3" function="PORTE" group="P"/>
+                <signal pad-key="pe4" index="4" function="PORTE" group="P"/>
+                <signal pad-key="pe5" index="5" function="PORTE" group="P"/>
+                <signal pad-key="pe7" index="7" function="PORTE" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portf" name="PORTF" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pf2" index="2" function="PORTF" group="P"/>
-                <signal pad-id="pf3/4" index="3" function="PORTF" group="P"/>
-                <signal pad-id="pf4/4" index="4" function="PORTF" group="P"/>
-                <signal pad-id="pf5" index="5" function="PORTF" group="P"/>
-                <signal pad-id="pf6" index="6" function="PORTF" group="P"/>
-                <signal pad-id="pf7" index="7" function="PORTF" group="P"/>
+                <signal pad-key="pf0" index="0" function="PORTF" group="P"/>
+                <signal pad-key="pf1" index="1" function="PORTF" group="P"/>
+                <signal pad-key="pf2" index="2" function="PORTF" group="P"/>
+                <signal pad-key="pf3/4" index="3" function="PORTF" group="P"/>
+                <signal pad-key="pf5" index="5" function="PORTF" group="P"/>
+                <signal pad-key="pf6" index="6" function="PORTF" group="P"/>
+                <signal pad-key="pf7" index="7" function="PORTF" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portg" name="PORTG" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pg4" index="4" function="PORTG" group="P"/>
+                <signal pad-key="pg1" index="1" function="PORTG" group="P"/>
+                <signal pad-key="pg3" index="3" function="PORTG" group="P"/>
+                <signal pad-key="pg4" index="4" function="PORTG" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="tc0" name="TC0" module-key="tc8">
@@ -1540,62 +1539,112 @@
             </register-group>
         </module>
     </modules>
+    <pads>
+        <pad key="pf3/4" name="PF3/4"/>
+        <pad key="pf5" name="PF5"/>
+        <pad key="pf6" name="PF6"/>
+        <pad key="pf7" name="PF7"/>
+        <pad key="avss_rfp" name="AVSS_RFP"/>
+        <pad key="rfp" name="RFP"/>
+        <pad key="rfn" name="RFN"/>
+        <pad key="avss_rfn" name="AVSS_RFN"/>
+        <pad key="tst" name="TST"/>
+        <pad key="rstn" name="RSTN"/>
+        <pad key="pg1" name="PG1"/>
+        <pad key="pg3" name="PG3"/>
+        <pad key="pg4" name="PG4"/>
+        <pad key="dvss" name="DVSS"/>
+        <pad key="dvdd" name="DVDD"/>
+        <pad key="devdd" name="DEVDD"/>
+        <pad key="pd0" name="PD0"/>
+        <pad key="pd1" name="PD1"/>
+        <pad key="pd2" name="PD2"/>
+        <pad key="pd3" name="PD3"/>
+        <pad key="pd4" name="PD4"/>
+        <pad key="pd5" name="PD5"/>
+        <pad key="pd6" name="PD6"/>
+        <pad key="pd7" name="PD7"/>
+        <pad key="clki" name="CLKI"/>
+        <pad key="pb0" name="PB0"/>
+        <pad key="pb1" name="PB1"/>
+        <pad key="pb2" name="PB2"/>
+        <pad key="pb3" name="PB3"/>
+        <pad key="pb4" name="PB4"/>
+        <pad key="pb5" name="PB5"/>
+        <pad key="pb6" name="PB6"/>
+        <pad key="pb7" name="PB7"/>
+        <pad key="pe0" name="PE0"/>
+        <pad key="pe1" name="PE1"/>
+        <pad key="pe2" name="PE2"/>
+        <pad key="pe3" name="PE3"/>
+        <pad key="pe4" name="PE4"/>
+        <pad key="pe5" name="PE5"/>
+        <pad key="pe7" name="PE7"/>
+        <pad key="xtal2" name="XTAL2"/>
+        <pad key="xtal1" name="XTAL1"/>
+        <pad key="avss" name="AVSS"/>
+        <pad key="evdd" name="EVDD"/>
+        <pad key="avdd" name="AVDD"/>
+        <pad key="pf0" name="PF0"/>
+        <pad key="pf1" name="PF1"/>
+        <pad key="pf2" name="PF2"/>
+    </pads>
     <pinouts>
         <pinout key="qfn48" name="QFN48" type="qfn">
-            <pin position="1" pad="PF3/4"/>
-            <pin position="2" pad="PF5"/>
-            <pin position="3" pad="PF6"/>
-            <pin position="4" pad="PF7"/>
-            <pin position="5" pad="AVSS_RFP"/>
-            <pin position="6" pad="RFP"/>
-            <pin position="7" pad="RFN"/>
-            <pin position="8" pad="AVSS_RFN"/>
-            <pin position="9" pad="TST"/>
-            <pin position="10" pad="RSTN"/>
-            <pin position="11" pad="PG1"/>
-            <pin position="12" pad="PG3"/>
-            <pin position="13" pad="PG4"/>
-            <pin position="14" pad="DVSS"/>
-            <pin position="15" pad="DVDD"/>
-            <pin position="16" pad="DEVDD"/>
-            <pin position="17" pad="PD0"/>
-            <pin position="18" pad="PD1"/>
-            <pin position="19" pad="PD2"/>
-            <pin position="20" pad="PD3"/>
-            <pin position="21" pad="PD4"/>
-            <pin position="22" pad="PD5"/>
-            <pin position="23" pad="PD6"/>
-            <pin position="24" pad="PD7"/>
-            <pin position="25" pad="CLKI"/>
-            <pin position="26" pad="PB0"/>
-            <pin position="27" pad="PB1"/>
-            <pin position="28" pad="PB2"/>
-            <pin position="29" pad="PB3"/>
-            <pin position="30" pad="PB4"/>
-            <pin position="31" pad="PB5"/>
-            <pin position="32" pad="PB6"/>
-            <pin position="33" pad="PB7"/>
-            <pin position="34" pad="PE0"/>
-            <pin position="35" pad="PE1"/>
-            <pin position="36" pad="PE2"/>
-            <pin position="37" pad="PE3"/>
-            <pin position="38" pad="PE4"/>
-            <pin position="39" pad="PE5"/>
-            <pin position="40" pad="PE7"/>
-            <pin position="41" pad="XTAL2"/>
-            <pin position="42" pad="XTAL1"/>
-            <pin position="43" pad="AVSS"/>
-            <pin position="44" pad="EVDD"/>
-            <pin position="45" pad="AVDD"/>
-            <pin position="46" pad="PF0"/>
-            <pin position="47" pad="PF1"/>
-            <pin position="48" pad="PF2"/>
+            <pin position="1" pad-key="pf3/4"/>
+            <pin position="2" pad-key="pf5"/>
+            <pin position="3" pad-key="pf6"/>
+            <pin position="4" pad-key="pf7"/>
+            <pin position="5" pad-key="avss_rfp"/>
+            <pin position="6" pad-key="rfp"/>
+            <pin position="7" pad-key="rfn"/>
+            <pin position="8" pad-key="avss_rfn"/>
+            <pin position="9" pad-key="tst"/>
+            <pin position="10" pad-key="rstn"/>
+            <pin position="11" pad-key="pg1"/>
+            <pin position="12" pad-key="pg3"/>
+            <pin position="13" pad-key="pg4"/>
+            <pin position="14" pad-key="dvss"/>
+            <pin position="15" pad-key="dvdd"/>
+            <pin position="16" pad-key="devdd"/>
+            <pin position="17" pad-key="pd0"/>
+            <pin position="18" pad-key="pd1"/>
+            <pin position="19" pad-key="pd2"/>
+            <pin position="20" pad-key="pd3"/>
+            <pin position="21" pad-key="pd4"/>
+            <pin position="22" pad-key="pd5"/>
+            <pin position="23" pad-key="pd6"/>
+            <pin position="24" pad-key="pd7"/>
+            <pin position="25" pad-key="clki"/>
+            <pin position="26" pad-key="pb0"/>
+            <pin position="27" pad-key="pb1"/>
+            <pin position="28" pad-key="pb2"/>
+            <pin position="29" pad-key="pb3"/>
+            <pin position="30" pad-key="pb4"/>
+            <pin position="31" pad-key="pb5"/>
+            <pin position="32" pad-key="pb6"/>
+            <pin position="33" pad-key="pb7"/>
+            <pin position="34" pad-key="pe0"/>
+            <pin position="35" pad-key="pe1"/>
+            <pin position="36" pad-key="pe2"/>
+            <pin position="37" pad-key="pe3"/>
+            <pin position="38" pad-key="pe4"/>
+            <pin position="39" pad-key="pe5"/>
+            <pin position="40" pad-key="pe7"/>
+            <pin position="41" pad-key="xtal2"/>
+            <pin position="42" pad-key="xtal1"/>
+            <pin position="43" pad-key="avss"/>
+            <pin position="44" pad-key="evdd"/>
+            <pin position="45" pad-key="avdd"/>
+            <pin position="46" pad-key="pf0"/>
+            <pin position="47" pad-key="pf1"/>
+            <pin position="48" pad-key="pf2"/>
         </pinout>
     </pinouts>
     <variants>
-        <variant name="ATmega644RFR2-ZU" pinout-key="qfn48" package="VQFN48"/>
-        <variant name="ATmega644RFR2-ZUR" pinout-key="qfn48" package="VQFN48"/>
-        <variant name="ATmega644RFR2-ZF" pinout-key="qfn48" package="VQFN48"/>
-        <variant name="ATmega644RFR2-ZFR" pinout-key="qfn48" package="VQFN48"/>
+        <variant key="atmega644rfr2_zu" name="ATmega644RFR2-ZU" pinout-key="qfn48"/>
+        <variant key="atmega644rfr2_zur" name="ATmega644RFR2-ZUR" pinout-key="qfn48"/>
+        <variant key="atmega644rfr2_zf" name="ATmega644RFR2-ZF" pinout-key="qfn48"/>
+        <variant key="atmega644rfr2_zfr" name="ATmega644RFR2-ZFR" pinout-key="qfn48"/>
     </variants>
 </device>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA645.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA645.xml
index d8175345..86c052ef 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA645.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA645.xml
@@ -218,90 +218,90 @@
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pa2" index="2" function="PORTA" group="P"/>
-                <signal pad-id="pa3" index="3" function="PORTA" group="P"/>
-                <signal pad-id="pa4" index="4" function="PORTA" group="P"/>
-                <signal pad-id="pa5" index="5" function="PORTA" group="P"/>
-                <signal pad-id="pa6" index="6" function="PORTA" group="P"/>
-                <signal pad-id="pa7" index="7" function="PORTA" group="P"/>
+                <signal pad-key="pa0" index="0" function="PORTA" group="P"/>
+                <signal pad-key="pa1" index="1" function="PORTA" group="P"/>
+                <signal pad-key="pa2" index="2" function="PORTA" group="P"/>
+                <signal pad-key="pa3" index="3" function="PORTA" group="P"/>
+                <signal pad-key="pa4" index="4" function="PORTA" group="P"/>
+                <signal pad-key="pa5" index="5" function="PORTA" group="P"/>
+                <signal pad-key="pa6" index="6" function="PORTA" group="P"/>
+                <signal pad-key="pa7" index="7" function="PORTA" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pb2" index="2" function="PORTB" group="P"/>
-                <signal pad-id="pb3" index="3" function="PORTB" group="P"/>
-                <signal pad-id="pb4" index="4" function="PORTB" group="P"/>
-                <signal pad-id="pb5" index="5" function="PORTB" group="P"/>
-                <signal pad-id="pb6" index="6" function="PORTB" group="P"/>
-                <signal pad-id="pb7" index="7" function="PORTB" group="P"/>
+                <signal pad-key="pb0" index="0" function="PORTB" group="P"/>
+                <signal pad-key="pb1" index="1" function="PORTB" group="P"/>
+                <signal pad-key="pb2" index="2" function="PORTB" group="P"/>
+                <signal pad-key="pb3" index="3" function="PORTB" group="P"/>
+                <signal pad-key="pb4" index="4" function="PORTB" group="P"/>
+                <signal pad-key="pb5" index="5" function="PORTB" group="P"/>
+                <signal pad-key="pb6" index="6" function="PORTB" group="P"/>
+                <signal pad-key="pb7" index="7" function="PORTB" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pc2" index="2" function="PORTC" group="P"/>
-                <signal pad-id="pc3" index="3" function="PORTC" group="P"/>
-                <signal pad-id="pc4" index="4" function="PORTC" group="P"/>
-                <signal pad-id="pc5" index="5" function="PORTC" group="P"/>
-                <signal pad-id="pc6" index="6" function="PORTC" group="P"/>
-                <signal pad-id="pc7" index="7" function="PORTC" group="P"/>
+                <signal pad-key="pc0" index="0" function="PORTC" group="P"/>
+                <signal pad-key="pc1" index="1" function="PORTC" group="P"/>
+                <signal pad-key="pc2" index="2" function="PORTC" group="P"/>
+                <signal pad-key="pc3" index="3" function="PORTC" group="P"/>
+                <signal pad-key="pc4" index="4" function="PORTC" group="P"/>
+                <signal pad-key="pc5" index="5" function="PORTC" group="P"/>
+                <signal pad-key="pc6" index="6" function="PORTC" group="P"/>
+                <signal pad-key="pc7" index="7" function="PORTC" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pd2" index="2" function="PORTD" group="P"/>
-                <signal pad-id="pd3" index="3" function="PORTD" group="P"/>
-                <signal pad-id="pd4" index="4" function="PORTD" group="P"/>
-                <signal pad-id="pd5" index="5" function="PORTD" group="P"/>
-                <signal pad-id="pd6" index="6" function="PORTD" group="P"/>
-                <signal pad-id="pd7" index="7" function="PORTD" group="P"/>
+                <signal pad-key="pd0" index="0" function="PORTD" group="P"/>
+                <signal pad-key="pd1" index="1" function="PORTD" group="P"/>
+                <signal pad-key="pd2" index="2" function="PORTD" group="P"/>
+                <signal pad-key="pd3" index="3" function="PORTD" group="P"/>
+                <signal pad-key="pd4" index="4" function="PORTD" group="P"/>
+                <signal pad-key="pd5" index="5" function="PORTD" group="P"/>
+                <signal pad-key="pd6" index="6" function="PORTD" group="P"/>
+                <signal pad-key="pd7" index="7" function="PORTD" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="porte" name="PORTE" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pe2" index="2" function="PORTE" group="P"/>
-                <signal pad-id="pe3" index="3" function="PORTE" group="P"/>
-                <signal pad-id="pe4" index="4" function="PORTE" group="P"/>
-                <signal pad-id="pe5" index="5" function="PORTE" group="P"/>
-                <signal pad-id="pe6" index="6" function="PORTE" group="P"/>
-                <signal pad-id="pe7" index="7" function="PORTE" group="P"/>
+                <signal pad-key="pe0" index="0" function="PORTE" group="P"/>
+                <signal pad-key="pe1" index="1" function="PORTE" group="P"/>
+                <signal pad-key="pe2" index="2" function="PORTE" group="P"/>
+                <signal pad-key="pe3" index="3" function="PORTE" group="P"/>
+                <signal pad-key="pe4" index="4" function="PORTE" group="P"/>
+                <signal pad-key="pe5" index="5" function="PORTE" group="P"/>
+                <signal pad-key="pe6" index="6" function="PORTE" group="P"/>
+                <signal pad-key="pe7" index="7" function="PORTE" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portf" name="PORTF" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pf2" index="2" function="PORTF" group="P"/>
-                <signal pad-id="pf3" index="3" function="PORTF" group="P"/>
-                <signal pad-id="pf4" index="4" function="PORTF" group="P"/>
-                <signal pad-id="pf5" index="5" function="PORTF" group="P"/>
-                <signal pad-id="pf6" index="6" function="PORTF" group="P"/>
-                <signal pad-id="pf7" index="7" function="PORTF" group="P"/>
+                <signal pad-key="pf0" index="0" function="PORTF" group="P"/>
+                <signal pad-key="pf1" index="1" function="PORTF" group="P"/>
+                <signal pad-key="pf2" index="2" function="PORTF" group="P"/>
+                <signal pad-key="pf3" index="3" function="PORTF" group="P"/>
+                <signal pad-key="pf4" index="4" function="PORTF" group="P"/>
+                <signal pad-key="pf5" index="5" function="PORTF" group="P"/>
+                <signal pad-key="pf6" index="6" function="PORTF" group="P"/>
+                <signal pad-key="pf7" index="7" function="PORTF" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portg" name="PORTG" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pg2" index="2" function="PORTG" group="P"/>
-                <signal pad-id="pg3" index="3" function="PORTG" group="P"/>
-                <signal pad-id="pg4" index="4" function="PORTG" group="P"/>
-                <signal pad-id="pg5" index="5" function="PORTG" group="P"/>
+                <signal pad-key="pg0" index="0" function="PORTG" group="P"/>
+                <signal pad-key="pg1" index="1" function="PORTG" group="P"/>
+                <signal pad-key="pg2" index="2" function="PORTG" group="P"/>
+                <signal pad-key="pg3" index="3" function="PORTG" group="P"/>
+                <signal pad-key="pg4" index="4" function="PORTG" group="P"/>
+                <signal pad-key="pg5" index="5" function="PORTG" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="tc0" name="TC0" module-key="tc8">
@@ -723,76 +723,139 @@
             </register-group>
         </module>
     </modules>
+    <pads>
+        <pad key="pe0" name="PE0"/>
+        <pad key="pe1" name="PE1"/>
+        <pad key="pe2" name="PE2"/>
+        <pad key="pe3" name="PE3"/>
+        <pad key="pe4" name="PE4"/>
+        <pad key="pe5" name="PE5"/>
+        <pad key="pe6" name="PE6"/>
+        <pad key="pe7" name="PE7"/>
+        <pad key="pb0" name="PB0"/>
+        <pad key="pb1" name="PB1"/>
+        <pad key="pb2" name="PB2"/>
+        <pad key="pb3" name="PB3"/>
+        <pad key="pb4" name="PB4"/>
+        <pad key="pb5" name="PB5"/>
+        <pad key="pb6" name="PB6"/>
+        <pad key="pb7" name="PB7"/>
+        <pad key="pg3" name="PG3"/>
+        <pad key="pg4" name="PG4"/>
+        <pad key="pg5" name="PG5"/>
+        <pad key="vcc" name="VCC"/>
+        <pad key="gdn" name="GDN"/>
+        <pad key="xtal2" name="XTAL2"/>
+        <pad key="xtal1" name="XTAL1"/>
+        <pad key="pd0" name="PD0"/>
+        <pad key="pd1" name="PD1"/>
+        <pad key="pd2" name="PD2"/>
+        <pad key="pd3" name="PD3"/>
+        <pad key="pd4" name="PD4"/>
+        <pad key="pd5" name="PD5"/>
+        <pad key="pd6" name="PD6"/>
+        <pad key="pd7" name="PD7"/>
+        <pad key="pg0" name="PG0"/>
+        <pad key="pg1" name="PG1"/>
+        <pad key="pc0" name="PC0"/>
+        <pad key="pc1" name="PC1"/>
+        <pad key="pc2" name="PC2"/>
+        <pad key="pc3" name="PC3"/>
+        <pad key="pc4" name="PC4"/>
+        <pad key="pc5" name="PC5"/>
+        <pad key="pc6" name="PC6"/>
+        <pad key="pc7" name="PC7"/>
+        <pad key="pg2" name="PG2"/>
+        <pad key="pa7" name="PA7"/>
+        <pad key="pa6" name="PA6"/>
+        <pad key="pa5" name="PA5"/>
+        <pad key="pa4" name="PA4"/>
+        <pad key="pa3" name="PA3"/>
+        <pad key="pa2" name="PA2"/>
+        <pad key="pa1" name="PA1"/>
+        <pad key="pa0" name="PA0"/>
+        <pad key="gnd" name="GND"/>
+        <pad key="pf7" name="PF7"/>
+        <pad key="pf6" name="PF6"/>
+        <pad key="pf5" name="PF5"/>
+        <pad key="pf4" name="PF4"/>
+        <pad key="pf3" name="PF3"/>
+        <pad key="pf2" name="PF2"/>
+        <pad key="pf1" name="PF1"/>
+        <pad key="pf0" name="PF0"/>
+        <pad key="aref" name="AREF"/>
+        <pad key="avcc" name="AVCC"/>
+    </pads>
     <pinouts>
         <pinout key="qfp_qfn_64" name="QFP_QFN_64" type="qfn">
-            <pin position="1" pad="NC"/>
-            <pin position="2" pad="PE0"/>
-            <pin position="3" pad="PE1"/>
-            <pin position="4" pad="PE2"/>
-            <pin position="5" pad="PE3"/>
-            <pin position="6" pad="PE4"/>
-            <pin position="7" pad="PE5"/>
-            <pin position="8" pad="PE6"/>
-            <pin position="9" pad="PE7"/>
-            <pin position="10" pad="PB0"/>
-            <pin position="11" pad="PB1"/>
-            <pin position="12" pad="PB2"/>
-            <pin position="13" pad="PB3"/>
-            <pin position="14" pad="PB4"/>
-            <pin position="15" pad="PB5"/>
-            <pin position="16" pad="PB6"/>
-            <pin position="17" pad="PB7"/>
-            <pin position="18" pad="PG3"/>
-            <pin position="19" pad="PG4"/>
-            <pin position="20" pad="PG5"/>
-            <pin position="21" pad="VCC"/>
-            <pin position="22" pad="GDN"/>
-            <pin position="23" pad="XTAL2"/>
-            <pin position="24" pad="XTAL1"/>
-            <pin position="25" pad="PD0"/>
-            <pin position="26" pad="PD1"/>
-            <pin position="27" pad="PD2"/>
-            <pin position="28" pad="PD3"/>
-            <pin position="29" pad="PD4"/>
-            <pin position="30" pad="PD5"/>
-            <pin position="31" pad="PD6"/>
-            <pin position="32" pad="PD7"/>
-            <pin position="33" pad="PG0"/>
-            <pin position="34" pad="PG1"/>
-            <pin position="35" pad="PC0"/>
-            <pin position="36" pad="PC1"/>
-            <pin position="37" pad="PC2"/>
-            <pin position="38" pad="PC3"/>
-            <pin position="39" pad="PC4"/>
-            <pin position="40" pad="PC5"/>
-            <pin position="41" pad="PC6"/>
-            <pin position="42" pad="PC7"/>
-            <pin position="43" pad="PG2"/>
-            <pin position="44" pad="PA7"/>
-            <pin position="45" pad="PA6"/>
-            <pin position="46" pad="PA5"/>
-            <pin position="47" pad="PA4"/>
-            <pin position="48" pad="PA3"/>
-            <pin position="49" pad="PA2"/>
-            <pin position="50" pad="PA1"/>
-            <pin position="51" pad="PA0"/>
-            <pin position="52" pad="VCC"/>
-            <pin position="53" pad="GND"/>
-            <pin position="54" pad="PF7"/>
-            <pin position="55" pad="PF6"/>
-            <pin position="56" pad="PF5"/>
-            <pin position="57" pad="PF4"/>
-            <pin position="58" pad="PF3"/>
-            <pin position="59" pad="PF2"/>
-            <pin position="60" pad="PF1"/>
-            <pin position="61" pad="PF0"/>
-            <pin position="62" pad="AREF"/>
-            <pin position="63" pad="GND"/>
-            <pin position="64" pad="AVCC"/>
+            <pin position="1"/>
+            <pin position="2" pad-key="pe0"/>
+            <pin position="3" pad-key="pe1"/>
+            <pin position="4" pad-key="pe2"/>
+            <pin position="5" pad-key="pe3"/>
+            <pin position="6" pad-key="pe4"/>
+            <pin position="7" pad-key="pe5"/>
+            <pin position="8" pad-key="pe6"/>
+            <pin position="9" pad-key="pe7"/>
+            <pin position="10" pad-key="pb0"/>
+            <pin position="11" pad-key="pb1"/>
+            <pin position="12" pad-key="pb2"/>
+            <pin position="13" pad-key="pb3"/>
+            <pin position="14" pad-key="pb4"/>
+            <pin position="15" pad-key="pb5"/>
+            <pin position="16" pad-key="pb6"/>
+            <pin position="17" pad-key="pb7"/>
+            <pin position="18" pad-key="pg3"/>
+            <pin position="19" pad-key="pg4"/>
+            <pin position="20" pad-key="pg5"/>
+            <pin position="21" pad-key="vcc"/>
+            <pin position="22" pad-key="gdn"/>
+            <pin position="23" pad-key="xtal2"/>
+            <pin position="24" pad-key="xtal1"/>
+            <pin position="25" pad-key="pd0"/>
+            <pin position="26" pad-key="pd1"/>
+            <pin position="27" pad-key="pd2"/>
+            <pin position="28" pad-key="pd3"/>
+            <pin position="29" pad-key="pd4"/>
+            <pin position="30" pad-key="pd5"/>
+            <pin position="31" pad-key="pd6"/>
+            <pin position="32" pad-key="pd7"/>
+            <pin position="33" pad-key="pg0"/>
+            <pin position="34" pad-key="pg1"/>
+            <pin position="35" pad-key="pc0"/>
+            <pin position="36" pad-key="pc1"/>
+            <pin position="37" pad-key="pc2"/>
+            <pin position="38" pad-key="pc3"/>
+            <pin position="39" pad-key="pc4"/>
+            <pin position="40" pad-key="pc5"/>
+            <pin position="41" pad-key="pc6"/>
+            <pin position="42" pad-key="pc7"/>
+            <pin position="43" pad-key="pg2"/>
+            <pin position="44" pad-key="pa7"/>
+            <pin position="45" pad-key="pa6"/>
+            <pin position="46" pad-key="pa5"/>
+            <pin position="47" pad-key="pa4"/>
+            <pin position="48" pad-key="pa3"/>
+            <pin position="49" pad-key="pa2"/>
+            <pin position="50" pad-key="pa1"/>
+            <pin position="51" pad-key="pa0"/>
+            <pin position="52" pad-key="vcc"/>
+            <pin position="53" pad-key="gnd"/>
+            <pin position="54" pad-key="pf7"/>
+            <pin position="55" pad-key="pf6"/>
+            <pin position="56" pad-key="pf5"/>
+            <pin position="57" pad-key="pf4"/>
+            <pin position="58" pad-key="pf3"/>
+            <pin position="59" pad-key="pf2"/>
+            <pin position="60" pad-key="pf1"/>
+            <pin position="61" pad-key="pf0"/>
+            <pin position="62" pad-key="aref"/>
+            <pin position="63" pad-key="gnd"/>
+            <pin position="64" pad-key="avcc"/>
         </pinout>
     </pinouts>
     <variants>
-        <variant name="ATmega645-AU" pinout-key="qfp_qfn_64" package="TQFP64"/>
-        <variant name="ATmega645-MU" pinout-key="qfp_qfn_64" package="VQFN64"/>
+        <variant key="atmega645_au" name="ATmega645-AU" pinout-key="qfp_qfn_64"/>
+        <variant key="atmega645_mu" name="ATmega645-MU" pinout-key="qfp_qfn_64"/>
     </variants>
 </device>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA6450.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA6450.xml
index 9d39397c..5a4d1dc9 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA6450.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA6450.xml
@@ -218,115 +218,115 @@
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pa2" index="2" function="PORTA" group="P"/>
-                <signal pad-id="pa3" index="3" function="PORTA" group="P"/>
-                <signal pad-id="pa4" index="4" function="PORTA" group="P"/>
-                <signal pad-id="pa5" index="5" function="PORTA" group="P"/>
-                <signal pad-id="pa6" index="6" function="PORTA" group="P"/>
-                <signal pad-id="pa7" index="7" function="PORTA" group="P"/>
+                <signal pad-key="pa0" index="0" function="PORTA" group="P"/>
+                <signal pad-key="pa1" index="1" function="PORTA" group="P"/>
+                <signal pad-key="pa2" index="2" function="PORTA" group="P"/>
+                <signal pad-key="pa3" index="3" function="PORTA" group="P"/>
+                <signal pad-key="pa4" index="4" function="PORTA" group="P"/>
+                <signal pad-key="pa5" index="5" function="PORTA" group="P"/>
+                <signal pad-key="pa6" index="6" function="PORTA" group="P"/>
+                <signal pad-key="pa7" index="7" function="PORTA" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pb2" index="2" function="PORTB" group="P"/>
-                <signal pad-id="pb3" index="3" function="PORTB" group="P"/>
-                <signal pad-id="pb4" index="4" function="PORTB" group="P"/>
-                <signal pad-id="pb5" index="5" function="PORTB" group="P"/>
-                <signal pad-id="pb6" index="6" function="PORTB" group="P"/>
-                <signal pad-id="pb7" index="7" function="PORTB" group="P"/>
+                <signal pad-key="pb0" index="0" function="PORTB" group="P"/>
+                <signal pad-key="pb1" index="1" function="PORTB" group="P"/>
+                <signal pad-key="pb2" index="2" function="PORTB" group="P"/>
+                <signal pad-key="pb3" index="3" function="PORTB" group="P"/>
+                <signal pad-key="pb4" index="4" function="PORTB" group="P"/>
+                <signal pad-key="pb5" index="5" function="PORTB" group="P"/>
+                <signal pad-key="pb6" index="6" function="PORTB" group="P"/>
+                <signal pad-key="pb7" index="7" function="PORTB" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pc2" index="2" function="PORTC" group="P"/>
-                <signal pad-id="pc3" index="3" function="PORTC" group="P"/>
-                <signal pad-id="pc4" index="4" function="PORTC" group="P"/>
-                <signal pad-id="pc5" index="5" function="PORTC" group="P"/>
-                <signal pad-id="pc6" index="6" function="PORTC" group="P"/>
-                <signal pad-id="pc7" index="7" function="PORTC" group="P"/>
+                <signal pad-key="pc0" index="0" function="PORTC" group="P"/>
+                <signal pad-key="pc1" index="1" function="PORTC" group="P"/>
+                <signal pad-key="pc2" index="2" function="PORTC" group="P"/>
+                <signal pad-key="pc3" index="3" function="PORTC" group="P"/>
+                <signal pad-key="pc4" index="4" function="PORTC" group="P"/>
+                <signal pad-key="pc5" index="5" function="PORTC" group="P"/>
+                <signal pad-key="pc6" index="6" function="PORTC" group="P"/>
+                <signal pad-key="pc7" index="7" function="PORTC" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pd2" index="2" function="PORTD" group="P"/>
-                <signal pad-id="pd3" index="3" function="PORTD" group="P"/>
-                <signal pad-id="pd4" index="4" function="PORTD" group="P"/>
-                <signal pad-id="pd5" index="5" function="PORTD" group="P"/>
-                <signal pad-id="pd6" index="6" function="PORTD" group="P"/>
-                <signal pad-id="pd7" index="7" function="PORTD" group="P"/>
+                <signal pad-key="pd0" index="0" function="PORTD" group="P"/>
+                <signal pad-key="pd1" index="1" function="PORTD" group="P"/>
+                <signal pad-key="pd2" index="2" function="PORTD" group="P"/>
+                <signal pad-key="pd3" index="3" function="PORTD" group="P"/>
+                <signal pad-key="pd4" index="4" function="PORTD" group="P"/>
+                <signal pad-key="pd5" index="5" function="PORTD" group="P"/>
+                <signal pad-key="pd6" index="6" function="PORTD" group="P"/>
+                <signal pad-key="pd7" index="7" function="PORTD" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="porte" name="PORTE" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pe2" index="2" function="PORTE" group="P"/>
-                <signal pad-id="pe3" index="3" function="PORTE" group="P"/>
-                <signal pad-id="pe4" index="4" function="PORTE" group="P"/>
-                <signal pad-id="pe5" index="5" function="PORTE" group="P"/>
-                <signal pad-id="pe6" index="6" function="PORTE" group="P"/>
-                <signal pad-id="pe7" index="7" function="PORTE" group="P"/>
+                <signal pad-key="pe0" index="0" function="PORTE" group="P"/>
+                <signal pad-key="pe1" index="1" function="PORTE" group="P"/>
+                <signal pad-key="pe2" index="2" function="PORTE" group="P"/>
+                <signal pad-key="pe3" index="3" function="PORTE" group="P"/>
+                <signal pad-key="pe4" index="4" function="PORTE" group="P"/>
+                <signal pad-key="pe5" index="5" function="PORTE" group="P"/>
+                <signal pad-key="pe6" index="6" function="PORTE" group="P"/>
+                <signal pad-key="pe7" index="7" function="PORTE" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portf" name="PORTF" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pf2" index="2" function="PORTF" group="P"/>
-                <signal pad-id="pf3" index="3" function="PORTF" group="P"/>
-                <signal pad-id="pf4" index="4" function="PORTF" group="P"/>
-                <signal pad-id="pf5" index="5" function="PORTF" group="P"/>
-                <signal pad-id="pf6" index="6" function="PORTF" group="P"/>
-                <signal pad-id="pf7" index="7" function="PORTF" group="P"/>
+                <signal pad-key="pf0" index="0" function="PORTF" group="P"/>
+                <signal pad-key="pf1" index="1" function="PORTF" group="P"/>
+                <signal pad-key="pf2" index="2" function="PORTF" group="P"/>
+                <signal pad-key="pf3" index="3" function="PORTF" group="P"/>
+                <signal pad-key="pf4" index="4" function="PORTF" group="P"/>
+                <signal pad-key="pf5" index="5" function="PORTF" group="P"/>
+                <signal pad-key="pf6" index="6" function="PORTF" group="P"/>
+                <signal pad-key="pf7" index="7" function="PORTF" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portg" name="PORTG" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pg2" index="2" function="PORTG" group="P"/>
-                <signal pad-id="pg3" index="3" function="PORTG" group="P"/>
-                <signal pad-id="pg4" index="4" function="PORTG" group="P"/>
-                <signal pad-id="pg5" index="5" function="PORTG" group="P"/>
+                <signal pad-key="pg0" index="0" function="PORTG" group="P"/>
+                <signal pad-key="pg1" index="1" function="PORTG" group="P"/>
+                <signal pad-key="pg2" index="2" function="PORTG" group="P"/>
+                <signal pad-key="pg3" index="3" function="PORTG" group="P"/>
+                <signal pad-key="pg4" index="4" function="PORTG" group="P"/>
+                <signal pad-key="pg5" index="5" function="PORTG" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="porth" name="PORTH" module-key="gpio_port">
             <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"/>
-                <signal pad-id="ph2" index="2" function="PORTH" group="P"/>
-                <signal pad-id="ph3" index="3" function="PORTH" group="P"/>
-                <signal pad-id="ph4" index="4" function="PORTH" group="P"/>
-                <signal pad-id="ph5" index="5" function="PORTH" group="P"/>
-                <signal pad-id="ph6" index="6" function="PORTH" group="P"/>
-                <signal pad-id="ph7" index="7" function="PORTH" group="P"/>
+                <signal pad-key="ph0" index="0" function="PORTH" group="P"/>
+                <signal pad-key="ph1" index="1" function="PORTH" group="P"/>
+                <signal pad-key="ph2" index="2" function="PORTH" group="P"/>
+                <signal pad-key="ph3" index="3" function="PORTH" group="P"/>
+                <signal pad-key="ph4" index="4" function="PORTH" group="P"/>
+                <signal pad-key="ph5" index="5" function="PORTH" group="P"/>
+                <signal pad-key="ph6" index="6" function="PORTH" group="P"/>
+                <signal pad-key="ph7" index="7" function="PORTH" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portj" name="PORTJ" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pj2" index="2" function="PORTJ" group="P"/>
-                <signal pad-id="pj3" index="3" function="PORTJ" group="P"/>
-                <signal pad-id="pj4" index="4" function="PORTJ" group="P"/>
-                <signal pad-id="pj5" index="5" function="PORTJ" group="P"/>
-                <signal pad-id="pj6" index="6" function="PORTJ" group="P"/>
+                <signal pad-key="pj0" index="0" function="PORTJ" group="P"/>
+                <signal pad-key="pj1" index="1" function="PORTJ" group="P"/>
+                <signal pad-key="pj2" index="2" function="PORTJ" group="P"/>
+                <signal pad-key="pj3" index="3" function="PORTJ" group="P"/>
+                <signal pad-key="pj4" index="4" function="PORTJ" group="P"/>
+                <signal pad-key="pj5" index="5" function="PORTJ" group="P"/>
+                <signal pad-key="pj6" index="6" function="PORTJ" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="tc0" name="TC0" module-key="tc8">
@@ -760,111 +760,189 @@
             </register-group>
         </module>
     </modules>
+    <pads>
+        <pad key="pe0" name="PE0"/>
+        <pad key="pe1" name="PE1"/>
+        <pad key="pe2" name="PE2"/>
+        <pad key="pe3" name="PE3"/>
+        <pad key="pe4" name="PE4"/>
+        <pad key="pe5" name="PE5"/>
+        <pad key="pe6" name="PE6"/>
+        <pad key="pe7" name="PE7"/>
+        <pad key="vcc" name="VCC"/>
+        <pad key="gnd" name="GND"/>
+        <pad key="pj0" name="PJ0"/>
+        <pad key="pj1" name="PJ1"/>
+        <pad key="pb0" name="PB0"/>
+        <pad key="pb1" name="PB1"/>
+        <pad key="pb2" name="PB2"/>
+        <pad key="pb3" name="PB3"/>
+        <pad key="pb4" name="PB4"/>
+        <pad key="pb5" name="PB5"/>
+        <pad key="pb6" name="PB6"/>
+        <pad key="pb7" name="PB7"/>
+        <pad key="pg3" name="PG3"/>
+        <pad key="pg4" name="PG4"/>
+        <pad key="pg5" name="PG5"/>
+        <pad key="xtal2" name="XTAL2"/>
+        <pad key="xtal1" name="XTAL1"/>
+        <pad key="pj2" name="PJ2"/>
+        <pad key="pj3" name="PJ3"/>
+        <pad key="pj4" name="PJ4"/>
+        <pad key="pj5" name="PJ5"/>
+        <pad key="pj6" name="PJ6"/>
+        <pad key="pd0" name="PD0"/>
+        <pad key="pd1" name="PD1"/>
+        <pad key="pd2" name="PD2"/>
+        <pad key="pd3" name="PD3"/>
+        <pad key="pd4" name="PD4"/>
+        <pad key="pd5" name="PD5"/>
+        <pad key="pd6" name="PD6"/>
+        <pad key="pd7" name="PD7"/>
+        <pad key="pg0" name="PG0"/>
+        <pad key="pg1" name="PG1"/>
+        <pad key="pc0" name="PC0"/>
+        <pad key="pc1" name="PC1"/>
+        <pad key="pc2" name="PC2"/>
+        <pad key="pc3" name="PC3"/>
+        <pad key="pc4" name="PC4"/>
+        <pad key="pc5" name="PC5"/>
+        <pad key="ph0" name="PH0"/>
+        <pad key="ph1" name="PH1"/>
+        <pad key="ph2" name="PH2"/>
+        <pad key="ph3" name="PH3"/>
+        <pad key="pc6" name="PC6"/>
+        <pad key="pc7" name="PC7"/>
+        <pad key="pg2" name="PG2"/>
+        <pad key="pa7" name="PA7"/>
+        <pad key="pa6" name="PA6"/>
+        <pad key="pa5" name="PA5"/>
+        <pad key="pa4" name="PA4"/>
+        <pad key="pa3" name="PA3"/>
+        <pad key="pa2" name="PA2"/>
+        <pad key="pa1" name="PA1"/>
+        <pad key="pa0" name="PA0"/>
+        <pad key="ph4" name="PH4"/>
+        <pad key="ph5" name="PH5"/>
+        <pad key="ph6" name="PH6"/>
+        <pad key="ph7" name="PH7"/>
+        <pad key="pf7" name="PF7"/>
+        <pad key="pf6" name="PF6"/>
+        <pad key="pf5" name="PF5"/>
+        <pad key="pf4" name="PF4"/>
+        <pad key="pf3" name="PF3"/>
+        <pad key="pf2" name="PF2"/>
+        <pad key="pf1" name="PF1"/>
+        <pad key="pf0" name="PF0"/>
+        <pad key="aref" name="AREF"/>
+        <pad key="agnd" name="AGND"/>
+        <pad key="avcc" name="AVCC"/>
+    </pads>
     <pinouts>
         <pinout key="qfp_100" name="QFP_100" type="qfp">
-            <pin position="1" pad="NC"/>
-            <pin position="2" pad="PE0"/>
-            <pin position="3" pad="PE1"/>
-            <pin position="4" pad="PE2"/>
-            <pin position="5" pad="PE3"/>
-            <pin position="6" pad="PE4"/>
-            <pin position="7" pad="PE5"/>
-            <pin position="8" pad="PE6"/>
-            <pin position="9" pad="PE7"/>
-            <pin position="10" pad="VCC"/>
-            <pin position="11" pad="GND"/>
-            <pin position="12" pad="NC"/>
-            <pin position="13" pad="PJ0"/>
-            <pin position="14" pad="PJ1"/>
-            <pin position="15" pad="NC"/>
-            <pin position="16" pad="NC"/>
-            <pin position="17" pad="NC"/>
-            <pin position="18" pad="NC"/>
-            <pin position="19" pad="PB0"/>
-            <pin position="20" pad="PB1"/>
-            <pin position="21" pad="PB2"/>
-            <pin position="22" pad="PB3"/>
-            <pin position="23" pad="PB4"/>
-            <pin position="24" pad="PB5"/>
-            <pin position="25" pad="PB6"/>
-            <pin position="26" pad="PB7"/>
-            <pin position="27" pad="NC"/>
-            <pin position="28" pad="PG3"/>
-            <pin position="29" pad="PG4"/>
-            <pin position="30" pad="PG5"/>
-            <pin position="31" pad="VCC"/>
-            <pin position="32" pad="GND"/>
-            <pin position="33" pad="XTAL2"/>
-            <pin position="34" pad="XTAL1"/>
-            <pin position="35" pad="NC"/>
-            <pin position="36" pad="NC"/>
-            <pin position="37" pad="PJ2"/>
-            <pin position="38" pad="PJ3"/>
-            <pin position="39" pad="PJ4"/>
-            <pin position="40" pad="PJ5"/>
-            <pin position="41" pad="PJ6"/>
-            <pin position="42" pad="NC"/>
-            <pin position="43" pad="PD0"/>
-            <pin position="44" pad="PD1"/>
-            <pin position="45" pad="PD2"/>
-            <pin position="46" pad="PD3"/>
-            <pin position="47" pad="PD4"/>
-            <pin position="48" pad="PD5"/>
-            <pin position="49" pad="PD6"/>
-            <pin position="50" pad="PD7"/>
-            <pin position="51" pad="PG0"/>
-            <pin position="52" pad="PG1"/>
-            <pin position="53" pad="PC0"/>
-            <pin position="54" pad="PC1"/>
-            <pin position="55" pad="PC2"/>
-            <pin position="56" pad="PC3"/>
-            <pin position="57" pad="PC4"/>
-            <pin position="58" pad="PC5"/>
-            <pin position="59" pad="NC"/>
-            <pin position="60" pad="NC"/>
-            <pin position="61" pad="NC"/>
-            <pin position="62" pad="NC"/>
-            <pin position="63" pad="PH0"/>
-            <pin position="64" pad="PH1"/>
-            <pin position="65" pad="PH2"/>
-            <pin position="66" pad="PH3"/>
-            <pin position="67" pad="NC"/>
-            <pin position="68" pad="PC6"/>
-            <pin position="69" pad="PC7"/>
-            <pin position="70" pad="PG2"/>
-            <pin position="71" pad="PA7"/>
-            <pin position="72" pad="PA6"/>
-            <pin position="73" pad="PA5"/>
-            <pin position="74" pad="PA4"/>
-            <pin position="75" pad="PA3"/>
-            <pin position="76" pad="PA2"/>
-            <pin position="77" pad="PA1"/>
-            <pin position="78" pad="PA0"/>
-            <pin position="79" pad="NC"/>
-            <pin position="80" pad="VCC"/>
-            <pin position="81" pad="GND"/>
-            <pin position="82" pad="NC"/>
-            <pin position="83" pad="NC"/>
-            <pin position="84" pad="PH4"/>
-            <pin position="85" pad="PH5"/>
-            <pin position="86" pad="PH6"/>
-            <pin position="87" pad="PH7"/>
-            <pin position="88" pad="NC"/>
-            <pin position="89" pad="NC"/>
-            <pin position="90" pad="PF7"/>
-            <pin position="91" pad="PF6"/>
-            <pin position="92" pad="PF5"/>
-            <pin position="93" pad="PF4"/>
-            <pin position="94" pad="PF3"/>
-            <pin position="95" pad="PF2"/>
-            <pin position="96" pad="PF1"/>
-            <pin position="97" pad="PF0"/>
-            <pin position="98" pad="AREF"/>
-            <pin position="99" pad="AGND"/>
-            <pin position="100" pad="AVCC"/>
+            <pin position="1"/>
+            <pin position="2" pad-key="pe0"/>
+            <pin position="3" pad-key="pe1"/>
+            <pin position="4" pad-key="pe2"/>
+            <pin position="5" pad-key="pe3"/>
+            <pin position="6" pad-key="pe4"/>
+            <pin position="7" pad-key="pe5"/>
+            <pin position="8" pad-key="pe6"/>
+            <pin position="9" pad-key="pe7"/>
+            <pin position="10" pad-key="vcc"/>
+            <pin position="11" pad-key="gnd"/>
+            <pin position="12"/>
+            <pin position="13" pad-key="pj0"/>
+            <pin position="14" pad-key="pj1"/>
+            <pin position="15"/>
+            <pin position="16"/>
+            <pin position="17"/>
+            <pin position="18"/>
+            <pin position="19" pad-key="pb0"/>
+            <pin position="20" pad-key="pb1"/>
+            <pin position="21" pad-key="pb2"/>
+            <pin position="22" pad-key="pb3"/>
+            <pin position="23" pad-key="pb4"/>
+            <pin position="24" pad-key="pb5"/>
+            <pin position="25" pad-key="pb6"/>
+            <pin position="26" pad-key="pb7"/>
+            <pin position="27"/>
+            <pin position="28" pad-key="pg3"/>
+            <pin position="29" pad-key="pg4"/>
+            <pin position="30" pad-key="pg5"/>
+            <pin position="31" pad-key="vcc"/>
+            <pin position="32" pad-key="gnd"/>
+            <pin position="33" pad-key="xtal2"/>
+            <pin position="34" pad-key="xtal1"/>
+            <pin position="35"/>
+            <pin position="36"/>
+            <pin position="37" pad-key="pj2"/>
+            <pin position="38" pad-key="pj3"/>
+            <pin position="39" pad-key="pj4"/>
+            <pin position="40" pad-key="pj5"/>
+            <pin position="41" pad-key="pj6"/>
+            <pin position="42"/>
+            <pin position="43" pad-key="pd0"/>
+            <pin position="44" pad-key="pd1"/>
+            <pin position="45" pad-key="pd2"/>
+            <pin position="46" pad-key="pd3"/>
+            <pin position="47" pad-key="pd4"/>
+            <pin position="48" pad-key="pd5"/>
+            <pin position="49" pad-key="pd6"/>
+            <pin position="50" pad-key="pd7"/>
+            <pin position="51" pad-key="pg0"/>
+            <pin position="52" pad-key="pg1"/>
+            <pin position="53" pad-key="pc0"/>
+            <pin position="54" pad-key="pc1"/>
+            <pin position="55" pad-key="pc2"/>
+            <pin position="56" pad-key="pc3"/>
+            <pin position="57" pad-key="pc4"/>
+            <pin position="58" pad-key="pc5"/>
+            <pin position="59"/>
+            <pin position="60"/>
+            <pin position="61"/>
+            <pin position="62"/>
+            <pin position="63" pad-key="ph0"/>
+            <pin position="64" pad-key="ph1"/>
+            <pin position="65" pad-key="ph2"/>
+            <pin position="66" pad-key="ph3"/>
+            <pin position="67"/>
+            <pin position="68" pad-key="pc6"/>
+            <pin position="69" pad-key="pc7"/>
+            <pin position="70" pad-key="pg2"/>
+            <pin position="71" pad-key="pa7"/>
+            <pin position="72" pad-key="pa6"/>
+            <pin position="73" pad-key="pa5"/>
+            <pin position="74" pad-key="pa4"/>
+            <pin position="75" pad-key="pa3"/>
+            <pin position="76" pad-key="pa2"/>
+            <pin position="77" pad-key="pa1"/>
+            <pin position="78" pad-key="pa0"/>
+            <pin position="79"/>
+            <pin position="80" pad-key="vcc"/>
+            <pin position="81" pad-key="gnd"/>
+            <pin position="82"/>
+            <pin position="83"/>
+            <pin position="84" pad-key="ph4"/>
+            <pin position="85" pad-key="ph5"/>
+            <pin position="86" pad-key="ph6"/>
+            <pin position="87" pad-key="ph7"/>
+            <pin position="88"/>
+            <pin position="89"/>
+            <pin position="90" pad-key="pf7"/>
+            <pin position="91" pad-key="pf6"/>
+            <pin position="92" pad-key="pf5"/>
+            <pin position="93" pad-key="pf4"/>
+            <pin position="94" pad-key="pf3"/>
+            <pin position="95" pad-key="pf2"/>
+            <pin position="96" pad-key="pf1"/>
+            <pin position="97" pad-key="pf0"/>
+            <pin position="98" pad-key="aref"/>
+            <pin position="99" pad-key="agnd"/>
+            <pin position="100" pad-key="avcc"/>
         </pinout>
     </pinouts>
     <variants>
-        <variant name="ATmega6450-AU" pinout-key="qfp_100" package="TQFP100"/>
+        <variant key="atmega6450_au" name="ATmega6450-AU" pinout-key="qfp_100"/>
     </variants>
 </device>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA6450A.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA6450A.xml
index 44d9bbd7..5d06ac5e 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA6450A.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA6450A.xml
@@ -218,115 +218,115 @@
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pa2" index="2" function="PORTA" group="P"/>
-                <signal pad-id="pa3" index="3" function="PORTA" group="P"/>
-                <signal pad-id="pa4" index="4" function="PORTA" group="P"/>
-                <signal pad-id="pa5" index="5" function="PORTA" group="P"/>
-                <signal pad-id="pa6" index="6" function="PORTA" group="P"/>
-                <signal pad-id="pa7" index="7" function="PORTA" group="P"/>
+                <signal pad-key="pa0" index="0" function="PORTA" group="P"/>
+                <signal pad-key="pa1" index="1" function="PORTA" group="P"/>
+                <signal pad-key="pa2" index="2" function="PORTA" group="P"/>
+                <signal pad-key="pa3" index="3" function="PORTA" group="P"/>
+                <signal pad-key="pa4" index="4" function="PORTA" group="P"/>
+                <signal pad-key="pa5" index="5" function="PORTA" group="P"/>
+                <signal pad-key="pa6" index="6" function="PORTA" group="P"/>
+                <signal pad-key="pa7" index="7" function="PORTA" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pb2" index="2" function="PORTB" group="P"/>
-                <signal pad-id="pb3" index="3" function="PORTB" group="P"/>
-                <signal pad-id="pb4" index="4" function="PORTB" group="P"/>
-                <signal pad-id="pb5" index="5" function="PORTB" group="P"/>
-                <signal pad-id="pb6" index="6" function="PORTB" group="P"/>
-                <signal pad-id="pb7" index="7" function="PORTB" group="P"/>
+                <signal pad-key="pb0" index="0" function="PORTB" group="P"/>
+                <signal pad-key="pb1" index="1" function="PORTB" group="P"/>
+                <signal pad-key="pb2" index="2" function="PORTB" group="P"/>
+                <signal pad-key="pb3" index="3" function="PORTB" group="P"/>
+                <signal pad-key="pb4" index="4" function="PORTB" group="P"/>
+                <signal pad-key="pb5" index="5" function="PORTB" group="P"/>
+                <signal pad-key="pb6" index="6" function="PORTB" group="P"/>
+                <signal pad-key="pb7" index="7" function="PORTB" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pc2" index="2" function="PORTC" group="P"/>
-                <signal pad-id="pc3" index="3" function="PORTC" group="P"/>
-                <signal pad-id="pc4" index="4" function="PORTC" group="P"/>
-                <signal pad-id="pc5" index="5" function="PORTC" group="P"/>
-                <signal pad-id="pc6" index="6" function="PORTC" group="P"/>
-                <signal pad-id="pc7" index="7" function="PORTC" group="P"/>
+                <signal pad-key="pc0" index="0" function="PORTC" group="P"/>
+                <signal pad-key="pc1" index="1" function="PORTC" group="P"/>
+                <signal pad-key="pc2" index="2" function="PORTC" group="P"/>
+                <signal pad-key="pc3" index="3" function="PORTC" group="P"/>
+                <signal pad-key="pc4" index="4" function="PORTC" group="P"/>
+                <signal pad-key="pc5" index="5" function="PORTC" group="P"/>
+                <signal pad-key="pc6" index="6" function="PORTC" group="P"/>
+                <signal pad-key="pc7" index="7" function="PORTC" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pd2" index="2" function="PORTD" group="P"/>
-                <signal pad-id="pd3" index="3" function="PORTD" group="P"/>
-                <signal pad-id="pd4" index="4" function="PORTD" group="P"/>
-                <signal pad-id="pd5" index="5" function="PORTD" group="P"/>
-                <signal pad-id="pd6" index="6" function="PORTD" group="P"/>
-                <signal pad-id="pd7" index="7" function="PORTD" group="P"/>
+                <signal pad-key="pd0" index="0" function="PORTD" group="P"/>
+                <signal pad-key="pd1" index="1" function="PORTD" group="P"/>
+                <signal pad-key="pd2" index="2" function="PORTD" group="P"/>
+                <signal pad-key="pd3" index="3" function="PORTD" group="P"/>
+                <signal pad-key="pd4" index="4" function="PORTD" group="P"/>
+                <signal pad-key="pd5" index="5" function="PORTD" group="P"/>
+                <signal pad-key="pd6" index="6" function="PORTD" group="P"/>
+                <signal pad-key="pd7" index="7" function="PORTD" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="porte" name="PORTE" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pe2" index="2" function="PORTE" group="P"/>
-                <signal pad-id="pe3" index="3" function="PORTE" group="P"/>
-                <signal pad-id="pe4" index="4" function="PORTE" group="P"/>
-                <signal pad-id="pe5" index="5" function="PORTE" group="P"/>
-                <signal pad-id="pe6" index="6" function="PORTE" group="P"/>
-                <signal pad-id="pe7" index="7" function="PORTE" group="P"/>
+                <signal pad-key="pe0" index="0" function="PORTE" group="P"/>
+                <signal pad-key="pe1" index="1" function="PORTE" group="P"/>
+                <signal pad-key="pe2" index="2" function="PORTE" group="P"/>
+                <signal pad-key="pe3" index="3" function="PORTE" group="P"/>
+                <signal pad-key="pe4" index="4" function="PORTE" group="P"/>
+                <signal pad-key="pe5" index="5" function="PORTE" group="P"/>
+                <signal pad-key="pe6" index="6" function="PORTE" group="P"/>
+                <signal pad-key="pe7" index="7" function="PORTE" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portf" name="PORTF" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pf2" index="2" function="PORTF" group="P"/>
-                <signal pad-id="pf3" index="3" function="PORTF" group="P"/>
-                <signal pad-id="pf4" index="4" function="PORTF" group="P"/>
-                <signal pad-id="pf5" index="5" function="PORTF" group="P"/>
-                <signal pad-id="pf6" index="6" function="PORTF" group="P"/>
-                <signal pad-id="pf7" index="7" function="PORTF" group="P"/>
+                <signal pad-key="pf0" index="0" function="PORTF" group="P"/>
+                <signal pad-key="pf1" index="1" function="PORTF" group="P"/>
+                <signal pad-key="pf2" index="2" function="PORTF" group="P"/>
+                <signal pad-key="pf3" index="3" function="PORTF" group="P"/>
+                <signal pad-key="pf4" index="4" function="PORTF" group="P"/>
+                <signal pad-key="pf5" index="5" function="PORTF" group="P"/>
+                <signal pad-key="pf6" index="6" function="PORTF" group="P"/>
+                <signal pad-key="pf7" index="7" function="PORTF" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portg" name="PORTG" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pg2" index="2" function="PORTG" group="P"/>
-                <signal pad-id="pg3" index="3" function="PORTG" group="P"/>
-                <signal pad-id="pg4" index="4" function="PORTG" group="P"/>
-                <signal pad-id="pg5" index="5" function="PORTG" group="P"/>
+                <signal pad-key="pg0" index="0" function="PORTG" group="P"/>
+                <signal pad-key="pg1" index="1" function="PORTG" group="P"/>
+                <signal pad-key="pg2" index="2" function="PORTG" group="P"/>
+                <signal pad-key="pg3" index="3" function="PORTG" group="P"/>
+                <signal pad-key="pg4" index="4" function="PORTG" group="P"/>
+                <signal pad-key="pg5" index="5" function="PORTG" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="porth" name="PORTH" module-key="gpio_port">
             <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"/>
-                <signal pad-id="ph2" index="2" function="PORTH" group="P"/>
-                <signal pad-id="ph3" index="3" function="PORTH" group="P"/>
-                <signal pad-id="ph4" index="4" function="PORTH" group="P"/>
-                <signal pad-id="ph5" index="5" function="PORTH" group="P"/>
-                <signal pad-id="ph6" index="6" function="PORTH" group="P"/>
-                <signal pad-id="ph7" index="7" function="PORTH" group="P"/>
+                <signal pad-key="ph0" index="0" function="PORTH" group="P"/>
+                <signal pad-key="ph1" index="1" function="PORTH" group="P"/>
+                <signal pad-key="ph2" index="2" function="PORTH" group="P"/>
+                <signal pad-key="ph3" index="3" function="PORTH" group="P"/>
+                <signal pad-key="ph4" index="4" function="PORTH" group="P"/>
+                <signal pad-key="ph5" index="5" function="PORTH" group="P"/>
+                <signal pad-key="ph6" index="6" function="PORTH" group="P"/>
+                <signal pad-key="ph7" index="7" function="PORTH" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portj" name="PORTJ" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pj2" index="2" function="PORTJ" group="P"/>
-                <signal pad-id="pj3" index="3" function="PORTJ" group="P"/>
-                <signal pad-id="pj4" index="4" function="PORTJ" group="P"/>
-                <signal pad-id="pj5" index="5" function="PORTJ" group="P"/>
-                <signal pad-id="pj6" index="6" function="PORTJ" group="P"/>
+                <signal pad-key="pj0" index="0" function="PORTJ" group="P"/>
+                <signal pad-key="pj1" index="1" function="PORTJ" group="P"/>
+                <signal pad-key="pj2" index="2" function="PORTJ" group="P"/>
+                <signal pad-key="pj3" index="3" function="PORTJ" group="P"/>
+                <signal pad-key="pj4" index="4" function="PORTJ" group="P"/>
+                <signal pad-key="pj5" index="5" function="PORTJ" group="P"/>
+                <signal pad-key="pj6" index="6" function="PORTJ" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="tc0" name="TC0" module-key="tc8">
@@ -760,111 +760,189 @@
             </register-group>
         </module>
     </modules>
+    <pads>
+        <pad key="pe0" name="PE0"/>
+        <pad key="pe1" name="PE1"/>
+        <pad key="pe2" name="PE2"/>
+        <pad key="pe3" name="PE3"/>
+        <pad key="pe4" name="PE4"/>
+        <pad key="pe5" name="PE5"/>
+        <pad key="pe6" name="PE6"/>
+        <pad key="pe7" name="PE7"/>
+        <pad key="vcc" name="VCC"/>
+        <pad key="gnd" name="GND"/>
+        <pad key="pj0" name="PJ0"/>
+        <pad key="pj1" name="PJ1"/>
+        <pad key="pb0" name="PB0"/>
+        <pad key="pb1" name="PB1"/>
+        <pad key="pb2" name="PB2"/>
+        <pad key="pb3" name="PB3"/>
+        <pad key="pb4" name="PB4"/>
+        <pad key="pb5" name="PB5"/>
+        <pad key="pb6" name="PB6"/>
+        <pad key="pb7" name="PB7"/>
+        <pad key="pg3" name="PG3"/>
+        <pad key="pg4" name="PG4"/>
+        <pad key="pg5" name="PG5"/>
+        <pad key="xtal2" name="XTAL2"/>
+        <pad key="xtal1" name="XTAL1"/>
+        <pad key="pj2" name="PJ2"/>
+        <pad key="pj3" name="PJ3"/>
+        <pad key="pj4" name="PJ4"/>
+        <pad key="pj5" name="PJ5"/>
+        <pad key="pj6" name="PJ6"/>
+        <pad key="pd0" name="PD0"/>
+        <pad key="pd1" name="PD1"/>
+        <pad key="pd2" name="PD2"/>
+        <pad key="pd3" name="PD3"/>
+        <pad key="pd4" name="PD4"/>
+        <pad key="pd5" name="PD5"/>
+        <pad key="pd6" name="PD6"/>
+        <pad key="pd7" name="PD7"/>
+        <pad key="pg0" name="PG0"/>
+        <pad key="pg1" name="PG1"/>
+        <pad key="pc0" name="PC0"/>
+        <pad key="pc1" name="PC1"/>
+        <pad key="pc2" name="PC2"/>
+        <pad key="pc3" name="PC3"/>
+        <pad key="pc4" name="PC4"/>
+        <pad key="pc5" name="PC5"/>
+        <pad key="ph0" name="PH0"/>
+        <pad key="ph1" name="PH1"/>
+        <pad key="ph2" name="PH2"/>
+        <pad key="ph3" name="PH3"/>
+        <pad key="pc6" name="PC6"/>
+        <pad key="pc7" name="PC7"/>
+        <pad key="pg2" name="PG2"/>
+        <pad key="pa7" name="PA7"/>
+        <pad key="pa6" name="PA6"/>
+        <pad key="pa5" name="PA5"/>
+        <pad key="pa4" name="PA4"/>
+        <pad key="pa3" name="PA3"/>
+        <pad key="pa2" name="PA2"/>
+        <pad key="pa1" name="PA1"/>
+        <pad key="pa0" name="PA0"/>
+        <pad key="ph4" name="PH4"/>
+        <pad key="ph5" name="PH5"/>
+        <pad key="ph6" name="PH6"/>
+        <pad key="ph7" name="PH7"/>
+        <pad key="pf7" name="PF7"/>
+        <pad key="pf6" name="PF6"/>
+        <pad key="pf5" name="PF5"/>
+        <pad key="pf4" name="PF4"/>
+        <pad key="pf3" name="PF3"/>
+        <pad key="pf2" name="PF2"/>
+        <pad key="pf1" name="PF1"/>
+        <pad key="pf0" name="PF0"/>
+        <pad key="aref" name="AREF"/>
+        <pad key="agnd" name="AGND"/>
+        <pad key="avcc" name="AVCC"/>
+    </pads>
     <pinouts>
         <pinout key="qfp_100" name="QFP_100" type="qfp">
-            <pin position="1" pad="NC"/>
-            <pin position="2" pad="PE0"/>
-            <pin position="3" pad="PE1"/>
-            <pin position="4" pad="PE2"/>
-            <pin position="5" pad="PE3"/>
-            <pin position="6" pad="PE4"/>
-            <pin position="7" pad="PE5"/>
-            <pin position="8" pad="PE6"/>
-            <pin position="9" pad="PE7"/>
-            <pin position="10" pad="VCC"/>
-            <pin position="11" pad="GND"/>
-            <pin position="12" pad="NC"/>
-            <pin position="13" pad="PJ0"/>
-            <pin position="14" pad="PJ1"/>
-            <pin position="15" pad="NC"/>
-            <pin position="16" pad="NC"/>
-            <pin position="17" pad="NC"/>
-            <pin position="18" pad="NC"/>
-            <pin position="19" pad="PB0"/>
-            <pin position="20" pad="PB1"/>
-            <pin position="21" pad="PB2"/>
-            <pin position="22" pad="PB3"/>
-            <pin position="23" pad="PB4"/>
-            <pin position="24" pad="PB5"/>
-            <pin position="25" pad="PB6"/>
-            <pin position="26" pad="PB7"/>
-            <pin position="27" pad="NC"/>
-            <pin position="28" pad="PG3"/>
-            <pin position="29" pad="PG4"/>
-            <pin position="30" pad="PG5"/>
-            <pin position="31" pad="VCC"/>
-            <pin position="32" pad="GND"/>
-            <pin position="33" pad="XTAL2"/>
-            <pin position="34" pad="XTAL1"/>
-            <pin position="35" pad="NC"/>
-            <pin position="36" pad="NC"/>
-            <pin position="37" pad="PJ2"/>
-            <pin position="38" pad="PJ3"/>
-            <pin position="39" pad="PJ4"/>
-            <pin position="40" pad="PJ5"/>
-            <pin position="41" pad="PJ6"/>
-            <pin position="42" pad="NC"/>
-            <pin position="43" pad="PD0"/>
-            <pin position="44" pad="PD1"/>
-            <pin position="45" pad="PD2"/>
-            <pin position="46" pad="PD3"/>
-            <pin position="47" pad="PD4"/>
-            <pin position="48" pad="PD5"/>
-            <pin position="49" pad="PD6"/>
-            <pin position="50" pad="PD7"/>
-            <pin position="51" pad="PG0"/>
-            <pin position="52" pad="PG1"/>
-            <pin position="53" pad="PC0"/>
-            <pin position="54" pad="PC1"/>
-            <pin position="55" pad="PC2"/>
-            <pin position="56" pad="PC3"/>
-            <pin position="57" pad="PC4"/>
-            <pin position="58" pad="PC5"/>
-            <pin position="59" pad="NC"/>
-            <pin position="60" pad="NC"/>
-            <pin position="61" pad="NC"/>
-            <pin position="62" pad="NC"/>
-            <pin position="63" pad="PH0"/>
-            <pin position="64" pad="PH1"/>
-            <pin position="65" pad="PH2"/>
-            <pin position="66" pad="PH3"/>
-            <pin position="67" pad="NC"/>
-            <pin position="68" pad="PC6"/>
-            <pin position="69" pad="PC7"/>
-            <pin position="70" pad="PG2"/>
-            <pin position="71" pad="PA7"/>
-            <pin position="72" pad="PA6"/>
-            <pin position="73" pad="PA5"/>
-            <pin position="74" pad="PA4"/>
-            <pin position="75" pad="PA3"/>
-            <pin position="76" pad="PA2"/>
-            <pin position="77" pad="PA1"/>
-            <pin position="78" pad="PA0"/>
-            <pin position="79" pad="NC"/>
-            <pin position="80" pad="VCC"/>
-            <pin position="81" pad="GND"/>
-            <pin position="82" pad="NC"/>
-            <pin position="83" pad="NC"/>
-            <pin position="84" pad="PH4"/>
-            <pin position="85" pad="PH5"/>
-            <pin position="86" pad="PH6"/>
-            <pin position="87" pad="PH7"/>
-            <pin position="88" pad="NC"/>
-            <pin position="89" pad="NC"/>
-            <pin position="90" pad="PF7"/>
-            <pin position="91" pad="PF6"/>
-            <pin position="92" pad="PF5"/>
-            <pin position="93" pad="PF4"/>
-            <pin position="94" pad="PF3"/>
-            <pin position="95" pad="PF2"/>
-            <pin position="96" pad="PF1"/>
-            <pin position="97" pad="PF0"/>
-            <pin position="98" pad="AREF"/>
-            <pin position="99" pad="AGND"/>
-            <pin position="100" pad="AVCC"/>
+            <pin position="1"/>
+            <pin position="2" pad-key="pe0"/>
+            <pin position="3" pad-key="pe1"/>
+            <pin position="4" pad-key="pe2"/>
+            <pin position="5" pad-key="pe3"/>
+            <pin position="6" pad-key="pe4"/>
+            <pin position="7" pad-key="pe5"/>
+            <pin position="8" pad-key="pe6"/>
+            <pin position="9" pad-key="pe7"/>
+            <pin position="10" pad-key="vcc"/>
+            <pin position="11" pad-key="gnd"/>
+            <pin position="12"/>
+            <pin position="13" pad-key="pj0"/>
+            <pin position="14" pad-key="pj1"/>
+            <pin position="15"/>
+            <pin position="16"/>
+            <pin position="17"/>
+            <pin position="18"/>
+            <pin position="19" pad-key="pb0"/>
+            <pin position="20" pad-key="pb1"/>
+            <pin position="21" pad-key="pb2"/>
+            <pin position="22" pad-key="pb3"/>
+            <pin position="23" pad-key="pb4"/>
+            <pin position="24" pad-key="pb5"/>
+            <pin position="25" pad-key="pb6"/>
+            <pin position="26" pad-key="pb7"/>
+            <pin position="27"/>
+            <pin position="28" pad-key="pg3"/>
+            <pin position="29" pad-key="pg4"/>
+            <pin position="30" pad-key="pg5"/>
+            <pin position="31" pad-key="vcc"/>
+            <pin position="32" pad-key="gnd"/>
+            <pin position="33" pad-key="xtal2"/>
+            <pin position="34" pad-key="xtal1"/>
+            <pin position="35"/>
+            <pin position="36"/>
+            <pin position="37" pad-key="pj2"/>
+            <pin position="38" pad-key="pj3"/>
+            <pin position="39" pad-key="pj4"/>
+            <pin position="40" pad-key="pj5"/>
+            <pin position="41" pad-key="pj6"/>
+            <pin position="42"/>
+            <pin position="43" pad-key="pd0"/>
+            <pin position="44" pad-key="pd1"/>
+            <pin position="45" pad-key="pd2"/>
+            <pin position="46" pad-key="pd3"/>
+            <pin position="47" pad-key="pd4"/>
+            <pin position="48" pad-key="pd5"/>
+            <pin position="49" pad-key="pd6"/>
+            <pin position="50" pad-key="pd7"/>
+            <pin position="51" pad-key="pg0"/>
+            <pin position="52" pad-key="pg1"/>
+            <pin position="53" pad-key="pc0"/>
+            <pin position="54" pad-key="pc1"/>
+            <pin position="55" pad-key="pc2"/>
+            <pin position="56" pad-key="pc3"/>
+            <pin position="57" pad-key="pc4"/>
+            <pin position="58" pad-key="pc5"/>
+            <pin position="59"/>
+            <pin position="60"/>
+            <pin position="61"/>
+            <pin position="62"/>
+            <pin position="63" pad-key="ph0"/>
+            <pin position="64" pad-key="ph1"/>
+            <pin position="65" pad-key="ph2"/>
+            <pin position="66" pad-key="ph3"/>
+            <pin position="67"/>
+            <pin position="68" pad-key="pc6"/>
+            <pin position="69" pad-key="pc7"/>
+            <pin position="70" pad-key="pg2"/>
+            <pin position="71" pad-key="pa7"/>
+            <pin position="72" pad-key="pa6"/>
+            <pin position="73" pad-key="pa5"/>
+            <pin position="74" pad-key="pa4"/>
+            <pin position="75" pad-key="pa3"/>
+            <pin position="76" pad-key="pa2"/>
+            <pin position="77" pad-key="pa1"/>
+            <pin position="78" pad-key="pa0"/>
+            <pin position="79"/>
+            <pin position="80" pad-key="vcc"/>
+            <pin position="81" pad-key="gnd"/>
+            <pin position="82"/>
+            <pin position="83"/>
+            <pin position="84" pad-key="ph4"/>
+            <pin position="85" pad-key="ph5"/>
+            <pin position="86" pad-key="ph6"/>
+            <pin position="87" pad-key="ph7"/>
+            <pin position="88"/>
+            <pin position="89"/>
+            <pin position="90" pad-key="pf7"/>
+            <pin position="91" pad-key="pf6"/>
+            <pin position="92" pad-key="pf5"/>
+            <pin position="93" pad-key="pf4"/>
+            <pin position="94" pad-key="pf3"/>
+            <pin position="95" pad-key="pf2"/>
+            <pin position="96" pad-key="pf1"/>
+            <pin position="97" pad-key="pf0"/>
+            <pin position="98" pad-key="aref"/>
+            <pin position="99" pad-key="agnd"/>
+            <pin position="100" pad-key="avcc"/>
         </pinout>
     </pinouts>
     <variants>
-        <variant name="ATmega6450A-AU" pinout-key="qfp_100" package="TQFP100"/>
+        <variant key="atmega6450a_au" name="ATmega6450A-AU" pinout-key="qfp_100"/>
     </variants>
 </device>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA6450P.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA6450P.xml
index 6771593a..622f277f 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA6450P.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA6450P.xml
@@ -218,115 +218,115 @@
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pa2" index="2" function="PORTA" group="P"/>
-                <signal pad-id="pa3" index="3" function="PORTA" group="P"/>
-                <signal pad-id="pa4" index="4" function="PORTA" group="P"/>
-                <signal pad-id="pa5" index="5" function="PORTA" group="P"/>
-                <signal pad-id="pa6" index="6" function="PORTA" group="P"/>
-                <signal pad-id="pa7" index="7" function="PORTA" group="P"/>
+                <signal pad-key="pa0" index="0" function="PORTA" group="P"/>
+                <signal pad-key="pa1" index="1" function="PORTA" group="P"/>
+                <signal pad-key="pa2" index="2" function="PORTA" group="P"/>
+                <signal pad-key="pa3" index="3" function="PORTA" group="P"/>
+                <signal pad-key="pa4" index="4" function="PORTA" group="P"/>
+                <signal pad-key="pa5" index="5" function="PORTA" group="P"/>
+                <signal pad-key="pa6" index="6" function="PORTA" group="P"/>
+                <signal pad-key="pa7" index="7" function="PORTA" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pb2" index="2" function="PORTB" group="P"/>
-                <signal pad-id="pb3" index="3" function="PORTB" group="P"/>
-                <signal pad-id="pb4" index="4" function="PORTB" group="P"/>
-                <signal pad-id="pb5" index="5" function="PORTB" group="P"/>
-                <signal pad-id="pb6" index="6" function="PORTB" group="P"/>
-                <signal pad-id="pb7" index="7" function="PORTB" group="P"/>
+                <signal pad-key="pb0" index="0" function="PORTB" group="P"/>
+                <signal pad-key="pb1" index="1" function="PORTB" group="P"/>
+                <signal pad-key="pb2" index="2" function="PORTB" group="P"/>
+                <signal pad-key="pb3" index="3" function="PORTB" group="P"/>
+                <signal pad-key="pb4" index="4" function="PORTB" group="P"/>
+                <signal pad-key="pb5" index="5" function="PORTB" group="P"/>
+                <signal pad-key="pb6" index="6" function="PORTB" group="P"/>
+                <signal pad-key="pb7" index="7" function="PORTB" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pc2" index="2" function="PORTC" group="P"/>
-                <signal pad-id="pc3" index="3" function="PORTC" group="P"/>
-                <signal pad-id="pc4" index="4" function="PORTC" group="P"/>
-                <signal pad-id="pc5" index="5" function="PORTC" group="P"/>
-                <signal pad-id="pc6" index="6" function="PORTC" group="P"/>
-                <signal pad-id="pc7" index="7" function="PORTC" group="P"/>
+                <signal pad-key="pc0" index="0" function="PORTC" group="P"/>
+                <signal pad-key="pc1" index="1" function="PORTC" group="P"/>
+                <signal pad-key="pc2" index="2" function="PORTC" group="P"/>
+                <signal pad-key="pc3" index="3" function="PORTC" group="P"/>
+                <signal pad-key="pc4" index="4" function="PORTC" group="P"/>
+                <signal pad-key="pc5" index="5" function="PORTC" group="P"/>
+                <signal pad-key="pc6" index="6" function="PORTC" group="P"/>
+                <signal pad-key="pc7" index="7" function="PORTC" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pd2" index="2" function="PORTD" group="P"/>
-                <signal pad-id="pd3" index="3" function="PORTD" group="P"/>
-                <signal pad-id="pd4" index="4" function="PORTD" group="P"/>
-                <signal pad-id="pd5" index="5" function="PORTD" group="P"/>
-                <signal pad-id="pd6" index="6" function="PORTD" group="P"/>
-                <signal pad-id="pd7" index="7" function="PORTD" group="P"/>
+                <signal pad-key="pd0" index="0" function="PORTD" group="P"/>
+                <signal pad-key="pd1" index="1" function="PORTD" group="P"/>
+                <signal pad-key="pd2" index="2" function="PORTD" group="P"/>
+                <signal pad-key="pd3" index="3" function="PORTD" group="P"/>
+                <signal pad-key="pd4" index="4" function="PORTD" group="P"/>
+                <signal pad-key="pd5" index="5" function="PORTD" group="P"/>
+                <signal pad-key="pd6" index="6" function="PORTD" group="P"/>
+                <signal pad-key="pd7" index="7" function="PORTD" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="porte" name="PORTE" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pe2" index="2" function="PORTE" group="P"/>
-                <signal pad-id="pe3" index="3" function="PORTE" group="P"/>
-                <signal pad-id="pe4" index="4" function="PORTE" group="P"/>
-                <signal pad-id="pe5" index="5" function="PORTE" group="P"/>
-                <signal pad-id="pe6" index="6" function="PORTE" group="P"/>
-                <signal pad-id="pe7" index="7" function="PORTE" group="P"/>
+                <signal pad-key="pe0" index="0" function="PORTE" group="P"/>
+                <signal pad-key="pe1" index="1" function="PORTE" group="P"/>
+                <signal pad-key="pe2" index="2" function="PORTE" group="P"/>
+                <signal pad-key="pe3" index="3" function="PORTE" group="P"/>
+                <signal pad-key="pe4" index="4" function="PORTE" group="P"/>
+                <signal pad-key="pe5" index="5" function="PORTE" group="P"/>
+                <signal pad-key="pe6" index="6" function="PORTE" group="P"/>
+                <signal pad-key="pe7" index="7" function="PORTE" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portf" name="PORTF" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pf2" index="2" function="PORTF" group="P"/>
-                <signal pad-id="pf3" index="3" function="PORTF" group="P"/>
-                <signal pad-id="pf4" index="4" function="PORTF" group="P"/>
-                <signal pad-id="pf5" index="5" function="PORTF" group="P"/>
-                <signal pad-id="pf6" index="6" function="PORTF" group="P"/>
-                <signal pad-id="pf7" index="7" function="PORTF" group="P"/>
+                <signal pad-key="pf0" index="0" function="PORTF" group="P"/>
+                <signal pad-key="pf1" index="1" function="PORTF" group="P"/>
+                <signal pad-key="pf2" index="2" function="PORTF" group="P"/>
+                <signal pad-key="pf3" index="3" function="PORTF" group="P"/>
+                <signal pad-key="pf4" index="4" function="PORTF" group="P"/>
+                <signal pad-key="pf5" index="5" function="PORTF" group="P"/>
+                <signal pad-key="pf6" index="6" function="PORTF" group="P"/>
+                <signal pad-key="pf7" index="7" function="PORTF" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portg" name="PORTG" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pg2" index="2" function="PORTG" group="P"/>
-                <signal pad-id="pg3" index="3" function="PORTG" group="P"/>
-                <signal pad-id="pg4" index="4" function="PORTG" group="P"/>
-                <signal pad-id="pg5" index="5" function="PORTG" group="P"/>
+                <signal pad-key="pg0" index="0" function="PORTG" group="P"/>
+                <signal pad-key="pg1" index="1" function="PORTG" group="P"/>
+                <signal pad-key="pg2" index="2" function="PORTG" group="P"/>
+                <signal pad-key="pg3" index="3" function="PORTG" group="P"/>
+                <signal pad-key="pg4" index="4" function="PORTG" group="P"/>
+                <signal pad-key="pg5" index="5" function="PORTG" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="porth" name="PORTH" module-key="gpio_port">
             <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"/>
-                <signal pad-id="ph2" index="2" function="PORTH" group="P"/>
-                <signal pad-id="ph3" index="3" function="PORTH" group="P"/>
-                <signal pad-id="ph4" index="4" function="PORTH" group="P"/>
-                <signal pad-id="ph5" index="5" function="PORTH" group="P"/>
-                <signal pad-id="ph6" index="6" function="PORTH" group="P"/>
-                <signal pad-id="ph7" index="7" function="PORTH" group="P"/>
+                <signal pad-key="ph0" index="0" function="PORTH" group="P"/>
+                <signal pad-key="ph1" index="1" function="PORTH" group="P"/>
+                <signal pad-key="ph2" index="2" function="PORTH" group="P"/>
+                <signal pad-key="ph3" index="3" function="PORTH" group="P"/>
+                <signal pad-key="ph4" index="4" function="PORTH" group="P"/>
+                <signal pad-key="ph5" index="5" function="PORTH" group="P"/>
+                <signal pad-key="ph6" index="6" function="PORTH" group="P"/>
+                <signal pad-key="ph7" index="7" function="PORTH" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portj" name="PORTJ" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pj2" index="2" function="PORTJ" group="P"/>
-                <signal pad-id="pj3" index="3" function="PORTJ" group="P"/>
-                <signal pad-id="pj4" index="4" function="PORTJ" group="P"/>
-                <signal pad-id="pj5" index="5" function="PORTJ" group="P"/>
-                <signal pad-id="pj6" index="6" function="PORTJ" group="P"/>
+                <signal pad-key="pj0" index="0" function="PORTJ" group="P"/>
+                <signal pad-key="pj1" index="1" function="PORTJ" group="P"/>
+                <signal pad-key="pj2" index="2" function="PORTJ" group="P"/>
+                <signal pad-key="pj3" index="3" function="PORTJ" group="P"/>
+                <signal pad-key="pj4" index="4" function="PORTJ" group="P"/>
+                <signal pad-key="pj5" index="5" function="PORTJ" group="P"/>
+                <signal pad-key="pj6" index="6" function="PORTJ" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="tc0" name="TC0" module-key="tc8">
@@ -760,111 +760,189 @@
             </register-group>
         </module>
     </modules>
+    <pads>
+        <pad key="pe0" name="PE0"/>
+        <pad key="pe1" name="PE1"/>
+        <pad key="pe2" name="PE2"/>
+        <pad key="pe3" name="PE3"/>
+        <pad key="pe4" name="PE4"/>
+        <pad key="pe5" name="PE5"/>
+        <pad key="pe6" name="PE6"/>
+        <pad key="pe7" name="PE7"/>
+        <pad key="vcc" name="VCC"/>
+        <pad key="gnd" name="GND"/>
+        <pad key="pj0" name="PJ0"/>
+        <pad key="pj1" name="PJ1"/>
+        <pad key="pb0" name="PB0"/>
+        <pad key="pb1" name="PB1"/>
+        <pad key="pb2" name="PB2"/>
+        <pad key="pb3" name="PB3"/>
+        <pad key="pb4" name="PB4"/>
+        <pad key="pb5" name="PB5"/>
+        <pad key="pb6" name="PB6"/>
+        <pad key="pb7" name="PB7"/>
+        <pad key="pg3" name="PG3"/>
+        <pad key="pg4" name="PG4"/>
+        <pad key="pg5" name="PG5"/>
+        <pad key="xtal2" name="XTAL2"/>
+        <pad key="xtal1" name="XTAL1"/>
+        <pad key="pj2" name="PJ2"/>
+        <pad key="pj3" name="PJ3"/>
+        <pad key="pj4" name="PJ4"/>
+        <pad key="pj5" name="PJ5"/>
+        <pad key="pj6" name="PJ6"/>
+        <pad key="pd0" name="PD0"/>
+        <pad key="pd1" name="PD1"/>
+        <pad key="pd2" name="PD2"/>
+        <pad key="pd3" name="PD3"/>
+        <pad key="pd4" name="PD4"/>
+        <pad key="pd5" name="PD5"/>
+        <pad key="pd6" name="PD6"/>
+        <pad key="pd7" name="PD7"/>
+        <pad key="pg0" name="PG0"/>
+        <pad key="pg1" name="PG1"/>
+        <pad key="pc0" name="PC0"/>
+        <pad key="pc1" name="PC1"/>
+        <pad key="pc2" name="PC2"/>
+        <pad key="pc3" name="PC3"/>
+        <pad key="pc4" name="PC4"/>
+        <pad key="pc5" name="PC5"/>
+        <pad key="ph0" name="PH0"/>
+        <pad key="ph1" name="PH1"/>
+        <pad key="ph2" name="PH2"/>
+        <pad key="ph3" name="PH3"/>
+        <pad key="pc6" name="PC6"/>
+        <pad key="pc7" name="PC7"/>
+        <pad key="pg2" name="PG2"/>
+        <pad key="pa7" name="PA7"/>
+        <pad key="pa6" name="PA6"/>
+        <pad key="pa5" name="PA5"/>
+        <pad key="pa4" name="PA4"/>
+        <pad key="pa3" name="PA3"/>
+        <pad key="pa2" name="PA2"/>
+        <pad key="pa1" name="PA1"/>
+        <pad key="pa0" name="PA0"/>
+        <pad key="ph4" name="PH4"/>
+        <pad key="ph5" name="PH5"/>
+        <pad key="ph6" name="PH6"/>
+        <pad key="ph7" name="PH7"/>
+        <pad key="pf7" name="PF7"/>
+        <pad key="pf6" name="PF6"/>
+        <pad key="pf5" name="PF5"/>
+        <pad key="pf4" name="PF4"/>
+        <pad key="pf3" name="PF3"/>
+        <pad key="pf2" name="PF2"/>
+        <pad key="pf1" name="PF1"/>
+        <pad key="pf0" name="PF0"/>
+        <pad key="aref" name="AREF"/>
+        <pad key="agnd" name="AGND"/>
+        <pad key="avcc" name="AVCC"/>
+    </pads>
     <pinouts>
         <pinout key="qfp_100" name="QFP_100" type="qfp">
-            <pin position="1" pad="NC"/>
-            <pin position="2" pad="PE0"/>
-            <pin position="3" pad="PE1"/>
-            <pin position="4" pad="PE2"/>
-            <pin position="5" pad="PE3"/>
-            <pin position="6" pad="PE4"/>
-            <pin position="7" pad="PE5"/>
-            <pin position="8" pad="PE6"/>
-            <pin position="9" pad="PE7"/>
-            <pin position="10" pad="VCC"/>
-            <pin position="11" pad="GND"/>
-            <pin position="12" pad="NC"/>
-            <pin position="13" pad="PJ0"/>
-            <pin position="14" pad="PJ1"/>
-            <pin position="15" pad="NC"/>
-            <pin position="16" pad="NC"/>
-            <pin position="17" pad="NC"/>
-            <pin position="18" pad="NC"/>
-            <pin position="19" pad="PB0"/>
-            <pin position="20" pad="PB1"/>
-            <pin position="21" pad="PB2"/>
-            <pin position="22" pad="PB3"/>
-            <pin position="23" pad="PB4"/>
-            <pin position="24" pad="PB5"/>
-            <pin position="25" pad="PB6"/>
-            <pin position="26" pad="PB7"/>
-            <pin position="27" pad="NC"/>
-            <pin position="28" pad="PG3"/>
-            <pin position="29" pad="PG4"/>
-            <pin position="30" pad="PG5"/>
-            <pin position="31" pad="VCC"/>
-            <pin position="32" pad="GND"/>
-            <pin position="33" pad="XTAL2"/>
-            <pin position="34" pad="XTAL1"/>
-            <pin position="35" pad="NC"/>
-            <pin position="36" pad="NC"/>
-            <pin position="37" pad="PJ2"/>
-            <pin position="38" pad="PJ3"/>
-            <pin position="39" pad="PJ4"/>
-            <pin position="40" pad="PJ5"/>
-            <pin position="41" pad="PJ6"/>
-            <pin position="42" pad="NC"/>
-            <pin position="43" pad="PD0"/>
-            <pin position="44" pad="PD1"/>
-            <pin position="45" pad="PD2"/>
-            <pin position="46" pad="PD3"/>
-            <pin position="47" pad="PD4"/>
-            <pin position="48" pad="PD5"/>
-            <pin position="49" pad="PD6"/>
-            <pin position="50" pad="PD7"/>
-            <pin position="51" pad="PG0"/>
-            <pin position="52" pad="PG1"/>
-            <pin position="53" pad="PC0"/>
-            <pin position="54" pad="PC1"/>
-            <pin position="55" pad="PC2"/>
-            <pin position="56" pad="PC3"/>
-            <pin position="57" pad="PC4"/>
-            <pin position="58" pad="PC5"/>
-            <pin position="59" pad="NC"/>
-            <pin position="60" pad="NC"/>
-            <pin position="61" pad="NC"/>
-            <pin position="62" pad="NC"/>
-            <pin position="63" pad="PH0"/>
-            <pin position="64" pad="PH1"/>
-            <pin position="65" pad="PH2"/>
-            <pin position="66" pad="PH3"/>
-            <pin position="67" pad="NC"/>
-            <pin position="68" pad="PC6"/>
-            <pin position="69" pad="PC7"/>
-            <pin position="70" pad="PG2"/>
-            <pin position="71" pad="PA7"/>
-            <pin position="72" pad="PA6"/>
-            <pin position="73" pad="PA5"/>
-            <pin position="74" pad="PA4"/>
-            <pin position="75" pad="PA3"/>
-            <pin position="76" pad="PA2"/>
-            <pin position="77" pad="PA1"/>
-            <pin position="78" pad="PA0"/>
-            <pin position="79" pad="NC"/>
-            <pin position="80" pad="VCC"/>
-            <pin position="81" pad="GND"/>
-            <pin position="82" pad="NC"/>
-            <pin position="83" pad="NC"/>
-            <pin position="84" pad="PH4"/>
-            <pin position="85" pad="PH5"/>
-            <pin position="86" pad="PH6"/>
-            <pin position="87" pad="PH7"/>
-            <pin position="88" pad="NC"/>
-            <pin position="89" pad="NC"/>
-            <pin position="90" pad="PF7"/>
-            <pin position="91" pad="PF6"/>
-            <pin position="92" pad="PF5"/>
-            <pin position="93" pad="PF4"/>
-            <pin position="94" pad="PF3"/>
-            <pin position="95" pad="PF2"/>
-            <pin position="96" pad="PF1"/>
-            <pin position="97" pad="PF0"/>
-            <pin position="98" pad="AREF"/>
-            <pin position="99" pad="AGND"/>
-            <pin position="100" pad="AVCC"/>
+            <pin position="1"/>
+            <pin position="2" pad-key="pe0"/>
+            <pin position="3" pad-key="pe1"/>
+            <pin position="4" pad-key="pe2"/>
+            <pin position="5" pad-key="pe3"/>
+            <pin position="6" pad-key="pe4"/>
+            <pin position="7" pad-key="pe5"/>
+            <pin position="8" pad-key="pe6"/>
+            <pin position="9" pad-key="pe7"/>
+            <pin position="10" pad-key="vcc"/>
+            <pin position="11" pad-key="gnd"/>
+            <pin position="12"/>
+            <pin position="13" pad-key="pj0"/>
+            <pin position="14" pad-key="pj1"/>
+            <pin position="15"/>
+            <pin position="16"/>
+            <pin position="17"/>
+            <pin position="18"/>
+            <pin position="19" pad-key="pb0"/>
+            <pin position="20" pad-key="pb1"/>
+            <pin position="21" pad-key="pb2"/>
+            <pin position="22" pad-key="pb3"/>
+            <pin position="23" pad-key="pb4"/>
+            <pin position="24" pad-key="pb5"/>
+            <pin position="25" pad-key="pb6"/>
+            <pin position="26" pad-key="pb7"/>
+            <pin position="27"/>
+            <pin position="28" pad-key="pg3"/>
+            <pin position="29" pad-key="pg4"/>
+            <pin position="30" pad-key="pg5"/>
+            <pin position="31" pad-key="vcc"/>
+            <pin position="32" pad-key="gnd"/>
+            <pin position="33" pad-key="xtal2"/>
+            <pin position="34" pad-key="xtal1"/>
+            <pin position="35"/>
+            <pin position="36"/>
+            <pin position="37" pad-key="pj2"/>
+            <pin position="38" pad-key="pj3"/>
+            <pin position="39" pad-key="pj4"/>
+            <pin position="40" pad-key="pj5"/>
+            <pin position="41" pad-key="pj6"/>
+            <pin position="42"/>
+            <pin position="43" pad-key="pd0"/>
+            <pin position="44" pad-key="pd1"/>
+            <pin position="45" pad-key="pd2"/>
+            <pin position="46" pad-key="pd3"/>
+            <pin position="47" pad-key="pd4"/>
+            <pin position="48" pad-key="pd5"/>
+            <pin position="49" pad-key="pd6"/>
+            <pin position="50" pad-key="pd7"/>
+            <pin position="51" pad-key="pg0"/>
+            <pin position="52" pad-key="pg1"/>
+            <pin position="53" pad-key="pc0"/>
+            <pin position="54" pad-key="pc1"/>
+            <pin position="55" pad-key="pc2"/>
+            <pin position="56" pad-key="pc3"/>
+            <pin position="57" pad-key="pc4"/>
+            <pin position="58" pad-key="pc5"/>
+            <pin position="59"/>
+            <pin position="60"/>
+            <pin position="61"/>
+            <pin position="62"/>
+            <pin position="63" pad-key="ph0"/>
+            <pin position="64" pad-key="ph1"/>
+            <pin position="65" pad-key="ph2"/>
+            <pin position="66" pad-key="ph3"/>
+            <pin position="67"/>
+            <pin position="68" pad-key="pc6"/>
+            <pin position="69" pad-key="pc7"/>
+            <pin position="70" pad-key="pg2"/>
+            <pin position="71" pad-key="pa7"/>
+            <pin position="72" pad-key="pa6"/>
+            <pin position="73" pad-key="pa5"/>
+            <pin position="74" pad-key="pa4"/>
+            <pin position="75" pad-key="pa3"/>
+            <pin position="76" pad-key="pa2"/>
+            <pin position="77" pad-key="pa1"/>
+            <pin position="78" pad-key="pa0"/>
+            <pin position="79"/>
+            <pin position="80" pad-key="vcc"/>
+            <pin position="81" pad-key="gnd"/>
+            <pin position="82"/>
+            <pin position="83"/>
+            <pin position="84" pad-key="ph4"/>
+            <pin position="85" pad-key="ph5"/>
+            <pin position="86" pad-key="ph6"/>
+            <pin position="87" pad-key="ph7"/>
+            <pin position="88"/>
+            <pin position="89"/>
+            <pin position="90" pad-key="pf7"/>
+            <pin position="91" pad-key="pf6"/>
+            <pin position="92" pad-key="pf5"/>
+            <pin position="93" pad-key="pf4"/>
+            <pin position="94" pad-key="pf3"/>
+            <pin position="95" pad-key="pf2"/>
+            <pin position="96" pad-key="pf1"/>
+            <pin position="97" pad-key="pf0"/>
+            <pin position="98" pad-key="aref"/>
+            <pin position="99" pad-key="agnd"/>
+            <pin position="100" pad-key="avcc"/>
         </pinout>
     </pinouts>
     <variants>
-        <variant name="ATmega6450P-AU" pinout-key="qfp_100" package="TQFP100"/>
+        <variant key="atmega6450p_au" name="ATmega6450P-AU" pinout-key="qfp_100"/>
     </variants>
 </device>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA645A.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA645A.xml
index 433bcb7f..4803f93b 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA645A.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA645A.xml
@@ -218,90 +218,90 @@
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pa2" index="2" function="PORTA" group="P"/>
-                <signal pad-id="pa3" index="3" function="PORTA" group="P"/>
-                <signal pad-id="pa4" index="4" function="PORTA" group="P"/>
-                <signal pad-id="pa5" index="5" function="PORTA" group="P"/>
-                <signal pad-id="pa6" index="6" function="PORTA" group="P"/>
-                <signal pad-id="pa7" index="7" function="PORTA" group="P"/>
+                <signal pad-key="pa0" index="0" function="PORTA" group="P"/>
+                <signal pad-key="pa1" index="1" function="PORTA" group="P"/>
+                <signal pad-key="pa2" index="2" function="PORTA" group="P"/>
+                <signal pad-key="pa3" index="3" function="PORTA" group="P"/>
+                <signal pad-key="pa4" index="4" function="PORTA" group="P"/>
+                <signal pad-key="pa5" index="5" function="PORTA" group="P"/>
+                <signal pad-key="pa6" index="6" function="PORTA" group="P"/>
+                <signal pad-key="pa7" index="7" function="PORTA" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pb2" index="2" function="PORTB" group="P"/>
-                <signal pad-id="pb3" index="3" function="PORTB" group="P"/>
-                <signal pad-id="pb4" index="4" function="PORTB" group="P"/>
-                <signal pad-id="pb5" index="5" function="PORTB" group="P"/>
-                <signal pad-id="pb6" index="6" function="PORTB" group="P"/>
-                <signal pad-id="pb7" index="7" function="PORTB" group="P"/>
+                <signal pad-key="pb0" index="0" function="PORTB" group="P"/>
+                <signal pad-key="pb1" index="1" function="PORTB" group="P"/>
+                <signal pad-key="pb2" index="2" function="PORTB" group="P"/>
+                <signal pad-key="pb3" index="3" function="PORTB" group="P"/>
+                <signal pad-key="pb4" index="4" function="PORTB" group="P"/>
+                <signal pad-key="pb5" index="5" function="PORTB" group="P"/>
+                <signal pad-key="pb6" index="6" function="PORTB" group="P"/>
+                <signal pad-key="pb7" index="7" function="PORTB" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pc2" index="2" function="PORTC" group="P"/>
-                <signal pad-id="pc3" index="3" function="PORTC" group="P"/>
-                <signal pad-id="pc4" index="4" function="PORTC" group="P"/>
-                <signal pad-id="pc5" index="5" function="PORTC" group="P"/>
-                <signal pad-id="pc6" index="6" function="PORTC" group="P"/>
-                <signal pad-id="pc7" index="7" function="PORTC" group="P"/>
+                <signal pad-key="pc0" index="0" function="PORTC" group="P"/>
+                <signal pad-key="pc1" index="1" function="PORTC" group="P"/>
+                <signal pad-key="pc2" index="2" function="PORTC" group="P"/>
+                <signal pad-key="pc3" index="3" function="PORTC" group="P"/>
+                <signal pad-key="pc4" index="4" function="PORTC" group="P"/>
+                <signal pad-key="pc5" index="5" function="PORTC" group="P"/>
+                <signal pad-key="pc6" index="6" function="PORTC" group="P"/>
+                <signal pad-key="pc7" index="7" function="PORTC" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pd2" index="2" function="PORTD" group="P"/>
-                <signal pad-id="pd3" index="3" function="PORTD" group="P"/>
-                <signal pad-id="pd4" index="4" function="PORTD" group="P"/>
-                <signal pad-id="pd5" index="5" function="PORTD" group="P"/>
-                <signal pad-id="pd6" index="6" function="PORTD" group="P"/>
-                <signal pad-id="pd7" index="7" function="PORTD" group="P"/>
+                <signal pad-key="pd0" index="0" function="PORTD" group="P"/>
+                <signal pad-key="pd1" index="1" function="PORTD" group="P"/>
+                <signal pad-key="pd2" index="2" function="PORTD" group="P"/>
+                <signal pad-key="pd3" index="3" function="PORTD" group="P"/>
+                <signal pad-key="pd4" index="4" function="PORTD" group="P"/>
+                <signal pad-key="pd5" index="5" function="PORTD" group="P"/>
+                <signal pad-key="pd6" index="6" function="PORTD" group="P"/>
+                <signal pad-key="pd7" index="7" function="PORTD" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="porte" name="PORTE" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pe2" index="2" function="PORTE" group="P"/>
-                <signal pad-id="pe3" index="3" function="PORTE" group="P"/>
-                <signal pad-id="pe4" index="4" function="PORTE" group="P"/>
-                <signal pad-id="pe5" index="5" function="PORTE" group="P"/>
-                <signal pad-id="pe6" index="6" function="PORTE" group="P"/>
-                <signal pad-id="pe7" index="7" function="PORTE" group="P"/>
+                <signal pad-key="pe0" index="0" function="PORTE" group="P"/>
+                <signal pad-key="pe1" index="1" function="PORTE" group="P"/>
+                <signal pad-key="pe2" index="2" function="PORTE" group="P"/>
+                <signal pad-key="pe3" index="3" function="PORTE" group="P"/>
+                <signal pad-key="pe4" index="4" function="PORTE" group="P"/>
+                <signal pad-key="pe5" index="5" function="PORTE" group="P"/>
+                <signal pad-key="pe6" index="6" function="PORTE" group="P"/>
+                <signal pad-key="pe7" index="7" function="PORTE" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portf" name="PORTF" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pf2" index="2" function="PORTF" group="P"/>
-                <signal pad-id="pf3" index="3" function="PORTF" group="P"/>
-                <signal pad-id="pf4" index="4" function="PORTF" group="P"/>
-                <signal pad-id="pf5" index="5" function="PORTF" group="P"/>
-                <signal pad-id="pf6" index="6" function="PORTF" group="P"/>
-                <signal pad-id="pf7" index="7" function="PORTF" group="P"/>
+                <signal pad-key="pf0" index="0" function="PORTF" group="P"/>
+                <signal pad-key="pf1" index="1" function="PORTF" group="P"/>
+                <signal pad-key="pf2" index="2" function="PORTF" group="P"/>
+                <signal pad-key="pf3" index="3" function="PORTF" group="P"/>
+                <signal pad-key="pf4" index="4" function="PORTF" group="P"/>
+                <signal pad-key="pf5" index="5" function="PORTF" group="P"/>
+                <signal pad-key="pf6" index="6" function="PORTF" group="P"/>
+                <signal pad-key="pf7" index="7" function="PORTF" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portg" name="PORTG" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pg2" index="2" function="PORTG" group="P"/>
-                <signal pad-id="pg3" index="3" function="PORTG" group="P"/>
-                <signal pad-id="pg4" index="4" function="PORTG" group="P"/>
-                <signal pad-id="pg5" index="5" function="PORTG" group="P"/>
+                <signal pad-key="pg0" index="0" function="PORTG" group="P"/>
+                <signal pad-key="pg1" index="1" function="PORTG" group="P"/>
+                <signal pad-key="pg2" index="2" function="PORTG" group="P"/>
+                <signal pad-key="pg3" index="3" function="PORTG" group="P"/>
+                <signal pad-key="pg4" index="4" function="PORTG" group="P"/>
+                <signal pad-key="pg5" index="5" function="PORTG" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="tc0" name="TC0" module-key="tc8">
@@ -724,76 +724,139 @@
             </register-group>
         </module>
     </modules>
+    <pads>
+        <pad key="pe0" name="PE0"/>
+        <pad key="pe1" name="PE1"/>
+        <pad key="pe2" name="PE2"/>
+        <pad key="pe3" name="PE3"/>
+        <pad key="pe4" name="PE4"/>
+        <pad key="pe5" name="PE5"/>
+        <pad key="pe6" name="PE6"/>
+        <pad key="pe7" name="PE7"/>
+        <pad key="pb0" name="PB0"/>
+        <pad key="pb1" name="PB1"/>
+        <pad key="pb2" name="PB2"/>
+        <pad key="pb3" name="PB3"/>
+        <pad key="pb4" name="PB4"/>
+        <pad key="pb5" name="PB5"/>
+        <pad key="pb6" name="PB6"/>
+        <pad key="pb7" name="PB7"/>
+        <pad key="pg3" name="PG3"/>
+        <pad key="pg4" name="PG4"/>
+        <pad key="pg5" name="PG5"/>
+        <pad key="vcc" name="VCC"/>
+        <pad key="gdn" name="GDN"/>
+        <pad key="xtal2" name="XTAL2"/>
+        <pad key="xtal1" name="XTAL1"/>
+        <pad key="pd0" name="PD0"/>
+        <pad key="pd1" name="PD1"/>
+        <pad key="pd2" name="PD2"/>
+        <pad key="pd3" name="PD3"/>
+        <pad key="pd4" name="PD4"/>
+        <pad key="pd5" name="PD5"/>
+        <pad key="pd6" name="PD6"/>
+        <pad key="pd7" name="PD7"/>
+        <pad key="pg0" name="PG0"/>
+        <pad key="pg1" name="PG1"/>
+        <pad key="pc0" name="PC0"/>
+        <pad key="pc1" name="PC1"/>
+        <pad key="pc2" name="PC2"/>
+        <pad key="pc3" name="PC3"/>
+        <pad key="pc4" name="PC4"/>
+        <pad key="pc5" name="PC5"/>
+        <pad key="pc6" name="PC6"/>
+        <pad key="pc7" name="PC7"/>
+        <pad key="pg2" name="PG2"/>
+        <pad key="pa7" name="PA7"/>
+        <pad key="pa6" name="PA6"/>
+        <pad key="pa5" name="PA5"/>
+        <pad key="pa4" name="PA4"/>
+        <pad key="pa3" name="PA3"/>
+        <pad key="pa2" name="PA2"/>
+        <pad key="pa1" name="PA1"/>
+        <pad key="pa0" name="PA0"/>
+        <pad key="gnd" name="GND"/>
+        <pad key="pf7" name="PF7"/>
+        <pad key="pf6" name="PF6"/>
+        <pad key="pf5" name="PF5"/>
+        <pad key="pf4" name="PF4"/>
+        <pad key="pf3" name="PF3"/>
+        <pad key="pf2" name="PF2"/>
+        <pad key="pf1" name="PF1"/>
+        <pad key="pf0" name="PF0"/>
+        <pad key="aref" name="AREF"/>
+        <pad key="avcc" name="AVCC"/>
+    </pads>
     <pinouts>
         <pinout key="qfp_qfn_64" name="QFP_QFN_64" type="qfn">
-            <pin position="1" pad="NC"/>
-            <pin position="2" pad="PE0"/>
-            <pin position="3" pad="PE1"/>
-            <pin position="4" pad="PE2"/>
-            <pin position="5" pad="PE3"/>
-            <pin position="6" pad="PE4"/>
-            <pin position="7" pad="PE5"/>
-            <pin position="8" pad="PE6"/>
-            <pin position="9" pad="PE7"/>
-            <pin position="10" pad="PB0"/>
-            <pin position="11" pad="PB1"/>
-            <pin position="12" pad="PB2"/>
-            <pin position="13" pad="PB3"/>
-            <pin position="14" pad="PB4"/>
-            <pin position="15" pad="PB5"/>
-            <pin position="16" pad="PB6"/>
-            <pin position="17" pad="PB7"/>
-            <pin position="18" pad="PG3"/>
-            <pin position="19" pad="PG4"/>
-            <pin position="20" pad="PG5"/>
-            <pin position="21" pad="VCC"/>
-            <pin position="22" pad="GDN"/>
-            <pin position="23" pad="XTAL2"/>
-            <pin position="24" pad="XTAL1"/>
-            <pin position="25" pad="PD0"/>
-            <pin position="26" pad="PD1"/>
-            <pin position="27" pad="PD2"/>
-            <pin position="28" pad="PD3"/>
-            <pin position="29" pad="PD4"/>
-            <pin position="30" pad="PD5"/>
-            <pin position="31" pad="PD6"/>
-            <pin position="32" pad="PD7"/>
-            <pin position="33" pad="PG0"/>
-            <pin position="34" pad="PG1"/>
-            <pin position="35" pad="PC0"/>
-            <pin position="36" pad="PC1"/>
-            <pin position="37" pad="PC2"/>
-            <pin position="38" pad="PC3"/>
-            <pin position="39" pad="PC4"/>
-            <pin position="40" pad="PC5"/>
-            <pin position="41" pad="PC6"/>
-            <pin position="42" pad="PC7"/>
-            <pin position="43" pad="PG2"/>
-            <pin position="44" pad="PA7"/>
-            <pin position="45" pad="PA6"/>
-            <pin position="46" pad="PA5"/>
-            <pin position="47" pad="PA4"/>
-            <pin position="48" pad="PA3"/>
-            <pin position="49" pad="PA2"/>
-            <pin position="50" pad="PA1"/>
-            <pin position="51" pad="PA0"/>
-            <pin position="52" pad="VCC"/>
-            <pin position="53" pad="GND"/>
-            <pin position="54" pad="PF7"/>
-            <pin position="55" pad="PF6"/>
-            <pin position="56" pad="PF5"/>
-            <pin position="57" pad="PF4"/>
-            <pin position="58" pad="PF3"/>
-            <pin position="59" pad="PF2"/>
-            <pin position="60" pad="PF1"/>
-            <pin position="61" pad="PF0"/>
-            <pin position="62" pad="AREF"/>
-            <pin position="63" pad="GND"/>
-            <pin position="64" pad="AVCC"/>
+            <pin position="1"/>
+            <pin position="2" pad-key="pe0"/>
+            <pin position="3" pad-key="pe1"/>
+            <pin position="4" pad-key="pe2"/>
+            <pin position="5" pad-key="pe3"/>
+            <pin position="6" pad-key="pe4"/>
+            <pin position="7" pad-key="pe5"/>
+            <pin position="8" pad-key="pe6"/>
+            <pin position="9" pad-key="pe7"/>
+            <pin position="10" pad-key="pb0"/>
+            <pin position="11" pad-key="pb1"/>
+            <pin position="12" pad-key="pb2"/>
+            <pin position="13" pad-key="pb3"/>
+            <pin position="14" pad-key="pb4"/>
+            <pin position="15" pad-key="pb5"/>
+            <pin position="16" pad-key="pb6"/>
+            <pin position="17" pad-key="pb7"/>
+            <pin position="18" pad-key="pg3"/>
+            <pin position="19" pad-key="pg4"/>
+            <pin position="20" pad-key="pg5"/>
+            <pin position="21" pad-key="vcc"/>
+            <pin position="22" pad-key="gdn"/>
+            <pin position="23" pad-key="xtal2"/>
+            <pin position="24" pad-key="xtal1"/>
+            <pin position="25" pad-key="pd0"/>
+            <pin position="26" pad-key="pd1"/>
+            <pin position="27" pad-key="pd2"/>
+            <pin position="28" pad-key="pd3"/>
+            <pin position="29" pad-key="pd4"/>
+            <pin position="30" pad-key="pd5"/>
+            <pin position="31" pad-key="pd6"/>
+            <pin position="32" pad-key="pd7"/>
+            <pin position="33" pad-key="pg0"/>
+            <pin position="34" pad-key="pg1"/>
+            <pin position="35" pad-key="pc0"/>
+            <pin position="36" pad-key="pc1"/>
+            <pin position="37" pad-key="pc2"/>
+            <pin position="38" pad-key="pc3"/>
+            <pin position="39" pad-key="pc4"/>
+            <pin position="40" pad-key="pc5"/>
+            <pin position="41" pad-key="pc6"/>
+            <pin position="42" pad-key="pc7"/>
+            <pin position="43" pad-key="pg2"/>
+            <pin position="44" pad-key="pa7"/>
+            <pin position="45" pad-key="pa6"/>
+            <pin position="46" pad-key="pa5"/>
+            <pin position="47" pad-key="pa4"/>
+            <pin position="48" pad-key="pa3"/>
+            <pin position="49" pad-key="pa2"/>
+            <pin position="50" pad-key="pa1"/>
+            <pin position="51" pad-key="pa0"/>
+            <pin position="52" pad-key="vcc"/>
+            <pin position="53" pad-key="gnd"/>
+            <pin position="54" pad-key="pf7"/>
+            <pin position="55" pad-key="pf6"/>
+            <pin position="56" pad-key="pf5"/>
+            <pin position="57" pad-key="pf4"/>
+            <pin position="58" pad-key="pf3"/>
+            <pin position="59" pad-key="pf2"/>
+            <pin position="60" pad-key="pf1"/>
+            <pin position="61" pad-key="pf0"/>
+            <pin position="62" pad-key="aref"/>
+            <pin position="63" pad-key="gnd"/>
+            <pin position="64" pad-key="avcc"/>
         </pinout>
     </pinouts>
     <variants>
-        <variant name="ATmega645A-AU" pinout-key="qfp_qfn_64" package="TQFP64"/>
-        <variant name="ATmega645A-MU" pinout-key="qfp_qfn_64" package="VQFN64"/>
+        <variant key="atmega645a_au" name="ATmega645A-AU" pinout-key="qfp_qfn_64"/>
+        <variant key="atmega645a_mu" name="ATmega645A-MU" pinout-key="qfp_qfn_64"/>
     </variants>
 </device>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA645P.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA645P.xml
index de7d1537..c163ca60 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA645P.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA645P.xml
@@ -218,90 +218,90 @@
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pa2" index="2" function="PORTA" group="P"/>
-                <signal pad-id="pa3" index="3" function="PORTA" group="P"/>
-                <signal pad-id="pa4" index="4" function="PORTA" group="P"/>
-                <signal pad-id="pa5" index="5" function="PORTA" group="P"/>
-                <signal pad-id="pa6" index="6" function="PORTA" group="P"/>
-                <signal pad-id="pa7" index="7" function="PORTA" group="P"/>
+                <signal pad-key="pa0" index="0" function="PORTA" group="P"/>
+                <signal pad-key="pa1" index="1" function="PORTA" group="P"/>
+                <signal pad-key="pa2" index="2" function="PORTA" group="P"/>
+                <signal pad-key="pa3" index="3" function="PORTA" group="P"/>
+                <signal pad-key="pa4" index="4" function="PORTA" group="P"/>
+                <signal pad-key="pa5" index="5" function="PORTA" group="P"/>
+                <signal pad-key="pa6" index="6" function="PORTA" group="P"/>
+                <signal pad-key="pa7" index="7" function="PORTA" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pb2" index="2" function="PORTB" group="P"/>
-                <signal pad-id="pb3" index="3" function="PORTB" group="P"/>
-                <signal pad-id="pb4" index="4" function="PORTB" group="P"/>
-                <signal pad-id="pb5" index="5" function="PORTB" group="P"/>
-                <signal pad-id="pb6" index="6" function="PORTB" group="P"/>
-                <signal pad-id="pb7" index="7" function="PORTB" group="P"/>
+                <signal pad-key="pb0" index="0" function="PORTB" group="P"/>
+                <signal pad-key="pb1" index="1" function="PORTB" group="P"/>
+                <signal pad-key="pb2" index="2" function="PORTB" group="P"/>
+                <signal pad-key="pb3" index="3" function="PORTB" group="P"/>
+                <signal pad-key="pb4" index="4" function="PORTB" group="P"/>
+                <signal pad-key="pb5" index="5" function="PORTB" group="P"/>
+                <signal pad-key="pb6" index="6" function="PORTB" group="P"/>
+                <signal pad-key="pb7" index="7" function="PORTB" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pc2" index="2" function="PORTC" group="P"/>
-                <signal pad-id="pc3" index="3" function="PORTC" group="P"/>
-                <signal pad-id="pc4" index="4" function="PORTC" group="P"/>
-                <signal pad-id="pc5" index="5" function="PORTC" group="P"/>
-                <signal pad-id="pc6" index="6" function="PORTC" group="P"/>
-                <signal pad-id="pc7" index="7" function="PORTC" group="P"/>
+                <signal pad-key="pc0" index="0" function="PORTC" group="P"/>
+                <signal pad-key="pc1" index="1" function="PORTC" group="P"/>
+                <signal pad-key="pc2" index="2" function="PORTC" group="P"/>
+                <signal pad-key="pc3" index="3" function="PORTC" group="P"/>
+                <signal pad-key="pc4" index="4" function="PORTC" group="P"/>
+                <signal pad-key="pc5" index="5" function="PORTC" group="P"/>
+                <signal pad-key="pc6" index="6" function="PORTC" group="P"/>
+                <signal pad-key="pc7" index="7" function="PORTC" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pd2" index="2" function="PORTD" group="P"/>
-                <signal pad-id="pd3" index="3" function="PORTD" group="P"/>
-                <signal pad-id="pd4" index="4" function="PORTD" group="P"/>
-                <signal pad-id="pd5" index="5" function="PORTD" group="P"/>
-                <signal pad-id="pd6" index="6" function="PORTD" group="P"/>
-                <signal pad-id="pd7" index="7" function="PORTD" group="P"/>
+                <signal pad-key="pd0" index="0" function="PORTD" group="P"/>
+                <signal pad-key="pd1" index="1" function="PORTD" group="P"/>
+                <signal pad-key="pd2" index="2" function="PORTD" group="P"/>
+                <signal pad-key="pd3" index="3" function="PORTD" group="P"/>
+                <signal pad-key="pd4" index="4" function="PORTD" group="P"/>
+                <signal pad-key="pd5" index="5" function="PORTD" group="P"/>
+                <signal pad-key="pd6" index="6" function="PORTD" group="P"/>
+                <signal pad-key="pd7" index="7" function="PORTD" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="porte" name="PORTE" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pe2" index="2" function="PORTE" group="P"/>
-                <signal pad-id="pe3" index="3" function="PORTE" group="P"/>
-                <signal pad-id="pe4" index="4" function="PORTE" group="P"/>
-                <signal pad-id="pe5" index="5" function="PORTE" group="P"/>
-                <signal pad-id="pe6" index="6" function="PORTE" group="P"/>
-                <signal pad-id="pe7" index="7" function="PORTE" group="P"/>
+                <signal pad-key="pe0" index="0" function="PORTE" group="P"/>
+                <signal pad-key="pe1" index="1" function="PORTE" group="P"/>
+                <signal pad-key="pe2" index="2" function="PORTE" group="P"/>
+                <signal pad-key="pe3" index="3" function="PORTE" group="P"/>
+                <signal pad-key="pe4" index="4" function="PORTE" group="P"/>
+                <signal pad-key="pe5" index="5" function="PORTE" group="P"/>
+                <signal pad-key="pe6" index="6" function="PORTE" group="P"/>
+                <signal pad-key="pe7" index="7" function="PORTE" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portf" name="PORTF" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pf2" index="2" function="PORTF" group="P"/>
-                <signal pad-id="pf3" index="3" function="PORTF" group="P"/>
-                <signal pad-id="pf4" index="4" function="PORTF" group="P"/>
-                <signal pad-id="pf5" index="5" function="PORTF" group="P"/>
-                <signal pad-id="pf6" index="6" function="PORTF" group="P"/>
-                <signal pad-id="pf7" index="7" function="PORTF" group="P"/>
+                <signal pad-key="pf0" index="0" function="PORTF" group="P"/>
+                <signal pad-key="pf1" index="1" function="PORTF" group="P"/>
+                <signal pad-key="pf2" index="2" function="PORTF" group="P"/>
+                <signal pad-key="pf3" index="3" function="PORTF" group="P"/>
+                <signal pad-key="pf4" index="4" function="PORTF" group="P"/>
+                <signal pad-key="pf5" index="5" function="PORTF" group="P"/>
+                <signal pad-key="pf6" index="6" function="PORTF" group="P"/>
+                <signal pad-key="pf7" index="7" function="PORTF" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portg" name="PORTG" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pg2" index="2" function="PORTG" group="P"/>
-                <signal pad-id="pg3" index="3" function="PORTG" group="P"/>
-                <signal pad-id="pg4" index="4" function="PORTG" group="P"/>
-                <signal pad-id="pg5" index="5" function="PORTG" group="P"/>
+                <signal pad-key="pg0" index="0" function="PORTG" group="P"/>
+                <signal pad-key="pg1" index="1" function="PORTG" group="P"/>
+                <signal pad-key="pg2" index="2" function="PORTG" group="P"/>
+                <signal pad-key="pg3" index="3" function="PORTG" group="P"/>
+                <signal pad-key="pg4" index="4" function="PORTG" group="P"/>
+                <signal pad-key="pg5" index="5" function="PORTG" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="tc0" name="TC0" module-key="tc8">
@@ -726,76 +726,139 @@
             </register-group>
         </module>
     </modules>
+    <pads>
+        <pad key="pe0" name="PE0"/>
+        <pad key="pe1" name="PE1"/>
+        <pad key="pe2" name="PE2"/>
+        <pad key="pe3" name="PE3"/>
+        <pad key="pe4" name="PE4"/>
+        <pad key="pe5" name="PE5"/>
+        <pad key="pe6" name="PE6"/>
+        <pad key="pe7" name="PE7"/>
+        <pad key="pb0" name="PB0"/>
+        <pad key="pb1" name="PB1"/>
+        <pad key="pb2" name="PB2"/>
+        <pad key="pb3" name="PB3"/>
+        <pad key="pb4" name="PB4"/>
+        <pad key="pb5" name="PB5"/>
+        <pad key="pb6" name="PB6"/>
+        <pad key="pb7" name="PB7"/>
+        <pad key="pg3" name="PG3"/>
+        <pad key="pg4" name="PG4"/>
+        <pad key="pg5" name="PG5"/>
+        <pad key="vcc" name="VCC"/>
+        <pad key="gdn" name="GDN"/>
+        <pad key="xtal2" name="XTAL2"/>
+        <pad key="xtal1" name="XTAL1"/>
+        <pad key="pd0" name="PD0"/>
+        <pad key="pd1" name="PD1"/>
+        <pad key="pd2" name="PD2"/>
+        <pad key="pd3" name="PD3"/>
+        <pad key="pd4" name="PD4"/>
+        <pad key="pd5" name="PD5"/>
+        <pad key="pd6" name="PD6"/>
+        <pad key="pd7" name="PD7"/>
+        <pad key="pg0" name="PG0"/>
+        <pad key="pg1" name="PG1"/>
+        <pad key="pc0" name="PC0"/>
+        <pad key="pc1" name="PC1"/>
+        <pad key="pc2" name="PC2"/>
+        <pad key="pc3" name="PC3"/>
+        <pad key="pc4" name="PC4"/>
+        <pad key="pc5" name="PC5"/>
+        <pad key="pc6" name="PC6"/>
+        <pad key="pc7" name="PC7"/>
+        <pad key="pg2" name="PG2"/>
+        <pad key="pa7" name="PA7"/>
+        <pad key="pa6" name="PA6"/>
+        <pad key="pa5" name="PA5"/>
+        <pad key="pa4" name="PA4"/>
+        <pad key="pa3" name="PA3"/>
+        <pad key="pa2" name="PA2"/>
+        <pad key="pa1" name="PA1"/>
+        <pad key="pa0" name="PA0"/>
+        <pad key="gnd" name="GND"/>
+        <pad key="pf7" name="PF7"/>
+        <pad key="pf6" name="PF6"/>
+        <pad key="pf5" name="PF5"/>
+        <pad key="pf4" name="PF4"/>
+        <pad key="pf3" name="PF3"/>
+        <pad key="pf2" name="PF2"/>
+        <pad key="pf1" name="PF1"/>
+        <pad key="pf0" name="PF0"/>
+        <pad key="aref" name="AREF"/>
+        <pad key="avcc" name="AVCC"/>
+    </pads>
     <pinouts>
         <pinout key="qfp_qfn_64" name="QFP_QFN_64" type="qfn">
-            <pin position="1" pad="NC"/>
-            <pin position="2" pad="PE0"/>
-            <pin position="3" pad="PE1"/>
-            <pin position="4" pad="PE2"/>
-            <pin position="5" pad="PE3"/>
-            <pin position="6" pad="PE4"/>
-            <pin position="7" pad="PE5"/>
-            <pin position="8" pad="PE6"/>
-            <pin position="9" pad="PE7"/>
-            <pin position="10" pad="PB0"/>
-            <pin position="11" pad="PB1"/>
-            <pin position="12" pad="PB2"/>
-            <pin position="13" pad="PB3"/>
-            <pin position="14" pad="PB4"/>
-            <pin position="15" pad="PB5"/>
-            <pin position="16" pad="PB6"/>
-            <pin position="17" pad="PB7"/>
-            <pin position="18" pad="PG3"/>
-            <pin position="19" pad="PG4"/>
-            <pin position="20" pad="PG5"/>
-            <pin position="21" pad="VCC"/>
-            <pin position="22" pad="GDN"/>
-            <pin position="23" pad="XTAL2"/>
-            <pin position="24" pad="XTAL1"/>
-            <pin position="25" pad="PD0"/>
-            <pin position="26" pad="PD1"/>
-            <pin position="27" pad="PD2"/>
-            <pin position="28" pad="PD3"/>
-            <pin position="29" pad="PD4"/>
-            <pin position="30" pad="PD5"/>
-            <pin position="31" pad="PD6"/>
-            <pin position="32" pad="PD7"/>
-            <pin position="33" pad="PG0"/>
-            <pin position="34" pad="PG1"/>
-            <pin position="35" pad="PC0"/>
-            <pin position="36" pad="PC1"/>
-            <pin position="37" pad="PC2"/>
-            <pin position="38" pad="PC3"/>
-            <pin position="39" pad="PC4"/>
-            <pin position="40" pad="PC5"/>
-            <pin position="41" pad="PC6"/>
-            <pin position="42" pad="PC7"/>
-            <pin position="43" pad="PG2"/>
-            <pin position="44" pad="PA7"/>
-            <pin position="45" pad="PA6"/>
-            <pin position="46" pad="PA5"/>
-            <pin position="47" pad="PA4"/>
-            <pin position="48" pad="PA3"/>
-            <pin position="49" pad="PA2"/>
-            <pin position="50" pad="PA1"/>
-            <pin position="51" pad="PA0"/>
-            <pin position="52" pad="VCC"/>
-            <pin position="53" pad="GND"/>
-            <pin position="54" pad="PF7"/>
-            <pin position="55" pad="PF6"/>
-            <pin position="56" pad="PF5"/>
-            <pin position="57" pad="PF4"/>
-            <pin position="58" pad="PF3"/>
-            <pin position="59" pad="PF2"/>
-            <pin position="60" pad="PF1"/>
-            <pin position="61" pad="PF0"/>
-            <pin position="62" pad="AREF"/>
-            <pin position="63" pad="GND"/>
-            <pin position="64" pad="AVCC"/>
+            <pin position="1"/>
+            <pin position="2" pad-key="pe0"/>
+            <pin position="3" pad-key="pe1"/>
+            <pin position="4" pad-key="pe2"/>
+            <pin position="5" pad-key="pe3"/>
+            <pin position="6" pad-key="pe4"/>
+            <pin position="7" pad-key="pe5"/>
+            <pin position="8" pad-key="pe6"/>
+            <pin position="9" pad-key="pe7"/>
+            <pin position="10" pad-key="pb0"/>
+            <pin position="11" pad-key="pb1"/>
+            <pin position="12" pad-key="pb2"/>
+            <pin position="13" pad-key="pb3"/>
+            <pin position="14" pad-key="pb4"/>
+            <pin position="15" pad-key="pb5"/>
+            <pin position="16" pad-key="pb6"/>
+            <pin position="17" pad-key="pb7"/>
+            <pin position="18" pad-key="pg3"/>
+            <pin position="19" pad-key="pg4"/>
+            <pin position="20" pad-key="pg5"/>
+            <pin position="21" pad-key="vcc"/>
+            <pin position="22" pad-key="gdn"/>
+            <pin position="23" pad-key="xtal2"/>
+            <pin position="24" pad-key="xtal1"/>
+            <pin position="25" pad-key="pd0"/>
+            <pin position="26" pad-key="pd1"/>
+            <pin position="27" pad-key="pd2"/>
+            <pin position="28" pad-key="pd3"/>
+            <pin position="29" pad-key="pd4"/>
+            <pin position="30" pad-key="pd5"/>
+            <pin position="31" pad-key="pd6"/>
+            <pin position="32" pad-key="pd7"/>
+            <pin position="33" pad-key="pg0"/>
+            <pin position="34" pad-key="pg1"/>
+            <pin position="35" pad-key="pc0"/>
+            <pin position="36" pad-key="pc1"/>
+            <pin position="37" pad-key="pc2"/>
+            <pin position="38" pad-key="pc3"/>
+            <pin position="39" pad-key="pc4"/>
+            <pin position="40" pad-key="pc5"/>
+            <pin position="41" pad-key="pc6"/>
+            <pin position="42" pad-key="pc7"/>
+            <pin position="43" pad-key="pg2"/>
+            <pin position="44" pad-key="pa7"/>
+            <pin position="45" pad-key="pa6"/>
+            <pin position="46" pad-key="pa5"/>
+            <pin position="47" pad-key="pa4"/>
+            <pin position="48" pad-key="pa3"/>
+            <pin position="49" pad-key="pa2"/>
+            <pin position="50" pad-key="pa1"/>
+            <pin position="51" pad-key="pa0"/>
+            <pin position="52" pad-key="vcc"/>
+            <pin position="53" pad-key="gnd"/>
+            <pin position="54" pad-key="pf7"/>
+            <pin position="55" pad-key="pf6"/>
+            <pin position="56" pad-key="pf5"/>
+            <pin position="57" pad-key="pf4"/>
+            <pin position="58" pad-key="pf3"/>
+            <pin position="59" pad-key="pf2"/>
+            <pin position="60" pad-key="pf1"/>
+            <pin position="61" pad-key="pf0"/>
+            <pin position="62" pad-key="aref"/>
+            <pin position="63" pad-key="gnd"/>
+            <pin position="64" pad-key="avcc"/>
         </pinout>
     </pinouts>
     <variants>
-        <variant name="ATmega645P-AU" pinout-key="qfp_qfn_64" package="TQFP64"/>
-        <variant name="ATmega645P-MU" pinout-key="qfp_qfn_64" package="VQFN64"/>
+        <variant key="atmega645p_au" name="ATmega645P-AU" pinout-key="qfp_qfn_64"/>
+        <variant key="atmega645p_mu" name="ATmega645P-MU" pinout-key="qfp_qfn_64"/>
     </variants>
 </device>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA649.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA649.xml
index 19d05eb1..05ec755d 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA649.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA649.xml
@@ -194,25 +194,25 @@
         <peripheral key="tc0" name="TC0" module-key="tc8">
             <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"/>
+                <signal pad-key="pg4" function="default" group="T"/>
+                <signal pad-key="pb4" function="default" group="OCA"/>
             </signals>
         </peripheral>
         <peripheral key="tc1" name="TC1" module-key="tc16">
             <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"/>
-                <signal pad-id="pb5" function="default" group="OCA"/>
-                <signal pad-id="pb6" function="default" group="OCB"/>
-                <signal pad-id="xtal1" function="default" group="TOSC"/>
+                <signal pad-key="pg3" function="default" group="T"/>
+                <signal pad-key="pd0" function="default" group="ICP"/>
+                <signal pad-key="pb5" function="default" group="OCA"/>
+                <signal pad-key="pb6" function="default" group="OCB"/>
+                <signal pad-key="xtal1" function="default" group="TOSC"/>
             </signals>
         </peripheral>
         <peripheral key="tc2" name="TC2" module-key="tc8_async">
             <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"/>
+                <signal pad-key="pb7" function="default" group="OCA"/>
+                <signal pad-key="xtal2" function="default" group="TOSC"/>
             </signals>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="wdt">
@@ -224,197 +224,197 @@
         <peripheral key="spi" name="SPI" module-key="spi">
             <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"/>
-                <signal pad-id="pb2" function="default" group="MOSI"/>
-                <signal pad-id="pb3" function="default" group="MISO"/>
+                <signal pad-key="pb0" function="default" group="SS"/>
+                <signal pad-key="pb1" function="default" group="SCK"/>
+                <signal pad-key="pb2" function="default" group="MOSI"/>
+                <signal pad-key="pb3" function="default" group="MISO"/>
             </signals>
         </peripheral>
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pa2" index="2" function="default" group="P"/>
-                <signal pad-id="pa3" index="3" function="default" group="P"/>
-                <signal pad-id="pa4" index="4" function="default" group="P"/>
-                <signal pad-id="pa5" index="5" function="default" group="P"/>
-                <signal pad-id="pa6" index="6" function="default" group="P"/>
-                <signal pad-id="pa7" index="7" function="default" group="P"/>
+                <signal pad-key="pa0" index="0" function="default" group="P"/>
+                <signal pad-key="pa1" index="1" function="default" group="P"/>
+                <signal pad-key="pa2" index="2" function="default" group="P"/>
+                <signal pad-key="pa3" index="3" function="default" group="P"/>
+                <signal pad-key="pa4" index="4" function="default" group="P"/>
+                <signal pad-key="pa5" index="5" function="default" group="P"/>
+                <signal pad-key="pa6" index="6" function="default" group="P"/>
+                <signal pad-key="pa7" index="7" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pb2" index="2" function="default" group="P"/>
-                <signal pad-id="pb3" index="3" function="default" group="P"/>
-                <signal pad-id="pb4" index="4" function="default" group="P"/>
-                <signal pad-id="pb5" index="5" function="default" group="P"/>
-                <signal pad-id="pb6" index="6" function="default" group="P"/>
-                <signal pad-id="pb7" index="7" function="default" group="P"/>
+                <signal pad-key="pb0" index="0" function="default" group="P"/>
+                <signal pad-key="pb1" index="1" function="default" group="P"/>
+                <signal pad-key="pb2" index="2" function="default" group="P"/>
+                <signal pad-key="pb3" index="3" function="default" group="P"/>
+                <signal pad-key="pb4" index="4" function="default" group="P"/>
+                <signal pad-key="pb5" index="5" function="default" group="P"/>
+                <signal pad-key="pb6" index="6" function="default" group="P"/>
+                <signal pad-key="pb7" index="7" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pc2" index="2" function="default" group="P"/>
-                <signal pad-id="pc3" index="3" function="default" group="P"/>
-                <signal pad-id="pc4" index="4" function="default" group="P"/>
-                <signal pad-id="pc5" index="5" function="default" group="P"/>
-                <signal pad-id="pc6" index="6" function="default" group="P"/>
-                <signal pad-id="pc7" index="7" function="default" group="P"/>
+                <signal pad-key="pc0" index="0" function="default" group="P"/>
+                <signal pad-key="pc1" index="1" function="default" group="P"/>
+                <signal pad-key="pc2" index="2" function="default" group="P"/>
+                <signal pad-key="pc3" index="3" function="default" group="P"/>
+                <signal pad-key="pc4" index="4" function="default" group="P"/>
+                <signal pad-key="pc5" index="5" function="default" group="P"/>
+                <signal pad-key="pc6" index="6" function="default" group="P"/>
+                <signal pad-key="pc7" index="7" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pd2" index="2" function="default" group="P"/>
-                <signal pad-id="pd3" index="3" function="default" group="P"/>
-                <signal pad-id="pd4" index="4" function="default" group="P"/>
-                <signal pad-id="pd5" index="5" function="default" group="P"/>
-                <signal pad-id="pd6" index="6" function="default" group="P"/>
-                <signal pad-id="pd7" index="7" function="default" group="P"/>
+                <signal pad-key="pd0" index="0" function="default" group="P"/>
+                <signal pad-key="pd1" index="1" function="default" group="P"/>
+                <signal pad-key="pd2" index="2" function="default" group="P"/>
+                <signal pad-key="pd3" index="3" function="default" group="P"/>
+                <signal pad-key="pd4" index="4" function="default" group="P"/>
+                <signal pad-key="pd5" index="5" function="default" group="P"/>
+                <signal pad-key="pd6" index="6" function="default" group="P"/>
+                <signal pad-key="pd7" index="7" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="porte" name="PORTE" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pe2" index="2" function="default" group="P"/>
-                <signal pad-id="pe3" index="3" function="default" group="P"/>
-                <signal pad-id="pe4" index="4" function="default" group="P"/>
-                <signal pad-id="pe5" index="5" function="default" group="P"/>
-                <signal pad-id="pe6" index="6" function="default" group="P"/>
-                <signal pad-id="pe7" index="7" function="default" group="P"/>
+                <signal pad-key="pe0" index="0" function="default" group="P"/>
+                <signal pad-key="pe1" index="1" function="default" group="P"/>
+                <signal pad-key="pe2" index="2" function="default" group="P"/>
+                <signal pad-key="pe3" index="3" function="default" group="P"/>
+                <signal pad-key="pe4" index="4" function="default" group="P"/>
+                <signal pad-key="pe5" index="5" function="default" group="P"/>
+                <signal pad-key="pe6" index="6" function="default" group="P"/>
+                <signal pad-key="pe7" index="7" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portf" name="PORTF" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pf2" index="2" function="default" group="P"/>
-                <signal pad-id="pf3" index="3" function="default" group="P"/>
-                <signal pad-id="pf4" index="4" function="default" group="P"/>
-                <signal pad-id="pf5" index="5" function="default" group="P"/>
-                <signal pad-id="pf6" index="6" function="default" group="P"/>
-                <signal pad-id="pf7" index="7" function="default" group="P"/>
+                <signal pad-key="pf0" index="0" function="default" group="P"/>
+                <signal pad-key="pf1" index="1" function="default" group="P"/>
+                <signal pad-key="pf2" index="2" function="default" group="P"/>
+                <signal pad-key="pf3" index="3" function="default" group="P"/>
+                <signal pad-key="pf4" index="4" function="default" group="P"/>
+                <signal pad-key="pf5" index="5" function="default" group="P"/>
+                <signal pad-key="pf6" index="6" function="default" group="P"/>
+                <signal pad-key="pf7" index="7" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portg" name="PORTG" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pg2" index="2" function="default" group="P"/>
-                <signal pad-id="pg3" index="3" function="default" group="P"/>
-                <signal pad-id="pg4" index="4" function="default" group="P"/>
-                <signal pad-id="pg5" index="4" function="default" group="P"/>
+                <signal pad-key="pg0" index="0" function="default" group="P"/>
+                <signal pad-key="pg1" index="1" function="default" group="P"/>
+                <signal pad-key="pg2" index="2" function="default" group="P"/>
+                <signal pad-key="pg3" index="3" function="default" group="P"/>
+                <signal pad-key="pg4" index="4" function="default" group="P"/>
+                <signal pad-key="pg5" index="4" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="ac" name="AC" module-key="ac">
             <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"/>
+                <signal pad-key="pe2" index="0" function="default" group="AIN"/>
+                <signal pad-key="pe3" index="1" function="default" group="AIN"/>
             </signals>
         </peripheral>
         <peripheral key="jtag" name="JTAG" module-key="jtag">
             <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"/>
-                <signal pad-id="pf6" function="default" group="TDO"/>
-                <signal pad-id="pf7" function="default" group="TDI"/>
+                <signal pad-key="pf4" function="default" group="TCK"/>
+                <signal pad-key="pf5" function="default" group="TMS"/>
+                <signal pad-key="pf6" function="default" group="TDO"/>
+                <signal pad-key="pf7" function="default" group="TDI"/>
             </signals>
         </peripheral>
         <peripheral key="lcd" name="LCD" module-key="lcd">
             <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"/>
-                <signal pad-id="pa6" index="2" function="default" group="SEG"/>
-                <signal pad-id="pa7" index="3" function="default" group="SEG"/>
-                <signal pad-id="pg2" index="4" function="default" group="SEG"/>
-                <signal pad-id="pc7" index="5" function="default" group="SEG"/>
-                <signal pad-id="pc6" index="6" function="default" group="SEG"/>
-                <signal pad-id="pc5" index="7" function="default" group="SEG"/>
-                <signal pad-id="pc4" index="8" function="default" group="SEG"/>
-                <signal pad-id="pc3" index="9" function="default" group="SEG"/>
-                <signal pad-id="pc2" index="10" function="default" group="SEG"/>
-                <signal pad-id="pc1" index="11" function="default" group="SEG"/>
-                <signal pad-id="pc0" index="12" function="default" group="SEG"/>
-                <signal pad-id="pg1" index="13" function="default" group="SEG"/>
-                <signal pad-id="pg2" index="14" function="default" group="SEG"/>
-                <signal pad-id="pd7" index="15" function="default" group="SEG"/>
-                <signal pad-id="pd6" index="16" function="default" group="SEG"/>
-                <signal pad-id="pd5" index="17" function="default" group="SEG"/>
-                <signal pad-id="pd4" index="18" function="default" group="SEG"/>
-                <signal pad-id="pd3" index="19" function="default" group="SEG"/>
-                <signal pad-id="pd2" index="20" function="default" group="SEG"/>
-                <signal pad-id="pd1" index="21" function="default" group="SEG"/>
-                <signal pad-id="pd0" index="22" function="default" group="SEG"/>
-                <signal pad-id="pg4" index="23" function="default" group="SEG"/>
-                <signal pad-id="pg3" index="24" function="default" group="SEG"/>
-                <signal pad-id="pa0" index="0" function="default" group="COM"/>
-                <signal pad-id="pa1" index="1" function="default" group="COM"/>
-                <signal pad-id="pa2" index="2" function="default" group="COM"/>
-                <signal pad-id="pa3" index="3" function="default" group="COM"/>
+                <signal pad-key="pa4" index="0" function="default" group="SEG"/>
+                <signal pad-key="pa5" index="1" function="default" group="SEG"/>
+                <signal pad-key="pa6" index="2" function="default" group="SEG"/>
+                <signal pad-key="pa7" index="3" function="default" group="SEG"/>
+                <signal pad-key="pg2" index="4" function="default" group="SEG"/>
+                <signal pad-key="pc7" index="5" function="default" group="SEG"/>
+                <signal pad-key="pc6" index="6" function="default" group="SEG"/>
+                <signal pad-key="pc5" index="7" function="default" group="SEG"/>
+                <signal pad-key="pc4" index="8" function="default" group="SEG"/>
+                <signal pad-key="pc3" index="9" function="default" group="SEG"/>
+                <signal pad-key="pc2" index="10" function="default" group="SEG"/>
+                <signal pad-key="pc1" index="11" function="default" group="SEG"/>
+                <signal pad-key="pc0" index="12" function="default" group="SEG"/>
+                <signal pad-key="pg1" index="13" function="default" group="SEG"/>
+                <signal pad-key="pg2" index="14" function="default" group="SEG"/>
+                <signal pad-key="pd7" index="15" function="default" group="SEG"/>
+                <signal pad-key="pd6" index="16" function="default" group="SEG"/>
+                <signal pad-key="pd5" index="17" function="default" group="SEG"/>
+                <signal pad-key="pd4" index="18" function="default" group="SEG"/>
+                <signal pad-key="pd3" index="19" function="default" group="SEG"/>
+                <signal pad-key="pd2" index="20" function="default" group="SEG"/>
+                <signal pad-key="pd1" index="21" function="default" group="SEG"/>
+                <signal pad-key="pd0" index="22" function="default" group="SEG"/>
+                <signal pad-key="pg4" index="23" function="default" group="SEG"/>
+                <signal pad-key="pg3" index="24" function="default" group="SEG"/>
+                <signal pad-key="pa0" index="0" function="default" group="COM"/>
+                <signal pad-key="pa1" index="1" function="default" group="COM"/>
+                <signal pad-key="pa2" index="2" function="default" group="COM"/>
+                <signal pad-key="pa3" index="3" function="default" group="COM"/>
             </signals>
         </peripheral>
         <peripheral key="exint" name="EXINT" module-key="exint">
             <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"/>
-                <signal pad-id="pe2" index="2" function="default" group="PCINT"/>
-                <signal pad-id="pe3" index="3" function="default" group="PCINT"/>
-                <signal pad-id="pe4" index="4" function="default" group="PCINT"/>
-                <signal pad-id="pe5" index="5" function="default" group="PCINT"/>
-                <signal pad-id="pe6" index="6" function="default" group="PCINT"/>
-                <signal pad-id="pe7" index="7" function="default" group="PCINT"/>
-                <signal pad-id="pb0" index="8" function="default" group="PCINT"/>
-                <signal pad-id="pb1" index="9" function="default" group="PCINT"/>
-                <signal pad-id="pb2" index="10" function="default" group="PCINT"/>
-                <signal pad-id="pb3" index="11" function="default" group="PCINT"/>
-                <signal pad-id="pb4" index="12" function="default" group="PCINT"/>
-                <signal pad-id="pb5" index="13" function="default" group="PCINT"/>
-                <signal pad-id="pb6" index="14" function="default" group="PCINT"/>
-                <signal pad-id="pb7" index="15" function="default" group="PCINT"/>
-                <signal pad-id="pd1" index="0" function="default" group="INT"/>
+                <signal pad-key="pe0" index="0" function="default" group="PCINT"/>
+                <signal pad-key="pe1" index="1" function="default" group="PCINT"/>
+                <signal pad-key="pe2" index="2" function="default" group="PCINT"/>
+                <signal pad-key="pe3" index="3" function="default" group="PCINT"/>
+                <signal pad-key="pe4" index="4" function="default" group="PCINT"/>
+                <signal pad-key="pe5" index="5" function="default" group="PCINT"/>
+                <signal pad-key="pe6" index="6" function="default" group="PCINT"/>
+                <signal pad-key="pe7" index="7" function="default" group="PCINT"/>
+                <signal pad-key="pb0" index="8" function="default" group="PCINT"/>
+                <signal pad-key="pb1" index="9" function="default" group="PCINT"/>
+                <signal pad-key="pb2" index="10" function="default" group="PCINT"/>
+                <signal pad-key="pb3" index="11" function="default" group="PCINT"/>
+                <signal pad-key="pb4" index="12" function="default" group="PCINT"/>
+                <signal pad-key="pb5" index="13" function="default" group="PCINT"/>
+                <signal pad-key="pb6" index="14" function="default" group="PCINT"/>
+                <signal pad-key="pb7" index="15" function="default" group="PCINT"/>
+                <signal pad-key="pd1" index="0" function="default" group="INT"/>
             </signals>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="cpu">
             <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"/>
+                <signal pad-key="pe7" index="0" function="default" group="CLK"/>
             </signals>
         </peripheral>
         <peripheral key="usi" name="USI" module-key="usi">
             <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"/>
+                <signal pad-key="pe5" function="default" group="DI"/>
+                <signal pad-key="pe6" function="default" group="DO"/>
             </signals>
         </peripheral>
         <peripheral key="adc" name="ADC" module-key="adc">
             <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"/>
-                <signal pad-id="pf2" index="2" function="default" group="ADC"/>
-                <signal pad-id="pf3" index="3" function="default" group="ADC"/>
-                <signal pad-id="pf4" index="4" function="default" group="ADC"/>
-                <signal pad-id="pf5" index="5" function="default" group="ADC"/>
-                <signal pad-id="pf6" index="6" function="default" group="ADC"/>
-                <signal pad-id="pf7" index="7" function="default" group="ADC"/>
+                <signal pad-key="pf0" index="0" function="default" group="ADC"/>
+                <signal pad-key="pf1" index="1" function="default" group="ADC"/>
+                <signal pad-key="pf2" index="2" function="default" group="ADC"/>
+                <signal pad-key="pf3" index="3" function="default" group="ADC"/>
+                <signal pad-key="pf4" index="4" function="default" group="ADC"/>
+                <signal pad-key="pf5" index="5" function="default" group="ADC"/>
+                <signal pad-key="pf6" index="6" function="default" group="ADC"/>
+                <signal pad-key="pf7" index="7" function="default" group="ADC"/>
             </signals>
         </peripheral>
         <peripheral key="boot_load" name="BOOT_LOAD" module-key="boot_load">
@@ -423,10 +423,10 @@
         <peripheral key="usart0" name="USART0" module-key="usart">
             <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"/>
-                <signal pad-id="pe2" function="default" group="XCK"/>
-                <signal pad-id="pe4" function="default" group="USCK"/>
+                <signal pad-key="pe0" function="default" group="RXD"/>
+                <signal pad-key="pe1" function="default" group="TXD"/>
+                <signal pad-key="pe2" function="default" group="XCK"/>
+                <signal pad-key="pe4" function="default" group="USCK"/>
             </signals>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="fuse">
@@ -869,144 +869,207 @@
             </register-group>
         </module>
     </modules>
+    <pads>
+        <pad key="lcdcap" name="LCDCAP"/>
+        <pad key="pe0" name="PE0"/>
+        <pad key="pe1" name="PE1"/>
+        <pad key="pe2" name="PE2"/>
+        <pad key="pe3" name="PE3"/>
+        <pad key="pe4" name="PE4"/>
+        <pad key="pe5" name="PE5"/>
+        <pad key="pe6" name="PE6"/>
+        <pad key="pe7" name="PE7"/>
+        <pad key="pb0" name="PB0"/>
+        <pad key="pb1" name="PB1"/>
+        <pad key="pb2" name="PB2"/>
+        <pad key="pb3" name="PB3"/>
+        <pad key="pb4" name="PB4"/>
+        <pad key="pb5" name="PB5"/>
+        <pad key="pb6" name="PB6"/>
+        <pad key="pb7" name="PB7"/>
+        <pad key="pg3" name="PG3"/>
+        <pad key="pg4" name="PG4"/>
+        <pad key="pg5" name="PG5"/>
+        <pad key="vcc" name="VCC"/>
+        <pad key="gnd" name="GND"/>
+        <pad key="xtal2" name="XTAL2"/>
+        <pad key="xtal1" name="XTAL1"/>
+        <pad key="pd0" name="PD0"/>
+        <pad key="pd1" name="PD1"/>
+        <pad key="pd2" name="PD2"/>
+        <pad key="pd3" name="PD3"/>
+        <pad key="pd4" name="PD4"/>
+        <pad key="pd5" name="PD5"/>
+        <pad key="pd6" name="PD6"/>
+        <pad key="pd7" name="PD7"/>
+        <pad key="pg0" name="PG0"/>
+        <pad key="pg1" name="PG1"/>
+        <pad key="pc0" name="PC0"/>
+        <pad key="pc1" name="PC1"/>
+        <pad key="pc2" name="PC2"/>
+        <pad key="pc3" name="PC3"/>
+        <pad key="pc4" name="PC4"/>
+        <pad key="pc5" name="PC5"/>
+        <pad key="pc6" name="PC6"/>
+        <pad key="pc7" name="PC7"/>
+        <pad key="pg2" name="PG2"/>
+        <pad key="pa7" name="PA7"/>
+        <pad key="pa6" name="PA6"/>
+        <pad key="pa5" name="PA5"/>
+        <pad key="pa4" name="PA4"/>
+        <pad key="pa3" name="PA3"/>
+        <pad key="pa2" name="PA2"/>
+        <pad key="pa1" name="PA1"/>
+        <pad key="pa0" name="PA0"/>
+        <pad key="pf7" name="PF7"/>
+        <pad key="pf6" name="PF6"/>
+        <pad key="pf5" name="PF5"/>
+        <pad key="pf4" name="PF4"/>
+        <pad key="pf3" name="PF3"/>
+        <pad key="pf2" name="PF2"/>
+        <pad key="pf1" name="PF1"/>
+        <pad key="pf0" name="PF0"/>
+        <pad key="aref" name="AREF"/>
+        <pad key="avcc" name="AVCC"/>
+    </pads>
     <pinouts>
         <pinout key="tqfp64" name="TQFP64" type="qfp">
-            <pin position="1" pad="LCDCAP"/>
-            <pin position="2" pad="PE0"/>
-            <pin position="3" pad="PE1"/>
-            <pin position="4" pad="PE2"/>
-            <pin position="5" pad="PE3"/>
-            <pin position="6" pad="PE4"/>
-            <pin position="7" pad="PE5"/>
-            <pin position="8" pad="PE6"/>
-            <pin position="9" pad="PE7"/>
-            <pin position="10" pad="PB0"/>
-            <pin position="11" pad="PB1"/>
-            <pin position="12" pad="PB2"/>
-            <pin position="13" pad="PB3"/>
-            <pin position="14" pad="PB4"/>
-            <pin position="15" pad="PB5"/>
-            <pin position="16" pad="PB6"/>
-            <pin position="17" pad="PB7"/>
-            <pin position="18" pad="PG3"/>
-            <pin position="19" pad="PG4"/>
-            <pin position="20" pad="PG5"/>
-            <pin position="21" pad="VCC"/>
-            <pin position="22" pad="GND"/>
-            <pin position="23" pad="XTAL2"/>
-            <pin position="24" pad="XTAL1"/>
-            <pin position="25" pad="PD0"/>
-            <pin position="26" pad="PD1"/>
-            <pin position="27" pad="PD2"/>
-            <pin position="28" pad="PD3"/>
-            <pin position="29" pad="PD4"/>
-            <pin position="30" pad="PD5"/>
-            <pin position="31" pad="PD6"/>
-            <pin position="32" pad="PD7"/>
-            <pin position="33" pad="PG0"/>
-            <pin position="34" pad="PG1"/>
-            <pin position="35" pad="PC0"/>
-            <pin position="36" pad="PC1"/>
-            <pin position="37" pad="PC2"/>
-            <pin position="38" pad="PC3"/>
-            <pin position="39" pad="PC4"/>
-            <pin position="40" pad="PC5"/>
-            <pin position="41" pad="PC6"/>
-            <pin position="42" pad="PC7"/>
-            <pin position="43" pad="PG2"/>
-            <pin position="44" pad="PA7"/>
-            <pin position="45" pad="PA6"/>
-            <pin position="46" pad="PA5"/>
-            <pin position="47" pad="PA4"/>
-            <pin position="48" pad="PA3"/>
-            <pin position="49" pad="PA2"/>
-            <pin position="50" pad="PA1"/>
-            <pin position="51" pad="PA0"/>
-            <pin position="52" pad="VCC"/>
-            <pin position="53" pad="GND"/>
-            <pin position="54" pad="PF7"/>
-            <pin position="55" pad="PF6"/>
-            <pin position="56" pad="PF5"/>
-            <pin position="57" pad="PF4"/>
-            <pin position="58" pad="PF3"/>
-            <pin position="59" pad="PF2"/>
-            <pin position="60" pad="PF1"/>
-            <pin position="61" pad="PF0"/>
-            <pin position="62" pad="AREF"/>
-            <pin position="63" pad="GND"/>
-            <pin position="64" pad="AVCC"/>
+            <pin position="1" pad-key="lcdcap"/>
+            <pin position="2" pad-key="pe0"/>
+            <pin position="3" pad-key="pe1"/>
+            <pin position="4" pad-key="pe2"/>
+            <pin position="5" pad-key="pe3"/>
+            <pin position="6" pad-key="pe4"/>
+            <pin position="7" pad-key="pe5"/>
+            <pin position="8" pad-key="pe6"/>
+            <pin position="9" pad-key="pe7"/>
+            <pin position="10" pad-key="pb0"/>
+            <pin position="11" pad-key="pb1"/>
+            <pin position="12" pad-key="pb2"/>
+            <pin position="13" pad-key="pb3"/>
+            <pin position="14" pad-key="pb4"/>
+            <pin position="15" pad-key="pb5"/>
+            <pin position="16" pad-key="pb6"/>
+            <pin position="17" pad-key="pb7"/>
+            <pin position="18" pad-key="pg3"/>
+            <pin position="19" pad-key="pg4"/>
+            <pin position="20" pad-key="pg5"/>
+            <pin position="21" pad-key="vcc"/>
+            <pin position="22" pad-key="gnd"/>
+            <pin position="23" pad-key="xtal2"/>
+            <pin position="24" pad-key="xtal1"/>
+            <pin position="25" pad-key="pd0"/>
+            <pin position="26" pad-key="pd1"/>
+            <pin position="27" pad-key="pd2"/>
+            <pin position="28" pad-key="pd3"/>
+            <pin position="29" pad-key="pd4"/>
+            <pin position="30" pad-key="pd5"/>
+            <pin position="31" pad-key="pd6"/>
+            <pin position="32" pad-key="pd7"/>
+            <pin position="33" pad-key="pg0"/>
+            <pin position="34" pad-key="pg1"/>
+            <pin position="35" pad-key="pc0"/>
+            <pin position="36" pad-key="pc1"/>
+            <pin position="37" pad-key="pc2"/>
+            <pin position="38" pad-key="pc3"/>
+            <pin position="39" pad-key="pc4"/>
+            <pin position="40" pad-key="pc5"/>
+            <pin position="41" pad-key="pc6"/>
+            <pin position="42" pad-key="pc7"/>
+            <pin position="43" pad-key="pg2"/>
+            <pin position="44" pad-key="pa7"/>
+            <pin position="45" pad-key="pa6"/>
+            <pin position="46" pad-key="pa5"/>
+            <pin position="47" pad-key="pa4"/>
+            <pin position="48" pad-key="pa3"/>
+            <pin position="49" pad-key="pa2"/>
+            <pin position="50" pad-key="pa1"/>
+            <pin position="51" pad-key="pa0"/>
+            <pin position="52" pad-key="vcc"/>
+            <pin position="53" pad-key="gnd"/>
+            <pin position="54" pad-key="pf7"/>
+            <pin position="55" pad-key="pf6"/>
+            <pin position="56" pad-key="pf5"/>
+            <pin position="57" pad-key="pf4"/>
+            <pin position="58" pad-key="pf3"/>
+            <pin position="59" pad-key="pf2"/>
+            <pin position="60" pad-key="pf1"/>
+            <pin position="61" pad-key="pf0"/>
+            <pin position="62" pad-key="aref"/>
+            <pin position="63" pad-key="gnd"/>
+            <pin position="64" pad-key="avcc"/>
         </pinout>
         <pinout key="qfn64" name="QFN64" type="qfn">
-            <pin position="1" pad="LCDCAP"/>
-            <pin position="2" pad="PE0"/>
-            <pin position="3" pad="PE1"/>
-            <pin position="4" pad="PE2"/>
-            <pin position="5" pad="PE3"/>
-            <pin position="6" pad="PE4"/>
-            <pin position="7" pad="PE5"/>
-            <pin position="8" pad="PE6"/>
-            <pin position="9" pad="PE7"/>
-            <pin position="10" pad="PB0"/>
-            <pin position="11" pad="PB1"/>
-            <pin position="12" pad="PB2"/>
-            <pin position="13" pad="PB3"/>
-            <pin position="14" pad="PB4"/>
-            <pin position="15" pad="PB5"/>
-            <pin position="16" pad="PB6"/>
-            <pin position="17" pad="PB7"/>
-            <pin position="18" pad="PG3"/>
-            <pin position="19" pad="PG4"/>
-            <pin position="20" pad="PG5"/>
-            <pin position="21" pad="VCC"/>
-            <pin position="22" pad="GND"/>
-            <pin position="23" pad="XTAL2"/>
-            <pin position="24" pad="XTAL1"/>
-            <pin position="25" pad="PD0"/>
-            <pin position="26" pad="PD1"/>
-            <pin position="27" pad="PD2"/>
-            <pin position="28" pad="PD3"/>
-            <pin position="29" pad="PD4"/>
-            <pin position="30" pad="PD5"/>
-            <pin position="31" pad="PD6"/>
-            <pin position="32" pad="PD7"/>
-            <pin position="33" pad="PG0"/>
-            <pin position="34" pad="PG1"/>
-            <pin position="35" pad="PC0"/>
-            <pin position="36" pad="PC1"/>
-            <pin position="37" pad="PC2"/>
-            <pin position="38" pad="PC3"/>
-            <pin position="39" pad="PC4"/>
-            <pin position="40" pad="PC5"/>
-            <pin position="41" pad="PC6"/>
-            <pin position="42" pad="PC7"/>
-            <pin position="43" pad="PG2"/>
-            <pin position="44" pad="PA7"/>
-            <pin position="45" pad="PA6"/>
-            <pin position="46" pad="PA5"/>
-            <pin position="47" pad="PA4"/>
-            <pin position="48" pad="PA3"/>
-            <pin position="49" pad="PA2"/>
-            <pin position="50" pad="PA1"/>
-            <pin position="51" pad="PA0"/>
-            <pin position="52" pad="VCC"/>
-            <pin position="53" pad="GND"/>
-            <pin position="54" pad="PF7"/>
-            <pin position="55" pad="PF6"/>
-            <pin position="56" pad="PF5"/>
-            <pin position="57" pad="PF4"/>
-            <pin position="58" pad="PF3"/>
-            <pin position="59" pad="PF2"/>
-            <pin position="60" pad="PF1"/>
-            <pin position="61" pad="PF0"/>
-            <pin position="62" pad="AREF"/>
-            <pin position="63" pad="GND"/>
-            <pin position="64" pad="AVCC"/>
+            <pin position="1" pad-key="lcdcap"/>
+            <pin position="2" pad-key="pe0"/>
+            <pin position="3" pad-key="pe1"/>
+            <pin position="4" pad-key="pe2"/>
+            <pin position="5" pad-key="pe3"/>
+            <pin position="6" pad-key="pe4"/>
+            <pin position="7" pad-key="pe5"/>
+            <pin position="8" pad-key="pe6"/>
+            <pin position="9" pad-key="pe7"/>
+            <pin position="10" pad-key="pb0"/>
+            <pin position="11" pad-key="pb1"/>
+            <pin position="12" pad-key="pb2"/>
+            <pin position="13" pad-key="pb3"/>
+            <pin position="14" pad-key="pb4"/>
+            <pin position="15" pad-key="pb5"/>
+            <pin position="16" pad-key="pb6"/>
+            <pin position="17" pad-key="pb7"/>
+            <pin position="18" pad-key="pg3"/>
+            <pin position="19" pad-key="pg4"/>
+            <pin position="20" pad-key="pg5"/>
+            <pin position="21" pad-key="vcc"/>
+            <pin position="22" pad-key="gnd"/>
+            <pin position="23" pad-key="xtal2"/>
+            <pin position="24" pad-key="xtal1"/>
+            <pin position="25" pad-key="pd0"/>
+            <pin position="26" pad-key="pd1"/>
+            <pin position="27" pad-key="pd2"/>
+            <pin position="28" pad-key="pd3"/>
+            <pin position="29" pad-key="pd4"/>
+            <pin position="30" pad-key="pd5"/>
+            <pin position="31" pad-key="pd6"/>
+            <pin position="32" pad-key="pd7"/>
+            <pin position="33" pad-key="pg0"/>
+            <pin position="34" pad-key="pg1"/>
+            <pin position="35" pad-key="pc0"/>
+            <pin position="36" pad-key="pc1"/>
+            <pin position="37" pad-key="pc2"/>
+            <pin position="38" pad-key="pc3"/>
+            <pin position="39" pad-key="pc4"/>
+            <pin position="40" pad-key="pc5"/>
+            <pin position="41" pad-key="pc6"/>
+            <pin position="42" pad-key="pc7"/>
+            <pin position="43" pad-key="pg2"/>
+            <pin position="44" pad-key="pa7"/>
+            <pin position="45" pad-key="pa6"/>
+            <pin position="46" pad-key="pa5"/>
+            <pin position="47" pad-key="pa4"/>
+            <pin position="48" pad-key="pa3"/>
+            <pin position="49" pad-key="pa2"/>
+            <pin position="50" pad-key="pa1"/>
+            <pin position="51" pad-key="pa0"/>
+            <pin position="52" pad-key="vcc"/>
+            <pin position="53" pad-key="gnd"/>
+            <pin position="54" pad-key="pf7"/>
+            <pin position="55" pad-key="pf6"/>
+            <pin position="56" pad-key="pf5"/>
+            <pin position="57" pad-key="pf4"/>
+            <pin position="58" pad-key="pf3"/>
+            <pin position="59" pad-key="pf2"/>
+            <pin position="60" pad-key="pf1"/>
+            <pin position="61" pad-key="pf0"/>
+            <pin position="62" pad-key="aref"/>
+            <pin position="63" pad-key="gnd"/>
+            <pin position="64" pad-key="avcc"/>
         </pinout>
     </pinouts>
     <variants>
-        <variant name="ATmega649V-8AU" pinout-key="tqfp64" package="TQFP64"/>
-        <variant name="ATmega649V-8MU" pinout-key="qfn64" package="QFN64"/>
-        <variant name="ATmega649-16AU" pinout-key="tqfp64" package="TQFP64 "/>
-        <variant name="ATmega649-16MU" pinout-key="qfn64" package="QFN64"/>
+        <variant key="atmega649v_8au" name="ATmega649V-8AU" pinout-key="tqfp64"/>
+        <variant key="atmega649v_8mu" name="ATmega649V-8MU" pinout-key="qfn64"/>
+        <variant key="atmega649_16au" name="ATmega649-16AU" pinout-key="tqfp64"/>
+        <variant key="atmega649_16mu" name="ATmega649-16MU" pinout-key="qfn64"/>
     </variants>
 </device>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA6490.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA6490.xml
index ce217e35..56e4a11b 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA6490.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA6490.xml
@@ -218,115 +218,115 @@
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pa2" index="2" function="PORTA" group="P"/>
-                <signal pad-id="pa3" index="3" function="PORTA" group="P"/>
-                <signal pad-id="pa4" index="4" function="PORTA" group="P"/>
-                <signal pad-id="pa5" index="5" function="PORTA" group="P"/>
-                <signal pad-id="pa6" index="6" function="PORTA" group="P"/>
-                <signal pad-id="pa7" index="7" function="PORTA" group="P"/>
+                <signal pad-key="pa0" index="0" function="PORTA" group="P"/>
+                <signal pad-key="pa1" index="1" function="PORTA" group="P"/>
+                <signal pad-key="pa2" index="2" function="PORTA" group="P"/>
+                <signal pad-key="pa3" index="3" function="PORTA" group="P"/>
+                <signal pad-key="pa4" index="4" function="PORTA" group="P"/>
+                <signal pad-key="pa5" index="5" function="PORTA" group="P"/>
+                <signal pad-key="pa6" index="6" function="PORTA" group="P"/>
+                <signal pad-key="pa7" index="7" function="PORTA" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pb2" index="2" function="PORTB" group="P"/>
-                <signal pad-id="pb3" index="3" function="PORTB" group="P"/>
-                <signal pad-id="pb4" index="4" function="PORTB" group="P"/>
-                <signal pad-id="pb5" index="5" function="PORTB" group="P"/>
-                <signal pad-id="pb6" index="6" function="PORTB" group="P"/>
-                <signal pad-id="pb7" index="7" function="PORTB" group="P"/>
+                <signal pad-key="pb0" index="0" function="PORTB" group="P"/>
+                <signal pad-key="pb1" index="1" function="PORTB" group="P"/>
+                <signal pad-key="pb2" index="2" function="PORTB" group="P"/>
+                <signal pad-key="pb3" index="3" function="PORTB" group="P"/>
+                <signal pad-key="pb4" index="4" function="PORTB" group="P"/>
+                <signal pad-key="pb5" index="5" function="PORTB" group="P"/>
+                <signal pad-key="pb6" index="6" function="PORTB" group="P"/>
+                <signal pad-key="pb7" index="7" function="PORTB" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pc2" index="2" function="PORTC" group="P"/>
-                <signal pad-id="pc3" index="3" function="PORTC" group="P"/>
-                <signal pad-id="pc4" index="4" function="PORTC" group="P"/>
-                <signal pad-id="pc5" index="5" function="PORTC" group="P"/>
-                <signal pad-id="pc6" index="6" function="PORTC" group="P"/>
-                <signal pad-id="pc7" index="7" function="PORTC" group="P"/>
+                <signal pad-key="pc0" index="0" function="PORTC" group="P"/>
+                <signal pad-key="pc1" index="1" function="PORTC" group="P"/>
+                <signal pad-key="pc2" index="2" function="PORTC" group="P"/>
+                <signal pad-key="pc3" index="3" function="PORTC" group="P"/>
+                <signal pad-key="pc4" index="4" function="PORTC" group="P"/>
+                <signal pad-key="pc5" index="5" function="PORTC" group="P"/>
+                <signal pad-key="pc6" index="6" function="PORTC" group="P"/>
+                <signal pad-key="pc7" index="7" function="PORTC" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pd2" index="2" function="PORTD" group="P"/>
-                <signal pad-id="pd3" index="3" function="PORTD" group="P"/>
-                <signal pad-id="pd4" index="4" function="PORTD" group="P"/>
-                <signal pad-id="pd5" index="5" function="PORTD" group="P"/>
-                <signal pad-id="pd6" index="6" function="PORTD" group="P"/>
-                <signal pad-id="pd7" index="7" function="PORTD" group="P"/>
+                <signal pad-key="pd0" index="0" function="PORTD" group="P"/>
+                <signal pad-key="pd1" index="1" function="PORTD" group="P"/>
+                <signal pad-key="pd2" index="2" function="PORTD" group="P"/>
+                <signal pad-key="pd3" index="3" function="PORTD" group="P"/>
+                <signal pad-key="pd4" index="4" function="PORTD" group="P"/>
+                <signal pad-key="pd5" index="5" function="PORTD" group="P"/>
+                <signal pad-key="pd6" index="6" function="PORTD" group="P"/>
+                <signal pad-key="pd7" index="7" function="PORTD" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="porte" name="PORTE" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pe2" index="2" function="PORTE" group="P"/>
-                <signal pad-id="pe3" index="3" function="PORTE" group="P"/>
-                <signal pad-id="pe4" index="4" function="PORTE" group="P"/>
-                <signal pad-id="pe5" index="5" function="PORTE" group="P"/>
-                <signal pad-id="pe6" index="6" function="PORTE" group="P"/>
-                <signal pad-id="pe7" index="7" function="PORTE" group="P"/>
+                <signal pad-key="pe0" index="0" function="PORTE" group="P"/>
+                <signal pad-key="pe1" index="1" function="PORTE" group="P"/>
+                <signal pad-key="pe2" index="2" function="PORTE" group="P"/>
+                <signal pad-key="pe3" index="3" function="PORTE" group="P"/>
+                <signal pad-key="pe4" index="4" function="PORTE" group="P"/>
+                <signal pad-key="pe5" index="5" function="PORTE" group="P"/>
+                <signal pad-key="pe6" index="6" function="PORTE" group="P"/>
+                <signal pad-key="pe7" index="7" function="PORTE" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portf" name="PORTF" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pf2" index="2" function="PORTF" group="P"/>
-                <signal pad-id="pf3" index="3" function="PORTF" group="P"/>
-                <signal pad-id="pf4" index="4" function="PORTF" group="P"/>
-                <signal pad-id="pf5" index="5" function="PORTF" group="P"/>
-                <signal pad-id="pf6" index="6" function="PORTF" group="P"/>
-                <signal pad-id="pf7" index="7" function="PORTF" group="P"/>
+                <signal pad-key="pf0" index="0" function="PORTF" group="P"/>
+                <signal pad-key="pf1" index="1" function="PORTF" group="P"/>
+                <signal pad-key="pf2" index="2" function="PORTF" group="P"/>
+                <signal pad-key="pf3" index="3" function="PORTF" group="P"/>
+                <signal pad-key="pf4" index="4" function="PORTF" group="P"/>
+                <signal pad-key="pf5" index="5" function="PORTF" group="P"/>
+                <signal pad-key="pf6" index="6" function="PORTF" group="P"/>
+                <signal pad-key="pf7" index="7" function="PORTF" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portg" name="PORTG" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pg2" index="2" function="PORTG" group="P"/>
-                <signal pad-id="pg3" index="3" function="PORTG" group="P"/>
-                <signal pad-id="pg4" index="4" function="PORTG" group="P"/>
-                <signal pad-id="pg5" index="5" function="PORTG" group="P"/>
+                <signal pad-key="pg0" index="0" function="PORTG" group="P"/>
+                <signal pad-key="pg1" index="1" function="PORTG" group="P"/>
+                <signal pad-key="pg2" index="2" function="PORTG" group="P"/>
+                <signal pad-key="pg3" index="3" function="PORTG" group="P"/>
+                <signal pad-key="pg4" index="4" function="PORTG" group="P"/>
+                <signal pad-key="pg5" index="5" function="PORTG" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="porth" name="PORTH" module-key="gpio_port">
             <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"/>
-                <signal pad-id="ph2" index="2" function="PORTH" group="P"/>
-                <signal pad-id="ph3" index="3" function="PORTH" group="P"/>
-                <signal pad-id="ph4" index="4" function="PORTH" group="P"/>
-                <signal pad-id="ph5" index="5" function="PORTH" group="P"/>
-                <signal pad-id="ph6" index="6" function="PORTH" group="P"/>
-                <signal pad-id="ph7" index="7" function="PORTH" group="P"/>
+                <signal pad-key="ph0" index="0" function="PORTH" group="P"/>
+                <signal pad-key="ph1" index="1" function="PORTH" group="P"/>
+                <signal pad-key="ph2" index="2" function="PORTH" group="P"/>
+                <signal pad-key="ph3" index="3" function="PORTH" group="P"/>
+                <signal pad-key="ph4" index="4" function="PORTH" group="P"/>
+                <signal pad-key="ph5" index="5" function="PORTH" group="P"/>
+                <signal pad-key="ph6" index="6" function="PORTH" group="P"/>
+                <signal pad-key="ph7" index="7" function="PORTH" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portj" name="PORTJ" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pj2" index="2" function="PORTJ" group="P"/>
-                <signal pad-id="pj3" index="3" function="PORTJ" group="P"/>
-                <signal pad-id="pj4" index="4" function="PORTJ" group="P"/>
-                <signal pad-id="pj5" index="5" function="PORTJ" group="P"/>
-                <signal pad-id="pj6" index="6" function="PORTJ" group="P"/>
+                <signal pad-key="pj0" index="0" function="PORTJ" group="P"/>
+                <signal pad-key="pj1" index="1" function="PORTJ" group="P"/>
+                <signal pad-key="pj2" index="2" function="PORTJ" group="P"/>
+                <signal pad-key="pj3" index="3" function="PORTJ" group="P"/>
+                <signal pad-key="pj4" index="4" function="PORTJ" group="P"/>
+                <signal pad-key="pj5" index="5" function="PORTJ" group="P"/>
+                <signal pad-key="pj6" index="6" function="PORTJ" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="tc0" name="TC0" module-key="tc8">
@@ -806,111 +806,190 @@
             </register-group>
         </module>
     </modules>
+    <pads>
+        <pad key="lcdcap" name="LCDCAP"/>
+        <pad key="pe0" name="PE0"/>
+        <pad key="pe1" name="PE1"/>
+        <pad key="pe2" name="PE2"/>
+        <pad key="pe3" name="PE3"/>
+        <pad key="pe4" name="PE4"/>
+        <pad key="pe5" name="PE5"/>
+        <pad key="pe6" name="PE6"/>
+        <pad key="pe7" name="PE7"/>
+        <pad key="vcc" name="VCC"/>
+        <pad key="gnd" name="GND"/>
+        <pad key="pj0" name="PJ0"/>
+        <pad key="pj1" name="PJ1"/>
+        <pad key="pb0" name="PB0"/>
+        <pad key="pb1" name="PB1"/>
+        <pad key="pb2" name="PB2"/>
+        <pad key="pb3" name="PB3"/>
+        <pad key="pb4" name="PB4"/>
+        <pad key="pb5" name="PB5"/>
+        <pad key="pb6" name="PB6"/>
+        <pad key="pb7" name="PB7"/>
+        <pad key="pg3" name="PG3"/>
+        <pad key="pg4" name="PG4"/>
+        <pad key="pg5" name="PG5"/>
+        <pad key="xtal2" name="XTAL2"/>
+        <pad key="xtal1" name="XTAL1"/>
+        <pad key="pj2" name="PJ2"/>
+        <pad key="pj3" name="PJ3"/>
+        <pad key="pj4" name="PJ4"/>
+        <pad key="pj5" name="PJ5"/>
+        <pad key="pj6" name="PJ6"/>
+        <pad key="pd0" name="PD0"/>
+        <pad key="pd1" name="PD1"/>
+        <pad key="pd2" name="PD2"/>
+        <pad key="pd3" name="PD3"/>
+        <pad key="pd4" name="PD4"/>
+        <pad key="pd5" name="PD5"/>
+        <pad key="pd6" name="PD6"/>
+        <pad key="pd7" name="PD7"/>
+        <pad key="pg0" name="PG0"/>
+        <pad key="pg1" name="PG1"/>
+        <pad key="pc0" name="PC0"/>
+        <pad key="pc1" name="PC1"/>
+        <pad key="pc2" name="PC2"/>
+        <pad key="pc3" name="PC3"/>
+        <pad key="pc4" name="PC4"/>
+        <pad key="pc5" name="PC5"/>
+        <pad key="ph0" name="PH0"/>
+        <pad key="ph1" name="PH1"/>
+        <pad key="ph2" name="PH2"/>
+        <pad key="ph3" name="PH3"/>
+        <pad key="pc6" name="PC6"/>
+        <pad key="pc7" name="PC7"/>
+        <pad key="pg2" name="PG2"/>
+        <pad key="pa7" name="PA7"/>
+        <pad key="pa6" name="PA6"/>
+        <pad key="pa5" name="PA5"/>
+        <pad key="pa4" name="PA4"/>
+        <pad key="pa3" name="PA3"/>
+        <pad key="pa2" name="PA2"/>
+        <pad key="pa1" name="PA1"/>
+        <pad key="pa0" name="PA0"/>
+        <pad key="ph4" name="PH4"/>
+        <pad key="ph5" name="PH5"/>
+        <pad key="ph6" name="PH6"/>
+        <pad key="ph7" name="PH7"/>
+        <pad key="pf7" name="PF7"/>
+        <pad key="pf6" name="PF6"/>
+        <pad key="pf5" name="PF5"/>
+        <pad key="pf4" name="PF4"/>
+        <pad key="pf3" name="PF3"/>
+        <pad key="pf2" name="PF2"/>
+        <pad key="pf1" name="PF1"/>
+        <pad key="pf0" name="PF0"/>
+        <pad key="aref" name="AREF"/>
+        <pad key="agnd" name="AGND"/>
+        <pad key="avcc" name="AVCC"/>
+    </pads>
     <pinouts>
         <pinout key="qfp100" name="QFP100" type="qfp">
-            <pin position="1" pad="LCDCAP"/>
-            <pin position="2" pad="PE0"/>
-            <pin position="3" pad="PE1"/>
-            <pin position="4" pad="PE2"/>
-            <pin position="5" pad="PE3"/>
-            <pin position="6" pad="PE4"/>
-            <pin position="7" pad="PE5"/>
-            <pin position="8" pad="PE6"/>
-            <pin position="9" pad="PE7"/>
-            <pin position="10" pad="VCC"/>
-            <pin position="11" pad="GND"/>
-            <pin position="12" pad="NC"/>
-            <pin position="13" pad="PJ0"/>
-            <pin position="14" pad="PJ1"/>
-            <pin position="15" pad="NC"/>
-            <pin position="16" pad="NC"/>
-            <pin position="17" pad="NC"/>
-            <pin position="18" pad="NC"/>
-            <pin position="19" pad="PB0"/>
-            <pin position="20" pad="PB1"/>
-            <pin position="21" pad="PB2"/>
-            <pin position="22" pad="PB3"/>
-            <pin position="23" pad="PB4"/>
-            <pin position="24" pad="PB5"/>
-            <pin position="25" pad="PB6"/>
-            <pin position="26" pad="PB7"/>
-            <pin position="27" pad="NC"/>
-            <pin position="28" pad="PG3"/>
-            <pin position="29" pad="PG4"/>
-            <pin position="30" pad="PG5"/>
-            <pin position="31" pad="VCC"/>
-            <pin position="32" pad="GND"/>
-            <pin position="33" pad="XTAL2"/>
-            <pin position="34" pad="XTAL1"/>
-            <pin position="35" pad="NC"/>
-            <pin position="36" pad="NC"/>
-            <pin position="37" pad="PJ2"/>
-            <pin position="38" pad="PJ3"/>
-            <pin position="39" pad="PJ4"/>
-            <pin position="40" pad="PJ5"/>
-            <pin position="41" pad="PJ6"/>
-            <pin position="42" pad="NC"/>
-            <pin position="43" pad="PD0"/>
-            <pin position="44" pad="PD1"/>
-            <pin position="45" pad="PD2"/>
-            <pin position="46" pad="PD3"/>
-            <pin position="47" pad="PD4"/>
-            <pin position="48" pad="PD5"/>
-            <pin position="49" pad="PD6"/>
-            <pin position="50" pad="PD7"/>
-            <pin position="51" pad="PG0"/>
-            <pin position="52" pad="PG1"/>
-            <pin position="53" pad="PC0"/>
-            <pin position="54" pad="PC1"/>
-            <pin position="55" pad="PC2"/>
-            <pin position="56" pad="PC3"/>
-            <pin position="57" pad="PC4"/>
-            <pin position="58" pad="PC5"/>
-            <pin position="59" pad="NC"/>
-            <pin position="60" pad="NC"/>
-            <pin position="61" pad="NC"/>
-            <pin position="62" pad="NC"/>
-            <pin position="63" pad="PH0"/>
-            <pin position="64" pad="PH1"/>
-            <pin position="65" pad="PH2"/>
-            <pin position="66" pad="PH3"/>
-            <pin position="67" pad="NC"/>
-            <pin position="68" pad="PC6"/>
-            <pin position="69" pad="PC7"/>
-            <pin position="70" pad="PG2"/>
-            <pin position="71" pad="PA7"/>
-            <pin position="72" pad="PA6"/>
-            <pin position="73" pad="PA5"/>
-            <pin position="74" pad="PA4"/>
-            <pin position="75" pad="PA3"/>
-            <pin position="76" pad="PA2"/>
-            <pin position="77" pad="PA1"/>
-            <pin position="78" pad="PA0"/>
-            <pin position="79" pad="NC"/>
-            <pin position="80" pad="VCC"/>
-            <pin position="81" pad="GND"/>
-            <pin position="82" pad="NC"/>
-            <pin position="83" pad="NC"/>
-            <pin position="84" pad="PH4"/>
-            <pin position="85" pad="PH5"/>
-            <pin position="86" pad="PH6"/>
-            <pin position="87" pad="PH7"/>
-            <pin position="88" pad="NC"/>
-            <pin position="89" pad="NC"/>
-            <pin position="90" pad="PF7"/>
-            <pin position="91" pad="PF6"/>
-            <pin position="92" pad="PF5"/>
-            <pin position="93" pad="PF4"/>
-            <pin position="94" pad="PF3"/>
-            <pin position="95" pad="PF2"/>
-            <pin position="96" pad="PF1"/>
-            <pin position="97" pad="PF0"/>
-            <pin position="98" pad="AREF"/>
-            <pin position="99" pad="AGND"/>
-            <pin position="100" pad="AVCC"/>
+            <pin position="1" pad-key="lcdcap"/>
+            <pin position="2" pad-key="pe0"/>
+            <pin position="3" pad-key="pe1"/>
+            <pin position="4" pad-key="pe2"/>
+            <pin position="5" pad-key="pe3"/>
+            <pin position="6" pad-key="pe4"/>
+            <pin position="7" pad-key="pe5"/>
+            <pin position="8" pad-key="pe6"/>
+            <pin position="9" pad-key="pe7"/>
+            <pin position="10" pad-key="vcc"/>
+            <pin position="11" pad-key="gnd"/>
+            <pin position="12"/>
+            <pin position="13" pad-key="pj0"/>
+            <pin position="14" pad-key="pj1"/>
+            <pin position="15"/>
+            <pin position="16"/>
+            <pin position="17"/>
+            <pin position="18"/>
+            <pin position="19" pad-key="pb0"/>
+            <pin position="20" pad-key="pb1"/>
+            <pin position="21" pad-key="pb2"/>
+            <pin position="22" pad-key="pb3"/>
+            <pin position="23" pad-key="pb4"/>
+            <pin position="24" pad-key="pb5"/>
+            <pin position="25" pad-key="pb6"/>
+            <pin position="26" pad-key="pb7"/>
+            <pin position="27"/>
+            <pin position="28" pad-key="pg3"/>
+            <pin position="29" pad-key="pg4"/>
+            <pin position="30" pad-key="pg5"/>
+            <pin position="31" pad-key="vcc"/>
+            <pin position="32" pad-key="gnd"/>
+            <pin position="33" pad-key="xtal2"/>
+            <pin position="34" pad-key="xtal1"/>
+            <pin position="35"/>
+            <pin position="36"/>
+            <pin position="37" pad-key="pj2"/>
+            <pin position="38" pad-key="pj3"/>
+            <pin position="39" pad-key="pj4"/>
+            <pin position="40" pad-key="pj5"/>
+            <pin position="41" pad-key="pj6"/>
+            <pin position="42"/>
+            <pin position="43" pad-key="pd0"/>
+            <pin position="44" pad-key="pd1"/>
+            <pin position="45" pad-key="pd2"/>
+            <pin position="46" pad-key="pd3"/>
+            <pin position="47" pad-key="pd4"/>
+            <pin position="48" pad-key="pd5"/>
+            <pin position="49" pad-key="pd6"/>
+            <pin position="50" pad-key="pd7"/>
+            <pin position="51" pad-key="pg0"/>
+            <pin position="52" pad-key="pg1"/>
+            <pin position="53" pad-key="pc0"/>
+            <pin position="54" pad-key="pc1"/>
+            <pin position="55" pad-key="pc2"/>
+            <pin position="56" pad-key="pc3"/>
+            <pin position="57" pad-key="pc4"/>
+            <pin position="58" pad-key="pc5"/>
+            <pin position="59"/>
+            <pin position="60"/>
+            <pin position="61"/>
+            <pin position="62"/>
+            <pin position="63" pad-key="ph0"/>
+            <pin position="64" pad-key="ph1"/>
+            <pin position="65" pad-key="ph2"/>
+            <pin position="66" pad-key="ph3"/>
+            <pin position="67"/>
+            <pin position="68" pad-key="pc6"/>
+            <pin position="69" pad-key="pc7"/>
+            <pin position="70" pad-key="pg2"/>
+            <pin position="71" pad-key="pa7"/>
+            <pin position="72" pad-key="pa6"/>
+            <pin position="73" pad-key="pa5"/>
+            <pin position="74" pad-key="pa4"/>
+            <pin position="75" pad-key="pa3"/>
+            <pin position="76" pad-key="pa2"/>
+            <pin position="77" pad-key="pa1"/>
+            <pin position="78" pad-key="pa0"/>
+            <pin position="79"/>
+            <pin position="80" pad-key="vcc"/>
+            <pin position="81" pad-key="gnd"/>
+            <pin position="82"/>
+            <pin position="83"/>
+            <pin position="84" pad-key="ph4"/>
+            <pin position="85" pad-key="ph5"/>
+            <pin position="86" pad-key="ph6"/>
+            <pin position="87" pad-key="ph7"/>
+            <pin position="88"/>
+            <pin position="89"/>
+            <pin position="90" pad-key="pf7"/>
+            <pin position="91" pad-key="pf6"/>
+            <pin position="92" pad-key="pf5"/>
+            <pin position="93" pad-key="pf4"/>
+            <pin position="94" pad-key="pf3"/>
+            <pin position="95" pad-key="pf2"/>
+            <pin position="96" pad-key="pf1"/>
+            <pin position="97" pad-key="pf0"/>
+            <pin position="98" pad-key="aref"/>
+            <pin position="99" pad-key="agnd"/>
+            <pin position="100" pad-key="avcc"/>
         </pinout>
     </pinouts>
     <variants>
-        <variant name="ATmega6490-16AU" pinout-key="qfp100" package="TQFP100"/>
+        <variant key="atmega6490_16au" name="ATmega6490-16AU" pinout-key="qfp100"/>
     </variants>
 </device>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA6490A.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA6490A.xml
index 60ee869c..776e3d75 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA6490A.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA6490A.xml
@@ -218,115 +218,115 @@
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pa2" index="2" function="PORTA" group="P"/>
-                <signal pad-id="pa3" index="3" function="PORTA" group="P"/>
-                <signal pad-id="pa4" index="4" function="PORTA" group="P"/>
-                <signal pad-id="pa5" index="5" function="PORTA" group="P"/>
-                <signal pad-id="pa6" index="6" function="PORTA" group="P"/>
-                <signal pad-id="pa7" index="7" function="PORTA" group="P"/>
+                <signal pad-key="pa0" index="0" function="PORTA" group="P"/>
+                <signal pad-key="pa1" index="1" function="PORTA" group="P"/>
+                <signal pad-key="pa2" index="2" function="PORTA" group="P"/>
+                <signal pad-key="pa3" index="3" function="PORTA" group="P"/>
+                <signal pad-key="pa4" index="4" function="PORTA" group="P"/>
+                <signal pad-key="pa5" index="5" function="PORTA" group="P"/>
+                <signal pad-key="pa6" index="6" function="PORTA" group="P"/>
+                <signal pad-key="pa7" index="7" function="PORTA" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pb2" index="2" function="PORTB" group="P"/>
-                <signal pad-id="pb3" index="3" function="PORTB" group="P"/>
-                <signal pad-id="pb4" index="4" function="PORTB" group="P"/>
-                <signal pad-id="pb5" index="5" function="PORTB" group="P"/>
-                <signal pad-id="pb6" index="6" function="PORTB" group="P"/>
-                <signal pad-id="pb7" index="7" function="PORTB" group="P"/>
+                <signal pad-key="pb0" index="0" function="PORTB" group="P"/>
+                <signal pad-key="pb1" index="1" function="PORTB" group="P"/>
+                <signal pad-key="pb2" index="2" function="PORTB" group="P"/>
+                <signal pad-key="pb3" index="3" function="PORTB" group="P"/>
+                <signal pad-key="pb4" index="4" function="PORTB" group="P"/>
+                <signal pad-key="pb5" index="5" function="PORTB" group="P"/>
+                <signal pad-key="pb6" index="6" function="PORTB" group="P"/>
+                <signal pad-key="pb7" index="7" function="PORTB" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pc2" index="2" function="PORTC" group="P"/>
-                <signal pad-id="pc3" index="3" function="PORTC" group="P"/>
-                <signal pad-id="pc4" index="4" function="PORTC" group="P"/>
-                <signal pad-id="pc5" index="5" function="PORTC" group="P"/>
-                <signal pad-id="pc6" index="6" function="PORTC" group="P"/>
-                <signal pad-id="pc7" index="7" function="PORTC" group="P"/>
+                <signal pad-key="pc0" index="0" function="PORTC" group="P"/>
+                <signal pad-key="pc1" index="1" function="PORTC" group="P"/>
+                <signal pad-key="pc2" index="2" function="PORTC" group="P"/>
+                <signal pad-key="pc3" index="3" function="PORTC" group="P"/>
+                <signal pad-key="pc4" index="4" function="PORTC" group="P"/>
+                <signal pad-key="pc5" index="5" function="PORTC" group="P"/>
+                <signal pad-key="pc6" index="6" function="PORTC" group="P"/>
+                <signal pad-key="pc7" index="7" function="PORTC" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pd2" index="2" function="PORTD" group="P"/>
-                <signal pad-id="pd3" index="3" function="PORTD" group="P"/>
-                <signal pad-id="pd4" index="4" function="PORTD" group="P"/>
-                <signal pad-id="pd5" index="5" function="PORTD" group="P"/>
-                <signal pad-id="pd6" index="6" function="PORTD" group="P"/>
-                <signal pad-id="pd7" index="7" function="PORTD" group="P"/>
+                <signal pad-key="pd0" index="0" function="PORTD" group="P"/>
+                <signal pad-key="pd1" index="1" function="PORTD" group="P"/>
+                <signal pad-key="pd2" index="2" function="PORTD" group="P"/>
+                <signal pad-key="pd3" index="3" function="PORTD" group="P"/>
+                <signal pad-key="pd4" index="4" function="PORTD" group="P"/>
+                <signal pad-key="pd5" index="5" function="PORTD" group="P"/>
+                <signal pad-key="pd6" index="6" function="PORTD" group="P"/>
+                <signal pad-key="pd7" index="7" function="PORTD" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="porte" name="PORTE" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pe2" index="2" function="PORTE" group="P"/>
-                <signal pad-id="pe3" index="3" function="PORTE" group="P"/>
-                <signal pad-id="pe4" index="4" function="PORTE" group="P"/>
-                <signal pad-id="pe5" index="5" function="PORTE" group="P"/>
-                <signal pad-id="pe6" index="6" function="PORTE" group="P"/>
-                <signal pad-id="pe7" index="7" function="PORTE" group="P"/>
+                <signal pad-key="pe0" index="0" function="PORTE" group="P"/>
+                <signal pad-key="pe1" index="1" function="PORTE" group="P"/>
+                <signal pad-key="pe2" index="2" function="PORTE" group="P"/>
+                <signal pad-key="pe3" index="3" function="PORTE" group="P"/>
+                <signal pad-key="pe4" index="4" function="PORTE" group="P"/>
+                <signal pad-key="pe5" index="5" function="PORTE" group="P"/>
+                <signal pad-key="pe6" index="6" function="PORTE" group="P"/>
+                <signal pad-key="pe7" index="7" function="PORTE" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portf" name="PORTF" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pf2" index="2" function="PORTF" group="P"/>
-                <signal pad-id="pf3" index="3" function="PORTF" group="P"/>
-                <signal pad-id="pf4" index="4" function="PORTF" group="P"/>
-                <signal pad-id="pf5" index="5" function="PORTF" group="P"/>
-                <signal pad-id="pf6" index="6" function="PORTF" group="P"/>
-                <signal pad-id="pf7" index="7" function="PORTF" group="P"/>
+                <signal pad-key="pf0" index="0" function="PORTF" group="P"/>
+                <signal pad-key="pf1" index="1" function="PORTF" group="P"/>
+                <signal pad-key="pf2" index="2" function="PORTF" group="P"/>
+                <signal pad-key="pf3" index="3" function="PORTF" group="P"/>
+                <signal pad-key="pf4" index="4" function="PORTF" group="P"/>
+                <signal pad-key="pf5" index="5" function="PORTF" group="P"/>
+                <signal pad-key="pf6" index="6" function="PORTF" group="P"/>
+                <signal pad-key="pf7" index="7" function="PORTF" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portg" name="PORTG" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pg2" index="2" function="PORTG" group="P"/>
-                <signal pad-id="pg3" index="3" function="PORTG" group="P"/>
-                <signal pad-id="pg4" index="4" function="PORTG" group="P"/>
-                <signal pad-id="pg5" index="5" function="PORTG" group="P"/>
+                <signal pad-key="pg0" index="0" function="PORTG" group="P"/>
+                <signal pad-key="pg1" index="1" function="PORTG" group="P"/>
+                <signal pad-key="pg2" index="2" function="PORTG" group="P"/>
+                <signal pad-key="pg3" index="3" function="PORTG" group="P"/>
+                <signal pad-key="pg4" index="4" function="PORTG" group="P"/>
+                <signal pad-key="pg5" index="5" function="PORTG" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="porth" name="PORTH" module-key="gpio_port">
             <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"/>
-                <signal pad-id="ph2" index="2" function="PORTH" group="P"/>
-                <signal pad-id="ph3" index="3" function="PORTH" group="P"/>
-                <signal pad-id="ph4" index="4" function="PORTH" group="P"/>
-                <signal pad-id="ph5" index="5" function="PORTH" group="P"/>
-                <signal pad-id="ph6" index="6" function="PORTH" group="P"/>
-                <signal pad-id="ph7" index="7" function="PORTH" group="P"/>
+                <signal pad-key="ph0" index="0" function="PORTH" group="P"/>
+                <signal pad-key="ph1" index="1" function="PORTH" group="P"/>
+                <signal pad-key="ph2" index="2" function="PORTH" group="P"/>
+                <signal pad-key="ph3" index="3" function="PORTH" group="P"/>
+                <signal pad-key="ph4" index="4" function="PORTH" group="P"/>
+                <signal pad-key="ph5" index="5" function="PORTH" group="P"/>
+                <signal pad-key="ph6" index="6" function="PORTH" group="P"/>
+                <signal pad-key="ph7" index="7" function="PORTH" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portj" name="PORTJ" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pj2" index="2" function="PORTJ" group="P"/>
-                <signal pad-id="pj3" index="3" function="PORTJ" group="P"/>
-                <signal pad-id="pj4" index="4" function="PORTJ" group="P"/>
-                <signal pad-id="pj5" index="5" function="PORTJ" group="P"/>
-                <signal pad-id="pj6" index="6" function="PORTJ" group="P"/>
+                <signal pad-key="pj0" index="0" function="PORTJ" group="P"/>
+                <signal pad-key="pj1" index="1" function="PORTJ" group="P"/>
+                <signal pad-key="pj2" index="2" function="PORTJ" group="P"/>
+                <signal pad-key="pj3" index="3" function="PORTJ" group="P"/>
+                <signal pad-key="pj4" index="4" function="PORTJ" group="P"/>
+                <signal pad-key="pj5" index="5" function="PORTJ" group="P"/>
+                <signal pad-key="pj6" index="6" function="PORTJ" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="tc0" name="TC0" module-key="tc8">
@@ -806,111 +806,190 @@
             </register-group>
         </module>
     </modules>
+    <pads>
+        <pad key="lcdcap" name="LCDCAP"/>
+        <pad key="pe0" name="PE0"/>
+        <pad key="pe1" name="PE1"/>
+        <pad key="pe2" name="PE2"/>
+        <pad key="pe3" name="PE3"/>
+        <pad key="pe4" name="PE4"/>
+        <pad key="pe5" name="PE5"/>
+        <pad key="pe6" name="PE6"/>
+        <pad key="pe7" name="PE7"/>
+        <pad key="vcc" name="VCC"/>
+        <pad key="gnd" name="GND"/>
+        <pad key="pj0" name="PJ0"/>
+        <pad key="pj1" name="PJ1"/>
+        <pad key="pb0" name="PB0"/>
+        <pad key="pb1" name="PB1"/>
+        <pad key="pb2" name="PB2"/>
+        <pad key="pb3" name="PB3"/>
+        <pad key="pb4" name="PB4"/>
+        <pad key="pb5" name="PB5"/>
+        <pad key="pb6" name="PB6"/>
+        <pad key="pb7" name="PB7"/>
+        <pad key="pg3" name="PG3"/>
+        <pad key="pg4" name="PG4"/>
+        <pad key="pg5" name="PG5"/>
+        <pad key="xtal2" name="XTAL2"/>
+        <pad key="xtal1" name="XTAL1"/>
+        <pad key="pj2" name="PJ2"/>
+        <pad key="pj3" name="PJ3"/>
+        <pad key="pj4" name="PJ4"/>
+        <pad key="pj5" name="PJ5"/>
+        <pad key="pj6" name="PJ6"/>
+        <pad key="pd0" name="PD0"/>
+        <pad key="pd1" name="PD1"/>
+        <pad key="pd2" name="PD2"/>
+        <pad key="pd3" name="PD3"/>
+        <pad key="pd4" name="PD4"/>
+        <pad key="pd5" name="PD5"/>
+        <pad key="pd6" name="PD6"/>
+        <pad key="pd7" name="PD7"/>
+        <pad key="pg0" name="PG0"/>
+        <pad key="pg1" name="PG1"/>
+        <pad key="pc0" name="PC0"/>
+        <pad key="pc1" name="PC1"/>
+        <pad key="pc2" name="PC2"/>
+        <pad key="pc3" name="PC3"/>
+        <pad key="pc4" name="PC4"/>
+        <pad key="pc5" name="PC5"/>
+        <pad key="ph0" name="PH0"/>
+        <pad key="ph1" name="PH1"/>
+        <pad key="ph2" name="PH2"/>
+        <pad key="ph3" name="PH3"/>
+        <pad key="pc6" name="PC6"/>
+        <pad key="pc7" name="PC7"/>
+        <pad key="pg2" name="PG2"/>
+        <pad key="pa7" name="PA7"/>
+        <pad key="pa6" name="PA6"/>
+        <pad key="pa5" name="PA5"/>
+        <pad key="pa4" name="PA4"/>
+        <pad key="pa3" name="PA3"/>
+        <pad key="pa2" name="PA2"/>
+        <pad key="pa1" name="PA1"/>
+        <pad key="pa0" name="PA0"/>
+        <pad key="ph4" name="PH4"/>
+        <pad key="ph5" name="PH5"/>
+        <pad key="ph6" name="PH6"/>
+        <pad key="ph7" name="PH7"/>
+        <pad key="pf7" name="PF7"/>
+        <pad key="pf6" name="PF6"/>
+        <pad key="pf5" name="PF5"/>
+        <pad key="pf4" name="PF4"/>
+        <pad key="pf3" name="PF3"/>
+        <pad key="pf2" name="PF2"/>
+        <pad key="pf1" name="PF1"/>
+        <pad key="pf0" name="PF0"/>
+        <pad key="aref" name="AREF"/>
+        <pad key="agnd" name="AGND"/>
+        <pad key="avcc" name="AVCC"/>
+    </pads>
     <pinouts>
         <pinout key="qfp100" name="QFP100" type="qfp">
-            <pin position="1" pad="LCDCAP"/>
-            <pin position="2" pad="PE0"/>
-            <pin position="3" pad="PE1"/>
-            <pin position="4" pad="PE2"/>
-            <pin position="5" pad="PE3"/>
-            <pin position="6" pad="PE4"/>
-            <pin position="7" pad="PE5"/>
-            <pin position="8" pad="PE6"/>
-            <pin position="9" pad="PE7"/>
-            <pin position="10" pad="VCC"/>
-            <pin position="11" pad="GND"/>
-            <pin position="12" pad="NC"/>
-            <pin position="13" pad="PJ0"/>
-            <pin position="14" pad="PJ1"/>
-            <pin position="15" pad="NC"/>
-            <pin position="16" pad="NC"/>
-            <pin position="17" pad="NC"/>
-            <pin position="18" pad="NC"/>
-            <pin position="19" pad="PB0"/>
-            <pin position="20" pad="PB1"/>
-            <pin position="21" pad="PB2"/>
-            <pin position="22" pad="PB3"/>
-            <pin position="23" pad="PB4"/>
-            <pin position="24" pad="PB5"/>
-            <pin position="25" pad="PB6"/>
-            <pin position="26" pad="PB7"/>
-            <pin position="27" pad="NC"/>
-            <pin position="28" pad="PG3"/>
-            <pin position="29" pad="PG4"/>
-            <pin position="30" pad="PG5"/>
-            <pin position="31" pad="VCC"/>
-            <pin position="32" pad="GND"/>
-            <pin position="33" pad="XTAL2"/>
-            <pin position="34" pad="XTAL1"/>
-            <pin position="35" pad="NC"/>
-            <pin position="36" pad="NC"/>
-            <pin position="37" pad="PJ2"/>
-            <pin position="38" pad="PJ3"/>
-            <pin position="39" pad="PJ4"/>
-            <pin position="40" pad="PJ5"/>
-            <pin position="41" pad="PJ6"/>
-            <pin position="42" pad="NC"/>
-            <pin position="43" pad="PD0"/>
-            <pin position="44" pad="PD1"/>
-            <pin position="45" pad="PD2"/>
-            <pin position="46" pad="PD3"/>
-            <pin position="47" pad="PD4"/>
-            <pin position="48" pad="PD5"/>
-            <pin position="49" pad="PD6"/>
-            <pin position="50" pad="PD7"/>
-            <pin position="51" pad="PG0"/>
-            <pin position="52" pad="PG1"/>
-            <pin position="53" pad="PC0"/>
-            <pin position="54" pad="PC1"/>
-            <pin position="55" pad="PC2"/>
-            <pin position="56" pad="PC3"/>
-            <pin position="57" pad="PC4"/>
-            <pin position="58" pad="PC5"/>
-            <pin position="59" pad="NC"/>
-            <pin position="60" pad="NC"/>
-            <pin position="61" pad="NC"/>
-            <pin position="62" pad="NC"/>
-            <pin position="63" pad="PH0"/>
-            <pin position="64" pad="PH1"/>
-            <pin position="65" pad="PH2"/>
-            <pin position="66" pad="PH3"/>
-            <pin position="67" pad="NC"/>
-            <pin position="68" pad="PC6"/>
-            <pin position="69" pad="PC7"/>
-            <pin position="70" pad="PG2"/>
-            <pin position="71" pad="PA7"/>
-            <pin position="72" pad="PA6"/>
-            <pin position="73" pad="PA5"/>
-            <pin position="74" pad="PA4"/>
-            <pin position="75" pad="PA3"/>
-            <pin position="76" pad="PA2"/>
-            <pin position="77" pad="PA1"/>
-            <pin position="78" pad="PA0"/>
-            <pin position="79" pad="NC"/>
-            <pin position="80" pad="VCC"/>
-            <pin position="81" pad="GND"/>
-            <pin position="82" pad="NC"/>
-            <pin position="83" pad="NC"/>
-            <pin position="84" pad="PH4"/>
-            <pin position="85" pad="PH5"/>
-            <pin position="86" pad="PH6"/>
-            <pin position="87" pad="PH7"/>
-            <pin position="88" pad="NC"/>
-            <pin position="89" pad="NC"/>
-            <pin position="90" pad="PF7"/>
-            <pin position="91" pad="PF6"/>
-            <pin position="92" pad="PF5"/>
-            <pin position="93" pad="PF4"/>
-            <pin position="94" pad="PF3"/>
-            <pin position="95" pad="PF2"/>
-            <pin position="96" pad="PF1"/>
-            <pin position="97" pad="PF0"/>
-            <pin position="98" pad="AREF"/>
-            <pin position="99" pad="AGND"/>
-            <pin position="100" pad="AVCC"/>
+            <pin position="1" pad-key="lcdcap"/>
+            <pin position="2" pad-key="pe0"/>
+            <pin position="3" pad-key="pe1"/>
+            <pin position="4" pad-key="pe2"/>
+            <pin position="5" pad-key="pe3"/>
+            <pin position="6" pad-key="pe4"/>
+            <pin position="7" pad-key="pe5"/>
+            <pin position="8" pad-key="pe6"/>
+            <pin position="9" pad-key="pe7"/>
+            <pin position="10" pad-key="vcc"/>
+            <pin position="11" pad-key="gnd"/>
+            <pin position="12"/>
+            <pin position="13" pad-key="pj0"/>
+            <pin position="14" pad-key="pj1"/>
+            <pin position="15"/>
+            <pin position="16"/>
+            <pin position="17"/>
+            <pin position="18"/>
+            <pin position="19" pad-key="pb0"/>
+            <pin position="20" pad-key="pb1"/>
+            <pin position="21" pad-key="pb2"/>
+            <pin position="22" pad-key="pb3"/>
+            <pin position="23" pad-key="pb4"/>
+            <pin position="24" pad-key="pb5"/>
+            <pin position="25" pad-key="pb6"/>
+            <pin position="26" pad-key="pb7"/>
+            <pin position="27"/>
+            <pin position="28" pad-key="pg3"/>
+            <pin position="29" pad-key="pg4"/>
+            <pin position="30" pad-key="pg5"/>
+            <pin position="31" pad-key="vcc"/>
+            <pin position="32" pad-key="gnd"/>
+            <pin position="33" pad-key="xtal2"/>
+            <pin position="34" pad-key="xtal1"/>
+            <pin position="35"/>
+            <pin position="36"/>
+            <pin position="37" pad-key="pj2"/>
+            <pin position="38" pad-key="pj3"/>
+            <pin position="39" pad-key="pj4"/>
+            <pin position="40" pad-key="pj5"/>
+            <pin position="41" pad-key="pj6"/>
+            <pin position="42"/>
+            <pin position="43" pad-key="pd0"/>
+            <pin position="44" pad-key="pd1"/>
+            <pin position="45" pad-key="pd2"/>
+            <pin position="46" pad-key="pd3"/>
+            <pin position="47" pad-key="pd4"/>
+            <pin position="48" pad-key="pd5"/>
+            <pin position="49" pad-key="pd6"/>
+            <pin position="50" pad-key="pd7"/>
+            <pin position="51" pad-key="pg0"/>
+            <pin position="52" pad-key="pg1"/>
+            <pin position="53" pad-key="pc0"/>
+            <pin position="54" pad-key="pc1"/>
+            <pin position="55" pad-key="pc2"/>
+            <pin position="56" pad-key="pc3"/>
+            <pin position="57" pad-key="pc4"/>
+            <pin position="58" pad-key="pc5"/>
+            <pin position="59"/>
+            <pin position="60"/>
+            <pin position="61"/>
+            <pin position="62"/>
+            <pin position="63" pad-key="ph0"/>
+            <pin position="64" pad-key="ph1"/>
+            <pin position="65" pad-key="ph2"/>
+            <pin position="66" pad-key="ph3"/>
+            <pin position="67"/>
+            <pin position="68" pad-key="pc6"/>
+            <pin position="69" pad-key="pc7"/>
+            <pin position="70" pad-key="pg2"/>
+            <pin position="71" pad-key="pa7"/>
+            <pin position="72" pad-key="pa6"/>
+            <pin position="73" pad-key="pa5"/>
+            <pin position="74" pad-key="pa4"/>
+            <pin position="75" pad-key="pa3"/>
+            <pin position="76" pad-key="pa2"/>
+            <pin position="77" pad-key="pa1"/>
+            <pin position="78" pad-key="pa0"/>
+            <pin position="79"/>
+            <pin position="80" pad-key="vcc"/>
+            <pin position="81" pad-key="gnd"/>
+            <pin position="82"/>
+            <pin position="83"/>
+            <pin position="84" pad-key="ph4"/>
+            <pin position="85" pad-key="ph5"/>
+            <pin position="86" pad-key="ph6"/>
+            <pin position="87" pad-key="ph7"/>
+            <pin position="88"/>
+            <pin position="89"/>
+            <pin position="90" pad-key="pf7"/>
+            <pin position="91" pad-key="pf6"/>
+            <pin position="92" pad-key="pf5"/>
+            <pin position="93" pad-key="pf4"/>
+            <pin position="94" pad-key="pf3"/>
+            <pin position="95" pad-key="pf2"/>
+            <pin position="96" pad-key="pf1"/>
+            <pin position="97" pad-key="pf0"/>
+            <pin position="98" pad-key="aref"/>
+            <pin position="99" pad-key="agnd"/>
+            <pin position="100" pad-key="avcc"/>
         </pinout>
     </pinouts>
     <variants>
-        <variant name="ATmega6490A-AU" pinout-key="qfp100" package="TQFP100"/>
+        <variant key="atmega6490a_au" name="ATmega6490A-AU" pinout-key="qfp100"/>
     </variants>
 </device>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA6490P.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA6490P.xml
index a0b84eac..ac1fd1a1 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA6490P.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA6490P.xml
@@ -218,115 +218,115 @@
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pa2" index="2" function="PORTA" group="P"/>
-                <signal pad-id="pa3" index="3" function="PORTA" group="P"/>
-                <signal pad-id="pa4" index="4" function="PORTA" group="P"/>
-                <signal pad-id="pa5" index="5" function="PORTA" group="P"/>
-                <signal pad-id="pa6" index="6" function="PORTA" group="P"/>
-                <signal pad-id="pa7" index="7" function="PORTA" group="P"/>
+                <signal pad-key="pa0" index="0" function="PORTA" group="P"/>
+                <signal pad-key="pa1" index="1" function="PORTA" group="P"/>
+                <signal pad-key="pa2" index="2" function="PORTA" group="P"/>
+                <signal pad-key="pa3" index="3" function="PORTA" group="P"/>
+                <signal pad-key="pa4" index="4" function="PORTA" group="P"/>
+                <signal pad-key="pa5" index="5" function="PORTA" group="P"/>
+                <signal pad-key="pa6" index="6" function="PORTA" group="P"/>
+                <signal pad-key="pa7" index="7" function="PORTA" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pb2" index="2" function="PORTB" group="P"/>
-                <signal pad-id="pb3" index="3" function="PORTB" group="P"/>
-                <signal pad-id="pb4" index="4" function="PORTB" group="P"/>
-                <signal pad-id="pb5" index="5" function="PORTB" group="P"/>
-                <signal pad-id="pb6" index="6" function="PORTB" group="P"/>
-                <signal pad-id="pb7" index="7" function="PORTB" group="P"/>
+                <signal pad-key="pb0" index="0" function="PORTB" group="P"/>
+                <signal pad-key="pb1" index="1" function="PORTB" group="P"/>
+                <signal pad-key="pb2" index="2" function="PORTB" group="P"/>
+                <signal pad-key="pb3" index="3" function="PORTB" group="P"/>
+                <signal pad-key="pb4" index="4" function="PORTB" group="P"/>
+                <signal pad-key="pb5" index="5" function="PORTB" group="P"/>
+                <signal pad-key="pb6" index="6" function="PORTB" group="P"/>
+                <signal pad-key="pb7" index="7" function="PORTB" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pc2" index="2" function="PORTC" group="P"/>
-                <signal pad-id="pc3" index="3" function="PORTC" group="P"/>
-                <signal pad-id="pc4" index="4" function="PORTC" group="P"/>
-                <signal pad-id="pc5" index="5" function="PORTC" group="P"/>
-                <signal pad-id="pc6" index="6" function="PORTC" group="P"/>
-                <signal pad-id="pc7" index="7" function="PORTC" group="P"/>
+                <signal pad-key="pc0" index="0" function="PORTC" group="P"/>
+                <signal pad-key="pc1" index="1" function="PORTC" group="P"/>
+                <signal pad-key="pc2" index="2" function="PORTC" group="P"/>
+                <signal pad-key="pc3" index="3" function="PORTC" group="P"/>
+                <signal pad-key="pc4" index="4" function="PORTC" group="P"/>
+                <signal pad-key="pc5" index="5" function="PORTC" group="P"/>
+                <signal pad-key="pc6" index="6" function="PORTC" group="P"/>
+                <signal pad-key="pc7" index="7" function="PORTC" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pd2" index="2" function="PORTD" group="P"/>
-                <signal pad-id="pd3" index="3" function="PORTD" group="P"/>
-                <signal pad-id="pd4" index="4" function="PORTD" group="P"/>
-                <signal pad-id="pd5" index="5" function="PORTD" group="P"/>
-                <signal pad-id="pd6" index="6" function="PORTD" group="P"/>
-                <signal pad-id="pd7" index="7" function="PORTD" group="P"/>
+                <signal pad-key="pd0" index="0" function="PORTD" group="P"/>
+                <signal pad-key="pd1" index="1" function="PORTD" group="P"/>
+                <signal pad-key="pd2" index="2" function="PORTD" group="P"/>
+                <signal pad-key="pd3" index="3" function="PORTD" group="P"/>
+                <signal pad-key="pd4" index="4" function="PORTD" group="P"/>
+                <signal pad-key="pd5" index="5" function="PORTD" group="P"/>
+                <signal pad-key="pd6" index="6" function="PORTD" group="P"/>
+                <signal pad-key="pd7" index="7" function="PORTD" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="porte" name="PORTE" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pe2" index="2" function="PORTE" group="P"/>
-                <signal pad-id="pe3" index="3" function="PORTE" group="P"/>
-                <signal pad-id="pe4" index="4" function="PORTE" group="P"/>
-                <signal pad-id="pe5" index="5" function="PORTE" group="P"/>
-                <signal pad-id="pe6" index="6" function="PORTE" group="P"/>
-                <signal pad-id="pe7" index="7" function="PORTE" group="P"/>
+                <signal pad-key="pe0" index="0" function="PORTE" group="P"/>
+                <signal pad-key="pe1" index="1" function="PORTE" group="P"/>
+                <signal pad-key="pe2" index="2" function="PORTE" group="P"/>
+                <signal pad-key="pe3" index="3" function="PORTE" group="P"/>
+                <signal pad-key="pe4" index="4" function="PORTE" group="P"/>
+                <signal pad-key="pe5" index="5" function="PORTE" group="P"/>
+                <signal pad-key="pe6" index="6" function="PORTE" group="P"/>
+                <signal pad-key="pe7" index="7" function="PORTE" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portf" name="PORTF" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pf2" index="2" function="PORTF" group="P"/>
-                <signal pad-id="pf3" index="3" function="PORTF" group="P"/>
-                <signal pad-id="pf4" index="4" function="PORTF" group="P"/>
-                <signal pad-id="pf5" index="5" function="PORTF" group="P"/>
-                <signal pad-id="pf6" index="6" function="PORTF" group="P"/>
-                <signal pad-id="pf7" index="7" function="PORTF" group="P"/>
+                <signal pad-key="pf0" index="0" function="PORTF" group="P"/>
+                <signal pad-key="pf1" index="1" function="PORTF" group="P"/>
+                <signal pad-key="pf2" index="2" function="PORTF" group="P"/>
+                <signal pad-key="pf3" index="3" function="PORTF" group="P"/>
+                <signal pad-key="pf4" index="4" function="PORTF" group="P"/>
+                <signal pad-key="pf5" index="5" function="PORTF" group="P"/>
+                <signal pad-key="pf6" index="6" function="PORTF" group="P"/>
+                <signal pad-key="pf7" index="7" function="PORTF" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portg" name="PORTG" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pg2" index="2" function="PORTG" group="P"/>
-                <signal pad-id="pg3" index="3" function="PORTG" group="P"/>
-                <signal pad-id="pg4" index="4" function="PORTG" group="P"/>
-                <signal pad-id="pg5" index="5" function="PORTG" group="P"/>
+                <signal pad-key="pg0" index="0" function="PORTG" group="P"/>
+                <signal pad-key="pg1" index="1" function="PORTG" group="P"/>
+                <signal pad-key="pg2" index="2" function="PORTG" group="P"/>
+                <signal pad-key="pg3" index="3" function="PORTG" group="P"/>
+                <signal pad-key="pg4" index="4" function="PORTG" group="P"/>
+                <signal pad-key="pg5" index="5" function="PORTG" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="porth" name="PORTH" module-key="gpio_port">
             <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"/>
-                <signal pad-id="ph2" index="2" function="PORTH" group="P"/>
-                <signal pad-id="ph3" index="3" function="PORTH" group="P"/>
-                <signal pad-id="ph4" index="4" function="PORTH" group="P"/>
-                <signal pad-id="ph5" index="5" function="PORTH" group="P"/>
-                <signal pad-id="ph6" index="6" function="PORTH" group="P"/>
-                <signal pad-id="ph7" index="7" function="PORTH" group="P"/>
+                <signal pad-key="ph0" index="0" function="PORTH" group="P"/>
+                <signal pad-key="ph1" index="1" function="PORTH" group="P"/>
+                <signal pad-key="ph2" index="2" function="PORTH" group="P"/>
+                <signal pad-key="ph3" index="3" function="PORTH" group="P"/>
+                <signal pad-key="ph4" index="4" function="PORTH" group="P"/>
+                <signal pad-key="ph5" index="5" function="PORTH" group="P"/>
+                <signal pad-key="ph6" index="6" function="PORTH" group="P"/>
+                <signal pad-key="ph7" index="7" function="PORTH" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portj" name="PORTJ" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pj2" index="2" function="PORTJ" group="P"/>
-                <signal pad-id="pj3" index="3" function="PORTJ" group="P"/>
-                <signal pad-id="pj4" index="4" function="PORTJ" group="P"/>
-                <signal pad-id="pj5" index="5" function="PORTJ" group="P"/>
-                <signal pad-id="pj6" index="6" function="PORTJ" group="P"/>
+                <signal pad-key="pj0" index="0" function="PORTJ" group="P"/>
+                <signal pad-key="pj1" index="1" function="PORTJ" group="P"/>
+                <signal pad-key="pj2" index="2" function="PORTJ" group="P"/>
+                <signal pad-key="pj3" index="3" function="PORTJ" group="P"/>
+                <signal pad-key="pj4" index="4" function="PORTJ" group="P"/>
+                <signal pad-key="pj5" index="5" function="PORTJ" group="P"/>
+                <signal pad-key="pj6" index="6" function="PORTJ" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="tc0" name="TC0" module-key="tc8">
@@ -806,111 +806,190 @@
             </register-group>
         </module>
     </modules>
+    <pads>
+        <pad key="lcdcap" name="LCDCAP"/>
+        <pad key="pe0" name="PE0"/>
+        <pad key="pe1" name="PE1"/>
+        <pad key="pe2" name="PE2"/>
+        <pad key="pe3" name="PE3"/>
+        <pad key="pe4" name="PE4"/>
+        <pad key="pe5" name="PE5"/>
+        <pad key="pe6" name="PE6"/>
+        <pad key="pe7" name="PE7"/>
+        <pad key="vcc" name="VCC"/>
+        <pad key="gnd" name="GND"/>
+        <pad key="pj0" name="PJ0"/>
+        <pad key="pj1" name="PJ1"/>
+        <pad key="pb0" name="PB0"/>
+        <pad key="pb1" name="PB1"/>
+        <pad key="pb2" name="PB2"/>
+        <pad key="pb3" name="PB3"/>
+        <pad key="pb4" name="PB4"/>
+        <pad key="pb5" name="PB5"/>
+        <pad key="pb6" name="PB6"/>
+        <pad key="pb7" name="PB7"/>
+        <pad key="pg3" name="PG3"/>
+        <pad key="pg4" name="PG4"/>
+        <pad key="pg5" name="PG5"/>
+        <pad key="xtal2" name="XTAL2"/>
+        <pad key="xtal1" name="XTAL1"/>
+        <pad key="pj2" name="PJ2"/>
+        <pad key="pj3" name="PJ3"/>
+        <pad key="pj4" name="PJ4"/>
+        <pad key="pj5" name="PJ5"/>
+        <pad key="pj6" name="PJ6"/>
+        <pad key="pd0" name="PD0"/>
+        <pad key="pd1" name="PD1"/>
+        <pad key="pd2" name="PD2"/>
+        <pad key="pd3" name="PD3"/>
+        <pad key="pd4" name="PD4"/>
+        <pad key="pd5" name="PD5"/>
+        <pad key="pd6" name="PD6"/>
+        <pad key="pd7" name="PD7"/>
+        <pad key="pg0" name="PG0"/>
+        <pad key="pg1" name="PG1"/>
+        <pad key="pc0" name="PC0"/>
+        <pad key="pc1" name="PC1"/>
+        <pad key="pc2" name="PC2"/>
+        <pad key="pc3" name="PC3"/>
+        <pad key="pc4" name="PC4"/>
+        <pad key="pc5" name="PC5"/>
+        <pad key="ph0" name="PH0"/>
+        <pad key="ph1" name="PH1"/>
+        <pad key="ph2" name="PH2"/>
+        <pad key="ph3" name="PH3"/>
+        <pad key="pc6" name="PC6"/>
+        <pad key="pc7" name="PC7"/>
+        <pad key="pg2" name="PG2"/>
+        <pad key="pa7" name="PA7"/>
+        <pad key="pa6" name="PA6"/>
+        <pad key="pa5" name="PA5"/>
+        <pad key="pa4" name="PA4"/>
+        <pad key="pa3" name="PA3"/>
+        <pad key="pa2" name="PA2"/>
+        <pad key="pa1" name="PA1"/>
+        <pad key="pa0" name="PA0"/>
+        <pad key="ph4" name="PH4"/>
+        <pad key="ph5" name="PH5"/>
+        <pad key="ph6" name="PH6"/>
+        <pad key="ph7" name="PH7"/>
+        <pad key="pf7" name="PF7"/>
+        <pad key="pf6" name="PF6"/>
+        <pad key="pf5" name="PF5"/>
+        <pad key="pf4" name="PF4"/>
+        <pad key="pf3" name="PF3"/>
+        <pad key="pf2" name="PF2"/>
+        <pad key="pf1" name="PF1"/>
+        <pad key="pf0" name="PF0"/>
+        <pad key="aref" name="AREF"/>
+        <pad key="agnd" name="AGND"/>
+        <pad key="avcc" name="AVCC"/>
+    </pads>
     <pinouts>
         <pinout key="qfp100" name="QFP100" type="qfp">
-            <pin position="1" pad="LCDCAP"/>
-            <pin position="2" pad="PE0"/>
-            <pin position="3" pad="PE1"/>
-            <pin position="4" pad="PE2"/>
-            <pin position="5" pad="PE3"/>
-            <pin position="6" pad="PE4"/>
-            <pin position="7" pad="PE5"/>
-            <pin position="8" pad="PE6"/>
-            <pin position="9" pad="PE7"/>
-            <pin position="10" pad="VCC"/>
-            <pin position="11" pad="GND"/>
-            <pin position="12" pad="NC"/>
-            <pin position="13" pad="PJ0"/>
-            <pin position="14" pad="PJ1"/>
-            <pin position="15" pad="NC"/>
-            <pin position="16" pad="NC"/>
-            <pin position="17" pad="NC"/>
-            <pin position="18" pad="NC"/>
-            <pin position="19" pad="PB0"/>
-            <pin position="20" pad="PB1"/>
-            <pin position="21" pad="PB2"/>
-            <pin position="22" pad="PB3"/>
-            <pin position="23" pad="PB4"/>
-            <pin position="24" pad="PB5"/>
-            <pin position="25" pad="PB6"/>
-            <pin position="26" pad="PB7"/>
-            <pin position="27" pad="NC"/>
-            <pin position="28" pad="PG3"/>
-            <pin position="29" pad="PG4"/>
-            <pin position="30" pad="PG5"/>
-            <pin position="31" pad="VCC"/>
-            <pin position="32" pad="GND"/>
-            <pin position="33" pad="XTAL2"/>
-            <pin position="34" pad="XTAL1"/>
-            <pin position="35" pad="NC"/>
-            <pin position="36" pad="NC"/>
-            <pin position="37" pad="PJ2"/>
-            <pin position="38" pad="PJ3"/>
-            <pin position="39" pad="PJ4"/>
-            <pin position="40" pad="PJ5"/>
-            <pin position="41" pad="PJ6"/>
-            <pin position="42" pad="NC"/>
-            <pin position="43" pad="PD0"/>
-            <pin position="44" pad="PD1"/>
-            <pin position="45" pad="PD2"/>
-            <pin position="46" pad="PD3"/>
-            <pin position="47" pad="PD4"/>
-            <pin position="48" pad="PD5"/>
-            <pin position="49" pad="PD6"/>
-            <pin position="50" pad="PD7"/>
-            <pin position="51" pad="PG0"/>
-            <pin position="52" pad="PG1"/>
-            <pin position="53" pad="PC0"/>
-            <pin position="54" pad="PC1"/>
-            <pin position="55" pad="PC2"/>
-            <pin position="56" pad="PC3"/>
-            <pin position="57" pad="PC4"/>
-            <pin position="58" pad="PC5"/>
-            <pin position="59" pad="NC"/>
-            <pin position="60" pad="NC"/>
-            <pin position="61" pad="NC"/>
-            <pin position="62" pad="NC"/>
-            <pin position="63" pad="PH0"/>
-            <pin position="64" pad="PH1"/>
-            <pin position="65" pad="PH2"/>
-            <pin position="66" pad="PH3"/>
-            <pin position="67" pad="NC"/>
-            <pin position="68" pad="PC6"/>
-            <pin position="69" pad="PC7"/>
-            <pin position="70" pad="PG2"/>
-            <pin position="71" pad="PA7"/>
-            <pin position="72" pad="PA6"/>
-            <pin position="73" pad="PA5"/>
-            <pin position="74" pad="PA4"/>
-            <pin position="75" pad="PA3"/>
-            <pin position="76" pad="PA2"/>
-            <pin position="77" pad="PA1"/>
-            <pin position="78" pad="PA0"/>
-            <pin position="79" pad="NC"/>
-            <pin position="80" pad="VCC"/>
-            <pin position="81" pad="GND"/>
-            <pin position="82" pad="NC"/>
-            <pin position="83" pad="NC"/>
-            <pin position="84" pad="PH4"/>
-            <pin position="85" pad="PH5"/>
-            <pin position="86" pad="PH6"/>
-            <pin position="87" pad="PH7"/>
-            <pin position="88" pad="NC"/>
-            <pin position="89" pad="NC"/>
-            <pin position="90" pad="PF7"/>
-            <pin position="91" pad="PF6"/>
-            <pin position="92" pad="PF5"/>
-            <pin position="93" pad="PF4"/>
-            <pin position="94" pad="PF3"/>
-            <pin position="95" pad="PF2"/>
-            <pin position="96" pad="PF1"/>
-            <pin position="97" pad="PF0"/>
-            <pin position="98" pad="AREF"/>
-            <pin position="99" pad="AGND"/>
-            <pin position="100" pad="AVCC"/>
+            <pin position="1" pad-key="lcdcap"/>
+            <pin position="2" pad-key="pe0"/>
+            <pin position="3" pad-key="pe1"/>
+            <pin position="4" pad-key="pe2"/>
+            <pin position="5" pad-key="pe3"/>
+            <pin position="6" pad-key="pe4"/>
+            <pin position="7" pad-key="pe5"/>
+            <pin position="8" pad-key="pe6"/>
+            <pin position="9" pad-key="pe7"/>
+            <pin position="10" pad-key="vcc"/>
+            <pin position="11" pad-key="gnd"/>
+            <pin position="12"/>
+            <pin position="13" pad-key="pj0"/>
+            <pin position="14" pad-key="pj1"/>
+            <pin position="15"/>
+            <pin position="16"/>
+            <pin position="17"/>
+            <pin position="18"/>
+            <pin position="19" pad-key="pb0"/>
+            <pin position="20" pad-key="pb1"/>
+            <pin position="21" pad-key="pb2"/>
+            <pin position="22" pad-key="pb3"/>
+            <pin position="23" pad-key="pb4"/>
+            <pin position="24" pad-key="pb5"/>
+            <pin position="25" pad-key="pb6"/>
+            <pin position="26" pad-key="pb7"/>
+            <pin position="27"/>
+            <pin position="28" pad-key="pg3"/>
+            <pin position="29" pad-key="pg4"/>
+            <pin position="30" pad-key="pg5"/>
+            <pin position="31" pad-key="vcc"/>
+            <pin position="32" pad-key="gnd"/>
+            <pin position="33" pad-key="xtal2"/>
+            <pin position="34" pad-key="xtal1"/>
+            <pin position="35"/>
+            <pin position="36"/>
+            <pin position="37" pad-key="pj2"/>
+            <pin position="38" pad-key="pj3"/>
+            <pin position="39" pad-key="pj4"/>
+            <pin position="40" pad-key="pj5"/>
+            <pin position="41" pad-key="pj6"/>
+            <pin position="42"/>
+            <pin position="43" pad-key="pd0"/>
+            <pin position="44" pad-key="pd1"/>
+            <pin position="45" pad-key="pd2"/>
+            <pin position="46" pad-key="pd3"/>
+            <pin position="47" pad-key="pd4"/>
+            <pin position="48" pad-key="pd5"/>
+            <pin position="49" pad-key="pd6"/>
+            <pin position="50" pad-key="pd7"/>
+            <pin position="51" pad-key="pg0"/>
+            <pin position="52" pad-key="pg1"/>
+            <pin position="53" pad-key="pc0"/>
+            <pin position="54" pad-key="pc1"/>
+            <pin position="55" pad-key="pc2"/>
+            <pin position="56" pad-key="pc3"/>
+            <pin position="57" pad-key="pc4"/>
+            <pin position="58" pad-key="pc5"/>
+            <pin position="59"/>
+            <pin position="60"/>
+            <pin position="61"/>
+            <pin position="62"/>
+            <pin position="63" pad-key="ph0"/>
+            <pin position="64" pad-key="ph1"/>
+            <pin position="65" pad-key="ph2"/>
+            <pin position="66" pad-key="ph3"/>
+            <pin position="67"/>
+            <pin position="68" pad-key="pc6"/>
+            <pin position="69" pad-key="pc7"/>
+            <pin position="70" pad-key="pg2"/>
+            <pin position="71" pad-key="pa7"/>
+            <pin position="72" pad-key="pa6"/>
+            <pin position="73" pad-key="pa5"/>
+            <pin position="74" pad-key="pa4"/>
+            <pin position="75" pad-key="pa3"/>
+            <pin position="76" pad-key="pa2"/>
+            <pin position="77" pad-key="pa1"/>
+            <pin position="78" pad-key="pa0"/>
+            <pin position="79"/>
+            <pin position="80" pad-key="vcc"/>
+            <pin position="81" pad-key="gnd"/>
+            <pin position="82"/>
+            <pin position="83"/>
+            <pin position="84" pad-key="ph4"/>
+            <pin position="85" pad-key="ph5"/>
+            <pin position="86" pad-key="ph6"/>
+            <pin position="87" pad-key="ph7"/>
+            <pin position="88"/>
+            <pin position="89"/>
+            <pin position="90" pad-key="pf7"/>
+            <pin position="91" pad-key="pf6"/>
+            <pin position="92" pad-key="pf5"/>
+            <pin position="93" pad-key="pf4"/>
+            <pin position="94" pad-key="pf3"/>
+            <pin position="95" pad-key="pf2"/>
+            <pin position="96" pad-key="pf1"/>
+            <pin position="97" pad-key="pf0"/>
+            <pin position="98" pad-key="aref"/>
+            <pin position="99" pad-key="agnd"/>
+            <pin position="100" pad-key="avcc"/>
         </pinout>
     </pinouts>
     <variants>
-        <variant name="ATmega6490P-AU" pinout-key="qfp100" package="TQFP100"/>
+        <variant key="atmega6490p_au" name="ATmega6490P-AU" pinout-key="qfp100"/>
     </variants>
 </device>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA649A.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA649A.xml
index fb48b0b9..096ce084 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA649A.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA649A.xml
@@ -194,25 +194,25 @@
         <peripheral key="tc0" name="TC0" module-key="tc8">
             <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"/>
+                <signal pad-key="pg4" function="default" group="T"/>
+                <signal pad-key="pb4" function="default" group="OCA"/>
             </signals>
         </peripheral>
         <peripheral key="tc1" name="TC1" module-key="tc16">
             <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"/>
-                <signal pad-id="pb5" function="default" group="OCA"/>
-                <signal pad-id="pb6" function="default" group="OCB"/>
-                <signal pad-id="xtal1" function="default" group="TOSC"/>
+                <signal pad-key="pg3" function="default" group="T"/>
+                <signal pad-key="pd0" function="default" group="ICP"/>
+                <signal pad-key="pb5" function="default" group="OCA"/>
+                <signal pad-key="pb6" function="default" group="OCB"/>
+                <signal pad-key="xtal1" function="default" group="TOSC"/>
             </signals>
         </peripheral>
         <peripheral key="tc2" name="TC2" module-key="tc8_async">
             <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"/>
+                <signal pad-key="pb7" function="default" group="OCA"/>
+                <signal pad-key="xtal2" function="default" group="TOSC"/>
             </signals>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="wdt">
@@ -224,197 +224,197 @@
         <peripheral key="spi" name="SPI" module-key="spi">
             <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"/>
-                <signal pad-id="pb2" function="default" group="MOSI"/>
-                <signal pad-id="pb3" function="default" group="MISO"/>
+                <signal pad-key="pb0" function="default" group="SS"/>
+                <signal pad-key="pb1" function="default" group="SCK"/>
+                <signal pad-key="pb2" function="default" group="MOSI"/>
+                <signal pad-key="pb3" function="default" group="MISO"/>
             </signals>
         </peripheral>
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pa2" index="2" function="default" group="P"/>
-                <signal pad-id="pa3" index="3" function="default" group="P"/>
-                <signal pad-id="pa4" index="4" function="default" group="P"/>
-                <signal pad-id="pa5" index="5" function="default" group="P"/>
-                <signal pad-id="pa6" index="6" function="default" group="P"/>
-                <signal pad-id="pa7" index="7" function="default" group="P"/>
+                <signal pad-key="pa0" index="0" function="default" group="P"/>
+                <signal pad-key="pa1" index="1" function="default" group="P"/>
+                <signal pad-key="pa2" index="2" function="default" group="P"/>
+                <signal pad-key="pa3" index="3" function="default" group="P"/>
+                <signal pad-key="pa4" index="4" function="default" group="P"/>
+                <signal pad-key="pa5" index="5" function="default" group="P"/>
+                <signal pad-key="pa6" index="6" function="default" group="P"/>
+                <signal pad-key="pa7" index="7" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pb2" index="2" function="default" group="P"/>
-                <signal pad-id="pb3" index="3" function="default" group="P"/>
-                <signal pad-id="pb4" index="4" function="default" group="P"/>
-                <signal pad-id="pb5" index="5" function="default" group="P"/>
-                <signal pad-id="pb6" index="6" function="default" group="P"/>
-                <signal pad-id="pb7" index="7" function="default" group="P"/>
+                <signal pad-key="pb0" index="0" function="default" group="P"/>
+                <signal pad-key="pb1" index="1" function="default" group="P"/>
+                <signal pad-key="pb2" index="2" function="default" group="P"/>
+                <signal pad-key="pb3" index="3" function="default" group="P"/>
+                <signal pad-key="pb4" index="4" function="default" group="P"/>
+                <signal pad-key="pb5" index="5" function="default" group="P"/>
+                <signal pad-key="pb6" index="6" function="default" group="P"/>
+                <signal pad-key="pb7" index="7" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pc2" index="2" function="default" group="P"/>
-                <signal pad-id="pc3" index="3" function="default" group="P"/>
-                <signal pad-id="pc4" index="4" function="default" group="P"/>
-                <signal pad-id="pc5" index="5" function="default" group="P"/>
-                <signal pad-id="pc6" index="6" function="default" group="P"/>
-                <signal pad-id="pc7" index="7" function="default" group="P"/>
+                <signal pad-key="pc0" index="0" function="default" group="P"/>
+                <signal pad-key="pc1" index="1" function="default" group="P"/>
+                <signal pad-key="pc2" index="2" function="default" group="P"/>
+                <signal pad-key="pc3" index="3" function="default" group="P"/>
+                <signal pad-key="pc4" index="4" function="default" group="P"/>
+                <signal pad-key="pc5" index="5" function="default" group="P"/>
+                <signal pad-key="pc6" index="6" function="default" group="P"/>
+                <signal pad-key="pc7" index="7" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pd2" index="2" function="default" group="P"/>
-                <signal pad-id="pd3" index="3" function="default" group="P"/>
-                <signal pad-id="pd4" index="4" function="default" group="P"/>
-                <signal pad-id="pd5" index="5" function="default" group="P"/>
-                <signal pad-id="pd6" index="6" function="default" group="P"/>
-                <signal pad-id="pd7" index="7" function="default" group="P"/>
+                <signal pad-key="pd0" index="0" function="default" group="P"/>
+                <signal pad-key="pd1" index="1" function="default" group="P"/>
+                <signal pad-key="pd2" index="2" function="default" group="P"/>
+                <signal pad-key="pd3" index="3" function="default" group="P"/>
+                <signal pad-key="pd4" index="4" function="default" group="P"/>
+                <signal pad-key="pd5" index="5" function="default" group="P"/>
+                <signal pad-key="pd6" index="6" function="default" group="P"/>
+                <signal pad-key="pd7" index="7" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="porte" name="PORTE" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pe2" index="2" function="default" group="P"/>
-                <signal pad-id="pe3" index="3" function="default" group="P"/>
-                <signal pad-id="pe4" index="4" function="default" group="P"/>
-                <signal pad-id="pe5" index="5" function="default" group="P"/>
-                <signal pad-id="pe6" index="6" function="default" group="P"/>
-                <signal pad-id="pe7" index="7" function="default" group="P"/>
+                <signal pad-key="pe0" index="0" function="default" group="P"/>
+                <signal pad-key="pe1" index="1" function="default" group="P"/>
+                <signal pad-key="pe2" index="2" function="default" group="P"/>
+                <signal pad-key="pe3" index="3" function="default" group="P"/>
+                <signal pad-key="pe4" index="4" function="default" group="P"/>
+                <signal pad-key="pe5" index="5" function="default" group="P"/>
+                <signal pad-key="pe6" index="6" function="default" group="P"/>
+                <signal pad-key="pe7" index="7" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portf" name="PORTF" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pf2" index="2" function="default" group="P"/>
-                <signal pad-id="pf3" index="3" function="default" group="P"/>
-                <signal pad-id="pf4" index="4" function="default" group="P"/>
-                <signal pad-id="pf5" index="5" function="default" group="P"/>
-                <signal pad-id="pf6" index="6" function="default" group="P"/>
-                <signal pad-id="pf7" index="7" function="default" group="P"/>
+                <signal pad-key="pf0" index="0" function="default" group="P"/>
+                <signal pad-key="pf1" index="1" function="default" group="P"/>
+                <signal pad-key="pf2" index="2" function="default" group="P"/>
+                <signal pad-key="pf3" index="3" function="default" group="P"/>
+                <signal pad-key="pf4" index="4" function="default" group="P"/>
+                <signal pad-key="pf5" index="5" function="default" group="P"/>
+                <signal pad-key="pf6" index="6" function="default" group="P"/>
+                <signal pad-key="pf7" index="7" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portg" name="PORTG" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pg2" index="2" function="default" group="P"/>
-                <signal pad-id="pg3" index="3" function="default" group="P"/>
-                <signal pad-id="pg4" index="4" function="default" group="P"/>
-                <signal pad-id="pg5" index="4" function="default" group="P"/>
+                <signal pad-key="pg0" index="0" function="default" group="P"/>
+                <signal pad-key="pg1" index="1" function="default" group="P"/>
+                <signal pad-key="pg2" index="2" function="default" group="P"/>
+                <signal pad-key="pg3" index="3" function="default" group="P"/>
+                <signal pad-key="pg4" index="4" function="default" group="P"/>
+                <signal pad-key="pg5" index="4" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="ac" name="AC" module-key="ac">
             <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"/>
+                <signal pad-key="pe2" index="0" function="default" group="AIN"/>
+                <signal pad-key="pe3" index="1" function="default" group="AIN"/>
             </signals>
         </peripheral>
         <peripheral key="jtag" name="JTAG" module-key="jtag">
             <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"/>
-                <signal pad-id="pf6" function="default" group="TDO"/>
-                <signal pad-id="pf7" function="default" group="TDI"/>
+                <signal pad-key="pf4" function="default" group="TCK"/>
+                <signal pad-key="pf5" function="default" group="TMS"/>
+                <signal pad-key="pf6" function="default" group="TDO"/>
+                <signal pad-key="pf7" function="default" group="TDI"/>
             </signals>
         </peripheral>
         <peripheral key="lcd" name="LCD" module-key="lcd">
             <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"/>
-                <signal pad-id="pa6" index="2" function="default" group="SEG"/>
-                <signal pad-id="pa7" index="3" function="default" group="SEG"/>
-                <signal pad-id="pg2" index="4" function="default" group="SEG"/>
-                <signal pad-id="pc7" index="5" function="default" group="SEG"/>
-                <signal pad-id="pc6" index="6" function="default" group="SEG"/>
-                <signal pad-id="pc5" index="7" function="default" group="SEG"/>
-                <signal pad-id="pc4" index="8" function="default" group="SEG"/>
-                <signal pad-id="pc3" index="9" function="default" group="SEG"/>
-                <signal pad-id="pc2" index="10" function="default" group="SEG"/>
-                <signal pad-id="pc1" index="11" function="default" group="SEG"/>
-                <signal pad-id="pc0" index="12" function="default" group="SEG"/>
-                <signal pad-id="pg1" index="13" function="default" group="SEG"/>
-                <signal pad-id="pg2" index="14" function="default" group="SEG"/>
-                <signal pad-id="pd7" index="15" function="default" group="SEG"/>
-                <signal pad-id="pd6" index="16" function="default" group="SEG"/>
-                <signal pad-id="pd5" index="17" function="default" group="SEG"/>
-                <signal pad-id="pd4" index="18" function="default" group="SEG"/>
-                <signal pad-id="pd3" index="19" function="default" group="SEG"/>
-                <signal pad-id="pd2" index="20" function="default" group="SEG"/>
-                <signal pad-id="pd1" index="21" function="default" group="SEG"/>
-                <signal pad-id="pd0" index="22" function="default" group="SEG"/>
-                <signal pad-id="pg4" index="23" function="default" group="SEG"/>
-                <signal pad-id="pg3" index="24" function="default" group="SEG"/>
-                <signal pad-id="pa0" index="0" function="default" group="COM"/>
-                <signal pad-id="pa1" index="1" function="default" group="COM"/>
-                <signal pad-id="pa2" index="2" function="default" group="COM"/>
-                <signal pad-id="pa3" index="3" function="default" group="COM"/>
+                <signal pad-key="pa4" index="0" function="default" group="SEG"/>
+                <signal pad-key="pa5" index="1" function="default" group="SEG"/>
+                <signal pad-key="pa6" index="2" function="default" group="SEG"/>
+                <signal pad-key="pa7" index="3" function="default" group="SEG"/>
+                <signal pad-key="pg2" index="4" function="default" group="SEG"/>
+                <signal pad-key="pc7" index="5" function="default" group="SEG"/>
+                <signal pad-key="pc6" index="6" function="default" group="SEG"/>
+                <signal pad-key="pc5" index="7" function="default" group="SEG"/>
+                <signal pad-key="pc4" index="8" function="default" group="SEG"/>
+                <signal pad-key="pc3" index="9" function="default" group="SEG"/>
+                <signal pad-key="pc2" index="10" function="default" group="SEG"/>
+                <signal pad-key="pc1" index="11" function="default" group="SEG"/>
+                <signal pad-key="pc0" index="12" function="default" group="SEG"/>
+                <signal pad-key="pg1" index="13" function="default" group="SEG"/>
+                <signal pad-key="pg2" index="14" function="default" group="SEG"/>
+                <signal pad-key="pd7" index="15" function="default" group="SEG"/>
+                <signal pad-key="pd6" index="16" function="default" group="SEG"/>
+                <signal pad-key="pd5" index="17" function="default" group="SEG"/>
+                <signal pad-key="pd4" index="18" function="default" group="SEG"/>
+                <signal pad-key="pd3" index="19" function="default" group="SEG"/>
+                <signal pad-key="pd2" index="20" function="default" group="SEG"/>
+                <signal pad-key="pd1" index="21" function="default" group="SEG"/>
+                <signal pad-key="pd0" index="22" function="default" group="SEG"/>
+                <signal pad-key="pg4" index="23" function="default" group="SEG"/>
+                <signal pad-key="pg3" index="24" function="default" group="SEG"/>
+                <signal pad-key="pa0" index="0" function="default" group="COM"/>
+                <signal pad-key="pa1" index="1" function="default" group="COM"/>
+                <signal pad-key="pa2" index="2" function="default" group="COM"/>
+                <signal pad-key="pa3" index="3" function="default" group="COM"/>
             </signals>
         </peripheral>
         <peripheral key="exint" name="EXINT" module-key="exint">
             <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"/>
-                <signal pad-id="pe2" index="2" function="default" group="PCINT"/>
-                <signal pad-id="pe3" index="3" function="default" group="PCINT"/>
-                <signal pad-id="pe4" index="4" function="default" group="PCINT"/>
-                <signal pad-id="pe5" index="5" function="default" group="PCINT"/>
-                <signal pad-id="pe6" index="6" function="default" group="PCINT"/>
-                <signal pad-id="pe7" index="7" function="default" group="PCINT"/>
-                <signal pad-id="pb0" index="8" function="default" group="PCINT"/>
-                <signal pad-id="pb1" index="9" function="default" group="PCINT"/>
-                <signal pad-id="pb2" index="10" function="default" group="PCINT"/>
-                <signal pad-id="pb3" index="11" function="default" group="PCINT"/>
-                <signal pad-id="pb4" index="12" function="default" group="PCINT"/>
-                <signal pad-id="pb5" index="13" function="default" group="PCINT"/>
-                <signal pad-id="pb6" index="14" function="default" group="PCINT"/>
-                <signal pad-id="pb7" index="15" function="default" group="PCINT"/>
-                <signal pad-id="pd1" index="0" function="default" group="INT"/>
+                <signal pad-key="pe0" index="0" function="default" group="PCINT"/>
+                <signal pad-key="pe1" index="1" function="default" group="PCINT"/>
+                <signal pad-key="pe2" index="2" function="default" group="PCINT"/>
+                <signal pad-key="pe3" index="3" function="default" group="PCINT"/>
+                <signal pad-key="pe4" index="4" function="default" group="PCINT"/>
+                <signal pad-key="pe5" index="5" function="default" group="PCINT"/>
+                <signal pad-key="pe6" index="6" function="default" group="PCINT"/>
+                <signal pad-key="pe7" index="7" function="default" group="PCINT"/>
+                <signal pad-key="pb0" index="8" function="default" group="PCINT"/>
+                <signal pad-key="pb1" index="9" function="default" group="PCINT"/>
+                <signal pad-key="pb2" index="10" function="default" group="PCINT"/>
+                <signal pad-key="pb3" index="11" function="default" group="PCINT"/>
+                <signal pad-key="pb4" index="12" function="default" group="PCINT"/>
+                <signal pad-key="pb5" index="13" function="default" group="PCINT"/>
+                <signal pad-key="pb6" index="14" function="default" group="PCINT"/>
+                <signal pad-key="pb7" index="15" function="default" group="PCINT"/>
+                <signal pad-key="pd1" index="0" function="default" group="INT"/>
             </signals>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="cpu">
             <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"/>
+                <signal pad-key="pe7" index="0" function="default" group="CLK"/>
             </signals>
         </peripheral>
         <peripheral key="usi" name="USI" module-key="usi">
             <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"/>
+                <signal pad-key="pe5" function="default" group="DI"/>
+                <signal pad-key="pe6" function="default" group="DO"/>
             </signals>
         </peripheral>
         <peripheral key="adc" name="ADC" module-key="adc">
             <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"/>
-                <signal pad-id="pf2" index="2" function="default" group="ADC"/>
-                <signal pad-id="pf3" index="3" function="default" group="ADC"/>
-                <signal pad-id="pf4" index="4" function="default" group="ADC"/>
-                <signal pad-id="pf5" index="5" function="default" group="ADC"/>
-                <signal pad-id="pf6" index="6" function="default" group="ADC"/>
-                <signal pad-id="pf7" index="7" function="default" group="ADC"/>
+                <signal pad-key="pf0" index="0" function="default" group="ADC"/>
+                <signal pad-key="pf1" index="1" function="default" group="ADC"/>
+                <signal pad-key="pf2" index="2" function="default" group="ADC"/>
+                <signal pad-key="pf3" index="3" function="default" group="ADC"/>
+                <signal pad-key="pf4" index="4" function="default" group="ADC"/>
+                <signal pad-key="pf5" index="5" function="default" group="ADC"/>
+                <signal pad-key="pf6" index="6" function="default" group="ADC"/>
+                <signal pad-key="pf7" index="7" function="default" group="ADC"/>
             </signals>
         </peripheral>
         <peripheral key="boot_load" name="BOOT_LOAD" module-key="boot_load">
@@ -423,10 +423,10 @@
         <peripheral key="usart0" name="USART0" module-key="usart">
             <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"/>
-                <signal pad-id="pe2" function="default" group="XCK"/>
-                <signal pad-id="pe4" function="default" group="USCK"/>
+                <signal pad-key="pe0" function="default" group="RXD"/>
+                <signal pad-key="pe1" function="default" group="TXD"/>
+                <signal pad-key="pe2" function="default" group="XCK"/>
+                <signal pad-key="pe4" function="default" group="USCK"/>
             </signals>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="fuse">
@@ -869,142 +869,205 @@
             </register-group>
         </module>
     </modules>
+    <pads>
+        <pad key="lcdcap" name="LCDCAP"/>
+        <pad key="pe0" name="PE0"/>
+        <pad key="pe1" name="PE1"/>
+        <pad key="pe2" name="PE2"/>
+        <pad key="pe3" name="PE3"/>
+        <pad key="pe4" name="PE4"/>
+        <pad key="pe5" name="PE5"/>
+        <pad key="pe6" name="PE6"/>
+        <pad key="pe7" name="PE7"/>
+        <pad key="pb0" name="PB0"/>
+        <pad key="pb1" name="PB1"/>
+        <pad key="pb2" name="PB2"/>
+        <pad key="pb3" name="PB3"/>
+        <pad key="pb4" name="PB4"/>
+        <pad key="pb5" name="PB5"/>
+        <pad key="pb6" name="PB6"/>
+        <pad key="pb7" name="PB7"/>
+        <pad key="pg3" name="PG3"/>
+        <pad key="pg4" name="PG4"/>
+        <pad key="pg5" name="PG5"/>
+        <pad key="vcc" name="VCC"/>
+        <pad key="gnd" name="GND"/>
+        <pad key="xtal2" name="XTAL2"/>
+        <pad key="xtal1" name="XTAL1"/>
+        <pad key="pd0" name="PD0"/>
+        <pad key="pd1" name="PD1"/>
+        <pad key="pd2" name="PD2"/>
+        <pad key="pd3" name="PD3"/>
+        <pad key="pd4" name="PD4"/>
+        <pad key="pd5" name="PD5"/>
+        <pad key="pd6" name="PD6"/>
+        <pad key="pd7" name="PD7"/>
+        <pad key="pg0" name="PG0"/>
+        <pad key="pg1" name="PG1"/>
+        <pad key="pc0" name="PC0"/>
+        <pad key="pc1" name="PC1"/>
+        <pad key="pc2" name="PC2"/>
+        <pad key="pc3" name="PC3"/>
+        <pad key="pc4" name="PC4"/>
+        <pad key="pc5" name="PC5"/>
+        <pad key="pc6" name="PC6"/>
+        <pad key="pc7" name="PC7"/>
+        <pad key="pg2" name="PG2"/>
+        <pad key="pa7" name="PA7"/>
+        <pad key="pa6" name="PA6"/>
+        <pad key="pa5" name="PA5"/>
+        <pad key="pa4" name="PA4"/>
+        <pad key="pa3" name="PA3"/>
+        <pad key="pa2" name="PA2"/>
+        <pad key="pa1" name="PA1"/>
+        <pad key="pa0" name="PA0"/>
+        <pad key="pf7" name="PF7"/>
+        <pad key="pf6" name="PF6"/>
+        <pad key="pf5" name="PF5"/>
+        <pad key="pf4" name="PF4"/>
+        <pad key="pf3" name="PF3"/>
+        <pad key="pf2" name="PF2"/>
+        <pad key="pf1" name="PF1"/>
+        <pad key="pf0" name="PF0"/>
+        <pad key="aref" name="AREF"/>
+        <pad key="avcc" name="AVCC"/>
+    </pads>
     <pinouts>
         <pinout key="tqfp64" name="TQFP64" type="qfp">
-            <pin position="1" pad="LCDCAP"/>
-            <pin position="2" pad="PE0"/>
-            <pin position="3" pad="PE1"/>
-            <pin position="4" pad="PE2"/>
-            <pin position="5" pad="PE3"/>
-            <pin position="6" pad="PE4"/>
-            <pin position="7" pad="PE5"/>
-            <pin position="8" pad="PE6"/>
-            <pin position="9" pad="PE7"/>
-            <pin position="10" pad="PB0"/>
-            <pin position="11" pad="PB1"/>
-            <pin position="12" pad="PB2"/>
-            <pin position="13" pad="PB3"/>
-            <pin position="14" pad="PB4"/>
-            <pin position="15" pad="PB5"/>
-            <pin position="16" pad="PB6"/>
-            <pin position="17" pad="PB7"/>
-            <pin position="18" pad="PG3"/>
-            <pin position="19" pad="PG4"/>
-            <pin position="20" pad="PG5"/>
-            <pin position="21" pad="VCC"/>
-            <pin position="22" pad="GND"/>
-            <pin position="23" pad="XTAL2"/>
-            <pin position="24" pad="XTAL1"/>
-            <pin position="25" pad="PD0"/>
-            <pin position="26" pad="PD1"/>
-            <pin position="27" pad="PD2"/>
-            <pin position="28" pad="PD3"/>
-            <pin position="29" pad="PD4"/>
-            <pin position="30" pad="PD5"/>
-            <pin position="31" pad="PD6"/>
-            <pin position="32" pad="PD7"/>
-            <pin position="33" pad="PG0"/>
-            <pin position="34" pad="PG1"/>
-            <pin position="35" pad="PC0"/>
-            <pin position="36" pad="PC1"/>
-            <pin position="37" pad="PC2"/>
-            <pin position="38" pad="PC3"/>
-            <pin position="39" pad="PC4"/>
-            <pin position="40" pad="PC5"/>
-            <pin position="41" pad="PC6"/>
-            <pin position="42" pad="PC7"/>
-            <pin position="43" pad="PG2"/>
-            <pin position="44" pad="PA7"/>
-            <pin position="45" pad="PA6"/>
-            <pin position="46" pad="PA5"/>
-            <pin position="47" pad="PA4"/>
-            <pin position="48" pad="PA3"/>
-            <pin position="49" pad="PA2"/>
-            <pin position="50" pad="PA1"/>
-            <pin position="51" pad="PA0"/>
-            <pin position="52" pad="VCC"/>
-            <pin position="53" pad="GND"/>
-            <pin position="54" pad="PF7"/>
-            <pin position="55" pad="PF6"/>
-            <pin position="56" pad="PF5"/>
-            <pin position="57" pad="PF4"/>
-            <pin position="58" pad="PF3"/>
-            <pin position="59" pad="PF2"/>
-            <pin position="60" pad="PF1"/>
-            <pin position="61" pad="PF0"/>
-            <pin position="62" pad="AREF"/>
-            <pin position="63" pad="GND"/>
-            <pin position="64" pad="AVCC"/>
+            <pin position="1" pad-key="lcdcap"/>
+            <pin position="2" pad-key="pe0"/>
+            <pin position="3" pad-key="pe1"/>
+            <pin position="4" pad-key="pe2"/>
+            <pin position="5" pad-key="pe3"/>
+            <pin position="6" pad-key="pe4"/>
+            <pin position="7" pad-key="pe5"/>
+            <pin position="8" pad-key="pe6"/>
+            <pin position="9" pad-key="pe7"/>
+            <pin position="10" pad-key="pb0"/>
+            <pin position="11" pad-key="pb1"/>
+            <pin position="12" pad-key="pb2"/>
+            <pin position="13" pad-key="pb3"/>
+            <pin position="14" pad-key="pb4"/>
+            <pin position="15" pad-key="pb5"/>
+            <pin position="16" pad-key="pb6"/>
+            <pin position="17" pad-key="pb7"/>
+            <pin position="18" pad-key="pg3"/>
+            <pin position="19" pad-key="pg4"/>
+            <pin position="20" pad-key="pg5"/>
+            <pin position="21" pad-key="vcc"/>
+            <pin position="22" pad-key="gnd"/>
+            <pin position="23" pad-key="xtal2"/>
+            <pin position="24" pad-key="xtal1"/>
+            <pin position="25" pad-key="pd0"/>
+            <pin position="26" pad-key="pd1"/>
+            <pin position="27" pad-key="pd2"/>
+            <pin position="28" pad-key="pd3"/>
+            <pin position="29" pad-key="pd4"/>
+            <pin position="30" pad-key="pd5"/>
+            <pin position="31" pad-key="pd6"/>
+            <pin position="32" pad-key="pd7"/>
+            <pin position="33" pad-key="pg0"/>
+            <pin position="34" pad-key="pg1"/>
+            <pin position="35" pad-key="pc0"/>
+            <pin position="36" pad-key="pc1"/>
+            <pin position="37" pad-key="pc2"/>
+            <pin position="38" pad-key="pc3"/>
+            <pin position="39" pad-key="pc4"/>
+            <pin position="40" pad-key="pc5"/>
+            <pin position="41" pad-key="pc6"/>
+            <pin position="42" pad-key="pc7"/>
+            <pin position="43" pad-key="pg2"/>
+            <pin position="44" pad-key="pa7"/>
+            <pin position="45" pad-key="pa6"/>
+            <pin position="46" pad-key="pa5"/>
+            <pin position="47" pad-key="pa4"/>
+            <pin position="48" pad-key="pa3"/>
+            <pin position="49" pad-key="pa2"/>
+            <pin position="50" pad-key="pa1"/>
+            <pin position="51" pad-key="pa0"/>
+            <pin position="52" pad-key="vcc"/>
+            <pin position="53" pad-key="gnd"/>
+            <pin position="54" pad-key="pf7"/>
+            <pin position="55" pad-key="pf6"/>
+            <pin position="56" pad-key="pf5"/>
+            <pin position="57" pad-key="pf4"/>
+            <pin position="58" pad-key="pf3"/>
+            <pin position="59" pad-key="pf2"/>
+            <pin position="60" pad-key="pf1"/>
+            <pin position="61" pad-key="pf0"/>
+            <pin position="62" pad-key="aref"/>
+            <pin position="63" pad-key="gnd"/>
+            <pin position="64" pad-key="avcc"/>
         </pinout>
         <pinout key="qfn64" name="QFN64" type="qfn">
-            <pin position="1" pad="LCDCAP"/>
-            <pin position="2" pad="PE0"/>
-            <pin position="3" pad="PE1"/>
-            <pin position="4" pad="PE2"/>
-            <pin position="5" pad="PE3"/>
-            <pin position="6" pad="PE4"/>
-            <pin position="7" pad="PE5"/>
-            <pin position="8" pad="PE6"/>
-            <pin position="9" pad="PE7"/>
-            <pin position="10" pad="PB0"/>
-            <pin position="11" pad="PB1"/>
-            <pin position="12" pad="PB2"/>
-            <pin position="13" pad="PB3"/>
-            <pin position="14" pad="PB4"/>
-            <pin position="15" pad="PB5"/>
-            <pin position="16" pad="PB6"/>
-            <pin position="17" pad="PB7"/>
-            <pin position="18" pad="PG3"/>
-            <pin position="19" pad="PG4"/>
-            <pin position="20" pad="PG5"/>
-            <pin position="21" pad="VCC"/>
-            <pin position="22" pad="GND"/>
-            <pin position="23" pad="XTAL2"/>
-            <pin position="24" pad="XTAL1"/>
-            <pin position="25" pad="PD0"/>
-            <pin position="26" pad="PD1"/>
-            <pin position="27" pad="PD2"/>
-            <pin position="28" pad="PD3"/>
-            <pin position="29" pad="PD4"/>
-            <pin position="30" pad="PD5"/>
-            <pin position="31" pad="PD6"/>
-            <pin position="32" pad="PD7"/>
-            <pin position="33" pad="PG0"/>
-            <pin position="34" pad="PG1"/>
-            <pin position="35" pad="PC0"/>
-            <pin position="36" pad="PC1"/>
-            <pin position="37" pad="PC2"/>
-            <pin position="38" pad="PC3"/>
-            <pin position="39" pad="PC4"/>
-            <pin position="40" pad="PC5"/>
-            <pin position="41" pad="PC6"/>
-            <pin position="42" pad="PC7"/>
-            <pin position="43" pad="PG2"/>
-            <pin position="44" pad="PA7"/>
-            <pin position="45" pad="PA6"/>
-            <pin position="46" pad="PA5"/>
-            <pin position="47" pad="PA4"/>
-            <pin position="48" pad="PA3"/>
-            <pin position="49" pad="PA2"/>
-            <pin position="50" pad="PA1"/>
-            <pin position="51" pad="PA0"/>
-            <pin position="52" pad="VCC"/>
-            <pin position="53" pad="GND"/>
-            <pin position="54" pad="PF7"/>
-            <pin position="55" pad="PF6"/>
-            <pin position="56" pad="PF5"/>
-            <pin position="57" pad="PF4"/>
-            <pin position="58" pad="PF3"/>
-            <pin position="59" pad="PF2"/>
-            <pin position="60" pad="PF1"/>
-            <pin position="61" pad="PF0"/>
-            <pin position="62" pad="AREF"/>
-            <pin position="63" pad="GND"/>
-            <pin position="64" pad="AVCC"/>
+            <pin position="1" pad-key="lcdcap"/>
+            <pin position="2" pad-key="pe0"/>
+            <pin position="3" pad-key="pe1"/>
+            <pin position="4" pad-key="pe2"/>
+            <pin position="5" pad-key="pe3"/>
+            <pin position="6" pad-key="pe4"/>
+            <pin position="7" pad-key="pe5"/>
+            <pin position="8" pad-key="pe6"/>
+            <pin position="9" pad-key="pe7"/>
+            <pin position="10" pad-key="pb0"/>
+            <pin position="11" pad-key="pb1"/>
+            <pin position="12" pad-key="pb2"/>
+            <pin position="13" pad-key="pb3"/>
+            <pin position="14" pad-key="pb4"/>
+            <pin position="15" pad-key="pb5"/>
+            <pin position="16" pad-key="pb6"/>
+            <pin position="17" pad-key="pb7"/>
+            <pin position="18" pad-key="pg3"/>
+            <pin position="19" pad-key="pg4"/>
+            <pin position="20" pad-key="pg5"/>
+            <pin position="21" pad-key="vcc"/>
+            <pin position="22" pad-key="gnd"/>
+            <pin position="23" pad-key="xtal2"/>
+            <pin position="24" pad-key="xtal1"/>
+            <pin position="25" pad-key="pd0"/>
+            <pin position="26" pad-key="pd1"/>
+            <pin position="27" pad-key="pd2"/>
+            <pin position="28" pad-key="pd3"/>
+            <pin position="29" pad-key="pd4"/>
+            <pin position="30" pad-key="pd5"/>
+            <pin position="31" pad-key="pd6"/>
+            <pin position="32" pad-key="pd7"/>
+            <pin position="33" pad-key="pg0"/>
+            <pin position="34" pad-key="pg1"/>
+            <pin position="35" pad-key="pc0"/>
+            <pin position="36" pad-key="pc1"/>
+            <pin position="37" pad-key="pc2"/>
+            <pin position="38" pad-key="pc3"/>
+            <pin position="39" pad-key="pc4"/>
+            <pin position="40" pad-key="pc5"/>
+            <pin position="41" pad-key="pc6"/>
+            <pin position="42" pad-key="pc7"/>
+            <pin position="43" pad-key="pg2"/>
+            <pin position="44" pad-key="pa7"/>
+            <pin position="45" pad-key="pa6"/>
+            <pin position="46" pad-key="pa5"/>
+            <pin position="47" pad-key="pa4"/>
+            <pin position="48" pad-key="pa3"/>
+            <pin position="49" pad-key="pa2"/>
+            <pin position="50" pad-key="pa1"/>
+            <pin position="51" pad-key="pa0"/>
+            <pin position="52" pad-key="vcc"/>
+            <pin position="53" pad-key="gnd"/>
+            <pin position="54" pad-key="pf7"/>
+            <pin position="55" pad-key="pf6"/>
+            <pin position="56" pad-key="pf5"/>
+            <pin position="57" pad-key="pf4"/>
+            <pin position="58" pad-key="pf3"/>
+            <pin position="59" pad-key="pf2"/>
+            <pin position="60" pad-key="pf1"/>
+            <pin position="61" pad-key="pf0"/>
+            <pin position="62" pad-key="aref"/>
+            <pin position="63" pad-key="gnd"/>
+            <pin position="64" pad-key="avcc"/>
         </pinout>
     </pinouts>
     <variants>
-        <variant name="ATmega649A-AU" pinout-key="tqfp64" package="TQFP64"/>
-        <variant name="ATmega649A-MU" pinout-key="qfn64" package="QFN64"/>
+        <variant key="atmega649a_au" name="ATmega649A-AU" pinout-key="tqfp64"/>
+        <variant key="atmega649a_mu" name="ATmega649A-MU" pinout-key="qfn64"/>
     </variants>
 </device>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA649P.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA649P.xml
index c8c4222b..9e0ee318 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA649P.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA649P.xml
@@ -194,25 +194,25 @@
         <peripheral key="tc0" name="TC0" module-key="tc8">
             <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"/>
+                <signal pad-key="pg4" function="default" group="T"/>
+                <signal pad-key="pb4" function="default" group="OCA"/>
             </signals>
         </peripheral>
         <peripheral key="tc1" name="TC1" module-key="tc16">
             <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"/>
-                <signal pad-id="pb5" function="default" group="OCA"/>
-                <signal pad-id="pb6" function="default" group="OCB"/>
-                <signal pad-id="xtal1" function="default" group="TOSC"/>
+                <signal pad-key="pg3" function="default" group="T"/>
+                <signal pad-key="pd0" function="default" group="ICP"/>
+                <signal pad-key="pb5" function="default" group="OCA"/>
+                <signal pad-key="pb6" function="default" group="OCB"/>
+                <signal pad-key="xtal1" function="default" group="TOSC"/>
             </signals>
         </peripheral>
         <peripheral key="tc2" name="TC2" module-key="tc8_async">
             <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"/>
+                <signal pad-key="pb7" function="default" group="OCA"/>
+                <signal pad-key="xtal2" function="default" group="TOSC"/>
             </signals>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="wdt">
@@ -224,197 +224,197 @@
         <peripheral key="spi" name="SPI" module-key="spi">
             <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"/>
-                <signal pad-id="pb2" function="default" group="MOSI"/>
-                <signal pad-id="pb3" function="default" group="MISO"/>
+                <signal pad-key="pb0" function="default" group="SS"/>
+                <signal pad-key="pb1" function="default" group="SCK"/>
+                <signal pad-key="pb2" function="default" group="MOSI"/>
+                <signal pad-key="pb3" function="default" group="MISO"/>
             </signals>
         </peripheral>
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pa2" index="2" function="default" group="P"/>
-                <signal pad-id="pa3" index="3" function="default" group="P"/>
-                <signal pad-id="pa4" index="4" function="default" group="P"/>
-                <signal pad-id="pa5" index="5" function="default" group="P"/>
-                <signal pad-id="pa6" index="6" function="default" group="P"/>
-                <signal pad-id="pa7" index="7" function="default" group="P"/>
+                <signal pad-key="pa0" index="0" function="default" group="P"/>
+                <signal pad-key="pa1" index="1" function="default" group="P"/>
+                <signal pad-key="pa2" index="2" function="default" group="P"/>
+                <signal pad-key="pa3" index="3" function="default" group="P"/>
+                <signal pad-key="pa4" index="4" function="default" group="P"/>
+                <signal pad-key="pa5" index="5" function="default" group="P"/>
+                <signal pad-key="pa6" index="6" function="default" group="P"/>
+                <signal pad-key="pa7" index="7" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pb2" index="2" function="default" group="P"/>
-                <signal pad-id="pb3" index="3" function="default" group="P"/>
-                <signal pad-id="pb4" index="4" function="default" group="P"/>
-                <signal pad-id="pb5" index="5" function="default" group="P"/>
-                <signal pad-id="pb6" index="6" function="default" group="P"/>
-                <signal pad-id="pb7" index="7" function="default" group="P"/>
+                <signal pad-key="pb0" index="0" function="default" group="P"/>
+                <signal pad-key="pb1" index="1" function="default" group="P"/>
+                <signal pad-key="pb2" index="2" function="default" group="P"/>
+                <signal pad-key="pb3" index="3" function="default" group="P"/>
+                <signal pad-key="pb4" index="4" function="default" group="P"/>
+                <signal pad-key="pb5" index="5" function="default" group="P"/>
+                <signal pad-key="pb6" index="6" function="default" group="P"/>
+                <signal pad-key="pb7" index="7" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pc2" index="2" function="default" group="P"/>
-                <signal pad-id="pc3" index="3" function="default" group="P"/>
-                <signal pad-id="pc4" index="4" function="default" group="P"/>
-                <signal pad-id="pc5" index="5" function="default" group="P"/>
-                <signal pad-id="pc6" index="6" function="default" group="P"/>
-                <signal pad-id="pc7" index="7" function="default" group="P"/>
+                <signal pad-key="pc0" index="0" function="default" group="P"/>
+                <signal pad-key="pc1" index="1" function="default" group="P"/>
+                <signal pad-key="pc2" index="2" function="default" group="P"/>
+                <signal pad-key="pc3" index="3" function="default" group="P"/>
+                <signal pad-key="pc4" index="4" function="default" group="P"/>
+                <signal pad-key="pc5" index="5" function="default" group="P"/>
+                <signal pad-key="pc6" index="6" function="default" group="P"/>
+                <signal pad-key="pc7" index="7" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pd2" index="2" function="default" group="P"/>
-                <signal pad-id="pd3" index="3" function="default" group="P"/>
-                <signal pad-id="pd4" index="4" function="default" group="P"/>
-                <signal pad-id="pd5" index="5" function="default" group="P"/>
-                <signal pad-id="pd6" index="6" function="default" group="P"/>
-                <signal pad-id="pd7" index="7" function="default" group="P"/>
+                <signal pad-key="pd0" index="0" function="default" group="P"/>
+                <signal pad-key="pd1" index="1" function="default" group="P"/>
+                <signal pad-key="pd2" index="2" function="default" group="P"/>
+                <signal pad-key="pd3" index="3" function="default" group="P"/>
+                <signal pad-key="pd4" index="4" function="default" group="P"/>
+                <signal pad-key="pd5" index="5" function="default" group="P"/>
+                <signal pad-key="pd6" index="6" function="default" group="P"/>
+                <signal pad-key="pd7" index="7" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="porte" name="PORTE" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pe2" index="2" function="default" group="P"/>
-                <signal pad-id="pe3" index="3" function="default" group="P"/>
-                <signal pad-id="pe4" index="4" function="default" group="P"/>
-                <signal pad-id="pe5" index="5" function="default" group="P"/>
-                <signal pad-id="pe6" index="6" function="default" group="P"/>
-                <signal pad-id="pe7" index="7" function="default" group="P"/>
+                <signal pad-key="pe0" index="0" function="default" group="P"/>
+                <signal pad-key="pe1" index="1" function="default" group="P"/>
+                <signal pad-key="pe2" index="2" function="default" group="P"/>
+                <signal pad-key="pe3" index="3" function="default" group="P"/>
+                <signal pad-key="pe4" index="4" function="default" group="P"/>
+                <signal pad-key="pe5" index="5" function="default" group="P"/>
+                <signal pad-key="pe6" index="6" function="default" group="P"/>
+                <signal pad-key="pe7" index="7" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portf" name="PORTF" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pf2" index="2" function="default" group="P"/>
-                <signal pad-id="pf3" index="3" function="default" group="P"/>
-                <signal pad-id="pf4" index="4" function="default" group="P"/>
-                <signal pad-id="pf5" index="5" function="default" group="P"/>
-                <signal pad-id="pf6" index="6" function="default" group="P"/>
-                <signal pad-id="pf7" index="7" function="default" group="P"/>
+                <signal pad-key="pf0" index="0" function="default" group="P"/>
+                <signal pad-key="pf1" index="1" function="default" group="P"/>
+                <signal pad-key="pf2" index="2" function="default" group="P"/>
+                <signal pad-key="pf3" index="3" function="default" group="P"/>
+                <signal pad-key="pf4" index="4" function="default" group="P"/>
+                <signal pad-key="pf5" index="5" function="default" group="P"/>
+                <signal pad-key="pf6" index="6" function="default" group="P"/>
+                <signal pad-key="pf7" index="7" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portg" name="PORTG" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pg2" index="2" function="default" group="P"/>
-                <signal pad-id="pg3" index="3" function="default" group="P"/>
-                <signal pad-id="pg4" index="4" function="default" group="P"/>
-                <signal pad-id="pg5" index="4" function="default" group="P"/>
+                <signal pad-key="pg0" index="0" function="default" group="P"/>
+                <signal pad-key="pg1" index="1" function="default" group="P"/>
+                <signal pad-key="pg2" index="2" function="default" group="P"/>
+                <signal pad-key="pg3" index="3" function="default" group="P"/>
+                <signal pad-key="pg4" index="4" function="default" group="P"/>
+                <signal pad-key="pg5" index="4" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="ac" name="AC" module-key="ac">
             <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"/>
+                <signal pad-key="pe2" index="0" function="default" group="AIN"/>
+                <signal pad-key="pe3" index="1" function="default" group="AIN"/>
             </signals>
         </peripheral>
         <peripheral key="jtag" name="JTAG" module-key="jtag">
             <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"/>
-                <signal pad-id="pf6" function="default" group="TDO"/>
-                <signal pad-id="pf7" function="default" group="TDI"/>
+                <signal pad-key="pf4" function="default" group="TCK"/>
+                <signal pad-key="pf5" function="default" group="TMS"/>
+                <signal pad-key="pf6" function="default" group="TDO"/>
+                <signal pad-key="pf7" function="default" group="TDI"/>
             </signals>
         </peripheral>
         <peripheral key="lcd" name="LCD" module-key="lcd">
             <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"/>
-                <signal pad-id="pa6" index="2" function="default" group="SEG"/>
-                <signal pad-id="pa7" index="3" function="default" group="SEG"/>
-                <signal pad-id="pg2" index="4" function="default" group="SEG"/>
-                <signal pad-id="pc7" index="5" function="default" group="SEG"/>
-                <signal pad-id="pc6" index="6" function="default" group="SEG"/>
-                <signal pad-id="pc5" index="7" function="default" group="SEG"/>
-                <signal pad-id="pc4" index="8" function="default" group="SEG"/>
-                <signal pad-id="pc3" index="9" function="default" group="SEG"/>
-                <signal pad-id="pc2" index="10" function="default" group="SEG"/>
-                <signal pad-id="pc1" index="11" function="default" group="SEG"/>
-                <signal pad-id="pc0" index="12" function="default" group="SEG"/>
-                <signal pad-id="pg1" index="13" function="default" group="SEG"/>
-                <signal pad-id="pg2" index="14" function="default" group="SEG"/>
-                <signal pad-id="pd7" index="15" function="default" group="SEG"/>
-                <signal pad-id="pd6" index="16" function="default" group="SEG"/>
-                <signal pad-id="pd5" index="17" function="default" group="SEG"/>
-                <signal pad-id="pd4" index="18" function="default" group="SEG"/>
-                <signal pad-id="pd3" index="19" function="default" group="SEG"/>
-                <signal pad-id="pd2" index="20" function="default" group="SEG"/>
-                <signal pad-id="pd1" index="21" function="default" group="SEG"/>
-                <signal pad-id="pd0" index="22" function="default" group="SEG"/>
-                <signal pad-id="pg4" index="23" function="default" group="SEG"/>
-                <signal pad-id="pg3" index="24" function="default" group="SEG"/>
-                <signal pad-id="pa0" index="0" function="default" group="COM"/>
-                <signal pad-id="pa1" index="1" function="default" group="COM"/>
-                <signal pad-id="pa2" index="2" function="default" group="COM"/>
-                <signal pad-id="pa3" index="3" function="default" group="COM"/>
+                <signal pad-key="pa4" index="0" function="default" group="SEG"/>
+                <signal pad-key="pa5" index="1" function="default" group="SEG"/>
+                <signal pad-key="pa6" index="2" function="default" group="SEG"/>
+                <signal pad-key="pa7" index="3" function="default" group="SEG"/>
+                <signal pad-key="pg2" index="4" function="default" group="SEG"/>
+                <signal pad-key="pc7" index="5" function="default" group="SEG"/>
+                <signal pad-key="pc6" index="6" function="default" group="SEG"/>
+                <signal pad-key="pc5" index="7" function="default" group="SEG"/>
+                <signal pad-key="pc4" index="8" function="default" group="SEG"/>
+                <signal pad-key="pc3" index="9" function="default" group="SEG"/>
+                <signal pad-key="pc2" index="10" function="default" group="SEG"/>
+                <signal pad-key="pc1" index="11" function="default" group="SEG"/>
+                <signal pad-key="pc0" index="12" function="default" group="SEG"/>
+                <signal pad-key="pg1" index="13" function="default" group="SEG"/>
+                <signal pad-key="pg2" index="14" function="default" group="SEG"/>
+                <signal pad-key="pd7" index="15" function="default" group="SEG"/>
+                <signal pad-key="pd6" index="16" function="default" group="SEG"/>
+                <signal pad-key="pd5" index="17" function="default" group="SEG"/>
+                <signal pad-key="pd4" index="18" function="default" group="SEG"/>
+                <signal pad-key="pd3" index="19" function="default" group="SEG"/>
+                <signal pad-key="pd2" index="20" function="default" group="SEG"/>
+                <signal pad-key="pd1" index="21" function="default" group="SEG"/>
+                <signal pad-key="pd0" index="22" function="default" group="SEG"/>
+                <signal pad-key="pg4" index="23" function="default" group="SEG"/>
+                <signal pad-key="pg3" index="24" function="default" group="SEG"/>
+                <signal pad-key="pa0" index="0" function="default" group="COM"/>
+                <signal pad-key="pa1" index="1" function="default" group="COM"/>
+                <signal pad-key="pa2" index="2" function="default" group="COM"/>
+                <signal pad-key="pa3" index="3" function="default" group="COM"/>
             </signals>
         </peripheral>
         <peripheral key="exint" name="EXINT" module-key="exint">
             <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"/>
-                <signal pad-id="pe2" index="2" function="default" group="PCINT"/>
-                <signal pad-id="pe3" index="3" function="default" group="PCINT"/>
-                <signal pad-id="pe4" index="4" function="default" group="PCINT"/>
-                <signal pad-id="pe5" index="5" function="default" group="PCINT"/>
-                <signal pad-id="pe6" index="6" function="default" group="PCINT"/>
-                <signal pad-id="pe7" index="7" function="default" group="PCINT"/>
-                <signal pad-id="pb0" index="8" function="default" group="PCINT"/>
-                <signal pad-id="pb1" index="9" function="default" group="PCINT"/>
-                <signal pad-id="pb2" index="10" function="default" group="PCINT"/>
-                <signal pad-id="pb3" index="11" function="default" group="PCINT"/>
-                <signal pad-id="pb4" index="12" function="default" group="PCINT"/>
-                <signal pad-id="pb5" index="13" function="default" group="PCINT"/>
-                <signal pad-id="pb6" index="14" function="default" group="PCINT"/>
-                <signal pad-id="pb7" index="15" function="default" group="PCINT"/>
-                <signal pad-id="pd1" index="0" function="default" group="INT"/>
+                <signal pad-key="pe0" index="0" function="default" group="PCINT"/>
+                <signal pad-key="pe1" index="1" function="default" group="PCINT"/>
+                <signal pad-key="pe2" index="2" function="default" group="PCINT"/>
+                <signal pad-key="pe3" index="3" function="default" group="PCINT"/>
+                <signal pad-key="pe4" index="4" function="default" group="PCINT"/>
+                <signal pad-key="pe5" index="5" function="default" group="PCINT"/>
+                <signal pad-key="pe6" index="6" function="default" group="PCINT"/>
+                <signal pad-key="pe7" index="7" function="default" group="PCINT"/>
+                <signal pad-key="pb0" index="8" function="default" group="PCINT"/>
+                <signal pad-key="pb1" index="9" function="default" group="PCINT"/>
+                <signal pad-key="pb2" index="10" function="default" group="PCINT"/>
+                <signal pad-key="pb3" index="11" function="default" group="PCINT"/>
+                <signal pad-key="pb4" index="12" function="default" group="PCINT"/>
+                <signal pad-key="pb5" index="13" function="default" group="PCINT"/>
+                <signal pad-key="pb6" index="14" function="default" group="PCINT"/>
+                <signal pad-key="pb7" index="15" function="default" group="PCINT"/>
+                <signal pad-key="pd1" index="0" function="default" group="INT"/>
             </signals>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="cpu">
             <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"/>
+                <signal pad-key="pe7" index="0" function="default" group="CLK"/>
             </signals>
         </peripheral>
         <peripheral key="usi" name="USI" module-key="usi">
             <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"/>
+                <signal pad-key="pe5" function="default" group="DI"/>
+                <signal pad-key="pe6" function="default" group="DO"/>
             </signals>
         </peripheral>
         <peripheral key="adc" name="ADC" module-key="adc">
             <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"/>
-                <signal pad-id="pf2" index="2" function="default" group="ADC"/>
-                <signal pad-id="pf3" index="3" function="default" group="ADC"/>
-                <signal pad-id="pf4" index="4" function="default" group="ADC"/>
-                <signal pad-id="pf5" index="5" function="default" group="ADC"/>
-                <signal pad-id="pf6" index="6" function="default" group="ADC"/>
-                <signal pad-id="pf7" index="7" function="default" group="ADC"/>
+                <signal pad-key="pf0" index="0" function="default" group="ADC"/>
+                <signal pad-key="pf1" index="1" function="default" group="ADC"/>
+                <signal pad-key="pf2" index="2" function="default" group="ADC"/>
+                <signal pad-key="pf3" index="3" function="default" group="ADC"/>
+                <signal pad-key="pf4" index="4" function="default" group="ADC"/>
+                <signal pad-key="pf5" index="5" function="default" group="ADC"/>
+                <signal pad-key="pf6" index="6" function="default" group="ADC"/>
+                <signal pad-key="pf7" index="7" function="default" group="ADC"/>
             </signals>
         </peripheral>
         <peripheral key="boot_load" name="BOOT_LOAD" module-key="boot_load">
@@ -423,10 +423,10 @@
         <peripheral key="usart0" name="USART0" module-key="usart">
             <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"/>
-                <signal pad-id="pe2" function="default" group="XCK"/>
-                <signal pad-id="pe4" function="default" group="USCK"/>
+                <signal pad-key="pe0" function="default" group="RXD"/>
+                <signal pad-key="pe1" function="default" group="TXD"/>
+                <signal pad-key="pe2" function="default" group="XCK"/>
+                <signal pad-key="pe4" function="default" group="USCK"/>
             </signals>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="fuse">
@@ -869,142 +869,205 @@
             </register-group>
         </module>
     </modules>
+    <pads>
+        <pad key="lcdcap" name="LCDCAP"/>
+        <pad key="pe0" name="PE0"/>
+        <pad key="pe1" name="PE1"/>
+        <pad key="pe2" name="PE2"/>
+        <pad key="pe3" name="PE3"/>
+        <pad key="pe4" name="PE4"/>
+        <pad key="pe5" name="PE5"/>
+        <pad key="pe6" name="PE6"/>
+        <pad key="pe7" name="PE7"/>
+        <pad key="pb0" name="PB0"/>
+        <pad key="pb1" name="PB1"/>
+        <pad key="pb2" name="PB2"/>
+        <pad key="pb3" name="PB3"/>
+        <pad key="pb4" name="PB4"/>
+        <pad key="pb5" name="PB5"/>
+        <pad key="pb6" name="PB6"/>
+        <pad key="pb7" name="PB7"/>
+        <pad key="pg3" name="PG3"/>
+        <pad key="pg4" name="PG4"/>
+        <pad key="pg5" name="PG5"/>
+        <pad key="vcc" name="VCC"/>
+        <pad key="gnd" name="GND"/>
+        <pad key="xtal2" name="XTAL2"/>
+        <pad key="xtal1" name="XTAL1"/>
+        <pad key="pd0" name="PD0"/>
+        <pad key="pd1" name="PD1"/>
+        <pad key="pd2" name="PD2"/>
+        <pad key="pd3" name="PD3"/>
+        <pad key="pd4" name="PD4"/>
+        <pad key="pd5" name="PD5"/>
+        <pad key="pd6" name="PD6"/>
+        <pad key="pd7" name="PD7"/>
+        <pad key="pg0" name="PG0"/>
+        <pad key="pg1" name="PG1"/>
+        <pad key="pc0" name="PC0"/>
+        <pad key="pc1" name="PC1"/>
+        <pad key="pc2" name="PC2"/>
+        <pad key="pc3" name="PC3"/>
+        <pad key="pc4" name="PC4"/>
+        <pad key="pc5" name="PC5"/>
+        <pad key="pc6" name="PC6"/>
+        <pad key="pc7" name="PC7"/>
+        <pad key="pg2" name="PG2"/>
+        <pad key="pa7" name="PA7"/>
+        <pad key="pa6" name="PA6"/>
+        <pad key="pa5" name="PA5"/>
+        <pad key="pa4" name="PA4"/>
+        <pad key="pa3" name="PA3"/>
+        <pad key="pa2" name="PA2"/>
+        <pad key="pa1" name="PA1"/>
+        <pad key="pa0" name="PA0"/>
+        <pad key="pf7" name="PF7"/>
+        <pad key="pf6" name="PF6"/>
+        <pad key="pf5" name="PF5"/>
+        <pad key="pf4" name="PF4"/>
+        <pad key="pf3" name="PF3"/>
+        <pad key="pf2" name="PF2"/>
+        <pad key="pf1" name="PF1"/>
+        <pad key="pf0" name="PF0"/>
+        <pad key="aref" name="AREF"/>
+        <pad key="avcc" name="AVCC"/>
+    </pads>
     <pinouts>
         <pinout key="tqfp64" name="TQFP64" type="qfp">
-            <pin position="1" pad="LCDCAP"/>
-            <pin position="2" pad="PE0"/>
-            <pin position="3" pad="PE1"/>
-            <pin position="4" pad="PE2"/>
-            <pin position="5" pad="PE3"/>
-            <pin position="6" pad="PE4"/>
-            <pin position="7" pad="PE5"/>
-            <pin position="8" pad="PE6"/>
-            <pin position="9" pad="PE7"/>
-            <pin position="10" pad="PB0"/>
-            <pin position="11" pad="PB1"/>
-            <pin position="12" pad="PB2"/>
-            <pin position="13" pad="PB3"/>
-            <pin position="14" pad="PB4"/>
-            <pin position="15" pad="PB5"/>
-            <pin position="16" pad="PB6"/>
-            <pin position="17" pad="PB7"/>
-            <pin position="18" pad="PG3"/>
-            <pin position="19" pad="PG4"/>
-            <pin position="20" pad="PG5"/>
-            <pin position="21" pad="VCC"/>
-            <pin position="22" pad="GND"/>
-            <pin position="23" pad="XTAL2"/>
-            <pin position="24" pad="XTAL1"/>
-            <pin position="25" pad="PD0"/>
-            <pin position="26" pad="PD1"/>
-            <pin position="27" pad="PD2"/>
-            <pin position="28" pad="PD3"/>
-            <pin position="29" pad="PD4"/>
-            <pin position="30" pad="PD5"/>
-            <pin position="31" pad="PD6"/>
-            <pin position="32" pad="PD7"/>
-            <pin position="33" pad="PG0"/>
-            <pin position="34" pad="PG1"/>
-            <pin position="35" pad="PC0"/>
-            <pin position="36" pad="PC1"/>
-            <pin position="37" pad="PC2"/>
-            <pin position="38" pad="PC3"/>
-            <pin position="39" pad="PC4"/>
-            <pin position="40" pad="PC5"/>
-            <pin position="41" pad="PC6"/>
-            <pin position="42" pad="PC7"/>
-            <pin position="43" pad="PG2"/>
-            <pin position="44" pad="PA7"/>
-            <pin position="45" pad="PA6"/>
-            <pin position="46" pad="PA5"/>
-            <pin position="47" pad="PA4"/>
-            <pin position="48" pad="PA3"/>
-            <pin position="49" pad="PA2"/>
-            <pin position="50" pad="PA1"/>
-            <pin position="51" pad="PA0"/>
-            <pin position="52" pad="VCC"/>
-            <pin position="53" pad="GND"/>
-            <pin position="54" pad="PF7"/>
-            <pin position="55" pad="PF6"/>
-            <pin position="56" pad="PF5"/>
-            <pin position="57" pad="PF4"/>
-            <pin position="58" pad="PF3"/>
-            <pin position="59" pad="PF2"/>
-            <pin position="60" pad="PF1"/>
-            <pin position="61" pad="PF0"/>
-            <pin position="62" pad="AREF"/>
-            <pin position="63" pad="GND"/>
-            <pin position="64" pad="AVCC"/>
+            <pin position="1" pad-key="lcdcap"/>
+            <pin position="2" pad-key="pe0"/>
+            <pin position="3" pad-key="pe1"/>
+            <pin position="4" pad-key="pe2"/>
+            <pin position="5" pad-key="pe3"/>
+            <pin position="6" pad-key="pe4"/>
+            <pin position="7" pad-key="pe5"/>
+            <pin position="8" pad-key="pe6"/>
+            <pin position="9" pad-key="pe7"/>
+            <pin position="10" pad-key="pb0"/>
+            <pin position="11" pad-key="pb1"/>
+            <pin position="12" pad-key="pb2"/>
+            <pin position="13" pad-key="pb3"/>
+            <pin position="14" pad-key="pb4"/>
+            <pin position="15" pad-key="pb5"/>
+            <pin position="16" pad-key="pb6"/>
+            <pin position="17" pad-key="pb7"/>
+            <pin position="18" pad-key="pg3"/>
+            <pin position="19" pad-key="pg4"/>
+            <pin position="20" pad-key="pg5"/>
+            <pin position="21" pad-key="vcc"/>
+            <pin position="22" pad-key="gnd"/>
+            <pin position="23" pad-key="xtal2"/>
+            <pin position="24" pad-key="xtal1"/>
+            <pin position="25" pad-key="pd0"/>
+            <pin position="26" pad-key="pd1"/>
+            <pin position="27" pad-key="pd2"/>
+            <pin position="28" pad-key="pd3"/>
+            <pin position="29" pad-key="pd4"/>
+            <pin position="30" pad-key="pd5"/>
+            <pin position="31" pad-key="pd6"/>
+            <pin position="32" pad-key="pd7"/>
+            <pin position="33" pad-key="pg0"/>
+            <pin position="34" pad-key="pg1"/>
+            <pin position="35" pad-key="pc0"/>
+            <pin position="36" pad-key="pc1"/>
+            <pin position="37" pad-key="pc2"/>
+            <pin position="38" pad-key="pc3"/>
+            <pin position="39" pad-key="pc4"/>
+            <pin position="40" pad-key="pc5"/>
+            <pin position="41" pad-key="pc6"/>
+            <pin position="42" pad-key="pc7"/>
+            <pin position="43" pad-key="pg2"/>
+            <pin position="44" pad-key="pa7"/>
+            <pin position="45" pad-key="pa6"/>
+            <pin position="46" pad-key="pa5"/>
+            <pin position="47" pad-key="pa4"/>
+            <pin position="48" pad-key="pa3"/>
+            <pin position="49" pad-key="pa2"/>
+            <pin position="50" pad-key="pa1"/>
+            <pin position="51" pad-key="pa0"/>
+            <pin position="52" pad-key="vcc"/>
+            <pin position="53" pad-key="gnd"/>
+            <pin position="54" pad-key="pf7"/>
+            <pin position="55" pad-key="pf6"/>
+            <pin position="56" pad-key="pf5"/>
+            <pin position="57" pad-key="pf4"/>
+            <pin position="58" pad-key="pf3"/>
+            <pin position="59" pad-key="pf2"/>
+            <pin position="60" pad-key="pf1"/>
+            <pin position="61" pad-key="pf0"/>
+            <pin position="62" pad-key="aref"/>
+            <pin position="63" pad-key="gnd"/>
+            <pin position="64" pad-key="avcc"/>
         </pinout>
         <pinout key="qfn64" name="QFN64" type="qfn">
-            <pin position="1" pad="LCDCAP"/>
-            <pin position="2" pad="PE0"/>
-            <pin position="3" pad="PE1"/>
-            <pin position="4" pad="PE2"/>
-            <pin position="5" pad="PE3"/>
-            <pin position="6" pad="PE4"/>
-            <pin position="7" pad="PE5"/>
-            <pin position="8" pad="PE6"/>
-            <pin position="9" pad="PE7"/>
-            <pin position="10" pad="PB0"/>
-            <pin position="11" pad="PB1"/>
-            <pin position="12" pad="PB2"/>
-            <pin position="13" pad="PB3"/>
-            <pin position="14" pad="PB4"/>
-            <pin position="15" pad="PB5"/>
-            <pin position="16" pad="PB6"/>
-            <pin position="17" pad="PB7"/>
-            <pin position="18" pad="PG3"/>
-            <pin position="19" pad="PG4"/>
-            <pin position="20" pad="PG5"/>
-            <pin position="21" pad="VCC"/>
-            <pin position="22" pad="GND"/>
-            <pin position="23" pad="XTAL2"/>
-            <pin position="24" pad="XTAL1"/>
-            <pin position="25" pad="PD0"/>
-            <pin position="26" pad="PD1"/>
-            <pin position="27" pad="PD2"/>
-            <pin position="28" pad="PD3"/>
-            <pin position="29" pad="PD4"/>
-            <pin position="30" pad="PD5"/>
-            <pin position="31" pad="PD6"/>
-            <pin position="32" pad="PD7"/>
-            <pin position="33" pad="PG0"/>
-            <pin position="34" pad="PG1"/>
-            <pin position="35" pad="PC0"/>
-            <pin position="36" pad="PC1"/>
-            <pin position="37" pad="PC2"/>
-            <pin position="38" pad="PC3"/>
-            <pin position="39" pad="PC4"/>
-            <pin position="40" pad="PC5"/>
-            <pin position="41" pad="PC6"/>
-            <pin position="42" pad="PC7"/>
-            <pin position="43" pad="PG2"/>
-            <pin position="44" pad="PA7"/>
-            <pin position="45" pad="PA6"/>
-            <pin position="46" pad="PA5"/>
-            <pin position="47" pad="PA4"/>
-            <pin position="48" pad="PA3"/>
-            <pin position="49" pad="PA2"/>
-            <pin position="50" pad="PA1"/>
-            <pin position="51" pad="PA0"/>
-            <pin position="52" pad="VCC"/>
-            <pin position="53" pad="GND"/>
-            <pin position="54" pad="PF7"/>
-            <pin position="55" pad="PF6"/>
-            <pin position="56" pad="PF5"/>
-            <pin position="57" pad="PF4"/>
-            <pin position="58" pad="PF3"/>
-            <pin position="59" pad="PF2"/>
-            <pin position="60" pad="PF1"/>
-            <pin position="61" pad="PF0"/>
-            <pin position="62" pad="AREF"/>
-            <pin position="63" pad="GND"/>
-            <pin position="64" pad="AVCC"/>
+            <pin position="1" pad-key="lcdcap"/>
+            <pin position="2" pad-key="pe0"/>
+            <pin position="3" pad-key="pe1"/>
+            <pin position="4" pad-key="pe2"/>
+            <pin position="5" pad-key="pe3"/>
+            <pin position="6" pad-key="pe4"/>
+            <pin position="7" pad-key="pe5"/>
+            <pin position="8" pad-key="pe6"/>
+            <pin position="9" pad-key="pe7"/>
+            <pin position="10" pad-key="pb0"/>
+            <pin position="11" pad-key="pb1"/>
+            <pin position="12" pad-key="pb2"/>
+            <pin position="13" pad-key="pb3"/>
+            <pin position="14" pad-key="pb4"/>
+            <pin position="15" pad-key="pb5"/>
+            <pin position="16" pad-key="pb6"/>
+            <pin position="17" pad-key="pb7"/>
+            <pin position="18" pad-key="pg3"/>
+            <pin position="19" pad-key="pg4"/>
+            <pin position="20" pad-key="pg5"/>
+            <pin position="21" pad-key="vcc"/>
+            <pin position="22" pad-key="gnd"/>
+            <pin position="23" pad-key="xtal2"/>
+            <pin position="24" pad-key="xtal1"/>
+            <pin position="25" pad-key="pd0"/>
+            <pin position="26" pad-key="pd1"/>
+            <pin position="27" pad-key="pd2"/>
+            <pin position="28" pad-key="pd3"/>
+            <pin position="29" pad-key="pd4"/>
+            <pin position="30" pad-key="pd5"/>
+            <pin position="31" pad-key="pd6"/>
+            <pin position="32" pad-key="pd7"/>
+            <pin position="33" pad-key="pg0"/>
+            <pin position="34" pad-key="pg1"/>
+            <pin position="35" pad-key="pc0"/>
+            <pin position="36" pad-key="pc1"/>
+            <pin position="37" pad-key="pc2"/>
+            <pin position="38" pad-key="pc3"/>
+            <pin position="39" pad-key="pc4"/>
+            <pin position="40" pad-key="pc5"/>
+            <pin position="41" pad-key="pc6"/>
+            <pin position="42" pad-key="pc7"/>
+            <pin position="43" pad-key="pg2"/>
+            <pin position="44" pad-key="pa7"/>
+            <pin position="45" pad-key="pa6"/>
+            <pin position="46" pad-key="pa5"/>
+            <pin position="47" pad-key="pa4"/>
+            <pin position="48" pad-key="pa3"/>
+            <pin position="49" pad-key="pa2"/>
+            <pin position="50" pad-key="pa1"/>
+            <pin position="51" pad-key="pa0"/>
+            <pin position="52" pad-key="vcc"/>
+            <pin position="53" pad-key="gnd"/>
+            <pin position="54" pad-key="pf7"/>
+            <pin position="55" pad-key="pf6"/>
+            <pin position="56" pad-key="pf5"/>
+            <pin position="57" pad-key="pf4"/>
+            <pin position="58" pad-key="pf3"/>
+            <pin position="59" pad-key="pf2"/>
+            <pin position="60" pad-key="pf1"/>
+            <pin position="61" pad-key="pf0"/>
+            <pin position="62" pad-key="aref"/>
+            <pin position="63" pad-key="gnd"/>
+            <pin position="64" pad-key="avcc"/>
         </pinout>
     </pinouts>
     <variants>
-        <variant name="ATmega649P-AU" pinout-key="tqfp64" package="TQFP64"/>
-        <variant name="ATmega649P-MU" pinout-key="qfn64" package="QFN64"/>
+        <variant key="atmega649p_au" name="ATmega649P-AU" pinout-key="tqfp64"/>
+        <variant key="atmega649p_mu" name="ATmega649P-MU" pinout-key="qfn64"/>
     </variants>
 </device>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA64A.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA64A.xml
index 61481ab6..2b9cb340 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA64A.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA64A.xml
@@ -195,53 +195,53 @@
         <peripheral key="ac" name="AC" module-key="ac">
             <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"/>
+                <signal pad-key="pe2" index="0" function="default" group="AIN"/>
+                <signal pad-key="pe3" index="1" function="default" group="AIN"/>
             </signals>
         </peripheral>
         <peripheral key="adc" name="ADC" module-key="adc">
             <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"/>
-                <signal pad-id="pf2" index="2" function="default" group="ADC"/>
-                <signal pad-id="pf3" index="3" function="default" group="ADC"/>
-                <signal pad-id="pf4" index="4" function="default" group="ADC"/>
-                <signal pad-id="pf5" index="5" function="default" group="ADC"/>
-                <signal pad-id="pf6" index="6" function="default" group="ADC"/>
-                <signal pad-id="pf7" index="7" function="default" group="ADC"/>
+                <signal pad-key="pf0" index="0" function="default" group="ADC"/>
+                <signal pad-key="pf1" index="1" function="default" group="ADC"/>
+                <signal pad-key="pf2" index="2" function="default" group="ADC"/>
+                <signal pad-key="pf3" index="3" function="default" group="ADC"/>
+                <signal pad-key="pf4" index="4" function="default" group="ADC"/>
+                <signal pad-key="pf5" index="5" function="default" group="ADC"/>
+                <signal pad-key="pf6" index="6" function="default" group="ADC"/>
+                <signal pad-key="pf7" index="7" function="default" group="ADC"/>
             </signals>
         </peripheral>
         <peripheral key="spi" name="SPI" module-key="spi">
             <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"/>
-                <signal pad-id="pb1" function="default" group="SCK"/>
-                <signal pad-id="pb0" function="default" group="SS"/>
+                <signal pad-key="pb3" function="default" group="MISO"/>
+                <signal pad-key="pb2" function="default" group="MOSI"/>
+                <signal pad-key="pb1" function="default" group="SCK"/>
+                <signal pad-key="pb0" function="default" group="SS"/>
             </signals>
         </peripheral>
         <peripheral key="twi" name="TWI" module-key="twi">
             <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"/>
+                <signal pad-key="pd1" function="default" group="SDA"/>
+                <signal pad-key="pd0" function="default" group="SCL"/>
             </signals>
         </peripheral>
         <peripheral key="usart0" name="USART0" module-key="usart">
             <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"/>
-                <signal pad-id="pe2" function="default" group="XCK"/>
+                <signal pad-key="pe0" function="default" group="RXD"/>
+                <signal pad-key="pe1" function="default" group="TXD"/>
+                <signal pad-key="pe2" function="default" group="XCK"/>
             </signals>
         </peripheral>
         <peripheral key="usart1" name="USART1" module-key="usart">
             <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"/>
-                <signal pad-id="pd5" function="default" group="XCK"/>
+                <signal pad-key="pd2" function="default" group="RXD"/>
+                <signal pad-key="pd3" function="default" group="TXD"/>
+                <signal pad-key="pd5" function="default" group="XCK"/>
             </signals>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="cpu">
@@ -253,52 +253,52 @@
         <peripheral key="jtag" name="JTAG" module-key="jtag">
             <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"/>
-                <signal pad-id="pf7" function="default" group="TDI"/>
-                <signal pad-id="pf6" function="default" group="TDO"/>
+                <signal pad-key="pf4" function="default" group="TCK"/>
+                <signal pad-key="pf5" function="default" group="TMS"/>
+                <signal pad-key="pf7" function="default" group="TDI"/>
+                <signal pad-key="pf6" function="default" group="TDO"/>
             </signals>
         </peripheral>
         <peripheral key="misc" name="MISC" module-key="misc">
             <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"/>
-                <signal pad-id="pe5" function="default" group="OC3C"/>
-                <signal pad-id="pg3" index="2" function="default" group="TOSC"/>
-                <signal pad-id="pg4" index="1" function="default" group="TOSC"/>
-                <signal pad-id="pg0" function="default" group="WR"/>
-                <signal pad-id="pg1" function="default" group="RD"/>
-                <signal pad-id="pc0" index="8" function="default" group="A"/>
-                <signal pad-id="pc1" index="9" function="default" group="A"/>
-                <signal pad-id="pc2" index="10" function="default" group="A"/>
-                <signal pad-id="pc3" index="11" function="default" group="A"/>
-                <signal pad-id="pc4" index="12" function="default" group="A"/>
-                <signal pad-id="pc5" index="13" function="default" group="A"/>
-                <signal pad-id="pc6" index="14" function="default" group="A"/>
-                <signal pad-id="pc7" index="15" function="default" group="A"/>
-                <signal pad-id="pg2" function="default" group="ALE"/>
-                <signal pad-id="pa7" index="7" function="default" group="AD"/>
-                <signal pad-id="pa6" index="6" function="default" group="AD"/>
-                <signal pad-id="pa5" index="5" function="default" group="AD"/>
-                <signal pad-id="pa4" index="4" function="default" group="AD"/>
-                <signal pad-id="pa3" index="3" function="default" group="AD"/>
-                <signal pad-id="pa2" index="2" function="default" group="AD"/>
-                <signal pad-id="pa1" index="1" function="default" group="AD"/>
-                <signal pad-id="pa0" index="0" function="default" group="AD"/>
+                <signal pad-key="pe0" function="default" group="PDI"/>
+                <signal pad-key="pe1" function="default" group="PDO"/>
+                <signal pad-key="pe5" function="default" group="OC3C"/>
+                <signal pad-key="pg3" index="2" function="default" group="TOSC"/>
+                <signal pad-key="pg4" index="1" function="default" group="TOSC"/>
+                <signal pad-key="pg0" function="default" group="WR"/>
+                <signal pad-key="pg1" function="default" group="RD"/>
+                <signal pad-key="pc0" index="8" function="default" group="A"/>
+                <signal pad-key="pc1" index="9" function="default" group="A"/>
+                <signal pad-key="pc2" index="10" function="default" group="A"/>
+                <signal pad-key="pc3" index="11" function="default" group="A"/>
+                <signal pad-key="pc4" index="12" function="default" group="A"/>
+                <signal pad-key="pc5" index="13" function="default" group="A"/>
+                <signal pad-key="pc6" index="14" function="default" group="A"/>
+                <signal pad-key="pc7" index="15" function="default" group="A"/>
+                <signal pad-key="pg2" function="default" group="ALE"/>
+                <signal pad-key="pa7" index="7" function="default" group="AD"/>
+                <signal pad-key="pa6" index="6" function="default" group="AD"/>
+                <signal pad-key="pa5" index="5" function="default" group="AD"/>
+                <signal pad-key="pa4" index="4" function="default" group="AD"/>
+                <signal pad-key="pa3" index="3" function="default" group="AD"/>
+                <signal pad-key="pa2" index="2" function="default" group="AD"/>
+                <signal pad-key="pa1" index="1" function="default" group="AD"/>
+                <signal pad-key="pa0" index="0" function="default" group="AD"/>
             </signals>
         </peripheral>
         <peripheral key="exint" name="EXINT" module-key="exint">
             <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"/>
-                <signal pad-id="pd2" index="2" function="default" group="INT"/>
-                <signal pad-id="pd3" index="3" function="default" group="INT"/>
-                <signal pad-id="pe4" index="4" function="default" group="INT"/>
-                <signal pad-id="pe5" index="5" function="default" group="INT"/>
-                <signal pad-id="pe6" index="6" function="default" group="INT"/>
-                <signal pad-id="pe7" index="7" function="default" group="INT"/>
+                <signal pad-key="pd0" index="0" function="default" group="INT"/>
+                <signal pad-key="pd1" index="1" function="default" group="INT"/>
+                <signal pad-key="pd2" index="2" function="default" group="INT"/>
+                <signal pad-key="pd3" index="3" function="default" group="INT"/>
+                <signal pad-key="pe4" index="4" function="default" group="INT"/>
+                <signal pad-key="pe5" index="5" function="default" group="INT"/>
+                <signal pad-key="pe6" index="6" function="default" group="INT"/>
+                <signal pad-key="pe7" index="7" function="default" group="INT"/>
             </signals>
         </peripheral>
         <peripheral key="eeprom" name="EEPROM" module-key="eeprom">
@@ -307,121 +307,121 @@
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pa2" index="2" function="default" group="P"/>
-                <signal pad-id="pa3" index="3" function="default" group="P"/>
-                <signal pad-id="pa4" index="4" function="default" group="P"/>
-                <signal pad-id="pa5" index="5" function="default" group="P"/>
-                <signal pad-id="pa6" index="6" function="default" group="P"/>
-                <signal pad-id="pa7" index="7" function="default" group="P"/>
+                <signal pad-key="pa0" index="0" function="default" group="P"/>
+                <signal pad-key="pa1" index="1" function="default" group="P"/>
+                <signal pad-key="pa2" index="2" function="default" group="P"/>
+                <signal pad-key="pa3" index="3" function="default" group="P"/>
+                <signal pad-key="pa4" index="4" function="default" group="P"/>
+                <signal pad-key="pa5" index="5" function="default" group="P"/>
+                <signal pad-key="pa6" index="6" function="default" group="P"/>
+                <signal pad-key="pa7" index="7" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pb2" index="2" function="default" group="P"/>
-                <signal pad-id="pb3" index="3" function="default" group="P"/>
-                <signal pad-id="pb4" index="4" function="default" group="P"/>
-                <signal pad-id="pb5" index="5" function="default" group="P"/>
-                <signal pad-id="pb6" index="6" function="default" group="P"/>
-                <signal pad-id="pb7" index="7" function="default" group="P"/>
+                <signal pad-key="pb0" index="0" function="default" group="P"/>
+                <signal pad-key="pb1" index="1" function="default" group="P"/>
+                <signal pad-key="pb2" index="2" function="default" group="P"/>
+                <signal pad-key="pb3" index="3" function="default" group="P"/>
+                <signal pad-key="pb4" index="4" function="default" group="P"/>
+                <signal pad-key="pb5" index="5" function="default" group="P"/>
+                <signal pad-key="pb6" index="6" function="default" group="P"/>
+                <signal pad-key="pb7" index="7" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pc2" index="2" function="default" group="P"/>
-                <signal pad-id="pc3" index="3" function="default" group="P"/>
-                <signal pad-id="pc4" index="4" function="default" group="P"/>
-                <signal pad-id="pc5" index="5" function="default" group="P"/>
-                <signal pad-id="pc6" index="6" function="default" group="P"/>
-                <signal pad-id="pc7" index="7" function="default" group="P"/>
+                <signal pad-key="pc0" index="0" function="default" group="P"/>
+                <signal pad-key="pc1" index="1" function="default" group="P"/>
+                <signal pad-key="pc2" index="2" function="default" group="P"/>
+                <signal pad-key="pc3" index="3" function="default" group="P"/>
+                <signal pad-key="pc4" index="4" function="default" group="P"/>
+                <signal pad-key="pc5" index="5" function="default" group="P"/>
+                <signal pad-key="pc6" index="6" function="default" group="P"/>
+                <signal pad-key="pc7" index="7" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pd2" index="2" function="default" group="P"/>
-                <signal pad-id="pd3" index="3" function="default" group="P"/>
-                <signal pad-id="pd4" index="4" function="default" group="P"/>
-                <signal pad-id="pd5" index="5" function="default" group="P"/>
-                <signal pad-id="pd6" index="6" function="default" group="P"/>
-                <signal pad-id="pd7" index="7" function="default" group="P"/>
+                <signal pad-key="pd0" index="0" function="default" group="P"/>
+                <signal pad-key="pd1" index="1" function="default" group="P"/>
+                <signal pad-key="pd2" index="2" function="default" group="P"/>
+                <signal pad-key="pd3" index="3" function="default" group="P"/>
+                <signal pad-key="pd4" index="4" function="default" group="P"/>
+                <signal pad-key="pd5" index="5" function="default" group="P"/>
+                <signal pad-key="pd6" index="6" function="default" group="P"/>
+                <signal pad-key="pd7" index="7" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="porte" name="PORTE" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pe2" index="2" function="default" group="P"/>
-                <signal pad-id="pe3" index="3" function="default" group="P"/>
-                <signal pad-id="pe4" index="4" function="default" group="P"/>
-                <signal pad-id="pe5" index="5" function="default" group="P"/>
-                <signal pad-id="pe6" index="6" function="default" group="P"/>
-                <signal pad-id="pe7" index="7" function="default" group="P"/>
+                <signal pad-key="pe0" index="0" function="default" group="P"/>
+                <signal pad-key="pe1" index="1" function="default" group="P"/>
+                <signal pad-key="pe2" index="2" function="default" group="P"/>
+                <signal pad-key="pe3" index="3" function="default" group="P"/>
+                <signal pad-key="pe4" index="4" function="default" group="P"/>
+                <signal pad-key="pe5" index="5" function="default" group="P"/>
+                <signal pad-key="pe6" index="6" function="default" group="P"/>
+                <signal pad-key="pe7" index="7" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portf" name="PORTF" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pf2" index="2" function="default" group="P"/>
-                <signal pad-id="pf3" index="3" function="default" group="P"/>
-                <signal pad-id="pf4" index="4" function="default" group="P"/>
-                <signal pad-id="pf5" index="5" function="default" group="P"/>
-                <signal pad-id="pf6" index="6" function="default" group="P"/>
-                <signal pad-id="pf7" index="7" function="default" group="P"/>
+                <signal pad-key="pf0" index="0" function="default" group="P"/>
+                <signal pad-key="pf1" index="1" function="default" group="P"/>
+                <signal pad-key="pf2" index="2" function="default" group="P"/>
+                <signal pad-key="pf3" index="3" function="default" group="P"/>
+                <signal pad-key="pf4" index="4" function="default" group="P"/>
+                <signal pad-key="pf5" index="5" function="default" group="P"/>
+                <signal pad-key="pf6" index="6" function="default" group="P"/>
+                <signal pad-key="pf7" index="7" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portg" name="PORTG" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pg2" index="2" function="default" group="P"/>
-                <signal pad-id="pg3" index="3" function="default" group="P"/>
-                <signal pad-id="pg4" index="4" function="default" group="P"/>
+                <signal pad-key="pg0" index="0" function="default" group="P"/>
+                <signal pad-key="pg1" index="1" function="default" group="P"/>
+                <signal pad-key="pg2" index="2" function="default" group="P"/>
+                <signal pad-key="pg3" index="3" function="default" group="P"/>
+                <signal pad-key="pg4" index="4" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="tc0" name="TC0" module-key="tc8_async">
             <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-key="pb4" function="default" group="OC"/>
             </signals>
         </peripheral>
         <peripheral key="tc1" name="TC1" module-key="tc16">
             <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"/>
-                <signal pad-id="pb7" function="default" group="OCC"/>
-                <signal pad-id="pd6" function="default" group="T"/>
-                <signal pad-id="pd4" function="default" group="ICP"/>
+                <signal pad-key="pb5" function="default" group="OCA"/>
+                <signal pad-key="pb6" function="default" group="OCB"/>
+                <signal pad-key="pb7" function="default" group="OCC"/>
+                <signal pad-key="pd6" function="default" group="T"/>
+                <signal pad-key="pd4" function="default" group="ICP"/>
             </signals>
         </peripheral>
         <peripheral key="tc3" name="TC3" module-key="tc16">
             <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"/>
-                <signal pad-id="pe6" function="default" group="T"/>
-                <signal pad-id="pe7" function="default" group="ICP"/>
+                <signal pad-key="pe3" function="default" group="OCA"/>
+                <signal pad-key="pe4" function="default" group="OCB"/>
+                <signal pad-key="pe6" function="default" group="T"/>
+                <signal pad-key="pe7" function="default" group="ICP"/>
             </signals>
         </peripheral>
         <peripheral key="tc2" name="TC2" module-key="tc8">
             <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"/>
+                <signal pad-key="pd7" function="default" group="T"/>
+                <signal pad-key="pb7" function="default" group="OC"/>
             </signals>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="wdt">
@@ -917,78 +917,141 @@
             </register-group>
         </module>
     </modules>
+    <pads>
+        <pad key="pen" name="PEN"/>
+        <pad key="pe0" name="PE0"/>
+        <pad key="pe1" name="PE1"/>
+        <pad key="pe2" name="PE2"/>
+        <pad key="pe3" name="PE3"/>
+        <pad key="pe4" name="PE4"/>
+        <pad key="pe5" name="PE5"/>
+        <pad key="pe6" name="PE6"/>
+        <pad key="pe7" name="PE7"/>
+        <pad key="pb0" name="PB0"/>
+        <pad key="pb1" name="PB1"/>
+        <pad key="pb2" name="PB2"/>
+        <pad key="pb3" name="PB3"/>
+        <pad key="pb4" name="PB4"/>
+        <pad key="pb5" name="PB5"/>
+        <pad key="pb6" name="PB6"/>
+        <pad key="pb7" name="PB7"/>
+        <pad key="pg3" name="PG3"/>
+        <pad key="pg4" name="PG4"/>
+        <pad key="reset" name="RESET"/>
+        <pad key="vcc" name="VCC"/>
+        <pad key="gnd" name="GND"/>
+        <pad key="xtal2" name="XTAL2"/>
+        <pad key="xtal1" name="XTAL1"/>
+        <pad key="pd0" name="PD0"/>
+        <pad key="pd1" name="PD1"/>
+        <pad key="pd2" name="PD2"/>
+        <pad key="pd3" name="PD3"/>
+        <pad key="pd4" name="PD4"/>
+        <pad key="pd5" name="PD5"/>
+        <pad key="pd6" name="PD6"/>
+        <pad key="pd7" name="PD7"/>
+        <pad key="pg0" name="PG0"/>
+        <pad key="pg1" name="PG1"/>
+        <pad key="pc0" name="PC0"/>
+        <pad key="pc1" name="PC1"/>
+        <pad key="pc2" name="PC2"/>
+        <pad key="pc3" name="PC3"/>
+        <pad key="pc4" name="PC4"/>
+        <pad key="pc5" name="PC5"/>
+        <pad key="pc6" name="PC6"/>
+        <pad key="pc7" name="PC7"/>
+        <pad key="pg2" name="PG2"/>
+        <pad key="pa7" name="PA7"/>
+        <pad key="pa6" name="PA6"/>
+        <pad key="pa5" name="PA5"/>
+        <pad key="pa4" name="PA4"/>
+        <pad key="pa3" name="PA3"/>
+        <pad key="pa2" name="PA2"/>
+        <pad key="pa1" name="PA1"/>
+        <pad key="pa0" name="PA0"/>
+        <pad key="pf7" name="PF7"/>
+        <pad key="pf6" name="PF6"/>
+        <pad key="pf5" name="PF5"/>
+        <pad key="pf4" name="PF4"/>
+        <pad key="pf3" name="PF3"/>
+        <pad key="pf2" name="PF2"/>
+        <pad key="pf1" name="PF1"/>
+        <pad key="pf0" name="PF0"/>
+        <pad key="aref" name="AREF"/>
+        <pad key="avcc" name="AVCC"/>
+    </pads>
     <pinouts>
         <pinout key="tqfpqfn64" name="TQFPQFN64" type="qfn">
-            <pin position="1" pad="PEN"/>
-            <pin position="2" pad="PE0"/>
-            <pin position="3" pad="PE1"/>
-            <pin position="4" pad="PE2"/>
-            <pin position="5" pad="PE3"/>
-            <pin position="6" pad="PE4"/>
-            <pin position="7" pad="PE5"/>
-            <pin position="8" pad="PE6"/>
-            <pin position="9" pad="PE7"/>
-            <pin position="10" pad="PB0"/>
-            <pin position="11" pad="PB1"/>
-            <pin position="12" pad="PB2"/>
-            <pin position="13" pad="PB3"/>
-            <pin position="14" pad="PB4"/>
-            <pin position="15" pad="PB5"/>
-            <pin position="16" pad="PB6"/>
-            <pin position="17" pad="PB7"/>
-            <pin position="18" pad="PG3"/>
-            <pin position="19" pad="PG4"/>
-            <pin position="20" pad="RESET"/>
-            <pin position="21" pad="VCC"/>
-            <pin position="22" pad="GND"/>
-            <pin position="23" pad="XTAL2"/>
-            <pin position="24" pad="XTAL1"/>
-            <pin position="25" pad="PD0"/>
-            <pin position="26" pad="PD1"/>
-            <pin position="27" pad="PD2"/>
-            <pin position="28" pad="PD3"/>
-            <pin position="29" pad="PD4"/>
-            <pin position="30" pad="PD5"/>
-            <pin position="31" pad="PD6"/>
-            <pin position="32" pad="PD7"/>
-            <pin position="33" pad="PG0"/>
-            <pin position="34" pad="PG1"/>
-            <pin position="35" pad="PC0"/>
-            <pin position="36" pad="PC1"/>
-            <pin position="37" pad="PC2"/>
-            <pin position="38" pad="PC3"/>
-            <pin position="39" pad="PC4"/>
-            <pin position="40" pad="PC5"/>
-            <pin position="41" pad="PC6"/>
-            <pin position="42" pad="PC7"/>
-            <pin position="43" pad="PG2"/>
-            <pin position="44" pad="PA7"/>
-            <pin position="45" pad="PA6"/>
-            <pin position="46" pad="PA5"/>
-            <pin position="47" pad="PA4"/>
-            <pin position="48" pad="PA3"/>
-            <pin position="49" pad="PA2"/>
-            <pin position="50" pad="PA1"/>
-            <pin position="51" pad="PA0"/>
-            <pin position="52" pad="VCC"/>
-            <pin position="53" pad="GND"/>
-            <pin position="54" pad="PF7"/>
-            <pin position="55" pad="PF6"/>
-            <pin position="56" pad="PF5"/>
-            <pin position="57" pad="PF4"/>
-            <pin position="58" pad="PF3"/>
-            <pin position="59" pad="PF2"/>
-            <pin position="60" pad="PF1"/>
-            <pin position="61" pad="PF0"/>
-            <pin position="62" pad="AREF"/>
-            <pin position="63" pad="GND"/>
-            <pin position="64" pad="AVCC"/>
+            <pin position="1" pad-key="pen"/>
+            <pin position="2" pad-key="pe0"/>
+            <pin position="3" pad-key="pe1"/>
+            <pin position="4" pad-key="pe2"/>
+            <pin position="5" pad-key="pe3"/>
+            <pin position="6" pad-key="pe4"/>
+            <pin position="7" pad-key="pe5"/>
+            <pin position="8" pad-key="pe6"/>
+            <pin position="9" pad-key="pe7"/>
+            <pin position="10" pad-key="pb0"/>
+            <pin position="11" pad-key="pb1"/>
+            <pin position="12" pad-key="pb2"/>
+            <pin position="13" pad-key="pb3"/>
+            <pin position="14" pad-key="pb4"/>
+            <pin position="15" pad-key="pb5"/>
+            <pin position="16" pad-key="pb6"/>
+            <pin position="17" pad-key="pb7"/>
+            <pin position="18" pad-key="pg3"/>
+            <pin position="19" pad-key="pg4"/>
+            <pin position="20" pad-key="reset"/>
+            <pin position="21" pad-key="vcc"/>
+            <pin position="22" pad-key="gnd"/>
+            <pin position="23" pad-key="xtal2"/>
+            <pin position="24" pad-key="xtal1"/>
+            <pin position="25" pad-key="pd0"/>
+            <pin position="26" pad-key="pd1"/>
+            <pin position="27" pad-key="pd2"/>
+            <pin position="28" pad-key="pd3"/>
+            <pin position="29" pad-key="pd4"/>
+            <pin position="30" pad-key="pd5"/>
+            <pin position="31" pad-key="pd6"/>
+            <pin position="32" pad-key="pd7"/>
+            <pin position="33" pad-key="pg0"/>
+            <pin position="34" pad-key="pg1"/>
+            <pin position="35" pad-key="pc0"/>
+            <pin position="36" pad-key="pc1"/>
+            <pin position="37" pad-key="pc2"/>
+            <pin position="38" pad-key="pc3"/>
+            <pin position="39" pad-key="pc4"/>
+            <pin position="40" pad-key="pc5"/>
+            <pin position="41" pad-key="pc6"/>
+            <pin position="42" pad-key="pc7"/>
+            <pin position="43" pad-key="pg2"/>
+            <pin position="44" pad-key="pa7"/>
+            <pin position="45" pad-key="pa6"/>
+            <pin position="46" pad-key="pa5"/>
+            <pin position="47" pad-key="pa4"/>
+            <pin position="48" pad-key="pa3"/>
+            <pin position="49" pad-key="pa2"/>
+            <pin position="50" pad-key="pa1"/>
+            <pin position="51" pad-key="pa0"/>
+            <pin position="52" pad-key="vcc"/>
+            <pin position="53" pad-key="gnd"/>
+            <pin position="54" pad-key="pf7"/>
+            <pin position="55" pad-key="pf6"/>
+            <pin position="56" pad-key="pf5"/>
+            <pin position="57" pad-key="pf4"/>
+            <pin position="58" pad-key="pf3"/>
+            <pin position="59" pad-key="pf2"/>
+            <pin position="60" pad-key="pf1"/>
+            <pin position="61" pad-key="pf0"/>
+            <pin position="62" pad-key="aref"/>
+            <pin position="63" pad-key="gnd"/>
+            <pin position="64" pad-key="avcc"/>
         </pinout>
     </pinouts>
     <variants>
-        <variant name="ATmega64A-AU" pinout-key="tqfpqfn64" package="TQFP64"/>
-        <variant name="ATmega64A-MU" pinout-key="tqfpqfn64" package="QFN64"/>
-        <variant name="ATmega64A-AN" pinout-key="tqfpqfn64" package="TQFP64"/>
-        <variant name="ATmega64A-MN" pinout-key="tqfpqfn64" package="QFN64"/>
+        <variant key="atmega64a_au" name="ATmega64A-AU" pinout-key="tqfpqfn64"/>
+        <variant key="atmega64a_mu" name="ATmega64A-MU" pinout-key="tqfpqfn64"/>
+        <variant key="atmega64a_an" name="ATmega64A-AN" pinout-key="tqfpqfn64"/>
+        <variant key="atmega64a_mn" name="ATmega64A-MN" pinout-key="tqfpqfn64"/>
     </variants>
 </device>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA64C1.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA64C1.xml
index ac8b86a3..e961edd8 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA64C1.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA64C1.xml
@@ -194,48 +194,48 @@
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pb2" index="2" function="IOPORT" group="PIN"/>
-                <signal pad-id="pb3" index="3" function="IOPORT" group="PIN"/>
-                <signal pad-id="pb4" index="4" function="IOPORT" group="PIN"/>
-                <signal pad-id="pb5" index="5" function="IOPORT" group="PIN"/>
-                <signal pad-id="pb6" index="6" function="IOPORT" group="PIN"/>
-                <signal pad-id="pb7" index="7" function="IOPORT" group="PIN"/>
+                <signal pad-key="pb0" index="0" function="IOPORT" group="PIN"/>
+                <signal pad-key="pb1" index="1" function="IOPORT" group="PIN"/>
+                <signal pad-key="pb2" index="2" function="IOPORT" group="PIN"/>
+                <signal pad-key="pb3" index="3" function="IOPORT" group="PIN"/>
+                <signal pad-key="pb4" index="4" function="IOPORT" group="PIN"/>
+                <signal pad-key="pb5" index="5" function="IOPORT" group="PIN"/>
+                <signal pad-key="pb6" index="6" function="IOPORT" group="PIN"/>
+                <signal pad-key="pb7" index="7" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pc2" index="2" function="IOPORT" group="PIN"/>
-                <signal pad-id="pc3" index="3" function="IOPORT" group="PIN"/>
-                <signal pad-id="pc4" index="4" function="IOPORT" group="PIN"/>
-                <signal pad-id="pc5" index="5" function="IOPORT" group="PIN"/>
-                <signal pad-id="pc6" index="6" function="IOPORT" group="PIN"/>
-                <signal pad-id="pc7" index="7" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc0" index="0" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc1" index="1" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc2" index="2" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc3" index="3" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc4" index="4" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc5" index="5" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc6" index="6" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc7" index="7" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pd2" index="2" function="IOPORT" group="PIN"/>
-                <signal pad-id="pd3" index="3" function="IOPORT" group="PIN"/>
-                <signal pad-id="pd4" index="4" function="IOPORT" group="PIN"/>
-                <signal pad-id="pd5" index="5" function="IOPORT" group="PIN"/>
-                <signal pad-id="pd6" index="6" function="IOPORT" group="PIN"/>
-                <signal pad-id="pd7" index="7" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd0" index="0" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd1" index="1" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd2" index="2" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd3" index="3" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd4" index="4" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd5" index="5" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd6" index="6" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd7" index="7" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="porte" name="PORTE" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pe2" index="2" function="IOPORT" group="PIN"/>
+                <signal pad-key="pe0" index="0" function="IOPORT" group="PIN"/>
+                <signal pad-key="pe1" index="1" function="IOPORT" group="PIN"/>
+                <signal pad-key="pe2" index="2" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="can" name="CAN" module-key="can">
@@ -244,20 +244,20 @@
         <peripheral key="ac" name="AC" module-key="ac">
             <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"/>
-                <signal pad-id="pd5" index="2" function="AC" group="ACMP"/>
-                <signal pad-id="pc5" index="3" function="AC" group="ACMP"/>
-                <signal pad-id="pb2" index="0" function="AC" group="ACMPN"/>
-                <signal pad-id="pb5" index="1" function="AC" group="ACMPN"/>
-                <signal pad-id="pd6" index="2" function="AC" group="ACMPN"/>
-                <signal pad-id="pc4" index="3" function="AC" group="ACMPN"/>
+                <signal pad-key="pd7" index="0" function="AC" group="ACMP"/>
+                <signal pad-key="pc6" index="1" function="AC" group="ACMP"/>
+                <signal pad-key="pd5" index="2" function="AC" group="ACMP"/>
+                <signal pad-key="pc5" index="3" function="AC" group="ACMP"/>
+                <signal pad-key="pb2" index="0" function="AC" group="ACMPN"/>
+                <signal pad-key="pb5" index="1" function="AC" group="ACMPN"/>
+                <signal pad-key="pd6" index="2" function="AC" group="ACMPN"/>
+                <signal pad-key="pc4" index="3" function="AC" group="ACMPN"/>
             </signals>
         </peripheral>
         <peripheral key="dac" name="DAC" module-key="dac">
             <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"/>
+                <signal pad-key="pc7" function="DAC" group="D2A"/>
             </signals>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="cpu">
@@ -266,55 +266,55 @@
         <peripheral key="tc0" name="TC0" module-key="tc8">
             <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"/>
-                <signal pad-id="pe1" function="TC0" group="OC0B"/>
+                <signal pad-key="pc2" function="TC0" group="T0"/>
+                <signal pad-key="pd3" function="TC0" group="OC0A"/>
+                <signal pad-key="pe1" function="TC0" group="OC0B"/>
             </signals>
         </peripheral>
         <peripheral key="tc1" name="TC1" module-key="tc16">
             <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"/>
-                <signal pad-id="pc3" function="TC1" group="ICP1B"/>
-                <signal pad-id="pd2" function="TC1" group="OC1A"/>
-                <signal pad-id="pc1" function="TC1" group="OC1B"/>
+                <signal pad-key="pc3" function="TC1" group="T1"/>
+                <signal pad-key="pd4" function="TC1" group="ICP1A"/>
+                <signal pad-key="pc3" function="TC1" group="ICP1B"/>
+                <signal pad-key="pd2" function="TC1" group="OC1A"/>
+                <signal pad-key="pc1" function="TC1" group="OC1B"/>
             </signals>
         </peripheral>
         <peripheral key="adc" name="ADC" module-key="adc">
             <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"/>
-                <signal pad-id="pd5" index="2" function="ADC" group="ADC"/>
-                <signal pad-id="pd6" index="3" function="ADC" group="ADC"/>
-                <signal pad-id="pb7" index="4" function="ADC" group="ADC"/>
-                <signal pad-id="pb2" index="5" function="ADC" group="ADC"/>
-                <signal pad-id="pb5" index="6" function="ADC" group="ADC"/>
-                <signal pad-id="pb6" index="7" function="ADC" group="ADC"/>
-                <signal pad-id="pc4" index="8" function="ADC" group="ADC"/>
-                <signal pad-id="pc5" index="9" function="ADC" group="ADC"/>
-                <signal pad-id="pc6" index="10" function="ADC" group="ADC"/>
+                <signal pad-key="pe2" index="0" function="ADC" group="ADC"/>
+                <signal pad-key="pd4" index="1" function="ADC" group="ADC"/>
+                <signal pad-key="pd5" index="2" function="ADC" group="ADC"/>
+                <signal pad-key="pd6" index="3" function="ADC" group="ADC"/>
+                <signal pad-key="pb7" index="4" function="ADC" group="ADC"/>
+                <signal pad-key="pb2" index="5" function="ADC" group="ADC"/>
+                <signal pad-key="pb5" index="6" function="ADC" group="ADC"/>
+                <signal pad-key="pb6" index="7" function="ADC" group="ADC"/>
+                <signal pad-key="pc4" index="8" function="ADC" group="ADC"/>
+                <signal pad-key="pc5" index="9" function="ADC" group="ADC"/>
+                <signal pad-key="pc6" index="10" function="ADC" group="ADC"/>
             </signals>
         </peripheral>
         <peripheral key="linuart" name="LINUART" module-key="linuart">
             <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"/>
+                <signal pad-key="pd3" function="LIN" group="TXLIN"/>
+                <signal pad-key="pd4" function="LIN" group="RXLIN"/>
             </signals>
         </peripheral>
         <peripheral key="spi" name="SPI" module-key="spi">
             <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"/>
-                <signal pad-id="pb1" function="SPI" group="MOSI"/>
-                <signal pad-id="pd3" function="SPI_ALT" group="MOSI"/>
-                <signal pad-id="pb7" function="SPI" group="SCK"/>
-                <signal pad-id="pd4" function="SPI_ALT" group="SCK"/>
-                <signal pad-id="pd3" function="SPI" group="SS"/>
-                <signal pad-id="pc1" function="SPI_ALT" group="SS"/>
+                <signal pad-key="pb0" function="SPI" group="MISO"/>
+                <signal pad-key="pd2" function="SPI_ALT" group="MISO"/>
+                <signal pad-key="pb1" function="SPI" group="MOSI"/>
+                <signal pad-key="pd3" function="SPI_ALT" group="MOSI"/>
+                <signal pad-key="pb7" function="SPI" group="SCK"/>
+                <signal pad-key="pd4" function="SPI_ALT" group="SCK"/>
+                <signal pad-key="pd3" function="SPI" group="SS"/>
+                <signal pad-key="pc1" function="SPI_ALT" group="SS"/>
             </signals>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="wdt">
@@ -323,37 +323,37 @@
         <peripheral key="exint" name="EXINT" module-key="exint">
             <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"/>
-                <signal pad-id="pb5" index="2" function="EXINT" group="INT"/>
-                <signal pad-id="pc0" index="3" function="EXINT" group="INT"/>
-                <signal pad-id="pb0" index="0" function="EXINT" group="PCINT"/>
-                <signal pad-id="pb1" index="1" function="EXINT" group="PCINT"/>
-                <signal pad-id="pb2" index="2" function="EXINT" group="PCINT"/>
-                <signal pad-id="pb3" index="3" function="EXINT" group="PCINT"/>
-                <signal pad-id="pb4" index="4" function="EXINT" group="PCINT"/>
-                <signal pad-id="pb5" index="5" function="EXINT" group="PCINT"/>
-                <signal pad-id="pb6" index="6" function="EXINT" group="PCINT"/>
-                <signal pad-id="pb7" index="7" function="EXINT" group="PCINT"/>
-                <signal pad-id="pc0" index="8" function="EXINT" group="PCINT"/>
-                <signal pad-id="pc1" index="9" function="EXINT" group="PCINT"/>
-                <signal pad-id="pc2" index="10" function="EXINT" group="PCINT"/>
-                <signal pad-id="pc3" index="11" function="EXINT" group="PCINT"/>
-                <signal pad-id="pc4" index="12" function="EXINT" group="PCINT"/>
-                <signal pad-id="pc5" index="13" function="EXINT" group="PCINT"/>
-                <signal pad-id="pc6" index="14" function="EXINT" group="PCINT"/>
-                <signal pad-id="pc7" index="15" function="EXINT" group="PCINT"/>
-                <signal pad-id="pd0" index="16" function="EXINT" group="PCINT"/>
-                <signal pad-id="pd1" index="17" function="EXINT" group="PCINT"/>
-                <signal pad-id="pd2" index="18" function="EXINT" group="PCINT"/>
-                <signal pad-id="pd3" index="19" function="EXINT" group="PCINT"/>
-                <signal pad-id="pd4" index="20" function="EXINT" group="PCINT"/>
-                <signal pad-id="pd5" index="21" function="EXINT" group="PCINT"/>
-                <signal pad-id="pd6" index="22" function="EXINT" group="PCINT"/>
-                <signal pad-id="pd7" index="23" function="EXINT" group="PCINT"/>
-                <signal pad-id="pe0" index="24" function="EXINT" group="PCINT"/>
-                <signal pad-id="pe1" index="25" function="EXINT" group="PCINT"/>
-                <signal pad-id="pe2" index="26" function="EXINT" group="PCINT"/>
+                <signal pad-key="pd6" index="0" function="EXINT" group="INT"/>
+                <signal pad-key="pb2" index="1" function="EXINT" group="INT"/>
+                <signal pad-key="pb5" index="2" function="EXINT" group="INT"/>
+                <signal pad-key="pc0" index="3" function="EXINT" group="INT"/>
+                <signal pad-key="pb0" index="0" function="EXINT" group="PCINT"/>
+                <signal pad-key="pb1" index="1" function="EXINT" group="PCINT"/>
+                <signal pad-key="pb2" index="2" function="EXINT" group="PCINT"/>
+                <signal pad-key="pb3" index="3" function="EXINT" group="PCINT"/>
+                <signal pad-key="pb4" index="4" function="EXINT" group="PCINT"/>
+                <signal pad-key="pb5" index="5" function="EXINT" group="PCINT"/>
+                <signal pad-key="pb6" index="6" function="EXINT" group="PCINT"/>
+                <signal pad-key="pb7" index="7" function="EXINT" group="PCINT"/>
+                <signal pad-key="pc0" index="8" function="EXINT" group="PCINT"/>
+                <signal pad-key="pc1" index="9" function="EXINT" group="PCINT"/>
+                <signal pad-key="pc2" index="10" function="EXINT" group="PCINT"/>
+                <signal pad-key="pc3" index="11" function="EXINT" group="PCINT"/>
+                <signal pad-key="pc4" index="12" function="EXINT" group="PCINT"/>
+                <signal pad-key="pc5" index="13" function="EXINT" group="PCINT"/>
+                <signal pad-key="pc6" index="14" function="EXINT" group="PCINT"/>
+                <signal pad-key="pc7" index="15" function="EXINT" group="PCINT"/>
+                <signal pad-key="pd0" index="16" function="EXINT" group="PCINT"/>
+                <signal pad-key="pd1" index="17" function="EXINT" group="PCINT"/>
+                <signal pad-key="pd2" index="18" function="EXINT" group="PCINT"/>
+                <signal pad-key="pd3" index="19" function="EXINT" group="PCINT"/>
+                <signal pad-key="pd4" index="20" function="EXINT" group="PCINT"/>
+                <signal pad-key="pd5" index="21" function="EXINT" group="PCINT"/>
+                <signal pad-key="pd6" index="22" function="EXINT" group="PCINT"/>
+                <signal pad-key="pd7" index="23" function="EXINT" group="PCINT"/>
+                <signal pad-key="pe0" index="24" function="EXINT" group="PCINT"/>
+                <signal pad-key="pe1" index="25" function="EXINT" group="PCINT"/>
+                <signal pad-key="pe2" index="26" function="EXINT" group="PCINT"/>
             </signals>
         </peripheral>
         <peripheral key="eeprom" name="EEPROM" module-key="eeprom">
@@ -944,44 +944,78 @@
             </register-group>
         </module>
     </modules>
+    <pads>
+        <pad key="pd2" name="PD2"/>
+        <pad key="pd3" name="PD3"/>
+        <pad key="pc1" name="PC1"/>
+        <pad key="vcc" name="VCC"/>
+        <pad key="gnd" name="GND"/>
+        <pad key="pc2" name="PC2"/>
+        <pad key="pc3" name="PC3"/>
+        <pad key="pb0" name="PB0"/>
+        <pad key="pb1" name="PB1"/>
+        <pad key="pe1" name="PE1"/>
+        <pad key="pe2" name="PE2"/>
+        <pad key="pd4" name="PD4"/>
+        <pad key="pd5" name="PD5"/>
+        <pad key="pd6" name="PD6"/>
+        <pad key="pd7" name="PD7"/>
+        <pad key="pb2" name="PB2"/>
+        <pad key="pc4" name="PC4"/>
+        <pad key="pc5" name="PC5"/>
+        <pad key="avcc" name="AVCC"/>
+        <pad key="agnd" name="AGND"/>
+        <pad key="aref" name="AREF"/>
+        <pad key="pc6" name="PC6"/>
+        <pad key="pb3" name="PB3"/>
+        <pad key="pb4" name="PB4"/>
+        <pad key="pc7" name="PC7"/>
+        <pad key="pb5" name="PB5"/>
+        <pad key="pb6" name="PB6"/>
+        <pad key="pb7" name="PB7"/>
+        <pad key="pd0" name="PD0"/>
+        <pad key="pc0" name="PC0"/>
+        <pad key="pe0" name="PE0"/>
+        <pad key="pd1" name="PD1"/>
+    </pads>
     <pinouts>
         <pinout key="tqfpqfn32" name="TQFPQFN32" type="qfn">
-            <pin position="1" pad="PD2"/>
-            <pin position="2" pad="PD3"/>
-            <pin position="3" pad="PC1"/>
-            <pin position="4" pad="VCC"/>
-            <pin position="5" pad="GND"/>
-            <pin position="6" pad="PC2"/>
-            <pin position="7" pad="PC3"/>
-            <pin position="8" pad="PB0"/>
-            <pin position="9" pad="PB1"/>
-            <pin position="10" pad="PE1"/>
-            <pin position="11" pad="PE2"/>
-            <pin position="12" pad="PD4"/>
-            <pin position="13" pad="PD5"/>
-            <pin position="14" pad="PD6"/>
-            <pin position="15" pad="PD7"/>
-            <pin position="16" pad="PB2"/>
-            <pin position="17" pad="PC4"/>
-            <pin position="18" pad="PC5"/>
-            <pin position="19" pad="AVCC"/>
-            <pin position="20" pad="AGND"/>
-            <pin position="21" pad="AREF"/>
-            <pin position="22" pad="PC6"/>
-            <pin position="23" pad="PB3"/>
-            <pin position="24" pad="PB4"/>
-            <pin position="25" pad="PC7"/>
-            <pin position="26" pad="PB5"/>
-            <pin position="27" pad="PB6"/>
-            <pin position="28" pad="PB7"/>
-            <pin position="29" pad="PD0"/>
-            <pin position="30" pad="PC0"/>
-            <pin position="31" pad="PE0"/>
-            <pin position="32" pad="PD1"/>
+            <pin position="1" pad-key="pd2"/>
+            <pin position="2" pad-key="pd3"/>
+            <pin position="3" pad-key="pc1"/>
+            <pin position="4" pad-key="vcc"/>
+            <pin position="5" pad-key="gnd"/>
+            <pin position="6" pad-key="pc2"/>
+            <pin position="7" pad-key="pc3"/>
+            <pin position="8" pad-key="pb0"/>
+            <pin position="9" pad-key="pb1"/>
+            <pin position="10" pad-key="pe1"/>
+            <pin position="11" pad-key="pe2"/>
+            <pin position="12" pad-key="pd4"/>
+            <pin position="13" pad-key="pd5"/>
+            <pin position="14" pad-key="pd6"/>
+            <pin position="15" pad-key="pd7"/>
+            <pin position="16" pad-key="pb2"/>
+            <pin position="17" pad-key="pc4"/>
+            <pin position="18" pad-key="pc5"/>
+            <pin position="19" pad-key="avcc"/>
+            <pin position="20" pad-key="agnd"/>
+            <pin position="21" pad-key="aref"/>
+            <pin position="22" pad-key="pc6"/>
+            <pin position="23" pad-key="pb3"/>
+            <pin position="24" pad-key="pb4"/>
+            <pin position="25" pad-key="pc7"/>
+            <pin position="26" pad-key="pb5"/>
+            <pin position="27" pad-key="pb6"/>
+            <pin position="28" pad-key="pb7"/>
+            <pin position="29" pad-key="pd0"/>
+            <pin position="30" pad-key="pc0"/>
+            <pin position="31" pad-key="pe0"/>
+            <pin position="32" pad-key="pd1"/>
         </pinout>
     </pinouts>
     <variants>
-        <variant name="ATmega64C1-AU" pinout-key="tqfpqfn32" package="TQFP32"/>
-        <variant name="ATmega64C1-MU" pinout-key="tqfpqfn32" package="QFN32"/>
+        <variant key="atmega64c1_au" name="ATmega64C1-AU" pinout-key="tqfpqfn32"/>
+        <variant key="atmega64c1_mu" name="ATmega64C1-MU" pinout-key="tqfpqfn32"/>
     </variants>
 </device>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA64M1.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA64M1.xml
index 90f4c7fd..1ab3a7bf 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA64M1.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA64M1.xml
@@ -194,48 +194,48 @@
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pb2" index="2" function="IOPORT" group="PIN"/>
-                <signal pad-id="pb3" index="3" function="IOPORT" group="PIN"/>
-                <signal pad-id="pb4" index="4" function="IOPORT" group="PIN"/>
-                <signal pad-id="pb5" index="5" function="IOPORT" group="PIN"/>
-                <signal pad-id="pb6" index="6" function="IOPORT" group="PIN"/>
-                <signal pad-id="pb7" index="7" function="IOPORT" group="PIN"/>
+                <signal pad-key="pb0" index="0" function="IOPORT" group="PIN"/>
+                <signal pad-key="pb1" index="1" function="IOPORT" group="PIN"/>
+                <signal pad-key="pb2" index="2" function="IOPORT" group="PIN"/>
+                <signal pad-key="pb3" index="3" function="IOPORT" group="PIN"/>
+                <signal pad-key="pb4" index="4" function="IOPORT" group="PIN"/>
+                <signal pad-key="pb5" index="5" function="IOPORT" group="PIN"/>
+                <signal pad-key="pb6" index="6" function="IOPORT" group="PIN"/>
+                <signal pad-key="pb7" index="7" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pc2" index="2" function="IOPORT" group="PIN"/>
-                <signal pad-id="pc3" index="3" function="IOPORT" group="PIN"/>
-                <signal pad-id="pc4" index="4" function="IOPORT" group="PIN"/>
-                <signal pad-id="pc5" index="5" function="IOPORT" group="PIN"/>
-                <signal pad-id="pc6" index="6" function="IOPORT" group="PIN"/>
-                <signal pad-id="pc7" index="7" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc0" index="0" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc1" index="1" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc2" index="2" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc3" index="3" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc4" index="4" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc5" index="5" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc6" index="6" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc7" index="7" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pd2" index="2" function="IOPORT" group="PIN"/>
-                <signal pad-id="pd3" index="3" function="IOPORT" group="PIN"/>
-                <signal pad-id="pd4" index="4" function="IOPORT" group="PIN"/>
-                <signal pad-id="pd5" index="5" function="IOPORT" group="PIN"/>
-                <signal pad-id="pd6" index="6" function="IOPORT" group="PIN"/>
-                <signal pad-id="pd7" index="7" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd0" index="0" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd1" index="1" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd2" index="2" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd3" index="3" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd4" index="4" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd5" index="5" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd6" index="6" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd7" index="7" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="porte" name="PORTE" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pe2" index="2" function="IOPORT" group="PIN"/>
+                <signal pad-key="pe0" index="0" function="IOPORT" group="PIN"/>
+                <signal pad-key="pe1" index="1" function="IOPORT" group="PIN"/>
+                <signal pad-key="pe2" index="2" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="can" name="CAN" module-key="can">
@@ -244,20 +244,20 @@
         <peripheral key="ac" name="AC" module-key="ac">
             <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"/>
-                <signal pad-id="pd5" index="2" function="AC" group="ACMP"/>
-                <signal pad-id="pc5" index="3" function="AC" group="ACMP"/>
-                <signal pad-id="pb2" index="0" function="AC" group="ACMPN"/>
-                <signal pad-id="pb5" index="1" function="AC" group="ACMPN"/>
-                <signal pad-id="pd6" index="2" function="AC" group="ACMPN"/>
-                <signal pad-id="pc4" index="3" function="AC" group="ACMPN"/>
+                <signal pad-key="pd7" index="0" function="AC" group="ACMP"/>
+                <signal pad-key="pc6" index="1" function="AC" group="ACMP"/>
+                <signal pad-key="pd5" index="2" function="AC" group="ACMP"/>
+                <signal pad-key="pc5" index="3" function="AC" group="ACMP"/>
+                <signal pad-key="pb2" index="0" function="AC" group="ACMPN"/>
+                <signal pad-key="pb5" index="1" function="AC" group="ACMPN"/>
+                <signal pad-key="pd6" index="2" function="AC" group="ACMPN"/>
+                <signal pad-key="pc4" index="3" function="AC" group="ACMPN"/>
             </signals>
         </peripheral>
         <peripheral key="dac" name="DAC" module-key="dac">
             <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"/>
+                <signal pad-key="pc7" function="DAC" group="D2A"/>
             </signals>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="cpu">
@@ -266,55 +266,55 @@
         <peripheral key="tc0" name="TC0" module-key="tc8">
             <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"/>
-                <signal pad-id="pe1" function="TC0" group="OC0B"/>
+                <signal pad-key="pc2" function="TC0" group="T0"/>
+                <signal pad-key="pd3" function="TC0" group="OC0A"/>
+                <signal pad-key="pe1" function="TC0" group="OC0B"/>
             </signals>
         </peripheral>
         <peripheral key="tc1" name="TC1" module-key="tc16">
             <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"/>
-                <signal pad-id="pc3" function="TC1" group="ICP1B"/>
-                <signal pad-id="pd2" function="TC1" group="OC1A"/>
-                <signal pad-id="pc1" function="TC1" group="OC1B"/>
+                <signal pad-key="pc3" function="TC1" group="T1"/>
+                <signal pad-key="pd4" function="TC1" group="ICP1A"/>
+                <signal pad-key="pc3" function="TC1" group="ICP1B"/>
+                <signal pad-key="pd2" function="TC1" group="OC1A"/>
+                <signal pad-key="pc1" function="TC1" group="OC1B"/>
             </signals>
         </peripheral>
         <peripheral key="adc" name="ADC" module-key="adc">
             <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"/>
-                <signal pad-id="pd5" index="2" function="ADC" group="ADC"/>
-                <signal pad-id="pd6" index="3" function="ADC" group="ADC"/>
-                <signal pad-id="pb7" index="4" function="ADC" group="ADC"/>
-                <signal pad-id="pb2" index="5" function="ADC" group="ADC"/>
-                <signal pad-id="pb5" index="6" function="ADC" group="ADC"/>
-                <signal pad-id="pb6" index="7" function="ADC" group="ADC"/>
-                <signal pad-id="pc4" index="8" function="ADC" group="ADC"/>
-                <signal pad-id="pc5" index="9" function="ADC" group="ADC"/>
-                <signal pad-id="pc6" index="10" function="ADC" group="ADC"/>
+                <signal pad-key="pe2" index="0" function="ADC" group="ADC"/>
+                <signal pad-key="pd4" index="1" function="ADC" group="ADC"/>
+                <signal pad-key="pd5" index="2" function="ADC" group="ADC"/>
+                <signal pad-key="pd6" index="3" function="ADC" group="ADC"/>
+                <signal pad-key="pb7" index="4" function="ADC" group="ADC"/>
+                <signal pad-key="pb2" index="5" function="ADC" group="ADC"/>
+                <signal pad-key="pb5" index="6" function="ADC" group="ADC"/>
+                <signal pad-key="pb6" index="7" function="ADC" group="ADC"/>
+                <signal pad-key="pc4" index="8" function="ADC" group="ADC"/>
+                <signal pad-key="pc5" index="9" function="ADC" group="ADC"/>
+                <signal pad-key="pc6" index="10" function="ADC" group="ADC"/>
             </signals>
         </peripheral>
         <peripheral key="linuart" name="LINUART" module-key="linuart">
             <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"/>
+                <signal pad-key="pd3" function="LIN" group="TXLIN"/>
+                <signal pad-key="pd4" function="LIN" group="RXLIN"/>
             </signals>
         </peripheral>
         <peripheral key="spi" name="SPI" module-key="spi">
             <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"/>
-                <signal pad-id="pb1" function="SPI" group="MOSI"/>
-                <signal pad-id="pd3" function="SPI_ALT" group="MOSI"/>
-                <signal pad-id="pb7" function="SPI" group="SCK"/>
-                <signal pad-id="pd4" function="SPI_ALT" group="SCK"/>
-                <signal pad-id="pd3" function="SPI" group="SS"/>
-                <signal pad-id="pc1" function="SPI_ALT" group="SS"/>
+                <signal pad-key="pb0" function="SPI" group="MISO"/>
+                <signal pad-key="pd2" function="SPI_ALT" group="MISO"/>
+                <signal pad-key="pb1" function="SPI" group="MOSI"/>
+                <signal pad-key="pd3" function="SPI_ALT" group="MOSI"/>
+                <signal pad-key="pb7" function="SPI" group="SCK"/>
+                <signal pad-key="pd4" function="SPI_ALT" group="SCK"/>
+                <signal pad-key="pd3" function="SPI" group="SS"/>
+                <signal pad-key="pc1" function="SPI_ALT" group="SS"/>
             </signals>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="wdt">
@@ -323,37 +323,37 @@
         <peripheral key="exint" name="EXINT" module-key="exint">
             <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"/>
-                <signal pad-id="pb5" index="2" function="EXINT" group="INT"/>
-                <signal pad-id="pc0" index="3" function="EXINT" group="INT"/>
-                <signal pad-id="pb0" index="0" function="EXINT" group="PCINT"/>
-                <signal pad-id="pb1" index="1" function="EXINT" group="PCINT"/>
-                <signal pad-id="pb2" index="2" function="EXINT" group="PCINT"/>
-                <signal pad-id="pb3" index="3" function="EXINT" group="PCINT"/>
-                <signal pad-id="pb4" index="4" function="EXINT" group="PCINT"/>
-                <signal pad-id="pb5" index="5" function="EXINT" group="PCINT"/>
-                <signal pad-id="pb6" index="6" function="EXINT" group="PCINT"/>
-                <signal pad-id="pb7" index="7" function="EXINT" group="PCINT"/>
-                <signal pad-id="pc0" index="8" function="EXINT" group="PCINT"/>
-                <signal pad-id="pc1" index="9" function="EXINT" group="PCINT"/>
-                <signal pad-id="pc2" index="10" function="EXINT" group="PCINT"/>
-                <signal pad-id="pc3" index="11" function="EXINT" group="PCINT"/>
-                <signal pad-id="pc4" index="12" function="EXINT" group="PCINT"/>
-                <signal pad-id="pc5" index="13" function="EXINT" group="PCINT"/>
-                <signal pad-id="pc6" index="14" function="EXINT" group="PCINT"/>
-                <signal pad-id="pc7" index="15" function="EXINT" group="PCINT"/>
-                <signal pad-id="pd0" index="16" function="EXINT" group="PCINT"/>
-                <signal pad-id="pd1" index="17" function="EXINT" group="PCINT"/>
-                <signal pad-id="pd2" index="18" function="EXINT" group="PCINT"/>
-                <signal pad-id="pd3" index="19" function="EXINT" group="PCINT"/>
-                <signal pad-id="pd4" index="20" function="EXINT" group="PCINT"/>
-                <signal pad-id="pd5" index="21" function="EXINT" group="PCINT"/>
-                <signal pad-id="pd6" index="22" function="EXINT" group="PCINT"/>
-                <signal pad-id="pd7" index="23" function="EXINT" group="PCINT"/>
-                <signal pad-id="pe0" index="24" function="EXINT" group="PCINT"/>
-                <signal pad-id="pe1" index="25" function="EXINT" group="PCINT"/>
-                <signal pad-id="pe2" index="26" function="EXINT" group="PCINT"/>
+                <signal pad-key="pd6" index="0" function="EXINT" group="INT"/>
+                <signal pad-key="pb2" index="1" function="EXINT" group="INT"/>
+                <signal pad-key="pb5" index="2" function="EXINT" group="INT"/>
+                <signal pad-key="pc0" index="3" function="EXINT" group="INT"/>
+                <signal pad-key="pb0" index="0" function="EXINT" group="PCINT"/>
+                <signal pad-key="pb1" index="1" function="EXINT" group="PCINT"/>
+                <signal pad-key="pb2" index="2" function="EXINT" group="PCINT"/>
+                <signal pad-key="pb3" index="3" function="EXINT" group="PCINT"/>
+                <signal pad-key="pb4" index="4" function="EXINT" group="PCINT"/>
+                <signal pad-key="pb5" index="5" function="EXINT" group="PCINT"/>
+                <signal pad-key="pb6" index="6" function="EXINT" group="PCINT"/>
+                <signal pad-key="pb7" index="7" function="EXINT" group="PCINT"/>
+                <signal pad-key="pc0" index="8" function="EXINT" group="PCINT"/>
+                <signal pad-key="pc1" index="9" function="EXINT" group="PCINT"/>
+                <signal pad-key="pc2" index="10" function="EXINT" group="PCINT"/>
+                <signal pad-key="pc3" index="11" function="EXINT" group="PCINT"/>
+                <signal pad-key="pc4" index="12" function="EXINT" group="PCINT"/>
+                <signal pad-key="pc5" index="13" function="EXINT" group="PCINT"/>
+                <signal pad-key="pc6" index="14" function="EXINT" group="PCINT"/>
+                <signal pad-key="pc7" index="15" function="EXINT" group="PCINT"/>
+                <signal pad-key="pd0" index="16" function="EXINT" group="PCINT"/>
+                <signal pad-key="pd1" index="17" function="EXINT" group="PCINT"/>
+                <signal pad-key="pd2" index="18" function="EXINT" group="PCINT"/>
+                <signal pad-key="pd3" index="19" function="EXINT" group="PCINT"/>
+                <signal pad-key="pd4" index="20" function="EXINT" group="PCINT"/>
+                <signal pad-key="pd5" index="21" function="EXINT" group="PCINT"/>
+                <signal pad-key="pd6" index="22" function="EXINT" group="PCINT"/>
+                <signal pad-key="pd7" index="23" function="EXINT" group="PCINT"/>
+                <signal pad-key="pe0" index="24" function="EXINT" group="PCINT"/>
+                <signal pad-key="pe1" index="25" function="EXINT" group="PCINT"/>
+                <signal pad-key="pe2" index="26" function="EXINT" group="PCINT"/>
             </signals>
         </peripheral>
         <peripheral key="eeprom" name="EEPROM" module-key="eeprom">
@@ -362,15 +362,15 @@
         <peripheral key="psc" name="PSC" module-key="psc">
             <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"/>
-                <signal pad-id="pb1" function="PSC" group="PSCOUT2B"/>
-                <signal pad-id="pc1" function="PSC" group="PSCIN1"/>
-                <signal pad-id="pc0" function="PSC" group="PSCOUT1A"/>
-                <signal pad-id="pb6" function="PSC" group="PSCOUT1B"/>
-                <signal pad-id="pd1" function="PSC" group="PSCIN0"/>
-                <signal pad-id="pd0" function="PSC" group="PSCOUT0A"/>
-                <signal pad-id="pb7" function="PSC" group="PSCOUT0B"/>
+                <signal pad-key="pd2" function="PSC" group="PSCIN2"/>
+                <signal pad-key="pb0" function="PSC" group="PSCOUT2A"/>
+                <signal pad-key="pb1" function="PSC" group="PSCOUT2B"/>
+                <signal pad-key="pc1" function="PSC" group="PSCIN1"/>
+                <signal pad-key="pc0" function="PSC" group="PSCOUT1A"/>
+                <signal pad-key="pb6" function="PSC" group="PSCOUT1B"/>
+                <signal pad-key="pd1" function="PSC" group="PSCIN0"/>
+                <signal pad-key="pd0" function="PSC" group="PSCOUT0A"/>
+                <signal pad-key="pb7" function="PSC" group="PSCOUT0B"/>
             </signals>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="fuse">
@@ -1038,44 +1038,78 @@
             </register-group>
         </module>
     </modules>
+    <pads>
+        <pad key="pd2" name="PD2"/>
+        <pad key="pd3" name="PD3"/>
+        <pad key="pc1" name="PC1"/>
+        <pad key="vcc" name="VCC"/>
+        <pad key="gnd" name="GND"/>
+        <pad key="pc2" name="PC2"/>
+        <pad key="pc3" name="PC3"/>
+        <pad key="pb0" name="PB0"/>
+        <pad key="pb1" name="PB1"/>
+        <pad key="pe1" name="PE1"/>
+        <pad key="pe2" name="PE2"/>
+        <pad key="pd4" name="PD4"/>
+        <pad key="pd5" name="PD5"/>
+        <pad key="pd6" name="PD6"/>
+        <pad key="pd7" name="PD7"/>
+        <pad key="pb2" name="PB2"/>
+        <pad key="pc4" name="PC4"/>
+        <pad key="pc5" name="PC5"/>
+        <pad key="avcc" name="AVCC"/>
+        <pad key="agnd" name="AGND"/>
+        <pad key="aref" name="AREF"/>
+        <pad key="pc6" name="PC6"/>
+        <pad key="pb3" name="PB3"/>
+        <pad key="pb4" name="PB4"/>
+        <pad key="pc7" name="PC7"/>
+        <pad key="pb5" name="PB5"/>
+        <pad key="pb6" name="PB6"/>
+        <pad key="pb7" name="PB7"/>
+        <pad key="pd0" name="PD0"/>
+        <pad key="pc0" name="PC0"/>
+        <pad key="pe0" name="PE0"/>
+        <pad key="pd1" name="PD1"/>
+    </pads>
     <pinouts>
         <pinout key="tqfpqfn32" name="TQFPQFN32" type="qfn">
-            <pin position="1" pad="PD2"/>
-            <pin position="2" pad="PD3"/>
-            <pin position="3" pad="PC1"/>
-            <pin position="4" pad="VCC"/>
-            <pin position="5" pad="GND"/>
-            <pin position="6" pad="PC2"/>
-            <pin position="7" pad="PC3"/>
-            <pin position="8" pad="PB0"/>
-            <pin position="9" pad="PB1"/>
-            <pin position="10" pad="PE1"/>
-            <pin position="11" pad="PE2"/>
-            <pin position="12" pad="PD4"/>
-            <pin position="13" pad="PD5"/>
-            <pin position="14" pad="PD6"/>
-            <pin position="15" pad="PD7"/>
-            <pin position="16" pad="PB2"/>
-            <pin position="17" pad="PC4"/>
-            <pin position="18" pad="PC5"/>
-            <pin position="19" pad="AVCC"/>
-            <pin position="20" pad="AGND"/>
-            <pin position="21" pad="AREF"/>
-            <pin position="22" pad="PC6"/>
-            <pin position="23" pad="PB3"/>
-            <pin position="24" pad="PB4"/>
-            <pin position="25" pad="PC7"/>
-            <pin position="26" pad="PB5"/>
-            <pin position="27" pad="PB6"/>
-            <pin position="28" pad="PB7"/>
-            <pin position="29" pad="PD0"/>
-            <pin position="30" pad="PC0"/>
-            <pin position="31" pad="PE0"/>
-            <pin position="32" pad="PD1"/>
+            <pin position="1" pad-key="pd2"/>
+            <pin position="2" pad-key="pd3"/>
+            <pin position="3" pad-key="pc1"/>
+            <pin position="4" pad-key="vcc"/>
+            <pin position="5" pad-key="gnd"/>
+            <pin position="6" pad-key="pc2"/>
+            <pin position="7" pad-key="pc3"/>
+            <pin position="8" pad-key="pb0"/>
+            <pin position="9" pad-key="pb1"/>
+            <pin position="10" pad-key="pe1"/>
+            <pin position="11" pad-key="pe2"/>
+            <pin position="12" pad-key="pd4"/>
+            <pin position="13" pad-key="pd5"/>
+            <pin position="14" pad-key="pd6"/>
+            <pin position="15" pad-key="pd7"/>
+            <pin position="16" pad-key="pb2"/>
+            <pin position="17" pad-key="pc4"/>
+            <pin position="18" pad-key="pc5"/>
+            <pin position="19" pad-key="avcc"/>
+            <pin position="20" pad-key="agnd"/>
+            <pin position="21" pad-key="aref"/>
+            <pin position="22" pad-key="pc6"/>
+            <pin position="23" pad-key="pb3"/>
+            <pin position="24" pad-key="pb4"/>
+            <pin position="25" pad-key="pc7"/>
+            <pin position="26" pad-key="pb5"/>
+            <pin position="27" pad-key="pb6"/>
+            <pin position="28" pad-key="pb7"/>
+            <pin position="29" pad-key="pd0"/>
+            <pin position="30" pad-key="pc0"/>
+            <pin position="31" pad-key="pe0"/>
+            <pin position="32" pad-key="pd1"/>
         </pinout>
     </pinouts>
     <variants>
-        <variant name="ATmega64M1-AU" pinout-key="tqfpqfn32" package="TQFP32"/>
-        <variant name="ATmega64M1-MU" pinout-key="tqfpqfn32" package="QFN32"/>
+        <variant key="atmega64m1_au" name="ATmega64M1-AU" pinout-key="tqfpqfn32"/>
+        <variant key="atmega64m1_mu" name="ATmega64M1-MU" pinout-key="tqfpqfn32"/>
     </variants>
 </device>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA64RFR2.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA64RFR2.xml
index c4ec097b..28dabb8b 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA64RFR2.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA64RFR2.xml
@@ -218,64 +218,63 @@
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pb2" index="2" function="PORTB" group="P"/>
-                <signal pad-id="pb3" index="3" function="PORTB" group="P"/>
-                <signal pad-id="pb4" index="4" function="PORTB" group="P"/>
-                <signal pad-id="pb5" index="5" function="PORTB" group="P"/>
-                <signal pad-id="pb6" index="6" function="PORTB" group="P"/>
-                <signal pad-id="pb7" index="7" function="PORTB" group="P"/>
+                <signal pad-key="pb0" index="0" function="PORTB" group="P"/>
+                <signal pad-key="pb1" index="1" function="PORTB" group="P"/>
+                <signal pad-key="pb2" index="2" function="PORTB" group="P"/>
+                <signal pad-key="pb3" index="3" function="PORTB" group="P"/>
+                <signal pad-key="pb4" index="4" function="PORTB" group="P"/>
+                <signal pad-key="pb5" index="5" function="PORTB" group="P"/>
+                <signal pad-key="pb6" index="6" function="PORTB" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pd2" index="2" function="PORTD" group="P"/>
-                <signal pad-id="pd3" index="3" function="PORTD" group="P"/>
-                <signal pad-id="pd4" index="4" function="PORTD" group="P"/>
-                <signal pad-id="pd5" index="5" function="PORTD" group="P"/>
-                <signal pad-id="pd6" index="6" function="PORTD" group="P"/>
-                <signal pad-id="pd7" index="7" function="PORTD" group="P"/>
+                <signal pad-key="pd0" index="0" function="PORTD" group="P"/>
+                <signal pad-key="pd1" index="1" function="PORTD" group="P"/>
+                <signal pad-key="pd2" index="2" function="PORTD" group="P"/>
+                <signal pad-key="pd3" index="3" function="PORTD" group="P"/>
+                <signal pad-key="pd4" index="4" function="PORTD" group="P"/>
+                <signal pad-key="pd5" index="5" function="PORTD" group="P"/>
+                <signal pad-key="pd6" index="6" function="PORTD" group="P"/>
+                <signal pad-key="pd7" index="7" function="PORTD" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="porte" name="PORTE" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pe2" index="2" function="PORTE" group="P"/>
-                <signal pad-id="pe3" index="3" function="PORTE" group="P"/>
-                <signal pad-id="pe4" index="4" function="PORTE" group="P"/>
-                <signal pad-id="pe5" index="5" function="PORTE" group="P"/>
-                <signal pad-id="pe6" index="6" function="PORTE" group="P"/>
-                <signal pad-id="pe7" index="7" function="PORTE" group="P"/>
+                <signal pad-key="pe0" index="0" function="PORTE" group="P"/>
+                <signal pad-key="pe1" index="1" function="PORTE" group="P"/>
+                <signal pad-key="pe2" index="2" function="PORTE" group="P"/>
+                <signal pad-key="pe3" index="3" function="PORTE" group="P"/>
+                <signal pad-key="pe4" index="4" function="PORTE" group="P"/>
+                <signal pad-key="pe5" index="5" function="PORTE" group="P"/>
+                <signal pad-key="pe6" index="6" function="PORTE" group="P"/>
+                <signal pad-key="pe7" index="7" function="PORTE" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portf" name="PORTF" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pf2" index="2" function="PORTF" group="P"/>
-                <signal pad-id="pf3" index="3" function="PORTF" group="P"/>
-                <signal pad-id="pf4" index="4" function="PORTF" group="P"/>
-                <signal pad-id="pf5" index="5" function="PORTF" group="P"/>
-                <signal pad-id="pf6" index="6" function="PORTF" group="P"/>
-                <signal pad-id="pf7" index="7" function="PORTF" group="P"/>
+                <signal pad-key="pf0" index="0" function="PORTF" group="P"/>
+                <signal pad-key="pf1" index="1" function="PORTF" group="P"/>
+                <signal pad-key="pf2" index="2" function="PORTF" group="P"/>
+                <signal pad-key="pf3" index="3" function="PORTF" group="P"/>
+                <signal pad-key="pf4" index="4" function="PORTF" group="P"/>
+                <signal pad-key="pf5" index="5" function="PORTF" group="P"/>
+                <signal pad-key="pf6" index="6" function="PORTF" group="P"/>
+                <signal pad-key="pf7" index="7" function="PORTF" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portg" name="PORTG" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pg2" index="2" function="PORTG" group="P"/>
-                <signal pad-id="pg3" index="3" function="PORTG" group="P"/>
-                <signal pad-id="pg4" index="4" function="PORTG" group="P"/>
-                <signal pad-id="pg5" index="5" function="PORTG" group="P"/>
+                <signal pad-key="pg0" index="0" function="PORTG" group="P"/>
+                <signal pad-key="pg1" index="1" function="PORTG" group="P"/>
+                <signal pad-key="pg2" index="2" function="PORTG" group="P"/>
+                <signal pad-key="pg3" index="3" function="PORTG" group="P"/>
+                <signal pad-key="pg4" index="4" function="PORTG" group="P"/>
+                <signal pad-key="pg5" index="5" function="PORTG" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="tc0" name="TC0" module-key="tc8">
@@ -1545,78 +1544,134 @@
             </register-group>
         </module>
     </modules>
+    <pads>
+        <pad key="pf2" name="PF2"/>
+        <pad key="pf3" name="PF3"/>
+        <pad key="pf4" name="PF4"/>
+        <pad key="pf5" name="PF5"/>
+        <pad key="pf6" name="PF6"/>
+        <pad key="pf7" name="PF7"/>
+        <pad key="avss_rfp" name="AVSS_RFP"/>
+        <pad key="rfp" name="RFP"/>
+        <pad key="rfn" name="RFN"/>
+        <pad key="avss_rfn" name="AVSS_RFN"/>
+        <pad key="tst" name="TST"/>
+        <pad key="rstn" name="RSTN"/>
+        <pad key="rston" name="RSTON"/>
+        <pad key="pg0" name="PG0"/>
+        <pad key="pg1" name="PG1"/>
+        <pad key="pg2" name="PG2"/>
+        <pad key="pg3" name="PG3"/>
+        <pad key="pg4" name="PG4"/>
+        <pad key="pg5" name="PG5"/>
+        <pad key="dvss" name="DVSS"/>
+        <pad key="dvdd" name="DVDD"/>
+        <pad key="devdd" name="DEVDD"/>
+        <pad key="pd0" name="PD0"/>
+        <pad key="pd1" name="PD1"/>
+        <pad key="pd2" name="PD2"/>
+        <pad key="pd3" name="PD3"/>
+        <pad key="pd4" name="PD4"/>
+        <pad key="pd5" name="PD5"/>
+        <pad key="pd6" name="PD6"/>
+        <pad key="pd7" name="PD7"/>
+        <pad key="clki" name="CLKI"/>
+        <pad key="pb0" name="PB0"/>
+        <pad key="pb1" name="PB1"/>
+        <pad key="pb2" name="PB2"/>
+        <pad key="pb3" name="PB3"/>
+        <pad key="pb4" name="PB4"/>
+        <pad key="pb5" name="PB5"/>
+        <pad key="pb6" name="PB6"/>
+        <pad key="pe7" name="PE7"/>
+        <pad key="pe0" name="PE0"/>
+        <pad key="pe1" name="PE1"/>
+        <pad key="pe2" name="PE2"/>
+        <pad key="pe3" name="PE3"/>
+        <pad key="pe4" name="PE4"/>
+        <pad key="pe5" name="PE5"/>
+        <pad key="pe6" name="PE6"/>
+        <pad key="xtal2" name="XTAL2"/>
+        <pad key="xtal1" name="XTAL1"/>
+        <pad key="avss" name="AVSS"/>
+        <pad key="evdd" name="EVDD"/>
+        <pad key="avdd" name="AVDD"/>
+        <pad key="aref" name="AREF"/>
+        <pad key="pf0" name="PF0"/>
+        <pad key="pf1" name="PF1"/>
+    </pads>
     <pinouts>
         <pinout key="qfn64" name="QFN64" type="qfn">
-            <pin position="1" pad="PF2"/>
-            <pin position="2" pad="PF3"/>
-            <pin position="3" pad="PF4"/>
-            <pin position="4" pad="PF5"/>
-            <pin position="5" pad="PF6"/>
-            <pin position="6" pad="PF7"/>
-            <pin position="7" pad="AVSS_RFP"/>
-            <pin position="8" pad="RFP"/>
-            <pin position="9" pad="RFN"/>
-            <pin position="10" pad="AVSS_RFN"/>
-            <pin position="11" pad="TST"/>
-            <pin position="12" pad="RSTN"/>
-            <pin position="13" pad="RSTON"/>
-            <pin position="14" pad="PG0"/>
-            <pin position="15" pad="PG1"/>
-            <pin position="16" pad="PG2"/>
-            <pin position="17" pad="PG3"/>
-            <pin position="18" pad="PG4"/>
-            <pin position="19" pad="PG5"/>
-            <pin position="20" pad="DVSS"/>
-            <pin position="21" pad="DVDD"/>
-            <pin position="22" pad="DVDD"/>
-            <pin position="23" pad="DEVDD"/>
-            <pin position="24" pad="DVSS"/>
-            <pin position="25" pad="PD0"/>
-            <pin position="26" pad="PD1"/>
-            <pin position="27" pad="PD2"/>
-            <pin position="28" pad="PD3"/>
-            <pin position="29" pad="PD4"/>
-            <pin position="30" pad="PD5"/>
-            <pin position="31" pad="PD6"/>
-            <pin position="32" pad="PD7"/>
-            <pin position="33" pad="CLKI"/>
-            <pin position="34" pad="DEVDD"/>
-            <pin position="35" pad="DVSS"/>
-            <pin position="36" pad="PB0"/>
-            <pin position="37" pad="PB1"/>
-            <pin position="38" pad="PB2"/>
-            <pin position="39" pad="PB3"/>
-            <pin position="40" pad="PB4"/>
-            <pin position="41" pad="PB5"/>
-            <pin position="42" pad="PB6"/>
-            <pin position="43" pad="PE7"/>
-            <pin position="44" pad="DEVDD"/>
-            <pin position="45" pad="DVSS"/>
-            <pin position="46" pad="PE0"/>
-            <pin position="47" pad="PE1"/>
-            <pin position="48" pad="PE2"/>
-            <pin position="49" pad="PE3"/>
-            <pin position="50" pad="PE4"/>
-            <pin position="51" pad="PE5"/>
-            <pin position="52" pad="PE6"/>
-            <pin position="53" pad="PE7"/>
-            <pin position="54" pad="DEVDD"/>
-            <pin position="55" pad="DVSS"/>
-            <pin position="56" pad="XTAL2"/>
-            <pin position="57" pad="XTAL1"/>
-            <pin position="58" pad="AVSS"/>
-            <pin position="59" pad="EVDD"/>
-            <pin position="60" pad="AVDD"/>
-            <pin position="61" pad="AVSS"/>
-            <pin position="62" pad="AREF"/>
-            <pin position="63" pad="PF0"/>
-            <pin position="64" pad="PF1"/>
+            <pin position="1" pad-key="pf2"/>
+            <pin position="2" pad-key="pf3"/>
+            <pin position="3" pad-key="pf4"/>
+            <pin position="4" pad-key="pf5"/>
+            <pin position="5" pad-key="pf6"/>
+            <pin position="6" pad-key="pf7"/>
+            <pin position="7" pad-key="avss_rfp"/>
+            <pin position="8" pad-key="rfp"/>
+            <pin position="9" pad-key="rfn"/>
+            <pin position="10" pad-key="avss_rfn"/>
+            <pin position="11" pad-key="tst"/>
+            <pin position="12" pad-key="rstn"/>
+            <pin position="13" pad-key="rston"/>
+            <pin position="14" pad-key="pg0"/>
+            <pin position="15" pad-key="pg1"/>
+            <pin position="16" pad-key="pg2"/>
+            <pin position="17" pad-key="pg3"/>
+            <pin position="18" pad-key="pg4"/>
+            <pin position="19" pad-key="pg5"/>
+            <pin position="20" pad-key="dvss"/>
+            <pin position="21" pad-key="dvdd"/>
+            <pin position="22" pad-key="dvdd"/>
+            <pin position="23" pad-key="devdd"/>
+            <pin position="24" pad-key="dvss"/>
+            <pin position="25" pad-key="pd0"/>
+            <pin position="26" pad-key="pd1"/>
+            <pin position="27" pad-key="pd2"/>
+            <pin position="28" pad-key="pd3"/>
+            <pin position="29" pad-key="pd4"/>
+            <pin position="30" pad-key="pd5"/>
+            <pin position="31" pad-key="pd6"/>
+            <pin position="32" pad-key="pd7"/>
+            <pin position="33" pad-key="clki"/>
+            <pin position="34" pad-key="devdd"/>
+            <pin position="35" pad-key="dvss"/>
+            <pin position="36" pad-key="pb0"/>
+            <pin position="37" pad-key="pb1"/>
+            <pin position="38" pad-key="pb2"/>
+            <pin position="39" pad-key="pb3"/>
+            <pin position="40" pad-key="pb4"/>
+            <pin position="41" pad-key="pb5"/>
+            <pin position="42" pad-key="pb6"/>
+            <pin position="43" pad-key="pe7"/>
+            <pin position="44" pad-key="devdd"/>
+            <pin position="45" pad-key="dvss"/>
+            <pin position="46" pad-key="pe0"/>
+            <pin position="47" pad-key="pe1"/>
+            <pin position="48" pad-key="pe2"/>
+            <pin position="49" pad-key="pe3"/>
+            <pin position="50" pad-key="pe4"/>
+            <pin position="51" pad-key="pe5"/>
+            <pin position="52" pad-key="pe6"/>
+            <pin position="53" pad-key="pe7"/>
+            <pin position="54" pad-key="devdd"/>
+            <pin position="55" pad-key="dvss"/>
+            <pin position="56" pad-key="xtal2"/>
+            <pin position="57" pad-key="xtal1"/>
+            <pin position="58" pad-key="avss"/>
+            <pin position="59" pad-key="evdd"/>
+            <pin position="60" pad-key="avdd"/>
+            <pin position="61" pad-key="avss"/>
+            <pin position="62" pad-key="aref"/>
+            <pin position="63" pad-key="pf0"/>
+            <pin position="64" pad-key="pf1"/>
         </pinout>
     </pinouts>
     <variants>
-        <variant name="ATmega64RFR2-ZU" pinout-key="qfn64" package="QFN64"/>
-        <variant name="ATmega64RFR2-ZUR" pinout-key="qfn64" package="QFN64"/>
-        <variant name="ATmega64RFR2-ZF" pinout-key="qfn64" package="QFN64"/>
-        <variant name="ATmega64RFR2-ZFR" pinout-key="qfn64" package="QFN64"/>
+        <variant key="atmega64rfr2_zu" name="ATmega64RFR2-ZU" pinout-key="qfn64"/>
+        <variant key="atmega64rfr2_zur" name="ATmega64RFR2-ZUR" pinout-key="qfn64"/>
+        <variant key="atmega64rfr2_zf" name="ATmega64RFR2-ZF" pinout-key="qfn64"/>
+        <variant key="atmega64rfr2_zfr" name="ATmega64RFR2-ZFR" pinout-key="qfn64"/>
     </variants>
 </device>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA808.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA808.xml
index 66f1dfd3..bc495ef3 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA808.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA808.xml
@@ -45,31 +45,31 @@
         <peripheral key="ac0" name="AC0" module-key="i2106">
             <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"/>
-                <signal pad-id="pd7" index="2" function="AC0" group="N"/>
-                <signal pad-id="pa7" index="0" function="AC0" group="OUT"/>
-                <signal pad-id="pd2" index="0" function="AC0" group="P"/>
-                <signal pad-id="pd4" index="1" function="AC0" group="P"/>
-                <signal pad-id="pd6" index="2" function="AC0" group="P"/>
-                <signal pad-id="pd1" index="3" function="AC0" group="P"/>
+                <signal pad-key="pd3" index="0" function="AC0" group="N"/>
+                <signal pad-key="pd5" index="1" function="AC0" group="N"/>
+                <signal pad-key="pd7" index="2" function="AC0" group="N"/>
+                <signal pad-key="pa7" index="0" function="AC0" group="OUT"/>
+                <signal pad-key="pd2" index="0" function="AC0" group="P"/>
+                <signal pad-key="pd4" index="1" function="AC0" group="P"/>
+                <signal pad-key="pd6" index="2" function="AC0" group="P"/>
+                <signal pad-key="pd1" index="3" function="AC0" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="adc0" name="ADC0" module-key="i2132">
             <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"/>
-                <signal pad-id="pd2" index="2" function="AIN0" group="AIN"/>
-                <signal pad-id="pd3" index="3" function="AIN0" group="AIN"/>
-                <signal pad-id="pd4" index="4" function="AIN0" group="AIN"/>
-                <signal pad-id="pd5" index="5" function="AIN0" group="AIN"/>
-                <signal pad-id="pd6" index="6" function="AIN0" group="AIN"/>
-                <signal pad-id="pd7" index="7" function="AIN0" group="AIN"/>
-                <signal pad-id="pf2" index="12" function="AIN0" group="AIN"/>
-                <signal pad-id="pf3" index="13" function="AIN0" group="AIN"/>
-                <signal pad-id="pf4" index="14" function="AIN0" group="AIN"/>
-                <signal pad-id="pf5" index="15" function="AIN0" group="AIN"/>
+                <signal pad-key="pd0" index="0" function="AIN0" group="AIN"/>
+                <signal pad-key="pd1" index="1" function="AIN0" group="AIN"/>
+                <signal pad-key="pd2" index="2" function="AIN0" group="AIN"/>
+                <signal pad-key="pd3" index="3" function="AIN0" group="AIN"/>
+                <signal pad-key="pd4" index="4" function="AIN0" group="AIN"/>
+                <signal pad-key="pd5" index="5" function="AIN0" group="AIN"/>
+                <signal pad-key="pd6" index="6" function="AIN0" group="AIN"/>
+                <signal pad-key="pd7" index="7" function="AIN0" group="AIN"/>
+                <signal pad-key="pf2" index="12" function="AIN0" group="AIN"/>
+                <signal pad-key="pf3" index="13" function="AIN0" group="AIN"/>
+                <signal pad-key="pf4" index="14" function="AIN0" group="AIN"/>
+                <signal pad-key="pf5" index="15" function="AIN0" group="AIN"/>
             </signals>
         </peripheral>
         <peripheral key="bod" name="BOD" module-key="i2114">
@@ -78,34 +78,34 @@
         <peripheral key="ccl" name="CCL" module-key="i2128">
             <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"/>
-                <signal pad-id="pa2" index="2" function="CCL" group="LUT0_IN" field="PORTMUX.CCLROUTEA.LUT0"/>
-                <signal pad-id="pa6" index="0" function="CCL_ALT" group="LUT0_OUT" field="PORTMUX.CCLROUTEA.LUT0"/>
-                <signal pad-id="pa3" index="0" function="CCL" group="LUT0_OUT" field="PORTMUX.CCLROUTEA.LUT0"/>
-                <signal pad-id="pc0" index="0" function="CCL" group="LUT1_IN" field="PORTMUX.CCLROUTEA.LUT1"/>
-                <signal pad-id="pc1" index="1" function="CCL" group="LUT1_IN" field="PORTMUX.CCLROUTEA.LUT1"/>
-                <signal pad-id="pc2" index="2" function="CCL" group="LUT1_IN" field="PORTMUX.CCLROUTEA.LUT1"/>
-                <signal pad-id="pc3" index="0" function="CCL" group="LUT1_OUT" field="PORTMUX.CCLROUTEA.LUT1"/>
-                <signal pad-id="pd0" index="0" function="CCL" group="LUT2_IN" field="PORTMUX.CCLROUTEA.LUT2"/>
-                <signal pad-id="pd1" index="1" function="CCL" group="LUT2_IN" field="PORTMUX.CCLROUTEA.LUT2"/>
-                <signal pad-id="pd2" index="2" function="CCL" group="LUT2_IN" field="PORTMUX.CCLROUTEA.LUT2"/>
-                <signal pad-id="pd3" index="0" function="CCL" group="LUT2_OUT" field="PORTMUX.CCLROUTEA.LUT2"/>
-                <signal pad-id="pd6" index="1" function="CCL_ALT" group="LUT2_OUT" field="PORTMUX.CCLROUTEA.LUT2"/>
-                <signal pad-id="pf0" index="0" function="CCL" group="LUT3_IN" field="PORTMUX.CCLROUTEA.LUT3"/>
-                <signal pad-id="pf1" index="1" function="CCL" group="LUT3_IN" field="PORTMUX.CCLROUTEA.LUT3"/>
-                <signal pad-id="pf2" index="2" function="CCL" group="LUT3_IN" field="PORTMUX.CCLROUTEA.LUT3"/>
-                <signal pad-id="pf6" index="1" function="CCL_ALT" group="LUT3_OUT" field="PORTMUX.CCLROUTEA.LUT3"/>
-                <signal pad-id="pf3" index="1" function="CCL" group="LUT3_OUT" field="PORTMUX.CCLROUTEA.LUT3"/>
+                <signal pad-key="pa0" index="0" function="CCL" group="LUT0_IN" field="PORTMUX.CCLROUTEA.LUT0"/>
+                <signal pad-key="pa1" index="1" function="CCL" group="LUT0_IN" field="PORTMUX.CCLROUTEA.LUT0"/>
+                <signal pad-key="pa2" index="2" function="CCL" group="LUT0_IN" field="PORTMUX.CCLROUTEA.LUT0"/>
+                <signal pad-key="pa6" index="0" function="CCL_ALT" group="LUT0_OUT" field="PORTMUX.CCLROUTEA.LUT0"/>
+                <signal pad-key="pa3" index="0" function="CCL" group="LUT0_OUT" field="PORTMUX.CCLROUTEA.LUT0"/>
+                <signal pad-key="pc0" index="0" function="CCL" group="LUT1_IN" field="PORTMUX.CCLROUTEA.LUT1"/>
+                <signal pad-key="pc1" index="1" function="CCL" group="LUT1_IN" field="PORTMUX.CCLROUTEA.LUT1"/>
+                <signal pad-key="pc2" index="2" function="CCL" group="LUT1_IN" field="PORTMUX.CCLROUTEA.LUT1"/>
+                <signal pad-key="pc3" index="0" function="CCL" group="LUT1_OUT" field="PORTMUX.CCLROUTEA.LUT1"/>
+                <signal pad-key="pd0" index="0" function="CCL" group="LUT2_IN" field="PORTMUX.CCLROUTEA.LUT2"/>
+                <signal pad-key="pd1" index="1" function="CCL" group="LUT2_IN" field="PORTMUX.CCLROUTEA.LUT2"/>
+                <signal pad-key="pd2" index="2" function="CCL" group="LUT2_IN" field="PORTMUX.CCLROUTEA.LUT2"/>
+                <signal pad-key="pd3" index="0" function="CCL" group="LUT2_OUT" field="PORTMUX.CCLROUTEA.LUT2"/>
+                <signal pad-key="pd6" index="1" function="CCL_ALT" group="LUT2_OUT" field="PORTMUX.CCLROUTEA.LUT2"/>
+                <signal pad-key="pf0" index="0" function="CCL" group="LUT3_IN" field="PORTMUX.CCLROUTEA.LUT3"/>
+                <signal pad-key="pf1" index="1" function="CCL" group="LUT3_IN" field="PORTMUX.CCLROUTEA.LUT3"/>
+                <signal pad-key="pf2" index="2" function="CCL" group="LUT3_IN" field="PORTMUX.CCLROUTEA.LUT3"/>
+                <signal pad-key="pf6" index="1" function="CCL_ALT" group="LUT3_OUT" field="PORTMUX.CCLROUTEA.LUT3"/>
+                <signal pad-key="pf3" index="1" function="CCL" group="LUT3_OUT" field="PORTMUX.CCLROUTEA.LUT3"/>
             </signals>
         </peripheral>
         <peripheral key="clkctrl" name="CLKCTRL" module-key="i2113">
             <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"/>
-                <signal pad-id="pf0" function="CLKCTRL" group="TOSC1"/>
-                <signal pad-id="pf1" function="CLKCTRL" group="TOSC2"/>
+                <signal pad-key="pa0" function="CLKCTRL" group="CLKI"/>
+                <signal pad-key="pa7" function="CLKCTRL" group="CLKO"/>
+                <signal pad-key="pf0" function="CLKCTRL" group="TOSC1"/>
+                <signal pad-key="pf1" function="CLKCTRL" group="TOSC2"/>
             </signals>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="i2100">
@@ -120,12 +120,12 @@
         <peripheral key="evsys" name="EVSYS" module-key="i2118">
             <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"/>
-                <signal pad-id="pc2" index="2" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUT2"/>
-                <signal pad-id="pd7" index="3" function="EVSYS_ALT" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUT3"/>
-                <signal pad-id="pd2" index="3" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUT3"/>
-                <signal pad-id="pf2" index="5" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUT5"/>
+                <signal pad-key="pa7" index="0" function="EVSYS_ALT" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUT0"/>
+                <signal pad-key="pa2" index="0" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUT0"/>
+                <signal pad-key="pc2" index="2" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUT2"/>
+                <signal pad-key="pd7" index="3" function="EVSYS_ALT" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUT3"/>
+                <signal pad-key="pd2" index="3" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUT3"/>
+                <signal pad-key="pf2" index="5" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUT5"/>
             </signals>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="i2600_fuse">
@@ -143,48 +143,48 @@
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pa2" index="2" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa3" index="3" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa4" index="4" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa5" index="5" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa6" index="6" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa7" index="7" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa0" index="0" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa1" index="1" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa2" index="2" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa3" index="3" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa4" index="4" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa5" index="5" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa6" index="6" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa7" index="7" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pc2" index="2" function="IOPORT" group="PIN"/>
-                <signal pad-id="pc3" index="3" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc0" index="0" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc1" index="1" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc2" index="2" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc3" index="3" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pd2" index="2" function="IOPORT" group="PIN"/>
-                <signal pad-id="pd3" index="3" function="IOPORT" group="PIN"/>
-                <signal pad-id="pd4" index="4" function="IOPORT" group="PIN"/>
-                <signal pad-id="pd5" index="5" function="IOPORT" group="PIN"/>
-                <signal pad-id="pd6" index="6" function="IOPORT" group="PIN"/>
-                <signal pad-id="pd7" index="7" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd0" index="0" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd1" index="1" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd2" index="2" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd3" index="3" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd4" index="4" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd5" index="5" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd6" index="6" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd7" index="7" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="portf" name="PORTF" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pf2" index="2" function="IOPORT" group="PIN"/>
-                <signal pad-id="pf3" index="3" function="IOPORT" group="PIN"/>
-                <signal pad-id="pf4" index="4" function="IOPORT" group="PIN"/>
-                <signal pad-id="pf5" index="5" function="IOPORT" group="PIN"/>
-                <signal pad-id="pf6" index="6" function="IOPORT" group="PIN"/>
+                <signal pad-key="pf0" index="0" function="IOPORT" group="PIN"/>
+                <signal pad-key="pf1" index="1" function="IOPORT" group="PIN"/>
+                <signal pad-key="pf2" index="2" function="IOPORT" group="PIN"/>
+                <signal pad-key="pf3" index="3" function="IOPORT" group="PIN"/>
+                <signal pad-key="pf4" index="4" function="IOPORT" group="PIN"/>
+                <signal pad-key="pf5" index="5" function="IOPORT" group="PIN"/>
+                <signal pad-key="pf6" index="6" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="portmux" name="PORTMUX" module-key="i2600_portmux">
@@ -193,7 +193,7 @@
         <peripheral key="rstctrl" name="RSTCTRL" module-key="i2111">
             <register-group-instance register-group-key="rstctrl" address-space-key="data" offset="0x40"/>
             <signals>
-                <signal pad-id="pf6" function="OTHER" group="RESET"/>
+                <signal pad-key="pf6" function="OTHER" group="RESET"/>
             </signals>
         </peripheral>
         <peripheral key="rtc" name="RTC" module-key="i2116">
@@ -208,14 +208,14 @@
         <peripheral key="spi0" name="SPI0" module-key="i2107">
             <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"/>
-                <signal pad-id="pc0" function="SPI_ALT" group="MOSI" field="PORTMUX.TWISPIROUTEA.SPI0"/>
-                <signal pad-id="pa4" function="SPI" group="MOSI" field="PORTMUX.TWISPIROUTEA.SPI0"/>
-                <signal pad-id="pc2" function="SPI_ALT" group="SCK" field="PORTMUX.TWISPIROUTEA.SPI0"/>
-                <signal pad-id="pa6" function="SPI" group="SCK" field="PORTMUX.TWISPIROUTEA.SPI0"/>
-                <signal pad-id="pc3" function="SPI_ALT" group="SS" field="PORTMUX.TWISPIROUTEA.SPI0"/>
-                <signal pad-id="pa7" function="SPI" group="SS" field="PORTMUX.TWISPIROUTEA.SPI0"/>
+                <signal pad-key="pc1" function="SPI_ALT" group="MISO" field="PORTMUX.TWISPIROUTEA.SPI0"/>
+                <signal pad-key="pa5" function="SPI" group="MISO" field="PORTMUX.TWISPIROUTEA.SPI0"/>
+                <signal pad-key="pc0" function="SPI_ALT" group="MOSI" field="PORTMUX.TWISPIROUTEA.SPI0"/>
+                <signal pad-key="pa4" function="SPI" group="MOSI" field="PORTMUX.TWISPIROUTEA.SPI0"/>
+                <signal pad-key="pc2" function="SPI_ALT" group="SCK" field="PORTMUX.TWISPIROUTEA.SPI0"/>
+                <signal pad-key="pa6" function="SPI" group="SCK" field="PORTMUX.TWISPIROUTEA.SPI0"/>
+                <signal pad-key="pc3" function="SPI_ALT" group="SS" field="PORTMUX.TWISPIROUTEA.SPI0"/>
+                <signal pad-key="pa7" function="SPI" group="SS" field="PORTMUX.TWISPIROUTEA.SPI0"/>
             </signals>
         </peripheral>
         <peripheral key="syscfg" name="SYSCFG" module-key="i2600_syscfg">
@@ -224,93 +224,93 @@
         <peripheral key="tca0" name="TCA0" module-key="i2117">
             <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"/>
-                <signal pad-id="pc0" index="0" function="TCA_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pa0" index="0" function="TCA" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pf1" index="1" function="TCA_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pd1" index="1" function="TCA_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pc1" index="1" function="TCA_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pa1" index="1" function="TCA" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pf2" index="2" function="TCA_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pd2" index="2" function="TCA_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pc2" index="2" function="TCA_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pa2" index="2" function="TCA" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pf3" index="3" function="TCA_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pd3" index="3" function="TCA_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pc3" index="3" function="TCA_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pa3" index="3" function="TCA" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pf4" index="4" function="TCA_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pd4" index="4" function="TCA_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pa4" index="4" function="TCA" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pf5" index="5" function="TCA_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pd5" index="5" function="TCA_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pa5" index="5" function="TCA" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pf0" index="0" function="TCA_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pd0" index="0" function="TCA_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pc0" index="0" function="TCA_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pa0" index="0" function="TCA" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pf1" index="1" function="TCA_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pd1" index="1" function="TCA_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pc1" index="1" function="TCA_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pa1" index="1" function="TCA" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pf2" index="2" function="TCA_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pd2" index="2" function="TCA_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pc2" index="2" function="TCA_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pa2" index="2" function="TCA" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pf3" index="3" function="TCA_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pd3" index="3" function="TCA_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pc3" index="3" function="TCA_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pa3" index="3" function="TCA" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pf4" index="4" function="TCA_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pd4" index="4" function="TCA_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pa4" index="4" function="TCA" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pf5" index="5" function="TCA_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pd5" index="5" function="TCA_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pa5" index="5" function="TCA" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
             </signals>
         </peripheral>
         <peripheral key="tcb0" name="TCB0" module-key="i2119">
             <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"/>
+                <signal pad-key="pf4" index="0" function="TCB0_ALT" group="WO" field="PORTMUX.TCBROUTEA.TCB0"/>
+                <signal pad-key="pa2" index="0" function="TCB0" group="WO" field="PORTMUX.TCBROUTEA.TCB0"/>
             </signals>
         </peripheral>
         <peripheral key="tcb1" name="TCB1" module-key="i2119">
             <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"/>
+                <signal pad-key="pf5" index="0" function="TCB1_ALT" group="WO" field="PORTMUX.TCBROUTEA.TCB1"/>
+                <signal pad-key="pa3" index="0" function="TCB1" group="WO" field="PORTMUX.TCBROUTEA.TCB1"/>
             </signals>
         </peripheral>
         <peripheral key="tcb2" name="TCB2" module-key="i2119">
             <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"/>
+                <signal pad-key="pc0" index="0" function="TCB2" group="WO" field="PORTMUX.TCBROUTEA.TCB2"/>
             </signals>
         </peripheral>
         <peripheral key="twi0" name="TWI0" module-key="i2110">
             <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"/>
-                <signal pad-id="pa3" function="I2C" group="SCL" field="PORTMUX.TWISPIROUTEA.TWI0"/>
-                <signal pad-id="pf2" function="I2C_ALT2" group="SDA" field="PORTMUX.TWISPIROUTEA.TWI0"/>
-                <signal pad-id="pc2" function="I2C_ALT" group="SDA" field="PORTMUX.TWISPIROUTEA.TWI0"/>
-                <signal pad-id="pa2" function="I2C" group="SDA" field="PORTMUX.TWISPIROUTEA.TWI0"/>
+                <signal pad-key="pf3" function="I2C_ALT2" group="SCL" field="PORTMUX.TWISPIROUTEA.TWI0"/>
+                <signal pad-key="pc3" function="I2C_ALT" group="SCL" field="PORTMUX.TWISPIROUTEA.TWI0"/>
+                <signal pad-key="pa3" function="I2C" group="SCL" field="PORTMUX.TWISPIROUTEA.TWI0"/>
+                <signal pad-key="pf2" function="I2C_ALT2" group="SDA" field="PORTMUX.TWISPIROUTEA.TWI0"/>
+                <signal pad-key="pc2" function="I2C_ALT" group="SDA" field="PORTMUX.TWISPIROUTEA.TWI0"/>
+                <signal pad-key="pa2" function="I2C" group="SDA" field="PORTMUX.TWISPIROUTEA.TWI0"/>
             </signals>
         </peripheral>
         <peripheral key="usart0" name="USART0" module-key="i2108">
             <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"/>
-                <signal pad-id="pa4" function="USART0_ALT" group="TXD" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pa0" function="USART0" group="TXD" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pa6" function="USART0_ALT" group="XCK" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pa2" function="USART0" group="XCK" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pa7" function="USART0_ALT" group="XDIR" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pa3" function="USART0" group="XDIR" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa5" function="USART0_ALT" group="RXD" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa1" function="USART0" group="RXD" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa4" function="USART0_ALT" group="TXD" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa0" function="USART0" group="TXD" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa6" function="USART0_ALT" group="XCK" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa2" function="USART0" group="XCK" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa7" function="USART0_ALT" group="XDIR" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa3" function="USART0" group="XDIR" field="PORTMUX.USARTROUTEA.USART0"/>
             </signals>
         </peripheral>
         <peripheral key="usart1" name="USART1" module-key="i2108">
             <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"/>
-                <signal pad-id="pc2" function="USART1" group="XCK" field="PORTMUX.USARTROUTEA.USART1"/>
-                <signal pad-id="pc3" function="USART1" group="XDIR" field="PORTMUX.USARTROUTEA.USART1"/>
+                <signal pad-key="pc1" function="USART1" group="RXD" field="PORTMUX.USARTROUTEA.USART1"/>
+                <signal pad-key="pc0" function="USART1" group="TXD" field="PORTMUX.USARTROUTEA.USART1"/>
+                <signal pad-key="pc2" function="USART1" group="XCK" field="PORTMUX.USARTROUTEA.USART1"/>
+                <signal pad-key="pc3" function="USART1" group="XDIR" field="PORTMUX.USARTROUTEA.USART1"/>
             </signals>
         </peripheral>
         <peripheral key="usart2" name="USART2" module-key="i2108">
             <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"/>
-                <signal pad-id="pf4" function="USART2_ALT" group="TXD" field="PORTMUX.USARTROUTEA.USART2"/>
-                <signal pad-id="pf0" function="USART2" group="TXD" field="PORTMUX.USARTROUTEA.USART2"/>
-                <signal pad-id="pf6" function="USART2_ALT" group="XCK" field="PORTMUX.USARTROUTEA.USART2"/>
-                <signal pad-id="pf2" function="USART2" group="XCK" field="PORTMUX.USARTROUTEA.USART2"/>
-                <signal pad-id="pf3" function="USART2" group="XDIR" field="PORTMUX.USARTROUTEA.USART2"/>
+                <signal pad-key="pf5" function="USART2_ALT" group="RXD" field="PORTMUX.USARTROUTEA.USART2"/>
+                <signal pad-key="pf1" function="USART2" group="RXD" field="PORTMUX.USARTROUTEA.USART2"/>
+                <signal pad-key="pf4" function="USART2_ALT" group="TXD" field="PORTMUX.USARTROUTEA.USART2"/>
+                <signal pad-key="pf0" function="USART2" group="TXD" field="PORTMUX.USARTROUTEA.USART2"/>
+                <signal pad-key="pf6" function="USART2_ALT" group="XCK" field="PORTMUX.USARTROUTEA.USART2"/>
+                <signal pad-key="pf2" function="USART2" group="XCK" field="PORTMUX.USARTROUTEA.USART2"/>
+                <signal pad-key="pf3" function="USART2" group="XDIR" field="PORTMUX.USARTROUTEA.USART2"/>
             </signals>
         </peripheral>
         <peripheral key="userrow" name="USERROW" module-key="i2603">
@@ -1368,109 +1368,143 @@
             </register-group>
         </module>
     </modules>
+    <pads>
+        <pad key="pa3" name="PA3"/>
+        <pad key="pa4" name="PA4"/>
+        <pad key="pa5" name="PA5"/>
+        <pad key="pa6" name="PA6"/>
+        <pad key="pa7" name="PA7"/>
+        <pad key="pc0" name="PC0"/>
+        <pad key="pc1" name="PC1"/>
+        <pad key="pc2" name="PC2"/>
+        <pad key="pc3" name="PC3"/>
+        <pad key="pd0" name="PD0"/>
+        <pad key="pd1" name="PD1"/>
+        <pad key="pd2" name="PD2"/>
+        <pad key="pd3" name="PD3"/>
+        <pad key="pd4" name="PD4"/>
+        <pad key="pd5" name="PD5"/>
+        <pad key="pd6" name="PD6"/>
+        <pad key="pd7" name="PD7"/>
+        <pad key="avdd" name="AVDD"/>
+        <pad key="gnd0" name="GND0"/>
+        <pad key="pf0" name="PF0"/>
+        <pad key="pf1" name="PF1"/>
+        <pad key="pf2" name="PF2"/>
+        <pad key="pf3" name="PF3"/>
+        <pad key="pf4" name="PF4"/>
+        <pad key="pf5" name="PF5"/>
+        <pad key="pf6" name="PF6"/>
+        <pad key="updi" name="UPDI"/>
+        <pad key="vdd0" name="VDD0"/>
+        <pad key="gnd1" name="GND1"/>
+        <pad key="pa0" name="PA0"/>
+        <pad key="pa1" name="PA1"/>
+        <pad key="pa2" name="PA2"/>
+    </pads>
     <pinouts>
         <pinout key="qfn32" name="QFN32" type="qfn">
-            <pin position="1" pad="PA3"/>
-            <pin position="2" pad="PA4"/>
-            <pin position="3" pad="PA5"/>
-            <pin position="4" pad="PA6"/>
-            <pin position="5" pad="PA7"/>
-            <pin position="6" pad="PC0"/>
-            <pin position="7" pad="PC1"/>
-            <pin position="8" pad="PC2"/>
-            <pin position="9" pad="PC3"/>
-            <pin position="10" pad="PD0"/>
-            <pin position="11" pad="PD1"/>
-            <pin position="12" pad="PD2"/>
-            <pin position="13" pad="PD3"/>
-            <pin position="14" pad="PD4"/>
-            <pin position="15" pad="PD5"/>
-            <pin position="16" pad="PD6"/>
-            <pin position="17" pad="PD7"/>
-            <pin position="18" pad="AVDD"/>
-            <pin position="19" pad="GND0"/>
-            <pin position="20" pad="PF0"/>
-            <pin position="21" pad="PF1"/>
-            <pin position="22" pad="PF2"/>
-            <pin position="23" pad="PF3"/>
-            <pin position="24" pad="PF4"/>
-            <pin position="25" pad="PF5"/>
-            <pin position="26" pad="PF6"/>
-            <pin position="27" pad="UPDI"/>
-            <pin position="28" pad="VDD0"/>
-            <pin position="29" pad="GND1"/>
-            <pin position="30" pad="PA0"/>
-            <pin position="31" pad="PA1"/>
-            <pin position="32" pad="PA2"/>
+            <pin position="1" pad-key="pa3"/>
+            <pin position="2" pad-key="pa4"/>
+            <pin position="3" pad-key="pa5"/>
+            <pin position="4" pad-key="pa6"/>
+            <pin position="5" pad-key="pa7"/>
+            <pin position="6" pad-key="pc0"/>
+            <pin position="7" pad-key="pc1"/>
+            <pin position="8" pad-key="pc2"/>
+            <pin position="9" pad-key="pc3"/>
+            <pin position="10" pad-key="pd0"/>
+            <pin position="11" pad-key="pd1"/>
+            <pin position="12" pad-key="pd2"/>
+            <pin position="13" pad-key="pd3"/>
+            <pin position="14" pad-key="pd4"/>
+            <pin position="15" pad-key="pd5"/>
+            <pin position="16" pad-key="pd6"/>
+            <pin position="17" pad-key="pd7"/>
+            <pin position="18" pad-key="avdd"/>
+            <pin position="19" pad-key="gnd0"/>
+            <pin position="20" pad-key="pf0"/>
+            <pin position="21" pad-key="pf1"/>
+            <pin position="22" pad-key="pf2"/>
+            <pin position="23" pad-key="pf3"/>
+            <pin position="24" pad-key="pf4"/>
+            <pin position="25" pad-key="pf5"/>
+            <pin position="26" pad-key="pf6"/>
+            <pin position="27" pad-key="updi"/>
+            <pin position="28" pad-key="vdd0"/>
+            <pin position="29" pad-key="gnd1"/>
+            <pin position="30" pad-key="pa0"/>
+            <pin position="31" pad-key="pa1"/>
+            <pin position="32" pad-key="pa2"/>
         </pinout>
         <pinout key="qfp32" name="QFP32" type="qfp">
-            <pin position="1" pad="PA3"/>
-            <pin position="2" pad="PA4"/>
-            <pin position="3" pad="PA5"/>
-            <pin position="4" pad="PA6"/>
-            <pin position="5" pad="PA7"/>
-            <pin position="6" pad="PC0"/>
-            <pin position="7" pad="PC1"/>
-            <pin position="8" pad="PC2"/>
-            <pin position="9" pad="PC3"/>
-            <pin position="10" pad="PD0"/>
-            <pin position="11" pad="PD1"/>
-            <pin position="12" pad="PD2"/>
-            <pin position="13" pad="PD3"/>
-            <pin position="14" pad="PD4"/>
-            <pin position="15" pad="PD5"/>
-            <pin position="16" pad="PD6"/>
-            <pin position="17" pad="PD7"/>
-            <pin position="18" pad="AVDD"/>
-            <pin position="19" pad="GND0"/>
-            <pin position="20" pad="PF0"/>
-            <pin position="21" pad="PF1"/>
-            <pin position="22" pad="PF2"/>
-            <pin position="23" pad="PF3"/>
-            <pin position="24" pad="PF4"/>
-            <pin position="25" pad="PF5"/>
-            <pin position="26" pad="PF6"/>
-            <pin position="27" pad="UPDI"/>
-            <pin position="28" pad="VDD0"/>
-            <pin position="29" pad="GND1"/>
-            <pin position="30" pad="PA0"/>
-            <pin position="31" pad="PA1"/>
-            <pin position="32" pad="PA2"/>
+            <pin position="1" pad-key="pa3"/>
+            <pin position="2" pad-key="pa4"/>
+            <pin position="3" pad-key="pa5"/>
+            <pin position="4" pad-key="pa6"/>
+            <pin position="5" pad-key="pa7"/>
+            <pin position="6" pad-key="pc0"/>
+            <pin position="7" pad-key="pc1"/>
+            <pin position="8" pad-key="pc2"/>
+            <pin position="9" pad-key="pc3"/>
+            <pin position="10" pad-key="pd0"/>
+            <pin position="11" pad-key="pd1"/>
+            <pin position="12" pad-key="pd2"/>
+            <pin position="13" pad-key="pd3"/>
+            <pin position="14" pad-key="pd4"/>
+            <pin position="15" pad-key="pd5"/>
+            <pin position="16" pad-key="pd6"/>
+            <pin position="17" pad-key="pd7"/>
+            <pin position="18" pad-key="avdd"/>
+            <pin position="19" pad-key="gnd0"/>
+            <pin position="20" pad-key="pf0"/>
+            <pin position="21" pad-key="pf1"/>
+            <pin position="22" pad-key="pf2"/>
+            <pin position="23" pad-key="pf3"/>
+            <pin position="24" pad-key="pf4"/>
+            <pin position="25" pad-key="pf5"/>
+            <pin position="26" pad-key="pf6"/>
+            <pin position="27" pad-key="updi"/>
+            <pin position="28" pad-key="vdd0"/>
+            <pin position="29" pad-key="gnd1"/>
+            <pin position="30" pad-key="pa0"/>
+            <pin position="31" pad-key="pa1"/>
+            <pin position="32" pad-key="pa2"/>
         </pinout>
         <pinout key="ssop28" name="SSOP28" type="ssop">
-            <pin position="1" pad="PA7"/>
-            <pin position="2" pad="PC0"/>
-            <pin position="3" pad="PC1"/>
-            <pin position="4" pad="PC2"/>
-            <pin position="5" pad="PC3"/>
-            <pin position="6" pad="PD0"/>
-            <pin position="7" pad="PD1"/>
-            <pin position="8" pad="PD2"/>
-            <pin position="9" pad="PD3"/>
-            <pin position="10" pad="PD4"/>
-            <pin position="11" pad="PD5"/>
-            <pin position="12" pad="PD6"/>
-            <pin position="13" pad="PD7"/>
-            <pin position="14" pad="AVDD"/>
-            <pin position="15" pad="GND0"/>
-            <pin position="16" pad="PF0"/>
-            <pin position="17" pad="PF1"/>
-            <pin position="18" pad="PF6"/>
-            <pin position="19" pad="UPDI"/>
-            <pin position="20" pad="VDD0"/>
-            <pin position="21" pad="GND1"/>
-            <pin position="22" pad="PA0"/>
-            <pin position="23" pad="PA1"/>
-            <pin position="24" pad="PA2"/>
-            <pin position="25" pad="PA3"/>
-            <pin position="26" pad="PA4"/>
-            <pin position="27" pad="PA5"/>
-            <pin position="28" pad="PA6"/>
+            <pin position="1" pad-key="pa7"/>
+            <pin position="2" pad-key="pc0"/>
+            <pin position="3" pad-key="pc1"/>
+            <pin position="4" pad-key="pc2"/>
+            <pin position="5" pad-key="pc3"/>
+            <pin position="6" pad-key="pd0"/>
+            <pin position="7" pad-key="pd1"/>
+            <pin position="8" pad-key="pd2"/>
+            <pin position="9" pad-key="pd3"/>
+            <pin position="10" pad-key="pd4"/>
+            <pin position="11" pad-key="pd5"/>
+            <pin position="12" pad-key="pd6"/>
+            <pin position="13" pad-key="pd7"/>
+            <pin position="14" pad-key="avdd"/>
+            <pin position="15" pad-key="gnd0"/>
+            <pin position="16" pad-key="pf0"/>
+            <pin position="17" pad-key="pf1"/>
+            <pin position="18" pad-key="pf6"/>
+            <pin position="19" pad-key="updi"/>
+            <pin position="20" pad-key="vdd0"/>
+            <pin position="21" pad-key="gnd1"/>
+            <pin position="22" pad-key="pa0"/>
+            <pin position="23" pad-key="pa1"/>
+            <pin position="24" pad-key="pa2"/>
+            <pin position="25" pad-key="pa3"/>
+            <pin position="26" pad-key="pa4"/>
+            <pin position="27" pad-key="pa5"/>
+            <pin position="28" pad-key="pa6"/>
         </pinout>
     </pinouts>
     <variants>
-        <variant name="ATmega808-AFR" pinout-key="qfp32" package="TQFP32"/>
-        <variant name="ATmega808-MFR" pinout-key="qfn32" package="VQFN32"/>
-        <variant name="ATmega808-XFR" pinout-key="ssop28" package="SSOP28"/>
+        <variant key="atmega808_afr" name="ATmega808-AFR" pinout-key="qfp32"/>
+        <variant key="atmega808_mfr" name="ATmega808-MFR" pinout-key="qfn32"/>
+        <variant key="atmega808_xfr" name="ATmega808-XFR" pinout-key="ssop28"/>
     </variants>
 </device>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA809.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA809.xml
index 99139282..6364ae47 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA809.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA809.xml
@@ -45,35 +45,35 @@
         <peripheral key="ac0" name="AC0" module-key="i2106">
             <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"/>
-                <signal pad-id="pd7" index="2" function="AC0" group="N"/>
-                <signal pad-id="pa7" index="0" function="AC0" group="OUT"/>
-                <signal pad-id="pd2" index="0" function="AC0" group="P"/>
-                <signal pad-id="pd4" index="1" function="AC0" group="P"/>
-                <signal pad-id="pd6" index="2" function="AC0" group="P"/>
-                <signal pad-id="pd1" index="3" function="AC0" group="P"/>
+                <signal pad-key="pd3" index="0" function="AC0" group="N"/>
+                <signal pad-key="pd5" index="1" function="AC0" group="N"/>
+                <signal pad-key="pd7" index="2" function="AC0" group="N"/>
+                <signal pad-key="pa7" index="0" function="AC0" group="OUT"/>
+                <signal pad-key="pd2" index="0" function="AC0" group="P"/>
+                <signal pad-key="pd4" index="1" function="AC0" group="P"/>
+                <signal pad-key="pd6" index="2" function="AC0" group="P"/>
+                <signal pad-key="pd1" index="3" function="AC0" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="adc0" name="ADC0" module-key="i2132">
             <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"/>
-                <signal pad-id="pd2" index="2" function="AIN0" group="AIN"/>
-                <signal pad-id="pd3" index="3" function="AIN0" group="AIN"/>
-                <signal pad-id="pd4" index="4" function="AIN0" group="AIN"/>
-                <signal pad-id="pd5" index="5" function="AIN0" group="AIN"/>
-                <signal pad-id="pd6" index="6" function="AIN0" group="AIN"/>
-                <signal pad-id="pd7" index="7" function="AIN0" group="AIN"/>
-                <signal pad-id="pe0" index="8" function="AIN0" group="AIN"/>
-                <signal pad-id="pe1" index="9" function="AIN0" group="AIN"/>
-                <signal pad-id="pe2" index="10" function="AIN0" group="AIN"/>
-                <signal pad-id="pe3" index="11" function="AIN0" group="AIN"/>
-                <signal pad-id="pf2" index="12" function="AIN0" group="AIN"/>
-                <signal pad-id="pf3" index="13" function="AIN0" group="AIN"/>
-                <signal pad-id="pf4" index="14" function="AIN0" group="AIN"/>
-                <signal pad-id="pf5" index="15" function="AIN0" group="AIN"/>
+                <signal pad-key="pd0" index="0" function="AIN0" group="AIN"/>
+                <signal pad-key="pd1" index="1" function="AIN0" group="AIN"/>
+                <signal pad-key="pd2" index="2" function="AIN0" group="AIN"/>
+                <signal pad-key="pd3" index="3" function="AIN0" group="AIN"/>
+                <signal pad-key="pd4" index="4" function="AIN0" group="AIN"/>
+                <signal pad-key="pd5" index="5" function="AIN0" group="AIN"/>
+                <signal pad-key="pd6" index="6" function="AIN0" group="AIN"/>
+                <signal pad-key="pd7" index="7" function="AIN0" group="AIN"/>
+                <signal pad-key="pe0" index="8" function="AIN0" group="AIN"/>
+                <signal pad-key="pe1" index="9" function="AIN0" group="AIN"/>
+                <signal pad-key="pe2" index="10" function="AIN0" group="AIN"/>
+                <signal pad-key="pe3" index="11" function="AIN0" group="AIN"/>
+                <signal pad-key="pf2" index="12" function="AIN0" group="AIN"/>
+                <signal pad-key="pf3" index="13" function="AIN0" group="AIN"/>
+                <signal pad-key="pf4" index="14" function="AIN0" group="AIN"/>
+                <signal pad-key="pf5" index="15" function="AIN0" group="AIN"/>
             </signals>
         </peripheral>
         <peripheral key="bod" name="BOD" module-key="i2114">
@@ -82,35 +82,35 @@
         <peripheral key="ccl" name="CCL" module-key="i2128">
             <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"/>
-                <signal pad-id="pa2" index="2" function="CCL" group="LUT0_IN" field="PORTMUX.CCLROUTEA.LUT0"/>
-                <signal pad-id="pa6" index="0" function="CCL_ALT" group="LUT0_OUT" field="PORTMUX.CCLROUTEA.LUT0"/>
-                <signal pad-id="pa3" index="0" function="CCL" group="LUT0_OUT" field="PORTMUX.CCLROUTEA.LUT0"/>
-                <signal pad-id="pc0" index="0" function="CCL" group="LUT1_IN" field="PORTMUX.CCLROUTEA.LUT1"/>
-                <signal pad-id="pc1" index="1" function="CCL" group="LUT1_IN" field="PORTMUX.CCLROUTEA.LUT1"/>
-                <signal pad-id="pc2" index="2" function="CCL" group="LUT1_IN" field="PORTMUX.CCLROUTEA.LUT1"/>
-                <signal pad-id="pc6" index="0" function="CCL_ALT" group="LUT1_OUT" field="PORTMUX.CCLROUTEA.LUT1"/>
-                <signal pad-id="pc3" index="0" function="CCL" group="LUT1_OUT" field="PORTMUX.CCLROUTEA.LUT1"/>
-                <signal pad-id="pd0" index="0" function="CCL" group="LUT2_IN" field="PORTMUX.CCLROUTEA.LUT2"/>
-                <signal pad-id="pd1" index="1" function="CCL" group="LUT2_IN" field="PORTMUX.CCLROUTEA.LUT2"/>
-                <signal pad-id="pd2" index="2" function="CCL" group="LUT2_IN" field="PORTMUX.CCLROUTEA.LUT2"/>
-                <signal pad-id="pd3" index="0" function="CCL" group="LUT2_OUT" field="PORTMUX.CCLROUTEA.LUT2"/>
-                <signal pad-id="pd6" index="1" function="CCL_ALT" group="LUT2_OUT" field="PORTMUX.CCLROUTEA.LUT2"/>
-                <signal pad-id="pf0" index="0" function="CCL" group="LUT3_IN" field="PORTMUX.CCLROUTEA.LUT3"/>
-                <signal pad-id="pf1" index="1" function="CCL" group="LUT3_IN" field="PORTMUX.CCLROUTEA.LUT3"/>
-                <signal pad-id="pf2" index="2" function="CCL" group="LUT3_IN" field="PORTMUX.CCLROUTEA.LUT3"/>
-                <signal pad-id="pf6" index="1" function="CCL_ALT" group="LUT3_OUT" field="PORTMUX.CCLROUTEA.LUT3"/>
-                <signal pad-id="pf3" index="1" function="CCL" group="LUT3_OUT" field="PORTMUX.CCLROUTEA.LUT3"/>
+                <signal pad-key="pa0" index="0" function="CCL" group="LUT0_IN" field="PORTMUX.CCLROUTEA.LUT0"/>
+                <signal pad-key="pa1" index="1" function="CCL" group="LUT0_IN" field="PORTMUX.CCLROUTEA.LUT0"/>
+                <signal pad-key="pa2" index="2" function="CCL" group="LUT0_IN" field="PORTMUX.CCLROUTEA.LUT0"/>
+                <signal pad-key="pa6" index="0" function="CCL_ALT" group="LUT0_OUT" field="PORTMUX.CCLROUTEA.LUT0"/>
+                <signal pad-key="pa3" index="0" function="CCL" group="LUT0_OUT" field="PORTMUX.CCLROUTEA.LUT0"/>
+                <signal pad-key="pc0" index="0" function="CCL" group="LUT1_IN" field="PORTMUX.CCLROUTEA.LUT1"/>
+                <signal pad-key="pc1" index="1" function="CCL" group="LUT1_IN" field="PORTMUX.CCLROUTEA.LUT1"/>
+                <signal pad-key="pc2" index="2" function="CCL" group="LUT1_IN" field="PORTMUX.CCLROUTEA.LUT1"/>
+                <signal pad-key="pc6" index="0" function="CCL_ALT" group="LUT1_OUT" field="PORTMUX.CCLROUTEA.LUT1"/>
+                <signal pad-key="pc3" index="0" function="CCL" group="LUT1_OUT" field="PORTMUX.CCLROUTEA.LUT1"/>
+                <signal pad-key="pd0" index="0" function="CCL" group="LUT2_IN" field="PORTMUX.CCLROUTEA.LUT2"/>
+                <signal pad-key="pd1" index="1" function="CCL" group="LUT2_IN" field="PORTMUX.CCLROUTEA.LUT2"/>
+                <signal pad-key="pd2" index="2" function="CCL" group="LUT2_IN" field="PORTMUX.CCLROUTEA.LUT2"/>
+                <signal pad-key="pd3" index="0" function="CCL" group="LUT2_OUT" field="PORTMUX.CCLROUTEA.LUT2"/>
+                <signal pad-key="pd6" index="1" function="CCL_ALT" group="LUT2_OUT" field="PORTMUX.CCLROUTEA.LUT2"/>
+                <signal pad-key="pf0" index="0" function="CCL" group="LUT3_IN" field="PORTMUX.CCLROUTEA.LUT3"/>
+                <signal pad-key="pf1" index="1" function="CCL" group="LUT3_IN" field="PORTMUX.CCLROUTEA.LUT3"/>
+                <signal pad-key="pf2" index="2" function="CCL" group="LUT3_IN" field="PORTMUX.CCLROUTEA.LUT3"/>
+                <signal pad-key="pf6" index="1" function="CCL_ALT" group="LUT3_OUT" field="PORTMUX.CCLROUTEA.LUT3"/>
+                <signal pad-key="pf3" index="1" function="CCL" group="LUT3_OUT" field="PORTMUX.CCLROUTEA.LUT3"/>
             </signals>
         </peripheral>
         <peripheral key="clkctrl" name="CLKCTRL" module-key="i2113">
             <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"/>
-                <signal pad-id="pf0" function="CLKCTRL" group="TOSC1"/>
-                <signal pad-id="pf1" function="CLKCTRL" group="TOSC2"/>
+                <signal pad-key="pa0" function="CLKCTRL" group="CLKI"/>
+                <signal pad-key="pa7" function="CLKCTRL" group="CLKO"/>
+                <signal pad-key="pf0" function="CLKCTRL" group="TOSC1"/>
+                <signal pad-key="pf1" function="CLKCTRL" group="TOSC2"/>
             </signals>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="i2100">
@@ -125,15 +125,15 @@
         <peripheral key="evsys" name="EVSYS" module-key="i2118">
             <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"/>
-                <signal pad-id="pb2" index="1" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUT1"/>
-                <signal pad-id="pc7" index="2" function="EVSYS_ALT" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUT2"/>
-                <signal pad-id="pc2" index="2" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUT2"/>
-                <signal pad-id="pd7" index="3" function="EVSYS_ALT" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUT3"/>
-                <signal pad-id="pd2" index="3" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUT3"/>
-                <signal pad-id="pe2" index="4" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUT4"/>
-                <signal pad-id="pf2" index="5" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUT5"/>
+                <signal pad-key="pa7" index="0" function="EVSYS_ALT" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUT0"/>
+                <signal pad-key="pa2" index="0" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUT0"/>
+                <signal pad-key="pb2" index="1" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUT1"/>
+                <signal pad-key="pc7" index="2" function="EVSYS_ALT" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUT2"/>
+                <signal pad-key="pc2" index="2" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUT2"/>
+                <signal pad-key="pd7" index="3" function="EVSYS_ALT" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUT3"/>
+                <signal pad-key="pd2" index="3" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUT3"/>
+                <signal pad-key="pe2" index="4" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUT4"/>
+                <signal pad-key="pf2" index="5" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUT5"/>
             </signals>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="i2600_fuse">
@@ -151,72 +151,72 @@
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pa2" index="2" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa3" index="3" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa4" index="4" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa5" index="5" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa6" index="6" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa7" index="7" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa0" index="0" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa1" index="1" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa2" index="2" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa3" index="3" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa4" index="4" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa5" index="5" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa6" index="6" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa7" index="7" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pb2" index="2" function="IOPORT" group="PIN"/>
-                <signal pad-id="pb3" index="3" function="IOPORT" group="PIN"/>
-                <signal pad-id="pb4" index="4" function="IOPORT" group="PIN"/>
-                <signal pad-id="pb5" index="5" function="IOPORT" group="PIN"/>
+                <signal pad-key="pb0" index="0" function="IOPORT" group="PIN"/>
+                <signal pad-key="pb1" index="1" function="IOPORT" group="PIN"/>
+                <signal pad-key="pb2" index="2" function="IOPORT" group="PIN"/>
+                <signal pad-key="pb3" index="3" function="IOPORT" group="PIN"/>
+                <signal pad-key="pb4" index="4" function="IOPORT" group="PIN"/>
+                <signal pad-key="pb5" index="5" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pc2" index="2" function="IOPORT" group="PIN"/>
-                <signal pad-id="pc3" index="3" function="IOPORT" group="PIN"/>
-                <signal pad-id="pc4" index="4" function="IOPORT" group="PIN"/>
-                <signal pad-id="pc5" index="5" function="IOPORT" group="PIN"/>
-                <signal pad-id="pc6" index="6" function="IOPORT" group="PIN"/>
-                <signal pad-id="pc7" index="7" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc0" index="0" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc1" index="1" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc2" index="2" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc3" index="3" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc4" index="4" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc5" index="5" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc6" index="6" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc7" index="7" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pd2" index="2" function="IOPORT" group="PIN"/>
-                <signal pad-id="pd3" index="3" function="IOPORT" group="PIN"/>
-                <signal pad-id="pd4" index="4" function="IOPORT" group="PIN"/>
-                <signal pad-id="pd5" index="5" function="IOPORT" group="PIN"/>
-                <signal pad-id="pd6" index="6" function="IOPORT" group="PIN"/>
-                <signal pad-id="pd7" index="7" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd0" index="0" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd1" index="1" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd2" index="2" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd3" index="3" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd4" index="4" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd5" index="5" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd6" index="6" function="IOPORT" group="PIN"/>
+                <signal pad-key="pd7" index="7" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="porte" name="PORTE" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pe2" index="2" function="IOPORT" group="PIN"/>
-                <signal pad-id="pe3" index="3" function="IOPORT" group="PIN"/>
+                <signal pad-key="pe0" index="0" function="IOPORT" group="PIN"/>
+                <signal pad-key="pe1" index="1" function="IOPORT" group="PIN"/>
+                <signal pad-key="pe2" index="2" function="IOPORT" group="PIN"/>
+                <signal pad-key="pe3" index="3" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="portf" name="PORTF" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pf2" index="2" function="IOPORT" group="PIN"/>
-                <signal pad-id="pf3" index="3" function="IOPORT" group="PIN"/>
-                <signal pad-id="pf4" index="4" function="IOPORT" group="PIN"/>
-                <signal pad-id="pf5" index="5" function="IOPORT" group="PIN"/>
-                <signal pad-id="pf6" index="6" function="IOPORT" group="PIN"/>
+                <signal pad-key="pf0" index="0" function="IOPORT" group="PIN"/>
+                <signal pad-key="pf1" index="1" function="IOPORT" group="PIN"/>
+                <signal pad-key="pf2" index="2" function="IOPORT" group="PIN"/>
+                <signal pad-key="pf3" index="3" function="IOPORT" group="PIN"/>
+                <signal pad-key="pf4" index="4" function="IOPORT" group="PIN"/>
+                <signal pad-key="pf5" index="5" function="IOPORT" group="PIN"/>
+                <signal pad-key="pf6" index="6" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="portmux" name="PORTMUX" module-key="i2600_portmux">
@@ -225,7 +225,7 @@
         <peripheral key="rstctrl" name="RSTCTRL" module-key="i2111">
             <register-group-instance register-group-key="rstctrl" address-space-key="data" offset="0x40"/>
             <signals>
-                <signal pad-id="pf6" function="OTHER" group="RESET"/>
+                <signal pad-key="pf6" function="OTHER" group="RESET"/>
             </signals>
         </peripheral>
         <peripheral key="rtc" name="RTC" module-key="i2116">
@@ -240,18 +240,18 @@
         <peripheral key="spi0" name="SPI0" module-key="i2107">
             <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"/>
-                <signal pad-id="pa5" function="SPI" group="MISO" field="PORTMUX.TWISPIROUTEA.SPI0"/>
-                <signal pad-id="pe0" function="SPI_ALT2" group="MOSI" field="PORTMUX.TWISPIROUTEA.SPI0"/>
-                <signal pad-id="pc0" function="SPI_ALT" group="MOSI" field="PORTMUX.TWISPIROUTEA.SPI0"/>
-                <signal pad-id="pa4" function="SPI" group="MOSI" field="PORTMUX.TWISPIROUTEA.SPI0"/>
-                <signal pad-id="pe2" function="SPI_ALT2" group="SCK" field="PORTMUX.TWISPIROUTEA.SPI0"/>
-                <signal pad-id="pc2" function="SPI_ALT" group="SCK" field="PORTMUX.TWISPIROUTEA.SPI0"/>
-                <signal pad-id="pa6" function="SPI" group="SCK" field="PORTMUX.TWISPIROUTEA.SPI0"/>
-                <signal pad-id="pe3" function="SPI_ALT2" group="SS" field="PORTMUX.TWISPIROUTEA.SPI0"/>
-                <signal pad-id="pc3" function="SPI_ALT" group="SS" field="PORTMUX.TWISPIROUTEA.SPI0"/>
-                <signal pad-id="pa7" function="SPI" group="SS" field="PORTMUX.TWISPIROUTEA.SPI0"/>
+                <signal pad-key="pe1" function="SPI_ALT2" group="MISO" field="PORTMUX.TWISPIROUTEA.SPI0"/>
+                <signal pad-key="pc1" function="SPI_ALT" group="MISO" field="PORTMUX.TWISPIROUTEA.SPI0"/>
+                <signal pad-key="pa5" function="SPI" group="MISO" field="PORTMUX.TWISPIROUTEA.SPI0"/>
+                <signal pad-key="pe0" function="SPI_ALT2" group="MOSI" field="PORTMUX.TWISPIROUTEA.SPI0"/>
+                <signal pad-key="pc0" function="SPI_ALT" group="MOSI" field="PORTMUX.TWISPIROUTEA.SPI0"/>
+                <signal pad-key="pa4" function="SPI" group="MOSI" field="PORTMUX.TWISPIROUTEA.SPI0"/>
+                <signal pad-key="pe2" function="SPI_ALT2" group="SCK" field="PORTMUX.TWISPIROUTEA.SPI0"/>
+                <signal pad-key="pc2" function="SPI_ALT" group="SCK" field="PORTMUX.TWISPIROUTEA.SPI0"/>
+                <signal pad-key="pa6" function="SPI" group="SCK" field="PORTMUX.TWISPIROUTEA.SPI0"/>
+                <signal pad-key="pe3" function="SPI_ALT2" group="SS" field="PORTMUX.TWISPIROUTEA.SPI0"/>
+                <signal pad-key="pc3" function="SPI_ALT" group="SS" field="PORTMUX.TWISPIROUTEA.SPI0"/>
+                <signal pad-key="pa7" function="SPI" group="SS" field="PORTMUX.TWISPIROUTEA.SPI0"/>
             </signals>
         </peripheral>
         <peripheral key="syscfg" name="SYSCFG" module-key="i2600_syscfg">
@@ -260,128 +260,128 @@
         <peripheral key="tca0" name="TCA0" module-key="i2117">
             <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"/>
-                <signal pad-id="pd0" index="0" function="TCA_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pc0" index="0" function="TCA_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pb0" index="0" function="TCA_ALT" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pa0" index="0" function="TCA" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pf1" index="1" function="TCA_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pe1" index="1" function="TCA_ALT4" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pd1" index="1" function="TCA_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pc1" index="1" function="TCA_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pb1" index="1" function="TCA_ALT" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pa1" index="1" function="TCA" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pf2" index="2" function="TCA_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pe2" index="2" function="TCA_ALT4" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pd2" index="2" function="TCA_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pc2" index="2" function="TCA_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pb2" index="2" function="TCA_ALT" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pa2" index="2" function="TCA" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pf3" index="3" function="TCA_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pe3" index="3" function="TCA_ALT4" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pd3" index="3" function="TCA_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pc3" index="3" function="TCA_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pb3" index="3" function="TCA_ALT" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pa3" index="3" function="TCA" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pf4" index="4" function="TCA_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pd4" index="4" function="TCA_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pc4" index="4" function="TCA_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pb4" index="4" function="TCA_ALT" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pa4" index="4" function="TCA" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pf5" index="5" function="TCA_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pd5" index="5" function="TCA_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pc5" index="5" function="TCA_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pb5" index="5" function="TCA_ALT" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pa5" index="5" function="TCA" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pf0" index="0" function="TCA_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pe0" index="0" function="TCA_ALT4" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pd0" index="0" function="TCA_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pc0" index="0" function="TCA_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pb0" index="0" function="TCA_ALT" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pa0" index="0" function="TCA" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pf1" index="1" function="TCA_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pe1" index="1" function="TCA_ALT4" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pd1" index="1" function="TCA_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pc1" index="1" function="TCA_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pb1" index="1" function="TCA_ALT" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pa1" index="1" function="TCA" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pf2" index="2" function="TCA_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pe2" index="2" function="TCA_ALT4" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pd2" index="2" function="TCA_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pc2" index="2" function="TCA_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pb2" index="2" function="TCA_ALT" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pa2" index="2" function="TCA" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pf3" index="3" function="TCA_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pe3" index="3" function="TCA_ALT4" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pd3" index="3" function="TCA_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pc3" index="3" function="TCA_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pb3" index="3" function="TCA_ALT" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pa3" index="3" function="TCA" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pf4" index="4" function="TCA_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pd4" index="4" function="TCA_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pc4" index="4" function="TCA_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pb4" index="4" function="TCA_ALT" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pa4" index="4" function="TCA" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pf5" index="5" function="TCA_ALT5" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pd5" index="5" function="TCA_ALT3" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pc5" index="5" function="TCA_ALT2" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pb5" index="5" function="TCA_ALT" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pa5" index="5" function="TCA" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
             </signals>
         </peripheral>
         <peripheral key="tcb0" name="TCB0" module-key="i2119">
             <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"/>
+                <signal pad-key="pf4" index="0" function="TCB0_ALT" group="WO" field="PORTMUX.TCBROUTEA.TCB0"/>
+                <signal pad-key="pa2" index="0" function="TCB0" group="WO" field="PORTMUX.TCBROUTEA.TCB0"/>
             </signals>
         </peripheral>
         <peripheral key="tcb1" name="TCB1" module-key="i2119">
             <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"/>
+                <signal pad-key="pf5" index="0" function="TCB1_ALT" group="WO" field="PORTMUX.TCBROUTEA.TCB1"/>
+                <signal pad-key="pa3" index="0" function="TCB1" group="WO" field="PORTMUX.TCBROUTEA.TCB1"/>
             </signals>
         </peripheral>
         <peripheral key="tcb2" name="TCB2" module-key="i2119">
             <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"/>
+                <signal pad-key="pb4" index="0" function="TCB2_ALT" group="WO" field="PORTMUX.TCBROUTEA.TCB2"/>
+                <signal pad-key="pc0" index="0" function="TCB2" group="WO" field="PORTMUX.TCBROUTEA.TCB2"/>
             </signals>
         </peripheral>
         <peripheral key="tcb3" name="TCB3" module-key="i2119">
             <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"/>
+                <signal pad-key="pc1" index="0" function="TCB3_ALT" group="WO" field="PORTMUX.TCBROUTEA.TCB3"/>
+                <signal pad-key="pb5" index="0" function="TCB3" group="WO" field="PORTMUX.TCBROUTEA.TCB3"/>
             </signals>
         </peripheral>
         <peripheral key="twi0" name="TWI0" module-key="i2110">
             <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"/>
-                <signal pad-id="pa3" function="I2C" group="SCL" field="PORTMUX.TWISPIROUTEA.TWI0"/>
-                <signal pad-id="pf2" function="I2C_ALT2" group="SDA" field="PORTMUX.TWISPIROUTEA.TWI0"/>
-                <signal pad-id="pc2" function="I2C_ALT" group="SDA" field="PORTMUX.TWISPIROUTEA.TWI0"/>
-                <signal pad-id="pa2" function="I2C" group="SDA" field="PORTMUX.TWISPIROUTEA.TWI0"/>
+                <signal pad-key="pf3" function="I2C_ALT2" group="SCL" field="PORTMUX.TWISPIROUTEA.TWI0"/>
+                <signal pad-key="pc3" function="I2C_ALT" group="SCL" field="PORTMUX.TWISPIROUTEA.TWI0"/>
+                <signal pad-key="pa3" function="I2C" group="SCL" field="PORTMUX.TWISPIROUTEA.TWI0"/>
+                <signal pad-key="pf2" function="I2C_ALT2" group="SDA" field="PORTMUX.TWISPIROUTEA.TWI0"/>
+                <signal pad-key="pc2" function="I2C_ALT" group="SDA" field="PORTMUX.TWISPIROUTEA.TWI0"/>
+                <signal pad-key="pa2" function="I2C" group="SDA" field="PORTMUX.TWISPIROUTEA.TWI0"/>
             </signals>
         </peripheral>
         <peripheral key="usart0" name="USART0" module-key="i2108">
             <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"/>
-                <signal pad-id="pa4" function="USART0_ALT" group="TXD" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pa0" function="USART0" group="TXD" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pa6" function="USART0_ALT" group="XCK" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pa2" function="USART0" group="XCK" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pa7" function="USART0_ALT" group="XDIR" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pa3" function="USART0" group="XDIR" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa5" function="USART0_ALT" group="RXD" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa1" function="USART0" group="RXD" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa4" function="USART0_ALT" group="TXD" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa0" function="USART0" group="TXD" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa6" function="USART0_ALT" group="XCK" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa2" function="USART0" group="XCK" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa7" function="USART0_ALT" group="XDIR" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa3" function="USART0" group="XDIR" field="PORTMUX.USARTROUTEA.USART0"/>
             </signals>
         </peripheral>
         <peripheral key="usart1" name="USART1" module-key="i2108">
             <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"/>
-                <signal pad-id="pc4" function="USART1_ALT" group="TXD" field="PORTMUX.USARTROUTEA.USART1"/>
-                <signal pad-id="pc0" function="USART1" group="TXD" field="PORTMUX.USARTROUTEA.USART1"/>
-                <signal pad-id="pc6" function="USART1_ALT" group="XCK" field="PORTMUX.USARTROUTEA.USART1"/>
-                <signal pad-id="pc2" function="USART1" group="XCK" field="PORTMUX.USARTROUTEA.USART1"/>
-                <signal pad-id="pc7" function="USART1_ALT" group="XDIR" field="PORTMUX.USARTROUTEA.USART1"/>
-                <signal pad-id="pc3" function="USART1" group="XDIR" field="PORTMUX.USARTROUTEA.USART1"/>
+                <signal pad-key="pc5" function="USART1_ALT" group="RXD" field="PORTMUX.USARTROUTEA.USART1"/>
+                <signal pad-key="pc1" function="USART1" group="RXD" field="PORTMUX.USARTROUTEA.USART1"/>
+                <signal pad-key="pc4" function="USART1_ALT" group="TXD" field="PORTMUX.USARTROUTEA.USART1"/>
+                <signal pad-key="pc0" function="USART1" group="TXD" field="PORTMUX.USARTROUTEA.USART1"/>
+                <signal pad-key="pc6" function="USART1_ALT" group="XCK" field="PORTMUX.USARTROUTEA.USART1"/>
+                <signal pad-key="pc2" function="USART1" group="XCK" field="PORTMUX.USARTROUTEA.USART1"/>
+                <signal pad-key="pc7" function="USART1_ALT" group="XDIR" field="PORTMUX.USARTROUTEA.USART1"/>
+                <signal pad-key="pc3" function="USART1" group="XDIR" field="PORTMUX.USARTROUTEA.USART1"/>
             </signals>
         </peripheral>
         <peripheral key="usart2" name="USART2" module-key="i2108">
             <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"/>
-                <signal pad-id="pf4" function="USART2_ALT" group="TXD" field="PORTMUX.USARTROUTEA.USART2"/>
-                <signal pad-id="pf0" function="USART2" group="TXD" field="PORTMUX.USARTROUTEA.USART2"/>
-                <signal pad-id="pf6" function="USART2_ALT" group="XCK" field="PORTMUX.USARTROUTEA.USART2"/>
-                <signal pad-id="pf2" function="USART2" group="XCK" field="PORTMUX.USARTROUTEA.USART2"/>
-                <signal pad-id="pf3" function="USART2" group="XDIR" field="PORTMUX.USARTROUTEA.USART2"/>
+                <signal pad-key="pf5" function="USART2_ALT" group="RXD" field="PORTMUX.USARTROUTEA.USART2"/>
+                <signal pad-key="pf1" function="USART2" group="RXD" field="PORTMUX.USARTROUTEA.USART2"/>
+                <signal pad-key="pf4" function="USART2_ALT" group="TXD" field="PORTMUX.USARTROUTEA.USART2"/>
+                <signal pad-key="pf0" function="USART2" group="TXD" field="PORTMUX.USARTROUTEA.USART2"/>
+                <signal pad-key="pf6" function="USART2_ALT" group="XCK" field="PORTMUX.USARTROUTEA.USART2"/>
+                <signal pad-key="pf2" function="USART2" group="XCK" field="PORTMUX.USARTROUTEA.USART2"/>
+                <signal pad-key="pf3" function="USART2" group="XDIR" field="PORTMUX.USARTROUTEA.USART2"/>
             </signals>
         </peripheral>
         <peripheral key="usart3" name="USART3" module-key="i2108">
             <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"/>
-                <signal pad-id="pb4" function="USART3_ALT" group="TXD" field="PORTMUX.USARTROUTEA.USART3"/>
-                <signal pad-id="pb0" function="USART3" group="TXD" field="PORTMUX.USARTROUTEA.USART3"/>
-                <signal pad-id="pb2" function="USART3" group="XCK" field="PORTMUX.USARTROUTEA.USART3"/>
-                <signal pad-id="pb3" function="USART3" group="XDIR" field="PORTMUX.USARTROUTEA.USART3"/>
+                <signal pad-key="pb5" function="USART3_ALT" group="RXD" field="PORTMUX.USARTROUTEA.USART3"/>
+                <signal pad-key="pb1" function="USART3" group="RXD" field="PORTMUX.USARTROUTEA.USART3"/>
+                <signal pad-key="pb4" function="USART3_ALT" group="TXD" field="PORTMUX.USARTROUTEA.USART3"/>
+                <signal pad-key="pb0" function="USART3" group="TXD" field="PORTMUX.USARTROUTEA.USART3"/>
+                <signal pad-key="pb2" function="USART3" group="XCK" field="PORTMUX.USARTROUTEA.USART3"/>
+                <signal pad-key="pb3" function="USART3" group="XDIR" field="PORTMUX.USARTROUTEA.USART3"/>
             </signals>
         </peripheral>
         <peripheral key="userrow" name="USERROW" module-key="i2603">
@@ -1445,110 +1445,160 @@
             </register-group>
         </module>
     </modules>
+    <pads>
+        <pad key="pa5" name="PA5"/>
+        <pad key="pa6" name="PA6"/>
+        <pad key="pa7" name="PA7"/>
+        <pad key="pb0" name="PB0"/>
+        <pad key="pb1" name="PB1"/>
+        <pad key="pb2" name="PB2"/>
+        <pad key="pb3" name="PB3"/>
+        <pad key="pb4" name="PB4"/>
+        <pad key="pb5" name="PB5"/>
+        <pad key="pc0" name="PC0"/>
+        <pad key="pc1" name="PC1"/>
+        <pad key="pc2" name="PC2"/>
+        <pad key="pc3" name="PC3"/>
+        <pad key="vdd0" name="VDD0"/>
+        <pad key="gnd0" name="GND0"/>
+        <pad key="pc4" name="PC4"/>
+        <pad key="pc5" name="PC5"/>
+        <pad key="pc6" name="PC6"/>
+        <pad key="pc7" name="PC7"/>
+        <pad key="pd0" name="PD0"/>
+        <pad key="pd1" name="PD1"/>
+        <pad key="pd2" name="PD2"/>
+        <pad key="pd3" name="PD3"/>
+        <pad key="pd4" name="PD4"/>
+        <pad key="pd5" name="PD5"/>
+        <pad key="pd6" name="PD6"/>
+        <pad key="pd7" name="PD7"/>
+        <pad key="avdd" name="AVDD"/>
+        <pad key="agnd" name="AGND"/>
+        <pad key="pe0" name="PE0"/>
+        <pad key="pe1" name="PE1"/>
+        <pad key="pe2" name="PE2"/>
+        <pad key="pe3" name="PE3"/>
+        <pad key="pf0" name="PF0"/>
+        <pad key="pf1" name="PF1"/>
+        <pad key="pf2" name="PF2"/>
+        <pad key="pf3" name="PF3"/>
+        <pad key="pf4" name="PF4"/>
+        <pad key="pf5" name="PF5"/>
+        <pad key="pf6" name="PF6"/>
+        <pad key="updi" name="UPDI"/>
+        <pad key="vdd1" name="VDD1"/>
+        <pad key="gnd1" name="GND1"/>
+        <pad key="pa0" name="PA0"/>
+        <pad key="pa1" name="PA1"/>
+        <pad key="pa2" name="PA2"/>
+        <pad key="pa3" name="PA3"/>
+        <pad key="pa4" name="PA4"/>
+    </pads>
     <pinouts>
         <pinout key="qfn48" name="QFN48" type="qfn">
-            <pin position="1" pad="PA5"/>
-            <pin position="2" pad="PA6"/>
-            <pin position="3" pad="PA7"/>
-            <pin position="4" pad="PB0"/>
-            <pin position="5" pad="PB1"/>
-            <pin position="6" pad="PB2"/>
-            <pin position="7" pad="PB3"/>
-            <pin position="8" pad="PB4"/>
-            <pin position="9" pad="PB5"/>
-            <pin position="10" pad="PC0"/>
-            <pin position="11" pad="PC1"/>
-            <pin position="12" pad="PC2"/>
-            <pin position="13" pad="PC3"/>
-            <pin position="14" pad="VDD0"/>
-            <pin position="15" pad="GND0"/>
-            <pin position="16" pad="PC4"/>
-            <pin position="17" pad="PC5"/>
-            <pin position="18" pad="PC6"/>
-            <pin position="19" pad="PC7"/>
-            <pin position="20" pad="PD0"/>
-            <pin position="21" pad="PD1"/>
-            <pin position="22" pad="PD2"/>
-            <pin position="23" pad="PD3"/>
-            <pin position="24" pad="PD4"/>
-            <pin position="25" pad="PD5"/>
-            <pin position="26" pad="PD6"/>
-            <pin position="27" pad="PD7"/>
-            <pin position="28" pad="AVDD"/>
-            <pin position="29" pad="AGND"/>
-            <pin position="30" pad="PE0"/>
-            <pin position="31" pad="PE1"/>
-            <pin position="32" pad="PE2"/>
-            <pin position="33" pad="PE3"/>
-            <pin position="34" pad="PF0"/>
-            <pin position="35" pad="PF1"/>
-            <pin position="36" pad="PF2"/>
-            <pin position="37" pad="PF3"/>
-            <pin position="38" pad="PF4"/>
-            <pin position="39" pad="PF5"/>
-            <pin position="40" pad="PF6"/>
-            <pin position="41" pad="UPDI"/>
-            <pin position="42" pad="VDD1"/>
-            <pin position="43" pad="GND1"/>
-            <pin position="44" pad="PA0"/>
-            <pin position="45" pad="PA1"/>
-            <pin position="46" pad="PA2"/>
-            <pin position="47" pad="PA3"/>
-            <pin position="48" pad="PA4"/>
+            <pin position="1" pad-key="pa5"/>
+            <pin position="2" pad-key="pa6"/>
+            <pin position="3" pad-key="pa7"/>
+            <pin position="4" pad-key="pb0"/>
+            <pin position="5" pad-key="pb1"/>
+            <pin position="6" pad-key="pb2"/>
+            <pin position="7" pad-key="pb3"/>
+            <pin position="8" pad-key="pb4"/>
+            <pin position="9" pad-key="pb5"/>
+            <pin position="10" pad-key="pc0"/>
+            <pin position="11" pad-key="pc1"/>
+            <pin position="12" pad-key="pc2"/>
+            <pin position="13" pad-key="pc3"/>
+            <pin position="14" pad-key="vdd0"/>
+            <pin position="15" pad-key="gnd0"/>
+            <pin position="16" pad-key="pc4"/>
+            <pin position="17" pad-key="pc5"/>
+            <pin position="18" pad-key="pc6"/>
+            <pin position="19" pad-key="pc7"/>
+            <pin position="20" pad-key="pd0"/>
+            <pin position="21" pad-key="pd1"/>
+            <pin position="22" pad-key="pd2"/>
+            <pin position="23" pad-key="pd3"/>
+            <pin position="24" pad-key="pd4"/>
+            <pin position="25" pad-key="pd5"/>
+            <pin position="26" pad-key="pd6"/>
+            <pin position="27" pad-key="pd7"/>
+            <pin position="28" pad-key="avdd"/>
+            <pin position="29" pad-key="agnd"/>
+            <pin position="30" pad-key="pe0"/>
+            <pin position="31" pad-key="pe1"/>
+            <pin position="32" pad-key="pe2"/>
+            <pin position="33" pad-key="pe3"/>
+            <pin position="34" pad-key="pf0"/>
+            <pin position="35" pad-key="pf1"/>
+            <pin position="36" pad-key="pf2"/>
+            <pin position="37" pad-key="pf3"/>
+            <pin position="38" pad-key="pf4"/>
+            <pin position="39" pad-key="pf5"/>
+            <pin position="40" pad-key="pf6"/>
+            <pin position="41" pad-key="updi"/>
+            <pin position="42" pad-key="vdd1"/>
+            <pin position="43" pad-key="gnd1"/>
+            <pin position="44" pad-key="pa0"/>
+            <pin position="45" pad-key="pa1"/>
+            <pin position="46" pad-key="pa2"/>
+            <pin position="47" pad-key="pa3"/>
+            <pin position="48" pad-key="pa4"/>
         </pinout>
         <pinout key="qfp48" name="QFP48" type="qfp">
-            <pin position="1" pad="PA5"/>
-            <pin position="2" pad="PA6"/>
-            <pin position="3" pad="PA7"/>
-            <pin position="4" pad="PB0"/>
-            <pin position="5" pad="PB1"/>
-            <pin position="6" pad="PB2"/>
-            <pin position="7" pad="PB3"/>
-            <pin position="8" pad="PB4"/>
-            <pin position="9" pad="PB5"/>
-            <pin position="10" pad="PC0"/>
-            <pin position="11" pad="PC1"/>
-            <pin position="12" pad="PC2"/>
-            <pin position="13" pad="PC3"/>
-            <pin position="14" pad="VDD0"/>
-            <pin position="15" pad="GND0"/>
-            <pin position="16" pad="PC4"/>
-            <pin position="17" pad="PC5"/>
-            <pin position="18" pad="PC6"/>
-            <pin position="19" pad="PC7"/>
-            <pin position="20" pad="PD0"/>
-            <pin position="21" pad="PD1"/>
-            <pin position="22" pad="PD2"/>
-            <pin position="23" pad="PD3"/>
-            <pin position="24" pad="PD4"/>
-            <pin position="25" pad="PD5"/>
-            <pin position="26" pad="PD6"/>
-            <pin position="27" pad="PD7"/>
-            <pin position="28" pad="AVDD"/>
-            <pin position="29" pad="AGND"/>
-            <pin position="30" pad="PE0"/>
-            <pin position="31" pad="PE1"/>
-            <pin position="32" pad="PE2"/>
-            <pin position="33" pad="PE3"/>
-            <pin position="34" pad="PF0"/>
-            <pin position="35" pad="PF1"/>
-            <pin position="36" pad="PF2"/>
-            <pin position="37" pad="PF3"/>
-            <pin position="38" pad="PF4"/>
-            <pin position="39" pad="PF5"/>
-            <pin position="40" pad="PF6"/>
-            <pin position="41" pad="UPDI"/>
-            <pin position="42" pad="VDD1"/>
-            <pin position="43" pad="GND1"/>
-            <pin position="44" pad="PA0"/>
-            <pin position="45" pad="PA1"/>
-            <pin position="46" pad="PA2"/>
-            <pin position="47" pad="PA3"/>
-            <pin position="48" pad="PA4"/>
+            <pin position="1" pad-key="pa5"/>
+            <pin position="2" pad-key="pa6"/>
+            <pin position="3" pad-key="pa7"/>
+            <pin position="4" pad-key="pb0"/>
+            <pin position="5" pad-key="pb1"/>
+            <pin position="6" pad-key="pb2"/>
+            <pin position="7" pad-key="pb3"/>
+            <pin position="8" pad-key="pb4"/>
+            <pin position="9" pad-key="pb5"/>
+            <pin position="10" pad-key="pc0"/>
+            <pin position="11" pad-key="pc1"/>
+            <pin position="12" pad-key="pc2"/>
+            <pin position="13" pad-key="pc3"/>
+            <pin position="14" pad-key="vdd0"/>
+            <pin position="15" pad-key="gnd0"/>
+            <pin position="16" pad-key="pc4"/>
+            <pin position="17" pad-key="pc5"/>
+            <pin position="18" pad-key="pc6"/>
+            <pin position="19" pad-key="pc7"/>
+            <pin position="20" pad-key="pd0"/>
+            <pin position="21" pad-key="pd1"/>
+            <pin position="22" pad-key="pd2"/>
+            <pin position="23" pad-key="pd3"/>
+            <pin position="24" pad-key="pd4"/>
+            <pin position="25" pad-key="pd5"/>
+            <pin position="26" pad-key="pd6"/>
+            <pin position="27" pad-key="pd7"/>
+            <pin position="28" pad-key="avdd"/>
+            <pin position="29" pad-key="agnd"/>
+            <pin position="30" pad-key="pe0"/>
+            <pin position="31" pad-key="pe1"/>
+            <pin position="32" pad-key="pe2"/>
+            <pin position="33" pad-key="pe3"/>
+            <pin position="34" pad-key="pf0"/>
+            <pin position="35" pad-key="pf1"/>
+            <pin position="36" pad-key="pf2"/>
+            <pin position="37" pad-key="pf3"/>
+            <pin position="38" pad-key="pf4"/>
+            <pin position="39" pad-key="pf5"/>
+            <pin position="40" pad-key="pf6"/>
+            <pin position="41" pad-key="updi"/>
+            <pin position="42" pad-key="vdd1"/>
+            <pin position="43" pad-key="gnd1"/>
+            <pin position="44" pad-key="pa0"/>
+            <pin position="45" pad-key="pa1"/>
+            <pin position="46" pad-key="pa2"/>
+            <pin position="47" pad-key="pa3"/>
+            <pin position="48" pad-key="pa4"/>
         </pinout>
     </pinouts>
     <variants>
-        <variant name="ATmega809-AFR" pinout-key="qfp48" package="TQFP48"/>
-        <variant name="ATmega809-MFR" pinout-key="qfn48" package="UQFN48"/>
+        <variant key="atmega809_afr" name="ATmega809-AFR" pinout-key="qfp48"/>
+        <variant key="atmega809_mfr" name="ATmega809-MFR" pinout-key="qfn48"/>
     </variants>
 </device>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA88.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA88.xml
index 0d4735a0..4c4dbacd 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA88.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA88.xml
@@ -220,141 +220,141 @@
         <peripheral key="usart0" name="USART0" module-key="usart">
             <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"/>
-                <signal pad-id="pd4" function="default" group="XCK"/>
+                <signal pad-key="pd1" function="default" group="TXD"/>
+                <signal pad-key="pd0" function="default" group="RXD"/>
+                <signal pad-key="pd4" function="default" group="XCK"/>
             </signals>
         </peripheral>
         <peripheral key="twi" name="TWI" module-key="twi">
             <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"/>
+                <signal pad-key="pc4" function="default" group="SDA"/>
+                <signal pad-key="pc5" function="default" group="SCL"/>
             </signals>
         </peripheral>
         <peripheral key="tc1" name="TC1" module-key="tc16">
             <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"/>
-                <signal pad-id="pb1" function="default" group="OCA"/>
-                <signal pad-id="pb2" function="default" group="OCB"/>
+                <signal pad-key="pd5" function="default" group="T"/>
+                <signal pad-key="pb0" function="default" group="ICP"/>
+                <signal pad-key="pb1" function="default" group="OCA"/>
+                <signal pad-key="pb2" function="default" group="OCB"/>
             </signals>
         </peripheral>
         <peripheral key="tc2" name="TC2" module-key="tc8_async">
             <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"/>
+                <signal pad-key="pb3" function="default" group="OCA"/>
+                <signal pad-key="pd3" function="default" group="OCB"/>
             </signals>
         </peripheral>
         <peripheral key="adc" name="ADC" module-key="adc">
             <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"/>
-                <signal pad-id="pc2" index="2" function="default" group="ADC"/>
-                <signal pad-id="pc3" index="3" function="default" group="ADC"/>
-                <signal pad-id="pc4" index="4" function="default" group="ADC"/>
-                <signal pad-id="pc5" index="5" function="default" group="ADC"/>
+                <signal pad-key="pc0" index="0" function="default" group="ADC"/>
+                <signal pad-key="pc1" index="1" function="default" group="ADC"/>
+                <signal pad-key="pc2" index="2" function="default" group="ADC"/>
+                <signal pad-key="pc3" index="3" function="default" group="ADC"/>
+                <signal pad-key="pc4" index="4" function="default" group="ADC"/>
+                <signal pad-key="pc5" index="5" function="default" group="ADC"/>
             </signals>
         </peripheral>
         <peripheral key="ac" name="AC" module-key="ac">
             <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"/>
+                <signal pad-key="pd6" index="0" function="default" group="AIN"/>
+                <signal pad-key="pd7" index="1" function="default" group="AIN"/>
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pb2" index="2" function="default" group="P"/>
-                <signal pad-id="pb3" index="3" function="default" group="P"/>
-                <signal pad-id="pb4" index="4" function="default" group="P"/>
-                <signal pad-id="pb5" index="5" function="default" group="P"/>
-                <signal pad-id="pb6" index="6" function="default" group="P"/>
-                <signal pad-id="pb7" index="7" function="default" group="P"/>
+                <signal pad-key="pb0" index="0" function="default" group="P"/>
+                <signal pad-key="pb1" index="1" function="default" group="P"/>
+                <signal pad-key="pb2" index="2" function="default" group="P"/>
+                <signal pad-key="pb3" index="3" function="default" group="P"/>
+                <signal pad-key="pb4" index="4" function="default" group="P"/>
+                <signal pad-key="pb5" index="5" function="default" group="P"/>
+                <signal pad-key="pb6" index="6" function="default" group="P"/>
+                <signal pad-key="pb7" index="7" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pc2" index="2" function="default" group="P"/>
-                <signal pad-id="pc3" index="3" function="default" group="P"/>
-                <signal pad-id="pc4" index="4" function="default" group="P"/>
-                <signal pad-id="pc5" index="5" function="default" group="P"/>
-                <signal pad-id="pc6" index="6" function="default" group="P"/>
+                <signal pad-key="pc0" index="0" function="default" group="P"/>
+                <signal pad-key="pc1" index="1" function="default" group="P"/>
+                <signal pad-key="pc2" index="2" function="default" group="P"/>
+                <signal pad-key="pc3" index="3" function="default" group="P"/>
+                <signal pad-key="pc4" index="4" function="default" group="P"/>
+                <signal pad-key="pc5" index="5" function="default" group="P"/>
+                <signal pad-key="pc6" index="6" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pd2" index="2" function="default" group="P"/>
-                <signal pad-id="pd3" index="3" function="default" group="P"/>
-                <signal pad-id="pd4" index="4" function="default" group="P"/>
-                <signal pad-id="pd5" index="5" function="default" group="P"/>
-                <signal pad-id="pd6" index="6" function="default" group="P"/>
-                <signal pad-id="pd7" index="7" function="default" group="P"/>
+                <signal pad-key="pd0" index="0" function="default" group="P"/>
+                <signal pad-key="pd1" index="1" function="default" group="P"/>
+                <signal pad-key="pd2" index="2" function="default" group="P"/>
+                <signal pad-key="pd3" index="3" function="default" group="P"/>
+                <signal pad-key="pd4" index="4" function="default" group="P"/>
+                <signal pad-key="pd5" index="5" function="default" group="P"/>
+                <signal pad-key="pd6" index="6" function="default" group="P"/>
+                <signal pad-key="pd7" index="7" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="tc0" name="TC0" module-key="tc8">
             <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"/>
-                <signal pad-id="pd6" function="default" group="OCA"/>
+                <signal pad-key="pd4" function="default" group="T"/>
+                <signal pad-key="pd5" function="default" group="OCB"/>
+                <signal pad-key="pd6" function="default" group="OCA"/>
             </signals>
         </peripheral>
         <peripheral key="exint" name="EXINT" module-key="exint">
             <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"/>
-                <signal pad-id="pd4" index="20" function="default" group="PCINT"/>
-                <signal pad-id="pb6" index="6" function="default" group="PCINT"/>
-                <signal pad-id="pb7" index="7" function="default" group="PCINT"/>
-                <signal pad-id="pd5" index="21" function="default" group="PCINT"/>
-                <signal pad-id="pd6" index="22" function="default" group="PCINT"/>
-                <signal pad-id="pd7" index="23" function="default" group="PCINT"/>
-                <signal pad-id="pb0" index="0" function="default" group="PCINT"/>
-                <signal pad-id="pb1" index="1" function="default" group="PCINT"/>
-                <signal pad-id="pb2" index="2" function="default" group="PCINT"/>
-                <signal pad-id="pb3" index="3" function="default" group="PCINT"/>
-                <signal pad-id="pb4" index="4" function="default" group="PCINT"/>
-                <signal pad-id="pb5" index="5" function="default" group="PCINT"/>
-                <signal pad-id="pc0" index="8" function="default" group="PCINT"/>
-                <signal pad-id="pc1" index="9" function="default" group="PCINT"/>
-                <signal pad-id="pc2" index="10" function="default" group="PCINT"/>
-                <signal pad-id="pc3" index="11" function="default" group="PCINT"/>
-                <signal pad-id="pc4" index="12" function="default" group="PCINT"/>
-                <signal pad-id="pc5" index="13" function="default" group="PCINT"/>
-                <signal pad-id="pc6" index="14" function="default" group="PCINT"/>
-                <signal pad-id="pd0" index="16" function="default" group="PCINT"/>
-                <signal pad-id="pd1" index="17" function="default" group="PCINT"/>
-                <signal pad-id="pd2" index="18" function="default" group="PCINT"/>
-                <signal pad-id="pd2" index="0" function="default" group="INT"/>
+                <signal pad-key="pd3" index="1" function="default" group="INT"/>
+                <signal pad-key="pd3" index="19" function="default" group="PCINT"/>
+                <signal pad-key="pd4" index="20" function="default" group="PCINT"/>
+                <signal pad-key="pb6" index="6" function="default" group="PCINT"/>
+                <signal pad-key="pb7" index="7" function="default" group="PCINT"/>
+                <signal pad-key="pd5" index="21" function="default" group="PCINT"/>
+                <signal pad-key="pd6" index="22" function="default" group="PCINT"/>
+                <signal pad-key="pd7" index="23" function="default" group="PCINT"/>
+                <signal pad-key="pb0" index="0" function="default" group="PCINT"/>
+                <signal pad-key="pb1" index="1" function="default" group="PCINT"/>
+                <signal pad-key="pb2" index="2" function="default" group="PCINT"/>
+                <signal pad-key="pb3" index="3" function="default" group="PCINT"/>
+                <signal pad-key="pb4" index="4" function="default" group="PCINT"/>
+                <signal pad-key="pb5" index="5" function="default" group="PCINT"/>
+                <signal pad-key="pc0" index="8" function="default" group="PCINT"/>
+                <signal pad-key="pc1" index="9" function="default" group="PCINT"/>
+                <signal pad-key="pc2" index="10" function="default" group="PCINT"/>
+                <signal pad-key="pc3" index="11" function="default" group="PCINT"/>
+                <signal pad-key="pc4" index="12" function="default" group="PCINT"/>
+                <signal pad-key="pc5" index="13" function="default" group="PCINT"/>
+                <signal pad-key="pc6" index="14" function="default" group="PCINT"/>
+                <signal pad-key="pd0" index="16" function="default" group="PCINT"/>
+                <signal pad-key="pd1" index="17" function="default" group="PCINT"/>
+                <signal pad-key="pd2" index="18" function="default" group="PCINT"/>
+                <signal pad-key="pd2" index="0" function="default" group="INT"/>
             </signals>
         </peripheral>
         <peripheral key="spi" name="SPI" module-key="spi">
             <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"/>
-                <signal pad-id="pb4" function="default" group="MISO"/>
-                <signal pad-id="pb5" function="default" group="SCK"/>
+                <signal pad-key="pb2" function="default" group="SS"/>
+                <signal pad-key="pb3" function="default" group="MOSI"/>
+                <signal pad-key="pb4" function="default" group="MISO"/>
+                <signal pad-key="pb5" function="default" group="SCK"/>
             </signals>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="cpu">
             <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"/>
+                <signal pad-key="pb0" index="0" function="default" group="CLK"/>
             </signals>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="wdt">
@@ -767,112 +767,143 @@
             </register-group>
         </module>
     </modules>
+    <pads>
+        <pad key="pd3" name="PD3"/>
+        <pad key="pd4" name="PD4"/>
+        <pad key="gnd" name="GND"/>
+        <pad key="vcc" name="VCC"/>
+        <pad key="pb6" name="PB6"/>
+        <pad key="pb7" name="PB7"/>
+        <pad key="pd5" name="PD5"/>
+        <pad key="pd6" name="PD6"/>
+        <pad key="pd7" name="PD7"/>
+        <pad key="pb0" name="PB0"/>
+        <pad key="pb1" name="PB1"/>
+        <pad key="pb2" name="PB2"/>
+        <pad key="pb3" name="PB3"/>
+        <pad key="pb4" name="PB4"/>
+        <pad key="pb5" name="PB5"/>
+        <pad key="avcc" name="AVCC"/>
+        <pad key="adc6" name="ADC6"/>
+        <pad key="aref" name="AREF"/>
+        <pad key="adc7" name="ADC7"/>
+        <pad key="pc0" name="PC0"/>
+        <pad key="pc1" name="PC1"/>
+        <pad key="pc2" name="PC2"/>
+        <pad key="pc3" name="PC3"/>
+        <pad key="pc4" name="PC4"/>
+        <pad key="pc5" name="PC5"/>
+        <pad key="pc6" name="PC6"/>
+        <pad key="pd0" name="PD0"/>
+        <pad key="pd1" name="PD1"/>
+        <pad key="pd2" name="PD2"/>
+    </pads>
     <pinouts>
         <pinout key="tqfp32" name="TQFP32" type="qfp">
-            <pin position="1" pad="PD3"/>
-            <pin position="2" pad="PD4"/>
-            <pin position="3" pad="GND"/>
-            <pin position="4" pad="VCC"/>
-            <pin position="5" pad="GND"/>
-            <pin position="6" pad="VCC"/>
-            <pin position="7" pad="PB6"/>
-            <pin position="8" pad="PB7"/>
-            <pin position="9" pad="PD5"/>
-            <pin position="10" pad="PD6"/>
-            <pin position="11" pad="PD7"/>
-            <pin position="12" pad="PB0"/>
-            <pin position="13" pad="PB1"/>
-            <pin position="14" pad="PB2"/>
-            <pin position="15" pad="PB3"/>
-            <pin position="16" pad="PB4"/>
-            <pin position="17" pad="PB5"/>
-            <pin position="18" pad="AVCC"/>
-            <pin position="19" pad="ADC6"/>
-            <pin position="20" pad="AREF"/>
-            <pin position="21" pad="GND"/>
-            <pin position="22" pad="ADC7"/>
-            <pin position="23" pad="PC0"/>
-            <pin position="24" pad="PC1"/>
-            <pin position="25" pad="PC2"/>
-            <pin position="26" pad="PC3"/>
-            <pin position="27" pad="PC4"/>
-            <pin position="28" pad="PC5"/>
-            <pin position="29" pad="PC6"/>
-            <pin position="30" pad="PD0"/>
-            <pin position="31" pad="PD1"/>
-            <pin position="32" pad="PD2"/>
+            <pin position="1" pad-key="pd3"/>
+            <pin position="2" pad-key="pd4"/>
+            <pin position="3" pad-key="gnd"/>
+            <pin position="4" pad-key="vcc"/>
+            <pin position="5" pad-key="gnd"/>
+            <pin position="6" pad-key="vcc"/>
+            <pin position="7" pad-key="pb6"/>
+            <pin position="8" pad-key="pb7"/>
+            <pin position="9" pad-key="pd5"/>
+            <pin position="10" pad-key="pd6"/>
+            <pin position="11" pad-key="pd7"/>
+            <pin position="12" pad-key="pb0"/>
+            <pin position="13" pad-key="pb1"/>
+            <pin position="14" pad-key="pb2"/>
+            <pin position="15" pad-key="pb3"/>
+            <pin position="16" pad-key="pb4"/>
+            <pin position="17" pad-key="pb5"/>
+            <pin position="18" pad-key="avcc"/>
+            <pin position="19" pad-key="adc6"/>
+            <pin position="20" pad-key="aref"/>
+            <pin position="21" pad-key="gnd"/>
+            <pin position="22" pad-key="adc7"/>
+            <pin position="23" pad-key="pc0"/>
+            <pin position="24" pad-key="pc1"/>
+            <pin position="25" pad-key="pc2"/>
+            <pin position="26" pad-key="pc3"/>
+            <pin position="27" pad-key="pc4"/>
+            <pin position="28" pad-key="pc5"/>
+            <pin position="29" pad-key="pc6"/>
+            <pin position="30" pad-key="pd0"/>
+            <pin position="31" pad-key="pd1"/>
+            <pin position="32" pad-key="pd2"/>
         </pinout>
         <pinout key="qfn32" name="QFN32" type="qfn">
-            <pin position="1" pad="PD3"/>
-            <pin position="2" pad="PD4"/>
-            <pin position="3" pad="GND"/>
-            <pin position="4" pad="VCC"/>
-            <pin position="5" pad="GND"/>
-            <pin position="6" pad="VCC"/>
-            <pin position="7" pad="PB6"/>
-            <pin position="8" pad="PB7"/>
-            <pin position="9" pad="PD5"/>
-            <pin position="10" pad="PD6"/>
-            <pin position="11" pad="PD7"/>
-            <pin position="12" pad="PB0"/>
-            <pin position="13" pad="PB1"/>
-            <pin position="14" pad="PB2"/>
-            <pin position="15" pad="PB3"/>
-            <pin position="16" pad="PB4"/>
-            <pin position="17" pad="PB5"/>
-            <pin position="18" pad="AVCC"/>
-            <pin position="19" pad="ADC6"/>
-            <pin position="20" pad="AREF"/>
-            <pin position="21" pad="GND"/>
-            <pin position="22" pad="ADC7"/>
-            <pin position="23" pad="PC0"/>
-            <pin position="24" pad="PC1"/>
-            <pin position="25" pad="PC2"/>
-            <pin position="26" pad="PC3"/>
-            <pin position="27" pad="PC4"/>
-            <pin position="28" pad="PC5"/>
-            <pin position="29" pad="PC6"/>
-            <pin position="30" pad="PD0"/>
-            <pin position="31" pad="PD1"/>
-            <pin position="32" pad="PD2"/>
+            <pin position="1" pad-key="pd3"/>
+            <pin position="2" pad-key="pd4"/>
+            <pin position="3" pad-key="gnd"/>
+            <pin position="4" pad-key="vcc"/>
+            <pin position="5" pad-key="gnd"/>
+            <pin position="6" pad-key="vcc"/>
+            <pin position="7" pad-key="pb6"/>
+            <pin position="8" pad-key="pb7"/>
+            <pin position="9" pad-key="pd5"/>
+            <pin position="10" pad-key="pd6"/>
+            <pin position="11" pad-key="pd7"/>
+            <pin position="12" pad-key="pb0"/>
+            <pin position="13" pad-key="pb1"/>
+            <pin position="14" pad-key="pb2"/>
+            <pin position="15" pad-key="pb3"/>
+            <pin position="16" pad-key="pb4"/>
+            <pin position="17" pad-key="pb5"/>
+            <pin position="18" pad-key="avcc"/>
+            <pin position="19" pad-key="adc6"/>
+            <pin position="20" pad-key="aref"/>
+            <pin position="21" pad-key="gnd"/>
+            <pin position="22" pad-key="adc7"/>
+            <pin position="23" pad-key="pc0"/>
+            <pin position="24" pad-key="pc1"/>
+            <pin position="25" pad-key="pc2"/>
+            <pin position="26" pad-key="pc3"/>
+            <pin position="27" pad-key="pc4"/>
+            <pin position="28" pad-key="pc5"/>
+            <pin position="29" pad-key="pc6"/>
+            <pin position="30" pad-key="pd0"/>
+            <pin position="31" pad-key="pd1"/>
+            <pin position="32" pad-key="pd2"/>
         </pinout>
         <pinout key="pdip28" name="PDIP28" type="dip">
-            <pin position="1" pad="PC6"/>
-            <pin position="2" pad="PD0"/>
-            <pin position="3" pad="PD1"/>
-            <pin position="4" pad="PD2"/>
-            <pin position="5" pad="PD3"/>
-            <pin position="6" pad="PD4"/>
-            <pin position="7" pad="VCC"/>
-            <pin position="8" pad="GND"/>
-            <pin position="9" pad="PB6"/>
-            <pin position="10" pad="PB7"/>
-            <pin position="11" pad="PD5"/>
-            <pin position="12" pad="PD6"/>
-            <pin position="13" pad="PD7"/>
-            <pin position="14" pad="PB0"/>
-            <pin position="15" pad="PB1"/>
-            <pin position="16" pad="PB2"/>
-            <pin position="17" pad="PB3"/>
-            <pin position="18" pad="PB4"/>
-            <pin position="19" pad="PB5"/>
-            <pin position="20" pad="AVCC"/>
-            <pin position="21" pad="AREF"/>
-            <pin position="22" pad="GND"/>
-            <pin position="23" pad="PC0"/>
-            <pin position="24" pad="PC1"/>
-            <pin position="25" pad="PC2"/>
-            <pin position="26" pad="PC3"/>
-            <pin position="27" pad="PC4"/>
-            <pin position="28" pad="PC5"/>
+            <pin position="1" pad-key="pc6"/>
+            <pin position="2" pad-key="pd0"/>
+            <pin position="3" pad-key="pd1"/>
+            <pin position="4" pad-key="pd2"/>
+            <pin position="5" pad-key="pd3"/>
+            <pin position="6" pad-key="pd4"/>
+            <pin position="7" pad-key="vcc"/>
+            <pin position="8" pad-key="gnd"/>
+            <pin position="9" pad-key="pb6"/>
+            <pin position="10" pad-key="pb7"/>
+            <pin position="11" pad-key="pd5"/>
+            <pin position="12" pad-key="pd6"/>
+            <pin position="13" pad-key="pd7"/>
+            <pin position="14" pad-key="pb0"/>
+            <pin position="15" pad-key="pb1"/>
+            <pin position="16" pad-key="pb2"/>
+            <pin position="17" pad-key="pb3"/>
+            <pin position="18" pad-key="pb4"/>
+            <pin position="19" pad-key="pb5"/>
+            <pin position="20" pad-key="avcc"/>
+            <pin position="21" pad-key="aref"/>
+            <pin position="22" pad-key="gnd"/>
+            <pin position="23" pad-key="pc0"/>
+            <pin position="24" pad-key="pc1"/>
+            <pin position="25" pad-key="pc2"/>
+            <pin position="26" pad-key="pc3"/>
+            <pin position="27" pad-key="pc4"/>
+            <pin position="28" pad-key="pc5"/>
         </pinout>
     </pinouts>
     <variants>
-        <variant name="ATmega88V-10AU" pinout-key="tqfp32" package="TQFP32"/>
-        <variant name="ATmega88V-10MU" pinout-key="qfn32" package="QFN32"/>
-        <variant name="ATmega88V-10PU" pinout-key="pdip28" package="PDIP28"/>
-        <variant name="ATmega88-20AU" pinout-key="tqfp32" package="TQFP32"/>
-        <variant name="ATmega88-20MU" pinout-key="qfn32" package="QFN32"/>
-        <variant name="ATmega88-20PU" pinout-key="pdip28" package="PDIP28"/>
+        <variant key="atmega88v_10au" name="ATmega88V-10AU" pinout-key="tqfp32"/>
+        <variant key="atmega88v_10mu" name="ATmega88V-10MU" pinout-key="qfn32"/>
+        <variant key="atmega88v_10pu" name="ATmega88V-10PU" pinout-key="pdip28"/>
+        <variant key="atmega88_20au" name="ATmega88-20AU" pinout-key="tqfp32"/>
+        <variant key="atmega88_20mu" name="ATmega88-20MU" pinout-key="qfn32"/>
+        <variant key="atmega88_20pu" name="ATmega88-20PU" pinout-key="pdip28"/>
     </variants>
 </device>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA88A.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA88A.xml
index d1c0f71c..aead65a8 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA88A.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA88A.xml
@@ -220,135 +220,135 @@
         <peripheral key="usart0" name="USART0" module-key="usart">
             <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"/>
-                <signal pad-id="pd4" function="default" group="XCK"/>
+                <signal pad-key="pd1" function="default" group="TXD"/>
+                <signal pad-key="pd0" function="default" group="RXD"/>
+                <signal pad-key="pd4" function="default" group="XCK"/>
             </signals>
         </peripheral>
         <peripheral key="twi" name="TWI" module-key="twi">
             <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"/>
+                <signal pad-key="pc4" function="default" group="SDA"/>
+                <signal pad-key="pc5" function="default" group="SCL"/>
             </signals>
         </peripheral>
         <peripheral key="tc1" name="TC1" module-key="tc16">
             <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"/>
-                <signal pad-id="pb1" function="default" group="OCA"/>
-                <signal pad-id="pb2" function="default" group="OCB"/>
+                <signal pad-key="pd5" function="default" group="T"/>
+                <signal pad-key="pb0" function="default" group="ICP"/>
+                <signal pad-key="pb1" function="default" group="OCA"/>
+                <signal pad-key="pb2" function="default" group="OCB"/>
             </signals>
         </peripheral>
         <peripheral key="tc2" name="TC2" module-key="tc8_async">
             <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"/>
+                <signal pad-key="pb3" function="default" group="OCA"/>
+                <signal pad-key="pd3" function="default" group="OCB"/>
             </signals>
         </peripheral>
         <peripheral key="adc" name="ADC" module-key="adc">
             <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"/>
-                <signal pad-id="pc2" index="2" function="default" group="ADC"/>
-                <signal pad-id="pc3" index="3" function="default" group="ADC"/>
-                <signal pad-id="pc4" index="4" function="default" group="ADC"/>
-                <signal pad-id="pc5" index="5" function="default" group="ADC"/>
+                <signal pad-key="pc0" index="0" function="default" group="ADC"/>
+                <signal pad-key="pc1" index="1" function="default" group="ADC"/>
+                <signal pad-key="pc2" index="2" function="default" group="ADC"/>
+                <signal pad-key="pc3" index="3" function="default" group="ADC"/>
+                <signal pad-key="pc4" index="4" function="default" group="ADC"/>
+                <signal pad-key="pc5" index="5" function="default" group="ADC"/>
             </signals>
         </peripheral>
         <peripheral key="ac" name="AC" module-key="ac">
             <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"/>
+                <signal pad-key="pd6" index="0" function="default" group="AIN"/>
+                <signal pad-key="pd7" index="1" function="default" group="AIN"/>
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pb2" index="2" function="default" group="P"/>
-                <signal pad-id="pb3" index="3" function="default" group="P"/>
-                <signal pad-id="pb4" index="4" function="default" group="P"/>
-                <signal pad-id="pb5" index="5" function="default" group="P"/>
-                <signal pad-id="pb6" index="6" function="default" group="P"/>
-                <signal pad-id="pb7" index="7" function="default" group="P"/>
+                <signal pad-key="pb0" index="0" function="default" group="P"/>
+                <signal pad-key="pb1" index="1" function="default" group="P"/>
+                <signal pad-key="pb2" index="2" function="default" group="P"/>
+                <signal pad-key="pb3" index="3" function="default" group="P"/>
+                <signal pad-key="pb4" index="4" function="default" group="P"/>
+                <signal pad-key="pb5" index="5" function="default" group="P"/>
+                <signal pad-key="pb6" index="6" function="default" group="P"/>
+                <signal pad-key="pb7" index="7" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pc2" index="2" function="default" group="P"/>
-                <signal pad-id="pc3" index="3" function="default" group="P"/>
-                <signal pad-id="pc4" index="4" function="default" group="P"/>
-                <signal pad-id="pc5" index="5" function="default" group="P"/>
-                <signal pad-id="pc6" index="6" function="default" group="P"/>
+                <signal pad-key="pc0" index="0" function="default" group="P"/>
+                <signal pad-key="pc1" index="1" function="default" group="P"/>
+                <signal pad-key="pc2" index="2" function="default" group="P"/>
+                <signal pad-key="pc3" index="3" function="default" group="P"/>
+                <signal pad-key="pc4" index="4" function="default" group="P"/>
+                <signal pad-key="pc5" index="5" function="default" group="P"/>
+                <signal pad-key="pc6" index="6" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pd2" index="2" function="default" group="P"/>
-                <signal pad-id="pd3" index="3" function="default" group="P"/>
-                <signal pad-id="pd4" index="4" function="default" group="P"/>
-                <signal pad-id="pd5" index="5" function="default" group="P"/>
-                <signal pad-id="pd6" index="6" function="default" group="P"/>
-                <signal pad-id="pd7" index="7" function="default" group="P"/>
+                <signal pad-key="pd0" index="0" function="default" group="P"/>
+                <signal pad-key="pd1" index="1" function="default" group="P"/>
+                <signal pad-key="pd2" index="2" function="default" group="P"/>
+                <signal pad-key="pd3" index="3" function="default" group="P"/>
+                <signal pad-key="pd4" index="4" function="default" group="P"/>
+                <signal pad-key="pd5" index="5" function="default" group="P"/>
+                <signal pad-key="pd6" index="6" function="default" group="P"/>
+                <signal pad-key="pd7" index="7" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="tc0" name="TC0" module-key="tc8">
             <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"/>
-                <signal pad-id="pd6" function="default" group="OCA"/>
+                <signal pad-key="pd4" function="default" group="T"/>
+                <signal pad-key="pd5" function="default" group="OCB"/>
+                <signal pad-key="pd6" function="default" group="OCA"/>
             </signals>
         </peripheral>
         <peripheral key="exint" name="EXINT" module-key="exint">
             <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"/>
-                <signal pad-id="pd4" index="20" function="default" group="PCINT"/>
-                <signal pad-id="pb6" index="6" function="default" group="PCINT"/>
-                <signal pad-id="pb7" index="7" function="default" group="PCINT"/>
-                <signal pad-id="pd5" index="21" function="default" group="PCINT"/>
-                <signal pad-id="pd6" index="22" function="default" group="PCINT"/>
-                <signal pad-id="pd7" index="23" function="default" group="PCINT"/>
-                <signal pad-id="pb0" index="0" function="default" group="PCINT"/>
-                <signal pad-id="pb1" index="1" function="default" group="PCINT"/>
-                <signal pad-id="pb2" index="2" function="default" group="PCINT"/>
-                <signal pad-id="pb3" index="3" function="default" group="PCINT"/>
-                <signal pad-id="pb4" index="4" function="default" group="PCINT"/>
-                <signal pad-id="pb5" index="5" function="default" group="PCINT"/>
-                <signal pad-id="pc0" index="8" function="default" group="PCINT"/>
-                <signal pad-id="pc1" index="9" function="default" group="PCINT"/>
-                <signal pad-id="pc2" index="10" function="default" group="PCINT"/>
-                <signal pad-id="pc3" index="11" function="default" group="PCINT"/>
-                <signal pad-id="pc4" index="12" function="default" group="PCINT"/>
-                <signal pad-id="pc5" index="13" function="default" group="PCINT"/>
-                <signal pad-id="pc6" index="14" function="default" group="PCINT"/>
-                <signal pad-id="pd0" index="16" function="default" group="PCINT"/>
-                <signal pad-id="pd1" index="17" function="default" group="PCINT"/>
-                <signal pad-id="pd2" index="18" function="default" group="PCINT"/>
-                <signal pad-id="pd2" index="0" function="default" group="INT"/>
+                <signal pad-key="pd3" index="1" function="default" group="INT"/>
+                <signal pad-key="pd3" index="19" function="default" group="PCINT"/>
+                <signal pad-key="pd4" index="20" function="default" group="PCINT"/>
+                <signal pad-key="pb6" index="6" function="default" group="PCINT"/>
+                <signal pad-key="pb7" index="7" function="default" group="PCINT"/>
+                <signal pad-key="pd5" index="21" function="default" group="PCINT"/>
+                <signal pad-key="pd6" index="22" function="default" group="PCINT"/>
+                <signal pad-key="pd7" index="23" function="default" group="PCINT"/>
+                <signal pad-key="pb0" index="0" function="default" group="PCINT"/>
+                <signal pad-key="pb1" index="1" function="default" group="PCINT"/>
+                <signal pad-key="pb2" index="2" function="default" group="PCINT"/>
+                <signal pad-key="pb3" index="3" function="default" group="PCINT"/>
+                <signal pad-key="pb4" index="4" function="default" group="PCINT"/>
+                <signal pad-key="pb5" index="5" function="default" group="PCINT"/>
+                <signal pad-key="pc0" index="8" function="default" group="PCINT"/>
+                <signal pad-key="pc1" index="9" function="default" group="PCINT"/>
+                <signal pad-key="pc2" index="10" function="default" group="PCINT"/>
+                <signal pad-key="pc3" index="11" function="default" group="PCINT"/>
+                <signal pad-key="pc4" index="12" function="default" group="PCINT"/>
+                <signal pad-key="pc5" index="13" function="default" group="PCINT"/>
+                <signal pad-key="pc6" index="14" function="default" group="PCINT"/>
+                <signal pad-key="pd0" index="16" function="default" group="PCINT"/>
+                <signal pad-key="pd1" index="17" function="default" group="PCINT"/>
+                <signal pad-key="pd2" index="18" function="default" group="PCINT"/>
+                <signal pad-key="pd2" index="0" function="default" group="INT"/>
             </signals>
         </peripheral>
         <peripheral key="spi" name="SPI" module-key="spi">
             <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"/>
-                <signal pad-id="pb4" function="default" group="MISO"/>
-                <signal pad-id="pb5" function="default" group="SCK"/>
+                <signal pad-key="pb2" function="default" group="SS"/>
+                <signal pad-key="pb3" function="default" group="MOSI"/>
+                <signal pad-key="pb4" function="default" group="MISO"/>
+                <signal pad-key="pb5" function="default" group="SCK"/>
             </signals>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="wdt">
@@ -360,7 +360,7 @@
         <peripheral key="cpu" name="CPU" module-key="cpu">
             <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"/>
+                <signal pad-key="pb0" index="0" function="default" group="CLK"/>
             </signals>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="fuse">
@@ -768,140 +768,171 @@
             </register-group>
         </module>
     </modules>
+    <pads>
+        <pad key="pd3" name="PD3"/>
+        <pad key="pd4" name="PD4"/>
+        <pad key="gnd" name="GND"/>
+        <pad key="vcc" name="VCC"/>
+        <pad key="pb6" name="PB6"/>
+        <pad key="pb7" name="PB7"/>
+        <pad key="pd5" name="PD5"/>
+        <pad key="pd6" name="PD6"/>
+        <pad key="pd7" name="PD7"/>
+        <pad key="pb0" name="PB0"/>
+        <pad key="pb1" name="PB1"/>
+        <pad key="pb2" name="PB2"/>
+        <pad key="pb3" name="PB3"/>
+        <pad key="pb4" name="PB4"/>
+        <pad key="pb5" name="PB5"/>
+        <pad key="avcc" name="AVCC"/>
+        <pad key="adc6" name="ADC6"/>
+        <pad key="aref" name="AREF"/>
+        <pad key="adc7" name="ADC7"/>
+        <pad key="pc0" name="PC0"/>
+        <pad key="pc1" name="PC1"/>
+        <pad key="pc2" name="PC2"/>
+        <pad key="pc3" name="PC3"/>
+        <pad key="pc4" name="PC4"/>
+        <pad key="pc5" name="PC5"/>
+        <pad key="pc6" name="PC6"/>
+        <pad key="pd0" name="PD0"/>
+        <pad key="pd1" name="PD1"/>
+        <pad key="pd2" name="PD2"/>
+    </pads>
     <pinouts>
         <pinout key="tqfp32" name="TQFP32" type="qfp">
-            <pin position="1" pad="PD3"/>
-            <pin position="2" pad="PD4"/>
-            <pin position="3" pad="GND"/>
-            <pin position="4" pad="VCC"/>
-            <pin position="5" pad="GND"/>
-            <pin position="6" pad="VCC"/>
-            <pin position="7" pad="PB6"/>
-            <pin position="8" pad="PB7"/>
-            <pin position="9" pad="PD5"/>
-            <pin position="10" pad="PD6"/>
-            <pin position="11" pad="PD7"/>
-            <pin position="12" pad="PB0"/>
-            <pin position="13" pad="PB1"/>
-            <pin position="14" pad="PB2"/>
-            <pin position="15" pad="PB3"/>
-            <pin position="16" pad="PB4"/>
-            <pin position="17" pad="PB5"/>
-            <pin position="18" pad="AVCC"/>
-            <pin position="19" pad="ADC6"/>
-            <pin position="20" pad="AREF"/>
-            <pin position="21" pad="GND"/>
-            <pin position="22" pad="ADC7"/>
-            <pin position="23" pad="PC0"/>
-            <pin position="24" pad="PC1"/>
-            <pin position="25" pad="PC2"/>
-            <pin position="26" pad="PC3"/>
-            <pin position="27" pad="PC4"/>
-            <pin position="28" pad="PC5"/>
-            <pin position="29" pad="PC6"/>
-            <pin position="30" pad="PD0"/>
-            <pin position="31" pad="PD1"/>
-            <pin position="32" pad="PD2"/>
+            <pin position="1" pad-key="pd3"/>
+            <pin position="2" pad-key="pd4"/>
+            <pin position="3" pad-key="gnd"/>
+            <pin position="4" pad-key="vcc"/>
+            <pin position="5" pad-key="gnd"/>
+            <pin position="6" pad-key="vcc"/>
+            <pin position="7" pad-key="pb6"/>
+            <pin position="8" pad-key="pb7"/>
+            <pin position="9" pad-key="pd5"/>
+            <pin position="10" pad-key="pd6"/>
+            <pin position="11" pad-key="pd7"/>
+            <pin position="12" pad-key="pb0"/>
+            <pin position="13" pad-key="pb1"/>
+            <pin position="14" pad-key="pb2"/>
+            <pin position="15" pad-key="pb3"/>
+            <pin position="16" pad-key="pb4"/>
+            <pin position="17" pad-key="pb5"/>
+            <pin position="18" pad-key="avcc"/>
+            <pin position="19" pad-key="adc6"/>
+            <pin position="20" pad-key="aref"/>
+            <pin position="21" pad-key="gnd"/>
+            <pin position="22" pad-key="adc7"/>
+            <pin position="23" pad-key="pc0"/>
+            <pin position="24" pad-key="pc1"/>
+            <pin position="25" pad-key="pc2"/>
+            <pin position="26" pad-key="pc3"/>
+            <pin position="27" pad-key="pc4"/>
+            <pin position="28" pad-key="pc5"/>
+            <pin position="29" pad-key="pc6"/>
+            <pin position="30" pad-key="pd0"/>
+            <pin position="31" pad-key="pd1"/>
+            <pin position="32" pad-key="pd2"/>
         </pinout>
         <pinout key="qfn32" name="QFN32" type="qfn">
-            <pin position="1" pad="PD3"/>
-            <pin position="2" pad="PD4"/>
-            <pin position="3" pad="GND"/>
-            <pin position="4" pad="VCC"/>
-            <pin position="5" pad="GND"/>
-            <pin position="6" pad="VCC"/>
-            <pin position="7" pad="PB6"/>
-            <pin position="8" pad="PB7"/>
-            <pin position="9" pad="PD5"/>
-            <pin position="10" pad="PD6"/>
-            <pin position="11" pad="PD7"/>
-            <pin position="12" pad="PB0"/>
-            <pin position="13" pad="PB1"/>
-            <pin position="14" pad="PB2"/>
-            <pin position="15" pad="PB3"/>
-            <pin position="16" pad="PB4"/>
-            <pin position="17" pad="PB5"/>
-            <pin position="18" pad="AVCC"/>
-            <pin position="19" pad="ADC6"/>
-            <pin position="20" pad="AREF"/>
-            <pin position="21" pad="GND"/>
-            <pin position="22" pad="ADC7"/>
-            <pin position="23" pad="PC0"/>
-            <pin position="24" pad="PC1"/>
-            <pin position="25" pad="PC2"/>
-            <pin position="26" pad="PC3"/>
-            <pin position="27" pad="PC4"/>
-            <pin position="28" pad="PC5"/>
-            <pin position="29" pad="PC6"/>
-            <pin position="30" pad="PD0"/>
-            <pin position="31" pad="PD1"/>
-            <pin position="32" pad="PD2"/>
+            <pin position="1" pad-key="pd3"/>
+            <pin position="2" pad-key="pd4"/>
+            <pin position="3" pad-key="gnd"/>
+            <pin position="4" pad-key="vcc"/>
+            <pin position="5" pad-key="gnd"/>
+            <pin position="6" pad-key="vcc"/>
+            <pin position="7" pad-key="pb6"/>
+            <pin position="8" pad-key="pb7"/>
+            <pin position="9" pad-key="pd5"/>
+            <pin position="10" pad-key="pd6"/>
+            <pin position="11" pad-key="pd7"/>
+            <pin position="12" pad-key="pb0"/>
+            <pin position="13" pad-key="pb1"/>
+            <pin position="14" pad-key="pb2"/>
+            <pin position="15" pad-key="pb3"/>
+            <pin position="16" pad-key="pb4"/>
+            <pin position="17" pad-key="pb5"/>
+            <pin position="18" pad-key="avcc"/>
+            <pin position="19" pad-key="adc6"/>
+            <pin position="20" pad-key="aref"/>
+            <pin position="21" pad-key="gnd"/>
+            <pin position="22" pad-key="adc7"/>
+            <pin position="23" pad-key="pc0"/>
+            <pin position="24" pad-key="pc1"/>
+            <pin position="25" pad-key="pc2"/>
+            <pin position="26" pad-key="pc3"/>
+            <pin position="27" pad-key="pc4"/>
+            <pin position="28" pad-key="pc5"/>
+            <pin position="29" pad-key="pc6"/>
+            <pin position="30" pad-key="pd0"/>
+            <pin position="31" pad-key="pd1"/>
+            <pin position="32" pad-key="pd2"/>
         </pinout>
         <pinout key="qfn28" name="QFN28" type="qfn">
-            <pin position="1" pad="PD3"/>
-            <pin position="2" pad="PD4"/>
-            <pin position="3" pad="VCC"/>
-            <pin position="4" pad="GND"/>
-            <pin position="5" pad="PB6"/>
-            <pin position="6" pad="PB7"/>
-            <pin position="7" pad="PD5"/>
-            <pin position="8" pad="PD6"/>
-            <pin position="9" pad="PD7"/>
-            <pin position="10" pad="PB0"/>
-            <pin position="11" pad="PB1"/>
-            <pin position="12" pad="PB2"/>
-            <pin position="13" pad="PB3"/>
-            <pin position="14" pad="PB4"/>
-            <pin position="15" pad="PB5"/>
-            <pin position="16" pad="AVCC"/>
-            <pin position="17" pad="AREF"/>
-            <pin position="18" pad="GND"/>
-            <pin position="19" pad="PC0"/>
-            <pin position="20" pad="PC1"/>
-            <pin position="21" pad="PC2"/>
-            <pin position="22" pad="PC3"/>
-            <pin position="23" pad="PC4"/>
-            <pin position="24" pad="PC5"/>
-            <pin position="25" pad="PC6"/>
-            <pin position="26" pad="PD0"/>
-            <pin position="27" pad="PD1"/>
-            <pin position="28" pad="PD2"/>
+            <pin position="1" pad-key="pd3"/>
+            <pin position="2" pad-key="pd4"/>
+            <pin position="3" pad-key="vcc"/>
+            <pin position="4" pad-key="gnd"/>
+            <pin position="5" pad-key="pb6"/>
+            <pin position="6" pad-key="pb7"/>
+            <pin position="7" pad-key="pd5"/>
+            <pin position="8" pad-key="pd6"/>
+            <pin position="9" pad-key="pd7"/>
+            <pin position="10" pad-key="pb0"/>
+            <pin position="11" pad-key="pb1"/>
+            <pin position="12" pad-key="pb2"/>
+            <pin position="13" pad-key="pb3"/>
+            <pin position="14" pad-key="pb4"/>
+            <pin position="15" pad-key="pb5"/>
+            <pin position="16" pad-key="avcc"/>
+            <pin position="17" pad-key="aref"/>
+            <pin position="18" pad-key="gnd"/>
+            <pin position="19" pad-key="pc0"/>
+            <pin position="20" pad-key="pc1"/>
+            <pin position="21" pad-key="pc2"/>
+            <pin position="22" pad-key="pc3"/>
+            <pin position="23" pad-key="pc4"/>
+            <pin position="24" pad-key="pc5"/>
+            <pin position="25" pad-key="pc6"/>
+            <pin position="26" pad-key="pd0"/>
+            <pin position="27" pad-key="pd1"/>
+            <pin position="28" pad-key="pd2"/>
         </pinout>
         <pinout key="pdip28" name="PDIP28" type="dip">
-            <pin position="1" pad="PC6"/>
-            <pin position="2" pad="PD0"/>
-            <pin position="3" pad="PD1"/>
-            <pin position="4" pad="PD2"/>
-            <pin position="5" pad="PD3"/>
-            <pin position="6" pad="PD4"/>
-            <pin position="7" pad="VCC"/>
-            <pin position="8" pad="GND"/>
-            <pin position="9" pad="PB6"/>
-            <pin position="10" pad="PB7"/>
-            <pin position="11" pad="PD5"/>
-            <pin position="12" pad="PD6"/>
-            <pin position="13" pad="PD7"/>
-            <pin position="14" pad="PB0"/>
-            <pin position="15" pad="PB1"/>
-            <pin position="16" pad="PB2"/>
-            <pin position="17" pad="PB3"/>
-            <pin position="18" pad="PB4"/>
-            <pin position="19" pad="PB5"/>
-            <pin position="20" pad="AVCC"/>
-            <pin position="21" pad="AREF"/>
-            <pin position="22" pad="GND"/>
-            <pin position="23" pad="PC0"/>
-            <pin position="24" pad="PC1"/>
-            <pin position="25" pad="PC2"/>
-            <pin position="26" pad="PC3"/>
-            <pin position="27" pad="PC4"/>
-            <pin position="28" pad="PC5"/>
+            <pin position="1" pad-key="pc6"/>
+            <pin position="2" pad-key="pd0"/>
+            <pin position="3" pad-key="pd1"/>
+            <pin position="4" pad-key="pd2"/>
+            <pin position="5" pad-key="pd3"/>
+            <pin position="6" pad-key="pd4"/>
+            <pin position="7" pad-key="vcc"/>
+            <pin position="8" pad-key="gnd"/>
+            <pin position="9" pad-key="pb6"/>
+            <pin position="10" pad-key="pb7"/>
+            <pin position="11" pad-key="pd5"/>
+            <pin position="12" pad-key="pd6"/>
+            <pin position="13" pad-key="pd7"/>
+            <pin position="14" pad-key="pb0"/>
+            <pin position="15" pad-key="pb1"/>
+            <pin position="16" pad-key="pb2"/>
+            <pin position="17" pad-key="pb3"/>
+            <pin position="18" pad-key="pb4"/>
+            <pin position="19" pad-key="pb5"/>
+            <pin position="20" pad-key="avcc"/>
+            <pin position="21" pad-key="aref"/>
+            <pin position="22" pad-key="gnd"/>
+            <pin position="23" pad-key="pc0"/>
+            <pin position="24" pad-key="pc1"/>
+            <pin position="25" pad-key="pc2"/>
+            <pin position="26" pad-key="pc3"/>
+            <pin position="27" pad-key="pc4"/>
+            <pin position="28" pad-key="pc5"/>
         </pinout>
     </pinouts>
     <variants>
-        <variant name="ATmega88A-AU" pinout-key="tqfp32" package="TQFP32"/>
-        <variant name="ATmega88A-MMH" pinout-key="qfn28" package="QFN28"/>
-        <variant name="ATmega88A-MU" pinout-key="qfn32" package="QFN32"/>
-        <variant name="ATmega88A-PU" pinout-key="pdip28" package="PDIP28"/>
+        <variant key="atmega88a_au" name="ATmega88A-AU" pinout-key="tqfp32"/>
+        <variant key="atmega88a_mmh" name="ATmega88A-MMH" pinout-key="qfn28"/>
+        <variant key="atmega88a_mu" name="ATmega88A-MU" pinout-key="qfn32"/>
+        <variant key="atmega88a_pu" name="ATmega88A-PU" pinout-key="pdip28"/>
     </variants>
 </device>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA88P.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA88P.xml
index 25c14af5..78e0e3c0 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA88P.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA88P.xml
@@ -220,135 +220,135 @@
         <peripheral key="usart0" name="USART0" module-key="usart">
             <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"/>
-                <signal pad-id="pd4" function="default" group="XCK"/>
+                <signal pad-key="pd1" function="default" group="TXD"/>
+                <signal pad-key="pd0" function="default" group="RXD"/>
+                <signal pad-key="pd4" function="default" group="XCK"/>
             </signals>
         </peripheral>
         <peripheral key="twi" name="TWI" module-key="twi">
             <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"/>
+                <signal pad-key="pc4" function="default" group="SDA"/>
+                <signal pad-key="pc5" function="default" group="SCL"/>
             </signals>
         </peripheral>
         <peripheral key="tc1" name="TC1" module-key="tc16">
             <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"/>
-                <signal pad-id="pb1" function="default" group="OCA"/>
-                <signal pad-id="pb2" function="default" group="OCB"/>
+                <signal pad-key="pd5" function="default" group="T"/>
+                <signal pad-key="pb0" function="default" group="ICP"/>
+                <signal pad-key="pb1" function="default" group="OCA"/>
+                <signal pad-key="pb2" function="default" group="OCB"/>
             </signals>
         </peripheral>
         <peripheral key="tc2" name="TC2" module-key="tc8_async">
             <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"/>
+                <signal pad-key="pb3" function="default" group="OCA"/>
+                <signal pad-key="pd3" function="default" group="OCB"/>
             </signals>
         </peripheral>
         <peripheral key="adc" name="ADC" module-key="adc">
             <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"/>
-                <signal pad-id="pc2" index="2" function="default" group="ADC"/>
-                <signal pad-id="pc3" index="3" function="default" group="ADC"/>
-                <signal pad-id="pc4" index="4" function="default" group="ADC"/>
-                <signal pad-id="pc5" index="5" function="default" group="ADC"/>
+                <signal pad-key="pc0" index="0" function="default" group="ADC"/>
+                <signal pad-key="pc1" index="1" function="default" group="ADC"/>
+                <signal pad-key="pc2" index="2" function="default" group="ADC"/>
+                <signal pad-key="pc3" index="3" function="default" group="ADC"/>
+                <signal pad-key="pc4" index="4" function="default" group="ADC"/>
+                <signal pad-key="pc5" index="5" function="default" group="ADC"/>
             </signals>
         </peripheral>
         <peripheral key="ac" name="AC" module-key="ac">
             <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"/>
+                <signal pad-key="pd6" index="0" function="default" group="AIN"/>
+                <signal pad-key="pd7" index="1" function="default" group="AIN"/>
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pb2" index="2" function="default" group="P"/>
-                <signal pad-id="pb3" index="3" function="default" group="P"/>
-                <signal pad-id="pb4" index="4" function="default" group="P"/>
-                <signal pad-id="pb5" index="5" function="default" group="P"/>
-                <signal pad-id="pb6" index="6" function="default" group="P"/>
-                <signal pad-id="pb7" index="7" function="default" group="P"/>
+                <signal pad-key="pb0" index="0" function="default" group="P"/>
+                <signal pad-key="pb1" index="1" function="default" group="P"/>
+                <signal pad-key="pb2" index="2" function="default" group="P"/>
+                <signal pad-key="pb3" index="3" function="default" group="P"/>
+                <signal pad-key="pb4" index="4" function="default" group="P"/>
+                <signal pad-key="pb5" index="5" function="default" group="P"/>
+                <signal pad-key="pb6" index="6" function="default" group="P"/>
+                <signal pad-key="pb7" index="7" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pc2" index="2" function="default" group="P"/>
-                <signal pad-id="pc3" index="3" function="default" group="P"/>
-                <signal pad-id="pc4" index="4" function="default" group="P"/>
-                <signal pad-id="pc5" index="5" function="default" group="P"/>
-                <signal pad-id="pc6" index="6" function="default" group="P"/>
+                <signal pad-key="pc0" index="0" function="default" group="P"/>
+                <signal pad-key="pc1" index="1" function="default" group="P"/>
+                <signal pad-key="pc2" index="2" function="default" group="P"/>
+                <signal pad-key="pc3" index="3" function="default" group="P"/>
+                <signal pad-key="pc4" index="4" function="default" group="P"/>
+                <signal pad-key="pc5" index="5" function="default" group="P"/>
+                <signal pad-key="pc6" index="6" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pd2" index="2" function="default" group="P"/>
-                <signal pad-id="pd3" index="3" function="default" group="P"/>
-                <signal pad-id="pd4" index="4" function="default" group="P"/>
-                <signal pad-id="pd5" index="5" function="default" group="P"/>
-                <signal pad-id="pd6" index="6" function="default" group="P"/>
-                <signal pad-id="pd7" index="7" function="default" group="P"/>
+                <signal pad-key="pd0" index="0" function="default" group="P"/>
+                <signal pad-key="pd1" index="1" function="default" group="P"/>
+                <signal pad-key="pd2" index="2" function="default" group="P"/>
+                <signal pad-key="pd3" index="3" function="default" group="P"/>
+                <signal pad-key="pd4" index="4" function="default" group="P"/>
+                <signal pad-key="pd5" index="5" function="default" group="P"/>
+                <signal pad-key="pd6" index="6" function="default" group="P"/>
+                <signal pad-key="pd7" index="7" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="tc0" name="TC0" module-key="tc8">
             <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"/>
-                <signal pad-id="pd6" function="default" group="OCA"/>
+                <signal pad-key="pd4" function="default" group="T"/>
+                <signal pad-key="pd5" function="default" group="OCB"/>
+                <signal pad-key="pd6" function="default" group="OCA"/>
             </signals>
         </peripheral>
         <peripheral key="exint" name="EXINT" module-key="exint">
             <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"/>
-                <signal pad-id="pd4" index="20" function="default" group="PCINT"/>
-                <signal pad-id="pb6" index="6" function="default" group="PCINT"/>
-                <signal pad-id="pb7" index="7" function="default" group="PCINT"/>
-                <signal pad-id="pd5" index="21" function="default" group="PCINT"/>
-                <signal pad-id="pd6" index="22" function="default" group="PCINT"/>
-                <signal pad-id="pd7" index="23" function="default" group="PCINT"/>
-                <signal pad-id="pb0" index="0" function="default" group="PCINT"/>
-                <signal pad-id="pb1" index="1" function="default" group="PCINT"/>
-                <signal pad-id="pb2" index="2" function="default" group="PCINT"/>
-                <signal pad-id="pb3" index="3" function="default" group="PCINT"/>
-                <signal pad-id="pb4" index="4" function="default" group="PCINT"/>
-                <signal pad-id="pb5" index="5" function="default" group="PCINT"/>
-                <signal pad-id="pc0" index="8" function="default" group="PCINT"/>
-                <signal pad-id="pc1" index="9" function="default" group="PCINT"/>
-                <signal pad-id="pc2" index="10" function="default" group="PCINT"/>
-                <signal pad-id="pc3" index="11" function="default" group="PCINT"/>
-                <signal pad-id="pc4" index="12" function="default" group="PCINT"/>
-                <signal pad-id="pc5" index="13" function="default" group="PCINT"/>
-                <signal pad-id="pc6" index="14" function="default" group="PCINT"/>
-                <signal pad-id="pd0" index="16" function="default" group="PCINT"/>
-                <signal pad-id="pd1" index="17" function="default" group="PCINT"/>
-                <signal pad-id="pd2" index="18" function="default" group="PCINT"/>
-                <signal pad-id="pd2" index="0" function="default" group="INT"/>
+                <signal pad-key="pd3" index="1" function="default" group="INT"/>
+                <signal pad-key="pd3" index="19" function="default" group="PCINT"/>
+                <signal pad-key="pd4" index="20" function="default" group="PCINT"/>
+                <signal pad-key="pb6" index="6" function="default" group="PCINT"/>
+                <signal pad-key="pb7" index="7" function="default" group="PCINT"/>
+                <signal pad-key="pd5" index="21" function="default" group="PCINT"/>
+                <signal pad-key="pd6" index="22" function="default" group="PCINT"/>
+                <signal pad-key="pd7" index="23" function="default" group="PCINT"/>
+                <signal pad-key="pb0" index="0" function="default" group="PCINT"/>
+                <signal pad-key="pb1" index="1" function="default" group="PCINT"/>
+                <signal pad-key="pb2" index="2" function="default" group="PCINT"/>
+                <signal pad-key="pb3" index="3" function="default" group="PCINT"/>
+                <signal pad-key="pb4" index="4" function="default" group="PCINT"/>
+                <signal pad-key="pb5" index="5" function="default" group="PCINT"/>
+                <signal pad-key="pc0" index="8" function="default" group="PCINT"/>
+                <signal pad-key="pc1" index="9" function="default" group="PCINT"/>
+                <signal pad-key="pc2" index="10" function="default" group="PCINT"/>
+                <signal pad-key="pc3" index="11" function="default" group="PCINT"/>
+                <signal pad-key="pc4" index="12" function="default" group="PCINT"/>
+                <signal pad-key="pc5" index="13" function="default" group="PCINT"/>
+                <signal pad-key="pc6" index="14" function="default" group="PCINT"/>
+                <signal pad-key="pd0" index="16" function="default" group="PCINT"/>
+                <signal pad-key="pd1" index="17" function="default" group="PCINT"/>
+                <signal pad-key="pd2" index="18" function="default" group="PCINT"/>
+                <signal pad-key="pd2" index="0" function="default" group="INT"/>
             </signals>
         </peripheral>
         <peripheral key="spi" name="SPI" module-key="spi">
             <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"/>
-                <signal pad-id="pb4" function="default" group="MISO"/>
-                <signal pad-id="pb5" function="default" group="SCK"/>
+                <signal pad-key="pb2" function="default" group="SS"/>
+                <signal pad-key="pb3" function="default" group="MOSI"/>
+                <signal pad-key="pb4" function="default" group="MISO"/>
+                <signal pad-key="pb5" function="default" group="SCK"/>
             </signals>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="wdt">
@@ -360,7 +360,7 @@
         <peripheral key="cpu" name="CPU" module-key="cpu">
             <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"/>
+                <signal pad-key="pb0" index="0" function="default" group="CLK"/>
             </signals>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="fuse">
@@ -769,142 +769,173 @@
             </register-group>
         </module>
     </modules>
+    <pads>
+        <pad key="pd3" name="PD3"/>
+        <pad key="pd4" name="PD4"/>
+        <pad key="gnd" name="GND"/>
+        <pad key="vcc" name="VCC"/>
+        <pad key="pb6" name="PB6"/>
+        <pad key="pb7" name="PB7"/>
+        <pad key="pd5" name="PD5"/>
+        <pad key="pd6" name="PD6"/>
+        <pad key="pd7" name="PD7"/>
+        <pad key="pb0" name="PB0"/>
+        <pad key="pb1" name="PB1"/>
+        <pad key="pb2" name="PB2"/>
+        <pad key="pb3" name="PB3"/>
+        <pad key="pb4" name="PB4"/>
+        <pad key="pb5" name="PB5"/>
+        <pad key="avcc" name="AVCC"/>
+        <pad key="adc6" name="ADC6"/>
+        <pad key="aref" name="AREF"/>
+        <pad key="adc7" name="ADC7"/>
+        <pad key="pc0" name="PC0"/>
+        <pad key="pc1" name="PC1"/>
+        <pad key="pc2" name="PC2"/>
+        <pad key="pc3" name="PC3"/>
+        <pad key="pc4" name="PC4"/>
+        <pad key="pc5" name="PC5"/>
+        <pad key="pc6" name="PC6"/>
+        <pad key="pd0" name="PD0"/>
+        <pad key="pd1" name="PD1"/>
+        <pad key="pd2" name="PD2"/>
+    </pads>
     <pinouts>
         <pinout key="tqfp32" name="TQFP32" type="qfp">
-            <pin position="1" pad="PD3"/>
-            <pin position="2" pad="PD4"/>
-            <pin position="3" pad="GND"/>
-            <pin position="4" pad="VCC"/>
-            <pin position="5" pad="GND"/>
-            <pin position="6" pad="VCC"/>
-            <pin position="7" pad="PB6"/>
-            <pin position="8" pad="PB7"/>
-            <pin position="9" pad="PD5"/>
-            <pin position="10" pad="PD6"/>
-            <pin position="11" pad="PD7"/>
-            <pin position="12" pad="PB0"/>
-            <pin position="13" pad="PB1"/>
-            <pin position="14" pad="PB2"/>
-            <pin position="15" pad="PB3"/>
-            <pin position="16" pad="PB4"/>
-            <pin position="17" pad="PB5"/>
-            <pin position="18" pad="AVCC"/>
-            <pin position="19" pad="ADC6"/>
-            <pin position="20" pad="AREF"/>
-            <pin position="21" pad="GND"/>
-            <pin position="22" pad="ADC7"/>
-            <pin position="23" pad="PC0"/>
-            <pin position="24" pad="PC1"/>
-            <pin position="25" pad="PC2"/>
-            <pin position="26" pad="PC3"/>
-            <pin position="27" pad="PC4"/>
-            <pin position="28" pad="PC5"/>
-            <pin position="29" pad="PC6"/>
-            <pin position="30" pad="PD0"/>
-            <pin position="31" pad="PD1"/>
-            <pin position="32" pad="PD2"/>
+            <pin position="1" pad-key="pd3"/>
+            <pin position="2" pad-key="pd4"/>
+            <pin position="3" pad-key="gnd"/>
+            <pin position="4" pad-key="vcc"/>
+            <pin position="5" pad-key="gnd"/>
+            <pin position="6" pad-key="vcc"/>
+            <pin position="7" pad-key="pb6"/>
+            <pin position="8" pad-key="pb7"/>
+            <pin position="9" pad-key="pd5"/>
+            <pin position="10" pad-key="pd6"/>
+            <pin position="11" pad-key="pd7"/>
+            <pin position="12" pad-key="pb0"/>
+            <pin position="13" pad-key="pb1"/>
+            <pin position="14" pad-key="pb2"/>
+            <pin position="15" pad-key="pb3"/>
+            <pin position="16" pad-key="pb4"/>
+            <pin position="17" pad-key="pb5"/>
+            <pin position="18" pad-key="avcc"/>
+            <pin position="19" pad-key="adc6"/>
+            <pin position="20" pad-key="aref"/>
+            <pin position="21" pad-key="gnd"/>
+            <pin position="22" pad-key="adc7"/>
+            <pin position="23" pad-key="pc0"/>
+            <pin position="24" pad-key="pc1"/>
+            <pin position="25" pad-key="pc2"/>
+            <pin position="26" pad-key="pc3"/>
+            <pin position="27" pad-key="pc4"/>
+            <pin position="28" pad-key="pc5"/>
+            <pin position="29" pad-key="pc6"/>
+            <pin position="30" pad-key="pd0"/>
+            <pin position="31" pad-key="pd1"/>
+            <pin position="32" pad-key="pd2"/>
         </pinout>
         <pinout key="qfn32" name="QFN32" type="qfn">
-            <pin position="1" pad="PD3"/>
-            <pin position="2" pad="PD4"/>
-            <pin position="3" pad="GND"/>
-            <pin position="4" pad="VCC"/>
-            <pin position="5" pad="GND"/>
-            <pin position="6" pad="VCC"/>
-            <pin position="7" pad="PB6"/>
-            <pin position="8" pad="PB7"/>
-            <pin position="9" pad="PD5"/>
-            <pin position="10" pad="PD6"/>
-            <pin position="11" pad="PD7"/>
-            <pin position="12" pad="PB0"/>
-            <pin position="13" pad="PB1"/>
-            <pin position="14" pad="PB2"/>
-            <pin position="15" pad="PB3"/>
-            <pin position="16" pad="PB4"/>
-            <pin position="17" pad="PB5"/>
-            <pin position="18" pad="AVCC"/>
-            <pin position="19" pad="ADC6"/>
-            <pin position="20" pad="AREF"/>
-            <pin position="21" pad="GND"/>
-            <pin position="22" pad="ADC7"/>
-            <pin position="23" pad="PC0"/>
-            <pin position="24" pad="PC1"/>
-            <pin position="25" pad="PC2"/>
-            <pin position="26" pad="PC3"/>
-            <pin position="27" pad="PC4"/>
-            <pin position="28" pad="PC5"/>
-            <pin position="29" pad="PC6"/>
-            <pin position="30" pad="PD0"/>
-            <pin position="31" pad="PD1"/>
-            <pin position="32" pad="PD2"/>
+            <pin position="1" pad-key="pd3"/>
+            <pin position="2" pad-key="pd4"/>
+            <pin position="3" pad-key="gnd"/>
+            <pin position="4" pad-key="vcc"/>
+            <pin position="5" pad-key="gnd"/>
+            <pin position="6" pad-key="vcc"/>
+            <pin position="7" pad-key="pb6"/>
+            <pin position="8" pad-key="pb7"/>
+            <pin position="9" pad-key="pd5"/>
+            <pin position="10" pad-key="pd6"/>
+            <pin position="11" pad-key="pd7"/>
+            <pin position="12" pad-key="pb0"/>
+            <pin position="13" pad-key="pb1"/>
+            <pin position="14" pad-key="pb2"/>
+            <pin position="15" pad-key="pb3"/>
+            <pin position="16" pad-key="pb4"/>
+            <pin position="17" pad-key="pb5"/>
+            <pin position="18" pad-key="avcc"/>
+            <pin position="19" pad-key="adc6"/>
+            <pin position="20" pad-key="aref"/>
+            <pin position="21" pad-key="gnd"/>
+            <pin position="22" pad-key="adc7"/>
+            <pin position="23" pad-key="pc0"/>
+            <pin position="24" pad-key="pc1"/>
+            <pin position="25" pad-key="pc2"/>
+            <pin position="26" pad-key="pc3"/>
+            <pin position="27" pad-key="pc4"/>
+            <pin position="28" pad-key="pc5"/>
+            <pin position="29" pad-key="pc6"/>
+            <pin position="30" pad-key="pd0"/>
+            <pin position="31" pad-key="pd1"/>
+            <pin position="32" pad-key="pd2"/>
         </pinout>
         <pinout key="qfn28" name="QFN28" type="qfn">
-            <pin position="1" pad="PD3"/>
-            <pin position="2" pad="PD4"/>
-            <pin position="3" pad="VCC"/>
-            <pin position="4" pad="GND"/>
-            <pin position="5" pad="PB6"/>
-            <pin position="6" pad="PB7"/>
-            <pin position="7" pad="PD5"/>
-            <pin position="8" pad="PD6"/>
-            <pin position="9" pad="PD7"/>
-            <pin position="10" pad="PB0"/>
-            <pin position="11" pad="PB1"/>
-            <pin position="12" pad="PB2"/>
-            <pin position="13" pad="PB3"/>
-            <pin position="14" pad="PB4"/>
-            <pin position="15" pad="PB5"/>
-            <pin position="16" pad="AVCC"/>
-            <pin position="17" pad="AREF"/>
-            <pin position="18" pad="GND"/>
-            <pin position="19" pad="PC0"/>
-            <pin position="20" pad="PC1"/>
-            <pin position="21" pad="PC2"/>
-            <pin position="22" pad="PC3"/>
-            <pin position="23" pad="PC4"/>
-            <pin position="24" pad="PC5"/>
-            <pin position="25" pad="PC6"/>
-            <pin position="26" pad="PD0"/>
-            <pin position="27" pad="PD1"/>
-            <pin position="28" pad="PD2"/>
+            <pin position="1" pad-key="pd3"/>
+            <pin position="2" pad-key="pd4"/>
+            <pin position="3" pad-key="vcc"/>
+            <pin position="4" pad-key="gnd"/>
+            <pin position="5" pad-key="pb6"/>
+            <pin position="6" pad-key="pb7"/>
+            <pin position="7" pad-key="pd5"/>
+            <pin position="8" pad-key="pd6"/>
+            <pin position="9" pad-key="pd7"/>
+            <pin position="10" pad-key="pb0"/>
+            <pin position="11" pad-key="pb1"/>
+            <pin position="12" pad-key="pb2"/>
+            <pin position="13" pad-key="pb3"/>
+            <pin position="14" pad-key="pb4"/>
+            <pin position="15" pad-key="pb5"/>
+            <pin position="16" pad-key="avcc"/>
+            <pin position="17" pad-key="aref"/>
+            <pin position="18" pad-key="gnd"/>
+            <pin position="19" pad-key="pc0"/>
+            <pin position="20" pad-key="pc1"/>
+            <pin position="21" pad-key="pc2"/>
+            <pin position="22" pad-key="pc3"/>
+            <pin position="23" pad-key="pc4"/>
+            <pin position="24" pad-key="pc5"/>
+            <pin position="25" pad-key="pc6"/>
+            <pin position="26" pad-key="pd0"/>
+            <pin position="27" pad-key="pd1"/>
+            <pin position="28" pad-key="pd2"/>
         </pinout>
         <pinout key="pdip28" name="PDIP28" type="dip">
-            <pin position="1" pad="PC6"/>
-            <pin position="2" pad="PD0"/>
-            <pin position="3" pad="PD1"/>
-            <pin position="4" pad="PD2"/>
-            <pin position="5" pad="PD3"/>
-            <pin position="6" pad="PD4"/>
-            <pin position="7" pad="VCC"/>
-            <pin position="8" pad="GND"/>
-            <pin position="9" pad="PB6"/>
-            <pin position="10" pad="PB7"/>
-            <pin position="11" pad="PD5"/>
-            <pin position="12" pad="PD6"/>
-            <pin position="13" pad="PD7"/>
-            <pin position="14" pad="PB0"/>
-            <pin position="15" pad="PB1"/>
-            <pin position="16" pad="PB2"/>
-            <pin position="17" pad="PB3"/>
-            <pin position="18" pad="PB4"/>
-            <pin position="19" pad="PB5"/>
-            <pin position="20" pad="AVCC"/>
-            <pin position="21" pad="AREF"/>
-            <pin position="22" pad="GND"/>
-            <pin position="23" pad="PC0"/>
-            <pin position="24" pad="PC1"/>
-            <pin position="25" pad="PC2"/>
-            <pin position="26" pad="PC3"/>
-            <pin position="27" pad="PC4"/>
-            <pin position="28" pad="PC5"/>
+            <pin position="1" pad-key="pc6"/>
+            <pin position="2" pad-key="pd0"/>
+            <pin position="3" pad-key="pd1"/>
+            <pin position="4" pad-key="pd2"/>
+            <pin position="5" pad-key="pd3"/>
+            <pin position="6" pad-key="pd4"/>
+            <pin position="7" pad-key="vcc"/>
+            <pin position="8" pad-key="gnd"/>
+            <pin position="9" pad-key="pb6"/>
+            <pin position="10" pad-key="pb7"/>
+            <pin position="11" pad-key="pd5"/>
+            <pin position="12" pad-key="pd6"/>
+            <pin position="13" pad-key="pd7"/>
+            <pin position="14" pad-key="pb0"/>
+            <pin position="15" pad-key="pb1"/>
+            <pin position="16" pad-key="pb2"/>
+            <pin position="17" pad-key="pb3"/>
+            <pin position="18" pad-key="pb4"/>
+            <pin position="19" pad-key="pb5"/>
+            <pin position="20" pad-key="avcc"/>
+            <pin position="21" pad-key="aref"/>
+            <pin position="22" pad-key="gnd"/>
+            <pin position="23" pad-key="pc0"/>
+            <pin position="24" pad-key="pc1"/>
+            <pin position="25" pad-key="pc2"/>
+            <pin position="26" pad-key="pc3"/>
+            <pin position="27" pad-key="pc4"/>
+            <pin position="28" pad-key="pc5"/>
         </pinout>
     </pinouts>
     <variants>
-        <variant name="ATmega88PV-10AU" pinout-key="tqfp32" package="TQFP32"/>
-        <variant name="ATmega88PV-10MU" pinout-key="qfn32" package="QFN32"/>
-        <variant name="ATmega88PV-10PU" pinout-key="pdip28" package="PDIP28"/>
-        <variant name="ATmega88P-20AU" pinout-key="tqfp32" package="TQFP32"/>
-        <variant name="ATmega88P-20MU" pinout-key="qfn32" package="QFN32"/>
-        <variant name="ATmega88P-20PU" pinout-key="pdip28" package="PDIP28"/>
+        <variant key="atmega88pv_10au" name="ATmega88PV-10AU" pinout-key="tqfp32"/>
+        <variant key="atmega88pv_10mu" name="ATmega88PV-10MU" pinout-key="qfn32"/>
+        <variant key="atmega88pv_10pu" name="ATmega88PV-10PU" pinout-key="pdip28"/>
+        <variant key="atmega88p_20au" name="ATmega88P-20AU" pinout-key="tqfp32"/>
+        <variant key="atmega88p_20mu" name="ATmega88P-20MU" pinout-key="qfn32"/>
+        <variant key="atmega88p_20pu" name="ATmega88P-20PU" pinout-key="pdip28"/>
     </variants>
 </device>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA88PA.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA88PA.xml
index 445087cc..6e0ca0b0 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA88PA.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA88PA.xml
@@ -220,135 +220,135 @@
         <peripheral key="usart0" name="USART0" module-key="usart">
             <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"/>
-                <signal pad-id="pd4" function="default" group="XCK"/>
+                <signal pad-key="pd1" function="default" group="TXD"/>
+                <signal pad-key="pd0" function="default" group="RXD"/>
+                <signal pad-key="pd4" function="default" group="XCK"/>
             </signals>
         </peripheral>
         <peripheral key="twi" name="TWI" module-key="twi">
             <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"/>
+                <signal pad-key="pc4" function="default" group="SDA"/>
+                <signal pad-key="pc5" function="default" group="SCL"/>
             </signals>
         </peripheral>
         <peripheral key="tc1" name="TC1" module-key="tc16">
             <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"/>
-                <signal pad-id="pb1" function="default" group="OCA"/>
-                <signal pad-id="pb2" function="default" group="OCB"/>
+                <signal pad-key="pd5" function="default" group="T"/>
+                <signal pad-key="pb0" function="default" group="ICP"/>
+                <signal pad-key="pb1" function="default" group="OCA"/>
+                <signal pad-key="pb2" function="default" group="OCB"/>
             </signals>
         </peripheral>
         <peripheral key="tc2" name="TC2" module-key="tc8_async">
             <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"/>
+                <signal pad-key="pb3" function="default" group="OCA"/>
+                <signal pad-key="pd3" function="default" group="OCB"/>
             </signals>
         </peripheral>
         <peripheral key="adc" name="ADC" module-key="adc">
             <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"/>
-                <signal pad-id="pc2" index="2" function="default" group="ADC"/>
-                <signal pad-id="pc3" index="3" function="default" group="ADC"/>
-                <signal pad-id="pc4" index="4" function="default" group="ADC"/>
-                <signal pad-id="pc5" index="5" function="default" group="ADC"/>
+                <signal pad-key="pc0" index="0" function="default" group="ADC"/>
+                <signal pad-key="pc1" index="1" function="default" group="ADC"/>
+                <signal pad-key="pc2" index="2" function="default" group="ADC"/>
+                <signal pad-key="pc3" index="3" function="default" group="ADC"/>
+                <signal pad-key="pc4" index="4" function="default" group="ADC"/>
+                <signal pad-key="pc5" index="5" function="default" group="ADC"/>
             </signals>
         </peripheral>
         <peripheral key="ac" name="AC" module-key="ac">
             <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"/>
+                <signal pad-key="pd6" index="0" function="default" group="AIN"/>
+                <signal pad-key="pd7" index="1" function="default" group="AIN"/>
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pb2" index="2" function="default" group="P"/>
-                <signal pad-id="pb3" index="3" function="default" group="P"/>
-                <signal pad-id="pb4" index="4" function="default" group="P"/>
-                <signal pad-id="pb5" index="5" function="default" group="P"/>
-                <signal pad-id="pb6" index="6" function="default" group="P"/>
-                <signal pad-id="pb7" index="7" function="default" group="P"/>
+                <signal pad-key="pb0" index="0" function="default" group="P"/>
+                <signal pad-key="pb1" index="1" function="default" group="P"/>
+                <signal pad-key="pb2" index="2" function="default" group="P"/>
+                <signal pad-key="pb3" index="3" function="default" group="P"/>
+                <signal pad-key="pb4" index="4" function="default" group="P"/>
+                <signal pad-key="pb5" index="5" function="default" group="P"/>
+                <signal pad-key="pb6" index="6" function="default" group="P"/>
+                <signal pad-key="pb7" index="7" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pc2" index="2" function="default" group="P"/>
-                <signal pad-id="pc3" index="3" function="default" group="P"/>
-                <signal pad-id="pc4" index="4" function="default" group="P"/>
-                <signal pad-id="pc5" index="5" function="default" group="P"/>
-                <signal pad-id="pc6" index="6" function="default" group="P"/>
+                <signal pad-key="pc0" index="0" function="default" group="P"/>
+                <signal pad-key="pc1" index="1" function="default" group="P"/>
+                <signal pad-key="pc2" index="2" function="default" group="P"/>
+                <signal pad-key="pc3" index="3" function="default" group="P"/>
+                <signal pad-key="pc4" index="4" function="default" group="P"/>
+                <signal pad-key="pc5" index="5" function="default" group="P"/>
+                <signal pad-key="pc6" index="6" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pd2" index="2" function="default" group="P"/>
-                <signal pad-id="pd3" index="3" function="default" group="P"/>
-                <signal pad-id="pd4" index="4" function="default" group="P"/>
-                <signal pad-id="pd5" index="5" function="default" group="P"/>
-                <signal pad-id="pd6" index="6" function="default" group="P"/>
-                <signal pad-id="pd7" index="7" function="default" group="P"/>
+                <signal pad-key="pd0" index="0" function="default" group="P"/>
+                <signal pad-key="pd1" index="1" function="default" group="P"/>
+                <signal pad-key="pd2" index="2" function="default" group="P"/>
+                <signal pad-key="pd3" index="3" function="default" group="P"/>
+                <signal pad-key="pd4" index="4" function="default" group="P"/>
+                <signal pad-key="pd5" index="5" function="default" group="P"/>
+                <signal pad-key="pd6" index="6" function="default" group="P"/>
+                <signal pad-key="pd7" index="7" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="tc0" name="TC0" module-key="tc8">
             <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"/>
-                <signal pad-id="pd6" function="default" group="OCA"/>
+                <signal pad-key="pd4" function="default" group="T"/>
+                <signal pad-key="pd5" function="default" group="OCB"/>
+                <signal pad-key="pd6" function="default" group="OCA"/>
             </signals>
         </peripheral>
         <peripheral key="exint" name="EXINT" module-key="exint">
             <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"/>
-                <signal pad-id="pd4" index="20" function="default" group="PCINT"/>
-                <signal pad-id="pb6" index="6" function="default" group="PCINT"/>
-                <signal pad-id="pb7" index="7" function="default" group="PCINT"/>
-                <signal pad-id="pd5" index="21" function="default" group="PCINT"/>
-                <signal pad-id="pd6" index="22" function="default" group="PCINT"/>
-                <signal pad-id="pd7" index="23" function="default" group="PCINT"/>
-                <signal pad-id="pb0" index="0" function="default" group="PCINT"/>
-                <signal pad-id="pb1" index="1" function="default" group="PCINT"/>
-                <signal pad-id="pb2" index="2" function="default" group="PCINT"/>
-                <signal pad-id="pb3" index="3" function="default" group="PCINT"/>
-                <signal pad-id="pb4" index="4" function="default" group="PCINT"/>
-                <signal pad-id="pb5" index="5" function="default" group="PCINT"/>
-                <signal pad-id="pc0" index="8" function="default" group="PCINT"/>
-                <signal pad-id="pc1" index="9" function="default" group="PCINT"/>
-                <signal pad-id="pc2" index="10" function="default" group="PCINT"/>
-                <signal pad-id="pc3" index="11" function="default" group="PCINT"/>
-                <signal pad-id="pc4" index="12" function="default" group="PCINT"/>
-                <signal pad-id="pc5" index="13" function="default" group="PCINT"/>
-                <signal pad-id="pc6" index="14" function="default" group="PCINT"/>
-                <signal pad-id="pd0" index="16" function="default" group="PCINT"/>
-                <signal pad-id="pd1" index="17" function="default" group="PCINT"/>
-                <signal pad-id="pd2" index="18" function="default" group="PCINT"/>
-                <signal pad-id="pd2" index="0" function="default" group="INT"/>
+                <signal pad-key="pd3" index="1" function="default" group="INT"/>
+                <signal pad-key="pd3" index="19" function="default" group="PCINT"/>
+                <signal pad-key="pd4" index="20" function="default" group="PCINT"/>
+                <signal pad-key="pb6" index="6" function="default" group="PCINT"/>
+                <signal pad-key="pb7" index="7" function="default" group="PCINT"/>
+                <signal pad-key="pd5" index="21" function="default" group="PCINT"/>
+                <signal pad-key="pd6" index="22" function="default" group="PCINT"/>
+                <signal pad-key="pd7" index="23" function="default" group="PCINT"/>
+                <signal pad-key="pb0" index="0" function="default" group="PCINT"/>
+                <signal pad-key="pb1" index="1" function="default" group="PCINT"/>
+                <signal pad-key="pb2" index="2" function="default" group="PCINT"/>
+                <signal pad-key="pb3" index="3" function="default" group="PCINT"/>
+                <signal pad-key="pb4" index="4" function="default" group="PCINT"/>
+                <signal pad-key="pb5" index="5" function="default" group="PCINT"/>
+                <signal pad-key="pc0" index="8" function="default" group="PCINT"/>
+                <signal pad-key="pc1" index="9" function="default" group="PCINT"/>
+                <signal pad-key="pc2" index="10" function="default" group="PCINT"/>
+                <signal pad-key="pc3" index="11" function="default" group="PCINT"/>
+                <signal pad-key="pc4" index="12" function="default" group="PCINT"/>
+                <signal pad-key="pc5" index="13" function="default" group="PCINT"/>
+                <signal pad-key="pc6" index="14" function="default" group="PCINT"/>
+                <signal pad-key="pd0" index="16" function="default" group="PCINT"/>
+                <signal pad-key="pd1" index="17" function="default" group="PCINT"/>
+                <signal pad-key="pd2" index="18" function="default" group="PCINT"/>
+                <signal pad-key="pd2" index="0" function="default" group="INT"/>
             </signals>
         </peripheral>
         <peripheral key="spi" name="SPI" module-key="spi">
             <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"/>
-                <signal pad-id="pb4" function="default" group="MISO"/>
-                <signal pad-id="pb5" function="default" group="SCK"/>
+                <signal pad-key="pb2" function="default" group="SS"/>
+                <signal pad-key="pb3" function="default" group="MOSI"/>
+                <signal pad-key="pb4" function="default" group="MISO"/>
+                <signal pad-key="pb5" function="default" group="SCK"/>
             </signals>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="wdt">
@@ -360,7 +360,7 @@
         <peripheral key="cpu" name="CPU" module-key="cpu">
             <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"/>
+                <signal pad-key="pb0" index="0" function="default" group="CLK"/>
             </signals>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="fuse">
@@ -770,144 +770,175 @@
             </register-group>
         </module>
     </modules>
+    <pads>
+        <pad key="pd3" name="PD3"/>
+        <pad key="pd4" name="PD4"/>
+        <pad key="gnd" name="GND"/>
+        <pad key="vcc" name="VCC"/>
+        <pad key="pb6" name="PB6"/>
+        <pad key="pb7" name="PB7"/>
+        <pad key="pd5" name="PD5"/>
+        <pad key="pd6" name="PD6"/>
+        <pad key="pd7" name="PD7"/>
+        <pad key="pb0" name="PB0"/>
+        <pad key="pb1" name="PB1"/>
+        <pad key="pb2" name="PB2"/>
+        <pad key="pb3" name="PB3"/>
+        <pad key="pb4" name="PB4"/>
+        <pad key="pb5" name="PB5"/>
+        <pad key="avcc" name="AVCC"/>
+        <pad key="adc6" name="ADC6"/>
+        <pad key="aref" name="AREF"/>
+        <pad key="adc7" name="ADC7"/>
+        <pad key="pc0" name="PC0"/>
+        <pad key="pc1" name="PC1"/>
+        <pad key="pc2" name="PC2"/>
+        <pad key="pc3" name="PC3"/>
+        <pad key="pc4" name="PC4"/>
+        <pad key="pc5" name="PC5"/>
+        <pad key="pc6" name="PC6"/>
+        <pad key="pd0" name="PD0"/>
+        <pad key="pd1" name="PD1"/>
+        <pad key="pd2" name="PD2"/>
+    </pads>
     <pinouts>
         <pinout key="tqfp32" name="TQFP32" type="qfp">
-            <pin position="1" pad="PD3"/>
-            <pin position="2" pad="PD4"/>
-            <pin position="3" pad="GND"/>
-            <pin position="4" pad="VCC"/>
-            <pin position="5" pad="GND"/>
-            <pin position="6" pad="VCC"/>
-            <pin position="7" pad="PB6"/>
-            <pin position="8" pad="PB7"/>
-            <pin position="9" pad="PD5"/>
-            <pin position="10" pad="PD6"/>
-            <pin position="11" pad="PD7"/>
-            <pin position="12" pad="PB0"/>
-            <pin position="13" pad="PB1"/>
-            <pin position="14" pad="PB2"/>
-            <pin position="15" pad="PB3"/>
-            <pin position="16" pad="PB4"/>
-            <pin position="17" pad="PB5"/>
-            <pin position="18" pad="AVCC"/>
-            <pin position="19" pad="ADC6"/>
-            <pin position="20" pad="AREF"/>
-            <pin position="21" pad="GND"/>
-            <pin position="22" pad="ADC7"/>
-            <pin position="23" pad="PC0"/>
-            <pin position="24" pad="PC1"/>
-            <pin position="25" pad="PC2"/>
-            <pin position="26" pad="PC3"/>
-            <pin position="27" pad="PC4"/>
-            <pin position="28" pad="PC5"/>
-            <pin position="29" pad="PC6"/>
-            <pin position="30" pad="PD0"/>
-            <pin position="31" pad="PD1"/>
-            <pin position="32" pad="PD2"/>
+            <pin position="1" pad-key="pd3"/>
+            <pin position="2" pad-key="pd4"/>
+            <pin position="3" pad-key="gnd"/>
+            <pin position="4" pad-key="vcc"/>
+            <pin position="5" pad-key="gnd"/>
+            <pin position="6" pad-key="vcc"/>
+            <pin position="7" pad-key="pb6"/>
+            <pin position="8" pad-key="pb7"/>
+            <pin position="9" pad-key="pd5"/>
+            <pin position="10" pad-key="pd6"/>
+            <pin position="11" pad-key="pd7"/>
+            <pin position="12" pad-key="pb0"/>
+            <pin position="13" pad-key="pb1"/>
+            <pin position="14" pad-key="pb2"/>
+            <pin position="15" pad-key="pb3"/>
+            <pin position="16" pad-key="pb4"/>
+            <pin position="17" pad-key="pb5"/>
+            <pin position="18" pad-key="avcc"/>
+            <pin position="19" pad-key="adc6"/>
+            <pin position="20" pad-key="aref"/>
+            <pin position="21" pad-key="gnd"/>
+            <pin position="22" pad-key="adc7"/>
+            <pin position="23" pad-key="pc0"/>
+            <pin position="24" pad-key="pc1"/>
+            <pin position="25" pad-key="pc2"/>
+            <pin position="26" pad-key="pc3"/>
+            <pin position="27" pad-key="pc4"/>
+            <pin position="28" pad-key="pc5"/>
+            <pin position="29" pad-key="pc6"/>
+            <pin position="30" pad-key="pd0"/>
+            <pin position="31" pad-key="pd1"/>
+            <pin position="32" pad-key="pd2"/>
         </pinout>
         <pinout key="qfn32" name="QFN32" type="qfn">
-            <pin position="1" pad="PD3"/>
-            <pin position="2" pad="PD4"/>
-            <pin position="3" pad="GND"/>
-            <pin position="4" pad="VCC"/>
-            <pin position="5" pad="GND"/>
-            <pin position="6" pad="VCC"/>
-            <pin position="7" pad="PB6"/>
-            <pin position="8" pad="PB7"/>
-            <pin position="9" pad="PD5"/>
-            <pin position="10" pad="PD6"/>
-            <pin position="11" pad="PD7"/>
-            <pin position="12" pad="PB0"/>
-            <pin position="13" pad="PB1"/>
-            <pin position="14" pad="PB2"/>
-            <pin position="15" pad="PB3"/>
-            <pin position="16" pad="PB4"/>
-            <pin position="17" pad="PB5"/>
-            <pin position="18" pad="AVCC"/>
-            <pin position="19" pad="ADC6"/>
-            <pin position="20" pad="AREF"/>
-            <pin position="21" pad="GND"/>
-            <pin position="22" pad="ADC7"/>
-            <pin position="23" pad="PC0"/>
-            <pin position="24" pad="PC1"/>
-            <pin position="25" pad="PC2"/>
-            <pin position="26" pad="PC3"/>
-            <pin position="27" pad="PC4"/>
-            <pin position="28" pad="PC5"/>
-            <pin position="29" pad="PC6"/>
-            <pin position="30" pad="PD0"/>
-            <pin position="31" pad="PD1"/>
-            <pin position="32" pad="PD2"/>
+            <pin position="1" pad-key="pd3"/>
+            <pin position="2" pad-key="pd4"/>
+            <pin position="3" pad-key="gnd"/>
+            <pin position="4" pad-key="vcc"/>
+            <pin position="5" pad-key="gnd"/>
+            <pin position="6" pad-key="vcc"/>
+            <pin position="7" pad-key="pb6"/>
+            <pin position="8" pad-key="pb7"/>
+            <pin position="9" pad-key="pd5"/>
+            <pin position="10" pad-key="pd6"/>
+            <pin position="11" pad-key="pd7"/>
+            <pin position="12" pad-key="pb0"/>
+            <pin position="13" pad-key="pb1"/>
+            <pin position="14" pad-key="pb2"/>
+            <pin position="15" pad-key="pb3"/>
+            <pin position="16" pad-key="pb4"/>
+            <pin position="17" pad-key="pb5"/>
+            <pin position="18" pad-key="avcc"/>
+            <pin position="19" pad-key="adc6"/>
+            <pin position="20" pad-key="aref"/>
+            <pin position="21" pad-key="gnd"/>
+            <pin position="22" pad-key="adc7"/>
+            <pin position="23" pad-key="pc0"/>
+            <pin position="24" pad-key="pc1"/>
+            <pin position="25" pad-key="pc2"/>
+            <pin position="26" pad-key="pc3"/>
+            <pin position="27" pad-key="pc4"/>
+            <pin position="28" pad-key="pc5"/>
+            <pin position="29" pad-key="pc6"/>
+            <pin position="30" pad-key="pd0"/>
+            <pin position="31" pad-key="pd1"/>
+            <pin position="32" pad-key="pd2"/>
         </pinout>
         <pinout key="qfn28" name="QFN28" type="qfn">
-            <pin position="1" pad="PD3"/>
-            <pin position="2" pad="PD4"/>
-            <pin position="3" pad="VCC"/>
-            <pin position="4" pad="GND"/>
-            <pin position="5" pad="PB6"/>
-            <pin position="6" pad="PB7"/>
-            <pin position="7" pad="PD5"/>
-            <pin position="8" pad="PD6"/>
-            <pin position="9" pad="PD7"/>
-            <pin position="10" pad="PB0"/>
-            <pin position="11" pad="PB1"/>
-            <pin position="12" pad="PB2"/>
-            <pin position="13" pad="PB3"/>
-            <pin position="14" pad="PB4"/>
-            <pin position="15" pad="PB5"/>
-            <pin position="16" pad="AVCC"/>
-            <pin position="17" pad="AREF"/>
-            <pin position="18" pad="GND"/>
-            <pin position="19" pad="PC0"/>
-            <pin position="20" pad="PC1"/>
-            <pin position="21" pad="PC2"/>
-            <pin position="22" pad="PC3"/>
-            <pin position="23" pad="PC4"/>
-            <pin position="24" pad="PC5"/>
-            <pin position="25" pad="PC6"/>
-            <pin position="26" pad="PD0"/>
-            <pin position="27" pad="PD1"/>
-            <pin position="28" pad="PD2"/>
+            <pin position="1" pad-key="pd3"/>
+            <pin position="2" pad-key="pd4"/>
+            <pin position="3" pad-key="vcc"/>
+            <pin position="4" pad-key="gnd"/>
+            <pin position="5" pad-key="pb6"/>
+            <pin position="6" pad-key="pb7"/>
+            <pin position="7" pad-key="pd5"/>
+            <pin position="8" pad-key="pd6"/>
+            <pin position="9" pad-key="pd7"/>
+            <pin position="10" pad-key="pb0"/>
+            <pin position="11" pad-key="pb1"/>
+            <pin position="12" pad-key="pb2"/>
+            <pin position="13" pad-key="pb3"/>
+            <pin position="14" pad-key="pb4"/>
+            <pin position="15" pad-key="pb5"/>
+            <pin position="16" pad-key="avcc"/>
+            <pin position="17" pad-key="aref"/>
+            <pin position="18" pad-key="gnd"/>
+            <pin position="19" pad-key="pc0"/>
+            <pin position="20" pad-key="pc1"/>
+            <pin position="21" pad-key="pc2"/>
+            <pin position="22" pad-key="pc3"/>
+            <pin position="23" pad-key="pc4"/>
+            <pin position="24" pad-key="pc5"/>
+            <pin position="25" pad-key="pc6"/>
+            <pin position="26" pad-key="pd0"/>
+            <pin position="27" pad-key="pd1"/>
+            <pin position="28" pad-key="pd2"/>
         </pinout>
         <pinout key="pdip28" name="PDIP28" type="dip">
-            <pin position="1" pad="PC6"/>
-            <pin position="2" pad="PD0"/>
-            <pin position="3" pad="PD1"/>
-            <pin position="4" pad="PD2"/>
-            <pin position="5" pad="PD3"/>
-            <pin position="6" pad="PD4"/>
-            <pin position="7" pad="VCC"/>
-            <pin position="8" pad="GND"/>
-            <pin position="9" pad="PB6"/>
-            <pin position="10" pad="PB7"/>
-            <pin position="11" pad="PD5"/>
-            <pin position="12" pad="PD6"/>
-            <pin position="13" pad="PD7"/>
-            <pin position="14" pad="PB0"/>
-            <pin position="15" pad="PB1"/>
-            <pin position="16" pad="PB2"/>
-            <pin position="17" pad="PB3"/>
-            <pin position="18" pad="PB4"/>
-            <pin position="19" pad="PB5"/>
-            <pin position="20" pad="AVCC"/>
-            <pin position="21" pad="AREF"/>
-            <pin position="22" pad="GND"/>
-            <pin position="23" pad="PC0"/>
-            <pin position="24" pad="PC1"/>
-            <pin position="25" pad="PC2"/>
-            <pin position="26" pad="PC3"/>
-            <pin position="27" pad="PC4"/>
-            <pin position="28" pad="PC5"/>
+            <pin position="1" pad-key="pc6"/>
+            <pin position="2" pad-key="pd0"/>
+            <pin position="3" pad-key="pd1"/>
+            <pin position="4" pad-key="pd2"/>
+            <pin position="5" pad-key="pd3"/>
+            <pin position="6" pad-key="pd4"/>
+            <pin position="7" pad-key="vcc"/>
+            <pin position="8" pad-key="gnd"/>
+            <pin position="9" pad-key="pb6"/>
+            <pin position="10" pad-key="pb7"/>
+            <pin position="11" pad-key="pd5"/>
+            <pin position="12" pad-key="pd6"/>
+            <pin position="13" pad-key="pd7"/>
+            <pin position="14" pad-key="pb0"/>
+            <pin position="15" pad-key="pb1"/>
+            <pin position="16" pad-key="pb2"/>
+            <pin position="17" pad-key="pb3"/>
+            <pin position="18" pad-key="pb4"/>
+            <pin position="19" pad-key="pb5"/>
+            <pin position="20" pad-key="avcc"/>
+            <pin position="21" pad-key="aref"/>
+            <pin position="22" pad-key="gnd"/>
+            <pin position="23" pad-key="pc0"/>
+            <pin position="24" pad-key="pc1"/>
+            <pin position="25" pad-key="pc2"/>
+            <pin position="26" pad-key="pc3"/>
+            <pin position="27" pad-key="pc4"/>
+            <pin position="28" pad-key="pc5"/>
         </pinout>
     </pinouts>
     <variants>
-        <variant name="ATmega88PA-AU" pinout-key="tqfp32" package="TQFP32"/>
-        <variant name="ATmega88PA-MMH" pinout-key="qfn28" package="QFN28"/>
-        <variant name="ATmega88PA-MU" pinout-key="qfn32" package="QFN32"/>
-        <variant name="ATmega88PA-PU" pinout-key="pdip28" package="PDIP28"/>
-        <variant name="ATmega88PA-AN" pinout-key="tqfp32" package="TQFP32"/>
-        <variant name="ATmega88PA-MMN" pinout-key="qfn28" package="QFN28"/>
-        <variant name="ATmega88PA-MN" pinout-key="qfn32" package="QFN32"/>
-        <variant name="ATmega88PA-PN" pinout-key="pdip28" package="PDIP28"/>
+        <variant key="atmega88pa_au" name="ATmega88PA-AU" pinout-key="tqfp32"/>
+        <variant key="atmega88pa_mmh" name="ATmega88PA-MMH" pinout-key="qfn28"/>
+        <variant key="atmega88pa_mu" name="ATmega88PA-MU" pinout-key="qfn32"/>
+        <variant key="atmega88pa_pu" name="ATmega88PA-PU" pinout-key="pdip28"/>
+        <variant key="atmega88pa_an" name="ATmega88PA-AN" pinout-key="tqfp32"/>
+        <variant key="atmega88pa_mmn" name="ATmega88PA-MMN" pinout-key="qfn28"/>
+        <variant key="atmega88pa_mn" name="ATmega88PA-MN" pinout-key="qfn32"/>
+        <variant key="atmega88pa_pn" name="ATmega88PA-PN" pinout-key="pdip28"/>
     </variants>
 </device>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA88PB.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA88PB.xml
index 727a6629..c851022d 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA88PB.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA88PB.xml
@@ -220,147 +220,147 @@
         <peripheral key="usart0" name="USART0" module-key="usart">
             <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"/>
-                <signal pad-id="pd4" function="default" group="XCK"/>
+                <signal pad-key="pd1" function="default" group="TXD"/>
+                <signal pad-key="pd0" function="default" group="RXD"/>
+                <signal pad-key="pd4" function="default" group="XCK"/>
             </signals>
         </peripheral>
         <peripheral key="twi" name="TWI" module-key="twi">
             <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"/>
+                <signal pad-key="pc4" function="default" group="SDA"/>
+                <signal pad-key="pc5" function="default" group="SCL"/>
             </signals>
         </peripheral>
         <peripheral key="tc1" name="TC1" module-key="tc16">
             <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"/>
-                <signal pad-id="pb1" function="default" group="OCA"/>
-                <signal pad-id="pb2" function="default" group="OCB"/>
+                <signal pad-key="pd5" function="default" group="T"/>
+                <signal pad-key="pb0" function="default" group="ICP"/>
+                <signal pad-key="pb1" function="default" group="OCA"/>
+                <signal pad-key="pb2" function="default" group="OCB"/>
             </signals>
         </peripheral>
         <peripheral key="tc2" name="TC2" module-key="tc8_async">
             <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"/>
+                <signal pad-key="pb3" function="default" group="OCA"/>
+                <signal pad-key="pd3" function="default" group="OCB"/>
             </signals>
         </peripheral>
         <peripheral key="adc" name="ADC" module-key="adc">
             <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"/>
-                <signal pad-id="pc2" index="2" function="default" group="ADC"/>
-                <signal pad-id="pc3" index="3" function="default" group="ADC"/>
-                <signal pad-id="pc4" index="4" function="default" group="ADC"/>
-                <signal pad-id="pc5" index="5" function="default" group="ADC"/>
-                <signal pad-id="pe2" index="6" function="default" group="ADC"/>
-                <signal pad-id="pe3" index="7" function="default" group="ADC"/>
+                <signal pad-key="pc0" index="0" function="default" group="ADC"/>
+                <signal pad-key="pc1" index="1" function="default" group="ADC"/>
+                <signal pad-key="pc2" index="2" function="default" group="ADC"/>
+                <signal pad-key="pc3" index="3" function="default" group="ADC"/>
+                <signal pad-key="pc4" index="4" function="default" group="ADC"/>
+                <signal pad-key="pc5" index="5" function="default" group="ADC"/>
+                <signal pad-key="pe2" index="6" function="default" group="ADC"/>
+                <signal pad-key="pe3" index="7" function="default" group="ADC"/>
             </signals>
         </peripheral>
         <peripheral key="ac" name="AC" module-key="ac">
             <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"/>
-                <signal pad-id="pd7" index="1" function="default" group="AIN"/>
+                <signal pad-key="pe0" function="default" group="AC"/>
+                <signal pad-key="pd6" index="0" function="default" group="AIN"/>
+                <signal pad-key="pd7" index="1" function="default" group="AIN"/>
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pb2" index="2" function="default" group="P"/>
-                <signal pad-id="pb3" index="3" function="default" group="P"/>
-                <signal pad-id="pb4" index="4" function="default" group="P"/>
-                <signal pad-id="pb5" index="5" function="default" group="P"/>
-                <signal pad-id="pb6" index="6" function="default" group="P"/>
-                <signal pad-id="pb7" index="7" function="default" group="P"/>
+                <signal pad-key="pb0" index="0" function="default" group="P"/>
+                <signal pad-key="pb1" index="1" function="default" group="P"/>
+                <signal pad-key="pb2" index="2" function="default" group="P"/>
+                <signal pad-key="pb3" index="3" function="default" group="P"/>
+                <signal pad-key="pb4" index="4" function="default" group="P"/>
+                <signal pad-key="pb5" index="5" function="default" group="P"/>
+                <signal pad-key="pb6" index="6" function="default" group="P"/>
+                <signal pad-key="pb7" index="7" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pc2" index="2" function="default" group="P"/>
-                <signal pad-id="pc3" index="3" function="default" group="P"/>
-                <signal pad-id="pc4" index="4" function="default" group="P"/>
-                <signal pad-id="pc5" index="5" function="default" group="P"/>
-                <signal pad-id="pc6" index="6" function="default" group="P"/>
+                <signal pad-key="pc0" index="0" function="default" group="P"/>
+                <signal pad-key="pc1" index="1" function="default" group="P"/>
+                <signal pad-key="pc2" index="2" function="default" group="P"/>
+                <signal pad-key="pc3" index="3" function="default" group="P"/>
+                <signal pad-key="pc4" index="4" function="default" group="P"/>
+                <signal pad-key="pc5" index="5" function="default" group="P"/>
+                <signal pad-key="pc6" index="6" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pd2" index="2" function="default" group="P"/>
-                <signal pad-id="pd3" index="3" function="default" group="P"/>
-                <signal pad-id="pd4" index="4" function="default" group="P"/>
-                <signal pad-id="pd5" index="5" function="default" group="P"/>
-                <signal pad-id="pd6" index="6" function="default" group="P"/>
-                <signal pad-id="pd7" index="7" function="default" group="P"/>
+                <signal pad-key="pd0" index="0" function="default" group="P"/>
+                <signal pad-key="pd1" index="1" function="default" group="P"/>
+                <signal pad-key="pd2" index="2" function="default" group="P"/>
+                <signal pad-key="pd3" index="3" function="default" group="P"/>
+                <signal pad-key="pd4" index="4" function="default" group="P"/>
+                <signal pad-key="pd5" index="5" function="default" group="P"/>
+                <signal pad-key="pd6" index="6" function="default" group="P"/>
+                <signal pad-key="pd7" index="7" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="porte" name="PORTE" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pe2" index="2" function="default" group="P"/>
-                <signal pad-id="pe3" index="3" function="default" group="P"/>
+                <signal pad-key="pe0" index="0" function="default" group="P"/>
+                <signal pad-key="pe1" index="1" function="default" group="P"/>
+                <signal pad-key="pe2" index="2" function="default" group="P"/>
+                <signal pad-key="pe3" index="3" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="tc0" name="TC0" module-key="tc8">
             <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"/>
-                <signal pad-id="pd6" function="default" group="OCA"/>
+                <signal pad-key="pd4" function="default" group="T"/>
+                <signal pad-key="pd5" function="default" group="OCB"/>
+                <signal pad-key="pd6" function="default" group="OCA"/>
             </signals>
         </peripheral>
         <peripheral key="exint" name="EXINT" module-key="exint">
             <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"/>
-                <signal pad-id="pd4" index="20" function="default" group="PCINT"/>
-                <signal pad-id="pb6" index="6" function="default" group="PCINT"/>
-                <signal pad-id="pb7" index="7" function="default" group="PCINT"/>
-                <signal pad-id="pd5" index="21" function="default" group="PCINT"/>
-                <signal pad-id="pd6" index="22" function="default" group="PCINT"/>
-                <signal pad-id="pd7" index="23" function="default" group="PCINT"/>
-                <signal pad-id="pb0" index="0" function="default" group="PCINT"/>
-                <signal pad-id="pb1" index="1" function="default" group="PCINT"/>
-                <signal pad-id="pb2" index="2" function="default" group="PCINT"/>
-                <signal pad-id="pb3" index="3" function="default" group="PCINT"/>
-                <signal pad-id="pb4" index="4" function="default" group="PCINT"/>
-                <signal pad-id="pb5" index="5" function="default" group="PCINT"/>
-                <signal pad-id="pc0" index="8" function="default" group="PCINT"/>
-                <signal pad-id="pc1" index="9" function="default" group="PCINT"/>
-                <signal pad-id="pc2" index="10" function="default" group="PCINT"/>
-                <signal pad-id="pc3" index="11" function="default" group="PCINT"/>
-                <signal pad-id="pc4" index="12" function="default" group="PCINT"/>
-                <signal pad-id="pc5" index="13" function="default" group="PCINT"/>
-                <signal pad-id="pc6" index="14" function="default" group="PCINT"/>
-                <signal pad-id="pd0" index="16" function="default" group="PCINT"/>
-                <signal pad-id="pd1" index="17" function="default" group="PCINT"/>
-                <signal pad-id="pd2" index="18" function="default" group="PCINT"/>
-                <signal pad-id="pd2" index="0" function="default" group="INT"/>
+                <signal pad-key="pd3" index="1" function="default" group="INT"/>
+                <signal pad-key="pd3" index="19" function="default" group="PCINT"/>
+                <signal pad-key="pd4" index="20" function="default" group="PCINT"/>
+                <signal pad-key="pb6" index="6" function="default" group="PCINT"/>
+                <signal pad-key="pb7" index="7" function="default" group="PCINT"/>
+                <signal pad-key="pd5" index="21" function="default" group="PCINT"/>
+                <signal pad-key="pd6" index="22" function="default" group="PCINT"/>
+                <signal pad-key="pd7" index="23" function="default" group="PCINT"/>
+                <signal pad-key="pb0" index="0" function="default" group="PCINT"/>
+                <signal pad-key="pb1" index="1" function="default" group="PCINT"/>
+                <signal pad-key="pb2" index="2" function="default" group="PCINT"/>
+                <signal pad-key="pb3" index="3" function="default" group="PCINT"/>
+                <signal pad-key="pb4" index="4" function="default" group="PCINT"/>
+                <signal pad-key="pb5" index="5" function="default" group="PCINT"/>
+                <signal pad-key="pc0" index="8" function="default" group="PCINT"/>
+                <signal pad-key="pc1" index="9" function="default" group="PCINT"/>
+                <signal pad-key="pc2" index="10" function="default" group="PCINT"/>
+                <signal pad-key="pc3" index="11" function="default" group="PCINT"/>
+                <signal pad-key="pc4" index="12" function="default" group="PCINT"/>
+                <signal pad-key="pc5" index="13" function="default" group="PCINT"/>
+                <signal pad-key="pc6" index="14" function="default" group="PCINT"/>
+                <signal pad-key="pd0" index="16" function="default" group="PCINT"/>
+                <signal pad-key="pd1" index="17" function="default" group="PCINT"/>
+                <signal pad-key="pd2" index="18" function="default" group="PCINT"/>
+                <signal pad-key="pd2" index="0" function="default" group="INT"/>
             </signals>
         </peripheral>
         <peripheral key="spi" name="SPI" module-key="spi">
             <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"/>
-                <signal pad-id="pb4" function="default" group="MISO"/>
-                <signal pad-id="pb5" function="default" group="SCK"/>
+                <signal pad-key="pb2" function="default" group="SS"/>
+                <signal pad-key="pb3" function="default" group="MOSI"/>
+                <signal pad-key="pb4" function="default" group="MISO"/>
+                <signal pad-key="pb5" function="default" group="SCK"/>
             </signals>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="wdt">
@@ -372,7 +372,7 @@
         <peripheral key="cpu" name="CPU" module-key="cpu">
             <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"/>
+                <signal pad-key="pb0" index="0" function="default" group="CLK"/>
             </signals>
         </peripheral>
         <peripheral key="deviceid" name="DEVICEID" module-key="deviceid">
@@ -811,80 +811,113 @@
             </register-group>
         </module>
     </modules>
+    <pads>
+        <pad key="pd3" name="PD3"/>
+        <pad key="pd4" name="PD4"/>
+        <pad key="pe0" name="PE0"/>
+        <pad key="vcc" name="VCC"/>
+        <pad key="gnd" name="GND"/>
+        <pad key="pe1" name="PE1"/>
+        <pad key="pb6" name="PB6"/>
+        <pad key="pb7" name="PB7"/>
+        <pad key="pd5" name="PD5"/>
+        <pad key="pd6" name="PD6"/>
+        <pad key="pd7" name="PD7"/>
+        <pad key="pb0" name="PB0"/>
+        <pad key="pb1" name="PB1"/>
+        <pad key="pb2" name="PB2"/>
+        <pad key="pb3" name="PB3"/>
+        <pad key="pb4" name="PB4"/>
+        <pad key="pb5" name="PB5"/>
+        <pad key="avcc" name="AVCC"/>
+        <pad key="pe2" name="PE2"/>
+        <pad key="aref" name="AREF"/>
+        <pad key="pe3" name="PE3"/>
+        <pad key="pc0" name="PC0"/>
+        <pad key="pc1" name="PC1"/>
+        <pad key="pc2" name="PC2"/>
+        <pad key="pc3" name="PC3"/>
+        <pad key="pc4" name="PC4"/>
+        <pad key="pc5" name="PC5"/>
+        <pad key="pc6" name="PC6"/>
+        <pad key="pd0" name="PD0"/>
+        <pad key="pd1" name="PD1"/>
+        <pad key="pd2" name="PD2"/>
+    </pads>
     <pinouts>
         <pinout key="tqfp32" name="TQFP32" type="qfp">
-            <pin position="1" pad="PD3"/>
-            <pin position="2" pad="PD4"/>
-            <pin position="3" pad="PE0"/>
-            <pin position="4" pad="VCC"/>
-            <pin position="5" pad="GND"/>
-            <pin position="6" pad="PE1"/>
-            <pin position="7" pad="PB6"/>
-            <pin position="8" pad="PB7"/>
-            <pin position="9" pad="PD5"/>
-            <pin position="10" pad="PD6"/>
-            <pin position="11" pad="PD7"/>
-            <pin position="12" pad="PB0"/>
-            <pin position="13" pad="PB1"/>
-            <pin position="14" pad="PB2"/>
-            <pin position="15" pad="PB3"/>
-            <pin position="16" pad="PB4"/>
-            <pin position="17" pad="PB5"/>
-            <pin position="18" pad="AVCC"/>
-            <pin position="19" pad="PE2"/>
-            <pin position="20" pad="AREF"/>
-            <pin position="21" pad="GND"/>
-            <pin position="22" pad="PE3"/>
-            <pin position="23" pad="PC0"/>
-            <pin position="24" pad="PC1"/>
-            <pin position="25" pad="PC2"/>
-            <pin position="26" pad="PC3"/>
-            <pin position="27" pad="PC4"/>
-            <pin position="28" pad="PC5"/>
-            <pin position="29" pad="PC6"/>
-            <pin position="30" pad="PD0"/>
-            <pin position="31" pad="PD1"/>
-            <pin position="32" pad="PD2"/>
+            <pin position="1" pad-key="pd3"/>
+            <pin position="2" pad-key="pd4"/>
+            <pin position="3" pad-key="pe0"/>
+            <pin position="4" pad-key="vcc"/>
+            <pin position="5" pad-key="gnd"/>
+            <pin position="6" pad-key="pe1"/>
+            <pin position="7" pad-key="pb6"/>
+            <pin position="8" pad-key="pb7"/>
+            <pin position="9" pad-key="pd5"/>
+            <pin position="10" pad-key="pd6"/>
+            <pin position="11" pad-key="pd7"/>
+            <pin position="12" pad-key="pb0"/>
+            <pin position="13" pad-key="pb1"/>
+            <pin position="14" pad-key="pb2"/>
+            <pin position="15" pad-key="pb3"/>
+            <pin position="16" pad-key="pb4"/>
+            <pin position="17" pad-key="pb5"/>
+            <pin position="18" pad-key="avcc"/>
+            <pin position="19" pad-key="pe2"/>
+            <pin position="20" pad-key="aref"/>
+            <pin position="21" pad-key="gnd"/>
+            <pin position="22" pad-key="pe3"/>
+            <pin position="23" pad-key="pc0"/>
+            <pin position="24" pad-key="pc1"/>
+            <pin position="25" pad-key="pc2"/>
+            <pin position="26" pad-key="pc3"/>
+            <pin position="27" pad-key="pc4"/>
+            <pin position="28" pad-key="pc5"/>
+            <pin position="29" pad-key="pc6"/>
+            <pin position="30" pad-key="pd0"/>
+            <pin position="31" pad-key="pd1"/>
+            <pin position="32" pad-key="pd2"/>
         </pinout>
         <pinout key="vqfn32" name="VQFN32" type="qfn">
-            <pin position="1" pad="PD3"/>
-            <pin position="2" pad="PD4"/>
-            <pin position="3" pad="PE0"/>
-            <pin position="4" pad="VCC"/>
-            <pin position="5" pad="GND"/>
-            <pin position="6" pad="PE1"/>
-            <pin position="7" pad="PB6"/>
-            <pin position="8" pad="PB7"/>
-            <pin position="9" pad="PD5"/>
-            <pin position="10" pad="PD6"/>
-            <pin position="11" pad="PD7"/>
-            <pin position="12" pad="PB0"/>
-            <pin position="13" pad="PB1"/>
-            <pin position="14" pad="PB2"/>
-            <pin position="15" pad="PB3"/>
-            <pin position="16" pad="PB4"/>
-            <pin position="17" pad="PB5"/>
-            <pin position="18" pad="AVCC"/>
-            <pin position="19" pad="PE2"/>
-            <pin position="20" pad="AREF"/>
-            <pin position="21" pad="GND"/>
-            <pin position="22" pad="PE3"/>
-            <pin position="23" pad="PC0"/>
-            <pin position="24" pad="PC1"/>
-            <pin position="25" pad="PC2"/>
-            <pin position="26" pad="PC3"/>
-            <pin position="27" pad="PC4"/>
-            <pin position="28" pad="PC5"/>
-            <pin position="29" pad="PC6"/>
-            <pin position="30" pad="PD0"/>
-            <pin position="31" pad="PD1"/>
-            <pin position="32" pad="PD2"/>
+            <pin position="1" pad-key="pd3"/>
+            <pin position="2" pad-key="pd4"/>
+            <pin position="3" pad-key="pe0"/>
+            <pin position="4" pad-key="vcc"/>
+            <pin position="5" pad-key="gnd"/>
+            <pin position="6" pad-key="pe1"/>
+            <pin position="7" pad-key="pb6"/>
+            <pin position="8" pad-key="pb7"/>
+            <pin position="9" pad-key="pd5"/>
+            <pin position="10" pad-key="pd6"/>
+            <pin position="11" pad-key="pd7"/>
+            <pin position="12" pad-key="pb0"/>
+            <pin position="13" pad-key="pb1"/>
+            <pin position="14" pad-key="pb2"/>
+            <pin position="15" pad-key="pb3"/>
+            <pin position="16" pad-key="pb4"/>
+            <pin position="17" pad-key="pb5"/>
+            <pin position="18" pad-key="avcc"/>
+            <pin position="19" pad-key="pe2"/>
+            <pin position="20" pad-key="aref"/>
+            <pin position="21" pad-key="gnd"/>
+            <pin position="22" pad-key="pe3"/>
+            <pin position="23" pad-key="pc0"/>
+            <pin position="24" pad-key="pc1"/>
+            <pin position="25" pad-key="pc2"/>
+            <pin position="26" pad-key="pc3"/>
+            <pin position="27" pad-key="pc4"/>
+            <pin position="28" pad-key="pc5"/>
+            <pin position="29" pad-key="pc6"/>
+            <pin position="30" pad-key="pd0"/>
+            <pin position="31" pad-key="pd1"/>
+            <pin position="32" pad-key="pd2"/>
         </pinout>
     </pinouts>
     <variants>
-        <variant name="ATmega88PB-AU" pinout-key="tqfp32" package="TQFP32"/>
-        <variant name="ATmega88PB-MU" pinout-key="vqfn32" package="VQFN32"/>
-        <variant name="ATmega88PB-AN" pinout-key="tqfp32" package="TQFP32"/>
-        <variant name="ATmega88PB-MN" pinout-key="vqfn32" package="VQFN32"/>
+        <variant key="atmega88pb_au" name="ATmega88PB-AU" pinout-key="tqfp32"/>
+        <variant key="atmega88pb_mu" name="ATmega88PB-MU" pinout-key="vqfn32"/>
+        <variant key="atmega88pb_an" name="ATmega88PB-AN" pinout-key="tqfp32"/>
+        <variant key="atmega88pb_mn" name="ATmega88PB-MN" pinout-key="vqfn32"/>
     </variants>
 </device>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA8U2.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA8U2.xml
index d98fcaf1..bb31aa5b 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA8U2.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA8U2.xml
@@ -194,49 +194,48 @@
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pb2" index="2" function="default" group="P"/>
-                <signal pad-id="pb3" index="3" function="default" group="P"/>
-                <signal pad-id="pb4" index="4" function="default" group="P"/>
-                <signal pad-id="pb5" index="5" function="default" group="P"/>
-                <signal pad-id="pb6" index="6" function="default" group="P"/>
-                <signal pad-id="pb7" index="7" function="default" group="P"/>
+                <signal pad-key="pb0" index="0" function="default" group="P"/>
+                <signal pad-key="pb1" index="1" function="default" group="P"/>
+                <signal pad-key="pb2" index="2" function="default" group="P"/>
+                <signal pad-key="pb3" index="3" function="default" group="P"/>
+                <signal pad-key="pb4" index="4" function="default" group="P"/>
+                <signal pad-key="pb5" index="5" function="default" group="P"/>
+                <signal pad-key="pb6" index="6" function="default" group="P"/>
+                <signal pad-key="pb7" index="7" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pd2" index="2" function="default" group="P"/>
-                <signal pad-id="pd3" index="3" function="default" group="P"/>
-                <signal pad-id="pd4" index="4" function="default" group="P"/>
-                <signal pad-id="pd5" index="5" function="default" group="P"/>
-                <signal pad-id="pd6" index="6" function="default" group="P"/>
-                <signal pad-id="pd7" index="7" function="default" group="P"/>
+                <signal pad-key="pd0" index="0" function="default" group="P"/>
+                <signal pad-key="pd1" index="1" function="default" group="P"/>
+                <signal pad-key="pd2" index="2" function="default" group="P"/>
+                <signal pad-key="pd3" index="3" function="default" group="P"/>
+                <signal pad-key="pd4" index="4" function="default" group="P"/>
+                <signal pad-key="pd5" index="5" function="default" group="P"/>
+                <signal pad-key="pd6" index="6" function="default" group="P"/>
+                <signal pad-key="pd7" index="7" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pc2" index="2" function="default" group="P"/>
-                <signal pad-id="pc3" index="3" function="default" group="P"/>
-                <signal pad-id="pc4" index="4" function="default" group="P"/>
-                <signal pad-id="pc5" index="5" function="default" group="P"/>
-                <signal pad-id="pc6" index="6" function="default" group="P"/>
-                <signal pad-id="pc7" index="7" function="default" group="P"/>
+                <signal pad-key="pc0" index="0" function="default" group="P"/>
+                <signal pad-key="pc1" index="1" function="default" group="P"/>
+                <signal pad-key="pc2" index="2" function="default" group="P"/>
+                <signal pad-key="pc4" index="4" function="default" group="P"/>
+                <signal pad-key="pc5" index="5" function="default" group="P"/>
+                <signal pad-key="pc6" index="6" function="default" group="P"/>
+                <signal pad-key="pc7" index="7" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="spi" name="SPI" module-key="spi">
             <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"/>
-                <signal pad-id="pb1" function="default" group="SCLK"/>
-                <signal pad-id="pb0" function="default" group="SS"/>
+                <signal pad-key="pb3" function="default" group="MISO"/>
+                <signal pad-key="pb2" function="default" group="MOSI"/>
+                <signal pad-key="pb1" function="default" group="SCLK"/>
+                <signal pad-key="pb0" function="default" group="SS"/>
             </signals>
         </peripheral>
         <peripheral key="boot_load" name="BOOT_LOAD" module-key="boot_load">
@@ -248,19 +247,19 @@
         <peripheral key="tc0" name="TC0" module-key="tc8">
             <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"/>
-                <signal pad-id="pd7" function="default" group="T"/>
+                <signal pad-key="pb7" function="default" group="OCA"/>
+                <signal pad-key="pd0" function="default" group="OCB"/>
+                <signal pad-key="pd7" function="default" group="T"/>
             </signals>
         </peripheral>
         <peripheral key="tc1" name="TC1" module-key="tc16">
             <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"/>
-                <signal pad-id="pc5" function="default" group="OCB"/>
-                <signal pad-id="pb7" function="default" group="OCC"/>
-                <signal pad-id="pb4" function="default" group="T"/>
+                <signal pad-key="pc7" function="default" group="ICP"/>
+                <signal pad-key="pc6" function="default" group="OCA"/>
+                <signal pad-key="pc5" function="default" group="OCB"/>
+                <signal pad-key="pb7" function="default" group="OCC"/>
+                <signal pad-key="pb4" function="default" group="T"/>
             </signals>
         </peripheral>
         <peripheral key="pll" name="PLL" module-key="pll">
@@ -275,37 +274,37 @@
         <peripheral key="exint" name="EXINT" module-key="exint">
             <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"/>
-                <signal pad-id="pd2" index="2" function="default" group="INT"/>
-                <signal pad-id="pd3" index="3" function="default" group="INT"/>
-                <signal pad-id="pc7" index="4" function="default" group="INT"/>
-                <signal pad-id="pd4" index="5" function="default" group="INT"/>
-                <signal pad-id="pd6" index="6" function="default" group="INT"/>
-                <signal pad-id="pd7" index="7" function="default" group="INT"/>
-                <signal pad-id="pb0" index="0" function="default" group="PCINT"/>
-                <signal pad-id="pb1" index="1" function="default" group="PCINT"/>
-                <signal pad-id="pb2" index="2" function="default" group="PCINT"/>
-                <signal pad-id="pb3" index="3" function="default" group="PCINT"/>
-                <signal pad-id="pb4" index="4" function="default" group="PCINT"/>
-                <signal pad-id="pb5" index="5" function="default" group="PCINT"/>
-                <signal pad-id="pb6" index="6" function="default" group="PCINT"/>
-                <signal pad-id="pb7" index="7" function="default" group="PCINT"/>
-                <signal pad-id="pc6" index="8" function="default" group="PCINT"/>
-                <signal pad-id="pc5" index="9" function="default" group="PCINT"/>
-                <signal pad-id="pc4" index="10" function="default" group="PCINT"/>
-                <signal pad-id="pc2" index="11" function="default" group="PCINT"/>
-                <signal pad-id="pd5" index="12" function="default" group="PCINT"/>
+                <signal pad-key="pd0" index="0" function="default" group="INT"/>
+                <signal pad-key="pd1" index="1" function="default" group="INT"/>
+                <signal pad-key="pd2" index="2" function="default" group="INT"/>
+                <signal pad-key="pd3" index="3" function="default" group="INT"/>
+                <signal pad-key="pc7" index="4" function="default" group="INT"/>
+                <signal pad-key="pd4" index="5" function="default" group="INT"/>
+                <signal pad-key="pd6" index="6" function="default" group="INT"/>
+                <signal pad-key="pd7" index="7" function="default" group="INT"/>
+                <signal pad-key="pb0" index="0" function="default" group="PCINT"/>
+                <signal pad-key="pb1" index="1" function="default" group="PCINT"/>
+                <signal pad-key="pb2" index="2" function="default" group="PCINT"/>
+                <signal pad-key="pb3" index="3" function="default" group="PCINT"/>
+                <signal pad-key="pb4" index="4" function="default" group="PCINT"/>
+                <signal pad-key="pb5" index="5" function="default" group="PCINT"/>
+                <signal pad-key="pb6" index="6" function="default" group="PCINT"/>
+                <signal pad-key="pb7" index="7" function="default" group="PCINT"/>
+                <signal pad-key="pc6" index="8" function="default" group="PCINT"/>
+                <signal pad-key="pc5" index="9" function="default" group="PCINT"/>
+                <signal pad-key="pc4" index="10" function="default" group="PCINT"/>
+                <signal pad-key="pc2" index="11" function="default" group="PCINT"/>
+                <signal pad-key="pd5" index="12" function="default" group="PCINT"/>
             </signals>
         </peripheral>
         <peripheral key="usart1" name="USART1" module-key="usart">
             <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"/>
-                <signal pad-id="pd5" function="default" group="XCK"/>
-                <signal pad-id="pd6" function="default" group="RTS"/>
-                <signal pad-id="pd7" function="default" group="CTS"/>
+                <signal pad-key="pd2" function="default" group="RXD"/>
+                <signal pad-key="pd3" function="default" group="TXD"/>
+                <signal pad-key="pd5" function="default" group="XCK"/>
+                <signal pad-key="pd6" function="default" group="RTS"/>
+                <signal pad-key="pd7" function="default" group="CTS"/>
             </signals>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="wdt">
@@ -314,13 +313,13 @@
         <peripheral key="ac" name="AC" module-key="ac">
             <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"/>
-                <signal pad-id="pc2" index="2" function="default" group="AIN"/>
-                <signal pad-id="pd4" index="3" function="default" group="AIN"/>
-                <signal pad-id="pd5" index="4" function="default" group="AIN"/>
-                <signal pad-id="pd6" index="5" function="default" group="AIN"/>
-                <signal pad-id="pd7" index="6" function="default" group="AIN"/>
+                <signal pad-key="pd1" index="0" function="default" group="AIN"/>
+                <signal pad-key="pd2" index="1" function="default" group="AIN"/>
+                <signal pad-key="pc2" index="2" function="default" group="AIN"/>
+                <signal pad-key="pd4" index="3" function="default" group="AIN"/>
+                <signal pad-key="pd5" index="4" function="default" group="AIN"/>
+                <signal pad-key="pd6" index="5" function="default" group="AIN"/>
+                <signal pad-key="pd7" index="6" function="default" group="AIN"/>
             </signals>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="fuse">
@@ -808,44 +807,78 @@
             </register-group>
         </module>
     </modules>
+    <pads>
+        <pad key="xtal1" name="XTAL1"/>
+        <pad key="pc0" name="PC0"/>
+        <pad key="gnd" name="GND"/>
+        <pad key="vcc" name="VCC"/>
+        <pad key="pc2" name="PC2"/>
+        <pad key="pd0" name="PD0"/>
+        <pad key="pd1" name="PD1"/>
+        <pad key="pd2" name="PD2"/>
+        <pad key="pd3" name="PD3"/>
+        <pad key="pd4" name="PD4"/>
+        <pad key="pd5" name="PD5"/>
+        <pad key="pd6" name="PD6"/>
+        <pad key="pd7" name="PD7"/>
+        <pad key="pb0" name="PB0"/>
+        <pad key="pb1" name="PB1"/>
+        <pad key="pb2" name="PB2"/>
+        <pad key="pb3" name="PB3"/>
+        <pad key="pb4" name="PB4"/>
+        <pad key="pb5" name="PB5"/>
+        <pad key="pb6" name="PB6"/>
+        <pad key="pb7" name="PB7"/>
+        <pad key="pc7" name="PC7"/>
+        <pad key="pc6" name="PC6"/>
+        <pad key="pc1" name="PC1"/>
+        <pad key="pc5" name="PC5"/>
+        <pad key="pc4" name="PC4"/>
+        <pad key="ucap" name="UCAP"/>
+        <pad key="ugnd" name="UGND"/>
+        <pad key="d+" name="D+"/>
+        <pad key="d-" name="D-"/>
+        <pad key="uvcc" name="UVCC"/>
+        <pad key="avcc" name="AVCC"/>
+    </pads>
     <pinouts>
         <pinout key="qfp32" name="QFP32" type="qfp">
-            <pin position="1" pad="XTAL1"/>
-            <pin position="2" pad="PC0"/>
-            <pin position="3" pad="GND"/>
-            <pin position="4" pad="VCC"/>
-            <pin position="5" pad="PC2"/>
-            <pin position="6" pad="PD0"/>
-            <pin position="7" pad="PD1"/>
-            <pin position="8" pad="PD2"/>
-            <pin position="9" pad="PD3"/>
-            <pin position="10" pad="PD4"/>
-            <pin position="11" pad="PD5"/>
-            <pin position="12" pad="PD6"/>
-            <pin position="13" pad="PD7"/>
-            <pin position="14" pad="PB0"/>
-            <pin position="15" pad="PB1"/>
-            <pin position="16" pad="PB2"/>
-            <pin position="17" pad="PB3"/>
-            <pin position="18" pad="PB4"/>
-            <pin position="19" pad="PB5"/>
-            <pin position="20" pad="PB6"/>
-            <pin position="21" pad="PB7"/>
-            <pin position="22" pad="PC7"/>
-            <pin position="23" pad="PC6"/>
-            <pin position="24" pad="PC1"/>
-            <pin position="25" pad="PC5"/>
-            <pin position="26" pad="PC4"/>
-            <pin position="27" pad="UCAP"/>
-            <pin position="28" pad="UGND"/>
-            <pin position="29" pad="D+"/>
-            <pin position="30" pad="D-"/>
-            <pin position="31" pad="UVCC"/>
-            <pin position="32" pad="AVCC"/>
+            <pin position="1" pad-key="xtal1"/>
+            <pin position="2" pad-key="pc0"/>
+            <pin position="3" pad-key="gnd"/>
+            <pin position="4" pad-key="vcc"/>
+            <pin position="5" pad-key="pc2"/>
+            <pin position="6" pad-key="pd0"/>
+            <pin position="7" pad-key="pd1"/>
+            <pin position="8" pad-key="pd2"/>
+            <pin position="9" pad-key="pd3"/>
+            <pin position="10" pad-key="pd4"/>
+            <pin position="11" pad-key="pd5"/>
+            <pin position="12" pad-key="pd6"/>
+            <pin position="13" pad-key="pd7"/>
+            <pin position="14" pad-key="pb0"/>
+            <pin position="15" pad-key="pb1"/>
+            <pin position="16" pad-key="pb2"/>
+            <pin position="17" pad-key="pb3"/>
+            <pin position="18" pad-key="pb4"/>
+            <pin position="19" pad-key="pb5"/>
+            <pin position="20" pad-key="pb6"/>
+            <pin position="21" pad-key="pb7"/>
+            <pin position="22" pad-key="pc7"/>
+            <pin position="23" pad-key="pc6"/>
+            <pin position="24" pad-key="pc1"/>
+            <pin position="25" pad-key="pc5"/>
+            <pin position="26" pad-key="pc4"/>
+            <pin position="27" pad-key="ucap"/>
+            <pin position="28" pad-key="ugnd"/>
+            <pin position="29" pad-key="d+"/>
+            <pin position="30" pad-key="d-"/>
+            <pin position="31" pad-key="uvcc"/>
+            <pin position="32" pad-key="avcc"/>
         </pinout>
     </pinouts>
     <variants>
-        <variant name="ATmega8U2-AU" pinout-key="qfp32" package="TQFP32"/>
-        <variant name="ATmega8U2-MU" pinout-key="qfp32" package="QFN32"/>
+        <variant key="atmega8u2_au" name="ATmega8U2-AU" pinout-key="qfp32"/>
+        <variant key="atmega8u2_mu" name="ATmega8U2-MU" pinout-key="qfp32"/>
     </variants>
 </device>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY13.xml b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY13.xml
index 36d27a03..8c72d6f2 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY13.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY13.xml
@@ -169,18 +169,12 @@
     <peripherals>
         <peripheral key="adc" name="ADC" module-key="adc">
             <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"/>
-                <signal pad-id="pa2" index="2" function="default" group="ADC"/>
-                <signal pad-id="pa3" index="3" function="default" group="ADC"/>
-            </signals>
         </peripheral>
         <peripheral key="ac" name="AC" module-key="ac">
             <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"/>
+                <signal pad-key="pb1" index="1" function="default" group="AIN"/>
+                <signal pad-key="pb0" index="0" function="default" group="AIN"/>
             </signals>
         </peripheral>
         <peripheral key="eeprom" name="EEPROM" module-key="eeprom">
@@ -192,32 +186,32 @@
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pb2" index="2" function="default" group="P"/>
-                <signal pad-id="pb3" index="3" function="default" group="P"/>
-                <signal pad-id="pb4" index="4" function="default" group="P"/>
-                <signal pad-id="pb5" index="5" function="default" group="P"/>
+                <signal pad-key="pb0" index="0" function="default" group="P"/>
+                <signal pad-key="pb1" index="1" function="default" group="P"/>
+                <signal pad-key="pb2" index="2" function="default" group="P"/>
+                <signal pad-key="pb3" index="3" function="default" group="P"/>
+                <signal pad-key="pb4" index="4" function="default" group="P"/>
+                <signal pad-key="pb5" index="5" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="exint" name="EXINT" module-key="exint">
             <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"/>
-                <signal pad-id="pb3" function="default" group="PCINT3"/>
-                <signal pad-id="pb2" function="default" group="PCINT2"/>
-                <signal pad-id="pb1" function="default" group="PCINT1"/>
-                <signal pad-id="pb1" function="default" group="INT"/>
-                <signal pad-id="pb0" function="default" group="PCINT0"/>
+                <signal pad-key="pb5" function="default" group="PCINT5"/>
+                <signal pad-key="pb4" function="default" group="PCINT4"/>
+                <signal pad-key="pb3" function="default" group="PCINT3"/>
+                <signal pad-key="pb2" function="default" group="PCINT2"/>
+                <signal pad-key="pb1" function="default" group="PCINT1"/>
+                <signal pad-key="pb1" function="default" group="INT"/>
+                <signal pad-key="pb0" function="default" group="PCINT0"/>
             </signals>
         </peripheral>
         <peripheral key="tc0" name="TC0" module-key="tc8">
             <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"/>
-                <signal pad-id="pb0" function="default" group="OCA"/>
+                <signal pad-key="pb2" function="default" group="T"/>
+                <signal pad-key="pb1" function="default" group="OCB"/>
+                <signal pad-key="pb0" function="default" group="OCA"/>
             </signals>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="wdt">
@@ -424,62 +418,72 @@
             </register-group>
         </module>
     </modules>
+    <pads>
+        <pad key="pb5" name="PB5"/>
+        <pad key="pb3" name="PB3"/>
+        <pad key="pb4" name="PB4"/>
+        <pad key="gnd" name="GND"/>
+        <pad key="pb0" name="PB0"/>
+        <pad key="pb1" name="PB1"/>
+        <pad key="pb2" name="PB2"/>
+        <pad key="vcc" name="VCC"/>
+    </pads>
     <pinouts>
         <pinout key="pdip_soic_8" name="PDIP_SOIC_8" type="dip">
-            <pin position="1" pad="PB5"/>
-            <pin position="2" pad="PB3"/>
-            <pin position="3" pad="PB4"/>
-            <pin position="4" pad="GND"/>
-            <pin position="5" pad="PB0"/>
-            <pin position="6" pad="PB1"/>
-            <pin position="7" pad="PB2"/>
-            <pin position="8" pad="VCC"/>
+            <pin position="1" pad-key="pb5"/>
+            <pin position="2" pad-key="pb3"/>
+            <pin position="3" pad-key="pb4"/>
+            <pin position="4" pad-key="gnd"/>
+            <pin position="5" pad-key="pb0"/>
+            <pin position="6" pad-key="pb1"/>
+            <pin position="7" pad-key="pb2"/>
+            <pin position="8" pad-key="vcc"/>
         </pinout>
         <pinout key="mlf20" name="MLF20" type="mlf">
-            <pin position="1" pad="PB5"/>
-            <pin position="2" pad="PB3"/>
-            <pin position="3" pad="NC"/>
-            <pin position="4" pad="NC"/>
-            <pin position="5" pad="PB4"/>
-            <pin position="6" pad="NC"/>
-            <pin position="7" pad="NC"/>
-            <pin position="8" pad="GND"/>
-            <pin position="9" pad="NC"/>
-            <pin position="10" pad="NC"/>
-            <pin position="11" pad="PB0"/>
-            <pin position="12" pad="PB1"/>
-            <pin position="13" pad="NC"/>
-            <pin position="14" pad="PB2"/>
-            <pin position="15" pad="VCC"/>
-            <pin position="16" pad="NC"/>
-            <pin position="17" pad="NC"/>
-            <pin position="18" pad="NC"/>
-            <pin position="19" pad="NC"/>
-            <pin position="20" pad="NC"/>
+            <pin position="1" pad-key="pb5"/>
+            <pin position="2" pad-key="pb3"/>
+            <pin position="3"/>
+            <pin position="4"/>
+            <pin position="5" pad-key="pb4"/>
+            <pin position="6"/>
+            <pin position="7"/>
+            <pin position="8" pad-key="gnd"/>
+            <pin position="9"/>
+            <pin position="10"/>
+            <pin position="11" pad-key="pb0"/>
+            <pin position="12" pad-key="pb1"/>
+            <pin position="13"/>
+            <pin position="14" pad-key="pb2"/>
+            <pin position="15" pad-key="vcc"/>
+            <pin position="16"/>
+            <pin position="17"/>
+            <pin position="18"/>
+            <pin position="19"/>
+            <pin position="20"/>
         </pinout>
         <pinout key="mlf10" name="MLF10" type="mlf">
-            <pin position="1" pad="PB5"/>
-            <pin position="2" pad="PB3"/>
-            <pin position="3" pad="NC"/>
-            <pin position="4" pad="PB4"/>
-            <pin position="5" pad="GND"/>
-            <pin position="6" pad="PB0"/>
-            <pin position="7" pad="PB1"/>
-            <pin position="8" pad="NC"/>
-            <pin position="9" pad="PB2"/>
-            <pin position="10" pad="VCC"/>
+            <pin position="1" pad-key="pb5"/>
+            <pin position="2" pad-key="pb3"/>
+            <pin position="3"/>
+            <pin position="4" pad-key="pb4"/>
+            <pin position="5" pad-key="gnd"/>
+            <pin position="6" pad-key="pb0"/>
+            <pin position="7" pad-key="pb1"/>
+            <pin position="8"/>
+            <pin position="9" pad-key="pb2"/>
+            <pin position="10" pad-key="vcc"/>
         </pinout>
     </pinouts>
     <variants>
-        <variant name="ATtiny13V-10PU" pinout-key="pdip_soic_8" package="PDIP8"/>
-        <variant name="ATtiny13V-10SU" pinout-key="pdip_soic_8" package="SOIC8"/>
-        <variant name="ATtiny13V-10SSU" pinout-key="pdip_soic_8" package="SOIC8"/>
-        <variant name="ATtiny13V-10MU" pinout-key="mlf20" package="MLF20"/>
-        <variant name="ATtiny13V-10MMU" pinout-key="mlf10" package="MLF10"/>
-        <variant name="ATtiny13-20PU" pinout-key="pdip_soic_8" package="PDIP8"/>
-        <variant name="ATtiny13-20SU" pinout-key="pdip_soic_8" package="SOIC8"/>
-        <variant name="ATtiny13-20SSU" pinout-key="pdip_soic_8" package="SOIC8"/>
-        <variant name="ATtiny13-20MU" pinout-key="mlf20" package="MLF20"/>
-        <variant name="ATtiny13-20MMU" pinout-key="mlf10" package="MLF10"/>
+        <variant key="attiny13v_10pu" name="ATtiny13V-10PU" pinout-key="pdip_soic_8"/>
+        <variant key="attiny13v_10su" name="ATtiny13V-10SU" pinout-key="pdip_soic_8"/>
+        <variant key="attiny13v_10ssu" name="ATtiny13V-10SSU" pinout-key="pdip_soic_8"/>
+        <variant key="attiny13v_10mu" name="ATtiny13V-10MU" pinout-key="mlf20"/>
+        <variant key="attiny13v_10mmu" name="ATtiny13V-10MMU" pinout-key="mlf10"/>
+        <variant key="attiny13_20pu" name="ATtiny13-20PU" pinout-key="pdip_soic_8"/>
+        <variant key="attiny13_20su" name="ATtiny13-20SU" pinout-key="pdip_soic_8"/>
+        <variant key="attiny13_20ssu" name="ATtiny13-20SSU" pinout-key="pdip_soic_8"/>
+        <variant key="attiny13_20mu" name="ATtiny13-20MU" pinout-key="mlf20"/>
+        <variant key="attiny13_20mmu" name="ATtiny13-20MMU" pinout-key="mlf10"/>
     </variants>
 </device>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY13A.xml b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY13A.xml
index 8192db53..db405b85 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY13A.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY13A.xml
@@ -169,18 +169,12 @@
     <peripherals>
         <peripheral key="adc" name="ADC" module-key="adc">
             <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"/>
-                <signal pad-id="pa2" index="2" function="default" group="ADC"/>
-                <signal pad-id="pa3" index="3" function="default" group="ADC"/>
-            </signals>
         </peripheral>
         <peripheral key="ac" name="AC" module-key="ac">
             <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"/>
+                <signal pad-key="pb1" index="1" function="default" group="AIN"/>
+                <signal pad-key="pb0" index="0" function="default" group="AIN"/>
             </signals>
         </peripheral>
         <peripheral key="eeprom" name="EEPROM" module-key="eeprom">
@@ -192,32 +186,32 @@
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pb2" index="2" function="default" group="P"/>
-                <signal pad-id="pb3" index="3" function="default" group="P"/>
-                <signal pad-id="pb4" index="4" function="default" group="P"/>
-                <signal pad-id="pb5" index="5" function="default" group="P"/>
+                <signal pad-key="pb0" index="0" function="default" group="P"/>
+                <signal pad-key="pb1" index="1" function="default" group="P"/>
+                <signal pad-key="pb2" index="2" function="default" group="P"/>
+                <signal pad-key="pb3" index="3" function="default" group="P"/>
+                <signal pad-key="pb4" index="4" function="default" group="P"/>
+                <signal pad-key="pb5" index="5" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="exint" name="EXINT" module-key="exint">
             <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"/>
-                <signal pad-id="pb3" function="default" group="PCINT3"/>
-                <signal pad-id="pb2" function="default" group="PCINT2"/>
-                <signal pad-id="pb1" function="default" group="PCINT1"/>
-                <signal pad-id="pb1" function="default" group="INT"/>
-                <signal pad-id="pb0" function="default" group="PCINT0"/>
+                <signal pad-key="pb5" function="default" group="PCINT5"/>
+                <signal pad-key="pb4" function="default" group="PCINT4"/>
+                <signal pad-key="pb3" function="default" group="PCINT3"/>
+                <signal pad-key="pb2" function="default" group="PCINT2"/>
+                <signal pad-key="pb1" function="default" group="PCINT1"/>
+                <signal pad-key="pb1" function="default" group="INT"/>
+                <signal pad-key="pb0" function="default" group="PCINT0"/>
             </signals>
         </peripheral>
         <peripheral key="tc0" name="TC0" module-key="tc8">
             <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"/>
-                <signal pad-id="pb0" function="default" group="OCA"/>
+                <signal pad-key="pb2" function="default" group="T"/>
+                <signal pad-key="pb1" function="default" group="OCB"/>
+                <signal pad-key="pb0" function="default" group="OCA"/>
             </signals>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="wdt">
@@ -432,63 +426,73 @@
             </register-group>
         </module>
     </modules>
+    <pads>
+        <pad key="pb5" name="PB5"/>
+        <pad key="pb3" name="PB3"/>
+        <pad key="pb4" name="PB4"/>
+        <pad key="gnd" name="GND"/>
+        <pad key="pb0" name="PB0"/>
+        <pad key="pb1" name="PB1"/>
+        <pad key="pb2" name="PB2"/>
+        <pad key="vcc" name="VCC"/>
+    </pads>
     <pinouts>
         <pinout key="pdip_soic_8" name="PDIP_SOIC_8" type="dip">
-            <pin position="1" pad="PB5"/>
-            <pin position="2" pad="PB3"/>
-            <pin position="3" pad="PB4"/>
-            <pin position="4" pad="GND"/>
-            <pin position="5" pad="PB0"/>
-            <pin position="6" pad="PB1"/>
-            <pin position="7" pad="PB2"/>
-            <pin position="8" pad="VCC"/>
+            <pin position="1" pad-key="pb5"/>
+            <pin position="2" pad-key="pb3"/>
+            <pin position="3" pad-key="pb4"/>
+            <pin position="4" pad-key="gnd"/>
+            <pin position="5" pad-key="pb0"/>
+            <pin position="6" pad-key="pb1"/>
+            <pin position="7" pad-key="pb2"/>
+            <pin position="8" pad-key="vcc"/>
         </pinout>
         <pinout key="mlf20" name="MLF20" type="mlf">
-            <pin position="1" pad="PB5"/>
-            <pin position="2" pad="PB3"/>
-            <pin position="3" pad="NC"/>
-            <pin position="4" pad="NC"/>
-            <pin position="5" pad="PB4"/>
-            <pin position="6" pad="NC"/>
-            <pin position="7" pad="NC"/>
-            <pin position="8" pad="GND"/>
-            <pin position="9" pad="NC"/>
-            <pin position="10" pad="NC"/>
-            <pin position="11" pad="PB0"/>
-            <pin position="12" pad="PB1"/>
-            <pin position="13" pad="NC"/>
-            <pin position="14" pad="PB2"/>
-            <pin position="15" pad="VCC"/>
-            <pin position="16" pad="NC"/>
-            <pin position="17" pad="NC"/>
-            <pin position="18" pad="NC"/>
-            <pin position="19" pad="NC"/>
-            <pin position="20" pad="NC"/>
+            <pin position="1" pad-key="pb5"/>
+            <pin position="2" pad-key="pb3"/>
+            <pin position="3"/>
+            <pin position="4"/>
+            <pin position="5" pad-key="pb4"/>
+            <pin position="6"/>
+            <pin position="7"/>
+            <pin position="8" pad-key="gnd"/>
+            <pin position="9"/>
+            <pin position="10"/>
+            <pin position="11" pad-key="pb0"/>
+            <pin position="12" pad-key="pb1"/>
+            <pin position="13"/>
+            <pin position="14" pad-key="pb2"/>
+            <pin position="15" pad-key="vcc"/>
+            <pin position="16"/>
+            <pin position="17"/>
+            <pin position="18"/>
+            <pin position="19"/>
+            <pin position="20"/>
         </pinout>
         <pinout key="mlf10" name="MLF10" type="mlf">
-            <pin position="1" pad="PB5"/>
-            <pin position="2" pad="PB3"/>
-            <pin position="3" pad="NC"/>
-            <pin position="4" pad="PB4"/>
-            <pin position="5" pad="GND"/>
-            <pin position="6" pad="PB0"/>
-            <pin position="7" pad="PB1"/>
-            <pin position="8" pad="NC"/>
-            <pin position="9" pad="PB2"/>
-            <pin position="10" pad="VCC"/>
+            <pin position="1" pad-key="pb5"/>
+            <pin position="2" pad-key="pb3"/>
+            <pin position="3"/>
+            <pin position="4" pad-key="pb4"/>
+            <pin position="5" pad-key="gnd"/>
+            <pin position="6" pad-key="pb0"/>
+            <pin position="7" pad-key="pb1"/>
+            <pin position="8"/>
+            <pin position="9" pad-key="pb2"/>
+            <pin position="10" pad-key="vcc"/>
         </pinout>
     </pinouts>
     <variants>
-        <variant name="ATtiny13A-PU" pinout-key="pdip_soic_8" package="PDIP8"/>
-        <variant name="ATtiny13A-SH" pinout-key="pdip_soic_8" package="SOIC8"/>
-        <variant name="ATtiny13A-SSH" pinout-key="pdip_soic_8" package="SOIC8"/>
-        <variant name="ATtiny13A-SSU" pinout-key="pdip_soic_8" package="SOIC8"/>
-        <variant name="ATtiny13A-SU" pinout-key="pdip_soic_8" package="SOIC8"/>
-        <variant name="ATtiny13A-MMU" pinout-key="mlf10" package="MLF10"/>
-        <variant name="ATtiny13A-MU" pinout-key="mlf20" package="MLF20"/>
-        <variant name="ATtiny13A-SN" pinout-key="pdip_soic_8" package="SOIC8"/>
-        <variant name="ATtiny13A-SS7" pinout-key="pdip_soic_8" package="SOIC8"/>
-        <variant name="ATtiny13A-SF" pinout-key="pdip_soic_8" package="SOIC8"/>
-        <variant name="ATtiny13A-MMF" pinout-key="mlf10" package="MLF10"/>
+        <variant key="attiny13a_pu" name="ATtiny13A-PU" pinout-key="pdip_soic_8"/>
+        <variant key="attiny13a_sh" name="ATtiny13A-SH" pinout-key="pdip_soic_8"/>
+        <variant key="attiny13a_ssh" name="ATtiny13A-SSH" pinout-key="pdip_soic_8"/>
+        <variant key="attiny13a_ssu" name="ATtiny13A-SSU" pinout-key="pdip_soic_8"/>
+        <variant key="attiny13a_su" name="ATtiny13A-SU" pinout-key="pdip_soic_8"/>
+        <variant key="attiny13a_mmu" name="ATtiny13A-MMU" pinout-key="mlf10"/>
+        <variant key="attiny13a_mu" name="ATtiny13A-MU" pinout-key="mlf20"/>
+        <variant key="attiny13a_sn" name="ATtiny13A-SN" pinout-key="pdip_soic_8"/>
+        <variant key="attiny13a_ss7" name="ATtiny13A-SS7" pinout-key="pdip_soic_8"/>
+        <variant key="attiny13a_sf" name="ATtiny13A-SF" pinout-key="pdip_soic_8"/>
+        <variant key="attiny13a_mmf" name="ATtiny13A-MMF" pinout-key="mlf10"/>
     </variants>
 </device>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY1604.xml b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY1604.xml
index 2d9b1067..7e633a0d 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY1604.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY1604.xml
@@ -44,24 +44,24 @@
         <peripheral key="ac0" name="AC0" module-key="i2106">
             <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"/>
-                <signal pad-id="pa7" index="0" function="AC0" group="P"/>
+                <signal pad-key="pa6" index="0" function="AC0" group="N"/>
+                <signal pad-key="pa5" index="0" function="AC0" group="OUT"/>
+                <signal pad-key="pa7" index="0" function="AC0" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="adc0" name="ADC0" module-key="i2132">
             <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"/>
-                <signal pad-id="pa2" index="2" function="AIN0" group="AIN"/>
-                <signal pad-id="pa3" index="3" function="AIN0" group="AIN"/>
-                <signal pad-id="pa4" index="4" function="AIN0" group="AIN"/>
-                <signal pad-id="pa5" index="5" function="AIN0" group="AIN"/>
-                <signal pad-id="pa6" index="6" function="AIN0" group="AIN"/>
-                <signal pad-id="pa7" index="7" function="AIN0" group="AIN"/>
-                <signal pad-id="pb1" index="10" function="AIN0" group="AIN"/>
-                <signal pad-id="pb0" index="11" function="AIN0" group="AIN"/>
+                <signal pad-key="pa0" index="0" function="AIN0" group="AIN"/>
+                <signal pad-key="pa1" index="1" function="AIN0" group="AIN"/>
+                <signal pad-key="pa2" index="2" function="AIN0" group="AIN"/>
+                <signal pad-key="pa3" index="3" function="AIN0" group="AIN"/>
+                <signal pad-key="pa4" index="4" function="AIN0" group="AIN"/>
+                <signal pad-key="pa5" index="5" function="AIN0" group="AIN"/>
+                <signal pad-key="pa6" index="6" function="AIN0" group="AIN"/>
+                <signal pad-key="pa7" index="7" function="AIN0" group="AIN"/>
+                <signal pad-key="pb1" index="10" function="AIN0" group="AIN"/>
+                <signal pad-key="pb0" index="11" function="AIN0" group="AIN"/>
             </signals>
         </peripheral>
         <peripheral key="bod" name="BOD" module-key="i2114">
@@ -70,25 +70,25 @@
         <peripheral key="ccl" name="CCL" module-key="i2128">
             <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"/>
-                <signal pad-id="pa2" index="2" function="CCL" group="LUT0_IN"/>
-                <signal pad-id="pa4" index="0" function="CCL" group="LUT0_OUT" field="PORTMUX.CTRLA.LUT0"/>
-                <signal pad-id="pa7" index="0" function="CCL" group="LUT1_OUT" field="PORTMUX.CTRLA.LUT1"/>
+                <signal pad-key="pa0" index="0" function="CCL" group="LUT0_IN"/>
+                <signal pad-key="pa1" index="1" function="CCL" group="LUT0_IN"/>
+                <signal pad-key="pa2" index="2" function="CCL" group="LUT0_IN"/>
+                <signal pad-key="pa4" index="0" function="CCL" group="LUT0_OUT" field="PORTMUX.CTRLA.LUT0"/>
+                <signal pad-key="pa7" index="0" function="CCL" group="LUT1_OUT" field="PORTMUX.CTRLA.LUT1"/>
             </signals>
         </peripheral>
         <peripheral key="clkctrl" name="CLKCTRL" module-key="i2603_clkctrl">
             <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"/>
-                <signal pad-id="pb2" function="CLKCTRL" group="TOSC2"/>
+                <signal pad-key="pa3" function="CLKCTRL" group="CLKI"/>
+                <signal pad-key="pb3" function="CLKCTRL" group="TOSC1"/>
+                <signal pad-key="pb2" function="CLKCTRL" group="TOSC2"/>
             </signals>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="i2100">
             <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"/>
+                <signal pad-key="pa1" function="BREAK" group="BREAK" field="PORTMUX.CTRLA.EXTBRK"/>
             </signals>
         </peripheral>
         <peripheral key="cpuint" name="CPUINT" module-key="i2104">
@@ -100,32 +100,32 @@
         <peripheral key="evsys" name="EVSYS" module-key="i2603_evsys">
             <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"/>
-                <signal pad-id="pa2" index="2" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
-                <signal pad-id="pa3" index="3" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
-                <signal pad-id="pa4" index="4" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
-                <signal pad-id="pa5" index="5" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
-                <signal pad-id="pa6" index="6" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
-                <signal pad-id="pa7" index="7" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
-                <signal pad-id="pb0" index="0" function="EVAINCH1" group="EVAPB" field="EVSYS.ASYNCCH1.ASYNCCH1"/>
-                <signal pad-id="pb1" index="1" function="EVAINCH1" group="EVAPB" field="EVSYS.ASYNCCH1.ASYNCCH1"/>
-                <signal pad-id="pb2" index="2" function="EVAINCH1" group="EVAPB" field="EVSYS.ASYNCCH1.ASYNCCH1"/>
-                <signal pad-id="pb3" index="3" function="EVAINCH1" group="EVAPB" field="EVSYS.ASYNCCH1.ASYNCCH1"/>
-                <signal pad-id="pa2" index="0" function="EVSYS" group="EVOUT" field="PORTMUX.CTRLA.EVOUT0"/>
-                <signal pad-id="pb2" index="1" function="EVSYS" group="EVOUT" field="PORTMUX.CTRLA.EVOUT1"/>
-                <signal pad-id="pa0" index="0" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
-                <signal pad-id="pa1" index="1" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
-                <signal pad-id="pa2" index="2" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
-                <signal pad-id="pa3" index="3" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
-                <signal pad-id="pa4" index="4" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
-                <signal pad-id="pa5" index="5" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
-                <signal pad-id="pa6" index="6" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
-                <signal pad-id="pa7" index="7" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
-                <signal pad-id="pb0" index="0" function="EVSINCH1" group="EVSPB" field="EVSYS.SYNCCH1.SYNCCH1"/>
-                <signal pad-id="pb1" index="1" function="EVSINCH1" group="EVSPB" field="EVSYS.SYNCCH1.SYNCCH1"/>
-                <signal pad-id="pb2" index="2" function="EVSINCH1" group="EVSPB" field="EVSYS.SYNCCH1.SYNCCH1"/>
-                <signal pad-id="pb3" index="3" function="EVSINCH1" group="EVSPB" field="EVSYS.SYNCCH1.SYNCCH1"/>
+                <signal pad-key="pa0" index="0" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
+                <signal pad-key="pa1" index="1" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
+                <signal pad-key="pa2" index="2" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
+                <signal pad-key="pa3" index="3" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
+                <signal pad-key="pa4" index="4" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
+                <signal pad-key="pa5" index="5" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
+                <signal pad-key="pa6" index="6" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
+                <signal pad-key="pa7" index="7" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
+                <signal pad-key="pb0" index="0" function="EVAINCH1" group="EVAPB" field="EVSYS.ASYNCCH1.ASYNCCH1"/>
+                <signal pad-key="pb1" index="1" function="EVAINCH1" group="EVAPB" field="EVSYS.ASYNCCH1.ASYNCCH1"/>
+                <signal pad-key="pb2" index="2" function="EVAINCH1" group="EVAPB" field="EVSYS.ASYNCCH1.ASYNCCH1"/>
+                <signal pad-key="pb3" index="3" function="EVAINCH1" group="EVAPB" field="EVSYS.ASYNCCH1.ASYNCCH1"/>
+                <signal pad-key="pa2" index="0" function="EVSYS" group="EVOUT" field="PORTMUX.CTRLA.EVOUT0"/>
+                <signal pad-key="pb2" index="1" function="EVSYS" group="EVOUT" field="PORTMUX.CTRLA.EVOUT1"/>
+                <signal pad-key="pa0" index="0" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
+                <signal pad-key="pa1" index="1" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
+                <signal pad-key="pa2" index="2" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
+                <signal pad-key="pa3" index="3" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
+                <signal pad-key="pa4" index="4" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
+                <signal pad-key="pa5" index="5" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
+                <signal pad-key="pa6" index="6" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
+                <signal pad-key="pa7" index="7" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
+                <signal pad-key="pb0" index="0" function="EVSINCH1" group="EVSPB" field="EVSYS.SYNCCH1.SYNCCH1"/>
+                <signal pad-key="pb1" index="1" function="EVSINCH1" group="EVSPB" field="EVSYS.SYNCCH1.SYNCCH1"/>
+                <signal pad-key="pb2" index="2" function="EVSINCH1" group="EVSPB" field="EVSYS.SYNCCH1.SYNCCH1"/>
+                <signal pad-key="pb3" index="3" function="EVSINCH1" group="EVSPB" field="EVSYS.SYNCCH1.SYNCCH1"/>
             </signals>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="i2603_fuse">
@@ -143,23 +143,23 @@
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pa2" index="2" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa3" index="3" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa4" index="4" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa5" index="5" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa6" index="6" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa7" index="7" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa0" index="0" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa1" index="1" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa2" index="2" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa3" index="3" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa4" index="4" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa5" index="5" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa6" index="6" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa7" index="7" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pb2" index="2" function="IOPORT" group="PIN"/>
-                <signal pad-id="pb3" index="3" function="IOPORT" group="PIN"/>
+                <signal pad-key="pb0" index="0" function="IOPORT" group="PIN"/>
+                <signal pad-key="pb1" index="1" function="IOPORT" group="PIN"/>
+                <signal pad-key="pb2" index="2" function="IOPORT" group="PIN"/>
+                <signal pad-key="pb3" index="3" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="portmux" name="PORTMUX" module-key="i2603_portmux">
@@ -168,7 +168,7 @@
         <peripheral key="rstctrl" name="RSTCTRL" module-key="i2111">
             <register-group-instance register-group-key="rstctrl" address-space-key="data" offset="0x40"/>
             <signals>
-                <signal pad-id="pa0" function="OTHER" group="RESET"/>
+                <signal pad-key="pa0" function="OTHER" group="RESET"/>
             </signals>
         </peripheral>
         <peripheral key="rtc" name="RTC" module-key="i2116">
@@ -183,54 +183,54 @@
         <peripheral key="spi0" name="SPI0" module-key="i2107">
             <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"/>
-                <signal pad-id="pa3" function="SPI0" group="SCK" field="PORTMUX.CTRLB.SPI0"/>
-                <signal pad-id="pa4" function="SPI0" group="SS" field="PORTMUX.CTRLB.SPI0"/>
+                <signal pad-key="pa2" function="SPI0" group="MISO" field="PORTMUX.CTRLB.SPI0"/>
+                <signal pad-key="pa1" function="SPI0" group="MOSI" field="PORTMUX.CTRLB.SPI0"/>
+                <signal pad-key="pa3" function="SPI0" group="SCK" field="PORTMUX.CTRLB.SPI0"/>
+                <signal pad-key="pa4" function="SPI0" group="SS" field="PORTMUX.CTRLB.SPI0"/>
             </signals>
         </peripheral>
         <peripheral key="syscfg" name="SYSCFG" module-key="i2603_syscfg">
             <register-group-instance register-group-key="syscfg" address-space-key="data" offset="0xF00"/>
             <signals>
-                <signal pad-id="pa0" function="OTHER" group="UPDI"/>
+                <signal pad-key="pa0" function="OTHER" group="UPDI"/>
             </signals>
         </peripheral>
         <peripheral key="tca0" name="TCA0" module-key="i2117">
             <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"/>
-                <signal pad-id="pb1" index="1" function="TCA0" group="WO" field="PORTMUX.CTRLC.TCA01"/>
-                <signal pad-id="pb2" index="2" function="TCA0" group="WO" field="PORTMUX.CTRLC.TCA02"/>
-                <signal pad-id="pa3" index="3" function="TCA0" group="WO" field="PORTMUX.CTRLC.TCA03"/>
-                <signal pad-id="pa4" index="4" function="TCA0" group="WO" field="PORTMUX.CTRLC.TCA04"/>
-                <signal pad-id="pa5" index="5" function="TCA0" group="WO" field="PORTMUX.CTRLC.TCA05"/>
+                <signal pad-key="pb3" index="0" function="TCA0_ALT" group="WO" field="PORTMUX.CTRLC.TCA00"/>
+                <signal pad-key="pb0" index="0" function="TCA0" group="WO" field="PORTMUX.CTRLC.TCA00"/>
+                <signal pad-key="pb1" index="1" function="TCA0" group="WO" field="PORTMUX.CTRLC.TCA01"/>
+                <signal pad-key="pb2" index="2" function="TCA0" group="WO" field="PORTMUX.CTRLC.TCA02"/>
+                <signal pad-key="pa3" index="3" function="TCA0" group="WO" field="PORTMUX.CTRLC.TCA03"/>
+                <signal pad-key="pa4" index="4" function="TCA0" group="WO" field="PORTMUX.CTRLC.TCA04"/>
+                <signal pad-key="pa5" index="5" function="TCA0" group="WO" field="PORTMUX.CTRLC.TCA05"/>
             </signals>
         </peripheral>
         <peripheral key="tcb0" name="TCB0" module-key="i2119">
             <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"/>
+                <signal pad-key="pa5" index="0" function="TCB0" group="WO" field="PORTMUX.CTRLD.TCB0"/>
             </signals>
         </peripheral>
         <peripheral key="twi0" name="TWI0" module-key="i2110">
             <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"/>
+                <signal pad-key="pb0" function="TWI0" group="SCL" field="PORTMUX.CTRLB.TWI0"/>
+                <signal pad-key="pb1" function="TWI0" group="SDA" field="PORTMUX.CTRLB.TWI0"/>
             </signals>
         </peripheral>
         <peripheral key="usart0" name="USART0" module-key="i2108">
             <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"/>
-                <signal pad-id="pa1" function="USART0_ALT" group="TXD" field="PORTMUX.CTRLB.USART0"/>
-                <signal pad-id="pb2" function="USART0" group="TXD" field="PORTMUX.CTRLB.USART0"/>
-                <signal pad-id="pa3" function="USART0_ALT" group="XCK" field="PORTMUX.CTRLB.USART0"/>
-                <signal pad-id="pb1" function="USART0" group="XCK" field="PORTMUX.CTRLB.USART0"/>
-                <signal pad-id="pa4" function="USART0_ALT" group="XDIR" field="PORTMUX.CTRLB.USART0"/>
-                <signal pad-id="pb0" function="USART0" group="XDIR" field="PORTMUX.CTRLB.USART0"/>
+                <signal pad-key="pa2" function="USART0_ALT" group="RXD" field="PORTMUX.CTRLB.USART0"/>
+                <signal pad-key="pb3" function="USART0" group="RXD" field="PORTMUX.CTRLB.USART0"/>
+                <signal pad-key="pa1" function="USART0_ALT" group="TXD" field="PORTMUX.CTRLB.USART0"/>
+                <signal pad-key="pb2" function="USART0" group="TXD" field="PORTMUX.CTRLB.USART0"/>
+                <signal pad-key="pa3" function="USART0_ALT" group="XCK" field="PORTMUX.CTRLB.USART0"/>
+                <signal pad-key="pb1" function="USART0" group="XCK" field="PORTMUX.CTRLB.USART0"/>
+                <signal pad-key="pa4" function="USART0_ALT" group="XDIR" field="PORTMUX.CTRLB.USART0"/>
+                <signal pad-key="pb0" function="USART0" group="XDIR" field="PORTMUX.CTRLB.USART0"/>
             </signals>
         </peripheral>
         <peripheral key="userrow" name="USERROW" module-key="i2603_userrow">
@@ -1159,26 +1159,42 @@
             </register-group>
         </module>
     </modules>
+    <pads>
+        <pad key="vdd" name="VDD"/>
+        <pad key="pa4" name="PA4"/>
+        <pad key="pa5" name="PA5"/>
+        <pad key="pa6" name="PA6"/>
+        <pad key="pa7" name="PA7"/>
+        <pad key="pb3" name="PB3"/>
+        <pad key="pb2" name="PB2"/>
+        <pad key="pb1" name="PB1"/>
+        <pad key="pb0" name="PB0"/>
+        <pad key="pa0" name="PA0"/>
+        <pad key="pa1" name="PA1"/>
+        <pad key="pa2" name="PA2"/>
+        <pad key="pa3" name="PA3"/>
+        <pad key="gnd" name="GND"/>
+    </pads>
     <pinouts>
         <pinout key="soic14" name="SOIC14" type="soic">
-            <pin position="1" pad="VDD"/>
-            <pin position="2" pad="PA4"/>
-            <pin position="3" pad="PA5"/>
-            <pin position="4" pad="PA6"/>
-            <pin position="5" pad="PA7"/>
-            <pin position="6" pad="PB3"/>
-            <pin position="7" pad="PB2"/>
-            <pin position="8" pad="PB1"/>
-            <pin position="9" pad="PB0"/>
-            <pin position="10" pad="PA0"/>
-            <pin position="11" pad="PA1"/>
-            <pin position="12" pad="PA2"/>
-            <pin position="13" pad="PA3"/>
-            <pin position="14" pad="GND"/>
+            <pin position="1" pad-key="vdd"/>
+            <pin position="2" pad-key="pa4"/>
+            <pin position="3" pad-key="pa5"/>
+            <pin position="4" pad-key="pa6"/>
+            <pin position="5" pad-key="pa7"/>
+            <pin position="6" pad-key="pb3"/>
+            <pin position="7" pad-key="pb2"/>
+            <pin position="8" pad-key="pb1"/>
+            <pin position="9" pad-key="pb0"/>
+            <pin position="10" pad-key="pa0"/>
+            <pin position="11" pad-key="pa1"/>
+            <pin position="12" pad-key="pa2"/>
+            <pin position="13" pad-key="pa3"/>
+            <pin position="14" pad-key="gnd"/>
         </pinout>
     </pinouts>
     <variants>
-        <variant name="ATtiny1604-SSFR" pinout-key="soic14" package="SOIC14"/>
-        <variant name="ATtiny1604-SSNR" pinout-key="soic14" package="SOIC14"/>
+        <variant key="attiny1604_ssfr" name="ATtiny1604-SSFR" pinout-key="soic14"/>
+        <variant key="attiny1604_ssnr" name="ATtiny1604-SSNR" pinout-key="soic14"/>
     </variants>
 </device>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY1606.xml b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY1606.xml
index 97647051..20f823de 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY1606.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY1606.xml
@@ -44,28 +44,28 @@
         <peripheral key="ac0" name="AC0" module-key="i2106">
             <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"/>
-                <signal pad-id="pa5" index="0" function="AC0" group="OUT"/>
-                <signal pad-id="pa7" index="0" function="AC0" group="P"/>
-                <signal pad-id="pb5" index="1" function="AC0" group="P"/>
+                <signal pad-key="pa6" index="0" function="AC0" group="N"/>
+                <signal pad-key="pb4" index="1" function="AC0" group="N"/>
+                <signal pad-key="pa5" index="0" function="AC0" group="OUT"/>
+                <signal pad-key="pa7" index="0" function="AC0" group="P"/>
+                <signal pad-key="pb5" index="1" function="AC0" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="adc0" name="ADC0" module-key="i2132">
             <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"/>
-                <signal pad-id="pa2" index="2" function="AIN0" group="AIN"/>
-                <signal pad-id="pa3" index="3" function="AIN0" group="AIN"/>
-                <signal pad-id="pa4" index="4" function="AIN0" group="AIN"/>
-                <signal pad-id="pa5" index="5" function="AIN0" group="AIN"/>
-                <signal pad-id="pa6" index="6" function="AIN0" group="AIN"/>
-                <signal pad-id="pa7" index="7" function="AIN0" group="AIN"/>
-                <signal pad-id="pb5" index="8" function="AIN0" group="AIN"/>
-                <signal pad-id="pb4" index="9" function="AIN0" group="AIN"/>
-                <signal pad-id="pb1" index="10" function="AIN0" group="AIN"/>
-                <signal pad-id="pb0" index="11" function="AIN0" group="AIN"/>
+                <signal pad-key="pa0" index="0" function="AIN0" group="AIN"/>
+                <signal pad-key="pa1" index="1" function="AIN0" group="AIN"/>
+                <signal pad-key="pa2" index="2" function="AIN0" group="AIN"/>
+                <signal pad-key="pa3" index="3" function="AIN0" group="AIN"/>
+                <signal pad-key="pa4" index="4" function="AIN0" group="AIN"/>
+                <signal pad-key="pa5" index="5" function="AIN0" group="AIN"/>
+                <signal pad-key="pa6" index="6" function="AIN0" group="AIN"/>
+                <signal pad-key="pa7" index="7" function="AIN0" group="AIN"/>
+                <signal pad-key="pb5" index="8" function="AIN0" group="AIN"/>
+                <signal pad-key="pb4" index="9" function="AIN0" group="AIN"/>
+                <signal pad-key="pb1" index="10" function="AIN0" group="AIN"/>
+                <signal pad-key="pb0" index="11" function="AIN0" group="AIN"/>
             </signals>
         </peripheral>
         <peripheral key="bod" name="BOD" module-key="i2114">
@@ -74,29 +74,29 @@
         <peripheral key="ccl" name="CCL" module-key="i2128">
             <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"/>
-                <signal pad-id="pa2" index="2" function="CCL" group="LUT0_IN"/>
-                <signal pad-id="pb4" index="0" function="CCL_ALT" group="LUT0_OUT" field="PORTMUX.CTRLA.LUT0"/>
-                <signal pad-id="pa4" index="0" function="CCL" group="LUT0_OUT" field="PORTMUX.CTRLA.LUT0"/>
-                <signal pad-id="pc3" index="0" function="CCL" group="LUT1_IN"/>
-                <signal pad-id="pc1" index="0" function="CCL_ALT" group="LUT1_OUT" field="PORTMUX.CTRLA.LUT1"/>
-                <signal pad-id="pa7" index="0" function="CCL" group="LUT1_OUT" field="PORTMUX.CTRLA.LUT1"/>
+                <signal pad-key="pa0" index="0" function="CCL" group="LUT0_IN"/>
+                <signal pad-key="pa1" index="1" function="CCL" group="LUT0_IN"/>
+                <signal pad-key="pa2" index="2" function="CCL" group="LUT0_IN"/>
+                <signal pad-key="pb4" index="0" function="CCL_ALT" group="LUT0_OUT" field="PORTMUX.CTRLA.LUT0"/>
+                <signal pad-key="pa4" index="0" function="CCL" group="LUT0_OUT" field="PORTMUX.CTRLA.LUT0"/>
+                <signal pad-key="pc3" index="0" function="CCL" group="LUT1_IN"/>
+                <signal pad-key="pc1" index="0" function="CCL_ALT" group="LUT1_OUT" field="PORTMUX.CTRLA.LUT1"/>
+                <signal pad-key="pa7" index="0" function="CCL" group="LUT1_OUT" field="PORTMUX.CTRLA.LUT1"/>
             </signals>
         </peripheral>
         <peripheral key="clkctrl" name="CLKCTRL" module-key="i2603_clkctrl">
             <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"/>
-                <signal pad-id="pb3" function="CLKCTRL" group="TOSC1"/>
-                <signal pad-id="pb2" function="CLKCTRL" group="TOSC2"/>
+                <signal pad-key="pa3" function="CLKCTRL" group="CLKI"/>
+                <signal pad-key="pb5" function="CLKCTRL" group="CLKO"/>
+                <signal pad-key="pb3" function="CLKCTRL" group="TOSC1"/>
+                <signal pad-key="pb2" function="CLKCTRL" group="TOSC2"/>
             </signals>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="i2100">
             <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"/>
+                <signal pad-key="pa1" function="BREAK" group="BREAK" field="PORTMUX.CTRLA.EXTBRK"/>
             </signals>
         </peripheral>
         <peripheral key="cpuint" name="CPUINT" module-key="i2104">
@@ -108,45 +108,45 @@
         <peripheral key="evsys" name="EVSYS" module-key="i2603_evsys">
             <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"/>
-                <signal pad-id="pa2" index="2" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
-                <signal pad-id="pa3" index="3" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
-                <signal pad-id="pa4" index="4" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
-                <signal pad-id="pa5" index="5" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
-                <signal pad-id="pa6" index="6" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
-                <signal pad-id="pa7" index="7" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
-                <signal pad-id="pb0" index="0" function="EVAINCH1" group="EVAPB" field="EVSYS.ASYNCCH1.ASYNCCH1"/>
-                <signal pad-id="pb1" index="1" function="EVAINCH1" group="EVAPB" field="EVSYS.ASYNCCH1.ASYNCCH1"/>
-                <signal pad-id="pb2" index="2" function="EVAINCH1" group="EVAPB" field="EVSYS.ASYNCCH1.ASYNCCH1"/>
-                <signal pad-id="pb3" index="3" function="EVAINCH1" group="EVAPB" field="EVSYS.ASYNCCH1.ASYNCCH1"/>
-                <signal pad-id="pb4" index="4" function="EVAINCH1" group="EVAPB" field="EVSYS.ASYNCCH1.ASYNCCH1"/>
-                <signal pad-id="pb5" index="5" function="EVAINCH1" group="EVAPB" field="EVSYS.ASYNCCH1.ASYNCCH1"/>
-                <signal pad-id="pc0" index="0" function="EVAINCH2" group="EVAPC" field="EVSYS.ASYNCCH2.ASYNCCH2"/>
-                <signal pad-id="pc1" index="1" function="EVAINCH2" group="EVAPC" field="EVSYS.ASYNCCH2.ASYNCCH2"/>
-                <signal pad-id="pc2" index="2" function="EVAINCH2" group="EVAPC" field="EVSYS.ASYNCCH2.ASYNCCH2"/>
-                <signal pad-id="pc3" index="3" function="EVAINCH2" group="EVAPC" field="EVSYS.ASYNCCH2.ASYNCCH2"/>
-                <signal pad-id="pa2" index="0" function="EVSYS" group="EVOUT" field="PORTMUX.CTRLA.EVOUT0"/>
-                <signal pad-id="pb2" index="1" function="EVSYS" group="EVOUT" field="PORTMUX.CTRLA.EVOUT1"/>
-                <signal pad-id="pc2" index="2" function="EVSYS" group="EVOUT" field="PORTMUX.CTRLA.EVOUT2"/>
-                <signal pad-id="pa0" index="0" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
-                <signal pad-id="pa1" index="1" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
-                <signal pad-id="pa2" index="2" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
-                <signal pad-id="pa3" index="3" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
-                <signal pad-id="pa4" index="4" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
-                <signal pad-id="pa5" index="5" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
-                <signal pad-id="pa6" index="6" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
-                <signal pad-id="pa7" index="7" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
-                <signal pad-id="pb0" index="0" function="EVSINCH1" group="EVSPB" field="EVSYS.SYNCCH1.SYNCCH1"/>
-                <signal pad-id="pb1" index="1" function="EVSINCH1" group="EVSPB" field="EVSYS.SYNCCH1.SYNCCH1"/>
-                <signal pad-id="pb2" index="2" function="EVSINCH1" group="EVSPB" field="EVSYS.SYNCCH1.SYNCCH1"/>
-                <signal pad-id="pb3" index="3" function="EVSINCH1" group="EVSPB" field="EVSYS.SYNCCH1.SYNCCH1"/>
-                <signal pad-id="pb4" index="4" function="EVSINCH1" group="EVSPB" field="EVSYS.SYNCCH1.SYNCCH1"/>
-                <signal pad-id="pb5" index="5" function="EVSINCH1" group="EVSPB" field="EVSYS.SYNCCH1.SYNCCH1"/>
-                <signal pad-id="pc0" index="0" function="EVSINCH0" group="EVSPC" field="EVSYS.SYNCCH0.SYNCCH0"/>
-                <signal pad-id="pc1" index="1" function="EVSINCH0" group="EVSPC" field="EVSYS.SYNCCH0.SYNCCH0"/>
-                <signal pad-id="pc2" index="2" function="EVSINCH0" group="EVSPC" field="EVSYS.SYNCCH0.SYNCCH0"/>
-                <signal pad-id="pc3" index="3" function="EVSINCH0" group="EVSPC" field="EVSYS.SYNCCH0.SYNCCH0"/>
+                <signal pad-key="pa0" index="0" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
+                <signal pad-key="pa1" index="1" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
+                <signal pad-key="pa2" index="2" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
+                <signal pad-key="pa3" index="3" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
+                <signal pad-key="pa4" index="4" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
+                <signal pad-key="pa5" index="5" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
+                <signal pad-key="pa6" index="6" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
+                <signal pad-key="pa7" index="7" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
+                <signal pad-key="pb0" index="0" function="EVAINCH1" group="EVAPB" field="EVSYS.ASYNCCH1.ASYNCCH1"/>
+                <signal pad-key="pb1" index="1" function="EVAINCH1" group="EVAPB" field="EVSYS.ASYNCCH1.ASYNCCH1"/>
+                <signal pad-key="pb2" index="2" function="EVAINCH1" group="EVAPB" field="EVSYS.ASYNCCH1.ASYNCCH1"/>
+                <signal pad-key="pb3" index="3" function="EVAINCH1" group="EVAPB" field="EVSYS.ASYNCCH1.ASYNCCH1"/>
+                <signal pad-key="pb4" index="4" function="EVAINCH1" group="EVAPB" field="EVSYS.ASYNCCH1.ASYNCCH1"/>
+                <signal pad-key="pb5" index="5" function="EVAINCH1" group="EVAPB" field="EVSYS.ASYNCCH1.ASYNCCH1"/>
+                <signal pad-key="pc0" index="0" function="EVAINCH2" group="EVAPC" field="EVSYS.ASYNCCH2.ASYNCCH2"/>
+                <signal pad-key="pc1" index="1" function="EVAINCH2" group="EVAPC" field="EVSYS.ASYNCCH2.ASYNCCH2"/>
+                <signal pad-key="pc2" index="2" function="EVAINCH2" group="EVAPC" field="EVSYS.ASYNCCH2.ASYNCCH2"/>
+                <signal pad-key="pc3" index="3" function="EVAINCH2" group="EVAPC" field="EVSYS.ASYNCCH2.ASYNCCH2"/>
+                <signal pad-key="pa2" index="0" function="EVSYS" group="EVOUT" field="PORTMUX.CTRLA.EVOUT0"/>
+                <signal pad-key="pb2" index="1" function="EVSYS" group="EVOUT" field="PORTMUX.CTRLA.EVOUT1"/>
+                <signal pad-key="pc2" index="2" function="EVSYS" group="EVOUT" field="PORTMUX.CTRLA.EVOUT2"/>
+                <signal pad-key="pa0" index="0" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
+                <signal pad-key="pa1" index="1" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
+                <signal pad-key="pa2" index="2" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
+                <signal pad-key="pa3" index="3" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
+                <signal pad-key="pa4" index="4" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
+                <signal pad-key="pa5" index="5" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
+                <signal pad-key="pa6" index="6" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
+                <signal pad-key="pa7" index="7" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
+                <signal pad-key="pb0" index="0" function="EVSINCH1" group="EVSPB" field="EVSYS.SYNCCH1.SYNCCH1"/>
+                <signal pad-key="pb1" index="1" function="EVSINCH1" group="EVSPB" field="EVSYS.SYNCCH1.SYNCCH1"/>
+                <signal pad-key="pb2" index="2" function="EVSINCH1" group="EVSPB" field="EVSYS.SYNCCH1.SYNCCH1"/>
+                <signal pad-key="pb3" index="3" function="EVSINCH1" group="EVSPB" field="EVSYS.SYNCCH1.SYNCCH1"/>
+                <signal pad-key="pb4" index="4" function="EVSINCH1" group="EVSPB" field="EVSYS.SYNCCH1.SYNCCH1"/>
+                <signal pad-key="pb5" index="5" function="EVSINCH1" group="EVSPB" field="EVSYS.SYNCCH1.SYNCCH1"/>
+                <signal pad-key="pc0" index="0" function="EVSINCH0" group="EVSPC" field="EVSYS.SYNCCH0.SYNCCH0"/>
+                <signal pad-key="pc1" index="1" function="EVSINCH0" group="EVSPC" field="EVSYS.SYNCCH0.SYNCCH0"/>
+                <signal pad-key="pc2" index="2" function="EVSINCH0" group="EVSPC" field="EVSYS.SYNCCH0.SYNCCH0"/>
+                <signal pad-key="pc3" index="3" function="EVSINCH0" group="EVSPC" field="EVSYS.SYNCCH0.SYNCCH0"/>
             </signals>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="i2603_fuse">
@@ -164,34 +164,34 @@
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pa2" index="2" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa3" index="3" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa4" index="4" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa5" index="5" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa6" index="6" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa7" index="7" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa0" index="0" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa1" index="1" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa2" index="2" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa3" index="3" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa4" index="4" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa5" index="5" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa6" index="6" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa7" index="7" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pb2" index="2" function="IOPORT" group="PIN"/>
-                <signal pad-id="pb3" index="3" function="IOPORT" group="PIN"/>
-                <signal pad-id="pb4" index="4" function="IOPORT" group="PIN"/>
-                <signal pad-id="pb5" index="5" function="IOPORT" group="PIN"/>
+                <signal pad-key="pb0" index="0" function="IOPORT" group="PIN"/>
+                <signal pad-key="pb1" index="1" function="IOPORT" group="PIN"/>
+                <signal pad-key="pb2" index="2" function="IOPORT" group="PIN"/>
+                <signal pad-key="pb3" index="3" function="IOPORT" group="PIN"/>
+                <signal pad-key="pb4" index="4" function="IOPORT" group="PIN"/>
+                <signal pad-key="pb5" index="5" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pc2" index="2" function="IOPORT" group="PIN"/>
-                <signal pad-id="pc3" index="3" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc0" index="0" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc1" index="1" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc2" index="2" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc3" index="3" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="portmux" name="PORTMUX" module-key="i2603_portmux">
@@ -200,7 +200,7 @@
         <peripheral key="rstctrl" name="RSTCTRL" module-key="i2111">
             <register-group-instance register-group-key="rstctrl" address-space-key="data" offset="0x40"/>
             <signals>
-                <signal pad-id="pa0" function="OTHER" group="RESET"/>
+                <signal pad-key="pa0" function="OTHER" group="RESET"/>
             </signals>
         </peripheral>
         <peripheral key="rtc" name="RTC" module-key="i2116">
@@ -215,62 +215,62 @@
         <peripheral key="spi0" name="SPI0" module-key="i2107">
             <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"/>
-                <signal pad-id="pc2" function="SPI0_ALT" group="MOSI" field="PORTMUX.CTRLB.SPI0"/>
-                <signal pad-id="pa1" function="SPI0" group="MOSI" field="PORTMUX.CTRLB.SPI0"/>
-                <signal pad-id="pc0" function="SPI0_ALT" group="SCK" field="PORTMUX.CTRLB.SPI0"/>
-                <signal pad-id="pa3" function="SPI0" group="SCK" field="PORTMUX.CTRLB.SPI0"/>
-                <signal pad-id="pc3" function="SPI0_ALT" group="SS" field="PORTMUX.CTRLB.SPI0"/>
-                <signal pad-id="pa4" function="SPI0" group="SS" field="PORTMUX.CTRLB.SPI0"/>
+                <signal pad-key="pc1" function="SPI0_ALT" group="MISO" field="PORTMUX.CTRLB.SPI0"/>
+                <signal pad-key="pa2" function="SPI0" group="MISO" field="PORTMUX.CTRLB.SPI0"/>
+                <signal pad-key="pc2" function="SPI0_ALT" group="MOSI" field="PORTMUX.CTRLB.SPI0"/>
+                <signal pad-key="pa1" function="SPI0" group="MOSI" field="PORTMUX.CTRLB.SPI0"/>
+                <signal pad-key="pc0" function="SPI0_ALT" group="SCK" field="PORTMUX.CTRLB.SPI0"/>
+                <signal pad-key="pa3" function="SPI0" group="SCK" field="PORTMUX.CTRLB.SPI0"/>
+                <signal pad-key="pc3" function="SPI0_ALT" group="SS" field="PORTMUX.CTRLB.SPI0"/>
+                <signal pad-key="pa4" function="SPI0" group="SS" field="PORTMUX.CTRLB.SPI0"/>
             </signals>
         </peripheral>
         <peripheral key="syscfg" name="SYSCFG" module-key="i2603_syscfg">
             <register-group-instance register-group-key="syscfg" address-space-key="data" offset="0xF00"/>
             <signals>
-                <signal pad-id="pa0" function="OTHER" group="UPDI"/>
+                <signal pad-key="pa0" function="OTHER" group="UPDI"/>
             </signals>
         </peripheral>
         <peripheral key="tca0" name="TCA0" module-key="i2117">
             <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"/>
-                <signal pad-id="pb4" index="1" function="TCA0_ALT" group="WO" field="PORTMUX.CTRLC.TCA01"/>
-                <signal pad-id="pb1" index="1" function="TCA0" group="WO" field="PORTMUX.CTRLC.TCA01"/>
-                <signal pad-id="pb5" index="2" function="TCA0_ALT" group="WO" field="PORTMUX.CTRLC.TCA02"/>
-                <signal pad-id="pb2" index="2" function="TCA0" group="WO" field="PORTMUX.CTRLC.TCA02"/>
-                <signal pad-id="pc3" index="3" function="TCA0_ALT" group="WO" field="PORTMUX.CTRLC.TCA03"/>
-                <signal pad-id="pa3" index="3" function="TCA0" group="WO" field="PORTMUX.CTRLC.TCA03"/>
-                <signal pad-id="pa4" index="4" function="TCA0" group="WO" field="PORTMUX.CTRLC.TCA04"/>
-                <signal pad-id="pa5" index="5" function="TCA0" group="WO" field="PORTMUX.CTRLC.TCA05"/>
+                <signal pad-key="pb3" index="0" function="TCA0_ALT" group="WO" field="PORTMUX.CTRLC.TCA00"/>
+                <signal pad-key="pb0" index="0" function="TCA0" group="WO" field="PORTMUX.CTRLC.TCA00"/>
+                <signal pad-key="pb4" index="1" function="TCA0_ALT" group="WO" field="PORTMUX.CTRLC.TCA01"/>
+                <signal pad-key="pb1" index="1" function="TCA0" group="WO" field="PORTMUX.CTRLC.TCA01"/>
+                <signal pad-key="pb5" index="2" function="TCA0_ALT" group="WO" field="PORTMUX.CTRLC.TCA02"/>
+                <signal pad-key="pb2" index="2" function="TCA0" group="WO" field="PORTMUX.CTRLC.TCA02"/>
+                <signal pad-key="pc3" index="3" function="TCA0_ALT" group="WO" field="PORTMUX.CTRLC.TCA03"/>
+                <signal pad-key="pa3" index="3" function="TCA0" group="WO" field="PORTMUX.CTRLC.TCA03"/>
+                <signal pad-key="pa4" index="4" function="TCA0" group="WO" field="PORTMUX.CTRLC.TCA04"/>
+                <signal pad-key="pa5" index="5" function="TCA0" group="WO" field="PORTMUX.CTRLC.TCA05"/>
             </signals>
         </peripheral>
         <peripheral key="tcb0" name="TCB0" module-key="i2119">
             <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"/>
+                <signal pad-key="pc0" index="0" function="TCB0_ALT" group="WO" field="PORTMUX.CTRLD.TCB0"/>
+                <signal pad-key="pa5" index="0" function="TCB0" group="WO" field="PORTMUX.CTRLD.TCB0"/>
             </signals>
         </peripheral>
         <peripheral key="twi0" name="TWI0" module-key="i2110">
             <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"/>
+                <signal pad-key="pb0" function="TWI0" group="SCL" field="PORTMUX.CTRLB.TWI0"/>
+                <signal pad-key="pb1" function="TWI0" group="SDA" field="PORTMUX.CTRLB.TWI0"/>
             </signals>
         </peripheral>
         <peripheral key="usart0" name="USART0" module-key="i2108">
             <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"/>
-                <signal pad-id="pa1" function="USART0_ALT" group="TXD" field="PORTMUX.CTRLB.USART0"/>
-                <signal pad-id="pb2" function="USART0" group="TXD" field="PORTMUX.CTRLB.USART0"/>
-                <signal pad-id="pa3" function="USART0_ALT" group="XCK" field="PORTMUX.CTRLB.USART0"/>
-                <signal pad-id="pb1" function="USART0" group="XCK" field="PORTMUX.CTRLB.USART0"/>
-                <signal pad-id="pa4" function="USART0_ALT" group="XDIR" field="PORTMUX.CTRLB.USART0"/>
-                <signal pad-id="pb0" function="USART0" group="XDIR" field="PORTMUX.CTRLB.USART0"/>
+                <signal pad-key="pa2" function="USART0_ALT" group="RXD" field="PORTMUX.CTRLB.USART0"/>
+                <signal pad-key="pb3" function="USART0" group="RXD" field="PORTMUX.CTRLB.USART0"/>
+                <signal pad-key="pa1" function="USART0_ALT" group="TXD" field="PORTMUX.CTRLB.USART0"/>
+                <signal pad-key="pb2" function="USART0" group="TXD" field="PORTMUX.CTRLB.USART0"/>
+                <signal pad-key="pa3" function="USART0_ALT" group="XCK" field="PORTMUX.CTRLB.USART0"/>
+                <signal pad-key="pb1" function="USART0" group="XCK" field="PORTMUX.CTRLB.USART0"/>
+                <signal pad-key="pa4" function="USART0_ALT" group="XDIR" field="PORTMUX.CTRLB.USART0"/>
+                <signal pad-key="pb0" function="USART0" group="XDIR" field="PORTMUX.CTRLB.USART0"/>
             </signals>
         </peripheral>
         <peripheral key="userrow" name="USERROW" module-key="i2603_userrow">
@@ -1199,56 +1199,78 @@
             </register-group>
         </module>
     </modules>
+    <pads>
+        <pad key="pa2" name="PA2"/>
+        <pad key="pa3" name="PA3"/>
+        <pad key="gnd" name="GND"/>
+        <pad key="vdd" name="VDD"/>
+        <pad key="pa4" name="PA4"/>
+        <pad key="pa5" name="PA5"/>
+        <pad key="pa6" name="PA6"/>
+        <pad key="pa7" name="PA7"/>
+        <pad key="pb5" name="PB5"/>
+        <pad key="pb4" name="PB4"/>
+        <pad key="pb3" name="PB3"/>
+        <pad key="pb2" name="PB2"/>
+        <pad key="pb1" name="PB1"/>
+        <pad key="pb0" name="PB0"/>
+        <pad key="pc0" name="PC0"/>
+        <pad key="pc1" name="PC1"/>
+        <pad key="pc2" name="PC2"/>
+        <pad key="pc3" name="PC3"/>
+        <pad key="pa0" name="PA0"/>
+        <pad key="pa1" name="PA1"/>
+    </pads>
     <pinouts>
         <pinout key="qfn20" name="QFN20" type="qfn">
-            <pin position="1" pad="PA2"/>
-            <pin position="2" pad="PA3"/>
-            <pin position="3" pad="GND"/>
-            <pin position="4" pad="VDD"/>
-            <pin position="5" pad="PA4"/>
-            <pin position="6" pad="PA5"/>
-            <pin position="7" pad="PA6"/>
-            <pin position="8" pad="PA7"/>
-            <pin position="9" pad="PB5"/>
-            <pin position="10" pad="PB4"/>
-            <pin position="11" pad="PB3"/>
-            <pin position="12" pad="PB2"/>
-            <pin position="13" pad="PB1"/>
-            <pin position="14" pad="PB0"/>
-            <pin position="15" pad="PC0"/>
-            <pin position="16" pad="PC1"/>
-            <pin position="17" pad="PC2"/>
-            <pin position="18" pad="PC3"/>
-            <pin position="19" pad="PA0"/>
-            <pin position="20" pad="PA1"/>
+            <pin position="1" pad-key="pa2"/>
+            <pin position="2" pad-key="pa3"/>
+            <pin position="3" pad-key="gnd"/>
+            <pin position="4" pad-key="vdd"/>
+            <pin position="5" pad-key="pa4"/>
+            <pin position="6" pad-key="pa5"/>
+            <pin position="7" pad-key="pa6"/>
+            <pin position="8" pad-key="pa7"/>
+            <pin position="9" pad-key="pb5"/>
+            <pin position="10" pad-key="pb4"/>
+            <pin position="11" pad-key="pb3"/>
+            <pin position="12" pad-key="pb2"/>
+            <pin position="13" pad-key="pb1"/>
+            <pin position="14" pad-key="pb0"/>
+            <pin position="15" pad-key="pc0"/>
+            <pin position="16" pad-key="pc1"/>
+            <pin position="17" pad-key="pc2"/>
+            <pin position="18" pad-key="pc3"/>
+            <pin position="19" pad-key="pa0"/>
+            <pin position="20" pad-key="pa1"/>
         </pinout>
         <pinout key="soic20" name="SOIC20" type="soic">
-            <pin position="1" pad="VDD"/>
-            <pin position="2" pad="PA4"/>
-            <pin position="3" pad="PA5"/>
-            <pin position="4" pad="PA6"/>
-            <pin position="5" pad="PA7"/>
-            <pin position="6" pad="PB5"/>
-            <pin position="7" pad="PB4"/>
-            <pin position="8" pad="PB3"/>
-            <pin position="9" pad="PB2"/>
-            <pin position="10" pad="PB1"/>
-            <pin position="11" pad="PB0"/>
-            <pin position="12" pad="PC0"/>
-            <pin position="13" pad="PC1"/>
-            <pin position="14" pad="PC2"/>
-            <pin position="15" pad="PC3"/>
-            <pin position="16" pad="PA0"/>
-            <pin position="17" pad="PA1"/>
-            <pin position="18" pad="PA2"/>
-            <pin position="19" pad="PA3"/>
-            <pin position="20" pad="GND"/>
+            <pin position="1" pad-key="vdd"/>
+            <pin position="2" pad-key="pa4"/>
+            <pin position="3" pad-key="pa5"/>
+            <pin position="4" pad-key="pa6"/>
+            <pin position="5" pad-key="pa7"/>
+            <pin position="6" pad-key="pb5"/>
+            <pin position="7" pad-key="pb4"/>
+            <pin position="8" pad-key="pb3"/>
+            <pin position="9" pad-key="pb2"/>
+            <pin position="10" pad-key="pb1"/>
+            <pin position="11" pad-key="pb0"/>
+            <pin position="12" pad-key="pc0"/>
+            <pin position="13" pad-key="pc1"/>
+            <pin position="14" pad-key="pc2"/>
+            <pin position="15" pad-key="pc3"/>
+            <pin position="16" pad-key="pa0"/>
+            <pin position="17" pad-key="pa1"/>
+            <pin position="18" pad-key="pa2"/>
+            <pin position="19" pad-key="pa3"/>
+            <pin position="20" pad-key="gnd"/>
         </pinout>
     </pinouts>
     <variants>
-        <variant name="ATtiny1606-MFR" pinout-key="qfn20" package="VQFN20"/>
-        <variant name="ATtiny1606-MNR" pinout-key="qfn20" package="VQFN20"/>
-        <variant name="ATtiny1606-SFR" pinout-key="soic20" package="SOIC20"/>
-        <variant name="ATtiny1606-SNR" pinout-key="soic20" package="SOIC20"/>
+        <variant key="attiny1606_mfr" name="ATtiny1606-MFR" pinout-key="qfn20"/>
+        <variant key="attiny1606_mnr" name="ATtiny1606-MNR" pinout-key="qfn20"/>
+        <variant key="attiny1606_sfr" name="ATtiny1606-SFR" pinout-key="soic20"/>
+        <variant key="attiny1606_snr" name="ATtiny1606-SNR" pinout-key="soic20"/>
     </variants>
 </device>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY1607.xml b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY1607.xml
index de612476..c0780094 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY1607.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY1607.xml
@@ -44,28 +44,28 @@
         <peripheral key="ac0" name="AC0" module-key="i2106">
             <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"/>
-                <signal pad-id="pa5" index="0" function="AC0" group="OUT"/>
-                <signal pad-id="pa7" index="0" function="AC0" group="P"/>
-                <signal pad-id="pb5" index="1" function="AC0" group="P"/>
+                <signal pad-key="pa6" index="0" function="AC0" group="N"/>
+                <signal pad-key="pb4" index="1" function="AC0" group="N"/>
+                <signal pad-key="pa5" index="0" function="AC0" group="OUT"/>
+                <signal pad-key="pa7" index="0" function="AC0" group="P"/>
+                <signal pad-key="pb5" index="1" function="AC0" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="adc0" name="ADC0" module-key="i2132">
             <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"/>
-                <signal pad-id="pa2" index="2" function="AIN0" group="AIN"/>
-                <signal pad-id="pa3" index="3" function="AIN0" group="AIN"/>
-                <signal pad-id="pa4" index="4" function="AIN0" group="AIN"/>
-                <signal pad-id="pa5" index="5" function="AIN0" group="AIN"/>
-                <signal pad-id="pa6" index="6" function="AIN0" group="AIN"/>
-                <signal pad-id="pa7" index="7" function="AIN0" group="AIN"/>
-                <signal pad-id="pb5" index="8" function="AIN0" group="AIN"/>
-                <signal pad-id="pb4" index="9" function="AIN0" group="AIN"/>
-                <signal pad-id="pb1" index="10" function="AIN0" group="AIN"/>
-                <signal pad-id="pb0" index="11" function="AIN0" group="AIN"/>
+                <signal pad-key="pa0" index="0" function="AIN0" group="AIN"/>
+                <signal pad-key="pa1" index="1" function="AIN0" group="AIN"/>
+                <signal pad-key="pa2" index="2" function="AIN0" group="AIN"/>
+                <signal pad-key="pa3" index="3" function="AIN0" group="AIN"/>
+                <signal pad-key="pa4" index="4" function="AIN0" group="AIN"/>
+                <signal pad-key="pa5" index="5" function="AIN0" group="AIN"/>
+                <signal pad-key="pa6" index="6" function="AIN0" group="AIN"/>
+                <signal pad-key="pa7" index="7" function="AIN0" group="AIN"/>
+                <signal pad-key="pb5" index="8" function="AIN0" group="AIN"/>
+                <signal pad-key="pb4" index="9" function="AIN0" group="AIN"/>
+                <signal pad-key="pb1" index="10" function="AIN0" group="AIN"/>
+                <signal pad-key="pb0" index="11" function="AIN0" group="AIN"/>
             </signals>
         </peripheral>
         <peripheral key="bod" name="BOD" module-key="i2114">
@@ -74,32 +74,32 @@
         <peripheral key="ccl" name="CCL" module-key="i2128">
             <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"/>
-                <signal pad-id="pa2" index="2" function="CCL" group="LUT0_IN"/>
-                <signal pad-id="pb4" index="0" function="CCL_ALT" group="LUT0_OUT" field="PORTMUX.CTRLA.LUT0"/>
-                <signal pad-id="pa4" index="0" function="CCL" group="LUT0_OUT" field="PORTMUX.CTRLA.LUT0"/>
-                <signal pad-id="pc3" index="0" function="CCL" group="LUT1_IN"/>
-                <signal pad-id="pc4" index="1" function="CCL" group="LUT1_IN"/>
-                <signal pad-id="pc5" index="2" function="CCL" group="LUT1_IN"/>
-                <signal pad-id="pc1" index="0" function="CCL_ALT" group="LUT1_OUT" field="PORTMUX.CTRLA.LUT1"/>
-                <signal pad-id="pa7" index="0" function="CCL" group="LUT1_OUT" field="PORTMUX.CTRLA.LUT1"/>
+                <signal pad-key="pa0" index="0" function="CCL" group="LUT0_IN"/>
+                <signal pad-key="pa1" index="1" function="CCL" group="LUT0_IN"/>
+                <signal pad-key="pa2" index="2" function="CCL" group="LUT0_IN"/>
+                <signal pad-key="pb4" index="0" function="CCL_ALT" group="LUT0_OUT" field="PORTMUX.CTRLA.LUT0"/>
+                <signal pad-key="pa4" index="0" function="CCL" group="LUT0_OUT" field="PORTMUX.CTRLA.LUT0"/>
+                <signal pad-key="pc3" index="0" function="CCL" group="LUT1_IN"/>
+                <signal pad-key="pc4" index="1" function="CCL" group="LUT1_IN"/>
+                <signal pad-key="pc5" index="2" function="CCL" group="LUT1_IN"/>
+                <signal pad-key="pc1" index="0" function="CCL_ALT" group="LUT1_OUT" field="PORTMUX.CTRLA.LUT1"/>
+                <signal pad-key="pa7" index="0" function="CCL" group="LUT1_OUT" field="PORTMUX.CTRLA.LUT1"/>
             </signals>
         </peripheral>
         <peripheral key="clkctrl" name="CLKCTRL" module-key="i2603_clkctrl">
             <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"/>
-                <signal pad-id="pb3" function="CLKCTRL" group="TOSC1"/>
-                <signal pad-id="pb2" function="CLKCTRL" group="TOSC2"/>
+                <signal pad-key="pa3" function="CLKCTRL" group="CLKI"/>
+                <signal pad-key="pb5" function="CLKCTRL" group="CLKO"/>
+                <signal pad-key="pb3" function="CLKCTRL" group="TOSC1"/>
+                <signal pad-key="pb2" function="CLKCTRL" group="TOSC2"/>
             </signals>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="i2100">
             <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"/>
+                <signal pad-key="pc4" function="BREAK_ALT" group="BREAK" field="PORTMUX.CTRLA.EXTBRK"/>
+                <signal pad-key="pa1" function="BREAK" group="BREAK" field="PORTMUX.CTRLA.EXTBRK"/>
             </signals>
         </peripheral>
         <peripheral key="cpuint" name="CPUINT" module-key="i2104">
@@ -111,53 +111,53 @@
         <peripheral key="evsys" name="EVSYS" module-key="i2603_evsys">
             <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"/>
-                <signal pad-id="pa2" index="2" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
-                <signal pad-id="pa3" index="3" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
-                <signal pad-id="pa4" index="4" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
-                <signal pad-id="pa5" index="5" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
-                <signal pad-id="pa6" index="6" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
-                <signal pad-id="pa7" index="7" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
-                <signal pad-id="pb0" index="0" function="EVAINCH1" group="EVAPB" field="EVSYS.ASYNCCH1.ASYNCCH1"/>
-                <signal pad-id="pb1" index="1" function="EVAINCH1" group="EVAPB" field="EVSYS.ASYNCCH1.ASYNCCH1"/>
-                <signal pad-id="pb2" index="2" function="EVAINCH1" group="EVAPB" field="EVSYS.ASYNCCH1.ASYNCCH1"/>
-                <signal pad-id="pb3" index="3" function="EVAINCH1" group="EVAPB" field="EVSYS.ASYNCCH1.ASYNCCH1"/>
-                <signal pad-id="pb4" index="4" function="EVAINCH1" group="EVAPB" field="EVSYS.ASYNCCH1.ASYNCCH1"/>
-                <signal pad-id="pb5" index="5" function="EVAINCH1" group="EVAPB" field="EVSYS.ASYNCCH1.ASYNCCH1"/>
-                <signal pad-id="pb6" index="6" function="EVAINCH1" group="EVAPB" field="EVSYS.ASYNCCH1.ASYNCCH1"/>
-                <signal pad-id="pb7" index="7" function="EVAINCH1" group="EVAPB" field="EVSYS.ASYNCCH1.ASYNCCH1"/>
-                <signal pad-id="pc0" index="0" function="EVAINCH2" group="EVAPC" field="EVSYS.ASYNCCH2.ASYNCCH2"/>
-                <signal pad-id="pc1" index="1" function="EVAINCH2" group="EVAPC" field="EVSYS.ASYNCCH2.ASYNCCH2"/>
-                <signal pad-id="pc2" index="2" function="EVAINCH2" group="EVAPC" field="EVSYS.ASYNCCH2.ASYNCCH2"/>
-                <signal pad-id="pc3" index="3" function="EVAINCH2" group="EVAPC" field="EVSYS.ASYNCCH2.ASYNCCH2"/>
-                <signal pad-id="pc4" index="4" function="EVAINCH2" group="EVAPC" field="EVSYS.ASYNCCH2.ASYNCCH2"/>
-                <signal pad-id="pc5" index="5" function="EVAINCH2" group="EVAPC" field="EVSYS.ASYNCCH2.ASYNCCH2"/>
-                <signal pad-id="pa2" index="0" function="EVSYS" group="EVOUT" field="PORTMUX.CTRLA.EVOUT0"/>
-                <signal pad-id="pb2" index="1" function="EVSYS" group="EVOUT" field="PORTMUX.CTRLA.EVOUT1"/>
-                <signal pad-id="pc2" index="2" function="EVSYS" group="EVOUT" field="PORTMUX.CTRLA.EVOUT2"/>
-                <signal pad-id="pa0" index="0" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
-                <signal pad-id="pa1" index="1" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
-                <signal pad-id="pa2" index="2" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
-                <signal pad-id="pa3" index="3" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
-                <signal pad-id="pa4" index="4" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
-                <signal pad-id="pa5" index="5" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
-                <signal pad-id="pa6" index="6" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
-                <signal pad-id="pa7" index="7" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
-                <signal pad-id="pb0" index="0" function="EVSINCH1" group="EVSPB" field="EVSYS.SYNCCH1.SYNCCH1"/>
-                <signal pad-id="pb1" index="1" function="EVSINCH1" group="EVSPB" field="EVSYS.SYNCCH1.SYNCCH1"/>
-                <signal pad-id="pb2" index="2" function="EVSINCH1" group="EVSPB" field="EVSYS.SYNCCH1.SYNCCH1"/>
-                <signal pad-id="pb3" index="3" function="EVSINCH1" group="EVSPB" field="EVSYS.SYNCCH1.SYNCCH1"/>
-                <signal pad-id="pb4" index="4" function="EVSINCH1" group="EVSPB" field="EVSYS.SYNCCH1.SYNCCH1"/>
-                <signal pad-id="pb5" index="5" function="EVSINCH1" group="EVSPB" field="EVSYS.SYNCCH1.SYNCCH1"/>
-                <signal pad-id="pb6" index="6" function="EVSINCH1" group="EVSPB" field="EVSYS.SYNCCH1.SYNCCH1"/>
-                <signal pad-id="pb7" index="7" function="EVSINCH1" group="EVSPB" field="EVSYS.SYNCCH1.SYNCCH1"/>
-                <signal pad-id="pc0" index="0" function="EVSINCH0" group="EVSPC" field="EVSYS.SYNCCH0.SYNCCH0"/>
-                <signal pad-id="pc1" index="1" function="EVSINCH0" group="EVSPC" field="EVSYS.SYNCCH0.SYNCCH0"/>
-                <signal pad-id="pc2" index="2" function="EVSINCH0" group="EVSPC" field="EVSYS.SYNCCH0.SYNCCH0"/>
-                <signal pad-id="pc3" index="3" function="EVSINCH0" group="EVSPC" field="EVSYS.SYNCCH0.SYNCCH0"/>
-                <signal pad-id="pc4" index="4" function="EVSINCH0" group="EVSPC" field="EVSYS.SYNCCH0.SYNCCH0"/>
-                <signal pad-id="pc5" index="5" function="EVSINCH0" group="EVSPC" field="EVSYS.SYNCCH0.SYNCCH0"/>
+                <signal pad-key="pa0" index="0" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
+                <signal pad-key="pa1" index="1" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
+                <signal pad-key="pa2" index="2" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
+                <signal pad-key="pa3" index="3" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
+                <signal pad-key="pa4" index="4" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
+                <signal pad-key="pa5" index="5" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
+                <signal pad-key="pa6" index="6" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
+                <signal pad-key="pa7" index="7" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
+                <signal pad-key="pb0" index="0" function="EVAINCH1" group="EVAPB" field="EVSYS.ASYNCCH1.ASYNCCH1"/>
+                <signal pad-key="pb1" index="1" function="EVAINCH1" group="EVAPB" field="EVSYS.ASYNCCH1.ASYNCCH1"/>
+                <signal pad-key="pb2" index="2" function="EVAINCH1" group="EVAPB" field="EVSYS.ASYNCCH1.ASYNCCH1"/>
+                <signal pad-key="pb3" index="3" function="EVAINCH1" group="EVAPB" field="EVSYS.ASYNCCH1.ASYNCCH1"/>
+                <signal pad-key="pb4" index="4" function="EVAINCH1" group="EVAPB" field="EVSYS.ASYNCCH1.ASYNCCH1"/>
+                <signal pad-key="pb5" index="5" function="EVAINCH1" group="EVAPB" field="EVSYS.ASYNCCH1.ASYNCCH1"/>
+                <signal pad-key="pb6" index="6" function="EVAINCH1" group="EVAPB" field="EVSYS.ASYNCCH1.ASYNCCH1"/>
+                <signal pad-key="pb7" index="7" function="EVAINCH1" group="EVAPB" field="EVSYS.ASYNCCH1.ASYNCCH1"/>
+                <signal pad-key="pc0" index="0" function="EVAINCH2" group="EVAPC" field="EVSYS.ASYNCCH2.ASYNCCH2"/>
+                <signal pad-key="pc1" index="1" function="EVAINCH2" group="EVAPC" field="EVSYS.ASYNCCH2.ASYNCCH2"/>
+                <signal pad-key="pc2" index="2" function="EVAINCH2" group="EVAPC" field="EVSYS.ASYNCCH2.ASYNCCH2"/>
+                <signal pad-key="pc3" index="3" function="EVAINCH2" group="EVAPC" field="EVSYS.ASYNCCH2.ASYNCCH2"/>
+                <signal pad-key="pc4" index="4" function="EVAINCH2" group="EVAPC" field="EVSYS.ASYNCCH2.ASYNCCH2"/>
+                <signal pad-key="pc5" index="5" function="EVAINCH2" group="EVAPC" field="EVSYS.ASYNCCH2.ASYNCCH2"/>
+                <signal pad-key="pa2" index="0" function="EVSYS" group="EVOUT" field="PORTMUX.CTRLA.EVOUT0"/>
+                <signal pad-key="pb2" index="1" function="EVSYS" group="EVOUT" field="PORTMUX.CTRLA.EVOUT1"/>
+                <signal pad-key="pc2" index="2" function="EVSYS" group="EVOUT" field="PORTMUX.CTRLA.EVOUT2"/>
+                <signal pad-key="pa0" index="0" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
+                <signal pad-key="pa1" index="1" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
+                <signal pad-key="pa2" index="2" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
+                <signal pad-key="pa3" index="3" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
+                <signal pad-key="pa4" index="4" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
+                <signal pad-key="pa5" index="5" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
+                <signal pad-key="pa6" index="6" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
+                <signal pad-key="pa7" index="7" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
+                <signal pad-key="pb0" index="0" function="EVSINCH1" group="EVSPB" field="EVSYS.SYNCCH1.SYNCCH1"/>
+                <signal pad-key="pb1" index="1" function="EVSINCH1" group="EVSPB" field="EVSYS.SYNCCH1.SYNCCH1"/>
+                <signal pad-key="pb2" index="2" function="EVSINCH1" group="EVSPB" field="EVSYS.SYNCCH1.SYNCCH1"/>
+                <signal pad-key="pb3" index="3" function="EVSINCH1" group="EVSPB" field="EVSYS.SYNCCH1.SYNCCH1"/>
+                <signal pad-key="pb4" index="4" function="EVSINCH1" group="EVSPB" field="EVSYS.SYNCCH1.SYNCCH1"/>
+                <signal pad-key="pb5" index="5" function="EVSINCH1" group="EVSPB" field="EVSYS.SYNCCH1.SYNCCH1"/>
+                <signal pad-key="pb6" index="6" function="EVSINCH1" group="EVSPB" field="EVSYS.SYNCCH1.SYNCCH1"/>
+                <signal pad-key="pb7" index="7" function="EVSINCH1" group="EVSPB" field="EVSYS.SYNCCH1.SYNCCH1"/>
+                <signal pad-key="pc0" index="0" function="EVSINCH0" group="EVSPC" field="EVSYS.SYNCCH0.SYNCCH0"/>
+                <signal pad-key="pc1" index="1" function="EVSINCH0" group="EVSPC" field="EVSYS.SYNCCH0.SYNCCH0"/>
+                <signal pad-key="pc2" index="2" function="EVSINCH0" group="EVSPC" field="EVSYS.SYNCCH0.SYNCCH0"/>
+                <signal pad-key="pc3" index="3" function="EVSINCH0" group="EVSPC" field="EVSYS.SYNCCH0.SYNCCH0"/>
+                <signal pad-key="pc4" index="4" function="EVSINCH0" group="EVSPC" field="EVSYS.SYNCCH0.SYNCCH0"/>
+                <signal pad-key="pc5" index="5" function="EVSINCH0" group="EVSPC" field="EVSYS.SYNCCH0.SYNCCH0"/>
             </signals>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="i2603_fuse">
@@ -175,38 +175,38 @@
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pa2" index="2" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa3" index="3" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa4" index="4" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa5" index="5" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa6" index="6" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa7" index="7" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa0" index="0" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa1" index="1" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa2" index="2" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa3" index="3" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa4" index="4" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa5" index="5" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa6" index="6" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa7" index="7" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pb2" index="2" function="IOPORT" group="PIN"/>
-                <signal pad-id="pb3" index="3" function="IOPORT" group="PIN"/>
-                <signal pad-id="pb4" index="4" function="IOPORT" group="PIN"/>
-                <signal pad-id="pb5" index="5" function="IOPORT" group="PIN"/>
-                <signal pad-id="pb6" index="6" function="IOPORT" group="PIN"/>
-                <signal pad-id="pb7" index="7" function="IOPORT" group="PIN"/>
+                <signal pad-key="pb0" index="0" function="IOPORT" group="PIN"/>
+                <signal pad-key="pb1" index="1" function="IOPORT" group="PIN"/>
+                <signal pad-key="pb2" index="2" function="IOPORT" group="PIN"/>
+                <signal pad-key="pb3" index="3" function="IOPORT" group="PIN"/>
+                <signal pad-key="pb4" index="4" function="IOPORT" group="PIN"/>
+                <signal pad-key="pb5" index="5" function="IOPORT" group="PIN"/>
+                <signal pad-key="pb6" index="6" function="IOPORT" group="PIN"/>
+                <signal pad-key="pb7" index="7" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pc2" index="2" function="IOPORT" group="PIN"/>
-                <signal pad-id="pc3" index="3" function="IOPORT" group="PIN"/>
-                <signal pad-id="pc4" index="4" function="IOPORT" group="PIN"/>
-                <signal pad-id="pc5" index="5" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc0" index="0" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc1" index="1" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc2" index="2" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc3" index="3" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc4" index="4" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc5" index="5" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="portmux" name="PORTMUX" module-key="i2603_portmux">
@@ -215,7 +215,7 @@
         <peripheral key="rstctrl" name="RSTCTRL" module-key="i2111">
             <register-group-instance register-group-key="rstctrl" address-space-key="data" offset="0x40"/>
             <signals>
-                <signal pad-id="pa0" function="OTHER" group="RESET"/>
+                <signal pad-key="pa0" function="OTHER" group="RESET"/>
             </signals>
         </peripheral>
         <peripheral key="rtc" name="RTC" module-key="i2116">
@@ -230,64 +230,64 @@
         <peripheral key="spi0" name="SPI0" module-key="i2107">
             <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"/>
-                <signal pad-id="pc2" function="SPI0_ALT" group="MOSI" field="PORTMUX.CTRLB.SPI0"/>
-                <signal pad-id="pa1" function="SPI0" group="MOSI" field="PORTMUX.CTRLB.SPI0"/>
-                <signal pad-id="pc0" function="SPI0_ALT" group="SCK" field="PORTMUX.CTRLB.SPI0"/>
-                <signal pad-id="pa3" function="SPI0" group="SCK" field="PORTMUX.CTRLB.SPI0"/>
-                <signal pad-id="pc3" function="SPI0_ALT" group="SS" field="PORTMUX.CTRLB.SPI0"/>
-                <signal pad-id="pa4" function="SPI0" group="SS" field="PORTMUX.CTRLB.SPI0"/>
+                <signal pad-key="pc1" function="SPI0_ALT" group="MISO" field="PORTMUX.CTRLB.SPI0"/>
+                <signal pad-key="pa2" function="SPI0" group="MISO" field="PORTMUX.CTRLB.SPI0"/>
+                <signal pad-key="pc2" function="SPI0_ALT" group="MOSI" field="PORTMUX.CTRLB.SPI0"/>
+                <signal pad-key="pa1" function="SPI0" group="MOSI" field="PORTMUX.CTRLB.SPI0"/>
+                <signal pad-key="pc0" function="SPI0_ALT" group="SCK" field="PORTMUX.CTRLB.SPI0"/>
+                <signal pad-key="pa3" function="SPI0" group="SCK" field="PORTMUX.CTRLB.SPI0"/>
+                <signal pad-key="pc3" function="SPI0_ALT" group="SS" field="PORTMUX.CTRLB.SPI0"/>
+                <signal pad-key="pa4" function="SPI0" group="SS" field="PORTMUX.CTRLB.SPI0"/>
             </signals>
         </peripheral>
         <peripheral key="syscfg" name="SYSCFG" module-key="i2603_syscfg">
             <register-group-instance register-group-key="syscfg" address-space-key="data" offset="0xF00"/>
             <signals>
-                <signal pad-id="pa0" function="OTHER" group="UPDI"/>
+                <signal pad-key="pa0" function="OTHER" group="UPDI"/>
             </signals>
         </peripheral>
         <peripheral key="tca0" name="TCA0" module-key="i2117">
             <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"/>
-                <signal pad-id="pb4" index="1" function="TCA0_ALT" group="WO" field="PORTMUX.CTRLC.TCA01"/>
-                <signal pad-id="pb1" index="1" function="TCA0" group="WO" field="PORTMUX.CTRLC.TCA01"/>
-                <signal pad-id="pb5" index="2" function="TCA0_ALT" group="WO" field="PORTMUX.CTRLC.TCA02"/>
-                <signal pad-id="pb2" index="2" function="TCA0" group="WO" field="PORTMUX.CTRLC.TCA02"/>
-                <signal pad-id="pc3" index="3" function="TCA0_ALT" group="WO" field="PORTMUX.CTRLC.TCA03"/>
-                <signal pad-id="pa3" index="3" function="TCA0" group="WO" field="PORTMUX.CTRLC.TCA03"/>
-                <signal pad-id="pc4" index="4" function="TCA0_ALT" group="WO" field="PORTMUX.CTRLC.TCA04"/>
-                <signal pad-id="pa4" index="4" function="TCA0" group="WO" field="PORTMUX.CTRLC.TCA04"/>
-                <signal pad-id="pc5" index="5" function="TCA0_ALT" group="WO" field="PORTMUX.CTRLC.TCA05"/>
-                <signal pad-id="pa5" index="5" function="TCA0" group="WO" field="PORTMUX.CTRLC.TCA05"/>
+                <signal pad-key="pb3" index="0" function="TCA0_ALT" group="WO" field="PORTMUX.CTRLC.TCA00"/>
+                <signal pad-key="pb0" index="0" function="TCA0" group="WO" field="PORTMUX.CTRLC.TCA00"/>
+                <signal pad-key="pb4" index="1" function="TCA0_ALT" group="WO" field="PORTMUX.CTRLC.TCA01"/>
+                <signal pad-key="pb1" index="1" function="TCA0" group="WO" field="PORTMUX.CTRLC.TCA01"/>
+                <signal pad-key="pb5" index="2" function="TCA0_ALT" group="WO" field="PORTMUX.CTRLC.TCA02"/>
+                <signal pad-key="pb2" index="2" function="TCA0" group="WO" field="PORTMUX.CTRLC.TCA02"/>
+                <signal pad-key="pc3" index="3" function="TCA0_ALT" group="WO" field="PORTMUX.CTRLC.TCA03"/>
+                <signal pad-key="pa3" index="3" function="TCA0" group="WO" field="PORTMUX.CTRLC.TCA03"/>
+                <signal pad-key="pc4" index="4" function="TCA0_ALT" group="WO" field="PORTMUX.CTRLC.TCA04"/>
+                <signal pad-key="pa4" index="4" function="TCA0" group="WO" field="PORTMUX.CTRLC.TCA04"/>
+                <signal pad-key="pc5" index="5" function="TCA0_ALT" group="WO" field="PORTMUX.CTRLC.TCA05"/>
+                <signal pad-key="pa5" index="5" function="TCA0" group="WO" field="PORTMUX.CTRLC.TCA05"/>
             </signals>
         </peripheral>
         <peripheral key="tcb0" name="TCB0" module-key="i2119">
             <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"/>
+                <signal pad-key="pc0" index="0" function="TCB0_ALT" group="WO" field="PORTMUX.CTRLD.TCB0"/>
+                <signal pad-key="pa5" index="0" function="TCB0" group="WO" field="PORTMUX.CTRLD.TCB0"/>
             </signals>
         </peripheral>
         <peripheral key="twi0" name="TWI0" module-key="i2110">
             <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"/>
+                <signal pad-key="pb0" function="TWI0" group="SCL" field="PORTMUX.CTRLB.TWI0"/>
+                <signal pad-key="pb1" function="TWI0" group="SDA" field="PORTMUX.CTRLB.TWI0"/>
             </signals>
         </peripheral>
         <peripheral key="usart0" name="USART0" module-key="i2108">
             <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"/>
-                <signal pad-id="pa1" function="USART0_ALT" group="TXD" field="PORTMUX.CTRLB.USART0"/>
-                <signal pad-id="pb2" function="USART0" group="TXD" field="PORTMUX.CTRLB.USART0"/>
-                <signal pad-id="pa3" function="USART0_ALT" group="XCK" field="PORTMUX.CTRLB.USART0"/>
-                <signal pad-id="pb1" function="USART0" group="XCK" field="PORTMUX.CTRLB.USART0"/>
-                <signal pad-id="pa4" function="USART0_ALT" group="XDIR" field="PORTMUX.CTRLB.USART0"/>
-                <signal pad-id="pb0" function="USART0" group="XDIR" field="PORTMUX.CTRLB.USART0"/>
+                <signal pad-key="pa2" function="USART0_ALT" group="RXD" field="PORTMUX.CTRLB.USART0"/>
+                <signal pad-key="pb3" function="USART0" group="RXD" field="PORTMUX.CTRLB.USART0"/>
+                <signal pad-key="pa1" function="USART0_ALT" group="TXD" field="PORTMUX.CTRLB.USART0"/>
+                <signal pad-key="pb2" function="USART0" group="TXD" field="PORTMUX.CTRLB.USART0"/>
+                <signal pad-key="pa3" function="USART0_ALT" group="XCK" field="PORTMUX.CTRLB.USART0"/>
+                <signal pad-key="pb1" function="USART0" group="XCK" field="PORTMUX.CTRLB.USART0"/>
+                <signal pad-key="pa4" function="USART0_ALT" group="XDIR" field="PORTMUX.CTRLB.USART0"/>
+                <signal pad-key="pb0" function="USART0" group="XDIR" field="PORTMUX.CTRLB.USART0"/>
             </signals>
         </peripheral>
         <peripheral key="userrow" name="USERROW" module-key="i2603_userrow">
@@ -1216,36 +1216,62 @@
             </register-group>
         </module>
     </modules>
+    <pads>
+        <pad key="pa2" name="PA2"/>
+        <pad key="pa3" name="PA3"/>
+        <pad key="gnd" name="GND"/>
+        <pad key="vdd" name="VDD"/>
+        <pad key="pa4" name="PA4"/>
+        <pad key="pa5" name="PA5"/>
+        <pad key="pa6" name="PA6"/>
+        <pad key="pa7" name="PA7"/>
+        <pad key="pb7" name="PB7"/>
+        <pad key="pb6" name="PB6"/>
+        <pad key="pb5" name="PB5"/>
+        <pad key="pb4" name="PB4"/>
+        <pad key="pb3" name="PB3"/>
+        <pad key="pb2" name="PB2"/>
+        <pad key="pb1" name="PB1"/>
+        <pad key="pb0" name="PB0"/>
+        <pad key="pc0" name="PC0"/>
+        <pad key="pc1" name="PC1"/>
+        <pad key="pc2" name="PC2"/>
+        <pad key="pc3" name="PC3"/>
+        <pad key="pc4" name="PC4"/>
+        <pad key="pc5" name="PC5"/>
+        <pad key="pa0" name="PA0"/>
+        <pad key="pa1" name="PA1"/>
+    </pads>
     <pinouts>
         <pinout key="qfn24" name="QFN24" type="qfn">
-            <pin position="1" pad="PA2"/>
-            <pin position="2" pad="PA3"/>
-            <pin position="3" pad="GND"/>
-            <pin position="4" pad="VDD"/>
-            <pin position="5" pad="PA4"/>
-            <pin position="6" pad="PA5"/>
-            <pin position="7" pad="PA6"/>
-            <pin position="8" pad="PA7"/>
-            <pin position="9" pad="PB7"/>
-            <pin position="10" pad="PB6"/>
-            <pin position="11" pad="PB5"/>
-            <pin position="12" pad="PB4"/>
-            <pin position="13" pad="PB3"/>
-            <pin position="14" pad="PB2"/>
-            <pin position="15" pad="PB1"/>
-            <pin position="16" pad="PB0"/>
-            <pin position="17" pad="PC0"/>
-            <pin position="18" pad="PC1"/>
-            <pin position="19" pad="PC2"/>
-            <pin position="20" pad="PC3"/>
-            <pin position="21" pad="PC4"/>
-            <pin position="22" pad="PC5"/>
-            <pin position="23" pad="PA0"/>
-            <pin position="24" pad="PA1"/>
+            <pin position="1" pad-key="pa2"/>
+            <pin position="2" pad-key="pa3"/>
+            <pin position="3" pad-key="gnd"/>
+            <pin position="4" pad-key="vdd"/>
+            <pin position="5" pad-key="pa4"/>
+            <pin position="6" pad-key="pa5"/>
+            <pin position="7" pad-key="pa6"/>
+            <pin position="8" pad-key="pa7"/>
+            <pin position="9" pad-key="pb7"/>
+            <pin position="10" pad-key="pb6"/>
+            <pin position="11" pad-key="pb5"/>
+            <pin position="12" pad-key="pb4"/>
+            <pin position="13" pad-key="pb3"/>
+            <pin position="14" pad-key="pb2"/>
+            <pin position="15" pad-key="pb1"/>
+            <pin position="16" pad-key="pb0"/>
+            <pin position="17" pad-key="pc0"/>
+            <pin position="18" pad-key="pc1"/>
+            <pin position="19" pad-key="pc2"/>
+            <pin position="20" pad-key="pc3"/>
+            <pin position="21" pad-key="pc4"/>
+            <pin position="22" pad-key="pc5"/>
+            <pin position="23" pad-key="pa0"/>
+            <pin position="24" pad-key="pa1"/>
         </pinout>
     </pinouts>
     <variants>
-        <variant name="ATtiny1607-MNR" pinout-key="qfn24" package="VQFN24"/>
-        <variant name="ATtiny1607-MRF" pinout-key="qfn24" package="VQFN24"/>
+        <variant key="attiny1607_mnr" name="ATtiny1607-MNR" pinout-key="qfn24"/>
+        <variant key="attiny1607_mrf" name="ATtiny1607-MRF" pinout-key="qfn24"/>
     </variants>
 </device>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY1614.xml b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY1614.xml
index c1b49a35..3fb5e4f9 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY1614.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY1614.xml
@@ -44,53 +44,53 @@
         <peripheral key="ac0" name="AC0" module-key="i2106">
             <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"/>
-                <signal pad-id="pa7" index="0" function="AC0" group="P"/>
-                <signal pad-id="pb1" index="2" function="AC0" group="P"/>
+                <signal pad-key="pa6" index="0" function="AC0" group="N"/>
+                <signal pad-key="pa5" index="0" function="AC0" group="OUT"/>
+                <signal pad-key="pa7" index="0" function="AC0" group="P"/>
+                <signal pad-key="pb1" index="2" function="AC0" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="ac1" name="AC1" module-key="i2106">
             <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"/>
-                <signal pad-id="pa7" index="0" function="AC1" group="P"/>
-                <signal pad-id="pa6" index="1" function="AC1" group="P"/>
-                <signal pad-id="pb0" index="2" function="AC1" group="P"/>
+                <signal pad-key="pa5" index="0" function="AC1" group="N"/>
+                <signal pad-key="pb3" index="0" function="AC1" group="OUT"/>
+                <signal pad-key="pa7" index="0" function="AC1" group="P"/>
+                <signal pad-key="pa6" index="1" function="AC1" group="P"/>
+                <signal pad-key="pb0" index="2" function="AC1" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="ac2" name="AC2" module-key="i2106">
             <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"/>
-                <signal pad-id="pa6" index="0" function="AC2" group="P"/>
-                <signal pad-id="pb0" index="1" function="AC2" group="P"/>
+                <signal pad-key="pa7" index="0" function="AC2" group="N"/>
+                <signal pad-key="pb2" index="0" function="AC2" group="OUT"/>
+                <signal pad-key="pa6" index="0" function="AC2" group="P"/>
+                <signal pad-key="pb0" index="1" function="AC2" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="adc0" name="ADC0" module-key="i2132">
             <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"/>
-                <signal pad-id="pa2" index="2" function="AIN0" group="AIN"/>
-                <signal pad-id="pa3" index="3" function="AIN0" group="AIN"/>
-                <signal pad-id="pa4" index="4" function="AIN0" group="AIN"/>
-                <signal pad-id="pa5" index="5" function="AIN0" group="AIN"/>
-                <signal pad-id="pa6" index="6" function="AIN0" group="AIN"/>
-                <signal pad-id="pa7" index="7" function="AIN0" group="AIN"/>
-                <signal pad-id="pb1" index="10" function="AIN0" group="AIN"/>
-                <signal pad-id="pb0" index="11" function="AIN0" group="AIN"/>
+                <signal pad-key="pa0" index="0" function="AIN0" group="AIN"/>
+                <signal pad-key="pa1" index="1" function="AIN0" group="AIN"/>
+                <signal pad-key="pa2" index="2" function="AIN0" group="AIN"/>
+                <signal pad-key="pa3" index="3" function="AIN0" group="AIN"/>
+                <signal pad-key="pa4" index="4" function="AIN0" group="AIN"/>
+                <signal pad-key="pa5" index="5" function="AIN0" group="AIN"/>
+                <signal pad-key="pa6" index="6" function="AIN0" group="AIN"/>
+                <signal pad-key="pa7" index="7" function="AIN0" group="AIN"/>
+                <signal pad-key="pb1" index="10" function="AIN0" group="AIN"/>
+                <signal pad-key="pb0" index="11" function="AIN0" group="AIN"/>
             </signals>
         </peripheral>
         <peripheral key="adc1" name="ADC1" module-key="i2132">
             <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"/>
-                <signal pad-id="pa6" index="2" function="AIN1" group="AIN"/>
-                <signal pad-id="pa7" index="3" function="AIN1" group="AIN"/>
+                <signal pad-key="pa4" index="0" function="AIN1" group="AIN"/>
+                <signal pad-key="pa5" index="1" function="AIN1" group="AIN"/>
+                <signal pad-key="pa6" index="2" function="AIN1" group="AIN"/>
+                <signal pad-key="pa7" index="3" function="AIN1" group="AIN"/>
             </signals>
         </peripheral>
         <peripheral key="bod" name="BOD" module-key="i2114">
@@ -99,25 +99,25 @@
         <peripheral key="ccl" name="CCL" module-key="i2128">
             <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"/>
-                <signal pad-id="pa2" index="2" function="CCL" group="LUT0_IN"/>
-                <signal pad-id="pa4" index="0" function="CCL" group="LUT0_OUT" field="PORTMUX.CTRLA.LUT0"/>
-                <signal pad-id="pa7" index="0" function="CCL" group="LUT1_OUT" field="PORTMUX.CTRLA.LUT1"/>
+                <signal pad-key="pa0" index="0" function="CCL" group="LUT0_IN"/>
+                <signal pad-key="pa1" index="1" function="CCL" group="LUT0_IN"/>
+                <signal pad-key="pa2" index="2" function="CCL" group="LUT0_IN"/>
+                <signal pad-key="pa4" index="0" function="CCL" group="LUT0_OUT" field="PORTMUX.CTRLA.LUT0"/>
+                <signal pad-key="pa7" index="0" function="CCL" group="LUT1_OUT" field="PORTMUX.CTRLA.LUT1"/>
             </signals>
         </peripheral>
         <peripheral key="clkctrl" name="CLKCTRL" module-key="i2603_clkctrl">
             <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"/>
-                <signal pad-id="pb2" function="CLKCTRL" group="TOSC2"/>
+                <signal pad-key="pa3" function="CLKCTRL" group="CLKI"/>
+                <signal pad-key="pb3" function="CLKCTRL" group="TOSC1"/>
+                <signal pad-key="pb2" function="CLKCTRL" group="TOSC2"/>
             </signals>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="i2100">
             <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"/>
+                <signal pad-key="pa1" function="BREAK" group="BREAK" field="PORTMUX.CTRLA.EXTBRK"/>
             </signals>
         </peripheral>
         <peripheral key="cpuint" name="CPUINT" module-key="i2104">
@@ -129,7 +129,7 @@
         <peripheral key="dac0" name="DAC0" module-key="i2121">
             <register-group-instance register-group-key="dac" address-space-key="data" offset="0x6A0"/>
             <signals>
-                <signal pad-id="pa6" index="0" function="DAC0" group="OUT"/>
+                <signal pad-key="pa6" index="0" function="DAC0" group="OUT"/>
             </signals>
         </peripheral>
         <peripheral key="dac1" name="DAC1" module-key="i2121">
@@ -141,32 +141,32 @@
         <peripheral key="evsys" name="EVSYS" module-key="i2603_evsys">
             <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"/>
-                <signal pad-id="pa2" index="2" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
-                <signal pad-id="pa3" index="3" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
-                <signal pad-id="pa4" index="4" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
-                <signal pad-id="pa5" index="5" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
-                <signal pad-id="pa6" index="6" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
-                <signal pad-id="pa7" index="7" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
-                <signal pad-id="pb0" index="0" function="EVAINCH1" group="EVAPB" field="EVSYS.ASYNCCH1.ASYNCCH1"/>
-                <signal pad-id="pb1" index="1" function="EVAINCH1" group="EVAPB" field="EVSYS.ASYNCCH1.ASYNCCH1"/>
-                <signal pad-id="pb2" index="2" function="EVAINCH1" group="EVAPB" field="EVSYS.ASYNCCH1.ASYNCCH1"/>
-                <signal pad-id="pb3" index="3" function="EVAINCH1" group="EVAPB" field="EVSYS.ASYNCCH1.ASYNCCH1"/>
-                <signal pad-id="pa2" index="0" function="EVSYS" group="EVOUT" field="PORTMUX.CTRLA.EVOUT0"/>
-                <signal pad-id="pb2" index="1" function="EVSYS" group="EVOUT" field="PORTMUX.CTRLA.EVOUT1"/>
-                <signal pad-id="pa0" index="0" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
-                <signal pad-id="pa1" index="1" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
-                <signal pad-id="pa2" index="2" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
-                <signal pad-id="pa3" index="3" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
-                <signal pad-id="pa4" index="4" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
-                <signal pad-id="pa5" index="5" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
-                <signal pad-id="pa6" index="6" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
-                <signal pad-id="pa7" index="7" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
-                <signal pad-id="pb0" index="0" function="EVSINCH1" group="EVSPB" field="EVSYS.SYNCCH1.SYNCCH1"/>
-                <signal pad-id="pb1" index="1" function="EVSINCH1" group="EVSPB" field="EVSYS.SYNCCH1.SYNCCH1"/>
-                <signal pad-id="pb2" index="2" function="EVSINCH1" group="EVSPB" field="EVSYS.SYNCCH1.SYNCCH1"/>
-                <signal pad-id="pb3" index="3" function="EVSINCH1" group="EVSPB" field="EVSYS.SYNCCH1.SYNCCH1"/>
+                <signal pad-key="pa0" index="0" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
+                <signal pad-key="pa1" index="1" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
+                <signal pad-key="pa2" index="2" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
+                <signal pad-key="pa3" index="3" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
+                <signal pad-key="pa4" index="4" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
+                <signal pad-key="pa5" index="5" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
+                <signal pad-key="pa6" index="6" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
+                <signal pad-key="pa7" index="7" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
+                <signal pad-key="pb0" index="0" function="EVAINCH1" group="EVAPB" field="EVSYS.ASYNCCH1.ASYNCCH1"/>
+                <signal pad-key="pb1" index="1" function="EVAINCH1" group="EVAPB" field="EVSYS.ASYNCCH1.ASYNCCH1"/>
+                <signal pad-key="pb2" index="2" function="EVAINCH1" group="EVAPB" field="EVSYS.ASYNCCH1.ASYNCCH1"/>
+                <signal pad-key="pb3" index="3" function="EVAINCH1" group="EVAPB" field="EVSYS.ASYNCCH1.ASYNCCH1"/>
+                <signal pad-key="pa2" index="0" function="EVSYS" group="EVOUT" field="PORTMUX.CTRLA.EVOUT0"/>
+                <signal pad-key="pb2" index="1" function="EVSYS" group="EVOUT" field="PORTMUX.CTRLA.EVOUT1"/>
+                <signal pad-key="pa0" index="0" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
+                <signal pad-key="pa1" index="1" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
+                <signal pad-key="pa2" index="2" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
+                <signal pad-key="pa3" index="3" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
+                <signal pad-key="pa4" index="4" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
+                <signal pad-key="pa5" index="5" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
+                <signal pad-key="pa6" index="6" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
+                <signal pad-key="pa7" index="7" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
+                <signal pad-key="pb0" index="0" function="EVSINCH1" group="EVSPB" field="EVSYS.SYNCCH1.SYNCCH1"/>
+                <signal pad-key="pb1" index="1" function="EVSINCH1" group="EVSPB" field="EVSYS.SYNCCH1.SYNCCH1"/>
+                <signal pad-key="pb2" index="2" function="EVSINCH1" group="EVSPB" field="EVSYS.SYNCCH1.SYNCCH1"/>
+                <signal pad-key="pb3" index="3" function="EVSINCH1" group="EVSPB" field="EVSYS.SYNCCH1.SYNCCH1"/>
             </signals>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="i2603_fuse">
@@ -184,23 +184,23 @@
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pa2" index="2" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa3" index="3" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa4" index="4" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa5" index="5" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa6" index="6" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa7" index="7" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa0" index="0" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa1" index="1" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa2" index="2" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa3" index="3" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa4" index="4" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa5" index="5" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa6" index="6" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa7" index="7" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pb2" index="2" function="IOPORT" group="PIN"/>
-                <signal pad-id="pb3" index="3" function="IOPORT" group="PIN"/>
+                <signal pad-key="pb0" index="0" function="IOPORT" group="PIN"/>
+                <signal pad-key="pb1" index="1" function="IOPORT" group="PIN"/>
+                <signal pad-key="pb2" index="2" function="IOPORT" group="PIN"/>
+                <signal pad-key="pb3" index="3" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="portmux" name="PORTMUX" module-key="i2603_portmux">
@@ -208,25 +208,25 @@
         </peripheral>
         <peripheral key="ptc" name="PTC" module-key="i2120">
             <signals>
-                <signal pad-id="pb2" index="0" function="PTC_DS" group="DS"/>
-                <signal pad-id="pa4" index="0" function="PTC_X" group="X"/>
-                <signal pad-id="pa5" index="1" function="PTC_X" group="X"/>
-                <signal pad-id="pa6" index="2" function="PTC_X" group="X"/>
-                <signal pad-id="pa7" index="3" function="PTC_X" group="X"/>
-                <signal pad-id="pb1" index="4" function="PTC_X" group="X"/>
-                <signal pad-id="pb0" index="5" function="PTC_X" group="X"/>
-                <signal pad-id="pa4" index="0" function="PTC_Y" group="Y"/>
-                <signal pad-id="pa5" index="1" function="PTC_Y" group="Y"/>
-                <signal pad-id="pa6" index="2" function="PTC_Y" group="Y"/>
-                <signal pad-id="pa7" index="3" function="PTC_Y" group="Y"/>
-                <signal pad-id="pb1" index="4" function="PTC_Y" group="Y"/>
-                <signal pad-id="pb0" index="5" function="PTC_Y" group="Y"/>
+                <signal pad-key="pb2" index="0" function="PTC_DS" group="DS"/>
+                <signal pad-key="pa4" index="0" function="PTC_X" group="X"/>
+                <signal pad-key="pa5" index="1" function="PTC_X" group="X"/>
+                <signal pad-key="pa6" index="2" function="PTC_X" group="X"/>
+                <signal pad-key="pa7" index="3" function="PTC_X" group="X"/>
+                <signal pad-key="pb1" index="4" function="PTC_X" group="X"/>
+                <signal pad-key="pb0" index="5" function="PTC_X" group="X"/>
+                <signal pad-key="pa4" index="0" function="PTC_Y" group="Y"/>
+                <signal pad-key="pa5" index="1" function="PTC_Y" group="Y"/>
+                <signal pad-key="pa6" index="2" function="PTC_Y" group="Y"/>
+                <signal pad-key="pa7" index="3" function="PTC_Y" group="Y"/>
+                <signal pad-key="pb1" index="4" function="PTC_Y" group="Y"/>
+                <signal pad-key="pb0" index="5" function="PTC_Y" group="Y"/>
             </signals>
         </peripheral>
         <peripheral key="rstctrl" name="RSTCTRL" module-key="i2111">
             <register-group-instance register-group-key="rstctrl" address-space-key="data" offset="0x40"/>
             <signals>
-                <signal pad-id="pa0" function="OTHER" group="RESET"/>
+                <signal pad-key="pa0" function="OTHER" group="RESET"/>
             </signals>
         </peripheral>
         <peripheral key="rtc" name="RTC" module-key="i2116">
@@ -241,69 +241,69 @@
         <peripheral key="spi0" name="SPI0" module-key="i2107">
             <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"/>
-                <signal pad-id="pa3" function="SPI0" group="SCK" field="PORTMUX.CTRLB.SPI0"/>
-                <signal pad-id="pa4" function="SPI0" group="SS" field="PORTMUX.CTRLB.SPI0"/>
+                <signal pad-key="pa2" function="SPI0" group="MISO" field="PORTMUX.CTRLB.SPI0"/>
+                <signal pad-key="pa1" function="SPI0" group="MOSI" field="PORTMUX.CTRLB.SPI0"/>
+                <signal pad-key="pa3" function="SPI0" group="SCK" field="PORTMUX.CTRLB.SPI0"/>
+                <signal pad-key="pa4" function="SPI0" group="SS" field="PORTMUX.CTRLB.SPI0"/>
             </signals>
         </peripheral>
         <peripheral key="syscfg" name="SYSCFG" module-key="i2603_syscfg">
             <register-group-instance register-group-key="syscfg" address-space-key="data" offset="0xF00"/>
             <signals>
-                <signal pad-id="pa0" function="OTHER" group="UPDI"/>
+                <signal pad-key="pa0" function="OTHER" group="UPDI"/>
             </signals>
         </peripheral>
         <peripheral key="tca0" name="TCA0" module-key="i2117">
             <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"/>
-                <signal pad-id="pb1" index="1" function="TCA0" group="WO" field="PORTMUX.CTRLC.TCA01"/>
-                <signal pad-id="pb2" index="2" function="TCA0" group="WO" field="PORTMUX.CTRLC.TCA02"/>
-                <signal pad-id="pa3" index="3" function="TCA0" group="WO" field="PORTMUX.CTRLC.TCA03"/>
-                <signal pad-id="pa4" index="4" function="TCA0" group="WO" field="PORTMUX.CTRLC.TCA04"/>
-                <signal pad-id="pa5" index="5" function="TCA0" group="WO" field="PORTMUX.CTRLC.TCA05"/>
+                <signal pad-key="pb3" index="0" function="TCA0_ALT" group="WO" field="PORTMUX.CTRLC.TCA00"/>
+                <signal pad-key="pb0" index="0" function="TCA0" group="WO" field="PORTMUX.CTRLC.TCA00"/>
+                <signal pad-key="pb1" index="1" function="TCA0" group="WO" field="PORTMUX.CTRLC.TCA01"/>
+                <signal pad-key="pb2" index="2" function="TCA0" group="WO" field="PORTMUX.CTRLC.TCA02"/>
+                <signal pad-key="pa3" index="3" function="TCA0" group="WO" field="PORTMUX.CTRLC.TCA03"/>
+                <signal pad-key="pa4" index="4" function="TCA0" group="WO" field="PORTMUX.CTRLC.TCA04"/>
+                <signal pad-key="pa5" index="5" function="TCA0" group="WO" field="PORTMUX.CTRLC.TCA05"/>
             </signals>
         </peripheral>
         <peripheral key="tcb0" name="TCB0" module-key="i2119">
             <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"/>
+                <signal pad-key="pa5" index="0" function="TCB0" group="WO" field="PORTMUX.CTRLD.TCB0"/>
             </signals>
         </peripheral>
         <peripheral key="tcb1" name="TCB1" module-key="i2119">
             <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"/>
+                <signal pad-key="pa3" index="0" function="TCB1" group="WO" field="PORTMUX.CTRLD.TCB1"/>
             </signals>
         </peripheral>
         <peripheral key="tcd0" name="TCD0" module-key="i2129">
             <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"/>
+                <signal pad-key="pa4" function="TCD0" group="WOA"/>
+                <signal pad-key="pa5" function="TCD0" group="WOB"/>
             </signals>
         </peripheral>
         <peripheral key="twi0" name="TWI0" module-key="i2110">
             <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"/>
-                <signal pad-id="pa1" function="TWI0_ALT" group="SDA" field="PORTMUX.CTRLB.TWI0"/>
-                <signal pad-id="pb1" function="TWI0" group="SDA" field="PORTMUX.CTRLB.TWI0"/>
+                <signal pad-key="pa2" function="TWI0_ALT" group="SCL" field="PORTMUX.CTRLB.TWI0"/>
+                <signal pad-key="pb0" function="TWI0" group="SCL" field="PORTMUX.CTRLB.TWI0"/>
+                <signal pad-key="pa1" function="TWI0_ALT" group="SDA" field="PORTMUX.CTRLB.TWI0"/>
+                <signal pad-key="pb1" function="TWI0" group="SDA" field="PORTMUX.CTRLB.TWI0"/>
             </signals>
         </peripheral>
         <peripheral key="usart0" name="USART0" module-key="i2108">
             <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"/>
-                <signal pad-id="pa1" function="USART0_ALT" group="TXD" field="PORTMUX.CTRLB.USART0"/>
-                <signal pad-id="pb2" function="USART0" group="TXD" field="PORTMUX.CTRLB.USART0"/>
-                <signal pad-id="pa3" function="USART0_ALT" group="XCK" field="PORTMUX.CTRLB.USART0"/>
-                <signal pad-id="pb1" function="USART0" group="XCK" field="PORTMUX.CTRLB.USART0"/>
-                <signal pad-id="pa4" function="USART0_ALT" group="XDIR" field="PORTMUX.CTRLB.USART0"/>
-                <signal pad-id="pb0" function="USART0" group="XDIR" field="PORTMUX.CTRLB.USART0"/>
+                <signal pad-key="pa2" function="USART0_ALT" group="RXD" field="PORTMUX.CTRLB.USART0"/>
+                <signal pad-key="pb3" function="USART0" group="RXD" field="PORTMUX.CTRLB.USART0"/>
+                <signal pad-key="pa1" function="USART0_ALT" group="TXD" field="PORTMUX.CTRLB.USART0"/>
+                <signal pad-key="pb2" function="USART0" group="TXD" field="PORTMUX.CTRLB.USART0"/>
+                <signal pad-key="pa3" function="USART0_ALT" group="XCK" field="PORTMUX.CTRLB.USART0"/>
+                <signal pad-key="pb1" function="USART0" group="XCK" field="PORTMUX.CTRLB.USART0"/>
+                <signal pad-key="pa4" function="USART0_ALT" group="XDIR" field="PORTMUX.CTRLB.USART0"/>
+                <signal pad-key="pb0" function="USART0" group="XDIR" field="PORTMUX.CTRLB.USART0"/>
             </signals>
         </peripheral>
         <peripheral key="userrow" name="USERROW" module-key="i2603_userrow">
@@ -1382,26 +1382,42 @@
             </register-group>
         </module>
     </modules>
+    <pads>
+        <pad key="vdd" name="VDD"/>
+        <pad key="pa4" name="PA4"/>
+        <pad key="pa5" name="PA5"/>
+        <pad key="pa6" name="PA6"/>
+        <pad key="pa7" name="PA7"/>
+        <pad key="pb3" name="PB3"/>
+        <pad key="pb2" name="PB2"/>
+        <pad key="pb1" name="PB1"/>
+        <pad key="pb0" name="PB0"/>
+        <pad key="pa0" name="PA0"/>
+        <pad key="pa1" name="PA1"/>
+        <pad key="pa2" name="PA2"/>
+        <pad key="pa3" name="PA3"/>
+        <pad key="gnd" name="GND"/>
+    </pads>
     <pinouts>
         <pinout key="soic14" name="SOIC14" type="soic">
-            <pin position="1" pad="VDD"/>
-            <pin position="2" pad="PA4"/>
-            <pin position="3" pad="PA5"/>
-            <pin position="4" pad="PA6"/>
-            <pin position="5" pad="PA7"/>
-            <pin position="6" pad="PB3"/>
-            <pin position="7" pad="PB2"/>
-            <pin position="8" pad="PB1"/>
-            <pin position="9" pad="PB0"/>
-            <pin position="10" pad="PA0"/>
-            <pin position="11" pad="PA1"/>
-            <pin position="12" pad="PA2"/>
-            <pin position="13" pad="PA3"/>
-            <pin position="14" pad="GND"/>
+            <pin position="1" pad-key="vdd"/>
+            <pin position="2" pad-key="pa4"/>
+            <pin position="3" pad-key="pa5"/>
+            <pin position="4" pad-key="pa6"/>
+            <pin position="5" pad-key="pa7"/>
+            <pin position="6" pad-key="pb3"/>
+            <pin position="7" pad-key="pb2"/>
+            <pin position="8" pad-key="pb1"/>
+            <pin position="9" pad-key="pb0"/>
+            <pin position="10" pad-key="pa0"/>
+            <pin position="11" pad-key="pa1"/>
+            <pin position="12" pad-key="pa2"/>
+            <pin position="13" pad-key="pa3"/>
+            <pin position="14" pad-key="gnd"/>
         </pinout>
     </pinouts>
     <variants>
-        <variant name="ATtiny1614-SSFR" pinout-key="soic14" package="SOIC14"/>
-        <variant name="ATtiny1614-SSNR" pinout-key="soic14" package="SOIC14"/>
+        <variant key="attiny1614_ssfr" name="ATtiny1614-SSFR" pinout-key="soic14"/>
+        <variant key="attiny1614_ssnr" name="ATtiny1614-SSNR" pinout-key="soic14"/>
     </variants>
 </device>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY1616.xml b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY1616.xml
index b470bc67..01c8000d 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY1616.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY1616.xml
@@ -44,63 +44,63 @@
         <peripheral key="ac0" name="AC0" module-key="i2106">
             <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"/>
-                <signal pad-id="pa5" index="0" function="AC0" group="OUT"/>
-                <signal pad-id="pa7" index="0" function="AC0" group="P"/>
-                <signal pad-id="pb5" index="1" function="AC0" group="P"/>
-                <signal pad-id="pb1" index="2" function="AC0" group="P"/>
+                <signal pad-key="pa6" index="0" function="AC0" group="N"/>
+                <signal pad-key="pb4" index="1" function="AC0" group="N"/>
+                <signal pad-key="pa5" index="0" function="AC0" group="OUT"/>
+                <signal pad-key="pa7" index="0" function="AC0" group="P"/>
+                <signal pad-key="pb5" index="1" function="AC0" group="P"/>
+                <signal pad-key="pb1" index="2" function="AC0" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="ac1" name="AC1" module-key="i2106">
             <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"/>
-                <signal pad-id="pa7" index="0" function="AC1" group="P"/>
-                <signal pad-id="pa6" index="1" function="AC1" group="P"/>
-                <signal pad-id="pb0" index="2" function="AC1" group="P"/>
-                <signal pad-id="pb4" index="3" function="AC1" group="P"/>
+                <signal pad-key="pa5" index="0" function="AC1" group="N"/>
+                <signal pad-key="pb3" index="0" function="AC1" group="OUT"/>
+                <signal pad-key="pa7" index="0" function="AC1" group="P"/>
+                <signal pad-key="pa6" index="1" function="AC1" group="P"/>
+                <signal pad-key="pb0" index="2" function="AC1" group="P"/>
+                <signal pad-key="pb4" index="3" function="AC1" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="ac2" name="AC2" module-key="i2106">
             <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"/>
-                <signal pad-id="pa6" index="0" function="AC2" group="P"/>
-                <signal pad-id="pb0" index="1" function="AC2" group="P"/>
-                <signal pad-id="pb5" index="2" function="AC2" group="P"/>
+                <signal pad-key="pa7" index="0" function="AC2" group="N"/>
+                <signal pad-key="pb2" index="0" function="AC2" group="OUT"/>
+                <signal pad-key="pa6" index="0" function="AC2" group="P"/>
+                <signal pad-key="pb0" index="1" function="AC2" group="P"/>
+                <signal pad-key="pb5" index="2" function="AC2" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="adc0" name="ADC0" module-key="i2132">
             <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"/>
-                <signal pad-id="pa2" index="2" function="AIN0" group="AIN"/>
-                <signal pad-id="pa3" index="3" function="AIN0" group="AIN"/>
-                <signal pad-id="pa4" index="4" function="AIN0" group="AIN"/>
-                <signal pad-id="pa5" index="5" function="AIN0" group="AIN"/>
-                <signal pad-id="pa6" index="6" function="AIN0" group="AIN"/>
-                <signal pad-id="pa7" index="7" function="AIN0" group="AIN"/>
-                <signal pad-id="pb5" index="8" function="AIN0" group="AIN"/>
-                <signal pad-id="pb4" index="9" function="AIN0" group="AIN"/>
-                <signal pad-id="pb1" index="10" function="AIN0" group="AIN"/>
-                <signal pad-id="pb0" index="11" function="AIN0" group="AIN"/>
+                <signal pad-key="pa0" index="0" function="AIN0" group="AIN"/>
+                <signal pad-key="pa1" index="1" function="AIN0" group="AIN"/>
+                <signal pad-key="pa2" index="2" function="AIN0" group="AIN"/>
+                <signal pad-key="pa3" index="3" function="AIN0" group="AIN"/>
+                <signal pad-key="pa4" index="4" function="AIN0" group="AIN"/>
+                <signal pad-key="pa5" index="5" function="AIN0" group="AIN"/>
+                <signal pad-key="pa6" index="6" function="AIN0" group="AIN"/>
+                <signal pad-key="pa7" index="7" function="AIN0" group="AIN"/>
+                <signal pad-key="pb5" index="8" function="AIN0" group="AIN"/>
+                <signal pad-key="pb4" index="9" function="AIN0" group="AIN"/>
+                <signal pad-key="pb1" index="10" function="AIN0" group="AIN"/>
+                <signal pad-key="pb0" index="11" function="AIN0" group="AIN"/>
             </signals>
         </peripheral>
         <peripheral key="adc1" name="ADC1" module-key="i2132">
             <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"/>
-                <signal pad-id="pa6" index="2" function="AIN1" group="AIN"/>
-                <signal pad-id="pa7" index="3" function="AIN1" group="AIN"/>
-                <signal pad-id="pc0" index="6" function="AIN1" group="AIN"/>
-                <signal pad-id="pc1" index="7" function="AIN1" group="AIN"/>
-                <signal pad-id="pc2" index="8" function="AIN1" group="AIN"/>
-                <signal pad-id="pc3" index="9" function="AIN1" group="AIN"/>
+                <signal pad-key="pa4" index="0" function="AIN1" group="AIN"/>
+                <signal pad-key="pa5" index="1" function="AIN1" group="AIN"/>
+                <signal pad-key="pa6" index="2" function="AIN1" group="AIN"/>
+                <signal pad-key="pa7" index="3" function="AIN1" group="AIN"/>
+                <signal pad-key="pc0" index="6" function="AIN1" group="AIN"/>
+                <signal pad-key="pc1" index="7" function="AIN1" group="AIN"/>
+                <signal pad-key="pc2" index="8" function="AIN1" group="AIN"/>
+                <signal pad-key="pc3" index="9" function="AIN1" group="AIN"/>
             </signals>
         </peripheral>
         <peripheral key="bod" name="BOD" module-key="i2114">
@@ -109,29 +109,29 @@
         <peripheral key="ccl" name="CCL" module-key="i2128">
             <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"/>
-                <signal pad-id="pa2" index="2" function="CCL" group="LUT0_IN"/>
-                <signal pad-id="pb4" index="0" function="CCL_ALT" group="LUT0_OUT" field="PORTMUX.CTRLA.LUT0"/>
-                <signal pad-id="pa4" index="0" function="CCL" group="LUT0_OUT" field="PORTMUX.CTRLA.LUT0"/>
-                <signal pad-id="pc3" index="0" function="CCL" group="LUT1_IN"/>
-                <signal pad-id="pc1" index="0" function="CCL_ALT" group="LUT1_OUT" field="PORTMUX.CTRLA.LUT1"/>
-                <signal pad-id="pa7" index="0" function="CCL" group="LUT1_OUT" field="PORTMUX.CTRLA.LUT1"/>
+                <signal pad-key="pa0" index="0" function="CCL" group="LUT0_IN"/>
+                <signal pad-key="pa1" index="1" function="CCL" group="LUT0_IN"/>
+                <signal pad-key="pa2" index="2" function="CCL" group="LUT0_IN"/>
+                <signal pad-key="pb4" index="0" function="CCL_ALT" group="LUT0_OUT" field="PORTMUX.CTRLA.LUT0"/>
+                <signal pad-key="pa4" index="0" function="CCL" group="LUT0_OUT" field="PORTMUX.CTRLA.LUT0"/>
+                <signal pad-key="pc3" index="0" function="CCL" group="LUT1_IN"/>
+                <signal pad-key="pc1" index="0" function="CCL_ALT" group="LUT1_OUT" field="PORTMUX.CTRLA.LUT1"/>
+                <signal pad-key="pa7" index="0" function="CCL" group="LUT1_OUT" field="PORTMUX.CTRLA.LUT1"/>
             </signals>
         </peripheral>
         <peripheral key="clkctrl" name="CLKCTRL" module-key="i2603_clkctrl">
             <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"/>
-                <signal pad-id="pb3" function="CLKCTRL" group="TOSC1"/>
-                <signal pad-id="pb2" function="CLKCTRL" group="TOSC2"/>
+                <signal pad-key="pa3" function="CLKCTRL" group="CLKI"/>
+                <signal pad-key="pb5" function="CLKCTRL" group="CLKO"/>
+                <signal pad-key="pb3" function="CLKCTRL" group="TOSC1"/>
+                <signal pad-key="pb2" function="CLKCTRL" group="TOSC2"/>
             </signals>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="i2100">
             <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"/>
+                <signal pad-key="pa1" function="BREAK" group="BREAK" field="PORTMUX.CTRLA.EXTBRK"/>
             </signals>
         </peripheral>
         <peripheral key="cpuint" name="CPUINT" module-key="i2104">
@@ -143,7 +143,7 @@
         <peripheral key="dac0" name="DAC0" module-key="i2121">
             <register-group-instance register-group-key="dac" address-space-key="data" offset="0x6A0"/>
             <signals>
-                <signal pad-id="pa6" index="0" function="DAC0" group="OUT"/>
+                <signal pad-key="pa6" index="0" function="DAC0" group="OUT"/>
             </signals>
         </peripheral>
         <peripheral key="dac1" name="DAC1" module-key="i2121">
@@ -155,45 +155,45 @@
         <peripheral key="evsys" name="EVSYS" module-key="i2603_evsys">
             <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"/>
-                <signal pad-id="pa2" index="2" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
-                <signal pad-id="pa3" index="3" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
-                <signal pad-id="pa4" index="4" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
-                <signal pad-id="pa5" index="5" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
-                <signal pad-id="pa6" index="6" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
-                <signal pad-id="pa7" index="7" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
-                <signal pad-id="pb0" index="0" function="EVAINCH1" group="EVAPB" field="EVSYS.ASYNCCH1.ASYNCCH1"/>
-                <signal pad-id="pb1" index="1" function="EVAINCH1" group="EVAPB" field="EVSYS.ASYNCCH1.ASYNCCH1"/>
-                <signal pad-id="pb2" index="2" function="EVAINCH1" group="EVAPB" field="EVSYS.ASYNCCH1.ASYNCCH1"/>
-                <signal pad-id="pb3" index="3" function="EVAINCH1" group="EVAPB" field="EVSYS.ASYNCCH1.ASYNCCH1"/>
-                <signal pad-id="pb4" index="4" function="EVAINCH1" group="EVAPB" field="EVSYS.ASYNCCH1.ASYNCCH1"/>
-                <signal pad-id="pb5" index="5" function="EVAINCH1" group="EVAPB" field="EVSYS.ASYNCCH1.ASYNCCH1"/>
-                <signal pad-id="pc0" index="0" function="EVAINCH2" group="EVAPC" field="EVSYS.ASYNCCH2.ASYNCCH2"/>
-                <signal pad-id="pc1" index="1" function="EVAINCH2" group="EVAPC" field="EVSYS.ASYNCCH2.ASYNCCH2"/>
-                <signal pad-id="pc2" index="2" function="EVAINCH2" group="EVAPC" field="EVSYS.ASYNCCH2.ASYNCCH2"/>
-                <signal pad-id="pc3" index="3" function="EVAINCH2" group="EVAPC" field="EVSYS.ASYNCCH2.ASYNCCH2"/>
-                <signal pad-id="pa2" index="0" function="EVSYS" group="EVOUT" field="PORTMUX.CTRLA.EVOUT0"/>
-                <signal pad-id="pb2" index="1" function="EVSYS" group="EVOUT" field="PORTMUX.CTRLA.EVOUT1"/>
-                <signal pad-id="pc2" index="2" function="EVSYS" group="EVOUT" field="PORTMUX.CTRLA.EVOUT2"/>
-                <signal pad-id="pa0" index="0" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
-                <signal pad-id="pa1" index="1" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
-                <signal pad-id="pa2" index="2" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
-                <signal pad-id="pa3" index="3" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
-                <signal pad-id="pa4" index="4" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
-                <signal pad-id="pa5" index="5" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
-                <signal pad-id="pa6" index="6" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
-                <signal pad-id="pa7" index="7" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
-                <signal pad-id="pb0" index="0" function="EVSINCH1" group="EVSPB" field="EVSYS.SYNCCH1.SYNCCH1"/>
-                <signal pad-id="pb1" index="1" function="EVSINCH1" group="EVSPB" field="EVSYS.SYNCCH1.SYNCCH1"/>
-                <signal pad-id="pb2" index="2" function="EVSINCH1" group="EVSPB" field="EVSYS.SYNCCH1.SYNCCH1"/>
-                <signal pad-id="pb3" index="3" function="EVSINCH1" group="EVSPB" field="EVSYS.SYNCCH1.SYNCCH1"/>
-                <signal pad-id="pb4" index="4" function="EVSINCH1" group="EVSPB" field="EVSYS.SYNCCH1.SYNCCH1"/>
-                <signal pad-id="pb5" index="5" function="EVSINCH1" group="EVSPB" field="EVSYS.SYNCCH1.SYNCCH1"/>
-                <signal pad-id="pc0" index="0" function="EVSINCH0" group="EVSPC" field="EVSYS.SYNCCH0.SYNCCH0"/>
-                <signal pad-id="pc1" index="1" function="EVSINCH0" group="EVSPC" field="EVSYS.SYNCCH0.SYNCCH0"/>
-                <signal pad-id="pc2" index="2" function="EVSINCH0" group="EVSPC" field="EVSYS.SYNCCH0.SYNCCH0"/>
-                <signal pad-id="pc3" index="3" function="EVSINCH0" group="EVSPC" field="EVSYS.SYNCCH0.SYNCCH0"/>
+                <signal pad-key="pa0" index="0" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
+                <signal pad-key="pa1" index="1" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
+                <signal pad-key="pa2" index="2" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
+                <signal pad-key="pa3" index="3" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
+                <signal pad-key="pa4" index="4" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
+                <signal pad-key="pa5" index="5" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
+                <signal pad-key="pa6" index="6" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
+                <signal pad-key="pa7" index="7" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
+                <signal pad-key="pb0" index="0" function="EVAINCH1" group="EVAPB" field="EVSYS.ASYNCCH1.ASYNCCH1"/>
+                <signal pad-key="pb1" index="1" function="EVAINCH1" group="EVAPB" field="EVSYS.ASYNCCH1.ASYNCCH1"/>
+                <signal pad-key="pb2" index="2" function="EVAINCH1" group="EVAPB" field="EVSYS.ASYNCCH1.ASYNCCH1"/>
+                <signal pad-key="pb3" index="3" function="EVAINCH1" group="EVAPB" field="EVSYS.ASYNCCH1.ASYNCCH1"/>
+                <signal pad-key="pb4" index="4" function="EVAINCH1" group="EVAPB" field="EVSYS.ASYNCCH1.ASYNCCH1"/>
+                <signal pad-key="pb5" index="5" function="EVAINCH1" group="EVAPB" field="EVSYS.ASYNCCH1.ASYNCCH1"/>
+                <signal pad-key="pc0" index="0" function="EVAINCH2" group="EVAPC" field="EVSYS.ASYNCCH2.ASYNCCH2"/>
+                <signal pad-key="pc1" index="1" function="EVAINCH2" group="EVAPC" field="EVSYS.ASYNCCH2.ASYNCCH2"/>
+                <signal pad-key="pc2" index="2" function="EVAINCH2" group="EVAPC" field="EVSYS.ASYNCCH2.ASYNCCH2"/>
+                <signal pad-key="pc3" index="3" function="EVAINCH2" group="EVAPC" field="EVSYS.ASYNCCH2.ASYNCCH2"/>
+                <signal pad-key="pa2" index="0" function="EVSYS" group="EVOUT" field="PORTMUX.CTRLA.EVOUT0"/>
+                <signal pad-key="pb2" index="1" function="EVSYS" group="EVOUT" field="PORTMUX.CTRLA.EVOUT1"/>
+                <signal pad-key="pc2" index="2" function="EVSYS" group="EVOUT" field="PORTMUX.CTRLA.EVOUT2"/>
+                <signal pad-key="pa0" index="0" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
+                <signal pad-key="pa1" index="1" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
+                <signal pad-key="pa2" index="2" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
+                <signal pad-key="pa3" index="3" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
+                <signal pad-key="pa4" index="4" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
+                <signal pad-key="pa5" index="5" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
+                <signal pad-key="pa6" index="6" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
+                <signal pad-key="pa7" index="7" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
+                <signal pad-key="pb0" index="0" function="EVSINCH1" group="EVSPB" field="EVSYS.SYNCCH1.SYNCCH1"/>
+                <signal pad-key="pb1" index="1" function="EVSINCH1" group="EVSPB" field="EVSYS.SYNCCH1.SYNCCH1"/>
+                <signal pad-key="pb2" index="2" function="EVSINCH1" group="EVSPB" field="EVSYS.SYNCCH1.SYNCCH1"/>
+                <signal pad-key="pb3" index="3" function="EVSINCH1" group="EVSPB" field="EVSYS.SYNCCH1.SYNCCH1"/>
+                <signal pad-key="pb4" index="4" function="EVSINCH1" group="EVSPB" field="EVSYS.SYNCCH1.SYNCCH1"/>
+                <signal pad-key="pb5" index="5" function="EVSINCH1" group="EVSPB" field="EVSYS.SYNCCH1.SYNCCH1"/>
+                <signal pad-key="pc0" index="0" function="EVSINCH0" group="EVSPC" field="EVSYS.SYNCCH0.SYNCCH0"/>
+                <signal pad-key="pc1" index="1" function="EVSINCH0" group="EVSPC" field="EVSYS.SYNCCH0.SYNCCH0"/>
+                <signal pad-key="pc2" index="2" function="EVSINCH0" group="EVSPC" field="EVSYS.SYNCCH0.SYNCCH0"/>
+                <signal pad-key="pc3" index="3" function="EVSINCH0" group="EVSPC" field="EVSYS.SYNCCH0.SYNCCH0"/>
             </signals>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="i2603_fuse">
@@ -211,34 +211,34 @@
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pa2" index="2" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa3" index="3" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa4" index="4" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa5" index="5" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa6" index="6" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa7" index="7" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa0" index="0" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa1" index="1" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa2" index="2" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa3" index="3" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa4" index="4" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa5" index="5" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa6" index="6" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa7" index="7" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pb2" index="2" function="IOPORT" group="PIN"/>
-                <signal pad-id="pb3" index="3" function="IOPORT" group="PIN"/>
-                <signal pad-id="pb4" index="4" function="IOPORT" group="PIN"/>
-                <signal pad-id="pb5" index="5" function="IOPORT" group="PIN"/>
+                <signal pad-key="pb0" index="0" function="IOPORT" group="PIN"/>
+                <signal pad-key="pb1" index="1" function="IOPORT" group="PIN"/>
+                <signal pad-key="pb2" index="2" function="IOPORT" group="PIN"/>
+                <signal pad-key="pb3" index="3" function="IOPORT" group="PIN"/>
+                <signal pad-key="pb4" index="4" function="IOPORT" group="PIN"/>
+                <signal pad-key="pb5" index="5" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pc2" index="2" function="IOPORT" group="PIN"/>
-                <signal pad-id="pc3" index="3" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc0" index="0" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc1" index="1" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc2" index="2" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc3" index="3" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="portmux" name="PORTMUX" module-key="i2603_portmux">
@@ -246,38 +246,38 @@
         </peripheral>
         <peripheral key="ptc" name="PTC" module-key="i2120">
             <signals>
-                <signal pad-id="pb2" index="0" function="PTC_DS" group="DS"/>
-                <signal pad-id="pb4" index="1" function="PTC_DS" group="DS"/>
-                <signal pad-id="pa4" index="0" function="PTC_X" group="X"/>
-                <signal pad-id="pa5" index="1" function="PTC_X" group="X"/>
-                <signal pad-id="pa6" index="2" function="PTC_X" group="X"/>
-                <signal pad-id="pa7" index="3" function="PTC_X" group="X"/>
-                <signal pad-id="pb1" index="4" function="PTC_X" group="X"/>
-                <signal pad-id="pb0" index="5" function="PTC_X" group="X"/>
-                <signal pad-id="pc0" index="6" function="PTC_X" group="X"/>
-                <signal pad-id="pc1" index="7" function="PTC_X" group="X"/>
-                <signal pad-id="pc2" index="8" function="PTC_X" group="X"/>
-                <signal pad-id="pc3" index="9" function="PTC_X" group="X"/>
-                <signal pad-id="pb5" index="12" function="PTC_X" group="X"/>
-                <signal pad-id="pb4" index="13" function="PTC_X" group="X"/>
-                <signal pad-id="pa4" index="0" function="PTC_Y" group="Y"/>
-                <signal pad-id="pa5" index="1" function="PTC_Y" group="Y"/>
-                <signal pad-id="pa6" index="2" function="PTC_Y" group="Y"/>
-                <signal pad-id="pa7" index="3" function="PTC_Y" group="Y"/>
-                <signal pad-id="pb1" index="4" function="PTC_Y" group="Y"/>
-                <signal pad-id="pb0" index="5" function="PTC_Y" group="Y"/>
-                <signal pad-id="pc0" index="6" function="PTC_Y" group="Y"/>
-                <signal pad-id="pc1" index="7" function="PTC_Y" group="Y"/>
-                <signal pad-id="pc2" index="8" function="PTC_Y" group="Y"/>
-                <signal pad-id="pc3" index="9" function="PTC_Y" group="Y"/>
-                <signal pad-id="pb5" index="12" function="PTC_Y" group="Y"/>
-                <signal pad-id="pb4" index="13" function="PTC_Y" group="Y"/>
+                <signal pad-key="pb2" index="0" function="PTC_DS" group="DS"/>
+                <signal pad-key="pb4" index="1" function="PTC_DS" group="DS"/>
+                <signal pad-key="pa4" index="0" function="PTC_X" group="X"/>
+                <signal pad-key="pa5" index="1" function="PTC_X" group="X"/>
+                <signal pad-key="pa6" index="2" function="PTC_X" group="X"/>
+                <signal pad-key="pa7" index="3" function="PTC_X" group="X"/>
+                <signal pad-key="pb1" index="4" function="PTC_X" group="X"/>
+                <signal pad-key="pb0" index="5" function="PTC_X" group="X"/>
+                <signal pad-key="pc0" index="6" function="PTC_X" group="X"/>
+                <signal pad-key="pc1" index="7" function="PTC_X" group="X"/>
+                <signal pad-key="pc2" index="8" function="PTC_X" group="X"/>
+                <signal pad-key="pc3" index="9" function="PTC_X" group="X"/>
+                <signal pad-key="pb5" index="12" function="PTC_X" group="X"/>
+                <signal pad-key="pb4" index="13" function="PTC_X" group="X"/>
+                <signal pad-key="pa4" index="0" function="PTC_Y" group="Y"/>
+                <signal pad-key="pa5" index="1" function="PTC_Y" group="Y"/>
+                <signal pad-key="pa6" index="2" function="PTC_Y" group="Y"/>
+                <signal pad-key="pa7" index="3" function="PTC_Y" group="Y"/>
+                <signal pad-key="pb1" index="4" function="PTC_Y" group="Y"/>
+                <signal pad-key="pb0" index="5" function="PTC_Y" group="Y"/>
+                <signal pad-key="pc0" index="6" function="PTC_Y" group="Y"/>
+                <signal pad-key="pc1" index="7" function="PTC_Y" group="Y"/>
+                <signal pad-key="pc2" index="8" function="PTC_Y" group="Y"/>
+                <signal pad-key="pc3" index="9" function="PTC_Y" group="Y"/>
+                <signal pad-key="pb5" index="12" function="PTC_Y" group="Y"/>
+                <signal pad-key="pb4" index="13" function="PTC_Y" group="Y"/>
             </signals>
         </peripheral>
         <peripheral key="rstctrl" name="RSTCTRL" module-key="i2111">
             <register-group-instance register-group-key="rstctrl" address-space-key="data" offset="0x40"/>
             <signals>
-                <signal pad-id="pa0" function="OTHER" group="RESET"/>
+                <signal pad-key="pa0" function="OTHER" group="RESET"/>
             </signals>
         </peripheral>
         <peripheral key="rtc" name="RTC" module-key="i2116">
@@ -292,79 +292,79 @@
         <peripheral key="spi0" name="SPI0" module-key="i2107">
             <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"/>
-                <signal pad-id="pc2" function="SPI0_ALT" group="MOSI" field="PORTMUX.CTRLB.SPI0"/>
-                <signal pad-id="pa1" function="SPI0" group="MOSI" field="PORTMUX.CTRLB.SPI0"/>
-                <signal pad-id="pc0" function="SPI0_ALT" group="SCK" field="PORTMUX.CTRLB.SPI0"/>
-                <signal pad-id="pa3" function="SPI0" group="SCK" field="PORTMUX.CTRLB.SPI0"/>
-                <signal pad-id="pc3" function="SPI0_ALT" group="SS" field="PORTMUX.CTRLB.SPI0"/>
-                <signal pad-id="pa4" function="SPI0" group="SS" field="PORTMUX.CTRLB.SPI0"/>
+                <signal pad-key="pc1" function="SPI0_ALT" group="MISO" field="PORTMUX.CTRLB.SPI0"/>
+                <signal pad-key="pa2" function="SPI0" group="MISO" field="PORTMUX.CTRLB.SPI0"/>
+                <signal pad-key="pc2" function="SPI0_ALT" group="MOSI" field="PORTMUX.CTRLB.SPI0"/>
+                <signal pad-key="pa1" function="SPI0" group="MOSI" field="PORTMUX.CTRLB.SPI0"/>
+                <signal pad-key="pc0" function="SPI0_ALT" group="SCK" field="PORTMUX.CTRLB.SPI0"/>
+                <signal pad-key="pa3" function="SPI0" group="SCK" field="PORTMUX.CTRLB.SPI0"/>
+                <signal pad-key="pc3" function="SPI0_ALT" group="SS" field="PORTMUX.CTRLB.SPI0"/>
+                <signal pad-key="pa4" function="SPI0" group="SS" field="PORTMUX.CTRLB.SPI0"/>
             </signals>
         </peripheral>
         <peripheral key="syscfg" name="SYSCFG" module-key="i2603_syscfg">
             <register-group-instance register-group-key="syscfg" address-space-key="data" offset="0xF00"/>
             <signals>
-                <signal pad-id="pa0" function="OTHER" group="UPDI"/>
+                <signal pad-key="pa0" function="OTHER" group="UPDI"/>
             </signals>
         </peripheral>
         <peripheral key="tca0" name="TCA0" module-key="i2117">
             <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"/>
-                <signal pad-id="pb4" index="1" function="TCA0_ALT" group="WO" field="PORTMUX.CTRLC.TCA01"/>
-                <signal pad-id="pb1" index="1" function="TCA0" group="WO" field="PORTMUX.CTRLC.TCA01"/>
-                <signal pad-id="pb5" index="2" function="TCA0_ALT" group="WO" field="PORTMUX.CTRLC.TCA02"/>
-                <signal pad-id="pb2" index="2" function="TCA0" group="WO" field="PORTMUX.CTRLC.TCA02"/>
-                <signal pad-id="pc3" index="3" function="TCA0_ALT" group="WO" field="PORTMUX.CTRLC.TCA03"/>
-                <signal pad-id="pa3" index="3" function="TCA0" group="WO" field="PORTMUX.CTRLC.TCA03"/>
-                <signal pad-id="pa4" index="4" function="TCA0" group="WO" field="PORTMUX.CTRLC.TCA04"/>
-                <signal pad-id="pa5" index="5" function="TCA0" group="WO" field="PORTMUX.CTRLC.TCA05"/>
+                <signal pad-key="pb3" index="0" function="TCA0_ALT" group="WO" field="PORTMUX.CTRLC.TCA00"/>
+                <signal pad-key="pb0" index="0" function="TCA0" group="WO" field="PORTMUX.CTRLC.TCA00"/>
+                <signal pad-key="pb4" index="1" function="TCA0_ALT" group="WO" field="PORTMUX.CTRLC.TCA01"/>
+                <signal pad-key="pb1" index="1" function="TCA0" group="WO" field="PORTMUX.CTRLC.TCA01"/>
+                <signal pad-key="pb5" index="2" function="TCA0_ALT" group="WO" field="PORTMUX.CTRLC.TCA02"/>
+                <signal pad-key="pb2" index="2" function="TCA0" group="WO" field="PORTMUX.CTRLC.TCA02"/>
+                <signal pad-key="pc3" index="3" function="TCA0_ALT" group="WO" field="PORTMUX.CTRLC.TCA03"/>
+                <signal pad-key="pa3" index="3" function="TCA0" group="WO" field="PORTMUX.CTRLC.TCA03"/>
+                <signal pad-key="pa4" index="4" function="TCA0" group="WO" field="PORTMUX.CTRLC.TCA04"/>
+                <signal pad-key="pa5" index="5" function="TCA0" group="WO" field="PORTMUX.CTRLC.TCA05"/>
             </signals>
         </peripheral>
         <peripheral key="tcb0" name="TCB0" module-key="i2119">
             <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"/>
+                <signal pad-key="pc0" index="0" function="TCB0_ALT" group="WO" field="PORTMUX.CTRLD.TCB0"/>
+                <signal pad-key="pa5" index="0" function="TCB0" group="WO" field="PORTMUX.CTRLD.TCB0"/>
             </signals>
         </peripheral>
         <peripheral key="tcb1" name="TCB1" module-key="i2119">
             <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"/>
+                <signal pad-key="pa3" index="0" function="TCB1" group="WO" field="PORTMUX.CTRLD.TCB1"/>
             </signals>
         </peripheral>
         <peripheral key="tcd0" name="TCD0" module-key="i2129">
             <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"/>
-                <signal pad-id="pc0" function="TCD0" group="WOC"/>
-                <signal pad-id="pc1" function="TCD0" group="WOD"/>
+                <signal pad-key="pa4" function="TCD0" group="WOA"/>
+                <signal pad-key="pa5" function="TCD0" group="WOB"/>
+                <signal pad-key="pc0" function="TCD0" group="WOC"/>
+                <signal pad-key="pc1" function="TCD0" group="WOD"/>
             </signals>
         </peripheral>
         <peripheral key="twi0" name="TWI0" module-key="i2110">
             <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"/>
-                <signal pad-id="pa1" function="TWI0_ALT" group="SDA" field="PORTMUX.CTRLB.TWI0"/>
-                <signal pad-id="pb1" function="TWI0" group="SDA" field="PORTMUX.CTRLB.TWI0"/>
+                <signal pad-key="pa2" function="TWI0_ALT" group="SCL" field="PORTMUX.CTRLB.TWI0"/>
+                <signal pad-key="pb0" function="TWI0" group="SCL" field="PORTMUX.CTRLB.TWI0"/>
+                <signal pad-key="pa1" function="TWI0_ALT" group="SDA" field="PORTMUX.CTRLB.TWI0"/>
+                <signal pad-key="pb1" function="TWI0" group="SDA" field="PORTMUX.CTRLB.TWI0"/>
             </signals>
         </peripheral>
         <peripheral key="usart0" name="USART0" module-key="i2108">
             <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"/>
-                <signal pad-id="pa1" function="USART0_ALT" group="TXD" field="PORTMUX.CTRLB.USART0"/>
-                <signal pad-id="pb2" function="USART0" group="TXD" field="PORTMUX.CTRLB.USART0"/>
-                <signal pad-id="pa3" function="USART0_ALT" group="XCK" field="PORTMUX.CTRLB.USART0"/>
-                <signal pad-id="pb1" function="USART0" group="XCK" field="PORTMUX.CTRLB.USART0"/>
-                <signal pad-id="pa4" function="USART0_ALT" group="XDIR" field="PORTMUX.CTRLB.USART0"/>
-                <signal pad-id="pb0" function="USART0" group="XDIR" field="PORTMUX.CTRLB.USART0"/>
+                <signal pad-key="pa2" function="USART0_ALT" group="RXD" field="PORTMUX.CTRLB.USART0"/>
+                <signal pad-key="pb3" function="USART0" group="RXD" field="PORTMUX.CTRLB.USART0"/>
+                <signal pad-key="pa1" function="USART0_ALT" group="TXD" field="PORTMUX.CTRLB.USART0"/>
+                <signal pad-key="pb2" function="USART0" group="TXD" field="PORTMUX.CTRLB.USART0"/>
+                <signal pad-key="pa3" function="USART0_ALT" group="XCK" field="PORTMUX.CTRLB.USART0"/>
+                <signal pad-key="pb1" function="USART0" group="XCK" field="PORTMUX.CTRLB.USART0"/>
+                <signal pad-key="pa4" function="USART0_ALT" group="XDIR" field="PORTMUX.CTRLB.USART0"/>
+                <signal pad-key="pb0" function="USART0" group="XDIR" field="PORTMUX.CTRLB.USART0"/>
             </signals>
         </peripheral>
         <peripheral key="userrow" name="USERROW" module-key="i2603_userrow">
@@ -1443,56 +1443,78 @@
             </register-group>
         </module>
     </modules>
+    <pads>
+        <pad key="pa2" name="PA2"/>
+        <pad key="pa3" name="PA3"/>
+        <pad key="gnd" name="GND"/>
+        <pad key="vdd" name="VDD"/>
+        <pad key="pa4" name="PA4"/>
+        <pad key="pa5" name="PA5"/>
+        <pad key="pa6" name="PA6"/>
+        <pad key="pa7" name="PA7"/>
+        <pad key="pb5" name="PB5"/>
+        <pad key="pb4" name="PB4"/>
+        <pad key="pb3" name="PB3"/>
+        <pad key="pb2" name="PB2"/>
+        <pad key="pb1" name="PB1"/>
+        <pad key="pb0" name="PB0"/>
+        <pad key="pc0" name="PC0"/>
+        <pad key="pc1" name="PC1"/>
+        <pad key="pc2" name="PC2"/>
+        <pad key="pc3" name="PC3"/>
+        <pad key="pa0" name="PA0"/>
+        <pad key="pa1" name="PA1"/>
+    </pads>
     <pinouts>
         <pinout key="qfn20" name="QFN20" type="qfn">
-            <pin position="1" pad="PA2"/>
-            <pin position="2" pad="PA3"/>
-            <pin position="3" pad="GND"/>
-            <pin position="4" pad="VDD"/>
-            <pin position="5" pad="PA4"/>
-            <pin position="6" pad="PA5"/>
-            <pin position="7" pad="PA6"/>
-            <pin position="8" pad="PA7"/>
-            <pin position="9" pad="PB5"/>
-            <pin position="10" pad="PB4"/>
-            <pin position="11" pad="PB3"/>
-            <pin position="12" pad="PB2"/>
-            <pin position="13" pad="PB1"/>
-            <pin position="14" pad="PB0"/>
-            <pin position="15" pad="PC0"/>
-            <pin position="16" pad="PC1"/>
-            <pin position="17" pad="PC2"/>
-            <pin position="18" pad="PC3"/>
-            <pin position="19" pad="PA0"/>
-            <pin position="20" pad="PA1"/>
+            <pin position="1" pad-key="pa2"/>
+            <pin position="2" pad-key="pa3"/>
+            <pin position="3" pad-key="gnd"/>
+            <pin position="4" pad-key="vdd"/>
+            <pin position="5" pad-key="pa4"/>
+            <pin position="6" pad-key="pa5"/>
+            <pin position="7" pad-key="pa6"/>
+            <pin position="8" pad-key="pa7"/>
+            <pin position="9" pad-key="pb5"/>
+            <pin position="10" pad-key="pb4"/>
+            <pin position="11" pad-key="pb3"/>
+            <pin position="12" pad-key="pb2"/>
+            <pin position="13" pad-key="pb1"/>
+            <pin position="14" pad-key="pb0"/>
+            <pin position="15" pad-key="pc0"/>
+            <pin position="16" pad-key="pc1"/>
+            <pin position="17" pad-key="pc2"/>
+            <pin position="18" pad-key="pc3"/>
+            <pin position="19" pad-key="pa0"/>
+            <pin position="20" pad-key="pa1"/>
         </pinout>
         <pinout key="soic20" name="SOIC20" type="soic">
-            <pin position="1" pad="VDD"/>
-            <pin position="2" pad="PA4"/>
-            <pin position="3" pad="PA5"/>
-            <pin position="4" pad="PA6"/>
-            <pin position="5" pad="PA7"/>
-            <pin position="6" pad="PB5"/>
-            <pin position="7" pad="PB4"/>
-            <pin position="8" pad="PB3"/>
-            <pin position="9" pad="PB2"/>
-            <pin position="10" pad="PB1"/>
-            <pin position="11" pad="PB0"/>
-            <pin position="12" pad="PC0"/>
-            <pin position="13" pad="PC1"/>
-            <pin position="14" pad="PC2"/>
-            <pin position="15" pad="PC3"/>
-            <pin position="16" pad="PA0"/>
-            <pin position="17" pad="PA1"/>
-            <pin position="18" pad="PA2"/>
-            <pin position="19" pad="PA3"/>
-            <pin position="20" pad="GND"/>
+            <pin position="1" pad-key="vdd"/>
+            <pin position="2" pad-key="pa4"/>
+            <pin position="3" pad-key="pa5"/>
+            <pin position="4" pad-key="pa6"/>
+            <pin position="5" pad-key="pa7"/>
+            <pin position="6" pad-key="pb5"/>
+            <pin position="7" pad-key="pb4"/>
+            <pin position="8" pad-key="pb3"/>
+            <pin position="9" pad-key="pb2"/>
+            <pin position="10" pad-key="pb1"/>
+            <pin position="11" pad-key="pb0"/>
+            <pin position="12" pad-key="pc0"/>
+            <pin position="13" pad-key="pc1"/>
+            <pin position="14" pad-key="pc2"/>
+            <pin position="15" pad-key="pc3"/>
+            <pin position="16" pad-key="pa0"/>
+            <pin position="17" pad-key="pa1"/>
+            <pin position="18" pad-key="pa2"/>
+            <pin position="19" pad-key="pa3"/>
+            <pin position="20" pad-key="gnd"/>
         </pinout>
     </pinouts>
     <variants>
-        <variant name="ATtiny1616-MFR" pinout-key="qfn20" package="VQFN20"/>
-        <variant name="ATtiny1616-MNR" pinout-key="qfn20" package="VQFN20"/>
-        <variant name="ATtiny1616-SFR" pinout-key="soic20" package="SOIC20"/>
-        <variant name="ATtiny1616-SNR" pinout-key="soic20" package="SOIC20"/>
+        <variant key="attiny1616_mfr" name="ATtiny1616-MFR" pinout-key="qfn20"/>
+        <variant key="attiny1616_mnr" name="ATtiny1616-MNR" pinout-key="qfn20"/>
+        <variant key="attiny1616_sfr" name="ATtiny1616-SFR" pinout-key="soic20"/>
+        <variant key="attiny1616_snr" name="ATtiny1616-SNR" pinout-key="soic20"/>
     </variants>
 </device>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY1617.xml b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY1617.xml
index 5248775e..4a98f03e 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY1617.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY1617.xml
@@ -44,71 +44,71 @@
         <peripheral key="ac0" name="AC0" module-key="i2106">
             <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"/>
-                <signal pad-id="pa5" index="0" function="AC0" group="OUT"/>
-                <signal pad-id="pa7" index="0" function="AC0" group="P"/>
-                <signal pad-id="pb5" index="1" function="AC0" group="P"/>
-                <signal pad-id="pb1" index="2" function="AC0" group="P"/>
-                <signal pad-id="pb6" index="3" function="AC0" group="P"/>
+                <signal pad-key="pa6" index="0" function="AC0" group="N"/>
+                <signal pad-key="pb4" index="1" function="AC0" group="N"/>
+                <signal pad-key="pa5" index="0" function="AC0" group="OUT"/>
+                <signal pad-key="pa7" index="0" function="AC0" group="P"/>
+                <signal pad-key="pb5" index="1" function="AC0" group="P"/>
+                <signal pad-key="pb1" index="2" function="AC0" group="P"/>
+                <signal pad-key="pb6" index="3" function="AC0" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="ac1" name="AC1" module-key="i2106">
             <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"/>
-                <signal pad-id="pb3" index="0" function="AC1" group="OUT"/>
-                <signal pad-id="pa7" index="0" function="AC1" group="P"/>
-                <signal pad-id="pa6" index="1" function="AC1" group="P"/>
-                <signal pad-id="pb0" index="2" function="AC1" group="P"/>
-                <signal pad-id="pb4" index="3" function="AC1" group="P"/>
+                <signal pad-key="pa5" index="0" function="AC1" group="N"/>
+                <signal pad-key="pb7" index="1" function="AC1" group="N"/>
+                <signal pad-key="pb3" index="0" function="AC1" group="OUT"/>
+                <signal pad-key="pa7" index="0" function="AC1" group="P"/>
+                <signal pad-key="pa6" index="1" function="AC1" group="P"/>
+                <signal pad-key="pb0" index="2" function="AC1" group="P"/>
+                <signal pad-key="pb4" index="3" function="AC1" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="ac2" name="AC2" module-key="i2106">
             <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"/>
-                <signal pad-id="pb2" index="0" function="AC2" group="OUT"/>
-                <signal pad-id="pa6" index="0" function="AC2" group="P"/>
-                <signal pad-id="pb0" index="1" function="AC2" group="P"/>
-                <signal pad-id="pb5" index="2" function="AC2" group="P"/>
-                <signal pad-id="pb7" index="3" function="AC2" group="P"/>
+                <signal pad-key="pa7" index="0" function="AC2" group="N"/>
+                <signal pad-key="pb6" index="1" function="AC2" group="N"/>
+                <signal pad-key="pb2" index="0" function="AC2" group="OUT"/>
+                <signal pad-key="pa6" index="0" function="AC2" group="P"/>
+                <signal pad-key="pb0" index="1" function="AC2" group="P"/>
+                <signal pad-key="pb5" index="2" function="AC2" group="P"/>
+                <signal pad-key="pb7" index="3" function="AC2" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="adc0" name="ADC0" module-key="i2132">
             <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"/>
-                <signal pad-id="pa2" index="2" function="AIN0" group="AIN"/>
-                <signal pad-id="pa3" index="3" function="AIN0" group="AIN"/>
-                <signal pad-id="pa4" index="4" function="AIN0" group="AIN"/>
-                <signal pad-id="pa5" index="5" function="AIN0" group="AIN"/>
-                <signal pad-id="pa6" index="6" function="AIN0" group="AIN"/>
-                <signal pad-id="pa7" index="7" function="AIN0" group="AIN"/>
-                <signal pad-id="pb5" index="8" function="AIN0" group="AIN"/>
-                <signal pad-id="pb4" index="9" function="AIN0" group="AIN"/>
-                <signal pad-id="pb1" index="10" function="AIN0" group="AIN"/>
-                <signal pad-id="pb0" index="11" function="AIN0" group="AIN"/>
+                <signal pad-key="pa0" index="0" function="AIN0" group="AIN"/>
+                <signal pad-key="pa1" index="1" function="AIN0" group="AIN"/>
+                <signal pad-key="pa2" index="2" function="AIN0" group="AIN"/>
+                <signal pad-key="pa3" index="3" function="AIN0" group="AIN"/>
+                <signal pad-key="pa4" index="4" function="AIN0" group="AIN"/>
+                <signal pad-key="pa5" index="5" function="AIN0" group="AIN"/>
+                <signal pad-key="pa6" index="6" function="AIN0" group="AIN"/>
+                <signal pad-key="pa7" index="7" function="AIN0" group="AIN"/>
+                <signal pad-key="pb5" index="8" function="AIN0" group="AIN"/>
+                <signal pad-key="pb4" index="9" function="AIN0" group="AIN"/>
+                <signal pad-key="pb1" index="10" function="AIN0" group="AIN"/>
+                <signal pad-key="pb0" index="11" function="AIN0" group="AIN"/>
             </signals>
         </peripheral>
         <peripheral key="adc1" name="ADC1" module-key="i2132">
             <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"/>
-                <signal pad-id="pa6" index="2" function="AIN1" group="AIN"/>
-                <signal pad-id="pa7" index="3" function="AIN1" group="AIN"/>
-                <signal pad-id="pb7" index="4" function="AIN1" group="AIN"/>
-                <signal pad-id="pb6" index="5" function="AIN1" group="AIN"/>
-                <signal pad-id="pc0" index="6" function="AIN1" group="AIN"/>
-                <signal pad-id="pc1" index="7" function="AIN1" group="AIN"/>
-                <signal pad-id="pc2" index="8" function="AIN1" group="AIN"/>
-                <signal pad-id="pc3" index="9" function="AIN1" group="AIN"/>
-                <signal pad-id="pc4" index="10" function="AIN1" group="AIN"/>
-                <signal pad-id="pc5" index="11" function="AIN1" group="AIN"/>
+                <signal pad-key="pa4" index="0" function="AIN1" group="AIN"/>
+                <signal pad-key="pa5" index="1" function="AIN1" group="AIN"/>
+                <signal pad-key="pa6" index="2" function="AIN1" group="AIN"/>
+                <signal pad-key="pa7" index="3" function="AIN1" group="AIN"/>
+                <signal pad-key="pb7" index="4" function="AIN1" group="AIN"/>
+                <signal pad-key="pb6" index="5" function="AIN1" group="AIN"/>
+                <signal pad-key="pc0" index="6" function="AIN1" group="AIN"/>
+                <signal pad-key="pc1" index="7" function="AIN1" group="AIN"/>
+                <signal pad-key="pc2" index="8" function="AIN1" group="AIN"/>
+                <signal pad-key="pc3" index="9" function="AIN1" group="AIN"/>
+                <signal pad-key="pc4" index="10" function="AIN1" group="AIN"/>
+                <signal pad-key="pc5" index="11" function="AIN1" group="AIN"/>
             </signals>
         </peripheral>
         <peripheral key="bod" name="BOD" module-key="i2114">
@@ -117,32 +117,32 @@
         <peripheral key="ccl" name="CCL" module-key="i2128">
             <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"/>
-                <signal pad-id="pa2" index="2" function="CCL" group="LUT0_IN"/>
-                <signal pad-id="pb4" index="0" function="CCL_ALT" group="LUT0_OUT" field="PORTMUX.CTRLA.LUT0"/>
-                <signal pad-id="pa4" index="0" function="CCL" group="LUT0_OUT" field="PORTMUX.CTRLA.LUT0"/>
-                <signal pad-id="pc3" index="0" function="CCL" group="LUT1_IN"/>
-                <signal pad-id="pc4" index="1" function="CCL" group="LUT1_IN"/>
-                <signal pad-id="pc5" index="2" function="CCL" group="LUT1_IN"/>
-                <signal pad-id="pc1" index="0" function="CCL_ALT" group="LUT1_OUT" field="PORTMUX.CTRLA.LUT1"/>
-                <signal pad-id="pa7" index="0" function="CCL" group="LUT1_OUT" field="PORTMUX.CTRLA.LUT1"/>
+                <signal pad-key="pa0" index="0" function="CCL" group="LUT0_IN"/>
+                <signal pad-key="pa1" index="1" function="CCL" group="LUT0_IN"/>
+                <signal pad-key="pa2" index="2" function="CCL" group="LUT0_IN"/>
+                <signal pad-key="pb4" index="0" function="CCL_ALT" group="LUT0_OUT" field="PORTMUX.CTRLA.LUT0"/>
+                <signal pad-key="pa4" index="0" function="CCL" group="LUT0_OUT" field="PORTMUX.CTRLA.LUT0"/>
+                <signal pad-key="pc3" index="0" function="CCL" group="LUT1_IN"/>
+                <signal pad-key="pc4" index="1" function="CCL" group="LUT1_IN"/>
+                <signal pad-key="pc5" index="2" function="CCL" group="LUT1_IN"/>
+                <signal pad-key="pc1" index="0" function="CCL_ALT" group="LUT1_OUT" field="PORTMUX.CTRLA.LUT1"/>
+                <signal pad-key="pa7" index="0" function="CCL" group="LUT1_OUT" field="PORTMUX.CTRLA.LUT1"/>
             </signals>
         </peripheral>
         <peripheral key="clkctrl" name="CLKCTRL" module-key="i2603_clkctrl">
             <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"/>
-                <signal pad-id="pb3" function="CLKCTRL" group="TOSC1"/>
-                <signal pad-id="pb2" function="CLKCTRL" group="TOSC2"/>
+                <signal pad-key="pa3" function="CLKCTRL" group="CLKI"/>
+                <signal pad-key="pb5" function="CLKCTRL" group="CLKO"/>
+                <signal pad-key="pb3" function="CLKCTRL" group="TOSC1"/>
+                <signal pad-key="pb2" function="CLKCTRL" group="TOSC2"/>
             </signals>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="i2100">
             <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"/>
+                <signal pad-key="pc4" function="BREAK_ALT" group="BREAK" field="PORTMUX.CTRLA.EXTBRK"/>
+                <signal pad-key="pa1" function="BREAK" group="BREAK" field="PORTMUX.CTRLA.EXTBRK"/>
             </signals>
         </peripheral>
         <peripheral key="cpuint" name="CPUINT" module-key="i2104">
@@ -154,7 +154,7 @@
         <peripheral key="dac0" name="DAC0" module-key="i2121">
             <register-group-instance register-group-key="dac" address-space-key="data" offset="0x6A0"/>
             <signals>
-                <signal pad-id="pa6" index="0" function="DAC0" group="OUT"/>
+                <signal pad-key="pa6" index="0" function="DAC0" group="OUT"/>
             </signals>
         </peripheral>
         <peripheral key="dac1" name="DAC1" module-key="i2121">
@@ -166,53 +166,53 @@
         <peripheral key="evsys" name="EVSYS" module-key="i2603_evsys">
             <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"/>
-                <signal pad-id="pa2" index="2" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
-                <signal pad-id="pa3" index="3" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
-                <signal pad-id="pa4" index="4" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
-                <signal pad-id="pa5" index="5" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
-                <signal pad-id="pa6" index="6" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
-                <signal pad-id="pa7" index="7" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
-                <signal pad-id="pb0" index="0" function="EVAINCH1" group="EVAPB" field="EVSYS.ASYNCCH1.ASYNCCH1"/>
-                <signal pad-id="pb1" index="1" function="EVAINCH1" group="EVAPB" field="EVSYS.ASYNCCH1.ASYNCCH1"/>
-                <signal pad-id="pb2" index="2" function="EVAINCH1" group="EVAPB" field="EVSYS.ASYNCCH1.ASYNCCH1"/>
-                <signal pad-id="pb3" index="3" function="EVAINCH1" group="EVAPB" field="EVSYS.ASYNCCH1.ASYNCCH1"/>
-                <signal pad-id="pb4" index="4" function="EVAINCH1" group="EVAPB" field="EVSYS.ASYNCCH1.ASYNCCH1"/>
-                <signal pad-id="pb5" index="5" function="EVAINCH1" group="EVAPB" field="EVSYS.ASYNCCH1.ASYNCCH1"/>
-                <signal pad-id="pb6" index="6" function="EVAINCH1" group="EVAPB" field="EVSYS.ASYNCCH1.ASYNCCH1"/>
-                <signal pad-id="pb7" index="7" function="EVAINCH1" group="EVAPB" field="EVSYS.ASYNCCH1.ASYNCCH1"/>
-                <signal pad-id="pc0" index="0" function="EVAINCH2" group="EVAPC" field="EVSYS.ASYNCCH2.ASYNCCH2"/>
-                <signal pad-id="pc1" index="1" function="EVAINCH2" group="EVAPC" field="EVSYS.ASYNCCH2.ASYNCCH2"/>
-                <signal pad-id="pc2" index="2" function="EVAINCH2" group="EVAPC" field="EVSYS.ASYNCCH2.ASYNCCH2"/>
-                <signal pad-id="pc3" index="3" function="EVAINCH2" group="EVAPC" field="EVSYS.ASYNCCH2.ASYNCCH2"/>
-                <signal pad-id="pc4" index="4" function="EVAINCH2" group="EVAPC" field="EVSYS.ASYNCCH2.ASYNCCH2"/>
-                <signal pad-id="pc5" index="5" function="EVAINCH2" group="EVAPC" field="EVSYS.ASYNCCH2.ASYNCCH2"/>
-                <signal pad-id="pa2" index="0" function="EVSYS" group="EVOUT" field="PORTMUX.CTRLA.EVOUT0"/>
-                <signal pad-id="pb2" index="1" function="EVSYS" group="EVOUT" field="PORTMUX.CTRLA.EVOUT1"/>
-                <signal pad-id="pc2" index="2" function="EVSYS" group="EVOUT" field="PORTMUX.CTRLA.EVOUT2"/>
-                <signal pad-id="pa0" index="0" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
-                <signal pad-id="pa1" index="1" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
-                <signal pad-id="pa2" index="2" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
-                <signal pad-id="pa3" index="3" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
-                <signal pad-id="pa4" index="4" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
-                <signal pad-id="pa5" index="5" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
-                <signal pad-id="pa6" index="6" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
-                <signal pad-id="pa7" index="7" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
-                <signal pad-id="pb0" index="0" function="EVSINCH1" group="EVSPB" field="EVSYS.SYNCCH1.SYNCCH1"/>
-                <signal pad-id="pb1" index="1" function="EVSINCH1" group="EVSPB" field="EVSYS.SYNCCH1.SYNCCH1"/>
-                <signal pad-id="pb2" index="2" function="EVSINCH1" group="EVSPB" field="EVSYS.SYNCCH1.SYNCCH1"/>
-                <signal pad-id="pb3" index="3" function="EVSINCH1" group="EVSPB" field="EVSYS.SYNCCH1.SYNCCH1"/>
-                <signal pad-id="pb4" index="4" function="EVSINCH1" group="EVSPB" field="EVSYS.SYNCCH1.SYNCCH1"/>
-                <signal pad-id="pb5" index="5" function="EVSINCH1" group="EVSPB" field="EVSYS.SYNCCH1.SYNCCH1"/>
-                <signal pad-id="pb6" index="6" function="EVSINCH1" group="EVSPB" field="EVSYS.SYNCCH1.SYNCCH1"/>
-                <signal pad-id="pb7" index="7" function="EVSINCH1" group="EVSPB" field="EVSYS.SYNCCH1.SYNCCH1"/>
-                <signal pad-id="pc0" index="0" function="EVSINCH0" group="EVSPC" field="EVSYS.SYNCCH0.SYNCCH0"/>
-                <signal pad-id="pc1" index="1" function="EVSINCH0" group="EVSPC" field="EVSYS.SYNCCH0.SYNCCH0"/>
-                <signal pad-id="pc2" index="2" function="EVSINCH0" group="EVSPC" field="EVSYS.SYNCCH0.SYNCCH0"/>
-                <signal pad-id="pc3" index="3" function="EVSINCH0" group="EVSPC" field="EVSYS.SYNCCH0.SYNCCH0"/>
-                <signal pad-id="pc4" index="4" function="EVSINCH0" group="EVSPC" field="EVSYS.SYNCCH0.SYNCCH0"/>
-                <signal pad-id="pc5" index="5" function="EVSINCH0" group="EVSPC" field="EVSYS.SYNCCH0.SYNCCH0"/>
+                <signal pad-key="pa0" index="0" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
+                <signal pad-key="pa1" index="1" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
+                <signal pad-key="pa2" index="2" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
+                <signal pad-key="pa3" index="3" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
+                <signal pad-key="pa4" index="4" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
+                <signal pad-key="pa5" index="5" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
+                <signal pad-key="pa6" index="6" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
+                <signal pad-key="pa7" index="7" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
+                <signal pad-key="pb0" index="0" function="EVAINCH1" group="EVAPB" field="EVSYS.ASYNCCH1.ASYNCCH1"/>
+                <signal pad-key="pb1" index="1" function="EVAINCH1" group="EVAPB" field="EVSYS.ASYNCCH1.ASYNCCH1"/>
+                <signal pad-key="pb2" index="2" function="EVAINCH1" group="EVAPB" field="EVSYS.ASYNCCH1.ASYNCCH1"/>
+                <signal pad-key="pb3" index="3" function="EVAINCH1" group="EVAPB" field="EVSYS.ASYNCCH1.ASYNCCH1"/>
+                <signal pad-key="pb4" index="4" function="EVAINCH1" group="EVAPB" field="EVSYS.ASYNCCH1.ASYNCCH1"/>
+                <signal pad-key="pb5" index="5" function="EVAINCH1" group="EVAPB" field="EVSYS.ASYNCCH1.ASYNCCH1"/>
+                <signal pad-key="pb6" index="6" function="EVAINCH1" group="EVAPB" field="EVSYS.ASYNCCH1.ASYNCCH1"/>
+                <signal pad-key="pb7" index="7" function="EVAINCH1" group="EVAPB" field="EVSYS.ASYNCCH1.ASYNCCH1"/>
+                <signal pad-key="pc0" index="0" function="EVAINCH2" group="EVAPC" field="EVSYS.ASYNCCH2.ASYNCCH2"/>
+                <signal pad-key="pc1" index="1" function="EVAINCH2" group="EVAPC" field="EVSYS.ASYNCCH2.ASYNCCH2"/>
+                <signal pad-key="pc2" index="2" function="EVAINCH2" group="EVAPC" field="EVSYS.ASYNCCH2.ASYNCCH2"/>
+                <signal pad-key="pc3" index="3" function="EVAINCH2" group="EVAPC" field="EVSYS.ASYNCCH2.ASYNCCH2"/>
+                <signal pad-key="pc4" index="4" function="EVAINCH2" group="EVAPC" field="EVSYS.ASYNCCH2.ASYNCCH2"/>
+                <signal pad-key="pc5" index="5" function="EVAINCH2" group="EVAPC" field="EVSYS.ASYNCCH2.ASYNCCH2"/>
+                <signal pad-key="pa2" index="0" function="EVSYS" group="EVOUT" field="PORTMUX.CTRLA.EVOUT0"/>
+                <signal pad-key="pb2" index="1" function="EVSYS" group="EVOUT" field="PORTMUX.CTRLA.EVOUT1"/>
+                <signal pad-key="pc2" index="2" function="EVSYS" group="EVOUT" field="PORTMUX.CTRLA.EVOUT2"/>
+                <signal pad-key="pa0" index="0" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
+                <signal pad-key="pa1" index="1" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
+                <signal pad-key="pa2" index="2" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
+                <signal pad-key="pa3" index="3" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
+                <signal pad-key="pa4" index="4" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
+                <signal pad-key="pa5" index="5" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
+                <signal pad-key="pa6" index="6" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
+                <signal pad-key="pa7" index="7" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
+                <signal pad-key="pb0" index="0" function="EVSINCH1" group="EVSPB" field="EVSYS.SYNCCH1.SYNCCH1"/>
+                <signal pad-key="pb1" index="1" function="EVSINCH1" group="EVSPB" field="EVSYS.SYNCCH1.SYNCCH1"/>
+                <signal pad-key="pb2" index="2" function="EVSINCH1" group="EVSPB" field="EVSYS.SYNCCH1.SYNCCH1"/>
+                <signal pad-key="pb3" index="3" function="EVSINCH1" group="EVSPB" field="EVSYS.SYNCCH1.SYNCCH1"/>
+                <signal pad-key="pb4" index="4" function="EVSINCH1" group="EVSPB" field="EVSYS.SYNCCH1.SYNCCH1"/>
+                <signal pad-key="pb5" index="5" function="EVSINCH1" group="EVSPB" field="EVSYS.SYNCCH1.SYNCCH1"/>
+                <signal pad-key="pb6" index="6" function="EVSINCH1" group="EVSPB" field="EVSYS.SYNCCH1.SYNCCH1"/>
+                <signal pad-key="pb7" index="7" function="EVSINCH1" group="EVSPB" field="EVSYS.SYNCCH1.SYNCCH1"/>
+                <signal pad-key="pc0" index="0" function="EVSINCH0" group="EVSPC" field="EVSYS.SYNCCH0.SYNCCH0"/>
+                <signal pad-key="pc1" index="1" function="EVSINCH0" group="EVSPC" field="EVSYS.SYNCCH0.SYNCCH0"/>
+                <signal pad-key="pc2" index="2" function="EVSINCH0" group="EVSPC" field="EVSYS.SYNCCH0.SYNCCH0"/>
+                <signal pad-key="pc3" index="3" function="EVSINCH0" group="EVSPC" field="EVSYS.SYNCCH0.SYNCCH0"/>
+                <signal pad-key="pc4" index="4" function="EVSINCH0" group="EVSPC" field="EVSYS.SYNCCH0.SYNCCH0"/>
+                <signal pad-key="pc5" index="5" function="EVSINCH0" group="EVSPC" field="EVSYS.SYNCCH0.SYNCCH0"/>
             </signals>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="i2603_fuse">
@@ -230,38 +230,38 @@
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pa2" index="2" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa3" index="3" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa4" index="4" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa5" index="5" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa6" index="6" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa7" index="7" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa0" index="0" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa1" index="1" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa2" index="2" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa3" index="3" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa4" index="4" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa5" index="5" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa6" index="6" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa7" index="7" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pb2" index="2" function="IOPORT" group="PIN"/>
-                <signal pad-id="pb3" index="3" function="IOPORT" group="PIN"/>
-                <signal pad-id="pb4" index="4" function="IOPORT" group="PIN"/>
-                <signal pad-id="pb5" index="5" function="IOPORT" group="PIN"/>
-                <signal pad-id="pb6" index="6" function="IOPORT" group="PIN"/>
-                <signal pad-id="pb7" index="7" function="IOPORT" group="PIN"/>
+                <signal pad-key="pb0" index="0" function="IOPORT" group="PIN"/>
+                <signal pad-key="pb1" index="1" function="IOPORT" group="PIN"/>
+                <signal pad-key="pb2" index="2" function="IOPORT" group="PIN"/>
+                <signal pad-key="pb3" index="3" function="IOPORT" group="PIN"/>
+                <signal pad-key="pb4" index="4" function="IOPORT" group="PIN"/>
+                <signal pad-key="pb5" index="5" function="IOPORT" group="PIN"/>
+                <signal pad-key="pb6" index="6" function="IOPORT" group="PIN"/>
+                <signal pad-key="pb7" index="7" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pc2" index="2" function="IOPORT" group="PIN"/>
-                <signal pad-id="pc3" index="3" function="IOPORT" group="PIN"/>
-                <signal pad-id="pc4" index="4" function="IOPORT" group="PIN"/>
-                <signal pad-id="pc5" index="5" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc0" index="0" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc1" index="1" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc2" index="2" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc3" index="3" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc4" index="4" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc5" index="5" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="portmux" name="PORTMUX" module-key="i2603_portmux">
@@ -269,42 +269,42 @@
         </peripheral>
         <peripheral key="ptc" name="PTC" module-key="i2120">
             <signals>
-                <signal pad-id="pb2" index="0" function="PTC_DS" group="DS"/>
-                <signal pad-id="pb4" index="1" function="PTC_DS" group="DS"/>
-                <signal pad-id="pa4" index="0" function="PTC_X" group="X"/>
-                <signal pad-id="pa5" index="1" function="PTC_X" group="X"/>
-                <signal pad-id="pa6" index="2" function="PTC_X" group="X"/>
-                <signal pad-id="pa7" index="3" function="PTC_X" group="X"/>
-                <signal pad-id="pb1" index="4" function="PTC_X" group="X"/>
-                <signal pad-id="pb0" index="5" function="PTC_X" group="X"/>
-                <signal pad-id="pc0" index="6" function="PTC_X" group="X"/>
-                <signal pad-id="pc1" index="7" function="PTC_X" group="X"/>
-                <signal pad-id="pc2" index="8" function="PTC_X" group="X"/>
-                <signal pad-id="pc3" index="9" function="PTC_X" group="X"/>
-                <signal pad-id="pc4" index="10" function="PTC_X" group="X"/>
-                <signal pad-id="pc5" index="11" function="PTC_X" group="X"/>
-                <signal pad-id="pb5" index="12" function="PTC_X" group="X"/>
-                <signal pad-id="pb4" index="13" function="PTC_X" group="X"/>
-                <signal pad-id="pa4" index="0" function="PTC_Y" group="Y"/>
-                <signal pad-id="pa5" index="1" function="PTC_Y" group="Y"/>
-                <signal pad-id="pa6" index="2" function="PTC_Y" group="Y"/>
-                <signal pad-id="pa7" index="3" function="PTC_Y" group="Y"/>
-                <signal pad-id="pb1" index="4" function="PTC_Y" group="Y"/>
-                <signal pad-id="pb0" index="5" function="PTC_Y" group="Y"/>
-                <signal pad-id="pc0" index="6" function="PTC_Y" group="Y"/>
-                <signal pad-id="pc1" index="7" function="PTC_Y" group="Y"/>
-                <signal pad-id="pc2" index="8" function="PTC_Y" group="Y"/>
-                <signal pad-id="pc3" index="9" function="PTC_Y" group="Y"/>
-                <signal pad-id="pc4" index="10" function="PTC_Y" group="Y"/>
-                <signal pad-id="pc5" index="11" function="PTC_Y" group="Y"/>
-                <signal pad-id="pb5" index="12" function="PTC_Y" group="Y"/>
-                <signal pad-id="pb4" index="13" function="PTC_Y" group="Y"/>
+                <signal pad-key="pb2" index="0" function="PTC_DS" group="DS"/>
+                <signal pad-key="pb4" index="1" function="PTC_DS" group="DS"/>
+                <signal pad-key="pa4" index="0" function="PTC_X" group="X"/>
+                <signal pad-key="pa5" index="1" function="PTC_X" group="X"/>
+                <signal pad-key="pa6" index="2" function="PTC_X" group="X"/>
+                <signal pad-key="pa7" index="3" function="PTC_X" group="X"/>
+                <signal pad-key="pb1" index="4" function="PTC_X" group="X"/>
+                <signal pad-key="pb0" index="5" function="PTC_X" group="X"/>
+                <signal pad-key="pc0" index="6" function="PTC_X" group="X"/>
+                <signal pad-key="pc1" index="7" function="PTC_X" group="X"/>
+                <signal pad-key="pc2" index="8" function="PTC_X" group="X"/>
+                <signal pad-key="pc3" index="9" function="PTC_X" group="X"/>
+                <signal pad-key="pc4" index="10" function="PTC_X" group="X"/>
+                <signal pad-key="pc5" index="11" function="PTC_X" group="X"/>
+                <signal pad-key="pb5" index="12" function="PTC_X" group="X"/>
+                <signal pad-key="pb4" index="13" function="PTC_X" group="X"/>
+                <signal pad-key="pa4" index="0" function="PTC_Y" group="Y"/>
+                <signal pad-key="pa5" index="1" function="PTC_Y" group="Y"/>
+                <signal pad-key="pa6" index="2" function="PTC_Y" group="Y"/>
+                <signal pad-key="pa7" index="3" function="PTC_Y" group="Y"/>
+                <signal pad-key="pb1" index="4" function="PTC_Y" group="Y"/>
+                <signal pad-key="pb0" index="5" function="PTC_Y" group="Y"/>
+                <signal pad-key="pc0" index="6" function="PTC_Y" group="Y"/>
+                <signal pad-key="pc1" index="7" function="PTC_Y" group="Y"/>
+                <signal pad-key="pc2" index="8" function="PTC_Y" group="Y"/>
+                <signal pad-key="pc3" index="9" function="PTC_Y" group="Y"/>
+                <signal pad-key="pc4" index="10" function="PTC_Y" group="Y"/>
+                <signal pad-key="pc5" index="11" function="PTC_Y" group="Y"/>
+                <signal pad-key="pb5" index="12" function="PTC_Y" group="Y"/>
+                <signal pad-key="pb4" index="13" function="PTC_Y" group="Y"/>
             </signals>
         </peripheral>
         <peripheral key="rstctrl" name="RSTCTRL" module-key="i2111">
             <register-group-instance register-group-key="rstctrl" address-space-key="data" offset="0x40"/>
             <signals>
-                <signal pad-id="pa0" function="OTHER" group="RESET"/>
+                <signal pad-key="pa0" function="OTHER" group="RESET"/>
             </signals>
         </peripheral>
         <peripheral key="rtc" name="RTC" module-key="i2116">
@@ -319,82 +319,82 @@
         <peripheral key="spi0" name="SPI0" module-key="i2107">
             <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"/>
-                <signal pad-id="pc2" function="SPI0_ALT" group="MOSI" field="PORTMUX.CTRLB.SPI0"/>
-                <signal pad-id="pa1" function="SPI0" group="MOSI" field="PORTMUX.CTRLB.SPI0"/>
-                <signal pad-id="pc0" function="SPI0_ALT" group="SCK" field="PORTMUX.CTRLB.SPI0"/>
-                <signal pad-id="pa3" function="SPI0" group="SCK" field="PORTMUX.CTRLB.SPI0"/>
-                <signal pad-id="pc3" function="SPI0_ALT" group="SS" field="PORTMUX.CTRLB.SPI0"/>
-                <signal pad-id="pa4" function="SPI0" group="SS" field="PORTMUX.CTRLB.SPI0"/>
+                <signal pad-key="pc1" function="SPI0_ALT" group="MISO" field="PORTMUX.CTRLB.SPI0"/>
+                <signal pad-key="pa2" function="SPI0" group="MISO" field="PORTMUX.CTRLB.SPI0"/>
+                <signal pad-key="pc2" function="SPI0_ALT" group="MOSI" field="PORTMUX.CTRLB.SPI0"/>
+                <signal pad-key="pa1" function="SPI0" group="MOSI" field="PORTMUX.CTRLB.SPI0"/>
+                <signal pad-key="pc0" function="SPI0_ALT" group="SCK" field="PORTMUX.CTRLB.SPI0"/>
+                <signal pad-key="pa3" function="SPI0" group="SCK" field="PORTMUX.CTRLB.SPI0"/>
+                <signal pad-key="pc3" function="SPI0_ALT" group="SS" field="PORTMUX.CTRLB.SPI0"/>
+                <signal pad-key="pa4" function="SPI0" group="SS" field="PORTMUX.CTRLB.SPI0"/>
             </signals>
         </peripheral>
         <peripheral key="syscfg" name="SYSCFG" module-key="i2603_syscfg">
             <register-group-instance register-group-key="syscfg" address-space-key="data" offset="0xF00"/>
             <signals>
-                <signal pad-id="pa0" function="OTHER" group="UPDI"/>
+                <signal pad-key="pa0" function="OTHER" group="UPDI"/>
             </signals>
         </peripheral>
         <peripheral key="tca0" name="TCA0" module-key="i2117">
             <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"/>
-                <signal pad-id="pb4" index="1" function="TCA0_ALT" group="WO" field="PORTMUX.CTRLC.TCA01"/>
-                <signal pad-id="pb1" index="1" function="TCA0" group="WO" field="PORTMUX.CTRLC.TCA01"/>
-                <signal pad-id="pb5" index="2" function="TCA0_ALT" group="WO" field="PORTMUX.CTRLC.TCA02"/>
-                <signal pad-id="pb2" index="2" function="TCA0" group="WO" field="PORTMUX.CTRLC.TCA02"/>
-                <signal pad-id="pc3" index="3" function="TCA0_ALT" group="WO" field="PORTMUX.CTRLC.TCA03"/>
-                <signal pad-id="pa3" index="3" function="TCA0" group="WO" field="PORTMUX.CTRLC.TCA03"/>
-                <signal pad-id="pc4" index="4" function="TCA0_ALT" group="WO" field="PORTMUX.CTRLC.TCA04"/>
-                <signal pad-id="pa4" index="4" function="TCA0" group="WO" field="PORTMUX.CTRLC.TCA04"/>
-                <signal pad-id="pc5" index="5" function="TCA0_ALT" group="WO" field="PORTMUX.CTRLC.TCA05"/>
-                <signal pad-id="pa5" index="5" function="TCA0" group="WO" field="PORTMUX.CTRLC.TCA05"/>
+                <signal pad-key="pb3" index="0" function="TCA0_ALT" group="WO" field="PORTMUX.CTRLC.TCA00"/>
+                <signal pad-key="pb0" index="0" function="TCA0" group="WO" field="PORTMUX.CTRLC.TCA00"/>
+                <signal pad-key="pb4" index="1" function="TCA0_ALT" group="WO" field="PORTMUX.CTRLC.TCA01"/>
+                <signal pad-key="pb1" index="1" function="TCA0" group="WO" field="PORTMUX.CTRLC.TCA01"/>
+                <signal pad-key="pb5" index="2" function="TCA0_ALT" group="WO" field="PORTMUX.CTRLC.TCA02"/>
+                <signal pad-key="pb2" index="2" function="TCA0" group="WO" field="PORTMUX.CTRLC.TCA02"/>
+                <signal pad-key="pc3" index="3" function="TCA0_ALT" group="WO" field="PORTMUX.CTRLC.TCA03"/>
+                <signal pad-key="pa3" index="3" function="TCA0" group="WO" field="PORTMUX.CTRLC.TCA03"/>
+                <signal pad-key="pc4" index="4" function="TCA0_ALT" group="WO" field="PORTMUX.CTRLC.TCA04"/>
+                <signal pad-key="pa4" index="4" function="TCA0" group="WO" field="PORTMUX.CTRLC.TCA04"/>
+                <signal pad-key="pc5" index="5" function="TCA0_ALT" group="WO" field="PORTMUX.CTRLC.TCA05"/>
+                <signal pad-key="pa5" index="5" function="TCA0" group="WO" field="PORTMUX.CTRLC.TCA05"/>
             </signals>
         </peripheral>
         <peripheral key="tcb0" name="TCB0" module-key="i2119">
             <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"/>
+                <signal pad-key="pc0" index="0" function="TCB0_ALT" group="WO" field="PORTMUX.CTRLD.TCB0"/>
+                <signal pad-key="pa5" index="0" function="TCB0" group="WO" field="PORTMUX.CTRLD.TCB0"/>
             </signals>
         </peripheral>
         <peripheral key="tcb1" name="TCB1" module-key="i2119">
             <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"/>
+                <signal pad-key="pc4" index="0" function="TCB1_ALT" group="WO" field="PORTMUX.CTRLD.TCB1"/>
+                <signal pad-key="pa3" index="0" function="TCB1" group="WO" field="PORTMUX.CTRLD.TCB1"/>
             </signals>
         </peripheral>
         <peripheral key="tcd0" name="TCD0" module-key="i2129">
             <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"/>
-                <signal pad-id="pc0" function="TCD0" group="WOC"/>
-                <signal pad-id="pc1" function="TCD0" group="WOD"/>
+                <signal pad-key="pa4" function="TCD0" group="WOA"/>
+                <signal pad-key="pa5" function="TCD0" group="WOB"/>
+                <signal pad-key="pc0" function="TCD0" group="WOC"/>
+                <signal pad-key="pc1" function="TCD0" group="WOD"/>
             </signals>
         </peripheral>
         <peripheral key="twi0" name="TWI0" module-key="i2110">
             <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"/>
-                <signal pad-id="pa1" function="TWI0_ALT" group="SDA" field="PORTMUX.CTRLB.TWI0"/>
-                <signal pad-id="pb1" function="TWI0" group="SDA" field="PORTMUX.CTRLB.TWI0"/>
+                <signal pad-key="pa2" function="TWI0_ALT" group="SCL" field="PORTMUX.CTRLB.TWI0"/>
+                <signal pad-key="pb0" function="TWI0" group="SCL" field="PORTMUX.CTRLB.TWI0"/>
+                <signal pad-key="pa1" function="TWI0_ALT" group="SDA" field="PORTMUX.CTRLB.TWI0"/>
+                <signal pad-key="pb1" function="TWI0" group="SDA" field="PORTMUX.CTRLB.TWI0"/>
             </signals>
         </peripheral>
         <peripheral key="usart0" name="USART0" module-key="i2108">
             <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"/>
-                <signal pad-id="pa1" function="USART0_ALT" group="TXD" field="PORTMUX.CTRLB.USART0"/>
-                <signal pad-id="pb2" function="USART0" group="TXD" field="PORTMUX.CTRLB.USART0"/>
-                <signal pad-id="pa3" function="USART0_ALT" group="XCK" field="PORTMUX.CTRLB.USART0"/>
-                <signal pad-id="pb1" function="USART0" group="XCK" field="PORTMUX.CTRLB.USART0"/>
-                <signal pad-id="pa4" function="USART0_ALT" group="XDIR" field="PORTMUX.CTRLB.USART0"/>
-                <signal pad-id="pb0" function="USART0" group="XDIR" field="PORTMUX.CTRLB.USART0"/>
+                <signal pad-key="pa2" function="USART0_ALT" group="RXD" field="PORTMUX.CTRLB.USART0"/>
+                <signal pad-key="pb3" function="USART0" group="RXD" field="PORTMUX.CTRLB.USART0"/>
+                <signal pad-key="pa1" function="USART0_ALT" group="TXD" field="PORTMUX.CTRLB.USART0"/>
+                <signal pad-key="pb2" function="USART0" group="TXD" field="PORTMUX.CTRLB.USART0"/>
+                <signal pad-key="pa3" function="USART0_ALT" group="XCK" field="PORTMUX.CTRLB.USART0"/>
+                <signal pad-key="pb1" function="USART0" group="XCK" field="PORTMUX.CTRLB.USART0"/>
+                <signal pad-key="pa4" function="USART0_ALT" group="XDIR" field="PORTMUX.CTRLB.USART0"/>
+                <signal pad-key="pb0" function="USART0" group="XDIR" field="PORTMUX.CTRLB.USART0"/>
             </signals>
         </peripheral>
         <peripheral key="userrow" name="USERROW" module-key="i2603_userrow">
@@ -1473,36 +1473,62 @@
             </register-group>
         </module>
     </modules>
+    <pads>
+        <pad key="pa2" name="PA2"/>
+        <pad key="pa3" name="PA3"/>
+        <pad key="gnd" name="GND"/>
+        <pad key="vdd" name="VDD"/>
+        <pad key="pa4" name="PA4"/>
+        <pad key="pa5" name="PA5"/>
+        <pad key="pa6" name="PA6"/>
+        <pad key="pa7" name="PA7"/>
+        <pad key="pb7" name="PB7"/>
+        <pad key="pb6" name="PB6"/>
+        <pad key="pb5" name="PB5"/>
+        <pad key="pb4" name="PB4"/>
+        <pad key="pb3" name="PB3"/>
+        <pad key="pb2" name="PB2"/>
+        <pad key="pb1" name="PB1"/>
+        <pad key="pb0" name="PB0"/>
+        <pad key="pc0" name="PC0"/>
+        <pad key="pc1" name="PC1"/>
+        <pad key="pc2" name="PC2"/>
+        <pad key="pc3" name="PC3"/>
+        <pad key="pc4" name="PC4"/>
+        <pad key="pc5" name="PC5"/>
+        <pad key="pa0" name="PA0"/>
+        <pad key="pa1" name="PA1"/>
+    </pads>
     <pinouts>
         <pinout key="qfn24" name="QFN24" type="qfn">
-            <pin position="1" pad="PA2"/>
-            <pin position="2" pad="PA3"/>
-            <pin position="3" pad="GND"/>
-            <pin position="4" pad="VDD"/>
-            <pin position="5" pad="PA4"/>
-            <pin position="6" pad="PA5"/>
-            <pin position="7" pad="PA6"/>
-            <pin position="8" pad="PA7"/>
-            <pin position="9" pad="PB7"/>
-            <pin position="10" pad="PB6"/>
-            <pin position="11" pad="PB5"/>
-            <pin position="12" pad="PB4"/>
-            <pin position="13" pad="PB3"/>
-            <pin position="14" pad="PB2"/>
-            <pin position="15" pad="PB1"/>
-            <pin position="16" pad="PB0"/>
-            <pin position="17" pad="PC0"/>
-            <pin position="18" pad="PC1"/>
-            <pin position="19" pad="PC2"/>
-            <pin position="20" pad="PC3"/>
-            <pin position="21" pad="PC4"/>
-            <pin position="22" pad="PC5"/>
-            <pin position="23" pad="PA0"/>
-            <pin position="24" pad="PA1"/>
+            <pin position="1" pad-key="pa2"/>
+            <pin position="2" pad-key="pa3"/>
+            <pin position="3" pad-key="gnd"/>
+            <pin position="4" pad-key="vdd"/>
+            <pin position="5" pad-key="pa4"/>
+            <pin position="6" pad-key="pa5"/>
+            <pin position="7" pad-key="pa6"/>
+            <pin position="8" pad-key="pa7"/>
+            <pin position="9" pad-key="pb7"/>
+            <pin position="10" pad-key="pb6"/>
+            <pin position="11" pad-key="pb5"/>
+            <pin position="12" pad-key="pb4"/>
+            <pin position="13" pad-key="pb3"/>
+            <pin position="14" pad-key="pb2"/>
+            <pin position="15" pad-key="pb1"/>
+            <pin position="16" pad-key="pb0"/>
+            <pin position="17" pad-key="pc0"/>
+            <pin position="18" pad-key="pc1"/>
+            <pin position="19" pad-key="pc2"/>
+            <pin position="20" pad-key="pc3"/>
+            <pin position="21" pad-key="pc4"/>
+            <pin position="22" pad-key="pc5"/>
+            <pin position="23" pad-key="pa0"/>
+            <pin position="24" pad-key="pa1"/>
         </pinout>
     </pinouts>
     <variants>
-        <variant name="ATtiny1617-MFR" pinout-key="qfn24" package="VQFN24"/>
-        <variant name="ATtiny1617-MNR" pinout-key="qfn24" package="VQFN24"/>
+        <variant key="attiny1617_mfr" name="ATtiny1617-MFR" pinout-key="qfn24"/>
+        <variant key="attiny1617_mnr" name="ATtiny1617-MNR" pinout-key="qfn24"/>
     </variants>
 </device>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY1624.xml b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY1624.xml
index 73eb7306..1abdf98b 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY1624.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY1624.xml
@@ -44,25 +44,25 @@
         <peripheral key="ac0" name="AC0" module-key="cmp_control_avr_v3">
             <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"/>
-                <signal pad-id="pa5" index="0" function="AC0" group="OUT"/>
-                <signal pad-id="pa7" index="0" function="AC0" group="P"/>
-                <signal pad-id="pb1" index="2" function="AC0" group="P"/>
+                <signal pad-key="pa6" index="0" function="AC0" group="N"/>
+                <signal pad-key="pb0" index="2" function="AC0" group="N"/>
+                <signal pad-key="pa5" index="0" function="AC0" group="OUT"/>
+                <signal pad-key="pa7" index="0" function="AC0" group="P"/>
+                <signal pad-key="pb1" index="2" function="AC0" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="adc0" name="ADC0" module-key="adc_12b_diff_ctrl_v2">
             <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"/>
-                <signal pad-id="pa3" index="3" function="AIN0" group="AIN"/>
-                <signal pad-id="pa4" index="4" function="AIN0" group="AIN"/>
-                <signal pad-id="pa5" index="5" function="AIN0" group="AIN"/>
-                <signal pad-id="pa6" index="6" function="AIN0" group="AIN"/>
-                <signal pad-id="pa7" index="7" function="AIN0" group="AIN"/>
-                <signal pad-id="pb1" index="10" function="AIN0" group="AIN"/>
-                <signal pad-id="pb0" index="11" function="AIN0" group="AIN"/>
+                <signal pad-key="pa1" index="1" function="AIN0" group="AIN"/>
+                <signal pad-key="pa2" index="2" function="AIN0" group="AIN"/>
+                <signal pad-key="pa3" index="3" function="AIN0" group="AIN"/>
+                <signal pad-key="pa4" index="4" function="AIN0" group="AIN"/>
+                <signal pad-key="pa5" index="5" function="AIN0" group="AIN"/>
+                <signal pad-key="pa6" index="6" function="AIN0" group="AIN"/>
+                <signal pad-key="pa7" index="7" function="AIN0" group="AIN"/>
+                <signal pad-key="pb1" index="10" function="AIN0" group="AIN"/>
+                <signal pad-key="pb0" index="11" function="AIN0" group="AIN"/>
             </signals>
         </peripheral>
         <peripheral key="bod" name="BOD" module-key="bor_lvd_ctrl_avr_v1">
@@ -71,30 +71,30 @@
         <peripheral key="ccl" name="CCL" module-key="cla_ccl_v1">
             <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"/>
-                <signal pad-id="pa2" index="2" function="CCL_IN" group="LUT0_IN" field="PORTMUX.CCLROUTEA.LUT0"/>
-                <signal pad-id="pa4" index="0" function="CCL" group="LUT0_OUT" field="PORTMUX.CCLROUTEA.LUT0"/>
-                <signal pad-id="pa7" index="0" function="CCL" group="LUT1_OUT" field="PORTMUX.CCLROUTEA.LUT1"/>
-                <signal pad-id="pb0" index="0" function="CCL_IN" group="LUT2_IN" field="PORTMUX.CCLROUTEA.LUT2"/>
-                <signal pad-id="pb1" index="1" function="CCL_IN" group="LUT2_IN" field="PORTMUX.CCLROUTEA.LUT2"/>
-                <signal pad-id="pb2" index="2" function="CCL_IN" group="LUT2_IN" field="PORTMUX.CCLROUTEA.LUT2"/>
-                <signal pad-id="pb3" index="0" function="CCL" group="LUT2_OUT" field="PORTMUX.CCLROUTEA.LUT2"/>
-                <signal pad-id="pa5" index="0" function="CCL_ALT" group="LUT3_OUT" field="PORTMUX.CCLROUTEA.LUT3"/>
+                <signal pad-key="pa0" index="0" function="CCL_IN" group="LUT0_IN" field="PORTMUX.CCLROUTEA.LUT0"/>
+                <signal pad-key="pa1" index="1" function="CCL_IN" group="LUT0_IN" field="PORTMUX.CCLROUTEA.LUT0"/>
+                <signal pad-key="pa2" index="2" function="CCL_IN" group="LUT0_IN" field="PORTMUX.CCLROUTEA.LUT0"/>
+                <signal pad-key="pa4" index="0" function="CCL" group="LUT0_OUT" field="PORTMUX.CCLROUTEA.LUT0"/>
+                <signal pad-key="pa7" index="0" function="CCL" group="LUT1_OUT" field="PORTMUX.CCLROUTEA.LUT1"/>
+                <signal pad-key="pb0" index="0" function="CCL_IN" group="LUT2_IN" field="PORTMUX.CCLROUTEA.LUT2"/>
+                <signal pad-key="pb1" index="1" function="CCL_IN" group="LUT2_IN" field="PORTMUX.CCLROUTEA.LUT2"/>
+                <signal pad-key="pb2" index="2" function="CCL_IN" group="LUT2_IN" field="PORTMUX.CCLROUTEA.LUT2"/>
+                <signal pad-key="pb3" index="0" function="CCL" group="LUT2_OUT" field="PORTMUX.CCLROUTEA.LUT2"/>
+                <signal pad-key="pa5" index="0" function="CCL_ALT" group="LUT3_OUT" field="PORTMUX.CCLROUTEA.LUT3"/>
             </signals>
         </peripheral>
         <peripheral key="clkctrl" name="CLKCTRL" module-key="chip_clkctrl">
             <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"/>
-                <signal pad-id="pb2" function="CLKCTRL" group="TOSC2"/>
+                <signal pad-key="pa3" function="CLKCTRL" group="CLKI"/>
+                <signal pad-key="pb3" function="CLKCTRL" group="TOSC1"/>
+                <signal pad-key="pb2" function="CLKCTRL" group="TOSC2"/>
             </signals>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="cpu_avr_v2">
             <register-group-instance register-group-key="cpu" address-space-key="data" offset="0x30"/>
             <signals>
-                <signal pad-id="pa1" function="OTHER" group="BREAK"/>
+                <signal pad-key="pa1" function="OTHER" group="BREAK"/>
             </signals>
         </peripheral>
         <peripheral key="cpuint" name="CPUINT" module-key="int_8bit_v3">
@@ -106,9 +106,9 @@
         <peripheral key="evsys" name="EVSYS" module-key="ev_ctrl_v1">
             <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"/>
-                <signal pad-id="pb2" index="1" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTB"/>
+                <signal pad-key="pa7" index="0" function="EVSYS_ALT" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTA"/>
+                <signal pad-key="pa2" index="0" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTA"/>
+                <signal pad-key="pb2" index="1" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTB"/>
             </signals>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="chip_fuse">
@@ -126,23 +126,23 @@
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pa2" index="2" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa3" index="3" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa4" index="4" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa5" index="5" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa6" index="6" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa7" index="7" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa0" index="0" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa1" index="1" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa2" index="2" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa3" index="3" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa4" index="4" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa5" index="5" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa6" index="6" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa7" index="7" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pb2" index="2" function="IOPORT" group="PIN"/>
-                <signal pad-id="pb3" index="3" function="IOPORT" group="PIN"/>
+                <signal pad-key="pb0" index="0" function="IOPORT" group="PIN"/>
+                <signal pad-key="pb1" index="1" function="IOPORT" group="PIN"/>
+                <signal pad-key="pb2" index="2" function="IOPORT" group="PIN"/>
+                <signal pad-key="pb3" index="3" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="portmux" name="PORTMUX" module-key="chip_portmux">
@@ -151,7 +151,7 @@
         <peripheral key="rstctrl" name="RSTCTRL" module-key="rst_integration_avr_v1">
             <register-group-instance register-group-key="rstctrl" address-space-key="data" offset="0x40"/>
             <signals>
-                <signal pad-id="pa0" function="OTHER" group="RESET"/>
+                <signal pad-key="pa0" function="OTHER" group="RESET"/>
             </signals>
         </peripheral>
         <peripheral key="rtc" name="RTC" module-key="tmr_16b_rtc_v1">
@@ -166,69 +166,69 @@
         <peripheral key="spi0" name="SPI0" module-key="spi_8bit_v2">
             <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"/>
-                <signal pad-id="pa3" function="SPI" group="SCK" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <signal pad-id="pa4" function="SPI" group="SS" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pa2" function="SPI" group="MISO" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pa1" function="SPI" group="MOSI" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pa3" function="SPI" group="SCK" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pa4" function="SPI" group="SS" field="PORTMUX.SPIROUTEA.SPI0"/>
             </signals>
         </peripheral>
         <peripheral key="syscfg" name="SYSCFG" module-key="chip_syscfg">
             <register-group-instance register-group-key="syscfg" address-space-key="data" offset="0xF00"/>
             <signals>
-                <signal pad-id="pa0" function="PDI" group="UPDI"/>
+                <signal pad-key="pa0" function="PDI" group="UPDI"/>
             </signals>
         </peripheral>
         <peripheral key="tca0" name="TCA0" module-key="tmr_16b_pwm_v1">
             <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"/>
-                <signal pad-id="pb1" index="1" function="TCA" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pb2" index="2" function="TCA" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pa3" index="3" function="TCA" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pa4" index="4" function="TCA" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pa5" index="5" function="TCA" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pb3" index="0" function="TCA_ALT" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pb0" index="0" function="TCA" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pb1" index="1" function="TCA" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pb2" index="2" function="TCA" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pa3" index="3" function="TCA" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pa4" index="4" function="TCA" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pa5" index="5" function="TCA" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
             </signals>
         </peripheral>
         <peripheral key="tcb0" name="TCB0" module-key="tmr_16b_capture_v1">
             <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"/>
+                <signal pad-key="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 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"/>
+                <signal pad-key="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 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"/>
+                <signal pad-key="pb0" function="I2C" group="SCL"/>
+                <signal pad-key="pb1" function="I2C" group="SDA"/>
             </signals>
         </peripheral>
         <peripheral key="usart0" name="USART0" module-key="uart_autobd_v4">
             <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"/>
-                <signal pad-id="pa1" function="USART0_ALT" group="TXD" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pb2" function="USART0" group="TXD" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pa3" function="USART0_ALT" group="XCK" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pb1" function="USART0" group="XCK" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pa7" function="USART0_ALT" group="XDIR" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pb0" function="USART0" group="XDIR" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa2" function="USART0_ALT" group="RXD" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pb3" function="USART0" group="RXD" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa1" function="USART0_ALT" group="TXD" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pb2" function="USART0" group="TXD" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa3" function="USART0_ALT" group="XCK" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pb1" function="USART0" group="XCK" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa7" function="USART0_ALT" group="XDIR" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pb0" function="USART0" group="XDIR" field="PORTMUX.USARTROUTEA.USART0"/>
             </signals>
         </peripheral>
         <peripheral key="usart1" name="USART1" module-key="uart_autobd_v4">
             <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"/>
-                <signal pad-id="pa3" function="USART1" group="XCK" field="PORTMUX.USARTROUTEA.USART1"/>
-                <signal pad-id="pa4" function="USART1" group="XDIR" field="PORTMUX.USARTROUTEA.USART1"/>
+                <signal pad-key="pa2" function="USART1" group="RXD" field="PORTMUX.USARTROUTEA.USART1"/>
+                <signal pad-key="pa1" function="USART1" group="TXD" field="PORTMUX.USARTROUTEA.USART1"/>
+                <signal pad-key="pa3" function="USART1" group="XCK" field="PORTMUX.USARTROUTEA.USART1"/>
+                <signal pad-key="pa4" function="USART1" group="XDIR" field="PORTMUX.USARTROUTEA.USART1"/>
             </signals>
         </peripheral>
         <peripheral key="userrow" name="USERROW" module-key="chip_userrow">
@@ -1294,26 +1294,42 @@
             </register-group>
         </module>
     </modules>
+    <pads>
+        <pad key="vcc" name="VCC"/>
+        <pad key="pa4" name="PA4"/>
+        <pad key="pa5" name="PA5"/>
+        <pad key="pa6" name="PA6"/>
+        <pad key="pa7" name="PA7"/>
+        <pad key="pb3" name="PB3"/>
+        <pad key="pb2" name="PB2"/>
+        <pad key="pb1" name="PB1"/>
+        <pad key="pb0" name="PB0"/>
+        <pad key="pa0" name="PA0"/>
+        <pad key="pa1" name="PA1"/>
+        <pad key="pa2" name="PA2"/>
+        <pad key="pa3" name="PA3"/>
+        <pad key="gnd" name="GND"/>
+    </pads>
     <pinouts>
         <pinout key="soic14" name="SOIC14" type="soic">
-            <pin position="1" pad="VCC"/>
-            <pin position="2" pad="PA4"/>
-            <pin position="3" pad="PA5"/>
-            <pin position="4" pad="PA6"/>
-            <pin position="5" pad="PA7"/>
-            <pin position="6" pad="PB3"/>
-            <pin position="7" pad="PB2"/>
-            <pin position="8" pad="PB1"/>
-            <pin position="9" pad="PB0"/>
-            <pin position="10" pad="PA0"/>
-            <pin position="11" pad="PA1"/>
-            <pin position="12" pad="PA2"/>
-            <pin position="13" pad="PA3"/>
-            <pin position="14" pad="GND"/>
+            <pin position="1" pad-key="vcc"/>
+            <pin position="2" pad-key="pa4"/>
+            <pin position="3" pad-key="pa5"/>
+            <pin position="4" pad-key="pa6"/>
+            <pin position="5" pad-key="pa7"/>
+            <pin position="6" pad-key="pb3"/>
+            <pin position="7" pad-key="pb2"/>
+            <pin position="8" pad-key="pb1"/>
+            <pin position="9" pad-key="pb0"/>
+            <pin position="10" pad-key="pa0"/>
+            <pin position="11" pad-key="pa1"/>
+            <pin position="12" pad-key="pa2"/>
+            <pin position="13" pad-key="pa3"/>
+            <pin position="14" pad-key="gnd"/>
         </pinout>
     </pinouts>
     <variants>
-        <variant name="ATtiny1624-SSFR" pinout-key="soic14" package="SOIC14"/>
-        <variant name="ATtiny1624-SSUR" pinout-key="soic14" package="SOIC14"/>
+        <variant key="attiny1624_ssfr" name="ATtiny1624-SSFR" pinout-key="soic14"/>
+        <variant key="attiny1624_ssur" name="ATtiny1624-SSUR" pinout-key="soic14"/>
     </variants>
 </device>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY1626.xml b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY1626.xml
index 2d9b008f..04491eb5 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY1626.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY1626.xml
@@ -44,33 +44,33 @@
         <peripheral key="ac0" name="AC0" module-key="cmp_control_avr_v3">
             <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"/>
-                <signal pad-id="pb0" index="2" function="AC0" group="N"/>
-                <signal pad-id="pa5" index="0" function="AC0" group="OUT"/>
-                <signal pad-id="pa7" index="0" function="AC0" group="P"/>
-                <signal pad-id="pb5" index="1" function="AC0" group="P"/>
-                <signal pad-id="pb1" index="2" function="AC0" group="P"/>
+                <signal pad-key="pa6" index="0" function="AC0" group="N"/>
+                <signal pad-key="pb4" index="1" function="AC0" group="N"/>
+                <signal pad-key="pb0" index="2" function="AC0" group="N"/>
+                <signal pad-key="pa5" index="0" function="AC0" group="OUT"/>
+                <signal pad-key="pa7" index="0" function="AC0" group="P"/>
+                <signal pad-key="pb5" index="1" function="AC0" group="P"/>
+                <signal pad-key="pb1" index="2" function="AC0" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="adc0" name="ADC0" module-key="adc_12b_diff_ctrl_v2">
             <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"/>
-                <signal pad-id="pa3" index="3" function="AIN0" group="AIN"/>
-                <signal pad-id="pa4" index="4" function="AIN0" group="AIN"/>
-                <signal pad-id="pa5" index="5" function="AIN0" group="AIN"/>
-                <signal pad-id="pa6" index="6" function="AIN0" group="AIN"/>
-                <signal pad-id="pa7" index="7" function="AIN0" group="AIN"/>
-                <signal pad-id="pb5" index="8" function="AIN0" group="AIN"/>
-                <signal pad-id="pb4" index="9" function="AIN0" group="AIN"/>
-                <signal pad-id="pb1" index="10" function="AIN0" group="AIN"/>
-                <signal pad-id="pb0" index="11" function="AIN0" group="AIN"/>
-                <signal pad-id="pc0" index="12" function="AIN0" group="AIN"/>
-                <signal pad-id="pc1" index="13" function="AIN0" group="AIN"/>
-                <signal pad-id="pc2" index="14" function="AIN0" group="AIN"/>
-                <signal pad-id="pc3" index="15" function="AIN0" group="AIN"/>
+                <signal pad-key="pa1" index="1" function="AIN0" group="AIN"/>
+                <signal pad-key="pa2" index="2" function="AIN0" group="AIN"/>
+                <signal pad-key="pa3" index="3" function="AIN0" group="AIN"/>
+                <signal pad-key="pa4" index="4" function="AIN0" group="AIN"/>
+                <signal pad-key="pa5" index="5" function="AIN0" group="AIN"/>
+                <signal pad-key="pa6" index="6" function="AIN0" group="AIN"/>
+                <signal pad-key="pa7" index="7" function="AIN0" group="AIN"/>
+                <signal pad-key="pb5" index="8" function="AIN0" group="AIN"/>
+                <signal pad-key="pb4" index="9" function="AIN0" group="AIN"/>
+                <signal pad-key="pb1" index="10" function="AIN0" group="AIN"/>
+                <signal pad-key="pb0" index="11" function="AIN0" group="AIN"/>
+                <signal pad-key="pc0" index="12" function="AIN0" group="AIN"/>
+                <signal pad-key="pc1" index="13" function="AIN0" group="AIN"/>
+                <signal pad-key="pc2" index="14" function="AIN0" group="AIN"/>
+                <signal pad-key="pc3" index="15" function="AIN0" group="AIN"/>
             </signals>
         </peripheral>
         <peripheral key="bod" name="BOD" module-key="bor_lvd_ctrl_avr_v1">
@@ -79,37 +79,37 @@
         <peripheral key="ccl" name="CCL" module-key="cla_ccl_v1">
             <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"/>
-                <signal pad-id="pa2" index="2" function="CCL_IN" group="LUT0_IN" field="PORTMUX.CCLROUTEA.LUT0"/>
-                <signal pad-id="pb4" index="0" function="CCL_ALT" group="LUT0_OUT" field="PORTMUX.CCLROUTEA.LUT0"/>
-                <signal pad-id="pa4" index="0" function="CCL" group="LUT0_OUT" field="PORTMUX.CCLROUTEA.LUT0"/>
-                <signal pad-id="pc3" index="0" function="CCL_IN" group="LUT1_IN" field="PORTMUX.CCLROUTEA.LUT1"/>
-                <signal pad-id="pc1" index="0" function="CCL_ALT" group="LUT1_OUT" field="PORTMUX.CCLROUTEA.LUT1"/>
-                <signal pad-id="pa7" index="0" function="CCL" group="LUT1_OUT" field="PORTMUX.CCLROUTEA.LUT1"/>
-                <signal pad-id="pb0" index="0" function="CCL_IN" group="LUT2_IN" field="PORTMUX.CCLROUTEA.LUT2"/>
-                <signal pad-id="pb1" index="1" function="CCL_IN" group="LUT2_IN" field="PORTMUX.CCLROUTEA.LUT2"/>
-                <signal pad-id="pb2" index="2" function="CCL_IN" group="LUT2_IN" field="PORTMUX.CCLROUTEA.LUT2"/>
-                <signal pad-id="pb3" index="0" function="CCL" group="LUT2_OUT" field="PORTMUX.CCLROUTEA.LUT2"/>
-                <signal pad-id="pc0" index="0" function="CCL_IN" group="LUT3_IN" field="PORTMUX.CCLROUTEA.LUT3"/>
-                <signal pad-id="pc1" index="1" function="CCL_IN" group="LUT3_IN" field="PORTMUX.CCLROUTEA.LUT3"/>
-                <signal pad-id="pc2" index="2" function="CCL_IN" group="LUT3_IN" field="PORTMUX.CCLROUTEA.LUT3"/>
-                <signal pad-id="pa5" index="0" function="CCL_ALT" group="LUT3_OUT" field="PORTMUX.CCLROUTEA.LUT3"/>
+                <signal pad-key="pa0" index="0" function="CCL_IN" group="LUT0_IN" field="PORTMUX.CCLROUTEA.LUT0"/>
+                <signal pad-key="pa1" index="1" function="CCL_IN" group="LUT0_IN" field="PORTMUX.CCLROUTEA.LUT0"/>
+                <signal pad-key="pa2" index="2" function="CCL_IN" group="LUT0_IN" field="PORTMUX.CCLROUTEA.LUT0"/>
+                <signal pad-key="pb4" index="0" function="CCL_ALT" group="LUT0_OUT" field="PORTMUX.CCLROUTEA.LUT0"/>
+                <signal pad-key="pa4" index="0" function="CCL" group="LUT0_OUT" field="PORTMUX.CCLROUTEA.LUT0"/>
+                <signal pad-key="pc3" index="0" function="CCL_IN" group="LUT1_IN" field="PORTMUX.CCLROUTEA.LUT1"/>
+                <signal pad-key="pc1" index="0" function="CCL_ALT" group="LUT1_OUT" field="PORTMUX.CCLROUTEA.LUT1"/>
+                <signal pad-key="pa7" index="0" function="CCL" group="LUT1_OUT" field="PORTMUX.CCLROUTEA.LUT1"/>
+                <signal pad-key="pb0" index="0" function="CCL_IN" group="LUT2_IN" field="PORTMUX.CCLROUTEA.LUT2"/>
+                <signal pad-key="pb1" index="1" function="CCL_IN" group="LUT2_IN" field="PORTMUX.CCLROUTEA.LUT2"/>
+                <signal pad-key="pb2" index="2" function="CCL_IN" group="LUT2_IN" field="PORTMUX.CCLROUTEA.LUT2"/>
+                <signal pad-key="pb3" index="0" function="CCL" group="LUT2_OUT" field="PORTMUX.CCLROUTEA.LUT2"/>
+                <signal pad-key="pc0" index="0" function="CCL_IN" group="LUT3_IN" field="PORTMUX.CCLROUTEA.LUT3"/>
+                <signal pad-key="pc1" index="1" function="CCL_IN" group="LUT3_IN" field="PORTMUX.CCLROUTEA.LUT3"/>
+                <signal pad-key="pc2" index="2" function="CCL_IN" group="LUT3_IN" field="PORTMUX.CCLROUTEA.LUT3"/>
+                <signal pad-key="pa5" index="0" function="CCL_ALT" group="LUT3_OUT" field="PORTMUX.CCLROUTEA.LUT3"/>
             </signals>
         </peripheral>
         <peripheral key="clkctrl" name="CLKCTRL" module-key="chip_clkctrl">
             <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"/>
-                <signal pad-id="pb3" function="CLKCTRL" group="TOSC1"/>
-                <signal pad-id="pb2" function="CLKCTRL" group="TOSC2"/>
+                <signal pad-key="pa3" function="CLKCTRL" group="CLKI"/>
+                <signal pad-key="pb5" function="CLKCTRL" group="CLKO"/>
+                <signal pad-key="pb3" function="CLKCTRL" group="TOSC1"/>
+                <signal pad-key="pb2" function="CLKCTRL" group="TOSC2"/>
             </signals>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="cpu_avr_v2">
             <register-group-instance register-group-key="cpu" address-space-key="data" offset="0x30"/>
             <signals>
-                <signal pad-id="pa1" function="OTHER" group="BREAK"/>
+                <signal pad-key="pa1" function="OTHER" group="BREAK"/>
             </signals>
         </peripheral>
         <peripheral key="cpuint" name="CPUINT" module-key="int_8bit_v3">
@@ -121,10 +121,10 @@
         <peripheral key="evsys" name="EVSYS" module-key="ev_ctrl_v1">
             <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"/>
-                <signal pad-id="pb2" index="1" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTB"/>
-                <signal pad-id="pc2" index="2" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTC"/>
+                <signal pad-key="pa7" index="0" function="EVSYS_ALT" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTA"/>
+                <signal pad-key="pa2" index="0" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTA"/>
+                <signal pad-key="pb2" index="1" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTB"/>
+                <signal pad-key="pc2" index="2" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTC"/>
             </signals>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="chip_fuse">
@@ -142,34 +142,34 @@
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pa2" index="2" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa3" index="3" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa4" index="4" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa5" index="5" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa6" index="6" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa7" index="7" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa0" index="0" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa1" index="1" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa2" index="2" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa3" index="3" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa4" index="4" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa5" index="5" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa6" index="6" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa7" index="7" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pb2" index="2" function="IOPORT" group="PIN"/>
-                <signal pad-id="pb3" index="3" function="IOPORT" group="PIN"/>
-                <signal pad-id="pb4" index="4" function="IOPORT" group="PIN"/>
-                <signal pad-id="pb5" index="5" function="IOPORT" group="PIN"/>
+                <signal pad-key="pb0" index="0" function="IOPORT" group="PIN"/>
+                <signal pad-key="pb1" index="1" function="IOPORT" group="PIN"/>
+                <signal pad-key="pb2" index="2" function="IOPORT" group="PIN"/>
+                <signal pad-key="pb3" index="3" function="IOPORT" group="PIN"/>
+                <signal pad-key="pb4" index="4" function="IOPORT" group="PIN"/>
+                <signal pad-key="pb5" index="5" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pc2" index="2" function="IOPORT" group="PIN"/>
-                <signal pad-id="pc3" index="3" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc0" index="0" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc1" index="1" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc2" index="2" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc3" index="3" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="portmux" name="PORTMUX" module-key="chip_portmux">
@@ -178,8 +178,8 @@
         <peripheral key="rstctrl" name="RSTCTRL" module-key="rst_integration_avr_v1">
             <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"/>
+                <signal pad-key="pa0" function="OTHER" group="RESET"/>
+                <signal pad-key="pb4" function="OTHER" group="RESET_ALT"/>
             </signals>
         </peripheral>
         <peripheral key="rtc" name="RTC" module-key="tmr_16b_rtc_v1">
@@ -194,81 +194,81 @@
         <peripheral key="spi0" name="SPI0" module-key="spi_8bit_v2">
             <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"/>
-                <signal pad-id="pc2" function="SPI_ALT" group="MOSI" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <signal pad-id="pa1" function="SPI" group="MOSI" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <signal pad-id="pc0" function="SPI_ALT" group="SCK" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <signal pad-id="pa3" function="SPI" group="SCK" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <signal pad-id="pc3" function="SPI_ALT" group="SS" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <signal pad-id="pa4" function="SPI" group="SS" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pc1" function="SPI_ALT" group="MISO" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pa2" function="SPI" group="MISO" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pc2" function="SPI_ALT" group="MOSI" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pa1" function="SPI" group="MOSI" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pc0" function="SPI_ALT" group="SCK" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pa3" function="SPI" group="SCK" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pc3" function="SPI_ALT" group="SS" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pa4" function="SPI" group="SS" field="PORTMUX.SPIROUTEA.SPI0"/>
             </signals>
         </peripheral>
         <peripheral key="syscfg" name="SYSCFG" module-key="chip_syscfg">
             <register-group-instance register-group-key="syscfg" address-space-key="data" offset="0xF00"/>
             <signals>
-                <signal pad-id="pa0" function="PDI" group="UPDI"/>
+                <signal pad-key="pa0" function="PDI" group="UPDI"/>
             </signals>
         </peripheral>
         <peripheral key="tca0" name="TCA0" module-key="tmr_16b_pwm_v1">
             <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"/>
-                <signal pad-id="pb4" index="1" function="TCA_ALT" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pb1" index="1" function="TCA" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pb5" index="2" function="TCA_ALT" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pb2" index="2" function="TCA" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pc3" index="3" function="TCA_ALT" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pa3" index="3" function="TCA" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pa4" index="4" function="TCA" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pa5" index="5" function="TCA" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pb3" index="0" function="TCA_ALT" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pb0" index="0" function="TCA" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pb4" index="1" function="TCA_ALT" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pb1" index="1" function="TCA" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pb5" index="2" function="TCA_ALT" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pb2" index="2" function="TCA" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pc3" index="3" function="TCA_ALT" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pa3" index="3" function="TCA" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pa4" index="4" function="TCA" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pa5" index="5" function="TCA" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
             </signals>
         </peripheral>
         <peripheral key="tcb0" name="TCB0" module-key="tmr_16b_capture_v1">
             <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"/>
+                <signal pad-key="pc0" index="0" function="TCB0_ALT" group="WO" field="PORTMUX.TCBROUTEA.TCB0"/>
+                <signal pad-key="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 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"/>
+                <signal pad-key="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 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"/>
+                <signal pad-key="pb0" function="I2C" group="SCL"/>
+                <signal pad-key="pb1" function="I2C" group="SDA"/>
             </signals>
         </peripheral>
         <peripheral key="usart0" name="USART0" module-key="uart_autobd_v4">
             <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"/>
-                <signal pad-id="pa1" function="USART0_ALT" group="TXD" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pb2" function="USART0" group="TXD" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pa3" function="USART0_ALT" group="XCK" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pb1" function="USART0" group="XCK" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pa7" function="USART0_ALT" group="XDIR" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pb0" function="USART0" group="XDIR" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa2" function="USART0_ALT" group="RXD" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pb3" function="USART0" group="RXD" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa1" function="USART0_ALT" group="TXD" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pb2" function="USART0" group="TXD" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa3" function="USART0_ALT" group="XCK" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pb1" function="USART0" group="XCK" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa7" function="USART0_ALT" group="XDIR" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pb0" function="USART0" group="XDIR" field="PORTMUX.USARTROUTEA.USART0"/>
             </signals>
         </peripheral>
         <peripheral key="usart1" name="USART1" module-key="uart_autobd_v4">
             <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"/>
-                <signal pad-id="pc2" function="USART1_ALT" group="TXD" field="PORTMUX.USARTROUTEA.USART1"/>
-                <signal pad-id="pa1" function="USART1" group="TXD" field="PORTMUX.USARTROUTEA.USART1"/>
-                <signal pad-id="pc0" function="USART1_ALT" group="XCK" field="PORTMUX.USARTROUTEA.USART1"/>
-                <signal pad-id="pa3" function="USART1" group="XCK" field="PORTMUX.USARTROUTEA.USART1"/>
-                <signal pad-id="pc3" function="USART1_ALT" group="XDIR" field="PORTMUX.USARTROUTEA.USART1"/>
-                <signal pad-id="pa4" function="USART1" group="XDIR" field="PORTMUX.USARTROUTEA.USART1"/>
+                <signal pad-key="pc1" function="USART1_ALT" group="RXD" field="PORTMUX.USARTROUTEA.USART1"/>
+                <signal pad-key="pa2" function="USART1" group="RXD" field="PORTMUX.USARTROUTEA.USART1"/>
+                <signal pad-key="pc2" function="USART1_ALT" group="TXD" field="PORTMUX.USARTROUTEA.USART1"/>
+                <signal pad-key="pa1" function="USART1" group="TXD" field="PORTMUX.USARTROUTEA.USART1"/>
+                <signal pad-key="pc0" function="USART1_ALT" group="XCK" field="PORTMUX.USARTROUTEA.USART1"/>
+                <signal pad-key="pa3" function="USART1" group="XCK" field="PORTMUX.USARTROUTEA.USART1"/>
+                <signal pad-key="pc3" function="USART1_ALT" group="XDIR" field="PORTMUX.USARTROUTEA.USART1"/>
+                <signal pad-key="pa4" function="USART1" group="XDIR" field="PORTMUX.USARTROUTEA.USART1"/>
             </signals>
         </peripheral>
         <peripheral key="userrow" name="USERROW" module-key="chip_userrow">
@@ -1337,56 +1337,79 @@
             </register-group>
         </module>
     </modules>
+    <pads>
+        <pad key="pa2" name="PA2"/>
+        <pad key="pa3" name="PA3"/>
+        <pad key="gnd" name="GND"/>
+        <pad key="vcc" name="VCC"/>
+        <pad key="pa4" name="PA4"/>
+        <pad key="pa5" name="PA5"/>
+        <pad key="pa6" name="PA6"/>
+        <pad key="pa7" name="PA7"/>
+        <pad key="pb5" name="PB5"/>
+        <pad key="pb4" name="PB4"/>
+        <pad key="pb3" name="PB3"/>
+        <pad key="pb2" name="PB2"/>
+        <pad key="pb1" name="PB1"/>
+        <pad key="pb0" name="PB0"/>
+        <pad key="pc0" name="PC0"/>
+        <pad key="pc1" name="PC1"/>
+        <pad key="pc2" name="PC2"/>
+        <pad key="pc3" name="PC3"/>
+        <pad key="pa0" name="PA0"/>
+        <pad key="pa1" name="PA1"/>
+        <pad key="gnd1" name="GND1"/>
+    </pads>
     <pinouts>
         <pinout key="qfn20" name="QFN20" type="qfn">
-            <pin position="1" pad="PA2"/>
-            <pin position="2" pad="PA3"/>
-            <pin position="3" pad="GND"/>
-            <pin position="4" pad="VCC"/>
-            <pin position="5" pad="PA4"/>
-            <pin position="6" pad="PA5"/>
-            <pin position="7" pad="PA6"/>
-            <pin position="8" pad="PA7"/>
-            <pin position="9" pad="PB5"/>
-            <pin position="10" pad="PB4"/>
-            <pin position="11" pad="PB3"/>
-            <pin position="12" pad="PB2"/>
-            <pin position="13" pad="PB1"/>
-            <pin position="14" pad="PB0"/>
-            <pin position="15" pad="PC0"/>
-            <pin position="16" pad="PC1"/>
-            <pin position="17" pad="PC2"/>
-            <pin position="18" pad="PC3"/>
-            <pin position="19" pad="PA0"/>
-            <pin position="20" pad="PA1"/>
+            <pin position="1" pad-key="pa2"/>
+            <pin position="2" pad-key="pa3"/>
+            <pin position="3" pad-key="gnd"/>
+            <pin position="4" pad-key="vcc"/>
+            <pin position="5" pad-key="pa4"/>
+            <pin position="6" pad-key="pa5"/>
+            <pin position="7" pad-key="pa6"/>
+            <pin position="8" pad-key="pa7"/>
+            <pin position="9" pad-key="pb5"/>
+            <pin position="10" pad-key="pb4"/>
+            <pin position="11" pad-key="pb3"/>
+            <pin position="12" pad-key="pb2"/>
+            <pin position="13" pad-key="pb1"/>
+            <pin position="14" pad-key="pb0"/>
+            <pin position="15" pad-key="pc0"/>
+            <pin position="16" pad-key="pc1"/>
+            <pin position="17" pad-key="pc2"/>
+            <pin position="18" pad-key="pc3"/>
+            <pin position="19" pad-key="pa0"/>
+            <pin position="20" pad-key="pa1"/>
         </pinout>
         <pinout key="soic20" name="SOIC20" type="soic">
-            <pin position="1" pad="VCC"/>
-            <pin position="2" pad="PA4"/>
-            <pin position="3" pad="PA5"/>
-            <pin position="4" pad="PA6"/>
-            <pin position="5" pad="PA7"/>
-            <pin position="6" pad="PB5"/>
-            <pin position="7" pad="PB4"/>
-            <pin position="8" pad="PB3"/>
-            <pin position="9" pad="PB2"/>
-            <pin position="10" pad="PB1"/>
-            <pin position="11" pad="PB0"/>
-            <pin position="12" pad="PC0"/>
-            <pin position="13" pad="PC1"/>
-            <pin position="14" pad="PC2"/>
-            <pin position="15" pad="PC3"/>
-            <pin position="16" pad="PA0"/>
-            <pin position="17" pad="PA1"/>
-            <pin position="18" pad="PA2"/>
-            <pin position="19" pad="PA3"/>
-            <pin position="20" pad="GND1"/>
+            <pin position="1" pad-key="vcc"/>
+            <pin position="2" pad-key="pa4"/>
+            <pin position="3" pad-key="pa5"/>
+            <pin position="4" pad-key="pa6"/>
+            <pin position="5" pad-key="pa7"/>
+            <pin position="6" pad-key="pb5"/>
+            <pin position="7" pad-key="pb4"/>
+            <pin position="8" pad-key="pb3"/>
+            <pin position="9" pad-key="pb2"/>
+            <pin position="10" pad-key="pb1"/>
+            <pin position="11" pad-key="pb0"/>
+            <pin position="12" pad-key="pc0"/>
+            <pin position="13" pad-key="pc1"/>
+            <pin position="14" pad-key="pc2"/>
+            <pin position="15" pad-key="pc3"/>
+            <pin position="16" pad-key="pa0"/>
+            <pin position="17" pad-key="pa1"/>
+            <pin position="18" pad-key="pa2"/>
+            <pin position="19" pad-key="pa3"/>
+            <pin position="20" pad-key="gnd1"/>
         </pinout>
     </pinouts>
     <variants>
-        <variant name="ATtiny1626-MFR" pinout-key="qfn20" package="VQFN20"/>
-        <variant name="ATtiny1626-MUR" pinout-key="qfn20" package="VQFN20"/>
-        <variant name="ATtiny1626-SFR" pinout-key="soic20" package="SOIC20"/>
-        <variant name="ATtiny1626-SUR" pinout-key="soic20" package="SOIC20"/>
+        <variant key="attiny1626_mfr" name="ATtiny1626-MFR" pinout-key="qfn20"/>
+        <variant key="attiny1626_mur" name="ATtiny1626-MUR" pinout-key="qfn20"/>
+        <variant key="attiny1626_sfr" name="ATtiny1626-SFR" pinout-key="soic20"/>
+        <variant key="attiny1626_sur" name="ATtiny1626-SUR" pinout-key="soic20"/>
     </variants>
 </device>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY1627.xml b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY1627.xml
index 0ab1ba50..4da8a849 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY1627.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY1627.xml
@@ -44,34 +44,34 @@
         <peripheral key="ac0" name="AC0" module-key="cmp_control_avr_v3">
             <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"/>
-                <signal pad-id="pb0" index="2" function="AC0" group="N"/>
-                <signal pad-id="pa5" index="0" function="AC0" group="OUT"/>
-                <signal pad-id="pa7" index="0" function="AC0" group="P"/>
-                <signal pad-id="pb5" index="1" function="AC0" group="P"/>
-                <signal pad-id="pb1" index="2" function="AC0" group="P"/>
-                <signal pad-id="pb6" index="3" function="AC0" group="P"/>
+                <signal pad-key="pa6" index="0" function="AC0" group="N"/>
+                <signal pad-key="pb4" index="1" function="AC0" group="N"/>
+                <signal pad-key="pb0" index="2" function="AC0" group="N"/>
+                <signal pad-key="pa5" index="0" function="AC0" group="OUT"/>
+                <signal pad-key="pa7" index="0" function="AC0" group="P"/>
+                <signal pad-key="pb5" index="1" function="AC0" group="P"/>
+                <signal pad-key="pb1" index="2" function="AC0" group="P"/>
+                <signal pad-key="pb6" index="3" function="AC0" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="adc0" name="ADC0" module-key="adc_12b_diff_ctrl_v2">
             <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"/>
-                <signal pad-id="pa3" index="3" function="AIN0" group="AIN"/>
-                <signal pad-id="pa4" index="4" function="AIN0" group="AIN"/>
-                <signal pad-id="pa5" index="5" function="AIN0" group="AIN"/>
-                <signal pad-id="pa6" index="6" function="AIN0" group="AIN"/>
-                <signal pad-id="pa7" index="7" function="AIN0" group="AIN"/>
-                <signal pad-id="pb5" index="8" function="AIN0" group="AIN"/>
-                <signal pad-id="pb4" index="9" function="AIN0" group="AIN"/>
-                <signal pad-id="pb1" index="10" function="AIN0" group="AIN"/>
-                <signal pad-id="pb0" index="11" function="AIN0" group="AIN"/>
-                <signal pad-id="pc0" index="12" function="AIN0" group="AIN"/>
-                <signal pad-id="pc1" index="13" function="AIN0" group="AIN"/>
-                <signal pad-id="pc2" index="14" function="AIN0" group="AIN"/>
-                <signal pad-id="pc3" index="15" function="AIN0" group="AIN"/>
+                <signal pad-key="pa1" index="1" function="AIN0" group="AIN"/>
+                <signal pad-key="pa2" index="2" function="AIN0" group="AIN"/>
+                <signal pad-key="pa3" index="3" function="AIN0" group="AIN"/>
+                <signal pad-key="pa4" index="4" function="AIN0" group="AIN"/>
+                <signal pad-key="pa5" index="5" function="AIN0" group="AIN"/>
+                <signal pad-key="pa6" index="6" function="AIN0" group="AIN"/>
+                <signal pad-key="pa7" index="7" function="AIN0" group="AIN"/>
+                <signal pad-key="pb5" index="8" function="AIN0" group="AIN"/>
+                <signal pad-key="pb4" index="9" function="AIN0" group="AIN"/>
+                <signal pad-key="pb1" index="10" function="AIN0" group="AIN"/>
+                <signal pad-key="pb0" index="11" function="AIN0" group="AIN"/>
+                <signal pad-key="pc0" index="12" function="AIN0" group="AIN"/>
+                <signal pad-key="pc1" index="13" function="AIN0" group="AIN"/>
+                <signal pad-key="pc2" index="14" function="AIN0" group="AIN"/>
+                <signal pad-key="pc3" index="15" function="AIN0" group="AIN"/>
             </signals>
         </peripheral>
         <peripheral key="bod" name="BOD" module-key="bor_lvd_ctrl_avr_v1">
@@ -80,42 +80,42 @@
         <peripheral key="ccl" name="CCL" module-key="cla_ccl_v1">
             <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"/>
-                <signal pad-id="pa2" index="2" function="CCL_IN" group="LUT0_IN" field="PORTMUX.CCLROUTEA.LUT0"/>
-                <signal pad-id="pb4" index="0" function="CCL_ALT" group="LUT0_OUT" field="PORTMUX.CCLROUTEA.LUT0"/>
-                <signal pad-id="pa4" index="0" function="CCL" group="LUT0_OUT" field="PORTMUX.CCLROUTEA.LUT0"/>
-                <signal pad-id="pc3" index="0" function="CCL_IN" group="LUT1_IN" field="PORTMUX.CCLROUTEA.LUT1"/>
-                <signal pad-id="pc4" index="1" function="CCL_IN" group="LUT1_IN" field="PORTMUX.CCLROUTEA.LUT1"/>
-                <signal pad-id="pc5" index="2" function="CCL_IN" group="LUT1_IN" field="PORTMUX.CCLROUTEA.LUT1"/>
-                <signal pad-id="pc1" index="0" function="CCL_ALT" group="LUT1_OUT" field="PORTMUX.CCLROUTEA.LUT1"/>
-                <signal pad-id="pa7" index="0" function="CCL" group="LUT1_OUT" field="PORTMUX.CCLROUTEA.LUT1"/>
-                <signal pad-id="pb0" index="0" function="CCL_IN" group="LUT2_IN" field="PORTMUX.CCLROUTEA.LUT2"/>
-                <signal pad-id="pb1" index="1" function="CCL_IN" group="LUT2_IN" field="PORTMUX.CCLROUTEA.LUT2"/>
-                <signal pad-id="pb2" index="2" function="CCL_IN" group="LUT2_IN" field="PORTMUX.CCLROUTEA.LUT2"/>
-                <signal pad-id="pb6" index="0" function="CCL_ALT" group="LUT2_OUT" field="PORTMUX.CCLROUTEA.LUT2"/>
-                <signal pad-id="pb3" index="0" function="CCL" group="LUT2_OUT" field="PORTMUX.CCLROUTEA.LUT2"/>
-                <signal pad-id="pc0" index="0" function="CCL_IN" group="LUT3_IN" field="PORTMUX.CCLROUTEA.LUT3"/>
-                <signal pad-id="pc1" index="1" function="CCL_IN" group="LUT3_IN" field="PORTMUX.CCLROUTEA.LUT3"/>
-                <signal pad-id="pc2" index="2" function="CCL_IN" group="LUT3_IN" field="PORTMUX.CCLROUTEA.LUT3"/>
-                <signal pad-id="pa5" index="0" function="CCL_ALT" group="LUT3_OUT" field="PORTMUX.CCLROUTEA.LUT3"/>
-                <signal pad-id="pc4" index="0" function="CCL" group="LUT3_OUT" field="PORTMUX.CCLROUTEA.LUT3"/>
+                <signal pad-key="pa0" index="0" function="CCL_IN" group="LUT0_IN" field="PORTMUX.CCLROUTEA.LUT0"/>
+                <signal pad-key="pa1" index="1" function="CCL_IN" group="LUT0_IN" field="PORTMUX.CCLROUTEA.LUT0"/>
+                <signal pad-key="pa2" index="2" function="CCL_IN" group="LUT0_IN" field="PORTMUX.CCLROUTEA.LUT0"/>
+                <signal pad-key="pb4" index="0" function="CCL_ALT" group="LUT0_OUT" field="PORTMUX.CCLROUTEA.LUT0"/>
+                <signal pad-key="pa4" index="0" function="CCL" group="LUT0_OUT" field="PORTMUX.CCLROUTEA.LUT0"/>
+                <signal pad-key="pc3" index="0" function="CCL_IN" group="LUT1_IN" field="PORTMUX.CCLROUTEA.LUT1"/>
+                <signal pad-key="pc4" index="1" function="CCL_IN" group="LUT1_IN" field="PORTMUX.CCLROUTEA.LUT1"/>
+                <signal pad-key="pc5" index="2" function="CCL_IN" group="LUT1_IN" field="PORTMUX.CCLROUTEA.LUT1"/>
+                <signal pad-key="pc1" index="0" function="CCL_ALT" group="LUT1_OUT" field="PORTMUX.CCLROUTEA.LUT1"/>
+                <signal pad-key="pa7" index="0" function="CCL" group="LUT1_OUT" field="PORTMUX.CCLROUTEA.LUT1"/>
+                <signal pad-key="pb0" index="0" function="CCL_IN" group="LUT2_IN" field="PORTMUX.CCLROUTEA.LUT2"/>
+                <signal pad-key="pb1" index="1" function="CCL_IN" group="LUT2_IN" field="PORTMUX.CCLROUTEA.LUT2"/>
+                <signal pad-key="pb2" index="2" function="CCL_IN" group="LUT2_IN" field="PORTMUX.CCLROUTEA.LUT2"/>
+                <signal pad-key="pb6" index="0" function="CCL_ALT" group="LUT2_OUT" field="PORTMUX.CCLROUTEA.LUT2"/>
+                <signal pad-key="pb3" index="0" function="CCL" group="LUT2_OUT" field="PORTMUX.CCLROUTEA.LUT2"/>
+                <signal pad-key="pc0" index="0" function="CCL_IN" group="LUT3_IN" field="PORTMUX.CCLROUTEA.LUT3"/>
+                <signal pad-key="pc1" index="1" function="CCL_IN" group="LUT3_IN" field="PORTMUX.CCLROUTEA.LUT3"/>
+                <signal pad-key="pc2" index="2" function="CCL_IN" group="LUT3_IN" field="PORTMUX.CCLROUTEA.LUT3"/>
+                <signal pad-key="pa5" index="0" function="CCL_ALT" group="LUT3_OUT" field="PORTMUX.CCLROUTEA.LUT3"/>
+                <signal pad-key="pc4" index="0" function="CCL" group="LUT3_OUT" field="PORTMUX.CCLROUTEA.LUT3"/>
             </signals>
         </peripheral>
         <peripheral key="clkctrl" name="CLKCTRL" module-key="chip_clkctrl">
             <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"/>
-                <signal pad-id="pb3" function="CLKCTRL" group="TOSC1"/>
-                <signal pad-id="pb2" function="CLKCTRL" group="TOSC2"/>
+                <signal pad-key="pa3" function="CLKCTRL" group="CLKI"/>
+                <signal pad-key="pb5" function="CLKCTRL" group="CLKO"/>
+                <signal pad-key="pb3" function="CLKCTRL" group="TOSC1"/>
+                <signal pad-key="pb2" function="CLKCTRL" group="TOSC2"/>
             </signals>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="cpu_avr_v2">
             <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"/>
+                <signal pad-key="pa1" function="OTHER" group="BREAK"/>
+                <signal pad-key="pc4" function="OTHER" group="BREAK_ALT"/>
             </signals>
         </peripheral>
         <peripheral key="cpuint" name="CPUINT" module-key="int_8bit_v3">
@@ -127,11 +127,11 @@
         <peripheral key="evsys" name="EVSYS" module-key="ev_ctrl_v1">
             <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"/>
-                <signal pad-id="pb7" index="1" function="EVSYS_ALT" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTB"/>
-                <signal pad-id="pb2" index="1" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTB"/>
-                <signal pad-id="pc2" index="2" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTC"/>
+                <signal pad-key="pa7" index="0" function="EVSYS_ALT" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTA"/>
+                <signal pad-key="pa2" index="0" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTA"/>
+                <signal pad-key="pb7" index="1" function="EVSYS_ALT" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTB"/>
+                <signal pad-key="pb2" index="1" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTB"/>
+                <signal pad-key="pc2" index="2" function="EVSYS" group="EVOUT" field="PORTMUX.EVSYSROUTEA.EVOUTC"/>
             </signals>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="chip_fuse">
@@ -149,38 +149,38 @@
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pa2" index="2" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa3" index="3" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa4" index="4" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa5" index="5" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa6" index="6" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa7" index="7" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa0" index="0" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa1" index="1" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa2" index="2" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa3" index="3" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa4" index="4" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa5" index="5" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa6" index="6" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa7" index="7" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pb2" index="2" function="IOPORT" group="PIN"/>
-                <signal pad-id="pb3" index="3" function="IOPORT" group="PIN"/>
-                <signal pad-id="pb4" index="4" function="IOPORT" group="PIN"/>
-                <signal pad-id="pb5" index="5" function="IOPORT" group="PIN"/>
-                <signal pad-id="pb6" index="6" function="IOPORT" group="PIN"/>
-                <signal pad-id="pb7" index="7" function="IOPORT" group="PIN"/>
+                <signal pad-key="pb0" index="0" function="IOPORT" group="PIN"/>
+                <signal pad-key="pb1" index="1" function="IOPORT" group="PIN"/>
+                <signal pad-key="pb2" index="2" function="IOPORT" group="PIN"/>
+                <signal pad-key="pb3" index="3" function="IOPORT" group="PIN"/>
+                <signal pad-key="pb4" index="4" function="IOPORT" group="PIN"/>
+                <signal pad-key="pb5" index="5" function="IOPORT" group="PIN"/>
+                <signal pad-key="pb6" index="6" function="IOPORT" group="PIN"/>
+                <signal pad-key="pb7" index="7" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pc2" index="2" function="IOPORT" group="PIN"/>
-                <signal pad-id="pc3" index="3" function="IOPORT" group="PIN"/>
-                <signal pad-id="pc4" index="4" function="IOPORT" group="PIN"/>
-                <signal pad-id="pc5" index="5" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc0" index="0" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc1" index="1" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc2" index="2" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc3" index="3" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc4" index="4" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc5" index="5" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="portmux" name="PORTMUX" module-key="chip_portmux">
@@ -189,8 +189,8 @@
         <peripheral key="rstctrl" name="RSTCTRL" module-key="rst_integration_avr_v1">
             <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"/>
+                <signal pad-key="pa0" function="OTHER" group="RESET"/>
+                <signal pad-key="pb4" function="OTHER" group="RESET_ALT"/>
             </signals>
         </peripheral>
         <peripheral key="rtc" name="RTC" module-key="tmr_16b_rtc_v1">
@@ -205,84 +205,84 @@
         <peripheral key="spi0" name="SPI0" module-key="spi_8bit_v2">
             <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"/>
-                <signal pad-id="pc2" function="SPI_ALT" group="MOSI" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <signal pad-id="pa1" function="SPI" group="MOSI" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <signal pad-id="pc0" function="SPI_ALT" group="SCK" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <signal pad-id="pa3" function="SPI" group="SCK" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <signal pad-id="pc3" function="SPI_ALT" group="SS" field="PORTMUX.SPIROUTEA.SPI0"/>
-                <signal pad-id="pa4" function="SPI" group="SS" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pc1" function="SPI_ALT" group="MISO" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pa2" function="SPI" group="MISO" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pc2" function="SPI_ALT" group="MOSI" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pa1" function="SPI" group="MOSI" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pc0" function="SPI_ALT" group="SCK" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pa3" function="SPI" group="SCK" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pc3" function="SPI_ALT" group="SS" field="PORTMUX.SPIROUTEA.SPI0"/>
+                <signal pad-key="pa4" function="SPI" group="SS" field="PORTMUX.SPIROUTEA.SPI0"/>
             </signals>
         </peripheral>
         <peripheral key="syscfg" name="SYSCFG" module-key="chip_syscfg">
             <register-group-instance register-group-key="syscfg" address-space-key="data" offset="0xF00"/>
             <signals>
-                <signal pad-id="pa0" function="PDI" group="UPDI"/>
+                <signal pad-key="pa0" function="PDI" group="UPDI"/>
             </signals>
         </peripheral>
         <peripheral key="tca0" name="TCA0" module-key="tmr_16b_pwm_v1">
             <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"/>
-                <signal pad-id="pb4" index="1" function="TCA_ALT" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pb1" index="1" function="TCA" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pb5" index="2" function="TCA_ALT" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pb2" index="2" function="TCA" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pc3" index="3" function="TCA_ALT" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pa3" index="3" function="TCA" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pc4" index="4" function="TCA_ALT" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pa4" index="4" function="TCA" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pc5" index="5" function="TCA_ALT" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
-                <signal pad-id="pa5" index="5" function="TCA" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pb3" index="0" function="TCA_ALT" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pb0" index="0" function="TCA" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pb4" index="1" function="TCA_ALT" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pb1" index="1" function="TCA" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pb5" index="2" function="TCA_ALT" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pb2" index="2" function="TCA" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pc3" index="3" function="TCA_ALT" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pa3" index="3" function="TCA" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pc4" index="4" function="TCA_ALT" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pa4" index="4" function="TCA" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pc5" index="5" function="TCA_ALT" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
+                <signal pad-key="pa5" index="5" function="TCA" group="WO" field="PORTMUX.TCAROUTEA.TCA0"/>
             </signals>
         </peripheral>
         <peripheral key="tcb0" name="TCB0" module-key="tmr_16b_capture_v1">
             <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"/>
+                <signal pad-key="pc0" index="0" function="TCB0_ALT" group="WO" field="PORTMUX.TCBROUTEA.TCB0"/>
+                <signal pad-key="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 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"/>
+                <signal pad-key="pc4" index="0" function="TCB1_ALT" group="WO" field="PORTMUX.TCBROUTEA.TCB1"/>
+                <signal pad-key="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 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"/>
+                <signal pad-key="pb0" function="I2C" group="SCL"/>
+                <signal pad-key="pb1" function="I2C" group="SDA"/>
             </signals>
         </peripheral>
         <peripheral key="usart0" name="USART0" module-key="uart_autobd_v4">
             <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"/>
-                <signal pad-id="pa1" function="USART0_ALT" group="TXD" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pb2" function="USART0" group="TXD" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pa3" function="USART0_ALT" group="XCK" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pb1" function="USART0" group="XCK" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pa7" function="USART0_ALT" group="XDIR" field="PORTMUX.USARTROUTEA.USART0"/>
-                <signal pad-id="pb0" function="USART0" group="XDIR" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa2" function="USART0_ALT" group="RXD" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pb3" function="USART0" group="RXD" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa1" function="USART0_ALT" group="TXD" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pb2" function="USART0" group="TXD" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa3" function="USART0_ALT" group="XCK" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pb1" function="USART0" group="XCK" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pa7" function="USART0_ALT" group="XDIR" field="PORTMUX.USARTROUTEA.USART0"/>
+                <signal pad-key="pb0" function="USART0" group="XDIR" field="PORTMUX.USARTROUTEA.USART0"/>
             </signals>
         </peripheral>
         <peripheral key="usart1" name="USART1" module-key="uart_autobd_v4">
             <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"/>
-                <signal pad-id="pc2" function="USART1_ALT" group="TXD" field="PORTMUX.USARTROUTEA.USART1"/>
-                <signal pad-id="pa1" function="USART1" group="TXD" field="PORTMUX.USARTROUTEA.USART1"/>
-                <signal pad-id="pc0" function="USART1_ALT" group="XCK" field="PORTMUX.USARTROUTEA.USART1"/>
-                <signal pad-id="pa3" function="USART1" group="XCK" field="PORTMUX.USARTROUTEA.USART1"/>
-                <signal pad-id="pc3" function="USART1_ALT" group="XDIR" field="PORTMUX.USARTROUTEA.USART1"/>
-                <signal pad-id="pa4" function="USART1" group="XDIR" field="PORTMUX.USARTROUTEA.USART1"/>
+                <signal pad-key="pc1" function="USART1_ALT" group="RXD" field="PORTMUX.USARTROUTEA.USART1"/>
+                <signal pad-key="pa2" function="USART1" group="RXD" field="PORTMUX.USARTROUTEA.USART1"/>
+                <signal pad-key="pc2" function="USART1_ALT" group="TXD" field="PORTMUX.USARTROUTEA.USART1"/>
+                <signal pad-key="pa1" function="USART1" group="TXD" field="PORTMUX.USARTROUTEA.USART1"/>
+                <signal pad-key="pc0" function="USART1_ALT" group="XCK" field="PORTMUX.USARTROUTEA.USART1"/>
+                <signal pad-key="pa3" function="USART1" group="XCK" field="PORTMUX.USARTROUTEA.USART1"/>
+                <signal pad-key="pc3" function="USART1_ALT" group="XDIR" field="PORTMUX.USARTROUTEA.USART1"/>
+                <signal pad-key="pa4" function="USART1" group="XDIR" field="PORTMUX.USARTROUTEA.USART1"/>
             </signals>
         </peripheral>
         <peripheral key="userrow" name="USERROW" module-key="chip_userrow">
@@ -1351,36 +1351,62 @@
             </register-group>
         </module>
     </modules>
+    <pads>
+        <pad key="pa2" name="PA2"/>
+        <pad key="pa3" name="PA3"/>
+        <pad key="gnd1" name="GND1"/>
+        <pad key="vcc" name="VCC"/>
+        <pad key="pa4" name="PA4"/>
+        <pad key="pa5" name="PA5"/>
+        <pad key="pa6" name="PA6"/>
+        <pad key="pa7" name="PA7"/>
+        <pad key="pb7" name="PB7"/>
+        <pad key="pb6" name="PB6"/>
+        <pad key="pb5" name="PB5"/>
+        <pad key="pb4" name="PB4"/>
+        <pad key="pb3" name="PB3"/>
+        <pad key="pb2" name="PB2"/>
+        <pad key="pb1" name="PB1"/>
+        <pad key="pb0" name="PB0"/>
+        <pad key="pc0" name="PC0"/>
+        <pad key="pc1" name="PC1"/>
+        <pad key="pc2" name="PC2"/>
+        <pad key="pc3" name="PC3"/>
+        <pad key="pc4" name="PC4"/>
+        <pad key="pc5" name="PC5"/>
+        <pad key="pa0" name="PA0"/>
+        <pad key="pa1" name="PA1"/>
+    </pads>
     <pinouts>
         <pinout key="qfn24" name="QFN24" type="qfn">
-            <pin position="1" pad="PA2"/>
-            <pin position="2" pad="PA3"/>
-            <pin position="3" pad="GND1"/>
-            <pin position="4" pad="VCC"/>
-            <pin position="5" pad="PA4"/>
-            <pin position="6" pad="PA5"/>
-            <pin position="7" pad="PA6"/>
-            <pin position="8" pad="PA7"/>
-            <pin position="9" pad="PB7"/>
-            <pin position="10" pad="PB6"/>
-            <pin position="11" pad="PB5"/>
-            <pin position="12" pad="PB4"/>
-            <pin position="13" pad="PB3"/>
-            <pin position="14" pad="PB2"/>
-            <pin position="15" pad="PB1"/>
-            <pin position="16" pad="PB0"/>
-            <pin position="17" pad="PC0"/>
-            <pin position="18" pad="PC1"/>
-            <pin position="19" pad="PC2"/>
-            <pin position="20" pad="PC3"/>
-            <pin position="21" pad="PC4"/>
-            <pin position="22" pad="PC5"/>
-            <pin position="23" pad="PA0"/>
-            <pin position="24" pad="PA1"/>
+            <pin position="1" pad-key="pa2"/>
+            <pin position="2" pad-key="pa3"/>
+            <pin position="3" pad-key="gnd1"/>
+            <pin position="4" pad-key="vcc"/>
+            <pin position="5" pad-key="pa4"/>
+            <pin position="6" pad-key="pa5"/>
+            <pin position="7" pad-key="pa6"/>
+            <pin position="8" pad-key="pa7"/>
+            <pin position="9" pad-key="pb7"/>
+            <pin position="10" pad-key="pb6"/>
+            <pin position="11" pad-key="pb5"/>
+            <pin position="12" pad-key="pb4"/>
+            <pin position="13" pad-key="pb3"/>
+            <pin position="14" pad-key="pb2"/>
+            <pin position="15" pad-key="pb1"/>
+            <pin position="16" pad-key="pb0"/>
+            <pin position="17" pad-key="pc0"/>
+            <pin position="18" pad-key="pc1"/>
+            <pin position="19" pad-key="pc2"/>
+            <pin position="20" pad-key="pc3"/>
+            <pin position="21" pad-key="pc4"/>
+            <pin position="22" pad-key="pc5"/>
+            <pin position="23" pad-key="pa0"/>
+            <pin position="24" pad-key="pa1"/>
         </pinout>
     </pinouts>
     <variants>
-        <variant name="ATtiny1627-MFR" pinout-key="qfn24" package="VQFN24"/>
-        <variant name="ATtiny1627-MUR" pinout-key="qfn24" package="VQFN24"/>
+        <variant key="attiny1627_mfr" name="ATtiny1627-MFR" pinout-key="qfn24"/>
+        <variant key="attiny1627_mur" name="ATtiny1627-MUR" pinout-key="qfn24"/>
     </variants>
 </device>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY1634.xml b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY1634.xml
index d99fa139..d8bf751c 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY1634.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY1634.xml
@@ -173,34 +173,34 @@
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pb2" index="2" function="PORTB" group="P"/>
-                <signal pad-id="pb3" index="3" function="PORTB" group="P"/>
+                <signal pad-key="pb0" index="0" function="PORTB" group="P"/>
+                <signal pad-key="pb1" index="1" function="PORTB" group="P"/>
+                <signal pad-key="pb2" index="2" function="PORTB" group="P"/>
+                <signal pad-key="pb3" index="3" function="PORTB" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pc2" index="2" function="PORTC" group="P"/>
-                <signal pad-id="pc3" index="3" function="PORTC" group="P"/>
-                <signal pad-id="pc4" index="4" function="PORTC" group="P"/>
-                <signal pad-id="pc5" index="5" function="PORTC" group="P"/>
+                <signal pad-key="pc0" index="0" function="PORTC" group="P"/>
+                <signal pad-key="pc1" index="1" function="PORTC" group="P"/>
+                <signal pad-key="pc2" index="2" function="PORTC" group="P"/>
+                <signal pad-key="pc3" index="3" function="PORTC" group="P"/>
+                <signal pad-key="pc4" index="4" function="PORTC" group="P"/>
+                <signal pad-key="pc5" index="5" function="PORTC" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pa2" index="2" function="PORTA" group="P"/>
-                <signal pad-id="pa3" index="3" function="PORTA" group="P"/>
-                <signal pad-id="pa4" index="4" function="PORTA" group="P"/>
-                <signal pad-id="pa5" index="5" function="PORTA" group="P"/>
-                <signal pad-id="pa6" index="6" function="PORTA" group="P"/>
-                <signal pad-id="pa7" index="7" function="PORTA" group="P"/>
+                <signal pad-key="pa0" index="0" function="PORTA" group="P"/>
+                <signal pad-key="pa1" index="1" function="PORTA" group="P"/>
+                <signal pad-key="pa2" index="2" function="PORTA" group="P"/>
+                <signal pad-key="pa3" index="3" function="PORTA" group="P"/>
+                <signal pad-key="pa4" index="4" function="PORTA" group="P"/>
+                <signal pad-key="pa5" index="5" function="PORTA" group="P"/>
+                <signal pad-key="pa6" index="6" function="PORTA" group="P"/>
+                <signal pad-key="pa7" index="7" function="PORTA" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="adc" name="ADC" module-key="adc">
@@ -675,54 +675,76 @@
             </register-group>
         </module>
     </modules>
+    <pads>
+        <pad key="pb0" name="PB0"/>
+        <pad key="pa7" name="PA7"/>
+        <pad key="pa6" name="PA6"/>
+        <pad key="pa5" name="PA5"/>
+        <pad key="pa4" name="PA4"/>
+        <pad key="pa3" name="PA3"/>
+        <pad key="pa2" name="PA2"/>
+        <pad key="pa1" name="PA1"/>
+        <pad key="pa0" name="PA0"/>
+        <pad key="gnd" name="GND"/>
+        <pad key="vcc" name="VCC"/>
+        <pad key="pc5" name="PC5"/>
+        <pad key="pc4" name="PC4"/>
+        <pad key="pc3" name="PC3"/>
+        <pad key="pc2" name="PC2"/>
+        <pad key="pc1" name="PC1"/>
+        <pad key="pc0" name="PC0"/>
+        <pad key="pb3" name="PB3"/>
+        <pad key="pb2" name="PB2"/>
+        <pad key="pb1" name="PB1"/>
+    </pads>
     <pinouts>
         <pinout key="soic_20" name="SOIC_20" type="soic">
-            <pin position="1" pad="PB0"/>
-            <pin position="2" pad="PA7"/>
-            <pin position="3" pad="PA6"/>
-            <pin position="4" pad="PA5"/>
-            <pin position="5" pad="PA4"/>
-            <pin position="6" pad="PA3"/>
-            <pin position="7" pad="PA2"/>
-            <pin position="8" pad="PA1"/>
-            <pin position="9" pad="PA0"/>
-            <pin position="10" pad="GND"/>
-            <pin position="11" pad="VCC"/>
-            <pin position="12" pad="PC5"/>
-            <pin position="13" pad="PC4"/>
-            <pin position="14" pad="PC3"/>
-            <pin position="15" pad="PC2"/>
-            <pin position="16" pad="PC1"/>
-            <pin position="17" pad="PC0"/>
-            <pin position="18" pad="PB3"/>
-            <pin position="19" pad="PB2"/>
-            <pin position="20" pad="PB1"/>
+            <pin position="1" pad-key="pb0"/>
+            <pin position="2" pad-key="pa7"/>
+            <pin position="3" pad-key="pa6"/>
+            <pin position="4" pad-key="pa5"/>
+            <pin position="5" pad-key="pa4"/>
+            <pin position="6" pad-key="pa3"/>
+            <pin position="7" pad-key="pa2"/>
+            <pin position="8" pad-key="pa1"/>
+            <pin position="9" pad-key="pa0"/>
+            <pin position="10" pad-key="gnd"/>
+            <pin position="11" pad-key="vcc"/>
+            <pin position="12" pad-key="pc5"/>
+            <pin position="13" pad-key="pc4"/>
+            <pin position="14" pad-key="pc3"/>
+            <pin position="15" pad-key="pc2"/>
+            <pin position="16" pad-key="pc1"/>
+            <pin position="17" pad-key="pc0"/>
+            <pin position="18" pad-key="pb3"/>
+            <pin position="19" pad-key="pb2"/>
+            <pin position="20" pad-key="pb1"/>
         </pinout>
         <pinout key="qfn_20" name="QFN_20" type="qfn">
-            <pin position="1" pad="PA6"/>
-            <pin position="2" pad="PA5"/>
-            <pin position="3" pad="PA4"/>
-            <pin position="4" pad="PA3"/>
-            <pin position="5" pad="PA2"/>
-            <pin position="6" pad="PA1"/>
-            <pin position="7" pad="PA0"/>
-            <pin position="8" pad="GND"/>
-            <pin position="9" pad="VCC"/>
-            <pin position="10" pad="PC5"/>
-            <pin position="11" pad="PC4"/>
-            <pin position="12" pad="PC3"/>
-            <pin position="13" pad="PC2"/>
-            <pin position="14" pad="PC1"/>
-            <pin position="15" pad="PC0"/>
-            <pin position="16" pad="PB3"/>
-            <pin position="17" pad="PB2"/>
-            <pin position="18" pad="PB1"/>
-            <pin position="19" pad="PB0"/>
-            <pin position="20" pad="PA7"/>
+            <pin position="1" pad-key="pa6"/>
+            <pin position="2" pad-key="pa5"/>
+            <pin position="3" pad-key="pa4"/>
+            <pin position="4" pad-key="pa3"/>
+            <pin position="5" pad-key="pa2"/>
+            <pin position="6" pad-key="pa1"/>
+            <pin position="7" pad-key="pa0"/>
+            <pin position="8" pad-key="gnd"/>
+            <pin position="9" pad-key="vcc"/>
+            <pin position="10" pad-key="pc5"/>
+            <pin position="11" pad-key="pc4"/>
+            <pin position="12" pad-key="pc3"/>
+            <pin position="13" pad-key="pc2"/>
+            <pin position="14" pad-key="pc1"/>
+            <pin position="15" pad-key="pc0"/>
+            <pin position="16" pad-key="pb3"/>
+            <pin position="17" pad-key="pb2"/>
+            <pin position="18" pad-key="pb1"/>
+            <pin position="19" pad-key="pb0"/>
+            <pin position="20" pad-key="pa7"/>
         </pinout>
     </pinouts>
     <variants>
-        <variant name="ATtiny1634-SU" pinout-key="soic_20" package="SOIC20"/>
-        <variant name="ATtiny1634-MU" pinout-key="qfn_20" package="WQFN20"/>
+        <variant key="attiny1634_su" name="ATtiny1634-SU" pinout-key="soic_20"/>
+        <variant key="attiny1634_mu" name="ATtiny1634-MU" pinout-key="qfn_20"/>
     </variants>
 </device>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY167.xml b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY167.xml
index 55d3fd43..d0a02fa3 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY167.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY167.xml
@@ -172,27 +172,27 @@
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pa2" index="2" function="default" group="P"/>
-                <signal pad-id="pa3" index="3" function="default" group="P"/>
-                <signal pad-id="pa4" index="4" function="default" group="P"/>
-                <signal pad-id="pa5" index="5" function="default" group="P"/>
-                <signal pad-id="pa6" index="6" function="default" group="P"/>
-                <signal pad-id="pa7" index="7" function="default" group="P"/>
+                <signal pad-key="pa0" index="0" function="default" group="P"/>
+                <signal pad-key="pa1" index="1" function="default" group="P"/>
+                <signal pad-key="pa2" index="2" function="default" group="P"/>
+                <signal pad-key="pa3" index="3" function="default" group="P"/>
+                <signal pad-key="pa4" index="4" function="default" group="P"/>
+                <signal pad-key="pa5" index="5" function="default" group="P"/>
+                <signal pad-key="pa6" index="6" function="default" group="P"/>
+                <signal pad-key="pa7" index="7" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pb2" index="2" function="default" group="P"/>
-                <signal pad-id="pb3" index="3" function="default" group="P"/>
-                <signal pad-id="pb4" index="4" function="default" group="P"/>
-                <signal pad-id="pb5" index="5" function="default" group="P"/>
-                <signal pad-id="pb6" index="6" function="default" group="P"/>
-                <signal pad-id="pb7" index="7" function="default" group="P"/>
+                <signal pad-key="pb0" index="0" function="default" group="P"/>
+                <signal pad-key="pb1" index="1" function="default" group="P"/>
+                <signal pad-key="pb2" index="2" function="default" group="P"/>
+                <signal pad-key="pb3" index="3" function="default" group="P"/>
+                <signal pad-key="pb4" index="4" function="default" group="P"/>
+                <signal pad-key="pb5" index="5" function="default" group="P"/>
+                <signal pad-key="pb6" index="6" function="default" group="P"/>
+                <signal pad-key="pb7" index="7" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="linuart" name="LINUART" module-key="linuart">
@@ -651,89 +651,111 @@
             </register-group>
         </module>
     </modules>
+    <pads>
+        <pad key="pa0" name="PA0"/>
+        <pad key="pa1" name="PA1"/>
+        <pad key="pa2" name="PA2"/>
+        <pad key="pa3" name="PA3"/>
+        <pad key="avcc" name="AVCC"/>
+        <pad key="agnd" name="AGND"/>
+        <pad key="pa4" name="PA4"/>
+        <pad key="pa5" name="PA5"/>
+        <pad key="pa6" name="PA6"/>
+        <pad key="pa7" name="PA7"/>
+        <pad key="pb7" name="PB7"/>
+        <pad key="pb6" name="PB6"/>
+        <pad key="pb5" name="PB5"/>
+        <pad key="pb4" name="PB4"/>
+        <pad key="vcc" name="VCC"/>
+        <pad key="gnd" name="GND"/>
+        <pad key="pb3" name="PB3"/>
+        <pad key="pb2" name="PB2"/>
+        <pad key="pb1" name="PB1"/>
+        <pad key="pb0" name="PB0"/>
+    </pads>
     <pinouts>
         <pinout key="soic20" name="SOIC20" type="soic">
-            <pin position="1" pad="PA0"/>
-            <pin position="2" pad="PA1"/>
-            <pin position="3" pad="PA2"/>
-            <pin position="4" pad="PA3"/>
-            <pin position="5" pad="AVCC"/>
-            <pin position="6" pad="AGND"/>
-            <pin position="7" pad="PA4"/>
-            <pin position="8" pad="PA5"/>
-            <pin position="9" pad="PA6"/>
-            <pin position="10" pad="PA7"/>
-            <pin position="11" pad="PB7"/>
-            <pin position="12" pad="PB6"/>
-            <pin position="13" pad="PB5"/>
-            <pin position="14" pad="PB4"/>
-            <pin position="15" pad="VCC"/>
-            <pin position="16" pad="GND"/>
-            <pin position="17" pad="PB3"/>
-            <pin position="18" pad="PB2"/>
-            <pin position="19" pad="PB1"/>
-            <pin position="20" pad="PB0"/>
+            <pin position="1" pad-key="pa0"/>
+            <pin position="2" pad-key="pa1"/>
+            <pin position="3" pad-key="pa2"/>
+            <pin position="4" pad-key="pa3"/>
+            <pin position="5" pad-key="avcc"/>
+            <pin position="6" pad-key="agnd"/>
+            <pin position="7" pad-key="pa4"/>
+            <pin position="8" pad-key="pa5"/>
+            <pin position="9" pad-key="pa6"/>
+            <pin position="10" pad-key="pa7"/>
+            <pin position="11" pad-key="pb7"/>
+            <pin position="12" pad-key="pb6"/>
+            <pin position="13" pad-key="pb5"/>
+            <pin position="14" pad-key="pb4"/>
+            <pin position="15" pad-key="vcc"/>
+            <pin position="16" pad-key="gnd"/>
+            <pin position="17" pad-key="pb3"/>
+            <pin position="18" pad-key="pb2"/>
+            <pin position="19" pad-key="pb1"/>
+            <pin position="20" pad-key="pb0"/>
         </pinout>
         <pinout key="qfn20" name="QFN20" type="qfn">
-            <pin position="1" pad="PA2"/>
-            <pin position="2" pad="PA3"/>
-            <pin position="3" pad="AVCC"/>
-            <pin position="4" pad="AGND"/>
-            <pin position="5" pad="PA4"/>
-            <pin position="6" pad="PA5"/>
-            <pin position="7" pad="PA6"/>
-            <pin position="8" pad="PA7"/>
-            <pin position="9" pad="PB7"/>
-            <pin position="10" pad="PB6"/>
-            <pin position="11" pad="PB5"/>
-            <pin position="12" pad="PB4"/>
-            <pin position="13" pad="VCC"/>
-            <pin position="14" pad="GND"/>
-            <pin position="15" pad="PB3"/>
-            <pin position="16" pad="PB2"/>
-            <pin position="17" pad="PB1"/>
-            <pin position="18" pad="PB0"/>
-            <pin position="19" pad="PA0"/>
-            <pin position="20" pad="PA1"/>
+            <pin position="1" pad-key="pa2"/>
+            <pin position="2" pad-key="pa3"/>
+            <pin position="3" pad-key="avcc"/>
+            <pin position="4" pad-key="agnd"/>
+            <pin position="5" pad-key="pa4"/>
+            <pin position="6" pad-key="pa5"/>
+            <pin position="7" pad-key="pa6"/>
+            <pin position="8" pad-key="pa7"/>
+            <pin position="9" pad-key="pb7"/>
+            <pin position="10" pad-key="pb6"/>
+            <pin position="11" pad-key="pb5"/>
+            <pin position="12" pad-key="pb4"/>
+            <pin position="13" pad-key="vcc"/>
+            <pin position="14" pad-key="gnd"/>
+            <pin position="15" pad-key="pb3"/>
+            <pin position="16" pad-key="pb2"/>
+            <pin position="17" pad-key="pb1"/>
+            <pin position="18" pad-key="pb0"/>
+            <pin position="19" pad-key="pa0"/>
+            <pin position="20" pad-key="pa1"/>
         </pinout>
         <pinout key="vqfn32" name="VQFN32" type="qfn">
-            <pin position="1" pad="NC"/>
-            <pin position="2" pad="NC"/>
-            <pin position="3" pad="PA3"/>
-            <pin position="4" pad="AVCC"/>
-            <pin position="5" pad="AGND"/>
-            <pin position="6" pad="NC"/>
-            <pin position="7" pad="NC"/>
-            <pin position="8" pad="NC"/>
-            <pin position="9" pad="PA4"/>
-            <pin position="10" pad="PA5"/>
-            <pin position="11" pad="PA6"/>
-            <pin position="12" pad="PA7"/>
-            <pin position="13" pad="NC"/>
-            <pin position="14" pad="PB7"/>
-            <pin position="15" pad="PB6"/>
-            <pin position="16" pad="NC"/>
-            <pin position="17" pad="NC"/>
-            <pin position="18" pad="PB5"/>
-            <pin position="19" pad="PB4"/>
-            <pin position="20" pad="VCC"/>
-            <pin position="21" pad="GND"/>
-            <pin position="22" pad="NC"/>
-            <pin position="23" pad="NC"/>
-            <pin position="24" pad="NC"/>
-            <pin position="25" pad="PB3"/>
-            <pin position="26" pad="PB2"/>
-            <pin position="27" pad="PB1"/>
-            <pin position="28" pad="PB0"/>
-            <pin position="29" pad="PA0"/>
-            <pin position="30" pad="PA1"/>
-            <pin position="31" pad="PA2"/>
-            <pin position="32" pad="NC"/>
+            <pin position="1"/>
+            <pin position="2"/>
+            <pin position="3" pad-key="pa3"/>
+            <pin position="4" pad-key="avcc"/>
+            <pin position="5" pad-key="agnd"/>
+            <pin position="6"/>
+            <pin position="7"/>
+            <pin position="8"/>
+            <pin position="9" pad-key="pa4"/>
+            <pin position="10" pad-key="pa5"/>
+            <pin position="11" pad-key="pa6"/>
+            <pin position="12" pad-key="pa7"/>
+            <pin position="13"/>
+            <pin position="14" pad-key="pb7"/>
+            <pin position="15" pad-key="pb6"/>
+            <pin position="16"/>
+            <pin position="17"/>
+            <pin position="18" pad-key="pb5"/>
+            <pin position="19" pad-key="pb4"/>
+            <pin position="20" pad-key="vcc"/>
+            <pin position="21" pad-key="gnd"/>
+            <pin position="22"/>
+            <pin position="23"/>
+            <pin position="24"/>
+            <pin position="25" pad-key="pb3"/>
+            <pin position="26" pad-key="pb2"/>
+            <pin position="27" pad-key="pb1"/>
+            <pin position="28" pad-key="pb0"/>
+            <pin position="29" pad-key="pa0"/>
+            <pin position="30" pad-key="pa1"/>
+            <pin position="31" pad-key="pa2"/>
+            <pin position="32"/>
         </pinout>
     </pinouts>
     <variants>
-        <variant name="ATtiny167-SU" pinout-key="soic20" package="SOIC20"/>
-        <variant name="ATtiny167-MU" pinout-key="vqfn32" package="VQFN32"/>
-        <variant name="ATtiny167-MMU" pinout-key="qfn20" package="QFN20"/>
+        <variant key="attiny167_su" name="ATtiny167-SU" pinout-key="soic20"/>
+        <variant key="attiny167_mu" name="ATtiny167-MU" pinout-key="vqfn32"/>
+        <variant key="attiny167_mmu" name="ATtiny167-MMU" pinout-key="qfn20"/>
     </variants>
 </device>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY202.xml b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY202.xml
index 03acd41d..03b02692 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY202.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY202.xml
@@ -43,20 +43,20 @@
         <peripheral key="ac0" name="AC0" module-key="i2106">
             <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"/>
-                <signal pad-id="pa7" index="0" function="AC0" group="P"/>
+                <signal pad-key="pa6" index="0" function="AC0" group="N"/>
+                <signal pad-key="pa3" function="AC0" group="OUT"/>
+                <signal pad-key="pa7" index="0" function="AC0" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="adc0" name="ADC0" module-key="i2132">
             <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"/>
-                <signal pad-id="pa2" index="2" function="AIN0" group="AIN"/>
-                <signal pad-id="pa3" index="3" function="AIN0" group="AIN"/>
-                <signal pad-id="pa6" index="6" function="AIN0" group="AIN"/>
-                <signal pad-id="pa7" index="7" function="AIN0" group="AIN"/>
+                <signal pad-key="pa0" index="0" function="AIN0" group="AIN"/>
+                <signal pad-key="pa1" index="1" function="AIN0" group="AIN"/>
+                <signal pad-key="pa2" index="2" function="AIN0" group="AIN"/>
+                <signal pad-key="pa3" index="3" function="AIN0" group="AIN"/>
+                <signal pad-key="pa6" index="6" function="AIN0" group="AIN"/>
+                <signal pad-key="pa7" index="7" function="AIN0" group="AIN"/>
             </signals>
         </peripheral>
         <peripheral key="bod" name="BOD" module-key="i2114">
@@ -65,22 +65,22 @@
         <peripheral key="ccl" name="CCL" module-key="i2128">
             <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"/>
-                <signal pad-id="pa2" index="2" function="CCL" group="LUT0_IN"/>
-                <signal pad-id="pa6" index="0" function="CCL" group="LUT1_OUT"/>
+                <signal pad-key="pa0" index="0" function="CCL" group="LUT0_IN"/>
+                <signal pad-key="pa1" index="1" function="CCL" group="LUT0_IN"/>
+                <signal pad-key="pa2" index="2" function="CCL" group="LUT0_IN"/>
+                <signal pad-key="pa6" index="0" function="CCL" group="LUT1_OUT"/>
             </signals>
         </peripheral>
         <peripheral key="clkctrl" name="CLKCTRL" module-key="i2601_clkctrl">
             <register-group-instance register-group-key="clkctrl" address-space-key="data" offset="0x60"/>
             <signals>
-                <signal pad-id="pa3" function="CLKCTRL" group="CLKI"/>
+                <signal pad-key="pa3" function="CLKCTRL" group="CLKI"/>
             </signals>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="i2100">
             <register-group-instance register-group-key="cpu" address-space-key="data" offset="0x30"/>
             <signals>
-                <signal pad-id="pa1" function="OTHER" group="BREAK"/>
+                <signal pad-key="pa1" function="OTHER" group="BREAK"/>
             </signals>
         </peripheral>
         <peripheral key="cpuint" name="CPUINT" module-key="i2104">
@@ -92,19 +92,19 @@
         <peripheral key="evsys" name="EVSYS" module-key="i2601_evsys">
             <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"/>
-                <signal pad-id="pa2" index="2" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
-                <signal pad-id="pa3" index="3" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
-                <signal pad-id="pa6" index="6" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
-                <signal pad-id="pa7" index="7" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
-                <signal pad-id="pa2" index="0" function="EVSYS" group="EVOUT" field="PORTMUX.CTRLA.EVOUT0"/>
-                <signal pad-id="pa0" index="0" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
-                <signal pad-id="pa1" index="1" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
-                <signal pad-id="pa2" index="2" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
-                <signal pad-id="pa3" index="3" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
-                <signal pad-id="pa6" index="6" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
-                <signal pad-id="pa7" index="7" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
+                <signal pad-key="pa0" index="0" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
+                <signal pad-key="pa1" index="1" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
+                <signal pad-key="pa2" index="2" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
+                <signal pad-key="pa3" index="3" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
+                <signal pad-key="pa6" index="6" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
+                <signal pad-key="pa7" index="7" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
+                <signal pad-key="pa2" index="0" function="EVSYS" group="EVOUT" field="PORTMUX.CTRLA.EVOUT0"/>
+                <signal pad-key="pa0" index="0" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
+                <signal pad-key="pa1" index="1" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
+                <signal pad-key="pa2" index="2" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
+                <signal pad-key="pa3" index="3" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
+                <signal pad-key="pa6" index="6" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
+                <signal pad-key="pa7" index="7" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
             </signals>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="i2601_fuse">
@@ -122,12 +122,12 @@
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pa2" index="2" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa3" index="3" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa6" index="6" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa7" index="7" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa0" index="0" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa1" index="1" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa2" index="2" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa3" index="3" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa6" index="6" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa7" index="7" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="portmux" name="PORTMUX" module-key="i2601_portmux">
@@ -136,7 +136,7 @@
         <peripheral key="rstctrl" name="RSTCTRL" module-key="i2111">
             <register-group-instance register-group-key="rstctrl" address-space-key="data" offset="0x40"/>
             <signals>
-                <signal pad-id="pa0" function="OTHER" group="RESET"/>
+                <signal pad-key="pa0" function="OTHER" group="RESET"/>
             </signals>
         </peripheral>
         <peripheral key="rtc" name="RTC" module-key="i2116">
@@ -151,52 +151,52 @@
         <peripheral key="spi0" name="SPI0" module-key="i2107">
             <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"/>
-                <signal pad-id="pa6" function="SPI0_ALT" group="MOSI" field="PORTMUX.CTRLB.SPI0"/>
-                <signal pad-id="pa1" function="SPI0" group="MOSI" field="PORTMUX.CTRLB.SPI0"/>
-                <signal pad-id="pa3" function="SPI0" group="SCK"/>
-                <signal pad-id="pa0" function="SPI0" group="SS"/>
+                <signal pad-key="pa7" function="SPI0_ALT" group="MISO" field="PORTMUX.CTRLB.SPI0"/>
+                <signal pad-key="pa2" function="SPI0" group="MISO" field="PORTMUX.CTRLB.SPI0"/>
+                <signal pad-key="pa6" function="SPI0_ALT" group="MOSI" field="PORTMUX.CTRLB.SPI0"/>
+                <signal pad-key="pa1" function="SPI0" group="MOSI" field="PORTMUX.CTRLB.SPI0"/>
+                <signal pad-key="pa3" function="SPI0" group="SCK"/>
+                <signal pad-key="pa0" function="SPI0" group="SS"/>
             </signals>
         </peripheral>
         <peripheral key="syscfg" name="SYSCFG" module-key="i2601_syscfg">
             <register-group-instance register-group-key="syscfg" address-space-key="data" offset="0xF00"/>
             <signals>
-                <signal pad-id="pa0" function="OTHER" group="UPDI"/>
+                <signal pad-key="pa0" function="OTHER" group="UPDI"/>
             </signals>
         </peripheral>
         <peripheral key="tca0" name="TCA0" module-key="i2117">
             <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"/>
-                <signal pad-id="pa1" index="1" function="TCA0" group="WO"/>
-                <signal pad-id="pa2" index="2" function="TCA0" group="WO"/>
-                <signal pad-id="pa3" index="3" function="TCA0" group="WO"/>
+                <signal pad-key="pa7" index="0" function="TCA0_ALT" group="WO" field="PORTMUX.CTRLC.TCA00"/>
+                <signal pad-key="pa3" index="0" function="TCA0" group="WO" field="PORTMUX.CTRLC.TCA00"/>
+                <signal pad-key="pa1" index="1" function="TCA0" group="WO"/>
+                <signal pad-key="pa2" index="2" function="TCA0" group="WO"/>
+                <signal pad-key="pa3" index="3" function="TCA0" group="WO"/>
             </signals>
         </peripheral>
         <peripheral key="tcb0" name="TCB0" module-key="i2119">
             <register-group-instance register-group-key="tcb" address-space-key="data" offset="0xA40"/>
             <signals>
-                <signal pad-id="pa6" function="TCB0" group="WO"/>
+                <signal pad-key="pa6" function="TCB0" group="WO"/>
             </signals>
         </peripheral>
         <peripheral key="twi0" name="TWI0" module-key="i2110">
             <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"/>
+                <signal pad-key="pa2" function="TWI0" group="SCL"/>
+                <signal pad-key="pa1" function="TWI0" group="SDA"/>
             </signals>
         </peripheral>
         <peripheral key="usart0" name="USART0" module-key="i2108">
             <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"/>
-                <signal pad-id="pa1" function="USART0_ALT" group="TXD" field="PORTMUX.CTRLB.USART0"/>
-                <signal pad-id="pa6" function="USART0" group="TXD" field="PORTMUX.CTRLB.USART0"/>
-                <signal pad-id="pa3" function="USART0" group="XCK"/>
-                <signal pad-id="pa0" function="USART0" group="XDIR"/>
+                <signal pad-key="pa2" function="USART0_ALT" group="RXD" field="PORTMUX.CTRLB.USART0"/>
+                <signal pad-key="pa7" function="USART0" group="RXD" field="PORTMUX.CTRLB.USART0"/>
+                <signal pad-key="pa1" function="USART0_ALT" group="TXD" field="PORTMUX.CTRLB.USART0"/>
+                <signal pad-key="pa6" function="USART0" group="TXD" field="PORTMUX.CTRLB.USART0"/>
+                <signal pad-key="pa3" function="USART0" group="XCK"/>
+                <signal pad-key="pa0" function="USART0" group="XDIR"/>
             </signals>
         </peripheral>
         <peripheral key="userrow" name="USERROW" module-key="i2601_userrow">
@@ -1134,20 +1134,30 @@
             </register-group>
         </module>
     </modules>
+    <pads>
+        <pad key="vdd" name="VDD"/>
+        <pad key="pa6" name="PA6"/>
+        <pad key="pa7" name="PA7"/>
+        <pad key="pa1" name="PA1"/>
+        <pad key="pa2" name="PA2"/>
+        <pad key="pa0" name="PA0"/>
+        <pad key="pa3" name="PA3"/>
+        <pad key="gnd" name="GND"/>
+    </pads>
     <pinouts>
         <pinout key="soic8" name="SOIC8" type="soic">
-            <pin position="1" pad="VDD"/>
-            <pin position="2" pad="PA6"/>
-            <pin position="3" pad="PA7"/>
-            <pin position="4" pad="PA1"/>
-            <pin position="5" pad="PA2"/>
-            <pin position="6" pad="PA0"/>
-            <pin position="7" pad="PA3"/>
-            <pin position="8" pad="GND"/>
+            <pin position="1" pad-key="vdd"/>
+            <pin position="2" pad-key="pa6"/>
+            <pin position="3" pad-key="pa7"/>
+            <pin position="4" pad-key="pa1"/>
+            <pin position="5" pad-key="pa2"/>
+            <pin position="6" pad-key="pa0"/>
+            <pin position="7" pad-key="pa3"/>
+            <pin position="8" pad-key="gnd"/>
         </pinout>
     </pinouts>
     <variants>
-        <variant name="ATtiny202-SSFR" pinout-key="soic8" package="SOIC8"/>
-        <variant name="ATtiny202-SSNR" pinout-key="soic8" package="SOIC8"/>
+        <variant key="attiny202_ssfr" name="ATtiny202-SSFR" pinout-key="soic8"/>
+        <variant key="attiny202_ssnr" name="ATtiny202-SSNR" pinout-key="soic8"/>
     </variants>
 </device>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY204.xml b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY204.xml
index 48ed543a..4cbfa395 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY204.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY204.xml
@@ -43,24 +43,24 @@
         <peripheral key="ac0" name="AC0" module-key="i2106">
             <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"/>
-                <signal pad-id="pa7" index="0" function="AC0" group="P"/>
+                <signal pad-key="pa6" index="0" function="AC0" group="N"/>
+                <signal pad-key="pa5" index="0" function="AC0" group="OUT"/>
+                <signal pad-key="pa7" index="0" function="AC0" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="adc0" name="ADC0" module-key="i2132">
             <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"/>
-                <signal pad-id="pa2" index="2" function="AIN0" group="AIN"/>
-                <signal pad-id="pa3" index="3" function="AIN0" group="AIN"/>
-                <signal pad-id="pa4" index="4" function="AIN0" group="AIN"/>
-                <signal pad-id="pa5" index="5" function="AIN0" group="AIN"/>
-                <signal pad-id="pa6" index="6" function="AIN0" group="AIN"/>
-                <signal pad-id="pa7" index="7" function="AIN0" group="AIN"/>
-                <signal pad-id="pb1" index="10" function="AIN0" group="AIN"/>
-                <signal pad-id="pb0" index="11" function="AIN0" group="AIN"/>
+                <signal pad-key="pa0" index="0" function="AIN0" group="AIN"/>
+                <signal pad-key="pa1" index="1" function="AIN0" group="AIN"/>
+                <signal pad-key="pa2" index="2" function="AIN0" group="AIN"/>
+                <signal pad-key="pa3" index="3" function="AIN0" group="AIN"/>
+                <signal pad-key="pa4" index="4" function="AIN0" group="AIN"/>
+                <signal pad-key="pa5" index="5" function="AIN0" group="AIN"/>
+                <signal pad-key="pa6" index="6" function="AIN0" group="AIN"/>
+                <signal pad-key="pa7" index="7" function="AIN0" group="AIN"/>
+                <signal pad-key="pb1" index="10" function="AIN0" group="AIN"/>
+                <signal pad-key="pb0" index="11" function="AIN0" group="AIN"/>
             </signals>
         </peripheral>
         <peripheral key="bod" name="BOD" module-key="i2114">
@@ -69,25 +69,25 @@
         <peripheral key="ccl" name="CCL" module-key="i2128">
             <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"/>
-                <signal pad-id="pa2" index="2" function="CCL" group="LUT0_IN"/>
-                <signal pad-id="pa4" index="0" function="CCL" group="LUT0_OUT" field="PORTMUX.CTRLA.LUT0"/>
-                <signal pad-id="pa7" index="0" function="CCL" group="LUT1_OUT" field="PORTMUX.CTRLA.LUT1"/>
+                <signal pad-key="pa0" index="0" function="CCL" group="LUT0_IN"/>
+                <signal pad-key="pa1" index="1" function="CCL" group="LUT0_IN"/>
+                <signal pad-key="pa2" index="2" function="CCL" group="LUT0_IN"/>
+                <signal pad-key="pa4" index="0" function="CCL" group="LUT0_OUT" field="PORTMUX.CTRLA.LUT0"/>
+                <signal pad-key="pa7" index="0" function="CCL" group="LUT1_OUT" field="PORTMUX.CTRLA.LUT1"/>
             </signals>
         </peripheral>
         <peripheral key="clkctrl" name="CLKCTRL" module-key="i2601_clkctrl">
             <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"/>
-                <signal pad-id="pb2" function="CLKCTRL" group="TOSC2"/>
+                <signal pad-key="pa3" function="CLKCTRL" group="CLKI"/>
+                <signal pad-key="pb3" function="CLKCTRL" group="TOSC1"/>
+                <signal pad-key="pb2" function="CLKCTRL" group="TOSC2"/>
             </signals>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="i2100">
             <register-group-instance register-group-key="cpu" address-space-key="data" offset="0x30"/>
             <signals>
-                <signal pad-id="pa1" function="OTHER" group="BREAK"/>
+                <signal pad-key="pa1" function="OTHER" group="BREAK"/>
             </signals>
         </peripheral>
         <peripheral key="cpuint" name="CPUINT" module-key="i2104">
@@ -99,32 +99,32 @@
         <peripheral key="evsys" name="EVSYS" module-key="i2601_evsys">
             <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"/>
-                <signal pad-id="pa2" index="2" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
-                <signal pad-id="pa3" index="3" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
-                <signal pad-id="pa4" index="4" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
-                <signal pad-id="pa5" index="5" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
-                <signal pad-id="pa6" index="6" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
-                <signal pad-id="pa7" index="7" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
-                <signal pad-id="pb0" index="0" function="EVAINCH1" group="EVAPB" field="EVSYS.ASYNCCH1.ASYNCCH1"/>
-                <signal pad-id="pb1" index="1" function="EVAINCH1" group="EVAPB" field="EVSYS.ASYNCCH1.ASYNCCH1"/>
-                <signal pad-id="pb2" index="2" function="EVAINCH1" group="EVAPB" field="EVSYS.ASYNCCH1.ASYNCCH1"/>
-                <signal pad-id="pb3" index="3" function="EVAINCH1" group="EVAPB" field="EVSYS.ASYNCCH1.ASYNCCH1"/>
-                <signal pad-id="pa2" index="0" function="EVSYS" group="EVOUT" field="PORTMUX.CTRLA.EVOUT0"/>
-                <signal pad-id="pb2" index="1" function="EVSYS" group="EVOUT" field="PORTMUX.CTRLA.EVOUT1"/>
-                <signal pad-id="pa0" index="0" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
-                <signal pad-id="pa1" index="1" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
-                <signal pad-id="pa2" index="2" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
-                <signal pad-id="pa3" index="3" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
-                <signal pad-id="pa4" index="4" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
-                <signal pad-id="pa5" index="5" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
-                <signal pad-id="pa6" index="6" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
-                <signal pad-id="pa7" index="7" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
-                <signal pad-id="pb0" index="0" function="EVSINCH1" group="EVSPB" field="EVSYS.SYNCCH1.SYNCCH1"/>
-                <signal pad-id="pb1" index="1" function="EVSINCH1" group="EVSPB" field="EVSYS.SYNCCH1.SYNCCH1"/>
-                <signal pad-id="pb2" index="2" function="EVSINCH1" group="EVSPB" field="EVSYS.SYNCCH1.SYNCCH1"/>
-                <signal pad-id="pb3" index="3" function="EVSINCH1" group="EVSPB" field="EVSYS.SYNCCH1.SYNCCH1"/>
+                <signal pad-key="pa0" index="0" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
+                <signal pad-key="pa1" index="1" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
+                <signal pad-key="pa2" index="2" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
+                <signal pad-key="pa3" index="3" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
+                <signal pad-key="pa4" index="4" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
+                <signal pad-key="pa5" index="5" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
+                <signal pad-key="pa6" index="6" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
+                <signal pad-key="pa7" index="7" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
+                <signal pad-key="pb0" index="0" function="EVAINCH1" group="EVAPB" field="EVSYS.ASYNCCH1.ASYNCCH1"/>
+                <signal pad-key="pb1" index="1" function="EVAINCH1" group="EVAPB" field="EVSYS.ASYNCCH1.ASYNCCH1"/>
+                <signal pad-key="pb2" index="2" function="EVAINCH1" group="EVAPB" field="EVSYS.ASYNCCH1.ASYNCCH1"/>
+                <signal pad-key="pb3" index="3" function="EVAINCH1" group="EVAPB" field="EVSYS.ASYNCCH1.ASYNCCH1"/>
+                <signal pad-key="pa2" index="0" function="EVSYS" group="EVOUT" field="PORTMUX.CTRLA.EVOUT0"/>
+                <signal pad-key="pb2" index="1" function="EVSYS" group="EVOUT" field="PORTMUX.CTRLA.EVOUT1"/>
+                <signal pad-key="pa0" index="0" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
+                <signal pad-key="pa1" index="1" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
+                <signal pad-key="pa2" index="2" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
+                <signal pad-key="pa3" index="3" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
+                <signal pad-key="pa4" index="4" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
+                <signal pad-key="pa5" index="5" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
+                <signal pad-key="pa6" index="6" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
+                <signal pad-key="pa7" index="7" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
+                <signal pad-key="pb0" index="0" function="EVSINCH1" group="EVSPB" field="EVSYS.SYNCCH1.SYNCCH1"/>
+                <signal pad-key="pb1" index="1" function="EVSINCH1" group="EVSPB" field="EVSYS.SYNCCH1.SYNCCH1"/>
+                <signal pad-key="pb2" index="2" function="EVSINCH1" group="EVSPB" field="EVSYS.SYNCCH1.SYNCCH1"/>
+                <signal pad-key="pb3" index="3" function="EVSINCH1" group="EVSPB" field="EVSYS.SYNCCH1.SYNCCH1"/>
             </signals>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="i2601_fuse">
@@ -142,23 +142,23 @@
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pa2" index="2" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa3" index="3" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa4" index="4" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa5" index="5" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa6" index="6" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa7" index="7" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa0" index="0" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa1" index="1" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa2" index="2" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa3" index="3" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa4" index="4" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa5" index="5" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa6" index="6" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa7" index="7" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pb2" index="2" function="IOPORT" group="PIN"/>
-                <signal pad-id="pb3" index="3" function="IOPORT" group="PIN"/>
+                <signal pad-key="pb0" index="0" function="IOPORT" group="PIN"/>
+                <signal pad-key="pb1" index="1" function="IOPORT" group="PIN"/>
+                <signal pad-key="pb2" index="2" function="IOPORT" group="PIN"/>
+                <signal pad-key="pb3" index="3" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="portmux" name="PORTMUX" module-key="i2601_portmux">
@@ -167,7 +167,7 @@
         <peripheral key="rstctrl" name="RSTCTRL" module-key="i2111">
             <register-group-instance register-group-key="rstctrl" address-space-key="data" offset="0x40"/>
             <signals>
-                <signal pad-id="pa0" function="OTHER" group="RESET"/>
+                <signal pad-key="pa0" function="OTHER" group="RESET"/>
             </signals>
         </peripheral>
         <peripheral key="rtc" name="RTC" module-key="i2116">
@@ -182,56 +182,56 @@
         <peripheral key="spi0" name="SPI0" module-key="i2107">
             <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"/>
-                <signal pad-id="pa6" function="SPI0_ALT" group="MOSI" field="PORTMUX.CTRLB.SPI0"/>
-                <signal pad-id="pa1" function="SPI0" group="MOSI" field="PORTMUX.CTRLB.SPI0"/>
-                <signal pad-id="pa3" function="SPI0" group="SCK" field="PORTMUX.CTRLB.SPI0"/>
-                <signal pad-id="pa4" function="SPI0" group="SS" field="PORTMUX.CTRLB.SPI0"/>
+                <signal pad-key="pa7" function="SPI0_ALT" group="MISO" field="PORTMUX.CTRLB.SPI0"/>
+                <signal pad-key="pa2" function="SPI0" group="MISO" field="PORTMUX.CTRLB.SPI0"/>
+                <signal pad-key="pa6" function="SPI0_ALT" group="MOSI" field="PORTMUX.CTRLB.SPI0"/>
+                <signal pad-key="pa1" function="SPI0" group="MOSI" field="PORTMUX.CTRLB.SPI0"/>
+                <signal pad-key="pa3" function="SPI0" group="SCK" field="PORTMUX.CTRLB.SPI0"/>
+                <signal pad-key="pa4" function="SPI0" group="SS" field="PORTMUX.CTRLB.SPI0"/>
             </signals>
         </peripheral>
         <peripheral key="syscfg" name="SYSCFG" module-key="i2601_syscfg">
             <register-group-instance register-group-key="syscfg" address-space-key="data" offset="0xF00"/>
             <signals>
-                <signal pad-id="pa0" function="OTHER" group="UPDI"/>
+                <signal pad-key="pa0" function="OTHER" group="UPDI"/>
             </signals>
         </peripheral>
         <peripheral key="tca0" name="TCA0" module-key="i2117">
             <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"/>
-                <signal pad-id="pb1" index="1" function="TCA0" group="WO" field="PORTMUX.CTRLC.TCA01"/>
-                <signal pad-id="pb2" index="2" function="TCA0" group="WO" field="PORTMUX.CTRLC.TCA02"/>
-                <signal pad-id="pa3" index="3" function="TCA0" group="WO" field="PORTMUX.CTRLC.TCA03"/>
-                <signal pad-id="pa4" index="4" function="TCA0" group="WO" field="PORTMUX.CTRLC.TCA04"/>
-                <signal pad-id="pa5" index="5" function="TCA0" group="WO" field="PORTMUX.CTRLC.TCA05"/>
+                <signal pad-key="pb3" index="0" function="TCA0_ALT" group="WO" field="PORTMUX.CTRLC.TCA00"/>
+                <signal pad-key="pb0" index="0" function="TCA0" group="WO" field="PORTMUX.CTRLC.TCA00"/>
+                <signal pad-key="pb1" index="1" function="TCA0" group="WO" field="PORTMUX.CTRLC.TCA01"/>
+                <signal pad-key="pb2" index="2" function="TCA0" group="WO" field="PORTMUX.CTRLC.TCA02"/>
+                <signal pad-key="pa3" index="3" function="TCA0" group="WO" field="PORTMUX.CTRLC.TCA03"/>
+                <signal pad-key="pa4" index="4" function="TCA0" group="WO" field="PORTMUX.CTRLC.TCA04"/>
+                <signal pad-key="pa5" index="5" function="TCA0" group="WO" field="PORTMUX.CTRLC.TCA05"/>
             </signals>
         </peripheral>
         <peripheral key="tcb0" name="TCB0" module-key="i2119">
             <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"/>
+                <signal pad-key="pa5" index="0" function="TCB0" group="WO" field="PORTMUX.CTRLD.TCB0"/>
             </signals>
         </peripheral>
         <peripheral key="twi0" name="TWI0" module-key="i2110">
             <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"/>
+                <signal pad-key="pb0" function="TWI0" group="SCL" field="PORTMUX.CTRLB.TWI0"/>
+                <signal pad-key="pb1" function="TWI0" group="SDA" field="PORTMUX.CTRLB.TWI0"/>
             </signals>
         </peripheral>
         <peripheral key="usart0" name="USART0" module-key="i2108">
             <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"/>
-                <signal pad-id="pa1" function="USART0_ALT" group="TXD" field="PORTMUX.CTRLB.USART0"/>
-                <signal pad-id="pb2" function="USART0" group="TXD" field="PORTMUX.CTRLB.USART0"/>
-                <signal pad-id="pa3" function="USART0_ALT" group="XCK" field="PORTMUX.CTRLB.USART0"/>
-                <signal pad-id="pb1" function="USART0" group="XCK" field="PORTMUX.CTRLB.USART0"/>
-                <signal pad-id="pa4" function="USART0_ALT" group="XDIR" field="PORTMUX.CTRLB.USART0"/>
-                <signal pad-id="pb0" function="USART0" group="XDIR" field="PORTMUX.CTRLB.USART0"/>
+                <signal pad-key="pa2" function="USART0_ALT" group="RXD" field="PORTMUX.CTRLB.USART0"/>
+                <signal pad-key="pb3" function="USART0" group="RXD" field="PORTMUX.CTRLB.USART0"/>
+                <signal pad-key="pa1" function="USART0_ALT" group="TXD" field="PORTMUX.CTRLB.USART0"/>
+                <signal pad-key="pb2" function="USART0" group="TXD" field="PORTMUX.CTRLB.USART0"/>
+                <signal pad-key="pa3" function="USART0_ALT" group="XCK" field="PORTMUX.CTRLB.USART0"/>
+                <signal pad-key="pb1" function="USART0" group="XCK" field="PORTMUX.CTRLB.USART0"/>
+                <signal pad-key="pa4" function="USART0_ALT" group="XDIR" field="PORTMUX.CTRLB.USART0"/>
+                <signal pad-key="pb0" function="USART0" group="XDIR" field="PORTMUX.CTRLB.USART0"/>
             </signals>
         </peripheral>
         <peripheral key="userrow" name="USERROW" module-key="i2601_userrow">
@@ -1172,26 +1172,42 @@
             </register-group>
         </module>
     </modules>
+    <pads>
+        <pad key="vdd" name="VDD"/>
+        <pad key="pa4" name="PA4"/>
+        <pad key="pa5" name="PA5"/>
+        <pad key="pa6" name="PA6"/>
+        <pad key="pa7" name="PA7"/>
+        <pad key="pb3" name="PB3"/>
+        <pad key="pb2" name="PB2"/>
+        <pad key="pb1" name="PB1"/>
+        <pad key="pb0" name="PB0"/>
+        <pad key="pa0" name="PA0"/>
+        <pad key="pa1" name="PA1"/>
+        <pad key="pa2" name="PA2"/>
+        <pad key="pa3" name="PA3"/>
+        <pad key="gnd" name="GND"/>
+    </pads>
     <pinouts>
         <pinout key="soic14" name="SOIC14" type="soic">
-            <pin position="1" pad="VDD"/>
-            <pin position="2" pad="PA4"/>
-            <pin position="3" pad="PA5"/>
-            <pin position="4" pad="PA6"/>
-            <pin position="5" pad="PA7"/>
-            <pin position="6" pad="PB3"/>
-            <pin position="7" pad="PB2"/>
-            <pin position="8" pad="PB1"/>
-            <pin position="9" pad="PB0"/>
-            <pin position="10" pad="PA0"/>
-            <pin position="11" pad="PA1"/>
-            <pin position="12" pad="PA2"/>
-            <pin position="13" pad="PA3"/>
-            <pin position="14" pad="GND"/>
+            <pin position="1" pad-key="vdd"/>
+            <pin position="2" pad-key="pa4"/>
+            <pin position="3" pad-key="pa5"/>
+            <pin position="4" pad-key="pa6"/>
+            <pin position="5" pad-key="pa7"/>
+            <pin position="6" pad-key="pb3"/>
+            <pin position="7" pad-key="pb2"/>
+            <pin position="8" pad-key="pb1"/>
+            <pin position="9" pad-key="pb0"/>
+            <pin position="10" pad-key="pa0"/>
+            <pin position="11" pad-key="pa1"/>
+            <pin position="12" pad-key="pa2"/>
+            <pin position="13" pad-key="pa3"/>
+            <pin position="14" pad-key="gnd"/>
         </pinout>
     </pinouts>
     <variants>
-        <variant name="ATtiny204-SSFR" pinout-key="soic14" package="SOIC14"/>
-        <variant name="ATtiny204-SSNR" pinout-key="soic14" package="SOIC14"/>
+        <variant key="attiny204_ssfr" name="ATtiny204-SSFR" pinout-key="soic14"/>
+        <variant key="attiny204_ssnr" name="ATtiny204-SSNR" pinout-key="soic14"/>
     </variants>
 </device>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY212.xml b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY212.xml
index c25f1935..80eaa163 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY212.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY212.xml
@@ -43,20 +43,20 @@
         <peripheral key="ac0" name="AC0" module-key="i2106">
             <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"/>
-                <signal pad-id="pa7" index="0" function="AC0" group="P"/>
+                <signal pad-key="pa6" index="0" function="AC0" group="N"/>
+                <signal pad-key="pa3" function="AC0" group="OUT"/>
+                <signal pad-key="pa7" index="0" function="AC0" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="adc0" name="ADC0" module-key="i2132">
             <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"/>
-                <signal pad-id="pa2" index="2" function="AIN0" group="AIN"/>
-                <signal pad-id="pa3" index="3" function="AIN0" group="AIN"/>
-                <signal pad-id="pa6" index="6" function="AIN0" group="AIN"/>
-                <signal pad-id="pa7" index="7" function="AIN0" group="AIN"/>
+                <signal pad-key="pa0" index="0" function="AIN0" group="AIN"/>
+                <signal pad-key="pa1" index="1" function="AIN0" group="AIN"/>
+                <signal pad-key="pa2" index="2" function="AIN0" group="AIN"/>
+                <signal pad-key="pa3" index="3" function="AIN0" group="AIN"/>
+                <signal pad-key="pa6" index="6" function="AIN0" group="AIN"/>
+                <signal pad-key="pa7" index="7" function="AIN0" group="AIN"/>
             </signals>
         </peripheral>
         <peripheral key="bod" name="BOD" module-key="i2114">
@@ -65,22 +65,22 @@
         <peripheral key="ccl" name="CCL" module-key="i2128">
             <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"/>
-                <signal pad-id="pa2" index="2" function="CCL" group="LUT0_IN"/>
-                <signal pad-id="pa6" index="0" function="CCL" group="LUT1_OUT"/>
+                <signal pad-key="pa0" index="0" function="CCL" group="LUT0_IN"/>
+                <signal pad-key="pa1" index="1" function="CCL" group="LUT0_IN"/>
+                <signal pad-key="pa2" index="2" function="CCL" group="LUT0_IN"/>
+                <signal pad-key="pa6" index="0" function="CCL" group="LUT1_OUT"/>
             </signals>
         </peripheral>
         <peripheral key="clkctrl" name="CLKCTRL" module-key="i2601_clkctrl">
             <register-group-instance register-group-key="clkctrl" address-space-key="data" offset="0x60"/>
             <signals>
-                <signal pad-id="pa3" function="CLKCTRL" group="CLKI"/>
+                <signal pad-key="pa3" function="CLKCTRL" group="CLKI"/>
             </signals>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="i2100">
             <register-group-instance register-group-key="cpu" address-space-key="data" offset="0x30"/>
             <signals>
-                <signal pad-id="pa1" function="OTHER" group="BREAK"/>
+                <signal pad-key="pa1" function="OTHER" group="BREAK"/>
             </signals>
         </peripheral>
         <peripheral key="cpuint" name="CPUINT" module-key="i2104">
@@ -92,25 +92,25 @@
         <peripheral key="dac0" name="DAC0" module-key="i2121">
             <register-group-instance register-group-key="dac" address-space-key="data" offset="0x680"/>
             <signals>
-                <signal pad-id="pa6" index="0" function="DAC0" group="OUT"/>
+                <signal pad-key="pa6" index="0" function="DAC0" group="OUT"/>
             </signals>
         </peripheral>
         <peripheral key="evsys" name="EVSYS" module-key="i2601_evsys">
             <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"/>
-                <signal pad-id="pa2" index="2" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
-                <signal pad-id="pa3" index="3" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
-                <signal pad-id="pa6" index="6" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
-                <signal pad-id="pa7" index="7" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
-                <signal pad-id="pa2" index="0" function="EVSYS" group="EVOUT" field="PORTMUX.CTRLA.EVOUT0"/>
-                <signal pad-id="pa0" index="0" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
-                <signal pad-id="pa1" index="1" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
-                <signal pad-id="pa2" index="2" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
-                <signal pad-id="pa3" index="3" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
-                <signal pad-id="pa6" index="6" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
-                <signal pad-id="pa7" index="7" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
+                <signal pad-key="pa0" index="0" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
+                <signal pad-key="pa1" index="1" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
+                <signal pad-key="pa2" index="2" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
+                <signal pad-key="pa3" index="3" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
+                <signal pad-key="pa6" index="6" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
+                <signal pad-key="pa7" index="7" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
+                <signal pad-key="pa2" index="0" function="EVSYS" group="EVOUT" field="PORTMUX.CTRLA.EVOUT0"/>
+                <signal pad-key="pa0" index="0" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
+                <signal pad-key="pa1" index="1" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
+                <signal pad-key="pa2" index="2" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
+                <signal pad-key="pa3" index="3" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
+                <signal pad-key="pa6" index="6" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
+                <signal pad-key="pa7" index="7" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
             </signals>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="i2601_fuse">
@@ -128,12 +128,12 @@
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pa2" index="2" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa3" index="3" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa6" index="6" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa7" index="7" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa0" index="0" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa1" index="1" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa2" index="2" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa3" index="3" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa6" index="6" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa7" index="7" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="portmux" name="PORTMUX" module-key="i2601_portmux">
@@ -142,7 +142,7 @@
         <peripheral key="rstctrl" name="RSTCTRL" module-key="i2111">
             <register-group-instance register-group-key="rstctrl" address-space-key="data" offset="0x40"/>
             <signals>
-                <signal pad-id="pa0" function="OTHER" group="RESET"/>
+                <signal pad-key="pa0" function="OTHER" group="RESET"/>
             </signals>
         </peripheral>
         <peripheral key="rtc" name="RTC" module-key="i2116">
@@ -157,59 +157,59 @@
         <peripheral key="spi0" name="SPI0" module-key="i2107">
             <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"/>
-                <signal pad-id="pa6" function="SPI0_ALT" group="MOSI" field="PORTMUX.CTRLB.SPI0"/>
-                <signal pad-id="pa1" function="SPI0" group="MOSI" field="PORTMUX.CTRLB.SPI0"/>
-                <signal pad-id="pa3" function="SPI0" group="SCK"/>
-                <signal pad-id="pa0" function="SPI0" group="SS"/>
+                <signal pad-key="pa7" function="SPI0_ALT" group="MISO" field="PORTMUX.CTRLB.SPI0"/>
+                <signal pad-key="pa2" function="SPI0" group="MISO" field="PORTMUX.CTRLB.SPI0"/>
+                <signal pad-key="pa6" function="SPI0_ALT" group="MOSI" field="PORTMUX.CTRLB.SPI0"/>
+                <signal pad-key="pa1" function="SPI0" group="MOSI" field="PORTMUX.CTRLB.SPI0"/>
+                <signal pad-key="pa3" function="SPI0" group="SCK"/>
+                <signal pad-key="pa0" function="SPI0" group="SS"/>
             </signals>
         </peripheral>
         <peripheral key="syscfg" name="SYSCFG" module-key="i2601_syscfg">
             <register-group-instance register-group-key="syscfg" address-space-key="data" offset="0xF00"/>
             <signals>
-                <signal pad-id="pa0" function="OTHER" group="UPDI"/>
+                <signal pad-key="pa0" function="OTHER" group="UPDI"/>
             </signals>
         </peripheral>
         <peripheral key="tca0" name="TCA0" module-key="i2117">
             <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"/>
-                <signal pad-id="pa1" index="1" function="TCA0" group="WO"/>
-                <signal pad-id="pa2" index="2" function="TCA0" group="WO"/>
-                <signal pad-id="pa3" index="3" function="TCA0" group="WO"/>
+                <signal pad-key="pa7" index="0" function="TCA0_ALT" group="WO" field="PORTMUX.CTRLC.TCA00"/>
+                <signal pad-key="pa3" index="0" function="TCA0" group="WO" field="PORTMUX.CTRLC.TCA00"/>
+                <signal pad-key="pa1" index="1" function="TCA0" group="WO"/>
+                <signal pad-key="pa2" index="2" function="TCA0" group="WO"/>
+                <signal pad-key="pa3" index="3" function="TCA0" group="WO"/>
             </signals>
         </peripheral>
         <peripheral key="tcb0" name="TCB0" module-key="i2119">
             <register-group-instance register-group-key="tcb" address-space-key="data" offset="0xA40"/>
             <signals>
-                <signal pad-id="pa6" function="TCB0" group="WO"/>
+                <signal pad-key="pa6" function="TCB0" group="WO"/>
             </signals>
         </peripheral>
         <peripheral key="tcd0" name="TCD0" module-key="i2129">
             <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"/>
+                <signal pad-key="pa6" function="TCD0" group="WOA"/>
+                <signal pad-key="pa7" function="TCD0" group="WOB"/>
             </signals>
         </peripheral>
         <peripheral key="twi0" name="TWI0" module-key="i2110">
             <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"/>
+                <signal pad-key="pa2" function="TWI0" group="SCL"/>
+                <signal pad-key="pa1" function="TWI0" group="SDA"/>
             </signals>
         </peripheral>
         <peripheral key="usart0" name="USART0" module-key="i2108">
             <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"/>
-                <signal pad-id="pa1" function="USART0_ALT" group="TXD" field="PORTMUX.CTRLB.USART0"/>
-                <signal pad-id="pa6" function="USART0" group="TXD" field="PORTMUX.CTRLB.USART0"/>
-                <signal pad-id="pa3" function="USART0" group="XCK"/>
-                <signal pad-id="pa0" function="USART0" group="XDIR"/>
+                <signal pad-key="pa2" function="USART0_ALT" group="RXD" field="PORTMUX.CTRLB.USART0"/>
+                <signal pad-key="pa7" function="USART0" group="RXD" field="PORTMUX.CTRLB.USART0"/>
+                <signal pad-key="pa1" function="USART0_ALT" group="TXD" field="PORTMUX.CTRLB.USART0"/>
+                <signal pad-key="pa6" function="USART0" group="TXD" field="PORTMUX.CTRLB.USART0"/>
+                <signal pad-key="pa3" function="USART0" group="XCK"/>
+                <signal pad-key="pa0" function="USART0" group="XDIR"/>
             </signals>
         </peripheral>
         <peripheral key="userrow" name="USERROW" module-key="i2601_userrow">
@@ -1273,20 +1273,30 @@
             </register-group>
         </module>
     </modules>
+    <pads>
+        <pad key="vdd" name="VDD"/>
+        <pad key="pa6" name="PA6"/>
+        <pad key="pa7" name="PA7"/>
+        <pad key="pa1" name="PA1"/>
+        <pad key="pa2" name="PA2"/>
+        <pad key="pa0" name="PA0"/>
+        <pad key="pa3" name="PA3"/>
+        <pad key="gnd" name="GND"/>
+    </pads>
     <pinouts>
         <pinout key="soic8" name="SOIC8" type="soic">
-            <pin position="1" pad="VDD"/>
-            <pin position="2" pad="PA6"/>
-            <pin position="3" pad="PA7"/>
-            <pin position="4" pad="PA1"/>
-            <pin position="5" pad="PA2"/>
-            <pin position="6" pad="PA0"/>
-            <pin position="7" pad="PA3"/>
-            <pin position="8" pad="GND"/>
+            <pin position="1" pad-key="vdd"/>
+            <pin position="2" pad-key="pa6"/>
+            <pin position="3" pad-key="pa7"/>
+            <pin position="4" pad-key="pa1"/>
+            <pin position="5" pad-key="pa2"/>
+            <pin position="6" pad-key="pa0"/>
+            <pin position="7" pad-key="pa3"/>
+            <pin position="8" pad-key="gnd"/>
         </pinout>
     </pinouts>
     <variants>
-        <variant name="ATtiny212-SSFR" pinout-key="soic8" package="SOIC8"/>
-        <variant name="ATtiny212-SSNR" pinout-key="soic8" package="SOIC8"/>
+        <variant key="attiny212_ssfr" name="ATtiny212-SSFR" pinout-key="soic8"/>
+        <variant key="attiny212_ssnr" name="ATtiny212-SSNR" pinout-key="soic8"/>
     </variants>
 </device>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY214.xml b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY214.xml
index ae6cf201..b2ed23c7 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY214.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY214.xml
@@ -43,24 +43,24 @@
         <peripheral key="ac0" name="AC0" module-key="i2106">
             <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"/>
-                <signal pad-id="pa7" index="0" function="AC0" group="P"/>
+                <signal pad-key="pa6" index="0" function="AC0" group="N"/>
+                <signal pad-key="pa5" index="0" function="AC0" group="OUT"/>
+                <signal pad-key="pa7" index="0" function="AC0" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="adc0" name="ADC0" module-key="i2132">
             <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"/>
-                <signal pad-id="pa2" index="2" function="AIN0" group="AIN"/>
-                <signal pad-id="pa3" index="3" function="AIN0" group="AIN"/>
-                <signal pad-id="pa4" index="4" function="AIN0" group="AIN"/>
-                <signal pad-id="pa5" index="5" function="AIN0" group="AIN"/>
-                <signal pad-id="pa6" index="6" function="AIN0" group="AIN"/>
-                <signal pad-id="pa7" index="7" function="AIN0" group="AIN"/>
-                <signal pad-id="pb1" index="10" function="AIN0" group="AIN"/>
-                <signal pad-id="pb0" index="11" function="AIN0" group="AIN"/>
+                <signal pad-key="pa0" index="0" function="AIN0" group="AIN"/>
+                <signal pad-key="pa1" index="1" function="AIN0" group="AIN"/>
+                <signal pad-key="pa2" index="2" function="AIN0" group="AIN"/>
+                <signal pad-key="pa3" index="3" function="AIN0" group="AIN"/>
+                <signal pad-key="pa4" index="4" function="AIN0" group="AIN"/>
+                <signal pad-key="pa5" index="5" function="AIN0" group="AIN"/>
+                <signal pad-key="pa6" index="6" function="AIN0" group="AIN"/>
+                <signal pad-key="pa7" index="7" function="AIN0" group="AIN"/>
+                <signal pad-key="pb1" index="10" function="AIN0" group="AIN"/>
+                <signal pad-key="pb0" index="11" function="AIN0" group="AIN"/>
             </signals>
         </peripheral>
         <peripheral key="bod" name="BOD" module-key="i2114">
@@ -69,25 +69,25 @@
         <peripheral key="ccl" name="CCL" module-key="i2128">
             <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"/>
-                <signal pad-id="pa2" index="2" function="CCL" group="LUT0_IN"/>
-                <signal pad-id="pa4" index="0" function="CCL" group="LUT0_OUT" field="PORTMUX.CTRLA.LUT0"/>
-                <signal pad-id="pa7" index="0" function="CCL" group="LUT1_OUT" field="PORTMUX.CTRLA.LUT1"/>
+                <signal pad-key="pa0" index="0" function="CCL" group="LUT0_IN"/>
+                <signal pad-key="pa1" index="1" function="CCL" group="LUT0_IN"/>
+                <signal pad-key="pa2" index="2" function="CCL" group="LUT0_IN"/>
+                <signal pad-key="pa4" index="0" function="CCL" group="LUT0_OUT" field="PORTMUX.CTRLA.LUT0"/>
+                <signal pad-key="pa7" index="0" function="CCL" group="LUT1_OUT" field="PORTMUX.CTRLA.LUT1"/>
             </signals>
         </peripheral>
         <peripheral key="clkctrl" name="CLKCTRL" module-key="i2601_clkctrl">
             <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"/>
-                <signal pad-id="pb2" function="CLKCTRL" group="TOSC2"/>
+                <signal pad-key="pa3" function="CLKCTRL" group="CLKI"/>
+                <signal pad-key="pb3" function="CLKCTRL" group="TOSC1"/>
+                <signal pad-key="pb2" function="CLKCTRL" group="TOSC2"/>
             </signals>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="i2100">
             <register-group-instance register-group-key="cpu" address-space-key="data" offset="0x30"/>
             <signals>
-                <signal pad-id="pa1" function="OTHER" group="BREAK"/>
+                <signal pad-key="pa1" function="OTHER" group="BREAK"/>
             </signals>
         </peripheral>
         <peripheral key="cpuint" name="CPUINT" module-key="i2104">
@@ -99,38 +99,38 @@
         <peripheral key="dac0" name="DAC0" module-key="i2121">
             <register-group-instance register-group-key="dac" address-space-key="data" offset="0x680"/>
             <signals>
-                <signal pad-id="pa6" index="0" function="DAC0" group="OUT"/>
+                <signal pad-key="pa6" index="0" function="DAC0" group="OUT"/>
             </signals>
         </peripheral>
         <peripheral key="evsys" name="EVSYS" module-key="i2601_evsys">
             <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"/>
-                <signal pad-id="pa2" index="2" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
-                <signal pad-id="pa3" index="3" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
-                <signal pad-id="pa4" index="4" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
-                <signal pad-id="pa5" index="5" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
-                <signal pad-id="pa6" index="6" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
-                <signal pad-id="pa7" index="7" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
-                <signal pad-id="pb0" index="0" function="EVAINCH1" group="EVAPB" field="EVSYS.ASYNCCH1.ASYNCCH1"/>
-                <signal pad-id="pb1" index="1" function="EVAINCH1" group="EVAPB" field="EVSYS.ASYNCCH1.ASYNCCH1"/>
-                <signal pad-id="pb2" index="2" function="EVAINCH1" group="EVAPB" field="EVSYS.ASYNCCH1.ASYNCCH1"/>
-                <signal pad-id="pb3" index="3" function="EVAINCH1" group="EVAPB" field="EVSYS.ASYNCCH1.ASYNCCH1"/>
-                <signal pad-id="pa2" index="0" function="EVSYS" group="EVOUT" field="PORTMUX.CTRLA.EVOUT0"/>
-                <signal pad-id="pb2" index="1" function="EVSYS" group="EVOUT" field="PORTMUX.CTRLA.EVOUT1"/>
-                <signal pad-id="pa0" index="0" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
-                <signal pad-id="pa1" index="1" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
-                <signal pad-id="pa2" index="2" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
-                <signal pad-id="pa3" index="3" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
-                <signal pad-id="pa4" index="4" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
-                <signal pad-id="pa5" index="5" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
-                <signal pad-id="pa6" index="6" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
-                <signal pad-id="pa7" index="7" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
-                <signal pad-id="pb0" index="0" function="EVSINCH1" group="EVSPB" field="EVSYS.SYNCCH1.SYNCCH1"/>
-                <signal pad-id="pb1" index="1" function="EVSINCH1" group="EVSPB" field="EVSYS.SYNCCH1.SYNCCH1"/>
-                <signal pad-id="pb2" index="2" function="EVSINCH1" group="EVSPB" field="EVSYS.SYNCCH1.SYNCCH1"/>
-                <signal pad-id="pb3" index="3" function="EVSINCH1" group="EVSPB" field="EVSYS.SYNCCH1.SYNCCH1"/>
+                <signal pad-key="pa0" index="0" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
+                <signal pad-key="pa1" index="1" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
+                <signal pad-key="pa2" index="2" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
+                <signal pad-key="pa3" index="3" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
+                <signal pad-key="pa4" index="4" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
+                <signal pad-key="pa5" index="5" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
+                <signal pad-key="pa6" index="6" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
+                <signal pad-key="pa7" index="7" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
+                <signal pad-key="pb0" index="0" function="EVAINCH1" group="EVAPB" field="EVSYS.ASYNCCH1.ASYNCCH1"/>
+                <signal pad-key="pb1" index="1" function="EVAINCH1" group="EVAPB" field="EVSYS.ASYNCCH1.ASYNCCH1"/>
+                <signal pad-key="pb2" index="2" function="EVAINCH1" group="EVAPB" field="EVSYS.ASYNCCH1.ASYNCCH1"/>
+                <signal pad-key="pb3" index="3" function="EVAINCH1" group="EVAPB" field="EVSYS.ASYNCCH1.ASYNCCH1"/>
+                <signal pad-key="pa2" index="0" function="EVSYS" group="EVOUT" field="PORTMUX.CTRLA.EVOUT0"/>
+                <signal pad-key="pb2" index="1" function="EVSYS" group="EVOUT" field="PORTMUX.CTRLA.EVOUT1"/>
+                <signal pad-key="pa0" index="0" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
+                <signal pad-key="pa1" index="1" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
+                <signal pad-key="pa2" index="2" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
+                <signal pad-key="pa3" index="3" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
+                <signal pad-key="pa4" index="4" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
+                <signal pad-key="pa5" index="5" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
+                <signal pad-key="pa6" index="6" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
+                <signal pad-key="pa7" index="7" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
+                <signal pad-key="pb0" index="0" function="EVSINCH1" group="EVSPB" field="EVSYS.SYNCCH1.SYNCCH1"/>
+                <signal pad-key="pb1" index="1" function="EVSINCH1" group="EVSPB" field="EVSYS.SYNCCH1.SYNCCH1"/>
+                <signal pad-key="pb2" index="2" function="EVSINCH1" group="EVSPB" field="EVSYS.SYNCCH1.SYNCCH1"/>
+                <signal pad-key="pb3" index="3" function="EVSINCH1" group="EVSPB" field="EVSYS.SYNCCH1.SYNCCH1"/>
             </signals>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="i2601_fuse">
@@ -148,23 +148,23 @@
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pa2" index="2" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa3" index="3" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa4" index="4" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa5" index="5" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa6" index="6" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa7" index="7" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa0" index="0" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa1" index="1" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa2" index="2" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa3" index="3" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa4" index="4" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa5" index="5" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa6" index="6" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa7" index="7" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pb2" index="2" function="IOPORT" group="PIN"/>
-                <signal pad-id="pb3" index="3" function="IOPORT" group="PIN"/>
+                <signal pad-key="pb0" index="0" function="IOPORT" group="PIN"/>
+                <signal pad-key="pb1" index="1" function="IOPORT" group="PIN"/>
+                <signal pad-key="pb2" index="2" function="IOPORT" group="PIN"/>
+                <signal pad-key="pb3" index="3" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="portmux" name="PORTMUX" module-key="i2601_portmux">
@@ -173,7 +173,7 @@
         <peripheral key="rstctrl" name="RSTCTRL" module-key="i2111">
             <register-group-instance register-group-key="rstctrl" address-space-key="data" offset="0x40"/>
             <signals>
-                <signal pad-id="pa0" function="OTHER" group="RESET"/>
+                <signal pad-key="pa0" function="OTHER" group="RESET"/>
             </signals>
         </peripheral>
         <peripheral key="rtc" name="RTC" module-key="i2116">
@@ -188,65 +188,65 @@
         <peripheral key="spi0" name="SPI0" module-key="i2107">
             <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"/>
-                <signal pad-id="pa6" function="SPI0_ALT" group="MOSI" field="PORTMUX.CTRLB.SPI0"/>
-                <signal pad-id="pa1" function="SPI0" group="MOSI" field="PORTMUX.CTRLB.SPI0"/>
-                <signal pad-id="pa3" function="SPI0" group="SCK" field="PORTMUX.CTRLB.SPI0"/>
-                <signal pad-id="pa4" function="SPI0" group="SS" field="PORTMUX.CTRLB.SPI0"/>
+                <signal pad-key="pa7" function="SPI0_ALT" group="MISO" field="PORTMUX.CTRLB.SPI0"/>
+                <signal pad-key="pa2" function="SPI0" group="MISO" field="PORTMUX.CTRLB.SPI0"/>
+                <signal pad-key="pa6" function="SPI0_ALT" group="MOSI" field="PORTMUX.CTRLB.SPI0"/>
+                <signal pad-key="pa1" function="SPI0" group="MOSI" field="PORTMUX.CTRLB.SPI0"/>
+                <signal pad-key="pa3" function="SPI0" group="SCK" field="PORTMUX.CTRLB.SPI0"/>
+                <signal pad-key="pa4" function="SPI0" group="SS" field="PORTMUX.CTRLB.SPI0"/>
             </signals>
         </peripheral>
         <peripheral key="syscfg" name="SYSCFG" module-key="i2601_syscfg">
             <register-group-instance register-group-key="syscfg" address-space-key="data" offset="0xF00"/>
             <signals>
-                <signal pad-id="pa0" function="OTHER" group="UPDI"/>
+                <signal pad-key="pa0" function="OTHER" group="UPDI"/>
             </signals>
         </peripheral>
         <peripheral key="tca0" name="TCA0" module-key="i2117">
             <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"/>
-                <signal pad-id="pb1" index="1" function="TCA0" group="WO" field="PORTMUX.CTRLC.TCA01"/>
-                <signal pad-id="pb2" index="2" function="TCA0" group="WO" field="PORTMUX.CTRLC.TCA02"/>
-                <signal pad-id="pa3" index="3" function="TCA0" group="WO" field="PORTMUX.CTRLC.TCA03"/>
-                <signal pad-id="pa4" index="4" function="TCA0" group="WO" field="PORTMUX.CTRLC.TCA04"/>
-                <signal pad-id="pa5" index="5" function="TCA0" group="WO" field="PORTMUX.CTRLC.TCA05"/>
+                <signal pad-key="pb3" index="0" function="TCA0_ALT" group="WO" field="PORTMUX.CTRLC.TCA00"/>
+                <signal pad-key="pb0" index="0" function="TCA0" group="WO" field="PORTMUX.CTRLC.TCA00"/>
+                <signal pad-key="pb1" index="1" function="TCA0" group="WO" field="PORTMUX.CTRLC.TCA01"/>
+                <signal pad-key="pb2" index="2" function="TCA0" group="WO" field="PORTMUX.CTRLC.TCA02"/>
+                <signal pad-key="pa3" index="3" function="TCA0" group="WO" field="PORTMUX.CTRLC.TCA03"/>
+                <signal pad-key="pa4" index="4" function="TCA0" group="WO" field="PORTMUX.CTRLC.TCA04"/>
+                <signal pad-key="pa5" index="5" function="TCA0" group="WO" field="PORTMUX.CTRLC.TCA05"/>
             </signals>
         </peripheral>
         <peripheral key="tcb0" name="TCB0" module-key="i2119">
             <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"/>
+                <signal pad-key="pa5" index="0" function="TCB0" group="WO" field="PORTMUX.CTRLD.TCB0"/>
             </signals>
         </peripheral>
         <peripheral key="tcd0" name="TCD0" module-key="i2129">
             <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"/>
+                <signal pad-key="pa4" function="TCD0" group="WOA"/>
+                <signal pad-key="pa5" function="TCD0" group="WOB"/>
             </signals>
         </peripheral>
         <peripheral key="twi0" name="TWI0" module-key="i2110">
             <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"/>
-                <signal pad-id="pa1" function="TWI0_ALT" group="SDA" field="PORTMUX.CTRLB.TWI0"/>
-                <signal pad-id="pb1" function="TWI0" group="SDA" field="PORTMUX.CTRLB.TWI0"/>
+                <signal pad-key="pa2" function="TWI0_ALT" group="SCL" field="PORTMUX.CTRLB.TWI0"/>
+                <signal pad-key="pb0" function="TWI0" group="SCL" field="PORTMUX.CTRLB.TWI0"/>
+                <signal pad-key="pa1" function="TWI0_ALT" group="SDA" field="PORTMUX.CTRLB.TWI0"/>
+                <signal pad-key="pb1" function="TWI0" group="SDA" field="PORTMUX.CTRLB.TWI0"/>
             </signals>
         </peripheral>
         <peripheral key="usart0" name="USART0" module-key="i2108">
             <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"/>
-                <signal pad-id="pa1" function="USART0_ALT" group="TXD" field="PORTMUX.CTRLB.USART0"/>
-                <signal pad-id="pb2" function="USART0" group="TXD" field="PORTMUX.CTRLB.USART0"/>
-                <signal pad-id="pa3" function="USART0_ALT" group="XCK" field="PORTMUX.CTRLB.USART0"/>
-                <signal pad-id="pb1" function="USART0" group="XCK" field="PORTMUX.CTRLB.USART0"/>
-                <signal pad-id="pa4" function="USART0_ALT" group="XDIR" field="PORTMUX.CTRLB.USART0"/>
-                <signal pad-id="pb0" function="USART0" group="XDIR" field="PORTMUX.CTRLB.USART0"/>
+                <signal pad-key="pa2" function="USART0_ALT" group="RXD" field="PORTMUX.CTRLB.USART0"/>
+                <signal pad-key="pb3" function="USART0" group="RXD" field="PORTMUX.CTRLB.USART0"/>
+                <signal pad-key="pa1" function="USART0_ALT" group="TXD" field="PORTMUX.CTRLB.USART0"/>
+                <signal pad-key="pb2" function="USART0" group="TXD" field="PORTMUX.CTRLB.USART0"/>
+                <signal pad-key="pa3" function="USART0_ALT" group="XCK" field="PORTMUX.CTRLB.USART0"/>
+                <signal pad-key="pb1" function="USART0" group="XCK" field="PORTMUX.CTRLB.USART0"/>
+                <signal pad-key="pa4" function="USART0_ALT" group="XDIR" field="PORTMUX.CTRLB.USART0"/>
+                <signal pad-key="pb0" function="USART0" group="XDIR" field="PORTMUX.CTRLB.USART0"/>
             </signals>
         </peripheral>
         <peripheral key="userrow" name="USERROW" module-key="i2601_userrow">
@@ -1313,26 +1313,42 @@
             </register-group>
         </module>
     </modules>
+    <pads>
+        <pad key="vdd" name="VDD"/>
+        <pad key="pa4" name="PA4"/>
+        <pad key="pa5" name="PA5"/>
+        <pad key="pa6" name="PA6"/>
+        <pad key="pa7" name="PA7"/>
+        <pad key="pb3" name="PB3"/>
+        <pad key="pb2" name="PB2"/>
+        <pad key="pb1" name="PB1"/>
+        <pad key="pb0" name="PB0"/>
+        <pad key="pa0" name="PA0"/>
+        <pad key="pa1" name="PA1"/>
+        <pad key="pa2" name="PA2"/>
+        <pad key="pa3" name="PA3"/>
+        <pad key="gnd" name="GND"/>
+    </pads>
     <pinouts>
         <pinout key="soic14" name="SOIC14" type="soic">
-            <pin position="1" pad="VDD"/>
-            <pin position="2" pad="PA4"/>
-            <pin position="3" pad="PA5"/>
-            <pin position="4" pad="PA6"/>
-            <pin position="5" pad="PA7"/>
-            <pin position="6" pad="PB3"/>
-            <pin position="7" pad="PB2"/>
-            <pin position="8" pad="PB1"/>
-            <pin position="9" pad="PB0"/>
-            <pin position="10" pad="PA0"/>
-            <pin position="11" pad="PA1"/>
-            <pin position="12" pad="PA2"/>
-            <pin position="13" pad="PA3"/>
-            <pin position="14" pad="GND"/>
+            <pin position="1" pad-key="vdd"/>
+            <pin position="2" pad-key="pa4"/>
+            <pin position="3" pad-key="pa5"/>
+            <pin position="4" pad-key="pa6"/>
+            <pin position="5" pad-key="pa7"/>
+            <pin position="6" pad-key="pb3"/>
+            <pin position="7" pad-key="pb2"/>
+            <pin position="8" pad-key="pb1"/>
+            <pin position="9" pad-key="pb0"/>
+            <pin position="10" pad-key="pa0"/>
+            <pin position="11" pad-key="pa1"/>
+            <pin position="12" pad-key="pa2"/>
+            <pin position="13" pad-key="pa3"/>
+            <pin position="14" pad-key="gnd"/>
         </pinout>
     </pinouts>
     <variants>
-        <variant name="ATtiny214-SSFR" pinout-key="soic14" package="SOIC14"/>
-        <variant name="ATtiny214-SSNR" pinout-key="soic14" package="SOIC14"/>
+        <variant key="attiny214_ssfr" name="ATtiny214-SSFR" pinout-key="soic14"/>
+        <variant key="attiny214_ssnr" name="ATtiny214-SSNR" pinout-key="soic14"/>
     </variants>
 </device>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY2313.xml b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY2313.xml
index 1c8c1fc6..7f1fca6f 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY2313.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY2313.xml
@@ -198,34 +198,34 @@
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pb2" index="2" function="default" group="P"/>
-                <signal pad-id="pb3" index="3" function="default" group="P"/>
-                <signal pad-id="pb4" index="4" function="default" group="P"/>
-                <signal pad-id="pb5" index="5" function="default" group="P"/>
-                <signal pad-id="pb6" index="6" function="default" group="P"/>
-                <signal pad-id="pb7" index="7" function="default" group="P"/>
+                <signal pad-key="pb0" index="0" function="default" group="P"/>
+                <signal pad-key="pb1" index="1" function="default" group="P"/>
+                <signal pad-key="pb2" index="2" function="default" group="P"/>
+                <signal pad-key="pb3" index="3" function="default" group="P"/>
+                <signal pad-key="pb4" index="4" function="default" group="P"/>
+                <signal pad-key="pb5" index="5" function="default" group="P"/>
+                <signal pad-key="pb6" index="6" function="default" group="P"/>
+                <signal pad-key="pb7" index="7" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pd2" index="2" function="default" group="P"/>
-                <signal pad-id="pd3" index="3" function="default" group="P"/>
-                <signal pad-id="pd4" index="4" function="default" group="P"/>
-                <signal pad-id="pd5" index="5" function="default" group="P"/>
-                <signal pad-id="pd6" index="6" function="default" group="P"/>
+                <signal pad-key="pd0" index="0" function="default" group="P"/>
+                <signal pad-key="pd1" index="1" function="default" group="P"/>
+                <signal pad-key="pd2" index="2" function="default" group="P"/>
+                <signal pad-key="pd3" index="3" function="default" group="P"/>
+                <signal pad-key="pd4" index="4" function="default" group="P"/>
+                <signal pad-key="pd5" index="5" function="default" group="P"/>
+                <signal pad-key="pd6" index="6" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pa2" index="2" function="default" group="P"/>
+                <signal pad-key="pa0" index="0" function="default" group="P"/>
+                <signal pad-key="pa1" index="1" function="default" group="P"/>
+                <signal pad-key="pa2" index="2" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="tc0" name="TC0" module-key="tc8">
@@ -524,55 +524,77 @@
             </register-group>
         </module>
     </modules>
+    <pads>
+        <pad key="pa2" name="PA2"/>
+        <pad key="pd0" name="PD0"/>
+        <pad key="pd1" name="PD1"/>
+        <pad key="pa1" name="PA1"/>
+        <pad key="pa0" name="PA0"/>
+        <pad key="pd2" name="PD2"/>
+        <pad key="pd3" name="PD3"/>
+        <pad key="pd4" name="PD4"/>
+        <pad key="pd5" name="PD5"/>
+        <pad key="gnd" name="GND"/>
+        <pad key="pd6" name="PD6"/>
+        <pad key="pb0" name="PB0"/>
+        <pad key="pb1" name="PB1"/>
+        <pad key="pb2" name="PB2"/>
+        <pad key="pb3" name="PB3"/>
+        <pad key="pb4" name="PB4"/>
+        <pad key="pb5" name="PB5"/>
+        <pad key="pb6" name="PB6"/>
+        <pad key="pb7" name="PB7"/>
+        <pad key="vcc" name="VCC"/>
+    </pads>
     <pinouts>
         <pinout key="pdip_soic_20" name="PDIP_SOIC_20" type="dip">
-            <pin position="1" pad="PA2"/>
-            <pin position="2" pad="PD0"/>
-            <pin position="3" pad="PD1"/>
-            <pin position="4" pad="PA1"/>
-            <pin position="5" pad="PA0"/>
-            <pin position="6" pad="PD2"/>
-            <pin position="7" pad="PD3"/>
-            <pin position="8" pad="PD4"/>
-            <pin position="9" pad="PD5"/>
-            <pin position="10" pad="GND"/>
-            <pin position="11" pad="PD6"/>
-            <pin position="12" pad="PB0"/>
-            <pin position="13" pad="PB1"/>
-            <pin position="14" pad="PB2"/>
-            <pin position="15" pad="PB3"/>
-            <pin position="16" pad="PB4"/>
-            <pin position="17" pad="PB5"/>
-            <pin position="18" pad="PB6"/>
-            <pin position="19" pad="PB7"/>
-            <pin position="20" pad="VCC"/>
+            <pin position="1" pad-key="pa2"/>
+            <pin position="2" pad-key="pd0"/>
+            <pin position="3" pad-key="pd1"/>
+            <pin position="4" pad-key="pa1"/>
+            <pin position="5" pad-key="pa0"/>
+            <pin position="6" pad-key="pd2"/>
+            <pin position="7" pad-key="pd3"/>
+            <pin position="8" pad-key="pd4"/>
+            <pin position="9" pad-key="pd5"/>
+            <pin position="10" pad-key="gnd"/>
+            <pin position="11" pad-key="pd6"/>
+            <pin position="12" pad-key="pb0"/>
+            <pin position="13" pad-key="pb1"/>
+            <pin position="14" pad-key="pb2"/>
+            <pin position="15" pad-key="pb3"/>
+            <pin position="16" pad-key="pb4"/>
+            <pin position="17" pad-key="pb5"/>
+            <pin position="18" pad-key="pb6"/>
+            <pin position="19" pad-key="pb7"/>
+            <pin position="20" pad-key="vcc"/>
         </pinout>
         <pinout key="qfn20" name="QFN20" type="qfn">
-            <pin position="1" pad="PD1"/>
-            <pin position="2" pad="PA1"/>
-            <pin position="3" pad="PA0"/>
-            <pin position="4" pad="PD2"/>
-            <pin position="5" pad="PD3"/>
-            <pin position="6" pad="PD4"/>
-            <pin position="7" pad="PD5"/>
-            <pin position="8" pad="GND"/>
-            <pin position="9" pad="PD6"/>
-            <pin position="10" pad="PB0"/>
-            <pin position="11" pad="PB1"/>
-            <pin position="12" pad="PB2"/>
-            <pin position="13" pad="PB3"/>
-            <pin position="14" pad="PB4"/>
-            <pin position="15" pad="PB5"/>
-            <pin position="16" pad="PB6"/>
-            <pin position="17" pad="PB7"/>
-            <pin position="18" pad="VCC"/>
-            <pin position="19" pad="PA2"/>
-            <pin position="20" pad="PD0"/>
+            <pin position="1" pad-key="pd1"/>
+            <pin position="2" pad-key="pa1"/>
+            <pin position="3" pad-key="pa0"/>
+            <pin position="4" pad-key="pd2"/>
+            <pin position="5" pad-key="pd3"/>
+            <pin position="6" pad-key="pd4"/>
+            <pin position="7" pad-key="pd5"/>
+            <pin position="8" pad-key="gnd"/>
+            <pin position="9" pad-key="pd6"/>
+            <pin position="10" pad-key="pb0"/>
+            <pin position="11" pad-key="pb1"/>
+            <pin position="12" pad-key="pb2"/>
+            <pin position="13" pad-key="pb3"/>
+            <pin position="14" pad-key="pb4"/>
+            <pin position="15" pad-key="pb5"/>
+            <pin position="16" pad-key="pb6"/>
+            <pin position="17" pad-key="pb7"/>
+            <pin position="18" pad-key="vcc"/>
+            <pin position="19" pad-key="pa2"/>
+            <pin position="20" pad-key="pd0"/>
         </pinout>
     </pinouts>
     <variants>
-        <variant name="ATtiny2313-20PU" pinout-key="pdip_soic_20" package="PDIP20"/>
-        <variant name="ATtiny2313-20SU" pinout-key="pdip_soic_20" package="SOIC20"/>
-        <variant name="ATtiny2313-20MUR" pinout-key="qfn20" package="WQFN20"/>
+        <variant key="attiny2313_20pu" name="ATtiny2313-20PU" pinout-key="pdip_soic_20"/>
+        <variant key="attiny2313_20su" name="ATtiny2313-20SU" pinout-key="pdip_soic_20"/>
+        <variant key="attiny2313_20mur" name="ATtiny2313-20MUR" pinout-key="qfn20"/>
     </variants>
 </device>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY2313A.xml b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY2313A.xml
index 82063414..ca39ce19 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY2313A.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY2313A.xml
@@ -198,34 +198,34 @@
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pb2" index="2" function="default" group="P"/>
-                <signal pad-id="pb3" index="3" function="default" group="P"/>
-                <signal pad-id="pb4" index="4" function="default" group="P"/>
-                <signal pad-id="pb5" index="5" function="default" group="P"/>
-                <signal pad-id="pb6" index="6" function="default" group="P"/>
-                <signal pad-id="pb7" index="7" function="default" group="P"/>
+                <signal pad-key="pb0" index="0" function="default" group="P"/>
+                <signal pad-key="pb1" index="1" function="default" group="P"/>
+                <signal pad-key="pb2" index="2" function="default" group="P"/>
+                <signal pad-key="pb3" index="3" function="default" group="P"/>
+                <signal pad-key="pb4" index="4" function="default" group="P"/>
+                <signal pad-key="pb5" index="5" function="default" group="P"/>
+                <signal pad-key="pb6" index="6" function="default" group="P"/>
+                <signal pad-key="pb7" index="7" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pd2" index="2" function="default" group="P"/>
-                <signal pad-id="pd3" index="3" function="default" group="P"/>
-                <signal pad-id="pd4" index="4" function="default" group="P"/>
-                <signal pad-id="pd5" index="5" function="default" group="P"/>
-                <signal pad-id="pd6" index="6" function="default" group="P"/>
+                <signal pad-key="pd0" index="0" function="default" group="P"/>
+                <signal pad-key="pd1" index="1" function="default" group="P"/>
+                <signal pad-key="pd2" index="2" function="default" group="P"/>
+                <signal pad-key="pd3" index="3" function="default" group="P"/>
+                <signal pad-key="pd4" index="4" function="default" group="P"/>
+                <signal pad-key="pd5" index="5" function="default" group="P"/>
+                <signal pad-key="pd6" index="6" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pa2" index="2" function="default" group="P"/>
+                <signal pad-key="pa0" index="0" function="default" group="P"/>
+                <signal pad-key="pa1" index="1" function="default" group="P"/>
+                <signal pad-key="pa2" index="2" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="tc0" name="TC0" module-key="tc8">
@@ -539,59 +539,81 @@
             </register-group>
         </module>
     </modules>
+    <pads>
+        <pad key="pa2" name="PA2"/>
+        <pad key="pd0" name="PD0"/>
+        <pad key="pd1" name="PD1"/>
+        <pad key="pa1" name="PA1"/>
+        <pad key="pa0" name="PA0"/>
+        <pad key="pd2" name="PD2"/>
+        <pad key="pd3" name="PD3"/>
+        <pad key="pd4" name="PD4"/>
+        <pad key="pd5" name="PD5"/>
+        <pad key="gnd" name="GND"/>
+        <pad key="pd6" name="PD6"/>
+        <pad key="pb0" name="PB0"/>
+        <pad key="pb1" name="PB1"/>
+        <pad key="pb2" name="PB2"/>
+        <pad key="pb3" name="PB3"/>
+        <pad key="pb4" name="PB4"/>
+        <pad key="pb5" name="PB5"/>
+        <pad key="pb6" name="PB6"/>
+        <pad key="pb7" name="PB7"/>
+        <pad key="vcc" name="VCC"/>
+    </pads>
     <pinouts>
         <pinout key="pdip_soic_20" name="PDIP_SOIC_20" type="dip">
-            <pin position="1" pad="PA2"/>
-            <pin position="2" pad="PD0"/>
-            <pin position="3" pad="PD1"/>
-            <pin position="4" pad="PA1"/>
-            <pin position="5" pad="PA0"/>
-            <pin position="6" pad="PD2"/>
-            <pin position="7" pad="PD3"/>
-            <pin position="8" pad="PD4"/>
-            <pin position="9" pad="PD5"/>
-            <pin position="10" pad="GND"/>
-            <pin position="11" pad="PD6"/>
-            <pin position="12" pad="PB0"/>
-            <pin position="13" pad="PB1"/>
-            <pin position="14" pad="PB2"/>
-            <pin position="15" pad="PB3"/>
-            <pin position="16" pad="PB4"/>
-            <pin position="17" pad="PB5"/>
-            <pin position="18" pad="PB6"/>
-            <pin position="19" pad="PB7"/>
-            <pin position="20" pad="VCC"/>
+            <pin position="1" pad-key="pa2"/>
+            <pin position="2" pad-key="pd0"/>
+            <pin position="3" pad-key="pd1"/>
+            <pin position="4" pad-key="pa1"/>
+            <pin position="5" pad-key="pa0"/>
+            <pin position="6" pad-key="pd2"/>
+            <pin position="7" pad-key="pd3"/>
+            <pin position="8" pad-key="pd4"/>
+            <pin position="9" pad-key="pd5"/>
+            <pin position="10" pad-key="gnd"/>
+            <pin position="11" pad-key="pd6"/>
+            <pin position="12" pad-key="pb0"/>
+            <pin position="13" pad-key="pb1"/>
+            <pin position="14" pad-key="pb2"/>
+            <pin position="15" pad-key="pb3"/>
+            <pin position="16" pad-key="pb4"/>
+            <pin position="17" pad-key="pb5"/>
+            <pin position="18" pad-key="pb6"/>
+            <pin position="19" pad-key="pb7"/>
+            <pin position="20" pad-key="vcc"/>
         </pinout>
         <pinout key="qfn20" name="QFN20" type="qfn">
-            <pin position="1" pad="PD1"/>
-            <pin position="2" pad="PA1"/>
-            <pin position="3" pad="PA0"/>
-            <pin position="4" pad="PD2"/>
-            <pin position="5" pad="PD3"/>
-            <pin position="6" pad="PD4"/>
-            <pin position="7" pad="PD5"/>
-            <pin position="8" pad="GND"/>
-            <pin position="9" pad="PD6"/>
-            <pin position="10" pad="PB0"/>
-            <pin position="11" pad="PB1"/>
-            <pin position="12" pad="PB2"/>
-            <pin position="13" pad="PB3"/>
-            <pin position="14" pad="PB4"/>
-            <pin position="15" pad="PB5"/>
-            <pin position="16" pad="PB6"/>
-            <pin position="17" pad="PB7"/>
-            <pin position="18" pad="VCC"/>
-            <pin position="19" pad="PA2"/>
-            <pin position="20" pad="PD0"/>
+            <pin position="1" pad-key="pd1"/>
+            <pin position="2" pad-key="pa1"/>
+            <pin position="3" pad-key="pa0"/>
+            <pin position="4" pad-key="pd2"/>
+            <pin position="5" pad-key="pd3"/>
+            <pin position="6" pad-key="pd4"/>
+            <pin position="7" pad-key="pd5"/>
+            <pin position="8" pad-key="gnd"/>
+            <pin position="9" pad-key="pd6"/>
+            <pin position="10" pad-key="pb0"/>
+            <pin position="11" pad-key="pb1"/>
+            <pin position="12" pad-key="pb2"/>
+            <pin position="13" pad-key="pb3"/>
+            <pin position="14" pad-key="pb4"/>
+            <pin position="15" pad-key="pb5"/>
+            <pin position="16" pad-key="pb6"/>
+            <pin position="17" pad-key="pb7"/>
+            <pin position="18" pad-key="vcc"/>
+            <pin position="19" pad-key="pa2"/>
+            <pin position="20" pad-key="pd0"/>
         </pinout>
     </pinouts>
     <variants>
-        <variant name="ATtiny2313A-SUR" pinout-key="pdip_soic_20" package="SOIC20"/>
-        <variant name="ATtiny2313A-SU" pinout-key="pdip_soic_20" package="SOIC20"/>
-        <variant name="ATtiny2313A-PU" pinout-key="pdip_soic_20" package="PDIP20"/>
-        <variant name="ATtiny2313A-MUR" pinout-key="qfn20" package="WQFN20"/>
-        <variant name="ATtiny2313A-MU" pinout-key="qfn20" package="WQFN20"/>
-        <variant name="ATtiny2313A-MMHR" pinout-key="qfn20" package="VQFN20"/>
-        <variant name="ATtiny2313A-MMH" pinout-key="qfn20" package="VQFN20"/>
+        <variant key="attiny2313a_sur" name="ATtiny2313A-SUR" pinout-key="pdip_soic_20"/>
+        <variant key="attiny2313a_su" name="ATtiny2313A-SU" pinout-key="pdip_soic_20"/>
+        <variant key="attiny2313a_pu" name="ATtiny2313A-PU" pinout-key="pdip_soic_20"/>
+        <variant key="attiny2313a_mur" name="ATtiny2313A-MUR" pinout-key="qfn20"/>
+        <variant key="attiny2313a_mu" name="ATtiny2313A-MU" pinout-key="qfn20"/>
+        <variant key="attiny2313a_mmhr" name="ATtiny2313A-MMHR" pinout-key="qfn20"/>
+        <variant key="attiny2313a_mmh" name="ATtiny2313A-MMH" pinout-key="qfn20"/>
     </variants>
 </device>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY24.xml b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY24.xml
index 643e4579..a0347306 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY24.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY24.xml
@@ -170,23 +170,23 @@
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pa2" index="2" function="PORTA" group="P"/>
-                <signal pad-id="pa3" index="3" function="PORTA" group="P"/>
-                <signal pad-id="pa4" index="4" function="PORTA" group="P"/>
-                <signal pad-id="pa5" index="5" function="PORTA" group="P"/>
-                <signal pad-id="pa6" index="6" function="PORTA" group="P"/>
-                <signal pad-id="pa7" index="7" function="PORTA" group="P"/>
+                <signal pad-key="pa0" index="0" function="PORTA" group="P"/>
+                <signal pad-key="pa1" index="1" function="PORTA" group="P"/>
+                <signal pad-key="pa2" index="2" function="PORTA" group="P"/>
+                <signal pad-key="pa3" index="3" function="PORTA" group="P"/>
+                <signal pad-key="pa4" index="4" function="PORTA" group="P"/>
+                <signal pad-key="pa5" index="5" function="PORTA" group="P"/>
+                <signal pad-key="pa6" index="6" function="PORTA" group="P"/>
+                <signal pad-key="pa7" index="7" function="PORTA" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pb2" index="2" function="PORTB" group="P"/>
-                <signal pad-id="pb3" index="3" function="PORTB" group="P"/>
+                <signal pad-key="pb0" index="0" function="PORTB" group="P"/>
+                <signal pad-key="pb1" index="1" function="PORTB" group="P"/>
+                <signal pad-key="pb2" index="2" function="PORTB" group="P"/>
+                <signal pad-key="pb3" index="3" function="PORTB" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="ac" name="AC" module-key="ac">
@@ -490,49 +490,65 @@
             </register-group>
         </module>
     </modules>
+    <pads>
+        <pad key="vcc" name="VCC"/>
+        <pad key="pb0" name="PB0"/>
+        <pad key="pb1" name="PB1"/>
+        <pad key="pb3" name="PB3"/>
+        <pad key="pb2" name="PB2"/>
+        <pad key="pa7" name="PA7"/>
+        <pad key="pa6" name="PA6"/>
+        <pad key="pa5" name="PA5"/>
+        <pad key="pa4" name="PA4"/>
+        <pad key="pa3" name="PA3"/>
+        <pad key="pa2" name="PA2"/>
+        <pad key="pa1" name="PA1"/>
+        <pad key="pa0" name="PA0"/>
+        <pad key="gnd" name="GND"/>
+    </pads>
     <pinouts>
         <pinout key="soic14" name="SOIC14" type="soic">
-            <pin position="1" pad="VCC"/>
-            <pin position="2" pad="PB0"/>
-            <pin position="3" pad="PB1"/>
-            <pin position="4" pad="PB3"/>
-            <pin position="5" pad="PB2"/>
-            <pin position="6" pad="PA7"/>
-            <pin position="7" pad="PA6"/>
-            <pin position="8" pad="PA5"/>
-            <pin position="9" pad="PA4"/>
-            <pin position="10" pad="PA3"/>
-            <pin position="11" pad="PA2"/>
-            <pin position="12" pad="PA1"/>
-            <pin position="13" pad="PA0"/>
-            <pin position="14" pad="GND"/>
+            <pin position="1" pad-key="vcc"/>
+            <pin position="2" pad-key="pb0"/>
+            <pin position="3" pad-key="pb1"/>
+            <pin position="4" pad-key="pb3"/>
+            <pin position="5" pad-key="pb2"/>
+            <pin position="6" pad-key="pa7"/>
+            <pin position="7" pad-key="pa6"/>
+            <pin position="8" pad-key="pa5"/>
+            <pin position="9" pad-key="pa4"/>
+            <pin position="10" pad-key="pa3"/>
+            <pin position="11" pad-key="pa2"/>
+            <pin position="12" pad-key="pa1"/>
+            <pin position="13" pad-key="pa0"/>
+            <pin position="14" pad-key="gnd"/>
         </pinout>
         <pinout key="qfn20" name="QFN20" type="qfn">
-            <pin position="1" pad="PA4"/>
-            <pin position="2" pad="PA3"/>
-            <pin position="3" pad="PA2"/>
-            <pin position="4" pad="PA1"/>
-            <pin position="5" pad="PA0"/>
-            <pin position="6" pad="NC"/>
-            <pin position="7" pad="NC"/>
-            <pin position="8" pad="GND"/>
-            <pin position="9" pad="VCC"/>
-            <pin position="10" pad="NC"/>
-            <pin position="11" pad="PB0"/>
-            <pin position="12" pad="PB1"/>
-            <pin position="13" pad="PB3"/>
-            <pin position="14" pad="PB2"/>
-            <pin position="15" pad="PA7"/>
-            <pin position="16" pad="PA6"/>
-            <pin position="17" pad="NC"/>
-            <pin position="18" pad="NC"/>
-            <pin position="19" pad="NC"/>
-            <pin position="20" pad="PA5"/>
+            <pin position="1" pad-key="pa4"/>
+            <pin position="2" pad-key="pa3"/>
+            <pin position="3" pad-key="pa2"/>
+            <pin position="4" pad-key="pa1"/>
+            <pin position="5" pad-key="pa0"/>
+            <pin position="6"/>
+            <pin position="7"/>
+            <pin position="8" pad-key="gnd"/>
+            <pin position="9" pad-key="vcc"/>
+            <pin position="10"/>
+            <pin position="11" pad-key="pb0"/>
+            <pin position="12" pad-key="pb1"/>
+            <pin position="13" pad-key="pb3"/>
+            <pin position="14" pad-key="pb2"/>
+            <pin position="15" pad-key="pa7"/>
+            <pin position="16" pad-key="pa6"/>
+            <pin position="17"/>
+            <pin position="18"/>
+            <pin position="19"/>
+            <pin position="20" pad-key="pa5"/>
         </pinout>
     </pinouts>
     <variants>
-        <variant name="ATtiny24V-10PU" pinout-key="soic14" package="PDIP14"/>
-        <variant name="ATtiny24-20SSU" pinout-key="soic14" package="SOIC14"/>
-        <variant name="ATtiny24V-10MU" pinout-key="qfn20" package="QFN20"/>
+        <variant key="attiny24v_10pu" name="ATtiny24V-10PU" pinout-key="soic14"/>
+        <variant key="attiny24_20ssu" name="ATtiny24-20SSU" pinout-key="soic14"/>
+        <variant key="attiny24v_10mu" name="ATtiny24V-10MU" pinout-key="qfn20"/>
     </variants>
 </device>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY24A.xml b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY24A.xml
index 60061837..2ae6e5b9 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY24A.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY24A.xml
@@ -170,72 +170,72 @@
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pa2" index="2" function="PORTA" group="P"/>
-                <signal pad-id="pa3" index="3" function="PORTA" group="P"/>
-                <signal pad-id="pa4" index="4" function="PORTA" group="P"/>
-                <signal pad-id="pa5" index="5" function="PORTA" group="P"/>
-                <signal pad-id="pa6" index="6" function="PORTA" group="P"/>
-                <signal pad-id="pa7" index="7" function="PORTA" group="P"/>
+                <signal pad-key="pa0" index="0" function="PORTA" group="P"/>
+                <signal pad-key="pa1" index="1" function="PORTA" group="P"/>
+                <signal pad-key="pa2" index="2" function="PORTA" group="P"/>
+                <signal pad-key="pa3" index="3" function="PORTA" group="P"/>
+                <signal pad-key="pa4" index="4" function="PORTA" group="P"/>
+                <signal pad-key="pa5" index="5" function="PORTA" group="P"/>
+                <signal pad-key="pa6" index="6" function="PORTA" group="P"/>
+                <signal pad-key="pa7" index="7" function="PORTA" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pb2" index="2" function="PORTB" group="P"/>
-                <signal pad-id="pb3" index="3" function="PORTB" group="P"/>
+                <signal pad-key="pb0" index="0" function="PORTB" group="P"/>
+                <signal pad-key="pb1" index="1" function="PORTB" group="P"/>
+                <signal pad-key="pb2" index="2" function="PORTB" group="P"/>
+                <signal pad-key="pb3" index="3" function="PORTB" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="ac" name="AC" module-key="ac">
             <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"/>
+                <signal pad-key="pa1" index="0" function="ACIN" group="AIN"/>
+                <signal pad-key="pa2" index="1" function="ACIN" group="AIN"/>
             </signals>
         </peripheral>
         <peripheral key="adc" name="ADC" module-key="adc">
             <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"/>
-                <signal pad-id="pa2" index="2" function="ADC" group="ADC"/>
-                <signal pad-id="pa3" index="3" function="ADC" group="ADC"/>
-                <signal pad-id="pa4" index="4" function="ADC" group="ADC"/>
-                <signal pad-id="pa5" index="5" function="ADC" group="ADC"/>
-                <signal pad-id="pa6" index="6" function="ADC" group="ADC"/>
-                <signal pad-id="pa7" index="7" function="ADC" group="ADC"/>
-                <signal pad-id="pa0" function="AREF" group="AREF"/>
+                <signal pad-key="pa0" index="0" function="ADC" group="ADC"/>
+                <signal pad-key="pa1" index="1" function="ADC" group="ADC"/>
+                <signal pad-key="pa2" index="2" function="ADC" group="ADC"/>
+                <signal pad-key="pa3" index="3" function="ADC" group="ADC"/>
+                <signal pad-key="pa4" index="4" function="ADC" group="ADC"/>
+                <signal pad-key="pa5" index="5" function="ADC" group="ADC"/>
+                <signal pad-key="pa6" index="6" function="ADC" group="ADC"/>
+                <signal pad-key="pa7" index="7" function="ADC" group="ADC"/>
+                <signal pad-key="pa0" function="AREF" group="AREF"/>
             </signals>
         </peripheral>
         <peripheral key="usi" name="USI" module-key="usi">
             <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"/>
-                <signal pad-id="pa4" function="SPI" group="USCK"/>
-                <signal pad-id="pa5" function="SPI" group="DO"/>
-                <signal pad-id="pa6" function="SPI" group="DI"/>
+                <signal pad-key="pa4" function="TWI" group="SCL"/>
+                <signal pad-key="pa6" function="TWI" group="SDA"/>
+                <signal pad-key="pa4" function="SPI" group="USCK"/>
+                <signal pad-key="pa5" function="SPI" group="DO"/>
+                <signal pad-key="pa6" function="SPI" group="DI"/>
             </signals>
         </peripheral>
         <peripheral key="exint" name="EXINT" module-key="exint">
             <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"/>
-                <signal pad-id="pa2" index="2" function="EXTINT" group="PCINT"/>
-                <signal pad-id="pa3" index="3" function="EXTINT" group="PCINT"/>
-                <signal pad-id="pa4" index="4" function="EXTINT" group="PCINT"/>
-                <signal pad-id="pa5" index="5" function="EXTINT" group="PCINT"/>
-                <signal pad-id="pa6" index="6" function="EXTINT" group="PCINT"/>
-                <signal pad-id="pa7" index="7" function="EXTINT" group="PCINT"/>
-                <signal pad-id="pb0" index="8" function="EXTINT" group="PCINT"/>
-                <signal pad-id="pb1" index="9" function="EXTINT" group="PCINT"/>
-                <signal pad-id="pb2" index="10" function="EXTINT" group="PCINT"/>
-                <signal pad-id="pb3" index="11" function="EXTINT" group="PCINT"/>
-                <signal pad-id="pb2" index="0" function="EXTINT" group="INT"/>
+                <signal pad-key="pa0" index="0" function="EXTINT" group="PCINT"/>
+                <signal pad-key="pa1" index="1" function="EXTINT" group="PCINT"/>
+                <signal pad-key="pa2" index="2" function="EXTINT" group="PCINT"/>
+                <signal pad-key="pa3" index="3" function="EXTINT" group="PCINT"/>
+                <signal pad-key="pa4" index="4" function="EXTINT" group="PCINT"/>
+                <signal pad-key="pa5" index="5" function="EXTINT" group="PCINT"/>
+                <signal pad-key="pa6" index="6" function="EXTINT" group="PCINT"/>
+                <signal pad-key="pa7" index="7" function="EXTINT" group="PCINT"/>
+                <signal pad-key="pb0" index="8" function="EXTINT" group="PCINT"/>
+                <signal pad-key="pb1" index="9" function="EXTINT" group="PCINT"/>
+                <signal pad-key="pb2" index="10" function="EXTINT" group="PCINT"/>
+                <signal pad-key="pb3" index="11" function="EXTINT" group="PCINT"/>
+                <signal pad-key="pb2" index="0" function="EXTINT" group="INT"/>
             </signals>
         </peripheral>
         <peripheral key="eeprom" name="EEPROM" module-key="eeprom">
@@ -247,18 +247,18 @@
         <peripheral key="tc0" name="TC0" module-key="tc8">
             <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"/>
-                <signal pad-id="pb2" function="T0" group="OC0A"/>
+                <signal pad-key="pa3" function="T0" group="T0"/>
+                <signal pad-key="pa7" function="T0" group="OC0B"/>
+                <signal pad-key="pb2" function="T0" group="OC0A"/>
             </signals>
         </peripheral>
         <peripheral key="tc1" name="TC1" module-key="tc16">
             <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"/>
-                <signal pad-id="pa6" function="T1" group="OC1A"/>
-                <signal pad-id="pa7" function="T1" group="ICP1"/>
+                <signal pad-key="pa4" function="T1" group="T1"/>
+                <signal pad-key="pa5" function="T1" group="OC1B"/>
+                <signal pad-key="pa6" function="T1" group="OC1A"/>
+                <signal pad-key="pa7" function="T1" group="ICP1"/>
             </signals>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="cpu">
@@ -540,73 +540,89 @@
             </register-group>
         </module>
     </modules>
+    <pads>
+        <pad key="vcc" name="VCC"/>
+        <pad key="pb0" name="PB0"/>
+        <pad key="pb1" name="PB1"/>
+        <pad key="pb3" name="PB3"/>
+        <pad key="pb2" name="PB2"/>
+        <pad key="pa7" name="PA7"/>
+        <pad key="pa6" name="PA6"/>
+        <pad key="pa5" name="PA5"/>
+        <pad key="pa4" name="PA4"/>
+        <pad key="pa3" name="PA3"/>
+        <pad key="pa2" name="PA2"/>
+        <pad key="pa1" name="PA1"/>
+        <pad key="pa0" name="PA0"/>
+        <pad key="gnd" name="GND"/>
+    </pads>
     <pinouts>
         <pinout key="soic_14" name="SOIC_14" type="soic">
-            <pin position="1" pad="VCC"/>
-            <pin position="2" pad="PB0"/>
-            <pin position="3" pad="PB1"/>
-            <pin position="4" pad="PB3"/>
-            <pin position="5" pad="PB2"/>
-            <pin position="6" pad="PA7"/>
-            <pin position="7" pad="PA6"/>
-            <pin position="8" pad="PA5"/>
-            <pin position="9" pad="PA4"/>
-            <pin position="10" pad="PA3"/>
-            <pin position="11" pad="PA2"/>
-            <pin position="12" pad="PA1"/>
-            <pin position="13" pad="PA0"/>
-            <pin position="14" pad="GND"/>
+            <pin position="1" pad-key="vcc"/>
+            <pin position="2" pad-key="pb0"/>
+            <pin position="3" pad-key="pb1"/>
+            <pin position="4" pad-key="pb3"/>
+            <pin position="5" pad-key="pb2"/>
+            <pin position="6" pad-key="pa7"/>
+            <pin position="7" pad-key="pa6"/>
+            <pin position="8" pad-key="pa5"/>
+            <pin position="9" pad-key="pa4"/>
+            <pin position="10" pad-key="pa3"/>
+            <pin position="11" pad-key="pa2"/>
+            <pin position="12" pad-key="pa1"/>
+            <pin position="13" pad-key="pa0"/>
+            <pin position="14" pad-key="gnd"/>
         </pinout>
         <pinout key="qfn20" name="QFN20" type="qfn">
-            <pin position="1" pad="PA4"/>
-            <pin position="2" pad="PA3"/>
-            <pin position="3" pad="PA2"/>
-            <pin position="4" pad="PA1"/>
-            <pin position="5" pad="PA0"/>
-            <pin position="6" pad="NC"/>
-            <pin position="7" pad="NC"/>
-            <pin position="8" pad="GND"/>
-            <pin position="9" pad="VCC"/>
-            <pin position="10" pad="NC"/>
-            <pin position="11" pad="PB0"/>
-            <pin position="12" pad="PB1"/>
-            <pin position="13" pad="PB3"/>
-            <pin position="14" pad="PB2"/>
-            <pin position="15" pad="PA7"/>
-            <pin position="16" pad="PA6"/>
-            <pin position="17" pad="NC"/>
-            <pin position="18" pad="NC"/>
-            <pin position="19" pad="NC"/>
-            <pin position="20" pad="PA5"/>
+            <pin position="1" pad-key="pa4"/>
+            <pin position="2" pad-key="pa3"/>
+            <pin position="3" pad-key="pa2"/>
+            <pin position="4" pad-key="pa1"/>
+            <pin position="5" pad-key="pa0"/>
+            <pin position="6"/>
+            <pin position="7"/>
+            <pin position="8" pad-key="gnd"/>
+            <pin position="9" pad-key="vcc"/>
+            <pin position="10"/>
+            <pin position="11" pad-key="pb0"/>
+            <pin position="12" pad-key="pb1"/>
+            <pin position="13" pad-key="pb3"/>
+            <pin position="14" pad-key="pb2"/>
+            <pin position="15" pad-key="pa7"/>
+            <pin position="16" pad-key="pa6"/>
+            <pin position="17"/>
+            <pin position="18"/>
+            <pin position="19"/>
+            <pin position="20" pad-key="pa5"/>
         </pinout>
         <pinout key="bga_16" name="BGA_16" type="bga">
-            <pin position="A1" pad="NC"/>
-            <pin position="A2" pad="PA5"/>
-            <pin position="A3" pad="PA6"/>
-            <pin position="A4" pad="PB2"/>
-            <pin position="B1" pad="PA4"/>
-            <pin position="B2" pad="PA7"/>
-            <pin position="B3" pad="PB1"/>
-            <pin position="B4" pad="PB3"/>
-            <pin position="C1" pad="PA3"/>
-            <pin position="C2" pad="PA2"/>
-            <pin position="C3" pad="PA1"/>
-            <pin position="C4" pad="PB0"/>
-            <pin position="D1" pad="PA0"/>
-            <pin position="D2" pad="GND"/>
-            <pin position="D3" pad="GND"/>
-            <pin position="D4" pad="VCC"/>
+            <pin position="A1"/>
+            <pin position="A2" pad-key="pa5"/>
+            <pin position="A3" pad-key="pa6"/>
+            <pin position="A4" pad-key="pb2"/>
+            <pin position="B1" pad-key="pa4"/>
+            <pin position="B2" pad-key="pa7"/>
+            <pin position="B3" pad-key="pb1"/>
+            <pin position="B4" pad-key="pb3"/>
+            <pin position="C1" pad-key="pa3"/>
+            <pin position="C2" pad-key="pa2"/>
+            <pin position="C3" pad-key="pa1"/>
+            <pin position="C4" pad-key="pb0"/>
+            <pin position="D1" pad-key="pa0"/>
+            <pin position="D2" pad-key="gnd"/>
+            <pin position="D3" pad-key="gnd"/>
+            <pin position="D4" pad-key="vcc"/>
         </pinout>
     </pinouts>
     <variants>
-        <variant name="ATtiny24A-CCU" pinout-key="bga_16" package="UFBGA16"/>
-        <variant name="ATtiny24A-MMH" pinout-key="qfn20" package="VQFN20"/>
-        <variant name="ATtiny24A-MU" pinout-key="qfn20" package="QFN20"/>
-        <variant name="ATtiny24A-PU" pinout-key="soic_14" package="PDIP14"/>
-        <variant name="ATtiny24A-SSU" pinout-key="soic_14" package="SOIC14"/>
-        <variant name="ATtiny24A-SSN" pinout-key="soic_14" package="SOIC14"/>
-        <variant name="ATtiny24A-MF" pinout-key="qfn20" package="QFN20"/>
-        <variant name="ATtiny24A-MM8" pinout-key="qfn20" package="VQFN20"/>
-        <variant name="ATtiny24A-SSF" pinout-key="soic_14" package="SOIC14"/>
+        <variant key="attiny24a_ccu" name="ATtiny24A-CCU" pinout-key="bga_16"/>
+        <variant key="attiny24a_mmh" name="ATtiny24A-MMH" pinout-key="qfn20"/>
+        <variant key="attiny24a_mu" name="ATtiny24A-MU" pinout-key="qfn20"/>
+        <variant key="attiny24a_pu" name="ATtiny24A-PU" pinout-key="soic_14"/>
+        <variant key="attiny24a_ssu" name="ATtiny24A-SSU" pinout-key="soic_14"/>
+        <variant key="attiny24a_ssn" name="ATtiny24A-SSN" pinout-key="soic_14"/>
+        <variant key="attiny24a_mf" name="ATtiny24A-MF" pinout-key="qfn20"/>
+        <variant key="attiny24a_mm8" name="ATtiny24A-MM8" pinout-key="qfn20"/>
+        <variant key="attiny24a_ssf" name="ATtiny24A-SSF" pinout-key="soic_14"/>
     </variants>
 </device>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY25.xml b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY25.xml
index 3585da9e..4c74f183 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY25.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY25.xml
@@ -170,50 +170,50 @@
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pb2" index="2" function="PORTB" group="P"/>
-                <signal pad-id="pb3" index="3" function="PORTB" group="P"/>
-                <signal pad-id="pb4" index="4" function="PORTB" group="P"/>
-                <signal pad-id="pb5" index="5" function="PORTB" group="P"/>
+                <signal pad-key="pb0" index="0" function="PORTB" group="P"/>
+                <signal pad-key="pb1" index="1" function="PORTB" group="P"/>
+                <signal pad-key="pb2" index="2" function="PORTB" group="P"/>
+                <signal pad-key="pb3" index="3" function="PORTB" group="P"/>
+                <signal pad-key="pb4" index="4" function="PORTB" group="P"/>
+                <signal pad-key="pb5" index="5" function="PORTB" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="ac" name="AC" module-key="ac">
             <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"/>
+                <signal pad-key="pb1" index="1" function="ACIN" group="AIN"/>
+                <signal pad-key="pb0" index="0" function="ACIN" group="AIN"/>
             </signals>
         </peripheral>
         <peripheral key="adc" name="ADC" module-key="adc">
             <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"/>
-                <signal pad-id="pb4" index="2" function="ADC" group="ADC"/>
-                <signal pad-id="pb0" function="AREF" group="AREF"/>
+                <signal pad-key="pb5" index="0" function="ADC" group="ADC"/>
+                <signal pad-key="pb2" index="1" function="ADC" group="ADC"/>
+                <signal pad-key="pb4" index="2" function="ADC" group="ADC"/>
+                <signal pad-key="pb0" function="AREF" group="AREF"/>
             </signals>
         </peripheral>
         <peripheral key="usi" name="USI" module-key="usi">
             <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"/>
-                <signal pad-id="pb0" function="SPI" group="DI"/>
-                <signal pad-id="pb1" function="SPI" group="DO"/>
-                <signal pad-id="pb2" function="SPI" group="USCK"/>
+                <signal pad-key="pb0" function="TWI" group="SDA"/>
+                <signal pad-key="pb2" function="TWI" group="SCL"/>
+                <signal pad-key="pb0" function="SPI" group="DI"/>
+                <signal pad-key="pb1" function="SPI" group="DO"/>
+                <signal pad-key="pb2" function="SPI" group="USCK"/>
             </signals>
         </peripheral>
         <peripheral key="exint" name="EXINT" module-key="exint">
             <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"/>
-                <signal pad-id="pb2" index="2" function="EXTINT" group="PCINT"/>
-                <signal pad-id="pb3" index="3" function="EXTINT" group="PCINT"/>
-                <signal pad-id="pb4" index="4" function="EXTINT" group="PCINT"/>
-                <signal pad-id="pb5" index="5" function="EXTINT" group="PCINT"/>
-                <signal pad-id="pb2" index="0" function="EXTINT" group="INT"/>
+                <signal pad-key="pb0" index="0" function="EXTINT" group="PCINT"/>
+                <signal pad-key="pb1" index="1" function="EXTINT" group="PCINT"/>
+                <signal pad-key="pb2" index="2" function="EXTINT" group="PCINT"/>
+                <signal pad-key="pb3" index="3" function="EXTINT" group="PCINT"/>
+                <signal pad-key="pb4" index="4" function="EXTINT" group="PCINT"/>
+                <signal pad-key="pb5" index="5" function="EXTINT" group="PCINT"/>
+                <signal pad-key="pb2" index="0" function="EXTINT" group="INT"/>
             </signals>
         </peripheral>
         <peripheral key="eeprom" name="EEPROM" module-key="eeprom">
@@ -225,18 +225,18 @@
         <peripheral key="tc0" name="TC0" module-key="tc8">
             <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"/>
-                <signal pad-id="pb0" function="T0" group="OC0A"/>
+                <signal pad-key="pb2" function="T0" group="T0"/>
+                <signal pad-key="pb1" function="T0" group="OC0B"/>
+                <signal pad-key="pb0" function="T0" group="OC0A"/>
             </signals>
         </peripheral>
         <peripheral key="tc1" name="TC1" module-key="tc8">
             <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"/>
-                <signal pad-id="pb1" function="T1" group="OC1A"/>
-                <signal pad-id="pb0" function="T1" group="OC1AINV"/>
+                <signal pad-key="pb4" function="T1" group="OC1B"/>
+                <signal pad-key="pb3" function="T1" group="OC1BINV"/>
+                <signal pad-key="pb1" function="T1" group="OC1A"/>
+                <signal pad-key="pb0" function="T1" group="OC1AINV"/>
             </signals>
         </peripheral>
         <peripheral key="boot_load" name="BOOT_LOAD" module-key="boot_load">
@@ -533,58 +533,68 @@
             </register-group>
         </module>
     </modules>
+    <pads>
+        <pad key="pb5" name="PB5"/>
+        <pad key="pb3" name="PB3"/>
+        <pad key="pb4" name="PB4"/>
+        <pad key="gnd" name="GND"/>
+        <pad key="pb0" name="PB0"/>
+        <pad key="pb1" name="PB1"/>
+        <pad key="pb2" name="PB2"/>
+        <pad key="vcc" name="VCC"/>
+    </pads>
     <pinouts>
         <pinout key="soic_8" name="SOIC_8" type="soic">
-            <pin position="1" pad="PB5"/>
-            <pin position="2" pad="PB3"/>
-            <pin position="3" pad="PB4"/>
-            <pin position="4" pad="GND"/>
-            <pin position="5" pad="PB0"/>
-            <pin position="6" pad="PB1"/>
-            <pin position="7" pad="PB2"/>
-            <pin position="8" pad="VCC"/>
+            <pin position="1" pad-key="pb5"/>
+            <pin position="2" pad-key="pb3"/>
+            <pin position="3" pad-key="pb4"/>
+            <pin position="4" pad-key="gnd"/>
+            <pin position="5" pad-key="pb0"/>
+            <pin position="6" pad-key="pb1"/>
+            <pin position="7" pad-key="pb2"/>
+            <pin position="8" pad-key="vcc"/>
         </pinout>
         <pinout key="qfn_20" name="QFN_20" type="qfn">
-            <pin position="1" pad="PB5"/>
-            <pin position="2" pad="PB3"/>
-            <pin position="3" pad="NC"/>
-            <pin position="4" pad="NC"/>
-            <pin position="5" pad="PB4"/>
-            <pin position="6" pad="NC"/>
-            <pin position="7" pad="NC"/>
-            <pin position="8" pad="GND"/>
-            <pin position="9" pad="NC"/>
-            <pin position="10" pad="NC"/>
-            <pin position="11" pad="PB0"/>
-            <pin position="12" pad="PB1"/>
-            <pin position="13" pad="NC"/>
-            <pin position="14" pad="PB2"/>
-            <pin position="15" pad="VCC"/>
-            <pin position="16" pad="NC"/>
-            <pin position="17" pad="NC"/>
-            <pin position="18" pad="NC"/>
-            <pin position="19" pad="NC"/>
-            <pin position="20" pad="NC"/>
+            <pin position="1" pad-key="pb5"/>
+            <pin position="2" pad-key="pb3"/>
+            <pin position="3"/>
+            <pin position="4"/>
+            <pin position="5" pad-key="pb4"/>
+            <pin position="6"/>
+            <pin position="7"/>
+            <pin position="8" pad-key="gnd"/>
+            <pin position="9"/>
+            <pin position="10"/>
+            <pin position="11" pad-key="pb0"/>
+            <pin position="12" pad-key="pb1"/>
+            <pin position="13"/>
+            <pin position="14" pad-key="pb2"/>
+            <pin position="15" pad-key="vcc"/>
+            <pin position="16"/>
+            <pin position="17"/>
+            <pin position="18"/>
+            <pin position="19"/>
+            <pin position="20"/>
         </pinout>
     </pinouts>
     <variants>
-        <variant name="ATtiny25V-10PU" pinout-key="soic_8" package="PDIP8"/>
-        <variant name="ATtiny25V-10SU" pinout-key="soic_8" package="SOIC8"/>
-        <variant name="ATtiny25V-10SH" pinout-key="soic_8" package="SOIC8"/>
-        <variant name="ATtiny25V-10SSU" pinout-key="soic_8" package="SOIC8"/>
-        <variant name="ATtiny25V-10SSH" pinout-key="soic_8" package="SOIC8"/>
-        <variant name="ATtiny25V-10MU" pinout-key="qfn_20" package="MLF20"/>
-        <variant name="ATtiny25V-10SN" pinout-key="soic_8" package="SOIC8"/>
-        <variant name="ATtiny25V-10SSN" pinout-key="soic_8" package="SOIC8"/>
-        <variant name="ATtiny25V-10MF" pinout-key="qfn_20" package="MLF20"/>
-        <variant name="ATtiny25V-20PU" pinout-key="soic_8" package="PDIP8"/>
-        <variant name="ATtiny25V-20SU" pinout-key="soic_8" package="SOIC8"/>
-        <variant name="ATtiny25V-20SH" pinout-key="soic_8" package="SOIC8"/>
-        <variant name="ATtiny25V-20SSU" pinout-key="soic_8" package="SOIC8"/>
-        <variant name="ATtiny25V-20SSH" pinout-key="soic_8" package="SOIC8"/>
-        <variant name="ATtiny25V-20MU" pinout-key="qfn_20" package="MLF20"/>
-        <variant name="ATtiny25V-20SN" pinout-key="soic_8" package="SOIC8"/>
-        <variant name="ATtiny25V-20SSN" pinout-key="soic_8" package="SOIC8"/>
-        <variant name="ATtiny25V-20MF" pinout-key="qfn_20" package="MLF20"/>
+        <variant key="attiny25v_10pu" name="ATtiny25V-10PU" pinout-key="soic_8"/>
+        <variant key="attiny25v_10su" name="ATtiny25V-10SU" pinout-key="soic_8"/>
+        <variant key="attiny25v_10sh" name="ATtiny25V-10SH" pinout-key="soic_8"/>
+        <variant key="attiny25v_10ssu" name="ATtiny25V-10SSU" pinout-key="soic_8"/>
+        <variant key="attiny25v_10ssh" name="ATtiny25V-10SSH" pinout-key="soic_8"/>
+        <variant key="attiny25v_10mu" name="ATtiny25V-10MU" pinout-key="qfn_20"/>
+        <variant key="attiny25v_10sn" name="ATtiny25V-10SN" pinout-key="soic_8"/>
+        <variant key="attiny25v_10ssn" name="ATtiny25V-10SSN" pinout-key="soic_8"/>
+        <variant key="attiny25v_10mf" name="ATtiny25V-10MF" pinout-key="qfn_20"/>
+        <variant key="attiny25v_20pu" name="ATtiny25V-20PU" pinout-key="soic_8"/>
+        <variant key="attiny25v_20su" name="ATtiny25V-20SU" pinout-key="soic_8"/>
+        <variant key="attiny25v_20sh" name="ATtiny25V-20SH" pinout-key="soic_8"/>
+        <variant key="attiny25v_20ssu" name="ATtiny25V-20SSU" pinout-key="soic_8"/>
+        <variant key="attiny25v_20ssh" name="ATtiny25V-20SSH" pinout-key="soic_8"/>
+        <variant key="attiny25v_20mu" name="ATtiny25V-20MU" pinout-key="qfn_20"/>
+        <variant key="attiny25v_20sn" name="ATtiny25V-20SN" pinout-key="soic_8"/>
+        <variant key="attiny25v_20ssn" name="ATtiny25V-20SSN" pinout-key="soic_8"/>
+        <variant key="attiny25v_20mf" name="ATtiny25V-20MF" pinout-key="qfn_20"/>
     </variants>
 </device>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY261.xml b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY261.xml
index 745a7e6d..fdf6282d 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY261.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY261.xml
@@ -198,67 +198,67 @@
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pa2" index="2" function="PORTA" group="P"/>
-                <signal pad-id="pa3" index="3" function="PORTA" group="P"/>
-                <signal pad-id="pa4" index="4" function="PORTA" group="P"/>
-                <signal pad-id="pa5" index="5" function="PORTA" group="P"/>
-                <signal pad-id="pa6" index="6" function="PORTA" group="P"/>
-                <signal pad-id="pa7" index="7" function="PORTA" group="P"/>
+                <signal pad-key="pa0" index="0" function="PORTA" group="P"/>
+                <signal pad-key="pa1" index="1" function="PORTA" group="P"/>
+                <signal pad-key="pa2" index="2" function="PORTA" group="P"/>
+                <signal pad-key="pa3" index="3" function="PORTA" group="P"/>
+                <signal pad-key="pa4" index="4" function="PORTA" group="P"/>
+                <signal pad-key="pa5" index="5" function="PORTA" group="P"/>
+                <signal pad-key="pa6" index="6" function="PORTA" group="P"/>
+                <signal pad-key="pa7" index="7" function="PORTA" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pb2" index="2" function="PORTB" group="P"/>
-                <signal pad-id="pb3" index="3" function="PORTB" group="P"/>
-                <signal pad-id="pb4" index="4" function="PORTB" group="P"/>
-                <signal pad-id="pb5" index="5" function="PORTB" group="P"/>
-                <signal pad-id="pb6" index="6" function="PORTB" group="P"/>
-                <signal pad-id="pb7" index="7" function="PORTB" group="P"/>
+                <signal pad-key="pb0" index="0" function="PORTB" group="P"/>
+                <signal pad-key="pb1" index="1" function="PORTB" group="P"/>
+                <signal pad-key="pb2" index="2" function="PORTB" group="P"/>
+                <signal pad-key="pb3" index="3" function="PORTB" group="P"/>
+                <signal pad-key="pb4" index="4" function="PORTB" group="P"/>
+                <signal pad-key="pb5" index="5" function="PORTB" group="P"/>
+                <signal pad-key="pb6" index="6" function="PORTB" group="P"/>
+                <signal pad-key="pb7" index="7" function="PORTB" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="adc" name="ADC" module-key="adc">
             <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"/>
-                <signal pad-id="pa2" index="2" function="ADC" group="ADC"/>
-                <signal pad-id="pa4" index="3" function="ADC" group="ADC"/>
-                <signal pad-id="pa5" index="4" function="ADC" group="ADC"/>
-                <signal pad-id="pa6" index="5" function="ADC" group="ADC"/>
-                <signal pad-id="pa7" index="6" function="ADC" group="ADC"/>
-                <signal pad-id="pb4" index="7" function="ADC" group="ADC"/>
-                <signal pad-id="pb5" index="8" function="ADC" group="ADC"/>
-                <signal pad-id="pb6" index="9" function="ADC" group="ADC"/>
-                <signal pad-id="pb7" index="10" function="ADC" group="ADC"/>
-                <signal pad-id="pa3" function="AREF" group="AREF"/>
+                <signal pad-key="pa0" index="0" function="ADC" group="ADC"/>
+                <signal pad-key="pa1" index="1" function="ADC" group="ADC"/>
+                <signal pad-key="pa2" index="2" function="ADC" group="ADC"/>
+                <signal pad-key="pa4" index="3" function="ADC" group="ADC"/>
+                <signal pad-key="pa5" index="4" function="ADC" group="ADC"/>
+                <signal pad-key="pa6" index="5" function="ADC" group="ADC"/>
+                <signal pad-key="pa7" index="6" function="ADC" group="ADC"/>
+                <signal pad-key="pb4" index="7" function="ADC" group="ADC"/>
+                <signal pad-key="pb5" index="8" function="ADC" group="ADC"/>
+                <signal pad-key="pb6" index="9" function="ADC" group="ADC"/>
+                <signal pad-key="pb7" index="10" function="ADC" group="ADC"/>
+                <signal pad-key="pa3" function="AREF" group="AREF"/>
             </signals>
         </peripheral>
         <peripheral key="ac" name="AC" module-key="ac">
             <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"/>
-                <signal pad-id="pa5" index="2" function="ACIN" group="AIN"/>
+                <signal pad-key="pa7" index="0" function="ACIN" group="AIN"/>
+                <signal pad-key="pa6" index="1" function="ACIN" group="AIN"/>
+                <signal pad-key="pa5" index="2" function="ACIN" group="AIN"/>
             </signals>
         </peripheral>
         <peripheral key="usi" name="USI" module-key="usi">
             <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"/>
-                <signal pad-id="pa2" function="USI_ALT" group="SCL " field="USIPOS"/>
-                <signal pad-id="pa0" function="USI_ALT" group="SDA" field="USIPOS"/>
-                <signal pad-id="pb0" function="USI" group="DI" field="USIPOS"/>
-                <signal pad-id="pb1" function="USI" group="DO" field="USIPOS"/>
-                <signal pad-id="pb2" function="USI" group="USCK" field="USIPOS"/>
-                <signal pad-id="pa2" function="USI_ALT" group="USCK" field="USIPOS"/>
-                <signal pad-id="pa1" function="USI_ALT" group="DO" field="USIPOS"/>
-                <signal pad-id="pa0" function="USI_ALT" group="DI" field="USIPOS"/>
+                <signal pad-key="pb0" function="USI" group="SDA" field="USIPOS"/>
+                <signal pad-key="pb2" function="USI" group="SCL" field="USIPOS"/>
+                <signal pad-key="pa2" function="USI_ALT" group="SCL " field="USIPOS"/>
+                <signal pad-key="pa0" function="USI_ALT" group="SDA" field="USIPOS"/>
+                <signal pad-key="pb0" function="USI" group="DI" field="USIPOS"/>
+                <signal pad-key="pb1" function="USI" group="DO" field="USIPOS"/>
+                <signal pad-key="pb2" function="USI" group="USCK" field="USIPOS"/>
+                <signal pad-key="pa2" function="USI_ALT" group="USCK" field="USIPOS"/>
+                <signal pad-key="pa1" function="USI_ALT" group="DO" field="USIPOS"/>
+                <signal pad-key="pa0" function="USI_ALT" group="DI" field="USIPOS"/>
             </signals>
         </peripheral>
         <peripheral key="eeprom" name="EEPROM" module-key="eeprom">
@@ -270,19 +270,19 @@
         <peripheral key="tc0" name="TC0" module-key="tc8">
             <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"/>
+                <signal pad-key="pa4" function="T0" group="ICP0"/>
+                <signal pad-key="pb6" function="T0" group="T0"/>
             </signals>
         </peripheral>
         <peripheral key="tc1" name="TC1" module-key="tc8">
             <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"/>
-                <signal pad-id="pb2" function="T1" group="OC1BINV"/>
-                <signal pad-id="pb3" function="T1" group="OC1B"/>
-                <signal pad-id="pb4" function="T1" group="OC1DINV"/>
-                <signal pad-id="pb5" function="T1" group="OC1D"/>
+                <signal pad-key="pb0" function="T1" group="OC1AINV"/>
+                <signal pad-key="pb1" function="T1" group="OC1A"/>
+                <signal pad-key="pb2" function="T1" group="OC1BINV"/>
+                <signal pad-key="pb3" function="T1" group="OC1B"/>
+                <signal pad-key="pb4" function="T1" group="OC1DINV"/>
+                <signal pad-key="pb5" function="T1" group="OC1D"/>
             </signals>
         </peripheral>
         <peripheral key="boot_load" name="BOOT_LOAD" module-key="boot_load">
@@ -291,24 +291,24 @@
         <peripheral key="exint" name="EXINT" module-key="exint">
             <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"/>
-                <signal pad-id="pa2" index="2" function="EXTINT" group="PCINT"/>
-                <signal pad-id="pa3" index="3" function="EXTINT" group="PCINT"/>
-                <signal pad-id="pa4" index="4" function="EXTINT" group="PCINT"/>
-                <signal pad-id="pa5" index="5" function="EXTINT" group="PCINT"/>
-                <signal pad-id="pa6" index="6" function="EXTINT" group="PCINT"/>
-                <signal pad-id="pa7" index="7" function="EXTINT" group="PCINT"/>
-                <signal pad-id="pb0" index="8" function="EXTINT" group="PCINT"/>
-                <signal pad-id="pb1" index="9" function="EXTINT" group="PCINT"/>
-                <signal pad-id="pb2" index="10" function="EXTINT" group="PCINT"/>
-                <signal pad-id="pb3" index="11" function="EXTINT" group="PCINT"/>
-                <signal pad-id="pb4" index="12" function="EXTINT" group="PCINT"/>
-                <signal pad-id="pb5" index="13" function="EXTINT" group="PCINT"/>
-                <signal pad-id="pb6" index="14" function="EXTINT" group="PCINT"/>
-                <signal pad-id="pb7" index="15" function="EXTINT" group="PCINT"/>
-                <signal pad-id="pa2" index="1" function="EXTINT" group="INT"/>
-                <signal pad-id="pb6" index="0" function="EXTINT" group="INT"/>
+                <signal pad-key="pa0" index="0" function="EXTINT" group="PCINT"/>
+                <signal pad-key="pa1" index="1" function="EXTINT" group="PCINT"/>
+                <signal pad-key="pa2" index="2" function="EXTINT" group="PCINT"/>
+                <signal pad-key="pa3" index="3" function="EXTINT" group="PCINT"/>
+                <signal pad-key="pa4" index="4" function="EXTINT" group="PCINT"/>
+                <signal pad-key="pa5" index="5" function="EXTINT" group="PCINT"/>
+                <signal pad-key="pa6" index="6" function="EXTINT" group="PCINT"/>
+                <signal pad-key="pa7" index="7" function="EXTINT" group="PCINT"/>
+                <signal pad-key="pb0" index="8" function="EXTINT" group="PCINT"/>
+                <signal pad-key="pb1" index="9" function="EXTINT" group="PCINT"/>
+                <signal pad-key="pb2" index="10" function="EXTINT" group="PCINT"/>
+                <signal pad-key="pb3" index="11" function="EXTINT" group="PCINT"/>
+                <signal pad-key="pb4" index="12" function="EXTINT" group="PCINT"/>
+                <signal pad-key="pb5" index="13" function="EXTINT" group="PCINT"/>
+                <signal pad-key="pb6" index="14" function="EXTINT" group="PCINT"/>
+                <signal pad-key="pb7" index="15" function="EXTINT" group="PCINT"/>
+                <signal pad-key="pa2" index="1" function="EXTINT" group="INT"/>
+                <signal pad-key="pb6" index="0" function="EXTINT" group="INT"/>
             </signals>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="cpu">
@@ -639,70 +639,92 @@
             </register-group>
         </module>
     </modules>
+    <pads>
+        <pad key="pb0" name="PB0"/>
+        <pad key="pb1" name="PB1"/>
+        <pad key="pb2" name="PB2"/>
+        <pad key="pb3" name="PB3"/>
+        <pad key="vcc" name="VCC"/>
+        <pad key="gnd" name="GND"/>
+        <pad key="pb4" name="PB4"/>
+        <pad key="pb5" name="PB5"/>
+        <pad key="pb6" name="PB6"/>
+        <pad key="pb7" name="PB7"/>
+        <pad key="pa7" name="PA7"/>
+        <pad key="pa6" name="PA6"/>
+        <pad key="pa5" name="PA5"/>
+        <pad key="pa4" name="PA4"/>
+        <pad key="avcc" name="AVCC"/>
+        <pad key="agnd" name="AGND"/>
+        <pad key="pa3" name="PA3"/>
+        <pad key="pa2" name="PA2"/>
+        <pad key="pa1" name="PA1"/>
+        <pad key="pa0" name="PA0"/>
+    </pads>
     <pinouts>
         <pinout key="soic_20" name="SOIC_20" type="soic">
-            <pin position="1" pad="PB0"/>
-            <pin position="2" pad="PB1"/>
-            <pin position="3" pad="PB2"/>
-            <pin position="4" pad="PB3"/>
-            <pin position="5" pad="VCC"/>
-            <pin position="6" pad="GND"/>
-            <pin position="7" pad="PB4"/>
-            <pin position="8" pad="PB5"/>
-            <pin position="9" pad="PB6"/>
-            <pin position="10" pad="PB7"/>
-            <pin position="11" pad="PA7"/>
-            <pin position="12" pad="PA6"/>
-            <pin position="13" pad="PA5"/>
-            <pin position="14" pad="PA4"/>
-            <pin position="15" pad="AVCC"/>
-            <pin position="16" pad="AGND"/>
-            <pin position="17" pad="PA3"/>
-            <pin position="18" pad="PA2"/>
-            <pin position="19" pad="PA1"/>
-            <pin position="20" pad="PA0"/>
+            <pin position="1" pad-key="pb0"/>
+            <pin position="2" pad-key="pb1"/>
+            <pin position="3" pad-key="pb2"/>
+            <pin position="4" pad-key="pb3"/>
+            <pin position="5" pad-key="vcc"/>
+            <pin position="6" pad-key="gnd"/>
+            <pin position="7" pad-key="pb4"/>
+            <pin position="8" pad-key="pb5"/>
+            <pin position="9" pad-key="pb6"/>
+            <pin position="10" pad-key="pb7"/>
+            <pin position="11" pad-key="pa7"/>
+            <pin position="12" pad-key="pa6"/>
+            <pin position="13" pad-key="pa5"/>
+            <pin position="14" pad-key="pa4"/>
+            <pin position="15" pad-key="avcc"/>
+            <pin position="16" pad-key="agnd"/>
+            <pin position="17" pad-key="pa3"/>
+            <pin position="18" pad-key="pa2"/>
+            <pin position="19" pad-key="pa1"/>
+            <pin position="20" pad-key="pa0"/>
         </pinout>
         <pinout key="qfn_32" name="QFN_32" type="qfn">
-            <pin position="1" pad="NC"/>
-            <pin position="2" pad="PB3"/>
-            <pin position="3" pad="NC"/>
-            <pin position="4" pad="VCC"/>
-            <pin position="5" pad="GND"/>
-            <pin position="6" pad="NC"/>
-            <pin position="7" pad="PB4"/>
-            <pin position="8" pad="PB5"/>
-            <pin position="9" pad="NC"/>
-            <pin position="10" pad="PB6"/>
-            <pin position="11" pad="PB7"/>
-            <pin position="12" pad="NC"/>
-            <pin position="13" pad="PA7"/>
-            <pin position="14" pad="PA6"/>
-            <pin position="15" pad="PA5"/>
-            <pin position="16" pad="NC"/>
-            <pin position="17" pad="PA4"/>
-            <pin position="18" pad="AVCC"/>
-            <pin position="19" pad="NC"/>
-            <pin position="20" pad="NC"/>
-            <pin position="21" pad="AGND"/>
-            <pin position="22" pad="PA3"/>
-            <pin position="23" pad="PA2"/>
-            <pin position="24" pad="NC"/>
-            <pin position="25" pad="PA1"/>
-            <pin position="26" pad="PA0"/>
-            <pin position="27" pad="NC"/>
-            <pin position="28" pad="NC"/>
-            <pin position="29" pad="NC"/>
-            <pin position="30" pad="PB0"/>
-            <pin position="31" pad="PB1"/>
-            <pin position="32" pad="PB2"/>
+            <pin position="1"/>
+            <pin position="2" pad-key="pb3"/>
+            <pin position="3"/>
+            <pin position="4" pad-key="vcc"/>
+            <pin position="5" pad-key="gnd"/>
+            <pin position="6"/>
+            <pin position="7" pad-key="pb4"/>
+            <pin position="8" pad-key="pb5"/>
+            <pin position="9"/>
+            <pin position="10" pad-key="pb6"/>
+            <pin position="11" pad-key="pb7"/>
+            <pin position="12"/>
+            <pin position="13" pad-key="pa7"/>
+            <pin position="14" pad-key="pa6"/>
+            <pin position="15" pad-key="pa5"/>
+            <pin position="16"/>
+            <pin position="17" pad-key="pa4"/>
+            <pin position="18" pad-key="avcc"/>
+            <pin position="19"/>
+            <pin position="20"/>
+            <pin position="21" pad-key="agnd"/>
+            <pin position="22" pad-key="pa3"/>
+            <pin position="23" pad-key="pa2"/>
+            <pin position="24"/>
+            <pin position="25" pad-key="pa1"/>
+            <pin position="26" pad-key="pa0"/>
+            <pin position="27"/>
+            <pin position="28"/>
+            <pin position="29"/>
+            <pin position="30" pad-key="pb0"/>
+            <pin position="31" pad-key="pb1"/>
+            <pin position="32" pad-key="pb2"/>
         </pinout>
     </pinouts>
     <variants>
-        <variant name="ATtiny261V-10MU" pinout-key="qfn_32" package="MLF32"/>
-        <variant name="ATtiny261V-10PU" pinout-key="soic_20" package="PDIP20"/>
-        <variant name="ATtiny261V-10SU" pinout-key="soic_20" package="SOIC20"/>
-        <variant name="ATtiny261-20MU" pinout-key="qfn_32" package="MLF32"/>
-        <variant name="ATtiny261-20PU" pinout-key="soic_20" package="PDIP20"/>
-        <variant name="ATtiny261-20SU" pinout-key="soic_20" package="SOIC20"/>
+        <variant key="attiny261v_10mu" name="ATtiny261V-10MU" pinout-key="qfn_32"/>
+        <variant key="attiny261v_10pu" name="ATtiny261V-10PU" pinout-key="soic_20"/>
+        <variant key="attiny261v_10su" name="ATtiny261V-10SU" pinout-key="soic_20"/>
+        <variant key="attiny261_20mu" name="ATtiny261-20MU" pinout-key="qfn_32"/>
+        <variant key="attiny261_20pu" name="ATtiny261-20PU" pinout-key="soic_20"/>
+        <variant key="attiny261_20su" name="ATtiny261-20SU" pinout-key="soic_20"/>
     </variants>
 </device>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY261A.xml b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY261A.xml
index 075045c8..5548a865 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY261A.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY261A.xml
@@ -198,27 +198,27 @@
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pa2" index="2" function="default" group="P"/>
-                <signal pad-id="pa3" index="3" function="default" group="P"/>
-                <signal pad-id="pa4" index="4" function="default" group="P"/>
-                <signal pad-id="pa5" index="5" function="default" group="P"/>
-                <signal pad-id="pa6" index="6" function="default" group="P"/>
-                <signal pad-id="pa7" index="7" function="default" group="P"/>
+                <signal pad-key="pa0" index="0" function="default" group="P"/>
+                <signal pad-key="pa1" index="1" function="default" group="P"/>
+                <signal pad-key="pa2" index="2" function="default" group="P"/>
+                <signal pad-key="pa3" index="3" function="default" group="P"/>
+                <signal pad-key="pa4" index="4" function="default" group="P"/>
+                <signal pad-key="pa5" index="5" function="default" group="P"/>
+                <signal pad-key="pa6" index="6" function="default" group="P"/>
+                <signal pad-key="pa7" index="7" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pb2" index="2" function="default" group="P"/>
-                <signal pad-id="pb3" index="3" function="default" group="P"/>
-                <signal pad-id="pb4" index="4" function="default" group="P"/>
-                <signal pad-id="pb5" index="5" function="default" group="P"/>
-                <signal pad-id="pb6" index="6" function="default" group="P"/>
-                <signal pad-id="pb7" index="7" function="default" group="P"/>
+                <signal pad-key="pb0" index="0" function="default" group="P"/>
+                <signal pad-key="pb1" index="1" function="default" group="P"/>
+                <signal pad-key="pb2" index="2" function="default" group="P"/>
+                <signal pad-key="pb3" index="3" function="default" group="P"/>
+                <signal pad-key="pb4" index="4" function="default" group="P"/>
+                <signal pad-key="pb5" index="5" function="default" group="P"/>
+                <signal pad-key="pb6" index="6" function="default" group="P"/>
+                <signal pad-key="pb7" index="7" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="adc" name="ADC" module-key="adc">
@@ -578,75 +578,98 @@
             </register-group>
         </module>
     </modules>
+    <pads>
+        <pad key="pb0" name="PB0"/>
+        <pad key="pb1" name="PB1"/>
+        <pad key="pb2" name="PB2"/>
+        <pad key="pb3" name="PB3"/>
+        <pad key="vcc" name="VCC"/>
+        <pad key="gnd" name="GND"/>
+        <pad key="pb4" name="PB4"/>
+        <pad key="pb5" name="PB5"/>
+        <pad key="pb6" name="PB6"/>
+        <pad key="pb7" name="PB7"/>
+        <pad key="pa7" name="PA7"/>
+        <pad key="pa6" name="PA6"/>
+        <pad key="pa5" name="PA5"/>
+        <pad key="pa4" name="PA4"/>
+        <pad key="avcc" name="AVCC"/>
+        <pad key="agnd" name="AGND"/>
+        <pad key="pa3" name="PA3"/>
+        <pad key="pa2" name="PA2"/>
+        <pad key="pa1" name="PA1"/>
+        <pad key="va0" name="VA0"/>
+        <pad key="pa0" name="PA0"/>
+    </pads>
     <pinouts>
         <pinout key="pdip_soic_tssop_20" name="PDIP_SOIC_TSSOP_20" type="dip">
-            <pin position="1" pad="PB0"/>
-            <pin position="2" pad="PB1"/>
-            <pin position="3" pad="PB2"/>
-            <pin position="4" pad="PB3"/>
-            <pin position="5" pad="VCC"/>
-            <pin position="6" pad="GND"/>
-            <pin position="7" pad="PB4"/>
-            <pin position="8" pad="PB5"/>
-            <pin position="9" pad="PB6"/>
-            <pin position="10" pad="PB7"/>
-            <pin position="11" pad="PA7"/>
-            <pin position="12" pad="PA6"/>
-            <pin position="13" pad="PA5"/>
-            <pin position="14" pad="PA4"/>
-            <pin position="15" pad="AVCC"/>
-            <pin position="16" pad="AGND"/>
-            <pin position="17" pad="PA3"/>
-            <pin position="18" pad="PA2"/>
-            <pin position="19" pad="PA1"/>
-            <pin position="20" pad="VA0"/>
+            <pin position="1" pad-key="pb0"/>
+            <pin position="2" pad-key="pb1"/>
+            <pin position="3" pad-key="pb2"/>
+            <pin position="4" pad-key="pb3"/>
+            <pin position="5" pad-key="vcc"/>
+            <pin position="6" pad-key="gnd"/>
+            <pin position="7" pad-key="pb4"/>
+            <pin position="8" pad-key="pb5"/>
+            <pin position="9" pad-key="pb6"/>
+            <pin position="10" pad-key="pb7"/>
+            <pin position="11" pad-key="pa7"/>
+            <pin position="12" pad-key="pa6"/>
+            <pin position="13" pad-key="pa5"/>
+            <pin position="14" pad-key="pa4"/>
+            <pin position="15" pad-key="avcc"/>
+            <pin position="16" pad-key="agnd"/>
+            <pin position="17" pad-key="pa3"/>
+            <pin position="18" pad-key="pa2"/>
+            <pin position="19" pad-key="pa1"/>
+            <pin position="20" pad-key="va0"/>
         </pinout>
         <pinout key="qfn32" name="QFN32" type="qfn">
-            <pin position="1" pad="NC"/>
-            <pin position="2" pad="PB3"/>
-            <pin position="3" pad="NC"/>
-            <pin position="4" pad="VCC"/>
-            <pin position="5" pad="GND"/>
-            <pin position="6" pad="NC"/>
-            <pin position="7" pad="PB4"/>
-            <pin position="8" pad="PB5"/>
-            <pin position="9" pad="NC"/>
-            <pin position="10" pad="PB6"/>
-            <pin position="11" pad="PB7"/>
-            <pin position="12" pad="NC"/>
-            <pin position="13" pad="PA7"/>
-            <pin position="14" pad="PA6"/>
-            <pin position="15" pad="PA5"/>
-            <pin position="16" pad="NC"/>
-            <pin position="17" pad="PA4"/>
-            <pin position="18" pad="AVCC"/>
-            <pin position="19" pad="NC"/>
-            <pin position="20" pad="NC"/>
-            <pin position="21" pad="AGND"/>
-            <pin position="22" pad="PA3"/>
-            <pin position="23" pad="PA2"/>
-            <pin position="24" pad="NC"/>
-            <pin position="25" pad="PA1"/>
-            <pin position="26" pad="PA0"/>
-            <pin position="27" pad="NC"/>
-            <pin position="28" pad="NC"/>
-            <pin position="29" pad="NC"/>
-            <pin position="30" pad="PB0"/>
-            <pin position="31" pad="PB1"/>
-            <pin position="32" pad="PB2"/>
+            <pin position="1"/>
+            <pin position="2" pad-key="pb3"/>
+            <pin position="3"/>
+            <pin position="4" pad-key="vcc"/>
+            <pin position="5" pad-key="gnd"/>
+            <pin position="6"/>
+            <pin position="7" pad-key="pb4"/>
+            <pin position="8" pad-key="pb5"/>
+            <pin position="9"/>
+            <pin position="10" pad-key="pb6"/>
+            <pin position="11" pad-key="pb7"/>
+            <pin position="12"/>
+            <pin position="13" pad-key="pa7"/>
+            <pin position="14" pad-key="pa6"/>
+            <pin position="15" pad-key="pa5"/>
+            <pin position="16"/>
+            <pin position="17" pad-key="pa4"/>
+            <pin position="18" pad-key="avcc"/>
+            <pin position="19"/>
+            <pin position="20"/>
+            <pin position="21" pad-key="agnd"/>
+            <pin position="22" pad-key="pa3"/>
+            <pin position="23" pad-key="pa2"/>
+            <pin position="24"/>
+            <pin position="25" pad-key="pa1"/>
+            <pin position="26" pad-key="pa0"/>
+            <pin position="27"/>
+            <pin position="28"/>
+            <pin position="29"/>
+            <pin position="30" pad-key="pb0"/>
+            <pin position="31" pad-key="pb1"/>
+            <pin position="32" pad-key="pb2"/>
         </pinout>
     </pinouts>
     <variants>
-        <variant name="ATtiny261A-PU" pinout-key="pdip_soic_tssop_20" package="PDIP20"/>
-        <variant name="ATtiny261A-SUR" pinout-key="pdip_soic_tssop_20" package="SOIC20"/>
-        <variant name="ATtiny261A-SU" pinout-key="pdip_soic_tssop_20" package="SOIC20"/>
-        <variant name="ATtiny261A-XU" pinout-key="pdip_soic_tssop_20" package="TSSOP20"/>
-        <variant name="ATtiny261A-XUR" pinout-key="pdip_soic_tssop_20" package="TSSOP20"/>
-        <variant name="ATtiny261A-MN" pinout-key="qfn32" package="VQFN32"/>
-        <variant name="ATtiny261A-MNR" pinout-key="qfn32" package="VQFN32"/>
-        <variant name="ATtiny261A-MUR" pinout-key="qfn32" package="VQFN32"/>
-        <variant name="ATtiny261A-MF" pinout-key="qfn32" package="VQFN32"/>
-        <variant name="ATtiny261A-MFR" pinout-key="qfn32" package="VQFN32"/>
-        <variant name="ATtiny261A-MU" pinout-key="qfn32" package="VQFN32"/>
+        <variant key="attiny261a_pu" name="ATtiny261A-PU" pinout-key="pdip_soic_tssop_20"/>
+        <variant key="attiny261a_sur" name="ATtiny261A-SUR" pinout-key="pdip_soic_tssop_20"/>
+        <variant key="attiny261a_su" name="ATtiny261A-SU" pinout-key="pdip_soic_tssop_20"/>
+        <variant key="attiny261a_xu" name="ATtiny261A-XU" pinout-key="pdip_soic_tssop_20"/>
+        <variant key="attiny261a_xur" name="ATtiny261A-XUR" pinout-key="pdip_soic_tssop_20"/>
+        <variant key="attiny261a_mn" name="ATtiny261A-MN" pinout-key="qfn32"/>
+        <variant key="attiny261a_mnr" name="ATtiny261A-MNR" pinout-key="qfn32"/>
+        <variant key="attiny261a_mur" name="ATtiny261A-MUR" pinout-key="qfn32"/>
+        <variant key="attiny261a_mf" name="ATtiny261A-MF" pinout-key="qfn32"/>
+        <variant key="attiny261a_mfr" name="ATtiny261A-MFR" pinout-key="qfn32"/>
+        <variant key="attiny261a_mu" name="ATtiny261A-MU" pinout-key="qfn32"/>
     </variants>
 </device>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY3216.xml b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY3216.xml
index 2b87de4c..077d8216 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY3216.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY3216.xml
@@ -44,63 +44,63 @@
         <peripheral key="ac0" name="AC0" module-key="i2106">
             <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"/>
-                <signal pad-id="pa5" index="0" function="AC0" group="OUT"/>
-                <signal pad-id="pa7" index="0" function="AC0" group="P"/>
-                <signal pad-id="pb5" index="1" function="AC0" group="P"/>
-                <signal pad-id="pb1" index="2" function="AC0" group="P"/>
+                <signal pad-key="pa6" index="0" function="AC0" group="N"/>
+                <signal pad-key="pb4" index="1" function="AC0" group="N"/>
+                <signal pad-key="pa5" index="0" function="AC0" group="OUT"/>
+                <signal pad-key="pa7" index="0" function="AC0" group="P"/>
+                <signal pad-key="pb5" index="1" function="AC0" group="P"/>
+                <signal pad-key="pb1" index="2" function="AC0" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="ac1" name="AC1" module-key="i2106">
             <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"/>
-                <signal pad-id="pa7" index="0" function="AC1" group="P"/>
-                <signal pad-id="pa6" index="1" function="AC1" group="P"/>
-                <signal pad-id="pb0" index="2" function="AC1" group="P"/>
-                <signal pad-id="pb4" index="3" function="AC1" group="P"/>
+                <signal pad-key="pa5" index="0" function="AC1" group="N"/>
+                <signal pad-key="pb3" index="0" function="AC1" group="OUT"/>
+                <signal pad-key="pa7" index="0" function="AC1" group="P"/>
+                <signal pad-key="pa6" index="1" function="AC1" group="P"/>
+                <signal pad-key="pb0" index="2" function="AC1" group="P"/>
+                <signal pad-key="pb4" index="3" function="AC1" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="ac2" name="AC2" module-key="i2106">
             <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"/>
-                <signal pad-id="pa6" index="0" function="AC2" group="P"/>
-                <signal pad-id="pb0" index="1" function="AC2" group="P"/>
-                <signal pad-id="pb5" index="2" function="AC2" group="P"/>
+                <signal pad-key="pa7" index="0" function="AC2" group="N"/>
+                <signal pad-key="pb2" index="0" function="AC2" group="OUT"/>
+                <signal pad-key="pa6" index="0" function="AC2" group="P"/>
+                <signal pad-key="pb0" index="1" function="AC2" group="P"/>
+                <signal pad-key="pb5" index="2" function="AC2" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="adc0" name="ADC0" module-key="i2132">
             <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"/>
-                <signal pad-id="pa2" index="2" function="AIN0" group="AIN"/>
-                <signal pad-id="pa3" index="3" function="AIN0" group="AIN"/>
-                <signal pad-id="pa4" index="4" function="AIN0" group="AIN"/>
-                <signal pad-id="pa5" index="5" function="AIN0" group="AIN"/>
-                <signal pad-id="pa6" index="6" function="AIN0" group="AIN"/>
-                <signal pad-id="pa7" index="7" function="AIN0" group="AIN"/>
-                <signal pad-id="pb5" index="8" function="AIN0" group="AIN"/>
-                <signal pad-id="pb4" index="9" function="AIN0" group="AIN"/>
-                <signal pad-id="pb1" index="10" function="AIN0" group="AIN"/>
-                <signal pad-id="pb0" index="11" function="AIN0" group="AIN"/>
+                <signal pad-key="pa0" index="0" function="AIN0" group="AIN"/>
+                <signal pad-key="pa1" index="1" function="AIN0" group="AIN"/>
+                <signal pad-key="pa2" index="2" function="AIN0" group="AIN"/>
+                <signal pad-key="pa3" index="3" function="AIN0" group="AIN"/>
+                <signal pad-key="pa4" index="4" function="AIN0" group="AIN"/>
+                <signal pad-key="pa5" index="5" function="AIN0" group="AIN"/>
+                <signal pad-key="pa6" index="6" function="AIN0" group="AIN"/>
+                <signal pad-key="pa7" index="7" function="AIN0" group="AIN"/>
+                <signal pad-key="pb5" index="8" function="AIN0" group="AIN"/>
+                <signal pad-key="pb4" index="9" function="AIN0" group="AIN"/>
+                <signal pad-key="pb1" index="10" function="AIN0" group="AIN"/>
+                <signal pad-key="pb0" index="11" function="AIN0" group="AIN"/>
             </signals>
         </peripheral>
         <peripheral key="adc1" name="ADC1" module-key="i2132">
             <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"/>
-                <signal pad-id="pa6" index="2" function="AIN1" group="AIN"/>
-                <signal pad-id="pa7" index="3" function="AIN1" group="AIN"/>
-                <signal pad-id="pc0" index="6" function="AIN1" group="AIN"/>
-                <signal pad-id="pc1" index="7" function="AIN1" group="AIN"/>
-                <signal pad-id="pc2" index="8" function="AIN1" group="AIN"/>
-                <signal pad-id="pc3" index="9" function="AIN1" group="AIN"/>
+                <signal pad-key="pa4" index="0" function="AIN1" group="AIN"/>
+                <signal pad-key="pa5" index="1" function="AIN1" group="AIN"/>
+                <signal pad-key="pa6" index="2" function="AIN1" group="AIN"/>
+                <signal pad-key="pa7" index="3" function="AIN1" group="AIN"/>
+                <signal pad-key="pc0" index="6" function="AIN1" group="AIN"/>
+                <signal pad-key="pc1" index="7" function="AIN1" group="AIN"/>
+                <signal pad-key="pc2" index="8" function="AIN1" group="AIN"/>
+                <signal pad-key="pc3" index="9" function="AIN1" group="AIN"/>
             </signals>
         </peripheral>
         <peripheral key="bod" name="BOD" module-key="i2114">
@@ -109,29 +109,29 @@
         <peripheral key="ccl" name="CCL" module-key="i2128">
             <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"/>
-                <signal pad-id="pa2" index="2" function="CCL" group="LUT0_IN"/>
-                <signal pad-id="pb4" index="0" function="CCL_ALT" group="LUT0_OUT" field="PORTMUX.CTRLA.LUT0"/>
-                <signal pad-id="pa4" index="0" function="CCL" group="LUT0_OUT" field="PORTMUX.CTRLA.LUT0"/>
-                <signal pad-id="pc3" index="0" function="CCL" group="LUT1_IN"/>
-                <signal pad-id="pc1" index="0" function="CCL_ALT" group="LUT1_OUT" field="PORTMUX.CTRLA.LUT1"/>
-                <signal pad-id="pa7" index="0" function="CCL" group="LUT1_OUT" field="PORTMUX.CTRLA.LUT1"/>
+                <signal pad-key="pa0" index="0" function="CCL" group="LUT0_IN"/>
+                <signal pad-key="pa1" index="1" function="CCL" group="LUT0_IN"/>
+                <signal pad-key="pa2" index="2" function="CCL" group="LUT0_IN"/>
+                <signal pad-key="pb4" index="0" function="CCL_ALT" group="LUT0_OUT" field="PORTMUX.CTRLA.LUT0"/>
+                <signal pad-key="pa4" index="0" function="CCL" group="LUT0_OUT" field="PORTMUX.CTRLA.LUT0"/>
+                <signal pad-key="pc3" index="0" function="CCL" group="LUT1_IN"/>
+                <signal pad-key="pc1" index="0" function="CCL_ALT" group="LUT1_OUT" field="PORTMUX.CTRLA.LUT1"/>
+                <signal pad-key="pa7" index="0" function="CCL" group="LUT1_OUT" field="PORTMUX.CTRLA.LUT1"/>
             </signals>
         </peripheral>
         <peripheral key="clkctrl" name="CLKCTRL" module-key="i2603_clkctrl">
             <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"/>
-                <signal pad-id="pb3" function="CLKCTRL" group="TOSC1"/>
-                <signal pad-id="pb2" function="CLKCTRL" group="TOSC2"/>
+                <signal pad-key="pa3" function="CLKCTRL" group="CLKI"/>
+                <signal pad-key="pb5" function="CLKCTRL" group="CLKO"/>
+                <signal pad-key="pb3" function="CLKCTRL" group="TOSC1"/>
+                <signal pad-key="pb2" function="CLKCTRL" group="TOSC2"/>
             </signals>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="i2100">
             <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"/>
+                <signal pad-key="pa1" function="BREAK" group="BREAK" field="PORTMUX.CTRLA.EXTBRK"/>
             </signals>
         </peripheral>
         <peripheral key="cpuint" name="CPUINT" module-key="i2104">
@@ -143,7 +143,7 @@
         <peripheral key="dac0" name="DAC0" module-key="i2121">
             <register-group-instance register-group-key="dac" address-space-key="data" offset="0x6A0"/>
             <signals>
-                <signal pad-id="pa6" index="0" function="DAC0" group="OUT"/>
+                <signal pad-key="pa6" index="0" function="DAC0" group="OUT"/>
             </signals>
         </peripheral>
         <peripheral key="dac1" name="DAC1" module-key="i2121">
@@ -155,45 +155,45 @@
         <peripheral key="evsys" name="EVSYS" module-key="i2603_evsys">
             <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"/>
-                <signal pad-id="pa2" index="2" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
-                <signal pad-id="pa3" index="3" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
-                <signal pad-id="pa4" index="4" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
-                <signal pad-id="pa5" index="5" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
-                <signal pad-id="pa6" index="6" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
-                <signal pad-id="pa7" index="7" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
-                <signal pad-id="pb0" index="0" function="EVAINCH1" group="EVAPB" field="EVSYS.ASYNCCH1.ASYNCCH1"/>
-                <signal pad-id="pb1" index="1" function="EVAINCH1" group="EVAPB" field="EVSYS.ASYNCCH1.ASYNCCH1"/>
-                <signal pad-id="pb2" index="2" function="EVAINCH1" group="EVAPB" field="EVSYS.ASYNCCH1.ASYNCCH1"/>
-                <signal pad-id="pb3" index="3" function="EVAINCH1" group="EVAPB" field="EVSYS.ASYNCCH1.ASYNCCH1"/>
-                <signal pad-id="pb4" index="4" function="EVAINCH1" group="EVAPB" field="EVSYS.ASYNCCH1.ASYNCCH1"/>
-                <signal pad-id="pb5" index="5" function="EVAINCH1" group="EVAPB" field="EVSYS.ASYNCCH1.ASYNCCH1"/>
-                <signal pad-id="pc0" index="0" function="EVAINCH2" group="EVAPC" field="EVSYS.ASYNCCH2.ASYNCCH2"/>
-                <signal pad-id="pc1" index="1" function="EVAINCH2" group="EVAPC" field="EVSYS.ASYNCCH2.ASYNCCH2"/>
-                <signal pad-id="pc2" index="2" function="EVAINCH2" group="EVAPC" field="EVSYS.ASYNCCH2.ASYNCCH2"/>
-                <signal pad-id="pc3" index="3" function="EVAINCH2" group="EVAPC" field="EVSYS.ASYNCCH2.ASYNCCH2"/>
-                <signal pad-id="pa2" index="0" function="EVSYS" group="EVOUT" field="PORTMUX.CTRLA.EVOUT0"/>
-                <signal pad-id="pb2" index="1" function="EVSYS" group="EVOUT" field="PORTMUX.CTRLA.EVOUT1"/>
-                <signal pad-id="pc2" index="2" function="EVSYS" group="EVOUT" field="PORTMUX.CTRLA.EVOUT2"/>
-                <signal pad-id="pa0" index="0" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
-                <signal pad-id="pa1" index="1" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
-                <signal pad-id="pa2" index="2" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
-                <signal pad-id="pa3" index="3" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
-                <signal pad-id="pa4" index="4" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
-                <signal pad-id="pa5" index="5" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
-                <signal pad-id="pa6" index="6" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
-                <signal pad-id="pa7" index="7" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
-                <signal pad-id="pb0" index="0" function="EVSINCH1" group="EVSPB" field="EVSYS.SYNCCH1.SYNCCH1"/>
-                <signal pad-id="pb1" index="1" function="EVSINCH1" group="EVSPB" field="EVSYS.SYNCCH1.SYNCCH1"/>
-                <signal pad-id="pb2" index="2" function="EVSINCH1" group="EVSPB" field="EVSYS.SYNCCH1.SYNCCH1"/>
-                <signal pad-id="pb3" index="3" function="EVSINCH1" group="EVSPB" field="EVSYS.SYNCCH1.SYNCCH1"/>
-                <signal pad-id="pb4" index="4" function="EVSINCH1" group="EVSPB" field="EVSYS.SYNCCH1.SYNCCH1"/>
-                <signal pad-id="pb5" index="5" function="EVSINCH1" group="EVSPB" field="EVSYS.SYNCCH1.SYNCCH1"/>
-                <signal pad-id="pc0" index="0" function="EVSINCH0" group="EVSPC" field="EVSYS.SYNCCH0.SYNCCH0"/>
-                <signal pad-id="pc1" index="1" function="EVSINCH0" group="EVSPC" field="EVSYS.SYNCCH0.SYNCCH0"/>
-                <signal pad-id="pc2" index="2" function="EVSINCH0" group="EVSPC" field="EVSYS.SYNCCH0.SYNCCH0"/>
-                <signal pad-id="pc3" index="3" function="EVSINCH0" group="EVSPC" field="EVSYS.SYNCCH0.SYNCCH0"/>
+                <signal pad-key="pa0" index="0" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
+                <signal pad-key="pa1" index="1" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
+                <signal pad-key="pa2" index="2" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
+                <signal pad-key="pa3" index="3" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
+                <signal pad-key="pa4" index="4" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
+                <signal pad-key="pa5" index="5" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
+                <signal pad-key="pa6" index="6" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
+                <signal pad-key="pa7" index="7" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
+                <signal pad-key="pb0" index="0" function="EVAINCH1" group="EVAPB" field="EVSYS.ASYNCCH1.ASYNCCH1"/>
+                <signal pad-key="pb1" index="1" function="EVAINCH1" group="EVAPB" field="EVSYS.ASYNCCH1.ASYNCCH1"/>
+                <signal pad-key="pb2" index="2" function="EVAINCH1" group="EVAPB" field="EVSYS.ASYNCCH1.ASYNCCH1"/>
+                <signal pad-key="pb3" index="3" function="EVAINCH1" group="EVAPB" field="EVSYS.ASYNCCH1.ASYNCCH1"/>
+                <signal pad-key="pb4" index="4" function="EVAINCH1" group="EVAPB" field="EVSYS.ASYNCCH1.ASYNCCH1"/>
+                <signal pad-key="pb5" index="5" function="EVAINCH1" group="EVAPB" field="EVSYS.ASYNCCH1.ASYNCCH1"/>
+                <signal pad-key="pc0" index="0" function="EVAINCH2" group="EVAPC" field="EVSYS.ASYNCCH2.ASYNCCH2"/>
+                <signal pad-key="pc1" index="1" function="EVAINCH2" group="EVAPC" field="EVSYS.ASYNCCH2.ASYNCCH2"/>
+                <signal pad-key="pc2" index="2" function="EVAINCH2" group="EVAPC" field="EVSYS.ASYNCCH2.ASYNCCH2"/>
+                <signal pad-key="pc3" index="3" function="EVAINCH2" group="EVAPC" field="EVSYS.ASYNCCH2.ASYNCCH2"/>
+                <signal pad-key="pa2" index="0" function="EVSYS" group="EVOUT" field="PORTMUX.CTRLA.EVOUT0"/>
+                <signal pad-key="pb2" index="1" function="EVSYS" group="EVOUT" field="PORTMUX.CTRLA.EVOUT1"/>
+                <signal pad-key="pc2" index="2" function="EVSYS" group="EVOUT" field="PORTMUX.CTRLA.EVOUT2"/>
+                <signal pad-key="pa0" index="0" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
+                <signal pad-key="pa1" index="1" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
+                <signal pad-key="pa2" index="2" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
+                <signal pad-key="pa3" index="3" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
+                <signal pad-key="pa4" index="4" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
+                <signal pad-key="pa5" index="5" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
+                <signal pad-key="pa6" index="6" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
+                <signal pad-key="pa7" index="7" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
+                <signal pad-key="pb0" index="0" function="EVSINCH1" group="EVSPB" field="EVSYS.SYNCCH1.SYNCCH1"/>
+                <signal pad-key="pb1" index="1" function="EVSINCH1" group="EVSPB" field="EVSYS.SYNCCH1.SYNCCH1"/>
+                <signal pad-key="pb2" index="2" function="EVSINCH1" group="EVSPB" field="EVSYS.SYNCCH1.SYNCCH1"/>
+                <signal pad-key="pb3" index="3" function="EVSINCH1" group="EVSPB" field="EVSYS.SYNCCH1.SYNCCH1"/>
+                <signal pad-key="pb4" index="4" function="EVSINCH1" group="EVSPB" field="EVSYS.SYNCCH1.SYNCCH1"/>
+                <signal pad-key="pb5" index="5" function="EVSINCH1" group="EVSPB" field="EVSYS.SYNCCH1.SYNCCH1"/>
+                <signal pad-key="pc0" index="0" function="EVSINCH0" group="EVSPC" field="EVSYS.SYNCCH0.SYNCCH0"/>
+                <signal pad-key="pc1" index="1" function="EVSINCH0" group="EVSPC" field="EVSYS.SYNCCH0.SYNCCH0"/>
+                <signal pad-key="pc2" index="2" function="EVSINCH0" group="EVSPC" field="EVSYS.SYNCCH0.SYNCCH0"/>
+                <signal pad-key="pc3" index="3" function="EVSINCH0" group="EVSPC" field="EVSYS.SYNCCH0.SYNCCH0"/>
             </signals>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="i2603_fuse">
@@ -211,34 +211,34 @@
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pa2" index="2" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa3" index="3" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa4" index="4" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa5" index="5" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa6" index="6" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa7" index="7" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa0" index="0" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa1" index="1" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa2" index="2" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa3" index="3" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa4" index="4" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa5" index="5" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa6" index="6" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa7" index="7" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pb2" index="2" function="IOPORT" group="PIN"/>
-                <signal pad-id="pb3" index="3" function="IOPORT" group="PIN"/>
-                <signal pad-id="pb4" index="4" function="IOPORT" group="PIN"/>
-                <signal pad-id="pb5" index="5" function="IOPORT" group="PIN"/>
+                <signal pad-key="pb0" index="0" function="IOPORT" group="PIN"/>
+                <signal pad-key="pb1" index="1" function="IOPORT" group="PIN"/>
+                <signal pad-key="pb2" index="2" function="IOPORT" group="PIN"/>
+                <signal pad-key="pb3" index="3" function="IOPORT" group="PIN"/>
+                <signal pad-key="pb4" index="4" function="IOPORT" group="PIN"/>
+                <signal pad-key="pb5" index="5" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pc2" index="2" function="IOPORT" group="PIN"/>
-                <signal pad-id="pc3" index="3" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc0" index="0" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc1" index="1" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc2" index="2" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc3" index="3" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="portmux" name="PORTMUX" module-key="i2603_portmux">
@@ -246,38 +246,38 @@
         </peripheral>
         <peripheral key="ptc" name="PTC" module-key="i2120">
             <signals>
-                <signal pad-id="pb2" index="0" function="PTC_DS" group="DS"/>
-                <signal pad-id="pb4" index="1" function="PTC_DS" group="DS"/>
-                <signal pad-id="pa4" index="0" function="PTC_X" group="X"/>
-                <signal pad-id="pa5" index="1" function="PTC_X" group="X"/>
-                <signal pad-id="pa6" index="2" function="PTC_X" group="X"/>
-                <signal pad-id="pa7" index="3" function="PTC_X" group="X"/>
-                <signal pad-id="pb1" index="4" function="PTC_X" group="X"/>
-                <signal pad-id="pb0" index="5" function="PTC_X" group="X"/>
-                <signal pad-id="pc0" index="6" function="PTC_X" group="X"/>
-                <signal pad-id="pc1" index="7" function="PTC_X" group="X"/>
-                <signal pad-id="pc2" index="8" function="PTC_X" group="X"/>
-                <signal pad-id="pc3" index="9" function="PTC_X" group="X"/>
-                <signal pad-id="pb5" index="12" function="PTC_X" group="X"/>
-                <signal pad-id="pb4" index="13" function="PTC_X" group="X"/>
-                <signal pad-id="pa4" index="0" function="PTC_Y" group="Y"/>
-                <signal pad-id="pa5" index="1" function="PTC_Y" group="Y"/>
-                <signal pad-id="pa6" index="2" function="PTC_Y" group="Y"/>
-                <signal pad-id="pa7" index="3" function="PTC_Y" group="Y"/>
-                <signal pad-id="pb1" index="4" function="PTC_Y" group="Y"/>
-                <signal pad-id="pb0" index="5" function="PTC_Y" group="Y"/>
-                <signal pad-id="pc0" index="6" function="PTC_Y" group="Y"/>
-                <signal pad-id="pc1" index="7" function="PTC_Y" group="Y"/>
-                <signal pad-id="pc2" index="8" function="PTC_Y" group="Y"/>
-                <signal pad-id="pc3" index="9" function="PTC_Y" group="Y"/>
-                <signal pad-id="pb5" index="12" function="PTC_Y" group="Y"/>
-                <signal pad-id="pb4" index="13" function="PTC_Y" group="Y"/>
+                <signal pad-key="pb2" index="0" function="PTC_DS" group="DS"/>
+                <signal pad-key="pb4" index="1" function="PTC_DS" group="DS"/>
+                <signal pad-key="pa4" index="0" function="PTC_X" group="X"/>
+                <signal pad-key="pa5" index="1" function="PTC_X" group="X"/>
+                <signal pad-key="pa6" index="2" function="PTC_X" group="X"/>
+                <signal pad-key="pa7" index="3" function="PTC_X" group="X"/>
+                <signal pad-key="pb1" index="4" function="PTC_X" group="X"/>
+                <signal pad-key="pb0" index="5" function="PTC_X" group="X"/>
+                <signal pad-key="pc0" index="6" function="PTC_X" group="X"/>
+                <signal pad-key="pc1" index="7" function="PTC_X" group="X"/>
+                <signal pad-key="pc2" index="8" function="PTC_X" group="X"/>
+                <signal pad-key="pc3" index="9" function="PTC_X" group="X"/>
+                <signal pad-key="pb5" index="12" function="PTC_X" group="X"/>
+                <signal pad-key="pb4" index="13" function="PTC_X" group="X"/>
+                <signal pad-key="pa4" index="0" function="PTC_Y" group="Y"/>
+                <signal pad-key="pa5" index="1" function="PTC_Y" group="Y"/>
+                <signal pad-key="pa6" index="2" function="PTC_Y" group="Y"/>
+                <signal pad-key="pa7" index="3" function="PTC_Y" group="Y"/>
+                <signal pad-key="pb1" index="4" function="PTC_Y" group="Y"/>
+                <signal pad-key="pb0" index="5" function="PTC_Y" group="Y"/>
+                <signal pad-key="pc0" index="6" function="PTC_Y" group="Y"/>
+                <signal pad-key="pc1" index="7" function="PTC_Y" group="Y"/>
+                <signal pad-key="pc2" index="8" function="PTC_Y" group="Y"/>
+                <signal pad-key="pc3" index="9" function="PTC_Y" group="Y"/>
+                <signal pad-key="pb5" index="12" function="PTC_Y" group="Y"/>
+                <signal pad-key="pb4" index="13" function="PTC_Y" group="Y"/>
             </signals>
         </peripheral>
         <peripheral key="rstctrl" name="RSTCTRL" module-key="i2111">
             <register-group-instance register-group-key="rstctrl" address-space-key="data" offset="0x40"/>
             <signals>
-                <signal pad-id="pa0" function="OTHER" group="RESET"/>
+                <signal pad-key="pa0" function="OTHER" group="RESET"/>
             </signals>
         </peripheral>
         <peripheral key="rtc" name="RTC" module-key="i2116">
@@ -292,79 +292,79 @@
         <peripheral key="spi0" name="SPI0" module-key="i2107">
             <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"/>
-                <signal pad-id="pc2" function="SPI0_ALT" group="MOSI" field="PORTMUX.CTRLB.SPI0"/>
-                <signal pad-id="pa1" function="SPI0" group="MOSI" field="PORTMUX.CTRLB.SPI0"/>
-                <signal pad-id="pc0" function="SPI0_ALT" group="SCK" field="PORTMUX.CTRLB.SPI0"/>
-                <signal pad-id="pa3" function="SPI0" group="SCK" field="PORTMUX.CTRLB.SPI0"/>
-                <signal pad-id="pc3" function="SPI0_ALT" group="SS" field="PORTMUX.CTRLB.SPI0"/>
-                <signal pad-id="pa4" function="SPI0" group="SS" field="PORTMUX.CTRLB.SPI0"/>
+                <signal pad-key="pc1" function="SPI0_ALT" group="MISO" field="PORTMUX.CTRLB.SPI0"/>
+                <signal pad-key="pa2" function="SPI0" group="MISO" field="PORTMUX.CTRLB.SPI0"/>
+                <signal pad-key="pc2" function="SPI0_ALT" group="MOSI" field="PORTMUX.CTRLB.SPI0"/>
+                <signal pad-key="pa1" function="SPI0" group="MOSI" field="PORTMUX.CTRLB.SPI0"/>
+                <signal pad-key="pc0" function="SPI0_ALT" group="SCK" field="PORTMUX.CTRLB.SPI0"/>
+                <signal pad-key="pa3" function="SPI0" group="SCK" field="PORTMUX.CTRLB.SPI0"/>
+                <signal pad-key="pc3" function="SPI0_ALT" group="SS" field="PORTMUX.CTRLB.SPI0"/>
+                <signal pad-key="pa4" function="SPI0" group="SS" field="PORTMUX.CTRLB.SPI0"/>
             </signals>
         </peripheral>
         <peripheral key="syscfg" name="SYSCFG" module-key="i2603_syscfg">
             <register-group-instance register-group-key="syscfg" address-space-key="data" offset="0xF00"/>
             <signals>
-                <signal pad-id="pa0" function="OTHER" group="UPDI"/>
+                <signal pad-key="pa0" function="OTHER" group="UPDI"/>
             </signals>
         </peripheral>
         <peripheral key="tca0" name="TCA0" module-key="i2117">
             <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"/>
-                <signal pad-id="pb4" index="1" function="TCA0_ALT" group="WO" field="PORTMUX.CTRLC.TCA01"/>
-                <signal pad-id="pb1" index="1" function="TCA0" group="WO" field="PORTMUX.CTRLC.TCA01"/>
-                <signal pad-id="pb5" index="2" function="TCA0_ALT" group="WO" field="PORTMUX.CTRLC.TCA02"/>
-                <signal pad-id="pb2" index="2" function="TCA0" group="WO" field="PORTMUX.CTRLC.TCA02"/>
-                <signal pad-id="pc3" index="3" function="TCA0_ALT" group="WO" field="PORTMUX.CTRLC.TCA03"/>
-                <signal pad-id="pa3" index="3" function="TCA0" group="WO" field="PORTMUX.CTRLC.TCA03"/>
-                <signal pad-id="pa4" index="4" function="TCA0" group="WO" field="PORTMUX.CTRLC.TCA04"/>
-                <signal pad-id="pa5" index="5" function="TCA0" group="WO" field="PORTMUX.CTRLC.TCA05"/>
+                <signal pad-key="pb3" index="0" function="TCA0_ALT" group="WO" field="PORTMUX.CTRLC.TCA00"/>
+                <signal pad-key="pb0" index="0" function="TCA0" group="WO" field="PORTMUX.CTRLC.TCA00"/>
+                <signal pad-key="pb4" index="1" function="TCA0_ALT" group="WO" field="PORTMUX.CTRLC.TCA01"/>
+                <signal pad-key="pb1" index="1" function="TCA0" group="WO" field="PORTMUX.CTRLC.TCA01"/>
+                <signal pad-key="pb5" index="2" function="TCA0_ALT" group="WO" field="PORTMUX.CTRLC.TCA02"/>
+                <signal pad-key="pb2" index="2" function="TCA0" group="WO" field="PORTMUX.CTRLC.TCA02"/>
+                <signal pad-key="pc3" index="3" function="TCA0_ALT" group="WO" field="PORTMUX.CTRLC.TCA03"/>
+                <signal pad-key="pa3" index="3" function="TCA0" group="WO" field="PORTMUX.CTRLC.TCA03"/>
+                <signal pad-key="pa4" index="4" function="TCA0" group="WO" field="PORTMUX.CTRLC.TCA04"/>
+                <signal pad-key="pa5" index="5" function="TCA0" group="WO" field="PORTMUX.CTRLC.TCA05"/>
             </signals>
         </peripheral>
         <peripheral key="tcb0" name="TCB0" module-key="i2119">
             <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"/>
+                <signal pad-key="pc0" index="0" function="TCB0_ALT" group="WO" field="PORTMUX.CTRLD.TCB0"/>
+                <signal pad-key="pa5" index="0" function="TCB0" group="WO" field="PORTMUX.CTRLD.TCB0"/>
             </signals>
         </peripheral>
         <peripheral key="tcb1" name="TCB1" module-key="i2119">
             <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"/>
+                <signal pad-key="pa3" index="0" function="TCB1" group="WO" field="PORTMUX.CTRLD.TCB1"/>
             </signals>
         </peripheral>
         <peripheral key="tcd0" name="TCD0" module-key="i2129">
             <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"/>
-                <signal pad-id="pc0" function="TCD0" group="WOC"/>
-                <signal pad-id="pc1" function="TCD0" group="WOD"/>
+                <signal pad-key="pa4" function="TCD0" group="WOA"/>
+                <signal pad-key="pa5" function="TCD0" group="WOB"/>
+                <signal pad-key="pc0" function="TCD0" group="WOC"/>
+                <signal pad-key="pc1" function="TCD0" group="WOD"/>
             </signals>
         </peripheral>
         <peripheral key="twi0" name="TWI0" module-key="i2110">
             <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"/>
-                <signal pad-id="pa1" function="TWI0_ALT" group="SDA" field="PORTMUX.CTRLB.TWI0"/>
-                <signal pad-id="pb1" function="TWI0" group="SDA" field="PORTMUX.CTRLB.TWI0"/>
+                <signal pad-key="pa2" function="TWI0_ALT" group="SCL" field="PORTMUX.CTRLB.TWI0"/>
+                <signal pad-key="pb0" function="TWI0" group="SCL" field="PORTMUX.CTRLB.TWI0"/>
+                <signal pad-key="pa1" function="TWI0_ALT" group="SDA" field="PORTMUX.CTRLB.TWI0"/>
+                <signal pad-key="pb1" function="TWI0" group="SDA" field="PORTMUX.CTRLB.TWI0"/>
             </signals>
         </peripheral>
         <peripheral key="usart0" name="USART0" module-key="i2108">
             <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"/>
-                <signal pad-id="pa1" function="USART0_ALT" group="TXD" field="PORTMUX.CTRLB.USART0"/>
-                <signal pad-id="pb2" function="USART0" group="TXD" field="PORTMUX.CTRLB.USART0"/>
-                <signal pad-id="pa3" function="USART0_ALT" group="XCK" field="PORTMUX.CTRLB.USART0"/>
-                <signal pad-id="pb1" function="USART0" group="XCK" field="PORTMUX.CTRLB.USART0"/>
-                <signal pad-id="pa4" function="USART0_ALT" group="XDIR" field="PORTMUX.CTRLB.USART0"/>
-                <signal pad-id="pb0" function="USART0" group="XDIR" field="PORTMUX.CTRLB.USART0"/>
+                <signal pad-key="pa2" function="USART0_ALT" group="RXD" field="PORTMUX.CTRLB.USART0"/>
+                <signal pad-key="pb3" function="USART0" group="RXD" field="PORTMUX.CTRLB.USART0"/>
+                <signal pad-key="pa1" function="USART0_ALT" group="TXD" field="PORTMUX.CTRLB.USART0"/>
+                <signal pad-key="pb2" function="USART0" group="TXD" field="PORTMUX.CTRLB.USART0"/>
+                <signal pad-key="pa3" function="USART0_ALT" group="XCK" field="PORTMUX.CTRLB.USART0"/>
+                <signal pad-key="pb1" function="USART0" group="XCK" field="PORTMUX.CTRLB.USART0"/>
+                <signal pad-key="pa4" function="USART0_ALT" group="XDIR" field="PORTMUX.CTRLB.USART0"/>
+                <signal pad-key="pb0" function="USART0" group="XDIR" field="PORTMUX.CTRLB.USART0"/>
             </signals>
         </peripheral>
         <peripheral key="userrow" name="USERROW" module-key="i2603_userrow">
@@ -1474,32 +1474,54 @@
             </register-group>
         </module>
     </modules>
+    <pads>
+        <pad key="vdd" name="VDD"/>
+        <pad key="pa4" name="PA4"/>
+        <pad key="pa5" name="PA5"/>
+        <pad key="pa6" name="PA6"/>
+        <pad key="pa7" name="PA7"/>
+        <pad key="pb5" name="PB5"/>
+        <pad key="pb4" name="PB4"/>
+        <pad key="pb3" name="PB3"/>
+        <pad key="pb2" name="PB2"/>
+        <pad key="pb1" name="PB1"/>
+        <pad key="pb0" name="PB0"/>
+        <pad key="pc0" name="PC0"/>
+        <pad key="pc1" name="PC1"/>
+        <pad key="pc2" name="PC2"/>
+        <pad key="pc3" name="PC3"/>
+        <pad key="pa0" name="PA0"/>
+        <pad key="pa1" name="PA1"/>
+        <pad key="pa2" name="PA2"/>
+        <pad key="pa3" name="PA3"/>
+        <pad key="gnd" name="GND"/>
+    </pads>
     <pinouts>
         <pinout key="soic20" name="SOIC20" type="soic">
-            <pin position="1" pad="VDD"/>
-            <pin position="2" pad="PA4"/>
-            <pin position="3" pad="PA5"/>
-            <pin position="4" pad="PA6"/>
-            <pin position="5" pad="PA7"/>
-            <pin position="6" pad="PB5"/>
-            <pin position="7" pad="PB4"/>
-            <pin position="8" pad="PB3"/>
-            <pin position="9" pad="PB2"/>
-            <pin position="10" pad="PB1"/>
-            <pin position="11" pad="PB0"/>
-            <pin position="12" pad="PC0"/>
-            <pin position="13" pad="PC1"/>
-            <pin position="14" pad="PC2"/>
-            <pin position="15" pad="PC3"/>
-            <pin position="16" pad="PA0"/>
-            <pin position="17" pad="PA1"/>
-            <pin position="18" pad="PA2"/>
-            <pin position="19" pad="PA3"/>
-            <pin position="20" pad="GND"/>
+            <pin position="1" pad-key="vdd"/>
+            <pin position="2" pad-key="pa4"/>
+            <pin position="3" pad-key="pa5"/>
+            <pin position="4" pad-key="pa6"/>
+            <pin position="5" pad-key="pa7"/>
+            <pin position="6" pad-key="pb5"/>
+            <pin position="7" pad-key="pb4"/>
+            <pin position="8" pad-key="pb3"/>
+            <pin position="9" pad-key="pb2"/>
+            <pin position="10" pad-key="pb1"/>
+            <pin position="11" pad-key="pb0"/>
+            <pin position="12" pad-key="pc0"/>
+            <pin position="13" pad-key="pc1"/>
+            <pin position="14" pad-key="pc2"/>
+            <pin position="15" pad-key="pc3"/>
+            <pin position="16" pad-key="pa0"/>
+            <pin position="17" pad-key="pa1"/>
+            <pin position="18" pad-key="pa2"/>
+            <pin position="19" pad-key="pa3"/>
+            <pin position="20" pad-key="gnd"/>
         </pinout>
     </pinouts>
     <variants>
-        <variant name="ATtiny3216-SFR" pinout-key="soic20" package="SOIC20"/>
-        <variant name="ATtiny3216-SNR" pinout-key="soic20" package="SOIC20"/>
+        <variant key="attiny3216_sfr" name="ATtiny3216-SFR" pinout-key="soic20"/>
+        <variant key="attiny3216_snr" name="ATtiny3216-SNR" pinout-key="soic20"/>
     </variants>
 </device>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY3217.xml b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY3217.xml
index 1e2109f4..4c19ac5f 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY3217.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY3217.xml
@@ -44,71 +44,71 @@
         <peripheral key="ac0" name="AC0" module-key="i2106">
             <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"/>
-                <signal pad-id="pa5" index="0" function="AC0" group="OUT"/>
-                <signal pad-id="pa7" index="0" function="AC0" group="P"/>
-                <signal pad-id="pb5" index="1" function="AC0" group="P"/>
-                <signal pad-id="pb1" index="2" function="AC0" group="P"/>
-                <signal pad-id="pb6" index="3" function="AC0" group="P"/>
+                <signal pad-key="pa6" index="0" function="AC0" group="N"/>
+                <signal pad-key="pb4" index="1" function="AC0" group="N"/>
+                <signal pad-key="pa5" index="0" function="AC0" group="OUT"/>
+                <signal pad-key="pa7" index="0" function="AC0" group="P"/>
+                <signal pad-key="pb5" index="1" function="AC0" group="P"/>
+                <signal pad-key="pb1" index="2" function="AC0" group="P"/>
+                <signal pad-key="pb6" index="3" function="AC0" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="ac1" name="AC1" module-key="i2106">
             <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"/>
-                <signal pad-id="pb3" index="0" function="AC1" group="OUT"/>
-                <signal pad-id="pa7" index="0" function="AC1" group="P"/>
-                <signal pad-id="pa6" index="1" function="AC1" group="P"/>
-                <signal pad-id="pb0" index="2" function="AC1" group="P"/>
-                <signal pad-id="pb4" index="3" function="AC1" group="P"/>
+                <signal pad-key="pa5" index="0" function="AC1" group="N"/>
+                <signal pad-key="pb7" index="1" function="AC1" group="N"/>
+                <signal pad-key="pb3" index="0" function="AC1" group="OUT"/>
+                <signal pad-key="pa7" index="0" function="AC1" group="P"/>
+                <signal pad-key="pa6" index="1" function="AC1" group="P"/>
+                <signal pad-key="pb0" index="2" function="AC1" group="P"/>
+                <signal pad-key="pb4" index="3" function="AC1" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="ac2" name="AC2" module-key="i2106">
             <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"/>
-                <signal pad-id="pb2" index="0" function="AC2" group="OUT"/>
-                <signal pad-id="pa6" index="0" function="AC2" group="P"/>
-                <signal pad-id="pb0" index="1" function="AC2" group="P"/>
-                <signal pad-id="pb5" index="2" function="AC2" group="P"/>
-                <signal pad-id="pb7" index="3" function="AC2" group="P"/>
+                <signal pad-key="pa7" index="0" function="AC2" group="N"/>
+                <signal pad-key="pb6" index="1" function="AC2" group="N"/>
+                <signal pad-key="pb2" index="0" function="AC2" group="OUT"/>
+                <signal pad-key="pa6" index="0" function="AC2" group="P"/>
+                <signal pad-key="pb0" index="1" function="AC2" group="P"/>
+                <signal pad-key="pb5" index="2" function="AC2" group="P"/>
+                <signal pad-key="pb7" index="3" function="AC2" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="adc0" name="ADC0" module-key="i2132">
             <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"/>
-                <signal pad-id="pa2" index="2" function="AIN0" group="AIN"/>
-                <signal pad-id="pa3" index="3" function="AIN0" group="AIN"/>
-                <signal pad-id="pa4" index="4" function="AIN0" group="AIN"/>
-                <signal pad-id="pa5" index="5" function="AIN0" group="AIN"/>
-                <signal pad-id="pa6" index="6" function="AIN0" group="AIN"/>
-                <signal pad-id="pa7" index="7" function="AIN0" group="AIN"/>
-                <signal pad-id="pb5" index="8" function="AIN0" group="AIN"/>
-                <signal pad-id="pb4" index="9" function="AIN0" group="AIN"/>
-                <signal pad-id="pb1" index="10" function="AIN0" group="AIN"/>
-                <signal pad-id="pb0" index="11" function="AIN0" group="AIN"/>
+                <signal pad-key="pa0" index="0" function="AIN0" group="AIN"/>
+                <signal pad-key="pa1" index="1" function="AIN0" group="AIN"/>
+                <signal pad-key="pa2" index="2" function="AIN0" group="AIN"/>
+                <signal pad-key="pa3" index="3" function="AIN0" group="AIN"/>
+                <signal pad-key="pa4" index="4" function="AIN0" group="AIN"/>
+                <signal pad-key="pa5" index="5" function="AIN0" group="AIN"/>
+                <signal pad-key="pa6" index="6" function="AIN0" group="AIN"/>
+                <signal pad-key="pa7" index="7" function="AIN0" group="AIN"/>
+                <signal pad-key="pb5" index="8" function="AIN0" group="AIN"/>
+                <signal pad-key="pb4" index="9" function="AIN0" group="AIN"/>
+                <signal pad-key="pb1" index="10" function="AIN0" group="AIN"/>
+                <signal pad-key="pb0" index="11" function="AIN0" group="AIN"/>
             </signals>
         </peripheral>
         <peripheral key="adc1" name="ADC1" module-key="i2132">
             <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"/>
-                <signal pad-id="pa6" index="2" function="AIN1" group="AIN"/>
-                <signal pad-id="pa7" index="3" function="AIN1" group="AIN"/>
-                <signal pad-id="pb7" index="4" function="AIN1" group="AIN"/>
-                <signal pad-id="pb6" index="5" function="AIN1" group="AIN"/>
-                <signal pad-id="pc0" index="6" function="AIN1" group="AIN"/>
-                <signal pad-id="pc1" index="7" function="AIN1" group="AIN"/>
-                <signal pad-id="pc2" index="8" function="AIN1" group="AIN"/>
-                <signal pad-id="pc3" index="9" function="AIN1" group="AIN"/>
-                <signal pad-id="pc4" index="10" function="AIN1" group="AIN"/>
-                <signal pad-id="pc5" index="11" function="AIN1" group="AIN"/>
+                <signal pad-key="pa4" index="0" function="AIN1" group="AIN"/>
+                <signal pad-key="pa5" index="1" function="AIN1" group="AIN"/>
+                <signal pad-key="pa6" index="2" function="AIN1" group="AIN"/>
+                <signal pad-key="pa7" index="3" function="AIN1" group="AIN"/>
+                <signal pad-key="pb7" index="4" function="AIN1" group="AIN"/>
+                <signal pad-key="pb6" index="5" function="AIN1" group="AIN"/>
+                <signal pad-key="pc0" index="6" function="AIN1" group="AIN"/>
+                <signal pad-key="pc1" index="7" function="AIN1" group="AIN"/>
+                <signal pad-key="pc2" index="8" function="AIN1" group="AIN"/>
+                <signal pad-key="pc3" index="9" function="AIN1" group="AIN"/>
+                <signal pad-key="pc4" index="10" function="AIN1" group="AIN"/>
+                <signal pad-key="pc5" index="11" function="AIN1" group="AIN"/>
             </signals>
         </peripheral>
         <peripheral key="bod" name="BOD" module-key="i2114">
@@ -117,32 +117,32 @@
         <peripheral key="ccl" name="CCL" module-key="i2128">
             <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"/>
-                <signal pad-id="pa2" index="2" function="CCL" group="LUT0_IN"/>
-                <signal pad-id="pb4" index="0" function="CCL_ALT" group="LUT0_OUT" field="PORTMUX.CTRLA.LUT0"/>
-                <signal pad-id="pa4" index="0" function="CCL" group="LUT0_OUT" field="PORTMUX.CTRLA.LUT0"/>
-                <signal pad-id="pc3" index="0" function="CCL" group="LUT1_IN"/>
-                <signal pad-id="pc4" index="1" function="CCL" group="LUT1_IN"/>
-                <signal pad-id="pc5" index="2" function="CCL" group="LUT1_IN"/>
-                <signal pad-id="pc1" index="0" function="CCL_ALT" group="LUT1_OUT" field="PORTMUX.CTRLA.LUT1"/>
-                <signal pad-id="pa7" index="0" function="CCL" group="LUT1_OUT" field="PORTMUX.CTRLA.LUT1"/>
+                <signal pad-key="pa0" index="0" function="CCL" group="LUT0_IN"/>
+                <signal pad-key="pa1" index="1" function="CCL" group="LUT0_IN"/>
+                <signal pad-key="pa2" index="2" function="CCL" group="LUT0_IN"/>
+                <signal pad-key="pb4" index="0" function="CCL_ALT" group="LUT0_OUT" field="PORTMUX.CTRLA.LUT0"/>
+                <signal pad-key="pa4" index="0" function="CCL" group="LUT0_OUT" field="PORTMUX.CTRLA.LUT0"/>
+                <signal pad-key="pc3" index="0" function="CCL" group="LUT1_IN"/>
+                <signal pad-key="pc4" index="1" function="CCL" group="LUT1_IN"/>
+                <signal pad-key="pc5" index="2" function="CCL" group="LUT1_IN"/>
+                <signal pad-key="pc1" index="0" function="CCL_ALT" group="LUT1_OUT" field="PORTMUX.CTRLA.LUT1"/>
+                <signal pad-key="pa7" index="0" function="CCL" group="LUT1_OUT" field="PORTMUX.CTRLA.LUT1"/>
             </signals>
         </peripheral>
         <peripheral key="clkctrl" name="CLKCTRL" module-key="i2603_clkctrl">
             <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"/>
-                <signal pad-id="pb3" function="CLKCTRL" group="TOSC1"/>
-                <signal pad-id="pb2" function="CLKCTRL" group="TOSC2"/>
+                <signal pad-key="pa3" function="CLKCTRL" group="CLKI"/>
+                <signal pad-key="pb5" function="CLKCTRL" group="CLKO"/>
+                <signal pad-key="pb3" function="CLKCTRL" group="TOSC1"/>
+                <signal pad-key="pb2" function="CLKCTRL" group="TOSC2"/>
             </signals>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="i2100">
             <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"/>
+                <signal pad-key="pc4" function="BREAK_ALT" group="BREAK" field="PORTMUX.CTRLA.EXTBRK"/>
+                <signal pad-key="pa1" function="BREAK" group="BREAK" field="PORTMUX.CTRLA.EXTBRK"/>
             </signals>
         </peripheral>
         <peripheral key="cpuint" name="CPUINT" module-key="i2104">
@@ -154,7 +154,7 @@
         <peripheral key="dac0" name="DAC0" module-key="i2121">
             <register-group-instance register-group-key="dac" address-space-key="data" offset="0x6A0"/>
             <signals>
-                <signal pad-id="pa6" index="0" function="DAC0" group="OUT"/>
+                <signal pad-key="pa6" index="0" function="DAC0" group="OUT"/>
             </signals>
         </peripheral>
         <peripheral key="dac1" name="DAC1" module-key="i2121">
@@ -166,53 +166,53 @@
         <peripheral key="evsys" name="EVSYS" module-key="i2603_evsys">
             <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"/>
-                <signal pad-id="pa2" index="2" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
-                <signal pad-id="pa3" index="3" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
-                <signal pad-id="pa4" index="4" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
-                <signal pad-id="pa5" index="5" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
-                <signal pad-id="pa6" index="6" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
-                <signal pad-id="pa7" index="7" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
-                <signal pad-id="pb0" index="0" function="EVAINCH1" group="EVAPB" field="EVSYS.ASYNCCH1.ASYNCCH1"/>
-                <signal pad-id="pb1" index="1" function="EVAINCH1" group="EVAPB" field="EVSYS.ASYNCCH1.ASYNCCH1"/>
-                <signal pad-id="pb2" index="2" function="EVAINCH1" group="EVAPB" field="EVSYS.ASYNCCH1.ASYNCCH1"/>
-                <signal pad-id="pb3" index="3" function="EVAINCH1" group="EVAPB" field="EVSYS.ASYNCCH1.ASYNCCH1"/>
-                <signal pad-id="pb4" index="4" function="EVAINCH1" group="EVAPB" field="EVSYS.ASYNCCH1.ASYNCCH1"/>
-                <signal pad-id="pb5" index="5" function="EVAINCH1" group="EVAPB" field="EVSYS.ASYNCCH1.ASYNCCH1"/>
-                <signal pad-id="pb6" index="6" function="EVAINCH1" group="EVAPB" field="EVSYS.ASYNCCH1.ASYNCCH1"/>
-                <signal pad-id="pb7" index="7" function="EVAINCH1" group="EVAPB" field="EVSYS.ASYNCCH1.ASYNCCH1"/>
-                <signal pad-id="pc0" index="0" function="EVAINCH2" group="EVAPC" field="EVSYS.ASYNCCH2.ASYNCCH2"/>
-                <signal pad-id="pc1" index="1" function="EVAINCH2" group="EVAPC" field="EVSYS.ASYNCCH2.ASYNCCH2"/>
-                <signal pad-id="pc2" index="2" function="EVAINCH2" group="EVAPC" field="EVSYS.ASYNCCH2.ASYNCCH2"/>
-                <signal pad-id="pc3" index="3" function="EVAINCH2" group="EVAPC" field="EVSYS.ASYNCCH2.ASYNCCH2"/>
-                <signal pad-id="pc4" index="4" function="EVAINCH2" group="EVAPC" field="EVSYS.ASYNCCH2.ASYNCCH2"/>
-                <signal pad-id="pc5" index="5" function="EVAINCH2" group="EVAPC" field="EVSYS.ASYNCCH2.ASYNCCH2"/>
-                <signal pad-id="pa2" index="0" function="EVSYS" group="EVOUT" field="PORTMUX.CTRLA.EVOUT0"/>
-                <signal pad-id="pb2" index="1" function="EVSYS" group="EVOUT" field="PORTMUX.CTRLA.EVOUT1"/>
-                <signal pad-id="pc2" index="2" function="EVSYS" group="EVOUT" field="PORTMUX.CTRLA.EVOUT2"/>
-                <signal pad-id="pa0" index="0" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
-                <signal pad-id="pa1" index="1" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
-                <signal pad-id="pa2" index="2" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
-                <signal pad-id="pa3" index="3" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
-                <signal pad-id="pa4" index="4" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
-                <signal pad-id="pa5" index="5" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
-                <signal pad-id="pa6" index="6" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
-                <signal pad-id="pa7" index="7" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
-                <signal pad-id="pb0" index="0" function="EVSINCH1" group="EVSPB" field="EVSYS.SYNCCH1.SYNCCH1"/>
-                <signal pad-id="pb1" index="1" function="EVSINCH1" group="EVSPB" field="EVSYS.SYNCCH1.SYNCCH1"/>
-                <signal pad-id="pb2" index="2" function="EVSINCH1" group="EVSPB" field="EVSYS.SYNCCH1.SYNCCH1"/>
-                <signal pad-id="pb3" index="3" function="EVSINCH1" group="EVSPB" field="EVSYS.SYNCCH1.SYNCCH1"/>
-                <signal pad-id="pb4" index="4" function="EVSINCH1" group="EVSPB" field="EVSYS.SYNCCH1.SYNCCH1"/>
-                <signal pad-id="pb5" index="5" function="EVSINCH1" group="EVSPB" field="EVSYS.SYNCCH1.SYNCCH1"/>
-                <signal pad-id="pb6" index="6" function="EVSINCH1" group="EVSPB" field="EVSYS.SYNCCH1.SYNCCH1"/>
-                <signal pad-id="pb7" index="7" function="EVSINCH1" group="EVSPB" field="EVSYS.SYNCCH1.SYNCCH1"/>
-                <signal pad-id="pc0" index="0" function="EVSINCH0" group="EVSPC" field="EVSYS.SYNCCH0.SYNCCH0"/>
-                <signal pad-id="pc1" index="1" function="EVSINCH0" group="EVSPC" field="EVSYS.SYNCCH0.SYNCCH0"/>
-                <signal pad-id="pc2" index="2" function="EVSINCH0" group="EVSPC" field="EVSYS.SYNCCH0.SYNCCH0"/>
-                <signal pad-id="pc3" index="3" function="EVSINCH0" group="EVSPC" field="EVSYS.SYNCCH0.SYNCCH0"/>
-                <signal pad-id="pc4" index="4" function="EVSINCH0" group="EVSPC" field="EVSYS.SYNCCH0.SYNCCH0"/>
-                <signal pad-id="pc5" index="5" function="EVSINCH0" group="EVSPC" field="EVSYS.SYNCCH0.SYNCCH0"/>
+                <signal pad-key="pa0" index="0" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
+                <signal pad-key="pa1" index="1" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
+                <signal pad-key="pa2" index="2" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
+                <signal pad-key="pa3" index="3" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
+                <signal pad-key="pa4" index="4" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
+                <signal pad-key="pa5" index="5" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
+                <signal pad-key="pa6" index="6" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
+                <signal pad-key="pa7" index="7" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
+                <signal pad-key="pb0" index="0" function="EVAINCH1" group="EVAPB" field="EVSYS.ASYNCCH1.ASYNCCH1"/>
+                <signal pad-key="pb1" index="1" function="EVAINCH1" group="EVAPB" field="EVSYS.ASYNCCH1.ASYNCCH1"/>
+                <signal pad-key="pb2" index="2" function="EVAINCH1" group="EVAPB" field="EVSYS.ASYNCCH1.ASYNCCH1"/>
+                <signal pad-key="pb3" index="3" function="EVAINCH1" group="EVAPB" field="EVSYS.ASYNCCH1.ASYNCCH1"/>
+                <signal pad-key="pb4" index="4" function="EVAINCH1" group="EVAPB" field="EVSYS.ASYNCCH1.ASYNCCH1"/>
+                <signal pad-key="pb5" index="5" function="EVAINCH1" group="EVAPB" field="EVSYS.ASYNCCH1.ASYNCCH1"/>
+                <signal pad-key="pb6" index="6" function="EVAINCH1" group="EVAPB" field="EVSYS.ASYNCCH1.ASYNCCH1"/>
+                <signal pad-key="pb7" index="7" function="EVAINCH1" group="EVAPB" field="EVSYS.ASYNCCH1.ASYNCCH1"/>
+                <signal pad-key="pc0" index="0" function="EVAINCH2" group="EVAPC" field="EVSYS.ASYNCCH2.ASYNCCH2"/>
+                <signal pad-key="pc1" index="1" function="EVAINCH2" group="EVAPC" field="EVSYS.ASYNCCH2.ASYNCCH2"/>
+                <signal pad-key="pc2" index="2" function="EVAINCH2" group="EVAPC" field="EVSYS.ASYNCCH2.ASYNCCH2"/>
+                <signal pad-key="pc3" index="3" function="EVAINCH2" group="EVAPC" field="EVSYS.ASYNCCH2.ASYNCCH2"/>
+                <signal pad-key="pc4" index="4" function="EVAINCH2" group="EVAPC" field="EVSYS.ASYNCCH2.ASYNCCH2"/>
+                <signal pad-key="pc5" index="5" function="EVAINCH2" group="EVAPC" field="EVSYS.ASYNCCH2.ASYNCCH2"/>
+                <signal pad-key="pa2" index="0" function="EVSYS" group="EVOUT" field="PORTMUX.CTRLA.EVOUT0"/>
+                <signal pad-key="pb2" index="1" function="EVSYS" group="EVOUT" field="PORTMUX.CTRLA.EVOUT1"/>
+                <signal pad-key="pc2" index="2" function="EVSYS" group="EVOUT" field="PORTMUX.CTRLA.EVOUT2"/>
+                <signal pad-key="pa0" index="0" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
+                <signal pad-key="pa1" index="1" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
+                <signal pad-key="pa2" index="2" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
+                <signal pad-key="pa3" index="3" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
+                <signal pad-key="pa4" index="4" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
+                <signal pad-key="pa5" index="5" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
+                <signal pad-key="pa6" index="6" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
+                <signal pad-key="pa7" index="7" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
+                <signal pad-key="pb0" index="0" function="EVSINCH1" group="EVSPB" field="EVSYS.SYNCCH1.SYNCCH1"/>
+                <signal pad-key="pb1" index="1" function="EVSINCH1" group="EVSPB" field="EVSYS.SYNCCH1.SYNCCH1"/>
+                <signal pad-key="pb2" index="2" function="EVSINCH1" group="EVSPB" field="EVSYS.SYNCCH1.SYNCCH1"/>
+                <signal pad-key="pb3" index="3" function="EVSINCH1" group="EVSPB" field="EVSYS.SYNCCH1.SYNCCH1"/>
+                <signal pad-key="pb4" index="4" function="EVSINCH1" group="EVSPB" field="EVSYS.SYNCCH1.SYNCCH1"/>
+                <signal pad-key="pb5" index="5" function="EVSINCH1" group="EVSPB" field="EVSYS.SYNCCH1.SYNCCH1"/>
+                <signal pad-key="pb6" index="6" function="EVSINCH1" group="EVSPB" field="EVSYS.SYNCCH1.SYNCCH1"/>
+                <signal pad-key="pb7" index="7" function="EVSINCH1" group="EVSPB" field="EVSYS.SYNCCH1.SYNCCH1"/>
+                <signal pad-key="pc0" index="0" function="EVSINCH0" group="EVSPC" field="EVSYS.SYNCCH0.SYNCCH0"/>
+                <signal pad-key="pc1" index="1" function="EVSINCH0" group="EVSPC" field="EVSYS.SYNCCH0.SYNCCH0"/>
+                <signal pad-key="pc2" index="2" function="EVSINCH0" group="EVSPC" field="EVSYS.SYNCCH0.SYNCCH0"/>
+                <signal pad-key="pc3" index="3" function="EVSINCH0" group="EVSPC" field="EVSYS.SYNCCH0.SYNCCH0"/>
+                <signal pad-key="pc4" index="4" function="EVSINCH0" group="EVSPC" field="EVSYS.SYNCCH0.SYNCCH0"/>
+                <signal pad-key="pc5" index="5" function="EVSINCH0" group="EVSPC" field="EVSYS.SYNCCH0.SYNCCH0"/>
             </signals>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="i2603_fuse">
@@ -230,38 +230,38 @@
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pa2" index="2" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa3" index="3" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa4" index="4" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa5" index="5" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa6" index="6" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa7" index="7" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa0" index="0" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa1" index="1" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa2" index="2" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa3" index="3" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa4" index="4" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa5" index="5" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa6" index="6" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa7" index="7" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pb2" index="2" function="IOPORT" group="PIN"/>
-                <signal pad-id="pb3" index="3" function="IOPORT" group="PIN"/>
-                <signal pad-id="pb4" index="4" function="IOPORT" group="PIN"/>
-                <signal pad-id="pb5" index="5" function="IOPORT" group="PIN"/>
-                <signal pad-id="pb6" index="6" function="IOPORT" group="PIN"/>
-                <signal pad-id="pb7" index="7" function="IOPORT" group="PIN"/>
+                <signal pad-key="pb0" index="0" function="IOPORT" group="PIN"/>
+                <signal pad-key="pb1" index="1" function="IOPORT" group="PIN"/>
+                <signal pad-key="pb2" index="2" function="IOPORT" group="PIN"/>
+                <signal pad-key="pb3" index="3" function="IOPORT" group="PIN"/>
+                <signal pad-key="pb4" index="4" function="IOPORT" group="PIN"/>
+                <signal pad-key="pb5" index="5" function="IOPORT" group="PIN"/>
+                <signal pad-key="pb6" index="6" function="IOPORT" group="PIN"/>
+                <signal pad-key="pb7" index="7" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pc2" index="2" function="IOPORT" group="PIN"/>
-                <signal pad-id="pc3" index="3" function="IOPORT" group="PIN"/>
-                <signal pad-id="pc4" index="4" function="IOPORT" group="PIN"/>
-                <signal pad-id="pc5" index="5" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc0" index="0" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc1" index="1" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc2" index="2" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc3" index="3" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc4" index="4" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc5" index="5" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="portmux" name="PORTMUX" module-key="i2603_portmux">
@@ -269,42 +269,42 @@
         </peripheral>
         <peripheral key="ptc" name="PTC" module-key="i2120">
             <signals>
-                <signal pad-id="pb2" index="0" function="PTC_DS" group="DS"/>
-                <signal pad-id="pb4" index="1" function="PTC_DS" group="DS"/>
-                <signal pad-id="pa4" index="0" function="PTC_X" group="X"/>
-                <signal pad-id="pa5" index="1" function="PTC_X" group="X"/>
-                <signal pad-id="pa6" index="2" function="PTC_X" group="X"/>
-                <signal pad-id="pa7" index="3" function="PTC_X" group="X"/>
-                <signal pad-id="pb1" index="4" function="PTC_X" group="X"/>
-                <signal pad-id="pb0" index="5" function="PTC_X" group="X"/>
-                <signal pad-id="pc0" index="6" function="PTC_X" group="X"/>
-                <signal pad-id="pc1" index="7" function="PTC_X" group="X"/>
-                <signal pad-id="pc2" index="8" function="PTC_X" group="X"/>
-                <signal pad-id="pc3" index="9" function="PTC_X" group="X"/>
-                <signal pad-id="pc4" index="10" function="PTC_X" group="X"/>
-                <signal pad-id="pc5" index="11" function="PTC_X" group="X"/>
-                <signal pad-id="pb5" index="12" function="PTC_X" group="X"/>
-                <signal pad-id="pb4" index="13" function="PTC_X" group="X"/>
-                <signal pad-id="pa4" index="0" function="PTC_Y" group="Y"/>
-                <signal pad-id="pa5" index="1" function="PTC_Y" group="Y"/>
-                <signal pad-id="pa6" index="2" function="PTC_Y" group="Y"/>
-                <signal pad-id="pa7" index="3" function="PTC_Y" group="Y"/>
-                <signal pad-id="pb1" index="4" function="PTC_Y" group="Y"/>
-                <signal pad-id="pb0" index="5" function="PTC_Y" group="Y"/>
-                <signal pad-id="pc0" index="6" function="PTC_Y" group="Y"/>
-                <signal pad-id="pc1" index="7" function="PTC_Y" group="Y"/>
-                <signal pad-id="pc2" index="8" function="PTC_Y" group="Y"/>
-                <signal pad-id="pc3" index="9" function="PTC_Y" group="Y"/>
-                <signal pad-id="pc4" index="10" function="PTC_Y" group="Y"/>
-                <signal pad-id="pc5" index="11" function="PTC_Y" group="Y"/>
-                <signal pad-id="pb5" index="12" function="PTC_Y" group="Y"/>
-                <signal pad-id="pb4" index="13" function="PTC_Y" group="Y"/>
+                <signal pad-key="pb2" index="0" function="PTC_DS" group="DS"/>
+                <signal pad-key="pb4" index="1" function="PTC_DS" group="DS"/>
+                <signal pad-key="pa4" index="0" function="PTC_X" group="X"/>
+                <signal pad-key="pa5" index="1" function="PTC_X" group="X"/>
+                <signal pad-key="pa6" index="2" function="PTC_X" group="X"/>
+                <signal pad-key="pa7" index="3" function="PTC_X" group="X"/>
+                <signal pad-key="pb1" index="4" function="PTC_X" group="X"/>
+                <signal pad-key="pb0" index="5" function="PTC_X" group="X"/>
+                <signal pad-key="pc0" index="6" function="PTC_X" group="X"/>
+                <signal pad-key="pc1" index="7" function="PTC_X" group="X"/>
+                <signal pad-key="pc2" index="8" function="PTC_X" group="X"/>
+                <signal pad-key="pc3" index="9" function="PTC_X" group="X"/>
+                <signal pad-key="pc4" index="10" function="PTC_X" group="X"/>
+                <signal pad-key="pc5" index="11" function="PTC_X" group="X"/>
+                <signal pad-key="pb5" index="12" function="PTC_X" group="X"/>
+                <signal pad-key="pb4" index="13" function="PTC_X" group="X"/>
+                <signal pad-key="pa4" index="0" function="PTC_Y" group="Y"/>
+                <signal pad-key="pa5" index="1" function="PTC_Y" group="Y"/>
+                <signal pad-key="pa6" index="2" function="PTC_Y" group="Y"/>
+                <signal pad-key="pa7" index="3" function="PTC_Y" group="Y"/>
+                <signal pad-key="pb1" index="4" function="PTC_Y" group="Y"/>
+                <signal pad-key="pb0" index="5" function="PTC_Y" group="Y"/>
+                <signal pad-key="pc0" index="6" function="PTC_Y" group="Y"/>
+                <signal pad-key="pc1" index="7" function="PTC_Y" group="Y"/>
+                <signal pad-key="pc2" index="8" function="PTC_Y" group="Y"/>
+                <signal pad-key="pc3" index="9" function="PTC_Y" group="Y"/>
+                <signal pad-key="pc4" index="10" function="PTC_Y" group="Y"/>
+                <signal pad-key="pc5" index="11" function="PTC_Y" group="Y"/>
+                <signal pad-key="pb5" index="12" function="PTC_Y" group="Y"/>
+                <signal pad-key="pb4" index="13" function="PTC_Y" group="Y"/>
             </signals>
         </peripheral>
         <peripheral key="rstctrl" name="RSTCTRL" module-key="i2111">
             <register-group-instance register-group-key="rstctrl" address-space-key="data" offset="0x40"/>
             <signals>
-                <signal pad-id="pa0" function="OTHER" group="RESET"/>
+                <signal pad-key="pa0" function="OTHER" group="RESET"/>
             </signals>
         </peripheral>
         <peripheral key="rtc" name="RTC" module-key="i2116">
@@ -319,82 +319,82 @@
         <peripheral key="spi0" name="SPI0" module-key="i2107">
             <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"/>
-                <signal pad-id="pc2" function="SPI0_ALT" group="MOSI" field="PORTMUX.CTRLB.SPI0"/>
-                <signal pad-id="pa1" function="SPI0" group="MOSI" field="PORTMUX.CTRLB.SPI0"/>
-                <signal pad-id="pc0" function="SPI0_ALT" group="SCK" field="PORTMUX.CTRLB.SPI0"/>
-                <signal pad-id="pa3" function="SPI0" group="SCK" field="PORTMUX.CTRLB.SPI0"/>
-                <signal pad-id="pc3" function="SPI0_ALT" group="SS" field="PORTMUX.CTRLB.SPI0"/>
-                <signal pad-id="pa4" function="SPI0" group="SS" field="PORTMUX.CTRLB.SPI0"/>
+                <signal pad-key="pc1" function="SPI0_ALT" group="MISO" field="PORTMUX.CTRLB.SPI0"/>
+                <signal pad-key="pa2" function="SPI0" group="MISO" field="PORTMUX.CTRLB.SPI0"/>
+                <signal pad-key="pc2" function="SPI0_ALT" group="MOSI" field="PORTMUX.CTRLB.SPI0"/>
+                <signal pad-key="pa1" function="SPI0" group="MOSI" field="PORTMUX.CTRLB.SPI0"/>
+                <signal pad-key="pc0" function="SPI0_ALT" group="SCK" field="PORTMUX.CTRLB.SPI0"/>
+                <signal pad-key="pa3" function="SPI0" group="SCK" field="PORTMUX.CTRLB.SPI0"/>
+                <signal pad-key="pc3" function="SPI0_ALT" group="SS" field="PORTMUX.CTRLB.SPI0"/>
+                <signal pad-key="pa4" function="SPI0" group="SS" field="PORTMUX.CTRLB.SPI0"/>
             </signals>
         </peripheral>
         <peripheral key="syscfg" name="SYSCFG" module-key="i2603_syscfg">
             <register-group-instance register-group-key="syscfg" address-space-key="data" offset="0xF00"/>
             <signals>
-                <signal pad-id="pa0" function="OTHER" group="UPDI"/>
+                <signal pad-key="pa0" function="OTHER" group="UPDI"/>
             </signals>
         </peripheral>
         <peripheral key="tca0" name="TCA0" module-key="i2117">
             <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"/>
-                <signal pad-id="pb4" index="1" function="TCA0_ALT" group="WO" field="PORTMUX.CTRLC.TCA01"/>
-                <signal pad-id="pb1" index="1" function="TCA0" group="WO" field="PORTMUX.CTRLC.TCA01"/>
-                <signal pad-id="pb5" index="2" function="TCA0_ALT" group="WO" field="PORTMUX.CTRLC.TCA02"/>
-                <signal pad-id="pb2" index="2" function="TCA0" group="WO" field="PORTMUX.CTRLC.TCA02"/>
-                <signal pad-id="pc3" index="3" function="TCA0_ALT" group="WO" field="PORTMUX.CTRLC.TCA03"/>
-                <signal pad-id="pa3" index="3" function="TCA0" group="WO" field="PORTMUX.CTRLC.TCA03"/>
-                <signal pad-id="pc4" index="4" function="TCA0_ALT" group="WO" field="PORTMUX.CTRLC.TCA04"/>
-                <signal pad-id="pa4" index="4" function="TCA0" group="WO" field="PORTMUX.CTRLC.TCA04"/>
-                <signal pad-id="pc5" index="5" function="TCA0_ALT" group="WO" field="PORTMUX.CTRLC.TCA05"/>
-                <signal pad-id="pa5" index="5" function="TCA0" group="WO" field="PORTMUX.CTRLC.TCA05"/>
+                <signal pad-key="pb3" index="0" function="TCA0_ALT" group="WO" field="PORTMUX.CTRLC.TCA00"/>
+                <signal pad-key="pb0" index="0" function="TCA0" group="WO" field="PORTMUX.CTRLC.TCA00"/>
+                <signal pad-key="pb4" index="1" function="TCA0_ALT" group="WO" field="PORTMUX.CTRLC.TCA01"/>
+                <signal pad-key="pb1" index="1" function="TCA0" group="WO" field="PORTMUX.CTRLC.TCA01"/>
+                <signal pad-key="pb5" index="2" function="TCA0_ALT" group="WO" field="PORTMUX.CTRLC.TCA02"/>
+                <signal pad-key="pb2" index="2" function="TCA0" group="WO" field="PORTMUX.CTRLC.TCA02"/>
+                <signal pad-key="pc3" index="3" function="TCA0_ALT" group="WO" field="PORTMUX.CTRLC.TCA03"/>
+                <signal pad-key="pa3" index="3" function="TCA0" group="WO" field="PORTMUX.CTRLC.TCA03"/>
+                <signal pad-key="pc4" index="4" function="TCA0_ALT" group="WO" field="PORTMUX.CTRLC.TCA04"/>
+                <signal pad-key="pa4" index="4" function="TCA0" group="WO" field="PORTMUX.CTRLC.TCA04"/>
+                <signal pad-key="pc5" index="5" function="TCA0_ALT" group="WO" field="PORTMUX.CTRLC.TCA05"/>
+                <signal pad-key="pa5" index="5" function="TCA0" group="WO" field="PORTMUX.CTRLC.TCA05"/>
             </signals>
         </peripheral>
         <peripheral key="tcb0" name="TCB0" module-key="i2119">
             <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"/>
+                <signal pad-key="pc0" index="0" function="TCB0_ALT" group="WO" field="PORTMUX.CTRLD.TCB0"/>
+                <signal pad-key="pa5" index="0" function="TCB0" group="WO" field="PORTMUX.CTRLD.TCB0"/>
             </signals>
         </peripheral>
         <peripheral key="tcb1" name="TCB1" module-key="i2119">
             <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"/>
+                <signal pad-key="pc4" index="0" function="TCB1_ALT" group="WO" field="PORTMUX.CTRLD.TCB1"/>
+                <signal pad-key="pa3" index="0" function="TCB1" group="WO" field="PORTMUX.CTRLD.TCB1"/>
             </signals>
         </peripheral>
         <peripheral key="tcd0" name="TCD0" module-key="i2129">
             <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"/>
-                <signal pad-id="pc0" function="TCD0" group="WOC"/>
-                <signal pad-id="pc1" function="TCD0" group="WOD"/>
+                <signal pad-key="pa4" function="TCD0" group="WOA"/>
+                <signal pad-key="pa5" function="TCD0" group="WOB"/>
+                <signal pad-key="pc0" function="TCD0" group="WOC"/>
+                <signal pad-key="pc1" function="TCD0" group="WOD"/>
             </signals>
         </peripheral>
         <peripheral key="twi0" name="TWI0" module-key="i2110">
             <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"/>
-                <signal pad-id="pa1" function="TWI0_ALT" group="SDA" field="PORTMUX.CTRLB.TWI0"/>
-                <signal pad-id="pb1" function="TWI0" group="SDA" field="PORTMUX.CTRLB.TWI0"/>
+                <signal pad-key="pa2" function="TWI0_ALT" group="SCL" field="PORTMUX.CTRLB.TWI0"/>
+                <signal pad-key="pb0" function="TWI0" group="SCL" field="PORTMUX.CTRLB.TWI0"/>
+                <signal pad-key="pa1" function="TWI0_ALT" group="SDA" field="PORTMUX.CTRLB.TWI0"/>
+                <signal pad-key="pb1" function="TWI0" group="SDA" field="PORTMUX.CTRLB.TWI0"/>
             </signals>
         </peripheral>
         <peripheral key="usart0" name="USART0" module-key="i2108">
             <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"/>
-                <signal pad-id="pa1" function="USART0_ALT" group="TXD" field="PORTMUX.CTRLB.USART0"/>
-                <signal pad-id="pb2" function="USART0" group="TXD" field="PORTMUX.CTRLB.USART0"/>
-                <signal pad-id="pa3" function="USART0_ALT" group="XCK" field="PORTMUX.CTRLB.USART0"/>
-                <signal pad-id="pb1" function="USART0" group="XCK" field="PORTMUX.CTRLB.USART0"/>
-                <signal pad-id="pa4" function="USART0_ALT" group="XDIR" field="PORTMUX.CTRLB.USART0"/>
-                <signal pad-id="pb0" function="USART0" group="XDIR" field="PORTMUX.CTRLB.USART0"/>
+                <signal pad-key="pa2" function="USART0_ALT" group="RXD" field="PORTMUX.CTRLB.USART0"/>
+                <signal pad-key="pb3" function="USART0" group="RXD" field="PORTMUX.CTRLB.USART0"/>
+                <signal pad-key="pa1" function="USART0_ALT" group="TXD" field="PORTMUX.CTRLB.USART0"/>
+                <signal pad-key="pb2" function="USART0" group="TXD" field="PORTMUX.CTRLB.USART0"/>
+                <signal pad-key="pa3" function="USART0_ALT" group="XCK" field="PORTMUX.CTRLB.USART0"/>
+                <signal pad-key="pb1" function="USART0" group="XCK" field="PORTMUX.CTRLB.USART0"/>
+                <signal pad-key="pa4" function="USART0_ALT" group="XDIR" field="PORTMUX.CTRLB.USART0"/>
+                <signal pad-key="pb0" function="USART0" group="XDIR" field="PORTMUX.CTRLB.USART0"/>
             </signals>
         </peripheral>
         <peripheral key="userrow" name="USERROW" module-key="i2603_userrow">
@@ -1504,36 +1504,62 @@
             </register-group>
         </module>
     </modules>
+    <pads>
+        <pad key="pa2" name="PA2"/>
+        <pad key="pa3" name="PA3"/>
+        <pad key="gnd" name="GND"/>
+        <pad key="vdd" name="VDD"/>
+        <pad key="pa4" name="PA4"/>
+        <pad key="pa5" name="PA5"/>
+        <pad key="pa6" name="PA6"/>
+        <pad key="pa7" name="PA7"/>
+        <pad key="pb7" name="PB7"/>
+        <pad key="pb6" name="PB6"/>
+        <pad key="pb5" name="PB5"/>
+        <pad key="pb4" name="PB4"/>
+        <pad key="pb3" name="PB3"/>
+        <pad key="pb2" name="PB2"/>
+        <pad key="pb1" name="PB1"/>
+        <pad key="pb0" name="PB0"/>
+        <pad key="pc0" name="PC0"/>
+        <pad key="pc1" name="PC1"/>
+        <pad key="pc2" name="PC2"/>
+        <pad key="pc3" name="PC3"/>
+        <pad key="pc4" name="PC4"/>
+        <pad key="pc5" name="PC5"/>
+        <pad key="pa0" name="PA0"/>
+        <pad key="pa1" name="PA1"/>
+    </pads>
     <pinouts>
         <pinout key="qfn24" name="QFN24" type="qfn">
-            <pin position="1" pad="PA2"/>
-            <pin position="2" pad="PA3"/>
-            <pin position="3" pad="GND"/>
-            <pin position="4" pad="VDD"/>
-            <pin position="5" pad="PA4"/>
-            <pin position="6" pad="PA5"/>
-            <pin position="7" pad="PA6"/>
-            <pin position="8" pad="PA7"/>
-            <pin position="9" pad="PB7"/>
-            <pin position="10" pad="PB6"/>
-            <pin position="11" pad="PB5"/>
-            <pin position="12" pad="PB4"/>
-            <pin position="13" pad="PB3"/>
-            <pin position="14" pad="PB2"/>
-            <pin position="15" pad="PB1"/>
-            <pin position="16" pad="PB0"/>
-            <pin position="17" pad="PC0"/>
-            <pin position="18" pad="PC1"/>
-            <pin position="19" pad="PC2"/>
-            <pin position="20" pad="PC3"/>
-            <pin position="21" pad="PC4"/>
-            <pin position="22" pad="PC5"/>
-            <pin position="23" pad="PA0"/>
-            <pin position="24" pad="PA1"/>
+            <pin position="1" pad-key="pa2"/>
+            <pin position="2" pad-key="pa3"/>
+            <pin position="3" pad-key="gnd"/>
+            <pin position="4" pad-key="vdd"/>
+            <pin position="5" pad-key="pa4"/>
+            <pin position="6" pad-key="pa5"/>
+            <pin position="7" pad-key="pa6"/>
+            <pin position="8" pad-key="pa7"/>
+            <pin position="9" pad-key="pb7"/>
+            <pin position="10" pad-key="pb6"/>
+            <pin position="11" pad-key="pb5"/>
+            <pin position="12" pad-key="pb4"/>
+            <pin position="13" pad-key="pb3"/>
+            <pin position="14" pad-key="pb2"/>
+            <pin position="15" pad-key="pb1"/>
+            <pin position="16" pad-key="pb0"/>
+            <pin position="17" pad-key="pc0"/>
+            <pin position="18" pad-key="pc1"/>
+            <pin position="19" pad-key="pc2"/>
+            <pin position="20" pad-key="pc3"/>
+            <pin position="21" pad-key="pc4"/>
+            <pin position="22" pad-key="pc5"/>
+            <pin position="23" pad-key="pa0"/>
+            <pin position="24" pad-key="pa1"/>
         </pinout>
     </pinouts>
     <variants>
-        <variant name="ATtiny3217-MFR" pinout-key="qfn24" package="VQFN24"/>
-        <variant name="ATtiny3217-MNR" pinout-key="qfn24" package="VQFN24"/>
+        <variant key="attiny3217_mfr" name="ATtiny3217-MFR" pinout-key="qfn24"/>
+        <variant key="attiny3217_mnr" name="ATtiny3217-MNR" pinout-key="qfn24"/>
     </variants>
 </device>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY402.xml b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY402.xml
index 26fa908a..01a32cbb 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY402.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY402.xml
@@ -43,20 +43,20 @@
         <peripheral key="ac0" name="AC0" module-key="i2106">
             <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"/>
-                <signal pad-id="pa7" index="0" function="AC0" group="P"/>
+                <signal pad-key="pa6" index="0" function="AC0" group="N"/>
+                <signal pad-key="pa3" function="AC0" group="OUT"/>
+                <signal pad-key="pa7" index="0" function="AC0" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="adc0" name="ADC0" module-key="i2132">
             <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"/>
-                <signal pad-id="pa2" index="2" function="AIN0" group="AIN"/>
-                <signal pad-id="pa3" index="3" function="AIN0" group="AIN"/>
-                <signal pad-id="pa6" index="6" function="AIN0" group="AIN"/>
-                <signal pad-id="pa7" index="7" function="AIN0" group="AIN"/>
+                <signal pad-key="pa0" index="0" function="AIN0" group="AIN"/>
+                <signal pad-key="pa1" index="1" function="AIN0" group="AIN"/>
+                <signal pad-key="pa2" index="2" function="AIN0" group="AIN"/>
+                <signal pad-key="pa3" index="3" function="AIN0" group="AIN"/>
+                <signal pad-key="pa6" index="6" function="AIN0" group="AIN"/>
+                <signal pad-key="pa7" index="7" function="AIN0" group="AIN"/>
             </signals>
         </peripheral>
         <peripheral key="bod" name="BOD" module-key="i2114">
@@ -65,22 +65,22 @@
         <peripheral key="ccl" name="CCL" module-key="i2128">
             <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"/>
-                <signal pad-id="pa2" index="2" function="CCL" group="LUT0_IN"/>
-                <signal pad-id="pa6" index="0" function="CCL" group="LUT1_OUT"/>
+                <signal pad-key="pa0" index="0" function="CCL" group="LUT0_IN"/>
+                <signal pad-key="pa1" index="1" function="CCL" group="LUT0_IN"/>
+                <signal pad-key="pa2" index="2" function="CCL" group="LUT0_IN"/>
+                <signal pad-key="pa6" index="0" function="CCL" group="LUT1_OUT"/>
             </signals>
         </peripheral>
         <peripheral key="clkctrl" name="CLKCTRL" module-key="i2601_clkctrl">
             <register-group-instance register-group-key="clkctrl" address-space-key="data" offset="0x60"/>
             <signals>
-                <signal pad-id="pa3" function="CLKCTRL" group="CLKI"/>
+                <signal pad-key="pa3" function="CLKCTRL" group="CLKI"/>
             </signals>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="i2100">
             <register-group-instance register-group-key="cpu" address-space-key="data" offset="0x30"/>
             <signals>
-                <signal pad-id="pa1" function="OTHER" group="BREAK"/>
+                <signal pad-key="pa1" function="OTHER" group="BREAK"/>
             </signals>
         </peripheral>
         <peripheral key="cpuint" name="CPUINT" module-key="i2104">
@@ -92,19 +92,19 @@
         <peripheral key="evsys" name="EVSYS" module-key="i2601_evsys">
             <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"/>
-                <signal pad-id="pa2" index="2" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
-                <signal pad-id="pa3" index="3" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
-                <signal pad-id="pa6" index="6" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
-                <signal pad-id="pa7" index="7" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
-                <signal pad-id="pa2" index="0" function="EVSYS" group="EVOUT" field="PORTMUX.CTRLA.EVOUT0"/>
-                <signal pad-id="pa0" index="0" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
-                <signal pad-id="pa1" index="1" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
-                <signal pad-id="pa2" index="2" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
-                <signal pad-id="pa3" index="3" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
-                <signal pad-id="pa6" index="6" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
-                <signal pad-id="pa7" index="7" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
+                <signal pad-key="pa0" index="0" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
+                <signal pad-key="pa1" index="1" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
+                <signal pad-key="pa2" index="2" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
+                <signal pad-key="pa3" index="3" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
+                <signal pad-key="pa6" index="6" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
+                <signal pad-key="pa7" index="7" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
+                <signal pad-key="pa2" index="0" function="EVSYS" group="EVOUT" field="PORTMUX.CTRLA.EVOUT0"/>
+                <signal pad-key="pa0" index="0" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
+                <signal pad-key="pa1" index="1" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
+                <signal pad-key="pa2" index="2" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
+                <signal pad-key="pa3" index="3" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
+                <signal pad-key="pa6" index="6" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
+                <signal pad-key="pa7" index="7" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
             </signals>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="i2601_fuse">
@@ -122,12 +122,12 @@
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pa2" index="2" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa3" index="3" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa6" index="6" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa7" index="7" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa0" index="0" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa1" index="1" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa2" index="2" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa3" index="3" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa6" index="6" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa7" index="7" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="portmux" name="PORTMUX" module-key="i2601_portmux">
@@ -136,7 +136,7 @@
         <peripheral key="rstctrl" name="RSTCTRL" module-key="i2111">
             <register-group-instance register-group-key="rstctrl" address-space-key="data" offset="0x40"/>
             <signals>
-                <signal pad-id="pa0" function="OTHER" group="RESET"/>
+                <signal pad-key="pa0" function="OTHER" group="RESET"/>
             </signals>
         </peripheral>
         <peripheral key="rtc" name="RTC" module-key="i2116">
@@ -151,52 +151,52 @@
         <peripheral key="spi0" name="SPI0" module-key="i2107">
             <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"/>
-                <signal pad-id="pa6" function="SPI0_ALT" group="MOSI" field="PORTMUX.CTRLB.SPI0"/>
-                <signal pad-id="pa1" function="SPI0" group="MOSI" field="PORTMUX.CTRLB.SPI0"/>
-                <signal pad-id="pa3" function="SPI0" group="SCK"/>
-                <signal pad-id="pa0" function="SPI0" group="SS"/>
+                <signal pad-key="pa7" function="SPI0_ALT" group="MISO" field="PORTMUX.CTRLB.SPI0"/>
+                <signal pad-key="pa2" function="SPI0" group="MISO" field="PORTMUX.CTRLB.SPI0"/>
+                <signal pad-key="pa6" function="SPI0_ALT" group="MOSI" field="PORTMUX.CTRLB.SPI0"/>
+                <signal pad-key="pa1" function="SPI0" group="MOSI" field="PORTMUX.CTRLB.SPI0"/>
+                <signal pad-key="pa3" function="SPI0" group="SCK"/>
+                <signal pad-key="pa0" function="SPI0" group="SS"/>
             </signals>
         </peripheral>
         <peripheral key="syscfg" name="SYSCFG" module-key="i2601_syscfg">
             <register-group-instance register-group-key="syscfg" address-space-key="data" offset="0xF00"/>
             <signals>
-                <signal pad-id="pa0" function="OTHER" group="UPDI"/>
+                <signal pad-key="pa0" function="OTHER" group="UPDI"/>
             </signals>
         </peripheral>
         <peripheral key="tca0" name="TCA0" module-key="i2117">
             <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"/>
-                <signal pad-id="pa1" index="1" function="TCA0" group="WO"/>
-                <signal pad-id="pa2" index="2" function="TCA0" group="WO"/>
-                <signal pad-id="pa3" index="3" function="TCA0" group="WO"/>
+                <signal pad-key="pa7" index="0" function="TCA0_ALT" group="WO" field="PORTMUX.CTRLC.TCA00"/>
+                <signal pad-key="pa3" index="0" function="TCA0" group="WO" field="PORTMUX.CTRLC.TCA00"/>
+                <signal pad-key="pa1" index="1" function="TCA0" group="WO"/>
+                <signal pad-key="pa2" index="2" function="TCA0" group="WO"/>
+                <signal pad-key="pa3" index="3" function="TCA0" group="WO"/>
             </signals>
         </peripheral>
         <peripheral key="tcb0" name="TCB0" module-key="i2119">
             <register-group-instance register-group-key="tcb" address-space-key="data" offset="0xA40"/>
             <signals>
-                <signal pad-id="pa6" function="TCB0" group="WO"/>
+                <signal pad-key="pa6" function="TCB0" group="WO"/>
             </signals>
         </peripheral>
         <peripheral key="twi0" name="TWI0" module-key="i2110">
             <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"/>
+                <signal pad-key="pa2" function="TWI0" group="SCL"/>
+                <signal pad-key="pa1" function="TWI0" group="SDA"/>
             </signals>
         </peripheral>
         <peripheral key="usart0" name="USART0" module-key="i2108">
             <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"/>
-                <signal pad-id="pa1" function="USART0_ALT" group="TXD" field="PORTMUX.CTRLB.USART0"/>
-                <signal pad-id="pa6" function="USART0" group="TXD" field="PORTMUX.CTRLB.USART0"/>
-                <signal pad-id="pa3" function="USART0" group="XCK"/>
-                <signal pad-id="pa0" function="USART0" group="XDIR"/>
+                <signal pad-key="pa2" function="USART0_ALT" group="RXD" field="PORTMUX.CTRLB.USART0"/>
+                <signal pad-key="pa7" function="USART0" group="RXD" field="PORTMUX.CTRLB.USART0"/>
+                <signal pad-key="pa1" function="USART0_ALT" group="TXD" field="PORTMUX.CTRLB.USART0"/>
+                <signal pad-key="pa6" function="USART0" group="TXD" field="PORTMUX.CTRLB.USART0"/>
+                <signal pad-key="pa3" function="USART0" group="XCK"/>
+                <signal pad-key="pa0" function="USART0" group="XDIR"/>
             </signals>
         </peripheral>
         <peripheral key="userrow" name="USERROW" module-key="i2601_userrow">
@@ -1134,20 +1134,30 @@
             </register-group>
         </module>
     </modules>
+    <pads>
+        <pad key="vdd" name="VDD"/>
+        <pad key="pa6" name="PA6"/>
+        <pad key="pa7" name="PA7"/>
+        <pad key="pa1" name="PA1"/>
+        <pad key="pa2" name="PA2"/>
+        <pad key="pa0" name="PA0"/>
+        <pad key="pa3" name="PA3"/>
+        <pad key="gnd" name="GND"/>
+    </pads>
     <pinouts>
         <pinout key="soic8" name="SOIC8" type="soic">
-            <pin position="1" pad="VDD"/>
-            <pin position="2" pad="PA6"/>
-            <pin position="3" pad="PA7"/>
-            <pin position="4" pad="PA1"/>
-            <pin position="5" pad="PA2"/>
-            <pin position="6" pad="PA0"/>
-            <pin position="7" pad="PA3"/>
-            <pin position="8" pad="GND"/>
+            <pin position="1" pad-key="vdd"/>
+            <pin position="2" pad-key="pa6"/>
+            <pin position="3" pad-key="pa7"/>
+            <pin position="4" pad-key="pa1"/>
+            <pin position="5" pad-key="pa2"/>
+            <pin position="6" pad-key="pa0"/>
+            <pin position="7" pad-key="pa3"/>
+            <pin position="8" pad-key="gnd"/>
         </pinout>
     </pinouts>
     <variants>
-        <variant name="ATtiny402-SSFR" pinout-key="soic8" package="SOIC8"/>
-        <variant name="ATtiny402-SSNR" pinout-key="soic8" package="SOIC8"/>
+        <variant key="attiny402_ssfr" name="ATtiny402-SSFR" pinout-key="soic8"/>
+        <variant key="attiny402_ssnr" name="ATtiny402-SSNR" pinout-key="soic8"/>
     </variants>
 </device>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY404.xml b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY404.xml
index d5a590f9..75ca93ac 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY404.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY404.xml
@@ -43,24 +43,24 @@
         <peripheral key="ac0" name="AC0" module-key="i2106">
             <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"/>
-                <signal pad-id="pa7" index="0" function="AC0" group="P"/>
+                <signal pad-key="pa6" index="0" function="AC0" group="N"/>
+                <signal pad-key="pa5" index="0" function="AC0" group="OUT"/>
+                <signal pad-key="pa7" index="0" function="AC0" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="adc0" name="ADC0" module-key="i2132">
             <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"/>
-                <signal pad-id="pa2" index="2" function="AIN0" group="AIN"/>
-                <signal pad-id="pa3" index="3" function="AIN0" group="AIN"/>
-                <signal pad-id="pa4" index="4" function="AIN0" group="AIN"/>
-                <signal pad-id="pa5" index="5" function="AIN0" group="AIN"/>
-                <signal pad-id="pa6" index="6" function="AIN0" group="AIN"/>
-                <signal pad-id="pa7" index="7" function="AIN0" group="AIN"/>
-                <signal pad-id="pb1" index="10" function="AIN0" group="AIN"/>
-                <signal pad-id="pb0" index="11" function="AIN0" group="AIN"/>
+                <signal pad-key="pa0" index="0" function="AIN0" group="AIN"/>
+                <signal pad-key="pa1" index="1" function="AIN0" group="AIN"/>
+                <signal pad-key="pa2" index="2" function="AIN0" group="AIN"/>
+                <signal pad-key="pa3" index="3" function="AIN0" group="AIN"/>
+                <signal pad-key="pa4" index="4" function="AIN0" group="AIN"/>
+                <signal pad-key="pa5" index="5" function="AIN0" group="AIN"/>
+                <signal pad-key="pa6" index="6" function="AIN0" group="AIN"/>
+                <signal pad-key="pa7" index="7" function="AIN0" group="AIN"/>
+                <signal pad-key="pb1" index="10" function="AIN0" group="AIN"/>
+                <signal pad-key="pb0" index="11" function="AIN0" group="AIN"/>
             </signals>
         </peripheral>
         <peripheral key="bod" name="BOD" module-key="i2114">
@@ -69,25 +69,25 @@
         <peripheral key="ccl" name="CCL" module-key="i2128">
             <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"/>
-                <signal pad-id="pa2" index="2" function="CCL" group="LUT0_IN"/>
-                <signal pad-id="pa4" index="0" function="CCL" group="LUT0_OUT" field="PORTMUX.CTRLA.LUT0"/>
-                <signal pad-id="pa7" index="0" function="CCL" group="LUT1_OUT" field="PORTMUX.CTRLA.LUT1"/>
+                <signal pad-key="pa0" index="0" function="CCL" group="LUT0_IN"/>
+                <signal pad-key="pa1" index="1" function="CCL" group="LUT0_IN"/>
+                <signal pad-key="pa2" index="2" function="CCL" group="LUT0_IN"/>
+                <signal pad-key="pa4" index="0" function="CCL" group="LUT0_OUT" field="PORTMUX.CTRLA.LUT0"/>
+                <signal pad-key="pa7" index="0" function="CCL" group="LUT1_OUT" field="PORTMUX.CTRLA.LUT1"/>
             </signals>
         </peripheral>
         <peripheral key="clkctrl" name="CLKCTRL" module-key="i2601_clkctrl">
             <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"/>
-                <signal pad-id="pb2" function="CLKCTRL" group="TOSC2"/>
+                <signal pad-key="pa3" function="CLKCTRL" group="CLKI"/>
+                <signal pad-key="pb3" function="CLKCTRL" group="TOSC1"/>
+                <signal pad-key="pb2" function="CLKCTRL" group="TOSC2"/>
             </signals>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="i2100">
             <register-group-instance register-group-key="cpu" address-space-key="data" offset="0x30"/>
             <signals>
-                <signal pad-id="pa1" function="OTHER" group="BREAK"/>
+                <signal pad-key="pa1" function="OTHER" group="BREAK"/>
             </signals>
         </peripheral>
         <peripheral key="cpuint" name="CPUINT" module-key="i2104">
@@ -99,32 +99,32 @@
         <peripheral key="evsys" name="EVSYS" module-key="i2601_evsys">
             <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"/>
-                <signal pad-id="pa2" index="2" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
-                <signal pad-id="pa3" index="3" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
-                <signal pad-id="pa4" index="4" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
-                <signal pad-id="pa5" index="5" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
-                <signal pad-id="pa6" index="6" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
-                <signal pad-id="pa7" index="7" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
-                <signal pad-id="pb0" index="0" function="EVAINCH1" group="EVAPB" field="EVSYS.ASYNCCH1.ASYNCCH1"/>
-                <signal pad-id="pb1" index="1" function="EVAINCH1" group="EVAPB" field="EVSYS.ASYNCCH1.ASYNCCH1"/>
-                <signal pad-id="pb2" index="2" function="EVAINCH1" group="EVAPB" field="EVSYS.ASYNCCH1.ASYNCCH1"/>
-                <signal pad-id="pb3" index="3" function="EVAINCH1" group="EVAPB" field="EVSYS.ASYNCCH1.ASYNCCH1"/>
-                <signal pad-id="pa2" index="0" function="EVSYS" group="EVOUT" field="PORTMUX.CTRLA.EVOUT0"/>
-                <signal pad-id="pb2" index="1" function="EVSYS" group="EVOUT" field="PORTMUX.CTRLA.EVOUT1"/>
-                <signal pad-id="pa0" index="0" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
-                <signal pad-id="pa1" index="1" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
-                <signal pad-id="pa2" index="2" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
-                <signal pad-id="pa3" index="3" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
-                <signal pad-id="pa4" index="4" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
-                <signal pad-id="pa5" index="5" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
-                <signal pad-id="pa6" index="6" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
-                <signal pad-id="pa7" index="7" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
-                <signal pad-id="pb0" index="0" function="EVSINCH1" group="EVSPB" field="EVSYS.SYNCCH1.SYNCCH1"/>
-                <signal pad-id="pb1" index="1" function="EVSINCH1" group="EVSPB" field="EVSYS.SYNCCH1.SYNCCH1"/>
-                <signal pad-id="pb2" index="2" function="EVSINCH1" group="EVSPB" field="EVSYS.SYNCCH1.SYNCCH1"/>
-                <signal pad-id="pb3" index="3" function="EVSINCH1" group="EVSPB" field="EVSYS.SYNCCH1.SYNCCH1"/>
+                <signal pad-key="pa0" index="0" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
+                <signal pad-key="pa1" index="1" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
+                <signal pad-key="pa2" index="2" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
+                <signal pad-key="pa3" index="3" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
+                <signal pad-key="pa4" index="4" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
+                <signal pad-key="pa5" index="5" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
+                <signal pad-key="pa6" index="6" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
+                <signal pad-key="pa7" index="7" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
+                <signal pad-key="pb0" index="0" function="EVAINCH1" group="EVAPB" field="EVSYS.ASYNCCH1.ASYNCCH1"/>
+                <signal pad-key="pb1" index="1" function="EVAINCH1" group="EVAPB" field="EVSYS.ASYNCCH1.ASYNCCH1"/>
+                <signal pad-key="pb2" index="2" function="EVAINCH1" group="EVAPB" field="EVSYS.ASYNCCH1.ASYNCCH1"/>
+                <signal pad-key="pb3" index="3" function="EVAINCH1" group="EVAPB" field="EVSYS.ASYNCCH1.ASYNCCH1"/>
+                <signal pad-key="pa2" index="0" function="EVSYS" group="EVOUT" field="PORTMUX.CTRLA.EVOUT0"/>
+                <signal pad-key="pb2" index="1" function="EVSYS" group="EVOUT" field="PORTMUX.CTRLA.EVOUT1"/>
+                <signal pad-key="pa0" index="0" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
+                <signal pad-key="pa1" index="1" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
+                <signal pad-key="pa2" index="2" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
+                <signal pad-key="pa3" index="3" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
+                <signal pad-key="pa4" index="4" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
+                <signal pad-key="pa5" index="5" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
+                <signal pad-key="pa6" index="6" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
+                <signal pad-key="pa7" index="7" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
+                <signal pad-key="pb0" index="0" function="EVSINCH1" group="EVSPB" field="EVSYS.SYNCCH1.SYNCCH1"/>
+                <signal pad-key="pb1" index="1" function="EVSINCH1" group="EVSPB" field="EVSYS.SYNCCH1.SYNCCH1"/>
+                <signal pad-key="pb2" index="2" function="EVSINCH1" group="EVSPB" field="EVSYS.SYNCCH1.SYNCCH1"/>
+                <signal pad-key="pb3" index="3" function="EVSINCH1" group="EVSPB" field="EVSYS.SYNCCH1.SYNCCH1"/>
             </signals>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="i2601_fuse">
@@ -142,23 +142,23 @@
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pa2" index="2" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa3" index="3" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa4" index="4" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa5" index="5" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa6" index="6" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa7" index="7" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa0" index="0" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa1" index="1" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa2" index="2" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa3" index="3" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa4" index="4" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa5" index="5" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa6" index="6" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa7" index="7" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pb2" index="2" function="IOPORT" group="PIN"/>
-                <signal pad-id="pb3" index="3" function="IOPORT" group="PIN"/>
+                <signal pad-key="pb0" index="0" function="IOPORT" group="PIN"/>
+                <signal pad-key="pb1" index="1" function="IOPORT" group="PIN"/>
+                <signal pad-key="pb2" index="2" function="IOPORT" group="PIN"/>
+                <signal pad-key="pb3" index="3" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="portmux" name="PORTMUX" module-key="i2601_portmux">
@@ -167,7 +167,7 @@
         <peripheral key="rstctrl" name="RSTCTRL" module-key="i2111">
             <register-group-instance register-group-key="rstctrl" address-space-key="data" offset="0x40"/>
             <signals>
-                <signal pad-id="pa0" function="OTHER" group="RESET"/>
+                <signal pad-key="pa0" function="OTHER" group="RESET"/>
             </signals>
         </peripheral>
         <peripheral key="rtc" name="RTC" module-key="i2116">
@@ -182,56 +182,56 @@
         <peripheral key="spi0" name="SPI0" module-key="i2107">
             <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"/>
-                <signal pad-id="pa6" function="SPI0_ALT" group="MOSI" field="PORTMUX.CTRLB.SPI0"/>
-                <signal pad-id="pa1" function="SPI0" group="MOSI" field="PORTMUX.CTRLB.SPI0"/>
-                <signal pad-id="pa3" function="SPI0" group="SCK" field="PORTMUX.CTRLB.SPI0"/>
-                <signal pad-id="pa4" function="SPI0" group="SS" field="PORTMUX.CTRLB.SPI0"/>
+                <signal pad-key="pa7" function="SPI0_ALT" group="MISO" field="PORTMUX.CTRLB.SPI0"/>
+                <signal pad-key="pa2" function="SPI0" group="MISO" field="PORTMUX.CTRLB.SPI0"/>
+                <signal pad-key="pa6" function="SPI0_ALT" group="MOSI" field="PORTMUX.CTRLB.SPI0"/>
+                <signal pad-key="pa1" function="SPI0" group="MOSI" field="PORTMUX.CTRLB.SPI0"/>
+                <signal pad-key="pa3" function="SPI0" group="SCK" field="PORTMUX.CTRLB.SPI0"/>
+                <signal pad-key="pa4" function="SPI0" group="SS" field="PORTMUX.CTRLB.SPI0"/>
             </signals>
         </peripheral>
         <peripheral key="syscfg" name="SYSCFG" module-key="i2601_syscfg">
             <register-group-instance register-group-key="syscfg" address-space-key="data" offset="0xF00"/>
             <signals>
-                <signal pad-id="pa0" function="OTHER" group="UPDI"/>
+                <signal pad-key="pa0" function="OTHER" group="UPDI"/>
             </signals>
         </peripheral>
         <peripheral key="tca0" name="TCA0" module-key="i2117">
             <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"/>
-                <signal pad-id="pb1" index="1" function="TCA0" group="WO" field="PORTMUX.CTRLC.TCA01"/>
-                <signal pad-id="pb2" index="2" function="TCA0" group="WO" field="PORTMUX.CTRLC.TCA02"/>
-                <signal pad-id="pa3" index="3" function="TCA0" group="WO" field="PORTMUX.CTRLC.TCA03"/>
-                <signal pad-id="pa4" index="4" function="TCA0" group="WO" field="PORTMUX.CTRLC.TCA04"/>
-                <signal pad-id="pa5" index="5" function="TCA0" group="WO" field="PORTMUX.CTRLC.TCA05"/>
+                <signal pad-key="pb3" index="0" function="TCA0_ALT" group="WO" field="PORTMUX.CTRLC.TCA00"/>
+                <signal pad-key="pb0" index="0" function="TCA0" group="WO" field="PORTMUX.CTRLC.TCA00"/>
+                <signal pad-key="pb1" index="1" function="TCA0" group="WO" field="PORTMUX.CTRLC.TCA01"/>
+                <signal pad-key="pb2" index="2" function="TCA0" group="WO" field="PORTMUX.CTRLC.TCA02"/>
+                <signal pad-key="pa3" index="3" function="TCA0" group="WO" field="PORTMUX.CTRLC.TCA03"/>
+                <signal pad-key="pa4" index="4" function="TCA0" group="WO" field="PORTMUX.CTRLC.TCA04"/>
+                <signal pad-key="pa5" index="5" function="TCA0" group="WO" field="PORTMUX.CTRLC.TCA05"/>
             </signals>
         </peripheral>
         <peripheral key="tcb0" name="TCB0" module-key="i2119">
             <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"/>
+                <signal pad-key="pa5" index="0" function="TCB0" group="WO" field="PORTMUX.CTRLD.TCB0"/>
             </signals>
         </peripheral>
         <peripheral key="twi0" name="TWI0" module-key="i2110">
             <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"/>
+                <signal pad-key="pb0" function="TWI0" group="SCL" field="PORTMUX.CTRLB.TWI0"/>
+                <signal pad-key="pb1" function="TWI0" group="SDA" field="PORTMUX.CTRLB.TWI0"/>
             </signals>
         </peripheral>
         <peripheral key="usart0" name="USART0" module-key="i2108">
             <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"/>
-                <signal pad-id="pa1" function="USART0_ALT" group="TXD" field="PORTMUX.CTRLB.USART0"/>
-                <signal pad-id="pb2" function="USART0" group="TXD" field="PORTMUX.CTRLB.USART0"/>
-                <signal pad-id="pa3" function="USART0_ALT" group="XCK" field="PORTMUX.CTRLB.USART0"/>
-                <signal pad-id="pb1" function="USART0" group="XCK" field="PORTMUX.CTRLB.USART0"/>
-                <signal pad-id="pa4" function="USART0_ALT" group="XDIR" field="PORTMUX.CTRLB.USART0"/>
-                <signal pad-id="pb0" function="USART0" group="XDIR" field="PORTMUX.CTRLB.USART0"/>
+                <signal pad-key="pa2" function="USART0_ALT" group="RXD" field="PORTMUX.CTRLB.USART0"/>
+                <signal pad-key="pb3" function="USART0" group="RXD" field="PORTMUX.CTRLB.USART0"/>
+                <signal pad-key="pa1" function="USART0_ALT" group="TXD" field="PORTMUX.CTRLB.USART0"/>
+                <signal pad-key="pb2" function="USART0" group="TXD" field="PORTMUX.CTRLB.USART0"/>
+                <signal pad-key="pa3" function="USART0_ALT" group="XCK" field="PORTMUX.CTRLB.USART0"/>
+                <signal pad-key="pb1" function="USART0" group="XCK" field="PORTMUX.CTRLB.USART0"/>
+                <signal pad-key="pa4" function="USART0_ALT" group="XDIR" field="PORTMUX.CTRLB.USART0"/>
+                <signal pad-key="pb0" function="USART0" group="XDIR" field="PORTMUX.CTRLB.USART0"/>
             </signals>
         </peripheral>
         <peripheral key="userrow" name="USERROW" module-key="i2601_userrow">
@@ -1172,26 +1172,42 @@
             </register-group>
         </module>
     </modules>
+    <pads>
+        <pad key="vdd" name="VDD"/>
+        <pad key="pa4" name="PA4"/>
+        <pad key="pa5" name="PA5"/>
+        <pad key="pa6" name="PA6"/>
+        <pad key="pa7" name="PA7"/>
+        <pad key="pb3" name="PB3"/>
+        <pad key="pb2" name="PB2"/>
+        <pad key="pb1" name="PB1"/>
+        <pad key="pb0" name="PB0"/>
+        <pad key="pa0" name="PA0"/>
+        <pad key="pa1" name="PA1"/>
+        <pad key="pa2" name="PA2"/>
+        <pad key="pa3" name="PA3"/>
+        <pad key="gnd" name="GND"/>
+    </pads>
     <pinouts>
         <pinout key="soic14" name="SOIC14" type="soic">
-            <pin position="1" pad="VDD"/>
-            <pin position="2" pad="PA4"/>
-            <pin position="3" pad="PA5"/>
-            <pin position="4" pad="PA6"/>
-            <pin position="5" pad="PA7"/>
-            <pin position="6" pad="PB3"/>
-            <pin position="7" pad="PB2"/>
-            <pin position="8" pad="PB1"/>
-            <pin position="9" pad="PB0"/>
-            <pin position="10" pad="PA0"/>
-            <pin position="11" pad="PA1"/>
-            <pin position="12" pad="PA2"/>
-            <pin position="13" pad="PA3"/>
-            <pin position="14" pad="GND"/>
+            <pin position="1" pad-key="vdd"/>
+            <pin position="2" pad-key="pa4"/>
+            <pin position="3" pad-key="pa5"/>
+            <pin position="4" pad-key="pa6"/>
+            <pin position="5" pad-key="pa7"/>
+            <pin position="6" pad-key="pb3"/>
+            <pin position="7" pad-key="pb2"/>
+            <pin position="8" pad-key="pb1"/>
+            <pin position="9" pad-key="pb0"/>
+            <pin position="10" pad-key="pa0"/>
+            <pin position="11" pad-key="pa1"/>
+            <pin position="12" pad-key="pa2"/>
+            <pin position="13" pad-key="pa3"/>
+            <pin position="14" pad-key="gnd"/>
         </pinout>
     </pinouts>
     <variants>
-        <variant name="ATtiny404-SSFR" pinout-key="soic14" package="SOIC14"/>
-        <variant name="ATtiny404-SSNR" pinout-key="soic14" package="SOIC14"/>
+        <variant key="attiny404_ssfr" name="ATtiny404-SSFR" pinout-key="soic14"/>
+        <variant key="attiny404_ssnr" name="ATtiny404-SSNR" pinout-key="soic14"/>
     </variants>
 </device>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY406.xml b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY406.xml
index 1c607391..9d8e5a44 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY406.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY406.xml
@@ -43,28 +43,28 @@
         <peripheral key="ac0" name="AC0" module-key="i2106">
             <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"/>
-                <signal pad-id="pa5" index="0" function="AC0" group="OUT"/>
-                <signal pad-id="pa7" index="0" function="AC0" group="P"/>
-                <signal pad-id="pb5" index="1" function="AC0" group="P"/>
+                <signal pad-key="pa6" index="0" function="AC0" group="N"/>
+                <signal pad-key="pb4" index="1" function="AC0" group="N"/>
+                <signal pad-key="pa5" index="0" function="AC0" group="OUT"/>
+                <signal pad-key="pa7" index="0" function="AC0" group="P"/>
+                <signal pad-key="pb5" index="1" function="AC0" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="adc0" name="ADC0" module-key="i2132">
             <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"/>
-                <signal pad-id="pa2" index="2" function="AIN0" group="AIN"/>
-                <signal pad-id="pa3" index="3" function="AIN0" group="AIN"/>
-                <signal pad-id="pa4" index="4" function="AIN0" group="AIN"/>
-                <signal pad-id="pa5" index="5" function="AIN0" group="AIN"/>
-                <signal pad-id="pa6" index="6" function="AIN0" group="AIN"/>
-                <signal pad-id="pa7" index="7" function="AIN0" group="AIN"/>
-                <signal pad-id="pb5" index="8" function="AIN0" group="AIN"/>
-                <signal pad-id="pb4" index="9" function="AIN0" group="AIN"/>
-                <signal pad-id="pb1" index="10" function="AIN0" group="AIN"/>
-                <signal pad-id="pb0" index="11" function="AIN0" group="AIN"/>
+                <signal pad-key="pa0" index="0" function="AIN0" group="AIN"/>
+                <signal pad-key="pa1" index="1" function="AIN0" group="AIN"/>
+                <signal pad-key="pa2" index="2" function="AIN0" group="AIN"/>
+                <signal pad-key="pa3" index="3" function="AIN0" group="AIN"/>
+                <signal pad-key="pa4" index="4" function="AIN0" group="AIN"/>
+                <signal pad-key="pa5" index="5" function="AIN0" group="AIN"/>
+                <signal pad-key="pa6" index="6" function="AIN0" group="AIN"/>
+                <signal pad-key="pa7" index="7" function="AIN0" group="AIN"/>
+                <signal pad-key="pb5" index="8" function="AIN0" group="AIN"/>
+                <signal pad-key="pb4" index="9" function="AIN0" group="AIN"/>
+                <signal pad-key="pb1" index="10" function="AIN0" group="AIN"/>
+                <signal pad-key="pb0" index="11" function="AIN0" group="AIN"/>
             </signals>
         </peripheral>
         <peripheral key="bod" name="BOD" module-key="i2114">
@@ -73,29 +73,29 @@
         <peripheral key="ccl" name="CCL" module-key="i2128">
             <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"/>
-                <signal pad-id="pa2" index="2" function="CCL" group="LUT0_IN"/>
-                <signal pad-id="pb4" index="0" function="CCL_ALT" group="LUT0_OUT" field="PORTMUX.CTRLA.LUT0"/>
-                <signal pad-id="pa4" index="0" function="CCL" group="LUT0_OUT" field="PORTMUX.CTRLA.LUT0"/>
-                <signal pad-id="pc3" index="0" function="CCL" group="LUT1_IN"/>
-                <signal pad-id="pc1" index="0" function="CCL_ALT" group="LUT1_OUT" field="PORTMUX.CTRLA.LUT1"/>
-                <signal pad-id="pa7" index="0" function="CCL" group="LUT1_OUT" field="PORTMUX.CTRLA.LUT1"/>
+                <signal pad-key="pa0" index="0" function="CCL" group="LUT0_IN"/>
+                <signal pad-key="pa1" index="1" function="CCL" group="LUT0_IN"/>
+                <signal pad-key="pa2" index="2" function="CCL" group="LUT0_IN"/>
+                <signal pad-key="pb4" index="0" function="CCL_ALT" group="LUT0_OUT" field="PORTMUX.CTRLA.LUT0"/>
+                <signal pad-key="pa4" index="0" function="CCL" group="LUT0_OUT" field="PORTMUX.CTRLA.LUT0"/>
+                <signal pad-key="pc3" index="0" function="CCL" group="LUT1_IN"/>
+                <signal pad-key="pc1" index="0" function="CCL_ALT" group="LUT1_OUT" field="PORTMUX.CTRLA.LUT1"/>
+                <signal pad-key="pa7" index="0" function="CCL" group="LUT1_OUT" field="PORTMUX.CTRLA.LUT1"/>
             </signals>
         </peripheral>
         <peripheral key="clkctrl" name="CLKCTRL" module-key="i2601_clkctrl">
             <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"/>
-                <signal pad-id="pb3" function="CLKCTRL" group="TOSC1"/>
-                <signal pad-id="pb2" function="CLKCTRL" group="TOSC2"/>
+                <signal pad-key="pa3" function="CLKCTRL" group="CLKI"/>
+                <signal pad-key="pb5" function="CLKCTRL" group="CLKO"/>
+                <signal pad-key="pb3" function="CLKCTRL" group="TOSC1"/>
+                <signal pad-key="pb2" function="CLKCTRL" group="TOSC2"/>
             </signals>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="i2100">
             <register-group-instance register-group-key="cpu" address-space-key="data" offset="0x30"/>
             <signals>
-                <signal pad-id="pa1" function="OTHER" group="BREAK"/>
+                <signal pad-key="pa1" function="OTHER" group="BREAK"/>
             </signals>
         </peripheral>
         <peripheral key="cpuint" name="CPUINT" module-key="i2104">
@@ -107,45 +107,45 @@
         <peripheral key="evsys" name="EVSYS" module-key="i2601_evsys">
             <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"/>
-                <signal pad-id="pa2" index="2" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
-                <signal pad-id="pa3" index="3" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
-                <signal pad-id="pa4" index="4" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
-                <signal pad-id="pa5" index="5" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
-                <signal pad-id="pa6" index="6" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
-                <signal pad-id="pa7" index="7" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
-                <signal pad-id="pb0" index="0" function="EVAINCH1" group="EVAPB" field="EVSYS.ASYNCCH1.ASYNCCH1"/>
-                <signal pad-id="pb1" index="1" function="EVAINCH1" group="EVAPB" field="EVSYS.ASYNCCH1.ASYNCCH1"/>
-                <signal pad-id="pb2" index="2" function="EVAINCH1" group="EVAPB" field="EVSYS.ASYNCCH1.ASYNCCH1"/>
-                <signal pad-id="pb3" index="3" function="EVAINCH1" group="EVAPB" field="EVSYS.ASYNCCH1.ASYNCCH1"/>
-                <signal pad-id="pb4" index="4" function="EVAINCH1" group="EVAPB" field="EVSYS.ASYNCCH1.ASYNCCH1"/>
-                <signal pad-id="pb5" index="5" function="EVAINCH1" group="EVAPB" field="EVSYS.ASYNCCH1.ASYNCCH1"/>
-                <signal pad-id="pc0" index="0" function="EVAINCH2" group="EVAPC" field="EVSYS.ASYNCCH2.ASYNCCH2"/>
-                <signal pad-id="pc1" index="1" function="EVAINCH2" group="EVAPC" field="EVSYS.ASYNCCH2.ASYNCCH2"/>
-                <signal pad-id="pc2" index="2" function="EVAINCH2" group="EVAPC" field="EVSYS.ASYNCCH2.ASYNCCH2"/>
-                <signal pad-id="pc3" index="3" function="EVAINCH2" group="EVAPC" field="EVSYS.ASYNCCH2.ASYNCCH2"/>
-                <signal pad-id="pa2" index="0" function="EVSYS" group="EVOUT" field="PORTMUX.CTRLA.EVOUT0"/>
-                <signal pad-id="pb2" index="1" function="EVSYS" group="EVOUT" field="PORTMUX.CTRLA.EVOUT1"/>
-                <signal pad-id="pc2" index="2" function="EVSYS" group="EVOUT" field="PORTMUX.CTRLA.EVOUT2"/>
-                <signal pad-id="pa0" index="0" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
-                <signal pad-id="pa1" index="1" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
-                <signal pad-id="pa2" index="2" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
-                <signal pad-id="pa3" index="3" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
-                <signal pad-id="pa4" index="4" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
-                <signal pad-id="pa5" index="5" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
-                <signal pad-id="pa6" index="6" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
-                <signal pad-id="pa7" index="7" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
-                <signal pad-id="pb0" index="0" function="EVSINCH1" group="EVSPB" field="EVSYS.SYNCCH1.SYNCCH1"/>
-                <signal pad-id="pb1" index="1" function="EVSINCH1" group="EVSPB" field="EVSYS.SYNCCH1.SYNCCH1"/>
-                <signal pad-id="pb2" index="2" function="EVSINCH1" group="EVSPB" field="EVSYS.SYNCCH1.SYNCCH1"/>
-                <signal pad-id="pb3" index="3" function="EVSINCH1" group="EVSPB" field="EVSYS.SYNCCH1.SYNCCH1"/>
-                <signal pad-id="pb4" index="4" function="EVSINCH1" group="EVSPB" field="EVSYS.SYNCCH1.SYNCCH1"/>
-                <signal pad-id="pb5" index="5" function="EVSINCH1" group="EVSPB" field="EVSYS.SYNCCH1.SYNCCH1"/>
-                <signal pad-id="pc0" index="0" function="EVSINCH0" group="EVSPC" field="EVSYS.SYNCCH0.SYNCCH0"/>
-                <signal pad-id="pc1" index="1" function="EVSINCH0" group="EVSPC" field="EVSYS.SYNCCH0.SYNCCH0"/>
-                <signal pad-id="pc2" index="2" function="EVSINCH0" group="EVSPC" field="EVSYS.SYNCCH0.SYNCCH0"/>
-                <signal pad-id="pc3" index="3" function="EVSINCH0" group="EVSPC" field="EVSYS.SYNCCH0.SYNCCH0"/>
+                <signal pad-key="pa0" index="0" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
+                <signal pad-key="pa1" index="1" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
+                <signal pad-key="pa2" index="2" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
+                <signal pad-key="pa3" index="3" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
+                <signal pad-key="pa4" index="4" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
+                <signal pad-key="pa5" index="5" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
+                <signal pad-key="pa6" index="6" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
+                <signal pad-key="pa7" index="7" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
+                <signal pad-key="pb0" index="0" function="EVAINCH1" group="EVAPB" field="EVSYS.ASYNCCH1.ASYNCCH1"/>
+                <signal pad-key="pb1" index="1" function="EVAINCH1" group="EVAPB" field="EVSYS.ASYNCCH1.ASYNCCH1"/>
+                <signal pad-key="pb2" index="2" function="EVAINCH1" group="EVAPB" field="EVSYS.ASYNCCH1.ASYNCCH1"/>
+                <signal pad-key="pb3" index="3" function="EVAINCH1" group="EVAPB" field="EVSYS.ASYNCCH1.ASYNCCH1"/>
+                <signal pad-key="pb4" index="4" function="EVAINCH1" group="EVAPB" field="EVSYS.ASYNCCH1.ASYNCCH1"/>
+                <signal pad-key="pb5" index="5" function="EVAINCH1" group="EVAPB" field="EVSYS.ASYNCCH1.ASYNCCH1"/>
+                <signal pad-key="pc0" index="0" function="EVAINCH2" group="EVAPC" field="EVSYS.ASYNCCH2.ASYNCCH2"/>
+                <signal pad-key="pc1" index="1" function="EVAINCH2" group="EVAPC" field="EVSYS.ASYNCCH2.ASYNCCH2"/>
+                <signal pad-key="pc2" index="2" function="EVAINCH2" group="EVAPC" field="EVSYS.ASYNCCH2.ASYNCCH2"/>
+                <signal pad-key="pc3" index="3" function="EVAINCH2" group="EVAPC" field="EVSYS.ASYNCCH2.ASYNCCH2"/>
+                <signal pad-key="pa2" index="0" function="EVSYS" group="EVOUT" field="PORTMUX.CTRLA.EVOUT0"/>
+                <signal pad-key="pb2" index="1" function="EVSYS" group="EVOUT" field="PORTMUX.CTRLA.EVOUT1"/>
+                <signal pad-key="pc2" index="2" function="EVSYS" group="EVOUT" field="PORTMUX.CTRLA.EVOUT2"/>
+                <signal pad-key="pa0" index="0" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
+                <signal pad-key="pa1" index="1" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
+                <signal pad-key="pa2" index="2" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
+                <signal pad-key="pa3" index="3" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
+                <signal pad-key="pa4" index="4" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
+                <signal pad-key="pa5" index="5" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
+                <signal pad-key="pa6" index="6" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
+                <signal pad-key="pa7" index="7" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
+                <signal pad-key="pb0" index="0" function="EVSINCH1" group="EVSPB" field="EVSYS.SYNCCH1.SYNCCH1"/>
+                <signal pad-key="pb1" index="1" function="EVSINCH1" group="EVSPB" field="EVSYS.SYNCCH1.SYNCCH1"/>
+                <signal pad-key="pb2" index="2" function="EVSINCH1" group="EVSPB" field="EVSYS.SYNCCH1.SYNCCH1"/>
+                <signal pad-key="pb3" index="3" function="EVSINCH1" group="EVSPB" field="EVSYS.SYNCCH1.SYNCCH1"/>
+                <signal pad-key="pb4" index="4" function="EVSINCH1" group="EVSPB" field="EVSYS.SYNCCH1.SYNCCH1"/>
+                <signal pad-key="pb5" index="5" function="EVSINCH1" group="EVSPB" field="EVSYS.SYNCCH1.SYNCCH1"/>
+                <signal pad-key="pc0" index="0" function="EVSINCH0" group="EVSPC" field="EVSYS.SYNCCH0.SYNCCH0"/>
+                <signal pad-key="pc1" index="1" function="EVSINCH0" group="EVSPC" field="EVSYS.SYNCCH0.SYNCCH0"/>
+                <signal pad-key="pc2" index="2" function="EVSINCH0" group="EVSPC" field="EVSYS.SYNCCH0.SYNCCH0"/>
+                <signal pad-key="pc3" index="3" function="EVSINCH0" group="EVSPC" field="EVSYS.SYNCCH0.SYNCCH0"/>
             </signals>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="i2601_fuse">
@@ -163,34 +163,34 @@
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pa2" index="2" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa3" index="3" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa4" index="4" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa5" index="5" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa6" index="6" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa7" index="7" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa0" index="0" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa1" index="1" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa2" index="2" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa3" index="3" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa4" index="4" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa5" index="5" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa6" index="6" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa7" index="7" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pb2" index="2" function="IOPORT" group="PIN"/>
-                <signal pad-id="pb3" index="3" function="IOPORT" group="PIN"/>
-                <signal pad-id="pb4" index="4" function="IOPORT" group="PIN"/>
-                <signal pad-id="pb5" index="5" function="IOPORT" group="PIN"/>
+                <signal pad-key="pb0" index="0" function="IOPORT" group="PIN"/>
+                <signal pad-key="pb1" index="1" function="IOPORT" group="PIN"/>
+                <signal pad-key="pb2" index="2" function="IOPORT" group="PIN"/>
+                <signal pad-key="pb3" index="3" function="IOPORT" group="PIN"/>
+                <signal pad-key="pb4" index="4" function="IOPORT" group="PIN"/>
+                <signal pad-key="pb5" index="5" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pc2" index="2" function="IOPORT" group="PIN"/>
-                <signal pad-id="pc3" index="3" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc0" index="0" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc1" index="1" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc2" index="2" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc3" index="3" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="portmux" name="PORTMUX" module-key="i2601_portmux">
@@ -199,7 +199,7 @@
         <peripheral key="rstctrl" name="RSTCTRL" module-key="i2111">
             <register-group-instance register-group-key="rstctrl" address-space-key="data" offset="0x40"/>
             <signals>
-                <signal pad-id="pa0" function="OTHER" group="RESET"/>
+                <signal pad-key="pa0" function="OTHER" group="RESET"/>
             </signals>
         </peripheral>
         <peripheral key="rtc" name="RTC" module-key="i2116">
@@ -214,62 +214,62 @@
         <peripheral key="spi0" name="SPI0" module-key="i2107">
             <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"/>
-                <signal pad-id="pc2" function="SPI0_ALT" group="MOSI" field="PORTMUX.CTRLB.SPI0"/>
-                <signal pad-id="pa1" function="SPI0" group="MOSI" field="PORTMUX.CTRLB.SPI0"/>
-                <signal pad-id="pc0" function="SPI0_ALT" group="SCK" field="PORTMUX.CTRLB.SPI0"/>
-                <signal pad-id="pa3" function="SPI0" group="SCK" field="PORTMUX.CTRLB.SPI0"/>
-                <signal pad-id="pc3" function="SPI0_ALT" group="SS" field="PORTMUX.CTRLB.SPI0"/>
-                <signal pad-id="pa4" function="SPI0" group="SS" field="PORTMUX.CTRLB.SPI0"/>
+                <signal pad-key="pc1" function="SPI0_ALT" group="MISO" field="PORTMUX.CTRLB.SPI0"/>
+                <signal pad-key="pa2" function="SPI0" group="MISO" field="PORTMUX.CTRLB.SPI0"/>
+                <signal pad-key="pc2" function="SPI0_ALT" group="MOSI" field="PORTMUX.CTRLB.SPI0"/>
+                <signal pad-key="pa1" function="SPI0" group="MOSI" field="PORTMUX.CTRLB.SPI0"/>
+                <signal pad-key="pc0" function="SPI0_ALT" group="SCK" field="PORTMUX.CTRLB.SPI0"/>
+                <signal pad-key="pa3" function="SPI0" group="SCK" field="PORTMUX.CTRLB.SPI0"/>
+                <signal pad-key="pc3" function="SPI0_ALT" group="SS" field="PORTMUX.CTRLB.SPI0"/>
+                <signal pad-key="pa4" function="SPI0" group="SS" field="PORTMUX.CTRLB.SPI0"/>
             </signals>
         </peripheral>
         <peripheral key="syscfg" name="SYSCFG" module-key="i2601_syscfg">
             <register-group-instance register-group-key="syscfg" address-space-key="data" offset="0xF00"/>
             <signals>
-                <signal pad-id="pa0" function="OTHER" group="UPDI"/>
+                <signal pad-key="pa0" function="OTHER" group="UPDI"/>
             </signals>
         </peripheral>
         <peripheral key="tca0" name="TCA0" module-key="i2117">
             <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"/>
-                <signal pad-id="pb4" index="1" function="TCA0_ALT" group="WO" field="PORTMUX.CTRLC.TCA01"/>
-                <signal pad-id="pb1" index="1" function="TCA0" group="WO" field="PORTMUX.CTRLC.TCA01"/>
-                <signal pad-id="pb5" index="2" function="TCA0_ALT" group="WO" field="PORTMUX.CTRLC.TCA02"/>
-                <signal pad-id="pb2" index="2" function="TCA0" group="WO" field="PORTMUX.CTRLC.TCA02"/>
-                <signal pad-id="pc3" index="3" function="TCA0_ALT" group="WO" field="PORTMUX.CTRLC.TCA03"/>
-                <signal pad-id="pa3" index="3" function="TCA0" group="WO" field="PORTMUX.CTRLC.TCA03"/>
-                <signal pad-id="pa4" index="4" function="TCA0" group="WO" field="PORTMUX.CTRLC.TCA04"/>
-                <signal pad-id="pa5" index="5" function="TCA0" group="WO" field="PORTMUX.CTRLC.TCA05"/>
+                <signal pad-key="pb3" index="0" function="TCA0_ALT" group="WO" field="PORTMUX.CTRLC.TCA00"/>
+                <signal pad-key="pb0" index="0" function="TCA0" group="WO" field="PORTMUX.CTRLC.TCA00"/>
+                <signal pad-key="pb4" index="1" function="TCA0_ALT" group="WO" field="PORTMUX.CTRLC.TCA01"/>
+                <signal pad-key="pb1" index="1" function="TCA0" group="WO" field="PORTMUX.CTRLC.TCA01"/>
+                <signal pad-key="pb5" index="2" function="TCA0_ALT" group="WO" field="PORTMUX.CTRLC.TCA02"/>
+                <signal pad-key="pb2" index="2" function="TCA0" group="WO" field="PORTMUX.CTRLC.TCA02"/>
+                <signal pad-key="pc3" index="3" function="TCA0_ALT" group="WO" field="PORTMUX.CTRLC.TCA03"/>
+                <signal pad-key="pa3" index="3" function="TCA0" group="WO" field="PORTMUX.CTRLC.TCA03"/>
+                <signal pad-key="pa4" index="4" function="TCA0" group="WO" field="PORTMUX.CTRLC.TCA04"/>
+                <signal pad-key="pa5" index="5" function="TCA0" group="WO" field="PORTMUX.CTRLC.TCA05"/>
             </signals>
         </peripheral>
         <peripheral key="tcb0" name="TCB0" module-key="i2119">
             <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"/>
+                <signal pad-key="pc0" index="0" function="TCB0_ALT" group="WO" field="PORTMUX.CTRLD.TCB0"/>
+                <signal pad-key="pa5" index="0" function="TCB0" group="WO" field="PORTMUX.CTRLD.TCB0"/>
             </signals>
         </peripheral>
         <peripheral key="twi0" name="TWI0" module-key="i2110">
             <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"/>
+                <signal pad-key="pb0" function="TWI0" group="SCL" field="PORTMUX.CTRLB.TWI0"/>
+                <signal pad-key="pb1" function="TWI0" group="SDA" field="PORTMUX.CTRLB.TWI0"/>
             </signals>
         </peripheral>
         <peripheral key="usart0" name="USART0" module-key="i2108">
             <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"/>
-                <signal pad-id="pa1" function="USART0_ALT" group="TXD" field="PORTMUX.CTRLB.USART0"/>
-                <signal pad-id="pb2" function="USART0" group="TXD" field="PORTMUX.CTRLB.USART0"/>
-                <signal pad-id="pa3" function="USART0_ALT" group="XCK" field="PORTMUX.CTRLB.USART0"/>
-                <signal pad-id="pb1" function="USART0" group="XCK" field="PORTMUX.CTRLB.USART0"/>
-                <signal pad-id="pa4" function="USART0_ALT" group="XDIR" field="PORTMUX.CTRLB.USART0"/>
-                <signal pad-id="pb0" function="USART0" group="XDIR" field="PORTMUX.CTRLB.USART0"/>
+                <signal pad-key="pa2" function="USART0_ALT" group="RXD" field="PORTMUX.CTRLB.USART0"/>
+                <signal pad-key="pb3" function="USART0" group="RXD" field="PORTMUX.CTRLB.USART0"/>
+                <signal pad-key="pa1" function="USART0_ALT" group="TXD" field="PORTMUX.CTRLB.USART0"/>
+                <signal pad-key="pb2" function="USART0" group="TXD" field="PORTMUX.CTRLB.USART0"/>
+                <signal pad-key="pa3" function="USART0_ALT" group="XCK" field="PORTMUX.CTRLB.USART0"/>
+                <signal pad-key="pb1" function="USART0" group="XCK" field="PORTMUX.CTRLB.USART0"/>
+                <signal pad-key="pa4" function="USART0_ALT" group="XDIR" field="PORTMUX.CTRLB.USART0"/>
+                <signal pad-key="pb0" function="USART0" group="XDIR" field="PORTMUX.CTRLB.USART0"/>
             </signals>
         </peripheral>
         <peripheral key="userrow" name="USERROW" module-key="i2601_userrow">
@@ -1209,56 +1209,78 @@
             </register-group>
         </module>
     </modules>
+    <pads>
+        <pad key="pa2" name="PA2"/>
+        <pad key="pa3" name="PA3"/>
+        <pad key="gnd" name="GND"/>
+        <pad key="vdd" name="VDD"/>
+        <pad key="pa4" name="PA4"/>
+        <pad key="pa5" name="PA5"/>
+        <pad key="pa6" name="PA6"/>
+        <pad key="pa7" name="PA7"/>
+        <pad key="pb5" name="PB5"/>
+        <pad key="pb4" name="PB4"/>
+        <pad key="pb3" name="PB3"/>
+        <pad key="pb2" name="PB2"/>
+        <pad key="pb1" name="PB1"/>
+        <pad key="pb0" name="PB0"/>
+        <pad key="pc0" name="PC0"/>
+        <pad key="pc1" name="PC1"/>
+        <pad key="pc2" name="PC2"/>
+        <pad key="pc3" name="PC3"/>
+        <pad key="pa0" name="PA0"/>
+        <pad key="pa1" name="PA1"/>
+    </pads>
     <pinouts>
         <pinout key="qfn20" name="QFN20" type="qfn">
-            <pin position="1" pad="PA2"/>
-            <pin position="2" pad="PA3"/>
-            <pin position="3" pad="GND"/>
-            <pin position="4" pad="VDD"/>
-            <pin position="5" pad="PA4"/>
-            <pin position="6" pad="PA5"/>
-            <pin position="7" pad="PA6"/>
-            <pin position="8" pad="PA7"/>
-            <pin position="9" pad="PB5"/>
-            <pin position="10" pad="PB4"/>
-            <pin position="11" pad="PB3"/>
-            <pin position="12" pad="PB2"/>
-            <pin position="13" pad="PB1"/>
-            <pin position="14" pad="PB0"/>
-            <pin position="15" pad="PC0"/>
-            <pin position="16" pad="PC1"/>
-            <pin position="17" pad="PC2"/>
-            <pin position="18" pad="PC3"/>
-            <pin position="19" pad="PA0"/>
-            <pin position="20" pad="PA1"/>
+            <pin position="1" pad-key="pa2"/>
+            <pin position="2" pad-key="pa3"/>
+            <pin position="3" pad-key="gnd"/>
+            <pin position="4" pad-key="vdd"/>
+            <pin position="5" pad-key="pa4"/>
+            <pin position="6" pad-key="pa5"/>
+            <pin position="7" pad-key="pa6"/>
+            <pin position="8" pad-key="pa7"/>
+            <pin position="9" pad-key="pb5"/>
+            <pin position="10" pad-key="pb4"/>
+            <pin position="11" pad-key="pb3"/>
+            <pin position="12" pad-key="pb2"/>
+            <pin position="13" pad-key="pb1"/>
+            <pin position="14" pad-key="pb0"/>
+            <pin position="15" pad-key="pc0"/>
+            <pin position="16" pad-key="pc1"/>
+            <pin position="17" pad-key="pc2"/>
+            <pin position="18" pad-key="pc3"/>
+            <pin position="19" pad-key="pa0"/>
+            <pin position="20" pad-key="pa1"/>
         </pinout>
         <pinout key="soic20" name="SOIC20" type="soic">
-            <pin position="1" pad="VDD"/>
-            <pin position="2" pad="PA4"/>
-            <pin position="3" pad="PA5"/>
-            <pin position="4" pad="PA6"/>
-            <pin position="5" pad="PA7"/>
-            <pin position="6" pad="PB5"/>
-            <pin position="7" pad="PB4"/>
-            <pin position="8" pad="PB3"/>
-            <pin position="9" pad="PB2"/>
-            <pin position="10" pad="PB1"/>
-            <pin position="11" pad="PB0"/>
-            <pin position="12" pad="PC0"/>
-            <pin position="13" pad="PC1"/>
-            <pin position="14" pad="PC2"/>
-            <pin position="15" pad="PC3"/>
-            <pin position="16" pad="PA0"/>
-            <pin position="17" pad="PA1"/>
-            <pin position="18" pad="PA2"/>
-            <pin position="19" pad="PA3"/>
-            <pin position="20" pad="GND"/>
+            <pin position="1" pad-key="vdd"/>
+            <pin position="2" pad-key="pa4"/>
+            <pin position="3" pad-key="pa5"/>
+            <pin position="4" pad-key="pa6"/>
+            <pin position="5" pad-key="pa7"/>
+            <pin position="6" pad-key="pb5"/>
+            <pin position="7" pad-key="pb4"/>
+            <pin position="8" pad-key="pb3"/>
+            <pin position="9" pad-key="pb2"/>
+            <pin position="10" pad-key="pb1"/>
+            <pin position="11" pad-key="pb0"/>
+            <pin position="12" pad-key="pc0"/>
+            <pin position="13" pad-key="pc1"/>
+            <pin position="14" pad-key="pc2"/>
+            <pin position="15" pad-key="pc3"/>
+            <pin position="16" pad-key="pa0"/>
+            <pin position="17" pad-key="pa1"/>
+            <pin position="18" pad-key="pa2"/>
+            <pin position="19" pad-key="pa3"/>
+            <pin position="20" pad-key="gnd"/>
         </pinout>
     </pinouts>
     <variants>
-        <variant name="ATtiny406-MFR" pinout-key="qfn20" package="VQFN20"/>
-        <variant name="ATtiny406-MNR" pinout-key="qfn20" package="VQFN20"/>
-        <variant name="ATtiny406-SFR" pinout-key="soic20" package="SOIC20"/>
-        <variant name="ATtiny406-SNR" pinout-key="soic20" package="SOIC20"/>
+        <variant key="attiny406_mfr" name="ATtiny406-MFR" pinout-key="qfn20"/>
+        <variant key="attiny406_mnr" name="ATtiny406-MNR" pinout-key="qfn20"/>
+        <variant key="attiny406_sfr" name="ATtiny406-SFR" pinout-key="soic20"/>
+        <variant key="attiny406_snr" name="ATtiny406-SNR" pinout-key="soic20"/>
     </variants>
 </device>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY412.xml b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY412.xml
index f56d68db..18dd58e1 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY412.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY412.xml
@@ -43,20 +43,20 @@
         <peripheral key="ac0" name="AC0" module-key="i2106">
             <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"/>
-                <signal pad-id="pa7" index="0" function="AC0" group="P"/>
+                <signal pad-key="pa6" index="0" function="AC0" group="N"/>
+                <signal pad-key="pa3" function="AC0" group="OUT"/>
+                <signal pad-key="pa7" index="0" function="AC0" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="adc0" name="ADC0" module-key="i2132">
             <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"/>
-                <signal pad-id="pa2" index="2" function="AIN0" group="AIN"/>
-                <signal pad-id="pa3" index="3" function="AIN0" group="AIN"/>
-                <signal pad-id="pa6" index="6" function="AIN0" group="AIN"/>
-                <signal pad-id="pa7" index="7" function="AIN0" group="AIN"/>
+                <signal pad-key="pa0" index="0" function="AIN0" group="AIN"/>
+                <signal pad-key="pa1" index="1" function="AIN0" group="AIN"/>
+                <signal pad-key="pa2" index="2" function="AIN0" group="AIN"/>
+                <signal pad-key="pa3" index="3" function="AIN0" group="AIN"/>
+                <signal pad-key="pa6" index="6" function="AIN0" group="AIN"/>
+                <signal pad-key="pa7" index="7" function="AIN0" group="AIN"/>
             </signals>
         </peripheral>
         <peripheral key="bod" name="BOD" module-key="i2114">
@@ -65,22 +65,22 @@
         <peripheral key="ccl" name="CCL" module-key="i2128">
             <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"/>
-                <signal pad-id="pa2" index="2" function="CCL" group="LUT0_IN"/>
-                <signal pad-id="pa6" index="0" function="CCL" group="LUT1_OUT"/>
+                <signal pad-key="pa0" index="0" function="CCL" group="LUT0_IN"/>
+                <signal pad-key="pa1" index="1" function="CCL" group="LUT0_IN"/>
+                <signal pad-key="pa2" index="2" function="CCL" group="LUT0_IN"/>
+                <signal pad-key="pa6" index="0" function="CCL" group="LUT1_OUT"/>
             </signals>
         </peripheral>
         <peripheral key="clkctrl" name="CLKCTRL" module-key="i2601_clkctrl">
             <register-group-instance register-group-key="clkctrl" address-space-key="data" offset="0x60"/>
             <signals>
-                <signal pad-id="pa3" function="CLKCTRL" group="CLKI"/>
+                <signal pad-key="pa3" function="CLKCTRL" group="CLKI"/>
             </signals>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="i2100">
             <register-group-instance register-group-key="cpu" address-space-key="data" offset="0x30"/>
             <signals>
-                <signal pad-id="pa1" function="OTHER" group="BREAK"/>
+                <signal pad-key="pa1" function="OTHER" group="BREAK"/>
             </signals>
         </peripheral>
         <peripheral key="cpuint" name="CPUINT" module-key="i2104">
@@ -92,25 +92,25 @@
         <peripheral key="dac0" name="DAC0" module-key="i2121">
             <register-group-instance register-group-key="dac" address-space-key="data" offset="0x680"/>
             <signals>
-                <signal pad-id="pa6" index="0" function="DAC0" group="OUT"/>
+                <signal pad-key="pa6" index="0" function="DAC0" group="OUT"/>
             </signals>
         </peripheral>
         <peripheral key="evsys" name="EVSYS" module-key="i2601_evsys">
             <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"/>
-                <signal pad-id="pa2" index="2" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
-                <signal pad-id="pa3" index="3" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
-                <signal pad-id="pa6" index="6" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
-                <signal pad-id="pa7" index="7" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
-                <signal pad-id="pa2" index="0" function="EVSYS" group="EVOUT" field="PORTMUX.CTRLA.EVOUT0"/>
-                <signal pad-id="pa0" index="0" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
-                <signal pad-id="pa1" index="1" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
-                <signal pad-id="pa2" index="2" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
-                <signal pad-id="pa3" index="3" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
-                <signal pad-id="pa6" index="6" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
-                <signal pad-id="pa7" index="7" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
+                <signal pad-key="pa0" index="0" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
+                <signal pad-key="pa1" index="1" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
+                <signal pad-key="pa2" index="2" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
+                <signal pad-key="pa3" index="3" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
+                <signal pad-key="pa6" index="6" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
+                <signal pad-key="pa7" index="7" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
+                <signal pad-key="pa2" index="0" function="EVSYS" group="EVOUT" field="PORTMUX.CTRLA.EVOUT0"/>
+                <signal pad-key="pa0" index="0" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
+                <signal pad-key="pa1" index="1" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
+                <signal pad-key="pa2" index="2" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
+                <signal pad-key="pa3" index="3" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
+                <signal pad-key="pa6" index="6" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
+                <signal pad-key="pa7" index="7" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
             </signals>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="i2601_fuse">
@@ -128,12 +128,12 @@
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pa2" index="2" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa3" index="3" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa6" index="6" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa7" index="7" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa0" index="0" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa1" index="1" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa2" index="2" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa3" index="3" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa6" index="6" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa7" index="7" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="portmux" name="PORTMUX" module-key="i2601_portmux">
@@ -142,7 +142,7 @@
         <peripheral key="rstctrl" name="RSTCTRL" module-key="i2111">
             <register-group-instance register-group-key="rstctrl" address-space-key="data" offset="0x40"/>
             <signals>
-                <signal pad-id="pa0" function="OTHER" group="RESET"/>
+                <signal pad-key="pa0" function="OTHER" group="RESET"/>
             </signals>
         </peripheral>
         <peripheral key="rtc" name="RTC" module-key="i2116">
@@ -157,59 +157,59 @@
         <peripheral key="spi0" name="SPI0" module-key="i2107">
             <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"/>
-                <signal pad-id="pa6" function="SPI0_ALT" group="MOSI" field="PORTMUX.CTRLB.SPI0"/>
-                <signal pad-id="pa1" function="SPI0" group="MOSI" field="PORTMUX.CTRLB.SPI0"/>
-                <signal pad-id="pa3" function="SPI0" group="SCK"/>
-                <signal pad-id="pa0" function="SPI0" group="SS"/>
+                <signal pad-key="pa7" function="SPI0_ALT" group="MISO" field="PORTMUX.CTRLB.SPI0"/>
+                <signal pad-key="pa2" function="SPI0" group="MISO" field="PORTMUX.CTRLB.SPI0"/>
+                <signal pad-key="pa6" function="SPI0_ALT" group="MOSI" field="PORTMUX.CTRLB.SPI0"/>
+                <signal pad-key="pa1" function="SPI0" group="MOSI" field="PORTMUX.CTRLB.SPI0"/>
+                <signal pad-key="pa3" function="SPI0" group="SCK"/>
+                <signal pad-key="pa0" function="SPI0" group="SS"/>
             </signals>
         </peripheral>
         <peripheral key="syscfg" name="SYSCFG" module-key="i2601_syscfg">
             <register-group-instance register-group-key="syscfg" address-space-key="data" offset="0xF00"/>
             <signals>
-                <signal pad-id="pa0" function="OTHER" group="UPDI"/>
+                <signal pad-key="pa0" function="OTHER" group="UPDI"/>
             </signals>
         </peripheral>
         <peripheral key="tca0" name="TCA0" module-key="i2117">
             <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"/>
-                <signal pad-id="pa1" index="1" function="TCA0" group="WO"/>
-                <signal pad-id="pa2" index="2" function="TCA0" group="WO"/>
-                <signal pad-id="pa3" index="3" function="TCA0" group="WO"/>
+                <signal pad-key="pa7" index="0" function="TCA0_ALT" group="WO" field="PORTMUX.CTRLC.TCA00"/>
+                <signal pad-key="pa3" index="0" function="TCA0" group="WO" field="PORTMUX.CTRLC.TCA00"/>
+                <signal pad-key="pa1" index="1" function="TCA0" group="WO"/>
+                <signal pad-key="pa2" index="2" function="TCA0" group="WO"/>
+                <signal pad-key="pa3" index="3" function="TCA0" group="WO"/>
             </signals>
         </peripheral>
         <peripheral key="tcb0" name="TCB0" module-key="i2119">
             <register-group-instance register-group-key="tcb" address-space-key="data" offset="0xA40"/>
             <signals>
-                <signal pad-id="pa6" function="TCB0" group="WO"/>
+                <signal pad-key="pa6" function="TCB0" group="WO"/>
             </signals>
         </peripheral>
         <peripheral key="tcd0" name="TCD0" module-key="i2129">
             <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"/>
+                <signal pad-key="pa6" function="TCD0" group="WOA"/>
+                <signal pad-key="pa7" function="TCD0" group="WOB"/>
             </signals>
         </peripheral>
         <peripheral key="twi0" name="TWI0" module-key="i2110">
             <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"/>
+                <signal pad-key="pa2" function="TWI0" group="SCL"/>
+                <signal pad-key="pa1" function="TWI0" group="SDA"/>
             </signals>
         </peripheral>
         <peripheral key="usart0" name="USART0" module-key="i2108">
             <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"/>
-                <signal pad-id="pa1" function="USART0_ALT" group="TXD" field="PORTMUX.CTRLB.USART0"/>
-                <signal pad-id="pa6" function="USART0" group="TXD" field="PORTMUX.CTRLB.USART0"/>
-                <signal pad-id="pa3" function="USART0" group="XCK"/>
-                <signal pad-id="pa0" function="USART0" group="XDIR"/>
+                <signal pad-key="pa2" function="USART0_ALT" group="RXD" field="PORTMUX.CTRLB.USART0"/>
+                <signal pad-key="pa7" function="USART0" group="RXD" field="PORTMUX.CTRLB.USART0"/>
+                <signal pad-key="pa1" function="USART0_ALT" group="TXD" field="PORTMUX.CTRLB.USART0"/>
+                <signal pad-key="pa6" function="USART0" group="TXD" field="PORTMUX.CTRLB.USART0"/>
+                <signal pad-key="pa3" function="USART0" group="XCK"/>
+                <signal pad-key="pa0" function="USART0" group="XDIR"/>
             </signals>
         </peripheral>
         <peripheral key="userrow" name="USERROW" module-key="i2601_userrow">
@@ -1273,20 +1273,30 @@
             </register-group>
         </module>
     </modules>
+    <pads>
+        <pad key="vdd" name="VDD"/>
+        <pad key="pa6" name="PA6"/>
+        <pad key="pa7" name="PA7"/>
+        <pad key="pa1" name="PA1"/>
+        <pad key="pa2" name="PA2"/>
+        <pad key="pa0" name="PA0"/>
+        <pad key="pa3" name="PA3"/>
+        <pad key="gnd" name="GND"/>
+    </pads>
     <pinouts>
         <pinout key="soic8" name="SOIC8" type="soic">
-            <pin position="1" pad="VDD"/>
-            <pin position="2" pad="PA6"/>
-            <pin position="3" pad="PA7"/>
-            <pin position="4" pad="PA1"/>
-            <pin position="5" pad="PA2"/>
-            <pin position="6" pad="PA0"/>
-            <pin position="7" pad="PA3"/>
-            <pin position="8" pad="GND"/>
+            <pin position="1" pad-key="vdd"/>
+            <pin position="2" pad-key="pa6"/>
+            <pin position="3" pad-key="pa7"/>
+            <pin position="4" pad-key="pa1"/>
+            <pin position="5" pad-key="pa2"/>
+            <pin position="6" pad-key="pa0"/>
+            <pin position="7" pad-key="pa3"/>
+            <pin position="8" pad-key="gnd"/>
         </pinout>
     </pinouts>
     <variants>
-        <variant name="ATtiny412-SSFR" pinout-key="soic8" package="SOIC8"/>
-        <variant name="ATtiny412-SSNR" pinout-key="soic8" package="SOIC8"/>
+        <variant key="attiny412_ssfr" name="ATtiny412-SSFR" pinout-key="soic8"/>
+        <variant key="attiny412_ssnr" name="ATtiny412-SSNR" pinout-key="soic8"/>
     </variants>
 </device>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY414.xml b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY414.xml
index 41b1d477..1124199f 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY414.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY414.xml
@@ -43,24 +43,24 @@
         <peripheral key="ac0" name="AC0" module-key="i2106">
             <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"/>
-                <signal pad-id="pa7" index="0" function="AC0" group="P"/>
+                <signal pad-key="pa6" index="0" function="AC0" group="N"/>
+                <signal pad-key="pa5" index="0" function="AC0" group="OUT"/>
+                <signal pad-key="pa7" index="0" function="AC0" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="adc0" name="ADC0" module-key="i2132">
             <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"/>
-                <signal pad-id="pa2" index="2" function="AIN0" group="AIN"/>
-                <signal pad-id="pa3" index="3" function="AIN0" group="AIN"/>
-                <signal pad-id="pa4" index="4" function="AIN0" group="AIN"/>
-                <signal pad-id="pa5" index="5" function="AIN0" group="AIN"/>
-                <signal pad-id="pa6" index="6" function="AIN0" group="AIN"/>
-                <signal pad-id="pa7" index="7" function="AIN0" group="AIN"/>
-                <signal pad-id="pb1" index="10" function="AIN0" group="AIN"/>
-                <signal pad-id="pb0" index="11" function="AIN0" group="AIN"/>
+                <signal pad-key="pa0" index="0" function="AIN0" group="AIN"/>
+                <signal pad-key="pa1" index="1" function="AIN0" group="AIN"/>
+                <signal pad-key="pa2" index="2" function="AIN0" group="AIN"/>
+                <signal pad-key="pa3" index="3" function="AIN0" group="AIN"/>
+                <signal pad-key="pa4" index="4" function="AIN0" group="AIN"/>
+                <signal pad-key="pa5" index="5" function="AIN0" group="AIN"/>
+                <signal pad-key="pa6" index="6" function="AIN0" group="AIN"/>
+                <signal pad-key="pa7" index="7" function="AIN0" group="AIN"/>
+                <signal pad-key="pb1" index="10" function="AIN0" group="AIN"/>
+                <signal pad-key="pb0" index="11" function="AIN0" group="AIN"/>
             </signals>
         </peripheral>
         <peripheral key="bod" name="BOD" module-key="i2114">
@@ -69,25 +69,25 @@
         <peripheral key="ccl" name="CCL" module-key="i2128">
             <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"/>
-                <signal pad-id="pa2" index="2" function="CCL" group="LUT0_IN"/>
-                <signal pad-id="pa4" index="0" function="CCL" group="LUT0_OUT" field="PORTMUX.CTRLA.LUT0"/>
-                <signal pad-id="pa7" index="0" function="CCL" group="LUT1_OUT" field="PORTMUX.CTRLA.LUT1"/>
+                <signal pad-key="pa0" index="0" function="CCL" group="LUT0_IN"/>
+                <signal pad-key="pa1" index="1" function="CCL" group="LUT0_IN"/>
+                <signal pad-key="pa2" index="2" function="CCL" group="LUT0_IN"/>
+                <signal pad-key="pa4" index="0" function="CCL" group="LUT0_OUT" field="PORTMUX.CTRLA.LUT0"/>
+                <signal pad-key="pa7" index="0" function="CCL" group="LUT1_OUT" field="PORTMUX.CTRLA.LUT1"/>
             </signals>
         </peripheral>
         <peripheral key="clkctrl" name="CLKCTRL" module-key="i2601_clkctrl">
             <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"/>
-                <signal pad-id="pb2" function="CLKCTRL" group="TOSC2"/>
+                <signal pad-key="pa3" function="CLKCTRL" group="CLKI"/>
+                <signal pad-key="pb3" function="CLKCTRL" group="TOSC1"/>
+                <signal pad-key="pb2" function="CLKCTRL" group="TOSC2"/>
             </signals>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="i2100">
             <register-group-instance register-group-key="cpu" address-space-key="data" offset="0x30"/>
             <signals>
-                <signal pad-id="pa1" function="OTHER" group="BREAK"/>
+                <signal pad-key="pa1" function="OTHER" group="BREAK"/>
             </signals>
         </peripheral>
         <peripheral key="cpuint" name="CPUINT" module-key="i2104">
@@ -99,38 +99,38 @@
         <peripheral key="dac0" name="DAC0" module-key="i2121">
             <register-group-instance register-group-key="dac" address-space-key="data" offset="0x680"/>
             <signals>
-                <signal pad-id="pa6" index="0" function="DAC0" group="OUT"/>
+                <signal pad-key="pa6" index="0" function="DAC0" group="OUT"/>
             </signals>
         </peripheral>
         <peripheral key="evsys" name="EVSYS" module-key="i2601_evsys">
             <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"/>
-                <signal pad-id="pa2" index="2" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
-                <signal pad-id="pa3" index="3" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
-                <signal pad-id="pa4" index="4" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
-                <signal pad-id="pa5" index="5" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
-                <signal pad-id="pa6" index="6" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
-                <signal pad-id="pa7" index="7" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
-                <signal pad-id="pb0" index="0" function="EVAINCH1" group="EVAPB" field="EVSYS.ASYNCCH1.ASYNCCH1"/>
-                <signal pad-id="pb1" index="1" function="EVAINCH1" group="EVAPB" field="EVSYS.ASYNCCH1.ASYNCCH1"/>
-                <signal pad-id="pb2" index="2" function="EVAINCH1" group="EVAPB" field="EVSYS.ASYNCCH1.ASYNCCH1"/>
-                <signal pad-id="pb3" index="3" function="EVAINCH1" group="EVAPB" field="EVSYS.ASYNCCH1.ASYNCCH1"/>
-                <signal pad-id="pa2" index="0" function="EVSYS" group="EVOUT" field="PORTMUX.CTRLA.EVOUT0"/>
-                <signal pad-id="pb2" index="1" function="EVSYS" group="EVOUT" field="PORTMUX.CTRLA.EVOUT1"/>
-                <signal pad-id="pa0" index="0" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
-                <signal pad-id="pa1" index="1" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
-                <signal pad-id="pa2" index="2" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
-                <signal pad-id="pa3" index="3" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
-                <signal pad-id="pa4" index="4" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
-                <signal pad-id="pa5" index="5" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
-                <signal pad-id="pa6" index="6" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
-                <signal pad-id="pa7" index="7" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
-                <signal pad-id="pb0" index="0" function="EVSINCH1" group="EVSPB" field="EVSYS.SYNCCH1.SYNCCH1"/>
-                <signal pad-id="pb1" index="1" function="EVSINCH1" group="EVSPB" field="EVSYS.SYNCCH1.SYNCCH1"/>
-                <signal pad-id="pb2" index="2" function="EVSINCH1" group="EVSPB" field="EVSYS.SYNCCH1.SYNCCH1"/>
-                <signal pad-id="pb3" index="3" function="EVSINCH1" group="EVSPB" field="EVSYS.SYNCCH1.SYNCCH1"/>
+                <signal pad-key="pa0" index="0" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
+                <signal pad-key="pa1" index="1" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
+                <signal pad-key="pa2" index="2" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
+                <signal pad-key="pa3" index="3" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
+                <signal pad-key="pa4" index="4" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
+                <signal pad-key="pa5" index="5" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
+                <signal pad-key="pa6" index="6" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
+                <signal pad-key="pa7" index="7" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
+                <signal pad-key="pb0" index="0" function="EVAINCH1" group="EVAPB" field="EVSYS.ASYNCCH1.ASYNCCH1"/>
+                <signal pad-key="pb1" index="1" function="EVAINCH1" group="EVAPB" field="EVSYS.ASYNCCH1.ASYNCCH1"/>
+                <signal pad-key="pb2" index="2" function="EVAINCH1" group="EVAPB" field="EVSYS.ASYNCCH1.ASYNCCH1"/>
+                <signal pad-key="pb3" index="3" function="EVAINCH1" group="EVAPB" field="EVSYS.ASYNCCH1.ASYNCCH1"/>
+                <signal pad-key="pa2" index="0" function="EVSYS" group="EVOUT" field="PORTMUX.CTRLA.EVOUT0"/>
+                <signal pad-key="pb2" index="1" function="EVSYS" group="EVOUT" field="PORTMUX.CTRLA.EVOUT1"/>
+                <signal pad-key="pa0" index="0" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
+                <signal pad-key="pa1" index="1" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
+                <signal pad-key="pa2" index="2" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
+                <signal pad-key="pa3" index="3" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
+                <signal pad-key="pa4" index="4" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
+                <signal pad-key="pa5" index="5" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
+                <signal pad-key="pa6" index="6" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
+                <signal pad-key="pa7" index="7" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
+                <signal pad-key="pb0" index="0" function="EVSINCH1" group="EVSPB" field="EVSYS.SYNCCH1.SYNCCH1"/>
+                <signal pad-key="pb1" index="1" function="EVSINCH1" group="EVSPB" field="EVSYS.SYNCCH1.SYNCCH1"/>
+                <signal pad-key="pb2" index="2" function="EVSINCH1" group="EVSPB" field="EVSYS.SYNCCH1.SYNCCH1"/>
+                <signal pad-key="pb3" index="3" function="EVSINCH1" group="EVSPB" field="EVSYS.SYNCCH1.SYNCCH1"/>
             </signals>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="i2601_fuse">
@@ -148,23 +148,23 @@
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pa2" index="2" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa3" index="3" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa4" index="4" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa5" index="5" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa6" index="6" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa7" index="7" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa0" index="0" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa1" index="1" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa2" index="2" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa3" index="3" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa4" index="4" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa5" index="5" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa6" index="6" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa7" index="7" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pb2" index="2" function="IOPORT" group="PIN"/>
-                <signal pad-id="pb3" index="3" function="IOPORT" group="PIN"/>
+                <signal pad-key="pb0" index="0" function="IOPORT" group="PIN"/>
+                <signal pad-key="pb1" index="1" function="IOPORT" group="PIN"/>
+                <signal pad-key="pb2" index="2" function="IOPORT" group="PIN"/>
+                <signal pad-key="pb3" index="3" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="portmux" name="PORTMUX" module-key="i2601_portmux">
@@ -173,7 +173,7 @@
         <peripheral key="rstctrl" name="RSTCTRL" module-key="i2111">
             <register-group-instance register-group-key="rstctrl" address-space-key="data" offset="0x40"/>
             <signals>
-                <signal pad-id="pa0" function="OTHER" group="RESET"/>
+                <signal pad-key="pa0" function="OTHER" group="RESET"/>
             </signals>
         </peripheral>
         <peripheral key="rtc" name="RTC" module-key="i2116">
@@ -188,65 +188,65 @@
         <peripheral key="spi0" name="SPI0" module-key="i2107">
             <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"/>
-                <signal pad-id="pa6" function="SPI0_ALT" group="MOSI" field="PORTMUX.CTRLB.SPI0"/>
-                <signal pad-id="pa1" function="SPI0" group="MOSI" field="PORTMUX.CTRLB.SPI0"/>
-                <signal pad-id="pa3" function="SPI0" group="SCK" field="PORTMUX.CTRLB.SPI0"/>
-                <signal pad-id="pa4" function="SPI0" group="SS" field="PORTMUX.CTRLB.SPI0"/>
+                <signal pad-key="pa7" function="SPI0_ALT" group="MISO" field="PORTMUX.CTRLB.SPI0"/>
+                <signal pad-key="pa2" function="SPI0" group="MISO" field="PORTMUX.CTRLB.SPI0"/>
+                <signal pad-key="pa6" function="SPI0_ALT" group="MOSI" field="PORTMUX.CTRLB.SPI0"/>
+                <signal pad-key="pa1" function="SPI0" group="MOSI" field="PORTMUX.CTRLB.SPI0"/>
+                <signal pad-key="pa3" function="SPI0" group="SCK" field="PORTMUX.CTRLB.SPI0"/>
+                <signal pad-key="pa4" function="SPI0" group="SS" field="PORTMUX.CTRLB.SPI0"/>
             </signals>
         </peripheral>
         <peripheral key="syscfg" name="SYSCFG" module-key="i2601_syscfg">
             <register-group-instance register-group-key="syscfg" address-space-key="data" offset="0xF00"/>
             <signals>
-                <signal pad-id="pa0" function="OTHER" group="UPDI"/>
+                <signal pad-key="pa0" function="OTHER" group="UPDI"/>
             </signals>
         </peripheral>
         <peripheral key="tca0" name="TCA0" module-key="i2117">
             <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"/>
-                <signal pad-id="pb1" index="1" function="TCA0" group="WO" field="PORTMUX.CTRLC.TCA01"/>
-                <signal pad-id="pb2" index="2" function="TCA0" group="WO" field="PORTMUX.CTRLC.TCA02"/>
-                <signal pad-id="pa3" index="3" function="TCA0" group="WO" field="PORTMUX.CTRLC.TCA03"/>
-                <signal pad-id="pa4" index="4" function="TCA0" group="WO" field="PORTMUX.CTRLC.TCA04"/>
-                <signal pad-id="pa5" index="5" function="TCA0" group="WO" field="PORTMUX.CTRLC.TCA05"/>
+                <signal pad-key="pb3" index="0" function="TCA0_ALT" group="WO" field="PORTMUX.CTRLC.TCA00"/>
+                <signal pad-key="pb0" index="0" function="TCA0" group="WO" field="PORTMUX.CTRLC.TCA00"/>
+                <signal pad-key="pb1" index="1" function="TCA0" group="WO" field="PORTMUX.CTRLC.TCA01"/>
+                <signal pad-key="pb2" index="2" function="TCA0" group="WO" field="PORTMUX.CTRLC.TCA02"/>
+                <signal pad-key="pa3" index="3" function="TCA0" group="WO" field="PORTMUX.CTRLC.TCA03"/>
+                <signal pad-key="pa4" index="4" function="TCA0" group="WO" field="PORTMUX.CTRLC.TCA04"/>
+                <signal pad-key="pa5" index="5" function="TCA0" group="WO" field="PORTMUX.CTRLC.TCA05"/>
             </signals>
         </peripheral>
         <peripheral key="tcb0" name="TCB0" module-key="i2119">
             <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"/>
+                <signal pad-key="pa5" index="0" function="TCB0" group="WO" field="PORTMUX.CTRLD.TCB0"/>
             </signals>
         </peripheral>
         <peripheral key="tcd0" name="TCD0" module-key="i2129">
             <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"/>
+                <signal pad-key="pa4" function="TCD0" group="WOA"/>
+                <signal pad-key="pa5" function="TCD0" group="WOB"/>
             </signals>
         </peripheral>
         <peripheral key="twi0" name="TWI0" module-key="i2110">
             <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"/>
-                <signal pad-id="pa1" function="TWI0_ALT" group="SDA" field="PORTMUX.CTRLB.TWI0"/>
-                <signal pad-id="pb1" function="TWI0" group="SDA" field="PORTMUX.CTRLB.TWI0"/>
+                <signal pad-key="pa2" function="TWI0_ALT" group="SCL" field="PORTMUX.CTRLB.TWI0"/>
+                <signal pad-key="pb0" function="TWI0" group="SCL" field="PORTMUX.CTRLB.TWI0"/>
+                <signal pad-key="pa1" function="TWI0_ALT" group="SDA" field="PORTMUX.CTRLB.TWI0"/>
+                <signal pad-key="pb1" function="TWI0" group="SDA" field="PORTMUX.CTRLB.TWI0"/>
             </signals>
         </peripheral>
         <peripheral key="usart0" name="USART0" module-key="i2108">
             <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"/>
-                <signal pad-id="pa1" function="USART0_ALT" group="TXD" field="PORTMUX.CTRLB.USART0"/>
-                <signal pad-id="pb2" function="USART0" group="TXD" field="PORTMUX.CTRLB.USART0"/>
-                <signal pad-id="pa3" function="USART0_ALT" group="XCK" field="PORTMUX.CTRLB.USART0"/>
-                <signal pad-id="pb1" function="USART0" group="XCK" field="PORTMUX.CTRLB.USART0"/>
-                <signal pad-id="pa4" function="USART0_ALT" group="XDIR" field="PORTMUX.CTRLB.USART0"/>
-                <signal pad-id="pb0" function="USART0" group="XDIR" field="PORTMUX.CTRLB.USART0"/>
+                <signal pad-key="pa2" function="USART0_ALT" group="RXD" field="PORTMUX.CTRLB.USART0"/>
+                <signal pad-key="pb3" function="USART0" group="RXD" field="PORTMUX.CTRLB.USART0"/>
+                <signal pad-key="pa1" function="USART0_ALT" group="TXD" field="PORTMUX.CTRLB.USART0"/>
+                <signal pad-key="pb2" function="USART0" group="TXD" field="PORTMUX.CTRLB.USART0"/>
+                <signal pad-key="pa3" function="USART0_ALT" group="XCK" field="PORTMUX.CTRLB.USART0"/>
+                <signal pad-key="pb1" function="USART0" group="XCK" field="PORTMUX.CTRLB.USART0"/>
+                <signal pad-key="pa4" function="USART0_ALT" group="XDIR" field="PORTMUX.CTRLB.USART0"/>
+                <signal pad-key="pb0" function="USART0" group="XDIR" field="PORTMUX.CTRLB.USART0"/>
             </signals>
         </peripheral>
         <peripheral key="userrow" name="USERROW" module-key="i2601_userrow">
@@ -1313,26 +1313,42 @@
             </register-group>
         </module>
     </modules>
+    <pads>
+        <pad key="vdd" name="VDD"/>
+        <pad key="pa4" name="PA4"/>
+        <pad key="pa5" name="PA5"/>
+        <pad key="pa6" name="PA6"/>
+        <pad key="pa7" name="PA7"/>
+        <pad key="pb3" name="PB3"/>
+        <pad key="pb2" name="PB2"/>
+        <pad key="pb1" name="PB1"/>
+        <pad key="pb0" name="PB0"/>
+        <pad key="pa0" name="PA0"/>
+        <pad key="pa1" name="PA1"/>
+        <pad key="pa2" name="PA2"/>
+        <pad key="pa3" name="PA3"/>
+        <pad key="gnd" name="GND"/>
+    </pads>
     <pinouts>
         <pinout key="soic14" name="SOIC14" type="soic">
-            <pin position="1" pad="VDD"/>
-            <pin position="2" pad="PA4"/>
-            <pin position="3" pad="PA5"/>
-            <pin position="4" pad="PA6"/>
-            <pin position="5" pad="PA7"/>
-            <pin position="6" pad="PB3"/>
-            <pin position="7" pad="PB2"/>
-            <pin position="8" pad="PB1"/>
-            <pin position="9" pad="PB0"/>
-            <pin position="10" pad="PA0"/>
-            <pin position="11" pad="PA1"/>
-            <pin position="12" pad="PA2"/>
-            <pin position="13" pad="PA3"/>
-            <pin position="14" pad="GND"/>
+            <pin position="1" pad-key="vdd"/>
+            <pin position="2" pad-key="pa4"/>
+            <pin position="3" pad-key="pa5"/>
+            <pin position="4" pad-key="pa6"/>
+            <pin position="5" pad-key="pa7"/>
+            <pin position="6" pad-key="pb3"/>
+            <pin position="7" pad-key="pb2"/>
+            <pin position="8" pad-key="pb1"/>
+            <pin position="9" pad-key="pb0"/>
+            <pin position="10" pad-key="pa0"/>
+            <pin position="11" pad-key="pa1"/>
+            <pin position="12" pad-key="pa2"/>
+            <pin position="13" pad-key="pa3"/>
+            <pin position="14" pad-key="gnd"/>
         </pinout>
     </pinouts>
     <variants>
-        <variant name="ATtiny414-SSFR" pinout-key="soic14" package="SOIC14"/>
-        <variant name="ATtiny414-SSNR" pinout-key="soic14" package="SOIC14"/>
+        <variant key="attiny414_ssfr" name="ATtiny414-SSFR" pinout-key="soic14"/>
+        <variant key="attiny414_ssnr" name="ATtiny414-SSNR" pinout-key="soic14"/>
     </variants>
 </device>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY416.xml b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY416.xml
index 51978d19..caef90d3 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY416.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY416.xml
@@ -43,28 +43,28 @@
         <peripheral key="ac0" name="AC0" module-key="i2106">
             <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"/>
-                <signal pad-id="pa5" index="0" function="AC0" group="OUT"/>
-                <signal pad-id="pa7" index="0" function="AC0" group="P"/>
-                <signal pad-id="pb5" index="1" function="AC0" group="P"/>
+                <signal pad-key="pa6" index="0" function="AC0" group="N"/>
+                <signal pad-key="pb4" index="1" function="AC0" group="N"/>
+                <signal pad-key="pa5" index="0" function="AC0" group="OUT"/>
+                <signal pad-key="pa7" index="0" function="AC0" group="P"/>
+                <signal pad-key="pb5" index="1" function="AC0" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="adc0" name="ADC0" module-key="i2132">
             <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"/>
-                <signal pad-id="pa2" index="2" function="AIN0" group="AIN"/>
-                <signal pad-id="pa3" index="3" function="AIN0" group="AIN"/>
-                <signal pad-id="pa4" index="4" function="AIN0" group="AIN"/>
-                <signal pad-id="pa5" index="5" function="AIN0" group="AIN"/>
-                <signal pad-id="pa6" index="6" function="AIN0" group="AIN"/>
-                <signal pad-id="pa7" index="7" function="AIN0" group="AIN"/>
-                <signal pad-id="pb5" index="8" function="AIN0" group="AIN"/>
-                <signal pad-id="pb4" index="9" function="AIN0" group="AIN"/>
-                <signal pad-id="pb1" index="10" function="AIN0" group="AIN"/>
-                <signal pad-id="pb0" index="11" function="AIN0" group="AIN"/>
+                <signal pad-key="pa0" index="0" function="AIN0" group="AIN"/>
+                <signal pad-key="pa1" index="1" function="AIN0" group="AIN"/>
+                <signal pad-key="pa2" index="2" function="AIN0" group="AIN"/>
+                <signal pad-key="pa3" index="3" function="AIN0" group="AIN"/>
+                <signal pad-key="pa4" index="4" function="AIN0" group="AIN"/>
+                <signal pad-key="pa5" index="5" function="AIN0" group="AIN"/>
+                <signal pad-key="pa6" index="6" function="AIN0" group="AIN"/>
+                <signal pad-key="pa7" index="7" function="AIN0" group="AIN"/>
+                <signal pad-key="pb5" index="8" function="AIN0" group="AIN"/>
+                <signal pad-key="pb4" index="9" function="AIN0" group="AIN"/>
+                <signal pad-key="pb1" index="10" function="AIN0" group="AIN"/>
+                <signal pad-key="pb0" index="11" function="AIN0" group="AIN"/>
             </signals>
         </peripheral>
         <peripheral key="bod" name="BOD" module-key="i2114">
@@ -73,29 +73,29 @@
         <peripheral key="ccl" name="CCL" module-key="i2128">
             <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"/>
-                <signal pad-id="pa2" index="2" function="CCL" group="LUT0_IN"/>
-                <signal pad-id="pb4" index="0" function="CCL_ALT" group="LUT0_OUT" field="PORTMUX.CTRLA.LUT0"/>
-                <signal pad-id="pa4" index="0" function="CCL" group="LUT0_OUT" field="PORTMUX.CTRLA.LUT0"/>
-                <signal pad-id="pc3" index="0" function="CCL" group="LUT1_IN"/>
-                <signal pad-id="pc1" index="0" function="CCL_ALT" group="LUT1_OUT" field="PORTMUX.CTRLA.LUT1"/>
-                <signal pad-id="pa7" index="0" function="CCL" group="LUT1_OUT" field="PORTMUX.CTRLA.LUT1"/>
+                <signal pad-key="pa0" index="0" function="CCL" group="LUT0_IN"/>
+                <signal pad-key="pa1" index="1" function="CCL" group="LUT0_IN"/>
+                <signal pad-key="pa2" index="2" function="CCL" group="LUT0_IN"/>
+                <signal pad-key="pb4" index="0" function="CCL_ALT" group="LUT0_OUT" field="PORTMUX.CTRLA.LUT0"/>
+                <signal pad-key="pa4" index="0" function="CCL" group="LUT0_OUT" field="PORTMUX.CTRLA.LUT0"/>
+                <signal pad-key="pc3" index="0" function="CCL" group="LUT1_IN"/>
+                <signal pad-key="pc1" index="0" function="CCL_ALT" group="LUT1_OUT" field="PORTMUX.CTRLA.LUT1"/>
+                <signal pad-key="pa7" index="0" function="CCL" group="LUT1_OUT" field="PORTMUX.CTRLA.LUT1"/>
             </signals>
         </peripheral>
         <peripheral key="clkctrl" name="CLKCTRL" module-key="i2601_clkctrl">
             <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"/>
-                <signal pad-id="pb3" function="CLKCTRL" group="TOSC1"/>
-                <signal pad-id="pb2" function="CLKCTRL" group="TOSC2"/>
+                <signal pad-key="pa3" function="CLKCTRL" group="CLKI"/>
+                <signal pad-key="pb5" function="CLKCTRL" group="CLKO"/>
+                <signal pad-key="pb3" function="CLKCTRL" group="TOSC1"/>
+                <signal pad-key="pb2" function="CLKCTRL" group="TOSC2"/>
             </signals>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="i2100">
             <register-group-instance register-group-key="cpu" address-space-key="data" offset="0x30"/>
             <signals>
-                <signal pad-id="pa1" function="OTHER" group="BREAK"/>
+                <signal pad-key="pa1" function="OTHER" group="BREAK"/>
             </signals>
         </peripheral>
         <peripheral key="cpuint" name="CPUINT" module-key="i2104">
@@ -107,51 +107,51 @@
         <peripheral key="dac0" name="DAC0" module-key="i2121">
             <register-group-instance register-group-key="dac" address-space-key="data" offset="0x680"/>
             <signals>
-                <signal pad-id="pa6" index="0" function="DAC0" group="OUT"/>
+                <signal pad-key="pa6" index="0" function="DAC0" group="OUT"/>
             </signals>
         </peripheral>
         <peripheral key="evsys" name="EVSYS" module-key="i2601_evsys">
             <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"/>
-                <signal pad-id="pa2" index="2" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
-                <signal pad-id="pa3" index="3" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
-                <signal pad-id="pa4" index="4" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
-                <signal pad-id="pa5" index="5" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
-                <signal pad-id="pa6" index="6" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
-                <signal pad-id="pa7" index="7" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
-                <signal pad-id="pb0" index="0" function="EVAINCH1" group="EVAPB" field="EVSYS.ASYNCCH1.ASYNCCH1"/>
-                <signal pad-id="pb1" index="1" function="EVAINCH1" group="EVAPB" field="EVSYS.ASYNCCH1.ASYNCCH1"/>
-                <signal pad-id="pb2" index="2" function="EVAINCH1" group="EVAPB" field="EVSYS.ASYNCCH1.ASYNCCH1"/>
-                <signal pad-id="pb3" index="3" function="EVAINCH1" group="EVAPB" field="EVSYS.ASYNCCH1.ASYNCCH1"/>
-                <signal pad-id="pb4" index="4" function="EVAINCH1" group="EVAPB" field="EVSYS.ASYNCCH1.ASYNCCH1"/>
-                <signal pad-id="pb5" index="5" function="EVAINCH1" group="EVAPB" field="EVSYS.ASYNCCH1.ASYNCCH1"/>
-                <signal pad-id="pc0" index="0" function="EVAINCH2" group="EVAPC" field="EVSYS.ASYNCCH2.ASYNCCH2"/>
-                <signal pad-id="pc1" index="1" function="EVAINCH2" group="EVAPC" field="EVSYS.ASYNCCH2.ASYNCCH2"/>
-                <signal pad-id="pc2" index="2" function="EVAINCH2" group="EVAPC" field="EVSYS.ASYNCCH2.ASYNCCH2"/>
-                <signal pad-id="pc3" index="3" function="EVAINCH2" group="EVAPC" field="EVSYS.ASYNCCH2.ASYNCCH2"/>
-                <signal pad-id="pa2" index="0" function="EVSYS" group="EVOUT" field="PORTMUX.CTRLA.EVOUT0"/>
-                <signal pad-id="pb2" index="1" function="EVSYS" group="EVOUT" field="PORTMUX.CTRLA.EVOUT1"/>
-                <signal pad-id="pc2" index="2" function="EVSYS" group="EVOUT" field="PORTMUX.CTRLA.EVOUT2"/>
-                <signal pad-id="pa0" index="0" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
-                <signal pad-id="pa1" index="1" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
-                <signal pad-id="pa2" index="2" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
-                <signal pad-id="pa3" index="3" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
-                <signal pad-id="pa4" index="4" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
-                <signal pad-id="pa5" index="5" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
-                <signal pad-id="pa6" index="6" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
-                <signal pad-id="pa7" index="7" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
-                <signal pad-id="pb0" index="0" function="EVSINCH1" group="EVSPB" field="EVSYS.SYNCCH1.SYNCCH1"/>
-                <signal pad-id="pb1" index="1" function="EVSINCH1" group="EVSPB" field="EVSYS.SYNCCH1.SYNCCH1"/>
-                <signal pad-id="pb2" index="2" function="EVSINCH1" group="EVSPB" field="EVSYS.SYNCCH1.SYNCCH1"/>
-                <signal pad-id="pb3" index="3" function="EVSINCH1" group="EVSPB" field="EVSYS.SYNCCH1.SYNCCH1"/>
-                <signal pad-id="pb4" index="4" function="EVSINCH1" group="EVSPB" field="EVSYS.SYNCCH1.SYNCCH1"/>
-                <signal pad-id="pb5" index="5" function="EVSINCH1" group="EVSPB" field="EVSYS.SYNCCH1.SYNCCH1"/>
-                <signal pad-id="pc0" index="0" function="EVSINCH0" group="EVSPC" field="EVSYS.SYNCCH0.SYNCCH0"/>
-                <signal pad-id="pc1" index="1" function="EVSINCH0" group="EVSPC" field="EVSYS.SYNCCH0.SYNCCH0"/>
-                <signal pad-id="pc2" index="2" function="EVSINCH0" group="EVSPC" field="EVSYS.SYNCCH0.SYNCCH0"/>
-                <signal pad-id="pc3" index="3" function="EVSINCH0" group="EVSPC" field="EVSYS.SYNCCH0.SYNCCH0"/>
+                <signal pad-key="pa0" index="0" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
+                <signal pad-key="pa1" index="1" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
+                <signal pad-key="pa2" index="2" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
+                <signal pad-key="pa3" index="3" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
+                <signal pad-key="pa4" index="4" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
+                <signal pad-key="pa5" index="5" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
+                <signal pad-key="pa6" index="6" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
+                <signal pad-key="pa7" index="7" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
+                <signal pad-key="pb0" index="0" function="EVAINCH1" group="EVAPB" field="EVSYS.ASYNCCH1.ASYNCCH1"/>
+                <signal pad-key="pb1" index="1" function="EVAINCH1" group="EVAPB" field="EVSYS.ASYNCCH1.ASYNCCH1"/>
+                <signal pad-key="pb2" index="2" function="EVAINCH1" group="EVAPB" field="EVSYS.ASYNCCH1.ASYNCCH1"/>
+                <signal pad-key="pb3" index="3" function="EVAINCH1" group="EVAPB" field="EVSYS.ASYNCCH1.ASYNCCH1"/>
+                <signal pad-key="pb4" index="4" function="EVAINCH1" group="EVAPB" field="EVSYS.ASYNCCH1.ASYNCCH1"/>
+                <signal pad-key="pb5" index="5" function="EVAINCH1" group="EVAPB" field="EVSYS.ASYNCCH1.ASYNCCH1"/>
+                <signal pad-key="pc0" index="0" function="EVAINCH2" group="EVAPC" field="EVSYS.ASYNCCH2.ASYNCCH2"/>
+                <signal pad-key="pc1" index="1" function="EVAINCH2" group="EVAPC" field="EVSYS.ASYNCCH2.ASYNCCH2"/>
+                <signal pad-key="pc2" index="2" function="EVAINCH2" group="EVAPC" field="EVSYS.ASYNCCH2.ASYNCCH2"/>
+                <signal pad-key="pc3" index="3" function="EVAINCH2" group="EVAPC" field="EVSYS.ASYNCCH2.ASYNCCH2"/>
+                <signal pad-key="pa2" index="0" function="EVSYS" group="EVOUT" field="PORTMUX.CTRLA.EVOUT0"/>
+                <signal pad-key="pb2" index="1" function="EVSYS" group="EVOUT" field="PORTMUX.CTRLA.EVOUT1"/>
+                <signal pad-key="pc2" index="2" function="EVSYS" group="EVOUT" field="PORTMUX.CTRLA.EVOUT2"/>
+                <signal pad-key="pa0" index="0" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
+                <signal pad-key="pa1" index="1" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
+                <signal pad-key="pa2" index="2" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
+                <signal pad-key="pa3" index="3" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
+                <signal pad-key="pa4" index="4" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
+                <signal pad-key="pa5" index="5" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
+                <signal pad-key="pa6" index="6" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
+                <signal pad-key="pa7" index="7" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
+                <signal pad-key="pb0" index="0" function="EVSINCH1" group="EVSPB" field="EVSYS.SYNCCH1.SYNCCH1"/>
+                <signal pad-key="pb1" index="1" function="EVSINCH1" group="EVSPB" field="EVSYS.SYNCCH1.SYNCCH1"/>
+                <signal pad-key="pb2" index="2" function="EVSINCH1" group="EVSPB" field="EVSYS.SYNCCH1.SYNCCH1"/>
+                <signal pad-key="pb3" index="3" function="EVSINCH1" group="EVSPB" field="EVSYS.SYNCCH1.SYNCCH1"/>
+                <signal pad-key="pb4" index="4" function="EVSINCH1" group="EVSPB" field="EVSYS.SYNCCH1.SYNCCH1"/>
+                <signal pad-key="pb5" index="5" function="EVSINCH1" group="EVSPB" field="EVSYS.SYNCCH1.SYNCCH1"/>
+                <signal pad-key="pc0" index="0" function="EVSINCH0" group="EVSPC" field="EVSYS.SYNCCH0.SYNCCH0"/>
+                <signal pad-key="pc1" index="1" function="EVSINCH0" group="EVSPC" field="EVSYS.SYNCCH0.SYNCCH0"/>
+                <signal pad-key="pc2" index="2" function="EVSINCH0" group="EVSPC" field="EVSYS.SYNCCH0.SYNCCH0"/>
+                <signal pad-key="pc3" index="3" function="EVSINCH0" group="EVSPC" field="EVSYS.SYNCCH0.SYNCCH0"/>
             </signals>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="i2601_fuse">
@@ -169,34 +169,34 @@
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pa2" index="2" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa3" index="3" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa4" index="4" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa5" index="5" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa6" index="6" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa7" index="7" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa0" index="0" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa1" index="1" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa2" index="2" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa3" index="3" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa4" index="4" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa5" index="5" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa6" index="6" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa7" index="7" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pb2" index="2" function="IOPORT" group="PIN"/>
-                <signal pad-id="pb3" index="3" function="IOPORT" group="PIN"/>
-                <signal pad-id="pb4" index="4" function="IOPORT" group="PIN"/>
-                <signal pad-id="pb5" index="5" function="IOPORT" group="PIN"/>
+                <signal pad-key="pb0" index="0" function="IOPORT" group="PIN"/>
+                <signal pad-key="pb1" index="1" function="IOPORT" group="PIN"/>
+                <signal pad-key="pb2" index="2" function="IOPORT" group="PIN"/>
+                <signal pad-key="pb3" index="3" function="IOPORT" group="PIN"/>
+                <signal pad-key="pb4" index="4" function="IOPORT" group="PIN"/>
+                <signal pad-key="pb5" index="5" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pc2" index="2" function="IOPORT" group="PIN"/>
-                <signal pad-id="pc3" index="3" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc0" index="0" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc1" index="1" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc2" index="2" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc3" index="3" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="portmux" name="PORTMUX" module-key="i2601_portmux">
@@ -205,7 +205,7 @@
         <peripheral key="rstctrl" name="RSTCTRL" module-key="i2111">
             <register-group-instance register-group-key="rstctrl" address-space-key="data" offset="0x40"/>
             <signals>
-                <signal pad-id="pa0" function="OTHER" group="RESET"/>
+                <signal pad-key="pa0" function="OTHER" group="RESET"/>
             </signals>
         </peripheral>
         <peripheral key="rtc" name="RTC" module-key="i2116">
@@ -220,73 +220,73 @@
         <peripheral key="spi0" name="SPI0" module-key="i2107">
             <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"/>
-                <signal pad-id="pc2" function="SPI0_ALT" group="MOSI" field="PORTMUX.CTRLB.SPI0"/>
-                <signal pad-id="pa1" function="SPI0" group="MOSI" field="PORTMUX.CTRLB.SPI0"/>
-                <signal pad-id="pc0" function="SPI0_ALT" group="SCK" field="PORTMUX.CTRLB.SPI0"/>
-                <signal pad-id="pa3" function="SPI0" group="SCK" field="PORTMUX.CTRLB.SPI0"/>
-                <signal pad-id="pc3" function="SPI0_ALT" group="SS" field="PORTMUX.CTRLB.SPI0"/>
-                <signal pad-id="pa4" function="SPI0" group="SS" field="PORTMUX.CTRLB.SPI0"/>
+                <signal pad-key="pc1" function="SPI0_ALT" group="MISO" field="PORTMUX.CTRLB.SPI0"/>
+                <signal pad-key="pa2" function="SPI0" group="MISO" field="PORTMUX.CTRLB.SPI0"/>
+                <signal pad-key="pc2" function="SPI0_ALT" group="MOSI" field="PORTMUX.CTRLB.SPI0"/>
+                <signal pad-key="pa1" function="SPI0" group="MOSI" field="PORTMUX.CTRLB.SPI0"/>
+                <signal pad-key="pc0" function="SPI0_ALT" group="SCK" field="PORTMUX.CTRLB.SPI0"/>
+                <signal pad-key="pa3" function="SPI0" group="SCK" field="PORTMUX.CTRLB.SPI0"/>
+                <signal pad-key="pc3" function="SPI0_ALT" group="SS" field="PORTMUX.CTRLB.SPI0"/>
+                <signal pad-key="pa4" function="SPI0" group="SS" field="PORTMUX.CTRLB.SPI0"/>
             </signals>
         </peripheral>
         <peripheral key="syscfg" name="SYSCFG" module-key="i2601_syscfg">
             <register-group-instance register-group-key="syscfg" address-space-key="data" offset="0xF00"/>
             <signals>
-                <signal pad-id="pa0" function="OTHER" group="UPDI"/>
+                <signal pad-key="pa0" function="OTHER" group="UPDI"/>
             </signals>
         </peripheral>
         <peripheral key="tca0" name="TCA0" module-key="i2117">
             <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"/>
-                <signal pad-id="pb4" index="1" function="TCA0_ALT" group="WO" field="PORTMUX.CTRLC.TCA01"/>
-                <signal pad-id="pb1" index="1" function="TCA0" group="WO" field="PORTMUX.CTRLC.TCA01"/>
-                <signal pad-id="pb5" index="2" function="TCA0_ALT" group="WO" field="PORTMUX.CTRLC.TCA02"/>
-                <signal pad-id="pb2" index="2" function="TCA0" group="WO" field="PORTMUX.CTRLC.TCA02"/>
-                <signal pad-id="pc3" index="3" function="TCA0_ALT" group="WO" field="PORTMUX.CTRLC.TCA03"/>
-                <signal pad-id="pa3" index="3" function="TCA0" group="WO" field="PORTMUX.CTRLC.TCA03"/>
-                <signal pad-id="pa4" index="4" function="TCA0" group="WO" field="PORTMUX.CTRLC.TCA04"/>
-                <signal pad-id="pa5" index="5" function="TCA0" group="WO" field="PORTMUX.CTRLC.TCA05"/>
+                <signal pad-key="pb3" index="0" function="TCA0_ALT" group="WO" field="PORTMUX.CTRLC.TCA00"/>
+                <signal pad-key="pb0" index="0" function="TCA0" group="WO" field="PORTMUX.CTRLC.TCA00"/>
+                <signal pad-key="pb4" index="1" function="TCA0_ALT" group="WO" field="PORTMUX.CTRLC.TCA01"/>
+                <signal pad-key="pb1" index="1" function="TCA0" group="WO" field="PORTMUX.CTRLC.TCA01"/>
+                <signal pad-key="pb5" index="2" function="TCA0_ALT" group="WO" field="PORTMUX.CTRLC.TCA02"/>
+                <signal pad-key="pb2" index="2" function="TCA0" group="WO" field="PORTMUX.CTRLC.TCA02"/>
+                <signal pad-key="pc3" index="3" function="TCA0_ALT" group="WO" field="PORTMUX.CTRLC.TCA03"/>
+                <signal pad-key="pa3" index="3" function="TCA0" group="WO" field="PORTMUX.CTRLC.TCA03"/>
+                <signal pad-key="pa4" index="4" function="TCA0" group="WO" field="PORTMUX.CTRLC.TCA04"/>
+                <signal pad-key="pa5" index="5" function="TCA0" group="WO" field="PORTMUX.CTRLC.TCA05"/>
             </signals>
         </peripheral>
         <peripheral key="tcb0" name="TCB0" module-key="i2119">
             <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"/>
+                <signal pad-key="pc0" index="0" function="TCB0_ALT" group="WO" field="PORTMUX.CTRLD.TCB0"/>
+                <signal pad-key="pa5" index="0" function="TCB0" group="WO" field="PORTMUX.CTRLD.TCB0"/>
             </signals>
         </peripheral>
         <peripheral key="tcd0" name="TCD0" module-key="i2129">
             <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"/>
-                <signal pad-id="pc0" function="TCD0" group="WOC"/>
-                <signal pad-id="pc1" function="TCD0" group="WOD"/>
+                <signal pad-key="pa4" function="TCD0" group="WOA"/>
+                <signal pad-key="pa5" function="TCD0" group="WOB"/>
+                <signal pad-key="pc0" function="TCD0" group="WOC"/>
+                <signal pad-key="pc1" function="TCD0" group="WOD"/>
             </signals>
         </peripheral>
         <peripheral key="twi0" name="TWI0" module-key="i2110">
             <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"/>
-                <signal pad-id="pa1" function="TWI0_ALT" group="SDA" field="PORTMUX.CTRLB.TWI0"/>
-                <signal pad-id="pb1" function="TWI0" group="SDA" field="PORTMUX.CTRLB.TWI0"/>
+                <signal pad-key="pa2" function="TWI0_ALT" group="SCL" field="PORTMUX.CTRLB.TWI0"/>
+                <signal pad-key="pb0" function="TWI0" group="SCL" field="PORTMUX.CTRLB.TWI0"/>
+                <signal pad-key="pa1" function="TWI0_ALT" group="SDA" field="PORTMUX.CTRLB.TWI0"/>
+                <signal pad-key="pb1" function="TWI0" group="SDA" field="PORTMUX.CTRLB.TWI0"/>
             </signals>
         </peripheral>
         <peripheral key="usart0" name="USART0" module-key="i2108">
             <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"/>
-                <signal pad-id="pa1" function="USART0_ALT" group="TXD" field="PORTMUX.CTRLB.USART0"/>
-                <signal pad-id="pb2" function="USART0" group="TXD" field="PORTMUX.CTRLB.USART0"/>
-                <signal pad-id="pa3" function="USART0_ALT" group="XCK" field="PORTMUX.CTRLB.USART0"/>
-                <signal pad-id="pb1" function="USART0" group="XCK" field="PORTMUX.CTRLB.USART0"/>
-                <signal pad-id="pa4" function="USART0_ALT" group="XDIR" field="PORTMUX.CTRLB.USART0"/>
-                <signal pad-id="pb0" function="USART0" group="XDIR" field="PORTMUX.CTRLB.USART0"/>
+                <signal pad-key="pa2" function="USART0_ALT" group="RXD" field="PORTMUX.CTRLB.USART0"/>
+                <signal pad-key="pb3" function="USART0" group="RXD" field="PORTMUX.CTRLB.USART0"/>
+                <signal pad-key="pa1" function="USART0_ALT" group="TXD" field="PORTMUX.CTRLB.USART0"/>
+                <signal pad-key="pb2" function="USART0" group="TXD" field="PORTMUX.CTRLB.USART0"/>
+                <signal pad-key="pa3" function="USART0_ALT" group="XCK" field="PORTMUX.CTRLB.USART0"/>
+                <signal pad-key="pb1" function="USART0" group="XCK" field="PORTMUX.CTRLB.USART0"/>
+                <signal pad-key="pa4" function="USART0_ALT" group="XDIR" field="PORTMUX.CTRLB.USART0"/>
+                <signal pad-key="pb0" function="USART0" group="XDIR" field="PORTMUX.CTRLB.USART0"/>
             </signals>
         </peripheral>
         <peripheral key="userrow" name="USERROW" module-key="i2601_userrow">
@@ -1353,56 +1353,78 @@
             </register-group>
         </module>
     </modules>
+    <pads>
+        <pad key="pa2" name="PA2"/>
+        <pad key="pa3" name="PA3"/>
+        <pad key="gnd" name="GND"/>
+        <pad key="vdd" name="VDD"/>
+        <pad key="pa4" name="PA4"/>
+        <pad key="pa5" name="PA5"/>
+        <pad key="pa6" name="PA6"/>
+        <pad key="pa7" name="PA7"/>
+        <pad key="pb5" name="PB5"/>
+        <pad key="pb4" name="PB4"/>
+        <pad key="pb3" name="PB3"/>
+        <pad key="pb2" name="PB2"/>
+        <pad key="pb1" name="PB1"/>
+        <pad key="pb0" name="PB0"/>
+        <pad key="pc0" name="PC0"/>
+        <pad key="pc1" name="PC1"/>
+        <pad key="pc2" name="PC2"/>
+        <pad key="pc3" name="PC3"/>
+        <pad key="pa0" name="PA0"/>
+        <pad key="pa1" name="PA1"/>
+    </pads>
     <pinouts>
         <pinout key="qfn20" name="QFN20" type="qfn">
-            <pin position="1" pad="PA2"/>
-            <pin position="2" pad="PA3"/>
-            <pin position="3" pad="GND"/>
-            <pin position="4" pad="VDD"/>
-            <pin position="5" pad="PA4"/>
-            <pin position="6" pad="PA5"/>
-            <pin position="7" pad="PA6"/>
-            <pin position="8" pad="PA7"/>
-            <pin position="9" pad="PB5"/>
-            <pin position="10" pad="PB4"/>
-            <pin position="11" pad="PB3"/>
-            <pin position="12" pad="PB2"/>
-            <pin position="13" pad="PB1"/>
-            <pin position="14" pad="PB0"/>
-            <pin position="15" pad="PC0"/>
-            <pin position="16" pad="PC1"/>
-            <pin position="17" pad="PC2"/>
-            <pin position="18" pad="PC3"/>
-            <pin position="19" pad="PA0"/>
-            <pin position="20" pad="PA1"/>
+            <pin position="1" pad-key="pa2"/>
+            <pin position="2" pad-key="pa3"/>
+            <pin position="3" pad-key="gnd"/>
+            <pin position="4" pad-key="vdd"/>
+            <pin position="5" pad-key="pa4"/>
+            <pin position="6" pad-key="pa5"/>
+            <pin position="7" pad-key="pa6"/>
+            <pin position="8" pad-key="pa7"/>
+            <pin position="9" pad-key="pb5"/>
+            <pin position="10" pad-key="pb4"/>
+            <pin position="11" pad-key="pb3"/>
+            <pin position="12" pad-key="pb2"/>
+            <pin position="13" pad-key="pb1"/>
+            <pin position="14" pad-key="pb0"/>
+            <pin position="15" pad-key="pc0"/>
+            <pin position="16" pad-key="pc1"/>
+            <pin position="17" pad-key="pc2"/>
+            <pin position="18" pad-key="pc3"/>
+            <pin position="19" pad-key="pa0"/>
+            <pin position="20" pad-key="pa1"/>
         </pinout>
         <pinout key="soic20" name="SOIC20" type="soic">
-            <pin position="1" pad="VDD"/>
-            <pin position="2" pad="PA4"/>
-            <pin position="3" pad="PA5"/>
-            <pin position="4" pad="PA6"/>
-            <pin position="5" pad="PA7"/>
-            <pin position="6" pad="PB5"/>
-            <pin position="7" pad="PB4"/>
-            <pin position="8" pad="PB3"/>
-            <pin position="9" pad="PB2"/>
-            <pin position="10" pad="PB1"/>
-            <pin position="11" pad="PB0"/>
-            <pin position="12" pad="PC0"/>
-            <pin position="13" pad="PC1"/>
-            <pin position="14" pad="PC2"/>
-            <pin position="15" pad="PC3"/>
-            <pin position="16" pad="PA0"/>
-            <pin position="17" pad="PA1"/>
-            <pin position="18" pad="PA2"/>
-            <pin position="19" pad="PA3"/>
-            <pin position="20" pad="GND"/>
+            <pin position="1" pad-key="vdd"/>
+            <pin position="2" pad-key="pa4"/>
+            <pin position="3" pad-key="pa5"/>
+            <pin position="4" pad-key="pa6"/>
+            <pin position="5" pad-key="pa7"/>
+            <pin position="6" pad-key="pb5"/>
+            <pin position="7" pad-key="pb4"/>
+            <pin position="8" pad-key="pb3"/>
+            <pin position="9" pad-key="pb2"/>
+            <pin position="10" pad-key="pb1"/>
+            <pin position="11" pad-key="pb0"/>
+            <pin position="12" pad-key="pc0"/>
+            <pin position="13" pad-key="pc1"/>
+            <pin position="14" pad-key="pc2"/>
+            <pin position="15" pad-key="pc3"/>
+            <pin position="16" pad-key="pa0"/>
+            <pin position="17" pad-key="pa1"/>
+            <pin position="18" pad-key="pa2"/>
+            <pin position="19" pad-key="pa3"/>
+            <pin position="20" pad-key="gnd"/>
         </pinout>
     </pinouts>
     <variants>
-        <variant name="ATtiny416-MFR" pinout-key="qfn20" package="VQFN20"/>
-        <variant name="ATtiny416-MNR" pinout-key="qfn20" package="VQFN20"/>
-        <variant name="ATtiny416-SFR" pinout-key="soic20" package="SOIC20"/>
-        <variant name="ATtiny416-SNR" pinout-key="soic20" package="SOIC20"/>
+        <variant key="attiny416_mfr" name="ATtiny416-MFR" pinout-key="qfn20"/>
+        <variant key="attiny416_mnr" name="ATtiny416-MNR" pinout-key="qfn20"/>
+        <variant key="attiny416_sfr" name="ATtiny416-SFR" pinout-key="soic20"/>
+        <variant key="attiny416_snr" name="ATtiny416-SNR" pinout-key="soic20"/>
     </variants>
 </device>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY417.xml b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY417.xml
index 80b700fd..68ea9f94 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY417.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY417.xml
@@ -44,28 +44,28 @@
         <peripheral key="ac0" name="AC0" module-key="i2106">
             <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"/>
-                <signal pad-id="pa5" index="0" function="AC0" group="OUT"/>
-                <signal pad-id="pa7" index="0" function="AC0" group="P"/>
-                <signal pad-id="pb5" index="1" function="AC0" group="P"/>
+                <signal pad-key="pa6" index="0" function="AC0" group="N"/>
+                <signal pad-key="pb4" index="1" function="AC0" group="N"/>
+                <signal pad-key="pa5" index="0" function="AC0" group="OUT"/>
+                <signal pad-key="pa7" index="0" function="AC0" group="P"/>
+                <signal pad-key="pb5" index="1" function="AC0" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="adc0" name="ADC0" module-key="i2132">
             <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"/>
-                <signal pad-id="pa2" index="2" function="AIN0" group="AIN"/>
-                <signal pad-id="pa3" index="3" function="AIN0" group="AIN"/>
-                <signal pad-id="pa4" index="4" function="AIN0" group="AIN"/>
-                <signal pad-id="pa5" index="5" function="AIN0" group="AIN"/>
-                <signal pad-id="pa6" index="6" function="AIN0" group="AIN"/>
-                <signal pad-id="pa7" index="7" function="AIN0" group="AIN"/>
-                <signal pad-id="pb5" index="8" function="AIN0" group="AIN"/>
-                <signal pad-id="pb4" index="9" function="AIN0" group="AIN"/>
-                <signal pad-id="pb1" index="10" function="AIN0" group="AIN"/>
-                <signal pad-id="pb0" index="11" function="AIN0" group="AIN"/>
+                <signal pad-key="pa0" index="0" function="AIN0" group="AIN"/>
+                <signal pad-key="pa1" index="1" function="AIN0" group="AIN"/>
+                <signal pad-key="pa2" index="2" function="AIN0" group="AIN"/>
+                <signal pad-key="pa3" index="3" function="AIN0" group="AIN"/>
+                <signal pad-key="pa4" index="4" function="AIN0" group="AIN"/>
+                <signal pad-key="pa5" index="5" function="AIN0" group="AIN"/>
+                <signal pad-key="pa6" index="6" function="AIN0" group="AIN"/>
+                <signal pad-key="pa7" index="7" function="AIN0" group="AIN"/>
+                <signal pad-key="pb5" index="8" function="AIN0" group="AIN"/>
+                <signal pad-key="pb4" index="9" function="AIN0" group="AIN"/>
+                <signal pad-key="pb1" index="10" function="AIN0" group="AIN"/>
+                <signal pad-key="pb0" index="11" function="AIN0" group="AIN"/>
             </signals>
         </peripheral>
         <peripheral key="bod" name="BOD" module-key="i2114">
@@ -74,32 +74,32 @@
         <peripheral key="ccl" name="CCL" module-key="i2128">
             <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"/>
-                <signal pad-id="pa2" index="2" function="CCL" group="LUT0_IN"/>
-                <signal pad-id="pb4" index="0" function="CCL_ALT" group="LUT0_OUT" field="PORTMUX.CTRLA.LUT0"/>
-                <signal pad-id="pa4" index="0" function="CCL" group="LUT0_OUT" field="PORTMUX.CTRLA.LUT0"/>
-                <signal pad-id="pc3" index="0" function="CCL" group="LUT1_IN"/>
-                <signal pad-id="pc4" index="1" function="CCL" group="LUT1_IN"/>
-                <signal pad-id="pc5" index="2" function="CCL" group="LUT1_IN"/>
-                <signal pad-id="pc1" index="0" function="CCL_ALT" group="LUT1_OUT" field="PORTMUX.CTRLA.LUT1"/>
-                <signal pad-id="pa7" index="0" function="CCL" group="LUT1_OUT" field="PORTMUX.CTRLA.LUT1"/>
+                <signal pad-key="pa0" index="0" function="CCL" group="LUT0_IN"/>
+                <signal pad-key="pa1" index="1" function="CCL" group="LUT0_IN"/>
+                <signal pad-key="pa2" index="2" function="CCL" group="LUT0_IN"/>
+                <signal pad-key="pb4" index="0" function="CCL_ALT" group="LUT0_OUT" field="PORTMUX.CTRLA.LUT0"/>
+                <signal pad-key="pa4" index="0" function="CCL" group="LUT0_OUT" field="PORTMUX.CTRLA.LUT0"/>
+                <signal pad-key="pc3" index="0" function="CCL" group="LUT1_IN"/>
+                <signal pad-key="pc4" index="1" function="CCL" group="LUT1_IN"/>
+                <signal pad-key="pc5" index="2" function="CCL" group="LUT1_IN"/>
+                <signal pad-key="pc1" index="0" function="CCL_ALT" group="LUT1_OUT" field="PORTMUX.CTRLA.LUT1"/>
+                <signal pad-key="pa7" index="0" function="CCL" group="LUT1_OUT" field="PORTMUX.CTRLA.LUT1"/>
             </signals>
         </peripheral>
         <peripheral key="clkctrl" name="CLKCTRL" module-key="i2600_clkctrl">
             <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"/>
-                <signal pad-id="pb3" function="CLKCTRL" group="TOSC1"/>
-                <signal pad-id="pb2" function="CLKCTRL" group="TOSC2"/>
+                <signal pad-key="pa3" function="CLKCTRL" group="CLKI"/>
+                <signal pad-key="pb5" function="CLKCTRL" group="CLKO"/>
+                <signal pad-key="pb3" function="CLKCTRL" group="TOSC1"/>
+                <signal pad-key="pb2" function="CLKCTRL" group="TOSC2"/>
             </signals>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="i2100">
             <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"/>
+                <signal pad-key="pc4" function="BREAK_ALT" group="BREAK" field="PORTMUX.CTRLA.EXTBRK"/>
+                <signal pad-key="pa1" function="BREAK" group="BREAK" field="PORTMUX.CTRLA.EXTBRK"/>
             </signals>
         </peripheral>
         <peripheral key="cpuint" name="CPUINT" module-key="i2104">
@@ -111,59 +111,59 @@
         <peripheral key="dac0" name="DAC0" module-key="i2121">
             <register-group-instance register-group-key="dac" address-space-key="data" offset="0x680"/>
             <signals>
-                <signal pad-id="pa6" index="0" function="DAC0" group="OUT"/>
+                <signal pad-key="pa6" index="0" function="DAC0" group="OUT"/>
             </signals>
         </peripheral>
         <peripheral key="evsys" name="EVSYS" module-key="i2600_evsys">
             <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"/>
-                <signal pad-id="pa2" index="2" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
-                <signal pad-id="pa3" index="3" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
-                <signal pad-id="pa4" index="4" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
-                <signal pad-id="pa5" index="5" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
-                <signal pad-id="pa6" index="6" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
-                <signal pad-id="pa7" index="7" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
-                <signal pad-id="pb0" index="0" function="EVAINCH1" group="EVAPB" field="EVSYS.ASYNCCH1.ASYNCCH1"/>
-                <signal pad-id="pb1" index="1" function="EVAINCH1" group="EVAPB" field="EVSYS.ASYNCCH1.ASYNCCH1"/>
-                <signal pad-id="pb2" index="2" function="EVAINCH1" group="EVAPB" field="EVSYS.ASYNCCH1.ASYNCCH1"/>
-                <signal pad-id="pb3" index="3" function="EVAINCH1" group="EVAPB" field="EVSYS.ASYNCCH1.ASYNCCH1"/>
-                <signal pad-id="pb4" index="4" function="EVAINCH1" group="EVAPB" field="EVSYS.ASYNCCH1.ASYNCCH1"/>
-                <signal pad-id="pb5" index="5" function="EVAINCH1" group="EVAPB" field="EVSYS.ASYNCCH1.ASYNCCH1"/>
-                <signal pad-id="pb6" index="6" function="EVAINCH1" group="EVAPB" field="EVSYS.ASYNCCH1.ASYNCCH1"/>
-                <signal pad-id="pb7" index="7" function="EVAINCH1" group="EVAPB" field="EVSYS.ASYNCCH1.ASYNCCH1"/>
-                <signal pad-id="pc0" index="0" function="EVAINCH2" group="EVAPC" field="EVSYS.ASYNCCH2.ASYNCCH2"/>
-                <signal pad-id="pc1" index="1" function="EVAINCH2" group="EVAPC" field="EVSYS.ASYNCCH2.ASYNCCH2"/>
-                <signal pad-id="pc2" index="2" function="EVAINCH2" group="EVAPC" field="EVSYS.ASYNCCH2.ASYNCCH2"/>
-                <signal pad-id="pc3" index="3" function="EVAINCH2" group="EVAPC" field="EVSYS.ASYNCCH2.ASYNCCH2"/>
-                <signal pad-id="pc4" index="4" function="EVAINCH2" group="EVAPC" field="EVSYS.ASYNCCH2.ASYNCCH2"/>
-                <signal pad-id="pc5" index="5" function="EVAINCH2" group="EVAPC" field="EVSYS.ASYNCCH2.ASYNCCH2"/>
-                <signal pad-id="pa2" index="0" function="EVSYS" group="EVOUT" field="PORTMUX.CTRLA.EVOUT0"/>
-                <signal pad-id="pb2" index="1" function="EVSYS" group="EVOUT" field="PORTMUX.CTRLA.EVOUT1"/>
-                <signal pad-id="pc2" index="2" function="EVSYS" group="EVOUT" field="PORTMUX.CTRLA.EVOUT2"/>
-                <signal pad-id="pa0" index="0" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
-                <signal pad-id="pa1" index="1" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
-                <signal pad-id="pa2" index="2" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
-                <signal pad-id="pa3" index="3" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
-                <signal pad-id="pa4" index="4" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
-                <signal pad-id="pa5" index="5" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
-                <signal pad-id="pa6" index="6" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
-                <signal pad-id="pa7" index="7" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
-                <signal pad-id="pb0" index="0" function="EVSINCH1" group="EVSPB" field="EVSYS.SYNCCH1.SYNCCH1"/>
-                <signal pad-id="pb1" index="1" function="EVSINCH1" group="EVSPB" field="EVSYS.SYNCCH1.SYNCCH1"/>
-                <signal pad-id="pb2" index="2" function="EVSINCH1" group="EVSPB" field="EVSYS.SYNCCH1.SYNCCH1"/>
-                <signal pad-id="pb3" index="3" function="EVSINCH1" group="EVSPB" field="EVSYS.SYNCCH1.SYNCCH1"/>
-                <signal pad-id="pb4" index="4" function="EVSINCH1" group="EVSPB" field="EVSYS.SYNCCH1.SYNCCH1"/>
-                <signal pad-id="pb5" index="5" function="EVSINCH1" group="EVSPB" field="EVSYS.SYNCCH1.SYNCCH1"/>
-                <signal pad-id="pb6" index="6" function="EVSINCH1" group="EVSPB" field="EVSYS.SYNCCH1.SYNCCH1"/>
-                <signal pad-id="pb7" index="7" function="EVSINCH1" group="EVSPB" field="EVSYS.SYNCCH1.SYNCCH1"/>
-                <signal pad-id="pc0" index="0" function="EVSINCH0" group="EVSPC" field="EVSYS.SYNCCH0.SYNCCH0"/>
-                <signal pad-id="pc1" index="1" function="EVSINCH0" group="EVSPC" field="EVSYS.SYNCCH0.SYNCCH0"/>
-                <signal pad-id="pc2" index="2" function="EVSINCH0" group="EVSPC" field="EVSYS.SYNCCH0.SYNCCH0"/>
-                <signal pad-id="pc3" index="3" function="EVSINCH0" group="EVSPC" field="EVSYS.SYNCCH0.SYNCCH0"/>
-                <signal pad-id="pc4" index="4" function="EVSINCH0" group="EVSPC" field="EVSYS.SYNCCH0.SYNCCH0"/>
-                <signal pad-id="pc5" index="5" function="EVSINCH0" group="EVSPC" field="EVSYS.SYNCCH0.SYNCCH0"/>
+                <signal pad-key="pa0" index="0" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
+                <signal pad-key="pa1" index="1" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
+                <signal pad-key="pa2" index="2" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
+                <signal pad-key="pa3" index="3" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
+                <signal pad-key="pa4" index="4" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
+                <signal pad-key="pa5" index="5" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
+                <signal pad-key="pa6" index="6" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
+                <signal pad-key="pa7" index="7" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
+                <signal pad-key="pb0" index="0" function="EVAINCH1" group="EVAPB" field="EVSYS.ASYNCCH1.ASYNCCH1"/>
+                <signal pad-key="pb1" index="1" function="EVAINCH1" group="EVAPB" field="EVSYS.ASYNCCH1.ASYNCCH1"/>
+                <signal pad-key="pb2" index="2" function="EVAINCH1" group="EVAPB" field="EVSYS.ASYNCCH1.ASYNCCH1"/>
+                <signal pad-key="pb3" index="3" function="EVAINCH1" group="EVAPB" field="EVSYS.ASYNCCH1.ASYNCCH1"/>
+                <signal pad-key="pb4" index="4" function="EVAINCH1" group="EVAPB" field="EVSYS.ASYNCCH1.ASYNCCH1"/>
+                <signal pad-key="pb5" index="5" function="EVAINCH1" group="EVAPB" field="EVSYS.ASYNCCH1.ASYNCCH1"/>
+                <signal pad-key="pb6" index="6" function="EVAINCH1" group="EVAPB" field="EVSYS.ASYNCCH1.ASYNCCH1"/>
+                <signal pad-key="pb7" index="7" function="EVAINCH1" group="EVAPB" field="EVSYS.ASYNCCH1.ASYNCCH1"/>
+                <signal pad-key="pc0" index="0" function="EVAINCH2" group="EVAPC" field="EVSYS.ASYNCCH2.ASYNCCH2"/>
+                <signal pad-key="pc1" index="1" function="EVAINCH2" group="EVAPC" field="EVSYS.ASYNCCH2.ASYNCCH2"/>
+                <signal pad-key="pc2" index="2" function="EVAINCH2" group="EVAPC" field="EVSYS.ASYNCCH2.ASYNCCH2"/>
+                <signal pad-key="pc3" index="3" function="EVAINCH2" group="EVAPC" field="EVSYS.ASYNCCH2.ASYNCCH2"/>
+                <signal pad-key="pc4" index="4" function="EVAINCH2" group="EVAPC" field="EVSYS.ASYNCCH2.ASYNCCH2"/>
+                <signal pad-key="pc5" index="5" function="EVAINCH2" group="EVAPC" field="EVSYS.ASYNCCH2.ASYNCCH2"/>
+                <signal pad-key="pa2" index="0" function="EVSYS" group="EVOUT" field="PORTMUX.CTRLA.EVOUT0"/>
+                <signal pad-key="pb2" index="1" function="EVSYS" group="EVOUT" field="PORTMUX.CTRLA.EVOUT1"/>
+                <signal pad-key="pc2" index="2" function="EVSYS" group="EVOUT" field="PORTMUX.CTRLA.EVOUT2"/>
+                <signal pad-key="pa0" index="0" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
+                <signal pad-key="pa1" index="1" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
+                <signal pad-key="pa2" index="2" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
+                <signal pad-key="pa3" index="3" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
+                <signal pad-key="pa4" index="4" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
+                <signal pad-key="pa5" index="5" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
+                <signal pad-key="pa6" index="6" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
+                <signal pad-key="pa7" index="7" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
+                <signal pad-key="pb0" index="0" function="EVSINCH1" group="EVSPB" field="EVSYS.SYNCCH1.SYNCCH1"/>
+                <signal pad-key="pb1" index="1" function="EVSINCH1" group="EVSPB" field="EVSYS.SYNCCH1.SYNCCH1"/>
+                <signal pad-key="pb2" index="2" function="EVSINCH1" group="EVSPB" field="EVSYS.SYNCCH1.SYNCCH1"/>
+                <signal pad-key="pb3" index="3" function="EVSINCH1" group="EVSPB" field="EVSYS.SYNCCH1.SYNCCH1"/>
+                <signal pad-key="pb4" index="4" function="EVSINCH1" group="EVSPB" field="EVSYS.SYNCCH1.SYNCCH1"/>
+                <signal pad-key="pb5" index="5" function="EVSINCH1" group="EVSPB" field="EVSYS.SYNCCH1.SYNCCH1"/>
+                <signal pad-key="pb6" index="6" function="EVSINCH1" group="EVSPB" field="EVSYS.SYNCCH1.SYNCCH1"/>
+                <signal pad-key="pb7" index="7" function="EVSINCH1" group="EVSPB" field="EVSYS.SYNCCH1.SYNCCH1"/>
+                <signal pad-key="pc0" index="0" function="EVSINCH0" group="EVSPC" field="EVSYS.SYNCCH0.SYNCCH0"/>
+                <signal pad-key="pc1" index="1" function="EVSINCH0" group="EVSPC" field="EVSYS.SYNCCH0.SYNCCH0"/>
+                <signal pad-key="pc2" index="2" function="EVSINCH0" group="EVSPC" field="EVSYS.SYNCCH0.SYNCCH0"/>
+                <signal pad-key="pc3" index="3" function="EVSINCH0" group="EVSPC" field="EVSYS.SYNCCH0.SYNCCH0"/>
+                <signal pad-key="pc4" index="4" function="EVSINCH0" group="EVSPC" field="EVSYS.SYNCCH0.SYNCCH0"/>
+                <signal pad-key="pc5" index="5" function="EVSINCH0" group="EVSPC" field="EVSYS.SYNCCH0.SYNCCH0"/>
             </signals>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="i2600_fuse">
@@ -181,38 +181,38 @@
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pa2" index="2" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa3" index="3" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa4" index="4" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa5" index="5" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa6" index="6" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa7" index="7" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa0" index="0" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa1" index="1" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa2" index="2" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa3" index="3" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa4" index="4" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa5" index="5" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa6" index="6" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa7" index="7" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pb2" index="2" function="IOPORT" group="PIN"/>
-                <signal pad-id="pb3" index="3" function="IOPORT" group="PIN"/>
-                <signal pad-id="pb4" index="4" function="IOPORT" group="PIN"/>
-                <signal pad-id="pb5" index="5" function="IOPORT" group="PIN"/>
-                <signal pad-id="pb6" index="6" function="IOPORT" group="PIN"/>
-                <signal pad-id="pb7" index="7" function="IOPORT" group="PIN"/>
+                <signal pad-key="pb0" index="0" function="IOPORT" group="PIN"/>
+                <signal pad-key="pb1" index="1" function="IOPORT" group="PIN"/>
+                <signal pad-key="pb2" index="2" function="IOPORT" group="PIN"/>
+                <signal pad-key="pb3" index="3" function="IOPORT" group="PIN"/>
+                <signal pad-key="pb4" index="4" function="IOPORT" group="PIN"/>
+                <signal pad-key="pb5" index="5" function="IOPORT" group="PIN"/>
+                <signal pad-key="pb6" index="6" function="IOPORT" group="PIN"/>
+                <signal pad-key="pb7" index="7" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pc2" index="2" function="IOPORT" group="PIN"/>
-                <signal pad-id="pc3" index="3" function="IOPORT" group="PIN"/>
-                <signal pad-id="pc4" index="4" function="IOPORT" group="PIN"/>
-                <signal pad-id="pc5" index="5" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc0" index="0" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc1" index="1" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc2" index="2" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc3" index="3" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc4" index="4" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc5" index="5" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="portmux" name="PORTMUX" module-key="i2600_portmux">
@@ -220,26 +220,26 @@
         </peripheral>
         <peripheral key="ptc" name="PTC" module-key="i2120">
             <signals>
-                <signal pad-id="pb2" index="0" function="PTC_DS" group="DS"/>
-                <signal pad-id="pb4" index="1" function="PTC_DS" group="DS"/>
-                <signal pad-id="pa4" index="0" function="PTC_X" group="X"/>
-                <signal pad-id="pa5" index="1" function="PTC_X" group="X"/>
-                <signal pad-id="pa6" index="2" function="PTC_X" group="X"/>
-                <signal pad-id="pa7" index="3" function="PTC_X" group="X"/>
-                <signal pad-id="pb1" index="4" function="PTC_X" group="X"/>
-                <signal pad-id="pb0" index="5" function="PTC_X" group="X"/>
-                <signal pad-id="pa4" index="0" function="PTC_Y" group="Y"/>
-                <signal pad-id="pa5" index="1" function="PTC_Y" group="Y"/>
-                <signal pad-id="pa6" index="2" function="PTC_Y" group="Y"/>
-                <signal pad-id="pa7" index="3" function="PTC_Y" group="Y"/>
-                <signal pad-id="pb1" index="4" function="PTC_Y" group="Y"/>
-                <signal pad-id="pb0" index="5" function="PTC_Y" group="Y"/>
+                <signal pad-key="pb2" index="0" function="PTC_DS" group="DS"/>
+                <signal pad-key="pb4" index="1" function="PTC_DS" group="DS"/>
+                <signal pad-key="pa4" index="0" function="PTC_X" group="X"/>
+                <signal pad-key="pa5" index="1" function="PTC_X" group="X"/>
+                <signal pad-key="pa6" index="2" function="PTC_X" group="X"/>
+                <signal pad-key="pa7" index="3" function="PTC_X" group="X"/>
+                <signal pad-key="pb1" index="4" function="PTC_X" group="X"/>
+                <signal pad-key="pb0" index="5" function="PTC_X" group="X"/>
+                <signal pad-key="pa4" index="0" function="PTC_Y" group="Y"/>
+                <signal pad-key="pa5" index="1" function="PTC_Y" group="Y"/>
+                <signal pad-key="pa6" index="2" function="PTC_Y" group="Y"/>
+                <signal pad-key="pa7" index="3" function="PTC_Y" group="Y"/>
+                <signal pad-key="pb1" index="4" function="PTC_Y" group="Y"/>
+                <signal pad-key="pb0" index="5" function="PTC_Y" group="Y"/>
             </signals>
         </peripheral>
         <peripheral key="rstctrl" name="RSTCTRL" module-key="i2111">
             <register-group-instance register-group-key="rstctrl" address-space-key="data" offset="0x40"/>
             <signals>
-                <signal pad-id="pa0" function="OTHER" group="RESET"/>
+                <signal pad-key="pa0" function="OTHER" group="RESET"/>
             </signals>
         </peripheral>
         <peripheral key="rtc" name="RTC" module-key="i2116">
@@ -254,75 +254,75 @@
         <peripheral key="spi0" name="SPI0" module-key="i2107">
             <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"/>
-                <signal pad-id="pc2" function="SPI0_ALT" group="MOSI" field="PORTMUX.CTRLB.SPI0"/>
-                <signal pad-id="pa1" function="SPI0" group="MOSI" field="PORTMUX.CTRLB.SPI0"/>
-                <signal pad-id="pc0" function="SPI0_ALT" group="SCK" field="PORTMUX.CTRLB.SPI0"/>
-                <signal pad-id="pa3" function="SPI0" group="SCK" field="PORTMUX.CTRLB.SPI0"/>
-                <signal pad-id="pc3" function="SPI0_ALT" group="SS" field="PORTMUX.CTRLB.SPI0"/>
-                <signal pad-id="pa4" function="SPI0" group="SS" field="PORTMUX.CTRLB.SPI0"/>
+                <signal pad-key="pc1" function="SPI0_ALT" group="MISO" field="PORTMUX.CTRLB.SPI0"/>
+                <signal pad-key="pa2" function="SPI0" group="MISO" field="PORTMUX.CTRLB.SPI0"/>
+                <signal pad-key="pc2" function="SPI0_ALT" group="MOSI" field="PORTMUX.CTRLB.SPI0"/>
+                <signal pad-key="pa1" function="SPI0" group="MOSI" field="PORTMUX.CTRLB.SPI0"/>
+                <signal pad-key="pc0" function="SPI0_ALT" group="SCK" field="PORTMUX.CTRLB.SPI0"/>
+                <signal pad-key="pa3" function="SPI0" group="SCK" field="PORTMUX.CTRLB.SPI0"/>
+                <signal pad-key="pc3" function="SPI0_ALT" group="SS" field="PORTMUX.CTRLB.SPI0"/>
+                <signal pad-key="pa4" function="SPI0" group="SS" field="PORTMUX.CTRLB.SPI0"/>
             </signals>
         </peripheral>
         <peripheral key="syscfg" name="SYSCFG" module-key="i2600_syscfg">
             <register-group-instance register-group-key="syscfg" address-space-key="data" offset="0xF00"/>
             <signals>
-                <signal pad-id="pa0" function="OTHER" group="UPDI"/>
+                <signal pad-key="pa0" function="OTHER" group="UPDI"/>
             </signals>
         </peripheral>
         <peripheral key="tca0" name="TCA0" module-key="i2117">
             <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"/>
-                <signal pad-id="pb4" index="1" function="TCA0_ALT" group="WO" field="PORTMUX.CTRLC.TCA01"/>
-                <signal pad-id="pb1" index="1" function="TCA0" group="WO" field="PORTMUX.CTRLC.TCA01"/>
-                <signal pad-id="pb5" index="2" function="TCA0_ALT" group="WO" field="PORTMUX.CTRLC.TCA02"/>
-                <signal pad-id="pb2" index="2" function="TCA0" group="WO" field="PORTMUX.CTRLC.TCA02"/>
-                <signal pad-id="pc3" index="3" function="TCA0_ALT" group="WO" field="PORTMUX.CTRLC.TCA03"/>
-                <signal pad-id="pa3" index="3" function="TCA0" group="WO" field="PORTMUX.CTRLC.TCA03"/>
-                <signal pad-id="pc4" index="4" function="TCA0_ALT" group="WO" field="PORTMUX.CTRLC.TCA04"/>
-                <signal pad-id="pa4" index="4" function="TCA0" group="WO" field="PORTMUX.CTRLC.TCA04"/>
-                <signal pad-id="pc5" index="5" function="TCA0_ALT" group="WO" field="PORTMUX.CTRLC.TCA05"/>
-                <signal pad-id="pa5" index="5" function="TCA0" group="WO" field="PORTMUX.CTRLC.TCA05"/>
+                <signal pad-key="pb3" index="0" function="TCA0_ALT" group="WO" field="PORTMUX.CTRLC.TCA00"/>
+                <signal pad-key="pb0" index="0" function="TCA0" group="WO" field="PORTMUX.CTRLC.TCA00"/>
+                <signal pad-key="pb4" index="1" function="TCA0_ALT" group="WO" field="PORTMUX.CTRLC.TCA01"/>
+                <signal pad-key="pb1" index="1" function="TCA0" group="WO" field="PORTMUX.CTRLC.TCA01"/>
+                <signal pad-key="pb5" index="2" function="TCA0_ALT" group="WO" field="PORTMUX.CTRLC.TCA02"/>
+                <signal pad-key="pb2" index="2" function="TCA0" group="WO" field="PORTMUX.CTRLC.TCA02"/>
+                <signal pad-key="pc3" index="3" function="TCA0_ALT" group="WO" field="PORTMUX.CTRLC.TCA03"/>
+                <signal pad-key="pa3" index="3" function="TCA0" group="WO" field="PORTMUX.CTRLC.TCA03"/>
+                <signal pad-key="pc4" index="4" function="TCA0_ALT" group="WO" field="PORTMUX.CTRLC.TCA04"/>
+                <signal pad-key="pa4" index="4" function="TCA0" group="WO" field="PORTMUX.CTRLC.TCA04"/>
+                <signal pad-key="pc5" index="5" function="TCA0_ALT" group="WO" field="PORTMUX.CTRLC.TCA05"/>
+                <signal pad-key="pa5" index="5" function="TCA0" group="WO" field="PORTMUX.CTRLC.TCA05"/>
             </signals>
         </peripheral>
         <peripheral key="tcb0" name="TCB0" module-key="i2119">
             <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"/>
+                <signal pad-key="pc0" index="0" function="TCB0_ALT" group="WO" field="PORTMUX.CTRLD.TCB0"/>
+                <signal pad-key="pa5" index="0" function="TCB0" group="WO" field="PORTMUX.CTRLD.TCB0"/>
             </signals>
         </peripheral>
         <peripheral key="tcd0" name="TCD0" module-key="i2129">
             <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"/>
-                <signal pad-id="pc0" function="TCD0" group="WOC"/>
-                <signal pad-id="pc1" function="TCD0" group="WOD"/>
+                <signal pad-key="pa4" function="TCD0" group="WOA"/>
+                <signal pad-key="pa5" function="TCD0" group="WOB"/>
+                <signal pad-key="pc0" function="TCD0" group="WOC"/>
+                <signal pad-key="pc1" function="TCD0" group="WOD"/>
             </signals>
         </peripheral>
         <peripheral key="twi0" name="TWI0" module-key="i2110">
             <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"/>
-                <signal pad-id="pa1" function="TWI0_ALT" group="SDA" field="PORTMUX.CTRLB.TWI0"/>
-                <signal pad-id="pb1" function="TWI0" group="SDA" field="PORTMUX.CTRLB.TWI0"/>
+                <signal pad-key="pa2" function="TWI0_ALT" group="SCL" field="PORTMUX.CTRLB.TWI0"/>
+                <signal pad-key="pb0" function="TWI0" group="SCL" field="PORTMUX.CTRLB.TWI0"/>
+                <signal pad-key="pa1" function="TWI0_ALT" group="SDA" field="PORTMUX.CTRLB.TWI0"/>
+                <signal pad-key="pb1" function="TWI0" group="SDA" field="PORTMUX.CTRLB.TWI0"/>
             </signals>
         </peripheral>
         <peripheral key="usart0" name="USART0" module-key="i2108">
             <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"/>
-                <signal pad-id="pa1" function="USART0_ALT" group="TXD" field="PORTMUX.CTRLB.USART0"/>
-                <signal pad-id="pb2" function="USART0" group="TXD" field="PORTMUX.CTRLB.USART0"/>
-                <signal pad-id="pa3" function="USART0_ALT" group="XCK" field="PORTMUX.CTRLB.USART0"/>
-                <signal pad-id="pb1" function="USART0" group="XCK" field="PORTMUX.CTRLB.USART0"/>
-                <signal pad-id="pa4" function="USART0_ALT" group="XDIR" field="PORTMUX.CTRLB.USART0"/>
-                <signal pad-id="pb0" function="USART0" group="XDIR" field="PORTMUX.CTRLB.USART0"/>
+                <signal pad-key="pa2" function="USART0_ALT" group="RXD" field="PORTMUX.CTRLB.USART0"/>
+                <signal pad-key="pb3" function="USART0" group="RXD" field="PORTMUX.CTRLB.USART0"/>
+                <signal pad-key="pa1" function="USART0_ALT" group="TXD" field="PORTMUX.CTRLB.USART0"/>
+                <signal pad-key="pb2" function="USART0" group="TXD" field="PORTMUX.CTRLB.USART0"/>
+                <signal pad-key="pa3" function="USART0_ALT" group="XCK" field="PORTMUX.CTRLB.USART0"/>
+                <signal pad-key="pb1" function="USART0" group="XCK" field="PORTMUX.CTRLB.USART0"/>
+                <signal pad-key="pa4" function="USART0_ALT" group="XDIR" field="PORTMUX.CTRLB.USART0"/>
+                <signal pad-key="pb0" function="USART0" group="XDIR" field="PORTMUX.CTRLB.USART0"/>
             </signals>
         </peripheral>
         <peripheral key="userrow" name="USERROW" module-key="i2600_userrow">
@@ -1389,36 +1389,62 @@
             </register-group>
         </module>
     </modules>
+    <pads>
+        <pad key="pa2" name="PA2"/>
+        <pad key="pa3" name="PA3"/>
+        <pad key="gnd" name="GND"/>
+        <pad key="vdd" name="VDD"/>
+        <pad key="pa4" name="PA4"/>
+        <pad key="pa5" name="PA5"/>
+        <pad key="pa6" name="PA6"/>
+        <pad key="pa7" name="PA7"/>
+        <pad key="pb7" name="PB7"/>
+        <pad key="pb6" name="PB6"/>
+        <pad key="pb5" name="PB5"/>
+        <pad key="pb4" name="PB4"/>
+        <pad key="pb3" name="PB3"/>
+        <pad key="pb2" name="PB2"/>
+        <pad key="pb1" name="PB1"/>
+        <pad key="pb0" name="PB0"/>
+        <pad key="pc0" name="PC0"/>
+        <pad key="pc1" name="PC1"/>
+        <pad key="pc2" name="PC2"/>
+        <pad key="pc3" name="PC3"/>
+        <pad key="pc4" name="PC4"/>
+        <pad key="pc5" name="PC5"/>
+        <pad key="pa0" name="PA0"/>
+        <pad key="pa1" name="PA1"/>
+    </pads>
     <pinouts>
         <pinout key="qfn24" name="QFN24" type="qfn">
-            <pin position="1" pad="PA2"/>
-            <pin position="2" pad="PA3"/>
-            <pin position="3" pad="GND"/>
-            <pin position="4" pad="VDD"/>
-            <pin position="5" pad="PA4"/>
-            <pin position="6" pad="PA5"/>
-            <pin position="7" pad="PA6"/>
-            <pin position="8" pad="PA7"/>
-            <pin position="9" pad="PB7"/>
-            <pin position="10" pad="PB6"/>
-            <pin position="11" pad="PB5"/>
-            <pin position="12" pad="PB4"/>
-            <pin position="13" pad="PB3"/>
-            <pin position="14" pad="PB2"/>
-            <pin position="15" pad="PB1"/>
-            <pin position="16" pad="PB0"/>
-            <pin position="17" pad="PC0"/>
-            <pin position="18" pad="PC1"/>
-            <pin position="19" pad="PC2"/>
-            <pin position="20" pad="PC3"/>
-            <pin position="21" pad="PC4"/>
-            <pin position="22" pad="PC5"/>
-            <pin position="23" pad="PA0"/>
-            <pin position="24" pad="PA1"/>
+            <pin position="1" pad-key="pa2"/>
+            <pin position="2" pad-key="pa3"/>
+            <pin position="3" pad-key="gnd"/>
+            <pin position="4" pad-key="vdd"/>
+            <pin position="5" pad-key="pa4"/>
+            <pin position="6" pad-key="pa5"/>
+            <pin position="7" pad-key="pa6"/>
+            <pin position="8" pad-key="pa7"/>
+            <pin position="9" pad-key="pb7"/>
+            <pin position="10" pad-key="pb6"/>
+            <pin position="11" pad-key="pb5"/>
+            <pin position="12" pad-key="pb4"/>
+            <pin position="13" pad-key="pb3"/>
+            <pin position="14" pad-key="pb2"/>
+            <pin position="15" pad-key="pb1"/>
+            <pin position="16" pad-key="pb0"/>
+            <pin position="17" pad-key="pc0"/>
+            <pin position="18" pad-key="pc1"/>
+            <pin position="19" pad-key="pc2"/>
+            <pin position="20" pad-key="pc3"/>
+            <pin position="21" pad-key="pc4"/>
+            <pin position="22" pad-key="pc5"/>
+            <pin position="23" pad-key="pa0"/>
+            <pin position="24" pad-key="pa1"/>
         </pinout>
     </pinouts>
     <variants>
-        <variant name="ATtiny417-MFR" pinout-key="qfn24" package="VQFN24"/>
-        <variant name="ATtiny417-MNR" pinout-key="qfn24" package="VQFN24"/>
+        <variant key="attiny417_mfr" name="ATtiny417-MFR" pinout-key="qfn24"/>
+        <variant key="attiny417_mnr" name="ATtiny417-MNR" pinout-key="qfn24"/>
     </variants>
 </device>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY4313.xml b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY4313.xml
index e8cdf266..fe7c18b2 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY4313.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY4313.xml
@@ -198,34 +198,34 @@
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pb2" index="2" function="default" group="P"/>
-                <signal pad-id="pb3" index="3" function="default" group="P"/>
-                <signal pad-id="pb4" index="4" function="default" group="P"/>
-                <signal pad-id="pb5" index="5" function="default" group="P"/>
-                <signal pad-id="pb6" index="6" function="default" group="P"/>
-                <signal pad-id="pb7" index="7" function="default" group="P"/>
+                <signal pad-key="pb0" index="0" function="default" group="P"/>
+                <signal pad-key="pb1" index="1" function="default" group="P"/>
+                <signal pad-key="pb2" index="2" function="default" group="P"/>
+                <signal pad-key="pb3" index="3" function="default" group="P"/>
+                <signal pad-key="pb4" index="4" function="default" group="P"/>
+                <signal pad-key="pb5" index="5" function="default" group="P"/>
+                <signal pad-key="pb6" index="6" function="default" group="P"/>
+                <signal pad-key="pb7" index="7" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pd2" index="2" function="default" group="P"/>
-                <signal pad-id="pd3" index="3" function="default" group="P"/>
-                <signal pad-id="pd4" index="4" function="default" group="P"/>
-                <signal pad-id="pd5" index="5" function="default" group="P"/>
-                <signal pad-id="pd6" index="6" function="default" group="P"/>
+                <signal pad-key="pd0" index="0" function="default" group="P"/>
+                <signal pad-key="pd1" index="1" function="default" group="P"/>
+                <signal pad-key="pd2" index="2" function="default" group="P"/>
+                <signal pad-key="pd3" index="3" function="default" group="P"/>
+                <signal pad-key="pd4" index="4" function="default" group="P"/>
+                <signal pad-key="pd5" index="5" function="default" group="P"/>
+                <signal pad-key="pd6" index="6" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pa2" index="2" function="default" group="P"/>
+                <signal pad-key="pa0" index="0" function="default" group="P"/>
+                <signal pad-key="pa1" index="1" function="default" group="P"/>
+                <signal pad-key="pa2" index="2" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="tc0" name="TC0" module-key="tc8">
@@ -539,59 +539,81 @@
             </register-group>
         </module>
     </modules>
+    <pads>
+        <pad key="pa2" name="PA2"/>
+        <pad key="pd0" name="PD0"/>
+        <pad key="pd1" name="PD1"/>
+        <pad key="pa1" name="PA1"/>
+        <pad key="pa0" name="PA0"/>
+        <pad key="pd2" name="PD2"/>
+        <pad key="pd3" name="PD3"/>
+        <pad key="pd4" name="PD4"/>
+        <pad key="pd5" name="PD5"/>
+        <pad key="gnd" name="GND"/>
+        <pad key="pd6" name="PD6"/>
+        <pad key="pb0" name="PB0"/>
+        <pad key="pb1" name="PB1"/>
+        <pad key="pb2" name="PB2"/>
+        <pad key="pb3" name="PB3"/>
+        <pad key="pb4" name="PB4"/>
+        <pad key="pb5" name="PB5"/>
+        <pad key="pb6" name="PB6"/>
+        <pad key="pb7" name="PB7"/>
+        <pad key="vcc" name="VCC"/>
+    </pads>
     <pinouts>
         <pinout key="pdip_soic_20" name="PDIP_SOIC_20" type="dip">
-            <pin position="1" pad="PA2"/>
-            <pin position="2" pad="PD0"/>
-            <pin position="3" pad="PD1"/>
-            <pin position="4" pad="PA1"/>
-            <pin position="5" pad="PA0"/>
-            <pin position="6" pad="PD2"/>
-            <pin position="7" pad="PD3"/>
-            <pin position="8" pad="PD4"/>
-            <pin position="9" pad="PD5"/>
-            <pin position="10" pad="GND"/>
-            <pin position="11" pad="PD6"/>
-            <pin position="12" pad="PB0"/>
-            <pin position="13" pad="PB1"/>
-            <pin position="14" pad="PB2"/>
-            <pin position="15" pad="PB3"/>
-            <pin position="16" pad="PB4"/>
-            <pin position="17" pad="PB5"/>
-            <pin position="18" pad="PB6"/>
-            <pin position="19" pad="PB7"/>
-            <pin position="20" pad="VCC"/>
+            <pin position="1" pad-key="pa2"/>
+            <pin position="2" pad-key="pd0"/>
+            <pin position="3" pad-key="pd1"/>
+            <pin position="4" pad-key="pa1"/>
+            <pin position="5" pad-key="pa0"/>
+            <pin position="6" pad-key="pd2"/>
+            <pin position="7" pad-key="pd3"/>
+            <pin position="8" pad-key="pd4"/>
+            <pin position="9" pad-key="pd5"/>
+            <pin position="10" pad-key="gnd"/>
+            <pin position="11" pad-key="pd6"/>
+            <pin position="12" pad-key="pb0"/>
+            <pin position="13" pad-key="pb1"/>
+            <pin position="14" pad-key="pb2"/>
+            <pin position="15" pad-key="pb3"/>
+            <pin position="16" pad-key="pb4"/>
+            <pin position="17" pad-key="pb5"/>
+            <pin position="18" pad-key="pb6"/>
+            <pin position="19" pad-key="pb7"/>
+            <pin position="20" pad-key="vcc"/>
         </pinout>
         <pinout key="qfn20" name="QFN20" type="qfn">
-            <pin position="1" pad="PD1"/>
-            <pin position="2" pad="PA1"/>
-            <pin position="3" pad="PA0"/>
-            <pin position="4" pad="PD2"/>
-            <pin position="5" pad="PD3"/>
-            <pin position="6" pad="PD4"/>
-            <pin position="7" pad="PD5"/>
-            <pin position="8" pad="GND"/>
-            <pin position="9" pad="PD6"/>
-            <pin position="10" pad="PB0"/>
-            <pin position="11" pad="PB1"/>
-            <pin position="12" pad="PB2"/>
-            <pin position="13" pad="PB3"/>
-            <pin position="14" pad="PB4"/>
-            <pin position="15" pad="PB5"/>
-            <pin position="16" pad="PB6"/>
-            <pin position="17" pad="PB7"/>
-            <pin position="18" pad="VCC"/>
-            <pin position="19" pad="PA2"/>
-            <pin position="20" pad="PD0"/>
+            <pin position="1" pad-key="pd1"/>
+            <pin position="2" pad-key="pa1"/>
+            <pin position="3" pad-key="pa0"/>
+            <pin position="4" pad-key="pd2"/>
+            <pin position="5" pad-key="pd3"/>
+            <pin position="6" pad-key="pd4"/>
+            <pin position="7" pad-key="pd5"/>
+            <pin position="8" pad-key="gnd"/>
+            <pin position="9" pad-key="pd6"/>
+            <pin position="10" pad-key="pb0"/>
+            <pin position="11" pad-key="pb1"/>
+            <pin position="12" pad-key="pb2"/>
+            <pin position="13" pad-key="pb3"/>
+            <pin position="14" pad-key="pb4"/>
+            <pin position="15" pad-key="pb5"/>
+            <pin position="16" pad-key="pb6"/>
+            <pin position="17" pad-key="pb7"/>
+            <pin position="18" pad-key="vcc"/>
+            <pin position="19" pad-key="pa2"/>
+            <pin position="20" pad-key="pd0"/>
         </pinout>
     </pinouts>
     <variants>
-        <variant name="ATtiny4313-PU" pinout-key="pdip_soic_20" package="PDIP20"/>
-        <variant name="ATtiny4313-SU" pinout-key="pdip_soic_20" package="SOIC20"/>
-        <variant name="ATtiny4313-SUR" pinout-key="pdip_soic_20" package="SOIC20"/>
-        <variant name="ATtiny4313-MMH" pinout-key="qfn20" package="VQFN20"/>
-        <variant name="ATtiny4313-MMHR" pinout-key="qfn20" package="VQFN20"/>
-        <variant name="ATtiny4313-MU" pinout-key="qfn20" package="WQFN20"/>
-        <variant name="ATtiny4313-MUR" pinout-key="qfn20" package="WQFN20"/>
+        <variant key="attiny4313_pu" name="ATtiny4313-PU" pinout-key="pdip_soic_20"/>
+        <variant key="attiny4313_su" name="ATtiny4313-SU" pinout-key="pdip_soic_20"/>
+        <variant key="attiny4313_sur" name="ATtiny4313-SUR" pinout-key="pdip_soic_20"/>
+        <variant key="attiny4313_mmh" name="ATtiny4313-MMH" pinout-key="qfn20"/>
+        <variant key="attiny4313_mmhr" name="ATtiny4313-MMHR" pinout-key="qfn20"/>
+        <variant key="attiny4313_mu" name="ATtiny4313-MU" pinout-key="qfn20"/>
+        <variant key="attiny4313_mur" name="ATtiny4313-MUR" pinout-key="qfn20"/>
     </variants>
 </device>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY43U.xml b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY43U.xml
index f8987f31..810c2166 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY43U.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY43U.xml
@@ -172,27 +172,27 @@
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pa2" index="2" function="PORTA" group="P"/>
-                <signal pad-id="pa3" index="3" function="PORTA" group="P"/>
-                <signal pad-id="pa4" index="4" function="PORTA" group="P"/>
-                <signal pad-id="pa5" index="5" function="PORTA" group="P"/>
-                <signal pad-id="pa6" index="6" function="PORTA" group="P"/>
-                <signal pad-id="pa7" index="7" function="PORTA" group="P"/>
+                <signal pad-key="pa0" index="0" function="PORTA" group="P"/>
+                <signal pad-key="pa1" index="1" function="PORTA" group="P"/>
+                <signal pad-key="pa2" index="2" function="PORTA" group="P"/>
+                <signal pad-key="pa3" index="3" function="PORTA" group="P"/>
+                <signal pad-key="pa4" index="4" function="PORTA" group="P"/>
+                <signal pad-key="pa5" index="5" function="PORTA" group="P"/>
+                <signal pad-key="pa6" index="6" function="PORTA" group="P"/>
+                <signal pad-key="pa7" index="7" function="PORTA" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pb2" index="2" function="PORTB" group="P"/>
-                <signal pad-id="pb3" index="3" function="PORTB" group="P"/>
-                <signal pad-id="pb4" index="4" function="PORTB" group="P"/>
-                <signal pad-id="pb5" index="5" function="PORTB" group="P"/>
-                <signal pad-id="pb6" index="6" function="PORTB" group="P"/>
-                <signal pad-id="pb7" index="7" function="PORTB" group="P"/>
+                <signal pad-key="pb0" index="0" function="PORTB" group="P"/>
+                <signal pad-key="pb1" index="1" function="PORTB" group="P"/>
+                <signal pad-key="pb2" index="2" function="PORTB" group="P"/>
+                <signal pad-key="pb3" index="3" function="PORTB" group="P"/>
+                <signal pad-key="pb4" index="4" function="PORTB" group="P"/>
+                <signal pad-key="pb5" index="5" function="PORTB" group="P"/>
+                <signal pad-key="pb6" index="6" function="PORTB" group="P"/>
+                <signal pad-key="pb7" index="7" function="PORTB" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="usi" name="USI" module-key="usi">
@@ -504,54 +504,76 @@
             </register-group>
         </module>
     </modules>
+    <pads>
+        <pad key="pb0" name="PB0"/>
+        <pad key="pb1" name="PB1"/>
+        <pad key="pb2" name="PB2"/>
+        <pad key="pb3" name="PB3"/>
+        <pad key="pb4" name="PB4"/>
+        <pad key="pb5" name="PB5"/>
+        <pad key="pb6" name="PB6"/>
+        <pad key="pb7" name="PB7"/>
+        <pad key="vcc" name="VCC"/>
+        <pad key="gnd" name="GND"/>
+        <pad key="lsw" name="LSW"/>
+        <pad key="vbat" name="VBAT"/>
+        <pad key="pa0" name="PA0"/>
+        <pad key="pa1" name="PA1"/>
+        <pad key="pa2" name="PA2"/>
+        <pad key="pa3" name="PA3"/>
+        <pad key="pa4" name="PA4"/>
+        <pad key="pa5" name="PA5"/>
+        <pad key="pa6" name="PA6"/>
+        <pad key="pa7" name="PA7"/>
+    </pads>
     <pinouts>
         <pinout key="soic20" name="SOIC20" type="soic">
-            <pin position="1" pad="PB0"/>
-            <pin position="2" pad="PB1"/>
-            <pin position="3" pad="PB2"/>
-            <pin position="4" pad="PB3"/>
-            <pin position="5" pad="PB4"/>
-            <pin position="6" pad="PB5"/>
-            <pin position="7" pad="PB6"/>
-            <pin position="8" pad="PB7"/>
-            <pin position="9" pad="VCC"/>
-            <pin position="10" pad="GND"/>
-            <pin position="11" pad="LSW"/>
-            <pin position="12" pad="VBAT"/>
-            <pin position="13" pad="PA0"/>
-            <pin position="14" pad="PA1"/>
-            <pin position="15" pad="PA2"/>
-            <pin position="16" pad="PA3"/>
-            <pin position="17" pad="PA4"/>
-            <pin position="18" pad="PA5"/>
-            <pin position="19" pad="PA6"/>
-            <pin position="20" pad="PA7"/>
+            <pin position="1" pad-key="pb0"/>
+            <pin position="2" pad-key="pb1"/>
+            <pin position="3" pad-key="pb2"/>
+            <pin position="4" pad-key="pb3"/>
+            <pin position="5" pad-key="pb4"/>
+            <pin position="6" pad-key="pb5"/>
+            <pin position="7" pad-key="pb6"/>
+            <pin position="8" pad-key="pb7"/>
+            <pin position="9" pad-key="vcc"/>
+            <pin position="10" pad-key="gnd"/>
+            <pin position="11" pad-key="lsw"/>
+            <pin position="12" pad-key="vbat"/>
+            <pin position="13" pad-key="pa0"/>
+            <pin position="14" pad-key="pa1"/>
+            <pin position="15" pad-key="pa2"/>
+            <pin position="16" pad-key="pa3"/>
+            <pin position="17" pad-key="pa4"/>
+            <pin position="18" pad-key="pa5"/>
+            <pin position="19" pad-key="pa6"/>
+            <pin position="20" pad-key="pa7"/>
         </pinout>
         <pinout key="qfn20" name="QFN20" type="qfn">
-            <pin position="1" pad="PB2"/>
-            <pin position="2" pad="PB3"/>
-            <pin position="3" pad="PB4"/>
-            <pin position="4" pad="PB5"/>
-            <pin position="5" pad="PB6"/>
-            <pin position="6" pad="PB7"/>
-            <pin position="7" pad="VCC"/>
-            <pin position="8" pad="GND"/>
-            <pin position="9" pad="LSW"/>
-            <pin position="10" pad="VBAT"/>
-            <pin position="11" pad="PA0"/>
-            <pin position="12" pad="PA1"/>
-            <pin position="13" pad="PA2"/>
-            <pin position="14" pad="PA3"/>
-            <pin position="15" pad="PA4"/>
-            <pin position="16" pad="PA5"/>
-            <pin position="17" pad="PA6"/>
-            <pin position="18" pad="PA7"/>
-            <pin position="19" pad="PB0"/>
-            <pin position="20" pad="PB1"/>
+            <pin position="1" pad-key="pb2"/>
+            <pin position="2" pad-key="pb3"/>
+            <pin position="3" pad-key="pb4"/>
+            <pin position="4" pad-key="pb5"/>
+            <pin position="5" pad-key="pb6"/>
+            <pin position="6" pad-key="pb7"/>
+            <pin position="7" pad-key="vcc"/>
+            <pin position="8" pad-key="gnd"/>
+            <pin position="9" pad-key="lsw"/>
+            <pin position="10" pad-key="vbat"/>
+            <pin position="11" pad-key="pa0"/>
+            <pin position="12" pad-key="pa1"/>
+            <pin position="13" pad-key="pa2"/>
+            <pin position="14" pad-key="pa3"/>
+            <pin position="15" pad-key="pa4"/>
+            <pin position="16" pad-key="pa5"/>
+            <pin position="17" pad-key="pa6"/>
+            <pin position="18" pad-key="pa7"/>
+            <pin position="19" pad-key="pb0"/>
+            <pin position="20" pad-key="pb1"/>
         </pinout>
     </pinouts>
     <variants>
-        <variant name="ATtiny43U-SU" pinout-key="soic20" package="SOIC20"/>
-        <variant name="ATtiny43U-MU" pinout-key="qfn20" package="WQFN20"/>
+        <variant key="attiny43u_su" name="ATtiny43U-SU" pinout-key="soic20"/>
+        <variant key="attiny43u_mu" name="ATtiny43U-MU" pinout-key="qfn20"/>
     </variants>
 </device>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY44.xml b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY44.xml
index 39b2c82e..423a2f6d 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY44.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY44.xml
@@ -170,23 +170,23 @@
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pa2" index="2" function="PORTA" group="P"/>
-                <signal pad-id="pa3" index="3" function="PORTA" group="P"/>
-                <signal pad-id="pa4" index="4" function="PORTA" group="P"/>
-                <signal pad-id="pa5" index="5" function="PORTA" group="P"/>
-                <signal pad-id="pa6" index="6" function="PORTA" group="P"/>
-                <signal pad-id="pa7" index="7" function="PORTA" group="P"/>
+                <signal pad-key="pa0" index="0" function="PORTA" group="P"/>
+                <signal pad-key="pa1" index="1" function="PORTA" group="P"/>
+                <signal pad-key="pa2" index="2" function="PORTA" group="P"/>
+                <signal pad-key="pa3" index="3" function="PORTA" group="P"/>
+                <signal pad-key="pa4" index="4" function="PORTA" group="P"/>
+                <signal pad-key="pa5" index="5" function="PORTA" group="P"/>
+                <signal pad-key="pa6" index="6" function="PORTA" group="P"/>
+                <signal pad-key="pa7" index="7" function="PORTA" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pb2" index="2" function="PORTB" group="P"/>
-                <signal pad-id="pb3" index="3" function="PORTB" group="P"/>
+                <signal pad-key="pb0" index="0" function="PORTB" group="P"/>
+                <signal pad-key="pb1" index="1" function="PORTB" group="P"/>
+                <signal pad-key="pb2" index="2" function="PORTB" group="P"/>
+                <signal pad-key="pb3" index="3" function="PORTB" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="ac" name="AC" module-key="ac">
@@ -490,49 +490,65 @@
             </register-group>
         </module>
     </modules>
+    <pads>
+        <pad key="vcc" name="VCC"/>
+        <pad key="pb0" name="PB0"/>
+        <pad key="pb1" name="PB1"/>
+        <pad key="pb3" name="PB3"/>
+        <pad key="pb2" name="PB2"/>
+        <pad key="pa7" name="PA7"/>
+        <pad key="pa6" name="PA6"/>
+        <pad key="pa5" name="PA5"/>
+        <pad key="pa4" name="PA4"/>
+        <pad key="pa3" name="PA3"/>
+        <pad key="pa2" name="PA2"/>
+        <pad key="pa1" name="PA1"/>
+        <pad key="pa0" name="PA0"/>
+        <pad key="gnd" name="GND"/>
+    </pads>
     <pinouts>
         <pinout key="soic_14" name="SOIC_14" type="soic">
-            <pin position="1" pad="VCC"/>
-            <pin position="2" pad="PB0"/>
-            <pin position="3" pad="PB1"/>
-            <pin position="4" pad="PB3"/>
-            <pin position="5" pad="PB2"/>
-            <pin position="6" pad="PA7"/>
-            <pin position="7" pad="PA6"/>
-            <pin position="8" pad="PA5"/>
-            <pin position="9" pad="PA4"/>
-            <pin position="10" pad="PA3"/>
-            <pin position="11" pad="PA2"/>
-            <pin position="12" pad="PA1"/>
-            <pin position="13" pad="PA0"/>
-            <pin position="14" pad="GND"/>
+            <pin position="1" pad-key="vcc"/>
+            <pin position="2" pad-key="pb0"/>
+            <pin position="3" pad-key="pb1"/>
+            <pin position="4" pad-key="pb3"/>
+            <pin position="5" pad-key="pb2"/>
+            <pin position="6" pad-key="pa7"/>
+            <pin position="7" pad-key="pa6"/>
+            <pin position="8" pad-key="pa5"/>
+            <pin position="9" pad-key="pa4"/>
+            <pin position="10" pad-key="pa3"/>
+            <pin position="11" pad-key="pa2"/>
+            <pin position="12" pad-key="pa1"/>
+            <pin position="13" pad-key="pa0"/>
+            <pin position="14" pad-key="gnd"/>
         </pinout>
         <pinout key="qfn_20" name="QFN_20" type="qfn">
-            <pin position="1" pad="PA4"/>
-            <pin position="2" pad="PA3"/>
-            <pin position="3" pad="PA2"/>
-            <pin position="4" pad="PA1"/>
-            <pin position="5" pad="PA0"/>
-            <pin position="6" pad="NC"/>
-            <pin position="7" pad="NC"/>
-            <pin position="8" pad="GND"/>
-            <pin position="9" pad="VCC"/>
-            <pin position="10" pad="NC"/>
-            <pin position="11" pad="PB0"/>
-            <pin position="12" pad="PB1"/>
-            <pin position="13" pad="PB3"/>
-            <pin position="14" pad="PB2"/>
-            <pin position="15" pad="PA7"/>
-            <pin position="16" pad="PA6"/>
-            <pin position="17" pad="NC"/>
-            <pin position="18" pad="NC"/>
-            <pin position="19" pad="NC"/>
-            <pin position="20" pad="PA5"/>
+            <pin position="1" pad-key="pa4"/>
+            <pin position="2" pad-key="pa3"/>
+            <pin position="3" pad-key="pa2"/>
+            <pin position="4" pad-key="pa1"/>
+            <pin position="5" pad-key="pa0"/>
+            <pin position="6"/>
+            <pin position="7"/>
+            <pin position="8" pad-key="gnd"/>
+            <pin position="9" pad-key="vcc"/>
+            <pin position="10"/>
+            <pin position="11" pad-key="pb0"/>
+            <pin position="12" pad-key="pb1"/>
+            <pin position="13" pad-key="pb3"/>
+            <pin position="14" pad-key="pb2"/>
+            <pin position="15" pad-key="pa7"/>
+            <pin position="16" pad-key="pa6"/>
+            <pin position="17"/>
+            <pin position="18"/>
+            <pin position="19"/>
+            <pin position="20" pad-key="pa5"/>
         </pinout>
     </pinouts>
     <variants>
-        <variant name="ATtiny44-20PU" pinout-key="soic_14" package="PDIP14"/>
-        <variant name="ATtiny44-20SSU" pinout-key="soic_14" package="SOIC14"/>
-        <variant name="ATtiny44-20MU" pinout-key="qfn_20" package="WQFN20"/>
+        <variant key="attiny44_20pu" name="ATtiny44-20PU" pinout-key="soic_14"/>
+        <variant key="attiny44_20ssu" name="ATtiny44-20SSU" pinout-key="soic_14"/>
+        <variant key="attiny44_20mu" name="ATtiny44-20MU" pinout-key="qfn_20"/>
     </variants>
 </device>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY441.xml b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY441.xml
index 495912fc..2da28674 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY441.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY441.xml
@@ -171,42 +171,42 @@
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pb2" index="2" function="PORTB" group="P"/>
-                <signal pad-id="pb3" index="3" function="PORTB" group="P"/>
+                <signal pad-key="pb0" index="0" function="PORTB" group="P"/>
+                <signal pad-key="pb1" index="1" function="PORTB" group="P"/>
+                <signal pad-key="pb2" index="2" function="PORTB" group="P"/>
+                <signal pad-key="pb3" index="3" function="PORTB" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pa2" index="2" function="PORTA" group="P"/>
-                <signal pad-id="pa3" index="3" function="PORTA" group="P"/>
-                <signal pad-id="pa4" index="4" function="PORTA" group="P"/>
-                <signal pad-id="pa5" index="5" function="PORTA" group="P"/>
-                <signal pad-id="pa6" index="6" function="PORTA" group="P"/>
-                <signal pad-id="pa7" index="7" function="PORTA" group="P"/>
+                <signal pad-key="pa0" index="0" function="PORTA" group="P"/>
+                <signal pad-key="pa1" index="1" function="PORTA" group="P"/>
+                <signal pad-key="pa2" index="2" function="PORTA" group="P"/>
+                <signal pad-key="pa3" index="3" function="PORTA" group="P"/>
+                <signal pad-key="pa4" index="4" function="PORTA" group="P"/>
+                <signal pad-key="pa5" index="5" function="PORTA" group="P"/>
+                <signal pad-key="pa6" index="6" function="PORTA" group="P"/>
+                <signal pad-key="pa7" index="7" function="PORTA" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="usart1" name="USART1" module-key="usart">
             <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"/>
-                <signal pad-id="pa6" function="USART" group="XCK"/>
+                <signal pad-key="pa4" function="USART" group="RXD"/>
+                <signal pad-key="pa5" function="USART" group="TXD"/>
+                <signal pad-key="pa6" function="USART" group="XCK"/>
             </signals>
         </peripheral>
         <peripheral key="usart0" name="USART0" module-key="usart">
             <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"/>
-                <signal pad-id="pa3" function="USART" group="XCK" field="U0MAP"/>
-                <signal pad-id="pa7" function="USART_ALT" group="TXD" field="U0MAP"/>
-                <signal pad-id="pb2" function="USART_ALT" group="RXD" field="U0MAP"/>
-                <signal pad-id="pa3" function="USART_ALT" group="XCK" field="U0MAP"/>
+                <signal pad-key="pa1" function="USART" group="TXD" field="U0MAP"/>
+                <signal pad-key="pa2" function="USART" group="RXD" field="U0MAP"/>
+                <signal pad-key="pa3" function="USART" group="XCK" field="U0MAP"/>
+                <signal pad-key="pa7" function="USART_ALT" group="TXD" field="U0MAP"/>
+                <signal pad-key="pb2" function="USART_ALT" group="RXD" field="U0MAP"/>
+                <signal pad-key="pa3" function="USART_ALT" group="XCK" field="U0MAP"/>
             </signals>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="wdt">
@@ -215,37 +215,37 @@
         <peripheral key="twi" name="TWI" module-key="twi">
             <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"/>
+                <signal pad-key="pa4" function="TWI" group="SCL"/>
+                <signal pad-key="pa6" function="TWI" group="SDA"/>
             </signals>
         </peripheral>
         <peripheral key="adc" name="ADC" module-key="adc">
             <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"/>
-                <signal pad-id="pa2" index="2" function="ADC" group="ADC"/>
-                <signal pad-id="pa3" index="3" function="ADC" group="ADC"/>
-                <signal pad-id="pa4" index="4" function="ADC" group="ADC"/>
-                <signal pad-id="pa5" index="5" function="ADC" group="ADC"/>
-                <signal pad-id="pa6" index="6" function="ADC" group="ADC"/>
-                <signal pad-id="pa7" index="7" function="ADC" group="ADC"/>
-                <signal pad-id="pb2" index="8" function="ADC" group="ADC"/>
-                <signal pad-id="pb3" index="9" function="ADC" group="ADC"/>
-                <signal pad-id="pb0" index="10" function="ADC" group="ADC"/>
-                <signal pad-id="pb1" index="11" function="ADC" group="ADC"/>
-                <signal pad-id="pa0" function="AREF" group="AREF"/>
+                <signal pad-key="pa0" index="0" function="ADC" group="ADC"/>
+                <signal pad-key="pa1" index="1" function="ADC" group="ADC"/>
+                <signal pad-key="pa2" index="2" function="ADC" group="ADC"/>
+                <signal pad-key="pa3" index="3" function="ADC" group="ADC"/>
+                <signal pad-key="pa4" index="4" function="ADC" group="ADC"/>
+                <signal pad-key="pa5" index="5" function="ADC" group="ADC"/>
+                <signal pad-key="pa6" index="6" function="ADC" group="ADC"/>
+                <signal pad-key="pa7" index="7" function="ADC" group="ADC"/>
+                <signal pad-key="pb2" index="8" function="ADC" group="ADC"/>
+                <signal pad-key="pb3" index="9" function="ADC" group="ADC"/>
+                <signal pad-key="pb0" index="10" function="ADC" group="ADC"/>
+                <signal pad-key="pb1" index="11" function="ADC" group="ADC"/>
+                <signal pad-key="pa0" function="AREF" group="AREF"/>
             </signals>
         </peripheral>
         <peripheral key="ac" name="AC" module-key="ac">
             <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"/>
-                <signal pad-id="pa5" function="ACOUT" group="ACO0"/>
-                <signal pad-id="pa6" function="ACOUT" group="ACO1"/>
-                <signal pad-id="pa3" index="0" function="ACIN1" group="AIN1"/>
-                <signal pad-id="pa4" index="1" function="ACIN1" group="AIN1"/>
+                <signal pad-key="pa1" index="0" function="ACIN0" group="AIN0"/>
+                <signal pad-key="pa2" index="1" function="ACIN0" group="AIN0"/>
+                <signal pad-key="pa5" function="ACOUT" group="ACO0"/>
+                <signal pad-key="pa6" function="ACOUT" group="ACO1"/>
+                <signal pad-key="pa3" index="0" function="ACIN1" group="AIN1"/>
+                <signal pad-key="pa4" index="1" function="ACIN1" group="AIN1"/>
             </signals>
         </peripheral>
         <peripheral key="eeprom" name="EEPROM" module-key="eeprom">
@@ -254,69 +254,69 @@
         <peripheral key="tc1" name="TC1" module-key="tc16">
             <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"/>
-                <signal pad-id="pa3" index="2" function="OC" group="TOCC"/>
-                <signal pad-id="pa4" index="3" function="OC" group="TOCC"/>
-                <signal pad-id="pa5" index="4" function="OC" group="TOCC"/>
-                <signal pad-id="pa6" index="5" function="OC" group="TOCC"/>
-                <signal pad-id="pa7" index="6" function="OC" group="TOCC"/>
-                <signal pad-id="pb2" index="7" function="OC" group="TOCC"/>
-                <signal pad-id="pa3" function="CS" group="T0"/>
-                <signal pad-id="pa4" function="CS" group="T1"/>
-                <signal pad-id="pa5" function="CS" group="T2"/>
-                <signal pad-id="pa7" function="ICP" group="ICP1"/>
+                <signal pad-key="pa1" index="0" function="OC" group="TOCC"/>
+                <signal pad-key="pa2" index="1" function="OC" group="TOCC"/>
+                <signal pad-key="pa3" index="2" function="OC" group="TOCC"/>
+                <signal pad-key="pa4" index="3" function="OC" group="TOCC"/>
+                <signal pad-key="pa5" index="4" function="OC" group="TOCC"/>
+                <signal pad-key="pa6" index="5" function="OC" group="TOCC"/>
+                <signal pad-key="pa7" index="6" function="OC" group="TOCC"/>
+                <signal pad-key="pb2" index="7" function="OC" group="TOCC"/>
+                <signal pad-key="pa3" function="CS" group="T0"/>
+                <signal pad-key="pa4" function="CS" group="T1"/>
+                <signal pad-key="pa5" function="CS" group="T2"/>
+                <signal pad-key="pa7" function="ICP" group="ICP1"/>
             </signals>
         </peripheral>
         <peripheral key="tc2" name="TC2" module-key="tc16">
             <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"/>
-                <signal pad-id="pa3" index="2" function="OC" group="TOCC"/>
-                <signal pad-id="pa4" index="3" function="OC" group="TOCC"/>
-                <signal pad-id="pa5" index="4" function="OC" group="TOCC"/>
-                <signal pad-id="pa6" index="5" function="OC" group="TOCC"/>
-                <signal pad-id="pa7" index="6" function="OC" group="TOCC"/>
-                <signal pad-id="pb2" index="7" function="OC" group="TOCC"/>
-                <signal pad-id="pa3" function="CS" group="T0"/>
-                <signal pad-id="pa4" function="CS" group="T1"/>
-                <signal pad-id="pa5" function="CS" group="T2"/>
-                <signal pad-id="pb2" function="ICP" group="ICP2"/>
+                <signal pad-key="pa1" index="0" function="OC" group="TOCC"/>
+                <signal pad-key="pa2" index="1" function="OC" group="TOCC"/>
+                <signal pad-key="pa3" index="2" function="OC" group="TOCC"/>
+                <signal pad-key="pa4" index="3" function="OC" group="TOCC"/>
+                <signal pad-key="pa5" index="4" function="OC" group="TOCC"/>
+                <signal pad-key="pa6" index="5" function="OC" group="TOCC"/>
+                <signal pad-key="pa7" index="6" function="OC" group="TOCC"/>
+                <signal pad-key="pb2" index="7" function="OC" group="TOCC"/>
+                <signal pad-key="pa3" function="CS" group="T0"/>
+                <signal pad-key="pa4" function="CS" group="T1"/>
+                <signal pad-key="pa5" function="CS" group="T2"/>
+                <signal pad-key="pb2" function="ICP" group="ICP2"/>
             </signals>
         </peripheral>
         <peripheral key="tc0" name="TC0" module-key="tc8">
             <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"/>
-                <signal pad-id="pa3" index="0" function="OC" group="TOCC"/>
-                <signal pad-id="pa4" index="0" function="OC" group="TOCC"/>
-                <signal pad-id="pa5" index="0" function="OC" group="TOCC"/>
-                <signal pad-id="pa6" index="0" function="OC" group="TOCC"/>
-                <signal pad-id="pa7" index="0" function="OC" group="TOCC"/>
-                <signal pad-id="pb2" index="0" function="OC" group="TOCC"/>
-                <signal pad-id="pa3" function="CS" group="T0"/>
-                <signal pad-id="pa4" function="CS" group="T1"/>
-                <signal pad-id="pa5" function="CS" group="T2"/>
+                <signal pad-key="pa1" index="0" function="OC" group="TOCC"/>
+                <signal pad-key="pa2" index="0" function="OC" group="TOCC"/>
+                <signal pad-key="pa3" index="0" function="OC" group="TOCC"/>
+                <signal pad-key="pa4" index="0" function="OC" group="TOCC"/>
+                <signal pad-key="pa5" index="0" function="OC" group="TOCC"/>
+                <signal pad-key="pa6" index="0" function="OC" group="TOCC"/>
+                <signal pad-key="pa7" index="0" function="OC" group="TOCC"/>
+                <signal pad-key="pb2" index="0" function="OC" group="TOCC"/>
+                <signal pad-key="pa3" function="CS" group="T0"/>
+                <signal pad-key="pa4" function="CS" group="T1"/>
+                <signal pad-key="pa5" function="CS" group="T2"/>
             </signals>
         </peripheral>
         <peripheral key="exint" name="EXINT" module-key="exint">
             <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"/>
-                <signal pad-id="pa2" index="2" function="EXTINT" group="PCINT"/>
-                <signal pad-id="pa3" index="3" function="EXTINT" group="PCINT"/>
-                <signal pad-id="pa4" index="4" function="EXTINT" group="PCINT"/>
-                <signal pad-id="pa5" index="5" function="EXTINT" group="PCINT"/>
-                <signal pad-id="pa6" index="6" function="EXTINT" group="PCINT"/>
-                <signal pad-id="pa7" index="7" function="EXTINT" group="PCINT"/>
-                <signal pad-id="pb0" index="8" function="EXTINT" group="PCINT"/>
-                <signal pad-id="pb1" index="9" function="EXTINT" group="PCINT"/>
-                <signal pad-id="pb2" index="10" function="EXTINT" group="PCINT"/>
-                <signal pad-id="pb3" index="11" function="EXTINT" group="PCINT"/>
-                <signal pad-id="pb1" index="0" function="EXTINT" group="INT"/>
+                <signal pad-key="pa0" index="0" function="EXTINT" group="PCINT"/>
+                <signal pad-key="pa1" index="1" function="EXTINT" group="PCINT"/>
+                <signal pad-key="pa2" index="2" function="EXTINT" group="PCINT"/>
+                <signal pad-key="pa3" index="3" function="EXTINT" group="PCINT"/>
+                <signal pad-key="pa4" index="4" function="EXTINT" group="PCINT"/>
+                <signal pad-key="pa5" index="5" function="EXTINT" group="PCINT"/>
+                <signal pad-key="pa6" index="6" function="EXTINT" group="PCINT"/>
+                <signal pad-key="pa7" index="7" function="EXTINT" group="PCINT"/>
+                <signal pad-key="pb0" index="8" function="EXTINT" group="PCINT"/>
+                <signal pad-key="pb1" index="9" function="EXTINT" group="PCINT"/>
+                <signal pad-key="pb2" index="10" function="EXTINT" group="PCINT"/>
+                <signal pad-key="pb3" index="11" function="EXTINT" group="PCINT"/>
+                <signal pad-key="pb1" index="0" function="EXTINT" group="INT"/>
             </signals>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="cpu">
@@ -328,14 +328,14 @@
         <peripheral key="spi" name="SPI" module-key="spi">
             <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"/>
-                <signal pad-id="pa2" function="SPI_ALT" group="SS" field="SPIMAP"/>
-                <signal pad-id="pa3" function="SPI_ALT" group="SCK" field="SPIMAP"/>
-                <signal pad-id="pa4" function="SPI" group="SCK" field="SPIMAP"/>
-                <signal pad-id="pa5" function="SPI" group="MISO" field="SPIMAP"/>
-                <signal pad-id="pa6" function="SPI" group="MOSI" field="SPIMAP"/>
-                <signal pad-id="pa7" function="SPI" group="SS" field="SPIMAP"/>
+                <signal pad-key="pa0" function="SPI_ALT" group="MISO" field="SPIMAP"/>
+                <signal pad-key="pa1" function="SPI_ALT" group="MOSI" field="SPIMAP"/>
+                <signal pad-key="pa2" function="SPI_ALT" group="SS" field="SPIMAP"/>
+                <signal pad-key="pa3" function="SPI_ALT" group="SCK" field="SPIMAP"/>
+                <signal pad-key="pa4" function="SPI" group="SCK" field="SPIMAP"/>
+                <signal pad-key="pa5" function="SPI" group="MISO" field="SPIMAP"/>
+                <signal pad-key="pa6" function="SPI" group="MOSI" field="SPIMAP"/>
+                <signal pad-key="pa7" function="SPI" group="SS" field="SPIMAP"/>
             </signals>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="fuse">
@@ -857,49 +857,65 @@
             </register-group>
         </module>
     </modules>
+    <pads>
+        <pad key="gnd" name="GND"/>
+        <pad key="pa0" name="PA0"/>
+        <pad key="pa1" name="PA1"/>
+        <pad key="pa2" name="PA2"/>
+        <pad key="pa3" name="PA3"/>
+        <pad key="pa4" name="PA4"/>
+        <pad key="pa5" name="PA5"/>
+        <pad key="pa6" name="PA6"/>
+        <pad key="pa7" name="PA7"/>
+        <pad key="pb2" name="PB2"/>
+        <pad key="pb3" name="PB3"/>
+        <pad key="pb1" name="PB1"/>
+        <pad key="pb0" name="PB0"/>
+        <pad key="vcc" name="VCC"/>
+    </pads>
     <pinouts>
         <pinout key="soic_14" name="SOIC_14" type="soic">
-            <pin position="14" pad="GND"/>
-            <pin position="13" pad="PA0"/>
-            <pin position="12" pad="PA1"/>
-            <pin position="11" pad="PA2"/>
-            <pin position="10" pad="PA3"/>
-            <pin position="9" pad="PA4"/>
-            <pin position="8" pad="PA5"/>
-            <pin position="7" pad="PA6"/>
-            <pin position="6" pad="PA7"/>
-            <pin position="5" pad="PB2"/>
-            <pin position="4" pad="PB3"/>
-            <pin position="3" pad="PB1"/>
-            <pin position="2" pad="PB0"/>
-            <pin position="1" pad="VCC"/>
+            <pin position="14" pad-key="gnd"/>
+            <pin position="13" pad-key="pa0"/>
+            <pin position="12" pad-key="pa1"/>
+            <pin position="11" pad-key="pa2"/>
+            <pin position="10" pad-key="pa3"/>
+            <pin position="9" pad-key="pa4"/>
+            <pin position="8" pad-key="pa5"/>
+            <pin position="7" pad-key="pa6"/>
+            <pin position="6" pad-key="pa7"/>
+            <pin position="5" pad-key="pb2"/>
+            <pin position="4" pad-key="pb3"/>
+            <pin position="3" pad-key="pb1"/>
+            <pin position="2" pad-key="pb0"/>
+            <pin position="1" pad-key="vcc"/>
         </pinout>
         <pinout key="qfn_20" name="QFN_20" type="qfn">
-            <pin position="1" pad="PA4"/>
-            <pin position="2" pad="PA3"/>
-            <pin position="3" pad="PA2"/>
-            <pin position="4" pad="PA1"/>
-            <pin position="5" pad="PA0"/>
-            <pin position="6" pad="NC"/>
-            <pin position="7" pad="NC"/>
-            <pin position="8" pad="GND"/>
-            <pin position="9" pad="VCC"/>
-            <pin position="10" pad="NC"/>
-            <pin position="11" pad="PB0"/>
-            <pin position="12" pad="PB1"/>
-            <pin position="13" pad="PB3"/>
-            <pin position="14" pad="PB2"/>
-            <pin position="15" pad="PA7"/>
-            <pin position="16" pad="PA6"/>
-            <pin position="17" pad="NC"/>
-            <pin position="18" pad="NC"/>
-            <pin position="19" pad="NC"/>
-            <pin position="20" pad="PA5"/>
+            <pin position="1" pad-key="pa4"/>
+            <pin position="2" pad-key="pa3"/>
+            <pin position="3" pad-key="pa2"/>
+            <pin position="4" pad-key="pa1"/>
+            <pin position="5" pad-key="pa0"/>
+            <pin position="6"/>
+            <pin position="7"/>
+            <pin position="8" pad-key="gnd"/>
+            <pin position="9" pad-key="vcc"/>
+            <pin position="10"/>
+            <pin position="11" pad-key="pb0"/>
+            <pin position="12" pad-key="pb1"/>
+            <pin position="13" pad-key="pb3"/>
+            <pin position="14" pad-key="pb2"/>
+            <pin position="15" pad-key="pa7"/>
+            <pin position="16" pad-key="pa6"/>
+            <pin position="17"/>
+            <pin position="18"/>
+            <pin position="19"/>
+            <pin position="20" pad-key="pa5"/>
         </pinout>
     </pinouts>
     <variants>
-        <variant name="ATtiny441-SSU" pinout-key="soic_14" package="SOIC14"/>
-        <variant name="ATtiny441-MU" pinout-key="qfn_20" package="MLF20"/>
-        <variant name="ATtiny441-MMH" pinout-key="qfn_20" package="VQFN20"/>
+        <variant key="attiny441_ssu" name="ATtiny441-SSU" pinout-key="soic_14"/>
+        <variant key="attiny441_mu" name="ATtiny441-MU" pinout-key="qfn_20"/>
+        <variant key="attiny441_mmh" name="ATtiny441-MMH" pinout-key="qfn_20"/>
     </variants>
 </device>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY44A.xml b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY44A.xml
index eea4ed29..7cf4b367 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY44A.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY44A.xml
@@ -170,72 +170,72 @@
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pa2" index="2" function="PORTA" group="P"/>
-                <signal pad-id="pa3" index="3" function="PORTA" group="P"/>
-                <signal pad-id="pa4" index="4" function="PORTA" group="P"/>
-                <signal pad-id="pa5" index="5" function="PORTA" group="P"/>
-                <signal pad-id="pa6" index="6" function="PORTA" group="P"/>
-                <signal pad-id="pa7" index="7" function="PORTA" group="P"/>
+                <signal pad-key="pa0" index="0" function="PORTA" group="P"/>
+                <signal pad-key="pa1" index="1" function="PORTA" group="P"/>
+                <signal pad-key="pa2" index="2" function="PORTA" group="P"/>
+                <signal pad-key="pa3" index="3" function="PORTA" group="P"/>
+                <signal pad-key="pa4" index="4" function="PORTA" group="P"/>
+                <signal pad-key="pa5" index="5" function="PORTA" group="P"/>
+                <signal pad-key="pa6" index="6" function="PORTA" group="P"/>
+                <signal pad-key="pa7" index="7" function="PORTA" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pb2" index="2" function="PORTB" group="P"/>
-                <signal pad-id="pb3" index="3" function="PORTB" group="P"/>
+                <signal pad-key="pb0" index="0" function="PORTB" group="P"/>
+                <signal pad-key="pb1" index="1" function="PORTB" group="P"/>
+                <signal pad-key="pb2" index="2" function="PORTB" group="P"/>
+                <signal pad-key="pb3" index="3" function="PORTB" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="ac" name="AC" module-key="ac">
             <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"/>
+                <signal pad-key="pa1" index="0" function="ACIN" group="AIN"/>
+                <signal pad-key="pa2" index="1" function="ACIN" group="AIN"/>
             </signals>
         </peripheral>
         <peripheral key="adc" name="ADC" module-key="adc">
             <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"/>
-                <signal pad-id="pa2" index="2" function="ADC" group="ADC"/>
-                <signal pad-id="pa3" index="3" function="ADC" group="ADC"/>
-                <signal pad-id="pa4" index="4" function="ADC" group="ADC"/>
-                <signal pad-id="pa5" index="5" function="ADC" group="ADC"/>
-                <signal pad-id="pa6" index="6" function="ADC" group="ADC"/>
-                <signal pad-id="pa7" index="7" function="ADC" group="ADC"/>
-                <signal pad-id="pa0" function="AREF" group="AREF"/>
+                <signal pad-key="pa0" index="0" function="ADC" group="ADC"/>
+                <signal pad-key="pa1" index="1" function="ADC" group="ADC"/>
+                <signal pad-key="pa2" index="2" function="ADC" group="ADC"/>
+                <signal pad-key="pa3" index="3" function="ADC" group="ADC"/>
+                <signal pad-key="pa4" index="4" function="ADC" group="ADC"/>
+                <signal pad-key="pa5" index="5" function="ADC" group="ADC"/>
+                <signal pad-key="pa6" index="6" function="ADC" group="ADC"/>
+                <signal pad-key="pa7" index="7" function="ADC" group="ADC"/>
+                <signal pad-key="pa0" function="AREF" group="AREF"/>
             </signals>
         </peripheral>
         <peripheral key="usi" name="USI" module-key="usi">
             <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"/>
-                <signal pad-id="pa4" function="SPI" group="USCK"/>
-                <signal pad-id="pa5" function="SPI" group="DO"/>
-                <signal pad-id="pa6" function="SPI" group="DI"/>
+                <signal pad-key="pa4" function="TWI" group="SCL"/>
+                <signal pad-key="pa6" function="TWI" group="SDA"/>
+                <signal pad-key="pa4" function="SPI" group="USCK"/>
+                <signal pad-key="pa5" function="SPI" group="DO"/>
+                <signal pad-key="pa6" function="SPI" group="DI"/>
             </signals>
         </peripheral>
         <peripheral key="exint" name="EXINT" module-key="exint">
             <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"/>
-                <signal pad-id="pa2" index="2" function="EXTINT" group="PCINT"/>
-                <signal pad-id="pa3" index="3" function="EXTINT" group="PCINT"/>
-                <signal pad-id="pa4" index="4" function="EXTINT" group="PCINT"/>
-                <signal pad-id="pa5" index="5" function="EXTINT" group="PCINT"/>
-                <signal pad-id="pa6" index="6" function="EXTINT" group="PCINT"/>
-                <signal pad-id="pa7" index="7" function="EXTINT" group="PCINT"/>
-                <signal pad-id="pb0" index="8" function="EXTINT" group="PCINT"/>
-                <signal pad-id="pb1" index="9" function="EXTINT" group="PCINT"/>
-                <signal pad-id="pb2" index="10" function="EXTINT" group="PCINT"/>
-                <signal pad-id="pb3" index="11" function="EXTINT" group="PCINT"/>
-                <signal pad-id="pb2" index="0" function="EXTINT" group="INT"/>
+                <signal pad-key="pa0" index="0" function="EXTINT" group="PCINT"/>
+                <signal pad-key="pa1" index="1" function="EXTINT" group="PCINT"/>
+                <signal pad-key="pa2" index="2" function="EXTINT" group="PCINT"/>
+                <signal pad-key="pa3" index="3" function="EXTINT" group="PCINT"/>
+                <signal pad-key="pa4" index="4" function="EXTINT" group="PCINT"/>
+                <signal pad-key="pa5" index="5" function="EXTINT" group="PCINT"/>
+                <signal pad-key="pa6" index="6" function="EXTINT" group="PCINT"/>
+                <signal pad-key="pa7" index="7" function="EXTINT" group="PCINT"/>
+                <signal pad-key="pb0" index="8" function="EXTINT" group="PCINT"/>
+                <signal pad-key="pb1" index="9" function="EXTINT" group="PCINT"/>
+                <signal pad-key="pb2" index="10" function="EXTINT" group="PCINT"/>
+                <signal pad-key="pb3" index="11" function="EXTINT" group="PCINT"/>
+                <signal pad-key="pb2" index="0" function="EXTINT" group="INT"/>
             </signals>
         </peripheral>
         <peripheral key="eeprom" name="EEPROM" module-key="eeprom">
@@ -247,18 +247,18 @@
         <peripheral key="tc0" name="TC0" module-key="tc8">
             <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"/>
-                <signal pad-id="pb2" function="T0" group="OC0A"/>
+                <signal pad-key="pa3" function="T0" group="T0"/>
+                <signal pad-key="pa7" function="T0" group="OC0B"/>
+                <signal pad-key="pb2" function="T0" group="OC0A"/>
             </signals>
         </peripheral>
         <peripheral key="tc1" name="TC1" module-key="tc16">
             <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"/>
-                <signal pad-id="pa6" function="T1" group="OC1A"/>
-                <signal pad-id="pa7" function="T1" group="ICP1"/>
+                <signal pad-key="pa4" function="T1" group="T1"/>
+                <signal pad-key="pa5" function="T1" group="OC1B"/>
+                <signal pad-key="pa6" function="T1" group="OC1A"/>
+                <signal pad-key="pa7" function="T1" group="ICP1"/>
             </signals>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="cpu">
@@ -540,72 +540,88 @@
             </register-group>
         </module>
     </modules>
+    <pads>
+        <pad key="vcc" name="VCC"/>
+        <pad key="pb0" name="PB0"/>
+        <pad key="pb1" name="PB1"/>
+        <pad key="pb3" name="PB3"/>
+        <pad key="pb2" name="PB2"/>
+        <pad key="pa7" name="PA7"/>
+        <pad key="pa6" name="PA6"/>
+        <pad key="pa5" name="PA5"/>
+        <pad key="pa4" name="PA4"/>
+        <pad key="pa3" name="PA3"/>
+        <pad key="pa2" name="PA2"/>
+        <pad key="pa1" name="PA1"/>
+        <pad key="pa0" name="PA0"/>
+        <pad key="gnd" name="GND"/>
+    </pads>
     <pinouts>
         <pinout key="soic_14" name="SOIC_14" type="soic">
-            <pin position="1" pad="VCC"/>
-            <pin position="2" pad="PB0"/>
-            <pin position="3" pad="PB1"/>
-            <pin position="4" pad="PB3"/>
-            <pin position="5" pad="PB2"/>
-            <pin position="6" pad="PA7"/>
-            <pin position="7" pad="PA6"/>
-            <pin position="8" pad="PA5"/>
-            <pin position="9" pad="PA4"/>
-            <pin position="10" pad="PA3"/>
-            <pin position="11" pad="PA2"/>
-            <pin position="12" pad="PA1"/>
-            <pin position="13" pad="PA0"/>
-            <pin position="14" pad="GND"/>
+            <pin position="1" pad-key="vcc"/>
+            <pin position="2" pad-key="pb0"/>
+            <pin position="3" pad-key="pb1"/>
+            <pin position="4" pad-key="pb3"/>
+            <pin position="5" pad-key="pb2"/>
+            <pin position="6" pad-key="pa7"/>
+            <pin position="7" pad-key="pa6"/>
+            <pin position="8" pad-key="pa5"/>
+            <pin position="9" pad-key="pa4"/>
+            <pin position="10" pad-key="pa3"/>
+            <pin position="11" pad-key="pa2"/>
+            <pin position="12" pad-key="pa1"/>
+            <pin position="13" pad-key="pa0"/>
+            <pin position="14" pad-key="gnd"/>
         </pinout>
         <pinout key="qfn_20" name="QFN_20" type="qfn">
-            <pin position="1" pad="PA4"/>
-            <pin position="2" pad="PA3"/>
-            <pin position="3" pad="PA2"/>
-            <pin position="4" pad="PA1"/>
-            <pin position="5" pad="PA0"/>
-            <pin position="6" pad="NC"/>
-            <pin position="7" pad="NC"/>
-            <pin position="8" pad="GND"/>
-            <pin position="9" pad="VCC"/>
-            <pin position="10" pad="NC"/>
-            <pin position="11" pad="PB0"/>
-            <pin position="12" pad="PB1"/>
-            <pin position="13" pad="PB3"/>
-            <pin position="14" pad="PB2"/>
-            <pin position="15" pad="PA7"/>
-            <pin position="16" pad="PA6"/>
-            <pin position="17" pad="NC"/>
-            <pin position="18" pad="NC"/>
-            <pin position="19" pad="NC"/>
-            <pin position="20" pad="PA5"/>
+            <pin position="1" pad-key="pa4"/>
+            <pin position="2" pad-key="pa3"/>
+            <pin position="3" pad-key="pa2"/>
+            <pin position="4" pad-key="pa1"/>
+            <pin position="5" pad-key="pa0"/>
+            <pin position="6"/>
+            <pin position="7"/>
+            <pin position="8" pad-key="gnd"/>
+            <pin position="9" pad-key="vcc"/>
+            <pin position="10"/>
+            <pin position="11" pad-key="pb0"/>
+            <pin position="12" pad-key="pb1"/>
+            <pin position="13" pad-key="pb3"/>
+            <pin position="14" pad-key="pb2"/>
+            <pin position="15" pad-key="pa7"/>
+            <pin position="16" pad-key="pa6"/>
+            <pin position="17"/>
+            <pin position="18"/>
+            <pin position="19"/>
+            <pin position="20" pad-key="pa5"/>
         </pinout>
         <pinout key="bga_16" name="BGA_16" type="bga">
-            <pin position="A1" pad="NC"/>
-            <pin position="A2" pad="PA5"/>
-            <pin position="A3" pad="PA6"/>
-            <pin position="A4" pad="PB2"/>
-            <pin position="B1" pad="PA4"/>
-            <pin position="B2" pad="PA7"/>
-            <pin position="B3" pad="PB1"/>
-            <pin position="B4" pad="PB3"/>
-            <pin position="C1" pad="PA3"/>
-            <pin position="C2" pad="PA2"/>
-            <pin position="C3" pad="PA1"/>
-            <pin position="C4" pad="PB0"/>
-            <pin position="D1" pad="PA0"/>
-            <pin position="D2" pad="GND"/>
-            <pin position="D3" pad="GND"/>
-            <pin position="D4" pad="VCC"/>
+            <pin position="A1"/>
+            <pin position="A2" pad-key="pa5"/>
+            <pin position="A3" pad-key="pa6"/>
+            <pin position="A4" pad-key="pb2"/>
+            <pin position="B1" pad-key="pa4"/>
+            <pin position="B2" pad-key="pa7"/>
+            <pin position="B3" pad-key="pb1"/>
+            <pin position="B4" pad-key="pb3"/>
+            <pin position="C1" pad-key="pa3"/>
+            <pin position="C2" pad-key="pa2"/>
+            <pin position="C3" pad-key="pa1"/>
+            <pin position="C4" pad-key="pb0"/>
+            <pin position="D1" pad-key="pa0"/>
+            <pin position="D2" pad-key="gnd"/>
+            <pin position="D3" pad-key="gnd"/>
+            <pin position="D4" pad-key="vcc"/>
         </pinout>
     </pinouts>
     <variants>
-        <variant name="ATtiny44A-CCU" pinout-key="bga_16" package="UFBGA16"/>
-        <variant name="ATtiny44A-MMH" pinout-key="qfn_20" package="VQFN20"/>
-        <variant name="ATtiny44A-MU" pinout-key="qfn_20" package="QFN20"/>
-        <variant name="ATtiny44A-PU" pinout-key="soic_14" package="PDIP14"/>
-        <variant name="ATtiny44A-SSU" pinout-key="soic_14" package="SOIC14"/>
-        <variant name="ATtiny44A-SSN" pinout-key="soic_14" package="SOIC14"/>
-        <variant name="ATtiny44A-MF" pinout-key="qfn_20" package="QFN20"/>
-        <variant name="ATtiny44A-SSF" pinout-key="soic_14" package="SOIC14"/>
+        <variant key="attiny44a_ccu" name="ATtiny44A-CCU" pinout-key="bga_16"/>
+        <variant key="attiny44a_mmh" name="ATtiny44A-MMH" pinout-key="qfn_20"/>
+        <variant key="attiny44a_mu" name="ATtiny44A-MU" pinout-key="qfn_20"/>
+        <variant key="attiny44a_pu" name="ATtiny44A-PU" pinout-key="soic_14"/>
+        <variant key="attiny44a_ssu" name="ATtiny44A-SSU" pinout-key="soic_14"/>
+        <variant key="attiny44a_ssn" name="ATtiny44A-SSN" pinout-key="soic_14"/>
+        <variant key="attiny44a_mf" name="ATtiny44A-MF" pinout-key="qfn_20"/>
+        <variant key="attiny44a_ssf" name="ATtiny44A-SSF" pinout-key="soic_14"/>
     </variants>
 </device>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY45.xml b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY45.xml
index efa02b1f..21702fd3 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY45.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY45.xml
@@ -170,50 +170,50 @@
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pb2" index="2" function="PORTB" group="P"/>
-                <signal pad-id="pb3" index="3" function="PORTB" group="P"/>
-                <signal pad-id="pb4" index="4" function="PORTB" group="P"/>
-                <signal pad-id="pb5" index="5" function="PORTB" group="P"/>
+                <signal pad-key="pb0" index="0" function="PORTB" group="P"/>
+                <signal pad-key="pb1" index="1" function="PORTB" group="P"/>
+                <signal pad-key="pb2" index="2" function="PORTB" group="P"/>
+                <signal pad-key="pb3" index="3" function="PORTB" group="P"/>
+                <signal pad-key="pb4" index="4" function="PORTB" group="P"/>
+                <signal pad-key="pb5" index="5" function="PORTB" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="ac" name="AC" module-key="ac">
             <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"/>
+                <signal pad-key="pb1" index="1" function="ACIN" group="AIN"/>
+                <signal pad-key="pb0" index="0" function="ACIN" group="AIN"/>
             </signals>
         </peripheral>
         <peripheral key="adc" name="ADC" module-key="adc">
             <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"/>
-                <signal pad-id="pb4" index="2" function="ADC" group="ADC"/>
-                <signal pad-id="pb0" function="AREF" group="AREF"/>
+                <signal pad-key="pb5" index="0" function="ADC" group="ADC"/>
+                <signal pad-key="pb2" index="1" function="ADC" group="ADC"/>
+                <signal pad-key="pb4" index="2" function="ADC" group="ADC"/>
+                <signal pad-key="pb0" function="AREF" group="AREF"/>
             </signals>
         </peripheral>
         <peripheral key="usi" name="USI" module-key="usi">
             <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"/>
-                <signal pad-id="pb0" function="SPI" group="DI"/>
-                <signal pad-id="pb1" function="SPI" group="DO"/>
-                <signal pad-id="pb2" function="SPI" group="USCK"/>
+                <signal pad-key="pb0" function="TWI" group="SDA"/>
+                <signal pad-key="pb2" function="TWI" group="SCL"/>
+                <signal pad-key="pb0" function="SPI" group="DI"/>
+                <signal pad-key="pb1" function="SPI" group="DO"/>
+                <signal pad-key="pb2" function="SPI" group="USCK"/>
             </signals>
         </peripheral>
         <peripheral key="exint" name="EXINT" module-key="exint">
             <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"/>
-                <signal pad-id="pb2" index="2" function="EXTINT" group="PCINT"/>
-                <signal pad-id="pb3" index="3" function="EXTINT" group="PCINT"/>
-                <signal pad-id="pb4" index="4" function="EXTINT" group="PCINT"/>
-                <signal pad-id="pb5" index="5" function="EXTINT" group="PCINT"/>
-                <signal pad-id="pb2" index="0" function="EXTINT" group="INT"/>
+                <signal pad-key="pb0" index="0" function="EXTINT" group="PCINT"/>
+                <signal pad-key="pb1" index="1" function="EXTINT" group="PCINT"/>
+                <signal pad-key="pb2" index="2" function="EXTINT" group="PCINT"/>
+                <signal pad-key="pb3" index="3" function="EXTINT" group="PCINT"/>
+                <signal pad-key="pb4" index="4" function="EXTINT" group="PCINT"/>
+                <signal pad-key="pb5" index="5" function="EXTINT" group="PCINT"/>
+                <signal pad-key="pb2" index="0" function="EXTINT" group="INT"/>
             </signals>
         </peripheral>
         <peripheral key="eeprom" name="EEPROM" module-key="eeprom">
@@ -225,18 +225,18 @@
         <peripheral key="tc0" name="TC0" module-key="tc8">
             <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"/>
-                <signal pad-id="pb0" function="T0" group="OC0A"/>
+                <signal pad-key="pb2" function="T0" group="T0"/>
+                <signal pad-key="pb1" function="T0" group="OC0B"/>
+                <signal pad-key="pb0" function="T0" group="OC0A"/>
             </signals>
         </peripheral>
         <peripheral key="tc1" name="TC1" module-key="tc8">
             <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"/>
-                <signal pad-id="pb1" function="T1" group="OC1A"/>
-                <signal pad-id="pb0" function="T1" group="OC1AINV"/>
+                <signal pad-key="pb4" function="T1" group="OC1B"/>
+                <signal pad-key="pb3" function="T1" group="OC1BINV"/>
+                <signal pad-key="pb1" function="T1" group="OC1A"/>
+                <signal pad-key="pb0" function="T1" group="OC1AINV"/>
             </signals>
         </peripheral>
         <peripheral key="boot_load" name="BOOT_LOAD" module-key="boot_load">
@@ -535,50 +535,60 @@
             </register-group>
         </module>
     </modules>
+    <pads>
+        <pad key="pb5" name="PB5"/>
+        <pad key="pb3" name="PB3"/>
+        <pad key="pb4" name="PB4"/>
+        <pad key="gnd" name="GND"/>
+        <pad key="pb0" name="PB0"/>
+        <pad key="pb1" name="PB1"/>
+        <pad key="pb2" name="PB2"/>
+        <pad key="vcc" name="VCC"/>
+    </pads>
     <pinouts>
         <pinout key="soic_8" name="SOIC_8" type="soic">
-            <pin position="1" pad="PB5"/>
-            <pin position="2" pad="PB3"/>
-            <pin position="3" pad="PB4"/>
-            <pin position="4" pad="GND"/>
-            <pin position="5" pad="PB0"/>
-            <pin position="6" pad="PB1"/>
-            <pin position="7" pad="PB2"/>
-            <pin position="8" pad="VCC"/>
+            <pin position="1" pad-key="pb5"/>
+            <pin position="2" pad-key="pb3"/>
+            <pin position="3" pad-key="pb4"/>
+            <pin position="4" pad-key="gnd"/>
+            <pin position="5" pad-key="pb0"/>
+            <pin position="6" pad-key="pb1"/>
+            <pin position="7" pad-key="pb2"/>
+            <pin position="8" pad-key="vcc"/>
         </pinout>
         <pinout key="qfn_20" name="QFN_20" type="qfn">
-            <pin position="1" pad="PB5"/>
-            <pin position="2" pad="PB3"/>
-            <pin position="3" pad="NC"/>
-            <pin position="4" pad="NC"/>
-            <pin position="5" pad="PB4"/>
-            <pin position="6" pad="NC"/>
-            <pin position="7" pad="NC"/>
-            <pin position="8" pad="GND"/>
-            <pin position="9" pad="NC"/>
-            <pin position="10" pad="NC"/>
-            <pin position="11" pad="PB0"/>
-            <pin position="12" pad="PB1"/>
-            <pin position="13" pad="NC"/>
-            <pin position="14" pad="PB2"/>
-            <pin position="15" pad="VCC"/>
-            <pin position="16" pad="NC"/>
-            <pin position="17" pad="NC"/>
-            <pin position="18" pad="NC"/>
-            <pin position="19" pad="NC"/>
-            <pin position="20" pad="NC"/>
+            <pin position="1" pad-key="pb5"/>
+            <pin position="2" pad-key="pb3"/>
+            <pin position="3"/>
+            <pin position="4"/>
+            <pin position="5" pad-key="pb4"/>
+            <pin position="6"/>
+            <pin position="7"/>
+            <pin position="8" pad-key="gnd"/>
+            <pin position="9"/>
+            <pin position="10"/>
+            <pin position="11" pad-key="pb0"/>
+            <pin position="12" pad-key="pb1"/>
+            <pin position="13"/>
+            <pin position="14" pad-key="pb2"/>
+            <pin position="15" pad-key="vcc"/>
+            <pin position="16"/>
+            <pin position="17"/>
+            <pin position="18"/>
+            <pin position="19"/>
+            <pin position="20"/>
         </pinout>
     </pinouts>
     <variants>
-        <variant name="ATtiny45V-10PU" pinout-key="soic_8" package="PDIP8"/>
-        <variant name="ATtiny45V-10SU" pinout-key="soic_8" package="SOIC8"/>
-        <variant name="ATtiny45V-10SH" pinout-key="soic_8" package="SOIC8"/>
-        <variant name="ATtiny45V-10XU" pinout-key="soic_8" package="TSSOP8"/>
-        <variant name="ATtiny45V-10MU" pinout-key="qfn_20" package="MLF20"/>
-        <variant name="ATtiny45V-20PU" pinout-key="soic_8" package="PDIP8"/>
-        <variant name="ATtiny45V-20SU" pinout-key="soic_8" package="SOIC8"/>
-        <variant name="ATtiny45V-20SH" pinout-key="soic_8" package="SOIC8"/>
-        <variant name="ATtiny45V-20XU" pinout-key="soic_8" package="TSSOP8"/>
-        <variant name="ATtiny45V-20MU" pinout-key="qfn_20" package="MLF20"/>
+        <variant key="attiny45v_10pu" name="ATtiny45V-10PU" pinout-key="soic_8"/>
+        <variant key="attiny45v_10su" name="ATtiny45V-10SU" pinout-key="soic_8"/>
+        <variant key="attiny45v_10sh" name="ATtiny45V-10SH" pinout-key="soic_8"/>
+        <variant key="attiny45v_10xu" name="ATtiny45V-10XU" pinout-key="soic_8"/>
+        <variant key="attiny45v_10mu" name="ATtiny45V-10MU" pinout-key="qfn_20"/>
+        <variant key="attiny45v_20pu" name="ATtiny45V-20PU" pinout-key="soic_8"/>
+        <variant key="attiny45v_20su" name="ATtiny45V-20SU" pinout-key="soic_8"/>
+        <variant key="attiny45v_20sh" name="ATtiny45V-20SH" pinout-key="soic_8"/>
+        <variant key="attiny45v_20xu" name="ATtiny45V-20XU" pinout-key="soic_8"/>
+        <variant key="attiny45v_20mu" name="ATtiny45V-20MU" pinout-key="qfn_20"/>
     </variants>
 </device>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY461.xml b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY461.xml
index 5b6fcae2..4c78ad43 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY461.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY461.xml
@@ -198,67 +198,67 @@
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pa2" index="2" function="PORTA" group="P"/>
-                <signal pad-id="pa3" index="3" function="PORTA" group="P"/>
-                <signal pad-id="pa4" index="4" function="PORTA" group="P"/>
-                <signal pad-id="pa5" index="5" function="PORTA" group="P"/>
-                <signal pad-id="pa6" index="6" function="PORTA" group="P"/>
-                <signal pad-id="pa7" index="7" function="PORTA" group="P"/>
+                <signal pad-key="pa0" index="0" function="PORTA" group="P"/>
+                <signal pad-key="pa1" index="1" function="PORTA" group="P"/>
+                <signal pad-key="pa2" index="2" function="PORTA" group="P"/>
+                <signal pad-key="pa3" index="3" function="PORTA" group="P"/>
+                <signal pad-key="pa4" index="4" function="PORTA" group="P"/>
+                <signal pad-key="pa5" index="5" function="PORTA" group="P"/>
+                <signal pad-key="pa6" index="6" function="PORTA" group="P"/>
+                <signal pad-key="pa7" index="7" function="PORTA" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pb2" index="2" function="PORTB" group="P"/>
-                <signal pad-id="pb3" index="3" function="PORTB" group="P"/>
-                <signal pad-id="pb4" index="4" function="PORTB" group="P"/>
-                <signal pad-id="pb5" index="5" function="PORTB" group="P"/>
-                <signal pad-id="pb6" index="6" function="PORTB" group="P"/>
-                <signal pad-id="pb7" index="7" function="PORTB" group="P"/>
+                <signal pad-key="pb0" index="0" function="PORTB" group="P"/>
+                <signal pad-key="pb1" index="1" function="PORTB" group="P"/>
+                <signal pad-key="pb2" index="2" function="PORTB" group="P"/>
+                <signal pad-key="pb3" index="3" function="PORTB" group="P"/>
+                <signal pad-key="pb4" index="4" function="PORTB" group="P"/>
+                <signal pad-key="pb5" index="5" function="PORTB" group="P"/>
+                <signal pad-key="pb6" index="6" function="PORTB" group="P"/>
+                <signal pad-key="pb7" index="7" function="PORTB" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="adc" name="ADC" module-key="adc">
             <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"/>
-                <signal pad-id="pa2" index="2" function="ADC" group="ADC"/>
-                <signal pad-id="pa4" index="3" function="ADC" group="ADC"/>
-                <signal pad-id="pa5" index="4" function="ADC" group="ADC"/>
-                <signal pad-id="pa6" index="5" function="ADC" group="ADC"/>
-                <signal pad-id="pa7" index="6" function="ADC" group="ADC"/>
-                <signal pad-id="pb4" index="7" function="ADC" group="ADC"/>
-                <signal pad-id="pb5" index="8" function="ADC" group="ADC"/>
-                <signal pad-id="pb6" index="9" function="ADC" group="ADC"/>
-                <signal pad-id="pb7" index="10" function="ADC" group="ADC"/>
-                <signal pad-id="pa3" function="AREF" group="AREF"/>
+                <signal pad-key="pa0" index="0" function="ADC" group="ADC"/>
+                <signal pad-key="pa1" index="1" function="ADC" group="ADC"/>
+                <signal pad-key="pa2" index="2" function="ADC" group="ADC"/>
+                <signal pad-key="pa4" index="3" function="ADC" group="ADC"/>
+                <signal pad-key="pa5" index="4" function="ADC" group="ADC"/>
+                <signal pad-key="pa6" index="5" function="ADC" group="ADC"/>
+                <signal pad-key="pa7" index="6" function="ADC" group="ADC"/>
+                <signal pad-key="pb4" index="7" function="ADC" group="ADC"/>
+                <signal pad-key="pb5" index="8" function="ADC" group="ADC"/>
+                <signal pad-key="pb6" index="9" function="ADC" group="ADC"/>
+                <signal pad-key="pb7" index="10" function="ADC" group="ADC"/>
+                <signal pad-key="pa3" function="AREF" group="AREF"/>
             </signals>
         </peripheral>
         <peripheral key="ac" name="AC" module-key="ac">
             <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"/>
-                <signal pad-id="pa5" index="2" function="ACIN" group="AIN"/>
+                <signal pad-key="pa7" index="0" function="ACIN" group="AIN"/>
+                <signal pad-key="pa6" index="1" function="ACIN" group="AIN"/>
+                <signal pad-key="pa5" index="2" function="ACIN" group="AIN"/>
             </signals>
         </peripheral>
         <peripheral key="usi" name="USI" module-key="usi">
             <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"/>
-                <signal pad-id="pa2" function="USI_ALT" group="SCL " field="USIPOS"/>
-                <signal pad-id="pa0" function="USI_ALT" group="SDA" field="USIPOS"/>
-                <signal pad-id="pb0" function="USI" group="DI" field="USIPOS"/>
-                <signal pad-id="pb1" function="USI" group="DO" field="USIPOS"/>
-                <signal pad-id="pb2" function="USI" group="USCK" field="USIPOS"/>
-                <signal pad-id="pa2" function="USI_ALT" group="USCK" field="USIPOS"/>
-                <signal pad-id="pa1" function="USI_ALT" group="DO" field="USIPOS"/>
-                <signal pad-id="pa0" function="USI_ALT" group="DI" field="USIPOS"/>
+                <signal pad-key="pb0" function="USI" group="SDA" field="USIPOS"/>
+                <signal pad-key="pb2" function="USI" group="SCL" field="USIPOS"/>
+                <signal pad-key="pa2" function="USI_ALT" group="SCL " field="USIPOS"/>
+                <signal pad-key="pa0" function="USI_ALT" group="SDA" field="USIPOS"/>
+                <signal pad-key="pb0" function="USI" group="DI" field="USIPOS"/>
+                <signal pad-key="pb1" function="USI" group="DO" field="USIPOS"/>
+                <signal pad-key="pb2" function="USI" group="USCK" field="USIPOS"/>
+                <signal pad-key="pa2" function="USI_ALT" group="USCK" field="USIPOS"/>
+                <signal pad-key="pa1" function="USI_ALT" group="DO" field="USIPOS"/>
+                <signal pad-key="pa0" function="USI_ALT" group="DI" field="USIPOS"/>
             </signals>
         </peripheral>
         <peripheral key="eeprom" name="EEPROM" module-key="eeprom">
@@ -270,19 +270,19 @@
         <peripheral key="tc0" name="TC0" module-key="tc8">
             <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"/>
+                <signal pad-key="pa4" function="T0" group="ICP0"/>
+                <signal pad-key="pb6" function="T0" group="T0"/>
             </signals>
         </peripheral>
         <peripheral key="tc1" name="TC1" module-key="tc8">
             <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"/>
-                <signal pad-id="pb2" function="T1" group="OC1BINV"/>
-                <signal pad-id="pb3" function="T1" group="OC1B"/>
-                <signal pad-id="pb4" function="T1" group="OC1DINV"/>
-                <signal pad-id="pb5" function="T1" group="OC1D"/>
+                <signal pad-key="pb0" function="T1" group="OC1AINV"/>
+                <signal pad-key="pb1" function="T1" group="OC1A"/>
+                <signal pad-key="pb2" function="T1" group="OC1BINV"/>
+                <signal pad-key="pb3" function="T1" group="OC1B"/>
+                <signal pad-key="pb4" function="T1" group="OC1DINV"/>
+                <signal pad-key="pb5" function="T1" group="OC1D"/>
             </signals>
         </peripheral>
         <peripheral key="boot_load" name="BOOT_LOAD" module-key="boot_load">
@@ -291,24 +291,24 @@
         <peripheral key="exint" name="EXINT" module-key="exint">
             <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"/>
-                <signal pad-id="pa2" index="2" function="EXTINT" group="PCINT"/>
-                <signal pad-id="pa3" index="3" function="EXTINT" group="PCINT"/>
-                <signal pad-id="pa4" index="4" function="EXTINT" group="PCINT"/>
-                <signal pad-id="pa5" index="5" function="EXTINT" group="PCINT"/>
-                <signal pad-id="pa6" index="6" function="EXTINT" group="PCINT"/>
-                <signal pad-id="pa7" index="7" function="EXTINT" group="PCINT"/>
-                <signal pad-id="pb0" index="8" function="EXTINT" group="PCINT"/>
-                <signal pad-id="pb1" index="9" function="EXTINT" group="PCINT"/>
-                <signal pad-id="pb2" index="10" function="EXTINT" group="PCINT"/>
-                <signal pad-id="pb3" index="11" function="EXTINT" group="PCINT"/>
-                <signal pad-id="pb4" index="12" function="EXTINT" group="PCINT"/>
-                <signal pad-id="pb5" index="13" function="EXTINT" group="PCINT"/>
-                <signal pad-id="pb6" index="14" function="EXTINT" group="PCINT"/>
-                <signal pad-id="pb7" index="15" function="EXTINT" group="PCINT"/>
-                <signal pad-id="pa2" index="1" function="EXTINT" group="INT"/>
-                <signal pad-id="pb6" index="0" function="EXTINT" group="INT"/>
+                <signal pad-key="pa0" index="0" function="EXTINT" group="PCINT"/>
+                <signal pad-key="pa1" index="1" function="EXTINT" group="PCINT"/>
+                <signal pad-key="pa2" index="2" function="EXTINT" group="PCINT"/>
+                <signal pad-key="pa3" index="3" function="EXTINT" group="PCINT"/>
+                <signal pad-key="pa4" index="4" function="EXTINT" group="PCINT"/>
+                <signal pad-key="pa5" index="5" function="EXTINT" group="PCINT"/>
+                <signal pad-key="pa6" index="6" function="EXTINT" group="PCINT"/>
+                <signal pad-key="pa7" index="7" function="EXTINT" group="PCINT"/>
+                <signal pad-key="pb0" index="8" function="EXTINT" group="PCINT"/>
+                <signal pad-key="pb1" index="9" function="EXTINT" group="PCINT"/>
+                <signal pad-key="pb2" index="10" function="EXTINT" group="PCINT"/>
+                <signal pad-key="pb3" index="11" function="EXTINT" group="PCINT"/>
+                <signal pad-key="pb4" index="12" function="EXTINT" group="PCINT"/>
+                <signal pad-key="pb5" index="13" function="EXTINT" group="PCINT"/>
+                <signal pad-key="pb6" index="14" function="EXTINT" group="PCINT"/>
+                <signal pad-key="pb7" index="15" function="EXTINT" group="PCINT"/>
+                <signal pad-key="pa2" index="1" function="EXTINT" group="INT"/>
+                <signal pad-key="pb6" index="0" function="EXTINT" group="INT"/>
             </signals>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="cpu">
@@ -639,70 +639,92 @@
             </register-group>
         </module>
     </modules>
+    <pads>
+        <pad key="pb0" name="PB0"/>
+        <pad key="pb1" name="PB1"/>
+        <pad key="pb2" name="PB2"/>
+        <pad key="pb3" name="PB3"/>
+        <pad key="vcc" name="VCC"/>
+        <pad key="gnd" name="GND"/>
+        <pad key="pb4" name="PB4"/>
+        <pad key="pb5" name="PB5"/>
+        <pad key="pb6" name="PB6"/>
+        <pad key="pb7" name="PB7"/>
+        <pad key="pa7" name="PA7"/>
+        <pad key="pa6" name="PA6"/>
+        <pad key="pa5" name="PA5"/>
+        <pad key="pa4" name="PA4"/>
+        <pad key="avcc" name="AVCC"/>
+        <pad key="agnd" name="AGND"/>
+        <pad key="pa3" name="PA3"/>
+        <pad key="pa2" name="PA2"/>
+        <pad key="pa1" name="PA1"/>
+        <pad key="pa0" name="PA0"/>
+    </pads>
     <pinouts>
         <pinout key="soic_20" name="SOIC_20" type="soic">
-            <pin position="1" pad="PB0"/>
-            <pin position="2" pad="PB1"/>
-            <pin position="3" pad="PB2"/>
-            <pin position="4" pad="PB3"/>
-            <pin position="5" pad="VCC"/>
-            <pin position="6" pad="GND"/>
-            <pin position="7" pad="PB4"/>
-            <pin position="8" pad="PB5"/>
-            <pin position="9" pad="PB6"/>
-            <pin position="10" pad="PB7"/>
-            <pin position="11" pad="PA7"/>
-            <pin position="12" pad="PA6"/>
-            <pin position="13" pad="PA5"/>
-            <pin position="14" pad="PA4"/>
-            <pin position="15" pad="AVCC"/>
-            <pin position="16" pad="AGND"/>
-            <pin position="17" pad="PA3"/>
-            <pin position="18" pad="PA2"/>
-            <pin position="19" pad="PA1"/>
-            <pin position="20" pad="PA0"/>
+            <pin position="1" pad-key="pb0"/>
+            <pin position="2" pad-key="pb1"/>
+            <pin position="3" pad-key="pb2"/>
+            <pin position="4" pad-key="pb3"/>
+            <pin position="5" pad-key="vcc"/>
+            <pin position="6" pad-key="gnd"/>
+            <pin position="7" pad-key="pb4"/>
+            <pin position="8" pad-key="pb5"/>
+            <pin position="9" pad-key="pb6"/>
+            <pin position="10" pad-key="pb7"/>
+            <pin position="11" pad-key="pa7"/>
+            <pin position="12" pad-key="pa6"/>
+            <pin position="13" pad-key="pa5"/>
+            <pin position="14" pad-key="pa4"/>
+            <pin position="15" pad-key="avcc"/>
+            <pin position="16" pad-key="agnd"/>
+            <pin position="17" pad-key="pa3"/>
+            <pin position="18" pad-key="pa2"/>
+            <pin position="19" pad-key="pa1"/>
+            <pin position="20" pad-key="pa0"/>
         </pinout>
         <pinout key="qfn_32" name="QFN_32" type="qfn">
-            <pin position="1" pad="NC"/>
-            <pin position="2" pad="PB3"/>
-            <pin position="3" pad="NC"/>
-            <pin position="4" pad="VCC"/>
-            <pin position="5" pad="GND"/>
-            <pin position="6" pad="NC"/>
-            <pin position="7" pad="PB4"/>
-            <pin position="8" pad="PB5"/>
-            <pin position="9" pad="NC"/>
-            <pin position="10" pad="PB6"/>
-            <pin position="11" pad="PB7"/>
-            <pin position="12" pad="NC"/>
-            <pin position="13" pad="PA7"/>
-            <pin position="14" pad="PA6"/>
-            <pin position="15" pad="PA5"/>
-            <pin position="16" pad="NC"/>
-            <pin position="17" pad="PA4"/>
-            <pin position="18" pad="AVCC"/>
-            <pin position="19" pad="NC"/>
-            <pin position="20" pad="NC"/>
-            <pin position="21" pad="AGND"/>
-            <pin position="22" pad="PA3"/>
-            <pin position="23" pad="PA2"/>
-            <pin position="24" pad="NC"/>
-            <pin position="25" pad="PA1"/>
-            <pin position="26" pad="PA0"/>
-            <pin position="27" pad="NC"/>
-            <pin position="28" pad="NC"/>
-            <pin position="29" pad="NC"/>
-            <pin position="30" pad="PB0"/>
-            <pin position="31" pad="PB1"/>
-            <pin position="32" pad="PB2"/>
+            <pin position="1"/>
+            <pin position="2" pad-key="pb3"/>
+            <pin position="3"/>
+            <pin position="4" pad-key="vcc"/>
+            <pin position="5" pad-key="gnd"/>
+            <pin position="6"/>
+            <pin position="7" pad-key="pb4"/>
+            <pin position="8" pad-key="pb5"/>
+            <pin position="9"/>
+            <pin position="10" pad-key="pb6"/>
+            <pin position="11" pad-key="pb7"/>
+            <pin position="12"/>
+            <pin position="13" pad-key="pa7"/>
+            <pin position="14" pad-key="pa6"/>
+            <pin position="15" pad-key="pa5"/>
+            <pin position="16"/>
+            <pin position="17" pad-key="pa4"/>
+            <pin position="18" pad-key="avcc"/>
+            <pin position="19"/>
+            <pin position="20"/>
+            <pin position="21" pad-key="agnd"/>
+            <pin position="22" pad-key="pa3"/>
+            <pin position="23" pad-key="pa2"/>
+            <pin position="24"/>
+            <pin position="25" pad-key="pa1"/>
+            <pin position="26" pad-key="pa0"/>
+            <pin position="27"/>
+            <pin position="28"/>
+            <pin position="29"/>
+            <pin position="30" pad-key="pb0"/>
+            <pin position="31" pad-key="pb1"/>
+            <pin position="32" pad-key="pb2"/>
         </pinout>
     </pinouts>
     <variants>
-        <variant name="ATtiny461V-10MU" pinout-key="qfn_32" package="MLF32"/>
-        <variant name="ATtiny461V-10PU" pinout-key="soic_20" package="PDIP20"/>
-        <variant name="ATtiny461V-10SU" pinout-key="soic_20" package="SOIC20"/>
-        <variant name="ATtiny461-20MU" pinout-key="qfn_32" package="MLF32"/>
-        <variant name="ATtiny461-20PU" pinout-key="soic_20" package="PDIP20"/>
-        <variant name="ATtiny461-20SU" pinout-key="soic_20" package="SOIC20"/>
+        <variant key="attiny461v_10mu" name="ATtiny461V-10MU" pinout-key="qfn_32"/>
+        <variant key="attiny461v_10pu" name="ATtiny461V-10PU" pinout-key="soic_20"/>
+        <variant key="attiny461v_10su" name="ATtiny461V-10SU" pinout-key="soic_20"/>
+        <variant key="attiny461_20mu" name="ATtiny461-20MU" pinout-key="qfn_32"/>
+        <variant key="attiny461_20pu" name="ATtiny461-20PU" pinout-key="soic_20"/>
+        <variant key="attiny461_20su" name="ATtiny461-20SU" pinout-key="soic_20"/>
     </variants>
 </device>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY461A.xml b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY461A.xml
index 5174d17c..18839b38 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY461A.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY461A.xml
@@ -198,27 +198,27 @@
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pa2" index="2" function="default" group="P"/>
-                <signal pad-id="pa3" index="3" function="default" group="P"/>
-                <signal pad-id="pa4" index="4" function="default" group="P"/>
-                <signal pad-id="pa5" index="5" function="default" group="P"/>
-                <signal pad-id="pa6" index="6" function="default" group="P"/>
-                <signal pad-id="pa7" index="7" function="default" group="P"/>
+                <signal pad-key="pa0" index="0" function="default" group="P"/>
+                <signal pad-key="pa1" index="1" function="default" group="P"/>
+                <signal pad-key="pa2" index="2" function="default" group="P"/>
+                <signal pad-key="pa3" index="3" function="default" group="P"/>
+                <signal pad-key="pa4" index="4" function="default" group="P"/>
+                <signal pad-key="pa5" index="5" function="default" group="P"/>
+                <signal pad-key="pa6" index="6" function="default" group="P"/>
+                <signal pad-key="pa7" index="7" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pb2" index="2" function="default" group="P"/>
-                <signal pad-id="pb3" index="3" function="default" group="P"/>
-                <signal pad-id="pb4" index="4" function="default" group="P"/>
-                <signal pad-id="pb5" index="5" function="default" group="P"/>
-                <signal pad-id="pb6" index="6" function="default" group="P"/>
-                <signal pad-id="pb7" index="7" function="default" group="P"/>
+                <signal pad-key="pb0" index="0" function="default" group="P"/>
+                <signal pad-key="pb1" index="1" function="default" group="P"/>
+                <signal pad-key="pb2" index="2" function="default" group="P"/>
+                <signal pad-key="pb3" index="3" function="default" group="P"/>
+                <signal pad-key="pb4" index="4" function="default" group="P"/>
+                <signal pad-key="pb5" index="5" function="default" group="P"/>
+                <signal pad-key="pb6" index="6" function="default" group="P"/>
+                <signal pad-key="pb7" index="7" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="adc" name="ADC" module-key="adc">
@@ -578,71 +578,94 @@
             </register-group>
         </module>
     </modules>
+    <pads>
+        <pad key="pb0" name="PB0"/>
+        <pad key="pb1" name="PB1"/>
+        <pad key="pb2" name="PB2"/>
+        <pad key="pb3" name="PB3"/>
+        <pad key="vcc" name="VCC"/>
+        <pad key="gnd" name="GND"/>
+        <pad key="pb4" name="PB4"/>
+        <pad key="pb5" name="PB5"/>
+        <pad key="pb6" name="PB6"/>
+        <pad key="pb7" name="PB7"/>
+        <pad key="pa7" name="PA7"/>
+        <pad key="pa6" name="PA6"/>
+        <pad key="pa5" name="PA5"/>
+        <pad key="pa4" name="PA4"/>
+        <pad key="avcc" name="AVCC"/>
+        <pad key="agnd" name="AGND"/>
+        <pad key="pa3" name="PA3"/>
+        <pad key="pa2" name="PA2"/>
+        <pad key="pa1" name="PA1"/>
+        <pad key="va0" name="VA0"/>
+        <pad key="pa0" name="PA0"/>
+    </pads>
     <pinouts>
         <pinout key="pdip_soic_tssop_20" name="PDIP_SOIC_TSSOP_20" type="dip">
-            <pin position="1" pad="PB0"/>
-            <pin position="2" pad="PB1"/>
-            <pin position="3" pad="PB2"/>
-            <pin position="4" pad="PB3"/>
-            <pin position="5" pad="VCC"/>
-            <pin position="6" pad="GND"/>
-            <pin position="7" pad="PB4"/>
-            <pin position="8" pad="PB5"/>
-            <pin position="9" pad="PB6"/>
-            <pin position="10" pad="PB7"/>
-            <pin position="11" pad="PA7"/>
-            <pin position="12" pad="PA6"/>
-            <pin position="13" pad="PA5"/>
-            <pin position="14" pad="PA4"/>
-            <pin position="15" pad="AVCC"/>
-            <pin position="16" pad="AGND"/>
-            <pin position="17" pad="PA3"/>
-            <pin position="18" pad="PA2"/>
-            <pin position="19" pad="PA1"/>
-            <pin position="20" pad="VA0"/>
+            <pin position="1" pad-key="pb0"/>
+            <pin position="2" pad-key="pb1"/>
+            <pin position="3" pad-key="pb2"/>
+            <pin position="4" pad-key="pb3"/>
+            <pin position="5" pad-key="vcc"/>
+            <pin position="6" pad-key="gnd"/>
+            <pin position="7" pad-key="pb4"/>
+            <pin position="8" pad-key="pb5"/>
+            <pin position="9" pad-key="pb6"/>
+            <pin position="10" pad-key="pb7"/>
+            <pin position="11" pad-key="pa7"/>
+            <pin position="12" pad-key="pa6"/>
+            <pin position="13" pad-key="pa5"/>
+            <pin position="14" pad-key="pa4"/>
+            <pin position="15" pad-key="avcc"/>
+            <pin position="16" pad-key="agnd"/>
+            <pin position="17" pad-key="pa3"/>
+            <pin position="18" pad-key="pa2"/>
+            <pin position="19" pad-key="pa1"/>
+            <pin position="20" pad-key="va0"/>
         </pinout>
         <pinout key="qfn32" name="QFN32" type="qfn">
-            <pin position="1" pad="NC"/>
-            <pin position="2" pad="PB3"/>
-            <pin position="3" pad="NC"/>
-            <pin position="4" pad="VCC"/>
-            <pin position="5" pad="GND"/>
-            <pin position="6" pad="NC"/>
-            <pin position="7" pad="PB4"/>
-            <pin position="8" pad="PB5"/>
-            <pin position="9" pad="NC"/>
-            <pin position="10" pad="PB6"/>
-            <pin position="11" pad="PB7"/>
-            <pin position="12" pad="NC"/>
-            <pin position="13" pad="PA7"/>
-            <pin position="14" pad="PA6"/>
-            <pin position="15" pad="PA5"/>
-            <pin position="16" pad="NC"/>
-            <pin position="17" pad="PA4"/>
-            <pin position="18" pad="AVCC"/>
-            <pin position="19" pad="NC"/>
-            <pin position="20" pad="NC"/>
-            <pin position="21" pad="AGND"/>
-            <pin position="22" pad="PA3"/>
-            <pin position="23" pad="PA2"/>
-            <pin position="24" pad="NC"/>
-            <pin position="25" pad="PA1"/>
-            <pin position="26" pad="PA0"/>
-            <pin position="27" pad="NC"/>
-            <pin position="28" pad="NC"/>
-            <pin position="29" pad="NC"/>
-            <pin position="30" pad="PB0"/>
-            <pin position="31" pad="PB1"/>
-            <pin position="32" pad="PB2"/>
+            <pin position="1"/>
+            <pin position="2" pad-key="pb3"/>
+            <pin position="3"/>
+            <pin position="4" pad-key="vcc"/>
+            <pin position="5" pad-key="gnd"/>
+            <pin position="6"/>
+            <pin position="7" pad-key="pb4"/>
+            <pin position="8" pad-key="pb5"/>
+            <pin position="9"/>
+            <pin position="10" pad-key="pb6"/>
+            <pin position="11" pad-key="pb7"/>
+            <pin position="12"/>
+            <pin position="13" pad-key="pa7"/>
+            <pin position="14" pad-key="pa6"/>
+            <pin position="15" pad-key="pa5"/>
+            <pin position="16"/>
+            <pin position="17" pad-key="pa4"/>
+            <pin position="18" pad-key="avcc"/>
+            <pin position="19"/>
+            <pin position="20"/>
+            <pin position="21" pad-key="agnd"/>
+            <pin position="22" pad-key="pa3"/>
+            <pin position="23" pad-key="pa2"/>
+            <pin position="24"/>
+            <pin position="25" pad-key="pa1"/>
+            <pin position="26" pad-key="pa0"/>
+            <pin position="27"/>
+            <pin position="28"/>
+            <pin position="29"/>
+            <pin position="30" pad-key="pb0"/>
+            <pin position="31" pad-key="pb1"/>
+            <pin position="32" pad-key="pb2"/>
         </pinout>
     </pinouts>
     <variants>
-        <variant name="ATtiny461A-PU" pinout-key="pdip_soic_tssop_20" package="PDIP20"/>
-        <variant name="ATtiny461A-SUR" pinout-key="pdip_soic_tssop_20" package="SOIC20"/>
-        <variant name="ATtiny461A-SU" pinout-key="pdip_soic_tssop_20" package="SOIC20"/>
-        <variant name="ATtiny461A-XU" pinout-key="pdip_soic_tssop_20" package="TSSOP20"/>
-        <variant name="ATtiny461A-XUR" pinout-key="pdip_soic_tssop_20" package="TSSOP20"/>
-        <variant name="ATtiny461A-MUR" pinout-key="qfn32" package="VQFN32"/>
-        <variant name="ATtiny461A-MU" pinout-key="qfn32" package="VQFN32"/>
+        <variant key="attiny461a_pu" name="ATtiny461A-PU" pinout-key="pdip_soic_tssop_20"/>
+        <variant key="attiny461a_sur" name="ATtiny461A-SUR" pinout-key="pdip_soic_tssop_20"/>
+        <variant key="attiny461a_su" name="ATtiny461A-SU" pinout-key="pdip_soic_tssop_20"/>
+        <variant key="attiny461a_xu" name="ATtiny461A-XU" pinout-key="pdip_soic_tssop_20"/>
+        <variant key="attiny461a_xur" name="ATtiny461A-XUR" pinout-key="pdip_soic_tssop_20"/>
+        <variant key="attiny461a_mur" name="ATtiny461A-MUR" pinout-key="qfn32"/>
+        <variant key="attiny461a_mu" name="ATtiny461A-MU" pinout-key="qfn32"/>
     </variants>
 </device>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY48.xml b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY48.xml
index af5c49ff..709c9e19 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY48.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY48.xml
@@ -198,74 +198,74 @@
         <peripheral key="tc1" name="TC1" module-key="tc16">
             <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"/>
-                <signal pad-id="pb1" group="OCA"/>
-                <signal pad-id="pb3" group="OCB"/>
+                <signal pad-key="pd5" group="T"/>
+                <signal pad-key="pb0" group="ICP"/>
+                <signal pad-key="pb1" group="OCA"/>
+                <signal pad-key="pb3" group="OCB"/>
             </signals>
         </peripheral>
         <peripheral key="ac" name="AC" module-key="ac">
             <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"/>
+                <signal pad-key="pd6" index="0" group="AIN"/>
+                <signal pad-key="pd7" index="1" group="AIN"/>
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pb2" index="2" function="default" group="P"/>
-                <signal pad-id="pb3" index="3" function="default" group="P"/>
-                <signal pad-id="pb4" index="4" function="default" group="P"/>
-                <signal pad-id="pb5" index="5" function="default" group="P"/>
-                <signal pad-id="pb6" index="6" function="default" group="P"/>
-                <signal pad-id="pb7" index="7" function="default" group="P"/>
+                <signal pad-key="pb0" index="0" function="default" group="P"/>
+                <signal pad-key="pb1" index="1" function="default" group="P"/>
+                <signal pad-key="pb2" index="2" function="default" group="P"/>
+                <signal pad-key="pb3" index="3" function="default" group="P"/>
+                <signal pad-key="pb4" index="4" function="default" group="P"/>
+                <signal pad-key="pb5" index="5" function="default" group="P"/>
+                <signal pad-key="pb6" index="6" function="default" group="P"/>
+                <signal pad-key="pb7" index="7" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pd2" index="2" function="default" group="P"/>
-                <signal pad-id="pd3" index="3" function="default" group="P"/>
-                <signal pad-id="pd4" index="4" function="default" group="P"/>
-                <signal pad-id="pd5" index="5" function="default" group="P"/>
-                <signal pad-id="pd6" index="6" function="default" group="P"/>
-                <signal pad-id="pd7" index="7" function="default" group="P"/>
+                <signal pad-key="pd0" index="0" function="default" group="P"/>
+                <signal pad-key="pd1" index="1" function="default" group="P"/>
+                <signal pad-key="pd2" index="2" function="default" group="P"/>
+                <signal pad-key="pd3" index="3" function="default" group="P"/>
+                <signal pad-key="pd4" index="4" function="default" group="P"/>
+                <signal pad-key="pd5" index="5" function="default" group="P"/>
+                <signal pad-key="pd6" index="6" function="default" group="P"/>
+                <signal pad-key="pd7" index="7" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pc2" index="2" function="default" group="P"/>
-                <signal pad-id="pc3" index="3" function="default" group="P"/>
-                <signal pad-id="pc4" index="4" function="default" group="P"/>
-                <signal pad-id="pc5" index="5" function="default" group="P"/>
-                <signal pad-id="pc6" index="6" function="default" group="P"/>
-                <signal pad-id="pc7" index="7" function="default" group="P"/>
+                <signal pad-key="pc0" index="0" function="default" group="P"/>
+                <signal pad-key="pc1" index="1" function="default" group="P"/>
+                <signal pad-key="pc2" index="2" function="default" group="P"/>
+                <signal pad-key="pc3" index="3" function="default" group="P"/>
+                <signal pad-key="pc4" index="4" function="default" group="P"/>
+                <signal pad-key="pc5" index="5" function="default" group="P"/>
+                <signal pad-key="pc6" index="6" function="default" group="P"/>
+                <signal pad-key="pc7" index="7" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pa2" index="2" function="default" group="P"/>
-                <signal pad-id="pa3" index="3" function="default" group="P"/>
+                <signal pad-key="pa0" index="0" function="default" group="P"/>
+                <signal pad-key="pa1" index="1" function="default" group="P"/>
+                <signal pad-key="pa2" index="2" function="default" group="P"/>
+                <signal pad-key="pa3" index="3" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="spi" name="SPI" module-key="spi">
             <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"/>
-                <signal pad-id="pb3" group="MOSI"/>
-                <signal pad-id="pb2" group="SS"/>
+                <signal pad-key="pb5" group="SCK"/>
+                <signal pad-key="pb4" group="MISO"/>
+                <signal pad-key="pb3" group="MOSI"/>
+                <signal pad-key="pb2" group="SS"/>
             </signals>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="wdt">
@@ -277,62 +277,62 @@
         <peripheral key="twi" name="TWI" module-key="twi">
             <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"/>
+                <signal pad-key="pc6" group="SCL"/>
+                <signal pad-key="pc5" group="SDA"/>
             </signals>
         </peripheral>
         <peripheral key="adc" name="ADC" module-key="adc">
             <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"/>
-                <signal pad-id="pc2" index="2" group="ADC"/>
-                <signal pad-id="pc3" index="3" group="ADC"/>
-                <signal pad-id="pc4" index="4" group="ADC"/>
-                <signal pad-id="pc5" index="5" group="ADC"/>
-                <signal pad-id="pa0" index="6" group="ADC"/>
-                <signal pad-id="pa1" index="7" group="ADC"/>
+                <signal pad-key="pc0" index="0" group="ADC"/>
+                <signal pad-key="pc1" index="1" group="ADC"/>
+                <signal pad-key="pc2" index="2" group="ADC"/>
+                <signal pad-key="pc3" index="3" group="ADC"/>
+                <signal pad-key="pc4" index="4" group="ADC"/>
+                <signal pad-key="pc5" index="5" group="ADC"/>
+                <signal pad-key="pa0" index="6" group="ADC"/>
+                <signal pad-key="pa1" index="7" group="ADC"/>
             </signals>
         </peripheral>
         <peripheral key="exint" name="EXINT" module-key="exint">
             <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"/>
-                <signal pad-id="pb2" index="2" group="PCINT"/>
-                <signal pad-id="pb3" index="3" group="PCINT"/>
-                <signal pad-id="pb4" index="4" group="PCINT"/>
-                <signal pad-id="pb5" index="5" group="PCINT"/>
-                <signal pad-id="pb6" index="6" group="PCINT"/>
-                <signal pad-id="pb7" index="7" group="PCINT"/>
-                <signal pad-id="pc0" index="8" group="PCINT"/>
-                <signal pad-id="pc1" index="9" group="PCINT"/>
-                <signal pad-id="pc2" index="10" group="PCINT"/>
-                <signal pad-id="pc3" index="11" group="PCINT"/>
-                <signal pad-id="pc4" index="12" group="PCINT"/>
-                <signal pad-id="pc5" index="13" group="PCINT"/>
-                <signal pad-id="pc6" index="14" group="PCINT"/>
-                <signal pad-id="pc7" index="15" group="PCINT"/>
-                <signal pad-id="pd0" index="16" group="PCINT"/>
-                <signal pad-id="pd1" index="17" group="PCINT"/>
-                <signal pad-id="pd2" index="18" group="PCINT"/>
-                <signal pad-id="pd3" index="19" group="PCINT"/>
-                <signal pad-id="pd4" index="20" group="PCINT"/>
-                <signal pad-id="pd5" index="21" group="PCINT"/>
-                <signal pad-id="pd6" index="22" group="PCINT"/>
-                <signal pad-id="pd7" index="23" group="PCINT"/>
-                <signal pad-id="pa0" index="24" group="PCINT"/>
-                <signal pad-id="pa1" index="25" group="PCINT"/>
-                <signal pad-id="pa2" index="26" group="PCINT"/>
-                <signal pad-id="pa3" index="27" group="PCINT"/>
-                <signal pad-id="pd2" index="0" group="INT"/>
-                <signal pad-id="pd3" index="1" group="INT"/>
+                <signal pad-key="pb0" index="0" group="PCINT"/>
+                <signal pad-key="pb1" index="1" group="PCINT"/>
+                <signal pad-key="pb2" index="2" group="PCINT"/>
+                <signal pad-key="pb3" index="3" group="PCINT"/>
+                <signal pad-key="pb4" index="4" group="PCINT"/>
+                <signal pad-key="pb5" index="5" group="PCINT"/>
+                <signal pad-key="pb6" index="6" group="PCINT"/>
+                <signal pad-key="pb7" index="7" group="PCINT"/>
+                <signal pad-key="pc0" index="8" group="PCINT"/>
+                <signal pad-key="pc1" index="9" group="PCINT"/>
+                <signal pad-key="pc2" index="10" group="PCINT"/>
+                <signal pad-key="pc3" index="11" group="PCINT"/>
+                <signal pad-key="pc4" index="12" group="PCINT"/>
+                <signal pad-key="pc5" index="13" group="PCINT"/>
+                <signal pad-key="pc6" index="14" group="PCINT"/>
+                <signal pad-key="pc7" index="15" group="PCINT"/>
+                <signal pad-key="pd0" index="16" group="PCINT"/>
+                <signal pad-key="pd1" index="17" group="PCINT"/>
+                <signal pad-key="pd2" index="18" group="PCINT"/>
+                <signal pad-key="pd3" index="19" group="PCINT"/>
+                <signal pad-key="pd4" index="20" group="PCINT"/>
+                <signal pad-key="pd5" index="21" group="PCINT"/>
+                <signal pad-key="pd6" index="22" group="PCINT"/>
+                <signal pad-key="pd7" index="23" group="PCINT"/>
+                <signal pad-key="pa0" index="24" group="PCINT"/>
+                <signal pad-key="pa1" index="25" group="PCINT"/>
+                <signal pad-key="pa2" index="26" group="PCINT"/>
+                <signal pad-key="pa3" index="27" group="PCINT"/>
+                <signal pad-key="pd2" index="0" group="INT"/>
+                <signal pad-key="pd3" index="1" group="INT"/>
             </signals>
         </peripheral>
         <peripheral key="tc0" name="TC0" module-key="tc8">
             <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"/>
+                <signal pad-key="pd4" group="T"/>
             </signals>
         </peripheral>
         <peripheral key="eeprom" name="EEPROM" module-key="eeprom">
@@ -674,142 +674,175 @@
             </register-group>
         </module>
     </modules>
+    <pads>
+        <pad key="pd3" name="PD3"/>
+        <pad key="pd4" name="PD4"/>
+        <pad key="pa2" name="PA2"/>
+        <pad key="vcc" name="VCC"/>
+        <pad key="gnd" name="GND"/>
+        <pad key="pa3" name="PA3"/>
+        <pad key="pb6" name="PB6"/>
+        <pad key="pb7" name="PB7"/>
+        <pad key="pd5" name="PD5"/>
+        <pad key="pd6" name="PD6"/>
+        <pad key="pd7" name="PD7"/>
+        <pad key="pb0" name="PB0"/>
+        <pad key="pb1" name="PB1"/>
+        <pad key="pb2" name="PB2"/>
+        <pad key="pb3" name="PB3"/>
+        <pad key="pb4" name="PB4"/>
+        <pad key="pb5" name="PB5"/>
+        <pad key="avcc" name="AVCC"/>
+        <pad key="pa0" name="PA0"/>
+        <pad key="pc7" name="PC7"/>
+        <pad key="pa1" name="PA1"/>
+        <pad key="pc0" name="PC0"/>
+        <pad key="pc1" name="PC1"/>
+        <pad key="pc2" name="PC2"/>
+        <pad key="pc3" name="PC3"/>
+        <pad key="pc4" name="PC4"/>
+        <pad key="pc5" name="PC5"/>
+        <pad key="pc6" name="PC6"/>
+        <pad key="pd0" name="PD0"/>
+        <pad key="pd1" name="PD1"/>
+        <pad key="pd2" name="PD2"/>
+    </pads>
     <pinouts>
         <pinout key="tqfp_qfn_32" name="TQFP_QFN_32" type="qfn">
-            <pin position="1" pad="PD3"/>
-            <pin position="2" pad="PD4"/>
-            <pin position="3" pad="PA2"/>
-            <pin position="4" pad="VCC"/>
-            <pin position="5" pad="GND"/>
-            <pin position="6" pad="PA3"/>
-            <pin position="7" pad="PB6"/>
-            <pin position="8" pad="PB7"/>
-            <pin position="9" pad="PD5"/>
-            <pin position="10" pad="PD6"/>
-            <pin position="11" pad="PD7"/>
-            <pin position="12" pad="PB0"/>
-            <pin position="13" pad="PB1"/>
-            <pin position="14" pad="PB2"/>
-            <pin position="15" pad="PB3"/>
-            <pin position="16" pad="PB4"/>
-            <pin position="17" pad="PB5"/>
-            <pin position="18" pad="AVCC"/>
-            <pin position="19" pad="PA0"/>
-            <pin position="20" pad="PC7"/>
-            <pin position="21" pad="GND"/>
-            <pin position="22" pad="PA1"/>
-            <pin position="23" pad="PC0"/>
-            <pin position="24" pad="PC1"/>
-            <pin position="25" pad="PC2"/>
-            <pin position="26" pad="PC3"/>
-            <pin position="27" pad="PC4"/>
-            <pin position="28" pad="PC5"/>
-            <pin position="29" pad="PC6"/>
-            <pin position="30" pad="PD0"/>
-            <pin position="31" pad="PD1"/>
-            <pin position="32" pad="PD2"/>
+            <pin position="1" pad-key="pd3"/>
+            <pin position="2" pad-key="pd4"/>
+            <pin position="3" pad-key="pa2"/>
+            <pin position="4" pad-key="vcc"/>
+            <pin position="5" pad-key="gnd"/>
+            <pin position="6" pad-key="pa3"/>
+            <pin position="7" pad-key="pb6"/>
+            <pin position="8" pad-key="pb7"/>
+            <pin position="9" pad-key="pd5"/>
+            <pin position="10" pad-key="pd6"/>
+            <pin position="11" pad-key="pd7"/>
+            <pin position="12" pad-key="pb0"/>
+            <pin position="13" pad-key="pb1"/>
+            <pin position="14" pad-key="pb2"/>
+            <pin position="15" pad-key="pb3"/>
+            <pin position="16" pad-key="pb4"/>
+            <pin position="17" pad-key="pb5"/>
+            <pin position="18" pad-key="avcc"/>
+            <pin position="19" pad-key="pa0"/>
+            <pin position="20" pad-key="pc7"/>
+            <pin position="21" pad-key="gnd"/>
+            <pin position="22" pad-key="pa1"/>
+            <pin position="23" pad-key="pc0"/>
+            <pin position="24" pad-key="pc1"/>
+            <pin position="25" pad-key="pc2"/>
+            <pin position="26" pad-key="pc3"/>
+            <pin position="27" pad-key="pc4"/>
+            <pin position="28" pad-key="pc5"/>
+            <pin position="29" pad-key="pc6"/>
+            <pin position="30" pad-key="pd0"/>
+            <pin position="31" pad-key="pd1"/>
+            <pin position="32" pad-key="pd2"/>
         </pinout>
         <pinout key="pdip28" name="PDIP28" type="dip">
-            <pin position="1" pad="PC6"/>
-            <pin position="2" pad="PD0"/>
-            <pin position="3" pad="PD1"/>
-            <pin position="4" pad="PD2"/>
-            <pin position="5" pad="PD3"/>
-            <pin position="6" pad="PD4"/>
-            <pin position="7" pad="VCC"/>
-            <pin position="8" pad="GND"/>
-            <pin position="9" pad="PB6"/>
-            <pin position="10" pad="PB7"/>
-            <pin position="11" pad="PD5"/>
-            <pin position="12" pad="PD6"/>
-            <pin position="13" pad="PD7"/>
-            <pin position="14" pad="PB0"/>
-            <pin position="15" pad="PB1"/>
-            <pin position="16" pad="PB2"/>
-            <pin position="17" pad="PB3"/>
-            <pin position="18" pad="PB4"/>
-            <pin position="19" pad="PB5"/>
-            <pin position="20" pad="AVCC"/>
-            <pin position="21" pad="PC7"/>
-            <pin position="22" pad="GND"/>
-            <pin position="23" pad="PC0"/>
-            <pin position="24" pad="PC1"/>
-            <pin position="25" pad="PC2"/>
-            <pin position="26" pad="PC3"/>
-            <pin position="27" pad="PC4"/>
-            <pin position="28" pad="PC5"/>
+            <pin position="1" pad-key="pc6"/>
+            <pin position="2" pad-key="pd0"/>
+            <pin position="3" pad-key="pd1"/>
+            <pin position="4" pad-key="pd2"/>
+            <pin position="5" pad-key="pd3"/>
+            <pin position="6" pad-key="pd4"/>
+            <pin position="7" pad-key="vcc"/>
+            <pin position="8" pad-key="gnd"/>
+            <pin position="9" pad-key="pb6"/>
+            <pin position="10" pad-key="pb7"/>
+            <pin position="11" pad-key="pd5"/>
+            <pin position="12" pad-key="pd6"/>
+            <pin position="13" pad-key="pd7"/>
+            <pin position="14" pad-key="pb0"/>
+            <pin position="15" pad-key="pb1"/>
+            <pin position="16" pad-key="pb2"/>
+            <pin position="17" pad-key="pb3"/>
+            <pin position="18" pad-key="pb4"/>
+            <pin position="19" pad-key="pb5"/>
+            <pin position="20" pad-key="avcc"/>
+            <pin position="21" pad-key="pc7"/>
+            <pin position="22" pad-key="gnd"/>
+            <pin position="23" pad-key="pc0"/>
+            <pin position="24" pad-key="pc1"/>
+            <pin position="25" pad-key="pc2"/>
+            <pin position="26" pad-key="pc3"/>
+            <pin position="27" pad-key="pc4"/>
+            <pin position="28" pad-key="pc5"/>
         </pinout>
         <pinout key="qfn28" name="QFN28" type="qfn">
-            <pin position="1" pad="PD3"/>
-            <pin position="2" pad="PD4"/>
-            <pin position="3" pad="VCC"/>
-            <pin position="4" pad="GND"/>
-            <pin position="5" pad="PB6"/>
-            <pin position="6" pad="PB7"/>
-            <pin position="7" pad="PD5"/>
-            <pin position="8" pad="PD6"/>
-            <pin position="9" pad="PD7"/>
-            <pin position="10" pad="PB0"/>
-            <pin position="11" pad="PB1"/>
-            <pin position="12" pad="PB2"/>
-            <pin position="13" pad="PB3"/>
-            <pin position="14" pad="PB4"/>
-            <pin position="15" pad="PB5"/>
-            <pin position="16" pad="AVCC"/>
-            <pin position="17" pad="PC7"/>
-            <pin position="18" pad="GND"/>
-            <pin position="19" pad="PC0"/>
-            <pin position="20" pad="PC1"/>
-            <pin position="21" pad="PC2"/>
-            <pin position="22" pad="PC3"/>
-            <pin position="23" pad="PC4"/>
-            <pin position="24" pad="PC5"/>
-            <pin position="25" pad="PC6"/>
-            <pin position="26" pad="PD0"/>
-            <pin position="27" pad="PD1"/>
-            <pin position="28" pad="PD2"/>
+            <pin position="1" pad-key="pd3"/>
+            <pin position="2" pad-key="pd4"/>
+            <pin position="3" pad-key="vcc"/>
+            <pin position="4" pad-key="gnd"/>
+            <pin position="5" pad-key="pb6"/>
+            <pin position="6" pad-key="pb7"/>
+            <pin position="7" pad-key="pd5"/>
+            <pin position="8" pad-key="pd6"/>
+            <pin position="9" pad-key="pd7"/>
+            <pin position="10" pad-key="pb0"/>
+            <pin position="11" pad-key="pb1"/>
+            <pin position="12" pad-key="pb2"/>
+            <pin position="13" pad-key="pb3"/>
+            <pin position="14" pad-key="pb4"/>
+            <pin position="15" pad-key="pb5"/>
+            <pin position="16" pad-key="avcc"/>
+            <pin position="17" pad-key="pc7"/>
+            <pin position="18" pad-key="gnd"/>
+            <pin position="19" pad-key="pc0"/>
+            <pin position="20" pad-key="pc1"/>
+            <pin position="21" pad-key="pc2"/>
+            <pin position="22" pad-key="pc3"/>
+            <pin position="23" pad-key="pc4"/>
+            <pin position="24" pad-key="pc5"/>
+            <pin position="25" pad-key="pc6"/>
+            <pin position="26" pad-key="pd0"/>
+            <pin position="27" pad-key="pd1"/>
+            <pin position="28" pad-key="pd2"/>
         </pinout>
         <pinout key="ufbga32" name="UFBGA32" type="bga">
-            <pin position="A1" pad="PD2"/>
-            <pin position="B1" pad="PD3"/>
-            <pin position="C1" pad="GND"/>
-            <pin position="D1" pad="VCC"/>
-            <pin position="E1" pad="PB6"/>
-            <pin position="F1" pad="PB7"/>
-            <pin position="A2" pad="PD1"/>
-            <pin position="B2" pad="PD4"/>
-            <pin position="C2" pad="PA2"/>
-            <pin position="D2" pad="PA3"/>
-            <pin position="E2" pad="PD6"/>
-            <pin position="F2" pad="PD5"/>
-            <pin position="A3" pad="PC6"/>
-            <pin position="B3" pad="PD0"/>
-            <pin position="E3" pad="PB0"/>
-            <pin position="F3" pad="PD7"/>
-            <pin position="A4" pad="PC4"/>
-            <pin position="B4" pad="PC5"/>
-            <pin position="E4" pad="PB2"/>
-            <pin position="F4" pad="PB1"/>
-            <pin position="A5" pad="PC2"/>
-            <pin position="B5" pad="PC3"/>
-            <pin position="C5" pad="PA1"/>
-            <pin position="D5" pad="PC7"/>
-            <pin position="E5" pad="AVCC"/>
-            <pin position="F5" pad="PB3"/>
-            <pin position="A6" pad="PC1"/>
-            <pin position="B6" pad="PC0"/>
-            <pin position="C6" pad="GND"/>
-            <pin position="D6" pad="PA0"/>
-            <pin position="E6" pad="PB5"/>
-            <pin position="F6" pad="PB4"/>
+            <pin position="A1" pad-key="pd2"/>
+            <pin position="B1" pad-key="pd3"/>
+            <pin position="C1" pad-key="gnd"/>
+            <pin position="D1" pad-key="vcc"/>
+            <pin position="E1" pad-key="pb6"/>
+            <pin position="F1" pad-key="pb7"/>
+            <pin position="A2" pad-key="pd1"/>
+            <pin position="B2" pad-key="pd4"/>
+            <pin position="C2" pad-key="pa2"/>
+            <pin position="D2" pad-key="pa3"/>
+            <pin position="E2" pad-key="pd6"/>
+            <pin position="F2" pad-key="pd5"/>
+            <pin position="A3" pad-key="pc6"/>
+            <pin position="B3" pad-key="pd0"/>
+            <pin position="E3" pad-key="pb0"/>
+            <pin position="F3" pad-key="pd7"/>
+            <pin position="A4" pad-key="pc4"/>
+            <pin position="B4" pad-key="pc5"/>
+            <pin position="E4" pad-key="pb2"/>
+            <pin position="F4" pad-key="pb1"/>
+            <pin position="A5" pad-key="pc2"/>
+            <pin position="B5" pad-key="pc3"/>
+            <pin position="C5" pad-key="pa1"/>
+            <pin position="D5" pad-key="pc7"/>
+            <pin position="E5" pad-key="avcc"/>
+            <pin position="F5" pad-key="pb3"/>
+            <pin position="A6" pad-key="pc1"/>
+            <pin position="B6" pad-key="pc0"/>
+            <pin position="C6" pad-key="gnd"/>
+            <pin position="D6" pad-key="pa0"/>
+            <pin position="E6" pad-key="pb5"/>
+            <pin position="F6" pad-key="pb4"/>
         </pinout>
     </pinouts>
     <variants>
-        <variant name="ATtiny48-MMU" pinout-key="qfn28" package="QFN28"/>
-        <variant name="ATtiny48-MMH" pinout-key="qfn28" package="QFN28"/>
-        <variant name="ATtiny48-PU" pinout-key="pdip28" package="PDIP28"/>
-        <variant name="ATtiny48-AU" pinout-key="tqfp_qfn_32" package="TQFP32"/>
-        <variant name="ATtiny48-CCU" pinout-key="ufbga32" package="UFBGA32"/>
-        <variant name="ATtiny48-MU" pinout-key="tqfp_qfn_32" package="QFN32"/>
+        <variant key="attiny48_mmu" name="ATtiny48-MMU" pinout-key="qfn28"/>
+        <variant key="attiny48_mmh" name="ATtiny48-MMH" pinout-key="qfn28"/>
+        <variant key="attiny48_pu" name="ATtiny48-PU" pinout-key="pdip28"/>
+        <variant key="attiny48_au" name="ATtiny48-AU" pinout-key="tqfp_qfn_32"/>
+        <variant key="attiny48_ccu" name="ATtiny48-CCU" pinout-key="ufbga32"/>
+        <variant key="attiny48_mu" name="ATtiny48-MU" pinout-key="tqfp_qfn_32"/>
     </variants>
 </device>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY804.xml b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY804.xml
index 7d7e2da8..5983b475 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY804.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY804.xml
@@ -44,24 +44,24 @@
         <peripheral key="ac0" name="AC0" module-key="i2106">
             <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"/>
-                <signal pad-id="pa7" index="0" function="AC0" group="P"/>
+                <signal pad-key="pa6" index="0" function="AC0" group="N"/>
+                <signal pad-key="pa5" index="0" function="AC0" group="OUT"/>
+                <signal pad-key="pa7" index="0" function="AC0" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="adc0" name="ADC0" module-key="i2132">
             <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"/>
-                <signal pad-id="pa2" index="2" function="AIN0" group="AIN"/>
-                <signal pad-id="pa3" index="3" function="AIN0" group="AIN"/>
-                <signal pad-id="pa4" index="4" function="AIN0" group="AIN"/>
-                <signal pad-id="pa5" index="5" function="AIN0" group="AIN"/>
-                <signal pad-id="pa6" index="6" function="AIN0" group="AIN"/>
-                <signal pad-id="pa7" index="7" function="AIN0" group="AIN"/>
-                <signal pad-id="pb1" index="10" function="AIN0" group="AIN"/>
-                <signal pad-id="pb0" index="11" function="AIN0" group="AIN"/>
+                <signal pad-key="pa0" index="0" function="AIN0" group="AIN"/>
+                <signal pad-key="pa1" index="1" function="AIN0" group="AIN"/>
+                <signal pad-key="pa2" index="2" function="AIN0" group="AIN"/>
+                <signal pad-key="pa3" index="3" function="AIN0" group="AIN"/>
+                <signal pad-key="pa4" index="4" function="AIN0" group="AIN"/>
+                <signal pad-key="pa5" index="5" function="AIN0" group="AIN"/>
+                <signal pad-key="pa6" index="6" function="AIN0" group="AIN"/>
+                <signal pad-key="pa7" index="7" function="AIN0" group="AIN"/>
+                <signal pad-key="pb1" index="10" function="AIN0" group="AIN"/>
+                <signal pad-key="pb0" index="11" function="AIN0" group="AIN"/>
             </signals>
         </peripheral>
         <peripheral key="bod" name="BOD" module-key="i2114">
@@ -70,25 +70,25 @@
         <peripheral key="ccl" name="CCL" module-key="i2128">
             <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"/>
-                <signal pad-id="pa2" index="2" function="CCL" group="LUT0_IN"/>
-                <signal pad-id="pa4" index="0" function="CCL" group="LUT0_OUT" field="PORTMUX.CTRLA.LUT0"/>
-                <signal pad-id="pa7" index="0" function="CCL" group="LUT1_OUT" field="PORTMUX.CTRLA.LUT1"/>
+                <signal pad-key="pa0" index="0" function="CCL" group="LUT0_IN"/>
+                <signal pad-key="pa1" index="1" function="CCL" group="LUT0_IN"/>
+                <signal pad-key="pa2" index="2" function="CCL" group="LUT0_IN"/>
+                <signal pad-key="pa4" index="0" function="CCL" group="LUT0_OUT" field="PORTMUX.CTRLA.LUT0"/>
+                <signal pad-key="pa7" index="0" function="CCL" group="LUT1_OUT" field="PORTMUX.CTRLA.LUT1"/>
             </signals>
         </peripheral>
         <peripheral key="clkctrl" name="CLKCTRL" module-key="i2603_clkctrl">
             <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"/>
-                <signal pad-id="pb2" function="CLKCTRL" group="TOSC2"/>
+                <signal pad-key="pa3" function="CLKCTRL" group="CLKI"/>
+                <signal pad-key="pb3" function="CLKCTRL" group="TOSC1"/>
+                <signal pad-key="pb2" function="CLKCTRL" group="TOSC2"/>
             </signals>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="i2100">
             <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"/>
+                <signal pad-key="pa1" function="BREAK" group="BREAK" field="PORTMUX.CTRLA.EXTBRK"/>
             </signals>
         </peripheral>
         <peripheral key="cpuint" name="CPUINT" module-key="i2104">
@@ -100,32 +100,32 @@
         <peripheral key="evsys" name="EVSYS" module-key="i2603_evsys">
             <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"/>
-                <signal pad-id="pa2" index="2" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
-                <signal pad-id="pa3" index="3" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
-                <signal pad-id="pa4" index="4" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
-                <signal pad-id="pa5" index="5" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
-                <signal pad-id="pa6" index="6" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
-                <signal pad-id="pa7" index="7" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
-                <signal pad-id="pb0" index="0" function="EVAINCH1" group="EVAPB" field="EVSYS.ASYNCCH1.ASYNCCH1"/>
-                <signal pad-id="pb1" index="1" function="EVAINCH1" group="EVAPB" field="EVSYS.ASYNCCH1.ASYNCCH1"/>
-                <signal pad-id="pb2" index="2" function="EVAINCH1" group="EVAPB" field="EVSYS.ASYNCCH1.ASYNCCH1"/>
-                <signal pad-id="pb3" index="3" function="EVAINCH1" group="EVAPB" field="EVSYS.ASYNCCH1.ASYNCCH1"/>
-                <signal pad-id="pa2" index="0" function="EVSYS" group="EVOUT" field="PORTMUX.CTRLA.EVOUT0"/>
-                <signal pad-id="pb2" index="1" function="EVSYS" group="EVOUT" field="PORTMUX.CTRLA.EVOUT1"/>
-                <signal pad-id="pa0" index="0" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
-                <signal pad-id="pa1" index="1" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
-                <signal pad-id="pa2" index="2" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
-                <signal pad-id="pa3" index="3" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
-                <signal pad-id="pa4" index="4" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
-                <signal pad-id="pa5" index="5" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
-                <signal pad-id="pa6" index="6" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
-                <signal pad-id="pa7" index="7" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
-                <signal pad-id="pb0" index="0" function="EVSINCH1" group="EVSPB" field="EVSYS.SYNCCH1.SYNCCH1"/>
-                <signal pad-id="pb1" index="1" function="EVSINCH1" group="EVSPB" field="EVSYS.SYNCCH1.SYNCCH1"/>
-                <signal pad-id="pb2" index="2" function="EVSINCH1" group="EVSPB" field="EVSYS.SYNCCH1.SYNCCH1"/>
-                <signal pad-id="pb3" index="3" function="EVSINCH1" group="EVSPB" field="EVSYS.SYNCCH1.SYNCCH1"/>
+                <signal pad-key="pa0" index="0" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
+                <signal pad-key="pa1" index="1" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
+                <signal pad-key="pa2" index="2" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
+                <signal pad-key="pa3" index="3" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
+                <signal pad-key="pa4" index="4" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
+                <signal pad-key="pa5" index="5" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
+                <signal pad-key="pa6" index="6" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
+                <signal pad-key="pa7" index="7" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
+                <signal pad-key="pb0" index="0" function="EVAINCH1" group="EVAPB" field="EVSYS.ASYNCCH1.ASYNCCH1"/>
+                <signal pad-key="pb1" index="1" function="EVAINCH1" group="EVAPB" field="EVSYS.ASYNCCH1.ASYNCCH1"/>
+                <signal pad-key="pb2" index="2" function="EVAINCH1" group="EVAPB" field="EVSYS.ASYNCCH1.ASYNCCH1"/>
+                <signal pad-key="pb3" index="3" function="EVAINCH1" group="EVAPB" field="EVSYS.ASYNCCH1.ASYNCCH1"/>
+                <signal pad-key="pa2" index="0" function="EVSYS" group="EVOUT" field="PORTMUX.CTRLA.EVOUT0"/>
+                <signal pad-key="pb2" index="1" function="EVSYS" group="EVOUT" field="PORTMUX.CTRLA.EVOUT1"/>
+                <signal pad-key="pa0" index="0" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
+                <signal pad-key="pa1" index="1" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
+                <signal pad-key="pa2" index="2" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
+                <signal pad-key="pa3" index="3" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
+                <signal pad-key="pa4" index="4" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
+                <signal pad-key="pa5" index="5" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
+                <signal pad-key="pa6" index="6" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
+                <signal pad-key="pa7" index="7" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
+                <signal pad-key="pb0" index="0" function="EVSINCH1" group="EVSPB" field="EVSYS.SYNCCH1.SYNCCH1"/>
+                <signal pad-key="pb1" index="1" function="EVSINCH1" group="EVSPB" field="EVSYS.SYNCCH1.SYNCCH1"/>
+                <signal pad-key="pb2" index="2" function="EVSINCH1" group="EVSPB" field="EVSYS.SYNCCH1.SYNCCH1"/>
+                <signal pad-key="pb3" index="3" function="EVSINCH1" group="EVSPB" field="EVSYS.SYNCCH1.SYNCCH1"/>
             </signals>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="i2603_fuse">
@@ -143,23 +143,23 @@
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pa2" index="2" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa3" index="3" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa4" index="4" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa5" index="5" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa6" index="6" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa7" index="7" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa0" index="0" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa1" index="1" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa2" index="2" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa3" index="3" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa4" index="4" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa5" index="5" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa6" index="6" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa7" index="7" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pb2" index="2" function="IOPORT" group="PIN"/>
-                <signal pad-id="pb3" index="3" function="IOPORT" group="PIN"/>
+                <signal pad-key="pb0" index="0" function="IOPORT" group="PIN"/>
+                <signal pad-key="pb1" index="1" function="IOPORT" group="PIN"/>
+                <signal pad-key="pb2" index="2" function="IOPORT" group="PIN"/>
+                <signal pad-key="pb3" index="3" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="portmux" name="PORTMUX" module-key="i2603_portmux">
@@ -168,7 +168,7 @@
         <peripheral key="rstctrl" name="RSTCTRL" module-key="i2111">
             <register-group-instance register-group-key="rstctrl" address-space-key="data" offset="0x40"/>
             <signals>
-                <signal pad-id="pa0" function="OTHER" group="RESET"/>
+                <signal pad-key="pa0" function="OTHER" group="RESET"/>
             </signals>
         </peripheral>
         <peripheral key="rtc" name="RTC" module-key="i2116">
@@ -183,54 +183,54 @@
         <peripheral key="spi0" name="SPI0" module-key="i2107">
             <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"/>
-                <signal pad-id="pa3" function="SPI0" group="SCK" field="PORTMUX.CTRLB.SPI0"/>
-                <signal pad-id="pa4" function="SPI0" group="SS" field="PORTMUX.CTRLB.SPI0"/>
+                <signal pad-key="pa2" function="SPI0" group="MISO" field="PORTMUX.CTRLB.SPI0"/>
+                <signal pad-key="pa1" function="SPI0" group="MOSI" field="PORTMUX.CTRLB.SPI0"/>
+                <signal pad-key="pa3" function="SPI0" group="SCK" field="PORTMUX.CTRLB.SPI0"/>
+                <signal pad-key="pa4" function="SPI0" group="SS" field="PORTMUX.CTRLB.SPI0"/>
             </signals>
         </peripheral>
         <peripheral key="syscfg" name="SYSCFG" module-key="i2603_syscfg">
             <register-group-instance register-group-key="syscfg" address-space-key="data" offset="0xF00"/>
             <signals>
-                <signal pad-id="pa0" function="OTHER" group="UPDI"/>
+                <signal pad-key="pa0" function="OTHER" group="UPDI"/>
             </signals>
         </peripheral>
         <peripheral key="tca0" name="TCA0" module-key="i2117">
             <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"/>
-                <signal pad-id="pb1" index="1" function="TCA0" group="WO" field="PORTMUX.CTRLC.TCA01"/>
-                <signal pad-id="pb2" index="2" function="TCA0" group="WO" field="PORTMUX.CTRLC.TCA02"/>
-                <signal pad-id="pa3" index="3" function="TCA0" group="WO" field="PORTMUX.CTRLC.TCA03"/>
-                <signal pad-id="pa4" index="4" function="TCA0" group="WO" field="PORTMUX.CTRLC.TCA04"/>
-                <signal pad-id="pa5" index="5" function="TCA0" group="WO" field="PORTMUX.CTRLC.TCA05"/>
+                <signal pad-key="pb3" index="0" function="TCA0_ALT" group="WO" field="PORTMUX.CTRLC.TCA00"/>
+                <signal pad-key="pb0" index="0" function="TCA0" group="WO" field="PORTMUX.CTRLC.TCA00"/>
+                <signal pad-key="pb1" index="1" function="TCA0" group="WO" field="PORTMUX.CTRLC.TCA01"/>
+                <signal pad-key="pb2" index="2" function="TCA0" group="WO" field="PORTMUX.CTRLC.TCA02"/>
+                <signal pad-key="pa3" index="3" function="TCA0" group="WO" field="PORTMUX.CTRLC.TCA03"/>
+                <signal pad-key="pa4" index="4" function="TCA0" group="WO" field="PORTMUX.CTRLC.TCA04"/>
+                <signal pad-key="pa5" index="5" function="TCA0" group="WO" field="PORTMUX.CTRLC.TCA05"/>
             </signals>
         </peripheral>
         <peripheral key="tcb0" name="TCB0" module-key="i2119">
             <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"/>
+                <signal pad-key="pa5" index="0" function="TCB0" group="WO" field="PORTMUX.CTRLD.TCB0"/>
             </signals>
         </peripheral>
         <peripheral key="twi0" name="TWI0" module-key="i2110">
             <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"/>
+                <signal pad-key="pb0" function="TWI0" group="SCL" field="PORTMUX.CTRLB.TWI0"/>
+                <signal pad-key="pb1" function="TWI0" group="SDA" field="PORTMUX.CTRLB.TWI0"/>
             </signals>
         </peripheral>
         <peripheral key="usart0" name="USART0" module-key="i2108">
             <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"/>
-                <signal pad-id="pa1" function="USART0_ALT" group="TXD" field="PORTMUX.CTRLB.USART0"/>
-                <signal pad-id="pb2" function="USART0" group="TXD" field="PORTMUX.CTRLB.USART0"/>
-                <signal pad-id="pa3" function="USART0_ALT" group="XCK" field="PORTMUX.CTRLB.USART0"/>
-                <signal pad-id="pb1" function="USART0" group="XCK" field="PORTMUX.CTRLB.USART0"/>
-                <signal pad-id="pa4" function="USART0_ALT" group="XDIR" field="PORTMUX.CTRLB.USART0"/>
-                <signal pad-id="pb0" function="USART0" group="XDIR" field="PORTMUX.CTRLB.USART0"/>
+                <signal pad-key="pa2" function="USART0_ALT" group="RXD" field="PORTMUX.CTRLB.USART0"/>
+                <signal pad-key="pb3" function="USART0" group="RXD" field="PORTMUX.CTRLB.USART0"/>
+                <signal pad-key="pa1" function="USART0_ALT" group="TXD" field="PORTMUX.CTRLB.USART0"/>
+                <signal pad-key="pb2" function="USART0" group="TXD" field="PORTMUX.CTRLB.USART0"/>
+                <signal pad-key="pa3" function="USART0_ALT" group="XCK" field="PORTMUX.CTRLB.USART0"/>
+                <signal pad-key="pb1" function="USART0" group="XCK" field="PORTMUX.CTRLB.USART0"/>
+                <signal pad-key="pa4" function="USART0_ALT" group="XDIR" field="PORTMUX.CTRLB.USART0"/>
+                <signal pad-key="pb0" function="USART0" group="XDIR" field="PORTMUX.CTRLB.USART0"/>
             </signals>
         </peripheral>
         <peripheral key="userrow" name="USERROW" module-key="i2603_userrow">
@@ -1159,26 +1159,42 @@
             </register-group>
         </module>
     </modules>
+    <pads>
+        <pad key="vdd" name="VDD"/>
+        <pad key="pa4" name="PA4"/>
+        <pad key="pa5" name="PA5"/>
+        <pad key="pa6" name="PA6"/>
+        <pad key="pa7" name="PA7"/>
+        <pad key="pb3" name="PB3"/>
+        <pad key="pb2" name="PB2"/>
+        <pad key="pb1" name="PB1"/>
+        <pad key="pb0" name="PB0"/>
+        <pad key="pa0" name="PA0"/>
+        <pad key="pa1" name="PA1"/>
+        <pad key="pa2" name="PA2"/>
+        <pad key="pa3" name="PA3"/>
+        <pad key="gnd" name="GND"/>
+    </pads>
     <pinouts>
         <pinout key="soic14" name="SOIC14" type="soic">
-            <pin position="1" pad="VDD"/>
-            <pin position="2" pad="PA4"/>
-            <pin position="3" pad="PA5"/>
-            <pin position="4" pad="PA6"/>
-            <pin position="5" pad="PA7"/>
-            <pin position="6" pad="PB3"/>
-            <pin position="7" pad="PB2"/>
-            <pin position="8" pad="PB1"/>
-            <pin position="9" pad="PB0"/>
-            <pin position="10" pad="PA0"/>
-            <pin position="11" pad="PA1"/>
-            <pin position="12" pad="PA2"/>
-            <pin position="13" pad="PA3"/>
-            <pin position="14" pad="GND"/>
+            <pin position="1" pad-key="vdd"/>
+            <pin position="2" pad-key="pa4"/>
+            <pin position="3" pad-key="pa5"/>
+            <pin position="4" pad-key="pa6"/>
+            <pin position="5" pad-key="pa7"/>
+            <pin position="6" pad-key="pb3"/>
+            <pin position="7" pad-key="pb2"/>
+            <pin position="8" pad-key="pb1"/>
+            <pin position="9" pad-key="pb0"/>
+            <pin position="10" pad-key="pa0"/>
+            <pin position="11" pad-key="pa1"/>
+            <pin position="12" pad-key="pa2"/>
+            <pin position="13" pad-key="pa3"/>
+            <pin position="14" pad-key="gnd"/>
         </pinout>
     </pinouts>
     <variants>
-        <variant name="ATtiny804-SSFR" pinout-key="soic14" package="SOIC14"/>
-        <variant name="ATtiny804-SSNR" pinout-key="soic14" package="SOIC14"/>
+        <variant key="attiny804_ssfr" name="ATtiny804-SSFR" pinout-key="soic14"/>
+        <variant key="attiny804_ssnr" name="ATtiny804-SSNR" pinout-key="soic14"/>
     </variants>
 </device>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY806.xml b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY806.xml
index e5f302f9..3bff439f 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY806.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY806.xml
@@ -44,28 +44,28 @@
         <peripheral key="ac0" name="AC0" module-key="i2106">
             <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"/>
-                <signal pad-id="pa5" index="0" function="AC0" group="OUT"/>
-                <signal pad-id="pa7" index="0" function="AC0" group="P"/>
-                <signal pad-id="pb5" index="1" function="AC0" group="P"/>
+                <signal pad-key="pa6" index="0" function="AC0" group="N"/>
+                <signal pad-key="pb4" index="1" function="AC0" group="N"/>
+                <signal pad-key="pa5" index="0" function="AC0" group="OUT"/>
+                <signal pad-key="pa7" index="0" function="AC0" group="P"/>
+                <signal pad-key="pb5" index="1" function="AC0" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="adc0" name="ADC0" module-key="i2132">
             <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"/>
-                <signal pad-id="pa2" index="2" function="AIN0" group="AIN"/>
-                <signal pad-id="pa3" index="3" function="AIN0" group="AIN"/>
-                <signal pad-id="pa4" index="4" function="AIN0" group="AIN"/>
-                <signal pad-id="pa5" index="5" function="AIN0" group="AIN"/>
-                <signal pad-id="pa6" index="6" function="AIN0" group="AIN"/>
-                <signal pad-id="pa7" index="7" function="AIN0" group="AIN"/>
-                <signal pad-id="pb5" index="8" function="AIN0" group="AIN"/>
-                <signal pad-id="pb4" index="9" function="AIN0" group="AIN"/>
-                <signal pad-id="pb1" index="10" function="AIN0" group="AIN"/>
-                <signal pad-id="pb0" index="11" function="AIN0" group="AIN"/>
+                <signal pad-key="pa0" index="0" function="AIN0" group="AIN"/>
+                <signal pad-key="pa1" index="1" function="AIN0" group="AIN"/>
+                <signal pad-key="pa2" index="2" function="AIN0" group="AIN"/>
+                <signal pad-key="pa3" index="3" function="AIN0" group="AIN"/>
+                <signal pad-key="pa4" index="4" function="AIN0" group="AIN"/>
+                <signal pad-key="pa5" index="5" function="AIN0" group="AIN"/>
+                <signal pad-key="pa6" index="6" function="AIN0" group="AIN"/>
+                <signal pad-key="pa7" index="7" function="AIN0" group="AIN"/>
+                <signal pad-key="pb5" index="8" function="AIN0" group="AIN"/>
+                <signal pad-key="pb4" index="9" function="AIN0" group="AIN"/>
+                <signal pad-key="pb1" index="10" function="AIN0" group="AIN"/>
+                <signal pad-key="pb0" index="11" function="AIN0" group="AIN"/>
             </signals>
         </peripheral>
         <peripheral key="bod" name="BOD" module-key="i2114">
@@ -74,29 +74,29 @@
         <peripheral key="ccl" name="CCL" module-key="i2128">
             <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"/>
-                <signal pad-id="pa2" index="2" function="CCL" group="LUT0_IN"/>
-                <signal pad-id="pb4" index="0" function="CCL_ALT" group="LUT0_OUT" field="PORTMUX.CTRLA.LUT0"/>
-                <signal pad-id="pa4" index="0" function="CCL" group="LUT0_OUT" field="PORTMUX.CTRLA.LUT0"/>
-                <signal pad-id="pc3" index="0" function="CCL" group="LUT1_IN"/>
-                <signal pad-id="pc1" index="0" function="CCL_ALT" group="LUT1_OUT" field="PORTMUX.CTRLA.LUT1"/>
-                <signal pad-id="pa7" index="0" function="CCL" group="LUT1_OUT" field="PORTMUX.CTRLA.LUT1"/>
+                <signal pad-key="pa0" index="0" function="CCL" group="LUT0_IN"/>
+                <signal pad-key="pa1" index="1" function="CCL" group="LUT0_IN"/>
+                <signal pad-key="pa2" index="2" function="CCL" group="LUT0_IN"/>
+                <signal pad-key="pb4" index="0" function="CCL_ALT" group="LUT0_OUT" field="PORTMUX.CTRLA.LUT0"/>
+                <signal pad-key="pa4" index="0" function="CCL" group="LUT0_OUT" field="PORTMUX.CTRLA.LUT0"/>
+                <signal pad-key="pc3" index="0" function="CCL" group="LUT1_IN"/>
+                <signal pad-key="pc1" index="0" function="CCL_ALT" group="LUT1_OUT" field="PORTMUX.CTRLA.LUT1"/>
+                <signal pad-key="pa7" index="0" function="CCL" group="LUT1_OUT" field="PORTMUX.CTRLA.LUT1"/>
             </signals>
         </peripheral>
         <peripheral key="clkctrl" name="CLKCTRL" module-key="i2603_clkctrl">
             <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"/>
-                <signal pad-id="pb3" function="CLKCTRL" group="TOSC1"/>
-                <signal pad-id="pb2" function="CLKCTRL" group="TOSC2"/>
+                <signal pad-key="pa3" function="CLKCTRL" group="CLKI"/>
+                <signal pad-key="pb5" function="CLKCTRL" group="CLKO"/>
+                <signal pad-key="pb3" function="CLKCTRL" group="TOSC1"/>
+                <signal pad-key="pb2" function="CLKCTRL" group="TOSC2"/>
             </signals>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="i2100">
             <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"/>
+                <signal pad-key="pa1" function="BREAK" group="BREAK" field="PORTMUX.CTRLA.EXTBRK"/>
             </signals>
         </peripheral>
         <peripheral key="cpuint" name="CPUINT" module-key="i2104">
@@ -108,45 +108,45 @@
         <peripheral key="evsys" name="EVSYS" module-key="i2603_evsys">
             <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"/>
-                <signal pad-id="pa2" index="2" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
-                <signal pad-id="pa3" index="3" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
-                <signal pad-id="pa4" index="4" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
-                <signal pad-id="pa5" index="5" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
-                <signal pad-id="pa6" index="6" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
-                <signal pad-id="pa7" index="7" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
-                <signal pad-id="pb0" index="0" function="EVAINCH1" group="EVAPB" field="EVSYS.ASYNCCH1.ASYNCCH1"/>
-                <signal pad-id="pb1" index="1" function="EVAINCH1" group="EVAPB" field="EVSYS.ASYNCCH1.ASYNCCH1"/>
-                <signal pad-id="pb2" index="2" function="EVAINCH1" group="EVAPB" field="EVSYS.ASYNCCH1.ASYNCCH1"/>
-                <signal pad-id="pb3" index="3" function="EVAINCH1" group="EVAPB" field="EVSYS.ASYNCCH1.ASYNCCH1"/>
-                <signal pad-id="pb4" index="4" function="EVAINCH1" group="EVAPB" field="EVSYS.ASYNCCH1.ASYNCCH1"/>
-                <signal pad-id="pb5" index="5" function="EVAINCH1" group="EVAPB" field="EVSYS.ASYNCCH1.ASYNCCH1"/>
-                <signal pad-id="pc0" index="0" function="EVAINCH2" group="EVAPC" field="EVSYS.ASYNCCH2.ASYNCCH2"/>
-                <signal pad-id="pc1" index="1" function="EVAINCH2" group="EVAPC" field="EVSYS.ASYNCCH2.ASYNCCH2"/>
-                <signal pad-id="pc2" index="2" function="EVAINCH2" group="EVAPC" field="EVSYS.ASYNCCH2.ASYNCCH2"/>
-                <signal pad-id="pc3" index="3" function="EVAINCH2" group="EVAPC" field="EVSYS.ASYNCCH2.ASYNCCH2"/>
-                <signal pad-id="pa2" index="0" function="EVSYS" group="EVOUT" field="PORTMUX.CTRLA.EVOUT0"/>
-                <signal pad-id="pb2" index="1" function="EVSYS" group="EVOUT" field="PORTMUX.CTRLA.EVOUT1"/>
-                <signal pad-id="pc2" index="2" function="EVSYS" group="EVOUT" field="PORTMUX.CTRLA.EVOUT2"/>
-                <signal pad-id="pa0" index="0" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
-                <signal pad-id="pa1" index="1" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
-                <signal pad-id="pa2" index="2" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
-                <signal pad-id="pa3" index="3" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
-                <signal pad-id="pa4" index="4" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
-                <signal pad-id="pa5" index="5" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
-                <signal pad-id="pa6" index="6" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
-                <signal pad-id="pa7" index="7" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
-                <signal pad-id="pb0" index="0" function="EVSINCH1" group="EVSPB" field="EVSYS.SYNCCH1.SYNCCH1"/>
-                <signal pad-id="pb1" index="1" function="EVSINCH1" group="EVSPB" field="EVSYS.SYNCCH1.SYNCCH1"/>
-                <signal pad-id="pb2" index="2" function="EVSINCH1" group="EVSPB" field="EVSYS.SYNCCH1.SYNCCH1"/>
-                <signal pad-id="pb3" index="3" function="EVSINCH1" group="EVSPB" field="EVSYS.SYNCCH1.SYNCCH1"/>
-                <signal pad-id="pb4" index="4" function="EVSINCH1" group="EVSPB" field="EVSYS.SYNCCH1.SYNCCH1"/>
-                <signal pad-id="pb5" index="5" function="EVSINCH1" group="EVSPB" field="EVSYS.SYNCCH1.SYNCCH1"/>
-                <signal pad-id="pc0" index="0" function="EVSINCH0" group="EVSPC" field="EVSYS.SYNCCH0.SYNCCH0"/>
-                <signal pad-id="pc1" index="1" function="EVSINCH0" group="EVSPC" field="EVSYS.SYNCCH0.SYNCCH0"/>
-                <signal pad-id="pc2" index="2" function="EVSINCH0" group="EVSPC" field="EVSYS.SYNCCH0.SYNCCH0"/>
-                <signal pad-id="pc3" index="3" function="EVSINCH0" group="EVSPC" field="EVSYS.SYNCCH0.SYNCCH0"/>
+                <signal pad-key="pa0" index="0" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
+                <signal pad-key="pa1" index="1" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
+                <signal pad-key="pa2" index="2" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
+                <signal pad-key="pa3" index="3" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
+                <signal pad-key="pa4" index="4" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
+                <signal pad-key="pa5" index="5" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
+                <signal pad-key="pa6" index="6" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
+                <signal pad-key="pa7" index="7" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
+                <signal pad-key="pb0" index="0" function="EVAINCH1" group="EVAPB" field="EVSYS.ASYNCCH1.ASYNCCH1"/>
+                <signal pad-key="pb1" index="1" function="EVAINCH1" group="EVAPB" field="EVSYS.ASYNCCH1.ASYNCCH1"/>
+                <signal pad-key="pb2" index="2" function="EVAINCH1" group="EVAPB" field="EVSYS.ASYNCCH1.ASYNCCH1"/>
+                <signal pad-key="pb3" index="3" function="EVAINCH1" group="EVAPB" field="EVSYS.ASYNCCH1.ASYNCCH1"/>
+                <signal pad-key="pb4" index="4" function="EVAINCH1" group="EVAPB" field="EVSYS.ASYNCCH1.ASYNCCH1"/>
+                <signal pad-key="pb5" index="5" function="EVAINCH1" group="EVAPB" field="EVSYS.ASYNCCH1.ASYNCCH1"/>
+                <signal pad-key="pc0" index="0" function="EVAINCH2" group="EVAPC" field="EVSYS.ASYNCCH2.ASYNCCH2"/>
+                <signal pad-key="pc1" index="1" function="EVAINCH2" group="EVAPC" field="EVSYS.ASYNCCH2.ASYNCCH2"/>
+                <signal pad-key="pc2" index="2" function="EVAINCH2" group="EVAPC" field="EVSYS.ASYNCCH2.ASYNCCH2"/>
+                <signal pad-key="pc3" index="3" function="EVAINCH2" group="EVAPC" field="EVSYS.ASYNCCH2.ASYNCCH2"/>
+                <signal pad-key="pa2" index="0" function="EVSYS" group="EVOUT" field="PORTMUX.CTRLA.EVOUT0"/>
+                <signal pad-key="pb2" index="1" function="EVSYS" group="EVOUT" field="PORTMUX.CTRLA.EVOUT1"/>
+                <signal pad-key="pc2" index="2" function="EVSYS" group="EVOUT" field="PORTMUX.CTRLA.EVOUT2"/>
+                <signal pad-key="pa0" index="0" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
+                <signal pad-key="pa1" index="1" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
+                <signal pad-key="pa2" index="2" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
+                <signal pad-key="pa3" index="3" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
+                <signal pad-key="pa4" index="4" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
+                <signal pad-key="pa5" index="5" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
+                <signal pad-key="pa6" index="6" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
+                <signal pad-key="pa7" index="7" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
+                <signal pad-key="pb0" index="0" function="EVSINCH1" group="EVSPB" field="EVSYS.SYNCCH1.SYNCCH1"/>
+                <signal pad-key="pb1" index="1" function="EVSINCH1" group="EVSPB" field="EVSYS.SYNCCH1.SYNCCH1"/>
+                <signal pad-key="pb2" index="2" function="EVSINCH1" group="EVSPB" field="EVSYS.SYNCCH1.SYNCCH1"/>
+                <signal pad-key="pb3" index="3" function="EVSINCH1" group="EVSPB" field="EVSYS.SYNCCH1.SYNCCH1"/>
+                <signal pad-key="pb4" index="4" function="EVSINCH1" group="EVSPB" field="EVSYS.SYNCCH1.SYNCCH1"/>
+                <signal pad-key="pb5" index="5" function="EVSINCH1" group="EVSPB" field="EVSYS.SYNCCH1.SYNCCH1"/>
+                <signal pad-key="pc0" index="0" function="EVSINCH0" group="EVSPC" field="EVSYS.SYNCCH0.SYNCCH0"/>
+                <signal pad-key="pc1" index="1" function="EVSINCH0" group="EVSPC" field="EVSYS.SYNCCH0.SYNCCH0"/>
+                <signal pad-key="pc2" index="2" function="EVSINCH0" group="EVSPC" field="EVSYS.SYNCCH0.SYNCCH0"/>
+                <signal pad-key="pc3" index="3" function="EVSINCH0" group="EVSPC" field="EVSYS.SYNCCH0.SYNCCH0"/>
             </signals>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="i2603_fuse">
@@ -164,34 +164,34 @@
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pa2" index="2" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa3" index="3" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa4" index="4" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa5" index="5" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa6" index="6" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa7" index="7" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa0" index="0" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa1" index="1" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa2" index="2" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa3" index="3" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa4" index="4" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa5" index="5" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa6" index="6" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa7" index="7" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pb2" index="2" function="IOPORT" group="PIN"/>
-                <signal pad-id="pb3" index="3" function="IOPORT" group="PIN"/>
-                <signal pad-id="pb4" index="4" function="IOPORT" group="PIN"/>
-                <signal pad-id="pb5" index="5" function="IOPORT" group="PIN"/>
+                <signal pad-key="pb0" index="0" function="IOPORT" group="PIN"/>
+                <signal pad-key="pb1" index="1" function="IOPORT" group="PIN"/>
+                <signal pad-key="pb2" index="2" function="IOPORT" group="PIN"/>
+                <signal pad-key="pb3" index="3" function="IOPORT" group="PIN"/>
+                <signal pad-key="pb4" index="4" function="IOPORT" group="PIN"/>
+                <signal pad-key="pb5" index="5" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pc2" index="2" function="IOPORT" group="PIN"/>
-                <signal pad-id="pc3" index="3" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc0" index="0" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc1" index="1" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc2" index="2" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc3" index="3" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="portmux" name="PORTMUX" module-key="i2603_portmux">
@@ -200,7 +200,7 @@
         <peripheral key="rstctrl" name="RSTCTRL" module-key="i2111">
             <register-group-instance register-group-key="rstctrl" address-space-key="data" offset="0x40"/>
             <signals>
-                <signal pad-id="pa0" function="OTHER" group="RESET"/>
+                <signal pad-key="pa0" function="OTHER" group="RESET"/>
             </signals>
         </peripheral>
         <peripheral key="rtc" name="RTC" module-key="i2116">
@@ -215,62 +215,62 @@
         <peripheral key="spi0" name="SPI0" module-key="i2107">
             <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"/>
-                <signal pad-id="pc2" function="SPI0_ALT" group="MOSI" field="PORTMUX.CTRLB.SPI0"/>
-                <signal pad-id="pa1" function="SPI0" group="MOSI" field="PORTMUX.CTRLB.SPI0"/>
-                <signal pad-id="pc0" function="SPI0_ALT" group="SCK" field="PORTMUX.CTRLB.SPI0"/>
-                <signal pad-id="pa3" function="SPI0" group="SCK" field="PORTMUX.CTRLB.SPI0"/>
-                <signal pad-id="pc3" function="SPI0_ALT" group="SS" field="PORTMUX.CTRLB.SPI0"/>
-                <signal pad-id="pa4" function="SPI0" group="SS" field="PORTMUX.CTRLB.SPI0"/>
+                <signal pad-key="pc1" function="SPI0_ALT" group="MISO" field="PORTMUX.CTRLB.SPI0"/>
+                <signal pad-key="pa2" function="SPI0" group="MISO" field="PORTMUX.CTRLB.SPI0"/>
+                <signal pad-key="pc2" function="SPI0_ALT" group="MOSI" field="PORTMUX.CTRLB.SPI0"/>
+                <signal pad-key="pa1" function="SPI0" group="MOSI" field="PORTMUX.CTRLB.SPI0"/>
+                <signal pad-key="pc0" function="SPI0_ALT" group="SCK" field="PORTMUX.CTRLB.SPI0"/>
+                <signal pad-key="pa3" function="SPI0" group="SCK" field="PORTMUX.CTRLB.SPI0"/>
+                <signal pad-key="pc3" function="SPI0_ALT" group="SS" field="PORTMUX.CTRLB.SPI0"/>
+                <signal pad-key="pa4" function="SPI0" group="SS" field="PORTMUX.CTRLB.SPI0"/>
             </signals>
         </peripheral>
         <peripheral key="syscfg" name="SYSCFG" module-key="i2603_syscfg">
             <register-group-instance register-group-key="syscfg" address-space-key="data" offset="0xF00"/>
             <signals>
-                <signal pad-id="pa0" function="OTHER" group="UPDI"/>
+                <signal pad-key="pa0" function="OTHER" group="UPDI"/>
             </signals>
         </peripheral>
         <peripheral key="tca0" name="TCA0" module-key="i2117">
             <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"/>
-                <signal pad-id="pb4" index="1" function="TCA0_ALT" group="WO" field="PORTMUX.CTRLC.TCA01"/>
-                <signal pad-id="pb1" index="1" function="TCA0" group="WO" field="PORTMUX.CTRLC.TCA01"/>
-                <signal pad-id="pb5" index="2" function="TCA0_ALT" group="WO" field="PORTMUX.CTRLC.TCA02"/>
-                <signal pad-id="pb2" index="2" function="TCA0" group="WO" field="PORTMUX.CTRLC.TCA02"/>
-                <signal pad-id="pc3" index="3" function="TCA0_ALT" group="WO" field="PORTMUX.CTRLC.TCA03"/>
-                <signal pad-id="pa3" index="3" function="TCA0" group="WO" field="PORTMUX.CTRLC.TCA03"/>
-                <signal pad-id="pa4" index="4" function="TCA0" group="WO" field="PORTMUX.CTRLC.TCA04"/>
-                <signal pad-id="pa5" index="5" function="TCA0" group="WO" field="PORTMUX.CTRLC.TCA05"/>
+                <signal pad-key="pb3" index="0" function="TCA0_ALT" group="WO" field="PORTMUX.CTRLC.TCA00"/>
+                <signal pad-key="pb0" index="0" function="TCA0" group="WO" field="PORTMUX.CTRLC.TCA00"/>
+                <signal pad-key="pb4" index="1" function="TCA0_ALT" group="WO" field="PORTMUX.CTRLC.TCA01"/>
+                <signal pad-key="pb1" index="1" function="TCA0" group="WO" field="PORTMUX.CTRLC.TCA01"/>
+                <signal pad-key="pb5" index="2" function="TCA0_ALT" group="WO" field="PORTMUX.CTRLC.TCA02"/>
+                <signal pad-key="pb2" index="2" function="TCA0" group="WO" field="PORTMUX.CTRLC.TCA02"/>
+                <signal pad-key="pc3" index="3" function="TCA0_ALT" group="WO" field="PORTMUX.CTRLC.TCA03"/>
+                <signal pad-key="pa3" index="3" function="TCA0" group="WO" field="PORTMUX.CTRLC.TCA03"/>
+                <signal pad-key="pa4" index="4" function="TCA0" group="WO" field="PORTMUX.CTRLC.TCA04"/>
+                <signal pad-key="pa5" index="5" function="TCA0" group="WO" field="PORTMUX.CTRLC.TCA05"/>
             </signals>
         </peripheral>
         <peripheral key="tcb0" name="TCB0" module-key="i2119">
             <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"/>
+                <signal pad-key="pc0" index="0" function="TCB0_ALT" group="WO" field="PORTMUX.CTRLD.TCB0"/>
+                <signal pad-key="pa5" index="0" function="TCB0" group="WO" field="PORTMUX.CTRLD.TCB0"/>
             </signals>
         </peripheral>
         <peripheral key="twi0" name="TWI0" module-key="i2110">
             <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"/>
+                <signal pad-key="pb0" function="TWI0" group="SCL" field="PORTMUX.CTRLB.TWI0"/>
+                <signal pad-key="pb1" function="TWI0" group="SDA" field="PORTMUX.CTRLB.TWI0"/>
             </signals>
         </peripheral>
         <peripheral key="usart0" name="USART0" module-key="i2108">
             <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"/>
-                <signal pad-id="pa1" function="USART0_ALT" group="TXD" field="PORTMUX.CTRLB.USART0"/>
-                <signal pad-id="pb2" function="USART0" group="TXD" field="PORTMUX.CTRLB.USART0"/>
-                <signal pad-id="pa3" function="USART0_ALT" group="XCK" field="PORTMUX.CTRLB.USART0"/>
-                <signal pad-id="pb1" function="USART0" group="XCK" field="PORTMUX.CTRLB.USART0"/>
-                <signal pad-id="pa4" function="USART0_ALT" group="XDIR" field="PORTMUX.CTRLB.USART0"/>
-                <signal pad-id="pb0" function="USART0" group="XDIR" field="PORTMUX.CTRLB.USART0"/>
+                <signal pad-key="pa2" function="USART0_ALT" group="RXD" field="PORTMUX.CTRLB.USART0"/>
+                <signal pad-key="pb3" function="USART0" group="RXD" field="PORTMUX.CTRLB.USART0"/>
+                <signal pad-key="pa1" function="USART0_ALT" group="TXD" field="PORTMUX.CTRLB.USART0"/>
+                <signal pad-key="pb2" function="USART0" group="TXD" field="PORTMUX.CTRLB.USART0"/>
+                <signal pad-key="pa3" function="USART0_ALT" group="XCK" field="PORTMUX.CTRLB.USART0"/>
+                <signal pad-key="pb1" function="USART0" group="XCK" field="PORTMUX.CTRLB.USART0"/>
+                <signal pad-key="pa4" function="USART0_ALT" group="XDIR" field="PORTMUX.CTRLB.USART0"/>
+                <signal pad-key="pb0" function="USART0" group="XDIR" field="PORTMUX.CTRLB.USART0"/>
             </signals>
         </peripheral>
         <peripheral key="userrow" name="USERROW" module-key="i2603_userrow">
@@ -1199,56 +1199,78 @@
             </register-group>
         </module>
     </modules>
+    <pads>
+        <pad key="pa2" name="PA2"/>
+        <pad key="pa3" name="PA3"/>
+        <pad key="gnd" name="GND"/>
+        <pad key="vdd" name="VDD"/>
+        <pad key="pa4" name="PA4"/>
+        <pad key="pa5" name="PA5"/>
+        <pad key="pa6" name="PA6"/>
+        <pad key="pa7" name="PA7"/>
+        <pad key="pb5" name="PB5"/>
+        <pad key="pb4" name="PB4"/>
+        <pad key="pb3" name="PB3"/>
+        <pad key="pb2" name="PB2"/>
+        <pad key="pb1" name="PB1"/>
+        <pad key="pb0" name="PB0"/>
+        <pad key="pc0" name="PC0"/>
+        <pad key="pc1" name="PC1"/>
+        <pad key="pc2" name="PC2"/>
+        <pad key="pc3" name="PC3"/>
+        <pad key="pa0" name="PA0"/>
+        <pad key="pa1" name="PA1"/>
+    </pads>
     <pinouts>
         <pinout key="qfn20" name="QFN20" type="qfn">
-            <pin position="1" pad="PA2"/>
-            <pin position="2" pad="PA3"/>
-            <pin position="3" pad="GND"/>
-            <pin position="4" pad="VDD"/>
-            <pin position="5" pad="PA4"/>
-            <pin position="6" pad="PA5"/>
-            <pin position="7" pad="PA6"/>
-            <pin position="8" pad="PA7"/>
-            <pin position="9" pad="PB5"/>
-            <pin position="10" pad="PB4"/>
-            <pin position="11" pad="PB3"/>
-            <pin position="12" pad="PB2"/>
-            <pin position="13" pad="PB1"/>
-            <pin position="14" pad="PB0"/>
-            <pin position="15" pad="PC0"/>
-            <pin position="16" pad="PC1"/>
-            <pin position="17" pad="PC2"/>
-            <pin position="18" pad="PC3"/>
-            <pin position="19" pad="PA0"/>
-            <pin position="20" pad="PA1"/>
+            <pin position="1" pad-key="pa2"/>
+            <pin position="2" pad-key="pa3"/>
+            <pin position="3" pad-key="gnd"/>
+            <pin position="4" pad-key="vdd"/>
+            <pin position="5" pad-key="pa4"/>
+            <pin position="6" pad-key="pa5"/>
+            <pin position="7" pad-key="pa6"/>
+            <pin position="8" pad-key="pa7"/>
+            <pin position="9" pad-key="pb5"/>
+            <pin position="10" pad-key="pb4"/>
+            <pin position="11" pad-key="pb3"/>
+            <pin position="12" pad-key="pb2"/>
+            <pin position="13" pad-key="pb1"/>
+            <pin position="14" pad-key="pb0"/>
+            <pin position="15" pad-key="pc0"/>
+            <pin position="16" pad-key="pc1"/>
+            <pin position="17" pad-key="pc2"/>
+            <pin position="18" pad-key="pc3"/>
+            <pin position="19" pad-key="pa0"/>
+            <pin position="20" pad-key="pa1"/>
         </pinout>
         <pinout key="soic20" name="SOIC20" type="soic">
-            <pin position="1" pad="VDD"/>
-            <pin position="2" pad="PA4"/>
-            <pin position="3" pad="PA5"/>
-            <pin position="4" pad="PA6"/>
-            <pin position="5" pad="PA7"/>
-            <pin position="6" pad="PB5"/>
-            <pin position="7" pad="PB4"/>
-            <pin position="8" pad="PB3"/>
-            <pin position="9" pad="PB2"/>
-            <pin position="10" pad="PB1"/>
-            <pin position="11" pad="PB0"/>
-            <pin position="12" pad="PC0"/>
-            <pin position="13" pad="PC1"/>
-            <pin position="14" pad="PC2"/>
-            <pin position="15" pad="PC3"/>
-            <pin position="16" pad="PA0"/>
-            <pin position="17" pad="PA1"/>
-            <pin position="18" pad="PA2"/>
-            <pin position="19" pad="PA3"/>
-            <pin position="20" pad="GND"/>
+            <pin position="1" pad-key="vdd"/>
+            <pin position="2" pad-key="pa4"/>
+            <pin position="3" pad-key="pa5"/>
+            <pin position="4" pad-key="pa6"/>
+            <pin position="5" pad-key="pa7"/>
+            <pin position="6" pad-key="pb5"/>
+            <pin position="7" pad-key="pb4"/>
+            <pin position="8" pad-key="pb3"/>
+            <pin position="9" pad-key="pb2"/>
+            <pin position="10" pad-key="pb1"/>
+            <pin position="11" pad-key="pb0"/>
+            <pin position="12" pad-key="pc0"/>
+            <pin position="13" pad-key="pc1"/>
+            <pin position="14" pad-key="pc2"/>
+            <pin position="15" pad-key="pc3"/>
+            <pin position="16" pad-key="pa0"/>
+            <pin position="17" pad-key="pa1"/>
+            <pin position="18" pad-key="pa2"/>
+            <pin position="19" pad-key="pa3"/>
+            <pin position="20" pad-key="gnd"/>
         </pinout>
     </pinouts>
     <variants>
-        <variant name="ATtiny806-MFR" pinout-key="qfn20" package="VQFN20"/>
-        <variant name="ATtiny806-MNR" pinout-key="qfn20" package="VQFN20"/>
-        <variant name="ATtiny806-SFR" pinout-key="soic20" package="SOIC20"/>
-        <variant name="ATtiny806-SNR" pinout-key="soic20" package="SOIC20"/>
+        <variant key="attiny806_mfr" name="ATtiny806-MFR" pinout-key="qfn20"/>
+        <variant key="attiny806_mnr" name="ATtiny806-MNR" pinout-key="qfn20"/>
+        <variant key="attiny806_sfr" name="ATtiny806-SFR" pinout-key="soic20"/>
+        <variant key="attiny806_snr" name="ATtiny806-SNR" pinout-key="soic20"/>
     </variants>
 </device>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY807.xml b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY807.xml
index 086084df..fa21d474 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY807.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY807.xml
@@ -44,28 +44,28 @@
         <peripheral key="ac0" name="AC0" module-key="i2106">
             <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"/>
-                <signal pad-id="pa5" index="0" function="AC0" group="OUT"/>
-                <signal pad-id="pa7" index="0" function="AC0" group="P"/>
-                <signal pad-id="pb5" index="1" function="AC0" group="P"/>
+                <signal pad-key="pa6" index="0" function="AC0" group="N"/>
+                <signal pad-key="pb4" index="1" function="AC0" group="N"/>
+                <signal pad-key="pa5" index="0" function="AC0" group="OUT"/>
+                <signal pad-key="pa7" index="0" function="AC0" group="P"/>
+                <signal pad-key="pb5" index="1" function="AC0" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="adc0" name="ADC0" module-key="i2132">
             <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"/>
-                <signal pad-id="pa2" index="2" function="AIN0" group="AIN"/>
-                <signal pad-id="pa3" index="3" function="AIN0" group="AIN"/>
-                <signal pad-id="pa4" index="4" function="AIN0" group="AIN"/>
-                <signal pad-id="pa5" index="5" function="AIN0" group="AIN"/>
-                <signal pad-id="pa6" index="6" function="AIN0" group="AIN"/>
-                <signal pad-id="pa7" index="7" function="AIN0" group="AIN"/>
-                <signal pad-id="pb5" index="8" function="AIN0" group="AIN"/>
-                <signal pad-id="pb4" index="9" function="AIN0" group="AIN"/>
-                <signal pad-id="pb1" index="10" function="AIN0" group="AIN"/>
-                <signal pad-id="pb0" index="11" function="AIN0" group="AIN"/>
+                <signal pad-key="pa0" index="0" function="AIN0" group="AIN"/>
+                <signal pad-key="pa1" index="1" function="AIN0" group="AIN"/>
+                <signal pad-key="pa2" index="2" function="AIN0" group="AIN"/>
+                <signal pad-key="pa3" index="3" function="AIN0" group="AIN"/>
+                <signal pad-key="pa4" index="4" function="AIN0" group="AIN"/>
+                <signal pad-key="pa5" index="5" function="AIN0" group="AIN"/>
+                <signal pad-key="pa6" index="6" function="AIN0" group="AIN"/>
+                <signal pad-key="pa7" index="7" function="AIN0" group="AIN"/>
+                <signal pad-key="pb5" index="8" function="AIN0" group="AIN"/>
+                <signal pad-key="pb4" index="9" function="AIN0" group="AIN"/>
+                <signal pad-key="pb1" index="10" function="AIN0" group="AIN"/>
+                <signal pad-key="pb0" index="11" function="AIN0" group="AIN"/>
             </signals>
         </peripheral>
         <peripheral key="bod" name="BOD" module-key="i2114">
@@ -74,32 +74,32 @@
         <peripheral key="ccl" name="CCL" module-key="i2128">
             <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"/>
-                <signal pad-id="pa2" index="2" function="CCL" group="LUT0_IN"/>
-                <signal pad-id="pb4" index="0" function="CCL_ALT" group="LUT0_OUT" field="PORTMUX.CTRLA.LUT0"/>
-                <signal pad-id="pa4" index="0" function="CCL" group="LUT0_OUT" field="PORTMUX.CTRLA.LUT0"/>
-                <signal pad-id="pc3" index="0" function="CCL" group="LUT1_IN"/>
-                <signal pad-id="pc4" index="1" function="CCL" group="LUT1_IN"/>
-                <signal pad-id="pc5" index="2" function="CCL" group="LUT1_IN"/>
-                <signal pad-id="pc1" index="0" function="CCL_ALT" group="LUT1_OUT" field="PORTMUX.CTRLA.LUT1"/>
-                <signal pad-id="pa7" index="0" function="CCL" group="LUT1_OUT" field="PORTMUX.CTRLA.LUT1"/>
+                <signal pad-key="pa0" index="0" function="CCL" group="LUT0_IN"/>
+                <signal pad-key="pa1" index="1" function="CCL" group="LUT0_IN"/>
+                <signal pad-key="pa2" index="2" function="CCL" group="LUT0_IN"/>
+                <signal pad-key="pb4" index="0" function="CCL_ALT" group="LUT0_OUT" field="PORTMUX.CTRLA.LUT0"/>
+                <signal pad-key="pa4" index="0" function="CCL" group="LUT0_OUT" field="PORTMUX.CTRLA.LUT0"/>
+                <signal pad-key="pc3" index="0" function="CCL" group="LUT1_IN"/>
+                <signal pad-key="pc4" index="1" function="CCL" group="LUT1_IN"/>
+                <signal pad-key="pc5" index="2" function="CCL" group="LUT1_IN"/>
+                <signal pad-key="pc1" index="0" function="CCL_ALT" group="LUT1_OUT" field="PORTMUX.CTRLA.LUT1"/>
+                <signal pad-key="pa7" index="0" function="CCL" group="LUT1_OUT" field="PORTMUX.CTRLA.LUT1"/>
             </signals>
         </peripheral>
         <peripheral key="clkctrl" name="CLKCTRL" module-key="i2603_clkctrl">
             <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"/>
-                <signal pad-id="pb3" function="CLKCTRL" group="TOSC1"/>
-                <signal pad-id="pb2" function="CLKCTRL" group="TOSC2"/>
+                <signal pad-key="pa3" function="CLKCTRL" group="CLKI"/>
+                <signal pad-key="pb5" function="CLKCTRL" group="CLKO"/>
+                <signal pad-key="pb3" function="CLKCTRL" group="TOSC1"/>
+                <signal pad-key="pb2" function="CLKCTRL" group="TOSC2"/>
             </signals>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="i2100">
             <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"/>
+                <signal pad-key="pc4" function="BREAK_ALT" group="BREAK" field="PORTMUX.CTRLA.EXTBRK"/>
+                <signal pad-key="pa1" function="BREAK" group="BREAK" field="PORTMUX.CTRLA.EXTBRK"/>
             </signals>
         </peripheral>
         <peripheral key="cpuint" name="CPUINT" module-key="i2104">
@@ -111,53 +111,53 @@
         <peripheral key="evsys" name="EVSYS" module-key="i2603_evsys">
             <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"/>
-                <signal pad-id="pa2" index="2" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
-                <signal pad-id="pa3" index="3" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
-                <signal pad-id="pa4" index="4" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
-                <signal pad-id="pa5" index="5" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
-                <signal pad-id="pa6" index="6" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
-                <signal pad-id="pa7" index="7" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
-                <signal pad-id="pb0" index="0" function="EVAINCH1" group="EVAPB" field="EVSYS.ASYNCCH1.ASYNCCH1"/>
-                <signal pad-id="pb1" index="1" function="EVAINCH1" group="EVAPB" field="EVSYS.ASYNCCH1.ASYNCCH1"/>
-                <signal pad-id="pb2" index="2" function="EVAINCH1" group="EVAPB" field="EVSYS.ASYNCCH1.ASYNCCH1"/>
-                <signal pad-id="pb3" index="3" function="EVAINCH1" group="EVAPB" field="EVSYS.ASYNCCH1.ASYNCCH1"/>
-                <signal pad-id="pb4" index="4" function="EVAINCH1" group="EVAPB" field="EVSYS.ASYNCCH1.ASYNCCH1"/>
-                <signal pad-id="pb5" index="5" function="EVAINCH1" group="EVAPB" field="EVSYS.ASYNCCH1.ASYNCCH1"/>
-                <signal pad-id="pb6" index="6" function="EVAINCH1" group="EVAPB" field="EVSYS.ASYNCCH1.ASYNCCH1"/>
-                <signal pad-id="pb7" index="7" function="EVAINCH1" group="EVAPB" field="EVSYS.ASYNCCH1.ASYNCCH1"/>
-                <signal pad-id="pc0" index="0" function="EVAINCH2" group="EVAPC" field="EVSYS.ASYNCCH2.ASYNCCH2"/>
-                <signal pad-id="pc1" index="1" function="EVAINCH2" group="EVAPC" field="EVSYS.ASYNCCH2.ASYNCCH2"/>
-                <signal pad-id="pc2" index="2" function="EVAINCH2" group="EVAPC" field="EVSYS.ASYNCCH2.ASYNCCH2"/>
-                <signal pad-id="pc3" index="3" function="EVAINCH2" group="EVAPC" field="EVSYS.ASYNCCH2.ASYNCCH2"/>
-                <signal pad-id="pc4" index="4" function="EVAINCH2" group="EVAPC" field="EVSYS.ASYNCCH2.ASYNCCH2"/>
-                <signal pad-id="pc5" index="5" function="EVAINCH2" group="EVAPC" field="EVSYS.ASYNCCH2.ASYNCCH2"/>
-                <signal pad-id="pa2" index="0" function="EVSYS" group="EVOUT" field="PORTMUX.CTRLA.EVOUT0"/>
-                <signal pad-id="pb2" index="1" function="EVSYS" group="EVOUT" field="PORTMUX.CTRLA.EVOUT1"/>
-                <signal pad-id="pc2" index="2" function="EVSYS" group="EVOUT" field="PORTMUX.CTRLA.EVOUT2"/>
-                <signal pad-id="pa0" index="0" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
-                <signal pad-id="pa1" index="1" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
-                <signal pad-id="pa2" index="2" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
-                <signal pad-id="pa3" index="3" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
-                <signal pad-id="pa4" index="4" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
-                <signal pad-id="pa5" index="5" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
-                <signal pad-id="pa6" index="6" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
-                <signal pad-id="pa7" index="7" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
-                <signal pad-id="pb0" index="0" function="EVSINCH1" group="EVSPB" field="EVSYS.SYNCCH1.SYNCCH1"/>
-                <signal pad-id="pb1" index="1" function="EVSINCH1" group="EVSPB" field="EVSYS.SYNCCH1.SYNCCH1"/>
-                <signal pad-id="pb2" index="2" function="EVSINCH1" group="EVSPB" field="EVSYS.SYNCCH1.SYNCCH1"/>
-                <signal pad-id="pb3" index="3" function="EVSINCH1" group="EVSPB" field="EVSYS.SYNCCH1.SYNCCH1"/>
-                <signal pad-id="pb4" index="4" function="EVSINCH1" group="EVSPB" field="EVSYS.SYNCCH1.SYNCCH1"/>
-                <signal pad-id="pb5" index="5" function="EVSINCH1" group="EVSPB" field="EVSYS.SYNCCH1.SYNCCH1"/>
-                <signal pad-id="pb6" index="6" function="EVSINCH1" group="EVSPB" field="EVSYS.SYNCCH1.SYNCCH1"/>
-                <signal pad-id="pb7" index="7" function="EVSINCH1" group="EVSPB" field="EVSYS.SYNCCH1.SYNCCH1"/>
-                <signal pad-id="pc0" index="0" function="EVSINCH0" group="EVSPC" field="EVSYS.SYNCCH0.SYNCCH0"/>
-                <signal pad-id="pc1" index="1" function="EVSINCH0" group="EVSPC" field="EVSYS.SYNCCH0.SYNCCH0"/>
-                <signal pad-id="pc2" index="2" function="EVSINCH0" group="EVSPC" field="EVSYS.SYNCCH0.SYNCCH0"/>
-                <signal pad-id="pc3" index="3" function="EVSINCH0" group="EVSPC" field="EVSYS.SYNCCH0.SYNCCH0"/>
-                <signal pad-id="pc4" index="4" function="EVSINCH0" group="EVSPC" field="EVSYS.SYNCCH0.SYNCCH0"/>
-                <signal pad-id="pc5" index="5" function="EVSINCH0" group="EVSPC" field="EVSYS.SYNCCH0.SYNCCH0"/>
+                <signal pad-key="pa0" index="0" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
+                <signal pad-key="pa1" index="1" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
+                <signal pad-key="pa2" index="2" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
+                <signal pad-key="pa3" index="3" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
+                <signal pad-key="pa4" index="4" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
+                <signal pad-key="pa5" index="5" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
+                <signal pad-key="pa6" index="6" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
+                <signal pad-key="pa7" index="7" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
+                <signal pad-key="pb0" index="0" function="EVAINCH1" group="EVAPB" field="EVSYS.ASYNCCH1.ASYNCCH1"/>
+                <signal pad-key="pb1" index="1" function="EVAINCH1" group="EVAPB" field="EVSYS.ASYNCCH1.ASYNCCH1"/>
+                <signal pad-key="pb2" index="2" function="EVAINCH1" group="EVAPB" field="EVSYS.ASYNCCH1.ASYNCCH1"/>
+                <signal pad-key="pb3" index="3" function="EVAINCH1" group="EVAPB" field="EVSYS.ASYNCCH1.ASYNCCH1"/>
+                <signal pad-key="pb4" index="4" function="EVAINCH1" group="EVAPB" field="EVSYS.ASYNCCH1.ASYNCCH1"/>
+                <signal pad-key="pb5" index="5" function="EVAINCH1" group="EVAPB" field="EVSYS.ASYNCCH1.ASYNCCH1"/>
+                <signal pad-key="pb6" index="6" function="EVAINCH1" group="EVAPB" field="EVSYS.ASYNCCH1.ASYNCCH1"/>
+                <signal pad-key="pb7" index="7" function="EVAINCH1" group="EVAPB" field="EVSYS.ASYNCCH1.ASYNCCH1"/>
+                <signal pad-key="pc0" index="0" function="EVAINCH2" group="EVAPC" field="EVSYS.ASYNCCH2.ASYNCCH2"/>
+                <signal pad-key="pc1" index="1" function="EVAINCH2" group="EVAPC" field="EVSYS.ASYNCCH2.ASYNCCH2"/>
+                <signal pad-key="pc2" index="2" function="EVAINCH2" group="EVAPC" field="EVSYS.ASYNCCH2.ASYNCCH2"/>
+                <signal pad-key="pc3" index="3" function="EVAINCH2" group="EVAPC" field="EVSYS.ASYNCCH2.ASYNCCH2"/>
+                <signal pad-key="pc4" index="4" function="EVAINCH2" group="EVAPC" field="EVSYS.ASYNCCH2.ASYNCCH2"/>
+                <signal pad-key="pc5" index="5" function="EVAINCH2" group="EVAPC" field="EVSYS.ASYNCCH2.ASYNCCH2"/>
+                <signal pad-key="pa2" index="0" function="EVSYS" group="EVOUT" field="PORTMUX.CTRLA.EVOUT0"/>
+                <signal pad-key="pb2" index="1" function="EVSYS" group="EVOUT" field="PORTMUX.CTRLA.EVOUT1"/>
+                <signal pad-key="pc2" index="2" function="EVSYS" group="EVOUT" field="PORTMUX.CTRLA.EVOUT2"/>
+                <signal pad-key="pa0" index="0" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
+                <signal pad-key="pa1" index="1" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
+                <signal pad-key="pa2" index="2" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
+                <signal pad-key="pa3" index="3" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
+                <signal pad-key="pa4" index="4" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
+                <signal pad-key="pa5" index="5" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
+                <signal pad-key="pa6" index="6" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
+                <signal pad-key="pa7" index="7" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
+                <signal pad-key="pb0" index="0" function="EVSINCH1" group="EVSPB" field="EVSYS.SYNCCH1.SYNCCH1"/>
+                <signal pad-key="pb1" index="1" function="EVSINCH1" group="EVSPB" field="EVSYS.SYNCCH1.SYNCCH1"/>
+                <signal pad-key="pb2" index="2" function="EVSINCH1" group="EVSPB" field="EVSYS.SYNCCH1.SYNCCH1"/>
+                <signal pad-key="pb3" index="3" function="EVSINCH1" group="EVSPB" field="EVSYS.SYNCCH1.SYNCCH1"/>
+                <signal pad-key="pb4" index="4" function="EVSINCH1" group="EVSPB" field="EVSYS.SYNCCH1.SYNCCH1"/>
+                <signal pad-key="pb5" index="5" function="EVSINCH1" group="EVSPB" field="EVSYS.SYNCCH1.SYNCCH1"/>
+                <signal pad-key="pb6" index="6" function="EVSINCH1" group="EVSPB" field="EVSYS.SYNCCH1.SYNCCH1"/>
+                <signal pad-key="pb7" index="7" function="EVSINCH1" group="EVSPB" field="EVSYS.SYNCCH1.SYNCCH1"/>
+                <signal pad-key="pc0" index="0" function="EVSINCH0" group="EVSPC" field="EVSYS.SYNCCH0.SYNCCH0"/>
+                <signal pad-key="pc1" index="1" function="EVSINCH0" group="EVSPC" field="EVSYS.SYNCCH0.SYNCCH0"/>
+                <signal pad-key="pc2" index="2" function="EVSINCH0" group="EVSPC" field="EVSYS.SYNCCH0.SYNCCH0"/>
+                <signal pad-key="pc3" index="3" function="EVSINCH0" group="EVSPC" field="EVSYS.SYNCCH0.SYNCCH0"/>
+                <signal pad-key="pc4" index="4" function="EVSINCH0" group="EVSPC" field="EVSYS.SYNCCH0.SYNCCH0"/>
+                <signal pad-key="pc5" index="5" function="EVSINCH0" group="EVSPC" field="EVSYS.SYNCCH0.SYNCCH0"/>
             </signals>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="i2603_fuse">
@@ -175,38 +175,38 @@
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pa2" index="2" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa3" index="3" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa4" index="4" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa5" index="5" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa6" index="6" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa7" index="7" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa0" index="0" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa1" index="1" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa2" index="2" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa3" index="3" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa4" index="4" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa5" index="5" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa6" index="6" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa7" index="7" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pb2" index="2" function="IOPORT" group="PIN"/>
-                <signal pad-id="pb3" index="3" function="IOPORT" group="PIN"/>
-                <signal pad-id="pb4" index="4" function="IOPORT" group="PIN"/>
-                <signal pad-id="pb5" index="5" function="IOPORT" group="PIN"/>
-                <signal pad-id="pb6" index="6" function="IOPORT" group="PIN"/>
-                <signal pad-id="pb7" index="7" function="IOPORT" group="PIN"/>
+                <signal pad-key="pb0" index="0" function="IOPORT" group="PIN"/>
+                <signal pad-key="pb1" index="1" function="IOPORT" group="PIN"/>
+                <signal pad-key="pb2" index="2" function="IOPORT" group="PIN"/>
+                <signal pad-key="pb3" index="3" function="IOPORT" group="PIN"/>
+                <signal pad-key="pb4" index="4" function="IOPORT" group="PIN"/>
+                <signal pad-key="pb5" index="5" function="IOPORT" group="PIN"/>
+                <signal pad-key="pb6" index="6" function="IOPORT" group="PIN"/>
+                <signal pad-key="pb7" index="7" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pc2" index="2" function="IOPORT" group="PIN"/>
-                <signal pad-id="pc3" index="3" function="IOPORT" group="PIN"/>
-                <signal pad-id="pc4" index="4" function="IOPORT" group="PIN"/>
-                <signal pad-id="pc5" index="5" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc0" index="0" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc1" index="1" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc2" index="2" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc3" index="3" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc4" index="4" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc5" index="5" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="portmux" name="PORTMUX" module-key="i2603_portmux">
@@ -215,7 +215,7 @@
         <peripheral key="rstctrl" name="RSTCTRL" module-key="i2111">
             <register-group-instance register-group-key="rstctrl" address-space-key="data" offset="0x40"/>
             <signals>
-                <signal pad-id="pa0" function="OTHER" group="RESET"/>
+                <signal pad-key="pa0" function="OTHER" group="RESET"/>
             </signals>
         </peripheral>
         <peripheral key="rtc" name="RTC" module-key="i2116">
@@ -230,64 +230,64 @@
         <peripheral key="spi0" name="SPI0" module-key="i2107">
             <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"/>
-                <signal pad-id="pc2" function="SPI0_ALT" group="MOSI" field="PORTMUX.CTRLB.SPI0"/>
-                <signal pad-id="pa1" function="SPI0" group="MOSI" field="PORTMUX.CTRLB.SPI0"/>
-                <signal pad-id="pc0" function="SPI0_ALT" group="SCK" field="PORTMUX.CTRLB.SPI0"/>
-                <signal pad-id="pa3" function="SPI0" group="SCK" field="PORTMUX.CTRLB.SPI0"/>
-                <signal pad-id="pc3" function="SPI0_ALT" group="SS" field="PORTMUX.CTRLB.SPI0"/>
-                <signal pad-id="pa4" function="SPI0" group="SS" field="PORTMUX.CTRLB.SPI0"/>
+                <signal pad-key="pc1" function="SPI0_ALT" group="MISO" field="PORTMUX.CTRLB.SPI0"/>
+                <signal pad-key="pa2" function="SPI0" group="MISO" field="PORTMUX.CTRLB.SPI0"/>
+                <signal pad-key="pc2" function="SPI0_ALT" group="MOSI" field="PORTMUX.CTRLB.SPI0"/>
+                <signal pad-key="pa1" function="SPI0" group="MOSI" field="PORTMUX.CTRLB.SPI0"/>
+                <signal pad-key="pc0" function="SPI0_ALT" group="SCK" field="PORTMUX.CTRLB.SPI0"/>
+                <signal pad-key="pa3" function="SPI0" group="SCK" field="PORTMUX.CTRLB.SPI0"/>
+                <signal pad-key="pc3" function="SPI0_ALT" group="SS" field="PORTMUX.CTRLB.SPI0"/>
+                <signal pad-key="pa4" function="SPI0" group="SS" field="PORTMUX.CTRLB.SPI0"/>
             </signals>
         </peripheral>
         <peripheral key="syscfg" name="SYSCFG" module-key="i2603_syscfg">
             <register-group-instance register-group-key="syscfg" address-space-key="data" offset="0xF00"/>
             <signals>
-                <signal pad-id="pa0" function="OTHER" group="UPDI"/>
+                <signal pad-key="pa0" function="OTHER" group="UPDI"/>
             </signals>
         </peripheral>
         <peripheral key="tca0" name="TCA0" module-key="i2117">
             <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"/>
-                <signal pad-id="pb4" index="1" function="TCA0_ALT" group="WO" field="PORTMUX.CTRLC.TCA01"/>
-                <signal pad-id="pb1" index="1" function="TCA0" group="WO" field="PORTMUX.CTRLC.TCA01"/>
-                <signal pad-id="pb5" index="2" function="TCA0_ALT" group="WO" field="PORTMUX.CTRLC.TCA02"/>
-                <signal pad-id="pb2" index="2" function="TCA0" group="WO" field="PORTMUX.CTRLC.TCA02"/>
-                <signal pad-id="pc3" index="3" function="TCA0_ALT" group="WO" field="PORTMUX.CTRLC.TCA03"/>
-                <signal pad-id="pa3" index="3" function="TCA0" group="WO" field="PORTMUX.CTRLC.TCA03"/>
-                <signal pad-id="pc4" index="4" function="TCA0_ALT" group="WO" field="PORTMUX.CTRLC.TCA04"/>
-                <signal pad-id="pa4" index="4" function="TCA0" group="WO" field="PORTMUX.CTRLC.TCA04"/>
-                <signal pad-id="pc5" index="5" function="TCA0_ALT" group="WO" field="PORTMUX.CTRLC.TCA05"/>
-                <signal pad-id="pa5" index="5" function="TCA0" group="WO" field="PORTMUX.CTRLC.TCA05"/>
+                <signal pad-key="pb3" index="0" function="TCA0_ALT" group="WO" field="PORTMUX.CTRLC.TCA00"/>
+                <signal pad-key="pb0" index="0" function="TCA0" group="WO" field="PORTMUX.CTRLC.TCA00"/>
+                <signal pad-key="pb4" index="1" function="TCA0_ALT" group="WO" field="PORTMUX.CTRLC.TCA01"/>
+                <signal pad-key="pb1" index="1" function="TCA0" group="WO" field="PORTMUX.CTRLC.TCA01"/>
+                <signal pad-key="pb5" index="2" function="TCA0_ALT" group="WO" field="PORTMUX.CTRLC.TCA02"/>
+                <signal pad-key="pb2" index="2" function="TCA0" group="WO" field="PORTMUX.CTRLC.TCA02"/>
+                <signal pad-key="pc3" index="3" function="TCA0_ALT" group="WO" field="PORTMUX.CTRLC.TCA03"/>
+                <signal pad-key="pa3" index="3" function="TCA0" group="WO" field="PORTMUX.CTRLC.TCA03"/>
+                <signal pad-key="pc4" index="4" function="TCA0_ALT" group="WO" field="PORTMUX.CTRLC.TCA04"/>
+                <signal pad-key="pa4" index="4" function="TCA0" group="WO" field="PORTMUX.CTRLC.TCA04"/>
+                <signal pad-key="pc5" index="5" function="TCA0_ALT" group="WO" field="PORTMUX.CTRLC.TCA05"/>
+                <signal pad-key="pa5" index="5" function="TCA0" group="WO" field="PORTMUX.CTRLC.TCA05"/>
             </signals>
         </peripheral>
         <peripheral key="tcb0" name="TCB0" module-key="i2119">
             <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"/>
+                <signal pad-key="pc0" index="0" function="TCB0_ALT" group="WO" field="PORTMUX.CTRLD.TCB0"/>
+                <signal pad-key="pa5" index="0" function="TCB0" group="WO" field="PORTMUX.CTRLD.TCB0"/>
             </signals>
         </peripheral>
         <peripheral key="twi0" name="TWI0" module-key="i2110">
             <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"/>
+                <signal pad-key="pb0" function="TWI0" group="SCL" field="PORTMUX.CTRLB.TWI0"/>
+                <signal pad-key="pb1" function="TWI0" group="SDA" field="PORTMUX.CTRLB.TWI0"/>
             </signals>
         </peripheral>
         <peripheral key="usart0" name="USART0" module-key="i2108">
             <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"/>
-                <signal pad-id="pa1" function="USART0_ALT" group="TXD" field="PORTMUX.CTRLB.USART0"/>
-                <signal pad-id="pb2" function="USART0" group="TXD" field="PORTMUX.CTRLB.USART0"/>
-                <signal pad-id="pa3" function="USART0_ALT" group="XCK" field="PORTMUX.CTRLB.USART0"/>
-                <signal pad-id="pb1" function="USART0" group="XCK" field="PORTMUX.CTRLB.USART0"/>
-                <signal pad-id="pa4" function="USART0_ALT" group="XDIR" field="PORTMUX.CTRLB.USART0"/>
-                <signal pad-id="pb0" function="USART0" group="XDIR" field="PORTMUX.CTRLB.USART0"/>
+                <signal pad-key="pa2" function="USART0_ALT" group="RXD" field="PORTMUX.CTRLB.USART0"/>
+                <signal pad-key="pb3" function="USART0" group="RXD" field="PORTMUX.CTRLB.USART0"/>
+                <signal pad-key="pa1" function="USART0_ALT" group="TXD" field="PORTMUX.CTRLB.USART0"/>
+                <signal pad-key="pb2" function="USART0" group="TXD" field="PORTMUX.CTRLB.USART0"/>
+                <signal pad-key="pa3" function="USART0_ALT" group="XCK" field="PORTMUX.CTRLB.USART0"/>
+                <signal pad-key="pb1" function="USART0" group="XCK" field="PORTMUX.CTRLB.USART0"/>
+                <signal pad-key="pa4" function="USART0_ALT" group="XDIR" field="PORTMUX.CTRLB.USART0"/>
+                <signal pad-key="pb0" function="USART0" group="XDIR" field="PORTMUX.CTRLB.USART0"/>
             </signals>
         </peripheral>
         <peripheral key="userrow" name="USERROW" module-key="i2603_userrow">
@@ -1216,36 +1216,62 @@
             </register-group>
         </module>
     </modules>
+    <pads>
+        <pad key="pa2" name="PA2"/>
+        <pad key="pa3" name="PA3"/>
+        <pad key="gnd" name="GND"/>
+        <pad key="vdd" name="VDD"/>
+        <pad key="pa4" name="PA4"/>
+        <pad key="pa5" name="PA5"/>
+        <pad key="pa6" name="PA6"/>
+        <pad key="pa7" name="PA7"/>
+        <pad key="pb7" name="PB7"/>
+        <pad key="pb6" name="PB6"/>
+        <pad key="pb5" name="PB5"/>
+        <pad key="pb4" name="PB4"/>
+        <pad key="pb3" name="PB3"/>
+        <pad key="pb2" name="PB2"/>
+        <pad key="pb1" name="PB1"/>
+        <pad key="pb0" name="PB0"/>
+        <pad key="pc0" name="PC0"/>
+        <pad key="pc1" name="PC1"/>
+        <pad key="pc2" name="PC2"/>
+        <pad key="pc3" name="PC3"/>
+        <pad key="pc4" name="PC4"/>
+        <pad key="pc5" name="PC5"/>
+        <pad key="pa0" name="PA0"/>
+        <pad key="pa1" name="PA1"/>
+    </pads>
     <pinouts>
         <pinout key="qfn24" name="QFN24" type="qfn">
-            <pin position="1" pad="PA2"/>
-            <pin position="2" pad="PA3"/>
-            <pin position="3" pad="GND"/>
-            <pin position="4" pad="VDD"/>
-            <pin position="5" pad="PA4"/>
-            <pin position="6" pad="PA5"/>
-            <pin position="7" pad="PA6"/>
-            <pin position="8" pad="PA7"/>
-            <pin position="9" pad="PB7"/>
-            <pin position="10" pad="PB6"/>
-            <pin position="11" pad="PB5"/>
-            <pin position="12" pad="PB4"/>
-            <pin position="13" pad="PB3"/>
-            <pin position="14" pad="PB2"/>
-            <pin position="15" pad="PB1"/>
-            <pin position="16" pad="PB0"/>
-            <pin position="17" pad="PC0"/>
-            <pin position="18" pad="PC1"/>
-            <pin position="19" pad="PC2"/>
-            <pin position="20" pad="PC3"/>
-            <pin position="21" pad="PC4"/>
-            <pin position="22" pad="PC5"/>
-            <pin position="23" pad="PA0"/>
-            <pin position="24" pad="PA1"/>
+            <pin position="1" pad-key="pa2"/>
+            <pin position="2" pad-key="pa3"/>
+            <pin position="3" pad-key="gnd"/>
+            <pin position="4" pad-key="vdd"/>
+            <pin position="5" pad-key="pa4"/>
+            <pin position="6" pad-key="pa5"/>
+            <pin position="7" pad-key="pa6"/>
+            <pin position="8" pad-key="pa7"/>
+            <pin position="9" pad-key="pb7"/>
+            <pin position="10" pad-key="pb6"/>
+            <pin position="11" pad-key="pb5"/>
+            <pin position="12" pad-key="pb4"/>
+            <pin position="13" pad-key="pb3"/>
+            <pin position="14" pad-key="pb2"/>
+            <pin position="15" pad-key="pb1"/>
+            <pin position="16" pad-key="pb0"/>
+            <pin position="17" pad-key="pc0"/>
+            <pin position="18" pad-key="pc1"/>
+            <pin position="19" pad-key="pc2"/>
+            <pin position="20" pad-key="pc3"/>
+            <pin position="21" pad-key="pc4"/>
+            <pin position="22" pad-key="pc5"/>
+            <pin position="23" pad-key="pa0"/>
+            <pin position="24" pad-key="pa1"/>
         </pinout>
     </pinouts>
     <variants>
-        <variant name="ATtiny807-MNR" pinout-key="qfn24" package="VQFN24"/>
-        <variant name="ATtiny807-MRF" pinout-key="qfn24" package="VQFN24"/>
+        <variant key="attiny807_mnr" name="ATtiny807-MNR" pinout-key="qfn24"/>
+        <variant key="attiny807_mrf" name="ATtiny807-MRF" pinout-key="qfn24"/>
     </variants>
 </device>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY814.xml b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY814.xml
index 05a339c9..f5480f16 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY814.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY814.xml
@@ -44,24 +44,24 @@
         <peripheral key="ac0" name="AC0" module-key="i2106">
             <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"/>
-                <signal pad-id="pa7" index="0" function="AC0" group="P"/>
+                <signal pad-key="pa6" index="0" function="AC0" group="N"/>
+                <signal pad-key="pa5" index="0" function="AC0" group="OUT"/>
+                <signal pad-key="pa7" index="0" function="AC0" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="adc0" name="ADC0" module-key="i2132">
             <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"/>
-                <signal pad-id="pa2" index="2" function="AIN0" group="AIN"/>
-                <signal pad-id="pa3" index="3" function="AIN0" group="AIN"/>
-                <signal pad-id="pa4" index="4" function="AIN0" group="AIN"/>
-                <signal pad-id="pa5" index="5" function="AIN0" group="AIN"/>
-                <signal pad-id="pa6" index="6" function="AIN0" group="AIN"/>
-                <signal pad-id="pa7" index="7" function="AIN0" group="AIN"/>
-                <signal pad-id="pb1" index="10" function="AIN0" group="AIN"/>
-                <signal pad-id="pb0" index="11" function="AIN0" group="AIN"/>
+                <signal pad-key="pa0" index="0" function="AIN0" group="AIN"/>
+                <signal pad-key="pa1" index="1" function="AIN0" group="AIN"/>
+                <signal pad-key="pa2" index="2" function="AIN0" group="AIN"/>
+                <signal pad-key="pa3" index="3" function="AIN0" group="AIN"/>
+                <signal pad-key="pa4" index="4" function="AIN0" group="AIN"/>
+                <signal pad-key="pa5" index="5" function="AIN0" group="AIN"/>
+                <signal pad-key="pa6" index="6" function="AIN0" group="AIN"/>
+                <signal pad-key="pa7" index="7" function="AIN0" group="AIN"/>
+                <signal pad-key="pb1" index="10" function="AIN0" group="AIN"/>
+                <signal pad-key="pb0" index="11" function="AIN0" group="AIN"/>
             </signals>
         </peripheral>
         <peripheral key="bod" name="BOD" module-key="i2114">
@@ -70,25 +70,25 @@
         <peripheral key="ccl" name="CCL" module-key="i2128">
             <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"/>
-                <signal pad-id="pa2" index="2" function="CCL" group="LUT0_IN"/>
-                <signal pad-id="pa4" index="0" function="CCL" group="LUT0_OUT" field="PORTMUX.CTRLA.LUT0"/>
-                <signal pad-id="pa7" index="0" function="CCL" group="LUT1_OUT" field="PORTMUX.CTRLA.LUT1"/>
+                <signal pad-key="pa0" index="0" function="CCL" group="LUT0_IN"/>
+                <signal pad-key="pa1" index="1" function="CCL" group="LUT0_IN"/>
+                <signal pad-key="pa2" index="2" function="CCL" group="LUT0_IN"/>
+                <signal pad-key="pa4" index="0" function="CCL" group="LUT0_OUT" field="PORTMUX.CTRLA.LUT0"/>
+                <signal pad-key="pa7" index="0" function="CCL" group="LUT1_OUT" field="PORTMUX.CTRLA.LUT1"/>
             </signals>
         </peripheral>
         <peripheral key="clkctrl" name="CLKCTRL" module-key="i2600_clkctrl">
             <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"/>
-                <signal pad-id="pb2" function="CLKCTRL" group="TOSC2"/>
+                <signal pad-key="pa3" function="CLKCTRL" group="CLKI"/>
+                <signal pad-key="pb3" function="CLKCTRL" group="TOSC1"/>
+                <signal pad-key="pb2" function="CLKCTRL" group="TOSC2"/>
             </signals>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="i2100">
             <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"/>
+                <signal pad-key="pa1" function="BREAK" group="BREAK" field="PORTMUX.CTRLA.EXTBRK"/>
             </signals>
         </peripheral>
         <peripheral key="cpuint" name="CPUINT" module-key="i2104">
@@ -100,38 +100,38 @@
         <peripheral key="dac0" name="DAC0" module-key="i2121">
             <register-group-instance register-group-key="dac" address-space-key="data" offset="0x680"/>
             <signals>
-                <signal pad-id="pa6" index="0" function="DAC0" group="OUT"/>
+                <signal pad-key="pa6" index="0" function="DAC0" group="OUT"/>
             </signals>
         </peripheral>
         <peripheral key="evsys" name="EVSYS" module-key="i2600_evsys">
             <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"/>
-                <signal pad-id="pa2" index="2" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
-                <signal pad-id="pa3" index="3" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
-                <signal pad-id="pa4" index="4" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
-                <signal pad-id="pa5" index="5" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
-                <signal pad-id="pa6" index="6" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
-                <signal pad-id="pa7" index="7" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
-                <signal pad-id="pb0" index="0" function="EVAINCH1" group="EVAPB" field="EVSYS.ASYNCCH1.ASYNCCH1"/>
-                <signal pad-id="pb1" index="1" function="EVAINCH1" group="EVAPB" field="EVSYS.ASYNCCH1.ASYNCCH1"/>
-                <signal pad-id="pb2" index="2" function="EVAINCH1" group="EVAPB" field="EVSYS.ASYNCCH1.ASYNCCH1"/>
-                <signal pad-id="pb3" index="3" function="EVAINCH1" group="EVAPB" field="EVSYS.ASYNCCH1.ASYNCCH1"/>
-                <signal pad-id="pa2" index="0" function="EVSYS" group="EVOUT" field="PORTMUX.CTRLA.EVOUT0"/>
-                <signal pad-id="pb2" index="1" function="EVSYS" group="EVOUT" field="PORTMUX.CTRLA.EVOUT1"/>
-                <signal pad-id="pa0" index="0" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
-                <signal pad-id="pa1" index="1" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
-                <signal pad-id="pa2" index="2" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
-                <signal pad-id="pa3" index="3" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
-                <signal pad-id="pa4" index="4" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
-                <signal pad-id="pa5" index="5" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
-                <signal pad-id="pa6" index="6" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
-                <signal pad-id="pa7" index="7" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
-                <signal pad-id="pb0" index="0" function="EVSINCH1" group="EVSPB" field="EVSYS.SYNCCH1.SYNCCH1"/>
-                <signal pad-id="pb1" index="1" function="EVSINCH1" group="EVSPB" field="EVSYS.SYNCCH1.SYNCCH1"/>
-                <signal pad-id="pb2" index="2" function="EVSINCH1" group="EVSPB" field="EVSYS.SYNCCH1.SYNCCH1"/>
-                <signal pad-id="pb3" index="3" function="EVSINCH1" group="EVSPB" field="EVSYS.SYNCCH1.SYNCCH1"/>
+                <signal pad-key="pa0" index="0" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
+                <signal pad-key="pa1" index="1" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
+                <signal pad-key="pa2" index="2" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
+                <signal pad-key="pa3" index="3" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
+                <signal pad-key="pa4" index="4" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
+                <signal pad-key="pa5" index="5" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
+                <signal pad-key="pa6" index="6" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
+                <signal pad-key="pa7" index="7" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
+                <signal pad-key="pb0" index="0" function="EVAINCH1" group="EVAPB" field="EVSYS.ASYNCCH1.ASYNCCH1"/>
+                <signal pad-key="pb1" index="1" function="EVAINCH1" group="EVAPB" field="EVSYS.ASYNCCH1.ASYNCCH1"/>
+                <signal pad-key="pb2" index="2" function="EVAINCH1" group="EVAPB" field="EVSYS.ASYNCCH1.ASYNCCH1"/>
+                <signal pad-key="pb3" index="3" function="EVAINCH1" group="EVAPB" field="EVSYS.ASYNCCH1.ASYNCCH1"/>
+                <signal pad-key="pa2" index="0" function="EVSYS" group="EVOUT" field="PORTMUX.CTRLA.EVOUT0"/>
+                <signal pad-key="pb2" index="1" function="EVSYS" group="EVOUT" field="PORTMUX.CTRLA.EVOUT1"/>
+                <signal pad-key="pa0" index="0" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
+                <signal pad-key="pa1" index="1" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
+                <signal pad-key="pa2" index="2" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
+                <signal pad-key="pa3" index="3" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
+                <signal pad-key="pa4" index="4" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
+                <signal pad-key="pa5" index="5" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
+                <signal pad-key="pa6" index="6" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
+                <signal pad-key="pa7" index="7" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
+                <signal pad-key="pb0" index="0" function="EVSINCH1" group="EVSPB" field="EVSYS.SYNCCH1.SYNCCH1"/>
+                <signal pad-key="pb1" index="1" function="EVSINCH1" group="EVSPB" field="EVSYS.SYNCCH1.SYNCCH1"/>
+                <signal pad-key="pb2" index="2" function="EVSINCH1" group="EVSPB" field="EVSYS.SYNCCH1.SYNCCH1"/>
+                <signal pad-key="pb3" index="3" function="EVSINCH1" group="EVSPB" field="EVSYS.SYNCCH1.SYNCCH1"/>
             </signals>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="i2600_fuse">
@@ -149,23 +149,23 @@
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pa2" index="2" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa3" index="3" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa4" index="4" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa5" index="5" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa6" index="6" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa7" index="7" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa0" index="0" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa1" index="1" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa2" index="2" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa3" index="3" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa4" index="4" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa5" index="5" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa6" index="6" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa7" index="7" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pb2" index="2" function="IOPORT" group="PIN"/>
-                <signal pad-id="pb3" index="3" function="IOPORT" group="PIN"/>
+                <signal pad-key="pb0" index="0" function="IOPORT" group="PIN"/>
+                <signal pad-key="pb1" index="1" function="IOPORT" group="PIN"/>
+                <signal pad-key="pb2" index="2" function="IOPORT" group="PIN"/>
+                <signal pad-key="pb3" index="3" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="portmux" name="PORTMUX" module-key="i2600_portmux">
@@ -173,25 +173,25 @@
         </peripheral>
         <peripheral key="ptc" name="PTC" module-key="i2120">
             <signals>
-                <signal pad-id="pb2" index="0" function="PTC_DS" group="DS"/>
-                <signal pad-id="pa4" index="0" function="PTC_X" group="X"/>
-                <signal pad-id="pa5" index="1" function="PTC_X" group="X"/>
-                <signal pad-id="pa6" index="2" function="PTC_X" group="X"/>
-                <signal pad-id="pa7" index="3" function="PTC_X" group="X"/>
-                <signal pad-id="pb1" index="4" function="PTC_X" group="X"/>
-                <signal pad-id="pb0" index="5" function="PTC_X" group="X"/>
-                <signal pad-id="pa4" index="0" function="PTC_Y" group="Y"/>
-                <signal pad-id="pa5" index="1" function="PTC_Y" group="Y"/>
-                <signal pad-id="pa6" index="2" function="PTC_Y" group="Y"/>
-                <signal pad-id="pa7" index="3" function="PTC_Y" group="Y"/>
-                <signal pad-id="pb1" index="4" function="PTC_Y" group="Y"/>
-                <signal pad-id="pb0" index="5" function="PTC_Y" group="Y"/>
+                <signal pad-key="pb2" index="0" function="PTC_DS" group="DS"/>
+                <signal pad-key="pa4" index="0" function="PTC_X" group="X"/>
+                <signal pad-key="pa5" index="1" function="PTC_X" group="X"/>
+                <signal pad-key="pa6" index="2" function="PTC_X" group="X"/>
+                <signal pad-key="pa7" index="3" function="PTC_X" group="X"/>
+                <signal pad-key="pb1" index="4" function="PTC_X" group="X"/>
+                <signal pad-key="pb0" index="5" function="PTC_X" group="X"/>
+                <signal pad-key="pa4" index="0" function="PTC_Y" group="Y"/>
+                <signal pad-key="pa5" index="1" function="PTC_Y" group="Y"/>
+                <signal pad-key="pa6" index="2" function="PTC_Y" group="Y"/>
+                <signal pad-key="pa7" index="3" function="PTC_Y" group="Y"/>
+                <signal pad-key="pb1" index="4" function="PTC_Y" group="Y"/>
+                <signal pad-key="pb0" index="5" function="PTC_Y" group="Y"/>
             </signals>
         </peripheral>
         <peripheral key="rstctrl" name="RSTCTRL" module-key="i2111">
             <register-group-instance register-group-key="rstctrl" address-space-key="data" offset="0x40"/>
             <signals>
-                <signal pad-id="pa0" function="OTHER" group="RESET"/>
+                <signal pad-key="pa0" function="OTHER" group="RESET"/>
             </signals>
         </peripheral>
         <peripheral key="rtc" name="RTC" module-key="i2116">
@@ -206,63 +206,63 @@
         <peripheral key="spi0" name="SPI0" module-key="i2107">
             <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"/>
-                <signal pad-id="pa3" function="SPI0" group="SCK" field="PORTMUX.CTRLB.SPI0"/>
-                <signal pad-id="pa4" function="SPI0" group="SS" field="PORTMUX.CTRLB.SPI0"/>
+                <signal pad-key="pa2" function="SPI0" group="MISO" field="PORTMUX.CTRLB.SPI0"/>
+                <signal pad-key="pa1" function="SPI0" group="MOSI" field="PORTMUX.CTRLB.SPI0"/>
+                <signal pad-key="pa3" function="SPI0" group="SCK" field="PORTMUX.CTRLB.SPI0"/>
+                <signal pad-key="pa4" function="SPI0" group="SS" field="PORTMUX.CTRLB.SPI0"/>
             </signals>
         </peripheral>
         <peripheral key="syscfg" name="SYSCFG" module-key="i2600_syscfg">
             <register-group-instance register-group-key="syscfg" address-space-key="data" offset="0xF00"/>
             <signals>
-                <signal pad-id="pa0" function="OTHER" group="UPDI"/>
+                <signal pad-key="pa0" function="OTHER" group="UPDI"/>
             </signals>
         </peripheral>
         <peripheral key="tca0" name="TCA0" module-key="i2117">
             <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"/>
-                <signal pad-id="pb1" index="1" function="TCA0" group="WO" field="PORTMUX.CTRLC.TCA01"/>
-                <signal pad-id="pb2" index="2" function="TCA0" group="WO" field="PORTMUX.CTRLC.TCA02"/>
-                <signal pad-id="pa3" index="3" function="TCA0" group="WO" field="PORTMUX.CTRLC.TCA03"/>
-                <signal pad-id="pa4" index="4" function="TCA0" group="WO" field="PORTMUX.CTRLC.TCA04"/>
-                <signal pad-id="pa5" index="5" function="TCA0" group="WO" field="PORTMUX.CTRLC.TCA05"/>
+                <signal pad-key="pb3" index="0" function="TCA0_ALT" group="WO" field="PORTMUX.CTRLC.TCA00"/>
+                <signal pad-key="pb0" index="0" function="TCA0" group="WO" field="PORTMUX.CTRLC.TCA00"/>
+                <signal pad-key="pb1" index="1" function="TCA0" group="WO" field="PORTMUX.CTRLC.TCA01"/>
+                <signal pad-key="pb2" index="2" function="TCA0" group="WO" field="PORTMUX.CTRLC.TCA02"/>
+                <signal pad-key="pa3" index="3" function="TCA0" group="WO" field="PORTMUX.CTRLC.TCA03"/>
+                <signal pad-key="pa4" index="4" function="TCA0" group="WO" field="PORTMUX.CTRLC.TCA04"/>
+                <signal pad-key="pa5" index="5" function="TCA0" group="WO" field="PORTMUX.CTRLC.TCA05"/>
             </signals>
         </peripheral>
         <peripheral key="tcb0" name="TCB0" module-key="i2119">
             <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"/>
+                <signal pad-key="pa5" index="0" function="TCB0" group="WO" field="PORTMUX.CTRLD.TCB0"/>
             </signals>
         </peripheral>
         <peripheral key="tcd0" name="TCD0" module-key="i2129">
             <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"/>
+                <signal pad-key="pa4" function="TCD0" group="WOA"/>
+                <signal pad-key="pa5" function="TCD0" group="WOB"/>
             </signals>
         </peripheral>
         <peripheral key="twi0" name="TWI0" module-key="i2110">
             <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"/>
-                <signal pad-id="pa1" function="TWI0_ALT" group="SDA" field="PORTMUX.CTRLB.TWI0"/>
-                <signal pad-id="pb1" function="TWI0" group="SDA" field="PORTMUX.CTRLB.TWI0"/>
+                <signal pad-key="pa2" function="TWI0_ALT" group="SCL" field="PORTMUX.CTRLB.TWI0"/>
+                <signal pad-key="pb0" function="TWI0" group="SCL" field="PORTMUX.CTRLB.TWI0"/>
+                <signal pad-key="pa1" function="TWI0_ALT" group="SDA" field="PORTMUX.CTRLB.TWI0"/>
+                <signal pad-key="pb1" function="TWI0" group="SDA" field="PORTMUX.CTRLB.TWI0"/>
             </signals>
         </peripheral>
         <peripheral key="usart0" name="USART0" module-key="i2108">
             <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"/>
-                <signal pad-id="pa1" function="USART0_ALT" group="TXD" field="PORTMUX.CTRLB.USART0"/>
-                <signal pad-id="pb2" function="USART0" group="TXD" field="PORTMUX.CTRLB.USART0"/>
-                <signal pad-id="pa3" function="USART0_ALT" group="XCK" field="PORTMUX.CTRLB.USART0"/>
-                <signal pad-id="pb1" function="USART0" group="XCK" field="PORTMUX.CTRLB.USART0"/>
-                <signal pad-id="pa4" function="USART0_ALT" group="XDIR" field="PORTMUX.CTRLB.USART0"/>
-                <signal pad-id="pb0" function="USART0" group="XDIR" field="PORTMUX.CTRLB.USART0"/>
+                <signal pad-key="pa2" function="USART0_ALT" group="RXD" field="PORTMUX.CTRLB.USART0"/>
+                <signal pad-key="pb3" function="USART0" group="RXD" field="PORTMUX.CTRLB.USART0"/>
+                <signal pad-key="pa1" function="USART0_ALT" group="TXD" field="PORTMUX.CTRLB.USART0"/>
+                <signal pad-key="pb2" function="USART0" group="TXD" field="PORTMUX.CTRLB.USART0"/>
+                <signal pad-key="pa3" function="USART0_ALT" group="XCK" field="PORTMUX.CTRLB.USART0"/>
+                <signal pad-key="pb1" function="USART0" group="XCK" field="PORTMUX.CTRLB.USART0"/>
+                <signal pad-key="pa4" function="USART0_ALT" group="XDIR" field="PORTMUX.CTRLB.USART0"/>
+                <signal pad-key="pb0" function="USART0" group="XDIR" field="PORTMUX.CTRLB.USART0"/>
             </signals>
         </peripheral>
         <peripheral key="userrow" name="USERROW" module-key="i2600_userrow">
@@ -1329,27 +1329,43 @@
             </register-group>
         </module>
     </modules>
+    <pads>
+        <pad key="vdd" name="VDD"/>
+        <pad key="pa4" name="PA4"/>
+        <pad key="pa5" name="PA5"/>
+        <pad key="pa6" name="PA6"/>
+        <pad key="pa7" name="PA7"/>
+        <pad key="pb3" name="PB3"/>
+        <pad key="pb2" name="PB2"/>
+        <pad key="pb1" name="PB1"/>
+        <pad key="pb0" name="PB0"/>
+        <pad key="pa0" name="PA0"/>
+        <pad key="pa1" name="PA1"/>
+        <pad key="pa2" name="PA2"/>
+        <pad key="pa3" name="PA3"/>
+        <pad key="gnd" name="GND"/>
+    </pads>
     <pinouts>
         <pinout key="soic14" name="SOIC14" type="soic">
-            <pin position="1" pad="VDD"/>
-            <pin position="2" pad="PA4"/>
-            <pin position="3" pad="PA5"/>
-            <pin position="4" pad="PA6"/>
-            <pin position="5" pad="PA7"/>
-            <pin position="6" pad="PB3"/>
-            <pin position="7" pad="PB2"/>
-            <pin position="8" pad="PB1"/>
-            <pin position="9" pad="PB0"/>
-            <pin position="10" pad="PA0"/>
-            <pin position="11" pad="PA1"/>
-            <pin position="12" pad="PA2"/>
-            <pin position="13" pad="PA3"/>
-            <pin position="14" pad="GND"/>
+            <pin position="1" pad-key="vdd"/>
+            <pin position="2" pad-key="pa4"/>
+            <pin position="3" pad-key="pa5"/>
+            <pin position="4" pad-key="pa6"/>
+            <pin position="5" pad-key="pa7"/>
+            <pin position="6" pad-key="pb3"/>
+            <pin position="7" pad-key="pb2"/>
+            <pin position="8" pad-key="pb1"/>
+            <pin position="9" pad-key="pb0"/>
+            <pin position="10" pad-key="pa0"/>
+            <pin position="11" pad-key="pa1"/>
+            <pin position="12" pad-key="pa2"/>
+            <pin position="13" pad-key="pa3"/>
+            <pin position="14" pad-key="gnd"/>
         </pinout>
     </pinouts>
     <variants>
-        <variant name="ATtiny814-SSFR" pinout-key="soic14" package="SOIC14"/>
-        <variant name="ATtiny814-SSNR" pinout-key="soic14" package="SOIC14"/>
-        <variant name="ATtiny814-SSNRES" pinout-key="soic14" package="SOIC14"/>
+        <variant key="attiny814_ssfr" name="ATtiny814-SSFR" pinout-key="soic14"/>
+        <variant key="attiny814_ssnr" name="ATtiny814-SSNR" pinout-key="soic14"/>
+        <variant key="attiny814_ssnres" name="ATtiny814-SSNRES" pinout-key="soic14"/>
     </variants>
 </device>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY816.xml b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY816.xml
index 62259245..b418887f 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY816.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY816.xml
@@ -44,28 +44,28 @@
         <peripheral key="ac0" name="AC0" module-key="i2106">
             <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"/>
-                <signal pad-id="pa5" index="0" function="AC0" group="OUT"/>
-                <signal pad-id="pa7" index="0" function="AC0" group="P"/>
-                <signal pad-id="pb5" index="1" function="AC0" group="P"/>
+                <signal pad-key="pa6" index="0" function="AC0" group="N"/>
+                <signal pad-key="pb4" index="1" function="AC0" group="N"/>
+                <signal pad-key="pa5" index="0" function="AC0" group="OUT"/>
+                <signal pad-key="pa7" index="0" function="AC0" group="P"/>
+                <signal pad-key="pb5" index="1" function="AC0" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="adc0" name="ADC0" module-key="i2132">
             <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"/>
-                <signal pad-id="pa2" index="2" function="AIN0" group="AIN"/>
-                <signal pad-id="pa3" index="3" function="AIN0" group="AIN"/>
-                <signal pad-id="pa4" index="4" function="AIN0" group="AIN"/>
-                <signal pad-id="pa5" index="5" function="AIN0" group="AIN"/>
-                <signal pad-id="pa6" index="6" function="AIN0" group="AIN"/>
-                <signal pad-id="pa7" index="7" function="AIN0" group="AIN"/>
-                <signal pad-id="pb5" index="8" function="AIN0" group="AIN"/>
-                <signal pad-id="pb4" index="9" function="AIN0" group="AIN"/>
-                <signal pad-id="pb1" index="10" function="AIN0" group="AIN"/>
-                <signal pad-id="pb0" index="11" function="AIN0" group="AIN"/>
+                <signal pad-key="pa0" index="0" function="AIN0" group="AIN"/>
+                <signal pad-key="pa1" index="1" function="AIN0" group="AIN"/>
+                <signal pad-key="pa2" index="2" function="AIN0" group="AIN"/>
+                <signal pad-key="pa3" index="3" function="AIN0" group="AIN"/>
+                <signal pad-key="pa4" index="4" function="AIN0" group="AIN"/>
+                <signal pad-key="pa5" index="5" function="AIN0" group="AIN"/>
+                <signal pad-key="pa6" index="6" function="AIN0" group="AIN"/>
+                <signal pad-key="pa7" index="7" function="AIN0" group="AIN"/>
+                <signal pad-key="pb5" index="8" function="AIN0" group="AIN"/>
+                <signal pad-key="pb4" index="9" function="AIN0" group="AIN"/>
+                <signal pad-key="pb1" index="10" function="AIN0" group="AIN"/>
+                <signal pad-key="pb0" index="11" function="AIN0" group="AIN"/>
             </signals>
         </peripheral>
         <peripheral key="bod" name="BOD" module-key="i2114">
@@ -74,29 +74,29 @@
         <peripheral key="ccl" name="CCL" module-key="i2128">
             <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"/>
-                <signal pad-id="pa2" index="2" function="CCL" group="LUT0_IN"/>
-                <signal pad-id="pb4" index="0" function="CCL_ALT" group="LUT0_OUT" field="PORTMUX.CTRLA.LUT0"/>
-                <signal pad-id="pa4" index="0" function="CCL" group="LUT0_OUT" field="PORTMUX.CTRLA.LUT0"/>
-                <signal pad-id="pc3" index="0" function="CCL" group="LUT1_IN"/>
-                <signal pad-id="pc1" index="0" function="CCL_ALT" group="LUT1_OUT" field="PORTMUX.CTRLA.LUT1"/>
-                <signal pad-id="pa7" index="0" function="CCL" group="LUT1_OUT" field="PORTMUX.CTRLA.LUT1"/>
+                <signal pad-key="pa0" index="0" function="CCL" group="LUT0_IN"/>
+                <signal pad-key="pa1" index="1" function="CCL" group="LUT0_IN"/>
+                <signal pad-key="pa2" index="2" function="CCL" group="LUT0_IN"/>
+                <signal pad-key="pb4" index="0" function="CCL_ALT" group="LUT0_OUT" field="PORTMUX.CTRLA.LUT0"/>
+                <signal pad-key="pa4" index="0" function="CCL" group="LUT0_OUT" field="PORTMUX.CTRLA.LUT0"/>
+                <signal pad-key="pc3" index="0" function="CCL" group="LUT1_IN"/>
+                <signal pad-key="pc1" index="0" function="CCL_ALT" group="LUT1_OUT" field="PORTMUX.CTRLA.LUT1"/>
+                <signal pad-key="pa7" index="0" function="CCL" group="LUT1_OUT" field="PORTMUX.CTRLA.LUT1"/>
             </signals>
         </peripheral>
         <peripheral key="clkctrl" name="CLKCTRL" module-key="i2600_clkctrl">
             <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"/>
-                <signal pad-id="pb3" function="CLKCTRL" group="TOSC1"/>
-                <signal pad-id="pb2" function="CLKCTRL" group="TOSC2"/>
+                <signal pad-key="pa3" function="CLKCTRL" group="CLKI"/>
+                <signal pad-key="pb5" function="CLKCTRL" group="CLKO"/>
+                <signal pad-key="pb3" function="CLKCTRL" group="TOSC1"/>
+                <signal pad-key="pb2" function="CLKCTRL" group="TOSC2"/>
             </signals>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="i2100">
             <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"/>
+                <signal pad-key="pa1" function="BREAK" group="BREAK" field="PORTMUX.CTRLA.EXTBRK"/>
             </signals>
         </peripheral>
         <peripheral key="cpuint" name="CPUINT" module-key="i2104">
@@ -108,51 +108,51 @@
         <peripheral key="dac0" name="DAC0" module-key="i2121">
             <register-group-instance register-group-key="dac" address-space-key="data" offset="0x680"/>
             <signals>
-                <signal pad-id="pa6" index="0" function="DAC0" group="OUT"/>
+                <signal pad-key="pa6" index="0" function="DAC0" group="OUT"/>
             </signals>
         </peripheral>
         <peripheral key="evsys" name="EVSYS" module-key="i2600_evsys">
             <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"/>
-                <signal pad-id="pa2" index="2" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
-                <signal pad-id="pa3" index="3" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
-                <signal pad-id="pa4" index="4" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
-                <signal pad-id="pa5" index="5" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
-                <signal pad-id="pa6" index="6" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
-                <signal pad-id="pa7" index="7" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
-                <signal pad-id="pb0" index="0" function="EVAINCH1" group="EVAPB" field="EVSYS.ASYNCCH1.ASYNCCH1"/>
-                <signal pad-id="pb1" index="1" function="EVAINCH1" group="EVAPB" field="EVSYS.ASYNCCH1.ASYNCCH1"/>
-                <signal pad-id="pb2" index="2" function="EVAINCH1" group="EVAPB" field="EVSYS.ASYNCCH1.ASYNCCH1"/>
-                <signal pad-id="pb3" index="3" function="EVAINCH1" group="EVAPB" field="EVSYS.ASYNCCH1.ASYNCCH1"/>
-                <signal pad-id="pb4" index="4" function="EVAINCH1" group="EVAPB" field="EVSYS.ASYNCCH1.ASYNCCH1"/>
-                <signal pad-id="pb5" index="5" function="EVAINCH1" group="EVAPB" field="EVSYS.ASYNCCH1.ASYNCCH1"/>
-                <signal pad-id="pc0" index="0" function="EVAINCH2" group="EVAPC" field="EVSYS.ASYNCCH2.ASYNCCH2"/>
-                <signal pad-id="pc1" index="1" function="EVAINCH2" group="EVAPC" field="EVSYS.ASYNCCH2.ASYNCCH2"/>
-                <signal pad-id="pc2" index="2" function="EVAINCH2" group="EVAPC" field="EVSYS.ASYNCCH2.ASYNCCH2"/>
-                <signal pad-id="pc3" index="3" function="EVAINCH2" group="EVAPC" field="EVSYS.ASYNCCH2.ASYNCCH2"/>
-                <signal pad-id="pa2" index="0" function="EVSYS" group="EVOUT" field="PORTMUX.CTRLA.EVOUT0"/>
-                <signal pad-id="pb2" index="1" function="EVSYS" group="EVOUT" field="PORTMUX.CTRLA.EVOUT1"/>
-                <signal pad-id="pc2" index="2" function="EVSYS" group="EVOUT" field="PORTMUX.CTRLA.EVOUT2"/>
-                <signal pad-id="pa0" index="0" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
-                <signal pad-id="pa1" index="1" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
-                <signal pad-id="pa2" index="2" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
-                <signal pad-id="pa3" index="3" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
-                <signal pad-id="pa4" index="4" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
-                <signal pad-id="pa5" index="5" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
-                <signal pad-id="pa6" index="6" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
-                <signal pad-id="pa7" index="7" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
-                <signal pad-id="pb0" index="0" function="EVSINCH1" group="EVSPB" field="EVSYS.SYNCCH1.SYNCCH1"/>
-                <signal pad-id="pb1" index="1" function="EVSINCH1" group="EVSPB" field="EVSYS.SYNCCH1.SYNCCH1"/>
-                <signal pad-id="pb2" index="2" function="EVSINCH1" group="EVSPB" field="EVSYS.SYNCCH1.SYNCCH1"/>
-                <signal pad-id="pb3" index="3" function="EVSINCH1" group="EVSPB" field="EVSYS.SYNCCH1.SYNCCH1"/>
-                <signal pad-id="pb4" index="4" function="EVSINCH1" group="EVSPB" field="EVSYS.SYNCCH1.SYNCCH1"/>
-                <signal pad-id="pb5" index="5" function="EVSINCH1" group="EVSPB" field="EVSYS.SYNCCH1.SYNCCH1"/>
-                <signal pad-id="pc0" index="0" function="EVSINCH0" group="EVSPC" field="EVSYS.SYNCCH0.SYNCCH0"/>
-                <signal pad-id="pc1" index="1" function="EVSINCH0" group="EVSPC" field="EVSYS.SYNCCH0.SYNCCH0"/>
-                <signal pad-id="pc2" index="2" function="EVSINCH0" group="EVSPC" field="EVSYS.SYNCCH0.SYNCCH0"/>
-                <signal pad-id="pc3" index="3" function="EVSINCH0" group="EVSPC" field="EVSYS.SYNCCH0.SYNCCH0"/>
+                <signal pad-key="pa0" index="0" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
+                <signal pad-key="pa1" index="1" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
+                <signal pad-key="pa2" index="2" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
+                <signal pad-key="pa3" index="3" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
+                <signal pad-key="pa4" index="4" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
+                <signal pad-key="pa5" index="5" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
+                <signal pad-key="pa6" index="6" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
+                <signal pad-key="pa7" index="7" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
+                <signal pad-key="pb0" index="0" function="EVAINCH1" group="EVAPB" field="EVSYS.ASYNCCH1.ASYNCCH1"/>
+                <signal pad-key="pb1" index="1" function="EVAINCH1" group="EVAPB" field="EVSYS.ASYNCCH1.ASYNCCH1"/>
+                <signal pad-key="pb2" index="2" function="EVAINCH1" group="EVAPB" field="EVSYS.ASYNCCH1.ASYNCCH1"/>
+                <signal pad-key="pb3" index="3" function="EVAINCH1" group="EVAPB" field="EVSYS.ASYNCCH1.ASYNCCH1"/>
+                <signal pad-key="pb4" index="4" function="EVAINCH1" group="EVAPB" field="EVSYS.ASYNCCH1.ASYNCCH1"/>
+                <signal pad-key="pb5" index="5" function="EVAINCH1" group="EVAPB" field="EVSYS.ASYNCCH1.ASYNCCH1"/>
+                <signal pad-key="pc0" index="0" function="EVAINCH2" group="EVAPC" field="EVSYS.ASYNCCH2.ASYNCCH2"/>
+                <signal pad-key="pc1" index="1" function="EVAINCH2" group="EVAPC" field="EVSYS.ASYNCCH2.ASYNCCH2"/>
+                <signal pad-key="pc2" index="2" function="EVAINCH2" group="EVAPC" field="EVSYS.ASYNCCH2.ASYNCCH2"/>
+                <signal pad-key="pc3" index="3" function="EVAINCH2" group="EVAPC" field="EVSYS.ASYNCCH2.ASYNCCH2"/>
+                <signal pad-key="pa2" index="0" function="EVSYS" group="EVOUT" field="PORTMUX.CTRLA.EVOUT0"/>
+                <signal pad-key="pb2" index="1" function="EVSYS" group="EVOUT" field="PORTMUX.CTRLA.EVOUT1"/>
+                <signal pad-key="pc2" index="2" function="EVSYS" group="EVOUT" field="PORTMUX.CTRLA.EVOUT2"/>
+                <signal pad-key="pa0" index="0" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
+                <signal pad-key="pa1" index="1" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
+                <signal pad-key="pa2" index="2" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
+                <signal pad-key="pa3" index="3" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
+                <signal pad-key="pa4" index="4" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
+                <signal pad-key="pa5" index="5" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
+                <signal pad-key="pa6" index="6" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
+                <signal pad-key="pa7" index="7" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
+                <signal pad-key="pb0" index="0" function="EVSINCH1" group="EVSPB" field="EVSYS.SYNCCH1.SYNCCH1"/>
+                <signal pad-key="pb1" index="1" function="EVSINCH1" group="EVSPB" field="EVSYS.SYNCCH1.SYNCCH1"/>
+                <signal pad-key="pb2" index="2" function="EVSINCH1" group="EVSPB" field="EVSYS.SYNCCH1.SYNCCH1"/>
+                <signal pad-key="pb3" index="3" function="EVSINCH1" group="EVSPB" field="EVSYS.SYNCCH1.SYNCCH1"/>
+                <signal pad-key="pb4" index="4" function="EVSINCH1" group="EVSPB" field="EVSYS.SYNCCH1.SYNCCH1"/>
+                <signal pad-key="pb5" index="5" function="EVSINCH1" group="EVSPB" field="EVSYS.SYNCCH1.SYNCCH1"/>
+                <signal pad-key="pc0" index="0" function="EVSINCH0" group="EVSPC" field="EVSYS.SYNCCH0.SYNCCH0"/>
+                <signal pad-key="pc1" index="1" function="EVSINCH0" group="EVSPC" field="EVSYS.SYNCCH0.SYNCCH0"/>
+                <signal pad-key="pc2" index="2" function="EVSINCH0" group="EVSPC" field="EVSYS.SYNCCH0.SYNCCH0"/>
+                <signal pad-key="pc3" index="3" function="EVSINCH0" group="EVSPC" field="EVSYS.SYNCCH0.SYNCCH0"/>
             </signals>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="i2600_fuse">
@@ -170,34 +170,34 @@
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pa2" index="2" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa3" index="3" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa4" index="4" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa5" index="5" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa6" index="6" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa7" index="7" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa0" index="0" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa1" index="1" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa2" index="2" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa3" index="3" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa4" index="4" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa5" index="5" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa6" index="6" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa7" index="7" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pb2" index="2" function="IOPORT" group="PIN"/>
-                <signal pad-id="pb3" index="3" function="IOPORT" group="PIN"/>
-                <signal pad-id="pb4" index="4" function="IOPORT" group="PIN"/>
-                <signal pad-id="pb5" index="5" function="IOPORT" group="PIN"/>
+                <signal pad-key="pb0" index="0" function="IOPORT" group="PIN"/>
+                <signal pad-key="pb1" index="1" function="IOPORT" group="PIN"/>
+                <signal pad-key="pb2" index="2" function="IOPORT" group="PIN"/>
+                <signal pad-key="pb3" index="3" function="IOPORT" group="PIN"/>
+                <signal pad-key="pb4" index="4" function="IOPORT" group="PIN"/>
+                <signal pad-key="pb5" index="5" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pc2" index="2" function="IOPORT" group="PIN"/>
-                <signal pad-id="pc3" index="3" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc0" index="0" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc1" index="1" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc2" index="2" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc3" index="3" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="portmux" name="PORTMUX" module-key="i2600_portmux">
@@ -205,26 +205,26 @@
         </peripheral>
         <peripheral key="ptc" name="PTC" module-key="i2120">
             <signals>
-                <signal pad-id="pb2" index="0" function="PTC_DS" group="DS"/>
-                <signal pad-id="pb4" index="1" function="PTC_DS" group="DS"/>
-                <signal pad-id="pa4" index="0" function="PTC_X" group="X"/>
-                <signal pad-id="pa5" index="1" function="PTC_X" group="X"/>
-                <signal pad-id="pa6" index="2" function="PTC_X" group="X"/>
-                <signal pad-id="pa7" index="3" function="PTC_X" group="X"/>
-                <signal pad-id="pb1" index="4" function="PTC_X" group="X"/>
-                <signal pad-id="pb0" index="5" function="PTC_X" group="X"/>
-                <signal pad-id="pa4" index="0" function="PTC_Y" group="Y"/>
-                <signal pad-id="pa5" index="1" function="PTC_Y" group="Y"/>
-                <signal pad-id="pa6" index="2" function="PTC_Y" group="Y"/>
-                <signal pad-id="pa7" index="3" function="PTC_Y" group="Y"/>
-                <signal pad-id="pb1" index="4" function="PTC_Y" group="Y"/>
-                <signal pad-id="pb0" index="5" function="PTC_Y" group="Y"/>
+                <signal pad-key="pb2" index="0" function="PTC_DS" group="DS"/>
+                <signal pad-key="pb4" index="1" function="PTC_DS" group="DS"/>
+                <signal pad-key="pa4" index="0" function="PTC_X" group="X"/>
+                <signal pad-key="pa5" index="1" function="PTC_X" group="X"/>
+                <signal pad-key="pa6" index="2" function="PTC_X" group="X"/>
+                <signal pad-key="pa7" index="3" function="PTC_X" group="X"/>
+                <signal pad-key="pb1" index="4" function="PTC_X" group="X"/>
+                <signal pad-key="pb0" index="5" function="PTC_X" group="X"/>
+                <signal pad-key="pa4" index="0" function="PTC_Y" group="Y"/>
+                <signal pad-key="pa5" index="1" function="PTC_Y" group="Y"/>
+                <signal pad-key="pa6" index="2" function="PTC_Y" group="Y"/>
+                <signal pad-key="pa7" index="3" function="PTC_Y" group="Y"/>
+                <signal pad-key="pb1" index="4" function="PTC_Y" group="Y"/>
+                <signal pad-key="pb0" index="5" function="PTC_Y" group="Y"/>
             </signals>
         </peripheral>
         <peripheral key="rstctrl" name="RSTCTRL" module-key="i2111">
             <register-group-instance register-group-key="rstctrl" address-space-key="data" offset="0x40"/>
             <signals>
-                <signal pad-id="pa0" function="OTHER" group="RESET"/>
+                <signal pad-key="pa0" function="OTHER" group="RESET"/>
             </signals>
         </peripheral>
         <peripheral key="rtc" name="RTC" module-key="i2116">
@@ -239,73 +239,73 @@
         <peripheral key="spi0" name="SPI0" module-key="i2107">
             <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"/>
-                <signal pad-id="pc2" function="SPI0_ALT" group="MOSI" field="PORTMUX.CTRLB.SPI0"/>
-                <signal pad-id="pa1" function="SPI0" group="MOSI" field="PORTMUX.CTRLB.SPI0"/>
-                <signal pad-id="pc0" function="SPI0_ALT" group="SCK" field="PORTMUX.CTRLB.SPI0"/>
-                <signal pad-id="pa3" function="SPI0" group="SCK" field="PORTMUX.CTRLB.SPI0"/>
-                <signal pad-id="pc3" function="SPI0_ALT" group="SS" field="PORTMUX.CTRLB.SPI0"/>
-                <signal pad-id="pa4" function="SPI0" group="SS" field="PORTMUX.CTRLB.SPI0"/>
+                <signal pad-key="pc1" function="SPI0_ALT" group="MISO" field="PORTMUX.CTRLB.SPI0"/>
+                <signal pad-key="pa2" function="SPI0" group="MISO" field="PORTMUX.CTRLB.SPI0"/>
+                <signal pad-key="pc2" function="SPI0_ALT" group="MOSI" field="PORTMUX.CTRLB.SPI0"/>
+                <signal pad-key="pa1" function="SPI0" group="MOSI" field="PORTMUX.CTRLB.SPI0"/>
+                <signal pad-key="pc0" function="SPI0_ALT" group="SCK" field="PORTMUX.CTRLB.SPI0"/>
+                <signal pad-key="pa3" function="SPI0" group="SCK" field="PORTMUX.CTRLB.SPI0"/>
+                <signal pad-key="pc3" function="SPI0_ALT" group="SS" field="PORTMUX.CTRLB.SPI0"/>
+                <signal pad-key="pa4" function="SPI0" group="SS" field="PORTMUX.CTRLB.SPI0"/>
             </signals>
         </peripheral>
         <peripheral key="syscfg" name="SYSCFG" module-key="i2600_syscfg">
             <register-group-instance register-group-key="syscfg" address-space-key="data" offset="0xF00"/>
             <signals>
-                <signal pad-id="pa0" function="OTHER" group="UPDI"/>
+                <signal pad-key="pa0" function="OTHER" group="UPDI"/>
             </signals>
         </peripheral>
         <peripheral key="tca0" name="TCA0" module-key="i2117">
             <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"/>
-                <signal pad-id="pb4" index="1" function="TCA0_ALT" group="WO" field="PORTMUX.CTRLC.TCA01"/>
-                <signal pad-id="pb1" index="1" function="TCA0" group="WO" field="PORTMUX.CTRLC.TCA01"/>
-                <signal pad-id="pb5" index="2" function="TCA0_ALT" group="WO" field="PORTMUX.CTRLC.TCA02"/>
-                <signal pad-id="pb2" index="2" function="TCA0" group="WO" field="PORTMUX.CTRLC.TCA02"/>
-                <signal pad-id="pc3" index="3" function="TCA0_ALT" group="WO" field="PORTMUX.CTRLC.TCA03"/>
-                <signal pad-id="pa3" index="3" function="TCA0" group="WO" field="PORTMUX.CTRLC.TCA03"/>
-                <signal pad-id="pa4" index="4" function="TCA0" group="WO" field="PORTMUX.CTRLC.TCA04"/>
-                <signal pad-id="pa5" index="5" function="TCA0" group="WO" field="PORTMUX.CTRLC.TCA05"/>
+                <signal pad-key="pb3" index="0" function="TCA0_ALT" group="WO" field="PORTMUX.CTRLC.TCA00"/>
+                <signal pad-key="pb0" index="0" function="TCA0" group="WO" field="PORTMUX.CTRLC.TCA00"/>
+                <signal pad-key="pb4" index="1" function="TCA0_ALT" group="WO" field="PORTMUX.CTRLC.TCA01"/>
+                <signal pad-key="pb1" index="1" function="TCA0" group="WO" field="PORTMUX.CTRLC.TCA01"/>
+                <signal pad-key="pb5" index="2" function="TCA0_ALT" group="WO" field="PORTMUX.CTRLC.TCA02"/>
+                <signal pad-key="pb2" index="2" function="TCA0" group="WO" field="PORTMUX.CTRLC.TCA02"/>
+                <signal pad-key="pc3" index="3" function="TCA0_ALT" group="WO" field="PORTMUX.CTRLC.TCA03"/>
+                <signal pad-key="pa3" index="3" function="TCA0" group="WO" field="PORTMUX.CTRLC.TCA03"/>
+                <signal pad-key="pa4" index="4" function="TCA0" group="WO" field="PORTMUX.CTRLC.TCA04"/>
+                <signal pad-key="pa5" index="5" function="TCA0" group="WO" field="PORTMUX.CTRLC.TCA05"/>
             </signals>
         </peripheral>
         <peripheral key="tcb0" name="TCB0" module-key="i2119">
             <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"/>
+                <signal pad-key="pc0" index="0" function="TCB0_ALT" group="WO" field="PORTMUX.CTRLD.TCB0"/>
+                <signal pad-key="pa5" index="0" function="TCB0" group="WO" field="PORTMUX.CTRLD.TCB0"/>
             </signals>
         </peripheral>
         <peripheral key="tcd0" name="TCD0" module-key="i2129">
             <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"/>
-                <signal pad-id="pc0" function="TCD0" group="WOC"/>
-                <signal pad-id="pc1" function="TCD0" group="WOD"/>
+                <signal pad-key="pa4" function="TCD0" group="WOA"/>
+                <signal pad-key="pa5" function="TCD0" group="WOB"/>
+                <signal pad-key="pc0" function="TCD0" group="WOC"/>
+                <signal pad-key="pc1" function="TCD0" group="WOD"/>
             </signals>
         </peripheral>
         <peripheral key="twi0" name="TWI0" module-key="i2110">
             <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"/>
-                <signal pad-id="pa1" function="TWI0_ALT" group="SDA" field="PORTMUX.CTRLB.TWI0"/>
-                <signal pad-id="pb1" function="TWI0" group="SDA" field="PORTMUX.CTRLB.TWI0"/>
+                <signal pad-key="pa2" function="TWI0_ALT" group="SCL" field="PORTMUX.CTRLB.TWI0"/>
+                <signal pad-key="pb0" function="TWI0" group="SCL" field="PORTMUX.CTRLB.TWI0"/>
+                <signal pad-key="pa1" function="TWI0_ALT" group="SDA" field="PORTMUX.CTRLB.TWI0"/>
+                <signal pad-key="pb1" function="TWI0" group="SDA" field="PORTMUX.CTRLB.TWI0"/>
             </signals>
         </peripheral>
         <peripheral key="usart0" name="USART0" module-key="i2108">
             <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"/>
-                <signal pad-id="pa1" function="USART0_ALT" group="TXD" field="PORTMUX.CTRLB.USART0"/>
-                <signal pad-id="pb2" function="USART0" group="TXD" field="PORTMUX.CTRLB.USART0"/>
-                <signal pad-id="pa3" function="USART0_ALT" group="XCK" field="PORTMUX.CTRLB.USART0"/>
-                <signal pad-id="pb1" function="USART0" group="XCK" field="PORTMUX.CTRLB.USART0"/>
-                <signal pad-id="pa4" function="USART0_ALT" group="XDIR" field="PORTMUX.CTRLB.USART0"/>
-                <signal pad-id="pb0" function="USART0" group="XDIR" field="PORTMUX.CTRLB.USART0"/>
+                <signal pad-key="pa2" function="USART0_ALT" group="RXD" field="PORTMUX.CTRLB.USART0"/>
+                <signal pad-key="pb3" function="USART0" group="RXD" field="PORTMUX.CTRLB.USART0"/>
+                <signal pad-key="pa1" function="USART0_ALT" group="TXD" field="PORTMUX.CTRLB.USART0"/>
+                <signal pad-key="pb2" function="USART0" group="TXD" field="PORTMUX.CTRLB.USART0"/>
+                <signal pad-key="pa3" function="USART0_ALT" group="XCK" field="PORTMUX.CTRLB.USART0"/>
+                <signal pad-key="pb1" function="USART0" group="XCK" field="PORTMUX.CTRLB.USART0"/>
+                <signal pad-key="pa4" function="USART0_ALT" group="XDIR" field="PORTMUX.CTRLB.USART0"/>
+                <signal pad-key="pb0" function="USART0" group="XDIR" field="PORTMUX.CTRLB.USART0"/>
             </signals>
         </peripheral>
         <peripheral key="userrow" name="USERROW" module-key="i2600_userrow">
@@ -1372,57 +1372,79 @@
             </register-group>
         </module>
     </modules>
+    <pads>
+        <pad key="pa2" name="PA2"/>
+        <pad key="pa3" name="PA3"/>
+        <pad key="gnd" name="GND"/>
+        <pad key="vdd" name="VDD"/>
+        <pad key="pa4" name="PA4"/>
+        <pad key="pa5" name="PA5"/>
+        <pad key="pa6" name="PA6"/>
+        <pad key="pa7" name="PA7"/>
+        <pad key="pb5" name="PB5"/>
+        <pad key="pb4" name="PB4"/>
+        <pad key="pb3" name="PB3"/>
+        <pad key="pb2" name="PB2"/>
+        <pad key="pb1" name="PB1"/>
+        <pad key="pb0" name="PB0"/>
+        <pad key="pc0" name="PC0"/>
+        <pad key="pc1" name="PC1"/>
+        <pad key="pc2" name="PC2"/>
+        <pad key="pc3" name="PC3"/>
+        <pad key="pa0" name="PA0"/>
+        <pad key="pa1" name="PA1"/>
+    </pads>
     <pinouts>
         <pinout key="qfn20" name="QFN20" type="qfn">
-            <pin position="1" pad="PA2"/>
-            <pin position="2" pad="PA3"/>
-            <pin position="3" pad="GND"/>
-            <pin position="4" pad="VDD"/>
-            <pin position="5" pad="PA4"/>
-            <pin position="6" pad="PA5"/>
-            <pin position="7" pad="PA6"/>
-            <pin position="8" pad="PA7"/>
-            <pin position="9" pad="PB5"/>
-            <pin position="10" pad="PB4"/>
-            <pin position="11" pad="PB3"/>
-            <pin position="12" pad="PB2"/>
-            <pin position="13" pad="PB1"/>
-            <pin position="14" pad="PB0"/>
-            <pin position="15" pad="PC0"/>
-            <pin position="16" pad="PC1"/>
-            <pin position="17" pad="PC2"/>
-            <pin position="18" pad="PC3"/>
-            <pin position="19" pad="PA0"/>
-            <pin position="20" pad="PA1"/>
+            <pin position="1" pad-key="pa2"/>
+            <pin position="2" pad-key="pa3"/>
+            <pin position="3" pad-key="gnd"/>
+            <pin position="4" pad-key="vdd"/>
+            <pin position="5" pad-key="pa4"/>
+            <pin position="6" pad-key="pa5"/>
+            <pin position="7" pad-key="pa6"/>
+            <pin position="8" pad-key="pa7"/>
+            <pin position="9" pad-key="pb5"/>
+            <pin position="10" pad-key="pb4"/>
+            <pin position="11" pad-key="pb3"/>
+            <pin position="12" pad-key="pb2"/>
+            <pin position="13" pad-key="pb1"/>
+            <pin position="14" pad-key="pb0"/>
+            <pin position="15" pad-key="pc0"/>
+            <pin position="16" pad-key="pc1"/>
+            <pin position="17" pad-key="pc2"/>
+            <pin position="18" pad-key="pc3"/>
+            <pin position="19" pad-key="pa0"/>
+            <pin position="20" pad-key="pa1"/>
         </pinout>
         <pinout key="soic20" name="SOIC20" type="soic">
-            <pin position="1" pad="VDD"/>
-            <pin position="2" pad="PA4"/>
-            <pin position="3" pad="PA5"/>
-            <pin position="4" pad="PA6"/>
-            <pin position="5" pad="PA7"/>
-            <pin position="6" pad="PB5"/>
-            <pin position="7" pad="PB4"/>
-            <pin position="8" pad="PB3"/>
-            <pin position="9" pad="PB2"/>
-            <pin position="10" pad="PB1"/>
-            <pin position="11" pad="PB0"/>
-            <pin position="12" pad="PC0"/>
-            <pin position="13" pad="PC1"/>
-            <pin position="14" pad="PC2"/>
-            <pin position="15" pad="PC3"/>
-            <pin position="16" pad="PA0"/>
-            <pin position="17" pad="PA1"/>
-            <pin position="18" pad="PA2"/>
-            <pin position="19" pad="PA3"/>
-            <pin position="20" pad="GND"/>
+            <pin position="1" pad-key="vdd"/>
+            <pin position="2" pad-key="pa4"/>
+            <pin position="3" pad-key="pa5"/>
+            <pin position="4" pad-key="pa6"/>
+            <pin position="5" pad-key="pa7"/>
+            <pin position="6" pad-key="pb5"/>
+            <pin position="7" pad-key="pb4"/>
+            <pin position="8" pad-key="pb3"/>
+            <pin position="9" pad-key="pb2"/>
+            <pin position="10" pad-key="pb1"/>
+            <pin position="11" pad-key="pb0"/>
+            <pin position="12" pad-key="pc0"/>
+            <pin position="13" pad-key="pc1"/>
+            <pin position="14" pad-key="pc2"/>
+            <pin position="15" pad-key="pc3"/>
+            <pin position="16" pad-key="pa0"/>
+            <pin position="17" pad-key="pa1"/>
+            <pin position="18" pad-key="pa2"/>
+            <pin position="19" pad-key="pa3"/>
+            <pin position="20" pad-key="gnd"/>
         </pinout>
     </pinouts>
     <variants>
-        <variant name="ATtiny816-MFR" pinout-key="qfn20" package="VQFN20"/>
-        <variant name="ATtiny816-MNR" pinout-key="qfn20" package="VQFN20"/>
-        <variant name="ATtiny816-MNRES" pinout-key="qfn20" package="VQFN20"/>
-        <variant name="ATtiny816-SFR" pinout-key="soic20" package="SOIC20"/>
-        <variant name="ATtiny816-SNR" pinout-key="soic20" package="SOIC20"/>
+        <variant key="attiny816_mfr" name="ATtiny816-MFR" pinout-key="qfn20"/>
+        <variant key="attiny816_mnr" name="ATtiny816-MNR" pinout-key="qfn20"/>
+        <variant key="attiny816_mnres" name="ATtiny816-MNRES" pinout-key="qfn20"/>
+        <variant key="attiny816_sfr" name="ATtiny816-SFR" pinout-key="soic20"/>
+        <variant key="attiny816_snr" name="ATtiny816-SNR" pinout-key="soic20"/>
     </variants>
 </device>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY817.xml b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY817.xml
index 610776bf..423185b3 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY817.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY817.xml
@@ -44,28 +44,28 @@
         <peripheral key="ac0" name="AC0" module-key="i2106">
             <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"/>
-                <signal pad-id="pa5" index="0" function="AC0" group="OUT"/>
-                <signal pad-id="pa7" index="0" function="AC0" group="P"/>
-                <signal pad-id="pb5" index="1" function="AC0" group="P"/>
+                <signal pad-key="pa6" index="0" function="AC0" group="N"/>
+                <signal pad-key="pb4" index="1" function="AC0" group="N"/>
+                <signal pad-key="pa5" index="0" function="AC0" group="OUT"/>
+                <signal pad-key="pa7" index="0" function="AC0" group="P"/>
+                <signal pad-key="pb5" index="1" function="AC0" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="adc0" name="ADC0" module-key="i2132">
             <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"/>
-                <signal pad-id="pa2" index="2" function="AIN0" group="AIN"/>
-                <signal pad-id="pa3" index="3" function="AIN0" group="AIN"/>
-                <signal pad-id="pa4" index="4" function="AIN0" group="AIN"/>
-                <signal pad-id="pa5" index="5" function="AIN0" group="AIN"/>
-                <signal pad-id="pa6" index="6" function="AIN0" group="AIN"/>
-                <signal pad-id="pa7" index="7" function="AIN0" group="AIN"/>
-                <signal pad-id="pb5" index="8" function="AIN0" group="AIN"/>
-                <signal pad-id="pb4" index="9" function="AIN0" group="AIN"/>
-                <signal pad-id="pb1" index="10" function="AIN0" group="AIN"/>
-                <signal pad-id="pb0" index="11" function="AIN0" group="AIN"/>
+                <signal pad-key="pa0" index="0" function="AIN0" group="AIN"/>
+                <signal pad-key="pa1" index="1" function="AIN0" group="AIN"/>
+                <signal pad-key="pa2" index="2" function="AIN0" group="AIN"/>
+                <signal pad-key="pa3" index="3" function="AIN0" group="AIN"/>
+                <signal pad-key="pa4" index="4" function="AIN0" group="AIN"/>
+                <signal pad-key="pa5" index="5" function="AIN0" group="AIN"/>
+                <signal pad-key="pa6" index="6" function="AIN0" group="AIN"/>
+                <signal pad-key="pa7" index="7" function="AIN0" group="AIN"/>
+                <signal pad-key="pb5" index="8" function="AIN0" group="AIN"/>
+                <signal pad-key="pb4" index="9" function="AIN0" group="AIN"/>
+                <signal pad-key="pb1" index="10" function="AIN0" group="AIN"/>
+                <signal pad-key="pb0" index="11" function="AIN0" group="AIN"/>
             </signals>
         </peripheral>
         <peripheral key="bod" name="BOD" module-key="i2114">
@@ -74,32 +74,32 @@
         <peripheral key="ccl" name="CCL" module-key="i2128">
             <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"/>
-                <signal pad-id="pa2" index="2" function="CCL" group="LUT0_IN"/>
-                <signal pad-id="pb4" index="0" function="CCL_ALT" group="LUT0_OUT" field="PORTMUX.CTRLA.LUT0"/>
-                <signal pad-id="pa4" index="0" function="CCL" group="LUT0_OUT" field="PORTMUX.CTRLA.LUT0"/>
-                <signal pad-id="pc3" index="0" function="CCL" group="LUT1_IN"/>
-                <signal pad-id="pc4" index="1" function="CCL" group="LUT1_IN"/>
-                <signal pad-id="pc5" index="2" function="CCL" group="LUT1_IN"/>
-                <signal pad-id="pc1" index="0" function="CCL_ALT" group="LUT1_OUT" field="PORTMUX.CTRLA.LUT1"/>
-                <signal pad-id="pa7" index="0" function="CCL" group="LUT1_OUT" field="PORTMUX.CTRLA.LUT1"/>
+                <signal pad-key="pa0" index="0" function="CCL" group="LUT0_IN"/>
+                <signal pad-key="pa1" index="1" function="CCL" group="LUT0_IN"/>
+                <signal pad-key="pa2" index="2" function="CCL" group="LUT0_IN"/>
+                <signal pad-key="pb4" index="0" function="CCL_ALT" group="LUT0_OUT" field="PORTMUX.CTRLA.LUT0"/>
+                <signal pad-key="pa4" index="0" function="CCL" group="LUT0_OUT" field="PORTMUX.CTRLA.LUT0"/>
+                <signal pad-key="pc3" index="0" function="CCL" group="LUT1_IN"/>
+                <signal pad-key="pc4" index="1" function="CCL" group="LUT1_IN"/>
+                <signal pad-key="pc5" index="2" function="CCL" group="LUT1_IN"/>
+                <signal pad-key="pc1" index="0" function="CCL_ALT" group="LUT1_OUT" field="PORTMUX.CTRLA.LUT1"/>
+                <signal pad-key="pa7" index="0" function="CCL" group="LUT1_OUT" field="PORTMUX.CTRLA.LUT1"/>
             </signals>
         </peripheral>
         <peripheral key="clkctrl" name="CLKCTRL" module-key="i2600_clkctrl">
             <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"/>
-                <signal pad-id="pb3" function="CLKCTRL" group="TOSC1"/>
-                <signal pad-id="pb2" function="CLKCTRL" group="TOSC2"/>
+                <signal pad-key="pa3" function="CLKCTRL" group="CLKI"/>
+                <signal pad-key="pb5" function="CLKCTRL" group="CLKO"/>
+                <signal pad-key="pb3" function="CLKCTRL" group="TOSC1"/>
+                <signal pad-key="pb2" function="CLKCTRL" group="TOSC2"/>
             </signals>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="i2100">
             <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"/>
+                <signal pad-key="pc4" function="BREAK_ALT" group="BREAK" field="PORTMUX.CTRLA.EXTBRK"/>
+                <signal pad-key="pa1" function="BREAK" group="BREAK" field="PORTMUX.CTRLA.EXTBRK"/>
             </signals>
         </peripheral>
         <peripheral key="cpuint" name="CPUINT" module-key="i2104">
@@ -111,59 +111,59 @@
         <peripheral key="dac0" name="DAC0" module-key="i2121">
             <register-group-instance register-group-key="dac" address-space-key="data" offset="0x680"/>
             <signals>
-                <signal pad-id="pa6" index="0" function="DAC0" group="OUT"/>
+                <signal pad-key="pa6" index="0" function="DAC0" group="OUT"/>
             </signals>
         </peripheral>
         <peripheral key="evsys" name="EVSYS" module-key="i2600_evsys">
             <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"/>
-                <signal pad-id="pa2" index="2" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
-                <signal pad-id="pa3" index="3" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
-                <signal pad-id="pa4" index="4" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
-                <signal pad-id="pa5" index="5" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
-                <signal pad-id="pa6" index="6" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
-                <signal pad-id="pa7" index="7" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
-                <signal pad-id="pb0" index="0" function="EVAINCH1" group="EVAPB" field="EVSYS.ASYNCCH1.ASYNCCH1"/>
-                <signal pad-id="pb1" index="1" function="EVAINCH1" group="EVAPB" field="EVSYS.ASYNCCH1.ASYNCCH1"/>
-                <signal pad-id="pb2" index="2" function="EVAINCH1" group="EVAPB" field="EVSYS.ASYNCCH1.ASYNCCH1"/>
-                <signal pad-id="pb3" index="3" function="EVAINCH1" group="EVAPB" field="EVSYS.ASYNCCH1.ASYNCCH1"/>
-                <signal pad-id="pb4" index="4" function="EVAINCH1" group="EVAPB" field="EVSYS.ASYNCCH1.ASYNCCH1"/>
-                <signal pad-id="pb5" index="5" function="EVAINCH1" group="EVAPB" field="EVSYS.ASYNCCH1.ASYNCCH1"/>
-                <signal pad-id="pb6" index="6" function="EVAINCH1" group="EVAPB" field="EVSYS.ASYNCCH1.ASYNCCH1"/>
-                <signal pad-id="pb7" index="7" function="EVAINCH1" group="EVAPB" field="EVSYS.ASYNCCH1.ASYNCCH1"/>
-                <signal pad-id="pc0" index="0" function="EVAINCH2" group="EVAPC" field="EVSYS.ASYNCCH2.ASYNCCH2"/>
-                <signal pad-id="pc1" index="1" function="EVAINCH2" group="EVAPC" field="EVSYS.ASYNCCH2.ASYNCCH2"/>
-                <signal pad-id="pc2" index="2" function="EVAINCH2" group="EVAPC" field="EVSYS.ASYNCCH2.ASYNCCH2"/>
-                <signal pad-id="pc3" index="3" function="EVAINCH2" group="EVAPC" field="EVSYS.ASYNCCH2.ASYNCCH2"/>
-                <signal pad-id="pc4" index="4" function="EVAINCH2" group="EVAPC" field="EVSYS.ASYNCCH2.ASYNCCH2"/>
-                <signal pad-id="pc5" index="5" function="EVAINCH2" group="EVAPC" field="EVSYS.ASYNCCH2.ASYNCCH2"/>
-                <signal pad-id="pa2" index="0" function="EVSYS" group="EVOUT" field="PORTMUX.CTRLA.EVOUT0"/>
-                <signal pad-id="pb2" index="1" function="EVSYS" group="EVOUT" field="PORTMUX.CTRLA.EVOUT1"/>
-                <signal pad-id="pc2" index="2" function="EVSYS" group="EVOUT" field="PORTMUX.CTRLA.EVOUT2"/>
-                <signal pad-id="pa0" index="0" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
-                <signal pad-id="pa1" index="1" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
-                <signal pad-id="pa2" index="2" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
-                <signal pad-id="pa3" index="3" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
-                <signal pad-id="pa4" index="4" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
-                <signal pad-id="pa5" index="5" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
-                <signal pad-id="pa6" index="6" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
-                <signal pad-id="pa7" index="7" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
-                <signal pad-id="pb0" index="0" function="EVSINCH1" group="EVSPB" field="EVSYS.SYNCCH1.SYNCCH1"/>
-                <signal pad-id="pb1" index="1" function="EVSINCH1" group="EVSPB" field="EVSYS.SYNCCH1.SYNCCH1"/>
-                <signal pad-id="pb2" index="2" function="EVSINCH1" group="EVSPB" field="EVSYS.SYNCCH1.SYNCCH1"/>
-                <signal pad-id="pb3" index="3" function="EVSINCH1" group="EVSPB" field="EVSYS.SYNCCH1.SYNCCH1"/>
-                <signal pad-id="pb4" index="4" function="EVSINCH1" group="EVSPB" field="EVSYS.SYNCCH1.SYNCCH1"/>
-                <signal pad-id="pb5" index="5" function="EVSINCH1" group="EVSPB" field="EVSYS.SYNCCH1.SYNCCH1"/>
-                <signal pad-id="pb6" index="6" function="EVSINCH1" group="EVSPB" field="EVSYS.SYNCCH1.SYNCCH1"/>
-                <signal pad-id="pb7" index="7" function="EVSINCH1" group="EVSPB" field="EVSYS.SYNCCH1.SYNCCH1"/>
-                <signal pad-id="pc0" index="0" function="EVSINCH0" group="EVSPC" field="EVSYS.SYNCCH0.SYNCCH0"/>
-                <signal pad-id="pc1" index="1" function="EVSINCH0" group="EVSPC" field="EVSYS.SYNCCH0.SYNCCH0"/>
-                <signal pad-id="pc2" index="2" function="EVSINCH0" group="EVSPC" field="EVSYS.SYNCCH0.SYNCCH0"/>
-                <signal pad-id="pc3" index="3" function="EVSINCH0" group="EVSPC" field="EVSYS.SYNCCH0.SYNCCH0"/>
-                <signal pad-id="pc4" index="4" function="EVSINCH0" group="EVSPC" field="EVSYS.SYNCCH0.SYNCCH0"/>
-                <signal pad-id="pc5" index="5" function="EVSINCH0" group="EVSPC" field="EVSYS.SYNCCH0.SYNCCH0"/>
+                <signal pad-key="pa0" index="0" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
+                <signal pad-key="pa1" index="1" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
+                <signal pad-key="pa2" index="2" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
+                <signal pad-key="pa3" index="3" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
+                <signal pad-key="pa4" index="4" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
+                <signal pad-key="pa5" index="5" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
+                <signal pad-key="pa6" index="6" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
+                <signal pad-key="pa7" index="7" function="EVAINCH0" group="EVAPA" field="EVSYS.ASYNCCH0.ASYNCCH0"/>
+                <signal pad-key="pb0" index="0" function="EVAINCH1" group="EVAPB" field="EVSYS.ASYNCCH1.ASYNCCH1"/>
+                <signal pad-key="pb1" index="1" function="EVAINCH1" group="EVAPB" field="EVSYS.ASYNCCH1.ASYNCCH1"/>
+                <signal pad-key="pb2" index="2" function="EVAINCH1" group="EVAPB" field="EVSYS.ASYNCCH1.ASYNCCH1"/>
+                <signal pad-key="pb3" index="3" function="EVAINCH1" group="EVAPB" field="EVSYS.ASYNCCH1.ASYNCCH1"/>
+                <signal pad-key="pb4" index="4" function="EVAINCH1" group="EVAPB" field="EVSYS.ASYNCCH1.ASYNCCH1"/>
+                <signal pad-key="pb5" index="5" function="EVAINCH1" group="EVAPB" field="EVSYS.ASYNCCH1.ASYNCCH1"/>
+                <signal pad-key="pb6" index="6" function="EVAINCH1" group="EVAPB" field="EVSYS.ASYNCCH1.ASYNCCH1"/>
+                <signal pad-key="pb7" index="7" function="EVAINCH1" group="EVAPB" field="EVSYS.ASYNCCH1.ASYNCCH1"/>
+                <signal pad-key="pc0" index="0" function="EVAINCH2" group="EVAPC" field="EVSYS.ASYNCCH2.ASYNCCH2"/>
+                <signal pad-key="pc1" index="1" function="EVAINCH2" group="EVAPC" field="EVSYS.ASYNCCH2.ASYNCCH2"/>
+                <signal pad-key="pc2" index="2" function="EVAINCH2" group="EVAPC" field="EVSYS.ASYNCCH2.ASYNCCH2"/>
+                <signal pad-key="pc3" index="3" function="EVAINCH2" group="EVAPC" field="EVSYS.ASYNCCH2.ASYNCCH2"/>
+                <signal pad-key="pc4" index="4" function="EVAINCH2" group="EVAPC" field="EVSYS.ASYNCCH2.ASYNCCH2"/>
+                <signal pad-key="pc5" index="5" function="EVAINCH2" group="EVAPC" field="EVSYS.ASYNCCH2.ASYNCCH2"/>
+                <signal pad-key="pa2" index="0" function="EVSYS" group="EVOUT" field="PORTMUX.CTRLA.EVOUT0"/>
+                <signal pad-key="pb2" index="1" function="EVSYS" group="EVOUT" field="PORTMUX.CTRLA.EVOUT1"/>
+                <signal pad-key="pc2" index="2" function="EVSYS" group="EVOUT" field="PORTMUX.CTRLA.EVOUT2"/>
+                <signal pad-key="pa0" index="0" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
+                <signal pad-key="pa1" index="1" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
+                <signal pad-key="pa2" index="2" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
+                <signal pad-key="pa3" index="3" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
+                <signal pad-key="pa4" index="4" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
+                <signal pad-key="pa5" index="5" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
+                <signal pad-key="pa6" index="6" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
+                <signal pad-key="pa7" index="7" function="EVSINCH0" group="EVSPA" field="EVSYS.SYNCCH0.SYNCCH0"/>
+                <signal pad-key="pb0" index="0" function="EVSINCH1" group="EVSPB" field="EVSYS.SYNCCH1.SYNCCH1"/>
+                <signal pad-key="pb1" index="1" function="EVSINCH1" group="EVSPB" field="EVSYS.SYNCCH1.SYNCCH1"/>
+                <signal pad-key="pb2" index="2" function="EVSINCH1" group="EVSPB" field="EVSYS.SYNCCH1.SYNCCH1"/>
+                <signal pad-key="pb3" index="3" function="EVSINCH1" group="EVSPB" field="EVSYS.SYNCCH1.SYNCCH1"/>
+                <signal pad-key="pb4" index="4" function="EVSINCH1" group="EVSPB" field="EVSYS.SYNCCH1.SYNCCH1"/>
+                <signal pad-key="pb5" index="5" function="EVSINCH1" group="EVSPB" field="EVSYS.SYNCCH1.SYNCCH1"/>
+                <signal pad-key="pb6" index="6" function="EVSINCH1" group="EVSPB" field="EVSYS.SYNCCH1.SYNCCH1"/>
+                <signal pad-key="pb7" index="7" function="EVSINCH1" group="EVSPB" field="EVSYS.SYNCCH1.SYNCCH1"/>
+                <signal pad-key="pc0" index="0" function="EVSINCH0" group="EVSPC" field="EVSYS.SYNCCH0.SYNCCH0"/>
+                <signal pad-key="pc1" index="1" function="EVSINCH0" group="EVSPC" field="EVSYS.SYNCCH0.SYNCCH0"/>
+                <signal pad-key="pc2" index="2" function="EVSINCH0" group="EVSPC" field="EVSYS.SYNCCH0.SYNCCH0"/>
+                <signal pad-key="pc3" index="3" function="EVSINCH0" group="EVSPC" field="EVSYS.SYNCCH0.SYNCCH0"/>
+                <signal pad-key="pc4" index="4" function="EVSINCH0" group="EVSPC" field="EVSYS.SYNCCH0.SYNCCH0"/>
+                <signal pad-key="pc5" index="5" function="EVSINCH0" group="EVSPC" field="EVSYS.SYNCCH0.SYNCCH0"/>
             </signals>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="i2600_fuse">
@@ -181,38 +181,38 @@
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pa2" index="2" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa3" index="3" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa4" index="4" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa5" index="5" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa6" index="6" function="IOPORT" group="PIN"/>
-                <signal pad-id="pa7" index="7" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa0" index="0" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa1" index="1" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa2" index="2" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa3" index="3" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa4" index="4" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa5" index="5" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa6" index="6" function="IOPORT" group="PIN"/>
+                <signal pad-key="pa7" index="7" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pb2" index="2" function="IOPORT" group="PIN"/>
-                <signal pad-id="pb3" index="3" function="IOPORT" group="PIN"/>
-                <signal pad-id="pb4" index="4" function="IOPORT" group="PIN"/>
-                <signal pad-id="pb5" index="5" function="IOPORT" group="PIN"/>
-                <signal pad-id="pb6" index="6" function="IOPORT" group="PIN"/>
-                <signal pad-id="pb7" index="7" function="IOPORT" group="PIN"/>
+                <signal pad-key="pb0" index="0" function="IOPORT" group="PIN"/>
+                <signal pad-key="pb1" index="1" function="IOPORT" group="PIN"/>
+                <signal pad-key="pb2" index="2" function="IOPORT" group="PIN"/>
+                <signal pad-key="pb3" index="3" function="IOPORT" group="PIN"/>
+                <signal pad-key="pb4" index="4" function="IOPORT" group="PIN"/>
+                <signal pad-key="pb5" index="5" function="IOPORT" group="PIN"/>
+                <signal pad-key="pb6" index="6" function="IOPORT" group="PIN"/>
+                <signal pad-key="pb7" index="7" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pc2" index="2" function="IOPORT" group="PIN"/>
-                <signal pad-id="pc3" index="3" function="IOPORT" group="PIN"/>
-                <signal pad-id="pc4" index="4" function="IOPORT" group="PIN"/>
-                <signal pad-id="pc5" index="5" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc0" index="0" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc1" index="1" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc2" index="2" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc3" index="3" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc4" index="4" function="IOPORT" group="PIN"/>
+                <signal pad-key="pc5" index="5" function="IOPORT" group="PIN"/>
             </signals>
         </peripheral>
         <peripheral key="portmux" name="PORTMUX" module-key="i2600_portmux">
@@ -220,26 +220,26 @@
         </peripheral>
         <peripheral key="ptc" name="PTC" module-key="i2120">
             <signals>
-                <signal pad-id="pb2" index="0" function="PTC_DS" group="DS"/>
-                <signal pad-id="pb4" index="1" function="PTC_DS" group="DS"/>
-                <signal pad-id="pa4" index="0" function="PTC_X" group="X"/>
-                <signal pad-id="pa5" index="1" function="PTC_X" group="X"/>
-                <signal pad-id="pa6" index="2" function="PTC_X" group="X"/>
-                <signal pad-id="pa7" index="3" function="PTC_X" group="X"/>
-                <signal pad-id="pb1" index="4" function="PTC_X" group="X"/>
-                <signal pad-id="pb0" index="5" function="PTC_X" group="X"/>
-                <signal pad-id="pa4" index="0" function="PTC_Y" group="Y"/>
-                <signal pad-id="pa5" index="1" function="PTC_Y" group="Y"/>
-                <signal pad-id="pa6" index="2" function="PTC_Y" group="Y"/>
-                <signal pad-id="pa7" index="3" function="PTC_Y" group="Y"/>
-                <signal pad-id="pb1" index="4" function="PTC_Y" group="Y"/>
-                <signal pad-id="pb0" index="5" function="PTC_Y" group="Y"/>
+                <signal pad-key="pb2" index="0" function="PTC_DS" group="DS"/>
+                <signal pad-key="pb4" index="1" function="PTC_DS" group="DS"/>
+                <signal pad-key="pa4" index="0" function="PTC_X" group="X"/>
+                <signal pad-key="pa5" index="1" function="PTC_X" group="X"/>
+                <signal pad-key="pa6" index="2" function="PTC_X" group="X"/>
+                <signal pad-key="pa7" index="3" function="PTC_X" group="X"/>
+                <signal pad-key="pb1" index="4" function="PTC_X" group="X"/>
+                <signal pad-key="pb0" index="5" function="PTC_X" group="X"/>
+                <signal pad-key="pa4" index="0" function="PTC_Y" group="Y"/>
+                <signal pad-key="pa5" index="1" function="PTC_Y" group="Y"/>
+                <signal pad-key="pa6" index="2" function="PTC_Y" group="Y"/>
+                <signal pad-key="pa7" index="3" function="PTC_Y" group="Y"/>
+                <signal pad-key="pb1" index="4" function="PTC_Y" group="Y"/>
+                <signal pad-key="pb0" index="5" function="PTC_Y" group="Y"/>
             </signals>
         </peripheral>
         <peripheral key="rstctrl" name="RSTCTRL" module-key="i2111">
             <register-group-instance register-group-key="rstctrl" address-space-key="data" offset="0x40"/>
             <signals>
-                <signal pad-id="pa0" function="OTHER" group="RESET"/>
+                <signal pad-key="pa0" function="OTHER" group="RESET"/>
             </signals>
         </peripheral>
         <peripheral key="rtc" name="RTC" module-key="i2116">
@@ -254,75 +254,75 @@
         <peripheral key="spi0" name="SPI0" module-key="i2107">
             <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"/>
-                <signal pad-id="pc2" function="SPI0_ALT" group="MOSI" field="PORTMUX.CTRLB.SPI0"/>
-                <signal pad-id="pa1" function="SPI0" group="MOSI" field="PORTMUX.CTRLB.SPI0"/>
-                <signal pad-id="pc0" function="SPI0_ALT" group="SCK" field="PORTMUX.CTRLB.SPI0"/>
-                <signal pad-id="pa3" function="SPI0" group="SCK" field="PORTMUX.CTRLB.SPI0"/>
-                <signal pad-id="pc3" function="SPI0_ALT" group="SS" field="PORTMUX.CTRLB.SPI0"/>
-                <signal pad-id="pa4" function="SPI0" group="SS" field="PORTMUX.CTRLB.SPI0"/>
+                <signal pad-key="pc1" function="SPI0_ALT" group="MISO" field="PORTMUX.CTRLB.SPI0"/>
+                <signal pad-key="pa2" function="SPI0" group="MISO" field="PORTMUX.CTRLB.SPI0"/>
+                <signal pad-key="pc2" function="SPI0_ALT" group="MOSI" field="PORTMUX.CTRLB.SPI0"/>
+                <signal pad-key="pa1" function="SPI0" group="MOSI" field="PORTMUX.CTRLB.SPI0"/>
+                <signal pad-key="pc0" function="SPI0_ALT" group="SCK" field="PORTMUX.CTRLB.SPI0"/>
+                <signal pad-key="pa3" function="SPI0" group="SCK" field="PORTMUX.CTRLB.SPI0"/>
+                <signal pad-key="pc3" function="SPI0_ALT" group="SS" field="PORTMUX.CTRLB.SPI0"/>
+                <signal pad-key="pa4" function="SPI0" group="SS" field="PORTMUX.CTRLB.SPI0"/>
             </signals>
         </peripheral>
         <peripheral key="syscfg" name="SYSCFG" module-key="i2600_syscfg">
             <register-group-instance register-group-key="syscfg" address-space-key="data" offset="0xF00"/>
             <signals>
-                <signal pad-id="pa0" function="OTHER" group="UPDI"/>
+                <signal pad-key="pa0" function="OTHER" group="UPDI"/>
             </signals>
         </peripheral>
         <peripheral key="tca0" name="TCA0" module-key="i2117">
             <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"/>
-                <signal pad-id="pb4" index="1" function="TCA0_ALT" group="WO" field="PORTMUX.CTRLC.TCA01"/>
-                <signal pad-id="pb1" index="1" function="TCA0" group="WO" field="PORTMUX.CTRLC.TCA01"/>
-                <signal pad-id="pb5" index="2" function="TCA0_ALT" group="WO" field="PORTMUX.CTRLC.TCA02"/>
-                <signal pad-id="pb2" index="2" function="TCA0" group="WO" field="PORTMUX.CTRLC.TCA02"/>
-                <signal pad-id="pc3" index="3" function="TCA0_ALT" group="WO" field="PORTMUX.CTRLC.TCA03"/>
-                <signal pad-id="pa3" index="3" function="TCA0" group="WO" field="PORTMUX.CTRLC.TCA03"/>
-                <signal pad-id="pc4" index="4" function="TCA0_ALT" group="WO" field="PORTMUX.CTRLC.TCA04"/>
-                <signal pad-id="pa4" index="4" function="TCA0" group="WO" field="PORTMUX.CTRLC.TCA04"/>
-                <signal pad-id="pc5" index="5" function="TCA0_ALT" group="WO" field="PORTMUX.CTRLC.TCA05"/>
-                <signal pad-id="pa5" index="5" function="TCA0" group="WO" field="PORTMUX.CTRLC.TCA05"/>
+                <signal pad-key="pb3" index="0" function="TCA0_ALT" group="WO" field="PORTMUX.CTRLC.TCA00"/>
+                <signal pad-key="pb0" index="0" function="TCA0" group="WO" field="PORTMUX.CTRLC.TCA00"/>
+                <signal pad-key="pb4" index="1" function="TCA0_ALT" group="WO" field="PORTMUX.CTRLC.TCA01"/>
+                <signal pad-key="pb1" index="1" function="TCA0" group="WO" field="PORTMUX.CTRLC.TCA01"/>
+                <signal pad-key="pb5" index="2" function="TCA0_ALT" group="WO" field="PORTMUX.CTRLC.TCA02"/>
+                <signal pad-key="pb2" index="2" function="TCA0" group="WO" field="PORTMUX.CTRLC.TCA02"/>
+                <signal pad-key="pc3" index="3" function="TCA0_ALT" group="WO" field="PORTMUX.CTRLC.TCA03"/>
+                <signal pad-key="pa3" index="3" function="TCA0" group="WO" field="PORTMUX.CTRLC.TCA03"/>
+                <signal pad-key="pc4" index="4" function="TCA0_ALT" group="WO" field="PORTMUX.CTRLC.TCA04"/>
+                <signal pad-key="pa4" index="4" function="TCA0" group="WO" field="PORTMUX.CTRLC.TCA04"/>
+                <signal pad-key="pc5" index="5" function="TCA0_ALT" group="WO" field="PORTMUX.CTRLC.TCA05"/>
+                <signal pad-key="pa5" index="5" function="TCA0" group="WO" field="PORTMUX.CTRLC.TCA05"/>
             </signals>
         </peripheral>
         <peripheral key="tcb0" name="TCB0" module-key="i2119">
             <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"/>
+                <signal pad-key="pc0" index="0" function="TCB0_ALT" group="WO" field="PORTMUX.CTRLD.TCB0"/>
+                <signal pad-key="pa5" index="0" function="TCB0" group="WO" field="PORTMUX.CTRLD.TCB0"/>
             </signals>
         </peripheral>
         <peripheral key="tcd0" name="TCD0" module-key="i2129">
             <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"/>
-                <signal pad-id="pc0" function="TCD0" group="WOC"/>
-                <signal pad-id="pc1" function="TCD0" group="WOD"/>
+                <signal pad-key="pa4" function="TCD0" group="WOA"/>
+                <signal pad-key="pa5" function="TCD0" group="WOB"/>
+                <signal pad-key="pc0" function="TCD0" group="WOC"/>
+                <signal pad-key="pc1" function="TCD0" group="WOD"/>
             </signals>
         </peripheral>
         <peripheral key="twi0" name="TWI0" module-key="i2110">
             <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"/>
-                <signal pad-id="pa1" function="TWI0_ALT" group="SDA" field="PORTMUX.CTRLB.TWI0"/>
-                <signal pad-id="pb1" function="TWI0" group="SDA" field="PORTMUX.CTRLB.TWI0"/>
+                <signal pad-key="pa2" function="TWI0_ALT" group="SCL" field="PORTMUX.CTRLB.TWI0"/>
+                <signal pad-key="pb0" function="TWI0" group="SCL" field="PORTMUX.CTRLB.TWI0"/>
+                <signal pad-key="pa1" function="TWI0_ALT" group="SDA" field="PORTMUX.CTRLB.TWI0"/>
+                <signal pad-key="pb1" function="TWI0" group="SDA" field="PORTMUX.CTRLB.TWI0"/>
             </signals>
         </peripheral>
         <peripheral key="usart0" name="USART0" module-key="i2108">
             <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"/>
-                <signal pad-id="pa1" function="USART0_ALT" group="TXD" field="PORTMUX.CTRLB.USART0"/>
-                <signal pad-id="pb2" function="USART0" group="TXD" field="PORTMUX.CTRLB.USART0"/>
-                <signal pad-id="pa3" function="USART0_ALT" group="XCK" field="PORTMUX.CTRLB.USART0"/>
-                <signal pad-id="pb1" function="USART0" group="XCK" field="PORTMUX.CTRLB.USART0"/>
-                <signal pad-id="pa4" function="USART0_ALT" group="XDIR" field="PORTMUX.CTRLB.USART0"/>
-                <signal pad-id="pb0" function="USART0" group="XDIR" field="PORTMUX.CTRLB.USART0"/>
+                <signal pad-key="pa2" function="USART0_ALT" group="RXD" field="PORTMUX.CTRLB.USART0"/>
+                <signal pad-key="pb3" function="USART0" group="RXD" field="PORTMUX.CTRLB.USART0"/>
+                <signal pad-key="pa1" function="USART0_ALT" group="TXD" field="PORTMUX.CTRLB.USART0"/>
+                <signal pad-key="pb2" function="USART0" group="TXD" field="PORTMUX.CTRLB.USART0"/>
+                <signal pad-key="pa3" function="USART0_ALT" group="XCK" field="PORTMUX.CTRLB.USART0"/>
+                <signal pad-key="pb1" function="USART0" group="XCK" field="PORTMUX.CTRLB.USART0"/>
+                <signal pad-key="pa4" function="USART0_ALT" group="XDIR" field="PORTMUX.CTRLB.USART0"/>
+                <signal pad-key="pb0" function="USART0" group="XDIR" field="PORTMUX.CTRLB.USART0"/>
             </signals>
         </peripheral>
         <peripheral key="userrow" name="USERROW" module-key="i2600_userrow">
@@ -1389,37 +1389,63 @@
             </register-group>
         </module>
     </modules>
+    <pads>
+        <pad key="pa2" name="PA2"/>
+        <pad key="pa3" name="PA3"/>
+        <pad key="gnd" name="GND"/>
+        <pad key="vdd" name="VDD"/>
+        <pad key="pa4" name="PA4"/>
+        <pad key="pa5" name="PA5"/>
+        <pad key="pa6" name="PA6"/>
+        <pad key="pa7" name="PA7"/>
+        <pad key="pb7" name="PB7"/>
+        <pad key="pb6" name="PB6"/>
+        <pad key="pb5" name="PB5"/>
+        <pad key="pb4" name="PB4"/>
+        <pad key="pb3" name="PB3"/>
+        <pad key="pb2" name="PB2"/>
+        <pad key="pb1" name="PB1"/>
+        <pad key="pb0" name="PB0"/>
+        <pad key="pc0" name="PC0"/>
+        <pad key="pc1" name="PC1"/>
+        <pad key="pc2" name="PC2"/>
+        <pad key="pc3" name="PC3"/>
+        <pad key="pc4" name="PC4"/>
+        <pad key="pc5" name="PC5"/>
+        <pad key="pa0" name="PA0"/>
+        <pad key="pa1" name="PA1"/>
+    </pads>
     <pinouts>
         <pinout key="qfn24" name="QFN24" type="qfn">
-            <pin position="1" pad="PA2"/>
-            <pin position="2" pad="PA3"/>
-            <pin position="3" pad="GND"/>
-            <pin position="4" pad="VDD"/>
-            <pin position="5" pad="PA4"/>
-            <pin position="6" pad="PA5"/>
-            <pin position="7" pad="PA6"/>
-            <pin position="8" pad="PA7"/>
-            <pin position="9" pad="PB7"/>
-            <pin position="10" pad="PB6"/>
-            <pin position="11" pad="PB5"/>
-            <pin position="12" pad="PB4"/>
-            <pin position="13" pad="PB3"/>
-            <pin position="14" pad="PB2"/>
-            <pin position="15" pad="PB1"/>
-            <pin position="16" pad="PB0"/>
-            <pin position="17" pad="PC0"/>
-            <pin position="18" pad="PC1"/>
-            <pin position="19" pad="PC2"/>
-            <pin position="20" pad="PC3"/>
-            <pin position="21" pad="PC4"/>
-            <pin position="22" pad="PC5"/>
-            <pin position="23" pad="PA0"/>
-            <pin position="24" pad="PA1"/>
+            <pin position="1" pad-key="pa2"/>
+            <pin position="2" pad-key="pa3"/>
+            <pin position="3" pad-key="gnd"/>
+            <pin position="4" pad-key="vdd"/>
+            <pin position="5" pad-key="pa4"/>
+            <pin position="6" pad-key="pa5"/>
+            <pin position="7" pad-key="pa6"/>
+            <pin position="8" pad-key="pa7"/>
+            <pin position="9" pad-key="pb7"/>
+            <pin position="10" pad-key="pb6"/>
+            <pin position="11" pad-key="pb5"/>
+            <pin position="12" pad-key="pb4"/>
+            <pin position="13" pad-key="pb3"/>
+            <pin position="14" pad-key="pb2"/>
+            <pin position="15" pad-key="pb1"/>
+            <pin position="16" pad-key="pb0"/>
+            <pin position="17" pad-key="pc0"/>
+            <pin position="18" pad-key="pc1"/>
+            <pin position="19" pad-key="pc2"/>
+            <pin position="20" pad-key="pc3"/>
+            <pin position="21" pad-key="pc4"/>
+            <pin position="22" pad-key="pc5"/>
+            <pin position="23" pad-key="pa0"/>
+            <pin position="24" pad-key="pa1"/>
         </pinout>
     </pinouts>
     <variants>
-        <variant name="ATtiny817-MFR" pinout-key="qfn24" package="VQFN24"/>
-        <variant name="ATtiny817-MNR" pinout-key="qfn24" package="VQFN24"/>
-        <variant name="ATtiny817-MNRES" pinout-key="qfn24" package="VQFN24"/>
+        <variant key="attiny817_mfr" name="ATtiny817-MFR" pinout-key="qfn24"/>
+        <variant key="attiny817_mnr" name="ATtiny817-MNR" pinout-key="qfn24"/>
+        <variant key="attiny817_mnres" name="ATtiny817-MNRES" pinout-key="qfn24"/>
     </variants>
 </device>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY828.xml b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY828.xml
index 0558621d..f1d65c80 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY828.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY828.xml
@@ -175,49 +175,49 @@
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pa2" index="2" function="PORTA" group="P"/>
-                <signal pad-id="pa3" index="3" function="PORTA" group="P"/>
-                <signal pad-id="pa4" index="4" function="PORTA" group="P"/>
-                <signal pad-id="pa5" index="5" function="PORTA" group="P"/>
-                <signal pad-id="pa6" index="6" function="PORTA" group="P"/>
-                <signal pad-id="pa7" index="7" function="PORTA" group="P"/>
+                <signal pad-key="pa0" index="0" function="PORTA" group="P"/>
+                <signal pad-key="pa1" index="1" function="PORTA" group="P"/>
+                <signal pad-key="pa2" index="2" function="PORTA" group="P"/>
+                <signal pad-key="pa3" index="3" function="PORTA" group="P"/>
+                <signal pad-key="pa4" index="4" function="PORTA" group="P"/>
+                <signal pad-key="pa5" index="5" function="PORTA" group="P"/>
+                <signal pad-key="pa6" index="6" function="PORTA" group="P"/>
+                <signal pad-key="pa7" index="7" function="PORTA" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pb2" index="2" function="PORTB" group="P"/>
-                <signal pad-id="pb3" index="3" function="PORTB" group="P"/>
-                <signal pad-id="pb4" index="4" function="PORTB" group="P"/>
-                <signal pad-id="pb5" index="5" function="PORTB" group="P"/>
-                <signal pad-id="pb6" index="6" function="PORTB" group="P"/>
-                <signal pad-id="pb7" index="7" function="PORTB" group="P"/>
+                <signal pad-key="pb0" index="0" function="PORTB" group="P"/>
+                <signal pad-key="pb1" index="1" function="PORTB" group="P"/>
+                <signal pad-key="pb2" index="2" function="PORTB" group="P"/>
+                <signal pad-key="pb3" index="3" function="PORTB" group="P"/>
+                <signal pad-key="pb4" index="4" function="PORTB" group="P"/>
+                <signal pad-key="pb5" index="5" function="PORTB" group="P"/>
+                <signal pad-key="pb6" index="6" function="PORTB" group="P"/>
+                <signal pad-key="pb7" index="7" function="PORTB" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pc2" index="2" function="PORTC" group="P"/>
-                <signal pad-id="pc3" index="3" function="PORTC" group="P"/>
-                <signal pad-id="pc4" index="4" function="PORTC" group="P"/>
-                <signal pad-id="pc5" index="5" function="PORTC" group="P"/>
-                <signal pad-id="pc6" index="6" function="PORTC" group="P"/>
-                <signal pad-id="pc7" index="7" function="PORTC" group="P"/>
+                <signal pad-key="pc0" index="0" function="PORTC" group="P"/>
+                <signal pad-key="pc1" index="1" function="PORTC" group="P"/>
+                <signal pad-key="pc2" index="2" function="PORTC" group="P"/>
+                <signal pad-key="pc3" index="3" function="PORTC" group="P"/>
+                <signal pad-key="pc4" index="4" function="PORTC" group="P"/>
+                <signal pad-key="pc5" index="5" function="PORTC" group="P"/>
+                <signal pad-key="pc6" index="6" function="PORTC" group="P"/>
+                <signal pad-key="pc7" index="7" function="PORTC" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pd2" index="2" function="PORTD" group="P"/>
-                <signal pad-id="pd3" index="3" function="PORTD" group="P"/>
+                <signal pad-key="pd0" index="0" function="PORTD" group="P"/>
+                <signal pad-key="pd1" index="1" function="PORTD" group="P"/>
+                <signal pad-key="pd2" index="2" function="PORTD" group="P"/>
+                <signal pad-key="pd3" index="3" function="PORTD" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="cpu">
@@ -704,44 +704,77 @@
             </register-group>
         </module>
     </modules>
+    <pads>
+        <pad key="pc2" name="PC2"/>
+        <pad key="pc3" name="PC3"/>
+        <pad key="pc4" name="PC4"/>
+        <pad key="vcc" name="VCC"/>
+        <pad key="gnd" name="GND"/>
+        <pad key="pc5" name="PC5"/>
+        <pad key="pc6" name="PC6"/>
+        <pad key="pc7" name="PC7"/>
+        <pad key="pa0" name="PA0"/>
+        <pad key="pa1" name="PA1"/>
+        <pad key="pa2" name="PA2"/>
+        <pad key="pa3" name="PA3"/>
+        <pad key="pa4" name="PA4"/>
+        <pad key="pa5" name="PA5"/>
+        <pad key="pa6" name="PA6"/>
+        <pad key="pa7" name="PA7"/>
+        <pad key="pb0" name="PB0"/>
+        <pad key="avcc" name="AVCC"/>
+        <pad key="pb1" name="PB1"/>
+        <pad key="pb2" name="PB2"/>
+        <pad key="pb3" name="PB3"/>
+        <pad key="pb4" name="PB4"/>
+        <pad key="pb5" name="PB5"/>
+        <pad key="pb6" name="PB6"/>
+        <pad key="pb7" name="PB7"/>
+        <pad key="pd0" name="PD0"/>
+        <pad key="pd1" name="PD1"/>
+        <pad key="pd2" name="PD2"/>
+        <pad key="pd3" name="PD3"/>
+        <pad key="pc0" name="PC0"/>
+        <pad key="pc1" name="PC1"/>
+    </pads>
     <pinouts>
         <pinout key="qfp_qfn_32" name="QFP_QFN_32" type="qfn">
-            <pin position="1" pad="PC2"/>
-            <pin position="2" pad="PC3"/>
-            <pin position="3" pad="PC4"/>
-            <pin position="4" pad="VCC"/>
-            <pin position="5" pad="GND"/>
-            <pin position="6" pad="PC5"/>
-            <pin position="7" pad="PC6"/>
-            <pin position="8" pad="PC7"/>
-            <pin position="9" pad="PA0"/>
-            <pin position="10" pad="PA1"/>
-            <pin position="11" pad="PA2"/>
-            <pin position="12" pad="PA3"/>
-            <pin position="13" pad="PA4"/>
-            <pin position="14" pad="PA5"/>
-            <pin position="15" pad="PA6"/>
-            <pin position="16" pad="PA7"/>
-            <pin position="17" pad="PB0"/>
-            <pin position="18" pad="AVCC"/>
-            <pin position="19" pad="PB1"/>
-            <pin position="20" pad="PB2"/>
-            <pin position="21" pad="GND"/>
-            <pin position="22" pad="PB3"/>
-            <pin position="23" pad="PB4"/>
-            <pin position="24" pad="PB5"/>
-            <pin position="25" pad="PB6"/>
-            <pin position="26" pad="PB7"/>
-            <pin position="27" pad="PD0"/>
-            <pin position="28" pad="PD1"/>
-            <pin position="29" pad="PD2"/>
-            <pin position="30" pad="PD3"/>
-            <pin position="31" pad="PC0"/>
-            <pin position="32" pad="PC1"/>
+            <pin position="1" pad-key="pc2"/>
+            <pin position="2" pad-key="pc3"/>
+            <pin position="3" pad-key="pc4"/>
+            <pin position="4" pad-key="vcc"/>
+            <pin position="5" pad-key="gnd"/>
+            <pin position="6" pad-key="pc5"/>
+            <pin position="7" pad-key="pc6"/>
+            <pin position="8" pad-key="pc7"/>
+            <pin position="9" pad-key="pa0"/>
+            <pin position="10" pad-key="pa1"/>
+            <pin position="11" pad-key="pa2"/>
+            <pin position="12" pad-key="pa3"/>
+            <pin position="13" pad-key="pa4"/>
+            <pin position="14" pad-key="pa5"/>
+            <pin position="15" pad-key="pa6"/>
+            <pin position="16" pad-key="pa7"/>
+            <pin position="17" pad-key="pb0"/>
+            <pin position="18" pad-key="avcc"/>
+            <pin position="19" pad-key="pb1"/>
+            <pin position="20" pad-key="pb2"/>
+            <pin position="21" pad-key="gnd"/>
+            <pin position="22" pad-key="pb3"/>
+            <pin position="23" pad-key="pb4"/>
+            <pin position="24" pad-key="pb5"/>
+            <pin position="25" pad-key="pb6"/>
+            <pin position="26" pad-key="pb7"/>
+            <pin position="27" pad-key="pd0"/>
+            <pin position="28" pad-key="pd1"/>
+            <pin position="29" pad-key="pd2"/>
+            <pin position="30" pad-key="pd3"/>
+            <pin position="31" pad-key="pc0"/>
+            <pin position="32" pad-key="pc1"/>
         </pinout>
     </pinouts>
     <variants>
-        <variant name="ATtiny828-MU" pinout-key="qfp_qfn_32" package="VQFN32"/>
-        <variant name="ATtiny828-AU" pinout-key="qfp_qfn_32" package="TQFP32"/>
+        <variant key="attiny828_mu" name="ATtiny828-MU" pinout-key="qfp_qfn_32"/>
+        <variant key="attiny828_au" name="ATtiny828-AU" pinout-key="qfp_qfn_32"/>
     </variants>
 </device>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY84.xml b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY84.xml
index b3f00176..21ec1599 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY84.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY84.xml
@@ -170,23 +170,23 @@
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pa2" index="2" function="PORTA" group="P"/>
-                <signal pad-id="pa3" index="3" function="PORTA" group="P"/>
-                <signal pad-id="pa4" index="4" function="PORTA" group="P"/>
-                <signal pad-id="pa5" index="5" function="PORTA" group="P"/>
-                <signal pad-id="pa6" index="6" function="PORTA" group="P"/>
-                <signal pad-id="pa7" index="7" function="PORTA" group="P"/>
+                <signal pad-key="pa0" index="0" function="PORTA" group="P"/>
+                <signal pad-key="pa1" index="1" function="PORTA" group="P"/>
+                <signal pad-key="pa2" index="2" function="PORTA" group="P"/>
+                <signal pad-key="pa3" index="3" function="PORTA" group="P"/>
+                <signal pad-key="pa4" index="4" function="PORTA" group="P"/>
+                <signal pad-key="pa5" index="5" function="PORTA" group="P"/>
+                <signal pad-key="pa6" index="6" function="PORTA" group="P"/>
+                <signal pad-key="pa7" index="7" function="PORTA" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pb2" index="2" function="PORTB" group="P"/>
-                <signal pad-id="pb3" index="3" function="PORTB" group="P"/>
+                <signal pad-key="pb0" index="0" function="PORTB" group="P"/>
+                <signal pad-key="pb1" index="1" function="PORTB" group="P"/>
+                <signal pad-key="pb2" index="2" function="PORTB" group="P"/>
+                <signal pad-key="pb3" index="3" function="PORTB" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="ac" name="AC" module-key="ac">
@@ -490,67 +490,83 @@
             </register-group>
         </module>
     </modules>
+    <pads>
+        <pad key="vcc" name="VCC"/>
+        <pad key="pb0" name="PB0"/>
+        <pad key="pb1" name="PB1"/>
+        <pad key="pb3" name="PB3"/>
+        <pad key="pb2" name="PB2"/>
+        <pad key="pa7" name="PA7"/>
+        <pad key="pa6" name="PA6"/>
+        <pad key="pa5" name="PA5"/>
+        <pad key="pa4" name="PA4"/>
+        <pad key="pa3" name="PA3"/>
+        <pad key="pa2" name="PA2"/>
+        <pad key="pa1" name="PA1"/>
+        <pad key="pa0" name="PA0"/>
+        <pad key="gnd" name="GND"/>
+    </pads>
     <pinouts>
         <pinout key="soic_14" name="SOIC_14" type="soic">
-            <pin position="1" pad="VCC"/>
-            <pin position="2" pad="PB0"/>
-            <pin position="3" pad="PB1"/>
-            <pin position="4" pad="PB3"/>
-            <pin position="5" pad="PB2"/>
-            <pin position="6" pad="PA7"/>
-            <pin position="7" pad="PA6"/>
-            <pin position="8" pad="PA5"/>
-            <pin position="9" pad="PA4"/>
-            <pin position="10" pad="PA3"/>
-            <pin position="11" pad="PA2"/>
-            <pin position="12" pad="PA1"/>
-            <pin position="13" pad="PA0"/>
-            <pin position="14" pad="GND"/>
+            <pin position="1" pad-key="vcc"/>
+            <pin position="2" pad-key="pb0"/>
+            <pin position="3" pad-key="pb1"/>
+            <pin position="4" pad-key="pb3"/>
+            <pin position="5" pad-key="pb2"/>
+            <pin position="6" pad-key="pa7"/>
+            <pin position="7" pad-key="pa6"/>
+            <pin position="8" pad-key="pa5"/>
+            <pin position="9" pad-key="pa4"/>
+            <pin position="10" pad-key="pa3"/>
+            <pin position="11" pad-key="pa2"/>
+            <pin position="12" pad-key="pa1"/>
+            <pin position="13" pad-key="pa0"/>
+            <pin position="14" pad-key="gnd"/>
         </pinout>
         <pinout key="qfn_20" name="QFN_20" type="qfn">
-            <pin position="1" pad="PA4"/>
-            <pin position="2" pad="PA3"/>
-            <pin position="3" pad="PA2"/>
-            <pin position="4" pad="PA1"/>
-            <pin position="5" pad="PA0"/>
-            <pin position="6" pad="NC"/>
-            <pin position="7" pad="NC"/>
-            <pin position="8" pad="GND"/>
-            <pin position="9" pad="VCC"/>
-            <pin position="10" pad="NC"/>
-            <pin position="11" pad="PB0"/>
-            <pin position="12" pad="PB1"/>
-            <pin position="13" pad="PB3"/>
-            <pin position="14" pad="PB2"/>
-            <pin position="15" pad="PA7"/>
-            <pin position="16" pad="PA6"/>
-            <pin position="17" pad="NC"/>
-            <pin position="18" pad="NC"/>
-            <pin position="19" pad="NC"/>
-            <pin position="20" pad="PA5"/>
+            <pin position="1" pad-key="pa4"/>
+            <pin position="2" pad-key="pa3"/>
+            <pin position="3" pad-key="pa2"/>
+            <pin position="4" pad-key="pa1"/>
+            <pin position="5" pad-key="pa0"/>
+            <pin position="6"/>
+            <pin position="7"/>
+            <pin position="8" pad-key="gnd"/>
+            <pin position="9" pad-key="vcc"/>
+            <pin position="10"/>
+            <pin position="11" pad-key="pb0"/>
+            <pin position="12" pad-key="pb1"/>
+            <pin position="13" pad-key="pb3"/>
+            <pin position="14" pad-key="pb2"/>
+            <pin position="15" pad-key="pa7"/>
+            <pin position="16" pad-key="pa6"/>
+            <pin position="17"/>
+            <pin position="18"/>
+            <pin position="19"/>
+            <pin position="20" pad-key="pa5"/>
         </pinout>
         <pinout key="bga_16" name="BGA_16" type="bga">
-            <pin position="A1" pad="NC"/>
-            <pin position="A2" pad="PA5"/>
-            <pin position="A3" pad="PA6"/>
-            <pin position="A4" pad="PB2"/>
-            <pin position="B1" pad="PA4"/>
-            <pin position="B2" pad="PA7"/>
-            <pin position="B3" pad="PB1"/>
-            <pin position="B4" pad="PB3"/>
-            <pin position="C1" pad="PA3"/>
-            <pin position="C2" pad="PA2"/>
-            <pin position="C3" pad="PA1"/>
-            <pin position="C4" pad="PB0"/>
-            <pin position="D1" pad="PA0"/>
-            <pin position="D2" pad="GND"/>
-            <pin position="D3" pad="GND"/>
-            <pin position="D4" pad="VCC"/>
+            <pin position="A1"/>
+            <pin position="A2" pad-key="pa5"/>
+            <pin position="A3" pad-key="pa6"/>
+            <pin position="A4" pad-key="pb2"/>
+            <pin position="B1" pad-key="pa4"/>
+            <pin position="B2" pad-key="pa7"/>
+            <pin position="B3" pad-key="pb1"/>
+            <pin position="B4" pad-key="pb3"/>
+            <pin position="C1" pad-key="pa3"/>
+            <pin position="C2" pad-key="pa2"/>
+            <pin position="C3" pad-key="pa1"/>
+            <pin position="C4" pad-key="pb0"/>
+            <pin position="D1" pad-key="pa0"/>
+            <pin position="D2" pad-key="gnd"/>
+            <pin position="D3" pad-key="gnd"/>
+            <pin position="D4" pad-key="vcc"/>
         </pinout>
     </pinouts>
     <variants>
-        <variant name="ATtiny84-20PU" pinout-key="soic_14" package="PDIP14"/>
-        <variant name="ATtiny84V-10SSU" pinout-key="soic_14" package="SOIC14"/>
-        <variant name="ATtiny84-20MU" pinout-key="qfn_20" package="QFN20"/>
+        <variant key="attiny84_20pu" name="ATtiny84-20PU" pinout-key="soic_14"/>
+        <variant key="attiny84v_10ssu" name="ATtiny84V-10SSU" pinout-key="soic_14"/>
+        <variant key="attiny84_20mu" name="ATtiny84-20MU" pinout-key="qfn_20"/>
     </variants>
 </device>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY841.xml b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY841.xml
index 661d92aa..fe46f274 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY841.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY841.xml
@@ -171,42 +171,42 @@
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pb2" index="2" function="PORTB" group="P"/>
-                <signal pad-id="pb3" index="3" function="PORTB" group="P"/>
+                <signal pad-key="pb0" index="0" function="PORTB" group="P"/>
+                <signal pad-key="pb1" index="1" function="PORTB" group="P"/>
+                <signal pad-key="pb2" index="2" function="PORTB" group="P"/>
+                <signal pad-key="pb3" index="3" function="PORTB" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pa2" index="2" function="PORTA" group="P"/>
-                <signal pad-id="pa3" index="3" function="PORTA" group="P"/>
-                <signal pad-id="pa4" index="4" function="PORTA" group="P"/>
-                <signal pad-id="pa5" index="5" function="PORTA" group="P"/>
-                <signal pad-id="pa6" index="6" function="PORTA" group="P"/>
-                <signal pad-id="pa7" index="7" function="PORTA" group="P"/>
+                <signal pad-key="pa0" index="0" function="PORTA" group="P"/>
+                <signal pad-key="pa1" index="1" function="PORTA" group="P"/>
+                <signal pad-key="pa2" index="2" function="PORTA" group="P"/>
+                <signal pad-key="pa3" index="3" function="PORTA" group="P"/>
+                <signal pad-key="pa4" index="4" function="PORTA" group="P"/>
+                <signal pad-key="pa5" index="5" function="PORTA" group="P"/>
+                <signal pad-key="pa6" index="6" function="PORTA" group="P"/>
+                <signal pad-key="pa7" index="7" function="PORTA" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="usart1" name="USART1" module-key="usart">
             <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"/>
-                <signal pad-id="pa6" function="USART" group="XCK"/>
+                <signal pad-key="pa4" function="USART" group="RXD"/>
+                <signal pad-key="pa5" function="USART" group="TXD"/>
+                <signal pad-key="pa6" function="USART" group="XCK"/>
             </signals>
         </peripheral>
         <peripheral key="usart0" name="USART0" module-key="usart">
             <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"/>
-                <signal pad-id="pa3" function="USART" group="XCK" field="U0MAP"/>
-                <signal pad-id="pa7" function="USART_ALT" group="TXD" field="U0MAP"/>
-                <signal pad-id="pb2" function="USART_ALT" group="RXD" field="U0MAP"/>
-                <signal pad-id="pa3" function="USART_ALT" group="XCK" field="U0MAP"/>
+                <signal pad-key="pa1" function="USART" group="TXD" field="U0MAP"/>
+                <signal pad-key="pa2" function="USART" group="RXD" field="U0MAP"/>
+                <signal pad-key="pa3" function="USART" group="XCK" field="U0MAP"/>
+                <signal pad-key="pa7" function="USART_ALT" group="TXD" field="U0MAP"/>
+                <signal pad-key="pb2" function="USART_ALT" group="RXD" field="U0MAP"/>
+                <signal pad-key="pa3" function="USART_ALT" group="XCK" field="U0MAP"/>
             </signals>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="wdt">
@@ -215,37 +215,37 @@
         <peripheral key="twi" name="TWI" module-key="twi">
             <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"/>
+                <signal pad-key="pa4" function="TWI" group="SCL"/>
+                <signal pad-key="pa6" function="TWI" group="SDA"/>
             </signals>
         </peripheral>
         <peripheral key="adc" name="ADC" module-key="adc">
             <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"/>
-                <signal pad-id="pa2" index="2" function="ADC" group="ADC"/>
-                <signal pad-id="pa3" index="3" function="ADC" group="ADC"/>
-                <signal pad-id="pa4" index="4" function="ADC" group="ADC"/>
-                <signal pad-id="pa5" index="5" function="ADC" group="ADC"/>
-                <signal pad-id="pa6" index="6" function="ADC" group="ADC"/>
-                <signal pad-id="pa7" index="7" function="ADC" group="ADC"/>
-                <signal pad-id="pb2" index="8" function="ADC" group="ADC"/>
-                <signal pad-id="pb3" index="9" function="ADC" group="ADC"/>
-                <signal pad-id="pb0" index="10" function="ADC" group="ADC"/>
-                <signal pad-id="pb1" index="11" function="ADC" group="ADC"/>
-                <signal pad-id="pa0" function="AREF" group="AREF"/>
+                <signal pad-key="pa0" index="0" function="ADC" group="ADC"/>
+                <signal pad-key="pa1" index="1" function="ADC" group="ADC"/>
+                <signal pad-key="pa2" index="2" function="ADC" group="ADC"/>
+                <signal pad-key="pa3" index="3" function="ADC" group="ADC"/>
+                <signal pad-key="pa4" index="4" function="ADC" group="ADC"/>
+                <signal pad-key="pa5" index="5" function="ADC" group="ADC"/>
+                <signal pad-key="pa6" index="6" function="ADC" group="ADC"/>
+                <signal pad-key="pa7" index="7" function="ADC" group="ADC"/>
+                <signal pad-key="pb2" index="8" function="ADC" group="ADC"/>
+                <signal pad-key="pb3" index="9" function="ADC" group="ADC"/>
+                <signal pad-key="pb0" index="10" function="ADC" group="ADC"/>
+                <signal pad-key="pb1" index="11" function="ADC" group="ADC"/>
+                <signal pad-key="pa0" function="AREF" group="AREF"/>
             </signals>
         </peripheral>
         <peripheral key="ac" name="AC" module-key="ac">
             <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"/>
-                <signal pad-id="pa5" function="ACOUT" group="ACO0"/>
-                <signal pad-id="pa6" function="ACOUT" group="ACO1"/>
-                <signal pad-id="pa3" index="0" function="ACIN1" group="AIN1"/>
-                <signal pad-id="pa4" index="1" function="ACIN1" group="AIN1"/>
+                <signal pad-key="pa1" index="0" function="ACIN0" group="AIN0"/>
+                <signal pad-key="pa2" index="1" function="ACIN0" group="AIN0"/>
+                <signal pad-key="pa5" function="ACOUT" group="ACO0"/>
+                <signal pad-key="pa6" function="ACOUT" group="ACO1"/>
+                <signal pad-key="pa3" index="0" function="ACIN1" group="AIN1"/>
+                <signal pad-key="pa4" index="1" function="ACIN1" group="AIN1"/>
             </signals>
         </peripheral>
         <peripheral key="eeprom" name="EEPROM" module-key="eeprom">
@@ -254,69 +254,69 @@
         <peripheral key="tc1" name="TC1" module-key="tc16">
             <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"/>
-                <signal pad-id="pa3" index="2" function="OC" group="TOCC"/>
-                <signal pad-id="pa4" index="3" function="OC" group="TOCC"/>
-                <signal pad-id="pa5" index="4" function="OC" group="TOCC"/>
-                <signal pad-id="pa6" index="5" function="OC" group="TOCC"/>
-                <signal pad-id="pa7" index="6" function="OC" group="TOCC"/>
-                <signal pad-id="pb2" index="7" function="OC" group="TOCC"/>
-                <signal pad-id="pa3" function="CS" group="T0"/>
-                <signal pad-id="pa4" function="CS" group="T1"/>
-                <signal pad-id="pa5" function="CS" group="T2"/>
-                <signal pad-id="pa7" function="ICP" group="ICP1"/>
+                <signal pad-key="pa1" index="0" function="OC" group="TOCC"/>
+                <signal pad-key="pa2" index="1" function="OC" group="TOCC"/>
+                <signal pad-key="pa3" index="2" function="OC" group="TOCC"/>
+                <signal pad-key="pa4" index="3" function="OC" group="TOCC"/>
+                <signal pad-key="pa5" index="4" function="OC" group="TOCC"/>
+                <signal pad-key="pa6" index="5" function="OC" group="TOCC"/>
+                <signal pad-key="pa7" index="6" function="OC" group="TOCC"/>
+                <signal pad-key="pb2" index="7" function="OC" group="TOCC"/>
+                <signal pad-key="pa3" function="CS" group="T0"/>
+                <signal pad-key="pa4" function="CS" group="T1"/>
+                <signal pad-key="pa5" function="CS" group="T2"/>
+                <signal pad-key="pa7" function="ICP" group="ICP1"/>
             </signals>
         </peripheral>
         <peripheral key="tc2" name="TC2" module-key="tc16">
             <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"/>
-                <signal pad-id="pa3" index="2" function="OC" group="TOCC"/>
-                <signal pad-id="pa4" index="3" function="OC" group="TOCC"/>
-                <signal pad-id="pa5" index="4" function="OC" group="TOCC"/>
-                <signal pad-id="pa6" index="5" function="OC" group="TOCC"/>
-                <signal pad-id="pa7" index="6" function="OC" group="TOCC"/>
-                <signal pad-id="pb2" index="7" function="OC" group="TOCC"/>
-                <signal pad-id="pa3" function="CS" group="T0"/>
-                <signal pad-id="pa4" function="CS" group="T1"/>
-                <signal pad-id="pa5" function="CS" group="T2"/>
-                <signal pad-id="pb2" function="ICP" group="ICP2"/>
+                <signal pad-key="pa1" index="0" function="OC" group="TOCC"/>
+                <signal pad-key="pa2" index="1" function="OC" group="TOCC"/>
+                <signal pad-key="pa3" index="2" function="OC" group="TOCC"/>
+                <signal pad-key="pa4" index="3" function="OC" group="TOCC"/>
+                <signal pad-key="pa5" index="4" function="OC" group="TOCC"/>
+                <signal pad-key="pa6" index="5" function="OC" group="TOCC"/>
+                <signal pad-key="pa7" index="6" function="OC" group="TOCC"/>
+                <signal pad-key="pb2" index="7" function="OC" group="TOCC"/>
+                <signal pad-key="pa3" function="CS" group="T0"/>
+                <signal pad-key="pa4" function="CS" group="T1"/>
+                <signal pad-key="pa5" function="CS" group="T2"/>
+                <signal pad-key="pb2" function="ICP" group="ICP2"/>
             </signals>
         </peripheral>
         <peripheral key="tc0" name="TC0" module-key="tc8">
             <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"/>
-                <signal pad-id="pa3" index="0" function="OC" group="TOCC"/>
-                <signal pad-id="pa4" index="0" function="OC" group="TOCC"/>
-                <signal pad-id="pa5" index="0" function="OC" group="TOCC"/>
-                <signal pad-id="pa6" index="0" function="OC" group="TOCC"/>
-                <signal pad-id="pa7" index="0" function="OC" group="TOCC"/>
-                <signal pad-id="pb2" index="0" function="OC" group="TOCC"/>
-                <signal pad-id="pa3" function="CS" group="T0"/>
-                <signal pad-id="pa4" function="CS" group="T1"/>
-                <signal pad-id="pa5" function="CS" group="T2"/>
+                <signal pad-key="pa1" index="0" function="OC" group="TOCC"/>
+                <signal pad-key="pa2" index="0" function="OC" group="TOCC"/>
+                <signal pad-key="pa3" index="0" function="OC" group="TOCC"/>
+                <signal pad-key="pa4" index="0" function="OC" group="TOCC"/>
+                <signal pad-key="pa5" index="0" function="OC" group="TOCC"/>
+                <signal pad-key="pa6" index="0" function="OC" group="TOCC"/>
+                <signal pad-key="pa7" index="0" function="OC" group="TOCC"/>
+                <signal pad-key="pb2" index="0" function="OC" group="TOCC"/>
+                <signal pad-key="pa3" function="CS" group="T0"/>
+                <signal pad-key="pa4" function="CS" group="T1"/>
+                <signal pad-key="pa5" function="CS" group="T2"/>
             </signals>
         </peripheral>
         <peripheral key="exint" name="EXINT" module-key="exint">
             <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"/>
-                <signal pad-id="pa2" index="2" function="EXTINT" group="PCINT"/>
-                <signal pad-id="pa3" index="3" function="EXTINT" group="PCINT"/>
-                <signal pad-id="pa4" index="4" function="EXTINT" group="PCINT"/>
-                <signal pad-id="pa5" index="5" function="EXTINT" group="PCINT"/>
-                <signal pad-id="pa6" index="6" function="EXTINT" group="PCINT"/>
-                <signal pad-id="pa7" index="7" function="EXTINT" group="PCINT"/>
-                <signal pad-id="pb0" index="8" function="EXTINT" group="PCINT"/>
-                <signal pad-id="pb1" index="9" function="EXTINT" group="PCINT"/>
-                <signal pad-id="pb2" index="10" function="EXTINT" group="PCINT"/>
-                <signal pad-id="pb3" index="11" function="EXTINT" group="PCINT"/>
-                <signal pad-id="pb1" index="0" function="EXTINT" group="INT"/>
+                <signal pad-key="pa0" index="0" function="EXTINT" group="PCINT"/>
+                <signal pad-key="pa1" index="1" function="EXTINT" group="PCINT"/>
+                <signal pad-key="pa2" index="2" function="EXTINT" group="PCINT"/>
+                <signal pad-key="pa3" index="3" function="EXTINT" group="PCINT"/>
+                <signal pad-key="pa4" index="4" function="EXTINT" group="PCINT"/>
+                <signal pad-key="pa5" index="5" function="EXTINT" group="PCINT"/>
+                <signal pad-key="pa6" index="6" function="EXTINT" group="PCINT"/>
+                <signal pad-key="pa7" index="7" function="EXTINT" group="PCINT"/>
+                <signal pad-key="pb0" index="8" function="EXTINT" group="PCINT"/>
+                <signal pad-key="pb1" index="9" function="EXTINT" group="PCINT"/>
+                <signal pad-key="pb2" index="10" function="EXTINT" group="PCINT"/>
+                <signal pad-key="pb3" index="11" function="EXTINT" group="PCINT"/>
+                <signal pad-key="pb1" index="0" function="EXTINT" group="INT"/>
             </signals>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="cpu">
@@ -328,14 +328,14 @@
         <peripheral key="spi" name="SPI" module-key="spi">
             <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"/>
-                <signal pad-id="pa2" function="SPI_ALT" group="SS" field="SPIMAP"/>
-                <signal pad-id="pa3" function="SPI_ALT" group="SCK" field="SPIMAP"/>
-                <signal pad-id="pa4" function="SPI" group="SCK" field="SPIMAP"/>
-                <signal pad-id="pa5" function="SPI" group="MISO" field="SPIMAP"/>
-                <signal pad-id="pa6" function="SPI" group="MOSI" field="SPIMAP"/>
-                <signal pad-id="pa7" function="SPI" group="SS" field="SPIMAP"/>
+                <signal pad-key="pa0" function="SPI_ALT" group="MISO" field="SPIMAP"/>
+                <signal pad-key="pa1" function="SPI_ALT" group="MOSI" field="SPIMAP"/>
+                <signal pad-key="pa2" function="SPI_ALT" group="SS" field="SPIMAP"/>
+                <signal pad-key="pa3" function="SPI_ALT" group="SCK" field="SPIMAP"/>
+                <signal pad-key="pa4" function="SPI" group="SCK" field="SPIMAP"/>
+                <signal pad-key="pa5" function="SPI" group="MISO" field="SPIMAP"/>
+                <signal pad-key="pa6" function="SPI" group="MOSI" field="SPIMAP"/>
+                <signal pad-key="pa7" function="SPI" group="SS" field="SPIMAP"/>
             </signals>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="fuse">
@@ -857,49 +857,65 @@
             </register-group>
         </module>
     </modules>
+    <pads>
+        <pad key="gnd" name="GND"/>
+        <pad key="pa0" name="PA0"/>
+        <pad key="pa1" name="PA1"/>
+        <pad key="pa2" name="PA2"/>
+        <pad key="pa3" name="PA3"/>
+        <pad key="pa4" name="PA4"/>
+        <pad key="pa5" name="PA5"/>
+        <pad key="pa6" name="PA6"/>
+        <pad key="pa7" name="PA7"/>
+        <pad key="pb2" name="PB2"/>
+        <pad key="pb3" name="PB3"/>
+        <pad key="pb1" name="PB1"/>
+        <pad key="pb0" name="PB0"/>
+        <pad key="vcc" name="VCC"/>
+    </pads>
     <pinouts>
         <pinout key="soic_14" name="SOIC_14" type="soic">
-            <pin position="14" pad="GND"/>
-            <pin position="13" pad="PA0"/>
-            <pin position="12" pad="PA1"/>
-            <pin position="11" pad="PA2"/>
-            <pin position="10" pad="PA3"/>
-            <pin position="9" pad="PA4"/>
-            <pin position="8" pad="PA5"/>
-            <pin position="7" pad="PA6"/>
-            <pin position="6" pad="PA7"/>
-            <pin position="5" pad="PB2"/>
-            <pin position="4" pad="PB3"/>
-            <pin position="3" pad="PB1"/>
-            <pin position="2" pad="PB0"/>
-            <pin position="1" pad="VCC"/>
+            <pin position="14" pad-key="gnd"/>
+            <pin position="13" pad-key="pa0"/>
+            <pin position="12" pad-key="pa1"/>
+            <pin position="11" pad-key="pa2"/>
+            <pin position="10" pad-key="pa3"/>
+            <pin position="9" pad-key="pa4"/>
+            <pin position="8" pad-key="pa5"/>
+            <pin position="7" pad-key="pa6"/>
+            <pin position="6" pad-key="pa7"/>
+            <pin position="5" pad-key="pb2"/>
+            <pin position="4" pad-key="pb3"/>
+            <pin position="3" pad-key="pb1"/>
+            <pin position="2" pad-key="pb0"/>
+            <pin position="1" pad-key="vcc"/>
         </pinout>
         <pinout key="qfn_20" name="QFN_20" type="qfn">
-            <pin position="1" pad="PA4"/>
-            <pin position="2" pad="PA3"/>
-            <pin position="3" pad="PA2"/>
-            <pin position="4" pad="PA1"/>
-            <pin position="5" pad="PA0"/>
-            <pin position="6" pad="NC"/>
-            <pin position="7" pad="NC"/>
-            <pin position="8" pad="GND"/>
-            <pin position="9" pad="VCC"/>
-            <pin position="10" pad="NC"/>
-            <pin position="11" pad="PB0"/>
-            <pin position="12" pad="PB1"/>
-            <pin position="13" pad="PB3"/>
-            <pin position="14" pad="PB2"/>
-            <pin position="15" pad="PA7"/>
-            <pin position="16" pad="PA6"/>
-            <pin position="17" pad="NC"/>
-            <pin position="18" pad="NC"/>
-            <pin position="19" pad="NC"/>
-            <pin position="20" pad="PA5"/>
+            <pin position="1" pad-key="pa4"/>
+            <pin position="2" pad-key="pa3"/>
+            <pin position="3" pad-key="pa2"/>
+            <pin position="4" pad-key="pa1"/>
+            <pin position="5" pad-key="pa0"/>
+            <pin position="6"/>
+            <pin position="7"/>
+            <pin position="8" pad-key="gnd"/>
+            <pin position="9" pad-key="vcc"/>
+            <pin position="10"/>
+            <pin position="11" pad-key="pb0"/>
+            <pin position="12" pad-key="pb1"/>
+            <pin position="13" pad-key="pb3"/>
+            <pin position="14" pad-key="pb2"/>
+            <pin position="15" pad-key="pa7"/>
+            <pin position="16" pad-key="pa6"/>
+            <pin position="17"/>
+            <pin position="18"/>
+            <pin position="19"/>
+            <pin position="20" pad-key="pa5"/>
         </pinout>
     </pinouts>
     <variants>
-        <variant name="ATtiny841-SSU" pinout-key="soic_14" package="SOIC14"/>
-        <variant name="ATtiny841-MU" pinout-key="qfn_20" package="MLF20"/>
-        <variant name="ATtiny841-MMH" pinout-key="qfn_20" package="VQFN20"/>
+        <variant key="attiny841_ssu" name="ATtiny841-SSU" pinout-key="soic_14"/>
+        <variant key="attiny841_mu" name="ATtiny841-MU" pinout-key="qfn_20"/>
+        <variant key="attiny841_mmh" name="ATtiny841-MMH" pinout-key="qfn_20"/>
     </variants>
 </device>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY84A.xml b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY84A.xml
index 6bb14b27..593bad6b 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY84A.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY84A.xml
@@ -170,72 +170,72 @@
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pa2" index="2" function="PORTA" group="P"/>
-                <signal pad-id="pa3" index="3" function="PORTA" group="P"/>
-                <signal pad-id="pa4" index="4" function="PORTA" group="P"/>
-                <signal pad-id="pa5" index="5" function="PORTA" group="P"/>
-                <signal pad-id="pa6" index="6" function="PORTA" group="P"/>
-                <signal pad-id="pa7" index="7" function="PORTA" group="P"/>
+                <signal pad-key="pa0" index="0" function="PORTA" group="P"/>
+                <signal pad-key="pa1" index="1" function="PORTA" group="P"/>
+                <signal pad-key="pa2" index="2" function="PORTA" group="P"/>
+                <signal pad-key="pa3" index="3" function="PORTA" group="P"/>
+                <signal pad-key="pa4" index="4" function="PORTA" group="P"/>
+                <signal pad-key="pa5" index="5" function="PORTA" group="P"/>
+                <signal pad-key="pa6" index="6" function="PORTA" group="P"/>
+                <signal pad-key="pa7" index="7" function="PORTA" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pb2" index="2" function="PORTB" group="P"/>
-                <signal pad-id="pb3" index="3" function="PORTB" group="P"/>
+                <signal pad-key="pb0" index="0" function="PORTB" group="P"/>
+                <signal pad-key="pb1" index="1" function="PORTB" group="P"/>
+                <signal pad-key="pb2" index="2" function="PORTB" group="P"/>
+                <signal pad-key="pb3" index="3" function="PORTB" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="ac" name="AC" module-key="ac">
             <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"/>
+                <signal pad-key="pa1" index="0" function="ACIN" group="AIN"/>
+                <signal pad-key="pa2" index="1" function="ACIN" group="AIN"/>
             </signals>
         </peripheral>
         <peripheral key="adc" name="ADC" module-key="adc">
             <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"/>
-                <signal pad-id="pa2" index="2" function="ADC" group="ADC"/>
-                <signal pad-id="pa3" index="3" function="ADC" group="ADC"/>
-                <signal pad-id="pa4" index="4" function="ADC" group="ADC"/>
-                <signal pad-id="pa5" index="5" function="ADC" group="ADC"/>
-                <signal pad-id="pa6" index="6" function="ADC" group="ADC"/>
-                <signal pad-id="pa7" index="7" function="ADC" group="ADC"/>
-                <signal pad-id="pa0" function="AREF" group="AREF"/>
+                <signal pad-key="pa0" index="0" function="ADC" group="ADC"/>
+                <signal pad-key="pa1" index="1" function="ADC" group="ADC"/>
+                <signal pad-key="pa2" index="2" function="ADC" group="ADC"/>
+                <signal pad-key="pa3" index="3" function="ADC" group="ADC"/>
+                <signal pad-key="pa4" index="4" function="ADC" group="ADC"/>
+                <signal pad-key="pa5" index="5" function="ADC" group="ADC"/>
+                <signal pad-key="pa6" index="6" function="ADC" group="ADC"/>
+                <signal pad-key="pa7" index="7" function="ADC" group="ADC"/>
+                <signal pad-key="pa0" function="AREF" group="AREF"/>
             </signals>
         </peripheral>
         <peripheral key="usi" name="USI" module-key="usi">
             <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"/>
-                <signal pad-id="pa4" function="SPI" group="USCK"/>
-                <signal pad-id="pa5" function="SPI" group="DO"/>
-                <signal pad-id="pa6" function="SPI" group="DI"/>
+                <signal pad-key="pa4" function="TWI" group="SCL"/>
+                <signal pad-key="pa6" function="TWI" group="SDA"/>
+                <signal pad-key="pa4" function="SPI" group="USCK"/>
+                <signal pad-key="pa5" function="SPI" group="DO"/>
+                <signal pad-key="pa6" function="SPI" group="DI"/>
             </signals>
         </peripheral>
         <peripheral key="exint" name="EXINT" module-key="exint">
             <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"/>
-                <signal pad-id="pa2" index="2" function="EXTINT" group="PCINT"/>
-                <signal pad-id="pa3" index="3" function="EXTINT" group="PCINT"/>
-                <signal pad-id="pa4" index="4" function="EXTINT" group="PCINT"/>
-                <signal pad-id="pa5" index="5" function="EXTINT" group="PCINT"/>
-                <signal pad-id="pa6" index="6" function="EXTINT" group="PCINT"/>
-                <signal pad-id="pa7" index="7" function="EXTINT" group="PCINT"/>
-                <signal pad-id="pb0" index="8" function="EXTINT" group="PCINT"/>
-                <signal pad-id="pb1" index="9" function="EXTINT" group="PCINT"/>
-                <signal pad-id="pb2" index="10" function="EXTINT" group="PCINT"/>
-                <signal pad-id="pb3" index="11" function="EXTINT" group="PCINT"/>
-                <signal pad-id="pb2" index="0" function="EXTINT" group="INT"/>
+                <signal pad-key="pa0" index="0" function="EXTINT" group="PCINT"/>
+                <signal pad-key="pa1" index="1" function="EXTINT" group="PCINT"/>
+                <signal pad-key="pa2" index="2" function="EXTINT" group="PCINT"/>
+                <signal pad-key="pa3" index="3" function="EXTINT" group="PCINT"/>
+                <signal pad-key="pa4" index="4" function="EXTINT" group="PCINT"/>
+                <signal pad-key="pa5" index="5" function="EXTINT" group="PCINT"/>
+                <signal pad-key="pa6" index="6" function="EXTINT" group="PCINT"/>
+                <signal pad-key="pa7" index="7" function="EXTINT" group="PCINT"/>
+                <signal pad-key="pb0" index="8" function="EXTINT" group="PCINT"/>
+                <signal pad-key="pb1" index="9" function="EXTINT" group="PCINT"/>
+                <signal pad-key="pb2" index="10" function="EXTINT" group="PCINT"/>
+                <signal pad-key="pb3" index="11" function="EXTINT" group="PCINT"/>
+                <signal pad-key="pb2" index="0" function="EXTINT" group="INT"/>
             </signals>
         </peripheral>
         <peripheral key="eeprom" name="EEPROM" module-key="eeprom">
@@ -247,18 +247,18 @@
         <peripheral key="tc0" name="TC0" module-key="tc8">
             <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"/>
-                <signal pad-id="pb2" function="T0" group="OC0A"/>
+                <signal pad-key="pa3" function="T0" group="T0"/>
+                <signal pad-key="pa7" function="T0" group="OC0B"/>
+                <signal pad-key="pb2" function="T0" group="OC0A"/>
             </signals>
         </peripheral>
         <peripheral key="tc1" name="TC1" module-key="tc16">
             <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"/>
-                <signal pad-id="pa6" function="T1" group="OC1A"/>
-                <signal pad-id="pa7" function="T1" group="ICP1"/>
+                <signal pad-key="pa4" function="T1" group="T1"/>
+                <signal pad-key="pa5" function="T1" group="OC1B"/>
+                <signal pad-key="pa6" function="T1" group="OC1A"/>
+                <signal pad-key="pa7" function="T1" group="ICP1"/>
             </signals>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="cpu">
@@ -540,70 +540,86 @@
             </register-group>
         </module>
     </modules>
+    <pads>
+        <pad key="vcc" name="VCC"/>
+        <pad key="pb0" name="PB0"/>
+        <pad key="pb1" name="PB1"/>
+        <pad key="pb3" name="PB3"/>
+        <pad key="pb2" name="PB2"/>
+        <pad key="pa7" name="PA7"/>
+        <pad key="pa6" name="PA6"/>
+        <pad key="pa5" name="PA5"/>
+        <pad key="pa4" name="PA4"/>
+        <pad key="pa3" name="PA3"/>
+        <pad key="pa2" name="PA2"/>
+        <pad key="pa1" name="PA1"/>
+        <pad key="pa0" name="PA0"/>
+        <pad key="gnd" name="GND"/>
+    </pads>
     <pinouts>
         <pinout key="soic_14" name="SOIC_14" type="soic">
-            <pin position="1" pad="VCC"/>
-            <pin position="2" pad="PB0"/>
-            <pin position="3" pad="PB1"/>
-            <pin position="4" pad="PB3"/>
-            <pin position="5" pad="PB2"/>
-            <pin position="6" pad="PA7"/>
-            <pin position="7" pad="PA6"/>
-            <pin position="8" pad="PA5"/>
-            <pin position="9" pad="PA4"/>
-            <pin position="10" pad="PA3"/>
-            <pin position="11" pad="PA2"/>
-            <pin position="12" pad="PA1"/>
-            <pin position="13" pad="PA0"/>
-            <pin position="14" pad="GND"/>
+            <pin position="1" pad-key="vcc"/>
+            <pin position="2" pad-key="pb0"/>
+            <pin position="3" pad-key="pb1"/>
+            <pin position="4" pad-key="pb3"/>
+            <pin position="5" pad-key="pb2"/>
+            <pin position="6" pad-key="pa7"/>
+            <pin position="7" pad-key="pa6"/>
+            <pin position="8" pad-key="pa5"/>
+            <pin position="9" pad-key="pa4"/>
+            <pin position="10" pad-key="pa3"/>
+            <pin position="11" pad-key="pa2"/>
+            <pin position="12" pad-key="pa1"/>
+            <pin position="13" pad-key="pa0"/>
+            <pin position="14" pad-key="gnd"/>
         </pinout>
         <pinout key="qfn_20" name="QFN_20" type="qfn">
-            <pin position="1" pad="PA4"/>
-            <pin position="2" pad="PA3"/>
-            <pin position="3" pad="PA2"/>
-            <pin position="4" pad="PA1"/>
-            <pin position="5" pad="PA0"/>
-            <pin position="6" pad="NC"/>
-            <pin position="7" pad="NC"/>
-            <pin position="8" pad="GND"/>
-            <pin position="9" pad="VCC"/>
-            <pin position="10" pad="NC"/>
-            <pin position="11" pad="PB0"/>
-            <pin position="12" pad="PB1"/>
-            <pin position="13" pad="PB3"/>
-            <pin position="14" pad="PB2"/>
-            <pin position="15" pad="PA7"/>
-            <pin position="16" pad="PA6"/>
-            <pin position="17" pad="NC"/>
-            <pin position="18" pad="NC"/>
-            <pin position="19" pad="NC"/>
-            <pin position="20" pad="PA5"/>
+            <pin position="1" pad-key="pa4"/>
+            <pin position="2" pad-key="pa3"/>
+            <pin position="3" pad-key="pa2"/>
+            <pin position="4" pad-key="pa1"/>
+            <pin position="5" pad-key="pa0"/>
+            <pin position="6"/>
+            <pin position="7"/>
+            <pin position="8" pad-key="gnd"/>
+            <pin position="9" pad-key="vcc"/>
+            <pin position="10"/>
+            <pin position="11" pad-key="pb0"/>
+            <pin position="12" pad-key="pb1"/>
+            <pin position="13" pad-key="pb3"/>
+            <pin position="14" pad-key="pb2"/>
+            <pin position="15" pad-key="pa7"/>
+            <pin position="16" pad-key="pa6"/>
+            <pin position="17"/>
+            <pin position="18"/>
+            <pin position="19"/>
+            <pin position="20" pad-key="pa5"/>
         </pinout>
         <pinout key="bga_16" name="BGA_16" type="bga">
-            <pin position="A1" pad="NC"/>
-            <pin position="A2" pad="PA5"/>
-            <pin position="A3" pad="PA6"/>
-            <pin position="A4" pad="PB2"/>
-            <pin position="B1" pad="PA4"/>
-            <pin position="B2" pad="PA7"/>
-            <pin position="B3" pad="PB1"/>
-            <pin position="B4" pad="PB3"/>
-            <pin position="C1" pad="PA3"/>
-            <pin position="C2" pad="PA2"/>
-            <pin position="C3" pad="PA1"/>
-            <pin position="C4" pad="PB0"/>
-            <pin position="D1" pad="PA0"/>
-            <pin position="D2" pad="GND"/>
-            <pin position="D3" pad="GND"/>
-            <pin position="D4" pad="VCC"/>
+            <pin position="A1"/>
+            <pin position="A2" pad-key="pa5"/>
+            <pin position="A3" pad-key="pa6"/>
+            <pin position="A4" pad-key="pb2"/>
+            <pin position="B1" pad-key="pa4"/>
+            <pin position="B2" pad-key="pa7"/>
+            <pin position="B3" pad-key="pb1"/>
+            <pin position="B4" pad-key="pb3"/>
+            <pin position="C1" pad-key="pa3"/>
+            <pin position="C2" pad-key="pa2"/>
+            <pin position="C3" pad-key="pa1"/>
+            <pin position="C4" pad-key="pb0"/>
+            <pin position="D1" pad-key="pa0"/>
+            <pin position="D2" pad-key="gnd"/>
+            <pin position="D3" pad-key="gnd"/>
+            <pin position="D4" pad-key="vcc"/>
         </pinout>
     </pinouts>
     <variants>
-        <variant name="ATtiny84A-CCU" pinout-key="bga_16" package="UFBGA16"/>
-        <variant name="ATtiny84A-MMH" pinout-key="qfn_20" package="VQFN20"/>
-        <variant name="ATtiny84A-MU" pinout-key="qfn_20" package="QFN20"/>
-        <variant name="ATtiny84A-PU" pinout-key="soic_14" package="PDIP14"/>
-        <variant name="ATtiny84A-SSU" pinout-key="soic_14" package="SOIC14"/>
-        <variant name="ATtiny84A-SSF" pinout-key="soic_14" package="SOIC14"/>
+        <variant key="attiny84a_ccu" name="ATtiny84A-CCU" pinout-key="bga_16"/>
+        <variant key="attiny84a_mmh" name="ATtiny84A-MMH" pinout-key="qfn_20"/>
+        <variant key="attiny84a_mu" name="ATtiny84A-MU" pinout-key="qfn_20"/>
+        <variant key="attiny84a_pu" name="ATtiny84A-PU" pinout-key="soic_14"/>
+        <variant key="attiny84a_ssu" name="ATtiny84A-SSU" pinout-key="soic_14"/>
+        <variant key="attiny84a_ssf" name="ATtiny84A-SSF" pinout-key="soic_14"/>
     </variants>
 </device>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY85.xml b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY85.xml
index fb09d5b8..f14fef7f 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY85.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY85.xml
@@ -170,50 +170,50 @@
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pb2" index="2" function="PORTB" group="P"/>
-                <signal pad-id="pb3" index="3" function="PORTB" group="P"/>
-                <signal pad-id="pb4" index="4" function="PORTB" group="P"/>
-                <signal pad-id="pb5" index="5" function="PORTB" group="P"/>
+                <signal pad-key="pb0" index="0" function="PORTB" group="P"/>
+                <signal pad-key="pb1" index="1" function="PORTB" group="P"/>
+                <signal pad-key="pb2" index="2" function="PORTB" group="P"/>
+                <signal pad-key="pb3" index="3" function="PORTB" group="P"/>
+                <signal pad-key="pb4" index="4" function="PORTB" group="P"/>
+                <signal pad-key="pb5" index="5" function="PORTB" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="ac" name="AC" module-key="ac">
             <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"/>
+                <signal pad-key="pb1" index="1" function="ACIN" group="AIN"/>
+                <signal pad-key="pb0" index="0" function="ACIN" group="AIN"/>
             </signals>
         </peripheral>
         <peripheral key="adc" name="ADC" module-key="adc">
             <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"/>
-                <signal pad-id="pb4" index="2" function="ADC" group="ADC"/>
-                <signal pad-id="pb0" function="AREF" group="AREF"/>
+                <signal pad-key="pb5" index="0" function="ADC" group="ADC"/>
+                <signal pad-key="pb2" index="1" function="ADC" group="ADC"/>
+                <signal pad-key="pb4" index="2" function="ADC" group="ADC"/>
+                <signal pad-key="pb0" function="AREF" group="AREF"/>
             </signals>
         </peripheral>
         <peripheral key="usi" name="USI" module-key="usi">
             <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"/>
-                <signal pad-id="pb0" function="SPI" group="DI"/>
-                <signal pad-id="pb1" function="SPI" group="DO"/>
-                <signal pad-id="pb2" function="SPI" group="USCK"/>
+                <signal pad-key="pb0" function="TWI" group="SDA"/>
+                <signal pad-key="pb2" function="TWI" group="SCL"/>
+                <signal pad-key="pb0" function="SPI" group="DI"/>
+                <signal pad-key="pb1" function="SPI" group="DO"/>
+                <signal pad-key="pb2" function="SPI" group="USCK"/>
             </signals>
         </peripheral>
         <peripheral key="exint" name="EXINT" module-key="exint">
             <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"/>
-                <signal pad-id="pb2" index="2" function="EXTINT" group="PCINT"/>
-                <signal pad-id="pb3" index="3" function="EXTINT" group="PCINT"/>
-                <signal pad-id="pb4" index="4" function="EXTINT" group="PCINT"/>
-                <signal pad-id="pb5" index="5" function="EXTINT" group="PCINT"/>
-                <signal pad-id="pb2" index="0" function="EXTINT" group="INT"/>
+                <signal pad-key="pb0" index="0" function="EXTINT" group="PCINT"/>
+                <signal pad-key="pb1" index="1" function="EXTINT" group="PCINT"/>
+                <signal pad-key="pb2" index="2" function="EXTINT" group="PCINT"/>
+                <signal pad-key="pb3" index="3" function="EXTINT" group="PCINT"/>
+                <signal pad-key="pb4" index="4" function="EXTINT" group="PCINT"/>
+                <signal pad-key="pb5" index="5" function="EXTINT" group="PCINT"/>
+                <signal pad-key="pb2" index="0" function="EXTINT" group="INT"/>
             </signals>
         </peripheral>
         <peripheral key="eeprom" name="EEPROM" module-key="eeprom">
@@ -225,18 +225,18 @@
         <peripheral key="tc0" name="TC0" module-key="tc8">
             <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"/>
-                <signal pad-id="pb0" function="T0" group="OC0A"/>
+                <signal pad-key="pb2" function="T0" group="T0"/>
+                <signal pad-key="pb1" function="T0" group="OC0B"/>
+                <signal pad-key="pb0" function="T0" group="OC0A"/>
             </signals>
         </peripheral>
         <peripheral key="tc1" name="TC1" module-key="tc16">
             <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"/>
-                <signal pad-id="pb1" function="T1" group="OC1A"/>
-                <signal pad-id="pb0" function="T1" group="OC1AINV"/>
+                <signal pad-key="pb4" function="T1" group="OC1B"/>
+                <signal pad-key="pb3" function="T1" group="OC1BINV"/>
+                <signal pad-key="pb1" function="T1" group="OC1A"/>
+                <signal pad-key="pb0" function="T1" group="OC1AINV"/>
             </signals>
         </peripheral>
         <peripheral key="boot_load" name="BOOT_LOAD" module-key="boot_load">
@@ -535,48 +535,58 @@
             </register-group>
         </module>
     </modules>
+    <pads>
+        <pad key="pb5" name="PB5"/>
+        <pad key="pb3" name="PB3"/>
+        <pad key="pb4" name="PB4"/>
+        <pad key="gnd" name="GND"/>
+        <pad key="pb0" name="PB0"/>
+        <pad key="pb1" name="PB1"/>
+        <pad key="pb2" name="PB2"/>
+        <pad key="vcc" name="VCC"/>
+    </pads>
     <pinouts>
         <pinout key="soic_8" name="SOIC_8" type="soic">
-            <pin position="1" pad="PB5"/>
-            <pin position="2" pad="PB3"/>
-            <pin position="3" pad="PB4"/>
-            <pin position="4" pad="GND"/>
-            <pin position="5" pad="PB0"/>
-            <pin position="6" pad="PB1"/>
-            <pin position="7" pad="PB2"/>
-            <pin position="8" pad="VCC"/>
+            <pin position="1" pad-key="pb5"/>
+            <pin position="2" pad-key="pb3"/>
+            <pin position="3" pad-key="pb4"/>
+            <pin position="4" pad-key="gnd"/>
+            <pin position="5" pad-key="pb0"/>
+            <pin position="6" pad-key="pb1"/>
+            <pin position="7" pad-key="pb2"/>
+            <pin position="8" pad-key="vcc"/>
         </pinout>
         <pinout key="qfn_20" name="QFN_20" type="qfn">
-            <pin position="1" pad="PB5"/>
-            <pin position="2" pad="PB3"/>
-            <pin position="3" pad="NC"/>
-            <pin position="4" pad="NC"/>
-            <pin position="5" pad="PB4"/>
-            <pin position="6" pad="NC"/>
-            <pin position="7" pad="NC"/>
-            <pin position="8" pad="GND"/>
-            <pin position="9" pad="NC"/>
-            <pin position="10" pad="NC"/>
-            <pin position="11" pad="PB0"/>
-            <pin position="12" pad="PB1"/>
-            <pin position="13" pad="NC"/>
-            <pin position="14" pad="PB2"/>
-            <pin position="15" pad="VCC"/>
-            <pin position="16" pad="NC"/>
-            <pin position="17" pad="NC"/>
-            <pin position="18" pad="NC"/>
-            <pin position="19" pad="NC"/>
-            <pin position="20" pad="NC"/>
+            <pin position="1" pad-key="pb5"/>
+            <pin position="2" pad-key="pb3"/>
+            <pin position="3"/>
+            <pin position="4"/>
+            <pin position="5" pad-key="pb4"/>
+            <pin position="6"/>
+            <pin position="7"/>
+            <pin position="8" pad-key="gnd"/>
+            <pin position="9"/>
+            <pin position="10"/>
+            <pin position="11" pad-key="pb0"/>
+            <pin position="12" pad-key="pb1"/>
+            <pin position="13"/>
+            <pin position="14" pad-key="pb2"/>
+            <pin position="15" pad-key="vcc"/>
+            <pin position="16"/>
+            <pin position="17"/>
+            <pin position="18"/>
+            <pin position="19"/>
+            <pin position="20"/>
         </pinout>
     </pinouts>
     <variants>
-        <variant name="ATtiny85V-10PU" pinout-key="soic_8" package="PDIP8"/>
-        <variant name="ATtiny85V-10SU" pinout-key="soic_8" package="SOIC8"/>
-        <variant name="ATtiny85V-10SH" pinout-key="soic_8" package="SOIC8"/>
-        <variant name="ATtiny85V-10MU" pinout-key="qfn_20" package="MLF20"/>
-        <variant name="ATtiny85V-20PU" pinout-key="soic_8" package="PDIP8"/>
-        <variant name="ATtiny85V-20SU" pinout-key="soic_8" package="SOIC8"/>
-        <variant name="ATtiny85V-20SH" pinout-key="soic_8" package="SOIC8"/>
-        <variant name="ATtiny85V-20MU" pinout-key="qfn_20" package="MLF20"/>
+        <variant key="attiny85v_10pu" name="ATtiny85V-10PU" pinout-key="soic_8"/>
+        <variant key="attiny85v_10su" name="ATtiny85V-10SU" pinout-key="soic_8"/>
+        <variant key="attiny85v_10sh" name="ATtiny85V-10SH" pinout-key="soic_8"/>
+        <variant key="attiny85v_10mu" name="ATtiny85V-10MU" pinout-key="qfn_20"/>
+        <variant key="attiny85v_20pu" name="ATtiny85V-20PU" pinout-key="soic_8"/>
+        <variant key="attiny85v_20su" name="ATtiny85V-20SU" pinout-key="soic_8"/>
+        <variant key="attiny85v_20sh" name="ATtiny85V-20SH" pinout-key="soic_8"/>
+        <variant key="attiny85v_20mu" name="ATtiny85V-20MU" pinout-key="qfn_20"/>
     </variants>
 </device>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY861.xml b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY861.xml
index 0c5fe76c..aac678c1 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY861.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY861.xml
@@ -198,67 +198,67 @@
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pa2" index="2" function="PORTA" group="P"/>
-                <signal pad-id="pa3" index="3" function="PORTA" group="P"/>
-                <signal pad-id="pa4" index="4" function="PORTA" group="P"/>
-                <signal pad-id="pa5" index="5" function="PORTA" group="P"/>
-                <signal pad-id="pa6" index="6" function="PORTA" group="P"/>
-                <signal pad-id="pa7" index="7" function="PORTA" group="P"/>
+                <signal pad-key="pa0" index="0" function="PORTA" group="P"/>
+                <signal pad-key="pa1" index="1" function="PORTA" group="P"/>
+                <signal pad-key="pa2" index="2" function="PORTA" group="P"/>
+                <signal pad-key="pa3" index="3" function="PORTA" group="P"/>
+                <signal pad-key="pa4" index="4" function="PORTA" group="P"/>
+                <signal pad-key="pa5" index="5" function="PORTA" group="P"/>
+                <signal pad-key="pa6" index="6" function="PORTA" group="P"/>
+                <signal pad-key="pa7" index="7" function="PORTA" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pb2" index="2" function="PORTB" group="P"/>
-                <signal pad-id="pb3" index="3" function="PORTB" group="P"/>
-                <signal pad-id="pb4" index="4" function="PORTB" group="P"/>
-                <signal pad-id="pb5" index="5" function="PORTB" group="P"/>
-                <signal pad-id="pb6" index="6" function="PORTB" group="P"/>
-                <signal pad-id="pb7" index="7" function="PORTB" group="P"/>
+                <signal pad-key="pb0" index="0" function="PORTB" group="P"/>
+                <signal pad-key="pb1" index="1" function="PORTB" group="P"/>
+                <signal pad-key="pb2" index="2" function="PORTB" group="P"/>
+                <signal pad-key="pb3" index="3" function="PORTB" group="P"/>
+                <signal pad-key="pb4" index="4" function="PORTB" group="P"/>
+                <signal pad-key="pb5" index="5" function="PORTB" group="P"/>
+                <signal pad-key="pb6" index="6" function="PORTB" group="P"/>
+                <signal pad-key="pb7" index="7" function="PORTB" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="adc" name="ADC" module-key="adc">
             <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"/>
-                <signal pad-id="pa2" index="2" function="ADC" group="ADC"/>
-                <signal pad-id="pa4" index="3" function="ADC" group="ADC"/>
-                <signal pad-id="pa5" index="4" function="ADC" group="ADC"/>
-                <signal pad-id="pa6" index="5" function="ADC" group="ADC"/>
-                <signal pad-id="pa7" index="6" function="ADC" group="ADC"/>
-                <signal pad-id="pb4" index="7" function="ADC" group="ADC"/>
-                <signal pad-id="pb5" index="8" function="ADC" group="ADC"/>
-                <signal pad-id="pb6" index="9" function="ADC" group="ADC"/>
-                <signal pad-id="pb7" index="10" function="ADC" group="ADC"/>
-                <signal pad-id="pa3" function="AREF" group="AREF"/>
+                <signal pad-key="pa0" index="0" function="ADC" group="ADC"/>
+                <signal pad-key="pa1" index="1" function="ADC" group="ADC"/>
+                <signal pad-key="pa2" index="2" function="ADC" group="ADC"/>
+                <signal pad-key="pa4" index="3" function="ADC" group="ADC"/>
+                <signal pad-key="pa5" index="4" function="ADC" group="ADC"/>
+                <signal pad-key="pa6" index="5" function="ADC" group="ADC"/>
+                <signal pad-key="pa7" index="6" function="ADC" group="ADC"/>
+                <signal pad-key="pb4" index="7" function="ADC" group="ADC"/>
+                <signal pad-key="pb5" index="8" function="ADC" group="ADC"/>
+                <signal pad-key="pb6" index="9" function="ADC" group="ADC"/>
+                <signal pad-key="pb7" index="10" function="ADC" group="ADC"/>
+                <signal pad-key="pa3" function="AREF" group="AREF"/>
             </signals>
         </peripheral>
         <peripheral key="ac" name="AC" module-key="ac">
             <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"/>
-                <signal pad-id="pa5" index="2" function="ACIN" group="AIN"/>
+                <signal pad-key="pa7" index="0" function="ACIN" group="AIN"/>
+                <signal pad-key="pa6" index="1" function="ACIN" group="AIN"/>
+                <signal pad-key="pa5" index="2" function="ACIN" group="AIN"/>
             </signals>
         </peripheral>
         <peripheral key="usi" name="USI" module-key="usi">
             <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"/>
-                <signal pad-id="pa2" function="USI_ALT" group="SCL " field="USIPOS"/>
-                <signal pad-id="pa0" function="USI_ALT" group="SDA" field="USIPOS"/>
-                <signal pad-id="pb0" function="USI" group="DI" field="USIPOS"/>
-                <signal pad-id="pb1" function="USI" group="DO" field="USIPOS"/>
-                <signal pad-id="pb2" function="USI" group="USCK" field="USIPOS"/>
-                <signal pad-id="pa2" function="USI_ALT" group="USCK" field="USIPOS"/>
-                <signal pad-id="pa1" function="USI_ALT" group="DO" field="USIPOS"/>
-                <signal pad-id="pa0" function="USI_ALT" group="DI" field="USIPOS"/>
+                <signal pad-key="pb0" function="USI" group="SDA" field="USIPOS"/>
+                <signal pad-key="pb2" function="USI" group="SCL" field="USIPOS"/>
+                <signal pad-key="pa2" function="USI_ALT" group="SCL " field="USIPOS"/>
+                <signal pad-key="pa0" function="USI_ALT" group="SDA" field="USIPOS"/>
+                <signal pad-key="pb0" function="USI" group="DI" field="USIPOS"/>
+                <signal pad-key="pb1" function="USI" group="DO" field="USIPOS"/>
+                <signal pad-key="pb2" function="USI" group="USCK" field="USIPOS"/>
+                <signal pad-key="pa2" function="USI_ALT" group="USCK" field="USIPOS"/>
+                <signal pad-key="pa1" function="USI_ALT" group="DO" field="USIPOS"/>
+                <signal pad-key="pa0" function="USI_ALT" group="DI" field="USIPOS"/>
             </signals>
         </peripheral>
         <peripheral key="eeprom" name="EEPROM" module-key="eeprom">
@@ -270,19 +270,19 @@
         <peripheral key="tc0" name="TC0" module-key="tc8">
             <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"/>
+                <signal pad-key="pa4" function="T0" group="ICP0"/>
+                <signal pad-key="pb6" function="T0" group="T0"/>
             </signals>
         </peripheral>
         <peripheral key="tc1" name="TC1" module-key="tc16">
             <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"/>
-                <signal pad-id="pb2" function="T1" group="OC1BINV"/>
-                <signal pad-id="pb3" function="T1" group="OC1B"/>
-                <signal pad-id="pb4" function="T1" group="OC1DINV"/>
-                <signal pad-id="pb5" function="T1" group="OC1D"/>
+                <signal pad-key="pb0" function="T1" group="OC1AINV"/>
+                <signal pad-key="pb1" function="T1" group="OC1A"/>
+                <signal pad-key="pb2" function="T1" group="OC1BINV"/>
+                <signal pad-key="pb3" function="T1" group="OC1B"/>
+                <signal pad-key="pb4" function="T1" group="OC1DINV"/>
+                <signal pad-key="pb5" function="T1" group="OC1D"/>
             </signals>
         </peripheral>
         <peripheral key="boot_load" name="BOOT_LOAD" module-key="boot_load">
@@ -291,24 +291,24 @@
         <peripheral key="exint" name="EXINT" module-key="exint">
             <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"/>
-                <signal pad-id="pa2" index="2" function="EXTINT" group="PCINT"/>
-                <signal pad-id="pa3" index="3" function="EXTINT" group="PCINT"/>
-                <signal pad-id="pa4" index="4" function="EXTINT" group="PCINT"/>
-                <signal pad-id="pa5" index="5" function="EXTINT" group="PCINT"/>
-                <signal pad-id="pa6" index="6" function="EXTINT" group="PCINT"/>
-                <signal pad-id="pa7" index="7" function="EXTINT" group="PCINT"/>
-                <signal pad-id="pb0" index="8" function="EXTINT" group="PCINT"/>
-                <signal pad-id="pb1" index="9" function="EXTINT" group="PCINT"/>
-                <signal pad-id="pb2" index="10" function="EXTINT" group="PCINT"/>
-                <signal pad-id="pb3" index="11" function="EXTINT" group="PCINT"/>
-                <signal pad-id="pb4" index="12" function="EXTINT" group="PCINT"/>
-                <signal pad-id="pb5" index="13" function="EXTINT" group="PCINT"/>
-                <signal pad-id="pb6" index="14" function="EXTINT" group="PCINT"/>
-                <signal pad-id="pb7" index="15" function="EXTINT" group="PCINT"/>
-                <signal pad-id="pa2" index="1" function="EXTINT" group="INT"/>
-                <signal pad-id="pb6" index="0" function="EXTINT" group="INT"/>
+                <signal pad-key="pa0" index="0" function="EXTINT" group="PCINT"/>
+                <signal pad-key="pa1" index="1" function="EXTINT" group="PCINT"/>
+                <signal pad-key="pa2" index="2" function="EXTINT" group="PCINT"/>
+                <signal pad-key="pa3" index="3" function="EXTINT" group="PCINT"/>
+                <signal pad-key="pa4" index="4" function="EXTINT" group="PCINT"/>
+                <signal pad-key="pa5" index="5" function="EXTINT" group="PCINT"/>
+                <signal pad-key="pa6" index="6" function="EXTINT" group="PCINT"/>
+                <signal pad-key="pa7" index="7" function="EXTINT" group="PCINT"/>
+                <signal pad-key="pb0" index="8" function="EXTINT" group="PCINT"/>
+                <signal pad-key="pb1" index="9" function="EXTINT" group="PCINT"/>
+                <signal pad-key="pb2" index="10" function="EXTINT" group="PCINT"/>
+                <signal pad-key="pb3" index="11" function="EXTINT" group="PCINT"/>
+                <signal pad-key="pb4" index="12" function="EXTINT" group="PCINT"/>
+                <signal pad-key="pb5" index="13" function="EXTINT" group="PCINT"/>
+                <signal pad-key="pb6" index="14" function="EXTINT" group="PCINT"/>
+                <signal pad-key="pb7" index="15" function="EXTINT" group="PCINT"/>
+                <signal pad-key="pa2" index="1" function="EXTINT" group="INT"/>
+                <signal pad-key="pb6" index="0" function="EXTINT" group="INT"/>
             </signals>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="cpu">
@@ -641,70 +641,92 @@
             </register-group>
         </module>
     </modules>
+    <pads>
+        <pad key="pb0" name="PB0"/>
+        <pad key="pb1" name="PB1"/>
+        <pad key="pb2" name="PB2"/>
+        <pad key="pb3" name="PB3"/>
+        <pad key="vcc" name="VCC"/>
+        <pad key="gnd" name="GND"/>
+        <pad key="pb4" name="PB4"/>
+        <pad key="pb5" name="PB5"/>
+        <pad key="pb6" name="PB6"/>
+        <pad key="pb7" name="PB7"/>
+        <pad key="pa7" name="PA7"/>
+        <pad key="pa6" name="PA6"/>
+        <pad key="pa5" name="PA5"/>
+        <pad key="pa4" name="PA4"/>
+        <pad key="avcc" name="AVCC"/>
+        <pad key="agnd" name="AGND"/>
+        <pad key="pa3" name="PA3"/>
+        <pad key="pa2" name="PA2"/>
+        <pad key="pa1" name="PA1"/>
+        <pad key="pa0" name="PA0"/>
+    </pads>
     <pinouts>
         <pinout key="soic_20" name="SOIC_20" type="soic">
-            <pin position="1" pad="PB0"/>
-            <pin position="2" pad="PB1"/>
-            <pin position="3" pad="PB2"/>
-            <pin position="4" pad="PB3"/>
-            <pin position="5" pad="VCC"/>
-            <pin position="6" pad="GND"/>
-            <pin position="7" pad="PB4"/>
-            <pin position="8" pad="PB5"/>
-            <pin position="9" pad="PB6"/>
-            <pin position="10" pad="PB7"/>
-            <pin position="11" pad="PA7"/>
-            <pin position="12" pad="PA6"/>
-            <pin position="13" pad="PA5"/>
-            <pin position="14" pad="PA4"/>
-            <pin position="15" pad="AVCC"/>
-            <pin position="16" pad="AGND"/>
-            <pin position="17" pad="PA3"/>
-            <pin position="18" pad="PA2"/>
-            <pin position="19" pad="PA1"/>
-            <pin position="20" pad="PA0"/>
+            <pin position="1" pad-key="pb0"/>
+            <pin position="2" pad-key="pb1"/>
+            <pin position="3" pad-key="pb2"/>
+            <pin position="4" pad-key="pb3"/>
+            <pin position="5" pad-key="vcc"/>
+            <pin position="6" pad-key="gnd"/>
+            <pin position="7" pad-key="pb4"/>
+            <pin position="8" pad-key="pb5"/>
+            <pin position="9" pad-key="pb6"/>
+            <pin position="10" pad-key="pb7"/>
+            <pin position="11" pad-key="pa7"/>
+            <pin position="12" pad-key="pa6"/>
+            <pin position="13" pad-key="pa5"/>
+            <pin position="14" pad-key="pa4"/>
+            <pin position="15" pad-key="avcc"/>
+            <pin position="16" pad-key="agnd"/>
+            <pin position="17" pad-key="pa3"/>
+            <pin position="18" pad-key="pa2"/>
+            <pin position="19" pad-key="pa1"/>
+            <pin position="20" pad-key="pa0"/>
         </pinout>
         <pinout key="qfn_32" name="QFN_32" type="qfn">
-            <pin position="1" pad="NC"/>
-            <pin position="2" pad="PB3"/>
-            <pin position="3" pad="NC"/>
-            <pin position="4" pad="VCC"/>
-            <pin position="5" pad="GND"/>
-            <pin position="6" pad="NC"/>
-            <pin position="7" pad="PB4"/>
-            <pin position="8" pad="PB5"/>
-            <pin position="9" pad="NC"/>
-            <pin position="10" pad="PB6"/>
-            <pin position="11" pad="PB7"/>
-            <pin position="12" pad="NC"/>
-            <pin position="13" pad="PA7"/>
-            <pin position="14" pad="PA6"/>
-            <pin position="15" pad="PA5"/>
-            <pin position="16" pad="NC"/>
-            <pin position="17" pad="PA4"/>
-            <pin position="18" pad="AVCC"/>
-            <pin position="19" pad="NC"/>
-            <pin position="20" pad="NC"/>
-            <pin position="21" pad="AGND"/>
-            <pin position="22" pad="PA3"/>
-            <pin position="23" pad="PA2"/>
-            <pin position="24" pad="NC"/>
-            <pin position="25" pad="PA1"/>
-            <pin position="26" pad="PA0"/>
-            <pin position="27" pad="NC"/>
-            <pin position="28" pad="NC"/>
-            <pin position="29" pad="NC"/>
-            <pin position="30" pad="PB0"/>
-            <pin position="31" pad="PB1"/>
-            <pin position="32" pad="PB2"/>
+            <pin position="1"/>
+            <pin position="2" pad-key="pb3"/>
+            <pin position="3"/>
+            <pin position="4" pad-key="vcc"/>
+            <pin position="5" pad-key="gnd"/>
+            <pin position="6"/>
+            <pin position="7" pad-key="pb4"/>
+            <pin position="8" pad-key="pb5"/>
+            <pin position="9"/>
+            <pin position="10" pad-key="pb6"/>
+            <pin position="11" pad-key="pb7"/>
+            <pin position="12"/>
+            <pin position="13" pad-key="pa7"/>
+            <pin position="14" pad-key="pa6"/>
+            <pin position="15" pad-key="pa5"/>
+            <pin position="16"/>
+            <pin position="17" pad-key="pa4"/>
+            <pin position="18" pad-key="avcc"/>
+            <pin position="19"/>
+            <pin position="20"/>
+            <pin position="21" pad-key="agnd"/>
+            <pin position="22" pad-key="pa3"/>
+            <pin position="23" pad-key="pa2"/>
+            <pin position="24"/>
+            <pin position="25" pad-key="pa1"/>
+            <pin position="26" pad-key="pa0"/>
+            <pin position="27"/>
+            <pin position="28"/>
+            <pin position="29"/>
+            <pin position="30" pad-key="pb0"/>
+            <pin position="31" pad-key="pb1"/>
+            <pin position="32" pad-key="pb2"/>
         </pinout>
     </pinouts>
     <variants>
-        <variant name="ATtiny861V-10MU" pinout-key="qfn_32" package="MLF32"/>
-        <variant name="ATtiny861V-10PU" pinout-key="soic_20" package="PDIP20"/>
-        <variant name="ATtiny861V-10SU" pinout-key="soic_20" package="SOIC20"/>
-        <variant name="ATtiny861-20MU" pinout-key="qfn_32" package="MLF32"/>
-        <variant name="ATtiny861-20PU" pinout-key="soic_20" package="PDIP20"/>
-        <variant name="ATtiny861-20SU" pinout-key="soic_20" package="SOIC20"/>
+        <variant key="attiny861v_10mu" name="ATtiny861V-10MU" pinout-key="qfn_32"/>
+        <variant key="attiny861v_10pu" name="ATtiny861V-10PU" pinout-key="soic_20"/>
+        <variant key="attiny861v_10su" name="ATtiny861V-10SU" pinout-key="soic_20"/>
+        <variant key="attiny861_20mu" name="ATtiny861-20MU" pinout-key="qfn_32"/>
+        <variant key="attiny861_20pu" name="ATtiny861-20PU" pinout-key="soic_20"/>
+        <variant key="attiny861_20su" name="ATtiny861-20SU" pinout-key="soic_20"/>
     </variants>
 </device>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY861A.xml b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY861A.xml
index 29bea023..ef7a4ee5 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY861A.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY861A.xml
@@ -198,27 +198,27 @@
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pa2" index="2" function="default" group="P"/>
-                <signal pad-id="pa3" index="3" function="default" group="P"/>
-                <signal pad-id="pa4" index="4" function="default" group="P"/>
-                <signal pad-id="pa5" index="5" function="default" group="P"/>
-                <signal pad-id="pa6" index="6" function="default" group="P"/>
-                <signal pad-id="pa7" index="7" function="default" group="P"/>
+                <signal pad-key="pa0" index="0" function="default" group="P"/>
+                <signal pad-key="pa1" index="1" function="default" group="P"/>
+                <signal pad-key="pa2" index="2" function="default" group="P"/>
+                <signal pad-key="pa3" index="3" function="default" group="P"/>
+                <signal pad-key="pa4" index="4" function="default" group="P"/>
+                <signal pad-key="pa5" index="5" function="default" group="P"/>
+                <signal pad-key="pa6" index="6" function="default" group="P"/>
+                <signal pad-key="pa7" index="7" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pb2" index="2" function="default" group="P"/>
-                <signal pad-id="pb3" index="3" function="default" group="P"/>
-                <signal pad-id="pb4" index="4" function="default" group="P"/>
-                <signal pad-id="pb5" index="5" function="default" group="P"/>
-                <signal pad-id="pb6" index="6" function="default" group="P"/>
-                <signal pad-id="pb7" index="7" function="default" group="P"/>
+                <signal pad-key="pb0" index="0" function="default" group="P"/>
+                <signal pad-key="pb1" index="1" function="default" group="P"/>
+                <signal pad-key="pb2" index="2" function="default" group="P"/>
+                <signal pad-key="pb3" index="3" function="default" group="P"/>
+                <signal pad-key="pb4" index="4" function="default" group="P"/>
+                <signal pad-key="pb5" index="5" function="default" group="P"/>
+                <signal pad-key="pb6" index="6" function="default" group="P"/>
+                <signal pad-key="pb7" index="7" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="adc" name="ADC" module-key="adc">
@@ -580,71 +580,94 @@
             </register-group>
         </module>
     </modules>
+    <pads>
+        <pad key="pb0" name="PB0"/>
+        <pad key="pb1" name="PB1"/>
+        <pad key="pb2" name="PB2"/>
+        <pad key="pb3" name="PB3"/>
+        <pad key="vcc" name="VCC"/>
+        <pad key="gnd" name="GND"/>
+        <pad key="pb4" name="PB4"/>
+        <pad key="pb5" name="PB5"/>
+        <pad key="pb6" name="PB6"/>
+        <pad key="pb7" name="PB7"/>
+        <pad key="pa7" name="PA7"/>
+        <pad key="pa6" name="PA6"/>
+        <pad key="pa5" name="PA5"/>
+        <pad key="pa4" name="PA4"/>
+        <pad key="avcc" name="AVCC"/>
+        <pad key="agnd" name="AGND"/>
+        <pad key="pa3" name="PA3"/>
+        <pad key="pa2" name="PA2"/>
+        <pad key="pa1" name="PA1"/>
+        <pad key="va0" name="VA0"/>
+        <pad key="pa0" name="PA0"/>
+    </pads>
     <pinouts>
         <pinout key="pdip_soic_tssop_20" name="PDIP_SOIC_TSSOP_20" type="dip">
-            <pin position="1" pad="PB0"/>
-            <pin position="2" pad="PB1"/>
-            <pin position="3" pad="PB2"/>
-            <pin position="4" pad="PB3"/>
-            <pin position="5" pad="VCC"/>
-            <pin position="6" pad="GND"/>
-            <pin position="7" pad="PB4"/>
-            <pin position="8" pad="PB5"/>
-            <pin position="9" pad="PB6"/>
-            <pin position="10" pad="PB7"/>
-            <pin position="11" pad="PA7"/>
-            <pin position="12" pad="PA6"/>
-            <pin position="13" pad="PA5"/>
-            <pin position="14" pad="PA4"/>
-            <pin position="15" pad="AVCC"/>
-            <pin position="16" pad="AGND"/>
-            <pin position="17" pad="PA3"/>
-            <pin position="18" pad="PA2"/>
-            <pin position="19" pad="PA1"/>
-            <pin position="20" pad="VA0"/>
+            <pin position="1" pad-key="pb0"/>
+            <pin position="2" pad-key="pb1"/>
+            <pin position="3" pad-key="pb2"/>
+            <pin position="4" pad-key="pb3"/>
+            <pin position="5" pad-key="vcc"/>
+            <pin position="6" pad-key="gnd"/>
+            <pin position="7" pad-key="pb4"/>
+            <pin position="8" pad-key="pb5"/>
+            <pin position="9" pad-key="pb6"/>
+            <pin position="10" pad-key="pb7"/>
+            <pin position="11" pad-key="pa7"/>
+            <pin position="12" pad-key="pa6"/>
+            <pin position="13" pad-key="pa5"/>
+            <pin position="14" pad-key="pa4"/>
+            <pin position="15" pad-key="avcc"/>
+            <pin position="16" pad-key="agnd"/>
+            <pin position="17" pad-key="pa3"/>
+            <pin position="18" pad-key="pa2"/>
+            <pin position="19" pad-key="pa1"/>
+            <pin position="20" pad-key="va0"/>
         </pinout>
         <pinout key="qfn32" name="QFN32" type="qfn">
-            <pin position="1" pad="NC"/>
-            <pin position="2" pad="PB3"/>
-            <pin position="3" pad="NC"/>
-            <pin position="4" pad="VCC"/>
-            <pin position="5" pad="GND"/>
-            <pin position="6" pad="NC"/>
-            <pin position="7" pad="PB4"/>
-            <pin position="8" pad="PB5"/>
-            <pin position="9" pad="NC"/>
-            <pin position="10" pad="PB6"/>
-            <pin position="11" pad="PB7"/>
-            <pin position="12" pad="NC"/>
-            <pin position="13" pad="PA7"/>
-            <pin position="14" pad="PA6"/>
-            <pin position="15" pad="PA5"/>
-            <pin position="16" pad="NC"/>
-            <pin position="17" pad="PA4"/>
-            <pin position="18" pad="AVCC"/>
-            <pin position="19" pad="NC"/>
-            <pin position="20" pad="NC"/>
-            <pin position="21" pad="AGND"/>
-            <pin position="22" pad="PA3"/>
-            <pin position="23" pad="PA2"/>
-            <pin position="24" pad="NC"/>
-            <pin position="25" pad="PA1"/>
-            <pin position="26" pad="PA0"/>
-            <pin position="27" pad="NC"/>
-            <pin position="28" pad="NC"/>
-            <pin position="29" pad="NC"/>
-            <pin position="30" pad="PB0"/>
-            <pin position="31" pad="PB1"/>
-            <pin position="32" pad="PB2"/>
+            <pin position="1"/>
+            <pin position="2" pad-key="pb3"/>
+            <pin position="3"/>
+            <pin position="4" pad-key="vcc"/>
+            <pin position="5" pad-key="gnd"/>
+            <pin position="6"/>
+            <pin position="7" pad-key="pb4"/>
+            <pin position="8" pad-key="pb5"/>
+            <pin position="9"/>
+            <pin position="10" pad-key="pb6"/>
+            <pin position="11" pad-key="pb7"/>
+            <pin position="12"/>
+            <pin position="13" pad-key="pa7"/>
+            <pin position="14" pad-key="pa6"/>
+            <pin position="15" pad-key="pa5"/>
+            <pin position="16"/>
+            <pin position="17" pad-key="pa4"/>
+            <pin position="18" pad-key="avcc"/>
+            <pin position="19"/>
+            <pin position="20"/>
+            <pin position="21" pad-key="agnd"/>
+            <pin position="22" pad-key="pa3"/>
+            <pin position="23" pad-key="pa2"/>
+            <pin position="24"/>
+            <pin position="25" pad-key="pa1"/>
+            <pin position="26" pad-key="pa0"/>
+            <pin position="27"/>
+            <pin position="28"/>
+            <pin position="29"/>
+            <pin position="30" pad-key="pb0"/>
+            <pin position="31" pad-key="pb1"/>
+            <pin position="32" pad-key="pb2"/>
         </pinout>
     </pinouts>
     <variants>
-        <variant name="ATtiny861A-PU" pinout-key="pdip_soic_tssop_20" package="PDIP20"/>
-        <variant name="ATtiny861A-SUR" pinout-key="pdip_soic_tssop_20" package="SOIC20"/>
-        <variant name="ATtiny861A-SU" pinout-key="pdip_soic_tssop_20" package="SOIC20"/>
-        <variant name="ATtiny861A-XU" pinout-key="pdip_soic_tssop_20" package="TSSOP20"/>
-        <variant name="ATtiny861A-XUR" pinout-key="pdip_soic_tssop_20" package="TSSOP20"/>
-        <variant name="ATtiny861A-MUR" pinout-key="qfn32" package="VQFN32"/>
-        <variant name="ATtiny861A-MU" pinout-key="qfn32" package="VQFN32"/>
+        <variant key="attiny861a_pu" name="ATtiny861A-PU" pinout-key="pdip_soic_tssop_20"/>
+        <variant key="attiny861a_sur" name="ATtiny861A-SUR" pinout-key="pdip_soic_tssop_20"/>
+        <variant key="attiny861a_su" name="ATtiny861A-SU" pinout-key="pdip_soic_tssop_20"/>
+        <variant key="attiny861a_xu" name="ATtiny861A-XU" pinout-key="pdip_soic_tssop_20"/>
+        <variant key="attiny861a_xur" name="ATtiny861A-XUR" pinout-key="pdip_soic_tssop_20"/>
+        <variant key="attiny861a_mur" name="ATtiny861A-MUR" pinout-key="qfn32"/>
+        <variant key="attiny861a_mu" name="ATtiny861A-MU" pinout-key="qfn32"/>
     </variants>
 </device>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY87.xml b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY87.xml
index b2edf523..d096d164 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY87.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY87.xml
@@ -172,27 +172,27 @@
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pa2" index="2" function="default" group="P"/>
-                <signal pad-id="pa3" index="3" function="default" group="P"/>
-                <signal pad-id="pa4" index="4" function="default" group="P"/>
-                <signal pad-id="pa5" index="5" function="default" group="P"/>
-                <signal pad-id="pa6" index="6" function="default" group="P"/>
-                <signal pad-id="pa7" index="7" function="default" group="P"/>
+                <signal pad-key="pa0" index="0" function="default" group="P"/>
+                <signal pad-key="pa1" index="1" function="default" group="P"/>
+                <signal pad-key="pa2" index="2" function="default" group="P"/>
+                <signal pad-key="pa3" index="3" function="default" group="P"/>
+                <signal pad-key="pa4" index="4" function="default" group="P"/>
+                <signal pad-key="pa5" index="5" function="default" group="P"/>
+                <signal pad-key="pa6" index="6" function="default" group="P"/>
+                <signal pad-key="pa7" index="7" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pb2" index="2" function="default" group="P"/>
-                <signal pad-id="pb3" index="3" function="default" group="P"/>
-                <signal pad-id="pb4" index="4" function="default" group="P"/>
-                <signal pad-id="pb5" index="5" function="default" group="P"/>
-                <signal pad-id="pb6" index="6" function="default" group="P"/>
-                <signal pad-id="pb7" index="7" function="default" group="P"/>
+                <signal pad-key="pb0" index="0" function="default" group="P"/>
+                <signal pad-key="pb1" index="1" function="default" group="P"/>
+                <signal pad-key="pb2" index="2" function="default" group="P"/>
+                <signal pad-key="pb3" index="3" function="default" group="P"/>
+                <signal pad-key="pb4" index="4" function="default" group="P"/>
+                <signal pad-key="pb5" index="5" function="default" group="P"/>
+                <signal pad-key="pb6" index="6" function="default" group="P"/>
+                <signal pad-key="pb7" index="7" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="linuart" name="LINUART" module-key="linuart">
@@ -651,66 +651,88 @@
             </register-group>
         </module>
     </modules>
+    <pads>
+        <pad key="pa0" name="PA0"/>
+        <pad key="pa1" name="PA1"/>
+        <pad key="pa2" name="PA2"/>
+        <pad key="pa3" name="PA3"/>
+        <pad key="avcc" name="AVCC"/>
+        <pad key="agnd" name="AGND"/>
+        <pad key="pa4" name="PA4"/>
+        <pad key="pa5" name="PA5"/>
+        <pad key="pa6" name="PA6"/>
+        <pad key="pa7" name="PA7"/>
+        <pad key="pb7" name="PB7"/>
+        <pad key="pb6" name="PB6"/>
+        <pad key="pb5" name="PB5"/>
+        <pad key="pb4" name="PB4"/>
+        <pad key="vcc" name="VCC"/>
+        <pad key="gnd" name="GND"/>
+        <pad key="pb3" name="PB3"/>
+        <pad key="pb2" name="PB2"/>
+        <pad key="pb1" name="PB1"/>
+        <pad key="pb0" name="PB0"/>
+    </pads>
     <pinouts>
         <pinout key="soic20" name="SOIC20" type="soic">
-            <pin position="1" pad="PA0"/>
-            <pin position="2" pad="PA1"/>
-            <pin position="3" pad="PA2"/>
-            <pin position="4" pad="PA3"/>
-            <pin position="5" pad="AVCC"/>
-            <pin position="6" pad="AGND"/>
-            <pin position="7" pad="PA4"/>
-            <pin position="8" pad="PA5"/>
-            <pin position="9" pad="PA6"/>
-            <pin position="10" pad="PA7"/>
-            <pin position="11" pad="PB7"/>
-            <pin position="12" pad="PB6"/>
-            <pin position="13" pad="PB5"/>
-            <pin position="14" pad="PB4"/>
-            <pin position="15" pad="VCC"/>
-            <pin position="16" pad="GND"/>
-            <pin position="17" pad="PB3"/>
-            <pin position="18" pad="PB2"/>
-            <pin position="19" pad="PB1"/>
-            <pin position="20" pad="PB0"/>
+            <pin position="1" pad-key="pa0"/>
+            <pin position="2" pad-key="pa1"/>
+            <pin position="3" pad-key="pa2"/>
+            <pin position="4" pad-key="pa3"/>
+            <pin position="5" pad-key="avcc"/>
+            <pin position="6" pad-key="agnd"/>
+            <pin position="7" pad-key="pa4"/>
+            <pin position="8" pad-key="pa5"/>
+            <pin position="9" pad-key="pa6"/>
+            <pin position="10" pad-key="pa7"/>
+            <pin position="11" pad-key="pb7"/>
+            <pin position="12" pad-key="pb6"/>
+            <pin position="13" pad-key="pb5"/>
+            <pin position="14" pad-key="pb4"/>
+            <pin position="15" pad-key="vcc"/>
+            <pin position="16" pad-key="gnd"/>
+            <pin position="17" pad-key="pb3"/>
+            <pin position="18" pad-key="pb2"/>
+            <pin position="19" pad-key="pb1"/>
+            <pin position="20" pad-key="pb0"/>
         </pinout>
         <pinout key="vqfn32" name="VQFN32" type="qfn">
-            <pin position="1" pad="NC"/>
-            <pin position="2" pad="NC"/>
-            <pin position="3" pad="PA3"/>
-            <pin position="4" pad="AVCC"/>
-            <pin position="5" pad="AGND"/>
-            <pin position="6" pad="NC"/>
-            <pin position="7" pad="NC"/>
-            <pin position="8" pad="NC"/>
-            <pin position="9" pad="PA4"/>
-            <pin position="10" pad="PA5"/>
-            <pin position="11" pad="PA6"/>
-            <pin position="12" pad="PA7"/>
-            <pin position="13" pad="NC"/>
-            <pin position="14" pad="PB7"/>
-            <pin position="15" pad="PB6"/>
-            <pin position="16" pad="NC"/>
-            <pin position="17" pad="NC"/>
-            <pin position="18" pad="PB5"/>
-            <pin position="19" pad="PB4"/>
-            <pin position="20" pad="VCC"/>
-            <pin position="21" pad="GND"/>
-            <pin position="22" pad="NC"/>
-            <pin position="23" pad="NC"/>
-            <pin position="24" pad="NC"/>
-            <pin position="25" pad="PB3"/>
-            <pin position="26" pad="PB2"/>
-            <pin position="27" pad="PB1"/>
-            <pin position="28" pad="PB0"/>
-            <pin position="29" pad="PA0"/>
-            <pin position="30" pad="PA1"/>
-            <pin position="31" pad="PA2"/>
-            <pin position="32" pad="NC"/>
+            <pin position="1"/>
+            <pin position="2"/>
+            <pin position="3" pad-key="pa3"/>
+            <pin position="4" pad-key="avcc"/>
+            <pin position="5" pad-key="agnd"/>
+            <pin position="6"/>
+            <pin position="7"/>
+            <pin position="8"/>
+            <pin position="9" pad-key="pa4"/>
+            <pin position="10" pad-key="pa5"/>
+            <pin position="11" pad-key="pa6"/>
+            <pin position="12" pad-key="pa7"/>
+            <pin position="13"/>
+            <pin position="14" pad-key="pb7"/>
+            <pin position="15" pad-key="pb6"/>
+            <pin position="16"/>
+            <pin position="17"/>
+            <pin position="18" pad-key="pb5"/>
+            <pin position="19" pad-key="pb4"/>
+            <pin position="20" pad-key="vcc"/>
+            <pin position="21" pad-key="gnd"/>
+            <pin position="22"/>
+            <pin position="23"/>
+            <pin position="24"/>
+            <pin position="25" pad-key="pb3"/>
+            <pin position="26" pad-key="pb2"/>
+            <pin position="27" pad-key="pb1"/>
+            <pin position="28" pad-key="pb0"/>
+            <pin position="29" pad-key="pa0"/>
+            <pin position="30" pad-key="pa1"/>
+            <pin position="31" pad-key="pa2"/>
+            <pin position="32"/>
         </pinout>
     </pinouts>
     <variants>
-        <variant name="ATtiny87-SU" pinout-key="soic20" package="SOIC20"/>
-        <variant name="ATtiny87-MU" pinout-key="vqfn32" package="VQFN32"/>
+        <variant key="attiny87_su" name="ATtiny87-SU" pinout-key="soic20"/>
+        <variant key="attiny87_mu" name="ATtiny87-MU" pinout-key="vqfn32"/>
     </variants>
 </device>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY88.xml b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY88.xml
index 135573cb..b75953b8 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY88.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY88.xml
@@ -198,74 +198,74 @@
         <peripheral key="tc1" name="TC1" module-key="tc16">
             <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"/>
-                <signal pad-id="pb1" group="OCA"/>
-                <signal pad-id="pb3" group="OCB"/>
+                <signal pad-key="pd5" group="T"/>
+                <signal pad-key="pb0" group="ICP"/>
+                <signal pad-key="pb1" group="OCA"/>
+                <signal pad-key="pb3" group="OCB"/>
             </signals>
         </peripheral>
         <peripheral key="ac" name="AC" module-key="ac">
             <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"/>
+                <signal pad-key="pd6" index="0" group="AIN"/>
+                <signal pad-key="pd7" index="1" group="AIN"/>
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pb2" index="2" function="default" group="P"/>
-                <signal pad-id="pb3" index="3" function="default" group="P"/>
-                <signal pad-id="pb4" index="4" function="default" group="P"/>
-                <signal pad-id="pb5" index="5" function="default" group="P"/>
-                <signal pad-id="pb6" index="6" function="default" group="P"/>
-                <signal pad-id="pb7" index="7" function="default" group="P"/>
+                <signal pad-key="pb0" index="0" function="default" group="P"/>
+                <signal pad-key="pb1" index="1" function="default" group="P"/>
+                <signal pad-key="pb2" index="2" function="default" group="P"/>
+                <signal pad-key="pb3" index="3" function="default" group="P"/>
+                <signal pad-key="pb4" index="4" function="default" group="P"/>
+                <signal pad-key="pb5" index="5" function="default" group="P"/>
+                <signal pad-key="pb6" index="6" function="default" group="P"/>
+                <signal pad-key="pb7" index="7" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pd2" index="2" function="default" group="P"/>
-                <signal pad-id="pd3" index="3" function="default" group="P"/>
-                <signal pad-id="pd4" index="4" function="default" group="P"/>
-                <signal pad-id="pd5" index="5" function="default" group="P"/>
-                <signal pad-id="pd6" index="6" function="default" group="P"/>
-                <signal pad-id="pd7" index="7" function="default" group="P"/>
+                <signal pad-key="pd0" index="0" function="default" group="P"/>
+                <signal pad-key="pd1" index="1" function="default" group="P"/>
+                <signal pad-key="pd2" index="2" function="default" group="P"/>
+                <signal pad-key="pd3" index="3" function="default" group="P"/>
+                <signal pad-key="pd4" index="4" function="default" group="P"/>
+                <signal pad-key="pd5" index="5" function="default" group="P"/>
+                <signal pad-key="pd6" index="6" function="default" group="P"/>
+                <signal pad-key="pd7" index="7" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pc2" index="2" function="default" group="P"/>
-                <signal pad-id="pc3" index="3" function="default" group="P"/>
-                <signal pad-id="pc4" index="4" function="default" group="P"/>
-                <signal pad-id="pc5" index="5" function="default" group="P"/>
-                <signal pad-id="pc6" index="6" function="default" group="P"/>
-                <signal pad-id="pc7" index="7" function="default" group="P"/>
+                <signal pad-key="pc0" index="0" function="default" group="P"/>
+                <signal pad-key="pc1" index="1" function="default" group="P"/>
+                <signal pad-key="pc2" index="2" function="default" group="P"/>
+                <signal pad-key="pc3" index="3" function="default" group="P"/>
+                <signal pad-key="pc4" index="4" function="default" group="P"/>
+                <signal pad-key="pc5" index="5" function="default" group="P"/>
+                <signal pad-key="pc6" index="6" function="default" group="P"/>
+                <signal pad-key="pc7" index="7" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pa2" index="2" function="default" group="P"/>
-                <signal pad-id="pa3" index="3" function="default" group="P"/>
+                <signal pad-key="pa0" index="0" function="default" group="P"/>
+                <signal pad-key="pa1" index="1" function="default" group="P"/>
+                <signal pad-key="pa2" index="2" function="default" group="P"/>
+                <signal pad-key="pa3" index="3" function="default" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="spi" name="SPI" module-key="spi">
             <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"/>
-                <signal pad-id="pb3" group="MOSI"/>
-                <signal pad-id="pb2" group="SS"/>
+                <signal pad-key="pb5" group="SCK"/>
+                <signal pad-key="pb4" group="MISO"/>
+                <signal pad-key="pb3" group="MOSI"/>
+                <signal pad-key="pb2" group="SS"/>
             </signals>
         </peripheral>
         <peripheral key="wdt" name="WDT" module-key="wdt">
@@ -274,62 +274,62 @@
         <peripheral key="twi" name="TWI" module-key="twi">
             <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"/>
+                <signal pad-key="pc6" group="SCL"/>
+                <signal pad-key="pc5" group="SDA"/>
             </signals>
         </peripheral>
         <peripheral key="adc" name="ADC" module-key="adc">
             <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"/>
-                <signal pad-id="pc2" index="2" group="ADC"/>
-                <signal pad-id="pc3" index="3" group="ADC"/>
-                <signal pad-id="pc4" index="4" group="ADC"/>
-                <signal pad-id="pc5" index="5" group="ADC"/>
-                <signal pad-id="pa0" index="6" group="ADC"/>
-                <signal pad-id="pa1" index="7" group="ADC"/>
+                <signal pad-key="pc0" index="0" group="ADC"/>
+                <signal pad-key="pc1" index="1" group="ADC"/>
+                <signal pad-key="pc2" index="2" group="ADC"/>
+                <signal pad-key="pc3" index="3" group="ADC"/>
+                <signal pad-key="pc4" index="4" group="ADC"/>
+                <signal pad-key="pc5" index="5" group="ADC"/>
+                <signal pad-key="pa0" index="6" group="ADC"/>
+                <signal pad-key="pa1" index="7" group="ADC"/>
             </signals>
         </peripheral>
         <peripheral key="exint" name="EXINT" module-key="exint">
             <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"/>
-                <signal pad-id="pb2" index="2" group="PCINT"/>
-                <signal pad-id="pb3" index="3" group="PCINT"/>
-                <signal pad-id="pb4" index="4" group="PCINT"/>
-                <signal pad-id="pb5" index="5" group="PCINT"/>
-                <signal pad-id="pb6" index="6" group="PCINT"/>
-                <signal pad-id="pb7" index="7" group="PCINT"/>
-                <signal pad-id="pc0" index="8" group="PCINT"/>
-                <signal pad-id="pc1" index="9" group="PCINT"/>
-                <signal pad-id="pc2" index="10" group="PCINT"/>
-                <signal pad-id="pc3" index="11" group="PCINT"/>
-                <signal pad-id="pc4" index="12" group="PCINT"/>
-                <signal pad-id="pc5" index="13" group="PCINT"/>
-                <signal pad-id="pc6" index="14" group="PCINT"/>
-                <signal pad-id="pc7" index="15" group="PCINT"/>
-                <signal pad-id="pd0" index="16" group="PCINT"/>
-                <signal pad-id="pd1" index="17" group="PCINT"/>
-                <signal pad-id="pd2" index="18" group="PCINT"/>
-                <signal pad-id="pd3" index="19" group="PCINT"/>
-                <signal pad-id="pd4" index="20" group="PCINT"/>
-                <signal pad-id="pd5" index="21" group="PCINT"/>
-                <signal pad-id="pd6" index="22" group="PCINT"/>
-                <signal pad-id="pd7" index="23" group="PCINT"/>
-                <signal pad-id="pa0" index="24" group="PCINT"/>
-                <signal pad-id="pa1" index="25" group="PCINT"/>
-                <signal pad-id="pa2" index="26" group="PCINT"/>
-                <signal pad-id="pa3" index="27" group="PCINT"/>
-                <signal pad-id="pd2" index="0" group="INT"/>
-                <signal pad-id="pd3" index="1" group="INT"/>
+                <signal pad-key="pb0" index="0" group="PCINT"/>
+                <signal pad-key="pb1" index="1" group="PCINT"/>
+                <signal pad-key="pb2" index="2" group="PCINT"/>
+                <signal pad-key="pb3" index="3" group="PCINT"/>
+                <signal pad-key="pb4" index="4" group="PCINT"/>
+                <signal pad-key="pb5" index="5" group="PCINT"/>
+                <signal pad-key="pb6" index="6" group="PCINT"/>
+                <signal pad-key="pb7" index="7" group="PCINT"/>
+                <signal pad-key="pc0" index="8" group="PCINT"/>
+                <signal pad-key="pc1" index="9" group="PCINT"/>
+                <signal pad-key="pc2" index="10" group="PCINT"/>
+                <signal pad-key="pc3" index="11" group="PCINT"/>
+                <signal pad-key="pc4" index="12" group="PCINT"/>
+                <signal pad-key="pc5" index="13" group="PCINT"/>
+                <signal pad-key="pc6" index="14" group="PCINT"/>
+                <signal pad-key="pc7" index="15" group="PCINT"/>
+                <signal pad-key="pd0" index="16" group="PCINT"/>
+                <signal pad-key="pd1" index="17" group="PCINT"/>
+                <signal pad-key="pd2" index="18" group="PCINT"/>
+                <signal pad-key="pd3" index="19" group="PCINT"/>
+                <signal pad-key="pd4" index="20" group="PCINT"/>
+                <signal pad-key="pd5" index="21" group="PCINT"/>
+                <signal pad-key="pd6" index="22" group="PCINT"/>
+                <signal pad-key="pd7" index="23" group="PCINT"/>
+                <signal pad-key="pa0" index="24" group="PCINT"/>
+                <signal pad-key="pa1" index="25" group="PCINT"/>
+                <signal pad-key="pa2" index="26" group="PCINT"/>
+                <signal pad-key="pa3" index="27" group="PCINT"/>
+                <signal pad-key="pd2" index="0" group="INT"/>
+                <signal pad-key="pd3" index="1" group="INT"/>
             </signals>
         </peripheral>
         <peripheral key="tc0" name="TC0" module-key="tc8">
             <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"/>
+                <signal pad-key="pd4" group="T"/>
             </signals>
         </peripheral>
         <peripheral key="cpu" name="CPU" module-key="cpu">
@@ -674,142 +674,175 @@
             </register-group>
         </module>
     </modules>
+    <pads>
+        <pad key="pd3" name="PD3"/>
+        <pad key="pd4" name="PD4"/>
+        <pad key="pa2" name="PA2"/>
+        <pad key="vcc" name="VCC"/>
+        <pad key="gnd" name="GND"/>
+        <pad key="pa3" name="PA3"/>
+        <pad key="pb6" name="PB6"/>
+        <pad key="pb7" name="PB7"/>
+        <pad key="pd5" name="PD5"/>
+        <pad key="pd6" name="PD6"/>
+        <pad key="pd7" name="PD7"/>
+        <pad key="pb0" name="PB0"/>
+        <pad key="pb1" name="PB1"/>
+        <pad key="pb2" name="PB2"/>
+        <pad key="pb3" name="PB3"/>
+        <pad key="pb4" name="PB4"/>
+        <pad key="pb5" name="PB5"/>
+        <pad key="avcc" name="AVCC"/>
+        <pad key="pa0" name="PA0"/>
+        <pad key="pc7" name="PC7"/>
+        <pad key="pa1" name="PA1"/>
+        <pad key="pc0" name="PC0"/>
+        <pad key="pc1" name="PC1"/>
+        <pad key="pc2" name="PC2"/>
+        <pad key="pc3" name="PC3"/>
+        <pad key="pc4" name="PC4"/>
+        <pad key="pc5" name="PC5"/>
+        <pad key="pc6" name="PC6"/>
+        <pad key="pd0" name="PD0"/>
+        <pad key="pd1" name="PD1"/>
+        <pad key="pd2" name="PD2"/>
+    </pads>
     <pinouts>
         <pinout key="tqfp_qfn_32" name="TQFP_QFN_32" type="qfn">
-            <pin position="1" pad="PD3"/>
-            <pin position="2" pad="PD4"/>
-            <pin position="3" pad="PA2"/>
-            <pin position="4" pad="VCC"/>
-            <pin position="5" pad="GND"/>
-            <pin position="6" pad="PA3"/>
-            <pin position="7" pad="PB6"/>
-            <pin position="8" pad="PB7"/>
-            <pin position="9" pad="PD5"/>
-            <pin position="10" pad="PD6"/>
-            <pin position="11" pad="PD7"/>
-            <pin position="12" pad="PB0"/>
-            <pin position="13" pad="PB1"/>
-            <pin position="14" pad="PB2"/>
-            <pin position="15" pad="PB3"/>
-            <pin position="16" pad="PB4"/>
-            <pin position="17" pad="PB5"/>
-            <pin position="18" pad="AVCC"/>
-            <pin position="19" pad="PA0"/>
-            <pin position="20" pad="PC7"/>
-            <pin position="21" pad="GND"/>
-            <pin position="22" pad="PA1"/>
-            <pin position="23" pad="PC0"/>
-            <pin position="24" pad="PC1"/>
-            <pin position="25" pad="PC2"/>
-            <pin position="26" pad="PC3"/>
-            <pin position="27" pad="PC4"/>
-            <pin position="28" pad="PC5"/>
-            <pin position="29" pad="PC6"/>
-            <pin position="30" pad="PD0"/>
-            <pin position="31" pad="PD1"/>
-            <pin position="32" pad="PD2"/>
+            <pin position="1" pad-key="pd3"/>
+            <pin position="2" pad-key="pd4"/>
+            <pin position="3" pad-key="pa2"/>
+            <pin position="4" pad-key="vcc"/>
+            <pin position="5" pad-key="gnd"/>
+            <pin position="6" pad-key="pa3"/>
+            <pin position="7" pad-key="pb6"/>
+            <pin position="8" pad-key="pb7"/>
+            <pin position="9" pad-key="pd5"/>
+            <pin position="10" pad-key="pd6"/>
+            <pin position="11" pad-key="pd7"/>
+            <pin position="12" pad-key="pb0"/>
+            <pin position="13" pad-key="pb1"/>
+            <pin position="14" pad-key="pb2"/>
+            <pin position="15" pad-key="pb3"/>
+            <pin position="16" pad-key="pb4"/>
+            <pin position="17" pad-key="pb5"/>
+            <pin position="18" pad-key="avcc"/>
+            <pin position="19" pad-key="pa0"/>
+            <pin position="20" pad-key="pc7"/>
+            <pin position="21" pad-key="gnd"/>
+            <pin position="22" pad-key="pa1"/>
+            <pin position="23" pad-key="pc0"/>
+            <pin position="24" pad-key="pc1"/>
+            <pin position="25" pad-key="pc2"/>
+            <pin position="26" pad-key="pc3"/>
+            <pin position="27" pad-key="pc4"/>
+            <pin position="28" pad-key="pc5"/>
+            <pin position="29" pad-key="pc6"/>
+            <pin position="30" pad-key="pd0"/>
+            <pin position="31" pad-key="pd1"/>
+            <pin position="32" pad-key="pd2"/>
         </pinout>
         <pinout key="pdip28" name="PDIP28" type="dip">
-            <pin position="1" pad="PC6"/>
-            <pin position="2" pad="PD0"/>
-            <pin position="3" pad="PD1"/>
-            <pin position="4" pad="PD2"/>
-            <pin position="5" pad="PD3"/>
-            <pin position="6" pad="PD4"/>
-            <pin position="7" pad="VCC"/>
-            <pin position="8" pad="GND"/>
-            <pin position="9" pad="PB6"/>
-            <pin position="10" pad="PB7"/>
-            <pin position="11" pad="PD5"/>
-            <pin position="12" pad="PD6"/>
-            <pin position="13" pad="PD7"/>
-            <pin position="14" pad="PB0"/>
-            <pin position="15" pad="PB1"/>
-            <pin position="16" pad="PB2"/>
-            <pin position="17" pad="PB3"/>
-            <pin position="18" pad="PB4"/>
-            <pin position="19" pad="PB5"/>
-            <pin position="20" pad="AVCC"/>
-            <pin position="21" pad="PC7"/>
-            <pin position="22" pad="GND"/>
-            <pin position="23" pad="PC0"/>
-            <pin position="24" pad="PC1"/>
-            <pin position="25" pad="PC2"/>
-            <pin position="26" pad="PC3"/>
-            <pin position="27" pad="PC4"/>
-            <pin position="28" pad="PC5"/>
+            <pin position="1" pad-key="pc6"/>
+            <pin position="2" pad-key="pd0"/>
+            <pin position="3" pad-key="pd1"/>
+            <pin position="4" pad-key="pd2"/>
+            <pin position="5" pad-key="pd3"/>
+            <pin position="6" pad-key="pd4"/>
+            <pin position="7" pad-key="vcc"/>
+            <pin position="8" pad-key="gnd"/>
+            <pin position="9" pad-key="pb6"/>
+            <pin position="10" pad-key="pb7"/>
+            <pin position="11" pad-key="pd5"/>
+            <pin position="12" pad-key="pd6"/>
+            <pin position="13" pad-key="pd7"/>
+            <pin position="14" pad-key="pb0"/>
+            <pin position="15" pad-key="pb1"/>
+            <pin position="16" pad-key="pb2"/>
+            <pin position="17" pad-key="pb3"/>
+            <pin position="18" pad-key="pb4"/>
+            <pin position="19" pad-key="pb5"/>
+            <pin position="20" pad-key="avcc"/>
+            <pin position="21" pad-key="pc7"/>
+            <pin position="22" pad-key="gnd"/>
+            <pin position="23" pad-key="pc0"/>
+            <pin position="24" pad-key="pc1"/>
+            <pin position="25" pad-key="pc2"/>
+            <pin position="26" pad-key="pc3"/>
+            <pin position="27" pad-key="pc4"/>
+            <pin position="28" pad-key="pc5"/>
         </pinout>
         <pinout key="qfn28" name="QFN28" type="qfn">
-            <pin position="1" pad="PD3"/>
-            <pin position="2" pad="PD4"/>
-            <pin position="3" pad="VCC"/>
-            <pin position="4" pad="GND"/>
-            <pin position="5" pad="PB6"/>
-            <pin position="6" pad="PB7"/>
-            <pin position="7" pad="PD5"/>
-            <pin position="8" pad="PD6"/>
-            <pin position="9" pad="PD7"/>
-            <pin position="10" pad="PB0"/>
-            <pin position="11" pad="PB1"/>
-            <pin position="12" pad="PB2"/>
-            <pin position="13" pad="PB3"/>
-            <pin position="14" pad="PB4"/>
-            <pin position="15" pad="PB5"/>
-            <pin position="16" pad="AVCC"/>
-            <pin position="17" pad="PC7"/>
-            <pin position="18" pad="GND"/>
-            <pin position="19" pad="PC0"/>
-            <pin position="20" pad="PC1"/>
-            <pin position="21" pad="PC2"/>
-            <pin position="22" pad="PC3"/>
-            <pin position="23" pad="PC4"/>
-            <pin position="24" pad="PC5"/>
-            <pin position="25" pad="PC6"/>
-            <pin position="26" pad="PD0"/>
-            <pin position="27" pad="PD1"/>
-            <pin position="28" pad="PD2"/>
+            <pin position="1" pad-key="pd3"/>
+            <pin position="2" pad-key="pd4"/>
+            <pin position="3" pad-key="vcc"/>
+            <pin position="4" pad-key="gnd"/>
+            <pin position="5" pad-key="pb6"/>
+            <pin position="6" pad-key="pb7"/>
+            <pin position="7" pad-key="pd5"/>
+            <pin position="8" pad-key="pd6"/>
+            <pin position="9" pad-key="pd7"/>
+            <pin position="10" pad-key="pb0"/>
+            <pin position="11" pad-key="pb1"/>
+            <pin position="12" pad-key="pb2"/>
+            <pin position="13" pad-key="pb3"/>
+            <pin position="14" pad-key="pb4"/>
+            <pin position="15" pad-key="pb5"/>
+            <pin position="16" pad-key="avcc"/>
+            <pin position="17" pad-key="pc7"/>
+            <pin position="18" pad-key="gnd"/>
+            <pin position="19" pad-key="pc0"/>
+            <pin position="20" pad-key="pc1"/>
+            <pin position="21" pad-key="pc2"/>
+            <pin position="22" pad-key="pc3"/>
+            <pin position="23" pad-key="pc4"/>
+            <pin position="24" pad-key="pc5"/>
+            <pin position="25" pad-key="pc6"/>
+            <pin position="26" pad-key="pd0"/>
+            <pin position="27" pad-key="pd1"/>
+            <pin position="28" pad-key="pd2"/>
         </pinout>
         <pinout key="ufbga32" name="UFBGA32" type="bga">
-            <pin position="A1" pad="PD2"/>
-            <pin position="B1" pad="PD3"/>
-            <pin position="C1" pad="GND"/>
-            <pin position="D1" pad="VCC"/>
-            <pin position="E1" pad="PB6"/>
-            <pin position="F1" pad="PB7"/>
-            <pin position="A2" pad="PD1"/>
-            <pin position="B2" pad="PD4"/>
-            <pin position="C2" pad="PA2"/>
-            <pin position="D2" pad="PA3"/>
-            <pin position="E2" pad="PD6"/>
-            <pin position="F2" pad="PD5"/>
-            <pin position="A3" pad="PC6"/>
-            <pin position="B3" pad="PD0"/>
-            <pin position="E3" pad="PB0"/>
-            <pin position="F3" pad="PD7"/>
-            <pin position="A4" pad="PC4"/>
-            <pin position="B4" pad="PC5"/>
-            <pin position="E4" pad="PB2"/>
-            <pin position="F4" pad="PB1"/>
-            <pin position="A5" pad="PC2"/>
-            <pin position="B5" pad="PC3"/>
-            <pin position="C5" pad="PA1"/>
-            <pin position="D5" pad="PC7"/>
-            <pin position="E5" pad="AVCC"/>
-            <pin position="F5" pad="PB3"/>
-            <pin position="A6" pad="PC1"/>
-            <pin position="B6" pad="PC0"/>
-            <pin position="C6" pad="GND"/>
-            <pin position="D6" pad="PA0"/>
-            <pin position="E6" pad="PB5"/>
-            <pin position="F6" pad="PB4"/>
+            <pin position="A1" pad-key="pd2"/>
+            <pin position="B1" pad-key="pd3"/>
+            <pin position="C1" pad-key="gnd"/>
+            <pin position="D1" pad-key="vcc"/>
+            <pin position="E1" pad-key="pb6"/>
+            <pin position="F1" pad-key="pb7"/>
+            <pin position="A2" pad-key="pd1"/>
+            <pin position="B2" pad-key="pd4"/>
+            <pin position="C2" pad-key="pa2"/>
+            <pin position="D2" pad-key="pa3"/>
+            <pin position="E2" pad-key="pd6"/>
+            <pin position="F2" pad-key="pd5"/>
+            <pin position="A3" pad-key="pc6"/>
+            <pin position="B3" pad-key="pd0"/>
+            <pin position="E3" pad-key="pb0"/>
+            <pin position="F3" pad-key="pd7"/>
+            <pin position="A4" pad-key="pc4"/>
+            <pin position="B4" pad-key="pc5"/>
+            <pin position="E4" pad-key="pb2"/>
+            <pin position="F4" pad-key="pb1"/>
+            <pin position="A5" pad-key="pc2"/>
+            <pin position="B5" pad-key="pc3"/>
+            <pin position="C5" pad-key="pa1"/>
+            <pin position="D5" pad-key="pc7"/>
+            <pin position="E5" pad-key="avcc"/>
+            <pin position="F5" pad-key="pb3"/>
+            <pin position="A6" pad-key="pc1"/>
+            <pin position="B6" pad-key="pc0"/>
+            <pin position="C6" pad-key="gnd"/>
+            <pin position="D6" pad-key="pa0"/>
+            <pin position="E6" pad-key="pb5"/>
+            <pin position="F6" pad-key="pb4"/>
         </pinout>
     </pinouts>
     <variants>
-        <variant name="ATtiny88-MMU" pinout-key="qfn28" package="QFN28"/>
-        <variant name="ATtiny88-MMH" pinout-key="qfn28" package="QFN28"/>
-        <variant name="ATtiny88-PU" pinout-key="pdip28" package="PDIP28"/>
-        <variant name="ATtiny88-AU" pinout-key="tqfp_qfn_32" package="TQFP32"/>
-        <variant name="ATtiny88-CCU" pinout-key="ufbga32" package="UFBGA32"/>
-        <variant name="ATtiny88-MU" pinout-key="tqfp_qfn_32" package="QFN32"/>
+        <variant key="attiny88_mmu" name="ATtiny88-MMU" pinout-key="qfn28"/>
+        <variant key="attiny88_mmh" name="ATtiny88-MMH" pinout-key="qfn28"/>
+        <variant key="attiny88_pu" name="ATtiny88-PU" pinout-key="pdip28"/>
+        <variant key="attiny88_au" name="ATtiny88-AU" pinout-key="tqfp_qfn_32"/>
+        <variant key="attiny88_ccu" name="ATtiny88-CCU" pinout-key="ufbga32"/>
+        <variant key="attiny88_mu" name="ATtiny88-MU" pinout-key="tqfp_qfn_32"/>
     </variants>
 </device>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA128A1.xml b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA128A1.xml
index c9039d36..6db11f1c 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA128A1.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA128A1.xml
@@ -173,134 +173,134 @@
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pa2" index="2" function="PORTA" group="P"/>
-                <signal pad-id="pa3" index="3" function="PORTA" group="P"/>
-                <signal pad-id="pa4" index="4" function="PORTA" group="P"/>
-                <signal pad-id="pa5" index="5" function="PORTA" group="P"/>
-                <signal pad-id="pa6" index="6" function="PORTA" group="P"/>
-                <signal pad-id="pa7" index="7" function="PORTA" group="P"/>
+                <signal pad-key="pa0" index="0" function="PORTA" group="P"/>
+                <signal pad-key="pa1" index="1" function="PORTA" group="P"/>
+                <signal pad-key="pa2" index="2" function="PORTA" group="P"/>
+                <signal pad-key="pa3" index="3" function="PORTA" group="P"/>
+                <signal pad-key="pa4" index="4" function="PORTA" group="P"/>
+                <signal pad-key="pa5" index="5" function="PORTA" group="P"/>
+                <signal pad-key="pa6" index="6" function="PORTA" group="P"/>
+                <signal pad-key="pa7" index="7" function="PORTA" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pb2" index="2" function="PORTB" group="P"/>
-                <signal pad-id="pb3" index="3" function="PORTB" group="P"/>
-                <signal pad-id="pb4" index="4" function="PORTB" group="P"/>
-                <signal pad-id="pb5" index="5" function="PORTB" group="P"/>
-                <signal pad-id="pb6" index="6" function="PORTB" group="P"/>
-                <signal pad-id="pb7" index="7" function="PORTB" group="P"/>
+                <signal pad-key="pb0" index="0" function="PORTB" group="P"/>
+                <signal pad-key="pb1" index="1" function="PORTB" group="P"/>
+                <signal pad-key="pb2" index="2" function="PORTB" group="P"/>
+                <signal pad-key="pb3" index="3" function="PORTB" group="P"/>
+                <signal pad-key="pb4" index="4" function="PORTB" group="P"/>
+                <signal pad-key="pb5" index="5" function="PORTB" group="P"/>
+                <signal pad-key="pb6" index="6" function="PORTB" group="P"/>
+                <signal pad-key="pb7" index="7" function="PORTB" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pc2" index="2" function="PORTC" group="P"/>
-                <signal pad-id="pc3" index="3" function="PORTC" group="P"/>
-                <signal pad-id="pc4" index="4" function="PORTC" group="P"/>
-                <signal pad-id="pc5" index="5" function="PORTC" group="P"/>
-                <signal pad-id="pc6" index="6" function="PORTC" group="P"/>
-                <signal pad-id="pc7" index="7" function="PORTC" group="P"/>
+                <signal pad-key="pc0" index="0" function="PORTC" group="P"/>
+                <signal pad-key="pc1" index="1" function="PORTC" group="P"/>
+                <signal pad-key="pc2" index="2" function="PORTC" group="P"/>
+                <signal pad-key="pc3" index="3" function="PORTC" group="P"/>
+                <signal pad-key="pc4" index="4" function="PORTC" group="P"/>
+                <signal pad-key="pc5" index="5" function="PORTC" group="P"/>
+                <signal pad-key="pc6" index="6" function="PORTC" group="P"/>
+                <signal pad-key="pc7" index="7" function="PORTC" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pd2" index="2" function="PORTD" group="P"/>
-                <signal pad-id="pd3" index="3" function="PORTD" group="P"/>
-                <signal pad-id="pd4" index="4" function="PORTD" group="P"/>
-                <signal pad-id="pd5" index="5" function="PORTD" group="P"/>
-                <signal pad-id="pd6" index="6" function="PORTD" group="P"/>
-                <signal pad-id="pd7" index="7" function="PORTD" group="P"/>
+                <signal pad-key="pd0" index="0" function="PORTD" group="P"/>
+                <signal pad-key="pd1" index="1" function="PORTD" group="P"/>
+                <signal pad-key="pd2" index="2" function="PORTD" group="P"/>
+                <signal pad-key="pd3" index="3" function="PORTD" group="P"/>
+                <signal pad-key="pd4" index="4" function="PORTD" group="P"/>
+                <signal pad-key="pd5" index="5" function="PORTD" group="P"/>
+                <signal pad-key="pd6" index="6" function="PORTD" group="P"/>
+                <signal pad-key="pd7" index="7" function="PORTD" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="porte" name="PORTE" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pe2" index="2" function="PORTE" group="P"/>
-                <signal pad-id="pe3" index="3" function="PORTE" group="P"/>
-                <signal pad-id="pe4" index="4" function="PORTE" group="P"/>
-                <signal pad-id="pe5" index="5" function="PORTE" group="P"/>
-                <signal pad-id="pe6" index="6" function="PORTE" group="P"/>
-                <signal pad-id="pe7" index="7" function="PORTE" group="P"/>
+                <signal pad-key="pe0" index="0" function="PORTE" group="P"/>
+                <signal pad-key="pe1" index="1" function="PORTE" group="P"/>
+                <signal pad-key="pe2" index="2" function="PORTE" group="P"/>
+                <signal pad-key="pe3" index="3" function="PORTE" group="P"/>
+                <signal pad-key="pe4" index="4" function="PORTE" group="P"/>
+                <signal pad-key="pe5" index="5" function="PORTE" group="P"/>
+                <signal pad-key="pe6" index="6" function="PORTE" group="P"/>
+                <signal pad-key="pe7" index="7" function="PORTE" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portf" name="PORTF" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pf2" index="2" function="PORTF" group="P"/>
-                <signal pad-id="pf3" index="3" function="PORTF" group="P"/>
-                <signal pad-id="pf4" index="4" function="PORTF" group="P"/>
-                <signal pad-id="pf5" index="5" function="PORTF" group="P"/>
-                <signal pad-id="pf6" index="6" function="PORTF" group="P"/>
-                <signal pad-id="pf7" index="7" function="PORTF" group="P"/>
+                <signal pad-key="pf0" index="0" function="PORTF" group="P"/>
+                <signal pad-key="pf1" index="1" function="PORTF" group="P"/>
+                <signal pad-key="pf2" index="2" function="PORTF" group="P"/>
+                <signal pad-key="pf3" index="3" function="PORTF" group="P"/>
+                <signal pad-key="pf4" index="4" function="PORTF" group="P"/>
+                <signal pad-key="pf5" index="5" function="PORTF" group="P"/>
+                <signal pad-key="pf6" index="6" function="PORTF" group="P"/>
+                <signal pad-key="pf7" index="7" function="PORTF" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="porth" name="PORTH" module-key="gpio_port">
             <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"/>
-                <signal pad-id="ph2" index="2" function="PORTH" group="P"/>
-                <signal pad-id="ph3" index="3" function="PORTH" group="P"/>
-                <signal pad-id="ph4" index="4" function="PORTH" group="P"/>
-                <signal pad-id="ph5" index="5" function="PORTH" group="P"/>
-                <signal pad-id="ph6" index="6" function="PORTH" group="P"/>
-                <signal pad-id="ph7" index="7" function="PORTH" group="P"/>
+                <signal pad-key="ph0" index="0" function="PORTH" group="P"/>
+                <signal pad-key="ph1" index="1" function="PORTH" group="P"/>
+                <signal pad-key="ph2" index="2" function="PORTH" group="P"/>
+                <signal pad-key="ph3" index="3" function="PORTH" group="P"/>
+                <signal pad-key="ph4" index="4" function="PORTH" group="P"/>
+                <signal pad-key="ph5" index="5" function="PORTH" group="P"/>
+                <signal pad-key="ph6" index="6" function="PORTH" group="P"/>
+                <signal pad-key="ph7" index="7" function="PORTH" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portj" name="PORTJ" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pj2" index="2" function="PORTJ" group="P"/>
-                <signal pad-id="pj3" index="3" function="PORTJ" group="P"/>
-                <signal pad-id="pj4" index="4" function="PORTJ" group="P"/>
-                <signal pad-id="pj5" index="5" function="PORTJ" group="P"/>
-                <signal pad-id="pj6" index="6" function="PORTJ" group="P"/>
-                <signal pad-id="pj7" index="7" function="PORTJ" group="P"/>
+                <signal pad-key="pj0" index="0" function="PORTJ" group="P"/>
+                <signal pad-key="pj1" index="1" function="PORTJ" group="P"/>
+                <signal pad-key="pj2" index="2" function="PORTJ" group="P"/>
+                <signal pad-key="pj3" index="3" function="PORTJ" group="P"/>
+                <signal pad-key="pj4" index="4" function="PORTJ" group="P"/>
+                <signal pad-key="pj5" index="5" function="PORTJ" group="P"/>
+                <signal pad-key="pj6" index="6" function="PORTJ" group="P"/>
+                <signal pad-key="pj7" index="7" function="PORTJ" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portk" name="PORTK" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pk2" index="2" function="PORTK" group="P"/>
-                <signal pad-id="pk3" index="3" function="PORTK" group="P"/>
-                <signal pad-id="pk4" index="4" function="PORTK" group="P"/>
-                <signal pad-id="pk5" index="5" function="PORTK" group="P"/>
-                <signal pad-id="pk6" index="6" function="PORTK" group="P"/>
-                <signal pad-id="pk7" index="7" function="PORTK" group="P"/>
+                <signal pad-key="pk0" index="0" function="PORTK" group="P"/>
+                <signal pad-key="pk1" index="1" function="PORTK" group="P"/>
+                <signal pad-key="pk2" index="2" function="PORTK" group="P"/>
+                <signal pad-key="pk3" index="3" function="PORTK" group="P"/>
+                <signal pad-key="pk4" index="4" function="PORTK" group="P"/>
+                <signal pad-key="pk5" index="5" function="PORTK" group="P"/>
+                <signal pad-key="pk6" index="6" function="PORTK" group="P"/>
+                <signal pad-key="pk7" index="7" function="PORTK" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portq" name="PORTQ" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pq2" index="2" function="PORTQ" group="P"/>
-                <signal pad-id="pq3" index="3" function="PORTQ" group="P"/>
+                <signal pad-key="pq0" index="0" function="PORTQ" group="P"/>
+                <signal pad-key="pq1" index="1" function="PORTQ" group="P"/>
+                <signal pad-key="pq2" index="2" function="PORTQ" group="P"/>
+                <signal pad-key="pq3" index="3" function="PORTQ" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portr" name="PORTR" module-key="gpio_port">
             <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"/>
+                <signal pad-key="pr0" index="0" function="PORTR" group="P"/>
+                <signal pad-key="pr1" index="1" function="PORTR" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="tcc0" name="TCC0" module-key="i6090_tc">
@@ -1495,214 +1495,300 @@
             </register-group>
         </module>
     </modules>
+    <pads>
+        <pad key="pa6" name="PA6"/>
+        <pad key="pa7" name="PA7"/>
+        <pad key="gnd" name="GND"/>
+        <pad key="avcc" name="AVCC"/>
+        <pad key="pb0" name="PB0"/>
+        <pad key="pb1" name="PB1"/>
+        <pad key="pb2" name="PB2"/>
+        <pad key="pb3" name="PB3"/>
+        <pad key="pb4" name="PB4"/>
+        <pad key="pb5" name="PB5"/>
+        <pad key="pb6" name="PB6"/>
+        <pad key="pb7" name="PB7"/>
+        <pad key="vcc" name="VCC"/>
+        <pad key="pc0" name="PC0"/>
+        <pad key="pc1" name="PC1"/>
+        <pad key="pc2" name="PC2"/>
+        <pad key="pc3" name="PC3"/>
+        <pad key="pc4" name="PC4"/>
+        <pad key="pc5" name="PC5"/>
+        <pad key="pc6" name="PC6"/>
+        <pad key="pc7" name="PC7"/>
+        <pad key="pd0" name="PD0"/>
+        <pad key="pd1" name="PD1"/>
+        <pad key="pd2" name="PD2"/>
+        <pad key="pd3" name="PD3"/>
+        <pad key="pd4" name="PD4"/>
+        <pad key="pd5" name="PD5"/>
+        <pad key="pd6" name="PD6"/>
+        <pad key="pd7" name="PD7"/>
+        <pad key="pe0" name="PE0"/>
+        <pad key="pe1" name="PE1"/>
+        <pad key="pe2" name="PE2"/>
+        <pad key="pe3" name="PE3"/>
+        <pad key="pe4" name="PE4"/>
+        <pad key="pe5" name="PE5"/>
+        <pad key="pe6" name="PE6"/>
+        <pad key="pe7" name="PE7"/>
+        <pad key="pf0" name="PF0"/>
+        <pad key="pf1" name="PF1"/>
+        <pad key="pf2" name="PF2"/>
+        <pad key="pf3" name="PF3"/>
+        <pad key="pf4" name="PF4"/>
+        <pad key="pf5" name="PF5"/>
+        <pad key="pf6" name="PF6"/>
+        <pad key="pf7" name="PF7"/>
+        <pad key="ph0" name="PH0"/>
+        <pad key="ph1" name="PH1"/>
+        <pad key="ph2" name="PH2"/>
+        <pad key="ph3" name="PH3"/>
+        <pad key="ph4" name="PH4"/>
+        <pad key="ph5" name="PH5"/>
+        <pad key="ph6" name="PH6"/>
+        <pad key="ph7" name="PH7"/>
+        <pad key="pj0" name="PJ0"/>
+        <pad key="pj1" name="PJ1"/>
+        <pad key="pj2" name="PJ2"/>
+        <pad key="pj3" name="PJ3"/>
+        <pad key="pj4" name="PJ4"/>
+        <pad key="pj5" name="PJ5"/>
+        <pad key="pj6" name="PJ6"/>
+        <pad key="pj7" name="PJ7"/>
+        <pad key="pk0" name="PK0"/>
+        <pad key="pk1" name="PK1"/>
+        <pad key="pk2" name="PK2"/>
+        <pad key="pk3" name="PK3"/>
+        <pad key="pk4" name="PK4"/>
+        <pad key="pk5" name="PK5"/>
+        <pad key="pk6" name="PK6"/>
+        <pad key="pk7" name="PK7"/>
+        <pad key="pq0" name="PQ0"/>
+        <pad key="pq1" name="PQ1"/>
+        <pad key="pq2" name="PQ2"/>
+        <pad key="pq3" name="PQ3"/>
+        <pad key="pdi" name="PDI"/>
+        <pad key="reset" name="RESET"/>
+        <pad key="pr0" name="PR0"/>
+        <pad key="pr1" name="PR1"/>
+        <pad key="pa0" name="PA0"/>
+        <pad key="pa1" name="PA1"/>
+        <pad key="pa2" name="PA2"/>
+        <pad key="pa3" name="PA3"/>
+        <pad key="pa4" name="PA4"/>
+        <pad key="pa5" name="PA5"/>
+        <pad key="pdi_data" name="PDI_DATA"/>
+    </pads>
     <pinouts>
         <pinout key="tqfp100" name="TQFP100" type="qfp">
-            <pin position="1" pad="PA6"/>
-            <pin position="2" pad="PA7"/>
-            <pin position="3" pad="GND"/>
-            <pin position="4" pad="AVCC"/>
-            <pin position="5" pad="PB0"/>
-            <pin position="6" pad="PB1"/>
-            <pin position="7" pad="PB2"/>
-            <pin position="8" pad="PB3"/>
-            <pin position="9" pad="PB4"/>
-            <pin position="10" pad="PB5"/>
-            <pin position="11" pad="PB6"/>
-            <pin position="12" pad="PB7"/>
-            <pin position="13" pad="GND"/>
-            <pin position="14" pad="VCC"/>
-            <pin position="15" pad="PC0"/>
-            <pin position="16" pad="PC1"/>
-            <pin position="17" pad="PC2"/>
-            <pin position="18" pad="PC3"/>
-            <pin position="19" pad="PC4"/>
-            <pin position="20" pad="PC5"/>
-            <pin position="21" pad="PC6"/>
-            <pin position="22" pad="PC7"/>
-            <pin position="23" pad="GND"/>
-            <pin position="24" pad="VCC"/>
-            <pin position="25" pad="PD0"/>
-            <pin position="26" pad="PD1"/>
-            <pin position="27" pad="PD2"/>
-            <pin position="28" pad="PD3"/>
-            <pin position="29" pad="PD4"/>
-            <pin position="30" pad="PD5"/>
-            <pin position="31" pad="PD6"/>
-            <pin position="32" pad="PD7"/>
-            <pin position="33" pad="GND"/>
-            <pin position="34" pad="VCC"/>
-            <pin position="35" pad="PE0"/>
-            <pin position="36" pad="PE1"/>
-            <pin position="37" pad="PE2"/>
-            <pin position="38" pad="PE3"/>
-            <pin position="39" pad="PE4"/>
-            <pin position="40" pad="PE5"/>
-            <pin position="41" pad="PE6"/>
-            <pin position="42" pad="PE7"/>
-            <pin position="43" pad="GND"/>
-            <pin position="44" pad="VCC"/>
-            <pin position="45" pad="PF0"/>
-            <pin position="46" pad="PF1"/>
-            <pin position="47" pad="PF2"/>
-            <pin position="48" pad="PF3"/>
-            <pin position="49" pad="PF4"/>
-            <pin position="50" pad="PF5"/>
-            <pin position="51" pad="PF6"/>
-            <pin position="52" pad="PF7"/>
-            <pin position="53" pad="GND"/>
-            <pin position="54" pad="VCC"/>
-            <pin position="55" pad="PH0"/>
-            <pin position="56" pad="PH1"/>
-            <pin position="57" pad="PH2"/>
-            <pin position="58" pad="PH3"/>
-            <pin position="59" pad="PH4"/>
-            <pin position="60" pad="PH5"/>
-            <pin position="61" pad="PH6"/>
-            <pin position="62" pad="PH7"/>
-            <pin position="63" pad="GND"/>
-            <pin position="64" pad="VCC"/>
-            <pin position="65" pad="PJ0"/>
-            <pin position="66" pad="PJ1"/>
-            <pin position="67" pad="PJ2"/>
-            <pin position="68" pad="PJ3"/>
-            <pin position="69" pad="PJ4"/>
-            <pin position="70" pad="PJ5"/>
-            <pin position="71" pad="PJ6"/>
-            <pin position="72" pad="PJ7"/>
-            <pin position="73" pad="GND"/>
-            <pin position="74" pad="VCC"/>
-            <pin position="75" pad="PK0"/>
-            <pin position="76" pad="PK1"/>
-            <pin position="77" pad="PK2"/>
-            <pin position="78" pad="PK3"/>
-            <pin position="79" pad="PK4"/>
-            <pin position="80" pad="PK5"/>
-            <pin position="81" pad="PK6"/>
-            <pin position="82" pad="PK7"/>
-            <pin position="83" pad="VCC"/>
-            <pin position="84" pad="GND"/>
-            <pin position="85" pad="PQ0"/>
-            <pin position="86" pad="PQ1"/>
-            <pin position="87" pad="PQ2"/>
-            <pin position="88" pad="PQ3"/>
-            <pin position="89" pad="PDI"/>
-            <pin position="90" pad="RESET"/>
-            <pin position="91" pad="PR0"/>
-            <pin position="92" pad="PR1"/>
-            <pin position="93" pad="GND"/>
-            <pin position="94" pad="AVCC"/>
-            <pin position="95" pad="PA0"/>
-            <pin position="96" pad="PA1"/>
-            <pin position="97" pad="PA2"/>
-            <pin position="98" pad="PA3"/>
-            <pin position="99" pad="PA4"/>
-            <pin position="100" pad="PA5"/>
+            <pin position="1" pad-key="pa6"/>
+            <pin position="2" pad-key="pa7"/>
+            <pin position="3" pad-key="gnd"/>
+            <pin position="4" pad-key="avcc"/>
+            <pin position="5" pad-key="pb0"/>
+            <pin position="6" pad-key="pb1"/>
+            <pin position="7" pad-key="pb2"/>
+            <pin position="8" pad-key="pb3"/>
+            <pin position="9" pad-key="pb4"/>
+            <pin position="10" pad-key="pb5"/>
+            <pin position="11" pad-key="pb6"/>
+            <pin position="12" pad-key="pb7"/>
+            <pin position="13" pad-key="gnd"/>
+            <pin position="14" pad-key="vcc"/>
+            <pin position="15" pad-key="pc0"/>
+            <pin position="16" pad-key="pc1"/>
+            <pin position="17" pad-key="pc2"/>
+            <pin position="18" pad-key="pc3"/>
+            <pin position="19" pad-key="pc4"/>
+            <pin position="20" pad-key="pc5"/>
+            <pin position="21" pad-key="pc6"/>
+            <pin position="22" pad-key="pc7"/>
+            <pin position="23" pad-key="gnd"/>
+            <pin position="24" pad-key="vcc"/>
+            <pin position="25" pad-key="pd0"/>
+            <pin position="26" pad-key="pd1"/>
+            <pin position="27" pad-key="pd2"/>
+            <pin position="28" pad-key="pd3"/>
+            <pin position="29" pad-key="pd4"/>
+            <pin position="30" pad-key="pd5"/>
+            <pin position="31" pad-key="pd6"/>
+            <pin position="32" pad-key="pd7"/>
+            <pin position="33" pad-key="gnd"/>
+            <pin position="34" pad-key="vcc"/>
+            <pin position="35" pad-key="pe0"/>
+            <pin position="36" pad-key="pe1"/>
+            <pin position="37" pad-key="pe2"/>
+            <pin position="38" pad-key="pe3"/>
+            <pin position="39" pad-key="pe4"/>
+            <pin position="40" pad-key="pe5"/>
+            <pin position="41" pad-key="pe6"/>
+            <pin position="42" pad-key="pe7"/>
+            <pin position="43" pad-key="gnd"/>
+            <pin position="44" pad-key="vcc"/>
+            <pin position="45" pad-key="pf0"/>
+            <pin position="46" pad-key="pf1"/>
+            <pin position="47" pad-key="pf2"/>
+            <pin position="48" pad-key="pf3"/>
+            <pin position="49" pad-key="pf4"/>
+            <pin position="50" pad-key="pf5"/>
+            <pin position="51" pad-key="pf6"/>
+            <pin position="52" pad-key="pf7"/>
+            <pin position="53" pad-key="gnd"/>
+            <pin position="54" pad-key="vcc"/>
+            <pin position="55" pad-key="ph0"/>
+            <pin position="56" pad-key="ph1"/>
+            <pin position="57" pad-key="ph2"/>
+            <pin position="58" pad-key="ph3"/>
+            <pin position="59" pad-key="ph4"/>
+            <pin position="60" pad-key="ph5"/>
+            <pin position="61" pad-key="ph6"/>
+            <pin position="62" pad-key="ph7"/>
+            <pin position="63" pad-key="gnd"/>
+            <pin position="64" pad-key="vcc"/>
+            <pin position="65" pad-key="pj0"/>
+            <pin position="66" pad-key="pj1"/>
+            <pin position="67" pad-key="pj2"/>
+            <pin position="68" pad-key="pj3"/>
+            <pin position="69" pad-key="pj4"/>
+            <pin position="70" pad-key="pj5"/>
+            <pin position="71" pad-key="pj6"/>
+            <pin position="72" pad-key="pj7"/>
+            <pin position="73" pad-key="gnd"/>
+            <pin position="74" pad-key="vcc"/>
+            <pin position="75" pad-key="pk0"/>
+            <pin position="76" pad-key="pk1"/>
+            <pin position="77" pad-key="pk2"/>
+            <pin position="78" pad-key="pk3"/>
+            <pin position="79" pad-key="pk4"/>
+            <pin position="80" pad-key="pk5"/>
+            <pin position="81" pad-key="pk6"/>
+            <pin position="82" pad-key="pk7"/>
+            <pin position="83" pad-key="vcc"/>
+            <pin position="84" pad-key="gnd"/>
+            <pin position="85" pad-key="pq0"/>
+            <pin position="86" pad-key="pq1"/>
+            <pin position="87" pad-key="pq2"/>
+            <pin position="88" pad-key="pq3"/>
+            <pin position="89" pad-key="pdi"/>
+            <pin position="90" pad-key="reset"/>
+            <pin position="91" pad-key="pr0"/>
+            <pin position="92" pad-key="pr1"/>
+            <pin position="93" pad-key="gnd"/>
+            <pin position="94" pad-key="avcc"/>
+            <pin position="95" pad-key="pa0"/>
+            <pin position="96" pad-key="pa1"/>
+            <pin position="97" pad-key="pa2"/>
+            <pin position="98" pad-key="pa3"/>
+            <pin position="99" pad-key="pa4"/>
+            <pin position="100" pad-key="pa5"/>
         </pinout>
         <pinout key="bga100" name="BGA100" type="bga">
-            <pin position="A1" pad="PK0"/>
-            <pin position="A2" pad="VCC"/>
-            <pin position="A3" pad="GND"/>
-            <pin position="A4" pad="PJ3"/>
-            <pin position="A5" pad="VCC"/>
-            <pin position="A6" pad="GND"/>
-            <pin position="A7" pad="PH1"/>
-            <pin position="A8" pad="GND"/>
-            <pin position="A9" pad="VCC"/>
-            <pin position="A10" pad="PF7"/>
-            <pin position="B1" pad="PK3"/>
-            <pin position="B2" pad="PK2"/>
-            <pin position="B3" pad="PK1"/>
-            <pin position="B4" pad="PJ4"/>
-            <pin position="B5" pad="PH7"/>
-            <pin position="B6" pad="PH4"/>
-            <pin position="B7" pad="PH2"/>
-            <pin position="B8" pad="PH0"/>
-            <pin position="B9" pad="PF6"/>
-            <pin position="B10" pad="PF5"/>
-            <pin position="C1" pad="VCC"/>
-            <pin position="C2" pad="PK5"/>
-            <pin position="C3" pad="PK4"/>
-            <pin position="C4" pad="PJ5"/>
-            <pin position="C5" pad="PJ0"/>
-            <pin position="C6" pad="PH5"/>
-            <pin position="C7" pad="PH3"/>
-            <pin position="C8" pad="PF2"/>
-            <pin position="C9" pad="PF3"/>
-            <pin position="C10" pad="VCC"/>
-            <pin position="D1" pad="GND"/>
-            <pin position="D2" pad="PK6"/>
-            <pin position="D3" pad="PK7"/>
-            <pin position="D4" pad="PJ6"/>
-            <pin position="D5" pad="PJ1"/>
-            <pin position="D6" pad="PH6"/>
-            <pin position="D7" pad="PF0"/>
-            <pin position="D8" pad="PF1"/>
-            <pin position="D9" pad="PF4"/>
-            <pin position="D10" pad="GND"/>
-            <pin position="E1" pad="PQ0"/>
-            <pin position="E2" pad="PQ1"/>
-            <pin position="E3" pad="PQ2"/>
-            <pin position="E4" pad="PJ7"/>
-            <pin position="E5" pad="PJ2"/>
-            <pin position="E6" pad="PE7"/>
-            <pin position="E7" pad="PE6"/>
-            <pin position="E8" pad="PE5"/>
-            <pin position="E9" pad="PE4"/>
-            <pin position="E10" pad="PE3"/>
-            <pin position="F1" pad="PR1"/>
-            <pin position="F2" pad="PR0"/>
-            <pin position="F3" pad="RESET"/>
-            <pin position="F4" pad="PDI_DATA"/>
-            <pin position="F5" pad="PQ3"/>
-            <pin position="F6" pad="PC2"/>
-            <pin position="F7" pad="PE2"/>
-            <pin position="F8" pad="PE1"/>
-            <pin position="F9" pad="PE0"/>
-            <pin position="F10" pad="VCC"/>
-            <pin position="G1" pad="GND"/>
-            <pin position="G2" pad="PA1"/>
-            <pin position="G3" pad="PA4"/>
-            <pin position="G4" pad="PB3"/>
-            <pin position="G5" pad="PB4"/>
-            <pin position="G6" pad="PC1"/>
-            <pin position="G7" pad="PC6"/>
-            <pin position="G8" pad="PD7"/>
-            <pin position="G9" pad="PD6"/>
-            <pin position="G10" pad="GND"/>
-            <pin position="H1" pad="AVCC"/>
-            <pin position="H2" pad="PA2"/>
-            <pin position="H3" pad="PA5"/>
-            <pin position="H4" pad="PB2"/>
-            <pin position="H5" pad="PB5"/>
-            <pin position="H6" pad="PC0"/>
-            <pin position="H7" pad="PC5"/>
-            <pin position="H8" pad="PD5"/>
-            <pin position="H9" pad="PD4"/>
-            <pin position="H10" pad="PD3"/>
-            <pin position="J1" pad="PA0"/>
-            <pin position="J2" pad="PA3"/>
-            <pin position="J3" pad="PB0"/>
-            <pin position="J4" pad="PB1"/>
-            <pin position="J5" pad="PB6"/>
-            <pin position="J6" pad="PC3"/>
-            <pin position="J7" pad="PC4"/>
-            <pin position="J8" pad="PC7"/>
-            <pin position="J9" pad="PD2"/>
-            <pin position="J10" pad="PD1"/>
-            <pin position="K1" pad="PA6"/>
-            <pin position="K2" pad="PA7"/>
-            <pin position="K3" pad="GND"/>
-            <pin position="K4" pad="AVCC"/>
-            <pin position="K5" pad="PB7"/>
-            <pin position="K6" pad="VCC "/>
-            <pin position="K7" pad="GND"/>
-            <pin position="K8" pad="VCC"/>
-            <pin position="K9" pad="GND"/>
-            <pin position="K10" pad="PD0"/>
+            <pin position="A1" pad-key="pk0"/>
+            <pin position="A2" pad-key="vcc"/>
+            <pin position="A3" pad-key="gnd"/>
+            <pin position="A4" pad-key="pj3"/>
+            <pin position="A5" pad-key="vcc"/>
+            <pin position="A6" pad-key="gnd"/>
+            <pin position="A7" pad-key="ph1"/>
+            <pin position="A8" pad-key="gnd"/>
+            <pin position="A9" pad-key="vcc"/>
+            <pin position="A10" pad-key="pf7"/>
+            <pin position="B1" pad-key="pk3"/>
+            <pin position="B2" pad-key="pk2"/>
+            <pin position="B3" pad-key="pk1"/>
+            <pin position="B4" pad-key="pj4"/>
+            <pin position="B5" pad-key="ph7"/>
+            <pin position="B6" pad-key="ph4"/>
+            <pin position="B7" pad-key="ph2"/>
+            <pin position="B8" pad-key="ph0"/>
+            <pin position="B9" pad-key="pf6"/>
+            <pin position="B10" pad-key="pf5"/>
+            <pin position="C1" pad-key="vcc"/>
+            <pin position="C2" pad-key="pk5"/>
+            <pin position="C3" pad-key="pk4"/>
+            <pin position="C4" pad-key="pj5"/>
+            <pin position="C5" pad-key="pj0"/>
+            <pin position="C6" pad-key="ph5"/>
+            <pin position="C7" pad-key="ph3"/>
+            <pin position="C8" pad-key="pf2"/>
+            <pin position="C9" pad-key="pf3"/>
+            <pin position="C10" pad-key="vcc"/>
+            <pin position="D1" pad-key="gnd"/>
+            <pin position="D2" pad-key="pk6"/>
+            <pin position="D3" pad-key="pk7"/>
+            <pin position="D4" pad-key="pj6"/>
+            <pin position="D5" pad-key="pj1"/>
+            <pin position="D6" pad-key="ph6"/>
+            <pin position="D7" pad-key="pf0"/>
+            <pin position="D8" pad-key="pf1"/>
+            <pin position="D9" pad-key="pf4"/>
+            <pin position="D10" pad-key="gnd"/>
+            <pin position="E1" pad-key="pq0"/>
+            <pin position="E2" pad-key="pq1"/>
+            <pin position="E3" pad-key="pq2"/>
+            <pin position="E4" pad-key="pj7"/>
+            <pin position="E5" pad-key="pj2"/>
+            <pin position="E6" pad-key="pe7"/>
+            <pin position="E7" pad-key="pe6"/>
+            <pin position="E8" pad-key="pe5"/>
+            <pin position="E9" pad-key="pe4"/>
+            <pin position="E10" pad-key="pe3"/>
+            <pin position="F1" pad-key="pr1"/>
+            <pin position="F2" pad-key="pr0"/>
+            <pin position="F3" pad-key="reset"/>
+            <pin position="F4" pad-key="pdi_data"/>
+            <pin position="F5" pad-key="pq3"/>
+            <pin position="F6" pad-key="pc2"/>
+            <pin position="F7" pad-key="pe2"/>
+            <pin position="F8" pad-key="pe1"/>
+            <pin position="F9" pad-key="pe0"/>
+            <pin position="F10" pad-key="vcc"/>
+            <pin position="G1" pad-key="gnd"/>
+            <pin position="G2" pad-key="pa1"/>
+            <pin position="G3" pad-key="pa4"/>
+            <pin position="G4" pad-key="pb3"/>
+            <pin position="G5" pad-key="pb4"/>
+            <pin position="G6" pad-key="pc1"/>
+            <pin position="G7" pad-key="pc6"/>
+            <pin position="G8" pad-key="pd7"/>
+            <pin position="G9" pad-key="pd6"/>
+            <pin position="G10" pad-key="gnd"/>
+            <pin position="H1" pad-key="avcc"/>
+            <pin position="H2" pad-key="pa2"/>
+            <pin position="H3" pad-key="pa5"/>
+            <pin position="H4" pad-key="pb2"/>
+            <pin position="H5" pad-key="pb5"/>
+            <pin position="H6" pad-key="pc0"/>
+            <pin position="H7" pad-key="pc5"/>
+            <pin position="H8" pad-key="pd5"/>
+            <pin position="H9" pad-key="pd4"/>
+            <pin position="H10" pad-key="pd3"/>
+            <pin position="J1" pad-key="pa0"/>
+            <pin position="J2" pad-key="pa3"/>
+            <pin position="J3" pad-key="pb0"/>
+            <pin position="J4" pad-key="pb1"/>
+            <pin position="J5" pad-key="pb6"/>
+            <pin position="J6" pad-key="pc3"/>
+            <pin position="J7" pad-key="pc4"/>
+            <pin position="J8" pad-key="pc7"/>
+            <pin position="J9" pad-key="pd2"/>
+            <pin position="J10" pad-key="pd1"/>
+            <pin position="K1" pad-key="pa6"/>
+            <pin position="K2" pad-key="pa7"/>
+            <pin position="K3" pad-key="gnd"/>
+            <pin position="K4" pad-key="avcc"/>
+            <pin position="K5" pad-key="pb7"/>
+            <pin position="K6" pad-key="vcc"/>
+            <pin position="K7" pad-key="gnd"/>
+            <pin position="K8" pad-key="vcc"/>
+            <pin position="K9" pad-key="gnd"/>
+            <pin position="K10" pad-key="pd0"/>
         </pinout>
     </pinouts>
     <variants>
-        <variant name="ATXMEGA128A1-AU" pinout-key="tqfp100" package="TQFP100"/>
-        <variant name="ATXMEGA128A1-CU" pinout-key="bga100" package="CBGA100"/>
+        <variant key="atxmega128a1_au" name="ATXMEGA128A1-AU" pinout-key="tqfp100"/>
+        <variant key="atxmega128a1_cu" name="ATXMEGA128A1-CU" pinout-key="bga100"/>
     </variants>
 </device>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA128A1U.xml b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA128A1U.xml
index 8949c673..bf5d25bb 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA128A1U.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA128A1U.xml
@@ -116,19 +116,19 @@
         <peripheral key="portcfg" name="PORTCFG" module-key="i6075_portcfg">
             <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"/>
-                <signal pad-id="pd7" function="CLKOUTD" group="CLKOUT" field="CLKOUT"/>
-                <signal pad-id="pd4" function="CLKOUTD_ALT" group="CLKOUT" field="CLKEVPIN"/>
-                <signal pad-id="pe7" function="CLKOUTE" group="CLKOUT" field="CLKOUT"/>
-                <signal pad-id="pe4" function="CLKOUTE_ALT" group="CLKOUT" field="CLKEVPIN"/>
-                <signal pad-id="pc7" function="EVOUTC" group="EVOUT" field="EVOUT"/>
-                <signal pad-id="pc4" function="EVOUTC_ALT" group="EVOUT" field="CLKEVPIN"/>
-                <signal pad-id="pd7" function="EVOUTD" group="EVOUT" field="EVOUT"/>
-                <signal pad-id="pd4" function="EVOUTD_ALT" group="EVOUT" field="CLKEVPIN"/>
-                <signal pad-id="pe7" function="EVOUTE" group="EVOUT" field="EVOUT"/>
-                <signal pad-id="pe4" function="EVOUTE_ALT" group="EVOUT" field="CLKEVPIN"/>
-                <signal pad-id="pc6" function="RTCOUTC" group="RTCOUT"/>
+                <signal pad-key="pc7" function="CLKOUTC" group="CLKOUT" field="CLKOUT"/>
+                <signal pad-key="pc4" function="CLKOUTC_ALT" group="CLKOUT" field="CLKEVPIN"/>
+                <signal pad-key="pd7" function="CLKOUTD" group="CLKOUT" field="CLKOUT"/>
+                <signal pad-key="pd4" function="CLKOUTD_ALT" group="CLKOUT" field="CLKEVPIN"/>
+                <signal pad-key="pe7" function="CLKOUTE" group="CLKOUT" field="CLKOUT"/>
+                <signal pad-key="pe4" function="CLKOUTE_ALT" group="CLKOUT" field="CLKEVPIN"/>
+                <signal pad-key="pc7" function="EVOUTC" group="EVOUT" field="EVOUT"/>
+                <signal pad-key="pc4" function="EVOUTC_ALT" group="EVOUT" field="CLKEVPIN"/>
+                <signal pad-key="pd7" function="EVOUTD" group="EVOUT" field="EVOUT"/>
+                <signal pad-key="pd4" function="EVOUTD_ALT" group="EVOUT" field="CLKEVPIN"/>
+                <signal pad-key="pe7" function="EVOUTE" group="EVOUT" field="EVOUT"/>
+                <signal pad-key="pe4" function="EVOUTE_ALT" group="EVOUT" field="CLKEVPIN"/>
+                <signal pad-key="pc6" function="RTCOUTC" group="RTCOUT"/>
             </signals>
         </peripheral>
         <peripheral key="aes" name="AES" module-key="i6096">
@@ -149,127 +149,127 @@
         <peripheral key="adca" name="ADCA" module-key="i6099">
             <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"/>
-                <signal pad-id="pa2" index="2" function="ADCPOS" group="ADC"/>
-                <signal pad-id="pa3" index="3" function="ADCPOS" group="ADC"/>
-                <signal pad-id="pa4" index="4" function="ADCPOS" group="ADC"/>
-                <signal pad-id="pa5" index="5" function="ADCPOS" group="ADC"/>
-                <signal pad-id="pa6" index="6" function="ADCPOS" group="ADC"/>
-                <signal pad-id="pa7" index="7" function="ADCPOS" group="ADC"/>
-                <signal pad-id="pb0" index="8" function="ADCPOS" group="ADC"/>
-                <signal pad-id="pb1" index="9" function="ADCPOS" group="ADC"/>
-                <signal pad-id="pb2" index="10" function="ADCPOS" group="ADC"/>
-                <signal pad-id="pb3" index="11" function="ADCPOS" group="ADC"/>
-                <signal pad-id="pb4" index="12" function="ADCPOS" group="ADC"/>
-                <signal pad-id="pb5" index="13" function="ADCPOS" group="ADC"/>
-                <signal pad-id="pb6" index="14" function="ADCPOS" group="ADC"/>
-                <signal pad-id="pb7" index="15" function="ADCPOS" group="ADC"/>
-                <signal pad-id="pa0" index="0" function="GAINPOS" group="ADC"/>
-                <signal pad-id="pa1" index="1" function="GAINPOS" group="ADC"/>
-                <signal pad-id="pa2" index="2" function="GAINPOS" group="ADC"/>
-                <signal pad-id="pa3" index="3" function="GAINPOS" group="ADC"/>
-                <signal pad-id="pa4" index="4" function="GAINPOS" group="ADC"/>
-                <signal pad-id="pa5" index="5" function="GAINPOS" group="ADC"/>
-                <signal pad-id="pa6" index="6" function="GAINPOS" group="ADC"/>
-                <signal pad-id="pa7" index="7" function="GAINPOS" group="ADC"/>
-                <signal pad-id="pa4" index="4" function="GAINNEG" group="ADC"/>
-                <signal pad-id="pa5" index="5" function="GAINNEG" group="ADC"/>
-                <signal pad-id="pa6" index="6" function="GAINNEG" group="ADC"/>
-                <signal pad-id="pa7" index="7" function="GAINNEG" group="ADC"/>
-                <signal pad-id="pa0" index="0" function="ADCNEG" group="ADC"/>
-                <signal pad-id="pa1" index="1" function="ADCNEG" group="ADC"/>
-                <signal pad-id="pa2" index="2" function="ADCNEG" group="ADC"/>
-                <signal pad-id="pa3" index="3" function="ADCNEG" group="ADC"/>
-                <signal pad-id="pa0" index="0" function="AREF" group="REFA"/>
-                <signal pad-id="pb0" index="0" function="AREF" group="REFB"/>
+                <signal pad-key="pa0" index="0" function="ADCPOS" group="ADC"/>
+                <signal pad-key="pa1" index="1" function="ADCPOS" group="ADC"/>
+                <signal pad-key="pa2" index="2" function="ADCPOS" group="ADC"/>
+                <signal pad-key="pa3" index="3" function="ADCPOS" group="ADC"/>
+                <signal pad-key="pa4" index="4" function="ADCPOS" group="ADC"/>
+                <signal pad-key="pa5" index="5" function="ADCPOS" group="ADC"/>
+                <signal pad-key="pa6" index="6" function="ADCPOS" group="ADC"/>
+                <signal pad-key="pa7" index="7" function="ADCPOS" group="ADC"/>
+                <signal pad-key="pb0" index="8" function="ADCPOS" group="ADC"/>
+                <signal pad-key="pb1" index="9" function="ADCPOS" group="ADC"/>
+                <signal pad-key="pb2" index="10" function="ADCPOS" group="ADC"/>
+                <signal pad-key="pb3" index="11" function="ADCPOS" group="ADC"/>
+                <signal pad-key="pb4" index="12" function="ADCPOS" group="ADC"/>
+                <signal pad-key="pb5" index="13" function="ADCPOS" group="ADC"/>
+                <signal pad-key="pb6" index="14" function="ADCPOS" group="ADC"/>
+                <signal pad-key="pb7" index="15" function="ADCPOS" group="ADC"/>
+                <signal pad-key="pa0" index="0" function="GAINPOS" group="ADC"/>
+                <signal pad-key="pa1" index="1" function="GAINPOS" group="ADC"/>
+                <signal pad-key="pa2" index="2" function="GAINPOS" group="ADC"/>
+                <signal pad-key="pa3" index="3" function="GAINPOS" group="ADC"/>
+                <signal pad-key="pa4" index="4" function="GAINPOS" group="ADC"/>
+                <signal pad-key="pa5" index="5" function="GAINPOS" group="ADC"/>
+                <signal pad-key="pa6" index="6" function="GAINPOS" group="ADC"/>
+                <signal pad-key="pa7" index="7" function="GAINPOS" group="ADC"/>
+                <signal pad-key="pa4" index="4" function="GAINNEG" group="ADC"/>
+                <signal pad-key="pa5" index="5" function="GAINNEG" group="ADC"/>
+                <signal pad-key="pa6" index="6" function="GAINNEG" group="ADC"/>
+                <signal pad-key="pa7" index="7" function="GAINNEG" group="ADC"/>
+                <signal pad-key="pa0" index="0" function="ADCNEG" group="ADC"/>
+                <signal pad-key="pa1" index="1" function="ADCNEG" group="ADC"/>
+                <signal pad-key="pa2" index="2" function="ADCNEG" group="ADC"/>
+                <signal pad-key="pa3" index="3" function="ADCNEG" group="ADC"/>
+                <signal pad-key="pa0" index="0" function="AREF" group="REFA"/>
+                <signal pad-key="pb0" index="0" function="AREF" group="REFB"/>
             </signals>
         </peripheral>
         <peripheral key="adcb" name="ADCB" module-key="i6099">
             <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"/>
-                <signal pad-id="pb2" index="2" function="ADCPOS" group="ADC"/>
-                <signal pad-id="pb3" index="3" function="ADCPOS" group="ADC"/>
-                <signal pad-id="pb4" index="4" function="ADCPOS" group="ADC"/>
-                <signal pad-id="pb5" index="5" function="ADCPOS" group="ADC"/>
-                <signal pad-id="pb6" index="6" function="ADCPOS" group="ADC"/>
-                <signal pad-id="pb7" index="7" function="ADCPOS" group="ADC"/>
-                <signal pad-id="pb0" index="0" function="GAINPOS" group="ADC"/>
-                <signal pad-id="pb1" index="1" function="GAINPOS" group="ADC"/>
-                <signal pad-id="pb2" index="2" function="GAINPOS" group="ADC"/>
-                <signal pad-id="pb3" index="3" function="GAINPOS" group="ADC"/>
-                <signal pad-id="pb4" index="4" function="GAINPOS" group="ADC"/>
-                <signal pad-id="pb5" index="5" function="GAINPOS" group="ADC"/>
-                <signal pad-id="pb6" index="6" function="GAINPOS" group="ADC"/>
-                <signal pad-id="pb7" index="7" function="GAINPOS" group="ADC"/>
-                <signal pad-id="pb4" index="4" function="ADCNEG" group="ADC"/>
-                <signal pad-id="pb5" index="5" function="ADCNEG" group="ADC"/>
-                <signal pad-id="pb6" index="6" function="ADCNEG" group="ADC"/>
-                <signal pad-id="pb7" index="7" function="ADCNEG" group="ADC"/>
-                <signal pad-id="pb4" index="4" function="GAINNEG" group="ADC"/>
-                <signal pad-id="pb5" index="5" function="GAINNEG" group="ADC"/>
-                <signal pad-id="pb6" index="6" function="GAINNEG" group="ADC"/>
-                <signal pad-id="pb7" index="7" function="GAINNEG" group="ADC"/>
-                <signal pad-id="pa0" index="0" function="AREF" group="REFA"/>
-                <signal pad-id="pb0" index="0" function="AREF" group="REFB"/>
+                <signal pad-key="pb0" index="0" function="ADCPOS" group="ADC"/>
+                <signal pad-key="pb1" index="1" function="ADCPOS" group="ADC"/>
+                <signal pad-key="pb2" index="2" function="ADCPOS" group="ADC"/>
+                <signal pad-key="pb3" index="3" function="ADCPOS" group="ADC"/>
+                <signal pad-key="pb4" index="4" function="ADCPOS" group="ADC"/>
+                <signal pad-key="pb5" index="5" function="ADCPOS" group="ADC"/>
+                <signal pad-key="pb6" index="6" function="ADCPOS" group="ADC"/>
+                <signal pad-key="pb7" index="7" function="ADCPOS" group="ADC"/>
+                <signal pad-key="pb0" index="0" function="GAINPOS" group="ADC"/>
+                <signal pad-key="pb1" index="1" function="GAINPOS" group="ADC"/>
+                <signal pad-key="pb2" index="2" function="GAINPOS" group="ADC"/>
+                <signal pad-key="pb3" index="3" function="GAINPOS" group="ADC"/>
+                <signal pad-key="pb4" index="4" function="GAINPOS" group="ADC"/>
+                <signal pad-key="pb5" index="5" function="GAINPOS" group="ADC"/>
+                <signal pad-key="pb6" index="6" function="GAINPOS" group="ADC"/>
+                <signal pad-key="pb7" index="7" function="GAINPOS" group="ADC"/>
+                <signal pad-key="pb4" index="4" function="ADCNEG" group="ADC"/>
+                <signal pad-key="pb5" index="5" function="ADCNEG" group="ADC"/>
+                <signal pad-key="pb6" index="6" function="ADCNEG" group="ADC"/>
+                <signal pad-key="pb7" index="7" function="ADCNEG" group="ADC"/>
+                <signal pad-key="pb4" index="4" function="GAINNEG" group="ADC"/>
+                <signal pad-key="pb5" index="5" function="GAINNEG" group="ADC"/>
+                <signal pad-key="pb6" index="6" function="GAINNEG" group="ADC"/>
+                <signal pad-key="pb7" index="7" function="GAINNEG" group="ADC"/>
+                <signal pad-key="pa0" index="0" function="AREF" group="REFA"/>
+                <signal pad-key="pb0" index="0" function="AREF" group="REFB"/>
             </signals>
         </peripheral>
         <peripheral key="daca" name="DACA" module-key="i6059">
             <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"/>
-                <signal pad-id="pa0" index="0" function="AREF" group="REFA"/>
-                <signal pad-id="pb0" index="0" function="AREF" group="REFB"/>
+                <signal pad-key="pa2" index="0" function="DAC" group="DAC"/>
+                <signal pad-key="pa3" index="1" function="DAC" group="DAC"/>
+                <signal pad-key="pa0" index="0" function="AREF" group="REFA"/>
+                <signal pad-key="pb0" index="0" function="AREF" group="REFB"/>
             </signals>
         </peripheral>
         <peripheral key="dacb" name="DACB" module-key="i6059">
             <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"/>
-                <signal pad-id="pa0" index="0" function="AREF" group="REFA"/>
-                <signal pad-id="pb0" index="0" function="AREF" group="REFB"/>
+                <signal pad-key="pb2" index="0" function="DAC" group="DAC"/>
+                <signal pad-key="pb3" index="1" function="DAC" group="DAC"/>
+                <signal pad-key="pa0" index="0" function="AREF" group="REFA"/>
+                <signal pad-key="pb0" index="0" function="AREF" group="REFB"/>
             </signals>
         </peripheral>
         <peripheral key="aca" name="ACA" module-key="i6077">
             <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"/>
-                <signal pad-id="pa2" index="2" function="ACPOS" group="AC"/>
-                <signal pad-id="pa3" index="3" function="ACPOS" group="AC"/>
-                <signal pad-id="pa4" index="4" function="ACPOS" group="AC"/>
-                <signal pad-id="pa5" index="5" function="ACPOS" group="AC"/>
-                <signal pad-id="pa6" index="6" function="ACPOS" group="AC"/>
-                <signal pad-id="pa0" index="0" function="ACNEG" group="AC"/>
-                <signal pad-id="pa1" index="1" function="ACNEG" group="AC"/>
-                <signal pad-id="pa3" index="3" function="ACNEG" group="AC"/>
-                <signal pad-id="pa5" index="5" function="ACNEG" group="AC"/>
-                <signal pad-id="pa7" index="7" function="ACNEG" group="AC"/>
-                <signal pad-id="pa6" index="1" function="ACOUT" group="ACOUT"/>
-                <signal pad-id="pa7" index="0" function="ACOUT" group="ACOUT"/>
+                <signal pad-key="pa0" index="0" function="ACPOS" group="AC"/>
+                <signal pad-key="pa1" index="1" function="ACPOS" group="AC"/>
+                <signal pad-key="pa2" index="2" function="ACPOS" group="AC"/>
+                <signal pad-key="pa3" index="3" function="ACPOS" group="AC"/>
+                <signal pad-key="pa4" index="4" function="ACPOS" group="AC"/>
+                <signal pad-key="pa5" index="5" function="ACPOS" group="AC"/>
+                <signal pad-key="pa6" index="6" function="ACPOS" group="AC"/>
+                <signal pad-key="pa0" index="0" function="ACNEG" group="AC"/>
+                <signal pad-key="pa1" index="1" function="ACNEG" group="AC"/>
+                <signal pad-key="pa3" index="3" function="ACNEG" group="AC"/>
+                <signal pad-key="pa5" index="5" function="ACNEG" group="AC"/>
+                <signal pad-key="pa7" index="7" function="ACNEG" group="AC"/>
+                <signal pad-key="pa6" index="1" function="ACOUT" group="ACOUT"/>
+                <signal pad-key="pa7" index="0" function="ACOUT" group="ACOUT"/>
             </signals>
         </peripheral>
         <peripheral key="acb" name="ACB" module-key="i6077">
             <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"/>
-                <signal pad-id="pb2" index="2" function="ACPOS" group="AC"/>
-                <signal pad-id="pb3" index="3" function="ACPOS" group="AC"/>
-                <signal pad-id="pb4" index="4" function="ACPOS" group="AC"/>
-                <signal pad-id="pb5" index="5" function="ACPOS" group="AC"/>
-                <signal pad-id="pb6" index="6" function="ACPOS" group="AC"/>
-                <signal pad-id="pb0" index="0" function="ACNEG" group="AC"/>
-                <signal pad-id="pb1" index="1" function="ACNEG" group="AC"/>
-                <signal pad-id="pb3" index="3" function="ACNEG" group="AC"/>
-                <signal pad-id="pb5" index="5" function="ACNEG" group="AC"/>
-                <signal pad-id="pb7" index="7" function="ACNEG" group="AC"/>
-                <signal pad-id="pb6" index="1" function="ACOUT" group="ACOUT"/>
-                <signal pad-id="pb7" index="0" function="ACOUT" group="ACOUT"/>
+                <signal pad-key="pb0" index="0" function="ACPOS" group="AC"/>
+                <signal pad-key="pb1" index="1" function="ACPOS" group="AC"/>
+                <signal pad-key="pb2" index="2" function="ACPOS" group="AC"/>
+                <signal pad-key="pb3" index="3" function="ACPOS" group="AC"/>
+                <signal pad-key="pb4" index="4" function="ACPOS" group="AC"/>
+                <signal pad-key="pb5" index="5" function="ACPOS" group="AC"/>
+                <signal pad-key="pb6" index="6" function="ACPOS" group="AC"/>
+                <signal pad-key="pb0" index="0" function="ACNEG" group="AC"/>
+                <signal pad-key="pb1" index="1" function="ACNEG" group="AC"/>
+                <signal pad-key="pb3" index="3" function="ACNEG" group="AC"/>
+                <signal pad-key="pb5" index="5" function="ACNEG" group="AC"/>
+                <signal pad-key="pb7" index="7" function="ACNEG" group="AC"/>
+                <signal pad-key="pb6" index="1" function="ACOUT" group="ACOUT"/>
+                <signal pad-key="pb7" index="0" function="ACOUT" group="ACOUT"/>
             </signals>
         </peripheral>
         <peripheral key="rtc" name="RTC" module-key="i6093">
@@ -278,352 +278,352 @@
         <peripheral key="ebi" name="EBI" module-key="i3001">
             <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"/>
-                <signal pad-id="ph2" index="2" function="EBIPORT0" group="PORT0"/>
-                <signal pad-id="ph3" index="3" function="EBIPORT0" group="PORT0"/>
-                <signal pad-id="ph4" index="4" function="EBIPORT0" group="PORT0"/>
-                <signal pad-id="ph5" index="5" function="EBIPORT0" group="PORT0"/>
-                <signal pad-id="ph6" index="6" function="EBIPORT0" group="PORT0"/>
-                <signal pad-id="ph7" index="7" function="EBIPORT0" group="PORT0"/>
-                <signal pad-id="pj0" index="0" function="EBIPORT1" group="PORT1"/>
-                <signal pad-id="pj1" index="1" function="EBIPORT1" group="PORT1"/>
-                <signal pad-id="pj2" index="2" function="EBIPORT1" group="PORT1"/>
-                <signal pad-id="pj3" index="3" function="EBIPORT1" group="PORT1"/>
-                <signal pad-id="pj4" index="4" function="EBIPORT1" group="PORT1"/>
-                <signal pad-id="pj5" index="5" function="EBIPORT1" group="PORT1"/>
-                <signal pad-id="pj6" index="6" function="EBIPORT1" group="PORT1"/>
-                <signal pad-id="pj7" index="7" function="EBIPORT1" group="PORT1"/>
-                <signal pad-id="pk0" index="0" function="EBIPORT2" group="PORT2"/>
-                <signal pad-id="pk1" index="1" function="EBIPORT2" group="PORT2"/>
-                <signal pad-id="pk2" index="2" function="EBIPORT2" group="PORT2"/>
-                <signal pad-id="pk3" index="3" function="EBIPORT2" group="PORT2"/>
-                <signal pad-id="pk4" index="4" function="EBIPORT2" group="PORT2"/>
-                <signal pad-id="pk5" index="5" function="EBIPORT2" group="PORT2"/>
-                <signal pad-id="pk6" index="6" function="EBIPORT2" group="PORT2"/>
-                <signal pad-id="pk7" index="7" function="EBIPORT2" group="PORT2"/>
-                <signal pad-id="pf0" index="0" function="EBIPORT3" group="PORT3"/>
-                <signal pad-id="pf1" index="1" function="EBIPORT3" group="PORT3"/>
-                <signal pad-id="pf2" index="2" function="EBIPORT3" group="PORT3"/>
-                <signal pad-id="pf3" index="3" function="EBIPORT3" group="PORT3"/>
-                <signal pad-id="pf4" index="4" function="EBIPORT3" group="PORT3"/>
-                <signal pad-id="pf5" index="5" function="EBIPORT3" group="PORT3"/>
-                <signal pad-id="pf6" index="6" function="EBIPORT3" group="PORT3"/>
-                <signal pad-id="pf7" index="7" function="EBIPORT3" group="PORT3"/>
+                <signal pad-key="ph0" index="0" function="EBIPORT0" group="PORT0"/>
+                <signal pad-key="ph1" index="1" function="EBIPORT0" group="PORT0"/>
+                <signal pad-key="ph2" index="2" function="EBIPORT0" group="PORT0"/>
+                <signal pad-key="ph3" index="3" function="EBIPORT0" group="PORT0"/>
+                <signal pad-key="ph4" index="4" function="EBIPORT0" group="PORT0"/>
+                <signal pad-key="ph5" index="5" function="EBIPORT0" group="PORT0"/>
+                <signal pad-key="ph6" index="6" function="EBIPORT0" group="PORT0"/>
+                <signal pad-key="ph7" index="7" function="EBIPORT0" group="PORT0"/>
+                <signal pad-key="pj0" index="0" function="EBIPORT1" group="PORT1"/>
+                <signal pad-key="pj1" index="1" function="EBIPORT1" group="PORT1"/>
+                <signal pad-key="pj2" index="2" function="EBIPORT1" group="PORT1"/>
+                <signal pad-key="pj3" index="3" function="EBIPORT1" group="PORT1"/>
+                <signal pad-key="pj4" index="4" function="EBIPORT1" group="PORT1"/>
+                <signal pad-key="pj5" index="5" function="EBIPORT1" group="PORT1"/>
+                <signal pad-key="pj6" index="6" function="EBIPORT1" group="PORT1"/>
+                <signal pad-key="pj7" index="7" function="EBIPORT1" group="PORT1"/>
+                <signal pad-key="pk0" index="0" function="EBIPORT2" group="PORT2"/>
+                <signal pad-key="pk1" index="1" function="EBIPORT2" group="PORT2"/>
+                <signal pad-key="pk2" index="2" function="EBIPORT2" group="PORT2"/>
+                <signal pad-key="pk3" index="3" function="EBIPORT2" group="PORT2"/>
+                <signal pad-key="pk4" index="4" function="EBIPORT2" group="PORT2"/>
+                <signal pad-key="pk5" index="5" function="EBIPORT2" group="PORT2"/>
+                <signal pad-key="pk6" index="6" function="EBIPORT2" group="PORT2"/>
+                <signal pad-key="pk7" index="7" function="EBIPORT2" group="PORT2"/>
+                <signal pad-key="pf0" index="0" function="EBIPORT3" group="PORT3"/>
+                <signal pad-key="pf1" index="1" function="EBIPORT3" group="PORT3"/>
+                <signal pad-key="pf2" index="2" function="EBIPORT3" group="PORT3"/>
+                <signal pad-key="pf3" index="3" function="EBIPORT3" group="PORT3"/>
+                <signal pad-key="pf4" index="4" function="EBIPORT3" group="PORT3"/>
+                <signal pad-key="pf5" index="5" function="EBIPORT3" group="PORT3"/>
+                <signal pad-key="pf6" index="6" function="EBIPORT3" group="PORT3"/>
+                <signal pad-key="pf7" index="7" function="EBIPORT3" group="PORT3"/>
             </signals>
         </peripheral>
         <peripheral key="twic" name="TWIC" module-key="i6089">
             <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"/>
+                <signal pad-key="pc0" function="TWIC" group="SDA"/>
+                <signal pad-key="pc1" function="TWIC" group="SCL"/>
             </signals>
         </peripheral>
         <peripheral key="twid" name="TWID" module-key="i6089">
             <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"/>
+                <signal pad-key="pd0" function="TWID" group="SDA"/>
+                <signal pad-key="pd1" function="TWID" group="SCL"/>
             </signals>
         </peripheral>
         <peripheral key="twie" name="TWIE" module-key="i6089">
             <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"/>
+                <signal pad-key="pe0" function="TWIE" group="SDA"/>
+                <signal pad-key="pe1" function="TWIE" group="SCL"/>
             </signals>
         </peripheral>
         <peripheral key="twif" name="TWIF" module-key="i6089">
             <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"/>
+                <signal pad-key="pf0" function="TWIF" group="SDA"/>
+                <signal pad-key="pf1" function="TWIF" group="SCL"/>
             </signals>
         </peripheral>
         <peripheral key="usb" name="USB" module-key="i3005">
             <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"/>
+                <signal pad-key="pd6" function="USB" group="DN"/>
+                <signal pad-key="pd7" function="USB" group="DP"/>
             </signals>
         </peripheral>
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pa2" index="2" function="PORTA" group="P"/>
-                <signal pad-id="pa3" index="3" function="PORTA" group="P"/>
-                <signal pad-id="pa4" index="4" function="PORTA" group="P"/>
-                <signal pad-id="pa5" index="5" function="PORTA" group="P"/>
-                <signal pad-id="pa6" index="6" function="PORTA" group="P"/>
-                <signal pad-id="pa7" index="7" function="PORTA" group="P"/>
+                <signal pad-key="pa0" index="0" function="PORTA" group="P"/>
+                <signal pad-key="pa1" index="1" function="PORTA" group="P"/>
+                <signal pad-key="pa2" index="2" function="PORTA" group="P"/>
+                <signal pad-key="pa3" index="3" function="PORTA" group="P"/>
+                <signal pad-key="pa4" index="4" function="PORTA" group="P"/>
+                <signal pad-key="pa5" index="5" function="PORTA" group="P"/>
+                <signal pad-key="pa6" index="6" function="PORTA" group="P"/>
+                <signal pad-key="pa7" index="7" function="PORTA" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pb2" index="2" function="PORTB" group="P"/>
-                <signal pad-id="pb3" index="3" function="PORTB" group="P"/>
-                <signal pad-id="pb4" index="4" function="PORTB" group="P"/>
-                <signal pad-id="pb5" index="5" function="PORTB" group="P"/>
-                <signal pad-id="pb6" index="6" function="PORTB" group="P"/>
-                <signal pad-id="pb7" index="7" function="PORTB" group="P"/>
+                <signal pad-key="pb0" index="0" function="PORTB" group="P"/>
+                <signal pad-key="pb1" index="1" function="PORTB" group="P"/>
+                <signal pad-key="pb2" index="2" function="PORTB" group="P"/>
+                <signal pad-key="pb3" index="3" function="PORTB" group="P"/>
+                <signal pad-key="pb4" index="4" function="PORTB" group="P"/>
+                <signal pad-key="pb5" index="5" function="PORTB" group="P"/>
+                <signal pad-key="pb6" index="6" function="PORTB" group="P"/>
+                <signal pad-key="pb7" index="7" function="PORTB" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pc2" index="2" function="PORTC" group="P"/>
-                <signal pad-id="pc3" index="3" function="PORTC" group="P"/>
-                <signal pad-id="pc4" index="4" function="PORTC" group="P"/>
-                <signal pad-id="pc5" index="5" function="PORTC" group="P"/>
-                <signal pad-id="pc6" index="6" function="PORTC" group="P"/>
-                <signal pad-id="pc7" index="7" function="PORTC" group="P"/>
+                <signal pad-key="pc0" index="0" function="PORTC" group="P"/>
+                <signal pad-key="pc1" index="1" function="PORTC" group="P"/>
+                <signal pad-key="pc2" index="2" function="PORTC" group="P"/>
+                <signal pad-key="pc3" index="3" function="PORTC" group="P"/>
+                <signal pad-key="pc4" index="4" function="PORTC" group="P"/>
+                <signal pad-key="pc5" index="5" function="PORTC" group="P"/>
+                <signal pad-key="pc6" index="6" function="PORTC" group="P"/>
+                <signal pad-key="pc7" index="7" function="PORTC" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pd2" index="2" function="PORTD" group="P"/>
-                <signal pad-id="pd3" index="3" function="PORTD" group="P"/>
-                <signal pad-id="pd4" index="4" function="PORTD" group="P"/>
-                <signal pad-id="pd5" index="5" function="PORTD" group="P"/>
-                <signal pad-id="pd6" index="6" function="PORTD" group="P"/>
-                <signal pad-id="pd7" index="7" function="PORTD" group="P"/>
+                <signal pad-key="pd0" index="0" function="PORTD" group="P"/>
+                <signal pad-key="pd1" index="1" function="PORTD" group="P"/>
+                <signal pad-key="pd2" index="2" function="PORTD" group="P"/>
+                <signal pad-key="pd3" index="3" function="PORTD" group="P"/>
+                <signal pad-key="pd4" index="4" function="PORTD" group="P"/>
+                <signal pad-key="pd5" index="5" function="PORTD" group="P"/>
+                <signal pad-key="pd6" index="6" function="PORTD" group="P"/>
+                <signal pad-key="pd7" index="7" function="PORTD" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="porte" name="PORTE" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pe2" index="2" function="PORTE" group="P"/>
-                <signal pad-id="pe3" index="3" function="PORTE" group="P"/>
-                <signal pad-id="pe4" index="4" function="PORTE" group="P"/>
-                <signal pad-id="pe5" index="5" function="PORTE" group="P"/>
-                <signal pad-id="pe6" index="6" function="PORTE" group="P"/>
-                <signal pad-id="pe7" index="7" function="PORTE" group="P"/>
+                <signal pad-key="pe0" index="0" function="PORTE" group="P"/>
+                <signal pad-key="pe1" index="1" function="PORTE" group="P"/>
+                <signal pad-key="pe2" index="2" function="PORTE" group="P"/>
+                <signal pad-key="pe3" index="3" function="PORTE" group="P"/>
+                <signal pad-key="pe4" index="4" function="PORTE" group="P"/>
+                <signal pad-key="pe5" index="5" function="PORTE" group="P"/>
+                <signal pad-key="pe6" index="6" function="PORTE" group="P"/>
+                <signal pad-key="pe7" index="7" function="PORTE" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portf" name="PORTF" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pf2" index="2" function="PORTF" group="P"/>
-                <signal pad-id="pf3" index="3" function="PORTF" group="P"/>
-                <signal pad-id="pf4" index="4" function="PORTF" group="P"/>
-                <signal pad-id="pf5" index="5" function="PORTF" group="P"/>
-                <signal pad-id="pf6" index="6" function="PORTF" group="P"/>
-                <signal pad-id="pf7" index="7" function="PORTF" group="P"/>
+                <signal pad-key="pf0" index="0" function="PORTF" group="P"/>
+                <signal pad-key="pf1" index="1" function="PORTF" group="P"/>
+                <signal pad-key="pf2" index="2" function="PORTF" group="P"/>
+                <signal pad-key="pf3" index="3" function="PORTF" group="P"/>
+                <signal pad-key="pf4" index="4" function="PORTF" group="P"/>
+                <signal pad-key="pf5" index="5" function="PORTF" group="P"/>
+                <signal pad-key="pf6" index="6" function="PORTF" group="P"/>
+                <signal pad-key="pf7" index="7" function="PORTF" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="porth" name="PORTH" module-key="gpio_port">
             <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"/>
-                <signal pad-id="ph2" index="2" function="PORTH" group="P"/>
-                <signal pad-id="ph3" index="3" function="PORTH" group="P"/>
-                <signal pad-id="ph4" index="4" function="PORTH" group="P"/>
-                <signal pad-id="ph5" index="5" function="PORTH" group="P"/>
-                <signal pad-id="ph6" index="6" function="PORTH" group="P"/>
-                <signal pad-id="ph7" index="7" function="PORTH" group="P"/>
+                <signal pad-key="ph0" index="0" function="PORTH" group="P"/>
+                <signal pad-key="ph1" index="1" function="PORTH" group="P"/>
+                <signal pad-key="ph2" index="2" function="PORTH" group="P"/>
+                <signal pad-key="ph3" index="3" function="PORTH" group="P"/>
+                <signal pad-key="ph4" index="4" function="PORTH" group="P"/>
+                <signal pad-key="ph5" index="5" function="PORTH" group="P"/>
+                <signal pad-key="ph6" index="6" function="PORTH" group="P"/>
+                <signal pad-key="ph7" index="7" function="PORTH" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portj" name="PORTJ" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pj2" index="2" function="PORTJ" group="P"/>
-                <signal pad-id="pj3" index="3" function="PORTJ" group="P"/>
-                <signal pad-id="pj4" index="4" function="PORTJ" group="P"/>
-                <signal pad-id="pj5" index="5" function="PORTJ" group="P"/>
-                <signal pad-id="pj6" index="6" function="PORTJ" group="P"/>
-                <signal pad-id="pj7" index="7" function="PORTJ" group="P"/>
+                <signal pad-key="pj0" index="0" function="PORTJ" group="P"/>
+                <signal pad-key="pj1" index="1" function="PORTJ" group="P"/>
+                <signal pad-key="pj2" index="2" function="PORTJ" group="P"/>
+                <signal pad-key="pj3" index="3" function="PORTJ" group="P"/>
+                <signal pad-key="pj4" index="4" function="PORTJ" group="P"/>
+                <signal pad-key="pj5" index="5" function="PORTJ" group="P"/>
+                <signal pad-key="pj6" index="6" function="PORTJ" group="P"/>
+                <signal pad-key="pj7" index="7" function="PORTJ" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portk" name="PORTK" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pk2" index="2" function="PORTK" group="P"/>
-                <signal pad-id="pk3" index="3" function="PORTK" group="P"/>
-                <signal pad-id="pk4" index="4" function="PORTK" group="P"/>
-                <signal pad-id="pk5" index="5" function="PORTK" group="P"/>
-                <signal pad-id="pk6" index="6" function="PORTK" group="P"/>
-                <signal pad-id="pk7" index="7" function="PORTK" group="P"/>
+                <signal pad-key="pk0" index="0" function="PORTK" group="P"/>
+                <signal pad-key="pk1" index="1" function="PORTK" group="P"/>
+                <signal pad-key="pk2" index="2" function="PORTK" group="P"/>
+                <signal pad-key="pk3" index="3" function="PORTK" group="P"/>
+                <signal pad-key="pk4" index="4" function="PORTK" group="P"/>
+                <signal pad-key="pk5" index="5" function="PORTK" group="P"/>
+                <signal pad-key="pk6" index="6" function="PORTK" group="P"/>
+                <signal pad-key="pk7" index="7" function="PORTK" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portq" name="PORTQ" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pq2" index="2" function="PORTQ" group="P"/>
-                <signal pad-id="pq3" index="3" function="PORTQ" group="P"/>
+                <signal pad-key="pq0" index="0" function="PORTQ" group="P"/>
+                <signal pad-key="pq1" index="1" function="PORTQ" group="P"/>
+                <signal pad-key="pq2" index="2" function="PORTQ" group="P"/>
+                <signal pad-key="pq3" index="3" function="PORTQ" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portr" name="PORTR" module-key="gpio_port">
             <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"/>
+                <signal pad-key="pr0" index="0" function="PORTR" group="P"/>
+                <signal pad-key="pr1" index="1" function="PORTR" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="tcc0" name="TCC0" module-key="i6090_tc">
             <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"/>
-                <signal pad-id="pc2" function="TCC" group="OC0C"/>
-                <signal pad-id="pc3" function="TCC" group="OC0D"/>
-                <signal pad-id="pc4" function="TCC_ALT" group="OC0A"/>
-                <signal pad-id="pc5" function="TCC_ALT" group="OC0B"/>
-                <signal pad-id="pc6" function="TCC_ALT" group="OC0C"/>
-                <signal pad-id="pc7" function="TCC_ALT" group="OC0D"/>
+                <signal pad-key="pc0" function="TCC" group="OC0A"/>
+                <signal pad-key="pc1" function="TCC" group="OC0B"/>
+                <signal pad-key="pc2" function="TCC" group="OC0C"/>
+                <signal pad-key="pc3" function="TCC" group="OC0D"/>
+                <signal pad-key="pc4" function="TCC_ALT" group="OC0A"/>
+                <signal pad-key="pc5" function="TCC_ALT" group="OC0B"/>
+                <signal pad-key="pc6" function="TCC_ALT" group="OC0C"/>
+                <signal pad-key="pc7" function="TCC_ALT" group="OC0D"/>
             </signals>
         </peripheral>
         <peripheral key="tcc1" name="TCC1" module-key="i6090_tc">
             <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"/>
+                <signal pad-key="pc4" function="TCC" group="OC1A"/>
+                <signal pad-key="pc5" function="TCC" group="OC1B"/>
             </signals>
         </peripheral>
         <peripheral key="tcd0" name="TCD0" module-key="i6090_tc">
             <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"/>
-                <signal pad-id="pd2" function="TCD" group="OC0C"/>
-                <signal pad-id="pd3" function="TCD" group="OC0D"/>
+                <signal pad-key="pd0" function="TCD" group="OC0A"/>
+                <signal pad-key="pd1" function="TCD" group="OC0B"/>
+                <signal pad-key="pd2" function="TCD" group="OC0C"/>
+                <signal pad-key="pd3" function="TCD" group="OC0D"/>
             </signals>
         </peripheral>
         <peripheral key="tcd1" name="TCD1" module-key="i6090_tc">
             <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"/>
+                <signal pad-key="pd4" function="TCD" group="OC1A"/>
+                <signal pad-key="pd5" function="TCD" group="OC1B"/>
             </signals>
         </peripheral>
         <peripheral key="tce0" name="TCE0" module-key="i6090_tc">
             <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"/>
-                <signal pad-id="pe2" function="TCE0" group="OC0C"/>
-                <signal pad-id="pe3" function="TCE0" group="OC0D"/>
+                <signal pad-key="pe0" function="TCE0" group="OC0A"/>
+                <signal pad-key="pe1" function="TCE0" group="OC0B"/>
+                <signal pad-key="pe2" function="TCE0" group="OC0C"/>
+                <signal pad-key="pe3" function="TCE0" group="OC0D"/>
             </signals>
         </peripheral>
         <peripheral key="tce1" name="TCE1" module-key="i6090_tc">
             <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"/>
+                <signal pad-key="pe4" function="TCE1" group="OC1A"/>
+                <signal pad-key="pe5" function="TCE1" group="OC1B"/>
             </signals>
         </peripheral>
         <peripheral key="tcf0" name="TCF0" module-key="i6090_tc">
             <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"/>
-                <signal pad-id="pf2" function="TCF0" group="OC0C"/>
-                <signal pad-id="pf3" function="TCF0" group="OC0D"/>
+                <signal pad-key="pf0" function="TCF0" group="OC0A"/>
+                <signal pad-key="pf1" function="TCF0" group="OC0B"/>
+                <signal pad-key="pf2" function="TCF0" group="OC0C"/>
+                <signal pad-key="pf3" function="TCF0" group="OC0D"/>
             </signals>
         </peripheral>
         <peripheral key="tcf1" name="TCF1" module-key="i6090_tc">
             <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"/>
+                <signal pad-key="pf4" function="TCF1" group="OC1A"/>
+                <signal pad-key="pf5" function="TCF1" group="OC1B"/>
             </signals>
         </peripheral>
         <peripheral key="tcc2" name="TCC2" module-key="i6090_tc2">
             <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"/>
-                <signal pad-id="pc2" function="TCC2" group="LOC2C"/>
-                <signal pad-id="pc3" function="TCC2" group="LOC2D"/>
-                <signal pad-id="pc4" function="TCC2" group="HOC2A"/>
-                <signal pad-id="pc5" function="TCC2" group="HOC2B"/>
-                <signal pad-id="pc6" function="TCC2" group="HOC2C"/>
-                <signal pad-id="pc7" function="TCC2" group="HOC2D"/>
+                <signal pad-key="pc0" function="TCC2" group="LOC2A"/>
+                <signal pad-key="pc1" function="TCC2" group="LOC2B"/>
+                <signal pad-key="pc2" function="TCC2" group="LOC2C"/>
+                <signal pad-key="pc3" function="TCC2" group="LOC2D"/>
+                <signal pad-key="pc4" function="TCC2" group="HOC2A"/>
+                <signal pad-key="pc5" function="TCC2" group="HOC2B"/>
+                <signal pad-key="pc6" function="TCC2" group="HOC2C"/>
+                <signal pad-key="pc7" function="TCC2" group="HOC2D"/>
             </signals>
         </peripheral>
         <peripheral key="tcd2" name="TCD2" module-key="i6090_tc2">
             <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"/>
-                <signal pad-id="pd2" function="TCD2" group="LOC2C"/>
-                <signal pad-id="pd3" function="TCD2" group="LOC2D"/>
-                <signal pad-id="pd4" function="TCD2" group="HOC2A"/>
-                <signal pad-id="pd5" function="TCD2" group="HOC2B"/>
-                <signal pad-id="pd6" function="TCD2" group="HOC2C"/>
-                <signal pad-id="pd7" function="TCD2" group="HOC2D"/>
+                <signal pad-key="pd0" function="TCD2" group="LOC2A"/>
+                <signal pad-key="pd1" function="TCD2" group="LOC2B"/>
+                <signal pad-key="pd2" function="TCD2" group="LOC2C"/>
+                <signal pad-key="pd3" function="TCD2" group="LOC2D"/>
+                <signal pad-key="pd4" function="TCD2" group="HOC2A"/>
+                <signal pad-key="pd5" function="TCD2" group="HOC2B"/>
+                <signal pad-key="pd6" function="TCD2" group="HOC2C"/>
+                <signal pad-key="pd7" function="TCD2" group="HOC2D"/>
             </signals>
         </peripheral>
         <peripheral key="tce2" name="TCE2" module-key="i6090_tc2">
             <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"/>
-                <signal pad-id="pe2" function="TCE2" group="LOC2C"/>
-                <signal pad-id="pe3" function="TCE2" group="LOC2D"/>
-                <signal pad-id="pe4" function="TCE2" group="HOC2A"/>
-                <signal pad-id="pe5" function="TCE2" group="HOC2B"/>
-                <signal pad-id="pe6" function="TCE2" group="HOC2C"/>
-                <signal pad-id="pe7" function="TCE2" group="HOC2D"/>
+                <signal pad-key="pe0" function="TCE2" group="LOC2A"/>
+                <signal pad-key="pe1" function="TCE2" group="LOC2B"/>
+                <signal pad-key="pe2" function="TCE2" group="LOC2C"/>
+                <signal pad-key="pe3" function="TCE2" group="LOC2D"/>
+                <signal pad-key="pe4" function="TCE2" group="HOC2A"/>
+                <signal pad-key="pe5" function="TCE2" group="HOC2B"/>
+                <signal pad-key="pe6" function="TCE2" group="HOC2C"/>
+                <signal pad-key="pe7" function="TCE2" group="HOC2D"/>
             </signals>
         </peripheral>
         <peripheral key="tcf2" name="TCF2" module-key="i6090_tc2">
             <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"/>
-                <signal pad-id="pf2" function="TCF2" group="LOC2C"/>
-                <signal pad-id="pf3" function="TCF2" group="LOC2D"/>
-                <signal pad-id="pf4" function="TCF2" group="HOC2A"/>
-                <signal pad-id="pf5" function="TCF2" group="HOC2B"/>
-                <signal pad-id="pf6" function="TCF2" group="HOC2C"/>
-                <signal pad-id="pf7" function="TCF2" group="HOC2D"/>
+                <signal pad-key="pf0" function="TCF2" group="LOC2A"/>
+                <signal pad-key="pf1" function="TCF2" group="LOC2B"/>
+                <signal pad-key="pf2" function="TCF2" group="LOC2C"/>
+                <signal pad-key="pf3" function="TCF2" group="LOC2D"/>
+                <signal pad-key="pf4" function="TCF2" group="HOC2A"/>
+                <signal pad-key="pf5" function="TCF2" group="HOC2B"/>
+                <signal pad-key="pf6" function="TCF2" group="HOC2C"/>
+                <signal pad-key="pf7" function="TCF2" group="HOC2D"/>
             </signals>
         </peripheral>
         <peripheral key="awexc" name="AWEXC" module-key="i6090_awex">
             <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"/>
-                <signal pad-id="pc2" function="AWEXC" group="OC0BLS"/>
-                <signal pad-id="pc3" function="AWEXC" group="OC0BHS"/>
-                <signal pad-id="pc4" function="AWEXC" group="OC0CLS"/>
-                <signal pad-id="pc5" function="AWEXC" group="OC0CHS"/>
-                <signal pad-id="pc6" function="AWEXC" group="OC0DLS"/>
-                <signal pad-id="pc7" function="AWEXC" group="OC0DHS"/>
+                <signal pad-key="pc0" function="AWEXC" group="OC0ALS"/>
+                <signal pad-key="pc1" function="AWEXC" group="OC0AHS"/>
+                <signal pad-key="pc2" function="AWEXC" group="OC0BLS"/>
+                <signal pad-key="pc3" function="AWEXC" group="OC0BHS"/>
+                <signal pad-key="pc4" function="AWEXC" group="OC0CLS"/>
+                <signal pad-key="pc5" function="AWEXC" group="OC0CHS"/>
+                <signal pad-key="pc6" function="AWEXC" group="OC0DLS"/>
+                <signal pad-key="pc7" function="AWEXC" group="OC0DHS"/>
             </signals>
         </peripheral>
         <peripheral key="awexe" name="AWEXE" module-key="i6090_awex">
             <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"/>
-                <signal pad-id="pe2" function="AWEXE" group="OC0BLS"/>
-                <signal pad-id="pe3" function="AWEXE" group="OC0BHS"/>
-                <signal pad-id="pe4" function="AWEXE" group="OC0CLS"/>
-                <signal pad-id="pe5" function="AWEXE" group="OC0CHS"/>
-                <signal pad-id="pe6" function="AWEXE" group="OC0DLS"/>
-                <signal pad-id="pe7" function="AWEXE" group="OC0DHS"/>
+                <signal pad-key="pe0" function="AWEXE" group="OC0ALS"/>
+                <signal pad-key="pe1" function="AWEXE" group="OC0AHS"/>
+                <signal pad-key="pe2" function="AWEXE" group="OC0BLS"/>
+                <signal pad-key="pe3" function="AWEXE" group="OC0BHS"/>
+                <signal pad-key="pe4" function="AWEXE" group="OC0CLS"/>
+                <signal pad-key="pe5" function="AWEXE" group="OC0CHS"/>
+                <signal pad-key="pe6" function="AWEXE" group="OC0DLS"/>
+                <signal pad-key="pe7" function="AWEXE" group="OC0DHS"/>
             </signals>
         </peripheral>
         <peripheral key="hiresc" name="HIRESC" module-key="i6090_hires">
@@ -641,104 +641,104 @@
         <peripheral key="usartc0" name="USARTC0" module-key="i6090_usart">
             <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"/>
-                <signal pad-id="pc3" function="USART" group="TXD"/>
-                <signal pad-id="pc5" function="USART_ALT" group="XCK"/>
-                <signal pad-id="pc6" function="USART_ALT" group="RXD"/>
-                <signal pad-id="pc7" function="USART_ALT" group="TXD"/>
+                <signal pad-key="pc1" function="USART" group="XCK"/>
+                <signal pad-key="pc2" function="USART" group="RXD"/>
+                <signal pad-key="pc3" function="USART" group="TXD"/>
+                <signal pad-key="pc5" function="USART_ALT" group="XCK"/>
+                <signal pad-key="pc6" function="USART_ALT" group="RXD"/>
+                <signal pad-key="pc7" function="USART_ALT" group="TXD"/>
             </signals>
         </peripheral>
         <peripheral key="usartc1" name="USARTC1" module-key="i6090_usart">
             <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"/>
-                <signal pad-id="pc7" function="USART" group="TXD"/>
+                <signal pad-key="pc5" function="USART" group="XCK"/>
+                <signal pad-key="pc6" function="USART" group="RXD"/>
+                <signal pad-key="pc7" function="USART" group="TXD"/>
             </signals>
         </peripheral>
         <peripheral key="usartd0" name="USARTD0" module-key="i6090_usart">
             <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"/>
-                <signal pad-id="pd3" function="USART" group="TXD"/>
+                <signal pad-key="pd1" function="USART" group="XCK"/>
+                <signal pad-key="pd2" function="USART" group="RXD"/>
+                <signal pad-key="pd3" function="USART" group="TXD"/>
             </signals>
         </peripheral>
         <peripheral key="usartd1" name="USARTD1" module-key="i6090_usart">
             <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"/>
-                <signal pad-id="pd7" function="USART" group="TXD"/>
+                <signal pad-key="pd5" function="USART" group="XCK"/>
+                <signal pad-key="pd6" function="USART" group="RXD"/>
+                <signal pad-key="pd7" function="USART" group="TXD"/>
             </signals>
         </peripheral>
         <peripheral key="usarte0" name="USARTE0" module-key="i6090_usart">
             <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"/>
-                <signal pad-id="pe3" function="USART" group="TXD"/>
+                <signal pad-key="pe1" function="USART" group="XCK"/>
+                <signal pad-key="pe2" function="USART" group="RXD"/>
+                <signal pad-key="pe3" function="USART" group="TXD"/>
             </signals>
         </peripheral>
         <peripheral key="usarte1" name="USARTE1" module-key="i6090_usart">
             <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"/>
-                <signal pad-id="pe7" function="USART" group="TXD"/>
+                <signal pad-key="pe5" function="USART" group="XCK"/>
+                <signal pad-key="pe6" function="USART" group="RXD"/>
+                <signal pad-key="pe7" function="USART" group="TXD"/>
             </signals>
         </peripheral>
         <peripheral key="usartf0" name="USARTF0" module-key="i6090_usart">
             <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"/>
-                <signal pad-id="pf3" function="USARTF0" group="TXD"/>
+                <signal pad-key="pf1" function="USARTF0" group="XCK"/>
+                <signal pad-key="pf2" function="USARTF0" group="RXD"/>
+                <signal pad-key="pf3" function="USARTF0" group="TXD"/>
             </signals>
         </peripheral>
         <peripheral key="usartf1" name="USARTF1" module-key="i6090_usart">
             <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"/>
-                <signal pad-id="pf7" function="USARTF1" group="TXD"/>
+                <signal pad-key="pf5" function="USARTF1" group="XCK"/>
+                <signal pad-key="pf6" function="USARTF1" group="RXD"/>
+                <signal pad-key="pf7" function="USARTF1" group="TXD"/>
             </signals>
         </peripheral>
         <peripheral key="spic" name="SPIC" module-key="i6090_spi">
             <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"/>
-                <signal pad-id="pc6" function="SPIC" group="MISO"/>
-                <signal pad-id="pc7" function="SPIC" group="SCK"/>
+                <signal pad-key="pc4" function="SPIC" group="SS"/>
+                <signal pad-key="pc5" function="SPIC" group="MOSI"/>
+                <signal pad-key="pc6" function="SPIC" group="MISO"/>
+                <signal pad-key="pc7" function="SPIC" group="SCK"/>
             </signals>
         </peripheral>
         <peripheral key="spid" name="SPID" module-key="i6090_spi">
             <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"/>
-                <signal pad-id="pd6" function="SPID" group="MISO"/>
-                <signal pad-id="pd7" function="SPID" group="SCK"/>
+                <signal pad-key="pd4" function="SPID" group="SS"/>
+                <signal pad-key="pd5" function="SPID" group="MOSI"/>
+                <signal pad-key="pd6" function="SPID" group="MISO"/>
+                <signal pad-key="pd7" function="SPID" group="SCK"/>
             </signals>
         </peripheral>
         <peripheral key="spie" name="SPIE" module-key="i6090_spi">
             <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"/>
-                <signal pad-id="pe6" function="SPIE" group="MISO"/>
-                <signal pad-id="pe7" function="SPIE" group="SCK"/>
+                <signal pad-key="pe4" function="SPIE" group="SS"/>
+                <signal pad-key="pe5" function="SPIE" group="MOSI"/>
+                <signal pad-key="pe6" function="SPIE" group="MISO"/>
+                <signal pad-key="pe7" function="SPIE" group="SCK"/>
             </signals>
         </peripheral>
         <peripheral key="spif" name="SPIF" module-key="i6090_spi">
             <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"/>
-                <signal pad-id="pf6" function="SPIF" group="MISO"/>
-                <signal pad-id="pf7" function="SPIF" group="SCK"/>
+                <signal pad-key="pf4" function="SPIF" group="SS"/>
+                <signal pad-key="pf5" function="SPIF" group="MOSI"/>
+                <signal pad-key="pf6" function="SPIF" group="MISO"/>
+                <signal pad-key="pf7" function="SPIF" group="SCK"/>
             </signals>
         </peripheral>
         <peripheral key="ircom" name="IRCOM" module-key="i6090_ircom">
@@ -2164,216 +2164,302 @@
             </register-group>
         </module>
     </modules>
+    <pads>
+        <pad key="pa6" name="PA6"/>
+        <pad key="pa7" name="PA7"/>
+        <pad key="gnd" name="GND"/>
+        <pad key="avcc" name="AVCC"/>
+        <pad key="pb0" name="PB0"/>
+        <pad key="pb1" name="PB1"/>
+        <pad key="pb2" name="PB2"/>
+        <pad key="pb3" name="PB3"/>
+        <pad key="pb4" name="PB4"/>
+        <pad key="pb5" name="PB5"/>
+        <pad key="pb6" name="PB6"/>
+        <pad key="pb7" name="PB7"/>
+        <pad key="vcc" name="VCC"/>
+        <pad key="pc0" name="PC0"/>
+        <pad key="pc1" name="PC1"/>
+        <pad key="pc2" name="PC2"/>
+        <pad key="pc3" name="PC3"/>
+        <pad key="pc4" name="PC4"/>
+        <pad key="pc5" name="PC5"/>
+        <pad key="pc6" name="PC6"/>
+        <pad key="pc7" name="PC7"/>
+        <pad key="pd0" name="PD0"/>
+        <pad key="pd1" name="PD1"/>
+        <pad key="pd2" name="PD2"/>
+        <pad key="pd3" name="PD3"/>
+        <pad key="pd4" name="PD4"/>
+        <pad key="pd5" name="PD5"/>
+        <pad key="pd6" name="PD6"/>
+        <pad key="pd7" name="PD7"/>
+        <pad key="pe0" name="PE0"/>
+        <pad key="pe1" name="PE1"/>
+        <pad key="pe2" name="PE2"/>
+        <pad key="pe3" name="PE3"/>
+        <pad key="pe4" name="PE4"/>
+        <pad key="pe5" name="PE5"/>
+        <pad key="pe6" name="PE6"/>
+        <pad key="pe7" name="PE7"/>
+        <pad key="pf0" name="PF0"/>
+        <pad key="pf1" name="PF1"/>
+        <pad key="pf2" name="PF2"/>
+        <pad key="pf3" name="PF3"/>
+        <pad key="pf4" name="PF4"/>
+        <pad key="pf5" name="PF5"/>
+        <pad key="pf6" name="PF6"/>
+        <pad key="pf7" name="PF7"/>
+        <pad key="ph0" name="PH0"/>
+        <pad key="ph1" name="PH1"/>
+        <pad key="ph2" name="PH2"/>
+        <pad key="ph3" name="PH3"/>
+        <pad key="ph4" name="PH4"/>
+        <pad key="ph5" name="PH5"/>
+        <pad key="ph6" name="PH6"/>
+        <pad key="ph7" name="PH7"/>
+        <pad key="pj0" name="PJ0"/>
+        <pad key="pj1" name="PJ1"/>
+        <pad key="pj2" name="PJ2"/>
+        <pad key="pj3" name="PJ3"/>
+        <pad key="pj4" name="PJ4"/>
+        <pad key="pj5" name="PJ5"/>
+        <pad key="pj6" name="PJ6"/>
+        <pad key="pj7" name="PJ7"/>
+        <pad key="pk0" name="PK0"/>
+        <pad key="pk1" name="PK1"/>
+        <pad key="pk2" name="PK2"/>
+        <pad key="pk3" name="PK3"/>
+        <pad key="pk4" name="PK4"/>
+        <pad key="pk5" name="PK5"/>
+        <pad key="pk6" name="PK6"/>
+        <pad key="pk7" name="PK7"/>
+        <pad key="pq0" name="PQ0"/>
+        <pad key="pq1" name="PQ1"/>
+        <pad key="pq2" name="PQ2"/>
+        <pad key="pq3" name="PQ3"/>
+        <pad key="pdi" name="PDI"/>
+        <pad key="reset" name="RESET"/>
+        <pad key="pr0" name="PR0"/>
+        <pad key="pr1" name="PR1"/>
+        <pad key="pa0" name="PA0"/>
+        <pad key="pa1" name="PA1"/>
+        <pad key="pa2" name="PA2"/>
+        <pad key="pa3" name="PA3"/>
+        <pad key="pa4" name="PA4"/>
+        <pad key="pa5" name="PA5"/>
+        <pad key="pdi_data" name="PDI_DATA"/>
+    </pads>
     <pinouts>
         <pinout key="tqfp100" name="TQFP100" type="qfp">
-            <pin position="1" pad="PA6"/>
-            <pin position="2" pad="PA7"/>
-            <pin position="3" pad="GND"/>
-            <pin position="4" pad="AVCC"/>
-            <pin position="5" pad="PB0"/>
-            <pin position="6" pad="PB1"/>
-            <pin position="7" pad="PB2"/>
-            <pin position="8" pad="PB3"/>
-            <pin position="9" pad="PB4"/>
-            <pin position="10" pad="PB5"/>
-            <pin position="11" pad="PB6"/>
-            <pin position="12" pad="PB7"/>
-            <pin position="13" pad="GND"/>
-            <pin position="14" pad="VCC"/>
-            <pin position="15" pad="PC0"/>
-            <pin position="16" pad="PC1"/>
-            <pin position="17" pad="PC2"/>
-            <pin position="18" pad="PC3"/>
-            <pin position="19" pad="PC4"/>
-            <pin position="20" pad="PC5"/>
-            <pin position="21" pad="PC6"/>
-            <pin position="22" pad="PC7"/>
-            <pin position="23" pad="GND"/>
-            <pin position="24" pad="VCC"/>
-            <pin position="25" pad="PD0"/>
-            <pin position="26" pad="PD1"/>
-            <pin position="27" pad="PD2"/>
-            <pin position="28" pad="PD3"/>
-            <pin position="29" pad="PD4"/>
-            <pin position="30" pad="PD5"/>
-            <pin position="31" pad="PD6"/>
-            <pin position="32" pad="PD7"/>
-            <pin position="33" pad="GND"/>
-            <pin position="34" pad="VCC"/>
-            <pin position="35" pad="PE0"/>
-            <pin position="36" pad="PE1"/>
-            <pin position="37" pad="PE2"/>
-            <pin position="38" pad="PE3"/>
-            <pin position="39" pad="PE4"/>
-            <pin position="40" pad="PE5"/>
-            <pin position="41" pad="PE6"/>
-            <pin position="42" pad="PE7"/>
-            <pin position="43" pad="GND"/>
-            <pin position="44" pad="VCC"/>
-            <pin position="45" pad="PF0"/>
-            <pin position="46" pad="PF1"/>
-            <pin position="47" pad="PF2"/>
-            <pin position="48" pad="PF3"/>
-            <pin position="49" pad="PF4"/>
-            <pin position="50" pad="PF5"/>
-            <pin position="51" pad="PF6"/>
-            <pin position="52" pad="PF7"/>
-            <pin position="53" pad="GND"/>
-            <pin position="54" pad="VCC"/>
-            <pin position="55" pad="PH0"/>
-            <pin position="56" pad="PH1"/>
-            <pin position="57" pad="PH2"/>
-            <pin position="58" pad="PH3"/>
-            <pin position="59" pad="PH4"/>
-            <pin position="60" pad="PH5"/>
-            <pin position="61" pad="PH6"/>
-            <pin position="62" pad="PH7"/>
-            <pin position="63" pad="GND"/>
-            <pin position="64" pad="VCC"/>
-            <pin position="65" pad="PJ0"/>
-            <pin position="66" pad="PJ1"/>
-            <pin position="67" pad="PJ2"/>
-            <pin position="68" pad="PJ3"/>
-            <pin position="69" pad="PJ4"/>
-            <pin position="70" pad="PJ5"/>
-            <pin position="71" pad="PJ6"/>
-            <pin position="72" pad="PJ7"/>
-            <pin position="73" pad="GND"/>
-            <pin position="74" pad="VCC"/>
-            <pin position="75" pad="PK0"/>
-            <pin position="76" pad="PK1"/>
-            <pin position="77" pad="PK2"/>
-            <pin position="78" pad="PK3"/>
-            <pin position="79" pad="PK4"/>
-            <pin position="80" pad="PK5"/>
-            <pin position="81" pad="PK6"/>
-            <pin position="82" pad="PK7"/>
-            <pin position="83" pad="VCC"/>
-            <pin position="84" pad="GND"/>
-            <pin position="85" pad="PQ0"/>
-            <pin position="86" pad="PQ1"/>
-            <pin position="87" pad="PQ2"/>
-            <pin position="88" pad="PQ3"/>
-            <pin position="89" pad="PDI"/>
-            <pin position="90" pad="RESET"/>
-            <pin position="91" pad="PR0"/>
-            <pin position="92" pad="PR1"/>
-            <pin position="93" pad="GND"/>
-            <pin position="94" pad="AVCC"/>
-            <pin position="95" pad="PA0"/>
-            <pin position="96" pad="PA1"/>
-            <pin position="97" pad="PA2"/>
-            <pin position="98" pad="PA3"/>
-            <pin position="99" pad="PA4"/>
-            <pin position="100" pad="PA5"/>
+            <pin position="1" pad-key="pa6"/>
+            <pin position="2" pad-key="pa7"/>
+            <pin position="3" pad-key="gnd"/>
+            <pin position="4" pad-key="avcc"/>
+            <pin position="5" pad-key="pb0"/>
+            <pin position="6" pad-key="pb1"/>
+            <pin position="7" pad-key="pb2"/>
+            <pin position="8" pad-key="pb3"/>
+            <pin position="9" pad-key="pb4"/>
+            <pin position="10" pad-key="pb5"/>
+            <pin position="11" pad-key="pb6"/>
+            <pin position="12" pad-key="pb7"/>
+            <pin position="13" pad-key="gnd"/>
+            <pin position="14" pad-key="vcc"/>
+            <pin position="15" pad-key="pc0"/>
+            <pin position="16" pad-key="pc1"/>
+            <pin position="17" pad-key="pc2"/>
+            <pin position="18" pad-key="pc3"/>
+            <pin position="19" pad-key="pc4"/>
+            <pin position="20" pad-key="pc5"/>
+            <pin position="21" pad-key="pc6"/>
+            <pin position="22" pad-key="pc7"/>
+            <pin position="23" pad-key="gnd"/>
+            <pin position="24" pad-key="vcc"/>
+            <pin position="25" pad-key="pd0"/>
+            <pin position="26" pad-key="pd1"/>
+            <pin position="27" pad-key="pd2"/>
+            <pin position="28" pad-key="pd3"/>
+            <pin position="29" pad-key="pd4"/>
+            <pin position="30" pad-key="pd5"/>
+            <pin position="31" pad-key="pd6"/>
+            <pin position="32" pad-key="pd7"/>
+            <pin position="33" pad-key="gnd"/>
+            <pin position="34" pad-key="vcc"/>
+            <pin position="35" pad-key="pe0"/>
+            <pin position="36" pad-key="pe1"/>
+            <pin position="37" pad-key="pe2"/>
+            <pin position="38" pad-key="pe3"/>
+            <pin position="39" pad-key="pe4"/>
+            <pin position="40" pad-key="pe5"/>
+            <pin position="41" pad-key="pe6"/>
+            <pin position="42" pad-key="pe7"/>
+            <pin position="43" pad-key="gnd"/>
+            <pin position="44" pad-key="vcc"/>
+            <pin position="45" pad-key="pf0"/>
+            <pin position="46" pad-key="pf1"/>
+            <pin position="47" pad-key="pf2"/>
+            <pin position="48" pad-key="pf3"/>
+            <pin position="49" pad-key="pf4"/>
+            <pin position="50" pad-key="pf5"/>
+            <pin position="51" pad-key="pf6"/>
+            <pin position="52" pad-key="pf7"/>
+            <pin position="53" pad-key="gnd"/>
+            <pin position="54" pad-key="vcc"/>
+            <pin position="55" pad-key="ph0"/>
+            <pin position="56" pad-key="ph1"/>
+            <pin position="57" pad-key="ph2"/>
+            <pin position="58" pad-key="ph3"/>
+            <pin position="59" pad-key="ph4"/>
+            <pin position="60" pad-key="ph5"/>
+            <pin position="61" pad-key="ph6"/>
+            <pin position="62" pad-key="ph7"/>
+            <pin position="63" pad-key="gnd"/>
+            <pin position="64" pad-key="vcc"/>
+            <pin position="65" pad-key="pj0"/>
+            <pin position="66" pad-key="pj1"/>
+            <pin position="67" pad-key="pj2"/>
+            <pin position="68" pad-key="pj3"/>
+            <pin position="69" pad-key="pj4"/>
+            <pin position="70" pad-key="pj5"/>
+            <pin position="71" pad-key="pj6"/>
+            <pin position="72" pad-key="pj7"/>
+            <pin position="73" pad-key="gnd"/>
+            <pin position="74" pad-key="vcc"/>
+            <pin position="75" pad-key="pk0"/>
+            <pin position="76" pad-key="pk1"/>
+            <pin position="77" pad-key="pk2"/>
+            <pin position="78" pad-key="pk3"/>
+            <pin position="79" pad-key="pk4"/>
+            <pin position="80" pad-key="pk5"/>
+            <pin position="81" pad-key="pk6"/>
+            <pin position="82" pad-key="pk7"/>
+            <pin position="83" pad-key="vcc"/>
+            <pin position="84" pad-key="gnd"/>
+            <pin position="85" pad-key="pq0"/>
+            <pin position="86" pad-key="pq1"/>
+            <pin position="87" pad-key="pq2"/>
+            <pin position="88" pad-key="pq3"/>
+            <pin position="89" pad-key="pdi"/>
+            <pin position="90" pad-key="reset"/>
+            <pin position="91" pad-key="pr0"/>
+            <pin position="92" pad-key="pr1"/>
+            <pin position="93" pad-key="gnd"/>
+            <pin position="94" pad-key="avcc"/>
+            <pin position="95" pad-key="pa0"/>
+            <pin position="96" pad-key="pa1"/>
+            <pin position="97" pad-key="pa2"/>
+            <pin position="98" pad-key="pa3"/>
+            <pin position="99" pad-key="pa4"/>
+            <pin position="100" pad-key="pa5"/>
         </pinout>
         <pinout key="bga100" name="BGA100" type="bga">
-            <pin position="A1" pad="PK0"/>
-            <pin position="A2" pad="VCC"/>
-            <pin position="A3" pad="GND"/>
-            <pin position="A4" pad="PJ3"/>
-            <pin position="A5" pad="VCC"/>
-            <pin position="A6" pad="GND"/>
-            <pin position="A7" pad="PH1"/>
-            <pin position="A8" pad="GND"/>
-            <pin position="A9" pad="VCC"/>
-            <pin position="A10" pad="PF7"/>
-            <pin position="B1" pad="PK3"/>
-            <pin position="B2" pad="PK2"/>
-            <pin position="B3" pad="PK1"/>
-            <pin position="B4" pad="PJ4"/>
-            <pin position="B5" pad="PH7"/>
-            <pin position="B6" pad="PH4"/>
-            <pin position="B7" pad="PH2"/>
-            <pin position="B8" pad="PH0"/>
-            <pin position="B9" pad="PF6"/>
-            <pin position="B10" pad="PF5"/>
-            <pin position="C1" pad="VCC"/>
-            <pin position="C2" pad="PK5"/>
-            <pin position="C3" pad="PK4"/>
-            <pin position="C4" pad="PJ5"/>
-            <pin position="C5" pad="PJ0"/>
-            <pin position="C6" pad="PH5"/>
-            <pin position="C7" pad="PH3"/>
-            <pin position="C8" pad="PF2"/>
-            <pin position="C9" pad="PF3"/>
-            <pin position="C10" pad="VCC"/>
-            <pin position="D1" pad="GND"/>
-            <pin position="D2" pad="PK6"/>
-            <pin position="D3" pad="PK7"/>
-            <pin position="D4" pad="PJ6"/>
-            <pin position="D5" pad="PJ1"/>
-            <pin position="D6" pad="PH6"/>
-            <pin position="D7" pad="PF0"/>
-            <pin position="D8" pad="PF1"/>
-            <pin position="D9" pad="PF4"/>
-            <pin position="D10" pad="GND"/>
-            <pin position="E1" pad="PQ0"/>
-            <pin position="E2" pad="PQ1"/>
-            <pin position="E3" pad="PQ2"/>
-            <pin position="E4" pad="PJ7"/>
-            <pin position="E5" pad="PJ2"/>
-            <pin position="E6" pad="PE7"/>
-            <pin position="E7" pad="PE6"/>
-            <pin position="E8" pad="PE5"/>
-            <pin position="E9" pad="PE4"/>
-            <pin position="E10" pad="PE3"/>
-            <pin position="F1" pad="PR1"/>
-            <pin position="F2" pad="PR0"/>
-            <pin position="F3" pad="RESET"/>
-            <pin position="F4" pad="PDI_DATA"/>
-            <pin position="F5" pad="PQ3"/>
-            <pin position="F6" pad="PC2"/>
-            <pin position="F7" pad="PE2"/>
-            <pin position="F8" pad="PE1"/>
-            <pin position="F9" pad="PE0"/>
-            <pin position="F10" pad="VCC"/>
-            <pin position="G1" pad="GND"/>
-            <pin position="G2" pad="PA1"/>
-            <pin position="G3" pad="PA4"/>
-            <pin position="G4" pad="PB3"/>
-            <pin position="G5" pad="PB4"/>
-            <pin position="G6" pad="PC1"/>
-            <pin position="G7" pad="PC6"/>
-            <pin position="G8" pad="PD7"/>
-            <pin position="G9" pad="PD6"/>
-            <pin position="G10" pad="GND"/>
-            <pin position="H1" pad="AVCC"/>
-            <pin position="H2" pad="PA2"/>
-            <pin position="H3" pad="PA5"/>
-            <pin position="H4" pad="PB2"/>
-            <pin position="H5" pad="PB5"/>
-            <pin position="H6" pad="PC0"/>
-            <pin position="H7" pad="PC5"/>
-            <pin position="H8" pad="PD5"/>
-            <pin position="H9" pad="PD4"/>
-            <pin position="H10" pad="PD3"/>
-            <pin position="J1" pad="PA0"/>
-            <pin position="J2" pad="PA3"/>
-            <pin position="J3" pad="PB0"/>
-            <pin position="J4" pad="PB1"/>
-            <pin position="J5" pad="PB6"/>
-            <pin position="J6" pad="PC3"/>
-            <pin position="J7" pad="PC4"/>
-            <pin position="J8" pad="PC7"/>
-            <pin position="J9" pad="PD2"/>
-            <pin position="J10" pad="PD1"/>
-            <pin position="K1" pad="PA6"/>
-            <pin position="K2" pad="PA7"/>
-            <pin position="K3" pad="GND"/>
-            <pin position="K4" pad="AVCC"/>
-            <pin position="K5" pad="PB7"/>
-            <pin position="K6" pad="VCC "/>
-            <pin position="K7" pad="GND"/>
-            <pin position="K8" pad="VCC"/>
-            <pin position="K9" pad="GND"/>
-            <pin position="K10" pad="PD0"/>
+            <pin position="A1" pad-key="pk0"/>
+            <pin position="A2" pad-key="vcc"/>
+            <pin position="A3" pad-key="gnd"/>
+            <pin position="A4" pad-key="pj3"/>
+            <pin position="A5" pad-key="vcc"/>
+            <pin position="A6" pad-key="gnd"/>
+            <pin position="A7" pad-key="ph1"/>
+            <pin position="A8" pad-key="gnd"/>
+            <pin position="A9" pad-key="vcc"/>
+            <pin position="A10" pad-key="pf7"/>
+            <pin position="B1" pad-key="pk3"/>
+            <pin position="B2" pad-key="pk2"/>
+            <pin position="B3" pad-key="pk1"/>
+            <pin position="B4" pad-key="pj4"/>
+            <pin position="B5" pad-key="ph7"/>
+            <pin position="B6" pad-key="ph4"/>
+            <pin position="B7" pad-key="ph2"/>
+            <pin position="B8" pad-key="ph0"/>
+            <pin position="B9" pad-key="pf6"/>
+            <pin position="B10" pad-key="pf5"/>
+            <pin position="C1" pad-key="vcc"/>
+            <pin position="C2" pad-key="pk5"/>
+            <pin position="C3" pad-key="pk4"/>
+            <pin position="C4" pad-key="pj5"/>
+            <pin position="C5" pad-key="pj0"/>
+            <pin position="C6" pad-key="ph5"/>
+            <pin position="C7" pad-key="ph3"/>
+            <pin position="C8" pad-key="pf2"/>
+            <pin position="C9" pad-key="pf3"/>
+            <pin position="C10" pad-key="vcc"/>
+            <pin position="D1" pad-key="gnd"/>
+            <pin position="D2" pad-key="pk6"/>
+            <pin position="D3" pad-key="pk7"/>
+            <pin position="D4" pad-key="pj6"/>
+            <pin position="D5" pad-key="pj1"/>
+            <pin position="D6" pad-key="ph6"/>
+            <pin position="D7" pad-key="pf0"/>
+            <pin position="D8" pad-key="pf1"/>
+            <pin position="D9" pad-key="pf4"/>
+            <pin position="D10" pad-key="gnd"/>
+            <pin position="E1" pad-key="pq0"/>
+            <pin position="E2" pad-key="pq1"/>
+            <pin position="E3" pad-key="pq2"/>
+            <pin position="E4" pad-key="pj7"/>
+            <pin position="E5" pad-key="pj2"/>
+            <pin position="E6" pad-key="pe7"/>
+            <pin position="E7" pad-key="pe6"/>
+            <pin position="E8" pad-key="pe5"/>
+            <pin position="E9" pad-key="pe4"/>
+            <pin position="E10" pad-key="pe3"/>
+            <pin position="F1" pad-key="pr1"/>
+            <pin position="F2" pad-key="pr0"/>
+            <pin position="F3" pad-key="reset"/>
+            <pin position="F4" pad-key="pdi_data"/>
+            <pin position="F5" pad-key="pq3"/>
+            <pin position="F6" pad-key="pc2"/>
+            <pin position="F7" pad-key="pe2"/>
+            <pin position="F8" pad-key="pe1"/>
+            <pin position="F9" pad-key="pe0"/>
+            <pin position="F10" pad-key="vcc"/>
+            <pin position="G1" pad-key="gnd"/>
+            <pin position="G2" pad-key="pa1"/>
+            <pin position="G3" pad-key="pa4"/>
+            <pin position="G4" pad-key="pb3"/>
+            <pin position="G5" pad-key="pb4"/>
+            <pin position="G6" pad-key="pc1"/>
+            <pin position="G7" pad-key="pc6"/>
+            <pin position="G8" pad-key="pd7"/>
+            <pin position="G9" pad-key="pd6"/>
+            <pin position="G10" pad-key="gnd"/>
+            <pin position="H1" pad-key="avcc"/>
+            <pin position="H2" pad-key="pa2"/>
+            <pin position="H3" pad-key="pa5"/>
+            <pin position="H4" pad-key="pb2"/>
+            <pin position="H5" pad-key="pb5"/>
+            <pin position="H6" pad-key="pc0"/>
+            <pin position="H7" pad-key="pc5"/>
+            <pin position="H8" pad-key="pd5"/>
+            <pin position="H9" pad-key="pd4"/>
+            <pin position="H10" pad-key="pd3"/>
+            <pin position="J1" pad-key="pa0"/>
+            <pin position="J2" pad-key="pa3"/>
+            <pin position="J3" pad-key="pb0"/>
+            <pin position="J4" pad-key="pb1"/>
+            <pin position="J5" pad-key="pb6"/>
+            <pin position="J6" pad-key="pc3"/>
+            <pin position="J7" pad-key="pc4"/>
+            <pin position="J8" pad-key="pc7"/>
+            <pin position="J9" pad-key="pd2"/>
+            <pin position="J10" pad-key="pd1"/>
+            <pin position="K1" pad-key="pa6"/>
+            <pin position="K2" pad-key="pa7"/>
+            <pin position="K3" pad-key="gnd"/>
+            <pin position="K4" pad-key="avcc"/>
+            <pin position="K5" pad-key="pb7"/>
+            <pin position="K6" pad-key="vcc"/>
+            <pin position="K7" pad-key="gnd"/>
+            <pin position="K8" pad-key="vcc"/>
+            <pin position="K9" pad-key="gnd"/>
+            <pin position="K10" pad-key="pd0"/>
         </pinout>
     </pinouts>
     <variants>
-        <variant name="ATxmega128A1U-AU" pinout-key="tqfp100" package="TQFP100"/>
-        <variant name="ATxmega128A1U-CU" pinout-key="bga100" package="BGA100"/>
-        <variant name="ATxmega128A1U-C7U" pinout-key="bga100" package="BGA100"/>
-        <variant name="ATxmega128A1U-AN" pinout-key="tqfp100" package="TQFP100"/>
+        <variant key="atxmega128a1u_au" name="ATxmega128A1U-AU" pinout-key="tqfp100"/>
+        <variant key="atxmega128a1u_cu" name="ATxmega128A1U-CU" pinout-key="bga100"/>
+        <variant key="atxmega128a1u_c7u" name="ATxmega128A1U-C7U" pinout-key="bga100"/>
+        <variant key="atxmega128a1u_an" name="ATxmega128A1U-AN" pinout-key="tqfp100"/>
     </variants>
 </device>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA128A3.xml b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA128A3.xml
index 6617d26d..2444dc68 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA128A3.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA128A3.xml
@@ -160,86 +160,86 @@
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pa2" index="2" function="PORTA" group="P"/>
-                <signal pad-id="pa3" index="3" function="PORTA" group="P"/>
-                <signal pad-id="pa4" index="4" function="PORTA" group="P"/>
-                <signal pad-id="pa5" index="5" function="PORTA" group="P"/>
-                <signal pad-id="pa6" index="6" function="PORTA" group="P"/>
-                <signal pad-id="pa7" index="7" function="PORTA" group="P"/>
+                <signal pad-key="pa0" index="0" function="PORTA" group="P"/>
+                <signal pad-key="pa1" index="1" function="PORTA" group="P"/>
+                <signal pad-key="pa2" index="2" function="PORTA" group="P"/>
+                <signal pad-key="pa3" index="3" function="PORTA" group="P"/>
+                <signal pad-key="pa4" index="4" function="PORTA" group="P"/>
+                <signal pad-key="pa5" index="5" function="PORTA" group="P"/>
+                <signal pad-key="pa6" index="6" function="PORTA" group="P"/>
+                <signal pad-key="pa7" index="7" function="PORTA" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pb2" index="2" function="PORTB" group="P"/>
-                <signal pad-id="pb3" index="3" function="PORTB" group="P"/>
-                <signal pad-id="pb4" index="4" function="PORTB" group="P"/>
-                <signal pad-id="pb5" index="5" function="PORTB" group="P"/>
-                <signal pad-id="pb6" index="6" function="PORTB" group="P"/>
-                <signal pad-id="pb7" index="7" function="PORTB" group="P"/>
+                <signal pad-key="pb0" index="0" function="PORTB" group="P"/>
+                <signal pad-key="pb1" index="1" function="PORTB" group="P"/>
+                <signal pad-key="pb2" index="2" function="PORTB" group="P"/>
+                <signal pad-key="pb3" index="3" function="PORTB" group="P"/>
+                <signal pad-key="pb4" index="4" function="PORTB" group="P"/>
+                <signal pad-key="pb5" index="5" function="PORTB" group="P"/>
+                <signal pad-key="pb6" index="6" function="PORTB" group="P"/>
+                <signal pad-key="pb7" index="7" function="PORTB" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pc2" index="2" function="PORTC" group="P"/>
-                <signal pad-id="pc3" index="3" function="PORTC" group="P"/>
-                <signal pad-id="pc4" index="4" function="PORTC" group="P"/>
-                <signal pad-id="pc5" index="5" function="PORTC" group="P"/>
-                <signal pad-id="pc6" index="6" function="PORTC" group="P"/>
-                <signal pad-id="pc7" index="7" function="PORTC" group="P"/>
+                <signal pad-key="pc0" index="0" function="PORTC" group="P"/>
+                <signal pad-key="pc1" index="1" function="PORTC" group="P"/>
+                <signal pad-key="pc2" index="2" function="PORTC" group="P"/>
+                <signal pad-key="pc3" index="3" function="PORTC" group="P"/>
+                <signal pad-key="pc4" index="4" function="PORTC" group="P"/>
+                <signal pad-key="pc5" index="5" function="PORTC" group="P"/>
+                <signal pad-key="pc6" index="6" function="PORTC" group="P"/>
+                <signal pad-key="pc7" index="7" function="PORTC" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pd2" index="2" function="PORTD" group="P"/>
-                <signal pad-id="pd3" index="3" function="PORTD" group="P"/>
-                <signal pad-id="pd4" index="4" function="PORTD" group="P"/>
-                <signal pad-id="pd5" index="5" function="PORTD" group="P"/>
-                <signal pad-id="pd6" index="6" function="PORTD" group="P"/>
-                <signal pad-id="pd7" index="7" function="PORTD" group="P"/>
+                <signal pad-key="pd0" index="0" function="PORTD" group="P"/>
+                <signal pad-key="pd1" index="1" function="PORTD" group="P"/>
+                <signal pad-key="pd2" index="2" function="PORTD" group="P"/>
+                <signal pad-key="pd3" index="3" function="PORTD" group="P"/>
+                <signal pad-key="pd4" index="4" function="PORTD" group="P"/>
+                <signal pad-key="pd5" index="5" function="PORTD" group="P"/>
+                <signal pad-key="pd6" index="6" function="PORTD" group="P"/>
+                <signal pad-key="pd7" index="7" function="PORTD" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="porte" name="PORTE" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pe2" index="2" function="PORTE" group="P"/>
-                <signal pad-id="pe3" index="3" function="PORTE" group="P"/>
-                <signal pad-id="pe4" index="4" function="PORTE" group="P"/>
-                <signal pad-id="pe5" index="5" function="PORTE" group="P"/>
-                <signal pad-id="pe6" index="6" function="PORTE" group="P"/>
-                <signal pad-id="pe7" index="7" function="PORTE" group="P"/>
+                <signal pad-key="pe0" index="0" function="PORTE" group="P"/>
+                <signal pad-key="pe1" index="1" function="PORTE" group="P"/>
+                <signal pad-key="pe2" index="2" function="PORTE" group="P"/>
+                <signal pad-key="pe3" index="3" function="PORTE" group="P"/>
+                <signal pad-key="pe4" index="4" function="PORTE" group="P"/>
+                <signal pad-key="pe5" index="5" function="PORTE" group="P"/>
+                <signal pad-key="pe6" index="6" function="PORTE" group="P"/>
+                <signal pad-key="pe7" index="7" function="PORTE" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portf" name="PORTF" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pf2" index="2" function="PORTF" group="P"/>
-                <signal pad-id="pf3" index="3" function="PORTF" group="P"/>
-                <signal pad-id="pf4" index="4" function="PORTF" group="P"/>
-                <signal pad-id="pf5" index="5" function="PORTF" group="P"/>
-                <signal pad-id="pf6" index="6" function="PORTF" group="P"/>
-                <signal pad-id="pf7" index="7" function="PORTF" group="P"/>
+                <signal pad-key="pf0" index="0" function="PORTF" group="P"/>
+                <signal pad-key="pf1" index="1" function="PORTF" group="P"/>
+                <signal pad-key="pf2" index="2" function="PORTF" group="P"/>
+                <signal pad-key="pf3" index="3" function="PORTF" group="P"/>
+                <signal pad-key="pf4" index="4" function="PORTF" group="P"/>
+                <signal pad-key="pf5" index="5" function="PORTF" group="P"/>
+                <signal pad-key="pf6" index="6" function="PORTF" group="P"/>
+                <signal pad-key="pf7" index="7" function="PORTF" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portr" name="PORTR" module-key="gpio_port">
             <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"/>
+                <signal pad-key="pr0" index="0" function="PORTR" group="P"/>
+                <signal pad-key="pr1" index="1" function="PORTR" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="tcc0" name="TCC0" module-key="i6090_tc">
@@ -1384,76 +1384,133 @@
             </register-group>
         </module>
     </modules>
+    <pads>
+        <pad key="pa3" name="PA3"/>
+        <pad key="pa4" name="PA4"/>
+        <pad key="pa5" name="PA5"/>
+        <pad key="pa6" name="PA6"/>
+        <pad key="pa7" name="PA7"/>
+        <pad key="pb0" name="PB0"/>
+        <pad key="pb1" name="PB1"/>
+        <pad key="pb2" name="PB2"/>
+        <pad key="pb3" name="PB3"/>
+        <pad key="pb4" name="PB4"/>
+        <pad key="pb5" name="PB5"/>
+        <pad key="pb6" name="PB6"/>
+        <pad key="pb7" name="PB7"/>
+        <pad key="gnd" name="GND"/>
+        <pad key="vcc" name="VCC"/>
+        <pad key="pc0" name="PC0"/>
+        <pad key="pc1" name="PC1"/>
+        <pad key="pc2" name="PC2"/>
+        <pad key="pc3" name="PC3"/>
+        <pad key="pc4" name="PC4"/>
+        <pad key="pc5" name="PC5"/>
+        <pad key="pc6" name="PC6"/>
+        <pad key="pc7" name="PC7"/>
+        <pad key="pd0" name="PD0"/>
+        <pad key="pd1" name="PD1"/>
+        <pad key="pd2" name="PD2"/>
+        <pad key="pd3" name="PD3"/>
+        <pad key="pd4" name="PD4"/>
+        <pad key="pd5" name="PD5"/>
+        <pad key="pd6" name="PD6"/>
+        <pad key="pd7" name="PD7"/>
+        <pad key="pe0" name="PE0"/>
+        <pad key="pe1" name="PE1"/>
+        <pad key="pe2" name="PE2"/>
+        <pad key="pe3" name="PE3"/>
+        <pad key="pe4" name="PE4"/>
+        <pad key="pe5" name="PE5"/>
+        <pad key="pe6" name="PE6"/>
+        <pad key="pe7" name="PE7"/>
+        <pad key="pf0" name="PF0"/>
+        <pad key="pf1" name="PF1"/>
+        <pad key="pf2" name="PF2"/>
+        <pad key="pf3" name="PF3"/>
+        <pad key="pf4" name="PF4"/>
+        <pad key="pf5" name="PF5"/>
+        <pad key="pf6" name="PF6"/>
+        <pad key="pf7" name="PF7"/>
+        <pad key="pdi" name="PDI"/>
+        <pad key="reset" name="RESET"/>
+        <pad key="pr0" name="PR0"/>
+        <pad key="pr1" name="PR1"/>
+        <pad key="avcc" name="AVCC"/>
+        <pad key="pa0" name="PA0"/>
+        <pad key="pa1" name="PA1"/>
+        <pad key="pa2" name="PA2"/>
+    </pads>
     <pinouts>
         <pinout key="qfp_qfn_64" name="QFP_QFN_64" type="qfn">
-            <pin position="1" pad="PA3"/>
-            <pin position="2" pad="PA4"/>
-            <pin position="3" pad="PA5"/>
-            <pin position="4" pad="PA6"/>
-            <pin position="5" pad="PA7"/>
-            <pin position="6" pad="PB0"/>
-            <pin position="7" pad="PB1"/>
-            <pin position="8" pad="PB2"/>
-            <pin position="9" pad="PB3"/>
-            <pin position="10" pad="PB4"/>
-            <pin position="11" pad="PB5"/>
-            <pin position="12" pad="PB6"/>
-            <pin position="13" pad="PB7"/>
-            <pin position="14" pad="GND"/>
-            <pin position="15" pad="VCC"/>
-            <pin position="16" pad="PC0"/>
-            <pin position="17" pad="PC1"/>
-            <pin position="18" pad="PC2"/>
-            <pin position="19" pad="PC3"/>
-            <pin position="20" pad="PC4"/>
-            <pin position="21" pad="PC5"/>
-            <pin position="22" pad="PC6"/>
-            <pin position="23" pad="PC7"/>
-            <pin position="24" pad="GND"/>
-            <pin position="25" pad="VCC"/>
-            <pin position="26" pad="PD0"/>
-            <pin position="27" pad="PD1"/>
-            <pin position="28" pad="PD2"/>
-            <pin position="29" pad="PD3"/>
-            <pin position="30" pad="PD4"/>
-            <pin position="31" pad="PD5"/>
-            <pin position="32" pad="PD6"/>
-            <pin position="33" pad="PD7"/>
-            <pin position="34" pad="GND"/>
-            <pin position="35" pad="VCC"/>
-            <pin position="36" pad="PE0"/>
-            <pin position="37" pad="PE1"/>
-            <pin position="38" pad="PE2"/>
-            <pin position="39" pad="PE3"/>
-            <pin position="40" pad="PE4"/>
-            <pin position="41" pad="PE5"/>
-            <pin position="42" pad="PE6"/>
-            <pin position="43" pad="PE7"/>
-            <pin position="44" pad="GND"/>
-            <pin position="45" pad="VCC"/>
-            <pin position="46" pad="PF0"/>
-            <pin position="47" pad="PF1"/>
-            <pin position="48" pad="PF2"/>
-            <pin position="49" pad="PF3"/>
-            <pin position="50" pad="PF4"/>
-            <pin position="51" pad="PF5"/>
-            <pin position="52" pad="GND"/>
-            <pin position="53" pad="VCC"/>
-            <pin position="54" pad="PF6"/>
-            <pin position="55" pad="PF7"/>
-            <pin position="56" pad="PDI"/>
-            <pin position="57" pad="RESET"/>
-            <pin position="58" pad="PR0"/>
-            <pin position="59" pad="PR1"/>
-            <pin position="60" pad="GND"/>
-            <pin position="61" pad="AVCC"/>
-            <pin position="62" pad="PA0"/>
-            <pin position="63" pad="PA1"/>
-            <pin position="64" pad="PA2"/>
+            <pin position="1" pad-key="pa3"/>
+            <pin position="2" pad-key="pa4"/>
+            <pin position="3" pad-key="pa5"/>
+            <pin position="4" pad-key="pa6"/>
+            <pin position="5" pad-key="pa7"/>
+            <pin position="6" pad-key="pb0"/>
+            <pin position="7" pad-key="pb1"/>
+            <pin position="8" pad-key="pb2"/>
+            <pin position="9" pad-key="pb3"/>
+            <pin position="10" pad-key="pb4"/>
+            <pin position="11" pad-key="pb5"/>
+            <pin position="12" pad-key="pb6"/>
+            <pin position="13" pad-key="pb7"/>
+            <pin position="14" pad-key="gnd"/>
+            <pin position="15" pad-key="vcc"/>
+            <pin position="16" pad-key="pc0"/>
+            <pin position="17" pad-key="pc1"/>
+            <pin position="18" pad-key="pc2"/>
+            <pin position="19" pad-key="pc3"/>
+            <pin position="20" pad-key="pc4"/>
+            <pin position="21" pad-key="pc5"/>
+            <pin position="22" pad-key="pc6"/>
+            <pin position="23" pad-key="pc7"/>
+            <pin position="24" pad-key="gnd"/>
+            <pin position="25" pad-key="vcc"/>
+            <pin position="26" pad-key="pd0"/>
+            <pin position="27" pad-key="pd1"/>
+            <pin position="28" pad-key="pd2"/>
+            <pin position="29" pad-key="pd3"/>
+            <pin position="30" pad-key="pd4"/>
+            <pin position="31" pad-key="pd5"/>
+            <pin position="32" pad-key="pd6"/>
+            <pin position="33" pad-key="pd7"/>
+            <pin position="34" pad-key="gnd"/>
+            <pin position="35" pad-key="vcc"/>
+            <pin position="36" pad-key="pe0"/>
+            <pin position="37" pad-key="pe1"/>
+            <pin position="38" pad-key="pe2"/>
+            <pin position="39" pad-key="pe3"/>
+            <pin position="40" pad-key="pe4"/>
+            <pin position="41" pad-key="pe5"/>
+            <pin position="42" pad-key="pe6"/>
+            <pin position="43" pad-key="pe7"/>
+            <pin position="44" pad-key="gnd"/>
+            <pin position="45" pad-key="vcc"/>
+            <pin position="46" pad-key="pf0"/>
+            <pin position="47" pad-key="pf1"/>
+            <pin position="48" pad-key="pf2"/>
+            <pin position="49" pad-key="pf3"/>
+            <pin position="50" pad-key="pf4"/>
+            <pin position="51" pad-key="pf5"/>
+            <pin position="52" pad-key="gnd"/>
+            <pin position="53" pad-key="vcc"/>
+            <pin position="54" pad-key="pf6"/>
+            <pin position="55" pad-key="pf7"/>
+            <pin position="56" pad-key="pdi"/>
+            <pin position="57" pad-key="reset"/>
+            <pin position="58" pad-key="pr0"/>
+            <pin position="59" pad-key="pr1"/>
+            <pin position="60" pad-key="gnd"/>
+            <pin position="61" pad-key="avcc"/>
+            <pin position="62" pad-key="pa0"/>
+            <pin position="63" pad-key="pa1"/>
+            <pin position="64" pad-key="pa2"/>
         </pinout>
     </pinouts>
     <variants>
-        <variant name="ATXMEGA128A3-AU" pinout-key="qfp_qfn_64" package="TQFP64"/>
-        <variant name="ATXMEGA128A3-MH" pinout-key="qfp_qfn_64" package="QFN64"/>
+        <variant key="atxmega128a3_au" name="ATXMEGA128A3-AU" pinout-key="qfp_qfn_64"/>
+        <variant key="atxmega128a3_mh" name="ATXMEGA128A3-MH" pinout-key="qfp_qfn_64"/>
     </variants>
 </device>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA128A3U.xml b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA128A3U.xml
index 64b03b3d..45b15226 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA128A3U.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA128A3U.xml
@@ -94,10 +94,10 @@
         <peripheral key="osc" name="OSC" module-key="i6079">
             <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"/>
-                <signal pad-id="pe2" function="TOSC" group="TOSC2"/>
-                <signal pad-id="pe3" function="TOSC" group="TOSC1"/>
+                <signal pad-key="pr0" function="XTAL" group="XTAL2"/>
+                <signal pad-key="pr1" function="XTAL" group="XTAL1"/>
+                <signal pad-key="pe2" function="TOSC" group="TOSC2"/>
+                <signal pad-key="pe3" function="TOSC" group="TOSC1"/>
             </signals>
         </peripheral>
         <peripheral key="dfllrc32m" name="DFLLRC32M" module-key="i6055">
@@ -121,19 +121,19 @@
         <peripheral key="portcfg" name="PORTCFG" module-key="i6075_portcfg">
             <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"/>
-                <signal pad-id="pd7" function="CLKOUTD" group="CLKOUT" field="CLKOUT"/>
-                <signal pad-id="pd4" function="CLKOUTD_ALT" group="CLKOUT" field="CLKEVPIN"/>
-                <signal pad-id="pe7" function="CLKOUTE" group="CLKOUT" field="CLKOUT"/>
-                <signal pad-id="pe4" function="CLKOUTE_ALT" group="CLKOUT" field="CLKEVPIN"/>
-                <signal pad-id="pc7" function="EVOUTC" group="EVOUT" field="EVOUT"/>
-                <signal pad-id="pc4" function="EVOUTC_ALT" group="EVOUT" field="CLKEVPIN"/>
-                <signal pad-id="pd7" function="EVOUTD" group="EVOUT" field="EVOUT"/>
-                <signal pad-id="pd4" function="EVOUTD_ALT" group="EVOUT" field="CLKEVPIN"/>
-                <signal pad-id="pe7" function="EVOUTE" group="EVOUT" field="EVOUT"/>
-                <signal pad-id="pe4" function="EVOUTE_ALT" group="EVOUT" field="CLKEVPIN"/>
-                <signal pad-id="pc6" function="RTCOUTC" group="RTCOUT"/>
+                <signal pad-key="pc7" function="CLKOUTC" group="CLKOUT" field="CLKOUT"/>
+                <signal pad-key="pc4" function="CLKOUTC_ALT" group="CLKOUT" field="CLKEVPIN"/>
+                <signal pad-key="pd7" function="CLKOUTD" group="CLKOUT" field="CLKOUT"/>
+                <signal pad-key="pd4" function="CLKOUTD_ALT" group="CLKOUT" field="CLKEVPIN"/>
+                <signal pad-key="pe7" function="CLKOUTE" group="CLKOUT" field="CLKOUT"/>
+                <signal pad-key="pe4" function="CLKOUTE_ALT" group="CLKOUT" field="CLKEVPIN"/>
+                <signal pad-key="pc7" function="EVOUTC" group="EVOUT" field="EVOUT"/>
+                <signal pad-key="pc4" function="EVOUTC_ALT" group="EVOUT" field="CLKEVPIN"/>
+                <signal pad-key="pd7" function="EVOUTD" group="EVOUT" field="EVOUT"/>
+                <signal pad-key="pd4" function="EVOUTD_ALT" group="EVOUT" field="CLKEVPIN"/>
+                <signal pad-key="pe7" function="EVOUTE" group="EVOUT" field="EVOUT"/>
+                <signal pad-key="pe4" function="EVOUTE_ALT" group="EVOUT" field="CLKEVPIN"/>
+                <signal pad-key="pc6" function="RTCOUTC" group="RTCOUT"/>
             </signals>
         </peripheral>
         <peripheral key="aes" name="AES" module-key="i6096">
@@ -154,78 +154,78 @@
         <peripheral key="adca" name="ADCA" module-key="i6099">
             <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"/>
-                <signal pad-id="pa2" index="2" function="ADC" group="ADC"/>
-                <signal pad-id="pa3" index="3" function="ADC" group="ADC"/>
-                <signal pad-id="pa4" index="4" function="ADC" group="ADC"/>
-                <signal pad-id="pa5" index="5" function="ADC" group="ADC"/>
-                <signal pad-id="pa6" index="6" function="ADC" group="ADC"/>
-                <signal pad-id="pa7" index="7" function="ADC" group="ADC"/>
-                <signal pad-id="pb0" index="8" function="ADC" group="ADC"/>
-                <signal pad-id="pb1" index="9" function="ADC" group="ADC"/>
-                <signal pad-id="pb2" index="10" function="ADC" group="ADC"/>
-                <signal pad-id="pb3" index="11" function="ADC" group="ADC"/>
-                <signal pad-id="pb4" index="12" function="ADC" group="ADC"/>
-                <signal pad-id="pb5" index="13" function="ADC" group="ADC"/>
-                <signal pad-id="pb6" index="14" function="ADC" group="ADC"/>
-                <signal pad-id="pb7" index="15" function="ADC" group="ADC"/>
-                <signal pad-id="pa0" index="0" function="AREF" group="REFA"/>
-                <signal pad-id="pb0" index="0" function="AREF" group="REFB"/>
+                <signal pad-key="pa0" index="0" function="ADC" group="ADC"/>
+                <signal pad-key="pa1" index="1" function="ADC" group="ADC"/>
+                <signal pad-key="pa2" index="2" function="ADC" group="ADC"/>
+                <signal pad-key="pa3" index="3" function="ADC" group="ADC"/>
+                <signal pad-key="pa4" index="4" function="ADC" group="ADC"/>
+                <signal pad-key="pa5" index="5" function="ADC" group="ADC"/>
+                <signal pad-key="pa6" index="6" function="ADC" group="ADC"/>
+                <signal pad-key="pa7" index="7" function="ADC" group="ADC"/>
+                <signal pad-key="pb0" index="8" function="ADC" group="ADC"/>
+                <signal pad-key="pb1" index="9" function="ADC" group="ADC"/>
+                <signal pad-key="pb2" index="10" function="ADC" group="ADC"/>
+                <signal pad-key="pb3" index="11" function="ADC" group="ADC"/>
+                <signal pad-key="pb4" index="12" function="ADC" group="ADC"/>
+                <signal pad-key="pb5" index="13" function="ADC" group="ADC"/>
+                <signal pad-key="pb6" index="14" function="ADC" group="ADC"/>
+                <signal pad-key="pb7" index="15" function="ADC" group="ADC"/>
+                <signal pad-key="pa0" index="0" function="AREF" group="REFA"/>
+                <signal pad-key="pb0" index="0" function="AREF" group="REFB"/>
             </signals>
         </peripheral>
         <peripheral key="adcb" name="ADCB" module-key="i6099">
             <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"/>
-                <signal pad-id="pb2" index="2" function="ADC" group="ADC"/>
-                <signal pad-id="pb3" index="3" function="ADC" group="ADC"/>
-                <signal pad-id="pb4" index="4" function="ADC" group="ADC"/>
-                <signal pad-id="pb5" index="5" function="ADC" group="ADC"/>
-                <signal pad-id="pb6" index="6" function="ADC" group="ADC"/>
-                <signal pad-id="pb7" index="7" function="ADC" group="ADC"/>
-                <signal pad-id="pa0" index="0" function="AREF" group="REFA"/>
-                <signal pad-id="pb0" index="0" function="AREF" group="REFB"/>
+                <signal pad-key="pb0" index="0" function="ADC" group="ADC"/>
+                <signal pad-key="pb1" index="1" function="ADC" group="ADC"/>
+                <signal pad-key="pb2" index="2" function="ADC" group="ADC"/>
+                <signal pad-key="pb3" index="3" function="ADC" group="ADC"/>
+                <signal pad-key="pb4" index="4" function="ADC" group="ADC"/>
+                <signal pad-key="pb5" index="5" function="ADC" group="ADC"/>
+                <signal pad-key="pb6" index="6" function="ADC" group="ADC"/>
+                <signal pad-key="pb7" index="7" function="ADC" group="ADC"/>
+                <signal pad-key="pa0" index="0" function="AREF" group="REFA"/>
+                <signal pad-key="pb0" index="0" function="AREF" group="REFB"/>
             </signals>
         </peripheral>
         <peripheral key="dacb" name="DACB" module-key="i6059">
             <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"/>
-                <signal pad-id="pa0" index="0" function="AREF" group="REFA"/>
-                <signal pad-id="pb0" index="0" function="AREF" group="REFB"/>
+                <signal pad-key="pb2" index="0" function="DAC" group="DAC"/>
+                <signal pad-key="pb3" index="1" function="DAC" group="DAC"/>
+                <signal pad-key="pa0" index="0" function="AREF" group="REFA"/>
+                <signal pad-key="pb0" index="0" function="AREF" group="REFB"/>
             </signals>
         </peripheral>
         <peripheral key="aca" name="ACA" module-key="i6077">
             <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"/>
-                <signal pad-id="pa2" index="2" function="AC" group="AC"/>
-                <signal pad-id="pa3" index="3" function="AC" group="AC"/>
-                <signal pad-id="pa4" index="4" function="AC" group="AC"/>
-                <signal pad-id="pa5" index="5" function="AC" group="AC"/>
-                <signal pad-id="pa6" index="6" function="AC" group="AC"/>
-                <signal pad-id="pa7" index="7" function="AC" group="AC"/>
-                <signal pad-id="pa6" index="1" function="ACOUT" group="ACOUT"/>
-                <signal pad-id="pa7" index="0" function="ACOUT" group="ACOUT"/>
+                <signal pad-key="pa0" index="0" function="AC" group="AC"/>
+                <signal pad-key="pa1" index="1" function="AC" group="AC"/>
+                <signal pad-key="pa2" index="2" function="AC" group="AC"/>
+                <signal pad-key="pa3" index="3" function="AC" group="AC"/>
+                <signal pad-key="pa4" index="4" function="AC" group="AC"/>
+                <signal pad-key="pa5" index="5" function="AC" group="AC"/>
+                <signal pad-key="pa6" index="6" function="AC" group="AC"/>
+                <signal pad-key="pa7" index="7" function="AC" group="AC"/>
+                <signal pad-key="pa6" index="1" function="ACOUT" group="ACOUT"/>
+                <signal pad-key="pa7" index="0" function="ACOUT" group="ACOUT"/>
             </signals>
         </peripheral>
         <peripheral key="acb" name="ACB" module-key="i6077">
             <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"/>
-                <signal pad-id="pb2" index="2" function="AC" group="AC"/>
-                <signal pad-id="pb3" index="3" function="AC" group="AC"/>
-                <signal pad-id="pb4" index="4" function="AC" group="AC"/>
-                <signal pad-id="pb5" index="5" function="AC" group="AC"/>
-                <signal pad-id="pb6" index="6" function="AC" group="AC"/>
-                <signal pad-id="pb7" index="7" function="AC" group="AC"/>
-                <signal pad-id="pb6" index="1" function="ACOUT" group="ACOUT"/>
-                <signal pad-id="pb7" index="0" function="ACOUT" group="ACOUT"/>
+                <signal pad-key="pb0" index="0" function="AC" group="AC"/>
+                <signal pad-key="pb1" index="1" function="AC" group="AC"/>
+                <signal pad-key="pb2" index="2" function="AC" group="AC"/>
+                <signal pad-key="pb3" index="3" function="AC" group="AC"/>
+                <signal pad-key="pb4" index="4" function="AC" group="AC"/>
+                <signal pad-key="pb5" index="5" function="AC" group="AC"/>
+                <signal pad-key="pb6" index="6" function="AC" group="AC"/>
+                <signal pad-key="pb7" index="7" function="AC" group="AC"/>
+                <signal pad-key="pb6" index="1" function="ACOUT" group="ACOUT"/>
+                <signal pad-key="pb7" index="0" function="ACOUT" group="ACOUT"/>
             </signals>
         </peripheral>
         <peripheral key="rtc" name="RTC" module-key="i6093">
@@ -234,262 +234,262 @@
         <peripheral key="twic" name="TWIC" module-key="i6089">
             <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"/>
-                <signal pad-id="pc0" function="TWI_EXT" group="SDAIN"/>
-                <signal pad-id="pc1" function="TWI_EXT" group="SCLIN"/>
-                <signal pad-id="pc2" function="TWI_EXT" group="SDAOUT"/>
-                <signal pad-id="pc3" function="TWI_EXT" group="SCLOUT"/>
+                <signal pad-key="pc0" function="TWI" group="SDA"/>
+                <signal pad-key="pc1" function="TWI" group="SCL"/>
+                <signal pad-key="pc0" function="TWI_EXT" group="SDAIN"/>
+                <signal pad-key="pc1" function="TWI_EXT" group="SCLIN"/>
+                <signal pad-key="pc2" function="TWI_EXT" group="SDAOUT"/>
+                <signal pad-key="pc3" function="TWI_EXT" group="SCLOUT"/>
             </signals>
         </peripheral>
         <peripheral key="twie" name="TWIE" module-key="i6089">
             <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"/>
-                <signal pad-id="pe0" function="TWI_EXT" group="SDAIN"/>
-                <signal pad-id="pe1" function="TWI_EXT" group="SCLIN"/>
-                <signal pad-id="pe2" function="TWI_EXT" group="SDAOUT"/>
-                <signal pad-id="pe3" function="TWI_EXT" group="SCLOUT"/>
+                <signal pad-key="pe0" function="TWI" group="SDA"/>
+                <signal pad-key="pe1" function="TWI" group="SCL"/>
+                <signal pad-key="pe0" function="TWI_EXT" group="SDAIN"/>
+                <signal pad-key="pe1" function="TWI_EXT" group="SCLIN"/>
+                <signal pad-key="pe2" function="TWI_EXT" group="SDAOUT"/>
+                <signal pad-key="pe3" function="TWI_EXT" group="SCLOUT"/>
             </signals>
         </peripheral>
         <peripheral key="usb" name="USB" module-key="i3005">
             <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"/>
+                <signal pad-key="pd6" function="USB" group="DN"/>
+                <signal pad-key="pd7" function="USB" group="DP"/>
             </signals>
         </peripheral>
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pa2" index="2" function="PORTA" group="P"/>
-                <signal pad-id="pa3" index="3" function="PORTA" group="P"/>
-                <signal pad-id="pa4" index="4" function="PORTA" group="P"/>
-                <signal pad-id="pa5" index="5" function="PORTA" group="P"/>
-                <signal pad-id="pa6" index="6" function="PORTA" group="P"/>
-                <signal pad-id="pa7" index="7" function="PORTA" group="P"/>
+                <signal pad-key="pa0" index="0" function="PORTA" group="P"/>
+                <signal pad-key="pa1" index="1" function="PORTA" group="P"/>
+                <signal pad-key="pa2" index="2" function="PORTA" group="P"/>
+                <signal pad-key="pa3" index="3" function="PORTA" group="P"/>
+                <signal pad-key="pa4" index="4" function="PORTA" group="P"/>
+                <signal pad-key="pa5" index="5" function="PORTA" group="P"/>
+                <signal pad-key="pa6" index="6" function="PORTA" group="P"/>
+                <signal pad-key="pa7" index="7" function="PORTA" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pb2" index="2" function="PORTB" group="P"/>
-                <signal pad-id="pb3" index="3" function="PORTB" group="P"/>
-                <signal pad-id="pb4" index="4" function="PORTB" group="P"/>
-                <signal pad-id="pb5" index="5" function="PORTB" group="P"/>
-                <signal pad-id="pb6" index="6" function="PORTB" group="P"/>
-                <signal pad-id="pb7" index="7" function="PORTB" group="P"/>
+                <signal pad-key="pb0" index="0" function="PORTB" group="P"/>
+                <signal pad-key="pb1" index="1" function="PORTB" group="P"/>
+                <signal pad-key="pb2" index="2" function="PORTB" group="P"/>
+                <signal pad-key="pb3" index="3" function="PORTB" group="P"/>
+                <signal pad-key="pb4" index="4" function="PORTB" group="P"/>
+                <signal pad-key="pb5" index="5" function="PORTB" group="P"/>
+                <signal pad-key="pb6" index="6" function="PORTB" group="P"/>
+                <signal pad-key="pb7" index="7" function="PORTB" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pc2" index="2" function="PORTC" group="P"/>
-                <signal pad-id="pc3" index="3" function="PORTC" group="P"/>
-                <signal pad-id="pc4" index="4" function="PORTC" group="P"/>
-                <signal pad-id="pc5" index="5" function="PORTC" group="P"/>
-                <signal pad-id="pc6" index="6" function="PORTC" group="P"/>
-                <signal pad-id="pc7" index="7" function="PORTC" group="P"/>
+                <signal pad-key="pc0" index="0" function="PORTC" group="P"/>
+                <signal pad-key="pc1" index="1" function="PORTC" group="P"/>
+                <signal pad-key="pc2" index="2" function="PORTC" group="P"/>
+                <signal pad-key="pc3" index="3" function="PORTC" group="P"/>
+                <signal pad-key="pc4" index="4" function="PORTC" group="P"/>
+                <signal pad-key="pc5" index="5" function="PORTC" group="P"/>
+                <signal pad-key="pc6" index="6" function="PORTC" group="P"/>
+                <signal pad-key="pc7" index="7" function="PORTC" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pd2" index="2" function="PORTD" group="P"/>
-                <signal pad-id="pd3" index="3" function="PORTD" group="P"/>
-                <signal pad-id="pd4" index="4" function="PORTD" group="P"/>
-                <signal pad-id="pd5" index="5" function="PORTD" group="P"/>
-                <signal pad-id="pd6" index="6" function="PORTD" group="P"/>
-                <signal pad-id="pd7" index="7" function="PORTD" group="P"/>
+                <signal pad-key="pd0" index="0" function="PORTD" group="P"/>
+                <signal pad-key="pd1" index="1" function="PORTD" group="P"/>
+                <signal pad-key="pd2" index="2" function="PORTD" group="P"/>
+                <signal pad-key="pd3" index="3" function="PORTD" group="P"/>
+                <signal pad-key="pd4" index="4" function="PORTD" group="P"/>
+                <signal pad-key="pd5" index="5" function="PORTD" group="P"/>
+                <signal pad-key="pd6" index="6" function="PORTD" group="P"/>
+                <signal pad-key="pd7" index="7" function="PORTD" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="porte" name="PORTE" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pe2" index="2" function="PORTE" group="P"/>
-                <signal pad-id="pe3" index="3" function="PORTE" group="P"/>
-                <signal pad-id="pe4" index="4" function="PORTE" group="P"/>
-                <signal pad-id="pe5" index="5" function="PORTE" group="P"/>
-                <signal pad-id="pe6" index="6" function="PORTE" group="P"/>
-                <signal pad-id="pe7" index="7" function="PORTE" group="P"/>
+                <signal pad-key="pe0" index="0" function="PORTE" group="P"/>
+                <signal pad-key="pe1" index="1" function="PORTE" group="P"/>
+                <signal pad-key="pe2" index="2" function="PORTE" group="P"/>
+                <signal pad-key="pe3" index="3" function="PORTE" group="P"/>
+                <signal pad-key="pe4" index="4" function="PORTE" group="P"/>
+                <signal pad-key="pe5" index="5" function="PORTE" group="P"/>
+                <signal pad-key="pe6" index="6" function="PORTE" group="P"/>
+                <signal pad-key="pe7" index="7" function="PORTE" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portf" name="PORTF" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pf2" index="2" function="PORTF" group="P"/>
-                <signal pad-id="pf3" index="3" function="PORTF" group="P"/>
-                <signal pad-id="pf4" index="4" function="PORTF" group="P"/>
-                <signal pad-id="pf5" index="5" function="PORTF" group="P"/>
-                <signal pad-id="pf6" index="6" function="PORTF" group="P"/>
-                <signal pad-id="pf7" index="7" function="PORTF" group="P"/>
+                <signal pad-key="pf0" index="0" function="PORTF" group="P"/>
+                <signal pad-key="pf1" index="1" function="PORTF" group="P"/>
+                <signal pad-key="pf2" index="2" function="PORTF" group="P"/>
+                <signal pad-key="pf3" index="3" function="PORTF" group="P"/>
+                <signal pad-key="pf4" index="4" function="PORTF" group="P"/>
+                <signal pad-key="pf5" index="5" function="PORTF" group="P"/>
+                <signal pad-key="pf6" index="6" function="PORTF" group="P"/>
+                <signal pad-key="pf7" index="7" function="PORTF" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portr" name="PORTR" module-key="gpio_port">
             <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"/>
+                <signal pad-key="pr0" index="0" function="PORTR" group="P"/>
+                <signal pad-key="pr1" index="1" function="PORTR" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="tcc0" name="TCC0" module-key="i6090_tc">
             <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"/>
-                <signal pad-id="pc2" function="TC0" group="OC0C" field="TC0C"/>
-                <signal pad-id="pc3" function="TC0" group="OC0D" field="TC0D"/>
-                <signal pad-id="pc4" function="TC0_ALT" group="OC0A" field="TC0A"/>
-                <signal pad-id="pc5" function="TC0_ALT" group="OC0B" field="TC0B"/>
-                <signal pad-id="pc6" function="TC0_ALT" group="OC0C" field="TC0C"/>
-                <signal pad-id="pc7" function="TC0_ALT" group="OC0D" field="TC0D"/>
+                <signal pad-key="pc0" function="TC0" group="OC0A" field="TC0A"/>
+                <signal pad-key="pc1" function="TC0" group="OC0B" field="TC0B"/>
+                <signal pad-key="pc2" function="TC0" group="OC0C" field="TC0C"/>
+                <signal pad-key="pc3" function="TC0" group="OC0D" field="TC0D"/>
+                <signal pad-key="pc4" function="TC0_ALT" group="OC0A" field="TC0A"/>
+                <signal pad-key="pc5" function="TC0_ALT" group="OC0B" field="TC0B"/>
+                <signal pad-key="pc6" function="TC0_ALT" group="OC0C" field="TC0C"/>
+                <signal pad-key="pc7" function="TC0_ALT" group="OC0D" field="TC0D"/>
             </signals>
         </peripheral>
         <peripheral key="tcc1" name="TCC1" module-key="i6090_tc">
             <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"/>
+                <signal pad-key="pc4" function="TC1" group="OC1A"/>
+                <signal pad-key="pc5" function="TC1" group="OC1B"/>
             </signals>
         </peripheral>
         <peripheral key="tcd0" name="TCD0" module-key="i6090_tc">
             <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"/>
-                <signal pad-id="pd2" function="TC0" group="OC0C" field="TC0C"/>
-                <signal pad-id="pd3" function="TC0" group="OC0D" field="TC0D"/>
-                <signal pad-id="pd4" function="TC0_ALT" group="OC0A" field="TC0A"/>
-                <signal pad-id="pd5" function="TC0_ALT" group="OC0B" field="TC0B"/>
-                <signal pad-id="pd6" function="TC0_ALT" group="OC0C" field="TC0C"/>
-                <signal pad-id="pd7" function="TC0_ALT" group="OC0D" field="TC0D"/>
+                <signal pad-key="pd0" function="TC0" group="OC0A" field="TC0A"/>
+                <signal pad-key="pd1" function="TC0" group="OC0B" field="TC0B"/>
+                <signal pad-key="pd2" function="TC0" group="OC0C" field="TC0C"/>
+                <signal pad-key="pd3" function="TC0" group="OC0D" field="TC0D"/>
+                <signal pad-key="pd4" function="TC0_ALT" group="OC0A" field="TC0A"/>
+                <signal pad-key="pd5" function="TC0_ALT" group="OC0B" field="TC0B"/>
+                <signal pad-key="pd6" function="TC0_ALT" group="OC0C" field="TC0C"/>
+                <signal pad-key="pd7" function="TC0_ALT" group="OC0D" field="TC0D"/>
             </signals>
         </peripheral>
         <peripheral key="tcd1" name="TCD1" module-key="i6090_tc">
             <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"/>
+                <signal pad-key="pd4" function="TC1" group="OC1A"/>
+                <signal pad-key="pd5" function="TC1" group="OC1B"/>
             </signals>
         </peripheral>
         <peripheral key="tce0" name="TCE0" module-key="i6090_tc">
             <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"/>
-                <signal pad-id="pe2" function="TC0" group="OC0C" field="TC0C"/>
-                <signal pad-id="pe3" function="TC0" group="OC0D" field="TC0D"/>
-                <signal pad-id="pe4" function="TC0_ALT" group="OC0A" field="TC0A"/>
-                <signal pad-id="pe5" function="TC0_ALT" group="OC0B" field="TC0B"/>
-                <signal pad-id="pe6" function="TC0_ALT" group="OC0C" field="TC0C"/>
-                <signal pad-id="pe7" function="TC0_ALT" group="OC0D" field="TC0D"/>
+                <signal pad-key="pe0" function="TC0" group="OC0A" field="TC0A"/>
+                <signal pad-key="pe1" function="TC0" group="OC0B" field="TC0B"/>
+                <signal pad-key="pe2" function="TC0" group="OC0C" field="TC0C"/>
+                <signal pad-key="pe3" function="TC0" group="OC0D" field="TC0D"/>
+                <signal pad-key="pe4" function="TC0_ALT" group="OC0A" field="TC0A"/>
+                <signal pad-key="pe5" function="TC0_ALT" group="OC0B" field="TC0B"/>
+                <signal pad-key="pe6" function="TC0_ALT" group="OC0C" field="TC0C"/>
+                <signal pad-key="pe7" function="TC0_ALT" group="OC0D" field="TC0D"/>
             </signals>
         </peripheral>
         <peripheral key="tce1" name="TCE1" module-key="i6090_tc">
             <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"/>
+                <signal pad-key="pe4" function="TC1" group="OC1A"/>
+                <signal pad-key="pe5" function="TC1" group="OC1B"/>
             </signals>
         </peripheral>
         <peripheral key="tcf0" name="TCF0" module-key="i6090_tc">
             <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"/>
-                <signal pad-id="pf2" function="TC0" group="OC0C"/>
-                <signal pad-id="pf3" function="TC0" group="OC0D"/>
+                <signal pad-key="pf0" function="TC0" group="OC0A"/>
+                <signal pad-key="pf1" function="TC0" group="OC0B"/>
+                <signal pad-key="pf2" function="TC0" group="OC0C"/>
+                <signal pad-key="pf3" function="TC0" group="OC0D"/>
             </signals>
         </peripheral>
         <peripheral key="tcc2" name="TCC2" module-key="i6090_tc2">
             <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"/>
-                <signal pad-id="pc2" function="TC2" group="LOC2C"/>
-                <signal pad-id="pc3" function="TC2" group="LOC2D"/>
-                <signal pad-id="pc4" function="TC2" group="HOC2A"/>
-                <signal pad-id="pc5" function="TC2" group="HOC2B"/>
-                <signal pad-id="pc6" function="TC2" group="HOC2C"/>
-                <signal pad-id="pc7" function="TC2" group="HOC2D"/>
+                <signal pad-key="pc0" function="TC2" group="LOC2A"/>
+                <signal pad-key="pc1" function="TC2" group="LOC2B"/>
+                <signal pad-key="pc2" function="TC2" group="LOC2C"/>
+                <signal pad-key="pc3" function="TC2" group="LOC2D"/>
+                <signal pad-key="pc4" function="TC2" group="HOC2A"/>
+                <signal pad-key="pc5" function="TC2" group="HOC2B"/>
+                <signal pad-key="pc6" function="TC2" group="HOC2C"/>
+                <signal pad-key="pc7" function="TC2" group="HOC2D"/>
             </signals>
         </peripheral>
         <peripheral key="tcd2" name="TCD2" module-key="i6090_tc2">
             <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"/>
-                <signal pad-id="pd2" function="TC2" group="LOC2C"/>
-                <signal pad-id="pd3" function="TC2" group="LOC2D"/>
-                <signal pad-id="pd4" function="TC2" group="HOC2A"/>
-                <signal pad-id="pd5" function="TC2" group="HOC2B"/>
-                <signal pad-id="pd6" function="TC2" group="HOC2C"/>
-                <signal pad-id="pd7" function="TC2" group="HOC2D"/>
+                <signal pad-key="pd0" function="TC2" group="LOC2A"/>
+                <signal pad-key="pd1" function="TC2" group="LOC2B"/>
+                <signal pad-key="pd2" function="TC2" group="LOC2C"/>
+                <signal pad-key="pd3" function="TC2" group="LOC2D"/>
+                <signal pad-key="pd4" function="TC2" group="HOC2A"/>
+                <signal pad-key="pd5" function="TC2" group="HOC2B"/>
+                <signal pad-key="pd6" function="TC2" group="HOC2C"/>
+                <signal pad-key="pd7" function="TC2" group="HOC2D"/>
             </signals>
         </peripheral>
         <peripheral key="tce2" name="TCE2" module-key="i6090_tc2">
             <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"/>
-                <signal pad-id="pe2" function="TC2" group="LOC2C"/>
-                <signal pad-id="pe3" function="TC2" group="LOC2D"/>
-                <signal pad-id="pe4" function="TC2" group="HOC2A"/>
-                <signal pad-id="pe5" function="TC2" group="HOC2B"/>
-                <signal pad-id="pe6" function="TC2" group="HOC2C"/>
-                <signal pad-id="pe7" function="TC2" group="HOC2D"/>
+                <signal pad-key="pe0" function="TC2" group="LOC2A"/>
+                <signal pad-key="pe1" function="TC2" group="LOC2B"/>
+                <signal pad-key="pe2" function="TC2" group="LOC2C"/>
+                <signal pad-key="pe3" function="TC2" group="LOC2D"/>
+                <signal pad-key="pe4" function="TC2" group="HOC2A"/>
+                <signal pad-key="pe5" function="TC2" group="HOC2B"/>
+                <signal pad-key="pe6" function="TC2" group="HOC2C"/>
+                <signal pad-key="pe7" function="TC2" group="HOC2D"/>
             </signals>
         </peripheral>
         <peripheral key="tcf2" name="TCF2" module-key="i6090_tc2">
             <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"/>
-                <signal pad-id="pf2" function="TC2" group="LOC2C"/>
-                <signal pad-id="pf3" function="TC2" group="LOC2D"/>
-                <signal pad-id="pf4" function="TC2" group="HOC2A"/>
-                <signal pad-id="pf5" function="TC2" group="HOC2B"/>
-                <signal pad-id="pf6" function="TC2" group="HOC2C"/>
-                <signal pad-id="pf7" function="TC2" group="HOC2D"/>
+                <signal pad-key="pf0" function="TC2" group="LOC2A"/>
+                <signal pad-key="pf1" function="TC2" group="LOC2B"/>
+                <signal pad-key="pf2" function="TC2" group="LOC2C"/>
+                <signal pad-key="pf3" function="TC2" group="LOC2D"/>
+                <signal pad-key="pf4" function="TC2" group="HOC2A"/>
+                <signal pad-key="pf5" function="TC2" group="HOC2B"/>
+                <signal pad-key="pf6" function="TC2" group="HOC2C"/>
+                <signal pad-key="pf7" function="TC2" group="HOC2D"/>
             </signals>
         </peripheral>
         <peripheral key="awexc" name="AWEXC" module-key="i6090_awex">
             <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"/>
-                <signal pad-id="pc2" function="AWEX" group="OC0BLS"/>
-                <signal pad-id="pc3" function="AWEX" group="OC0BHS"/>
-                <signal pad-id="pc4" function="AWEX" group="OC0CLS"/>
-                <signal pad-id="pc5" function="AWEX" group="OC0CHS"/>
-                <signal pad-id="pc6" function="AWEX" group="OC0DLS"/>
-                <signal pad-id="pc7" function="AWEX" group="OC0DHS"/>
+                <signal pad-key="pc0" function="AWEX" group="OC0ALS"/>
+                <signal pad-key="pc1" function="AWEX" group="OC0AHS"/>
+                <signal pad-key="pc2" function="AWEX" group="OC0BLS"/>
+                <signal pad-key="pc3" function="AWEX" group="OC0BHS"/>
+                <signal pad-key="pc4" function="AWEX" group="OC0CLS"/>
+                <signal pad-key="pc5" function="AWEX" group="OC0CHS"/>
+                <signal pad-key="pc6" function="AWEX" group="OC0DLS"/>
+                <signal pad-key="pc7" function="AWEX" group="OC0DHS"/>
             </signals>
         </peripheral>
         <peripheral key="awexe" name="AWEXE" module-key="i6090_awex">
             <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"/>
-                <signal pad-id="pe2" function="AWEX" group="OC0BLS"/>
-                <signal pad-id="pe3" function="AWEX" group="OC0BHS"/>
-                <signal pad-id="pe4" function="AWEX" group="OC0CLS"/>
-                <signal pad-id="pe5" function="AWEX" group="OC0CHS"/>
-                <signal pad-id="pe6" function="AWEX" group="OC0DLS"/>
-                <signal pad-id="pe7" function="AWEX" group="OC0DHS"/>
+                <signal pad-key="pe0" function="AWEX" group="OC0ALS"/>
+                <signal pad-key="pe1" function="AWEX" group="OC0AHS"/>
+                <signal pad-key="pe2" function="AWEX" group="OC0BLS"/>
+                <signal pad-key="pe3" function="AWEX" group="OC0BHS"/>
+                <signal pad-key="pe4" function="AWEX" group="OC0CLS"/>
+                <signal pad-key="pe5" function="AWEX" group="OC0CHS"/>
+                <signal pad-key="pe6" function="AWEX" group="OC0DLS"/>
+                <signal pad-key="pe7" function="AWEX" group="OC0DHS"/>
             </signals>
         </peripheral>
         <peripheral key="hiresc" name="HIRESC" module-key="i6090_hires">
@@ -507,108 +507,108 @@
         <peripheral key="usartc0" name="USARTC0" module-key="i6090_usart">
             <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"/>
-                <signal pad-id="pc3" function="USART" group="TXD" field="USART0"/>
-                <signal pad-id="pc5" function="USART_ALT" group="XCK" field="USART0"/>
-                <signal pad-id="pc6" function="USART_ALT" group="RXD" field="USART0"/>
-                <signal pad-id="pc7" function="USART_ALT" group="TXD" field="USART0"/>
+                <signal pad-key="pc1" function="USART" group="XCK" field="USART0"/>
+                <signal pad-key="pc2" function="USART" group="RXD" field="USART0"/>
+                <signal pad-key="pc3" function="USART" group="TXD" field="USART0"/>
+                <signal pad-key="pc5" function="USART_ALT" group="XCK" field="USART0"/>
+                <signal pad-key="pc6" function="USART_ALT" group="RXD" field="USART0"/>
+                <signal pad-key="pc7" function="USART_ALT" group="TXD" field="USART0"/>
             </signals>
         </peripheral>
         <peripheral key="usartc1" name="USARTC1" module-key="i6090_usart">
             <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"/>
-                <signal pad-id="pd7" function="USART" group="TXD"/>
+                <signal pad-key="pd5" function="USART" group="XCK"/>
+                <signal pad-key="pd6" function="USART" group="RXD"/>
+                <signal pad-key="pd7" function="USART" group="TXD"/>
             </signals>
         </peripheral>
         <peripheral key="usartd0" name="USARTD0" module-key="i6090_usart">
             <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"/>
-                <signal pad-id="pd3" function="USART" group="TXD" field="USART0"/>
-                <signal pad-id="pd5" function="USART_ALT" group="XCK" field="USART0"/>
-                <signal pad-id="pd6" function="USART_ALT" group="RXD" field="USART0"/>
-                <signal pad-id="pd7" function="USART_ALT" group="TXD" field="USART0"/>
+                <signal pad-key="pd1" function="USART" group="XCK" field="USART0"/>
+                <signal pad-key="pd2" function="USART" group="RXD" field="USART0"/>
+                <signal pad-key="pd3" function="USART" group="TXD" field="USART0"/>
+                <signal pad-key="pd5" function="USART_ALT" group="XCK" field="USART0"/>
+                <signal pad-key="pd6" function="USART_ALT" group="RXD" field="USART0"/>
+                <signal pad-key="pd7" function="USART_ALT" group="TXD" field="USART0"/>
             </signals>
         </peripheral>
         <peripheral key="usartd1" name="USARTD1" module-key="i6090_usart">
             <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"/>
-                <signal pad-id="pd7" function="USART" group="TXD"/>
+                <signal pad-key="pd5" function="USART" group="XCK"/>
+                <signal pad-key="pd6" function="USART" group="RXD"/>
+                <signal pad-key="pd7" function="USART" group="TXD"/>
             </signals>
         </peripheral>
         <peripheral key="usarte0" name="USARTE0" module-key="i6090_usart">
             <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"/>
-                <signal pad-id="pe3" function="USART" group="TXD" field="USART0"/>
-                <signal pad-id="pe5" function="USART_ALT" group="XCK" field="USART0"/>
-                <signal pad-id="pe6" function="USART_ALT" group="RXD" field="USART0"/>
-                <signal pad-id="pe7" function="USART_ALT" group="TXD" field="USART0"/>
+                <signal pad-key="pe1" function="USART" group="XCK" field="USART0"/>
+                <signal pad-key="pe2" function="USART" group="RXD" field="USART0"/>
+                <signal pad-key="pe3" function="USART" group="TXD" field="USART0"/>
+                <signal pad-key="pe5" function="USART_ALT" group="XCK" field="USART0"/>
+                <signal pad-key="pe6" function="USART_ALT" group="RXD" field="USART0"/>
+                <signal pad-key="pe7" function="USART_ALT" group="TXD" field="USART0"/>
             </signals>
         </peripheral>
         <peripheral key="usarte1" name="USARTE1" module-key="i6090_usart">
             <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"/>
-                <signal pad-id="pe7" function="USART" group="TXD"/>
+                <signal pad-key="pe5" function="USART" group="XCK"/>
+                <signal pad-key="pe6" function="USART" group="RXD"/>
+                <signal pad-key="pe7" function="USART" group="TXD"/>
             </signals>
         </peripheral>
         <peripheral key="usartf0" name="USARTF0" module-key="i6090_usart">
             <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"/>
-                <signal pad-id="pf3" function="USART" group="TXD" field="USART0"/>
-                <signal pad-id="pf5" function="USART_ALT" group="XCK" field="USART0"/>
-                <signal pad-id="pf6" function="USART_ALT" group="RXD" field="USART0"/>
-                <signal pad-id="pf7" function="USART_ALT" group="TXD" field="USART0"/>
+                <signal pad-key="pf1" function="USART" group="XCK" field="USART0"/>
+                <signal pad-key="pf2" function="USART" group="RXD" field="USART0"/>
+                <signal pad-key="pf3" function="USART" group="TXD" field="USART0"/>
+                <signal pad-key="pf5" function="USART_ALT" group="XCK" field="USART0"/>
+                <signal pad-key="pf6" function="USART_ALT" group="RXD" field="USART0"/>
+                <signal pad-key="pf7" function="USART_ALT" group="TXD" field="USART0"/>
             </signals>
         </peripheral>
         <peripheral key="spic" name="SPIC" module-key="i6090_spi">
             <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"/>
-                <signal pad-id="pc6" function="SPI" group="MISO" field="SPI"/>
-                <signal pad-id="pc7" function="SPI" group="SCK" field="SPI"/>
-                <signal pad-id="pc4" function="SPI_ALT" group="SS" field="SPI"/>
-                <signal pad-id="pc5" function="SPI_ALT" group="SCK" field="SPI"/>
-                <signal pad-id="pc6" function="SPI_ALT" group="MISO" field="SPI"/>
-                <signal pad-id="pc7" function="SPI_ALT" group="MOSI" field="SPI"/>
+                <signal pad-key="pc4" function="SPI" group="SS" field="SPI"/>
+                <signal pad-key="pc5" function="SPI" group="MOSI" field="SPI"/>
+                <signal pad-key="pc6" function="SPI" group="MISO" field="SPI"/>
+                <signal pad-key="pc7" function="SPI" group="SCK" field="SPI"/>
+                <signal pad-key="pc4" function="SPI_ALT" group="SS" field="SPI"/>
+                <signal pad-key="pc5" function="SPI_ALT" group="SCK" field="SPI"/>
+                <signal pad-key="pc6" function="SPI_ALT" group="MISO" field="SPI"/>
+                <signal pad-key="pc7" function="SPI_ALT" group="MOSI" field="SPI"/>
             </signals>
         </peripheral>
         <peripheral key="spid" name="SPID" module-key="i6090_spi">
             <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"/>
-                <signal pad-id="pd6" function="SPI" group="MISO" field="SPI"/>
-                <signal pad-id="pd7" function="SPI" group="SCK" field="SPI"/>
-                <signal pad-id="pd4" function="SPI_ALT" group="SS" field="SPI"/>
-                <signal pad-id="pd5" function="SPI_ALT" group="SCK" field="SPI"/>
-                <signal pad-id="pd6" function="SPI_ALT" group="MISO" field="SPI"/>
-                <signal pad-id="pd7" function="SPI_ALT" group="MOSI" field="SPI"/>
+                <signal pad-key="pd4" function="SPI" group="SS" field="SPI"/>
+                <signal pad-key="pd5" function="SPI" group="MOSI" field="SPI"/>
+                <signal pad-key="pd6" function="SPI" group="MISO" field="SPI"/>
+                <signal pad-key="pd7" function="SPI" group="SCK" field="SPI"/>
+                <signal pad-key="pd4" function="SPI_ALT" group="SS" field="SPI"/>
+                <signal pad-key="pd5" function="SPI_ALT" group="SCK" field="SPI"/>
+                <signal pad-key="pd6" function="SPI_ALT" group="MISO" field="SPI"/>
+                <signal pad-key="pd7" function="SPI_ALT" group="MOSI" field="SPI"/>
             </signals>
         </peripheral>
         <peripheral key="spie" name="SPIE" module-key="i6090_spi">
             <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"/>
-                <signal pad-id="pe6" function="SPI" group="MISO" field="SPI"/>
-                <signal pad-id="pe7" function="SPI" group="SCK" field="SPI"/>
-                <signal pad-id="pe4" function="SPI_ALT" group="SS" field="SPI"/>
-                <signal pad-id="pe5" function="SPI_ALT" group="SCK" field="SPI"/>
-                <signal pad-id="pe6" function="SPI_ALT" group="MISO" field="SPI"/>
-                <signal pad-id="pe7" function="SPI_ALT" group="MOSI" field="SPI"/>
+                <signal pad-key="pe4" function="SPI" group="SS" field="SPI"/>
+                <signal pad-key="pe5" function="SPI" group="MOSI" field="SPI"/>
+                <signal pad-key="pe6" function="SPI" group="MISO" field="SPI"/>
+                <signal pad-key="pe7" function="SPI" group="SCK" field="SPI"/>
+                <signal pad-key="pe4" function="SPI_ALT" group="SS" field="SPI"/>
+                <signal pad-key="pe5" function="SPI_ALT" group="SCK" field="SPI"/>
+                <signal pad-key="pe6" function="SPI_ALT" group="MISO" field="SPI"/>
+                <signal pad-key="pe7" function="SPI_ALT" group="MOSI" field="SPI"/>
             </signals>
         </peripheral>
         <peripheral key="ircom" name="IRCOM" module-key="i6090_ircom">
@@ -1978,78 +1978,135 @@
             </register-group>
         </module>
     </modules>
+    <pads>
+        <pad key="pa3" name="PA3"/>
+        <pad key="pa4" name="PA4"/>
+        <pad key="pa5" name="PA5"/>
+        <pad key="pa6" name="PA6"/>
+        <pad key="pa7" name="PA7"/>
+        <pad key="pb0" name="PB0"/>
+        <pad key="pb1" name="PB1"/>
+        <pad key="pb2" name="PB2"/>
+        <pad key="pb3" name="PB3"/>
+        <pad key="pb4" name="PB4"/>
+        <pad key="pb5" name="PB5"/>
+        <pad key="pb6" name="PB6"/>
+        <pad key="pb7" name="PB7"/>
+        <pad key="gnd" name="GND"/>
+        <pad key="vcc" name="VCC"/>
+        <pad key="pc0" name="PC0"/>
+        <pad key="pc1" name="PC1"/>
+        <pad key="pc2" name="PC2"/>
+        <pad key="pc3" name="PC3"/>
+        <pad key="pc4" name="PC4"/>
+        <pad key="pc5" name="PC5"/>
+        <pad key="pc6" name="PC6"/>
+        <pad key="pc7" name="PC7"/>
+        <pad key="pd0" name="PD0"/>
+        <pad key="pd1" name="PD1"/>
+        <pad key="pd2" name="PD2"/>
+        <pad key="pd3" name="PD3"/>
+        <pad key="pd4" name="PD4"/>
+        <pad key="pd5" name="PD5"/>
+        <pad key="pd6" name="PD6"/>
+        <pad key="pd7" name="PD7"/>
+        <pad key="pe0" name="PE0"/>
+        <pad key="pe1" name="PE1"/>
+        <pad key="pe2" name="PE2"/>
+        <pad key="pe3" name="PE3"/>
+        <pad key="pe4" name="PE4"/>
+        <pad key="pe5" name="PE5"/>
+        <pad key="pe6" name="PE6"/>
+        <pad key="pe7" name="PE7"/>
+        <pad key="pf0" name="PF0"/>
+        <pad key="pf1" name="PF1"/>
+        <pad key="pf2" name="PF2"/>
+        <pad key="pf3" name="PF3"/>
+        <pad key="pf4" name="PF4"/>
+        <pad key="pf5" name="PF5"/>
+        <pad key="pf6" name="PF6"/>
+        <pad key="pf7" name="PF7"/>
+        <pad key="pdi" name="PDI"/>
+        <pad key="reset" name="RESET"/>
+        <pad key="pr0" name="PR0"/>
+        <pad key="pr1" name="PR1"/>
+        <pad key="avcc" name="AVCC"/>
+        <pad key="pa0" name="PA0"/>
+        <pad key="pa1" name="PA1"/>
+        <pad key="pa2" name="PA2"/>
+    </pads>
     <pinouts>
         <pinout key="qfp_qfn_64" name="QFP_QFN_64" type="qfn">
-            <pin position="1" pad="PA3"/>
-            <pin position="2" pad="PA4"/>
-            <pin position="3" pad="PA5"/>
-            <pin position="4" pad="PA6"/>
-            <pin position="5" pad="PA7"/>
-            <pin position="6" pad="PB0"/>
-            <pin position="7" pad="PB1"/>
-            <pin position="8" pad="PB2"/>
-            <pin position="9" pad="PB3"/>
-            <pin position="10" pad="PB4"/>
-            <pin position="11" pad="PB5"/>
-            <pin position="12" pad="PB6"/>
-            <pin position="13" pad="PB7"/>
-            <pin position="14" pad="GND"/>
-            <pin position="15" pad="VCC"/>
-            <pin position="16" pad="PC0"/>
-            <pin position="17" pad="PC1"/>
-            <pin position="18" pad="PC2"/>
-            <pin position="19" pad="PC3"/>
-            <pin position="20" pad="PC4"/>
-            <pin position="21" pad="PC5"/>
-            <pin position="22" pad="PC6"/>
-            <pin position="23" pad="PC7"/>
-            <pin position="24" pad="GND"/>
-            <pin position="25" pad="VCC"/>
-            <pin position="26" pad="PD0"/>
-            <pin position="27" pad="PD1"/>
-            <pin position="28" pad="PD2"/>
-            <pin position="29" pad="PD3"/>
-            <pin position="30" pad="PD4"/>
-            <pin position="31" pad="PD5"/>
-            <pin position="32" pad="PD6"/>
-            <pin position="33" pad="PD7"/>
-            <pin position="34" pad="GND"/>
-            <pin position="35" pad="VCC"/>
-            <pin position="36" pad="PE0"/>
-            <pin position="37" pad="PE1"/>
-            <pin position="38" pad="PE2"/>
-            <pin position="39" pad="PE3"/>
-            <pin position="40" pad="PE4"/>
-            <pin position="41" pad="PE5"/>
-            <pin position="42" pad="PE6"/>
-            <pin position="43" pad="PE7"/>
-            <pin position="44" pad="GND"/>
-            <pin position="45" pad="VCC"/>
-            <pin position="46" pad="PF0"/>
-            <pin position="47" pad="PF1"/>
-            <pin position="48" pad="PF2"/>
-            <pin position="49" pad="PF3"/>
-            <pin position="50" pad="PF4"/>
-            <pin position="51" pad="PF5"/>
-            <pin position="52" pad="GND"/>
-            <pin position="53" pad="VCC"/>
-            <pin position="54" pad="PF6"/>
-            <pin position="55" pad="PF7"/>
-            <pin position="56" pad="PDI"/>
-            <pin position="57" pad="RESET"/>
-            <pin position="58" pad="PR0"/>
-            <pin position="59" pad="PR1"/>
-            <pin position="60" pad="GND"/>
-            <pin position="61" pad="AVCC"/>
-            <pin position="62" pad="PA0"/>
-            <pin position="63" pad="PA1"/>
-            <pin position="64" pad="PA2"/>
+            <pin position="1" pad-key="pa3"/>
+            <pin position="2" pad-key="pa4"/>
+            <pin position="3" pad-key="pa5"/>
+            <pin position="4" pad-key="pa6"/>
+            <pin position="5" pad-key="pa7"/>
+            <pin position="6" pad-key="pb0"/>
+            <pin position="7" pad-key="pb1"/>
+            <pin position="8" pad-key="pb2"/>
+            <pin position="9" pad-key="pb3"/>
+            <pin position="10" pad-key="pb4"/>
+            <pin position="11" pad-key="pb5"/>
+            <pin position="12" pad-key="pb6"/>
+            <pin position="13" pad-key="pb7"/>
+            <pin position="14" pad-key="gnd"/>
+            <pin position="15" pad-key="vcc"/>
+            <pin position="16" pad-key="pc0"/>
+            <pin position="17" pad-key="pc1"/>
+            <pin position="18" pad-key="pc2"/>
+            <pin position="19" pad-key="pc3"/>
+            <pin position="20" pad-key="pc4"/>
+            <pin position="21" pad-key="pc5"/>
+            <pin position="22" pad-key="pc6"/>
+            <pin position="23" pad-key="pc7"/>
+            <pin position="24" pad-key="gnd"/>
+            <pin position="25" pad-key="vcc"/>
+            <pin position="26" pad-key="pd0"/>
+            <pin position="27" pad-key="pd1"/>
+            <pin position="28" pad-key="pd2"/>
+            <pin position="29" pad-key="pd3"/>
+            <pin position="30" pad-key="pd4"/>
+            <pin position="31" pad-key="pd5"/>
+            <pin position="32" pad-key="pd6"/>
+            <pin position="33" pad-key="pd7"/>
+            <pin position="34" pad-key="gnd"/>
+            <pin position="35" pad-key="vcc"/>
+            <pin position="36" pad-key="pe0"/>
+            <pin position="37" pad-key="pe1"/>
+            <pin position="38" pad-key="pe2"/>
+            <pin position="39" pad-key="pe3"/>
+            <pin position="40" pad-key="pe4"/>
+            <pin position="41" pad-key="pe5"/>
+            <pin position="42" pad-key="pe6"/>
+            <pin position="43" pad-key="pe7"/>
+            <pin position="44" pad-key="gnd"/>
+            <pin position="45" pad-key="vcc"/>
+            <pin position="46" pad-key="pf0"/>
+            <pin position="47" pad-key="pf1"/>
+            <pin position="48" pad-key="pf2"/>
+            <pin position="49" pad-key="pf3"/>
+            <pin position="50" pad-key="pf4"/>
+            <pin position="51" pad-key="pf5"/>
+            <pin position="52" pad-key="gnd"/>
+            <pin position="53" pad-key="vcc"/>
+            <pin position="54" pad-key="pf6"/>
+            <pin position="55" pad-key="pf7"/>
+            <pin position="56" pad-key="pdi"/>
+            <pin position="57" pad-key="reset"/>
+            <pin position="58" pad-key="pr0"/>
+            <pin position="59" pad-key="pr1"/>
+            <pin position="60" pad-key="gnd"/>
+            <pin position="61" pad-key="avcc"/>
+            <pin position="62" pad-key="pa0"/>
+            <pin position="63" pad-key="pa1"/>
+            <pin position="64" pad-key="pa2"/>
         </pinout>
     </pinouts>
     <variants>
-        <variant name="ATxmega128A3U-AU" pinout-key="qfp_qfn_64" package="TQFP64"/>
-        <variant name="ATxmega128A3U-MH" pinout-key="qfp_qfn_64" package="QFN64"/>
-        <variant name="ATxmega128A3U-AN" pinout-key="qfp_qfn_64" package="TQFP64"/>
-        <variant name="ATxmega128A3U-MN" pinout-key="qfp_qfn_64" package="QFN64"/>
+        <variant key="atxmega128a3u_au" name="ATxmega128A3U-AU" pinout-key="qfp_qfn_64"/>
+        <variant key="atxmega128a3u_mh" name="ATxmega128A3U-MH" pinout-key="qfp_qfn_64"/>
+        <variant key="atxmega128a3u_an" name="ATxmega128A3U-AN" pinout-key="qfp_qfn_64"/>
+        <variant key="atxmega128a3u_mn" name="ATxmega128A3U-MN" pinout-key="qfp_qfn_64"/>
     </variants>
 </device>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA128A4U.xml b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA128A4U.xml
index 90e038f3..00e40597 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA128A4U.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA128A4U.xml
@@ -92,12 +92,12 @@
         <peripheral key="osc" name="OSC" module-key="i6079">
             <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"/>
-                <signal pad-id="pr0" function="TOSC" group="TOSC2" field="TOSCSEL"/>
-                <signal pad-id="pr1" function="TOSC" group="TOSC1" field="TOSCSEL"/>
-                <signal pad-id="pe2" function="TOSC_ALT" group="TOSC2" field="TOSCSEL"/>
-                <signal pad-id="pe3" function="TOSC_ALT" group="TOSC1" field="TOSCSEL"/>
+                <signal pad-key="pr0" function="XTAL" group="XTAL2"/>
+                <signal pad-key="pr1" function="XTAL" group="XTAL1"/>
+                <signal pad-key="pr0" function="TOSC" group="TOSC2" field="TOSCSEL"/>
+                <signal pad-key="pr1" function="TOSC" group="TOSC1" field="TOSCSEL"/>
+                <signal pad-key="pe2" function="TOSC_ALT" group="TOSC2" field="TOSCSEL"/>
+                <signal pad-key="pe3" function="TOSC_ALT" group="TOSC1" field="TOSCSEL"/>
             </signals>
         </peripheral>
         <peripheral key="dfllrc32m" name="DFLLRC32M" module-key="i6055">
@@ -121,15 +121,15 @@
         <peripheral key="portcfg" name="PORTCFG" module-key="i6075_portcfg">
             <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"/>
-                <signal pad-id="pd7" function="CLKOUTD" group="CLKOUT" field="CLKOUT"/>
-                <signal pad-id="pd4" function="CLKOUTD_ALT" group="CLKOUT" field="CLKEVPIN"/>
-                <signal pad-id="pc7" function="EVOUTC" group="EVOUT" field="EVOUT"/>
-                <signal pad-id="pc4" function="EVOUTC_ALT" group="EVOUT" field="CLKEVPIN"/>
-                <signal pad-id="pd7" function="EVOUTD" group="EVOUT" field="EVOUT"/>
-                <signal pad-id="pd4" function="EVOUTD_ALT" group="EVOUT" field="CLKEVPIN"/>
-                <signal pad-id="pc6" function="RTCOUTC" group="RTCOUT"/>
+                <signal pad-key="pc7" function="CLKOUTC" group="CLKOUT" field="CLKOUT"/>
+                <signal pad-key="pc4" function="CLKOUTC_ALT" group="CLKOUT" field="CLKEVPIN"/>
+                <signal pad-key="pd7" function="CLKOUTD" group="CLKOUT" field="CLKOUT"/>
+                <signal pad-key="pd4" function="CLKOUTD_ALT" group="CLKOUT" field="CLKEVPIN"/>
+                <signal pad-key="pc7" function="EVOUTC" group="EVOUT" field="EVOUT"/>
+                <signal pad-key="pc4" function="EVOUTC_ALT" group="EVOUT" field="CLKEVPIN"/>
+                <signal pad-key="pd7" function="EVOUTD" group="EVOUT" field="EVOUT"/>
+                <signal pad-key="pd4" function="EVOUTD_ALT" group="EVOUT" field="CLKEVPIN"/>
+                <signal pad-key="pc6" function="RTCOUTC" group="RTCOUT"/>
             </signals>
         </peripheral>
         <peripheral key="aes" name="AES" module-key="i6096">
@@ -150,44 +150,44 @@
         <peripheral key="adca" name="ADCA" module-key="i6099">
             <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"/>
-                <signal pad-id="pa2" index="2" function="ADC" group="ADC"/>
-                <signal pad-id="pa3" index="3" function="ADC" group="ADC"/>
-                <signal pad-id="pa4" index="4" function="ADC" group="ADC"/>
-                <signal pad-id="pa5" index="5" function="ADC" group="ADC"/>
-                <signal pad-id="pa6" index="6" function="ADC" group="ADC"/>
-                <signal pad-id="pa7" index="7" function="ADC" group="ADC"/>
-                <signal pad-id="pb0" index="8" function="ADC" group="ADC"/>
-                <signal pad-id="pb1" index="9" function="ADC" group="ADC"/>
-                <signal pad-id="pb2" index="10" function="ADC" group="ADC"/>
-                <signal pad-id="pb3" index="11" function="ADC" group="ADC"/>
-                <signal pad-id="pa0" index="0" function="AREF" group="REFA"/>
-                <signal pad-id="pb0" index="0" function="AREF" group="REFB"/>
+                <signal pad-key="pa0" index="0" function="ADC" group="ADC"/>
+                <signal pad-key="pa1" index="1" function="ADC" group="ADC"/>
+                <signal pad-key="pa2" index="2" function="ADC" group="ADC"/>
+                <signal pad-key="pa3" index="3" function="ADC" group="ADC"/>
+                <signal pad-key="pa4" index="4" function="ADC" group="ADC"/>
+                <signal pad-key="pa5" index="5" function="ADC" group="ADC"/>
+                <signal pad-key="pa6" index="6" function="ADC" group="ADC"/>
+                <signal pad-key="pa7" index="7" function="ADC" group="ADC"/>
+                <signal pad-key="pb0" index="8" function="ADC" group="ADC"/>
+                <signal pad-key="pb1" index="9" function="ADC" group="ADC"/>
+                <signal pad-key="pb2" index="10" function="ADC" group="ADC"/>
+                <signal pad-key="pb3" index="11" function="ADC" group="ADC"/>
+                <signal pad-key="pa0" index="0" function="AREF" group="REFA"/>
+                <signal pad-key="pb0" index="0" function="AREF" group="REFB"/>
             </signals>
         </peripheral>
         <peripheral key="dacb" name="DACB" module-key="i6059">
             <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"/>
-                <signal pad-id="pa0" index="0" function="AREF" group="REFA"/>
-                <signal pad-id="pb0" index="0" function="AREF" group="REFB"/>
+                <signal pad-key="pb2" index="0" function="DAC" group="DAC"/>
+                <signal pad-key="pb3" index="1" function="DAC" group="DAC"/>
+                <signal pad-key="pa0" index="0" function="AREF" group="REFA"/>
+                <signal pad-key="pb0" index="0" function="AREF" group="REFB"/>
             </signals>
         </peripheral>
         <peripheral key="aca" name="ACA" module-key="i6077">
             <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"/>
-                <signal pad-id="pa2" index="2" function="AC" group="AC"/>
-                <signal pad-id="pa3" index="3" function="AC" group="AC"/>
-                <signal pad-id="pa4" index="4" function="AC" group="AC"/>
-                <signal pad-id="pa5" index="5" function="AC" group="AC"/>
-                <signal pad-id="pa6" index="6" function="AC" group="AC"/>
-                <signal pad-id="pa7" index="7" function="AC" group="AC"/>
-                <signal pad-id="pa6" index="1" function="ACOUT" group="ACOUT"/>
-                <signal pad-id="pa7" index="0" function="ACOUT" group="ACOUT"/>
+                <signal pad-key="pa0" index="0" function="AC" group="AC"/>
+                <signal pad-key="pa1" index="1" function="AC" group="AC"/>
+                <signal pad-key="pa2" index="2" function="AC" group="AC"/>
+                <signal pad-key="pa3" index="3" function="AC" group="AC"/>
+                <signal pad-key="pa4" index="4" function="AC" group="AC"/>
+                <signal pad-key="pa5" index="5" function="AC" group="AC"/>
+                <signal pad-key="pa6" index="6" function="AC" group="AC"/>
+                <signal pad-key="pa7" index="7" function="AC" group="AC"/>
+                <signal pad-key="pa6" index="1" function="ACOUT" group="ACOUT"/>
+                <signal pad-key="pa7" index="0" function="ACOUT" group="ACOUT"/>
             </signals>
         </peripheral>
         <peripheral key="rtc" name="RTC" module-key="i6093">
@@ -196,178 +196,178 @@
         <peripheral key="twic" name="TWIC" module-key="i6089">
             <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"/>
-                <signal pad-id="pc0" function="TWI_EXT" group="SDAIN"/>
-                <signal pad-id="pc1" function="TWI_EXT" group="SCLIN"/>
-                <signal pad-id="pc2" function="TWI_EXT" group="SDAOUT"/>
-                <signal pad-id="pc3" function="TWI_EXT" group="SCLOUT"/>
+                <signal pad-key="pc0" function="TWI" group="SDA"/>
+                <signal pad-key="pc1" function="TWI" group="SCL"/>
+                <signal pad-key="pc0" function="TWI_EXT" group="SDAIN"/>
+                <signal pad-key="pc1" function="TWI_EXT" group="SCLIN"/>
+                <signal pad-key="pc2" function="TWI_EXT" group="SDAOUT"/>
+                <signal pad-key="pc3" function="TWI_EXT" group="SCLOUT"/>
             </signals>
         </peripheral>
         <peripheral key="twie" name="TWIE" module-key="i6089">
             <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"/>
+                <signal pad-key="pe0" function="TWI" group="SDA"/>
+                <signal pad-key="pe1" function="TWI" group="SCL"/>
             </signals>
         </peripheral>
         <peripheral key="usb" name="USB" module-key="i3005">
             <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"/>
+                <signal pad-key="pd6" function="USB" group="DN"/>
+                <signal pad-key="pd7" function="USB" group="DP"/>
             </signals>
         </peripheral>
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pa2" index="2" function="PORTA" group="P"/>
-                <signal pad-id="pa3" index="3" function="PORTA" group="P"/>
-                <signal pad-id="pa4" index="4" function="PORTA" group="P"/>
-                <signal pad-id="pa5" index="5" function="PORTA" group="P"/>
-                <signal pad-id="pa6" index="6" function="PORTA" group="P"/>
-                <signal pad-id="pa7" index="7" function="PORTA" group="P"/>
+                <signal pad-key="pa0" index="0" function="PORTA" group="P"/>
+                <signal pad-key="pa1" index="1" function="PORTA" group="P"/>
+                <signal pad-key="pa2" index="2" function="PORTA" group="P"/>
+                <signal pad-key="pa3" index="3" function="PORTA" group="P"/>
+                <signal pad-key="pa4" index="4" function="PORTA" group="P"/>
+                <signal pad-key="pa5" index="5" function="PORTA" group="P"/>
+                <signal pad-key="pa6" index="6" function="PORTA" group="P"/>
+                <signal pad-key="pa7" index="7" function="PORTA" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pb2" index="2" function="PORTB" group="P"/>
-                <signal pad-id="pb3" index="3" function="PORTB" group="P"/>
+                <signal pad-key="pb0" index="0" function="PORTB" group="P"/>
+                <signal pad-key="pb1" index="1" function="PORTB" group="P"/>
+                <signal pad-key="pb2" index="2" function="PORTB" group="P"/>
+                <signal pad-key="pb3" index="3" function="PORTB" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pc2" index="2" function="PORTC" group="P"/>
-                <signal pad-id="pc3" index="3" function="PORTC" group="P"/>
-                <signal pad-id="pc4" index="4" function="PORTC" group="P"/>
-                <signal pad-id="pc5" index="5" function="PORTC" group="P"/>
-                <signal pad-id="pc6" index="6" function="PORTC" group="P"/>
-                <signal pad-id="pc7" index="7" function="PORTC" group="P"/>
+                <signal pad-key="pc0" index="0" function="PORTC" group="P"/>
+                <signal pad-key="pc1" index="1" function="PORTC" group="P"/>
+                <signal pad-key="pc2" index="2" function="PORTC" group="P"/>
+                <signal pad-key="pc3" index="3" function="PORTC" group="P"/>
+                <signal pad-key="pc4" index="4" function="PORTC" group="P"/>
+                <signal pad-key="pc5" index="5" function="PORTC" group="P"/>
+                <signal pad-key="pc6" index="6" function="PORTC" group="P"/>
+                <signal pad-key="pc7" index="7" function="PORTC" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pd2" index="2" function="PORTD" group="P"/>
-                <signal pad-id="pd3" index="3" function="PORTD" group="P"/>
-                <signal pad-id="pd4" index="4" function="PORTD" group="P"/>
-                <signal pad-id="pd5" index="5" function="PORTD" group="P"/>
-                <signal pad-id="pd6" index="6" function="PORTD" group="P"/>
-                <signal pad-id="pd7" index="7" function="PORTD" group="P"/>
+                <signal pad-key="pd0" index="0" function="PORTD" group="P"/>
+                <signal pad-key="pd1" index="1" function="PORTD" group="P"/>
+                <signal pad-key="pd2" index="2" function="PORTD" group="P"/>
+                <signal pad-key="pd3" index="3" function="PORTD" group="P"/>
+                <signal pad-key="pd4" index="4" function="PORTD" group="P"/>
+                <signal pad-key="pd5" index="5" function="PORTD" group="P"/>
+                <signal pad-key="pd6" index="6" function="PORTD" group="P"/>
+                <signal pad-key="pd7" index="7" function="PORTD" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="porte" name="PORTE" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pe2" index="2" function="PORTE" group="P"/>
-                <signal pad-id="pe3" index="3" function="PORTE" group="P"/>
+                <signal pad-key="pe0" index="0" function="PORTE" group="P"/>
+                <signal pad-key="pe1" index="1" function="PORTE" group="P"/>
+                <signal pad-key="pe2" index="2" function="PORTE" group="P"/>
+                <signal pad-key="pe3" index="3" function="PORTE" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portr" name="PORTR" module-key="gpio_port">
             <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"/>
+                <signal pad-key="pr0" index="0" function="PORTR" group="P"/>
+                <signal pad-key="pr1" index="1" function="PORTR" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="tcc0" name="TCC0" module-key="i6090_tc">
             <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"/>
-                <signal pad-id="pc2" function="TC0" group="OC0C" field="TC0C"/>
-                <signal pad-id="pc3" function="TC0" group="OC0D" field="TC0D"/>
-                <signal pad-id="pc4" function="TC0_ALT" group="OC0A" field="TC0A"/>
-                <signal pad-id="pc5" function="TC0_ALT" group="OC0B" field="TC0B"/>
-                <signal pad-id="pc6" function="TC0_ALT" group="OC0C" field="TC0C"/>
-                <signal pad-id="pc7" function="TC0_ALT" group="OC0D" field="TC0D"/>
+                <signal pad-key="pc0" function="TC0" group="OC0A" field="TC0A"/>
+                <signal pad-key="pc1" function="TC0" group="OC0B" field="TC0B"/>
+                <signal pad-key="pc2" function="TC0" group="OC0C" field="TC0C"/>
+                <signal pad-key="pc3" function="TC0" group="OC0D" field="TC0D"/>
+                <signal pad-key="pc4" function="TC0_ALT" group="OC0A" field="TC0A"/>
+                <signal pad-key="pc5" function="TC0_ALT" group="OC0B" field="TC0B"/>
+                <signal pad-key="pc6" function="TC0_ALT" group="OC0C" field="TC0C"/>
+                <signal pad-key="pc7" function="TC0_ALT" group="OC0D" field="TC0D"/>
             </signals>
         </peripheral>
         <peripheral key="tcc1" name="TCC1" module-key="i6090_tc">
             <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"/>
+                <signal pad-key="pc4" function="TC1" group="OC1A"/>
+                <signal pad-key="pc5" function="TC1" group="OC1B"/>
             </signals>
         </peripheral>
         <peripheral key="tcd0" name="TCD0" module-key="i6090_tc">
             <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"/>
-                <signal pad-id="pd2" function="TC0" group="OC0C"/>
-                <signal pad-id="pd3" function="TC0" group="OC0D"/>
-                <signal pad-id="pd4" function="TC0_ALT" group="OC0A"/>
-                <signal pad-id="pd5" function="TC0_ALT" group="OC0B"/>
-                <signal pad-id="pd6" function="TC0_ALT" group="OC0C"/>
-                <signal pad-id="pd7" function="TC0_ALT" group="OC0D"/>
+                <signal pad-key="pd0" function="TC0" group="OC0A"/>
+                <signal pad-key="pd1" function="TC0" group="OC0B"/>
+                <signal pad-key="pd2" function="TC0" group="OC0C"/>
+                <signal pad-key="pd3" function="TC0" group="OC0D"/>
+                <signal pad-key="pd4" function="TC0_ALT" group="OC0A"/>
+                <signal pad-key="pd5" function="TC0_ALT" group="OC0B"/>
+                <signal pad-key="pd6" function="TC0_ALT" group="OC0C"/>
+                <signal pad-key="pd7" function="TC0_ALT" group="OC0D"/>
             </signals>
         </peripheral>
         <peripheral key="tcd1" name="TCD1" module-key="i6090_tc">
             <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"/>
+                <signal pad-key="pd4" function="TC1" group="OC1A"/>
+                <signal pad-key="pd5" function="TC1" group="OC1B"/>
             </signals>
         </peripheral>
         <peripheral key="tce0" name="TCE0" module-key="i6090_tc">
             <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"/>
-                <signal pad-id="pe2" function="TC0" group="OC0C"/>
-                <signal pad-id="pe3" function="TC0" group="OC0D"/>
+                <signal pad-key="pe0" function="TC0" group="OC0A"/>
+                <signal pad-key="pe1" function="TC0" group="OC0B"/>
+                <signal pad-key="pe2" function="TC0" group="OC0C"/>
+                <signal pad-key="pe3" function="TC0" group="OC0D"/>
             </signals>
         </peripheral>
         <peripheral key="tcc2" name="TCC2" module-key="i6090_tc2">
             <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"/>
-                <signal pad-id="pc2" function="TC2" group="LOC2C"/>
-                <signal pad-id="pc3" function="TC2" group="LOC2D"/>
-                <signal pad-id="pc4" function="TC2" group="HOC2A"/>
-                <signal pad-id="pc5" function="TC2" group="HOC2B"/>
-                <signal pad-id="pc6" function="TC2" group="HOC2C"/>
-                <signal pad-id="pc7" function="TC2" group="HOC2D"/>
+                <signal pad-key="pc0" function="TC2" group="LOC2A"/>
+                <signal pad-key="pc1" function="TC2" group="LOC2B"/>
+                <signal pad-key="pc2" function="TC2" group="LOC2C"/>
+                <signal pad-key="pc3" function="TC2" group="LOC2D"/>
+                <signal pad-key="pc4" function="TC2" group="HOC2A"/>
+                <signal pad-key="pc5" function="TC2" group="HOC2B"/>
+                <signal pad-key="pc6" function="TC2" group="HOC2C"/>
+                <signal pad-key="pc7" function="TC2" group="HOC2D"/>
             </signals>
         </peripheral>
         <peripheral key="tcd2" name="TCD2" module-key="i6090_tc2">
             <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"/>
-                <signal pad-id="pd2" function="TC2" group="LOC2C"/>
-                <signal pad-id="pd3" function="TC2" group="LOC2D"/>
-                <signal pad-id="pd4" function="TC2" group="HOC2A"/>
-                <signal pad-id="pd5" function="TC2" group="HOC2B"/>
-                <signal pad-id="pd6" function="TC2" group="HOC2C"/>
-                <signal pad-id="pd7" function="TC2" group="HOC2D"/>
+                <signal pad-key="pd0" function="TC2" group="LOC2A"/>
+                <signal pad-key="pd1" function="TC2" group="LOC2B"/>
+                <signal pad-key="pd2" function="TC2" group="LOC2C"/>
+                <signal pad-key="pd3" function="TC2" group="LOC2D"/>
+                <signal pad-key="pd4" function="TC2" group="HOC2A"/>
+                <signal pad-key="pd5" function="TC2" group="HOC2B"/>
+                <signal pad-key="pd6" function="TC2" group="HOC2C"/>
+                <signal pad-key="pd7" function="TC2" group="HOC2D"/>
             </signals>
         </peripheral>
         <peripheral key="awexc" name="AWEXC" module-key="i6090_awex">
             <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"/>
-                <signal pad-id="pc2" function="AWEX" group="OC0BLS"/>
-                <signal pad-id="pc3" function="AWEX" group="OC0BHS"/>
-                <signal pad-id="pc4" function="AWEX" group="OC0CLS"/>
-                <signal pad-id="pc5" function="AWEX" group="OC0CHS"/>
-                <signal pad-id="pc6" function="AWEX" group="OC0DLS"/>
-                <signal pad-id="pc7" function="AWEX" group="OC0DHS"/>
+                <signal pad-key="pc0" function="AWEX" group="OC0ALS"/>
+                <signal pad-key="pc1" function="AWEX" group="OC0AHS"/>
+                <signal pad-key="pc2" function="AWEX" group="OC0BLS"/>
+                <signal pad-key="pc3" function="AWEX" group="OC0BHS"/>
+                <signal pad-key="pc4" function="AWEX" group="OC0CLS"/>
+                <signal pad-key="pc5" function="AWEX" group="OC0CHS"/>
+                <signal pad-key="pc6" function="AWEX" group="OC0DLS"/>
+                <signal pad-key="pc7" function="AWEX" group="OC0DHS"/>
             </signals>
         </peripheral>
         <peripheral key="hiresc" name="HIRESC" module-key="i6090_hires">
@@ -382,73 +382,73 @@
         <peripheral key="usartc0" name="USARTC0" module-key="i6090_usart">
             <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"/>
-                <signal pad-id="pc3" function="USART" group="TXD" field="USART0"/>
-                <signal pad-id="pc5" function="USART_ALT" group="XCK" field="USART0"/>
-                <signal pad-id="pc6" function="USART_ALT" group="RXD" field="USART0"/>
-                <signal pad-id="pc7" function="USART_ALT" group="TXD" field="USART0"/>
+                <signal pad-key="pc1" function="USART" group="XCK" field="USART0"/>
+                <signal pad-key="pc2" function="USART" group="RXD" field="USART0"/>
+                <signal pad-key="pc3" function="USART" group="TXD" field="USART0"/>
+                <signal pad-key="pc5" function="USART_ALT" group="XCK" field="USART0"/>
+                <signal pad-key="pc6" function="USART_ALT" group="RXD" field="USART0"/>
+                <signal pad-key="pc7" function="USART_ALT" group="TXD" field="USART0"/>
             </signals>
         </peripheral>
         <peripheral key="usartc1" name="USARTC1" module-key="i6090_usart">
             <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"/>
-                <signal pad-id="pd7" function="USART" group="TXD"/>
+                <signal pad-key="pd5" function="USART" group="XCK"/>
+                <signal pad-key="pd6" function="USART" group="RXD"/>
+                <signal pad-key="pd7" function="USART" group="TXD"/>
             </signals>
         </peripheral>
         <peripheral key="usartd0" name="USARTD0" module-key="i6090_usart">
             <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"/>
-                <signal pad-id="pd3" function="USART" group="TXD" field="USART0"/>
-                <signal pad-id="pd5" function="USART_ALT" group="XCK" field="USART0"/>
-                <signal pad-id="pd6" function="USART_ALT" group="RXD" field="USART0"/>
-                <signal pad-id="pd7" function="USART_ALT" group="TXD" field="USART0"/>
+                <signal pad-key="pd1" function="USART" group="XCK" field="USART0"/>
+                <signal pad-key="pd2" function="USART" group="RXD" field="USART0"/>
+                <signal pad-key="pd3" function="USART" group="TXD" field="USART0"/>
+                <signal pad-key="pd5" function="USART_ALT" group="XCK" field="USART0"/>
+                <signal pad-key="pd6" function="USART_ALT" group="RXD" field="USART0"/>
+                <signal pad-key="pd7" function="USART_ALT" group="TXD" field="USART0"/>
             </signals>
         </peripheral>
         <peripheral key="usartd1" name="USARTD1" module-key="i6090_usart">
             <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"/>
-                <signal pad-id="pd7" function="USART" group="TXD"/>
+                <signal pad-key="pd5" function="USART" group="XCK"/>
+                <signal pad-key="pd6" function="USART" group="RXD"/>
+                <signal pad-key="pd7" function="USART" group="TXD"/>
             </signals>
         </peripheral>
         <peripheral key="usarte0" name="USARTE0" module-key="i6090_usart">
             <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"/>
-                <signal pad-id="pe3" function="USART" group="TXD"/>
+                <signal pad-key="pe1" function="USART" group="XCK"/>
+                <signal pad-key="pe2" function="USART" group="RXD"/>
+                <signal pad-key="pe3" function="USART" group="TXD"/>
             </signals>
         </peripheral>
         <peripheral key="spic" name="SPIC" module-key="i6090_spi">
             <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"/>
-                <signal pad-id="pc6" function="SPI" group="MISO" field="SPI"/>
-                <signal pad-id="pc7" function="SPI" group="SCK" field="SPI"/>
-                <signal pad-id="pc4" function="SPI_ALT" group="SS" field="SPI"/>
-                <signal pad-id="pc5" function="SPI_ALT" group="SCK" field="SPI"/>
-                <signal pad-id="pc6" function="SPI_ALT" group="MISO" field="SPI"/>
-                <signal pad-id="pc7" function="SPI_ALT" group="MOSI" field="SPI"/>
+                <signal pad-key="pc4" function="SPI" group="SS" field="SPI"/>
+                <signal pad-key="pc5" function="SPI" group="MOSI" field="SPI"/>
+                <signal pad-key="pc6" function="SPI" group="MISO" field="SPI"/>
+                <signal pad-key="pc7" function="SPI" group="SCK" field="SPI"/>
+                <signal pad-key="pc4" function="SPI_ALT" group="SS" field="SPI"/>
+                <signal pad-key="pc5" function="SPI_ALT" group="SCK" field="SPI"/>
+                <signal pad-key="pc6" function="SPI_ALT" group="MISO" field="SPI"/>
+                <signal pad-key="pc7" function="SPI_ALT" group="MOSI" field="SPI"/>
             </signals>
         </peripheral>
         <peripheral key="spid" name="SPID" module-key="i6090_spi">
             <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"/>
-                <signal pad-id="pd6" function="SPI" group="MISO" field="SPI"/>
-                <signal pad-id="pd7" function="SPI" group="SCK" field="SPI"/>
-                <signal pad-id="pd4" function="SPI_ALT" group="SS" field="SPI"/>
-                <signal pad-id="pd5" function="SPI_ALT" group="SCK" field="SPI"/>
-                <signal pad-id="pd6" function="SPI_ALT" group="MISO" field="SPI"/>
-                <signal pad-id="pd7" function="SPI_ALT" group="MOSI" field="SPI"/>
+                <signal pad-key="pd4" function="SPI" group="SS" field="SPI"/>
+                <signal pad-key="pd5" function="SPI" group="MOSI" field="SPI"/>
+                <signal pad-key="pd6" function="SPI" group="MISO" field="SPI"/>
+                <signal pad-key="pd7" function="SPI" group="SCK" field="SPI"/>
+                <signal pad-key="pd4" function="SPI_ALT" group="SS" field="SPI"/>
+                <signal pad-key="pd5" function="SPI_ALT" group="SCK" field="SPI"/>
+                <signal pad-key="pd6" function="SPI_ALT" group="MISO" field="SPI"/>
+                <signal pad-key="pd7" function="SPI_ALT" group="MOSI" field="SPI"/>
             </signals>
         </peripheral>
         <peripheral key="ircom" name="IRCOM" module-key="i6090_ircom">
@@ -1822,110 +1822,152 @@
             </register-group>
         </module>
     </modules>
+    <pads>
+        <pad key="pa5" name="PA5"/>
+        <pad key="pa6" name="PA6"/>
+        <pad key="pa7" name="PA7"/>
+        <pad key="pb0" name="PB0"/>
+        <pad key="pb1" name="PB1"/>
+        <pad key="pb2" name="PB2"/>
+        <pad key="pb3" name="PB3"/>
+        <pad key="gnd" name="GND"/>
+        <pad key="vcc" name="VCC"/>
+        <pad key="pc0" name="PC0"/>
+        <pad key="pc1" name="PC1"/>
+        <pad key="pc2" name="PC2"/>
+        <pad key="pc3" name="PC3"/>
+        <pad key="pc4" name="PC4"/>
+        <pad key="pc5" name="PC5"/>
+        <pad key="pc6" name="PC6"/>
+        <pad key="pc7" name="PC7"/>
+        <pad key="pd0" name="PD0"/>
+        <pad key="pd1" name="PD1"/>
+        <pad key="pd2" name="PD2"/>
+        <pad key="pd3" name="PD3"/>
+        <pad key="pd4" name="PD4"/>
+        <pad key="pd5" name="PD5"/>
+        <pad key="pd6" name="PD6"/>
+        <pad key="pd7" name="PD7"/>
+        <pad key="pe0" name="PE0"/>
+        <pad key="pe1" name="PE1"/>
+        <pad key="pe2" name="PE2"/>
+        <pad key="pe3" name="PE3"/>
+        <pad key="pdi" name="PDI"/>
+        <pad key="reset" name="RESET"/>
+        <pad key="pr0" name="PR0"/>
+        <pad key="pr1" name="PR1"/>
+        <pad key="avcc" name="AVCC"/>
+        <pad key="pa0" name="PA0"/>
+        <pad key="pa1" name="PA1"/>
+        <pad key="pa2" name="PA2"/>
+        <pad key="pa3" name="PA3"/>
+        <pad key="pa4" name="PA4"/>
+        <pad key="pdi_data" name="PDI_DATA"/>
+    </pads>
     <pinouts>
         <pinout key="qfp_qfn_44" name="QFP_QFN_44" type="qfn">
-            <pin position="1" pad="PA5"/>
-            <pin position="2" pad="PA6"/>
-            <pin position="3" pad="PA7"/>
-            <pin position="4" pad="PB0"/>
-            <pin position="5" pad="PB1"/>
-            <pin position="6" pad="PB2"/>
-            <pin position="7" pad="PB3"/>
-            <pin position="8" pad="GND"/>
-            <pin position="9" pad="VCC"/>
-            <pin position="10" pad="PC0"/>
-            <pin position="11" pad="PC1"/>
-            <pin position="12" pad="PC2"/>
-            <pin position="13" pad="PC3"/>
-            <pin position="14" pad="PC4"/>
-            <pin position="15" pad="PC5"/>
-            <pin position="16" pad="PC6"/>
-            <pin position="17" pad="PC7"/>
-            <pin position="18" pad="GND"/>
-            <pin position="19" pad="VCC"/>
-            <pin position="20" pad="PD0"/>
-            <pin position="21" pad="PD1"/>
-            <pin position="22" pad="PD2"/>
-            <pin position="23" pad="PD3"/>
-            <pin position="24" pad="PD4"/>
-            <pin position="25" pad="PD5"/>
-            <pin position="26" pad="PD6"/>
-            <pin position="27" pad="PD7"/>
-            <pin position="28" pad="PE0"/>
-            <pin position="29" pad="PE1"/>
-            <pin position="30" pad="GND"/>
-            <pin position="31" pad="VCC"/>
-            <pin position="32" pad="PE2"/>
-            <pin position="33" pad="PE3"/>
-            <pin position="34" pad="PDI"/>
-            <pin position="35" pad="RESET"/>
-            <pin position="36" pad="PR0"/>
-            <pin position="37" pad="PR1"/>
-            <pin position="38" pad="GND"/>
-            <pin position="39" pad="AVCC"/>
-            <pin position="40" pad="PA0"/>
-            <pin position="41" pad="PA1"/>
-            <pin position="42" pad="PA2"/>
-            <pin position="43" pad="PA3"/>
-            <pin position="44" pad="PA4"/>
+            <pin position="1" pad-key="pa5"/>
+            <pin position="2" pad-key="pa6"/>
+            <pin position="3" pad-key="pa7"/>
+            <pin position="4" pad-key="pb0"/>
+            <pin position="5" pad-key="pb1"/>
+            <pin position="6" pad-key="pb2"/>
+            <pin position="7" pad-key="pb3"/>
+            <pin position="8" pad-key="gnd"/>
+            <pin position="9" pad-key="vcc"/>
+            <pin position="10" pad-key="pc0"/>
+            <pin position="11" pad-key="pc1"/>
+            <pin position="12" pad-key="pc2"/>
+            <pin position="13" pad-key="pc3"/>
+            <pin position="14" pad-key="pc4"/>
+            <pin position="15" pad-key="pc5"/>
+            <pin position="16" pad-key="pc6"/>
+            <pin position="17" pad-key="pc7"/>
+            <pin position="18" pad-key="gnd"/>
+            <pin position="19" pad-key="vcc"/>
+            <pin position="20" pad-key="pd0"/>
+            <pin position="21" pad-key="pd1"/>
+            <pin position="22" pad-key="pd2"/>
+            <pin position="23" pad-key="pd3"/>
+            <pin position="24" pad-key="pd4"/>
+            <pin position="25" pad-key="pd5"/>
+            <pin position="26" pad-key="pd6"/>
+            <pin position="27" pad-key="pd7"/>
+            <pin position="28" pad-key="pe0"/>
+            <pin position="29" pad-key="pe1"/>
+            <pin position="30" pad-key="gnd"/>
+            <pin position="31" pad-key="vcc"/>
+            <pin position="32" pad-key="pe2"/>
+            <pin position="33" pad-key="pe3"/>
+            <pin position="34" pad-key="pdi"/>
+            <pin position="35" pad-key="reset"/>
+            <pin position="36" pad-key="pr0"/>
+            <pin position="37" pad-key="pr1"/>
+            <pin position="38" pad-key="gnd"/>
+            <pin position="39" pad-key="avcc"/>
+            <pin position="40" pad-key="pa0"/>
+            <pin position="41" pad-key="pa1"/>
+            <pin position="42" pad-key="pa2"/>
+            <pin position="43" pad-key="pa3"/>
+            <pin position="44" pad-key="pa4"/>
         </pinout>
         <pinout key="bga_49" name="BGA_49" type="bga">
-            <pin position="A1" pad="PA3"/>
-            <pin position="A2" pad="AVCC"/>
-            <pin position="A3" pad="GND"/>
-            <pin position="A4" pad="PR1"/>
-            <pin position="A5" pad="PR0"/>
-            <pin position="A6" pad="PDI_DATA"/>
-            <pin position="A7" pad="PE3"/>
-            <pin position="B1" pad="PA4"/>
-            <pin position="B2" pad="PA1"/>
-            <pin position="B3" pad="PA0"/>
-            <pin position="B4" pad="GND"/>
-            <pin position="B5" pad="RESET"/>
-            <pin position="B6" pad="PE2"/>
-            <pin position="B7" pad="VCC"/>
-            <pin position="C1" pad="PA5"/>
-            <pin position="C2" pad="PA2"/>
-            <pin position="C3" pad="PA6"/>
-            <pin position="C4" pad="PA7"/>
-            <pin position="C5" pad="GND"/>
-            <pin position="C6" pad="PE1"/>
-            <pin position="C7" pad="GND"/>
-            <pin position="D1" pad="PB1"/>
-            <pin position="D2" pad="PB2"/>
-            <pin position="D3" pad="PB3"/>
-            <pin position="D4" pad="PB0"/>
-            <pin position="D5" pad="GND"/>
-            <pin position="D6" pad="PD7"/>
-            <pin position="D7" pad="PE0"/>
-            <pin position="E1" pad="GND"/>
-            <pin position="E2" pad="GND"/>
-            <pin position="E3" pad="PC3"/>
-            <pin position="E4" pad="GND"/>
-            <pin position="E5" pad="PD4"/>
-            <pin position="E6" pad="PD5"/>
-            <pin position="E7" pad="PD6"/>
-            <pin position="F1" pad="VCC"/>
-            <pin position="F2" pad="PC0"/>
-            <pin position="F3" pad="PC4"/>
-            <pin position="F4" pad="PC6"/>
-            <pin position="F5" pad="PD0"/>
-            <pin position="F6" pad="PD1"/>
-            <pin position="F7" pad="PD3"/>
-            <pin position="G1" pad="PC1"/>
-            <pin position="G2" pad="PC2"/>
-            <pin position="G3" pad="PC5"/>
-            <pin position="G4" pad="PC7"/>
-            <pin position="G5" pad="GND"/>
-            <pin position="G6" pad="VCC"/>
-            <pin position="G7" pad="PD2"/>
+            <pin position="A1" pad-key="pa3"/>
+            <pin position="A2" pad-key="avcc"/>
+            <pin position="A3" pad-key="gnd"/>
+            <pin position="A4" pad-key="pr1"/>
+            <pin position="A5" pad-key="pr0"/>
+            <pin position="A6" pad-key="pdi_data"/>
+            <pin position="A7" pad-key="pe3"/>
+            <pin position="B1" pad-key="pa4"/>
+            <pin position="B2" pad-key="pa1"/>
+            <pin position="B3" pad-key="pa0"/>
+            <pin position="B4" pad-key="gnd"/>
+            <pin position="B5" pad-key="reset"/>
+            <pin position="B6" pad-key="pe2"/>
+            <pin position="B7" pad-key="vcc"/>
+            <pin position="C1" pad-key="pa5"/>
+            <pin position="C2" pad-key="pa2"/>
+            <pin position="C3" pad-key="pa6"/>
+            <pin position="C4" pad-key="pa7"/>
+            <pin position="C5" pad-key="gnd"/>
+            <pin position="C6" pad-key="pe1"/>
+            <pin position="C7" pad-key="gnd"/>
+            <pin position="D1" pad-key="pb1"/>
+            <pin position="D2" pad-key="pb2"/>
+            <pin position="D3" pad-key="pb3"/>
+            <pin position="D4" pad-key="pb0"/>
+            <pin position="D5" pad-key="gnd"/>
+            <pin position="D6" pad-key="pd7"/>
+            <pin position="D7" pad-key="pe0"/>
+            <pin position="E1" pad-key="gnd"/>
+            <pin position="E2" pad-key="gnd"/>
+            <pin position="E3" pad-key="pc3"/>
+            <pin position="E4" pad-key="gnd"/>
+            <pin position="E5" pad-key="pd4"/>
+            <pin position="E6" pad-key="pd5"/>
+            <pin position="E7" pad-key="pd6"/>
+            <pin position="F1" pad-key="vcc"/>
+            <pin position="F2" pad-key="pc0"/>
+            <pin position="F3" pad-key="pc4"/>
+            <pin position="F4" pad-key="pc6"/>
+            <pin position="F5" pad-key="pd0"/>
+            <pin position="F6" pad-key="pd1"/>
+            <pin position="F7" pad-key="pd3"/>
+            <pin position="G1" pad-key="pc1"/>
+            <pin position="G2" pad-key="pc2"/>
+            <pin position="G3" pad-key="pc5"/>
+            <pin position="G4" pad-key="pc7"/>
+            <pin position="G5" pad-key="gnd"/>
+            <pin position="G6" pad-key="vcc"/>
+            <pin position="G7" pad-key="pd2"/>
         </pinout>
     </pinouts>
     <variants>
-        <variant name="ATxmega128A4U-AU" pinout-key="qfp_qfn_44" package="TQFP44"/>
-        <variant name="ATxmega128A4U-MH" pinout-key="qfp_qfn_44" package="VQFN44PW"/>
-        <variant name="ATxmega128A4U-CU" pinout-key="bga_49" package="VFBGA49"/>
-        <variant name="ATxmega128A4U-AN" pinout-key="qfp_qfn_44" package="TQFP44"/>
-        <variant name="ATxmega128A4U-M7" pinout-key="qfp_qfn_44" package="VQFN44PW"/>
+        <variant key="atxmega128a4u_au" name="ATxmega128A4U-AU" pinout-key="qfp_qfn_44"/>
+        <variant key="atxmega128a4u_mh" name="ATxmega128A4U-MH" pinout-key="qfp_qfn_44"/>
+        <variant key="atxmega128a4u_cu" name="ATxmega128A4U-CU" pinout-key="bga_49"/>
+        <variant key="atxmega128a4u_an" name="ATxmega128A4U-AN" pinout-key="qfp_qfn_44"/>
+        <variant key="atxmega128a4u_m7" name="ATxmega128A4U-M7" pinout-key="qfp_qfn_44"/>
     </variants>
 </device>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA128B1.xml b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA128B1.xml
index 9ffa7edd..5c054920 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA128B1.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA128B1.xml
@@ -85,14 +85,14 @@
         <peripheral key="clk" name="CLK" module-key="i6073">
             <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"/>
-                <signal pad-id="pc2" index="2" function="EXTERNAL_CLOCK" group="EXTCLK"/>
-                <signal pad-id="pc3" index="3" function="EXTERNAL_CLOCK" group="EXTCLK"/>
-                <signal pad-id="pc4" index="4" function="EXTERNAL_CLOCK" group="EXTCLK"/>
-                <signal pad-id="pc5" index="5" function="EXTERNAL_CLOCK" group="EXTCLK"/>
-                <signal pad-id="pc6" index="6" function="EXTERNAL_CLOCK" group="EXTCLK"/>
-                <signal pad-id="pc7" index="7" function="EXTERNAL_CLOCK" group="EXTCLK"/>
+                <signal pad-key="pc0" index="0" function="EXTERNAL_CLOCK" group="EXTCLK"/>
+                <signal pad-key="pc1" index="1" function="EXTERNAL_CLOCK" group="EXTCLK"/>
+                <signal pad-key="pc2" index="2" function="EXTERNAL_CLOCK" group="EXTCLK"/>
+                <signal pad-key="pc3" index="3" function="EXTERNAL_CLOCK" group="EXTCLK"/>
+                <signal pad-key="pc4" index="4" function="EXTERNAL_CLOCK" group="EXTCLK"/>
+                <signal pad-key="pc5" index="5" function="EXTERNAL_CLOCK" group="EXTCLK"/>
+                <signal pad-key="pc6" index="6" function="EXTERNAL_CLOCK" group="EXTCLK"/>
+                <signal pad-key="pc7" index="7" function="EXTERNAL_CLOCK" group="EXTCLK"/>
             </signals>
         </peripheral>
         <peripheral key="sleep" name="SLEEP" module-key="i6081">
@@ -101,12 +101,12 @@
         <peripheral key="osc" name="OSC" module-key="i6079">
             <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"/>
-                <signal pad-id="pr0" function="TOSC" group="TOSC2"/>
-                <signal pad-id="pr1" function="TOSC" group="TOSC1"/>
-                <signal pad-id="pe6" function="TOSC_ALT" group="TOSC2"/>
-                <signal pad-id="pe7" function="TOSC_ALT" group="TOSC1"/>
+                <signal pad-key="pr0" function="XTAL" group="XTAL2"/>
+                <signal pad-key="pr1" function="XTAL" group="XTAL1"/>
+                <signal pad-key="pr0" function="TOSC" group="TOSC2"/>
+                <signal pad-key="pr1" function="TOSC" group="TOSC1"/>
+                <signal pad-key="pe6" function="TOSC_ALT" group="TOSC2"/>
+                <signal pad-key="pe7" function="TOSC_ALT" group="TOSC1"/>
             </signals>
         </peripheral>
         <peripheral key="dfllrc32m" name="DFLLRC32M" module-key="i6055">
@@ -133,11 +133,8 @@
         <peripheral key="portcfg" name="PORTCFG" module-key="i6075_portcfg">
             <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"/>
-                <signal pad-id="pd6" function="RTCOUTC" group="RTCOUT" field="RTCOUT"/>
-                <signal pad-id="pe7" function="CLKOUTE" group="CLKOUT" field="CLKOUT"/>
-                <signal pad-id="pe7" function="EVOUT" group="EVOUT" field="EVOUT"/>
+                <signal pad-key="pe7" function="CLKOUTE" group="CLKOUT" field="CLKOUT"/>
+                <signal pad-key="pe7" function="EVOUT" group="EVOUT" field="EVOUT"/>
             </signals>
         </peripheral>
         <peripheral key="aes" name="AES" module-key="i6096">
@@ -158,69 +155,69 @@
         <peripheral key="adca" name="ADCA" module-key="i6110">
             <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"/>
-                <signal pad-id="pa2" index="2" function="ADC" group="ADC"/>
-                <signal pad-id="pa3" index="3" function="ADC" group="ADC"/>
-                <signal pad-id="pa4" index="4" function="ADC" group="ADC"/>
-                <signal pad-id="pa5" index="5" function="ADC" group="ADC"/>
-                <signal pad-id="pa6" index="6" function="ADC" group="ADC"/>
-                <signal pad-id="pa7" index="7" function="ADC" group="ADC"/>
-                <signal pad-id="pb0" index="8" function="ADC" group="ADC"/>
-                <signal pad-id="pb1" index="9" function="ADC" group="ADC"/>
-                <signal pad-id="pb2" index="10" function="ADC" group="ADC"/>
-                <signal pad-id="pb3" index="11" function="ADC" group="ADC"/>
-                <signal pad-id="pb4" index="12" function="ADC" group="ADC"/>
-                <signal pad-id="pb5" index="13" function="ADC" group="ADC"/>
-                <signal pad-id="pb6" index="14" function="ADC" group="ADC"/>
-                <signal pad-id="pb7" index="15" function="ADC" group="ADC"/>
-                <signal pad-id="pa0" index="0" function="AREF" group="REFA"/>
-                <signal pad-id="pb0" index="0" function="AREF" group="REFB"/>
+                <signal pad-key="pa0" index="0" function="ADC" group="ADC"/>
+                <signal pad-key="pa1" index="1" function="ADC" group="ADC"/>
+                <signal pad-key="pa2" index="2" function="ADC" group="ADC"/>
+                <signal pad-key="pa3" index="3" function="ADC" group="ADC"/>
+                <signal pad-key="pa4" index="4" function="ADC" group="ADC"/>
+                <signal pad-key="pa5" index="5" function="ADC" group="ADC"/>
+                <signal pad-key="pa6" index="6" function="ADC" group="ADC"/>
+                <signal pad-key="pa7" index="7" function="ADC" group="ADC"/>
+                <signal pad-key="pb0" index="8" function="ADC" group="ADC"/>
+                <signal pad-key="pb1" index="9" function="ADC" group="ADC"/>
+                <signal pad-key="pb2" index="10" function="ADC" group="ADC"/>
+                <signal pad-key="pb3" index="11" function="ADC" group="ADC"/>
+                <signal pad-key="pb4" index="12" function="ADC" group="ADC"/>
+                <signal pad-key="pb5" index="13" function="ADC" group="ADC"/>
+                <signal pad-key="pb6" index="14" function="ADC" group="ADC"/>
+                <signal pad-key="pb7" index="15" function="ADC" group="ADC"/>
+                <signal pad-key="pa0" index="0" function="AREF" group="REFA"/>
+                <signal pad-key="pb0" index="0" function="AREF" group="REFB"/>
             </signals>
         </peripheral>
         <peripheral key="adcb" name="ADCB" module-key="i6110">
             <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"/>
-                <signal pad-id="pb2" index="2" function="ADC" group="ADC"/>
-                <signal pad-id="pb3" index="3" function="ADC" group="ADC"/>
-                <signal pad-id="pb4" index="4" function="ADC" group="ADC"/>
-                <signal pad-id="pb5" index="5" function="ADC" group="ADC"/>
-                <signal pad-id="pb6" index="6" function="ADC" group="ADC"/>
-                <signal pad-id="pb7" index="7" function="ADC" group="ADC"/>
-                <signal pad-id="pa0" index="0" function="AREF" group="REFA"/>
-                <signal pad-id="pb0" index="0" function="AREF" group="REFB"/>
+                <signal pad-key="pb0" index="0" function="ADC" group="ADC"/>
+                <signal pad-key="pb1" index="1" function="ADC" group="ADC"/>
+                <signal pad-key="pb2" index="2" function="ADC" group="ADC"/>
+                <signal pad-key="pb3" index="3" function="ADC" group="ADC"/>
+                <signal pad-key="pb4" index="4" function="ADC" group="ADC"/>
+                <signal pad-key="pb5" index="5" function="ADC" group="ADC"/>
+                <signal pad-key="pb6" index="6" function="ADC" group="ADC"/>
+                <signal pad-key="pb7" index="7" function="ADC" group="ADC"/>
+                <signal pad-key="pa0" index="0" function="AREF" group="REFA"/>
+                <signal pad-key="pb0" index="0" function="AREF" group="REFB"/>
             </signals>
         </peripheral>
         <peripheral key="aca" name="ACA" module-key="i6077">
             <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"/>
-                <signal pad-id="pa2" index="2" function="AC" group="AC"/>
-                <signal pad-id="pa3" index="3" function="AC" group="AC"/>
-                <signal pad-id="pa4" index="4" function="AC" group="AC"/>
-                <signal pad-id="pa5" index="5" function="AC" group="AC"/>
-                <signal pad-id="pa6" index="6" function="AC" group="AC"/>
-                <signal pad-id="pa7" index="7" function="AC" group="AC"/>
-                <signal pad-id="pa6" index="1" function="ACOUT" group="ACOUT"/>
-                <signal pad-id="pa7" index="0" function="ACOUT" group="ACOUT"/>
+                <signal pad-key="pa0" index="0" function="AC" group="AC"/>
+                <signal pad-key="pa1" index="1" function="AC" group="AC"/>
+                <signal pad-key="pa2" index="2" function="AC" group="AC"/>
+                <signal pad-key="pa3" index="3" function="AC" group="AC"/>
+                <signal pad-key="pa4" index="4" function="AC" group="AC"/>
+                <signal pad-key="pa5" index="5" function="AC" group="AC"/>
+                <signal pad-key="pa6" index="6" function="AC" group="AC"/>
+                <signal pad-key="pa7" index="7" function="AC" group="AC"/>
+                <signal pad-key="pa6" index="1" function="ACOUT" group="ACOUT"/>
+                <signal pad-key="pa7" index="0" function="ACOUT" group="ACOUT"/>
             </signals>
         </peripheral>
         <peripheral key="acb" name="ACB" module-key="i6077">
             <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"/>
-                <signal pad-id="pb2" index="2" function="AC" group="AC"/>
-                <signal pad-id="pb3" index="3" function="AC" group="AC"/>
-                <signal pad-id="pb4" index="4" function="AC" group="AC"/>
-                <signal pad-id="pb5" index="5" function="AC" group="AC"/>
-                <signal pad-id="pb6" index="6" function="AC" group="AC"/>
-                <signal pad-id="pb7" index="7" function="AC" group="AC"/>
-                <signal pad-id="pb6" index="1" function="ACOUT" group="ACOUT"/>
-                <signal pad-id="pb7" index="0" function="ACOUT" group="ACOUT"/>
+                <signal pad-key="pb0" index="0" function="AC" group="AC"/>
+                <signal pad-key="pb1" index="1" function="AC" group="AC"/>
+                <signal pad-key="pb2" index="2" function="AC" group="AC"/>
+                <signal pad-key="pb3" index="3" function="AC" group="AC"/>
+                <signal pad-key="pb4" index="4" function="AC" group="AC"/>
+                <signal pad-key="pb5" index="5" function="AC" group="AC"/>
+                <signal pad-key="pb6" index="6" function="AC" group="AC"/>
+                <signal pad-key="pb7" index="7" function="AC" group="AC"/>
+                <signal pad-key="pb6" index="1" function="ACOUT" group="ACOUT"/>
+                <signal pad-key="pb7" index="0" function="ACOUT" group="ACOUT"/>
             </signals>
         </peripheral>
         <peripheral key="rtc" name="RTC" module-key="i6093">
@@ -229,180 +226,180 @@
         <peripheral key="twic" name="TWIC" module-key="i6089">
             <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"/>
+                <signal pad-key="pc0" function="TWI" group="SDA"/>
+                <signal pad-key="pc1" function="TWI" group="SCL"/>
             </signals>
         </peripheral>
         <peripheral key="usb" name="USB" module-key="i3005">
             <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"/>
+                <signal pad-key="pd0" function="USB" group="DN"/>
+                <signal pad-key="pd1" function="USB" group="DP"/>
             </signals>
         </peripheral>
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pa2" index="2" function="PORTA" group="P"/>
-                <signal pad-id="pa3" index="3" function="PORTA" group="P"/>
-                <signal pad-id="pa4" index="4" function="PORTA" group="P"/>
-                <signal pad-id="pa5" index="5" function="PORTA" group="P"/>
-                <signal pad-id="pa6" index="6" function="PORTA" group="P"/>
-                <signal pad-id="pa7" index="7" function="PORTA" group="P"/>
+                <signal pad-key="pa0" index="0" function="PORTA" group="P"/>
+                <signal pad-key="pa1" index="1" function="PORTA" group="P"/>
+                <signal pad-key="pa2" index="2" function="PORTA" group="P"/>
+                <signal pad-key="pa3" index="3" function="PORTA" group="P"/>
+                <signal pad-key="pa4" index="4" function="PORTA" group="P"/>
+                <signal pad-key="pa5" index="5" function="PORTA" group="P"/>
+                <signal pad-key="pa6" index="6" function="PORTA" group="P"/>
+                <signal pad-key="pa7" index="7" function="PORTA" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pb2" index="2" function="PORTB" group="P"/>
-                <signal pad-id="pb3" index="3" function="PORTB" group="P"/>
-                <signal pad-id="pb4" index="4" function="PORTB" group="P"/>
-                <signal pad-id="pb5" index="5" function="PORTB" group="P"/>
-                <signal pad-id="pb6" index="6" function="PORTB" group="P"/>
-                <signal pad-id="pb7" index="7" function="PORTB" group="P"/>
+                <signal pad-key="pb0" index="0" function="PORTB" group="P"/>
+                <signal pad-key="pb1" index="1" function="PORTB" group="P"/>
+                <signal pad-key="pb2" index="2" function="PORTB" group="P"/>
+                <signal pad-key="pb3" index="3" function="PORTB" group="P"/>
+                <signal pad-key="pb4" index="4" function="PORTB" group="P"/>
+                <signal pad-key="pb5" index="5" function="PORTB" group="P"/>
+                <signal pad-key="pb6" index="6" function="PORTB" group="P"/>
+                <signal pad-key="pb7" index="7" function="PORTB" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pc2" index="2" function="PORTC" group="P"/>
-                <signal pad-id="pc3" index="3" function="PORTC" group="P"/>
-                <signal pad-id="pc4" index="4" function="PORTC" group="P"/>
-                <signal pad-id="pc5" index="5" function="PORTC" group="P"/>
-                <signal pad-id="pc6" index="6" function="PORTC" group="P"/>
-                <signal pad-id="pc7" index="7" function="PORTC" group="P"/>
+                <signal pad-key="pc0" index="0" function="PORTC" group="P"/>
+                <signal pad-key="pc1" index="1" function="PORTC" group="P"/>
+                <signal pad-key="pc2" index="2" function="PORTC" group="P"/>
+                <signal pad-key="pc3" index="3" function="PORTC" group="P"/>
+                <signal pad-key="pc4" index="4" function="PORTC" group="P"/>
+                <signal pad-key="pc5" index="5" function="PORTC" group="P"/>
+                <signal pad-key="pc6" index="6" function="PORTC" group="P"/>
+                <signal pad-key="pc7" index="7" function="PORTC" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pd2" index="2" function="PORTD" group="P"/>
+                <signal pad-key="pd0" index="0" function="PORTD" group="P"/>
+                <signal pad-key="pd1" index="1" function="PORTD" group="P"/>
+                <signal pad-key="pd2" index="2" function="PORTD" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="porte" name="PORTE" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pe2" index="2" function="PORTE" group="P"/>
-                <signal pad-id="pe3" index="3" function="PORTE" group="P"/>
-                <signal pad-id="pe4" index="4" function="PORTE" group="P"/>
-                <signal pad-id="pe5" index="5" function="PORTE" group="P"/>
-                <signal pad-id="pe6" index="6" function="PORTE" group="P"/>
-                <signal pad-id="pe7" index="7" function="PORTE" group="P"/>
+                <signal pad-key="pe0" index="0" function="PORTE" group="P"/>
+                <signal pad-key="pe1" index="1" function="PORTE" group="P"/>
+                <signal pad-key="pe2" index="2" function="PORTE" group="P"/>
+                <signal pad-key="pe3" index="3" function="PORTE" group="P"/>
+                <signal pad-key="pe4" index="4" function="PORTE" group="P"/>
+                <signal pad-key="pe5" index="5" function="PORTE" group="P"/>
+                <signal pad-key="pe6" index="6" function="PORTE" group="P"/>
+                <signal pad-key="pe7" index="7" function="PORTE" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portg" name="PORTG" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pg2" index="2" function="PORTG" group="P"/>
-                <signal pad-id="pg3" index="3" function="PORTG" group="P"/>
-                <signal pad-id="pg4" index="4" function="PORTG" group="P"/>
-                <signal pad-id="pg5" index="5" function="PORTG" group="P"/>
-                <signal pad-id="pg6" index="6" function="PORTG" group="P"/>
-                <signal pad-id="pg7" index="7" function="PORTG" group="P"/>
+                <signal pad-key="pg0" index="0" function="PORTG" group="P"/>
+                <signal pad-key="pg1" index="1" function="PORTG" group="P"/>
+                <signal pad-key="pg2" index="2" function="PORTG" group="P"/>
+                <signal pad-key="pg3" index="3" function="PORTG" group="P"/>
+                <signal pad-key="pg4" index="4" function="PORTG" group="P"/>
+                <signal pad-key="pg5" index="5" function="PORTG" group="P"/>
+                <signal pad-key="pg6" index="6" function="PORTG" group="P"/>
+                <signal pad-key="pg7" index="7" function="PORTG" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portm" name="PORTM" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pm2" index="2" function="PORTM" group="P"/>
-                <signal pad-id="pm3" index="3" function="PORTM" group="P"/>
-                <signal pad-id="pm4" index="4" function="PORTM" group="P"/>
-                <signal pad-id="pm5" index="5" function="PORTM" group="P"/>
-                <signal pad-id="pm6" index="6" function="PORTM" group="P"/>
-                <signal pad-id="pm7" index="7" function="PORTM" group="P"/>
+                <signal pad-key="pm0" index="0" function="PORTM" group="P"/>
+                <signal pad-key="pm1" index="1" function="PORTM" group="P"/>
+                <signal pad-key="pm2" index="2" function="PORTM" group="P"/>
+                <signal pad-key="pm3" index="3" function="PORTM" group="P"/>
+                <signal pad-key="pm4" index="4" function="PORTM" group="P"/>
+                <signal pad-key="pm5" index="5" function="PORTM" group="P"/>
+                <signal pad-key="pm6" index="6" function="PORTM" group="P"/>
+                <signal pad-key="pm7" index="7" function="PORTM" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portr" name="PORTR" module-key="gpio_port">
             <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"/>
+                <signal pad-key="pr0" index="0" function="PORTR" group="P"/>
+                <signal pad-key="pr1" index="1" function="PORTR" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="tcc0" name="TCC0" module-key="i6090_tc">
             <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"/>
-                <signal pad-id="pc2" function="TC0" group="OC0C" field="TC0C"/>
-                <signal pad-id="pc3" function="TC0" group="OC0D" field="TC0D"/>
-                <signal pad-id="pc4" function="TC0_ALT" group="OC0A" field="TC0A"/>
-                <signal pad-id="pc5" function="TC0_ALT" group="OC0B" field="TC0B"/>
-                <signal pad-id="pc6" function="TC0_ALT" group="OC0C" field="TC0C"/>
-                <signal pad-id="pc7" function="TC0_ALT" group="OC0D" field="TC0D"/>
+                <signal pad-key="pc0" function="TC0" group="OC0A" field="TC0A"/>
+                <signal pad-key="pc1" function="TC0" group="OC0B" field="TC0B"/>
+                <signal pad-key="pc2" function="TC0" group="OC0C" field="TC0C"/>
+                <signal pad-key="pc3" function="TC0" group="OC0D" field="TC0D"/>
+                <signal pad-key="pc4" function="TC0_ALT" group="OC0A" field="TC0A"/>
+                <signal pad-key="pc5" function="TC0_ALT" group="OC0B" field="TC0B"/>
+                <signal pad-key="pc6" function="TC0_ALT" group="OC0C" field="TC0C"/>
+                <signal pad-key="pc7" function="TC0_ALT" group="OC0D" field="TC0D"/>
             </signals>
         </peripheral>
         <peripheral key="tcc1" name="TCC1" module-key="i6090_tc">
             <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"/>
+                <signal pad-key="pc4" function="TC1" group="OC1A"/>
+                <signal pad-key="pc5" function="TC1" group="OC1B"/>
             </signals>
         </peripheral>
         <peripheral key="tce0" name="TCE0" module-key="i6090_tc">
             <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"/>
-                <signal pad-id="pe2" function="TC0" group="OC0C" field="TC0C"/>
-                <signal pad-id="pe3" function="TC0" group="OC0D" field="TC0D"/>
-                <signal pad-id="pe4" function="TC0_ALT" group="OC0A" field="TC0A"/>
-                <signal pad-id="pe5" function="TC0_ALT" group="OC0B" field="TC0B"/>
-                <signal pad-id="pe6" function="TC0_ALT" group="OC0C" field="TC0C"/>
-                <signal pad-id="pe7" function="TC0_ALT" group="OC0D" field="TC0D"/>
+                <signal pad-key="pe0" function="TC0" group="OC0A" field="TC0A"/>
+                <signal pad-key="pe1" function="TC0" group="OC0B" field="TC0B"/>
+                <signal pad-key="pe2" function="TC0" group="OC0C" field="TC0C"/>
+                <signal pad-key="pe3" function="TC0" group="OC0D" field="TC0D"/>
+                <signal pad-key="pe4" function="TC0_ALT" group="OC0A" field="TC0A"/>
+                <signal pad-key="pe5" function="TC0_ALT" group="OC0B" field="TC0B"/>
+                <signal pad-key="pe6" function="TC0_ALT" group="OC0C" field="TC0C"/>
+                <signal pad-key="pe7" function="TC0_ALT" group="OC0D" field="TC0D"/>
             </signals>
         </peripheral>
         <peripheral key="tcc2" name="TCC2" module-key="i6090_tc2">
             <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"/>
-                <signal pad-id="pc2" function="TC2" group="LOC2C"/>
-                <signal pad-id="pc3" function="TC2" group="LOC2D"/>
-                <signal pad-id="pc4" function="TC2" group="HOC2A"/>
-                <signal pad-id="pc5" function="TC2" group="HOC2B"/>
-                <signal pad-id="pc6" function="TC2" group="HOC2C"/>
-                <signal pad-id="pc7" function="TC2" group="HOC2D"/>
+                <signal pad-key="pc0" function="TC2" group="LOC2A"/>
+                <signal pad-key="pc1" function="TC2" group="LOC2B"/>
+                <signal pad-key="pc2" function="TC2" group="LOC2C"/>
+                <signal pad-key="pc3" function="TC2" group="LOC2D"/>
+                <signal pad-key="pc4" function="TC2" group="HOC2A"/>
+                <signal pad-key="pc5" function="TC2" group="HOC2B"/>
+                <signal pad-key="pc6" function="TC2" group="HOC2C"/>
+                <signal pad-key="pc7" function="TC2" group="HOC2D"/>
             </signals>
         </peripheral>
         <peripheral key="tce2" name="TCE2" module-key="i6090_tc2">
             <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"/>
-                <signal pad-id="pe2" function="TC2" group="LOC2C"/>
-                <signal pad-id="pe3" function="TC2" group="LOC2D"/>
-                <signal pad-id="pe4" function="TC2" group="HOC2A"/>
-                <signal pad-id="pe5" function="TC2" group="HOC2B"/>
-                <signal pad-id="pe6" function="TC2" group="HOC2C"/>
-                <signal pad-id="pe7" function="TC2" group="HOC2D"/>
+                <signal pad-key="pe0" function="TC2" group="LOC2A"/>
+                <signal pad-key="pe1" function="TC2" group="LOC2B"/>
+                <signal pad-key="pe2" function="TC2" group="LOC2C"/>
+                <signal pad-key="pe3" function="TC2" group="LOC2D"/>
+                <signal pad-key="pe4" function="TC2" group="HOC2A"/>
+                <signal pad-key="pe5" function="TC2" group="HOC2B"/>
+                <signal pad-key="pe6" function="TC2" group="HOC2C"/>
+                <signal pad-key="pe7" function="TC2" group="HOC2D"/>
             </signals>
         </peripheral>
         <peripheral key="awexc" name="AWEXC" module-key="i6090_awex">
             <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"/>
-                <signal pad-id="pc2" function="AWEX" group="OC0BLS"/>
-                <signal pad-id="pc3" function="AWEX" group="OC0BHS"/>
-                <signal pad-id="pc4" function="AWEX" group="OC0CLS"/>
-                <signal pad-id="pc5" function="AWEX" group="OC0CHS"/>
-                <signal pad-id="pc6" function="AWEX" group="OC0DLS"/>
-                <signal pad-id="pc7" function="AWEX" group="OC0DHS"/>
+                <signal pad-key="pc0" function="AWEX" group="OC0ALS"/>
+                <signal pad-key="pc1" function="AWEX" group="OC0AHS"/>
+                <signal pad-key="pc2" function="AWEX" group="OC0BLS"/>
+                <signal pad-key="pc3" function="AWEX" group="OC0BHS"/>
+                <signal pad-key="pc4" function="AWEX" group="OC0CLS"/>
+                <signal pad-key="pc5" function="AWEX" group="OC0CHS"/>
+                <signal pad-key="pc6" function="AWEX" group="OC0DLS"/>
+                <signal pad-key="pc7" function="AWEX" group="OC0DHS"/>
             </signals>
         </peripheral>
         <peripheral key="hiresc" name="HIRESC" module-key="i6090_hires">
@@ -411,36 +408,36 @@
         <peripheral key="usartc0" name="USARTC0" module-key="i6090_usart">
             <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"/>
-                <signal pad-id="pc3" function="USART" group="TXD" field="USART0"/>
-                <signal pad-id="pc5" function="USART_ALT" group="XCK" field="USART0"/>
-                <signal pad-id="pc6" function="USART_ALT" group="RXD" field="USART0"/>
-                <signal pad-id="pc7" function="USART_ALT" group="TXD" field="USART0"/>
+                <signal pad-key="pc1" function="USART" group="XCK" field="USART0"/>
+                <signal pad-key="pc2" function="USART" group="RXD" field="USART0"/>
+                <signal pad-key="pc3" function="USART" group="TXD" field="USART0"/>
+                <signal pad-key="pc5" function="USART_ALT" group="XCK" field="USART0"/>
+                <signal pad-key="pc6" function="USART_ALT" group="RXD" field="USART0"/>
+                <signal pad-key="pc7" function="USART_ALT" group="TXD" field="USART0"/>
             </signals>
         </peripheral>
         <peripheral key="usarte0" name="USARTE0" module-key="i6090_usart">
             <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"/>
-                <signal pad-id="pe3" function="USART" group="TXD" field="USART0"/>
-                <signal pad-id="pe5" function="USART_ALT" group="XCK" field="USART0"/>
-                <signal pad-id="pe6" function="USART_ALT" group="RXD" field="USART0"/>
-                <signal pad-id="pe7" function="USART_ALT" group="TXD" field="USART0"/>
+                <signal pad-key="pe1" function="USART" group="XCK" field="USART0"/>
+                <signal pad-key="pe2" function="USART" group="RXD" field="USART0"/>
+                <signal pad-key="pe3" function="USART" group="TXD" field="USART0"/>
+                <signal pad-key="pe5" function="USART_ALT" group="XCK" field="USART0"/>
+                <signal pad-key="pe6" function="USART_ALT" group="RXD" field="USART0"/>
+                <signal pad-key="pe7" function="USART_ALT" group="TXD" field="USART0"/>
             </signals>
         </peripheral>
         <peripheral key="spic" name="SPIC" module-key="i6090_spi">
             <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"/>
-                <signal pad-id="pc6" function="SPI" group="MISO" field="SPI"/>
-                <signal pad-id="pc7" function="SPI" group="SCK" field="SPI"/>
-                <signal pad-id="pc4" function="SPI_ALT" group="SS" field="SPI"/>
-                <signal pad-id="pc5" function="SPI_ALT" group="SCK" field="SPI"/>
-                <signal pad-id="pc6" function="SPI_ALT" group="MISO" field="SPI"/>
-                <signal pad-id="pc7" function="SPI_ALT" group="MOSI" field="SPI"/>
+                <signal pad-key="pc4" function="SPI" group="SS" field="SPI"/>
+                <signal pad-key="pc5" function="SPI" group="MOSI" field="SPI"/>
+                <signal pad-key="pc6" function="SPI" group="MISO" field="SPI"/>
+                <signal pad-key="pc7" function="SPI" group="SCK" field="SPI"/>
+                <signal pad-key="pc4" function="SPI_ALT" group="SS" field="SPI"/>
+                <signal pad-key="pc5" function="SPI_ALT" group="SCK" field="SPI"/>
+                <signal pad-key="pc6" function="SPI_ALT" group="MISO" field="SPI"/>
+                <signal pad-key="pc7" function="SPI_ALT" group="MOSI" field="SPI"/>
             </signals>
         </peripheral>
         <peripheral key="ircom" name="IRCOM" module-key="i6090_ircom">
@@ -449,61 +446,61 @@
         <peripheral key="lcd" name="LCD" module-key="i3003">
             <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"/>
-                <signal pad-id="pg2" index="37" function="LCD_SEG" group="SEG"/>
-                <signal pad-id="pg3" index="36" function="LCD_SEG" group="SEG"/>
-                <signal pad-id="pg4" index="35" function="LCD_SEG" group="SEG"/>
-                <signal pad-id="pg5" index="34" function="LCD_SEG" group="SEG"/>
-                <signal pad-id="pg6" index="33" function="LCD_SEG" group="SEG"/>
-                <signal pad-id="pg7" index="32" function="LCD_SEG" group="SEG"/>
-                <signal pad-id="pm0" index="31" function="LCD_SEG" group="SEG"/>
-                <signal pad-id="pm1" index="30" function="LCD_SEG" group="SEG"/>
-                <signal pad-id="pm2" index="29" function="LCD_SEG" group="SEG"/>
-                <signal pad-id="pm3" index="28" function="LCD_SEG" group="SEG"/>
-                <signal pad-id="pm4" index="27" function="LCD_SEG" group="SEG"/>
-                <signal pad-id="pm5" index="26" function="LCD_SEG" group="SEG"/>
-                <signal pad-id="pm6" index="25" function="LCD_SEG" group="SEG"/>
-                <signal pad-id="pm7" index="24" function="LCD_SEG" group="SEG"/>
-                <signal pad-id="seg23" index="23" function="LCD_SEG" group="SEG"/>
-                <signal pad-id="seg22" index="22" function="LCD_SEG" group="SEG"/>
-                <signal pad-id="seg21" index="21" function="LCD_SEG" group="SEG"/>
-                <signal pad-id="seg20" index="20" function="LCD_SEG" group="SEG"/>
-                <signal pad-id="seg19" index="19" function="LCD_SEG" group="SEG"/>
-                <signal pad-id="seg18" index="18" function="LCD_SEG" group="SEG"/>
-                <signal pad-id="seg17" index="17" function="LCD_SEG" group="SEG"/>
-                <signal pad-id="seg16" index="16" function="LCD_SEG" group="SEG"/>
-                <signal pad-id="seg15" index="15" function="LCD_SEG" group="SEG"/>
-                <signal pad-id="seg14" index="14" function="LCD_SEG" group="SEG"/>
-                <signal pad-id="seg13" index="13" function="LCD_SEG" group="SEG"/>
-                <signal pad-id="seg12" index="12" function="LCD_SEG" group="SEG"/>
-                <signal pad-id="seg11" index="11" function="LCD_SEG" group="SEG"/>
-                <signal pad-id="seg10" index="10" function="LCD_SEG" group="SEG"/>
-                <signal pad-id="seg9" index="9" function="LCD_SEG" group="SEG"/>
-                <signal pad-id="seg8" index="8" function="LCD_SEG" group="SEG"/>
-                <signal pad-id="seg7" index="7" function="LCD_SEG" group="SEG"/>
-                <signal pad-id="seg6" index="6" function="LCD_SEG" group="SEG"/>
-                <signal pad-id="seg5" index="5" function="LCD_SEG" group="SEG"/>
-                <signal pad-id="seg4" index="4" function="LCD_SEG" group="SEG"/>
-                <signal pad-id="seg3" index="3" function="LCD_SEG" group="SEG"/>
-                <signal pad-id="seg2" index="2" function="LCD_SEG" group="SEG"/>
-                <signal pad-id="seg1" index="1" function="LCD_SEG" group="SEG"/>
-                <signal pad-id="seg0" index="0" function="LCD_SEG" group="SEG"/>
-                <signal pad-id="seg1" index="1" function="LCD_BLINK" group="BLINK"/>
-                <signal pad-id="seg0" index="0" function="LCD_BLINK" group="BLINK"/>
-                <signal pad-id="bias1" index="1" function="LCD_BIAS" group="BIAS"/>
-                <signal pad-id="bias2" index="2" function="LCD_BIAS" group="BIAS"/>
-                <signal pad-id="vlcd" function="LCD_BIAS" group="VLCD"/>
-                <signal pad-id="capl" function="LCD_BIAS" group="CAPL"/>
-                <signal pad-id="caph" function="LCD_BIAS" group="CAPH"/>
-                <signal pad-id="com0" index="0" function="LCD_COM" group="COM"/>
-                <signal pad-id="com1" index="1" function="LCD_COM" group="COM"/>
-                <signal pad-id="com2" index="2" function="LCD_COM" group="COM"/>
-                <signal pad-id="com3" index="3" function="LCD_COM" group="COM"/>
-                <signal pad-id="com3" index="0" function="LCD_COM_SWP" group="COM"/>
-                <signal pad-id="com2" index="1" function="LCD_COM_SWP" group="COM"/>
-                <signal pad-id="com1" index="2" function="LCD_COM_SWP" group="COM"/>
-                <signal pad-id="com0" index="3" function="LCD_COM_SWP" group="COM"/>
+                <signal pad-key="pg0" index="39" function="LCD_SEG" group="SEG"/>
+                <signal pad-key="pg1" index="38" function="LCD_SEG" group="SEG"/>
+                <signal pad-key="pg2" index="37" function="LCD_SEG" group="SEG"/>
+                <signal pad-key="pg3" index="36" function="LCD_SEG" group="SEG"/>
+                <signal pad-key="pg4" index="35" function="LCD_SEG" group="SEG"/>
+                <signal pad-key="pg5" index="34" function="LCD_SEG" group="SEG"/>
+                <signal pad-key="pg6" index="33" function="LCD_SEG" group="SEG"/>
+                <signal pad-key="pg7" index="32" function="LCD_SEG" group="SEG"/>
+                <signal pad-key="pm0" index="31" function="LCD_SEG" group="SEG"/>
+                <signal pad-key="pm1" index="30" function="LCD_SEG" group="SEG"/>
+                <signal pad-key="pm2" index="29" function="LCD_SEG" group="SEG"/>
+                <signal pad-key="pm3" index="28" function="LCD_SEG" group="SEG"/>
+                <signal pad-key="pm4" index="27" function="LCD_SEG" group="SEG"/>
+                <signal pad-key="pm5" index="26" function="LCD_SEG" group="SEG"/>
+                <signal pad-key="pm6" index="25" function="LCD_SEG" group="SEG"/>
+                <signal pad-key="pm7" index="24" function="LCD_SEG" group="SEG"/>
+                <signal pad-key="seg23" index="23" function="LCD_SEG" group="SEG"/>
+                <signal pad-key="seg22" index="22" function="LCD_SEG" group="SEG"/>
+                <signal pad-key="seg21" index="21" function="LCD_SEG" group="SEG"/>
+                <signal pad-key="seg20" index="20" function="LCD_SEG" group="SEG"/>
+                <signal pad-key="seg19" index="19" function="LCD_SEG" group="SEG"/>
+                <signal pad-key="seg18" index="18" function="LCD_SEG" group="SEG"/>
+                <signal pad-key="seg17" index="17" function="LCD_SEG" group="SEG"/>
+                <signal pad-key="seg16" index="16" function="LCD_SEG" group="SEG"/>
+                <signal pad-key="seg15" index="15" function="LCD_SEG" group="SEG"/>
+                <signal pad-key="seg14" index="14" function="LCD_SEG" group="SEG"/>
+                <signal pad-key="seg13" index="13" function="LCD_SEG" group="SEG"/>
+                <signal pad-key="seg12" index="12" function="LCD_SEG" group="SEG"/>
+                <signal pad-key="seg11" index="11" function="LCD_SEG" group="SEG"/>
+                <signal pad-key="seg10" index="10" function="LCD_SEG" group="SEG"/>
+                <signal pad-key="seg9" index="9" function="LCD_SEG" group="SEG"/>
+                <signal pad-key="seg8" index="8" function="LCD_SEG" group="SEG"/>
+                <signal pad-key="seg7" index="7" function="LCD_SEG" group="SEG"/>
+                <signal pad-key="seg6" index="6" function="LCD_SEG" group="SEG"/>
+                <signal pad-key="seg5" index="5" function="LCD_SEG" group="SEG"/>
+                <signal pad-key="seg4" index="4" function="LCD_SEG" group="SEG"/>
+                <signal pad-key="seg3" index="3" function="LCD_SEG" group="SEG"/>
+                <signal pad-key="seg2" index="2" function="LCD_SEG" group="SEG"/>
+                <signal pad-key="seg1" index="1" function="LCD_SEG" group="SEG"/>
+                <signal pad-key="seg0" index="0" function="LCD_SEG" group="SEG"/>
+                <signal pad-key="seg1" index="1" function="LCD_BLINK" group="BLINK"/>
+                <signal pad-key="seg0" index="0" function="LCD_BLINK" group="BLINK"/>
+                <signal pad-key="bias1" index="1" function="LCD_BIAS" group="BIAS"/>
+                <signal pad-key="bias2" index="2" function="LCD_BIAS" group="BIAS"/>
+                <signal pad-key="vlcd" function="LCD_BIAS" group="VLCD"/>
+                <signal pad-key="capl" function="LCD_BIAS" group="CAPL"/>
+                <signal pad-key="caph" function="LCD_BIAS" group="CAPH"/>
+                <signal pad-key="com0" index="0" function="LCD_COM" group="COM"/>
+                <signal pad-key="com1" index="1" function="LCD_COM" group="COM"/>
+                <signal pad-key="com2" index="2" function="LCD_COM" group="COM"/>
+                <signal pad-key="com3" index="3" function="LCD_COM" group="COM"/>
+                <signal pad-key="com3" index="0" function="LCD_COM_SWP" group="COM"/>
+                <signal pad-key="com2" index="1" function="LCD_COM_SWP" group="COM"/>
+                <signal pad-key="com1" index="2" function="LCD_COM_SWP" group="COM"/>
+                <signal pad-key="com0" index="3" function="LCD_COM_SWP" group="COM"/>
             </signals>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="i6570_fuse">
@@ -1799,215 +1796,309 @@
             </register-group>
         </module>
     </modules>
+    <pads>
+        <pad key="gnd" name="GND"/>
+        <pad key="pc0" name="PC0"/>
+        <pad key="pc1" name="PC1"/>
+        <pad key="pc2" name="PC2"/>
+        <pad key="pc3" name="PC3"/>
+        <pad key="pc4" name="PC4"/>
+        <pad key="pc5" name="PC5"/>
+        <pad key="pc6" name="PC6"/>
+        <pad key="pc7" name="PC7"/>
+        <pad key="vcc" name="VCC"/>
+        <pad key="pd0" name="PD0"/>
+        <pad key="pd1" name="PD1"/>
+        <pad key="pd2" name="PD2"/>
+        <pad key="reset" name="RESET"/>
+        <pad key="pdi" name="PDI"/>
+        <pad key="pe0" name="PE0"/>
+        <pad key="pe1" name="PE1"/>
+        <pad key="pe2" name="PE2"/>
+        <pad key="pe3" name="PE3"/>
+        <pad key="pe4" name="PE4"/>
+        <pad key="pe5" name="PE5"/>
+        <pad key="pe6" name="PE6"/>
+        <pad key="pe7" name="PE7"/>
+        <pad key="pg0" name="PG0"/>
+        <pad key="pg1" name="PG1"/>
+        <pad key="pg2" name="PG2"/>
+        <pad key="pg3" name="PG3"/>
+        <pad key="pg4" name="PG4"/>
+        <pad key="pg5" name="PG5"/>
+        <pad key="pg6" name="PG6"/>
+        <pad key="pg7" name="PG7"/>
+        <pad key="pm0" name="PM0"/>
+        <pad key="pm1" name="PM1"/>
+        <pad key="pm2" name="PM2"/>
+        <pad key="pm3" name="PM3"/>
+        <pad key="pm4" name="PM4"/>
+        <pad key="pm5" name="PM5"/>
+        <pad key="pm6" name="PM6"/>
+        <pad key="pm7" name="PM7"/>
+        <pad key="seg23" name="SEG23"/>
+        <pad key="seg22" name="SEG22"/>
+        <pad key="seg21" name="SEG21"/>
+        <pad key="seg20" name="SEG20"/>
+        <pad key="seg19" name="SEG19"/>
+        <pad key="seg18" name="SEG18"/>
+        <pad key="seg17" name="SEG17"/>
+        <pad key="seg16" name="SEG16"/>
+        <pad key="seg15" name="SEG15"/>
+        <pad key="seg14" name="SEG14"/>
+        <pad key="seg13" name="SEG13"/>
+        <pad key="seg12" name="SEG12"/>
+        <pad key="seg11" name="SEG11"/>
+        <pad key="seg10" name="SEG10"/>
+        <pad key="seg9" name="SEG9"/>
+        <pad key="seg8" name="SEG8"/>
+        <pad key="seg7" name="SEG7"/>
+        <pad key="seg6" name="SEG6"/>
+        <pad key="seg5" name="SEG5"/>
+        <pad key="seg4" name="SEG4"/>
+        <pad key="seg3" name="SEG3"/>
+        <pad key="seg2" name="SEG2"/>
+        <pad key="seg1" name="SEG1"/>
+        <pad key="seg0" name="SEG0"/>
+        <pad key="bias1" name="BIAS1"/>
+        <pad key="bias2" name="BIAS2"/>
+        <pad key="vlcd" name="VLCD"/>
+        <pad key="capl" name="CAPL"/>
+        <pad key="caph" name="CAPH"/>
+        <pad key="com0" name="COM0"/>
+        <pad key="com1" name="COM1"/>
+        <pad key="com2" name="COM2"/>
+        <pad key="com3" name="COM3"/>
+        <pad key="pr0" name="PR0"/>
+        <pad key="pr1" name="PR1"/>
+        <pad key="pa0" name="PA0"/>
+        <pad key="pa1" name="PA1"/>
+        <pad key="pa2" name="PA2"/>
+        <pad key="pa3" name="PA3"/>
+        <pad key="pa4" name="PA4"/>
+        <pad key="pa5" name="PA5"/>
+        <pad key="pa6" name="PA6"/>
+        <pad key="pa7" name="PA7"/>
+        <pad key="agnd" name="AGND"/>
+        <pad key="avcc" name="AVCC"/>
+        <pad key="pb0" name="PB0"/>
+        <pad key="pb1" name="PB1"/>
+        <pad key="pb2" name="PB2"/>
+        <pad key="pb3" name="PB3"/>
+        <pad key="pb4" name="PB4"/>
+        <pad key="pb5" name="PB5"/>
+        <pad key="pb6" name="PB6"/>
+        <pad key="pb7" name="PB7"/>
+    </pads>
     <pinouts>
         <pinout key="qfp_100" name="QFP_100" type="qfp">
-            <pin position="1" pad="GND"/>
-            <pin position="2" pad="PC0"/>
-            <pin position="3" pad="PC1"/>
-            <pin position="4" pad="PC2"/>
-            <pin position="5" pad="PC3"/>
-            <pin position="6" pad="PC4"/>
-            <pin position="7" pad="PC5"/>
-            <pin position="8" pad="PC6"/>
-            <pin position="9" pad="PC7"/>
-            <pin position="10" pad="GND"/>
-            <pin position="11" pad="VCC"/>
-            <pin position="12" pad="PD0"/>
-            <pin position="13" pad="PD1"/>
-            <pin position="14" pad="PD2"/>
-            <pin position="15" pad="RESET"/>
-            <pin position="16" pad="PDI"/>
-            <pin position="17" pad="GND"/>
-            <pin position="18" pad="VCC"/>
-            <pin position="19" pad="PE0"/>
-            <pin position="20" pad="PE1"/>
-            <pin position="21" pad="PE2"/>
-            <pin position="22" pad="PE3"/>
-            <pin position="23" pad="PE4"/>
-            <pin position="24" pad="PE5"/>
-            <pin position="25" pad="PE6"/>
-            <pin position="26" pad="PE7"/>
-            <pin position="27" pad="GND"/>
-            <pin position="28" pad="VCC"/>
-            <pin position="29" pad="PG0"/>
-            <pin position="30" pad="PG1"/>
-            <pin position="31" pad="PG2"/>
-            <pin position="32" pad="PG3"/>
-            <pin position="33" pad="PG4"/>
-            <pin position="34" pad="PG5"/>
-            <pin position="35" pad="PG6"/>
-            <pin position="36" pad="PG7"/>
-            <pin position="37" pad="PM0"/>
-            <pin position="38" pad="PM1"/>
-            <pin position="39" pad="PM2"/>
-            <pin position="40" pad="PM3"/>
-            <pin position="41" pad="PM4"/>
-            <pin position="42" pad="PM5"/>
-            <pin position="43" pad="PM6"/>
-            <pin position="44" pad="PM7"/>
-            <pin position="45" pad="SEG23"/>
-            <pin position="46" pad="SEG22"/>
-            <pin position="47" pad="SEG21"/>
-            <pin position="48" pad="SEG20"/>
-            <pin position="49" pad="SEG19"/>
-            <pin position="50" pad="SEG18"/>
-            <pin position="51" pad="SEG17"/>
-            <pin position="52" pad="SEG16"/>
-            <pin position="53" pad="SEG15"/>
-            <pin position="54" pad="SEG14"/>
-            <pin position="55" pad="SEG13"/>
-            <pin position="56" pad="SEG12"/>
-            <pin position="57" pad="SEG11"/>
-            <pin position="58" pad="SEG10"/>
-            <pin position="59" pad="SEG9"/>
-            <pin position="60" pad="SEG8"/>
-            <pin position="61" pad="SEG7"/>
-            <pin position="62" pad="SEG6"/>
-            <pin position="63" pad="SEG5"/>
-            <pin position="64" pad="SEG4"/>
-            <pin position="65" pad="SEG3"/>
-            <pin position="66" pad="SEG2"/>
-            <pin position="67" pad="SEG1"/>
-            <pin position="68" pad="SEG0"/>
-            <pin position="69" pad="GND"/>
-            <pin position="70" pad="VCC"/>
-            <pin position="71" pad="BIAS1"/>
-            <pin position="72" pad="BIAS2"/>
-            <pin position="73" pad="VLCD"/>
-            <pin position="74" pad="CAPL"/>
-            <pin position="75" pad="CAPH"/>
-            <pin position="76" pad="COM0"/>
-            <pin position="77" pad="COM1"/>
-            <pin position="78" pad="COM2"/>
-            <pin position="79" pad="COM3"/>
-            <pin position="80" pad="PR0"/>
-            <pin position="81" pad="PR1"/>
-            <pin position="82" pad="PA0"/>
-            <pin position="83" pad="PA1"/>
-            <pin position="84" pad="PA2"/>
-            <pin position="85" pad="PA3"/>
-            <pin position="86" pad="PA4"/>
-            <pin position="87" pad="PA5"/>
-            <pin position="88" pad="PA6"/>
-            <pin position="89" pad="PA7"/>
-            <pin position="90" pad="AGND"/>
-            <pin position="91" pad="AVCC"/>
-            <pin position="92" pad="PB0"/>
-            <pin position="93" pad="PB1"/>
-            <pin position="94" pad="PB2"/>
-            <pin position="95" pad="PB3"/>
-            <pin position="96" pad="PB4"/>
-            <pin position="97" pad="PB5"/>
-            <pin position="98" pad="PB6"/>
-            <pin position="99" pad="PB7"/>
-            <pin position="100" pad="GND"/>
+            <pin position="1" pad-key="gnd"/>
+            <pin position="2" pad-key="pc0"/>
+            <pin position="3" pad-key="pc1"/>
+            <pin position="4" pad-key="pc2"/>
+            <pin position="5" pad-key="pc3"/>
+            <pin position="6" pad-key="pc4"/>
+            <pin position="7" pad-key="pc5"/>
+            <pin position="8" pad-key="pc6"/>
+            <pin position="9" pad-key="pc7"/>
+            <pin position="10" pad-key="gnd"/>
+            <pin position="11" pad-key="vcc"/>
+            <pin position="12" pad-key="pd0"/>
+            <pin position="13" pad-key="pd1"/>
+            <pin position="14" pad-key="pd2"/>
+            <pin position="15" pad-key="reset"/>
+            <pin position="16" pad-key="pdi"/>
+            <pin position="17" pad-key="gnd"/>
+            <pin position="18" pad-key="vcc"/>
+            <pin position="19" pad-key="pe0"/>
+            <pin position="20" pad-key="pe1"/>
+            <pin position="21" pad-key="pe2"/>
+            <pin position="22" pad-key="pe3"/>
+            <pin position="23" pad-key="pe4"/>
+            <pin position="24" pad-key="pe5"/>
+            <pin position="25" pad-key="pe6"/>
+            <pin position="26" pad-key="pe7"/>
+            <pin position="27" pad-key="gnd"/>
+            <pin position="28" pad-key="vcc"/>
+            <pin position="29" pad-key="pg0"/>
+            <pin position="30" pad-key="pg1"/>
+            <pin position="31" pad-key="pg2"/>
+            <pin position="32" pad-key="pg3"/>
+            <pin position="33" pad-key="pg4"/>
+            <pin position="34" pad-key="pg5"/>
+            <pin position="35" pad-key="pg6"/>
+            <pin position="36" pad-key="pg7"/>
+            <pin position="37" pad-key="pm0"/>
+            <pin position="38" pad-key="pm1"/>
+            <pin position="39" pad-key="pm2"/>
+            <pin position="40" pad-key="pm3"/>
+            <pin position="41" pad-key="pm4"/>
+            <pin position="42" pad-key="pm5"/>
+            <pin position="43" pad-key="pm6"/>
+            <pin position="44" pad-key="pm7"/>
+            <pin position="45" pad-key="seg23"/>
+            <pin position="46" pad-key="seg22"/>
+            <pin position="47" pad-key="seg21"/>
+            <pin position="48" pad-key="seg20"/>
+            <pin position="49" pad-key="seg19"/>
+            <pin position="50" pad-key="seg18"/>
+            <pin position="51" pad-key="seg17"/>
+            <pin position="52" pad-key="seg16"/>
+            <pin position="53" pad-key="seg15"/>
+            <pin position="54" pad-key="seg14"/>
+            <pin position="55" pad-key="seg13"/>
+            <pin position="56" pad-key="seg12"/>
+            <pin position="57" pad-key="seg11"/>
+            <pin position="58" pad-key="seg10"/>
+            <pin position="59" pad-key="seg9"/>
+            <pin position="60" pad-key="seg8"/>
+            <pin position="61" pad-key="seg7"/>
+            <pin position="62" pad-key="seg6"/>
+            <pin position="63" pad-key="seg5"/>
+            <pin position="64" pad-key="seg4"/>
+            <pin position="65" pad-key="seg3"/>
+            <pin position="66" pad-key="seg2"/>
+            <pin position="67" pad-key="seg1"/>
+            <pin position="68" pad-key="seg0"/>
+            <pin position="69" pad-key="gnd"/>
+            <pin position="70" pad-key="vcc"/>
+            <pin position="71" pad-key="bias1"/>
+            <pin position="72" pad-key="bias2"/>
+            <pin position="73" pad-key="vlcd"/>
+            <pin position="74" pad-key="capl"/>
+            <pin position="75" pad-key="caph"/>
+            <pin position="76" pad-key="com0"/>
+            <pin position="77" pad-key="com1"/>
+            <pin position="78" pad-key="com2"/>
+            <pin position="79" pad-key="com3"/>
+            <pin position="80" pad-key="pr0"/>
+            <pin position="81" pad-key="pr1"/>
+            <pin position="82" pad-key="pa0"/>
+            <pin position="83" pad-key="pa1"/>
+            <pin position="84" pad-key="pa2"/>
+            <pin position="85" pad-key="pa3"/>
+            <pin position="86" pad-key="pa4"/>
+            <pin position="87" pad-key="pa5"/>
+            <pin position="88" pad-key="pa6"/>
+            <pin position="89" pad-key="pa7"/>
+            <pin position="90" pad-key="agnd"/>
+            <pin position="91" pad-key="avcc"/>
+            <pin position="92" pad-key="pb0"/>
+            <pin position="93" pad-key="pb1"/>
+            <pin position="94" pad-key="pb2"/>
+            <pin position="95" pad-key="pb3"/>
+            <pin position="96" pad-key="pb4"/>
+            <pin position="97" pad-key="pb5"/>
+            <pin position="98" pad-key="pb6"/>
+            <pin position="99" pad-key="pb7"/>
+            <pin position="100" pad-key="gnd"/>
         </pinout>
         <pinout key="bga_100" name="BGA_100" type="bga">
-            <pin position="A1" pad="PC0"/>
-            <pin position="A2" pad="VCC"/>
-            <pin position="A3" pad="PB6"/>
-            <pin position="A4" pad="PB2"/>
-            <pin position="A5" pad="AVCC"/>
-            <pin position="A6" pad="PA5"/>
-            <pin position="A7" pad="PA1"/>
-            <pin position="A8" pad="PR1"/>
-            <pin position="A9" pad="COM2"/>
-            <pin position="A10" pad="CAPH"/>
-            <pin position="B1" pad="PC3"/>
-            <pin position="B2" pad="GND"/>
-            <pin position="B3" pad="PB7"/>
-            <pin position="B4" pad="PB4"/>
-            <pin position="B5" pad="AGND"/>
-            <pin position="B6" pad="PA4"/>
-            <pin position="B7" pad="PA0"/>
-            <pin position="B8" pad="PR0"/>
-            <pin position="B9" pad="COM1"/>
-            <pin position="B10" pad="CAPL"/>
-            <pin position="C1" pad="PC5"/>
-            <pin position="C2" pad="PC4"/>
-            <pin position="C3" pad="PC1"/>
-            <pin position="C4" pad="PB5"/>
-            <pin position="C5" pad="PA7"/>
-            <pin position="C6" pad="PA3"/>
-            <pin position="C7" pad="COM3"/>
-            <pin position="C8" pad="COM0"/>
-            <pin position="C9" pad="BIAS2"/>
-            <pin position="C10" pad="BIAS1"/>
-            <pin position="D1" pad="VCC"/>
-            <pin position="D2" pad="GND"/>
-            <pin position="D3" pad="PD0"/>
-            <pin position="D4" pad="PC2"/>
-            <pin position="D5" pad="PB0"/>
-            <pin position="D6" pad="PA6"/>
-            <pin position="D7" pad="SEG0"/>
-            <pin position="D8" pad="VLCD"/>
-            <pin position="D9" pad="GND"/>
-            <pin position="D10" pad="VCC"/>
-            <pin position="E1" pad="PD2"/>
-            <pin position="E2" pad="RESET"/>
-            <pin position="E3" pad="PD1"/>
-            <pin position="E4" pad="PC6"/>
-            <pin position="E5" pad="PB1"/>
-            <pin position="E6" pad="PA2"/>
-            <pin position="E7" pad="SEG1"/>
-            <pin position="E8" pad="SEG4"/>
-            <pin position="E9" pad="SEG3"/>
-            <pin position="E10" pad="SEG2"/>
-            <pin position="F1" pad="VCC"/>
-            <pin position="F2" pad="GND"/>
-            <pin position="F3" pad="PDI"/>
-            <pin position="F4" pad="PC7"/>
-            <pin position="F5" pad="PB3"/>
-            <pin position="F6" pad="PM2"/>
-            <pin position="F7" pad="SEG10"/>
-            <pin position="F8" pad="SEG7"/>
-            <pin position="F9" pad="SEG6"/>
-            <pin position="F10" pad="SEG5"/>
-            <pin position="G1" pad="PE2"/>
-            <pin position="G2" pad="PE1"/>
-            <pin position="G3" pad="PE3"/>
-            <pin position="G4" pad="PE0"/>
-            <pin position="G5" pad="PE4"/>
-            <pin position="G6" pad="SEG23"/>
-            <pin position="G7" pad="SEG15"/>
-            <pin position="G8" pad="SEG13"/>
-            <pin position="G9" pad="SEG9"/>
-            <pin position="G10" pad="SEG8"/>
-            <pin position="H1" pad="PE5"/>
-            <pin position="H2" pad="PE6"/>
-            <pin position="H3" pad="PG1"/>
-            <pin position="H4" pad="PG4"/>
-            <pin position="H5" pad="PG7"/>
-            <pin position="H6" pad="PM5"/>
-            <pin position="H7" pad="SEG21"/>
-            <pin position="H8" pad="SEG18"/>
-            <pin position="H9" pad="SEG12"/>
-            <pin position="H10" pad="SEG11"/>
-            <pin position="J1" pad="PE7"/>
-            <pin position="J2" pad="PG0"/>
-            <pin position="J3" pad="PG3"/>
-            <pin position="J4" pad="PG6"/>
-            <pin position="J5" pad="PM1"/>
-            <pin position="J6" pad="PM4"/>
-            <pin position="J7" pad="PM7"/>
-            <pin position="J8" pad="SEG20"/>
-            <pin position="J9" pad="SEG16"/>
-            <pin position="J10" pad="SEG14"/>
-            <pin position="K1" pad="GND"/>
-            <pin position="K2" pad="VCC"/>
-            <pin position="K3" pad="PG2"/>
-            <pin position="K4" pad="PG5"/>
-            <pin position="K5" pad="PM0"/>
-            <pin position="K6" pad="PM3"/>
-            <pin position="K7" pad="PM6"/>
-            <pin position="K8" pad="SEG22"/>
-            <pin position="K9" pad="SEG19"/>
-            <pin position="K10" pad="SEG17"/>
+            <pin position="A1" pad-key="pc0"/>
+            <pin position="A2" pad-key="vcc"/>
+            <pin position="A3" pad-key="pb6"/>
+            <pin position="A4" pad-key="pb2"/>
+            <pin position="A5" pad-key="avcc"/>
+            <pin position="A6" pad-key="pa5"/>
+            <pin position="A7" pad-key="pa1"/>
+            <pin position="A8" pad-key="pr1"/>
+            <pin position="A9" pad-key="com2"/>
+            <pin position="A10" pad-key="caph"/>
+            <pin position="B1" pad-key="pc3"/>
+            <pin position="B2" pad-key="gnd"/>
+            <pin position="B3" pad-key="pb7"/>
+            <pin position="B4" pad-key="pb4"/>
+            <pin position="B5" pad-key="agnd"/>
+            <pin position="B6" pad-key="pa4"/>
+            <pin position="B7" pad-key="pa0"/>
+            <pin position="B8" pad-key="pr0"/>
+            <pin position="B9" pad-key="com1"/>
+            <pin position="B10" pad-key="capl"/>
+            <pin position="C1" pad-key="pc5"/>
+            <pin position="C2" pad-key="pc4"/>
+            <pin position="C3" pad-key="pc1"/>
+            <pin position="C4" pad-key="pb5"/>
+            <pin position="C5" pad-key="pa7"/>
+            <pin position="C6" pad-key="pa3"/>
+            <pin position="C7" pad-key="com3"/>
+            <pin position="C8" pad-key="com0"/>
+            <pin position="C9" pad-key="bias2"/>
+            <pin position="C10" pad-key="bias1"/>
+            <pin position="D1" pad-key="vcc"/>
+            <pin position="D2" pad-key="gnd"/>
+            <pin position="D3" pad-key="pd0"/>
+            <pin position="D4" pad-key="pc2"/>
+            <pin position="D5" pad-key="pb0"/>
+            <pin position="D6" pad-key="pa6"/>
+            <pin position="D7" pad-key="seg0"/>
+            <pin position="D8" pad-key="vlcd"/>
+            <pin position="D9" pad-key="gnd"/>
+            <pin position="D10" pad-key="vcc"/>
+            <pin position="E1" pad-key="pd2"/>
+            <pin position="E2" pad-key="reset"/>
+            <pin position="E3" pad-key="pd1"/>
+            <pin position="E4" pad-key="pc6"/>
+            <pin position="E5" pad-key="pb1"/>
+            <pin position="E6" pad-key="pa2"/>
+            <pin position="E7" pad-key="seg1"/>
+            <pin position="E8" pad-key="seg4"/>
+            <pin position="E9" pad-key="seg3"/>
+            <pin position="E10" pad-key="seg2"/>
+            <pin position="F1" pad-key="vcc"/>
+            <pin position="F2" pad-key="gnd"/>
+            <pin position="F3" pad-key="pdi"/>
+            <pin position="F4" pad-key="pc7"/>
+            <pin position="F5" pad-key="pb3"/>
+            <pin position="F6" pad-key="pm2"/>
+            <pin position="F7" pad-key="seg10"/>
+            <pin position="F8" pad-key="seg7"/>
+            <pin position="F9" pad-key="seg6"/>
+            <pin position="F10" pad-key="seg5"/>
+            <pin position="G1" pad-key="pe2"/>
+            <pin position="G2" pad-key="pe1"/>
+            <pin position="G3" pad-key="pe3"/>
+            <pin position="G4" pad-key="pe0"/>
+            <pin position="G5" pad-key="pe4"/>
+            <pin position="G6" pad-key="seg23"/>
+            <pin position="G7" pad-key="seg15"/>
+            <pin position="G8" pad-key="seg13"/>
+            <pin position="G9" pad-key="seg9"/>
+            <pin position="G10" pad-key="seg8"/>
+            <pin position="H1" pad-key="pe5"/>
+            <pin position="H2" pad-key="pe6"/>
+            <pin position="H3" pad-key="pg1"/>
+            <pin position="H4" pad-key="pg4"/>
+            <pin position="H5" pad-key="pg7"/>
+            <pin position="H6" pad-key="pm5"/>
+            <pin position="H7" pad-key="seg21"/>
+            <pin position="H8" pad-key="seg18"/>
+            <pin position="H9" pad-key="seg12"/>
+            <pin position="H10" pad-key="seg11"/>
+            <pin position="J1" pad-key="pe7"/>
+            <pin position="J2" pad-key="pg0"/>
+            <pin position="J3" pad-key="pg3"/>
+            <pin position="J4" pad-key="pg6"/>
+            <pin position="J5" pad-key="pm1"/>
+            <pin position="J6" pad-key="pm4"/>
+            <pin position="J7" pad-key="pm7"/>
+            <pin position="J8" pad-key="seg20"/>
+            <pin position="J9" pad-key="seg16"/>
+            <pin position="J10" pad-key="seg14"/>
+            <pin position="K1" pad-key="gnd"/>
+            <pin position="K2" pad-key="vcc"/>
+            <pin position="K3" pad-key="pg2"/>
+            <pin position="K4" pad-key="pg5"/>
+            <pin position="K5" pad-key="pm0"/>
+            <pin position="K6" pad-key="pm3"/>
+            <pin position="K7" pad-key="pm6"/>
+            <pin position="K8" pad-key="seg22"/>
+            <pin position="K9" pad-key="seg19"/>
+            <pin position="K10" pad-key="seg17"/>
         </pinout>
     </pinouts>
     <variants>
-        <variant name="ATxmega128B1-AU" pinout-key="qfp_100" package="TQFP100"/>
-        <variant name="ATxmega128B1-CU" pinout-key="bga_100" package="VFBGA100"/>
-        <variant name="ATxmega128B1-AN" pinout-key="qfp_100" package="TQFP100"/>
+        <variant key="atxmega128b1_au" name="ATxmega128B1-AU" pinout-key="qfp_100"/>
+        <variant key="atxmega128b1_cu" name="ATxmega128B1-CU" pinout-key="bga_100"/>
+        <variant key="atxmega128b1_an" name="ATxmega128B1-AN" pinout-key="qfp_100"/>
     </variants>
 </device>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA128B3.xml b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA128B3.xml
index 60cdff58..501d996c 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA128B3.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA128B3.xml
@@ -85,14 +85,14 @@
         <peripheral key="clk" name="CLK" module-key="i6073">
             <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"/>
-                <signal pad-id="pc2" index="2" function="EXTERNAL_CLOCK" group="EXTCLK"/>
-                <signal pad-id="pc3" index="3" function="EXTERNAL_CLOCK" group="EXTCLK"/>
-                <signal pad-id="pc4" index="4" function="EXTERNAL_CLOCK" group="EXTCLK"/>
-                <signal pad-id="pc5" index="5" function="EXTERNAL_CLOCK" group="EXTCLK"/>
-                <signal pad-id="pc6" index="6" function="EXTERNAL_CLOCK" group="EXTCLK"/>
-                <signal pad-id="pc7" index="7" function="EXTERNAL_CLOCK" group="EXTCLK"/>
+                <signal pad-key="pc0" index="0" function="EXTERNAL_CLOCK" group="EXTCLK"/>
+                <signal pad-key="pc1" index="1" function="EXTERNAL_CLOCK" group="EXTCLK"/>
+                <signal pad-key="pc2" index="2" function="EXTERNAL_CLOCK" group="EXTCLK"/>
+                <signal pad-key="pc3" index="3" function="EXTERNAL_CLOCK" group="EXTCLK"/>
+                <signal pad-key="pc4" index="4" function="EXTERNAL_CLOCK" group="EXTCLK"/>
+                <signal pad-key="pc5" index="5" function="EXTERNAL_CLOCK" group="EXTCLK"/>
+                <signal pad-key="pc6" index="6" function="EXTERNAL_CLOCK" group="EXTCLK"/>
+                <signal pad-key="pc7" index="7" function="EXTERNAL_CLOCK" group="EXTCLK"/>
             </signals>
         </peripheral>
         <peripheral key="sleep" name="SLEEP" module-key="i6081">
@@ -101,10 +101,10 @@
         <peripheral key="osc" name="OSC" module-key="i6079">
             <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"/>
-                <signal pad-id="pr0" function="TOSC" group="TOSC2"/>
-                <signal pad-id="pr1" function="TOSC" group="TOSC1"/>
+                <signal pad-key="pr0" function="XTAL" group="XTAL2"/>
+                <signal pad-key="pr1" function="XTAL" group="XTAL1"/>
+                <signal pad-key="pr0" function="TOSC" group="TOSC2"/>
+                <signal pad-key="pr1" function="TOSC" group="TOSC1"/>
             </signals>
         </peripheral>
         <peripheral key="dfllrc32m" name="DFLLRC32M" module-key="i6055">
@@ -130,11 +130,6 @@
         </peripheral>
         <peripheral key="portcfg" name="PORTCFG" module-key="i6075_portcfg">
             <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"/>
-                <signal pad-id="pd6" function="RTCOUTC" group="RTCOUT" field="RTCOUT"/>
-            </signals>
         </peripheral>
         <peripheral key="aes" name="AES" module-key="i6096">
             <register-group-instance register-group-key="aes" address-space-key="data" offset="0xC0"/>
@@ -154,30 +149,30 @@
         <peripheral key="adcb" name="ADCB" module-key="i6110">
             <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"/>
-                <signal pad-id="pb2" index="2" function="ADC" group="ADC"/>
-                <signal pad-id="pb3" index="3" function="ADC" group="ADC"/>
-                <signal pad-id="pb4" index="4" function="ADC" group="ADC"/>
-                <signal pad-id="pb5" index="5" function="ADC" group="ADC"/>
-                <signal pad-id="pb6" index="6" function="ADC" group="ADC"/>
-                <signal pad-id="pb7" index="7" function="ADC" group="ADC"/>
-                <signal pad-id="pb0" index="0" function="AREF" group="REFB"/>
+                <signal pad-key="pb0" index="0" function="ADC" group="ADC"/>
+                <signal pad-key="pb1" index="1" function="ADC" group="ADC"/>
+                <signal pad-key="pb2" index="2" function="ADC" group="ADC"/>
+                <signal pad-key="pb3" index="3" function="ADC" group="ADC"/>
+                <signal pad-key="pb4" index="4" function="ADC" group="ADC"/>
+                <signal pad-key="pb5" index="5" function="ADC" group="ADC"/>
+                <signal pad-key="pb6" index="6" function="ADC" group="ADC"/>
+                <signal pad-key="pb7" index="7" function="ADC" group="ADC"/>
+                <signal pad-key="pb0" index="0" function="AREF" group="REFB"/>
             </signals>
         </peripheral>
         <peripheral key="acb" name="ACB" module-key="i6077">
             <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"/>
-                <signal pad-id="pb2" index="2" function="AC" group="AC"/>
-                <signal pad-id="pb3" index="3" function="AC" group="AC"/>
-                <signal pad-id="pb4" index="4" function="AC" group="AC"/>
-                <signal pad-id="pb5" index="5" function="AC" group="AC"/>
-                <signal pad-id="pb6" index="6" function="AC" group="AC"/>
-                <signal pad-id="pb7" index="7" function="AC" group="AC"/>
-                <signal pad-id="pb6" index="1" function="ACOUT" group="ACOUT"/>
-                <signal pad-id="pb7" index="0" function="ACOUT" group="ACOUT"/>
+                <signal pad-key="pb0" index="0" function="AC" group="AC"/>
+                <signal pad-key="pb1" index="1" function="AC" group="AC"/>
+                <signal pad-key="pb2" index="2" function="AC" group="AC"/>
+                <signal pad-key="pb3" index="3" function="AC" group="AC"/>
+                <signal pad-key="pb4" index="4" function="AC" group="AC"/>
+                <signal pad-key="pb5" index="5" function="AC" group="AC"/>
+                <signal pad-key="pb6" index="6" function="AC" group="AC"/>
+                <signal pad-key="pb7" index="7" function="AC" group="AC"/>
+                <signal pad-key="pb6" index="1" function="ACOUT" group="ACOUT"/>
+                <signal pad-key="pb7" index="0" function="ACOUT" group="ACOUT"/>
             </signals>
         </peripheral>
         <peripheral key="rtc" name="RTC" module-key="i6093">
@@ -186,127 +181,127 @@
         <peripheral key="twic" name="TWIC" module-key="i6089">
             <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"/>
+                <signal pad-key="pc0" function="TWI" group="SDA"/>
+                <signal pad-key="pc1" function="TWI" group="SCL"/>
             </signals>
         </peripheral>
         <peripheral key="usb" name="USB" module-key="i3005">
             <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"/>
+                <signal pad-key="pd0" function="USB" group="DN"/>
+                <signal pad-key="pd1" function="USB" group="DP"/>
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pb2" index="2" function="PORTB" group="P"/>
-                <signal pad-id="pb3" index="3" function="PORTB" group="P"/>
-                <signal pad-id="pb4" index="4" function="PORTB" group="P"/>
-                <signal pad-id="pb5" index="5" function="PORTB" group="P"/>
-                <signal pad-id="pb6" index="6" function="PORTB" group="P"/>
-                <signal pad-id="pb7" index="7" function="PORTB" group="P"/>
+                <signal pad-key="pb0" index="0" function="PORTB" group="P"/>
+                <signal pad-key="pb1" index="1" function="PORTB" group="P"/>
+                <signal pad-key="pb2" index="2" function="PORTB" group="P"/>
+                <signal pad-key="pb3" index="3" function="PORTB" group="P"/>
+                <signal pad-key="pb4" index="4" function="PORTB" group="P"/>
+                <signal pad-key="pb5" index="5" function="PORTB" group="P"/>
+                <signal pad-key="pb6" index="6" function="PORTB" group="P"/>
+                <signal pad-key="pb7" index="7" function="PORTB" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pc2" index="2" function="PORTC" group="P"/>
-                <signal pad-id="pc3" index="3" function="PORTC" group="P"/>
-                <signal pad-id="pc4" index="4" function="PORTC" group="P"/>
-                <signal pad-id="pc5" index="5" function="PORTC" group="P"/>
-                <signal pad-id="pc6" index="6" function="PORTC" group="P"/>
-                <signal pad-id="pc7" index="7" function="PORTC" group="P"/>
+                <signal pad-key="pc0" index="0" function="PORTC" group="P"/>
+                <signal pad-key="pc1" index="1" function="PORTC" group="P"/>
+                <signal pad-key="pc2" index="2" function="PORTC" group="P"/>
+                <signal pad-key="pc3" index="3" function="PORTC" group="P"/>
+                <signal pad-key="pc4" index="4" function="PORTC" group="P"/>
+                <signal pad-key="pc5" index="5" function="PORTC" group="P"/>
+                <signal pad-key="pc6" index="6" function="PORTC" group="P"/>
+                <signal pad-key="pc7" index="7" function="PORTC" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
             <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"/>
+                <signal pad-key="pd0" index="0" function="PORTD" group="P"/>
+                <signal pad-key="pd1" index="1" function="PORTD" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portg" name="PORTG" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pg2" index="2" function="PORTG" group="P"/>
-                <signal pad-id="pg3" index="3" function="PORTG" group="P"/>
-                <signal pad-id="pg4" index="4" function="PORTG" group="P"/>
-                <signal pad-id="pg5" index="5" function="PORTG" group="P"/>
-                <signal pad-id="pg6" index="6" function="PORTG" group="P"/>
-                <signal pad-id="pg7" index="7" function="PORTG" group="P"/>
+                <signal pad-key="pg0" index="0" function="PORTG" group="P"/>
+                <signal pad-key="pg1" index="1" function="PORTG" group="P"/>
+                <signal pad-key="pg2" index="2" function="PORTG" group="P"/>
+                <signal pad-key="pg3" index="3" function="PORTG" group="P"/>
+                <signal pad-key="pg4" index="4" function="PORTG" group="P"/>
+                <signal pad-key="pg5" index="5" function="PORTG" group="P"/>
+                <signal pad-key="pg6" index="6" function="PORTG" group="P"/>
+                <signal pad-key="pg7" index="7" function="PORTG" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portm" name="PORTM" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pm2" index="2" function="PORTM" group="P"/>
-                <signal pad-id="pm3" index="3" function="PORTM" group="P"/>
-                <signal pad-id="pm4" index="4" function="PORTM" group="P"/>
-                <signal pad-id="pm5" index="5" function="PORTM" group="P"/>
-                <signal pad-id="pm6" index="6" function="PORTM" group="P"/>
-                <signal pad-id="pm7" index="7" function="PORTM" group="P"/>
+                <signal pad-key="pm0" index="0" function="PORTM" group="P"/>
+                <signal pad-key="pm1" index="1" function="PORTM" group="P"/>
+                <signal pad-key="pm2" index="2" function="PORTM" group="P"/>
+                <signal pad-key="pm3" index="3" function="PORTM" group="P"/>
+                <signal pad-key="pm4" index="4" function="PORTM" group="P"/>
+                <signal pad-key="pm5" index="5" function="PORTM" group="P"/>
+                <signal pad-key="pm6" index="6" function="PORTM" group="P"/>
+                <signal pad-key="pm7" index="7" function="PORTM" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portr" name="PORTR" module-key="gpio_port">
             <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"/>
+                <signal pad-key="pr0" index="0" function="PORTR" group="P"/>
+                <signal pad-key="pr1" index="1" function="PORTR" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="tcc0" name="TCC0" module-key="i6090_tc">
             <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"/>
-                <signal pad-id="pc2" function="TC0" group="OC0C" field="TC0C"/>
-                <signal pad-id="pc3" function="TC0" group="OC0D" field="TC0D"/>
-                <signal pad-id="pc4" function="TC0_ALT" group="OC0A" field="TC0A"/>
-                <signal pad-id="pc5" function="TC0_ALT" group="OC0B" field="TC0B"/>
-                <signal pad-id="pc6" function="TC0_ALT" group="OC0C" field="TC0C"/>
-                <signal pad-id="pc7" function="TC0_ALT" group="OC0D" field="TC0D"/>
+                <signal pad-key="pc0" function="TC0" group="OC0A" field="TC0A"/>
+                <signal pad-key="pc1" function="TC0" group="OC0B" field="TC0B"/>
+                <signal pad-key="pc2" function="TC0" group="OC0C" field="TC0C"/>
+                <signal pad-key="pc3" function="TC0" group="OC0D" field="TC0D"/>
+                <signal pad-key="pc4" function="TC0_ALT" group="OC0A" field="TC0A"/>
+                <signal pad-key="pc5" function="TC0_ALT" group="OC0B" field="TC0B"/>
+                <signal pad-key="pc6" function="TC0_ALT" group="OC0C" field="TC0C"/>
+                <signal pad-key="pc7" function="TC0_ALT" group="OC0D" field="TC0D"/>
             </signals>
         </peripheral>
         <peripheral key="tcc1" name="TCC1" module-key="i6090_tc">
             <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"/>
+                <signal pad-key="pc4" function="TC1" group="OC1A"/>
+                <signal pad-key="pc5" function="TC1" group="OC1B"/>
             </signals>
         </peripheral>
         <peripheral key="tcc2" name="TCC2" module-key="i6090_tc2">
             <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"/>
-                <signal pad-id="pc2" function="TC2" group="LOC2C"/>
-                <signal pad-id="pc3" function="TC2" group="LOC2D"/>
-                <signal pad-id="pc4" function="TC2" group="HOC2A"/>
-                <signal pad-id="pc5" function="TC2" group="HOC2B"/>
-                <signal pad-id="pc6" function="TC2" group="HOC2C"/>
-                <signal pad-id="pc7" function="TC2" group="HOC2D"/>
+                <signal pad-key="pc0" function="TC2" group="LOC2A"/>
+                <signal pad-key="pc1" function="TC2" group="LOC2B"/>
+                <signal pad-key="pc2" function="TC2" group="LOC2C"/>
+                <signal pad-key="pc3" function="TC2" group="LOC2D"/>
+                <signal pad-key="pc4" function="TC2" group="HOC2A"/>
+                <signal pad-key="pc5" function="TC2" group="HOC2B"/>
+                <signal pad-key="pc6" function="TC2" group="HOC2C"/>
+                <signal pad-key="pc7" function="TC2" group="HOC2D"/>
             </signals>
         </peripheral>
         <peripheral key="awexc" name="AWEXC" module-key="i6090_awex">
             <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"/>
-                <signal pad-id="pc2" function="AWEX" group="OC0BLS"/>
-                <signal pad-id="pc3" function="AWEX" group="OC0BHS"/>
-                <signal pad-id="pc4" function="AWEX" group="OC0CLS"/>
-                <signal pad-id="pc5" function="AWEX" group="OC0CHS"/>
-                <signal pad-id="pc6" function="AWEX" group="OC0DLS"/>
-                <signal pad-id="pc7" function="AWEX" group="OC0DHS"/>
+                <signal pad-key="pc0" function="AWEX" group="OC0ALS"/>
+                <signal pad-key="pc1" function="AWEX" group="OC0AHS"/>
+                <signal pad-key="pc2" function="AWEX" group="OC0BLS"/>
+                <signal pad-key="pc3" function="AWEX" group="OC0BHS"/>
+                <signal pad-key="pc4" function="AWEX" group="OC0CLS"/>
+                <signal pad-key="pc5" function="AWEX" group="OC0CHS"/>
+                <signal pad-key="pc6" function="AWEX" group="OC0DLS"/>
+                <signal pad-key="pc7" function="AWEX" group="OC0DHS"/>
             </signals>
         </peripheral>
         <peripheral key="hiresc" name="HIRESC" module-key="i6090_hires">
@@ -315,25 +310,25 @@
         <peripheral key="usartc0" name="USARTC0" module-key="i6090_usart">
             <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"/>
-                <signal pad-id="pc3" function="USART" group="TXD" field="USART0"/>
-                <signal pad-id="pc5" function="USART_ALT" group="XCK" field="USART0"/>
-                <signal pad-id="pc6" function="USART_ALT" group="RXD" field="USART0"/>
-                <signal pad-id="pc7" function="USART_ALT" group="TXD" field="USART0"/>
+                <signal pad-key="pc1" function="USART" group="XCK" field="USART0"/>
+                <signal pad-key="pc2" function="USART" group="RXD" field="USART0"/>
+                <signal pad-key="pc3" function="USART" group="TXD" field="USART0"/>
+                <signal pad-key="pc5" function="USART_ALT" group="XCK" field="USART0"/>
+                <signal pad-key="pc6" function="USART_ALT" group="RXD" field="USART0"/>
+                <signal pad-key="pc7" function="USART_ALT" group="TXD" field="USART0"/>
             </signals>
         </peripheral>
         <peripheral key="spic" name="SPIC" module-key="i6090_spi">
             <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"/>
-                <signal pad-id="pc6" function="SPI" group="MISO" field="SPI"/>
-                <signal pad-id="pc7" function="SPI" group="SCK" field="SPI"/>
-                <signal pad-id="pc4" function="SPI_ALT" group="SS" field="SPI"/>
-                <signal pad-id="pc5" function="SPI_ALT" group="SCK" field="SPI"/>
-                <signal pad-id="pc6" function="SPI_ALT" group="MISO" field="SPI"/>
-                <signal pad-id="pc7" function="SPI_ALT" group="MOSI" field="SPI"/>
+                <signal pad-key="pc4" function="SPI" group="SS" field="SPI"/>
+                <signal pad-key="pc5" function="SPI" group="MOSI" field="SPI"/>
+                <signal pad-key="pc6" function="SPI" group="MISO" field="SPI"/>
+                <signal pad-key="pc7" function="SPI" group="SCK" field="SPI"/>
+                <signal pad-key="pc4" function="SPI_ALT" group="SS" field="SPI"/>
+                <signal pad-key="pc5" function="SPI_ALT" group="SCK" field="SPI"/>
+                <signal pad-key="pc6" function="SPI_ALT" group="MISO" field="SPI"/>
+                <signal pad-key="pc7" function="SPI_ALT" group="MOSI" field="SPI"/>
             </signals>
         </peripheral>
         <peripheral key="ircom" name="IRCOM" module-key="i6090_ircom">
@@ -342,46 +337,46 @@
         <peripheral key="lcd" name="LCD" module-key="i3003">
             <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"/>
-                <signal pad-id="pg2" index="22" function="LCD_SEG" group="SEG"/>
-                <signal pad-id="pg3" index="21" function="LCD_SEG" group="SEG"/>
-                <signal pad-id="pg4" index="20" function="LCD_SEG" group="SEG"/>
-                <signal pad-id="pg5" index="19" function="LCD_SEG" group="SEG"/>
-                <signal pad-id="pg6" index="18" function="LCD_SEG" group="SEG"/>
-                <signal pad-id="pg7" index="17" function="LCD_SEG" group="SEG"/>
-                <signal pad-id="pm0" index="16" function="LCD_SEG" group="SEG"/>
-                <signal pad-id="pm1" index="15" function="LCD_SEG" group="SEG"/>
-                <signal pad-id="pm2" index="14" function="LCD_SEG" group="SEG"/>
-                <signal pad-id="pm3" index="13" function="LCD_SEG" group="SEG"/>
-                <signal pad-id="pm4" index="12" function="LCD_SEG" group="SEG"/>
-                <signal pad-id="pm5" index="11" function="LCD_SEG" group="SEG"/>
-                <signal pad-id="pm6" index="10" function="LCD_SEG" group="SEG"/>
-                <signal pad-id="pm7" index="9" function="LCD_SEG" group="SEG"/>
-                <signal pad-id="seg8" index="8" function="LCD_SEG" group="SEG"/>
-                <signal pad-id="seg7" index="7" function="LCD_SEG" group="SEG"/>
-                <signal pad-id="seg6" index="6" function="LCD_SEG" group="SEG"/>
-                <signal pad-id="seg5" index="5" function="LCD_SEG" group="SEG"/>
-                <signal pad-id="seg4" index="4" function="LCD_SEG" group="SEG"/>
-                <signal pad-id="seg3" index="3" function="LCD_SEG" group="SEG"/>
-                <signal pad-id="seg2" index="2" function="LCD_SEG" group="SEG"/>
-                <signal pad-id="seg1" index="1" function="LCD_SEG" group="SEG"/>
-                <signal pad-id="seg0" index="0" function="LCD_SEG" group="SEG"/>
-                <signal pad-id="seg1" index="1" function="LCD_BLINK" group="BLINK"/>
-                <signal pad-id="seg0" index="0" function="LCD_BLINK" group="BLINK"/>
-                <signal pad-id="bias1" index="1" function="LCD_BIAS" group="BIAS"/>
-                <signal pad-id="bias2" index="2" function="LCD_BIAS" group="BIAS"/>
-                <signal pad-id="vlcd" function="LCD_BIAS" group="VLCD"/>
-                <signal pad-id="capl" function="LCD_BIAS" group="CAPL"/>
-                <signal pad-id="caph" function="LCD_BIAS" group="CAPH"/>
-                <signal pad-id="com0" index="0" function="LCD_COM" group="COM"/>
-                <signal pad-id="com1" index="1" function="LCD_COM" group="COM"/>
-                <signal pad-id="com2" index="2" function="LCD_COM" group="COM"/>
-                <signal pad-id="com3" index="3" function="LCD_COM" group="COM"/>
-                <signal pad-id="com3" index="0" function="LCD_COM_SWP" group="COM"/>
-                <signal pad-id="com2" index="1" function="LCD_COM_SWP" group="COM"/>
-                <signal pad-id="com1" index="2" function="LCD_COM_SWP" group="COM"/>
-                <signal pad-id="com0" index="3" function="LCD_COM_SWP" group="COM"/>
+                <signal pad-key="pg0" index="24" function="LCD_SEG" group="SEG"/>
+                <signal pad-key="pg1" index="23" function="LCD_SEG" group="SEG"/>
+                <signal pad-key="pg2" index="22" function="LCD_SEG" group="SEG"/>
+                <signal pad-key="pg3" index="21" function="LCD_SEG" group="SEG"/>
+                <signal pad-key="pg4" index="20" function="LCD_SEG" group="SEG"/>
+                <signal pad-key="pg5" index="19" function="LCD_SEG" group="SEG"/>
+                <signal pad-key="pg6" index="18" function="LCD_SEG" group="SEG"/>
+                <signal pad-key="pg7" index="17" function="LCD_SEG" group="SEG"/>
+                <signal pad-key="pm0" index="16" function="LCD_SEG" group="SEG"/>
+                <signal pad-key="pm1" index="15" function="LCD_SEG" group="SEG"/>
+                <signal pad-key="pm2" index="14" function="LCD_SEG" group="SEG"/>
+                <signal pad-key="pm3" index="13" function="LCD_SEG" group="SEG"/>
+                <signal pad-key="pm4" index="12" function="LCD_SEG" group="SEG"/>
+                <signal pad-key="pm5" index="11" function="LCD_SEG" group="SEG"/>
+                <signal pad-key="pm6" index="10" function="LCD_SEG" group="SEG"/>
+                <signal pad-key="pm7" index="9" function="LCD_SEG" group="SEG"/>
+                <signal pad-key="seg8" index="8" function="LCD_SEG" group="SEG"/>
+                <signal pad-key="seg7" index="7" function="LCD_SEG" group="SEG"/>
+                <signal pad-key="seg6" index="6" function="LCD_SEG" group="SEG"/>
+                <signal pad-key="seg5" index="5" function="LCD_SEG" group="SEG"/>
+                <signal pad-key="seg4" index="4" function="LCD_SEG" group="SEG"/>
+                <signal pad-key="seg3" index="3" function="LCD_SEG" group="SEG"/>
+                <signal pad-key="seg2" index="2" function="LCD_SEG" group="SEG"/>
+                <signal pad-key="seg1" index="1" function="LCD_SEG" group="SEG"/>
+                <signal pad-key="seg0" index="0" function="LCD_SEG" group="SEG"/>
+                <signal pad-key="seg1" index="1" function="LCD_BLINK" group="BLINK"/>
+                <signal pad-key="seg0" index="0" function="LCD_BLINK" group="BLINK"/>
+                <signal pad-key="bias1" index="1" function="LCD_BIAS" group="BIAS"/>
+                <signal pad-key="bias2" index="2" function="LCD_BIAS" group="BIAS"/>
+                <signal pad-key="vlcd" function="LCD_BIAS" group="VLCD"/>
+                <signal pad-key="capl" function="LCD_BIAS" group="CAPL"/>
+                <signal pad-key="caph" function="LCD_BIAS" group="CAPH"/>
+                <signal pad-key="com0" index="0" function="LCD_COM" group="COM"/>
+                <signal pad-key="com1" index="1" function="LCD_COM" group="COM"/>
+                <signal pad-key="com2" index="2" function="LCD_COM" group="COM"/>
+                <signal pad-key="com3" index="3" function="LCD_COM" group="COM"/>
+                <signal pad-key="com3" index="0" function="LCD_COM_SWP" group="COM"/>
+                <signal pad-key="com2" index="1" function="LCD_COM_SWP" group="COM"/>
+                <signal pad-key="com1" index="2" function="LCD_COM_SWP" group="COM"/>
+                <signal pad-key="com0" index="3" function="LCD_COM_SWP" group="COM"/>
             </signals>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="i6570_fuse">
@@ -1677,143 +1672,205 @@
             </register-group>
         </module>
     </modules>
+    <pads>
+        <pad key="pc0" name="PC0"/>
+        <pad key="pc1" name="PC1"/>
+        <pad key="pc2" name="PC2"/>
+        <pad key="pc3" name="PC3"/>
+        <pad key="pc4" name="PC4"/>
+        <pad key="pc5" name="PC5"/>
+        <pad key="pc6" name="PC6"/>
+        <pad key="pc7" name="PC7"/>
+        <pad key="gnd" name="GND"/>
+        <pad key="vcc" name="VCC"/>
+        <pad key="pd0" name="PD0"/>
+        <pad key="pd1" name="PD1"/>
+        <pad key="reset" name="RESET"/>
+        <pad key="pdi" name="PDI"/>
+        <pad key="pg0" name="PG0"/>
+        <pad key="pg1" name="PG1"/>
+        <pad key="pg2" name="PG2"/>
+        <pad key="pg3" name="PG3"/>
+        <pad key="pg4" name="PG4"/>
+        <pad key="pg5" name="PG5"/>
+        <pad key="pg6" name="PG6"/>
+        <pad key="pg7" name="PG7"/>
+        <pad key="pm0" name="PM0"/>
+        <pad key="pm1" name="PM1"/>
+        <pad key="pm2" name="PM2"/>
+        <pad key="pm3" name="PM3"/>
+        <pad key="pm4" name="PM4"/>
+        <pad key="pm5" name="PM5"/>
+        <pad key="pm6" name="PM6"/>
+        <pad key="pm7" name="PM7"/>
+        <pad key="seg8" name="SEG8"/>
+        <pad key="seg7" name="SEG7"/>
+        <pad key="seg6" name="SEG6"/>
+        <pad key="seg5" name="SEG5"/>
+        <pad key="seg4" name="SEG4"/>
+        <pad key="seg3" name="SEG3"/>
+        <pad key="seg2" name="SEG2"/>
+        <pad key="seg1" name="SEG1"/>
+        <pad key="seg0" name="SEG0"/>
+        <pad key="bias1" name="BIAS1"/>
+        <pad key="bias2" name="BIAS2"/>
+        <pad key="vlcd" name="VLCD"/>
+        <pad key="capl" name="CAPL"/>
+        <pad key="caph" name="CAPH"/>
+        <pad key="com0" name="COM0"/>
+        <pad key="com1" name="COM1"/>
+        <pad key="com2" name="COM2"/>
+        <pad key="com3" name="COM3"/>
+        <pad key="pr0" name="PR0"/>
+        <pad key="pr1" name="PR1"/>
+        <pad key="agnd" name="AGND"/>
+        <pad key="avcc" name="AVCC"/>
+        <pad key="pb0" name="PB0"/>
+        <pad key="pb1" name="PB1"/>
+        <pad key="pb2" name="PB2"/>
+        <pad key="pb3" name="PB3"/>
+        <pad key="pb4" name="PB4"/>
+        <pad key="pb5" name="PB5"/>
+        <pad key="pb6" name="PB6"/>
+        <pad key="pb7" name="PB7"/>
+    </pads>
     <pinouts>
         <pinout key="qfp_qfn_64" name="QFP_QFN_64" type="qfn">
-            <pin position="1" pad="PC0"/>
-            <pin position="2" pad="PC1"/>
-            <pin position="3" pad="PC2"/>
-            <pin position="4" pad="PC3"/>
-            <pin position="5" pad="PC4"/>
-            <pin position="6" pad="PC5"/>
-            <pin position="7" pad="PC6"/>
-            <pin position="8" pad="PC7"/>
-            <pin position="9" pad="GND"/>
-            <pin position="10" pad="VCC"/>
-            <pin position="11" pad="PD0"/>
-            <pin position="12" pad="PD1"/>
-            <pin position="13" pad="RESET"/>
-            <pin position="14" pad="PDI"/>
-            <pin position="15" pad="GND"/>
-            <pin position="16" pad="VCC"/>
-            <pin position="17" pad="PG0"/>
-            <pin position="18" pad="PG1"/>
-            <pin position="19" pad="PG2"/>
-            <pin position="20" pad="PG3"/>
-            <pin position="21" pad="PG4"/>
-            <pin position="22" pad="PG5"/>
-            <pin position="23" pad="PG6"/>
-            <pin position="24" pad="PG7"/>
-            <pin position="25" pad="PM0"/>
-            <pin position="26" pad="PM1"/>
-            <pin position="27" pad="PM2"/>
-            <pin position="28" pad="PM3"/>
-            <pin position="29" pad="PM4"/>
-            <pin position="30" pad="PM5"/>
-            <pin position="31" pad="PM6"/>
-            <pin position="32" pad="PM7"/>
-            <pin position="33" pad="SEG8"/>
-            <pin position="34" pad="SEG7"/>
-            <pin position="35" pad="SEG6"/>
-            <pin position="36" pad="SEG5"/>
-            <pin position="37" pad="SEG4"/>
-            <pin position="38" pad="SEG3"/>
-            <pin position="39" pad="SEG2"/>
-            <pin position="40" pad="SEG1"/>
-            <pin position="41" pad="SEG0"/>
-            <pin position="42" pad="GND"/>
-            <pin position="43" pad="VCC"/>
-            <pin position="44" pad="BIAS1"/>
-            <pin position="45" pad="BIAS2"/>
-            <pin position="46" pad="VLCD"/>
-            <pin position="47" pad="CAPL"/>
-            <pin position="48" pad="CAPH"/>
-            <pin position="49" pad="COM0"/>
-            <pin position="50" pad="COM1"/>
-            <pin position="51" pad="COM2"/>
-            <pin position="52" pad="COM3"/>
-            <pin position="53" pad="PR0"/>
-            <pin position="54" pad="PR1"/>
-            <pin position="55" pad="AGND"/>
-            <pin position="56" pad="AVCC"/>
-            <pin position="57" pad="PB0"/>
-            <pin position="58" pad="PB1"/>
-            <pin position="59" pad="PB2"/>
-            <pin position="60" pad="PB3"/>
-            <pin position="61" pad="PB4"/>
-            <pin position="62" pad="PB5"/>
-            <pin position="63" pad="PB6"/>
-            <pin position="64" pad="PB7"/>
+            <pin position="1" pad-key="pc0"/>
+            <pin position="2" pad-key="pc1"/>
+            <pin position="3" pad-key="pc2"/>
+            <pin position="4" pad-key="pc3"/>
+            <pin position="5" pad-key="pc4"/>
+            <pin position="6" pad-key="pc5"/>
+            <pin position="7" pad-key="pc6"/>
+            <pin position="8" pad-key="pc7"/>
+            <pin position="9" pad-key="gnd"/>
+            <pin position="10" pad-key="vcc"/>
+            <pin position="11" pad-key="pd0"/>
+            <pin position="12" pad-key="pd1"/>
+            <pin position="13" pad-key="reset"/>
+            <pin position="14" pad-key="pdi"/>
+            <pin position="15" pad-key="gnd"/>
+            <pin position="16" pad-key="vcc"/>
+            <pin position="17" pad-key="pg0"/>
+            <pin position="18" pad-key="pg1"/>
+            <pin position="19" pad-key="pg2"/>
+            <pin position="20" pad-key="pg3"/>
+            <pin position="21" pad-key="pg4"/>
+            <pin position="22" pad-key="pg5"/>
+            <pin position="23" pad-key="pg6"/>
+            <pin position="24" pad-key="pg7"/>
+            <pin position="25" pad-key="pm0"/>
+            <pin position="26" pad-key="pm1"/>
+            <pin position="27" pad-key="pm2"/>
+            <pin position="28" pad-key="pm3"/>
+            <pin position="29" pad-key="pm4"/>
+            <pin position="30" pad-key="pm5"/>
+            <pin position="31" pad-key="pm6"/>
+            <pin position="32" pad-key="pm7"/>
+            <pin position="33" pad-key="seg8"/>
+            <pin position="34" pad-key="seg7"/>
+            <pin position="35" pad-key="seg6"/>
+            <pin position="36" pad-key="seg5"/>
+            <pin position="37" pad-key="seg4"/>
+            <pin position="38" pad-key="seg3"/>
+            <pin position="39" pad-key="seg2"/>
+            <pin position="40" pad-key="seg1"/>
+            <pin position="41" pad-key="seg0"/>
+            <pin position="42" pad-key="gnd"/>
+            <pin position="43" pad-key="vcc"/>
+            <pin position="44" pad-key="bias1"/>
+            <pin position="45" pad-key="bias2"/>
+            <pin position="46" pad-key="vlcd"/>
+            <pin position="47" pad-key="capl"/>
+            <pin position="48" pad-key="caph"/>
+            <pin position="49" pad-key="com0"/>
+            <pin position="50" pad-key="com1"/>
+            <pin position="51" pad-key="com2"/>
+            <pin position="52" pad-key="com3"/>
+            <pin position="53" pad-key="pr0"/>
+            <pin position="54" pad-key="pr1"/>
+            <pin position="55" pad-key="agnd"/>
+            <pin position="56" pad-key="avcc"/>
+            <pin position="57" pad-key="pb0"/>
+            <pin position="58" pad-key="pb1"/>
+            <pin position="59" pad-key="pb2"/>
+            <pin position="60" pad-key="pb3"/>
+            <pin position="61" pad-key="pb4"/>
+            <pin position="62" pad-key="pb5"/>
+            <pin position="63" pad-key="pb6"/>
+            <pin position="64" pad-key="pb7"/>
         </pinout>
         <pinout key="drqfn_64" name="DRQFN_64" type="drqfn">
-            <pin position="A1" pad="PC0"/>
-            <pin position="B1" pad="PC1"/>
-            <pin position="A2" pad="PC2"/>
-            <pin position="B2" pad="PC3"/>
-            <pin position="A3" pad="PC4"/>
-            <pin position="B3" pad="PC5"/>
-            <pin position="A4" pad="PC6"/>
-            <pin position="B4" pad="GND"/>
-            <pin position="A5" pad="PC7"/>
-            <pin position="B5" pad="PD0"/>
-            <pin position="A6" pad="VCC"/>
-            <pin position="B6" pad="RESET"/>
-            <pin position="A7" pad="PD1"/>
-            <pin position="B7" pad="PDI"/>
-            <pin position="A8" pad="GND"/>
-            <pin position="A9" pad="PG0"/>
-            <pin position="B8" pad="VCC"/>
-            <pin position="A10" pad="PG2"/>
-            <pin position="B9" pad="PG1"/>
-            <pin position="A11" pad="PG3"/>
-            <pin position="B10" pad="PG4"/>
-            <pin position="A12" pad="PG5"/>
-            <pin position="B11" pad="PG6"/>
-            <pin position="A13" pad="PG7"/>
-            <pin position="B12" pad="PM0"/>
-            <pin position="A14" pad="PM1"/>
-            <pin position="B13" pad="PM2"/>
-            <pin position="A15" pad="PM3"/>
-            <pin position="B14" pad="PM5"/>
-            <pin position="A16" pad="PM4"/>
-            <pin position="B15" pad="PM7"/>
-            <pin position="A17" pad="PM6"/>
-            <pin position="A18" pad="SEG7"/>
-            <pin position="B16" pad="SEG8"/>
-            <pin position="A19" pad="SEG6"/>
-            <pin position="B17" pad="SEG5"/>
-            <pin position="A20" pad="SEG4"/>
-            <pin position="B18" pad="SEG3"/>
-            <pin position="A21" pad="SEG2"/>
-            <pin position="B19" pad="SEG1"/>
-            <pin position="A22" pad="SEG0"/>
-            <pin position="B20" pad="GND"/>
-            <pin position="A23" pad="VCC"/>
-            <pin position="B21" pad="BIAS1"/>
-            <pin position="A24" pad="BIAS2"/>
-            <pin position="B22" pad="VLCD"/>
-            <pin position="A25" pad="CAPL"/>
-            <pin position="A26" pad="CAPH"/>
-            <pin position="B23" pad="COM0"/>
-            <pin position="A27" pad="COM1"/>
-            <pin position="B24" pad="COM2"/>
-            <pin position="A28" pad="COM3"/>
-            <pin position="B25" pad="PR0"/>
-            <pin position="A29" pad="PR1"/>
-            <pin position="B26" pad="AGND"/>
-            <pin position="A30" pad="PB0"/>
-            <pin position="B27" pad="AVCC"/>
-            <pin position="A31" pad="PB1"/>
-            <pin position="B28" pad="PB2"/>
-            <pin position="A32" pad="PB3"/>
-            <pin position="B29" pad="PB4"/>
-            <pin position="A33" pad="PB5"/>
-            <pin position="B30" pad="PB7"/>
-            <pin position="A34" pad="PB6"/>
+            <pin position="A1" pad-key="pc0"/>
+            <pin position="B1" pad-key="pc1"/>
+            <pin position="A2" pad-key="pc2"/>
+            <pin position="B2" pad-key="pc3"/>
+            <pin position="A3" pad-key="pc4"/>
+            <pin position="B3" pad-key="pc5"/>
+            <pin position="A4" pad-key="pc6"/>
+            <pin position="B4" pad-key="gnd"/>
+            <pin position="A5" pad-key="pc7"/>
+            <pin position="B5" pad-key="pd0"/>
+            <pin position="A6" pad-key="vcc"/>
+            <pin position="B6" pad-key="reset"/>
+            <pin position="A7" pad-key="pd1"/>
+            <pin position="B7" pad-key="pdi"/>
+            <pin position="A8" pad-key="gnd"/>
+            <pin position="A9" pad-key="pg0"/>
+            <pin position="B8" pad-key="vcc"/>
+            <pin position="A10" pad-key="pg2"/>
+            <pin position="B9" pad-key="pg1"/>
+            <pin position="A11" pad-key="pg3"/>
+            <pin position="B10" pad-key="pg4"/>
+            <pin position="A12" pad-key="pg5"/>
+            <pin position="B11" pad-key="pg6"/>
+            <pin position="A13" pad-key="pg7"/>
+            <pin position="B12" pad-key="pm0"/>
+            <pin position="A14" pad-key="pm1"/>
+            <pin position="B13" pad-key="pm2"/>
+            <pin position="A15" pad-key="pm3"/>
+            <pin position="B14" pad-key="pm5"/>
+            <pin position="A16" pad-key="pm4"/>
+            <pin position="B15" pad-key="pm7"/>
+            <pin position="A17" pad-key="pm6"/>
+            <pin position="A18" pad-key="seg7"/>
+            <pin position="B16" pad-key="seg8"/>
+            <pin position="A19" pad-key="seg6"/>
+            <pin position="B17" pad-key="seg5"/>
+            <pin position="A20" pad-key="seg4"/>
+            <pin position="B18" pad-key="seg3"/>
+            <pin position="A21" pad-key="seg2"/>
+            <pin position="B19" pad-key="seg1"/>
+            <pin position="A22" pad-key="seg0"/>
+            <pin position="B20" pad-key="gnd"/>
+            <pin position="A23" pad-key="vcc"/>
+            <pin position="B21" pad-key="bias1"/>
+            <pin position="A24" pad-key="bias2"/>
+            <pin position="B22" pad-key="vlcd"/>
+            <pin position="A25" pad-key="capl"/>
+            <pin position="A26" pad-key="caph"/>
+            <pin position="B23" pad-key="com0"/>
+            <pin position="A27" pad-key="com1"/>
+            <pin position="B24" pad-key="com2"/>
+            <pin position="A28" pad-key="com3"/>
+            <pin position="B25" pad-key="pr0"/>
+            <pin position="A29" pad-key="pr1"/>
+            <pin position="B26" pad-key="agnd"/>
+            <pin position="A30" pad-key="pb0"/>
+            <pin position="B27" pad-key="avcc"/>
+            <pin position="A31" pad-key="pb1"/>
+            <pin position="B28" pad-key="pb2"/>
+            <pin position="A32" pad-key="pb3"/>
+            <pin position="B29" pad-key="pb4"/>
+            <pin position="A33" pad-key="pb5"/>
+            <pin position="B30" pad-key="pb7"/>
+            <pin position="A34" pad-key="pb6"/>
         </pinout>
     </pinouts>
     <variants>
-        <variant name="ATxmega128B3-AU" pinout-key="qfp_qfn_64" package="TQFP64"/>
-        <variant name="ATxmega128B3-MH" pinout-key="qfp_qfn_64" package="QFN64"/>
-        <variant name="ATxmega128B3-MCU" pinout-key="drqfn_64" package="DRQFN64"/>
+        <variant key="atxmega128b3_au" name="ATxmega128B3-AU" pinout-key="qfp_qfn_64"/>
+        <variant key="atxmega128b3_mh" name="ATxmega128B3-MH" pinout-key="qfp_qfn_64"/>
+        <variant key="atxmega128b3_mcu" name="ATxmega128B3-MCU" pinout-key="drqfn_64"/>
     </variants>
 </device>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA128C3.xml b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA128C3.xml
index abed3a83..080ccb63 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA128C3.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA128C3.xml
@@ -92,10 +92,10 @@
         <peripheral key="osc" name="OSC" module-key="i6079">
             <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"/>
-                <signal pad-id="pe2" function="TOSC" group="TOSC2"/>
-                <signal pad-id="pe3" function="TOSC" group="TOSC1"/>
+                <signal pad-key="pr0" function="XTAL" group="XTAL2"/>
+                <signal pad-key="pr1" function="XTAL" group="XTAL1"/>
+                <signal pad-key="pe2" function="TOSC" group="TOSC2"/>
+                <signal pad-key="pe3" function="TOSC" group="TOSC1"/>
             </signals>
         </peripheral>
         <peripheral key="dfllrc32m" name="DFLLRC32M" module-key="i6055">
@@ -119,11 +119,11 @@
         <peripheral key="portcfg" name="PORTCFG" module-key="i6075_portcfg">
             <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"/>
-                <signal pad-id="pc7" function="EVOUT" group="EVOUT" field="EVOUT"/>
-                <signal pad-id="pc4" function="EVOUT_ALT" group="EVOUT" field="CLKEVPIN"/>
-                <signal pad-id="pc6" function="RTCOUTC" group="RTCOUT"/>
+                <signal pad-key="pc7" function="CLKOUT" group="CLKOUT" field="CLKOUT"/>
+                <signal pad-key="pc4" function="CLKOUT_ALT" group="CLKOUT" field="CLKEVPIN"/>
+                <signal pad-key="pc7" function="EVOUT" group="EVOUT" field="EVOUT"/>
+                <signal pad-key="pc4" function="EVOUT_ALT" group="EVOUT" field="CLKEVPIN"/>
+                <signal pad-key="pc6" function="RTCOUTC" group="RTCOUT"/>
             </signals>
         </peripheral>
         <peripheral key="crc" name="CRC" module-key="i6111">
@@ -138,39 +138,39 @@
         <peripheral key="adca" name="ADCA" module-key="i6110">
             <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"/>
-                <signal pad-id="pa2" index="2" function="ADC" group="ADC"/>
-                <signal pad-id="pa3" index="3" function="ADC" group="ADC"/>
-                <signal pad-id="pa4" index="4" function="ADC" group="ADC"/>
-                <signal pad-id="pa5" index="5" function="ADC" group="ADC"/>
-                <signal pad-id="pa6" index="6" function="ADC" group="ADC"/>
-                <signal pad-id="pa7" index="7" function="ADC" group="ADC"/>
-                <signal pad-id="pb0" index="8" function="ADC" group="ADC"/>
-                <signal pad-id="pb1" index="9" function="ADC" group="ADC"/>
-                <signal pad-id="pb2" index="10" function="ADC" group="ADC"/>
-                <signal pad-id="pb3" index="11" function="ADC" group="ADC"/>
-                <signal pad-id="pb4" index="12" function="ADC" group="ADC"/>
-                <signal pad-id="pb5" index="13" function="ADC" group="ADC"/>
-                <signal pad-id="pb6" index="14" function="ADC" group="ADC"/>
-                <signal pad-id="pb7" index="15" function="ADC" group="ADC"/>
-                <signal pad-id="pa0" index="0" function="AREF" group="REFA"/>
-                <signal pad-id="pb0" index="0" function="AREF" group="REFB"/>
+                <signal pad-key="pa0" index="0" function="ADC" group="ADC"/>
+                <signal pad-key="pa1" index="1" function="ADC" group="ADC"/>
+                <signal pad-key="pa2" index="2" function="ADC" group="ADC"/>
+                <signal pad-key="pa3" index="3" function="ADC" group="ADC"/>
+                <signal pad-key="pa4" index="4" function="ADC" group="ADC"/>
+                <signal pad-key="pa5" index="5" function="ADC" group="ADC"/>
+                <signal pad-key="pa6" index="6" function="ADC" group="ADC"/>
+                <signal pad-key="pa7" index="7" function="ADC" group="ADC"/>
+                <signal pad-key="pb0" index="8" function="ADC" group="ADC"/>
+                <signal pad-key="pb1" index="9" function="ADC" group="ADC"/>
+                <signal pad-key="pb2" index="10" function="ADC" group="ADC"/>
+                <signal pad-key="pb3" index="11" function="ADC" group="ADC"/>
+                <signal pad-key="pb4" index="12" function="ADC" group="ADC"/>
+                <signal pad-key="pb5" index="13" function="ADC" group="ADC"/>
+                <signal pad-key="pb6" index="14" function="ADC" group="ADC"/>
+                <signal pad-key="pb7" index="15" function="ADC" group="ADC"/>
+                <signal pad-key="pa0" index="0" function="AREF" group="REFA"/>
+                <signal pad-key="pb0" index="0" function="AREF" group="REFB"/>
             </signals>
         </peripheral>
         <peripheral key="aca" name="ACA" module-key="i6077">
             <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"/>
-                <signal pad-id="pa2" index="2" function="AC" group="AC"/>
-                <signal pad-id="pa3" index="3" function="AC" group="AC"/>
-                <signal pad-id="pa4" index="4" function="AC" group="AC"/>
-                <signal pad-id="pa5" index="5" function="AC" group="AC"/>
-                <signal pad-id="pa6" index="6" function="AC" group="AC"/>
-                <signal pad-id="pa7" index="7" function="AC" group="AC"/>
-                <signal pad-id="pa6" index="1" function="ACOUT" group="ACOUT"/>
-                <signal pad-id="pa7" index="0" function="ACOUT" group="ACOUT"/>
+                <signal pad-key="pa0" index="0" function="AC" group="AC"/>
+                <signal pad-key="pa1" index="1" function="AC" group="AC"/>
+                <signal pad-key="pa2" index="2" function="AC" group="AC"/>
+                <signal pad-key="pa3" index="3" function="AC" group="AC"/>
+                <signal pad-key="pa4" index="4" function="AC" group="AC"/>
+                <signal pad-key="pa5" index="5" function="AC" group="AC"/>
+                <signal pad-key="pa6" index="6" function="AC" group="AC"/>
+                <signal pad-key="pa7" index="7" function="AC" group="AC"/>
+                <signal pad-key="pa6" index="1" function="ACOUT" group="ACOUT"/>
+                <signal pad-key="pa7" index="0" function="ACOUT" group="ACOUT"/>
             </signals>
         </peripheral>
         <peripheral key="rtc" name="RTC" module-key="i6093">
@@ -179,219 +179,219 @@
         <peripheral key="twic" name="TWIC" module-key="i6089">
             <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"/>
+                <signal pad-key="pc0" function="TWI" group="SDA"/>
+                <signal pad-key="pc1" function="TWI" group="SCL"/>
             </signals>
         </peripheral>
         <peripheral key="twie" name="TWIE" module-key="i6089">
             <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"/>
+                <signal pad-key="pe0" function="TWI" group="SDA"/>
+                <signal pad-key="pe1" function="TWI" group="SCL"/>
             </signals>
         </peripheral>
         <peripheral key="usb" name="USB" module-key="i3005">
             <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"/>
+                <signal pad-key="pd6" function="USB" group="DN"/>
+                <signal pad-key="pd7" function="USB" group="DP"/>
             </signals>
         </peripheral>
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pa2" index="2" function="PORTA" group="P"/>
-                <signal pad-id="pa3" index="3" function="PORTA" group="P"/>
-                <signal pad-id="pa4" index="4" function="PORTA" group="P"/>
-                <signal pad-id="pa5" index="5" function="PORTA" group="P"/>
-                <signal pad-id="pa6" index="6" function="PORTA" group="P"/>
-                <signal pad-id="pa7" index="7" function="PORTA" group="P"/>
+                <signal pad-key="pa0" index="0" function="PORTA" group="P"/>
+                <signal pad-key="pa1" index="1" function="PORTA" group="P"/>
+                <signal pad-key="pa2" index="2" function="PORTA" group="P"/>
+                <signal pad-key="pa3" index="3" function="PORTA" group="P"/>
+                <signal pad-key="pa4" index="4" function="PORTA" group="P"/>
+                <signal pad-key="pa5" index="5" function="PORTA" group="P"/>
+                <signal pad-key="pa6" index="6" function="PORTA" group="P"/>
+                <signal pad-key="pa7" index="7" function="PORTA" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pb2" index="2" function="PORTB" group="P"/>
-                <signal pad-id="pb3" index="3" function="PORTB" group="P"/>
-                <signal pad-id="pb4" index="4" function="PORTB" group="P"/>
-                <signal pad-id="pb5" index="5" function="PORTB" group="P"/>
-                <signal pad-id="pb6" index="6" function="PORTB" group="P"/>
-                <signal pad-id="pb7" index="7" function="PORTB" group="P"/>
+                <signal pad-key="pb0" index="0" function="PORTB" group="P"/>
+                <signal pad-key="pb1" index="1" function="PORTB" group="P"/>
+                <signal pad-key="pb2" index="2" function="PORTB" group="P"/>
+                <signal pad-key="pb3" index="3" function="PORTB" group="P"/>
+                <signal pad-key="pb4" index="4" function="PORTB" group="P"/>
+                <signal pad-key="pb5" index="5" function="PORTB" group="P"/>
+                <signal pad-key="pb6" index="6" function="PORTB" group="P"/>
+                <signal pad-key="pb7" index="7" function="PORTB" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pc2" index="2" function="PORTC" group="P"/>
-                <signal pad-id="pc3" index="3" function="PORTC" group="P"/>
-                <signal pad-id="pc4" index="4" function="PORTC" group="P"/>
-                <signal pad-id="pc5" index="5" function="PORTC" group="P"/>
-                <signal pad-id="pc6" index="6" function="PORTC" group="P"/>
-                <signal pad-id="pc7" index="7" function="PORTC" group="P"/>
+                <signal pad-key="pc0" index="0" function="PORTC" group="P"/>
+                <signal pad-key="pc1" index="1" function="PORTC" group="P"/>
+                <signal pad-key="pc2" index="2" function="PORTC" group="P"/>
+                <signal pad-key="pc3" index="3" function="PORTC" group="P"/>
+                <signal pad-key="pc4" index="4" function="PORTC" group="P"/>
+                <signal pad-key="pc5" index="5" function="PORTC" group="P"/>
+                <signal pad-key="pc6" index="6" function="PORTC" group="P"/>
+                <signal pad-key="pc7" index="7" function="PORTC" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pd2" index="2" function="PORTD" group="P"/>
-                <signal pad-id="pd3" index="3" function="PORTD" group="P"/>
-                <signal pad-id="pd4" index="4" function="PORTD" group="P"/>
-                <signal pad-id="pd5" index="5" function="PORTD" group="P"/>
-                <signal pad-id="pd6" index="6" function="PORTD" group="P"/>
-                <signal pad-id="pd7" index="7" function="PORTD" group="P"/>
+                <signal pad-key="pd0" index="0" function="PORTD" group="P"/>
+                <signal pad-key="pd1" index="1" function="PORTD" group="P"/>
+                <signal pad-key="pd2" index="2" function="PORTD" group="P"/>
+                <signal pad-key="pd3" index="3" function="PORTD" group="P"/>
+                <signal pad-key="pd4" index="4" function="PORTD" group="P"/>
+                <signal pad-key="pd5" index="5" function="PORTD" group="P"/>
+                <signal pad-key="pd6" index="6" function="PORTD" group="P"/>
+                <signal pad-key="pd7" index="7" function="PORTD" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="porte" name="PORTE" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pe2" index="2" function="PORTE" group="P"/>
-                <signal pad-id="pe3" index="3" function="PORTE" group="P"/>
-                <signal pad-id="pe4" index="4" function="PORTE" group="P"/>
-                <signal pad-id="pe5" index="5" function="PORTE" group="P"/>
-                <signal pad-id="pe6" index="6" function="PORTE" group="P"/>
-                <signal pad-id="pe7" index="7" function="PORTE" group="P"/>
+                <signal pad-key="pe0" index="0" function="PORTE" group="P"/>
+                <signal pad-key="pe1" index="1" function="PORTE" group="P"/>
+                <signal pad-key="pe2" index="2" function="PORTE" group="P"/>
+                <signal pad-key="pe3" index="3" function="PORTE" group="P"/>
+                <signal pad-key="pe4" index="4" function="PORTE" group="P"/>
+                <signal pad-key="pe5" index="5" function="PORTE" group="P"/>
+                <signal pad-key="pe6" index="6" function="PORTE" group="P"/>
+                <signal pad-key="pe7" index="7" function="PORTE" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portf" name="PORTF" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pf2" index="2" function="PORTF" group="P"/>
-                <signal pad-id="pf3" index="3" function="PORTF" group="P"/>
-                <signal pad-id="pf4" index="4" function="PORTF" group="P"/>
-                <signal pad-id="pf5" index="5" function="PORTF" group="P"/>
-                <signal pad-id="pf6" index="6" function="PORTF" group="P"/>
-                <signal pad-id="pf7" index="7" function="PORTF" group="P"/>
+                <signal pad-key="pf0" index="0" function="PORTF" group="P"/>
+                <signal pad-key="pf1" index="1" function="PORTF" group="P"/>
+                <signal pad-key="pf2" index="2" function="PORTF" group="P"/>
+                <signal pad-key="pf3" index="3" function="PORTF" group="P"/>
+                <signal pad-key="pf4" index="4" function="PORTF" group="P"/>
+                <signal pad-key="pf5" index="5" function="PORTF" group="P"/>
+                <signal pad-key="pf6" index="6" function="PORTF" group="P"/>
+                <signal pad-key="pf7" index="7" function="PORTF" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portr" name="PORTR" module-key="gpio_port">
             <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"/>
+                <signal pad-key="pr0" index="0" function="PORTR" group="P"/>
+                <signal pad-key="pr1" index="1" function="PORTR" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="tcc0" name="TCC0" module-key="i6090_tc">
             <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"/>
-                <signal pad-id="pc2" function="TC0" group="OC0C" field="TC0C"/>
-                <signal pad-id="pc3" function="TC0" group="OC0D" field="TC0D"/>
-                <signal pad-id="pc4" function="TC0_ALT" group="OC0A" field="TC0A"/>
-                <signal pad-id="pc5" function="TC0_ALT" group="OC0B" field="TC0B"/>
-                <signal pad-id="pc6" function="TC0_ALT" group="OC0C" field="TC0C"/>
-                <signal pad-id="pc7" function="TC0_ALT" group="OC0D" field="TC0D"/>
+                <signal pad-key="pc0" function="TC0" group="OC0A" field="TC0A"/>
+                <signal pad-key="pc1" function="TC0" group="OC0B" field="TC0B"/>
+                <signal pad-key="pc2" function="TC0" group="OC0C" field="TC0C"/>
+                <signal pad-key="pc3" function="TC0" group="OC0D" field="TC0D"/>
+                <signal pad-key="pc4" function="TC0_ALT" group="OC0A" field="TC0A"/>
+                <signal pad-key="pc5" function="TC0_ALT" group="OC0B" field="TC0B"/>
+                <signal pad-key="pc6" function="TC0_ALT" group="OC0C" field="TC0C"/>
+                <signal pad-key="pc7" function="TC0_ALT" group="OC0D" field="TC0D"/>
             </signals>
         </peripheral>
         <peripheral key="tcc1" name="TCC1" module-key="i6090_tc">
             <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"/>
+                <signal pad-key="pc4" function="TC1" group="OC1A"/>
+                <signal pad-key="pc5" function="TC1" group="OC1B"/>
             </signals>
         </peripheral>
         <peripheral key="tcd0" name="TCD0" module-key="i6090_tc">
             <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"/>
-                <signal pad-id="pd2" function="TC0" group="OC0C"/>
-                <signal pad-id="pd3" function="TC0" group="OC0D"/>
+                <signal pad-key="pd0" function="TC0" group="OC0A"/>
+                <signal pad-key="pd1" function="TC0" group="OC0B"/>
+                <signal pad-key="pd2" function="TC0" group="OC0C"/>
+                <signal pad-key="pd3" function="TC0" group="OC0D"/>
             </signals>
         </peripheral>
         <peripheral key="tce0" name="TCE0" module-key="i6090_tc">
             <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"/>
-                <signal pad-id="pe2" function="TC0" group="OC0C"/>
-                <signal pad-id="pe3" function="TC0" group="OC0D"/>
+                <signal pad-key="pe0" function="TC0" group="OC0A"/>
+                <signal pad-key="pe1" function="TC0" group="OC0B"/>
+                <signal pad-key="pe2" function="TC0" group="OC0C"/>
+                <signal pad-key="pe3" function="TC0" group="OC0D"/>
             </signals>
         </peripheral>
         <peripheral key="tcf0" name="TCF0" module-key="i6090_tc">
             <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"/>
-                <signal pad-id="pf2" function="TC0" group="OC0C"/>
-                <signal pad-id="pf3" function="TC0" group="OC0D"/>
+                <signal pad-key="pf0" function="TC0" group="OC0A"/>
+                <signal pad-key="pf1" function="TC0" group="OC0B"/>
+                <signal pad-key="pf2" function="TC0" group="OC0C"/>
+                <signal pad-key="pf3" function="TC0" group="OC0D"/>
             </signals>
         </peripheral>
         <peripheral key="tcc2" name="TCC2" module-key="i6090_tc2">
             <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"/>
-                <signal pad-id="pc2" function="TC2" group="LOC2C"/>
-                <signal pad-id="pc3" function="TC2" group="LOC2D"/>
-                <signal pad-id="pc4" function="TC2" group="HOC2A"/>
-                <signal pad-id="pc5" function="TC2" group="HOC2B"/>
-                <signal pad-id="pc6" function="TC2" group="HOC2C"/>
-                <signal pad-id="pc7" function="TC2" group="HOC2D"/>
+                <signal pad-key="pc0" function="TC2" group="LOC2A"/>
+                <signal pad-key="pc1" function="TC2" group="LOC2B"/>
+                <signal pad-key="pc2" function="TC2" group="LOC2C"/>
+                <signal pad-key="pc3" function="TC2" group="LOC2D"/>
+                <signal pad-key="pc4" function="TC2" group="HOC2A"/>
+                <signal pad-key="pc5" function="TC2" group="HOC2B"/>
+                <signal pad-key="pc6" function="TC2" group="HOC2C"/>
+                <signal pad-key="pc7" function="TC2" group="HOC2D"/>
             </signals>
         </peripheral>
         <peripheral key="tcd2" name="TCD2" module-key="i6090_tc2">
             <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"/>
-                <signal pad-id="pd2" function="TC2" group="LOC2C"/>
-                <signal pad-id="pd3" function="TC2" group="LOC2D"/>
-                <signal pad-id="pd4" function="TC2" group="HOC2A"/>
-                <signal pad-id="pd5" function="TC2" group="HOC2B"/>
-                <signal pad-id="pd6" function="TC2" group="HOC2C"/>
-                <signal pad-id="pd7" function="TC2" group="HOC2D"/>
+                <signal pad-key="pd0" function="TC2" group="LOC2A"/>
+                <signal pad-key="pd1" function="TC2" group="LOC2B"/>
+                <signal pad-key="pd2" function="TC2" group="LOC2C"/>
+                <signal pad-key="pd3" function="TC2" group="LOC2D"/>
+                <signal pad-key="pd4" function="TC2" group="HOC2A"/>
+                <signal pad-key="pd5" function="TC2" group="HOC2B"/>
+                <signal pad-key="pd6" function="TC2" group="HOC2C"/>
+                <signal pad-key="pd7" function="TC2" group="HOC2D"/>
             </signals>
         </peripheral>
         <peripheral key="tce2" name="TCE2" module-key="i6090_tc2">
             <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"/>
-                <signal pad-id="pe2" function="TC2" group="LOC2C"/>
-                <signal pad-id="pe3" function="TC2" group="LOC2D"/>
-                <signal pad-id="pe4" function="TC2" group="HOC2A"/>
-                <signal pad-id="pe5" function="TC2" group="HOC2B"/>
-                <signal pad-id="pe6" function="TC2" group="HOC2C"/>
-                <signal pad-id="pe7" function="TC2" group="HOC2D"/>
+                <signal pad-key="pe0" function="TC2" group="LOC2A"/>
+                <signal pad-key="pe1" function="TC2" group="LOC2B"/>
+                <signal pad-key="pe2" function="TC2" group="LOC2C"/>
+                <signal pad-key="pe3" function="TC2" group="LOC2D"/>
+                <signal pad-key="pe4" function="TC2" group="HOC2A"/>
+                <signal pad-key="pe5" function="TC2" group="HOC2B"/>
+                <signal pad-key="pe6" function="TC2" group="HOC2C"/>
+                <signal pad-key="pe7" function="TC2" group="HOC2D"/>
             </signals>
         </peripheral>
         <peripheral key="tcf2" name="TCF2" module-key="i6090_tc2">
             <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"/>
-                <signal pad-id="pf2" function="TC2" group="LOC2C"/>
-                <signal pad-id="pf3" function="TC2" group="LOC2D"/>
-                <signal pad-id="pf4" function="TC2" group="HOC2A"/>
-                <signal pad-id="pf5" function="TC2" group="HOC2B"/>
-                <signal pad-id="pf6" function="TC2" group="HOC2C"/>
-                <signal pad-id="pf7" function="TC2" group="HOC2D"/>
+                <signal pad-key="pf0" function="TC2" group="LOC2A"/>
+                <signal pad-key="pf1" function="TC2" group="LOC2B"/>
+                <signal pad-key="pf2" function="TC2" group="LOC2C"/>
+                <signal pad-key="pf3" function="TC2" group="LOC2D"/>
+                <signal pad-key="pf4" function="TC2" group="HOC2A"/>
+                <signal pad-key="pf5" function="TC2" group="HOC2B"/>
+                <signal pad-key="pf6" function="TC2" group="HOC2C"/>
+                <signal pad-key="pf7" function="TC2" group="HOC2D"/>
             </signals>
         </peripheral>
         <peripheral key="awexc" name="AWEXC" module-key="i6090_awex">
             <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"/>
-                <signal pad-id="pc2" function="AWEX" group="OC0BLS"/>
-                <signal pad-id="pc3" function="AWEX" group="OC0BHS"/>
-                <signal pad-id="pc4" function="AWEX" group="OC0CLS"/>
-                <signal pad-id="pc5" function="AWEX" group="OC0CHS"/>
-                <signal pad-id="pc6" function="AWEX" group="OC0DLS"/>
-                <signal pad-id="pc7" function="AWEX" group="OC0DHS"/>
+                <signal pad-key="pc0" function="AWEX" group="OC0ALS"/>
+                <signal pad-key="pc1" function="AWEX" group="OC0AHS"/>
+                <signal pad-key="pc2" function="AWEX" group="OC0BLS"/>
+                <signal pad-key="pc3" function="AWEX" group="OC0BHS"/>
+                <signal pad-key="pc4" function="AWEX" group="OC0CLS"/>
+                <signal pad-key="pc5" function="AWEX" group="OC0CHS"/>
+                <signal pad-key="pc6" function="AWEX" group="OC0DLS"/>
+                <signal pad-key="pc7" function="AWEX" group="OC0DHS"/>
             </signals>
         </peripheral>
         <peripheral key="hiresc" name="HIRESC" module-key="i6090_hires">
@@ -400,50 +400,50 @@
         <peripheral key="usartc0" name="USARTC0" module-key="i6090_usart">
             <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"/>
-                <signal pad-id="pc3" function="USART" group="TXD" field="USART0"/>
-                <signal pad-id="pc5" function="USART_ALT" group="XCK" field="USART0"/>
-                <signal pad-id="pc6" function="USART_ALT" group="RXD" field="USART0"/>
-                <signal pad-id="pc7" function="USART_ALT" group="TXD" field="USART0"/>
+                <signal pad-key="pc1" function="USART" group="XCK" field="USART0"/>
+                <signal pad-key="pc2" function="USART" group="RXD" field="USART0"/>
+                <signal pad-key="pc3" function="USART" group="TXD" field="USART0"/>
+                <signal pad-key="pc5" function="USART_ALT" group="XCK" field="USART0"/>
+                <signal pad-key="pc6" function="USART_ALT" group="RXD" field="USART0"/>
+                <signal pad-key="pc7" function="USART_ALT" group="TXD" field="USART0"/>
             </signals>
         </peripheral>
         <peripheral key="usartd0" name="USARTD0" module-key="i6090_usart">
             <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"/>
-                <signal pad-id="pd3" function="USART" group="TXD"/>
+                <signal pad-key="pd1" function="USART" group="XCK"/>
+                <signal pad-key="pd2" function="USART" group="RXD"/>
+                <signal pad-key="pd3" function="USART" group="TXD"/>
             </signals>
         </peripheral>
         <peripheral key="usarte0" name="USARTE0" module-key="i6090_usart">
             <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"/>
-                <signal pad-id="pe3" function="USART" group="TXD"/>
+                <signal pad-key="pe1" function="USART" group="XCK"/>
+                <signal pad-key="pe2" function="USART" group="RXD"/>
+                <signal pad-key="pe3" function="USART" group="TXD"/>
             </signals>
         </peripheral>
         <peripheral key="spic" name="SPIC" module-key="i6090_spi">
             <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"/>
-                <signal pad-id="pc6" function="SPI" group="MISO" field="SPI"/>
-                <signal pad-id="pc7" function="SPI" group="SCK" field="SPI"/>
-                <signal pad-id="pc4" function="SPI_ALT" group="SS" field="SPI"/>
-                <signal pad-id="pc5" function="SPI_ALT" group="SCK" field="SPI"/>
-                <signal pad-id="pc6" function="SPI_ALT" group="MISO" field="SPI"/>
-                <signal pad-id="pc7" function="SPI_ALT" group="MOSI" field="SPI"/>
+                <signal pad-key="pc4" function="SPI" group="SS" field="SPI"/>
+                <signal pad-key="pc5" function="SPI" group="MOSI" field="SPI"/>
+                <signal pad-key="pc6" function="SPI" group="MISO" field="SPI"/>
+                <signal pad-key="pc7" function="SPI" group="SCK" field="SPI"/>
+                <signal pad-key="pc4" function="SPI_ALT" group="SS" field="SPI"/>
+                <signal pad-key="pc5" function="SPI_ALT" group="SCK" field="SPI"/>
+                <signal pad-key="pc6" function="SPI_ALT" group="MISO" field="SPI"/>
+                <signal pad-key="pc7" function="SPI_ALT" group="MOSI" field="SPI"/>
             </signals>
         </peripheral>
         <peripheral key="spid" name="SPID" module-key="i6090_spi">
             <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"/>
-                <signal pad-id="pd6" function="SPI" group="MISO"/>
-                <signal pad-id="pd7" function="SPI" group="SCK"/>
+                <signal pad-key="pd4" function="SPI" group="SS"/>
+                <signal pad-key="pd5" function="SPI" group="MOSI"/>
+                <signal pad-key="pd6" function="SPI" group="MISO"/>
+                <signal pad-key="pd7" function="SPI" group="SCK"/>
             </signals>
         </peripheral>
         <peripheral key="ircom" name="IRCOM" module-key="i6090_ircom">
@@ -1579,78 +1579,135 @@
             </register-group>
         </module>
     </modules>
+    <pads>
+        <pad key="pa3" name="PA3"/>
+        <pad key="pa4" name="PA4"/>
+        <pad key="pa5" name="PA5"/>
+        <pad key="pa6" name="PA6"/>
+        <pad key="pa7" name="PA7"/>
+        <pad key="pb0" name="PB0"/>
+        <pad key="pb1" name="PB1"/>
+        <pad key="pb2" name="PB2"/>
+        <pad key="pb3" name="PB3"/>
+        <pad key="pb4" name="PB4"/>
+        <pad key="pb5" name="PB5"/>
+        <pad key="pb6" name="PB6"/>
+        <pad key="pb7" name="PB7"/>
+        <pad key="gnd" name="GND"/>
+        <pad key="vcc" name="VCC"/>
+        <pad key="pc0" name="PC0"/>
+        <pad key="pc1" name="PC1"/>
+        <pad key="pc2" name="PC2"/>
+        <pad key="pc3" name="PC3"/>
+        <pad key="pc4" name="PC4"/>
+        <pad key="pc5" name="PC5"/>
+        <pad key="pc6" name="PC6"/>
+        <pad key="pc7" name="PC7"/>
+        <pad key="pd0" name="PD0"/>
+        <pad key="pd1" name="PD1"/>
+        <pad key="pd2" name="PD2"/>
+        <pad key="pd3" name="PD3"/>
+        <pad key="pd4" name="PD4"/>
+        <pad key="pd5" name="PD5"/>
+        <pad key="pd6" name="PD6"/>
+        <pad key="pd7" name="PD7"/>
+        <pad key="pe0" name="PE0"/>
+        <pad key="pe1" name="PE1"/>
+        <pad key="pe2" name="PE2"/>
+        <pad key="pe3" name="PE3"/>
+        <pad key="pe4" name="PE4"/>
+        <pad key="pe5" name="PE5"/>
+        <pad key="pe6" name="PE6"/>
+        <pad key="pe7" name="PE7"/>
+        <pad key="pf0" name="PF0"/>
+        <pad key="pf1" name="PF1"/>
+        <pad key="pf2" name="PF2"/>
+        <pad key="pf3" name="PF3"/>
+        <pad key="pf4" name="PF4"/>
+        <pad key="pf5" name="PF5"/>
+        <pad key="pf6" name="PF6"/>
+        <pad key="pf7" name="PF7"/>
+        <pad key="pdi" name="PDI"/>
+        <pad key="reset" name="RESET"/>
+        <pad key="pr0" name="PR0"/>
+        <pad key="pr1" name="PR1"/>
+        <pad key="avcc" name="AVCC"/>
+        <pad key="pa0" name="PA0"/>
+        <pad key="pa1" name="PA1"/>
+        <pad key="pa2" name="PA2"/>
+    </pads>
     <pinouts>
         <pinout key="qfp_qfn_64" name="QFP_QFN_64" type="qfn">
-            <pin position="1" pad="PA3"/>
-            <pin position="2" pad="PA4"/>
-            <pin position="3" pad="PA5"/>
-            <pin position="4" pad="PA6"/>
-            <pin position="5" pad="PA7"/>
-            <pin position="6" pad="PB0"/>
-            <pin position="7" pad="PB1"/>
-            <pin position="8" pad="PB2"/>
-            <pin position="9" pad="PB3"/>
-            <pin position="10" pad="PB4"/>
-            <pin position="11" pad="PB5"/>
-            <pin position="12" pad="PB6"/>
-            <pin position="13" pad="PB7"/>
-            <pin position="14" pad="GND"/>
-            <pin position="15" pad="VCC"/>
-            <pin position="16" pad="PC0"/>
-            <pin position="17" pad="PC1"/>
-            <pin position="18" pad="PC2"/>
-            <pin position="19" pad="PC3"/>
-            <pin position="20" pad="PC4"/>
-            <pin position="21" pad="PC5"/>
-            <pin position="22" pad="PC6"/>
-            <pin position="23" pad="PC7"/>
-            <pin position="24" pad="GND"/>
-            <pin position="25" pad="VCC"/>
-            <pin position="26" pad="PD0"/>
-            <pin position="27" pad="PD1"/>
-            <pin position="28" pad="PD2"/>
-            <pin position="29" pad="PD3"/>
-            <pin position="30" pad="PD4"/>
-            <pin position="31" pad="PD5"/>
-            <pin position="32" pad="PD6"/>
-            <pin position="33" pad="PD7"/>
-            <pin position="34" pad="GND"/>
-            <pin position="35" pad="VCC"/>
-            <pin position="36" pad="PE0"/>
-            <pin position="37" pad="PE1"/>
-            <pin position="38" pad="PE2"/>
-            <pin position="39" pad="PE3"/>
-            <pin position="40" pad="PE4"/>
-            <pin position="41" pad="PE5"/>
-            <pin position="42" pad="PE6"/>
-            <pin position="43" pad="PE7"/>
-            <pin position="44" pad="GND"/>
-            <pin position="45" pad="VCC"/>
-            <pin position="46" pad="PF0"/>
-            <pin position="47" pad="PF1"/>
-            <pin position="48" pad="PF2"/>
-            <pin position="49" pad="PF3"/>
-            <pin position="50" pad="PF4"/>
-            <pin position="51" pad="PF5"/>
-            <pin position="52" pad="GND"/>
-            <pin position="53" pad="VCC"/>
-            <pin position="54" pad="PF6"/>
-            <pin position="55" pad="PF7"/>
-            <pin position="56" pad="PDI"/>
-            <pin position="57" pad="RESET"/>
-            <pin position="58" pad="PR0"/>
-            <pin position="59" pad="PR1"/>
-            <pin position="60" pad="GND"/>
-            <pin position="61" pad="AVCC"/>
-            <pin position="62" pad="PA0"/>
-            <pin position="63" pad="PA1"/>
-            <pin position="64" pad="PA2"/>
+            <pin position="1" pad-key="pa3"/>
+            <pin position="2" pad-key="pa4"/>
+            <pin position="3" pad-key="pa5"/>
+            <pin position="4" pad-key="pa6"/>
+            <pin position="5" pad-key="pa7"/>
+            <pin position="6" pad-key="pb0"/>
+            <pin position="7" pad-key="pb1"/>
+            <pin position="8" pad-key="pb2"/>
+            <pin position="9" pad-key="pb3"/>
+            <pin position="10" pad-key="pb4"/>
+            <pin position="11" pad-key="pb5"/>
+            <pin position="12" pad-key="pb6"/>
+            <pin position="13" pad-key="pb7"/>
+            <pin position="14" pad-key="gnd"/>
+            <pin position="15" pad-key="vcc"/>
+            <pin position="16" pad-key="pc0"/>
+            <pin position="17" pad-key="pc1"/>
+            <pin position="18" pad-key="pc2"/>
+            <pin position="19" pad-key="pc3"/>
+            <pin position="20" pad-key="pc4"/>
+            <pin position="21" pad-key="pc5"/>
+            <pin position="22" pad-key="pc6"/>
+            <pin position="23" pad-key="pc7"/>
+            <pin position="24" pad-key="gnd"/>
+            <pin position="25" pad-key="vcc"/>
+            <pin position="26" pad-key="pd0"/>
+            <pin position="27" pad-key="pd1"/>
+            <pin position="28" pad-key="pd2"/>
+            <pin position="29" pad-key="pd3"/>
+            <pin position="30" pad-key="pd4"/>
+            <pin position="31" pad-key="pd5"/>
+            <pin position="32" pad-key="pd6"/>
+            <pin position="33" pad-key="pd7"/>
+            <pin position="34" pad-key="gnd"/>
+            <pin position="35" pad-key="vcc"/>
+            <pin position="36" pad-key="pe0"/>
+            <pin position="37" pad-key="pe1"/>
+            <pin position="38" pad-key="pe2"/>
+            <pin position="39" pad-key="pe3"/>
+            <pin position="40" pad-key="pe4"/>
+            <pin position="41" pad-key="pe5"/>
+            <pin position="42" pad-key="pe6"/>
+            <pin position="43" pad-key="pe7"/>
+            <pin position="44" pad-key="gnd"/>
+            <pin position="45" pad-key="vcc"/>
+            <pin position="46" pad-key="pf0"/>
+            <pin position="47" pad-key="pf1"/>
+            <pin position="48" pad-key="pf2"/>
+            <pin position="49" pad-key="pf3"/>
+            <pin position="50" pad-key="pf4"/>
+            <pin position="51" pad-key="pf5"/>
+            <pin position="52" pad-key="gnd"/>
+            <pin position="53" pad-key="vcc"/>
+            <pin position="54" pad-key="pf6"/>
+            <pin position="55" pad-key="pf7"/>
+            <pin position="56" pad-key="pdi"/>
+            <pin position="57" pad-key="reset"/>
+            <pin position="58" pad-key="pr0"/>
+            <pin position="59" pad-key="pr1"/>
+            <pin position="60" pad-key="gnd"/>
+            <pin position="61" pad-key="avcc"/>
+            <pin position="62" pad-key="pa0"/>
+            <pin position="63" pad-key="pa1"/>
+            <pin position="64" pad-key="pa2"/>
         </pinout>
     </pinouts>
     <variants>
-        <variant name="ATxmega128C3-AU" pinout-key="qfp_qfn_64" package="TQFP64"/>
-        <variant name="ATxmega128C3-MH" pinout-key="qfp_qfn_64" package="QFN64"/>
-        <variant name="ATxmega128C3-AN" pinout-key="qfp_qfn_64" package="TQFP64"/>
-        <variant name="ATxmega128C3-M7" pinout-key="qfp_qfn_64" package="QFN64"/>
+        <variant key="atxmega128c3_au" name="ATxmega128C3-AU" pinout-key="qfp_qfn_64"/>
+        <variant key="atxmega128c3_mh" name="ATxmega128C3-MH" pinout-key="qfp_qfn_64"/>
+        <variant key="atxmega128c3_an" name="ATxmega128C3-AN" pinout-key="qfp_qfn_64"/>
+        <variant key="atxmega128c3_m7" name="ATxmega128C3-M7" pinout-key="qfp_qfn_64"/>
     </variants>
 </device>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA128D3.xml b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA128D3.xml
index 1809f81a..0a3d2c45 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA128D3.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA128D3.xml
@@ -81,10 +81,10 @@
         <peripheral key="osc" name="OSC" module-key="i6079">
             <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"/>
-                <signal pad-id="pe2" function="TOSC" group="TOSC2"/>
-                <signal pad-id="pe3" function="TOSC" group="TOSC1"/>
+                <signal pad-key="pr0" function="XTAL" group="XTAL2"/>
+                <signal pad-key="pr1" function="XTAL" group="XTAL1"/>
+                <signal pad-key="pe2" function="TOSC" group="TOSC2"/>
+                <signal pad-key="pe3" function="TOSC" group="TOSC1"/>
             </signals>
         </peripheral>
         <peripheral key="dfllrc32m" name="DFLLRC32M" module-key="i6055">
@@ -126,39 +126,39 @@
         <peripheral key="aca" name="ACA" module-key="i6077">
             <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"/>
-                <signal pad-id="pa2" index="2" function="AC" group="AC"/>
-                <signal pad-id="pa3" index="3" function="AC" group="AC"/>
-                <signal pad-id="pa4" index="4" function="AC" group="AC"/>
-                <signal pad-id="pa5" index="5" function="AC" group="AC"/>
-                <signal pad-id="pa6" index="6" function="AC" group="AC"/>
-                <signal pad-id="pa7" index="7" function="AC" group="AC"/>
-                <signal pad-id="pa6" index="1" function="ACOUT" group="ACOUT"/>
-                <signal pad-id="pa7" index="0" function="ACOUT" group="ACOUT"/>
+                <signal pad-key="pa0" index="0" function="AC" group="AC"/>
+                <signal pad-key="pa1" index="1" function="AC" group="AC"/>
+                <signal pad-key="pa2" index="2" function="AC" group="AC"/>
+                <signal pad-key="pa3" index="3" function="AC" group="AC"/>
+                <signal pad-key="pa4" index="4" function="AC" group="AC"/>
+                <signal pad-key="pa5" index="5" function="AC" group="AC"/>
+                <signal pad-key="pa6" index="6" function="AC" group="AC"/>
+                <signal pad-key="pa7" index="7" function="AC" group="AC"/>
+                <signal pad-key="pa6" index="1" function="ACOUT" group="ACOUT"/>
+                <signal pad-key="pa7" index="0" function="ACOUT" group="ACOUT"/>
             </signals>
         </peripheral>
         <peripheral key="adca" name="ADCA" module-key="i6110">
             <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"/>
-                <signal pad-id="pa2" index="2" function="ADC" group="ADC"/>
-                <signal pad-id="pa3" index="3" function="ADC" group="ADC"/>
-                <signal pad-id="pa4" index="4" function="ADC" group="ADC"/>
-                <signal pad-id="pa5" index="5" function="ADC" group="ADC"/>
-                <signal pad-id="pa6" index="6" function="ADC" group="ADC"/>
-                <signal pad-id="pa7" index="7" function="ADC" group="ADC"/>
-                <signal pad-id="pb0" index="8" function="ADC" group="ADC"/>
-                <signal pad-id="pb1" index="9" function="ADC" group="ADC"/>
-                <signal pad-id="pb2" index="10" function="ADC" group="ADC"/>
-                <signal pad-id="pb3" index="11" function="ADC" group="ADC"/>
-                <signal pad-id="pb4" index="12" function="ADC" group="ADC"/>
-                <signal pad-id="pb5" index="13" function="ADC" group="ADC"/>
-                <signal pad-id="pb6" index="14" function="ADC" group="ADC"/>
-                <signal pad-id="pb7" index="15" function="ADC" group="ADC"/>
-                <signal pad-id="pa0" index="0" function="AREF" group="REFA"/>
-                <signal pad-id="pb0" index="0" function="AREF" group="REFB"/>
+                <signal pad-key="pa0" index="0" function="ADC" group="ADC"/>
+                <signal pad-key="pa1" index="1" function="ADC" group="ADC"/>
+                <signal pad-key="pa2" index="2" function="ADC" group="ADC"/>
+                <signal pad-key="pa3" index="3" function="ADC" group="ADC"/>
+                <signal pad-key="pa4" index="4" function="ADC" group="ADC"/>
+                <signal pad-key="pa5" index="5" function="ADC" group="ADC"/>
+                <signal pad-key="pa6" index="6" function="ADC" group="ADC"/>
+                <signal pad-key="pa7" index="7" function="ADC" group="ADC"/>
+                <signal pad-key="pb0" index="8" function="ADC" group="ADC"/>
+                <signal pad-key="pb1" index="9" function="ADC" group="ADC"/>
+                <signal pad-key="pb2" index="10" function="ADC" group="ADC"/>
+                <signal pad-key="pb3" index="11" function="ADC" group="ADC"/>
+                <signal pad-key="pb4" index="12" function="ADC" group="ADC"/>
+                <signal pad-key="pb5" index="13" function="ADC" group="ADC"/>
+                <signal pad-key="pb6" index="14" function="ADC" group="ADC"/>
+                <signal pad-key="pb7" index="15" function="ADC" group="ADC"/>
+                <signal pad-key="pa0" index="0" function="AREF" group="REFA"/>
+                <signal pad-key="pb0" index="0" function="AREF" group="REFB"/>
             </signals>
         </peripheral>
         <peripheral key="rtc" name="RTC" module-key="i6093">
@@ -167,25 +167,25 @@
         <peripheral key="twic" name="TWIC" module-key="i6089">
             <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"/>
+                <signal pad-key="pc0" function="TWI" group="SDA"/>
+                <signal pad-key="pc1" function="TWI" group="SCL"/>
             </signals>
         </peripheral>
         <peripheral key="twie" name="TWIE" module-key="i6089">
             <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"/>
+                <signal pad-key="pe0" function="TWI" group="SDA"/>
+                <signal pad-key="pe1" function="TWI" group="SCL"/>
             </signals>
         </peripheral>
         <peripheral key="port_cfg" name="PORT_CFG" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pc7" function="EVOUT" group="EVOUT" field="EVOUT"/>
-                <signal pad-id="pc4" function="EVOUT_ALT" group="EVOUT" field="CLKEVPIN"/>
-                <signal pad-id="pc6" function="RTCOUTC" group="RTCOUT"/>
+                <signal pad-key="pc7" function="CLKOUT" group="CLKOUT" field="CLKOUT"/>
+                <signal pad-key="pc4" function="CLKOUT_ALT" group="CLKOUT" field="CLKEVPIN"/>
+                <signal pad-key="pc7" function="EVOUT" group="EVOUT" field="EVOUT"/>
+                <signal pad-key="pc4" function="EVOUT_ALT" group="EVOUT" field="CLKEVPIN"/>
+                <signal pad-key="pc6" function="RTCOUTC" group="RTCOUT"/>
             </signals>
         </peripheral>
         <peripheral key="vport0" name="VPORT0" module-key="gpio_port">
@@ -203,119 +203,119 @@
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pa2" index="2" function="PORTA" group="P"/>
-                <signal pad-id="pa3" index="3" function="PORTA" group="P"/>
-                <signal pad-id="pa4" index="4" function="PORTA" group="P"/>
-                <signal pad-id="pa5" index="5" function="PORTA" group="P"/>
-                <signal pad-id="pa6" index="6" function="PORTA" group="P"/>
-                <signal pad-id="pa7" index="7" function="PORTA" group="P"/>
+                <signal pad-key="pa0" index="0" function="PORTA" group="P"/>
+                <signal pad-key="pa1" index="1" function="PORTA" group="P"/>
+                <signal pad-key="pa2" index="2" function="PORTA" group="P"/>
+                <signal pad-key="pa3" index="3" function="PORTA" group="P"/>
+                <signal pad-key="pa4" index="4" function="PORTA" group="P"/>
+                <signal pad-key="pa5" index="5" function="PORTA" group="P"/>
+                <signal pad-key="pa6" index="6" function="PORTA" group="P"/>
+                <signal pad-key="pa7" index="7" function="PORTA" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pb2" index="2" function="PORTB" group="P"/>
-                <signal pad-id="pb3" index="3" function="PORTB" group="P"/>
-                <signal pad-id="pb4" index="4" function="PORTB" group="P"/>
-                <signal pad-id="pb5" index="5" function="PORTB" group="P"/>
-                <signal pad-id="pb6" index="6" function="PORTB" group="P"/>
-                <signal pad-id="pb7" index="7" function="PORTB" group="P"/>
+                <signal pad-key="pb0" index="0" function="PORTB" group="P"/>
+                <signal pad-key="pb1" index="1" function="PORTB" group="P"/>
+                <signal pad-key="pb2" index="2" function="PORTB" group="P"/>
+                <signal pad-key="pb3" index="3" function="PORTB" group="P"/>
+                <signal pad-key="pb4" index="4" function="PORTB" group="P"/>
+                <signal pad-key="pb5" index="5" function="PORTB" group="P"/>
+                <signal pad-key="pb6" index="6" function="PORTB" group="P"/>
+                <signal pad-key="pb7" index="7" function="PORTB" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pc2" index="2" function="PORTC" group="P"/>
-                <signal pad-id="pc3" index="3" function="PORTC" group="P"/>
-                <signal pad-id="pc4" index="4" function="PORTC" group="P"/>
-                <signal pad-id="pc5" index="5" function="PORTC" group="P"/>
-                <signal pad-id="pc6" index="6" function="PORTC" group="P"/>
-                <signal pad-id="pc7" index="7" function="PORTC" group="P"/>
+                <signal pad-key="pc0" index="0" function="PORTC" group="P"/>
+                <signal pad-key="pc1" index="1" function="PORTC" group="P"/>
+                <signal pad-key="pc2" index="2" function="PORTC" group="P"/>
+                <signal pad-key="pc3" index="3" function="PORTC" group="P"/>
+                <signal pad-key="pc4" index="4" function="PORTC" group="P"/>
+                <signal pad-key="pc5" index="5" function="PORTC" group="P"/>
+                <signal pad-key="pc6" index="6" function="PORTC" group="P"/>
+                <signal pad-key="pc7" index="7" function="PORTC" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pd2" index="2" function="PORTD" group="P"/>
-                <signal pad-id="pd3" index="3" function="PORTD" group="P"/>
-                <signal pad-id="pd4" index="4" function="PORTD" group="P"/>
-                <signal pad-id="pd5" index="5" function="PORTD" group="P"/>
-                <signal pad-id="pd6" index="6" function="PORTD" group="P"/>
-                <signal pad-id="pd7" index="7" function="PORTD" group="P"/>
+                <signal pad-key="pd0" index="0" function="PORTD" group="P"/>
+                <signal pad-key="pd1" index="1" function="PORTD" group="P"/>
+                <signal pad-key="pd2" index="2" function="PORTD" group="P"/>
+                <signal pad-key="pd3" index="3" function="PORTD" group="P"/>
+                <signal pad-key="pd4" index="4" function="PORTD" group="P"/>
+                <signal pad-key="pd5" index="5" function="PORTD" group="P"/>
+                <signal pad-key="pd6" index="6" function="PORTD" group="P"/>
+                <signal pad-key="pd7" index="7" function="PORTD" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="porte" name="PORTE" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pe2" index="2" function="PORTE" group="P"/>
-                <signal pad-id="pe3" index="3" function="PORTE" group="P"/>
-                <signal pad-id="pe4" index="4" function="PORTE" group="P"/>
-                <signal pad-id="pe5" index="5" function="PORTE" group="P"/>
-                <signal pad-id="pe6" index="6" function="PORTE" group="P"/>
-                <signal pad-id="pe7" index="7" function="PORTE" group="P"/>
+                <signal pad-key="pe0" index="0" function="PORTE" group="P"/>
+                <signal pad-key="pe1" index="1" function="PORTE" group="P"/>
+                <signal pad-key="pe2" index="2" function="PORTE" group="P"/>
+                <signal pad-key="pe3" index="3" function="PORTE" group="P"/>
+                <signal pad-key="pe4" index="4" function="PORTE" group="P"/>
+                <signal pad-key="pe5" index="5" function="PORTE" group="P"/>
+                <signal pad-key="pe6" index="6" function="PORTE" group="P"/>
+                <signal pad-key="pe7" index="7" function="PORTE" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portf" name="PORTF" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pf2" index="2" function="PORTF" group="P"/>
-                <signal pad-id="pf3" index="3" function="PORTF" group="P"/>
-                <signal pad-id="pf4" index="4" function="PORTF" group="P"/>
-                <signal pad-id="pf5" index="5" function="PORTF" group="P"/>
-                <signal pad-id="pf6" index="6" function="PORTF" group="P"/>
-                <signal pad-id="pf7" index="7" function="PORTF" group="P"/>
+                <signal pad-key="pf0" index="0" function="PORTF" group="P"/>
+                <signal pad-key="pf1" index="1" function="PORTF" group="P"/>
+                <signal pad-key="pf2" index="2" function="PORTF" group="P"/>
+                <signal pad-key="pf3" index="3" function="PORTF" group="P"/>
+                <signal pad-key="pf4" index="4" function="PORTF" group="P"/>
+                <signal pad-key="pf5" index="5" function="PORTF" group="P"/>
+                <signal pad-key="pf6" index="6" function="PORTF" group="P"/>
+                <signal pad-key="pf7" index="7" function="PORTF" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portr" name="PORTR" module-key="gpio_port">
             <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"/>
+                <signal pad-key="pr0" index="0" function="PORTR" group="P"/>
+                <signal pad-key="pr1" index="1" function="PORTR" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="tcc0" name="TCC0" module-key="i6090_tc">
             <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"/>
-                <signal pad-id="pc2" function="TC0" group="OC0C" field="TC0C"/>
-                <signal pad-id="pc3" function="TC0" group="OC0D" field="TC0D"/>
-                <signal pad-id="pc4" function="TC0_ALT" group="OC0A" field="TC0A"/>
-                <signal pad-id="pc5" function="TC0_ALT" group="OC0B" field="TC0B"/>
-                <signal pad-id="pc6" function="TC0_ALT" group="OC0C" field="TC0C"/>
-                <signal pad-id="pc7" function="TC0_ALT" group="OC0D" field="TC0D"/>
+                <signal pad-key="pc0" function="TC0" group="OC0A" field="TC0A"/>
+                <signal pad-key="pc1" function="TC0" group="OC0B" field="TC0B"/>
+                <signal pad-key="pc2" function="TC0" group="OC0C" field="TC0C"/>
+                <signal pad-key="pc3" function="TC0" group="OC0D" field="TC0D"/>
+                <signal pad-key="pc4" function="TC0_ALT" group="OC0A" field="TC0A"/>
+                <signal pad-key="pc5" function="TC0_ALT" group="OC0B" field="TC0B"/>
+                <signal pad-key="pc6" function="TC0_ALT" group="OC0C" field="TC0C"/>
+                <signal pad-key="pc7" function="TC0_ALT" group="OC0D" field="TC0D"/>
             </signals>
         </peripheral>
         <peripheral key="tcc1" name="TCC1" module-key="i6090_tc">
             <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"/>
+                <signal pad-key="pc4" function="TC1" group="OC1A"/>
+                <signal pad-key="pc5" function="TC1" group="OC1B"/>
             </signals>
         </peripheral>
         <peripheral key="awexc" name="AWEXC" module-key="i6090_tc">
             <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"/>
-                <signal pad-id="pc2" function="AWEX" group="OC0BLS"/>
-                <signal pad-id="pc3" function="AWEX" group="OC0BHS"/>
-                <signal pad-id="pc4" function="AWEX" group="OC0CLS"/>
-                <signal pad-id="pc5" function="AWEX" group="OC0CHS"/>
-                <signal pad-id="pc6" function="AWEX" group="OC0DLS"/>
-                <signal pad-id="pc7" function="AWEX" group="OC0DHS"/>
+                <signal pad-key="pc0" function="AWEX" group="OC0ALS"/>
+                <signal pad-key="pc1" function="AWEX" group="OC0AHS"/>
+                <signal pad-key="pc2" function="AWEX" group="OC0BLS"/>
+                <signal pad-key="pc3" function="AWEX" group="OC0BHS"/>
+                <signal pad-key="pc4" function="AWEX" group="OC0CLS"/>
+                <signal pad-key="pc5" function="AWEX" group="OC0CHS"/>
+                <signal pad-key="pc6" function="AWEX" group="OC0DLS"/>
+                <signal pad-key="pc7" function="AWEX" group="OC0DHS"/>
             </signals>
         </peripheral>
         <peripheral key="hiresc" name="HIRESC" module-key="i6090_tc">
@@ -324,19 +324,19 @@
         <peripheral key="tcd0" name="TCD0" module-key="i6090_tc">
             <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"/>
-                <signal pad-id="pd2" function="TC0" group="OC0C"/>
-                <signal pad-id="pd3" function="TC0" group="OC0D"/>
+                <signal pad-key="pd0" function="TC0" group="OC0A"/>
+                <signal pad-key="pd1" function="TC0" group="OC0B"/>
+                <signal pad-key="pd2" function="TC0" group="OC0C"/>
+                <signal pad-key="pd3" function="TC0" group="OC0D"/>
             </signals>
         </peripheral>
         <peripheral key="tce0" name="TCE0" module-key="i6090_tc">
             <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"/>
-                <signal pad-id="pe2" function="TC0" group="OC0C"/>
-                <signal pad-id="pe3" function="TC0" group="OC0D"/>
+                <signal pad-key="pe0" function="TC0" group="OC0A"/>
+                <signal pad-key="pe1" function="TC0" group="OC0B"/>
+                <signal pad-key="pe2" function="TC0" group="OC0C"/>
+                <signal pad-key="pe3" function="TC0" group="OC0D"/>
             </signals>
         </peripheral>
         <peripheral key="awexe" name="AWEXE" module-key="i6090_tc">
@@ -345,111 +345,111 @@
         <peripheral key="tcf0" name="TCF0" module-key="i6090_tc">
             <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"/>
-                <signal pad-id="pf2" function="TC0" group="OC0C"/>
-                <signal pad-id="pf3" function="TC0" group="OC0D"/>
+                <signal pad-key="pf0" function="TC0" group="OC0A"/>
+                <signal pad-key="pf1" function="TC0" group="OC0B"/>
+                <signal pad-key="pf2" function="TC0" group="OC0C"/>
+                <signal pad-key="pf3" function="TC0" group="OC0D"/>
             </signals>
         </peripheral>
         <peripheral key="tcc2" name="TCC2" module-key="i6090_tc2">
             <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"/>
-                <signal pad-id="pc2" function="TC2" group="LOC2C"/>
-                <signal pad-id="pc3" function="TC2" group="LOC2D"/>
-                <signal pad-id="pc4" function="TC2" group="HOC2A"/>
-                <signal pad-id="pc5" function="TC2" group="HOC2B"/>
-                <signal pad-id="pc6" function="TC2" group="HOC2C"/>
-                <signal pad-id="pc7" function="TC2" group="HOC2D"/>
+                <signal pad-key="pc0" function="TC2" group="LOC2A"/>
+                <signal pad-key="pc1" function="TC2" group="LOC2B"/>
+                <signal pad-key="pc2" function="TC2" group="LOC2C"/>
+                <signal pad-key="pc3" function="TC2" group="LOC2D"/>
+                <signal pad-key="pc4" function="TC2" group="HOC2A"/>
+                <signal pad-key="pc5" function="TC2" group="HOC2B"/>
+                <signal pad-key="pc6" function="TC2" group="HOC2C"/>
+                <signal pad-key="pc7" function="TC2" group="HOC2D"/>
             </signals>
         </peripheral>
         <peripheral key="tcd2" name="TCD2" module-key="i6090_tc2">
             <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"/>
-                <signal pad-id="pd2" function="TC2" group="LOC2C"/>
-                <signal pad-id="pd3" function="TC2" group="LOC2D"/>
-                <signal pad-id="pd4" function="TC2" group="HOC2A"/>
-                <signal pad-id="pd5" function="TC2" group="HOC2B"/>
-                <signal pad-id="pd6" function="TC2" group="HOC2C"/>
-                <signal pad-id="pd7" function="TC2" group="HOC2D"/>
+                <signal pad-key="pd0" function="TC2" group="LOC2A"/>
+                <signal pad-key="pd1" function="TC2" group="LOC2B"/>
+                <signal pad-key="pd2" function="TC2" group="LOC2C"/>
+                <signal pad-key="pd3" function="TC2" group="LOC2D"/>
+                <signal pad-key="pd4" function="TC2" group="HOC2A"/>
+                <signal pad-key="pd5" function="TC2" group="HOC2B"/>
+                <signal pad-key="pd6" function="TC2" group="HOC2C"/>
+                <signal pad-key="pd7" function="TC2" group="HOC2D"/>
             </signals>
         </peripheral>
         <peripheral key="tce2" name="TCE2" module-key="i6090_tc2">
             <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"/>
-                <signal pad-id="pe2" function="TC2" group="LOC2C"/>
-                <signal pad-id="pe3" function="TC2" group="LOC2D"/>
-                <signal pad-id="pe4" function="TC2" group="HOC2A"/>
-                <signal pad-id="pe5" function="TC2" group="HOC2B"/>
-                <signal pad-id="pe6" function="TC2" group="HOC2C"/>
-                <signal pad-id="pe7" function="TC2" group="HOC2D"/>
+                <signal pad-key="pe0" function="TC2" group="LOC2A"/>
+                <signal pad-key="pe1" function="TC2" group="LOC2B"/>
+                <signal pad-key="pe2" function="TC2" group="LOC2C"/>
+                <signal pad-key="pe3" function="TC2" group="LOC2D"/>
+                <signal pad-key="pe4" function="TC2" group="HOC2A"/>
+                <signal pad-key="pe5" function="TC2" group="HOC2B"/>
+                <signal pad-key="pe6" function="TC2" group="HOC2C"/>
+                <signal pad-key="pe7" function="TC2" group="HOC2D"/>
             </signals>
         </peripheral>
         <peripheral key="tcf2" name="TCF2" module-key="i6090_tc2">
             <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"/>
-                <signal pad-id="pf2" function="TC2" group="LOC2C"/>
-                <signal pad-id="pf3" function="TC2" group="LOC2D"/>
-                <signal pad-id="pf4" function="TC2" group="HOC2A"/>
-                <signal pad-id="pf5" function="TC2" group="HOC2B"/>
-                <signal pad-id="pf6" function="TC2" group="HOC2C"/>
-                <signal pad-id="pf7" function="TC2" group="HOC2D"/>
+                <signal pad-key="pf0" function="TC2" group="LOC2A"/>
+                <signal pad-key="pf1" function="TC2" group="LOC2B"/>
+                <signal pad-key="pf2" function="TC2" group="LOC2C"/>
+                <signal pad-key="pf3" function="TC2" group="LOC2D"/>
+                <signal pad-key="pf4" function="TC2" group="HOC2A"/>
+                <signal pad-key="pf5" function="TC2" group="HOC2B"/>
+                <signal pad-key="pf6" function="TC2" group="HOC2C"/>
+                <signal pad-key="pf7" function="TC2" group="HOC2D"/>
             </signals>
         </peripheral>
         <peripheral key="usartc0" name="USARTC0" module-key="i6090_usart">
             <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"/>
-                <signal pad-id="pc3" function="USART" group="TXD" field="USART0"/>
-                <signal pad-id="pc5" function="USART_ALT" group="XCK" field="USART0"/>
-                <signal pad-id="pc6" function="USART_ALT" group="RXD" field="USART0"/>
-                <signal pad-id="pc7" function="USART_ALT" group="TXD" field="USART0"/>
+                <signal pad-key="pc1" function="USART" group="XCK" field="USART0"/>
+                <signal pad-key="pc2" function="USART" group="RXD" field="USART0"/>
+                <signal pad-key="pc3" function="USART" group="TXD" field="USART0"/>
+                <signal pad-key="pc5" function="USART_ALT" group="XCK" field="USART0"/>
+                <signal pad-key="pc6" function="USART_ALT" group="RXD" field="USART0"/>
+                <signal pad-key="pc7" function="USART_ALT" group="TXD" field="USART0"/>
             </signals>
         </peripheral>
         <peripheral key="usartd0" name="USARTD0" module-key="i6090_usart">
             <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"/>
-                <signal pad-id="pd3" function="USART" group="TXD"/>
+                <signal pad-key="pd1" function="USART" group="XCK"/>
+                <signal pad-key="pd2" function="USART" group="RXD"/>
+                <signal pad-key="pd3" function="USART" group="TXD"/>
             </signals>
         </peripheral>
         <peripheral key="usarte0" name="USARTE0" module-key="i6090_usart">
             <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"/>
-                <signal pad-id="pe3" function="USART" group="TXD"/>
+                <signal pad-key="pe1" function="USART" group="XCK"/>
+                <signal pad-key="pe2" function="USART" group="RXD"/>
+                <signal pad-key="pe3" function="USART" group="TXD"/>
             </signals>
         </peripheral>
         <peripheral key="spic" name="SPIC" module-key="i6090_spi">
             <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"/>
-                <signal pad-id="pc6" function="SPI" group="MISO" field="SPI"/>
-                <signal pad-id="pc7" function="SPI" group="SCK" field="SPI"/>
-                <signal pad-id="pc4" function="SPI_ALT" group="SS" field="SPI"/>
-                <signal pad-id="pc5" function="SPI_ALT" group="SCK" field="SPI"/>
-                <signal pad-id="pc6" function="SPI_ALT" group="MISO" field="SPI"/>
-                <signal pad-id="pc7" function="SPI_ALT" group="MOSI" field="SPI"/>
+                <signal pad-key="pc4" function="SPI" group="SS" field="SPI"/>
+                <signal pad-key="pc5" function="SPI" group="MOSI" field="SPI"/>
+                <signal pad-key="pc6" function="SPI" group="MISO" field="SPI"/>
+                <signal pad-key="pc7" function="SPI" group="SCK" field="SPI"/>
+                <signal pad-key="pc4" function="SPI_ALT" group="SS" field="SPI"/>
+                <signal pad-key="pc5" function="SPI_ALT" group="SCK" field="SPI"/>
+                <signal pad-key="pc6" function="SPI_ALT" group="MISO" field="SPI"/>
+                <signal pad-key="pc7" function="SPI_ALT" group="MOSI" field="SPI"/>
             </signals>
         </peripheral>
         <peripheral key="spid" name="SPID" module-key="i6090_spi">
             <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"/>
-                <signal pad-id="pd6" function="SPI" group="MISO"/>
-                <signal pad-id="pd7" function="SPI" group="SCK"/>
+                <signal pad-key="pd4" function="SPI" group="SS"/>
+                <signal pad-key="pd5" function="SPI" group="MOSI"/>
+                <signal pad-key="pd6" function="SPI" group="MISO"/>
+                <signal pad-key="pd7" function="SPI" group="SCK"/>
             </signals>
         </peripheral>
         <peripheral key="spie" name="SPIE" module-key="i6090_spi">
@@ -1408,78 +1408,135 @@
             </register-group>
         </module>
     </modules>
+    <pads>
+        <pad key="pa3" name="PA3"/>
+        <pad key="pa4" name="PA4"/>
+        <pad key="pa5" name="PA5"/>
+        <pad key="pa6" name="PA6"/>
+        <pad key="pa7" name="PA7"/>
+        <pad key="pb0" name="PB0"/>
+        <pad key="pb1" name="PB1"/>
+        <pad key="pb2" name="PB2"/>
+        <pad key="pb3" name="PB3"/>
+        <pad key="pb4" name="PB4"/>
+        <pad key="pb5" name="PB5"/>
+        <pad key="pb6" name="PB6"/>
+        <pad key="pb7" name="PB7"/>
+        <pad key="gnd" name="GND"/>
+        <pad key="vcc" name="VCC"/>
+        <pad key="pc0" name="PC0"/>
+        <pad key="pc1" name="PC1"/>
+        <pad key="pc2" name="PC2"/>
+        <pad key="pc3" name="PC3"/>
+        <pad key="pc4" name="PC4"/>
+        <pad key="pc5" name="PC5"/>
+        <pad key="pc6" name="PC6"/>
+        <pad key="pc7" name="PC7"/>
+        <pad key="pd0" name="PD0"/>
+        <pad key="pd1" name="PD1"/>
+        <pad key="pd2" name="PD2"/>
+        <pad key="pd3" name="PD3"/>
+        <pad key="pd4" name="PD4"/>
+        <pad key="pd5" name="PD5"/>
+        <pad key="pd6" name="PD6"/>
+        <pad key="pd7" name="PD7"/>
+        <pad key="pe0" name="PE0"/>
+        <pad key="pe1" name="PE1"/>
+        <pad key="pe2" name="PE2"/>
+        <pad key="pe3" name="PE3"/>
+        <pad key="pe4" name="PE4"/>
+        <pad key="pe5" name="PE5"/>
+        <pad key="pe6" name="PE6"/>
+        <pad key="pe7" name="PE7"/>
+        <pad key="pf0" name="PF0"/>
+        <pad key="pf1" name="PF1"/>
+        <pad key="pf2" name="PF2"/>
+        <pad key="pf3" name="PF3"/>
+        <pad key="pf4" name="PF4"/>
+        <pad key="pf5" name="PF5"/>
+        <pad key="pf6" name="PF6"/>
+        <pad key="pf7" name="PF7"/>
+        <pad key="pdi" name="PDI"/>
+        <pad key="reset" name="RESET"/>
+        <pad key="pr0" name="PR0"/>
+        <pad key="pr1" name="PR1"/>
+        <pad key="avcc" name="AVCC"/>
+        <pad key="pa0" name="PA0"/>
+        <pad key="pa1" name="PA1"/>
+        <pad key="pa2" name="PA2"/>
+    </pads>
     <pinouts>
         <pinout key="qfp_qfn_64" name="QFP_QFN_64" type="qfn">
-            <pin position="1" pad="PA3"/>
-            <pin position="2" pad="PA4"/>
-            <pin position="3" pad="PA5"/>
-            <pin position="4" pad="PA6"/>
-            <pin position="5" pad="PA7"/>
-            <pin position="6" pad="PB0"/>
-            <pin position="7" pad="PB1"/>
-            <pin position="8" pad="PB2"/>
-            <pin position="9" pad="PB3"/>
-            <pin position="10" pad="PB4"/>
-            <pin position="11" pad="PB5"/>
-            <pin position="12" pad="PB6"/>
-            <pin position="13" pad="PB7"/>
-            <pin position="14" pad="GND"/>
-            <pin position="15" pad="VCC"/>
-            <pin position="16" pad="PC0"/>
-            <pin position="17" pad="PC1"/>
-            <pin position="18" pad="PC2"/>
-            <pin position="19" pad="PC3"/>
-            <pin position="20" pad="PC4"/>
-            <pin position="21" pad="PC5"/>
-            <pin position="22" pad="PC6"/>
-            <pin position="23" pad="PC7"/>
-            <pin position="24" pad="GND"/>
-            <pin position="25" pad="VCC"/>
-            <pin position="26" pad="PD0"/>
-            <pin position="27" pad="PD1"/>
-            <pin position="28" pad="PD2"/>
-            <pin position="29" pad="PD3"/>
-            <pin position="30" pad="PD4"/>
-            <pin position="31" pad="PD5"/>
-            <pin position="32" pad="PD6"/>
-            <pin position="33" pad="PD7"/>
-            <pin position="34" pad="GND"/>
-            <pin position="35" pad="VCC"/>
-            <pin position="36" pad="PE0"/>
-            <pin position="37" pad="PE1"/>
-            <pin position="38" pad="PE2"/>
-            <pin position="39" pad="PE3"/>
-            <pin position="40" pad="PE4"/>
-            <pin position="41" pad="PE5"/>
-            <pin position="42" pad="PE6"/>
-            <pin position="43" pad="PE7"/>
-            <pin position="44" pad="GND"/>
-            <pin position="45" pad="VCC"/>
-            <pin position="46" pad="PF0"/>
-            <pin position="47" pad="PF1"/>
-            <pin position="48" pad="PF2"/>
-            <pin position="49" pad="PF3"/>
-            <pin position="50" pad="PF4"/>
-            <pin position="51" pad="PF5"/>
-            <pin position="52" pad="GND"/>
-            <pin position="53" pad="VCC"/>
-            <pin position="54" pad="PF6"/>
-            <pin position="55" pad="PF7"/>
-            <pin position="56" pad="PDI"/>
-            <pin position="57" pad="RESET"/>
-            <pin position="58" pad="PR0"/>
-            <pin position="59" pad="PR1"/>
-            <pin position="60" pad="GND"/>
-            <pin position="61" pad="AVCC"/>
-            <pin position="62" pad="PA0"/>
-            <pin position="63" pad="PA1"/>
-            <pin position="64" pad="PA2"/>
+            <pin position="1" pad-key="pa3"/>
+            <pin position="2" pad-key="pa4"/>
+            <pin position="3" pad-key="pa5"/>
+            <pin position="4" pad-key="pa6"/>
+            <pin position="5" pad-key="pa7"/>
+            <pin position="6" pad-key="pb0"/>
+            <pin position="7" pad-key="pb1"/>
+            <pin position="8" pad-key="pb2"/>
+            <pin position="9" pad-key="pb3"/>
+            <pin position="10" pad-key="pb4"/>
+            <pin position="11" pad-key="pb5"/>
+            <pin position="12" pad-key="pb6"/>
+            <pin position="13" pad-key="pb7"/>
+            <pin position="14" pad-key="gnd"/>
+            <pin position="15" pad-key="vcc"/>
+            <pin position="16" pad-key="pc0"/>
+            <pin position="17" pad-key="pc1"/>
+            <pin position="18" pad-key="pc2"/>
+            <pin position="19" pad-key="pc3"/>
+            <pin position="20" pad-key="pc4"/>
+            <pin position="21" pad-key="pc5"/>
+            <pin position="22" pad-key="pc6"/>
+            <pin position="23" pad-key="pc7"/>
+            <pin position="24" pad-key="gnd"/>
+            <pin position="25" pad-key="vcc"/>
+            <pin position="26" pad-key="pd0"/>
+            <pin position="27" pad-key="pd1"/>
+            <pin position="28" pad-key="pd2"/>
+            <pin position="29" pad-key="pd3"/>
+            <pin position="30" pad-key="pd4"/>
+            <pin position="31" pad-key="pd5"/>
+            <pin position="32" pad-key="pd6"/>
+            <pin position="33" pad-key="pd7"/>
+            <pin position="34" pad-key="gnd"/>
+            <pin position="35" pad-key="vcc"/>
+            <pin position="36" pad-key="pe0"/>
+            <pin position="37" pad-key="pe1"/>
+            <pin position="38" pad-key="pe2"/>
+            <pin position="39" pad-key="pe3"/>
+            <pin position="40" pad-key="pe4"/>
+            <pin position="41" pad-key="pe5"/>
+            <pin position="42" pad-key="pe6"/>
+            <pin position="43" pad-key="pe7"/>
+            <pin position="44" pad-key="gnd"/>
+            <pin position="45" pad-key="vcc"/>
+            <pin position="46" pad-key="pf0"/>
+            <pin position="47" pad-key="pf1"/>
+            <pin position="48" pad-key="pf2"/>
+            <pin position="49" pad-key="pf3"/>
+            <pin position="50" pad-key="pf4"/>
+            <pin position="51" pad-key="pf5"/>
+            <pin position="52" pad-key="gnd"/>
+            <pin position="53" pad-key="vcc"/>
+            <pin position="54" pad-key="pf6"/>
+            <pin position="55" pad-key="pf7"/>
+            <pin position="56" pad-key="pdi"/>
+            <pin position="57" pad-key="reset"/>
+            <pin position="58" pad-key="pr0"/>
+            <pin position="59" pad-key="pr1"/>
+            <pin position="60" pad-key="gnd"/>
+            <pin position="61" pad-key="avcc"/>
+            <pin position="62" pad-key="pa0"/>
+            <pin position="63" pad-key="pa1"/>
+            <pin position="64" pad-key="pa2"/>
         </pinout>
     </pinouts>
     <variants>
-        <variant name="ATxmega128D3-AU" pinout-key="qfp_qfn_64" package="TQFP64"/>
-        <variant name="ATxmega128D3-MH" pinout-key="qfp_qfn_64" package="QFN64"/>
-        <variant name="ATxmega128D3-AN" pinout-key="qfp_qfn_64" package="TQFP64"/>
-        <variant name="ATxmega128D3-MN" pinout-key="qfp_qfn_64" package="QFN64"/>
+        <variant key="atxmega128d3_au" name="ATxmega128D3-AU" pinout-key="qfp_qfn_64"/>
+        <variant key="atxmega128d3_mh" name="ATxmega128D3-MH" pinout-key="qfp_qfn_64"/>
+        <variant key="atxmega128d3_an" name="ATxmega128D3-AN" pinout-key="qfp_qfn_64"/>
+        <variant key="atxmega128d3_mn" name="ATxmega128D3-MN" pinout-key="qfp_qfn_64"/>
     </variants>
 </device>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA128D4.xml b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA128D4.xml
index a6e0ef06..0b971275 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA128D4.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA128D4.xml
@@ -92,12 +92,12 @@
         <peripheral key="osc" name="OSC" module-key="i6079">
             <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"/>
-                <signal pad-id="pr0" function="TOSC" group="TOSC2"/>
-                <signal pad-id="pr1" function="TOSC" group="TOSC1"/>
-                <signal pad-id="pe2" function="TOSC_ALT" group="TOSC2"/>
-                <signal pad-id="pe3" function="TOSC_ALT" group="TOSC1"/>
+                <signal pad-key="pr0" function="XTAL" group="XTAL2"/>
+                <signal pad-key="pr1" function="XTAL" group="XTAL1"/>
+                <signal pad-key="pr0" function="TOSC" group="TOSC2"/>
+                <signal pad-key="pr1" function="TOSC" group="TOSC1"/>
+                <signal pad-key="pe2" function="TOSC_ALT" group="TOSC2"/>
+                <signal pad-key="pe3" function="TOSC_ALT" group="TOSC1"/>
             </signals>
         </peripheral>
         <peripheral key="dfllrc32m" name="DFLLRC32M" module-key="i6055">
@@ -121,11 +121,11 @@
         <peripheral key="portcfg" name="PORTCFG" module-key="i6075_portcfg">
             <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"/>
-                <signal pad-id="pc7" function="EVOUT" group="EVOUT" field="EVOUT"/>
-                <signal pad-id="pc4" function="EVOUT_ALT" group="EVOUT" field="CLKEVPIN"/>
-                <signal pad-id="pc6" function="RTCOUTC" group="RTCOUT"/>
+                <signal pad-key="pc7" function="CLKOUT" group="CLKOUT" field="CLKOUT"/>
+                <signal pad-key="pc4" function="CLKOUT_ALT" group="CLKOUT" field="CLKEVPIN"/>
+                <signal pad-key="pc7" function="EVOUT" group="EVOUT" field="EVOUT"/>
+                <signal pad-key="pc4" function="EVOUT_ALT" group="EVOUT" field="CLKEVPIN"/>
+                <signal pad-key="pc6" function="RTCOUTC" group="RTCOUT"/>
             </signals>
         </peripheral>
         <peripheral key="crc" name="CRC" module-key="i6111">
@@ -140,34 +140,34 @@
         <peripheral key="adca" name="ADCA" module-key="i6110">
             <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"/>
-                <signal pad-id="pa2" index="2" function="ADC" group="ADC"/>
-                <signal pad-id="pa3" index="3" function="ADC" group="ADC"/>
-                <signal pad-id="pa4" index="4" function="ADC" group="ADC"/>
-                <signal pad-id="pa5" index="5" function="ADC" group="ADC"/>
-                <signal pad-id="pa6" index="6" function="ADC" group="ADC"/>
-                <signal pad-id="pa7" index="7" function="ADC" group="ADC"/>
-                <signal pad-id="pb0" index="8" function="ADC" group="ADC"/>
-                <signal pad-id="pb1" index="9" function="ADC" group="ADC"/>
-                <signal pad-id="pb2" index="10" function="ADC" group="ADC"/>
-                <signal pad-id="pb3" index="11" function="ADC" group="ADC"/>
-                <signal pad-id="pa0" index="0" function="AREF" group="REFA"/>
-                <signal pad-id="pb0" index="0" function="AREF" group="REFB"/>
+                <signal pad-key="pa0" index="0" function="ADC" group="ADC"/>
+                <signal pad-key="pa1" index="1" function="ADC" group="ADC"/>
+                <signal pad-key="pa2" index="2" function="ADC" group="ADC"/>
+                <signal pad-key="pa3" index="3" function="ADC" group="ADC"/>
+                <signal pad-key="pa4" index="4" function="ADC" group="ADC"/>
+                <signal pad-key="pa5" index="5" function="ADC" group="ADC"/>
+                <signal pad-key="pa6" index="6" function="ADC" group="ADC"/>
+                <signal pad-key="pa7" index="7" function="ADC" group="ADC"/>
+                <signal pad-key="pb0" index="8" function="ADC" group="ADC"/>
+                <signal pad-key="pb1" index="9" function="ADC" group="ADC"/>
+                <signal pad-key="pb2" index="10" function="ADC" group="ADC"/>
+                <signal pad-key="pb3" index="11" function="ADC" group="ADC"/>
+                <signal pad-key="pa0" index="0" function="AREF" group="REFA"/>
+                <signal pad-key="pb0" index="0" function="AREF" group="REFB"/>
             </signals>
         </peripheral>
         <peripheral key="aca" name="ACA" module-key="i6077">
             <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"/>
-                <signal pad-id="pa2" index="2" function="AC" group="AC"/>
-                <signal pad-id="pa3" index="3" function="AC" group="AC"/>
-                <signal pad-id="pa4" index="4" function="AC" group="AC"/>
-                <signal pad-id="pa5" index="5" function="AC" group="AC"/>
-                <signal pad-id="pa6" index="6" function="AC" group="AC"/>
-                <signal pad-id="pa7" index="7" function="AC" group="AC"/>
-                <signal pad-id="pa7" index="0" function="ACOUT" group="ACOUT"/>
+                <signal pad-key="pa0" index="0" function="AC" group="AC"/>
+                <signal pad-key="pa1" index="1" function="AC" group="AC"/>
+                <signal pad-key="pa2" index="2" function="AC" group="AC"/>
+                <signal pad-key="pa3" index="3" function="AC" group="AC"/>
+                <signal pad-key="pa4" index="4" function="AC" group="AC"/>
+                <signal pad-key="pa5" index="5" function="AC" group="AC"/>
+                <signal pad-key="pa6" index="6" function="AC" group="AC"/>
+                <signal pad-key="pa7" index="7" function="AC" group="AC"/>
+                <signal pad-key="pa7" index="0" function="ACOUT" group="ACOUT"/>
             </signals>
         </peripheral>
         <peripheral key="rtc" name="RTC" module-key="i6093">
@@ -176,156 +176,156 @@
         <peripheral key="twic" name="TWIC" module-key="i6089">
             <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"/>
+                <signal pad-key="pc0" function="TWI" group="SDA"/>
+                <signal pad-key="pc1" function="TWI" group="SCL"/>
             </signals>
         </peripheral>
         <peripheral key="twie" name="TWIE" module-key="i6089">
             <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"/>
+                <signal pad-key="pe0" function="TWI" group="SDA"/>
+                <signal pad-key="pe1" function="TWI" group="SCL"/>
             </signals>
         </peripheral>
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pa2" index="2" function="PORTA" group="P"/>
-                <signal pad-id="pa3" index="3" function="PORTA" group="P"/>
-                <signal pad-id="pa4" index="4" function="PORTA" group="P"/>
-                <signal pad-id="pa5" index="5" function="PORTA" group="P"/>
-                <signal pad-id="pa6" index="6" function="PORTA" group="P"/>
-                <signal pad-id="pa7" index="7" function="PORTA" group="P"/>
+                <signal pad-key="pa0" index="0" function="PORTA" group="P"/>
+                <signal pad-key="pa1" index="1" function="PORTA" group="P"/>
+                <signal pad-key="pa2" index="2" function="PORTA" group="P"/>
+                <signal pad-key="pa3" index="3" function="PORTA" group="P"/>
+                <signal pad-key="pa4" index="4" function="PORTA" group="P"/>
+                <signal pad-key="pa5" index="5" function="PORTA" group="P"/>
+                <signal pad-key="pa6" index="6" function="PORTA" group="P"/>
+                <signal pad-key="pa7" index="7" function="PORTA" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pb2" index="2" function="PORTB" group="P"/>
-                <signal pad-id="pb3" index="3" function="PORTB" group="P"/>
+                <signal pad-key="pb0" index="0" function="PORTB" group="P"/>
+                <signal pad-key="pb1" index="1" function="PORTB" group="P"/>
+                <signal pad-key="pb2" index="2" function="PORTB" group="P"/>
+                <signal pad-key="pb3" index="3" function="PORTB" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pc2" index="2" function="PORTC" group="P"/>
-                <signal pad-id="pc3" index="3" function="PORTC" group="P"/>
-                <signal pad-id="pc4" index="4" function="PORTC" group="P"/>
-                <signal pad-id="pc5" index="5" function="PORTC" group="P"/>
-                <signal pad-id="pc6" index="6" function="PORTC" group="P"/>
-                <signal pad-id="pc7" index="7" function="PORTC" group="P"/>
+                <signal pad-key="pc0" index="0" function="PORTC" group="P"/>
+                <signal pad-key="pc1" index="1" function="PORTC" group="P"/>
+                <signal pad-key="pc2" index="2" function="PORTC" group="P"/>
+                <signal pad-key="pc3" index="3" function="PORTC" group="P"/>
+                <signal pad-key="pc4" index="4" function="PORTC" group="P"/>
+                <signal pad-key="pc5" index="5" function="PORTC" group="P"/>
+                <signal pad-key="pc6" index="6" function="PORTC" group="P"/>
+                <signal pad-key="pc7" index="7" function="PORTC" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pd2" index="2" function="PORTD" group="P"/>
-                <signal pad-id="pd3" index="3" function="PORTD" group="P"/>
-                <signal pad-id="pd4" index="4" function="PORTD" group="P"/>
-                <signal pad-id="pd5" index="5" function="PORTD" group="P"/>
-                <signal pad-id="pd6" index="6" function="PORTD" group="P"/>
-                <signal pad-id="pd7" index="7" function="PORTD" group="P"/>
+                <signal pad-key="pd0" index="0" function="PORTD" group="P"/>
+                <signal pad-key="pd1" index="1" function="PORTD" group="P"/>
+                <signal pad-key="pd2" index="2" function="PORTD" group="P"/>
+                <signal pad-key="pd3" index="3" function="PORTD" group="P"/>
+                <signal pad-key="pd4" index="4" function="PORTD" group="P"/>
+                <signal pad-key="pd5" index="5" function="PORTD" group="P"/>
+                <signal pad-key="pd6" index="6" function="PORTD" group="P"/>
+                <signal pad-key="pd7" index="7" function="PORTD" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="porte" name="PORTE" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pe2" index="2" function="PORTE" group="P"/>
-                <signal pad-id="pe3" index="3" function="PORTE" group="P"/>
+                <signal pad-key="pe0" index="0" function="PORTE" group="P"/>
+                <signal pad-key="pe1" index="1" function="PORTE" group="P"/>
+                <signal pad-key="pe2" index="2" function="PORTE" group="P"/>
+                <signal pad-key="pe3" index="3" function="PORTE" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portr" name="PORTR" module-key="gpio_port">
             <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"/>
+                <signal pad-key="pr0" index="0" function="PORTR" group="P"/>
+                <signal pad-key="pr1" index="1" function="PORTR" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="tcc0" name="TCC0" module-key="i6090_tc">
             <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"/>
-                <signal pad-id="pc2" function="TCC" group="OC0C" field="TC0C"/>
-                <signal pad-id="pc3" function="TCC" group="OC0D" field="TC0D"/>
-                <signal pad-id="pc4" function="TCC_ALT" group="OC0A" field="TC0A"/>
-                <signal pad-id="pc5" function="TCC_ALT" group="OC0B" field="TC0B"/>
-                <signal pad-id="pc6" function="TCC_ALT" group="OC0C" field="TC0C"/>
-                <signal pad-id="pc7" function="TCC_ALT" group="OC0D" field="TC0D"/>
+                <signal pad-key="pc0" function="TCC" group="OC0A" field="TC0A"/>
+                <signal pad-key="pc1" function="TCC" group="OC0B" field="TC0B"/>
+                <signal pad-key="pc2" function="TCC" group="OC0C" field="TC0C"/>
+                <signal pad-key="pc3" function="TCC" group="OC0D" field="TC0D"/>
+                <signal pad-key="pc4" function="TCC_ALT" group="OC0A" field="TC0A"/>
+                <signal pad-key="pc5" function="TCC_ALT" group="OC0B" field="TC0B"/>
+                <signal pad-key="pc6" function="TCC_ALT" group="OC0C" field="TC0C"/>
+                <signal pad-key="pc7" function="TCC_ALT" group="OC0D" field="TC0D"/>
             </signals>
         </peripheral>
         <peripheral key="tcc1" name="TCC1" module-key="i6090_tc">
             <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"/>
+                <signal pad-key="pc4" function="TCC" group="OC1A"/>
+                <signal pad-key="pc5" function="TCC" group="OC1B"/>
             </signals>
         </peripheral>
         <peripheral key="tcd0" name="TCD0" module-key="i6090_tc">
             <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"/>
-                <signal pad-id="pd2" function="TCC" group="OC0C"/>
-                <signal pad-id="pd3" function="TCC" group="OC0D"/>
+                <signal pad-key="pd0" function="TCC" group="OC0A"/>
+                <signal pad-key="pd1" function="TCC" group="OC0B"/>
+                <signal pad-key="pd2" function="TCC" group="OC0C"/>
+                <signal pad-key="pd3" function="TCC" group="OC0D"/>
             </signals>
         </peripheral>
         <peripheral key="tce0" name="TCE0" module-key="i6090_tc">
             <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"/>
-                <signal pad-id="pe2" function="TCE" group="OC0C"/>
-                <signal pad-id="pe3" function="TCE" group="OC0D"/>
+                <signal pad-key="pe0" function="TCE" group="OC0A"/>
+                <signal pad-key="pe1" function="TCE" group="OC0B"/>
+                <signal pad-key="pe2" function="TCE" group="OC0C"/>
+                <signal pad-key="pe3" function="TCE" group="OC0D"/>
             </signals>
         </peripheral>
         <peripheral key="tcc2" name="TCC2" module-key="i6090_tc2">
             <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"/>
-                <signal pad-id="pc2" function="TCC2" group="LOC2C"/>
-                <signal pad-id="pc3" function="TCC2" group="LOC2D"/>
-                <signal pad-id="pc4" function="TCC2" group="HOC2A"/>
-                <signal pad-id="pc5" function="TCC2" group="HOC2B"/>
-                <signal pad-id="pc6" function="TCC2" group="HOC2C"/>
-                <signal pad-id="pc7" function="TCC2" group="HOC2D"/>
+                <signal pad-key="pc0" function="TCC2" group="LOC2A"/>
+                <signal pad-key="pc1" function="TCC2" group="LOC2B"/>
+                <signal pad-key="pc2" function="TCC2" group="LOC2C"/>
+                <signal pad-key="pc3" function="TCC2" group="LOC2D"/>
+                <signal pad-key="pc4" function="TCC2" group="HOC2A"/>
+                <signal pad-key="pc5" function="TCC2" group="HOC2B"/>
+                <signal pad-key="pc6" function="TCC2" group="HOC2C"/>
+                <signal pad-key="pc7" function="TCC2" group="HOC2D"/>
             </signals>
         </peripheral>
         <peripheral key="tcd2" name="TCD2" module-key="i6090_tc2">
             <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"/>
-                <signal pad-id="pd2" function="TC2" group="LOC2C"/>
-                <signal pad-id="pd3" function="TC2" group="LOC2D"/>
-                <signal pad-id="pd4" function="TC2" group="HOC2A"/>
-                <signal pad-id="pd5" function="TC2" group="HOC2B"/>
-                <signal pad-id="pd6" function="TC2" group="HOC2C"/>
-                <signal pad-id="pd7" function="TC2" group="HOC2D"/>
+                <signal pad-key="pd0" function="TC2" group="LOC2A"/>
+                <signal pad-key="pd1" function="TC2" group="LOC2B"/>
+                <signal pad-key="pd2" function="TC2" group="LOC2C"/>
+                <signal pad-key="pd3" function="TC2" group="LOC2D"/>
+                <signal pad-key="pd4" function="TC2" group="HOC2A"/>
+                <signal pad-key="pd5" function="TC2" group="HOC2B"/>
+                <signal pad-key="pd6" function="TC2" group="HOC2C"/>
+                <signal pad-key="pd7" function="TC2" group="HOC2D"/>
             </signals>
         </peripheral>
         <peripheral key="awexc" name="AWEXC" module-key="i6090_awex">
             <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"/>
-                <signal pad-id="pc2" function="AWEX" group="OC0BLS"/>
-                <signal pad-id="pc3" function="AWEX" group="OC0BHS"/>
-                <signal pad-id="pc4" function="AWEX" group="OC0CLS"/>
-                <signal pad-id="pc5" function="AWEX" group="OC0CHS"/>
-                <signal pad-id="pc6" function="AWEX" group="OC0DLS"/>
-                <signal pad-id="pc7" function="AWEX" group="OC0DHS"/>
+                <signal pad-key="pc0" function="AWEX" group="OC0ALS"/>
+                <signal pad-key="pc1" function="AWEX" group="OC0AHS"/>
+                <signal pad-key="pc2" function="AWEX" group="OC0BLS"/>
+                <signal pad-key="pc3" function="AWEX" group="OC0BHS"/>
+                <signal pad-key="pc4" function="AWEX" group="OC0CLS"/>
+                <signal pad-key="pc5" function="AWEX" group="OC0CHS"/>
+                <signal pad-key="pc6" function="AWEX" group="OC0DLS"/>
+                <signal pad-key="pc7" function="AWEX" group="OC0DHS"/>
             </signals>
         </peripheral>
         <peripheral key="hiresc" name="HIRESC" module-key="i6090_hires">
@@ -334,42 +334,42 @@
         <peripheral key="usartc0" name="USARTC0" module-key="i6090_usart">
             <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"/>
-                <signal pad-id="pc3" function="USART" group="TXD" field="USART0"/>
-                <signal pad-id="pc5" function="USART_ALT" group="XCK" field="USART0"/>
-                <signal pad-id="pc6" function="USART_ALT" group="RXD" field="USART0"/>
-                <signal pad-id="pc7" function="USART_ALT" group="TXD" field="USART0"/>
+                <signal pad-key="pc1" function="USART" group="XCK" field="USART0"/>
+                <signal pad-key="pc2" function="USART" group="RXD" field="USART0"/>
+                <signal pad-key="pc3" function="USART" group="TXD" field="USART0"/>
+                <signal pad-key="pc5" function="USART_ALT" group="XCK" field="USART0"/>
+                <signal pad-key="pc6" function="USART_ALT" group="RXD" field="USART0"/>
+                <signal pad-key="pc7" function="USART_ALT" group="TXD" field="USART0"/>
             </signals>
         </peripheral>
         <peripheral key="usartd0" name="USARTD0" module-key="i6090_usart">
             <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"/>
-                <signal pad-id="pd3" function="USART" group="TXD"/>
+                <signal pad-key="pd1" function="USART" group="XCK"/>
+                <signal pad-key="pd2" function="USART" group="RXD"/>
+                <signal pad-key="pd3" function="USART" group="TXD"/>
             </signals>
         </peripheral>
         <peripheral key="spic" name="SPIC" module-key="i6090_spi">
             <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"/>
-                <signal pad-id="pc6" function="SPI" group="MISO" field="SPI"/>
-                <signal pad-id="pc7" function="SPI" group="SCK" field="SPI"/>
-                <signal pad-id="pc4" function="SPI_ALT" group="SS" field="SPI"/>
-                <signal pad-id="pc5" function="SPI_ALT" group="SCK" field="SPI"/>
-                <signal pad-id="pc6" function="SPI_ALT" group="MISO" field="SPI"/>
-                <signal pad-id="pc7" function="SPI_ALT" group="MOSI" field="SPI"/>
+                <signal pad-key="pc4" function="SPI" group="SS" field="SPI"/>
+                <signal pad-key="pc5" function="SPI" group="MOSI" field="SPI"/>
+                <signal pad-key="pc6" function="SPI" group="MISO" field="SPI"/>
+                <signal pad-key="pc7" function="SPI" group="SCK" field="SPI"/>
+                <signal pad-key="pc4" function="SPI_ALT" group="SS" field="SPI"/>
+                <signal pad-key="pc5" function="SPI_ALT" group="SCK" field="SPI"/>
+                <signal pad-key="pc6" function="SPI_ALT" group="MISO" field="SPI"/>
+                <signal pad-key="pc7" function="SPI_ALT" group="MOSI" field="SPI"/>
             </signals>
         </peripheral>
         <peripheral key="spid" name="SPID" module-key="i6090_spi">
             <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"/>
-                <signal pad-id="pd6" function="SPI" group="MISO"/>
-                <signal pad-id="pd7" function="SPI" group="SCK"/>
+                <signal pad-key="pd4" function="SPI" group="SS"/>
+                <signal pad-key="pd5" function="SPI" group="MOSI"/>
+                <signal pad-key="pd6" function="SPI" group="MISO"/>
+                <signal pad-key="pd7" function="SPI" group="SCK"/>
             </signals>
         </peripheral>
         <peripheral key="ircom" name="IRCOM" module-key="i6090_ircom">
@@ -1363,110 +1363,151 @@
             </register-group>
         </module>
     </modules>
+    <pads>
+        <pad key="pa5" name="PA5"/>
+        <pad key="pa6" name="PA6"/>
+        <pad key="pa7" name="PA7"/>
+        <pad key="pb0" name="PB0"/>
+        <pad key="pb1" name="PB1"/>
+        <pad key="pb2" name="PB2"/>
+        <pad key="pb3" name="PB3"/>
+        <pad key="gnd" name="GND"/>
+        <pad key="vcc" name="VCC"/>
+        <pad key="pc0" name="PC0"/>
+        <pad key="pc1" name="PC1"/>
+        <pad key="pc2" name="PC2"/>
+        <pad key="pc3" name="PC3"/>
+        <pad key="pc4" name="PC4"/>
+        <pad key="pc5" name="PC5"/>
+        <pad key="pc6" name="PC6"/>
+        <pad key="pc7" name="PC7"/>
+        <pad key="pd0" name="PD0"/>
+        <pad key="pd1" name="PD1"/>
+        <pad key="pd2" name="PD2"/>
+        <pad key="pd3" name="PD3"/>
+        <pad key="pd4" name="PD4"/>
+        <pad key="pd5" name="PD5"/>
+        <pad key="pd6" name="PD6"/>
+        <pad key="pd7" name="PD7"/>
+        <pad key="pe0" name="PE0"/>
+        <pad key="pe1" name="PE1"/>
+        <pad key="pe2" name="PE2"/>
+        <pad key="pe3" name="PE3"/>
+        <pad key="pdi" name="PDI"/>
+        <pad key="reset" name="RESET"/>
+        <pad key="pr0" name="PR0"/>
+        <pad key="pr1" name="PR1"/>
+        <pad key="avcc" name="AVCC"/>
+        <pad key="pa0" name="PA0"/>
+        <pad key="pa1" name="PA1"/>
+        <pad key="pa2" name="PA2"/>
+        <pad key="pa3" name="PA3"/>
+        <pad key="pa4" name="PA4"/>
+    </pads>
     <pinouts>
         <pinout key="qfn_qfp_44" name="QFN_QFP_44" type="qfn">
-            <pin position="1" pad="PA5"/>
-            <pin position="2" pad="PA6"/>
-            <pin position="3" pad="PA7"/>
-            <pin position="4" pad="PB0"/>
-            <pin position="5" pad="PB1"/>
-            <pin position="6" pad="PB2"/>
-            <pin position="7" pad="PB3"/>
-            <pin position="8" pad="GND"/>
-            <pin position="9" pad="VCC"/>
-            <pin position="10" pad="PC0"/>
-            <pin position="11" pad="PC1"/>
-            <pin position="12" pad="PC2"/>
-            <pin position="13" pad="PC3"/>
-            <pin position="14" pad="PC4"/>
-            <pin position="15" pad="PC5"/>
-            <pin position="16" pad="PC6"/>
-            <pin position="17" pad="PC7"/>
-            <pin position="18" pad="GND"/>
-            <pin position="19" pad="VCC"/>
-            <pin position="20" pad="PD0"/>
-            <pin position="21" pad="PD1"/>
-            <pin position="22" pad="PD2"/>
-            <pin position="23" pad="PD3"/>
-            <pin position="24" pad="PD4"/>
-            <pin position="25" pad="PD5"/>
-            <pin position="26" pad="PD6"/>
-            <pin position="27" pad="PD7"/>
-            <pin position="28" pad="PE0"/>
-            <pin position="29" pad="PE1"/>
-            <pin position="30" pad="GND"/>
-            <pin position="31" pad="VCC"/>
-            <pin position="32" pad="PE2"/>
-            <pin position="33" pad="PE3"/>
-            <pin position="34" pad="PDI"/>
-            <pin position="35" pad="RESET"/>
-            <pin position="36" pad="PR0"/>
-            <pin position="37" pad="PR1"/>
-            <pin position="38" pad="GND"/>
-            <pin position="39" pad="AVCC"/>
-            <pin position="40" pad="PA0"/>
-            <pin position="41" pad="PA1"/>
-            <pin position="42" pad="PA2"/>
-            <pin position="43" pad="PA3"/>
-            <pin position="44" pad="PA4"/>
+            <pin position="1" pad-key="pa5"/>
+            <pin position="2" pad-key="pa6"/>
+            <pin position="3" pad-key="pa7"/>
+            <pin position="4" pad-key="pb0"/>
+            <pin position="5" pad-key="pb1"/>
+            <pin position="6" pad-key="pb2"/>
+            <pin position="7" pad-key="pb3"/>
+            <pin position="8" pad-key="gnd"/>
+            <pin position="9" pad-key="vcc"/>
+            <pin position="10" pad-key="pc0"/>
+            <pin position="11" pad-key="pc1"/>
+            <pin position="12" pad-key="pc2"/>
+            <pin position="13" pad-key="pc3"/>
+            <pin position="14" pad-key="pc4"/>
+            <pin position="15" pad-key="pc5"/>
+            <pin position="16" pad-key="pc6"/>
+            <pin position="17" pad-key="pc7"/>
+            <pin position="18" pad-key="gnd"/>
+            <pin position="19" pad-key="vcc"/>
+            <pin position="20" pad-key="pd0"/>
+            <pin position="21" pad-key="pd1"/>
+            <pin position="22" pad-key="pd2"/>
+            <pin position="23" pad-key="pd3"/>
+            <pin position="24" pad-key="pd4"/>
+            <pin position="25" pad-key="pd5"/>
+            <pin position="26" pad-key="pd6"/>
+            <pin position="27" pad-key="pd7"/>
+            <pin position="28" pad-key="pe0"/>
+            <pin position="29" pad-key="pe1"/>
+            <pin position="30" pad-key="gnd"/>
+            <pin position="31" pad-key="vcc"/>
+            <pin position="32" pad-key="pe2"/>
+            <pin position="33" pad-key="pe3"/>
+            <pin position="34" pad-key="pdi"/>
+            <pin position="35" pad-key="reset"/>
+            <pin position="36" pad-key="pr0"/>
+            <pin position="37" pad-key="pr1"/>
+            <pin position="38" pad-key="gnd"/>
+            <pin position="39" pad-key="avcc"/>
+            <pin position="40" pad-key="pa0"/>
+            <pin position="41" pad-key="pa1"/>
+            <pin position="42" pad-key="pa2"/>
+            <pin position="43" pad-key="pa3"/>
+            <pin position="44" pad-key="pa4"/>
         </pinout>
         <pinout key="bga_49" name="BGA_49" type="bga">
-            <pin position="A1" pad="PA3"/>
-            <pin position="A2" pad="AVCC"/>
-            <pin position="A3" pad="GND"/>
-            <pin position="A4" pad="PR1"/>
-            <pin position="A5" pad="PR0"/>
-            <pin position="A6" pad="PDI"/>
-            <pin position="A7" pad="PE3"/>
-            <pin position="B1" pad="PA4"/>
-            <pin position="B2" pad="PA1"/>
-            <pin position="B3" pad="PA0"/>
-            <pin position="B4" pad="GND"/>
-            <pin position="B5" pad="RESET"/>
-            <pin position="B6" pad="PE2"/>
-            <pin position="B7" pad="VCC"/>
-            <pin position="C1" pad="PA5"/>
-            <pin position="C2" pad="PA2"/>
-            <pin position="C3" pad="PA6"/>
-            <pin position="C4" pad="PA7"/>
-            <pin position="C5" pad="GND"/>
-            <pin position="C6" pad="PE1"/>
-            <pin position="C7" pad="GND"/>
-            <pin position="D1" pad="PB1"/>
-            <pin position="D2" pad="PB2"/>
-            <pin position="D3" pad="PB3"/>
-            <pin position="D4" pad="PB0"/>
-            <pin position="D5" pad="GND"/>
-            <pin position="D6" pad="PD7"/>
-            <pin position="D7" pad="PE0"/>
-            <pin position="E1" pad="GND"/>
-            <pin position="E2" pad="GND"/>
-            <pin position="E3" pad="PC3"/>
-            <pin position="E4" pad="GND"/>
-            <pin position="E5" pad="PD4"/>
-            <pin position="E6" pad="PD5"/>
-            <pin position="E7" pad="PD6"/>
-            <pin position="F1" pad="VCC"/>
-            <pin position="F2" pad="PC0"/>
-            <pin position="F3" pad="PC4"/>
-            <pin position="F4" pad="PC6"/>
-            <pin position="F5" pad="PD0"/>
-            <pin position="F6" pad="PD1"/>
-            <pin position="F7" pad="PD3"/>
-            <pin position="G1" pad="PC1"/>
-            <pin position="G2" pad="PC2"/>
-            <pin position="G3" pad="PC5"/>
-            <pin position="G4" pad="PC7"/>
-            <pin position="G5" pad="GND"/>
-            <pin position="G6" pad="VCC"/>
-            <pin position="G7" pad="PD2"/>
+            <pin position="A1" pad-key="pa3"/>
+            <pin position="A2" pad-key="avcc"/>
+            <pin position="A3" pad-key="gnd"/>
+            <pin position="A4" pad-key="pr1"/>
+            <pin position="A5" pad-key="pr0"/>
+            <pin position="A6" pad-key="pdi"/>
+            <pin position="A7" pad-key="pe3"/>
+            <pin position="B1" pad-key="pa4"/>
+            <pin position="B2" pad-key="pa1"/>
+            <pin position="B3" pad-key="pa0"/>
+            <pin position="B4" pad-key="gnd"/>
+            <pin position="B5" pad-key="reset"/>
+            <pin position="B6" pad-key="pe2"/>
+            <pin position="B7" pad-key="vcc"/>
+            <pin position="C1" pad-key="pa5"/>
+            <pin position="C2" pad-key="pa2"/>
+            <pin position="C3" pad-key="pa6"/>
+            <pin position="C4" pad-key="pa7"/>
+            <pin position="C5" pad-key="gnd"/>
+            <pin position="C6" pad-key="pe1"/>
+            <pin position="C7" pad-key="gnd"/>
+            <pin position="D1" pad-key="pb1"/>
+            <pin position="D2" pad-key="pb2"/>
+            <pin position="D3" pad-key="pb3"/>
+            <pin position="D4" pad-key="pb0"/>
+            <pin position="D5" pad-key="gnd"/>
+            <pin position="D6" pad-key="pd7"/>
+            <pin position="D7" pad-key="pe0"/>
+            <pin position="E1" pad-key="gnd"/>
+            <pin position="E2" pad-key="gnd"/>
+            <pin position="E3" pad-key="pc3"/>
+            <pin position="E4" pad-key="gnd"/>
+            <pin position="E5" pad-key="pd4"/>
+            <pin position="E6" pad-key="pd5"/>
+            <pin position="E7" pad-key="pd6"/>
+            <pin position="F1" pad-key="vcc"/>
+            <pin position="F2" pad-key="pc0"/>
+            <pin position="F3" pad-key="pc4"/>
+            <pin position="F4" pad-key="pc6"/>
+            <pin position="F5" pad-key="pd0"/>
+            <pin position="F6" pad-key="pd1"/>
+            <pin position="F7" pad-key="pd3"/>
+            <pin position="G1" pad-key="pc1"/>
+            <pin position="G2" pad-key="pc2"/>
+            <pin position="G3" pad-key="pc5"/>
+            <pin position="G4" pad-key="pc7"/>
+            <pin position="G5" pad-key="gnd"/>
+            <pin position="G6" pad-key="vcc"/>
+            <pin position="G7" pad-key="pd2"/>
         </pinout>
     </pinouts>
     <variants>
-        <variant name="ATxmega128D4-AU" pinout-key="qfn_qfp_44" package="TQFP44"/>
-        <variant name="ATxmega128D4-MH" pinout-key="qfn_qfp_44" package="VQFN44"/>
-        <variant name="ATxmega128D4-CU" pinout-key="bga_49" package="VFBGA49"/>
-        <variant name="ATxmega128D4-AN" pinout-key="qfn_qfp_44" package="TQFP44"/>
-        <variant name="ATxmega128D4-M7" pinout-key="bga_49" package="VFBGA49"/>
+        <variant key="atxmega128d4_au" name="ATxmega128D4-AU" pinout-key="qfn_qfp_44"/>
+        <variant key="atxmega128d4_mh" name="ATxmega128D4-MH" pinout-key="qfn_qfp_44"/>
+        <variant key="atxmega128d4_cu" name="ATxmega128D4-CU" pinout-key="bga_49"/>
+        <variant key="atxmega128d4_an" name="ATxmega128D4-AN" pinout-key="qfn_qfp_44"/>
+        <variant key="atxmega128d4_m7" name="ATxmega128D4-M7" pinout-key="bga_49"/>
     </variants>
 </device>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA16A4.xml b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA16A4.xml
index ddbeff94..b633aa31 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA16A4.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA16A4.xml
@@ -153,65 +153,65 @@
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pa2" index="2" function="PORTA" group="P"/>
-                <signal pad-id="pa3" index="3" function="PORTA" group="P"/>
-                <signal pad-id="pa4" index="4" function="PORTA" group="P"/>
-                <signal pad-id="pa5" index="5" function="PORTA" group="P"/>
-                <signal pad-id="pa6" index="6" function="PORTA" group="P"/>
-                <signal pad-id="pa7" index="7" function="PORTA" group="P"/>
+                <signal pad-key="pa0" index="0" function="PORTA" group="P"/>
+                <signal pad-key="pa1" index="1" function="PORTA" group="P"/>
+                <signal pad-key="pa2" index="2" function="PORTA" group="P"/>
+                <signal pad-key="pa3" index="3" function="PORTA" group="P"/>
+                <signal pad-key="pa4" index="4" function="PORTA" group="P"/>
+                <signal pad-key="pa5" index="5" function="PORTA" group="P"/>
+                <signal pad-key="pa6" index="6" function="PORTA" group="P"/>
+                <signal pad-key="pa7" index="7" function="PORTA" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pb2" index="2" function="PORTB" group="P"/>
-                <signal pad-id="pb3" index="3" function="PORTB" group="P"/>
+                <signal pad-key="pb0" index="0" function="PORTB" group="P"/>
+                <signal pad-key="pb1" index="1" function="PORTB" group="P"/>
+                <signal pad-key="pb2" index="2" function="PORTB" group="P"/>
+                <signal pad-key="pb3" index="3" function="PORTB" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pc2" index="2" function="PORTC" group="P"/>
-                <signal pad-id="pc3" index="3" function="PORTC" group="P"/>
-                <signal pad-id="pc4" index="4" function="PORTC" group="P"/>
-                <signal pad-id="pc5" index="5" function="PORTC" group="P"/>
-                <signal pad-id="pc6" index="6" function="PORTC" group="P"/>
-                <signal pad-id="pc7" index="7" function="PORTC" group="P"/>
+                <signal pad-key="pc0" index="0" function="PORTC" group="P"/>
+                <signal pad-key="pc1" index="1" function="PORTC" group="P"/>
+                <signal pad-key="pc2" index="2" function="PORTC" group="P"/>
+                <signal pad-key="pc3" index="3" function="PORTC" group="P"/>
+                <signal pad-key="pc4" index="4" function="PORTC" group="P"/>
+                <signal pad-key="pc5" index="5" function="PORTC" group="P"/>
+                <signal pad-key="pc6" index="6" function="PORTC" group="P"/>
+                <signal pad-key="pc7" index="7" function="PORTC" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pd2" index="2" function="PORTD" group="P"/>
-                <signal pad-id="pd3" index="3" function="PORTD" group="P"/>
-                <signal pad-id="pd4" index="4" function="PORTD" group="P"/>
-                <signal pad-id="pd5" index="5" function="PORTD" group="P"/>
-                <signal pad-id="pd6" index="6" function="PORTD" group="P"/>
-                <signal pad-id="pd7" index="7" function="PORTD" group="P"/>
+                <signal pad-key="pd0" index="0" function="PORTD" group="P"/>
+                <signal pad-key="pd1" index="1" function="PORTD" group="P"/>
+                <signal pad-key="pd2" index="2" function="PORTD" group="P"/>
+                <signal pad-key="pd3" index="3" function="PORTD" group="P"/>
+                <signal pad-key="pd4" index="4" function="PORTD" group="P"/>
+                <signal pad-key="pd5" index="5" function="PORTD" group="P"/>
+                <signal pad-key="pd6" index="6" function="PORTD" group="P"/>
+                <signal pad-key="pd7" index="7" function="PORTD" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="porte" name="PORTE" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pe2" index="2" function="PORTE" group="P"/>
-                <signal pad-id="pe3" index="3" function="PORTE" group="P"/>
+                <signal pad-key="pe0" index="0" function="PORTE" group="P"/>
+                <signal pad-key="pe1" index="1" function="PORTE" group="P"/>
+                <signal pad-key="pe2" index="2" function="PORTE" group="P"/>
+                <signal pad-key="pe3" index="3" function="PORTE" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portr" name="PORTR" module-key="gpio_port">
             <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"/>
+                <signal pad-key="pr0" index="0" function="PORTR" group="P"/>
+                <signal pad-key="pr1" index="1" function="PORTR" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="tcc0" name="TCC0" module-key="i6090_tc">
@@ -1325,56 +1325,97 @@
             </register-group>
         </module>
     </modules>
+    <pads>
+        <pad key="pa5" name="PA5"/>
+        <pad key="pa6" name="PA6"/>
+        <pad key="pa7" name="PA7"/>
+        <pad key="pb0" name="PB0"/>
+        <pad key="pb1" name="PB1"/>
+        <pad key="pb2" name="PB2"/>
+        <pad key="pb3" name="PB3"/>
+        <pad key="gnd" name="GND"/>
+        <pad key="vcc" name="VCC"/>
+        <pad key="pc0" name="PC0"/>
+        <pad key="pc1" name="PC1"/>
+        <pad key="pc2" name="PC2"/>
+        <pad key="pc3" name="PC3"/>
+        <pad key="pc4" name="PC4"/>
+        <pad key="pc5" name="PC5"/>
+        <pad key="pc6" name="PC6"/>
+        <pad key="pc7" name="PC7"/>
+        <pad key="pd0" name="PD0"/>
+        <pad key="pd1" name="PD1"/>
+        <pad key="pd2" name="PD2"/>
+        <pad key="pd3" name="PD3"/>
+        <pad key="pd4" name="PD4"/>
+        <pad key="pd5" name="PD5"/>
+        <pad key="pd6" name="PD6"/>
+        <pad key="pd7" name="PD7"/>
+        <pad key="pe0" name="PE0"/>
+        <pad key="pe1" name="PE1"/>
+        <pad key="pe2" name="PE2"/>
+        <pad key="pe3" name="PE3"/>
+        <pad key="pdi" name="PDI"/>
+        <pad key="reset" name="RESET"/>
+        <pad key="pr0" name="PR0"/>
+        <pad key="pr1" name="PR1"/>
+        <pad key="avcc" name="AVCC"/>
+        <pad key="pa0" name="PA0"/>
+        <pad key="pa1" name="PA1"/>
+        <pad key="pa2" name="PA2"/>
+        <pad key="pa3" name="PA3"/>
+        <pad key="pa4" name="PA4"/>
+    </pads>
     <pinouts>
         <pinout key="qfp_qfn_44" name="QFP_QFN_44" type="qfn">
-            <pin position="1" pad="PA5"/>
-            <pin position="2" pad="PA6"/>
-            <pin position="3" pad="PA7"/>
-            <pin position="4" pad="PB0"/>
-            <pin position="5" pad="PB1"/>
-            <pin position="6" pad="PB2"/>
-            <pin position="7" pad="PB3"/>
-            <pin position="8" pad="GND"/>
-            <pin position="9" pad="VCC"/>
-            <pin position="10" pad="PC0"/>
-            <pin position="11" pad="PC1"/>
-            <pin position="12" pad="PC2"/>
-            <pin position="13" pad="PC3"/>
-            <pin position="14" pad="PC4"/>
-            <pin position="15" pad="PC5"/>
-            <pin position="16" pad="PC6"/>
-            <pin position="17" pad="PC7"/>
-            <pin position="18" pad="GND"/>
-            <pin position="19" pad="VCC"/>
-            <pin position="20" pad="PD0"/>
-            <pin position="21" pad="PD1"/>
-            <pin position="22" pad="PD2"/>
-            <pin position="23" pad="PD3"/>
-            <pin position="24" pad="PD4"/>
-            <pin position="25" pad="PD5"/>
-            <pin position="26" pad="PD6"/>
-            <pin position="27" pad="PD7"/>
-            <pin position="28" pad="PE0"/>
-            <pin position="29" pad="PE1"/>
-            <pin position="30" pad="GND"/>
-            <pin position="31" pad="VCC"/>
-            <pin position="32" pad="PE2"/>
-            <pin position="33" pad="PE3"/>
-            <pin position="34" pad="PDI"/>
-            <pin position="35" pad="RESET"/>
-            <pin position="36" pad="PR0"/>
-            <pin position="37" pad="PR1"/>
-            <pin position="38" pad="GND"/>
-            <pin position="39" pad="AVCC"/>
-            <pin position="40" pad="PA0"/>
-            <pin position="41" pad="PA1"/>
-            <pin position="42" pad="PA2"/>
-            <pin position="43" pad="PA3"/>
-            <pin position="44" pad="PA4"/>
+            <pin position="1" pad-key="pa5"/>
+            <pin position="2" pad-key="pa6"/>
+            <pin position="3" pad-key="pa7"/>
+            <pin position="4" pad-key="pb0"/>
+            <pin position="5" pad-key="pb1"/>
+            <pin position="6" pad-key="pb2"/>
+            <pin position="7" pad-key="pb3"/>
+            <pin position="8" pad-key="gnd"/>
+            <pin position="9" pad-key="vcc"/>
+            <pin position="10" pad-key="pc0"/>
+            <pin position="11" pad-key="pc1"/>
+            <pin position="12" pad-key="pc2"/>
+            <pin position="13" pad-key="pc3"/>
+            <pin position="14" pad-key="pc4"/>
+            <pin position="15" pad-key="pc5"/>
+            <pin position="16" pad-key="pc6"/>
+            <pin position="17" pad-key="pc7"/>
+            <pin position="18" pad-key="gnd"/>
+            <pin position="19" pad-key="vcc"/>
+            <pin position="20" pad-key="pd0"/>
+            <pin position="21" pad-key="pd1"/>
+            <pin position="22" pad-key="pd2"/>
+            <pin position="23" pad-key="pd3"/>
+            <pin position="24" pad-key="pd4"/>
+            <pin position="25" pad-key="pd5"/>
+            <pin position="26" pad-key="pd6"/>
+            <pin position="27" pad-key="pd7"/>
+            <pin position="28" pad-key="pe0"/>
+            <pin position="29" pad-key="pe1"/>
+            <pin position="30" pad-key="gnd"/>
+            <pin position="31" pad-key="vcc"/>
+            <pin position="32" pad-key="pe2"/>
+            <pin position="33" pad-key="pe3"/>
+            <pin position="34" pad-key="pdi"/>
+            <pin position="35" pad-key="reset"/>
+            <pin position="36" pad-key="pr0"/>
+            <pin position="37" pad-key="pr1"/>
+            <pin position="38" pad-key="gnd"/>
+            <pin position="39" pad-key="avcc"/>
+            <pin position="40" pad-key="pa0"/>
+            <pin position="41" pad-key="pa1"/>
+            <pin position="42" pad-key="pa2"/>
+            <pin position="43" pad-key="pa3"/>
+            <pin position="44" pad-key="pa4"/>
         </pinout>
     </pinouts>
     <variants>
-        <variant name="ATXMEGA16A4-AU" pinout-key="qfp_qfn_44" package="TQFP44"/>
-        <variant name="ATXMEGA16A4-MH" pinout-key="qfp_qfn_44" package="VQFN44"/>
+        <variant key="atxmega16a4_au" name="ATXMEGA16A4-AU" pinout-key="qfp_qfn_44"/>
+        <variant key="atxmega16a4_mh" name="ATXMEGA16A4-MH" pinout-key="qfp_qfn_44"/>
     </variants>
 </device>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA16A4U.xml b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA16A4U.xml
index daaaf1d2..8b97fd6c 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA16A4U.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA16A4U.xml
@@ -92,12 +92,12 @@
         <peripheral key="osc" name="OSC" module-key="i6079">
             <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"/>
-                <signal pad-id="pr0" function="TOSC" group="TOSC2" field="TOSCSEL"/>
-                <signal pad-id="pr1" function="TOSC" group="TOSC1" field="TOSCSEL"/>
-                <signal pad-id="pe2" function="TOSC_ALT" group="TOSC2" field="TOSCSEL"/>
-                <signal pad-id="pe3" function="TOSC_ALT" group="TOSC1" field="TOSCSEL"/>
+                <signal pad-key="pr0" function="XTAL" group="XTAL2"/>
+                <signal pad-key="pr1" function="XTAL" group="XTAL1"/>
+                <signal pad-key="pr0" function="TOSC" group="TOSC2" field="TOSCSEL"/>
+                <signal pad-key="pr1" function="TOSC" group="TOSC1" field="TOSCSEL"/>
+                <signal pad-key="pe2" function="TOSC_ALT" group="TOSC2" field="TOSCSEL"/>
+                <signal pad-key="pe3" function="TOSC_ALT" group="TOSC1" field="TOSCSEL"/>
             </signals>
         </peripheral>
         <peripheral key="dfllrc32m" name="DFLLRC32M" module-key="i6055">
@@ -121,15 +121,15 @@
         <peripheral key="portcfg" name="PORTCFG" module-key="i6075_portcfg">
             <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"/>
-                <signal pad-id="pd7" function="CLKOUTD" group="CLKOUT" field="CLKOUT"/>
-                <signal pad-id="pd4" function="CLKOUTD_ALT" group="CLKOUT" field="CLKEVPIN"/>
-                <signal pad-id="pc7" function="EVOUTC" group="EVOUT" field="EVOUT"/>
-                <signal pad-id="pc4" function="EVOUTC_ALT" group="EVOUT" field="CLKEVPIN"/>
-                <signal pad-id="pd7" function="EVOUTD" group="EVOUT" field="EVOUT"/>
-                <signal pad-id="pd4" function="EVOUTD_ALT" group="EVOUT" field="CLKEVPIN"/>
-                <signal pad-id="pc6" function="RTCOUTC" group="RTCOUT"/>
+                <signal pad-key="pc7" function="CLKOUTC" group="CLKOUT" field="CLKOUT"/>
+                <signal pad-key="pc4" function="CLKOUTC_ALT" group="CLKOUT" field="CLKEVPIN"/>
+                <signal pad-key="pd7" function="CLKOUTD" group="CLKOUT" field="CLKOUT"/>
+                <signal pad-key="pd4" function="CLKOUTD_ALT" group="CLKOUT" field="CLKEVPIN"/>
+                <signal pad-key="pc7" function="EVOUTC" group="EVOUT" field="EVOUT"/>
+                <signal pad-key="pc4" function="EVOUTC_ALT" group="EVOUT" field="CLKEVPIN"/>
+                <signal pad-key="pd7" function="EVOUTD" group="EVOUT" field="EVOUT"/>
+                <signal pad-key="pd4" function="EVOUTD_ALT" group="EVOUT" field="CLKEVPIN"/>
+                <signal pad-key="pc6" function="RTCOUTC" group="RTCOUT"/>
             </signals>
         </peripheral>
         <peripheral key="aes" name="AES" module-key="i6096">
@@ -150,44 +150,44 @@
         <peripheral key="adca" name="ADCA" module-key="i6099">
             <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"/>
-                <signal pad-id="pa2" index="2" function="ADC" group="ADC"/>
-                <signal pad-id="pa3" index="3" function="ADC" group="ADC"/>
-                <signal pad-id="pa4" index="4" function="ADC" group="ADC"/>
-                <signal pad-id="pa5" index="5" function="ADC" group="ADC"/>
-                <signal pad-id="pa6" index="6" function="ADC" group="ADC"/>
-                <signal pad-id="pa7" index="7" function="ADC" group="ADC"/>
-                <signal pad-id="pb0" index="8" function="ADC" group="ADC"/>
-                <signal pad-id="pb1" index="9" function="ADC" group="ADC"/>
-                <signal pad-id="pb2" index="10" function="ADC" group="ADC"/>
-                <signal pad-id="pb3" index="11" function="ADC" group="ADC"/>
-                <signal pad-id="pa0" index="0" function="AREF" group="REFA"/>
-                <signal pad-id="pb0" index="0" function="AREF" group="REFB"/>
+                <signal pad-key="pa0" index="0" function="ADC" group="ADC"/>
+                <signal pad-key="pa1" index="1" function="ADC" group="ADC"/>
+                <signal pad-key="pa2" index="2" function="ADC" group="ADC"/>
+                <signal pad-key="pa3" index="3" function="ADC" group="ADC"/>
+                <signal pad-key="pa4" index="4" function="ADC" group="ADC"/>
+                <signal pad-key="pa5" index="5" function="ADC" group="ADC"/>
+                <signal pad-key="pa6" index="6" function="ADC" group="ADC"/>
+                <signal pad-key="pa7" index="7" function="ADC" group="ADC"/>
+                <signal pad-key="pb0" index="8" function="ADC" group="ADC"/>
+                <signal pad-key="pb1" index="9" function="ADC" group="ADC"/>
+                <signal pad-key="pb2" index="10" function="ADC" group="ADC"/>
+                <signal pad-key="pb3" index="11" function="ADC" group="ADC"/>
+                <signal pad-key="pa0" index="0" function="AREF" group="REFA"/>
+                <signal pad-key="pb0" index="0" function="AREF" group="REFB"/>
             </signals>
         </peripheral>
         <peripheral key="dacb" name="DACB" module-key="i6059">
             <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"/>
-                <signal pad-id="pa0" index="0" function="AREF" group="REFA"/>
-                <signal pad-id="pb0" index="0" function="AREF" group="REFB"/>
+                <signal pad-key="pb2" index="0" function="DAC" group="DAC"/>
+                <signal pad-key="pb3" index="1" function="DAC" group="DAC"/>
+                <signal pad-key="pa0" index="0" function="AREF" group="REFA"/>
+                <signal pad-key="pb0" index="0" function="AREF" group="REFB"/>
             </signals>
         </peripheral>
         <peripheral key="aca" name="ACA" module-key="i6077">
             <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"/>
-                <signal pad-id="pa2" index="2" function="AC" group="AC"/>
-                <signal pad-id="pa3" index="3" function="AC" group="AC"/>
-                <signal pad-id="pa4" index="4" function="AC" group="AC"/>
-                <signal pad-id="pa5" index="5" function="AC" group="AC"/>
-                <signal pad-id="pa6" index="6" function="AC" group="AC"/>
-                <signal pad-id="pa7" index="7" function="AC" group="AC"/>
-                <signal pad-id="pa6" index="1" function="ACOUT" group="ACOUT"/>
-                <signal pad-id="pa7" index="0" function="ACOUT" group="ACOUT"/>
+                <signal pad-key="pa0" index="0" function="AC" group="AC"/>
+                <signal pad-key="pa1" index="1" function="AC" group="AC"/>
+                <signal pad-key="pa2" index="2" function="AC" group="AC"/>
+                <signal pad-key="pa3" index="3" function="AC" group="AC"/>
+                <signal pad-key="pa4" index="4" function="AC" group="AC"/>
+                <signal pad-key="pa5" index="5" function="AC" group="AC"/>
+                <signal pad-key="pa6" index="6" function="AC" group="AC"/>
+                <signal pad-key="pa7" index="7" function="AC" group="AC"/>
+                <signal pad-key="pa6" index="1" function="ACOUT" group="ACOUT"/>
+                <signal pad-key="pa7" index="0" function="ACOUT" group="ACOUT"/>
             </signals>
         </peripheral>
         <peripheral key="rtc" name="RTC" module-key="i6093">
@@ -196,178 +196,178 @@
         <peripheral key="twic" name="TWIC" module-key="i6089">
             <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"/>
-                <signal pad-id="pc0" function="TWI_EXT" group="SDAIN"/>
-                <signal pad-id="pc1" function="TWI_EXT" group="SCLIN"/>
-                <signal pad-id="pc2" function="TWI_EXT" group="SDAOUT"/>
-                <signal pad-id="pc3" function="TWI_EXT" group="SCLOUT"/>
+                <signal pad-key="pc0" function="TWI" group="SDA"/>
+                <signal pad-key="pc1" function="TWI" group="SCL"/>
+                <signal pad-key="pc0" function="TWI_EXT" group="SDAIN"/>
+                <signal pad-key="pc1" function="TWI_EXT" group="SCLIN"/>
+                <signal pad-key="pc2" function="TWI_EXT" group="SDAOUT"/>
+                <signal pad-key="pc3" function="TWI_EXT" group="SCLOUT"/>
             </signals>
         </peripheral>
         <peripheral key="twie" name="TWIE" module-key="i6089">
             <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"/>
+                <signal pad-key="pe0" function="TWI" group="SDA"/>
+                <signal pad-key="pe1" function="TWI" group="SCL"/>
             </signals>
         </peripheral>
         <peripheral key="usb" name="USB" module-key="i3005">
             <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"/>
+                <signal pad-key="pd6" function="USB" group="DN"/>
+                <signal pad-key="pd7" function="USB" group="DP"/>
             </signals>
         </peripheral>
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pa2" index="2" function="PORTA" group="P"/>
-                <signal pad-id="pa3" index="3" function="PORTA" group="P"/>
-                <signal pad-id="pa4" index="4" function="PORTA" group="P"/>
-                <signal pad-id="pa5" index="5" function="PORTA" group="P"/>
-                <signal pad-id="pa6" index="6" function="PORTA" group="P"/>
-                <signal pad-id="pa7" index="7" function="PORTA" group="P"/>
+                <signal pad-key="pa0" index="0" function="PORTA" group="P"/>
+                <signal pad-key="pa1" index="1" function="PORTA" group="P"/>
+                <signal pad-key="pa2" index="2" function="PORTA" group="P"/>
+                <signal pad-key="pa3" index="3" function="PORTA" group="P"/>
+                <signal pad-key="pa4" index="4" function="PORTA" group="P"/>
+                <signal pad-key="pa5" index="5" function="PORTA" group="P"/>
+                <signal pad-key="pa6" index="6" function="PORTA" group="P"/>
+                <signal pad-key="pa7" index="7" function="PORTA" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pb2" index="2" function="PORTB" group="P"/>
-                <signal pad-id="pb3" index="3" function="PORTB" group="P"/>
+                <signal pad-key="pb0" index="0" function="PORTB" group="P"/>
+                <signal pad-key="pb1" index="1" function="PORTB" group="P"/>
+                <signal pad-key="pb2" index="2" function="PORTB" group="P"/>
+                <signal pad-key="pb3" index="3" function="PORTB" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pc2" index="2" function="PORTC" group="P"/>
-                <signal pad-id="pc3" index="3" function="PORTC" group="P"/>
-                <signal pad-id="pc4" index="4" function="PORTC" group="P"/>
-                <signal pad-id="pc5" index="5" function="PORTC" group="P"/>
-                <signal pad-id="pc6" index="6" function="PORTC" group="P"/>
-                <signal pad-id="pc7" index="7" function="PORTC" group="P"/>
+                <signal pad-key="pc0" index="0" function="PORTC" group="P"/>
+                <signal pad-key="pc1" index="1" function="PORTC" group="P"/>
+                <signal pad-key="pc2" index="2" function="PORTC" group="P"/>
+                <signal pad-key="pc3" index="3" function="PORTC" group="P"/>
+                <signal pad-key="pc4" index="4" function="PORTC" group="P"/>
+                <signal pad-key="pc5" index="5" function="PORTC" group="P"/>
+                <signal pad-key="pc6" index="6" function="PORTC" group="P"/>
+                <signal pad-key="pc7" index="7" function="PORTC" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pd2" index="2" function="PORTD" group="P"/>
-                <signal pad-id="pd3" index="3" function="PORTD" group="P"/>
-                <signal pad-id="pd4" index="4" function="PORTD" group="P"/>
-                <signal pad-id="pd5" index="5" function="PORTD" group="P"/>
-                <signal pad-id="pd6" index="6" function="PORTD" group="P"/>
-                <signal pad-id="pd7" index="7" function="PORTD" group="P"/>
+                <signal pad-key="pd0" index="0" function="PORTD" group="P"/>
+                <signal pad-key="pd1" index="1" function="PORTD" group="P"/>
+                <signal pad-key="pd2" index="2" function="PORTD" group="P"/>
+                <signal pad-key="pd3" index="3" function="PORTD" group="P"/>
+                <signal pad-key="pd4" index="4" function="PORTD" group="P"/>
+                <signal pad-key="pd5" index="5" function="PORTD" group="P"/>
+                <signal pad-key="pd6" index="6" function="PORTD" group="P"/>
+                <signal pad-key="pd7" index="7" function="PORTD" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="porte" name="PORTE" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pe2" index="2" function="PORTE" group="P"/>
-                <signal pad-id="pe3" index="3" function="PORTE" group="P"/>
+                <signal pad-key="pe0" index="0" function="PORTE" group="P"/>
+                <signal pad-key="pe1" index="1" function="PORTE" group="P"/>
+                <signal pad-key="pe2" index="2" function="PORTE" group="P"/>
+                <signal pad-key="pe3" index="3" function="PORTE" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portr" name="PORTR" module-key="gpio_port">
             <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"/>
+                <signal pad-key="pr0" index="0" function="PORTR" group="P"/>
+                <signal pad-key="pr1" index="1" function="PORTR" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="tcc0" name="TCC0" module-key="i6090_tc">
             <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"/>
-                <signal pad-id="pc2" function="TC0" group="OC0C" field="TC0C"/>
-                <signal pad-id="pc3" function="TC0" group="OC0D" field="TC0D"/>
-                <signal pad-id="pc4" function="TC0_ALT" group="OC0A" field="TC0A"/>
-                <signal pad-id="pc5" function="TC0_ALT" group="OC0B" field="TC0B"/>
-                <signal pad-id="pc6" function="TC0_ALT" group="OC0C" field="TC0C"/>
-                <signal pad-id="pc7" function="TC0_ALT" group="OC0D" field="TC0D"/>
+                <signal pad-key="pc0" function="TC0" group="OC0A" field="TC0A"/>
+                <signal pad-key="pc1" function="TC0" group="OC0B" field="TC0B"/>
+                <signal pad-key="pc2" function="TC0" group="OC0C" field="TC0C"/>
+                <signal pad-key="pc3" function="TC0" group="OC0D" field="TC0D"/>
+                <signal pad-key="pc4" function="TC0_ALT" group="OC0A" field="TC0A"/>
+                <signal pad-key="pc5" function="TC0_ALT" group="OC0B" field="TC0B"/>
+                <signal pad-key="pc6" function="TC0_ALT" group="OC0C" field="TC0C"/>
+                <signal pad-key="pc7" function="TC0_ALT" group="OC0D" field="TC0D"/>
             </signals>
         </peripheral>
         <peripheral key="tcc1" name="TCC1" module-key="i6090_tc">
             <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"/>
+                <signal pad-key="pc4" function="TC1" group="OC1A"/>
+                <signal pad-key="pc5" function="TC1" group="OC1B"/>
             </signals>
         </peripheral>
         <peripheral key="tcd0" name="TCD0" module-key="i6090_tc">
             <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"/>
-                <signal pad-id="pd2" function="TC0" group="OC0C"/>
-                <signal pad-id="pd3" function="TC0" group="OC0D"/>
-                <signal pad-id="pd4" function="TC0_ALT" group="OC0A"/>
-                <signal pad-id="pd5" function="TC0_ALT" group="OC0B"/>
-                <signal pad-id="pd6" function="TC0_ALT" group="OC0C"/>
-                <signal pad-id="pd7" function="TC0_ALT" group="OC0D"/>
+                <signal pad-key="pd0" function="TC0" group="OC0A"/>
+                <signal pad-key="pd1" function="TC0" group="OC0B"/>
+                <signal pad-key="pd2" function="TC0" group="OC0C"/>
+                <signal pad-key="pd3" function="TC0" group="OC0D"/>
+                <signal pad-key="pd4" function="TC0_ALT" group="OC0A"/>
+                <signal pad-key="pd5" function="TC0_ALT" group="OC0B"/>
+                <signal pad-key="pd6" function="TC0_ALT" group="OC0C"/>
+                <signal pad-key="pd7" function="TC0_ALT" group="OC0D"/>
             </signals>
         </peripheral>
         <peripheral key="tcd1" name="TCD1" module-key="i6090_tc">
             <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"/>
+                <signal pad-key="pd4" function="TC1" group="OC1A"/>
+                <signal pad-key="pd5" function="TC1" group="OC1B"/>
             </signals>
         </peripheral>
         <peripheral key="tce0" name="TCE0" module-key="i6090_tc">
             <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"/>
-                <signal pad-id="pe2" function="TC0" group="OC0C"/>
-                <signal pad-id="pe3" function="TC0" group="OC0D"/>
+                <signal pad-key="pe0" function="TC0" group="OC0A"/>
+                <signal pad-key="pe1" function="TC0" group="OC0B"/>
+                <signal pad-key="pe2" function="TC0" group="OC0C"/>
+                <signal pad-key="pe3" function="TC0" group="OC0D"/>
             </signals>
         </peripheral>
         <peripheral key="tcc2" name="TCC2" module-key="i6090_tc2">
             <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"/>
-                <signal pad-id="pc2" function="TC2" group="LOC2C"/>
-                <signal pad-id="pc3" function="TC2" group="LOC2D"/>
-                <signal pad-id="pc4" function="TC2" group="HOC2A"/>
-                <signal pad-id="pc5" function="TC2" group="HOC2B"/>
-                <signal pad-id="pc6" function="TC2" group="HOC2C"/>
-                <signal pad-id="pc7" function="TC2" group="HOC2D"/>
+                <signal pad-key="pc0" function="TC2" group="LOC2A"/>
+                <signal pad-key="pc1" function="TC2" group="LOC2B"/>
+                <signal pad-key="pc2" function="TC2" group="LOC2C"/>
+                <signal pad-key="pc3" function="TC2" group="LOC2D"/>
+                <signal pad-key="pc4" function="TC2" group="HOC2A"/>
+                <signal pad-key="pc5" function="TC2" group="HOC2B"/>
+                <signal pad-key="pc6" function="TC2" group="HOC2C"/>
+                <signal pad-key="pc7" function="TC2" group="HOC2D"/>
             </signals>
         </peripheral>
         <peripheral key="tcd2" name="TCD2" module-key="i6090_tc2">
             <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"/>
-                <signal pad-id="pd2" function="TC2" group="LOC2C"/>
-                <signal pad-id="pd3" function="TC2" group="LOC2D"/>
-                <signal pad-id="pd4" function="TC2" group="HOC2A"/>
-                <signal pad-id="pd5" function="TC2" group="HOC2B"/>
-                <signal pad-id="pd6" function="TC2" group="HOC2C"/>
-                <signal pad-id="pd7" function="TC2" group="HOC2D"/>
+                <signal pad-key="pd0" function="TC2" group="LOC2A"/>
+                <signal pad-key="pd1" function="TC2" group="LOC2B"/>
+                <signal pad-key="pd2" function="TC2" group="LOC2C"/>
+                <signal pad-key="pd3" function="TC2" group="LOC2D"/>
+                <signal pad-key="pd4" function="TC2" group="HOC2A"/>
+                <signal pad-key="pd5" function="TC2" group="HOC2B"/>
+                <signal pad-key="pd6" function="TC2" group="HOC2C"/>
+                <signal pad-key="pd7" function="TC2" group="HOC2D"/>
             </signals>
         </peripheral>
         <peripheral key="awexc" name="AWEXC" module-key="i6090_awex">
             <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"/>
-                <signal pad-id="pc2" function="AWEX" group="OC0BLS"/>
-                <signal pad-id="pc3" function="AWEX" group="OC0BHS"/>
-                <signal pad-id="pc4" function="AWEX" group="OC0CLS"/>
-                <signal pad-id="pc5" function="AWEX" group="OC0CHS"/>
-                <signal pad-id="pc6" function="AWEX" group="OC0DLS"/>
-                <signal pad-id="pc7" function="AWEX" group="OC0DHS"/>
+                <signal pad-key="pc0" function="AWEX" group="OC0ALS"/>
+                <signal pad-key="pc1" function="AWEX" group="OC0AHS"/>
+                <signal pad-key="pc2" function="AWEX" group="OC0BLS"/>
+                <signal pad-key="pc3" function="AWEX" group="OC0BHS"/>
+                <signal pad-key="pc4" function="AWEX" group="OC0CLS"/>
+                <signal pad-key="pc5" function="AWEX" group="OC0CHS"/>
+                <signal pad-key="pc6" function="AWEX" group="OC0DLS"/>
+                <signal pad-key="pc7" function="AWEX" group="OC0DHS"/>
             </signals>
         </peripheral>
         <peripheral key="hiresc" name="HIRESC" module-key="i6090_hires">
@@ -382,73 +382,73 @@
         <peripheral key="usartc0" name="USARTC0" module-key="i6090_usart">
             <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"/>
-                <signal pad-id="pc3" function="USART" group="TXD" field="USART0"/>
-                <signal pad-id="pc5" function="USART_ALT" group="XCK" field="USART0"/>
-                <signal pad-id="pc6" function="USART_ALT" group="RXD" field="USART0"/>
-                <signal pad-id="pc7" function="USART_ALT" group="TXD" field="USART0"/>
+                <signal pad-key="pc1" function="USART" group="XCK" field="USART0"/>
+                <signal pad-key="pc2" function="USART" group="RXD" field="USART0"/>
+                <signal pad-key="pc3" function="USART" group="TXD" field="USART0"/>
+                <signal pad-key="pc5" function="USART_ALT" group="XCK" field="USART0"/>
+                <signal pad-key="pc6" function="USART_ALT" group="RXD" field="USART0"/>
+                <signal pad-key="pc7" function="USART_ALT" group="TXD" field="USART0"/>
             </signals>
         </peripheral>
         <peripheral key="usartc1" name="USARTC1" module-key="i6090_usart">
             <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"/>
-                <signal pad-id="pd7" function="USART" group="TXD"/>
+                <signal pad-key="pd5" function="USART" group="XCK"/>
+                <signal pad-key="pd6" function="USART" group="RXD"/>
+                <signal pad-key="pd7" function="USART" group="TXD"/>
             </signals>
         </peripheral>
         <peripheral key="usartd0" name="USARTD0" module-key="i6090_usart">
             <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"/>
-                <signal pad-id="pd3" function="USART" group="TXD" field="USART0"/>
-                <signal pad-id="pd5" function="USART_ALT" group="XCK" field="USART0"/>
-                <signal pad-id="pd6" function="USART_ALT" group="RXD" field="USART0"/>
-                <signal pad-id="pd7" function="USART_ALT" group="TXD" field="USART0"/>
+                <signal pad-key="pd1" function="USART" group="XCK" field="USART0"/>
+                <signal pad-key="pd2" function="USART" group="RXD" field="USART0"/>
+                <signal pad-key="pd3" function="USART" group="TXD" field="USART0"/>
+                <signal pad-key="pd5" function="USART_ALT" group="XCK" field="USART0"/>
+                <signal pad-key="pd6" function="USART_ALT" group="RXD" field="USART0"/>
+                <signal pad-key="pd7" function="USART_ALT" group="TXD" field="USART0"/>
             </signals>
         </peripheral>
         <peripheral key="usartd1" name="USARTD1" module-key="i6090_usart">
             <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"/>
-                <signal pad-id="pd7" function="USART" group="TXD"/>
+                <signal pad-key="pd5" function="USART" group="XCK"/>
+                <signal pad-key="pd6" function="USART" group="RXD"/>
+                <signal pad-key="pd7" function="USART" group="TXD"/>
             </signals>
         </peripheral>
         <peripheral key="usarte0" name="USARTE0" module-key="i6090_usart">
             <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"/>
-                <signal pad-id="pe3" function="USART" group="TXD"/>
+                <signal pad-key="pe1" function="USART" group="XCK"/>
+                <signal pad-key="pe2" function="USART" group="RXD"/>
+                <signal pad-key="pe3" function="USART" group="TXD"/>
             </signals>
         </peripheral>
         <peripheral key="spic" name="SPIC" module-key="i6090_spi">
             <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"/>
-                <signal pad-id="pc6" function="SPI" group="MISO" field="SPI"/>
-                <signal pad-id="pc7" function="SPI" group="SCK" field="SPI"/>
-                <signal pad-id="pc4" function="SPI_ALT" group="SS" field="SPI"/>
-                <signal pad-id="pc5" function="SPI_ALT" group="SCK" field="SPI"/>
-                <signal pad-id="pc6" function="SPI_ALT" group="MISO" field="SPI"/>
-                <signal pad-id="pc7" function="SPI_ALT" group="MOSI" field="SPI"/>
+                <signal pad-key="pc4" function="SPI" group="SS" field="SPI"/>
+                <signal pad-key="pc5" function="SPI" group="MOSI" field="SPI"/>
+                <signal pad-key="pc6" function="SPI" group="MISO" field="SPI"/>
+                <signal pad-key="pc7" function="SPI" group="SCK" field="SPI"/>
+                <signal pad-key="pc4" function="SPI_ALT" group="SS" field="SPI"/>
+                <signal pad-key="pc5" function="SPI_ALT" group="SCK" field="SPI"/>
+                <signal pad-key="pc6" function="SPI_ALT" group="MISO" field="SPI"/>
+                <signal pad-key="pc7" function="SPI_ALT" group="MOSI" field="SPI"/>
             </signals>
         </peripheral>
         <peripheral key="spid" name="SPID" module-key="i6090_spi">
             <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"/>
-                <signal pad-id="pd6" function="SPI" group="MISO" field="SPI"/>
-                <signal pad-id="pd7" function="SPI" group="SCK" field="SPI"/>
-                <signal pad-id="pd4" function="SPI_ALT" group="SS" field="SPI"/>
-                <signal pad-id="pd5" function="SPI_ALT" group="SCK" field="SPI"/>
-                <signal pad-id="pd6" function="SPI_ALT" group="MISO" field="SPI"/>
-                <signal pad-id="pd7" function="SPI_ALT" group="MOSI" field="SPI"/>
+                <signal pad-key="pd4" function="SPI" group="SS" field="SPI"/>
+                <signal pad-key="pd5" function="SPI" group="MOSI" field="SPI"/>
+                <signal pad-key="pd6" function="SPI" group="MISO" field="SPI"/>
+                <signal pad-key="pd7" function="SPI" group="SCK" field="SPI"/>
+                <signal pad-key="pd4" function="SPI_ALT" group="SS" field="SPI"/>
+                <signal pad-key="pd5" function="SPI_ALT" group="SCK" field="SPI"/>
+                <signal pad-key="pd6" function="SPI_ALT" group="MISO" field="SPI"/>
+                <signal pad-key="pd7" function="SPI_ALT" group="MOSI" field="SPI"/>
             </signals>
         </peripheral>
         <peripheral key="ircom" name="IRCOM" module-key="i6090_ircom">
@@ -1809,110 +1809,152 @@
             </register-group>
         </module>
     </modules>
+    <pads>
+        <pad key="pa5" name="PA5"/>
+        <pad key="pa6" name="PA6"/>
+        <pad key="pa7" name="PA7"/>
+        <pad key="pb0" name="PB0"/>
+        <pad key="pb1" name="PB1"/>
+        <pad key="pb2" name="PB2"/>
+        <pad key="pb3" name="PB3"/>
+        <pad key="gnd" name="GND"/>
+        <pad key="vcc" name="VCC"/>
+        <pad key="pc0" name="PC0"/>
+        <pad key="pc1" name="PC1"/>
+        <pad key="pc2" name="PC2"/>
+        <pad key="pc3" name="PC3"/>
+        <pad key="pc4" name="PC4"/>
+        <pad key="pc5" name="PC5"/>
+        <pad key="pc6" name="PC6"/>
+        <pad key="pc7" name="PC7"/>
+        <pad key="pd0" name="PD0"/>
+        <pad key="pd1" name="PD1"/>
+        <pad key="pd2" name="PD2"/>
+        <pad key="pd3" name="PD3"/>
+        <pad key="pd4" name="PD4"/>
+        <pad key="pd5" name="PD5"/>
+        <pad key="pd6" name="PD6"/>
+        <pad key="pd7" name="PD7"/>
+        <pad key="pe0" name="PE0"/>
+        <pad key="pe1" name="PE1"/>
+        <pad key="pe2" name="PE2"/>
+        <pad key="pe3" name="PE3"/>
+        <pad key="pdi" name="PDI"/>
+        <pad key="reset" name="RESET"/>
+        <pad key="pr0" name="PR0"/>
+        <pad key="pr1" name="PR1"/>
+        <pad key="avcc" name="AVCC"/>
+        <pad key="pa0" name="PA0"/>
+        <pad key="pa1" name="PA1"/>
+        <pad key="pa2" name="PA2"/>
+        <pad key="pa3" name="PA3"/>
+        <pad key="pa4" name="PA4"/>
+        <pad key="pdi_data" name="PDI_DATA"/>
+    </pads>
     <pinouts>
         <pinout key="qfp_qfn_44" name="QFP_QFN_44" type="qfn">
-            <pin position="1" pad="PA5"/>
-            <pin position="2" pad="PA6"/>
-            <pin position="3" pad="PA7"/>
-            <pin position="4" pad="PB0"/>
-            <pin position="5" pad="PB1"/>
-            <pin position="6" pad="PB2"/>
-            <pin position="7" pad="PB3"/>
-            <pin position="8" pad="GND"/>
-            <pin position="9" pad="VCC"/>
-            <pin position="10" pad="PC0"/>
-            <pin position="11" pad="PC1"/>
-            <pin position="12" pad="PC2"/>
-            <pin position="13" pad="PC3"/>
-            <pin position="14" pad="PC4"/>
-            <pin position="15" pad="PC5"/>
-            <pin position="16" pad="PC6"/>
-            <pin position="17" pad="PC7"/>
-            <pin position="18" pad="GND"/>
-            <pin position="19" pad="VCC"/>
-            <pin position="20" pad="PD0"/>
-            <pin position="21" pad="PD1"/>
-            <pin position="22" pad="PD2"/>
-            <pin position="23" pad="PD3"/>
-            <pin position="24" pad="PD4"/>
-            <pin position="25" pad="PD5"/>
-            <pin position="26" pad="PD6"/>
-            <pin position="27" pad="PD7"/>
-            <pin position="28" pad="PE0"/>
-            <pin position="29" pad="PE1"/>
-            <pin position="30" pad="GND"/>
-            <pin position="31" pad="VCC"/>
-            <pin position="32" pad="PE2"/>
-            <pin position="33" pad="PE3"/>
-            <pin position="34" pad="PDI"/>
-            <pin position="35" pad="RESET"/>
-            <pin position="36" pad="PR0"/>
-            <pin position="37" pad="PR1"/>
-            <pin position="38" pad="GND"/>
-            <pin position="39" pad="AVCC"/>
-            <pin position="40" pad="PA0"/>
-            <pin position="41" pad="PA1"/>
-            <pin position="42" pad="PA2"/>
-            <pin position="43" pad="PA3"/>
-            <pin position="44" pad="PA4"/>
+            <pin position="1" pad-key="pa5"/>
+            <pin position="2" pad-key="pa6"/>
+            <pin position="3" pad-key="pa7"/>
+            <pin position="4" pad-key="pb0"/>
+            <pin position="5" pad-key="pb1"/>
+            <pin position="6" pad-key="pb2"/>
+            <pin position="7" pad-key="pb3"/>
+            <pin position="8" pad-key="gnd"/>
+            <pin position="9" pad-key="vcc"/>
+            <pin position="10" pad-key="pc0"/>
+            <pin position="11" pad-key="pc1"/>
+            <pin position="12" pad-key="pc2"/>
+            <pin position="13" pad-key="pc3"/>
+            <pin position="14" pad-key="pc4"/>
+            <pin position="15" pad-key="pc5"/>
+            <pin position="16" pad-key="pc6"/>
+            <pin position="17" pad-key="pc7"/>
+            <pin position="18" pad-key="gnd"/>
+            <pin position="19" pad-key="vcc"/>
+            <pin position="20" pad-key="pd0"/>
+            <pin position="21" pad-key="pd1"/>
+            <pin position="22" pad-key="pd2"/>
+            <pin position="23" pad-key="pd3"/>
+            <pin position="24" pad-key="pd4"/>
+            <pin position="25" pad-key="pd5"/>
+            <pin position="26" pad-key="pd6"/>
+            <pin position="27" pad-key="pd7"/>
+            <pin position="28" pad-key="pe0"/>
+            <pin position="29" pad-key="pe1"/>
+            <pin position="30" pad-key="gnd"/>
+            <pin position="31" pad-key="vcc"/>
+            <pin position="32" pad-key="pe2"/>
+            <pin position="33" pad-key="pe3"/>
+            <pin position="34" pad-key="pdi"/>
+            <pin position="35" pad-key="reset"/>
+            <pin position="36" pad-key="pr0"/>
+            <pin position="37" pad-key="pr1"/>
+            <pin position="38" pad-key="gnd"/>
+            <pin position="39" pad-key="avcc"/>
+            <pin position="40" pad-key="pa0"/>
+            <pin position="41" pad-key="pa1"/>
+            <pin position="42" pad-key="pa2"/>
+            <pin position="43" pad-key="pa3"/>
+            <pin position="44" pad-key="pa4"/>
         </pinout>
         <pinout key="bga_49" name="BGA_49" type="bga">
-            <pin position="A1" pad="PA3"/>
-            <pin position="A2" pad="AVCC"/>
-            <pin position="A3" pad="GND"/>
-            <pin position="A4" pad="PR1"/>
-            <pin position="A5" pad="PR0"/>
-            <pin position="A6" pad="PDI_DATA"/>
-            <pin position="A7" pad="PE3"/>
-            <pin position="B1" pad="PA4"/>
-            <pin position="B2" pad="PA1"/>
-            <pin position="B3" pad="PA0"/>
-            <pin position="B4" pad="GND"/>
-            <pin position="B5" pad="RESET"/>
-            <pin position="B6" pad="PE2"/>
-            <pin position="B7" pad="VCC"/>
-            <pin position="C1" pad="PA5"/>
-            <pin position="C2" pad="PA2"/>
-            <pin position="C3" pad="PA6"/>
-            <pin position="C4" pad="PA7"/>
-            <pin position="C5" pad="GND"/>
-            <pin position="C6" pad="PE1"/>
-            <pin position="C7" pad="GND"/>
-            <pin position="D1" pad="PB1"/>
-            <pin position="D2" pad="PB2"/>
-            <pin position="D3" pad="PB3"/>
-            <pin position="D4" pad="PB0"/>
-            <pin position="D5" pad="GND"/>
-            <pin position="D6" pad="PD7"/>
-            <pin position="D7" pad="PE0"/>
-            <pin position="E1" pad="GND"/>
-            <pin position="E2" pad="GND"/>
-            <pin position="E3" pad="PC3"/>
-            <pin position="E4" pad="GND"/>
-            <pin position="E5" pad="PD4"/>
-            <pin position="E6" pad="PD5"/>
-            <pin position="E7" pad="PD6"/>
-            <pin position="F1" pad="VCC"/>
-            <pin position="F2" pad="PC0"/>
-            <pin position="F3" pad="PC4"/>
-            <pin position="F4" pad="PC6"/>
-            <pin position="F5" pad="PD0"/>
-            <pin position="F6" pad="PD1"/>
-            <pin position="F7" pad="PD3"/>
-            <pin position="G1" pad="PC1"/>
-            <pin position="G2" pad="PC2"/>
-            <pin position="G3" pad="PC5"/>
-            <pin position="G4" pad="PC7"/>
-            <pin position="G5" pad="GND"/>
-            <pin position="G6" pad="VCC"/>
-            <pin position="G7" pad="PD2"/>
+            <pin position="A1" pad-key="pa3"/>
+            <pin position="A2" pad-key="avcc"/>
+            <pin position="A3" pad-key="gnd"/>
+            <pin position="A4" pad-key="pr1"/>
+            <pin position="A5" pad-key="pr0"/>
+            <pin position="A6" pad-key="pdi_data"/>
+            <pin position="A7" pad-key="pe3"/>
+            <pin position="B1" pad-key="pa4"/>
+            <pin position="B2" pad-key="pa1"/>
+            <pin position="B3" pad-key="pa0"/>
+            <pin position="B4" pad-key="gnd"/>
+            <pin position="B5" pad-key="reset"/>
+            <pin position="B6" pad-key="pe2"/>
+            <pin position="B7" pad-key="vcc"/>
+            <pin position="C1" pad-key="pa5"/>
+            <pin position="C2" pad-key="pa2"/>
+            <pin position="C3" pad-key="pa6"/>
+            <pin position="C4" pad-key="pa7"/>
+            <pin position="C5" pad-key="gnd"/>
+            <pin position="C6" pad-key="pe1"/>
+            <pin position="C7" pad-key="gnd"/>
+            <pin position="D1" pad-key="pb1"/>
+            <pin position="D2" pad-key="pb2"/>
+            <pin position="D3" pad-key="pb3"/>
+            <pin position="D4" pad-key="pb0"/>
+            <pin position="D5" pad-key="gnd"/>
+            <pin position="D6" pad-key="pd7"/>
+            <pin position="D7" pad-key="pe0"/>
+            <pin position="E1" pad-key="gnd"/>
+            <pin position="E2" pad-key="gnd"/>
+            <pin position="E3" pad-key="pc3"/>
+            <pin position="E4" pad-key="gnd"/>
+            <pin position="E5" pad-key="pd4"/>
+            <pin position="E6" pad-key="pd5"/>
+            <pin position="E7" pad-key="pd6"/>
+            <pin position="F1" pad-key="vcc"/>
+            <pin position="F2" pad-key="pc0"/>
+            <pin position="F3" pad-key="pc4"/>
+            <pin position="F4" pad-key="pc6"/>
+            <pin position="F5" pad-key="pd0"/>
+            <pin position="F6" pad-key="pd1"/>
+            <pin position="F7" pad-key="pd3"/>
+            <pin position="G1" pad-key="pc1"/>
+            <pin position="G2" pad-key="pc2"/>
+            <pin position="G3" pad-key="pc5"/>
+            <pin position="G4" pad-key="pc7"/>
+            <pin position="G5" pad-key="gnd"/>
+            <pin position="G6" pad-key="vcc"/>
+            <pin position="G7" pad-key="pd2"/>
         </pinout>
     </pinouts>
     <variants>
-        <variant name="ATxmega16A4U-AU" pinout-key="qfp_qfn_44" package="TQFP44"/>
-        <variant name="ATxmega16A4U-MH" pinout-key="qfp_qfn_44" package="VQFN44"/>
-        <variant name="ATxmega16A4U-CU" pinout-key="bga_49" package="VFBGA49"/>
-        <variant name="ATxmega16A4U-AN" pinout-key="qfp_qfn_44" package="TQFP44"/>
-        <variant name="ATxmega16A4U-M7" pinout-key="qfp_qfn_44" package="VQFN44"/>
+        <variant key="atxmega16a4u_au" name="ATxmega16A4U-AU" pinout-key="qfp_qfn_44"/>
+        <variant key="atxmega16a4u_mh" name="ATxmega16A4U-MH" pinout-key="qfp_qfn_44"/>
+        <variant key="atxmega16a4u_cu" name="ATxmega16A4U-CU" pinout-key="bga_49"/>
+        <variant key="atxmega16a4u_an" name="ATxmega16A4U-AN" pinout-key="qfp_qfn_44"/>
+        <variant key="atxmega16a4u_m7" name="ATxmega16A4U-M7" pinout-key="qfp_qfn_44"/>
     </variants>
 </device>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA16C4.xml b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA16C4.xml
index 1026599e..348f9594 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA16C4.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA16C4.xml
@@ -92,12 +92,12 @@
         <peripheral key="osc" name="OSC" module-key="i6079">
             <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"/>
-                <signal pad-id="pr0" function="TOSC" group="TOSC2"/>
-                <signal pad-id="pr1" function="TOSC" group="TOSC1"/>
-                <signal pad-id="pe2" function="TOSC_ALT" group="TOSC2"/>
-                <signal pad-id="pe3" function="TOSC_ALT" group="TOSC1"/>
+                <signal pad-key="pr0" function="XTAL" group="XTAL2"/>
+                <signal pad-key="pr1" function="XTAL" group="XTAL1"/>
+                <signal pad-key="pr0" function="TOSC" group="TOSC2"/>
+                <signal pad-key="pr1" function="TOSC" group="TOSC1"/>
+                <signal pad-key="pe2" function="TOSC_ALT" group="TOSC2"/>
+                <signal pad-key="pe3" function="TOSC_ALT" group="TOSC1"/>
             </signals>
         </peripheral>
         <peripheral key="dfllrc32m" name="DFLLRC32M" module-key="i6055">
@@ -121,11 +121,11 @@
         <peripheral key="portcfg" name="PORTCFG" module-key="i6075_portcfg">
             <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"/>
-                <signal pad-id="pc7" function="EVOUT" group="EVOUT" field="EVOUT"/>
-                <signal pad-id="pc4" function="EVOUT_ALT" group="EVOUT" field="CLKEVPIN"/>
-                <signal pad-id="pc6" function="RTCOUTC" group="RTCOUT"/>
+                <signal pad-key="pc7" function="CLKOUT" group="CLKOUT" field="CLKOUT"/>
+                <signal pad-key="pc4" function="CLKOUT_ALT" group="CLKOUT" field="CLKEVPIN"/>
+                <signal pad-key="pc7" function="EVOUT" group="EVOUT" field="EVOUT"/>
+                <signal pad-key="pc4" function="EVOUT_ALT" group="EVOUT" field="CLKEVPIN"/>
+                <signal pad-key="pc6" function="RTCOUTC" group="RTCOUT"/>
             </signals>
         </peripheral>
         <peripheral key="crc" name="CRC" module-key="i6111">
@@ -140,34 +140,34 @@
         <peripheral key="adca" name="ADCA" module-key="i6110">
             <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"/>
-                <signal pad-id="pa2" index="2" function="ADC" group="ADC"/>
-                <signal pad-id="pa3" index="3" function="ADC" group="ADC"/>
-                <signal pad-id="pa4" index="4" function="ADC" group="ADC"/>
-                <signal pad-id="pa5" index="5" function="ADC" group="ADC"/>
-                <signal pad-id="pa6" index="6" function="ADC" group="ADC"/>
-                <signal pad-id="pa7" index="7" function="ADC" group="ADC"/>
-                <signal pad-id="pb0" index="8" function="ADC" group="ADC"/>
-                <signal pad-id="pb1" index="9" function="ADC" group="ADC"/>
-                <signal pad-id="pb2" index="10" function="ADC" group="ADC"/>
-                <signal pad-id="pb3" index="11" function="ADC" group="ADC"/>
-                <signal pad-id="pa0" index="0" function="AREF" group="REFA"/>
-                <signal pad-id="pb0" index="0" function="AREF" group="REFB"/>
+                <signal pad-key="pa0" index="0" function="ADC" group="ADC"/>
+                <signal pad-key="pa1" index="1" function="ADC" group="ADC"/>
+                <signal pad-key="pa2" index="2" function="ADC" group="ADC"/>
+                <signal pad-key="pa3" index="3" function="ADC" group="ADC"/>
+                <signal pad-key="pa4" index="4" function="ADC" group="ADC"/>
+                <signal pad-key="pa5" index="5" function="ADC" group="ADC"/>
+                <signal pad-key="pa6" index="6" function="ADC" group="ADC"/>
+                <signal pad-key="pa7" index="7" function="ADC" group="ADC"/>
+                <signal pad-key="pb0" index="8" function="ADC" group="ADC"/>
+                <signal pad-key="pb1" index="9" function="ADC" group="ADC"/>
+                <signal pad-key="pb2" index="10" function="ADC" group="ADC"/>
+                <signal pad-key="pb3" index="11" function="ADC" group="ADC"/>
+                <signal pad-key="pa0" index="0" function="AREF" group="REFA"/>
+                <signal pad-key="pb0" index="0" function="AREF" group="REFB"/>
             </signals>
         </peripheral>
         <peripheral key="aca" name="ACA" module-key="i6077">
             <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"/>
-                <signal pad-id="pa2" index="2" function="AC" group="AC"/>
-                <signal pad-id="pa3" index="3" function="AC" group="AC"/>
-                <signal pad-id="pa4" index="4" function="AC" group="AC"/>
-                <signal pad-id="pa5" index="5" function="AC" group="AC"/>
-                <signal pad-id="pa6" index="6" function="AC" group="AC"/>
-                <signal pad-id="pa7" index="7" function="AC" group="AC"/>
-                <signal pad-id="pa7" index="0" function="ACOUT" group="ACOUT"/>
+                <signal pad-key="pa0" index="0" function="AC" group="AC"/>
+                <signal pad-key="pa1" index="1" function="AC" group="AC"/>
+                <signal pad-key="pa2" index="2" function="AC" group="AC"/>
+                <signal pad-key="pa3" index="3" function="AC" group="AC"/>
+                <signal pad-key="pa4" index="4" function="AC" group="AC"/>
+                <signal pad-key="pa5" index="5" function="AC" group="AC"/>
+                <signal pad-key="pa6" index="6" function="AC" group="AC"/>
+                <signal pad-key="pa7" index="7" function="AC" group="AC"/>
+                <signal pad-key="pa7" index="0" function="ACOUT" group="ACOUT"/>
             </signals>
         </peripheral>
         <peripheral key="rtc" name="RTC" module-key="i6093">
@@ -176,163 +176,163 @@
         <peripheral key="twic" name="TWIC" module-key="i6089">
             <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"/>
+                <signal pad-key="pc0" function="TWI" group="SDA"/>
+                <signal pad-key="pc1" function="TWI" group="SCL"/>
             </signals>
         </peripheral>
         <peripheral key="twie" name="TWIE" module-key="i6089">
             <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"/>
+                <signal pad-key="pe0" function="TWI" group="SDA"/>
+                <signal pad-key="pe1" function="TWI" group="SCL"/>
             </signals>
         </peripheral>
         <peripheral key="usb" name="USB" module-key="i3005">
             <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"/>
+                <signal pad-key="pd6" function="USB" group="DN"/>
+                <signal pad-key="pd7" function="USB" group="DP"/>
             </signals>
         </peripheral>
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pa2" index="2" function="PORTA" group="P"/>
-                <signal pad-id="pa3" index="3" function="PORTA" group="P"/>
-                <signal pad-id="pa4" index="4" function="PORTA" group="P"/>
-                <signal pad-id="pa5" index="5" function="PORTA" group="P"/>
-                <signal pad-id="pa6" index="6" function="PORTA" group="P"/>
-                <signal pad-id="pa7" index="7" function="PORTA" group="P"/>
+                <signal pad-key="pa0" index="0" function="PORTA" group="P"/>
+                <signal pad-key="pa1" index="1" function="PORTA" group="P"/>
+                <signal pad-key="pa2" index="2" function="PORTA" group="P"/>
+                <signal pad-key="pa3" index="3" function="PORTA" group="P"/>
+                <signal pad-key="pa4" index="4" function="PORTA" group="P"/>
+                <signal pad-key="pa5" index="5" function="PORTA" group="P"/>
+                <signal pad-key="pa6" index="6" function="PORTA" group="P"/>
+                <signal pad-key="pa7" index="7" function="PORTA" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pb2" index="2" function="PORTB" group="P"/>
-                <signal pad-id="pb3" index="3" function="PORTB" group="P"/>
+                <signal pad-key="pb0" index="0" function="PORTB" group="P"/>
+                <signal pad-key="pb1" index="1" function="PORTB" group="P"/>
+                <signal pad-key="pb2" index="2" function="PORTB" group="P"/>
+                <signal pad-key="pb3" index="3" function="PORTB" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pc2" index="2" function="PORTC" group="P"/>
-                <signal pad-id="pc3" index="3" function="PORTC" group="P"/>
-                <signal pad-id="pc4" index="4" function="PORTC" group="P"/>
-                <signal pad-id="pc5" index="5" function="PORTC" group="P"/>
-                <signal pad-id="pc6" index="6" function="PORTC" group="P"/>
-                <signal pad-id="pc7" index="7" function="PORTC" group="P"/>
+                <signal pad-key="pc0" index="0" function="PORTC" group="P"/>
+                <signal pad-key="pc1" index="1" function="PORTC" group="P"/>
+                <signal pad-key="pc2" index="2" function="PORTC" group="P"/>
+                <signal pad-key="pc3" index="3" function="PORTC" group="P"/>
+                <signal pad-key="pc4" index="4" function="PORTC" group="P"/>
+                <signal pad-key="pc5" index="5" function="PORTC" group="P"/>
+                <signal pad-key="pc6" index="6" function="PORTC" group="P"/>
+                <signal pad-key="pc7" index="7" function="PORTC" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pd2" index="2" function="PORTD" group="P"/>
-                <signal pad-id="pd3" index="3" function="PORTD" group="P"/>
-                <signal pad-id="pd4" index="4" function="PORTD" group="P"/>
-                <signal pad-id="pd5" index="5" function="PORTD" group="P"/>
-                <signal pad-id="pd6" index="6" function="PORTD" group="P"/>
-                <signal pad-id="pd7" index="7" function="PORTD" group="P"/>
+                <signal pad-key="pd0" index="0" function="PORTD" group="P"/>
+                <signal pad-key="pd1" index="1" function="PORTD" group="P"/>
+                <signal pad-key="pd2" index="2" function="PORTD" group="P"/>
+                <signal pad-key="pd3" index="3" function="PORTD" group="P"/>
+                <signal pad-key="pd4" index="4" function="PORTD" group="P"/>
+                <signal pad-key="pd5" index="5" function="PORTD" group="P"/>
+                <signal pad-key="pd6" index="6" function="PORTD" group="P"/>
+                <signal pad-key="pd7" index="7" function="PORTD" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="porte" name="PORTE" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pe2" index="2" function="PORTE" group="P"/>
-                <signal pad-id="pe3" index="3" function="PORTE" group="P"/>
+                <signal pad-key="pe0" index="0" function="PORTE" group="P"/>
+                <signal pad-key="pe1" index="1" function="PORTE" group="P"/>
+                <signal pad-key="pe2" index="2" function="PORTE" group="P"/>
+                <signal pad-key="pe3" index="3" function="PORTE" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portr" name="PORTR" module-key="gpio_port">
             <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"/>
+                <signal pad-key="pr0" index="0" function="PORTR" group="P"/>
+                <signal pad-key="pr1" index="1" function="PORTR" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="tcc0" name="TCC0" module-key="i6090_tc">
             <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"/>
-                <signal pad-id="pc2" function="TCC" group="OC0C" field="TC0C"/>
-                <signal pad-id="pc3" function="TCC" group="OC0D" field="TC0D"/>
-                <signal pad-id="pc4" function="TCC_ALT" group="OC0A" field="TC0A"/>
-                <signal pad-id="pc5" function="TCC_ALT" group="OC0B" field="TC0B"/>
-                <signal pad-id="pc6" function="TCC_ALT" group="OC0C" field="TC0C"/>
-                <signal pad-id="pc7" function="TCC_ALT" group="OC0D" field="TC0D"/>
+                <signal pad-key="pc0" function="TCC" group="OC0A" field="TC0A"/>
+                <signal pad-key="pc1" function="TCC" group="OC0B" field="TC0B"/>
+                <signal pad-key="pc2" function="TCC" group="OC0C" field="TC0C"/>
+                <signal pad-key="pc3" function="TCC" group="OC0D" field="TC0D"/>
+                <signal pad-key="pc4" function="TCC_ALT" group="OC0A" field="TC0A"/>
+                <signal pad-key="pc5" function="TCC_ALT" group="OC0B" field="TC0B"/>
+                <signal pad-key="pc6" function="TCC_ALT" group="OC0C" field="TC0C"/>
+                <signal pad-key="pc7" function="TCC_ALT" group="OC0D" field="TC0D"/>
             </signals>
         </peripheral>
         <peripheral key="tcc1" name="TCC1" module-key="i6090_tc">
             <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"/>
+                <signal pad-key="pc4" function="TCC" group="OC1A"/>
+                <signal pad-key="pc5" function="TCC" group="OC1B"/>
             </signals>
         </peripheral>
         <peripheral key="tcd0" name="TCD0" module-key="i6090_tc">
             <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"/>
-                <signal pad-id="pd2" function="TC0" group="OC0C"/>
-                <signal pad-id="pd3" function="TC0" group="OC0D"/>
+                <signal pad-key="pd0" function="TC0" group="OC0A"/>
+                <signal pad-key="pd1" function="TC0" group="OC0B"/>
+                <signal pad-key="pd2" function="TC0" group="OC0C"/>
+                <signal pad-key="pd3" function="TC0" group="OC0D"/>
             </signals>
         </peripheral>
         <peripheral key="tce0" name="TCE0" module-key="i6090_tc">
             <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"/>
-                <signal pad-id="pe2" function="TCE" group="OC0C"/>
-                <signal pad-id="pe3" function="TCE" group="OC0D"/>
+                <signal pad-key="pe0" function="TCE" group="OC0A"/>
+                <signal pad-key="pe1" function="TCE" group="OC0B"/>
+                <signal pad-key="pe2" function="TCE" group="OC0C"/>
+                <signal pad-key="pe3" function="TCE" group="OC0D"/>
             </signals>
         </peripheral>
         <peripheral key="tcc2" name="TCC2" module-key="i6090_tc2">
             <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"/>
-                <signal pad-id="pc2" function="TC2" group="LOC2C"/>
-                <signal pad-id="pc3" function="TC2" group="LOC2D"/>
-                <signal pad-id="pc4" function="TC2" group="HOC2A"/>
-                <signal pad-id="pc5" function="TC2" group="HOC2B"/>
-                <signal pad-id="pc6" function="TC2" group="HOC2C"/>
-                <signal pad-id="pc7" function="TC2" group="HOC2D"/>
+                <signal pad-key="pc0" function="TC2" group="LOC2A"/>
+                <signal pad-key="pc1" function="TC2" group="LOC2B"/>
+                <signal pad-key="pc2" function="TC2" group="LOC2C"/>
+                <signal pad-key="pc3" function="TC2" group="LOC2D"/>
+                <signal pad-key="pc4" function="TC2" group="HOC2A"/>
+                <signal pad-key="pc5" function="TC2" group="HOC2B"/>
+                <signal pad-key="pc6" function="TC2" group="HOC2C"/>
+                <signal pad-key="pc7" function="TC2" group="HOC2D"/>
             </signals>
         </peripheral>
         <peripheral key="tcd2" name="TCD2" module-key="i6090_tc2">
             <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"/>
-                <signal pad-id="pd2" function="TC2" group="LOC2C"/>
-                <signal pad-id="pd3" function="TC2" group="LOC2D"/>
-                <signal pad-id="pd4" function="TC2" group="HOC2A"/>
-                <signal pad-id="pd5" function="TC2" group="HOC2B"/>
-                <signal pad-id="pd6" function="TC2" group="HOC2C"/>
-                <signal pad-id="pd7" function="TC2" group="HOC2D"/>
+                <signal pad-key="pd0" function="TC2" group="LOC2A"/>
+                <signal pad-key="pd1" function="TC2" group="LOC2B"/>
+                <signal pad-key="pd2" function="TC2" group="LOC2C"/>
+                <signal pad-key="pd3" function="TC2" group="LOC2D"/>
+                <signal pad-key="pd4" function="TC2" group="HOC2A"/>
+                <signal pad-key="pd5" function="TC2" group="HOC2B"/>
+                <signal pad-key="pd6" function="TC2" group="HOC2C"/>
+                <signal pad-key="pd7" function="TC2" group="HOC2D"/>
             </signals>
         </peripheral>
         <peripheral key="awexc" name="AWEXC" module-key="i6090_awex">
             <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"/>
-                <signal pad-id="pc2" function="AWEX" group="OC0BLS"/>
-                <signal pad-id="pc3" function="AWEX" group="OC0BHS"/>
-                <signal pad-id="pc4" function="AWEX" group="OC0CLS"/>
-                <signal pad-id="pc5" function="AWEX" group="OC0CHS"/>
-                <signal pad-id="pc6" function="AWEX" group="OC0DLS"/>
-                <signal pad-id="pc7" function="AWEX" group="OC0DHS"/>
+                <signal pad-key="pc0" function="AWEX" group="OC0ALS"/>
+                <signal pad-key="pc1" function="AWEX" group="OC0AHS"/>
+                <signal pad-key="pc2" function="AWEX" group="OC0BLS"/>
+                <signal pad-key="pc3" function="AWEX" group="OC0BHS"/>
+                <signal pad-key="pc4" function="AWEX" group="OC0CLS"/>
+                <signal pad-key="pc5" function="AWEX" group="OC0CHS"/>
+                <signal pad-key="pc6" function="AWEX" group="OC0DLS"/>
+                <signal pad-key="pc7" function="AWEX" group="OC0DHS"/>
             </signals>
         </peripheral>
         <peripheral key="hiresc" name="HIRESC" module-key="i6090_hires">
@@ -341,50 +341,50 @@
         <peripheral key="usartc0" name="USARTC0" module-key="i6090_usart">
             <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"/>
-                <signal pad-id="pc3" function="USART" group="TXD" field="USART0"/>
-                <signal pad-id="pc5" function="USART_ALT" group="XCK" field="USART0"/>
-                <signal pad-id="pc6" function="USART_ALT" group="RXD" field="USART0"/>
-                <signal pad-id="pc7" function="USART_ALT" group="TXD" field="USART0"/>
+                <signal pad-key="pc1" function="USART" group="XCK" field="USART0"/>
+                <signal pad-key="pc2" function="USART" group="RXD" field="USART0"/>
+                <signal pad-key="pc3" function="USART" group="TXD" field="USART0"/>
+                <signal pad-key="pc5" function="USART_ALT" group="XCK" field="USART0"/>
+                <signal pad-key="pc6" function="USART_ALT" group="RXD" field="USART0"/>
+                <signal pad-key="pc7" function="USART_ALT" group="TXD" field="USART0"/>
             </signals>
         </peripheral>
         <peripheral key="usartc1" name="USARTC1" module-key="i6090_usart">
             <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"/>
-                <signal pad-id="pc7" function="USART" group="TXD"/>
+                <signal pad-key="pc5" function="USART" group="XCK"/>
+                <signal pad-key="pc6" function="USART" group="RXD"/>
+                <signal pad-key="pc7" function="USART" group="TXD"/>
             </signals>
         </peripheral>
         <peripheral key="usartd0" name="USARTD0" module-key="i6090_usart">
             <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"/>
-                <signal pad-id="pd3" function="USART" group="TXD"/>
+                <signal pad-key="pd1" function="USART" group="XCK"/>
+                <signal pad-key="pd2" function="USART" group="RXD"/>
+                <signal pad-key="pd3" function="USART" group="TXD"/>
             </signals>
         </peripheral>
         <peripheral key="spic" name="SPIC" module-key="i6090_spi">
             <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"/>
-                <signal pad-id="pc6" function="SPI" group="MISO" field="SPI"/>
-                <signal pad-id="pc7" function="SPI" group="SCK" field="SPI"/>
-                <signal pad-id="pc4" function="SPI_ALT" group="SS" field="SPI"/>
-                <signal pad-id="pc5" function="SPI_ALT" group="SCK" field="SPI"/>
-                <signal pad-id="pc6" function="SPI_ALT" group="MISO" field="SPI"/>
-                <signal pad-id="pc7" function="SPI_ALT" group="MOSI" field="SPI"/>
+                <signal pad-key="pc4" function="SPI" group="SS" field="SPI"/>
+                <signal pad-key="pc5" function="SPI" group="MOSI" field="SPI"/>
+                <signal pad-key="pc6" function="SPI" group="MISO" field="SPI"/>
+                <signal pad-key="pc7" function="SPI" group="SCK" field="SPI"/>
+                <signal pad-key="pc4" function="SPI_ALT" group="SS" field="SPI"/>
+                <signal pad-key="pc5" function="SPI_ALT" group="SCK" field="SPI"/>
+                <signal pad-key="pc6" function="SPI_ALT" group="MISO" field="SPI"/>
+                <signal pad-key="pc7" function="SPI_ALT" group="MOSI" field="SPI"/>
             </signals>
         </peripheral>
         <peripheral key="spid" name="SPID" module-key="i6090_spi">
             <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"/>
-                <signal pad-id="pd6" function="SPI" group="MISO"/>
-                <signal pad-id="pd7" function="SPI" group="SCK"/>
+                <signal pad-key="pd4" function="SPI" group="SS"/>
+                <signal pad-key="pd5" function="SPI" group="MOSI"/>
+                <signal pad-key="pd6" function="SPI" group="MISO"/>
+                <signal pad-key="pd7" function="SPI" group="SCK"/>
             </signals>
         </peripheral>
         <peripheral key="ircom" name="IRCOM" module-key="i6090_ircom">
@@ -1519,110 +1519,151 @@
             </register-group>
         </module>
     </modules>
+    <pads>
+        <pad key="pa5" name="PA5"/>
+        <pad key="pa6" name="PA6"/>
+        <pad key="pa7" name="PA7"/>
+        <pad key="pb0" name="PB0"/>
+        <pad key="pb1" name="PB1"/>
+        <pad key="pb2" name="PB2"/>
+        <pad key="pb3" name="PB3"/>
+        <pad key="gnd" name="GND"/>
+        <pad key="vcc" name="VCC"/>
+        <pad key="pc0" name="PC0"/>
+        <pad key="pc1" name="PC1"/>
+        <pad key="pc2" name="PC2"/>
+        <pad key="pc3" name="PC3"/>
+        <pad key="pc4" name="PC4"/>
+        <pad key="pc5" name="PC5"/>
+        <pad key="pc6" name="PC6"/>
+        <pad key="pc7" name="PC7"/>
+        <pad key="pd0" name="PD0"/>
+        <pad key="pd1" name="PD1"/>
+        <pad key="pd2" name="PD2"/>
+        <pad key="pd3" name="PD3"/>
+        <pad key="pd4" name="PD4"/>
+        <pad key="pd5" name="PD5"/>
+        <pad key="pd6" name="PD6"/>
+        <pad key="pd7" name="PD7"/>
+        <pad key="pe0" name="PE0"/>
+        <pad key="pe1" name="PE1"/>
+        <pad key="pe2" name="PE2"/>
+        <pad key="pe3" name="PE3"/>
+        <pad key="pdi" name="PDI"/>
+        <pad key="reset" name="RESET"/>
+        <pad key="pr0" name="PR0"/>
+        <pad key="pr1" name="PR1"/>
+        <pad key="avcc" name="AVCC"/>
+        <pad key="pa0" name="PA0"/>
+        <pad key="pa1" name="PA1"/>
+        <pad key="pa2" name="PA2"/>
+        <pad key="pa3" name="PA3"/>
+        <pad key="pa4" name="PA4"/>
+    </pads>
     <pinouts>
         <pinout key="qfn_qfp_44" name="QFN_QFP_44" type="qfn">
-            <pin position="1" pad="PA5"/>
-            <pin position="2" pad="PA6"/>
-            <pin position="3" pad="PA7"/>
-            <pin position="4" pad="PB0"/>
-            <pin position="5" pad="PB1"/>
-            <pin position="6" pad="PB2"/>
-            <pin position="7" pad="PB3"/>
-            <pin position="8" pad="GND"/>
-            <pin position="9" pad="VCC"/>
-            <pin position="10" pad="PC0"/>
-            <pin position="11" pad="PC1"/>
-            <pin position="12" pad="PC2"/>
-            <pin position="13" pad="PC3"/>
-            <pin position="14" pad="PC4"/>
-            <pin position="15" pad="PC5"/>
-            <pin position="16" pad="PC6"/>
-            <pin position="17" pad="PC7"/>
-            <pin position="18" pad="GND"/>
-            <pin position="19" pad="VCC"/>
-            <pin position="20" pad="PD0"/>
-            <pin position="21" pad="PD1"/>
-            <pin position="22" pad="PD2"/>
-            <pin position="23" pad="PD3"/>
-            <pin position="24" pad="PD4"/>
-            <pin position="25" pad="PD5"/>
-            <pin position="26" pad="PD6"/>
-            <pin position="27" pad="PD7"/>
-            <pin position="28" pad="PE0"/>
-            <pin position="29" pad="PE1"/>
-            <pin position="30" pad="GND"/>
-            <pin position="31" pad="VCC"/>
-            <pin position="32" pad="PE2"/>
-            <pin position="33" pad="PE3"/>
-            <pin position="34" pad="PDI"/>
-            <pin position="35" pad="RESET"/>
-            <pin position="36" pad="PR0"/>
-            <pin position="37" pad="PR1"/>
-            <pin position="38" pad="GND"/>
-            <pin position="39" pad="AVCC"/>
-            <pin position="40" pad="PA0"/>
-            <pin position="41" pad="PA1"/>
-            <pin position="42" pad="PA2"/>
-            <pin position="43" pad="PA3"/>
-            <pin position="44" pad="PA4"/>
+            <pin position="1" pad-key="pa5"/>
+            <pin position="2" pad-key="pa6"/>
+            <pin position="3" pad-key="pa7"/>
+            <pin position="4" pad-key="pb0"/>
+            <pin position="5" pad-key="pb1"/>
+            <pin position="6" pad-key="pb2"/>
+            <pin position="7" pad-key="pb3"/>
+            <pin position="8" pad-key="gnd"/>
+            <pin position="9" pad-key="vcc"/>
+            <pin position="10" pad-key="pc0"/>
+            <pin position="11" pad-key="pc1"/>
+            <pin position="12" pad-key="pc2"/>
+            <pin position="13" pad-key="pc3"/>
+            <pin position="14" pad-key="pc4"/>
+            <pin position="15" pad-key="pc5"/>
+            <pin position="16" pad-key="pc6"/>
+            <pin position="17" pad-key="pc7"/>
+            <pin position="18" pad-key="gnd"/>
+            <pin position="19" pad-key="vcc"/>
+            <pin position="20" pad-key="pd0"/>
+            <pin position="21" pad-key="pd1"/>
+            <pin position="22" pad-key="pd2"/>
+            <pin position="23" pad-key="pd3"/>
+            <pin position="24" pad-key="pd4"/>
+            <pin position="25" pad-key="pd5"/>
+            <pin position="26" pad-key="pd6"/>
+            <pin position="27" pad-key="pd7"/>
+            <pin position="28" pad-key="pe0"/>
+            <pin position="29" pad-key="pe1"/>
+            <pin position="30" pad-key="gnd"/>
+            <pin position="31" pad-key="vcc"/>
+            <pin position="32" pad-key="pe2"/>
+            <pin position="33" pad-key="pe3"/>
+            <pin position="34" pad-key="pdi"/>
+            <pin position="35" pad-key="reset"/>
+            <pin position="36" pad-key="pr0"/>
+            <pin position="37" pad-key="pr1"/>
+            <pin position="38" pad-key="gnd"/>
+            <pin position="39" pad-key="avcc"/>
+            <pin position="40" pad-key="pa0"/>
+            <pin position="41" pad-key="pa1"/>
+            <pin position="42" pad-key="pa2"/>
+            <pin position="43" pad-key="pa3"/>
+            <pin position="44" pad-key="pa4"/>
         </pinout>
         <pinout key="bga_49" name="BGA_49" type="bga">
-            <pin position="A1" pad="PA3"/>
-            <pin position="A2" pad="AVCC"/>
-            <pin position="A3" pad="GND"/>
-            <pin position="A4" pad="PR1"/>
-            <pin position="A5" pad="PR0"/>
-            <pin position="A6" pad="PDI"/>
-            <pin position="A7" pad="PE3"/>
-            <pin position="B1" pad="PA4"/>
-            <pin position="B2" pad="PA1"/>
-            <pin position="B3" pad="PA0"/>
-            <pin position="B4" pad="GND"/>
-            <pin position="B5" pad="RESET"/>
-            <pin position="B6" pad="PE2"/>
-            <pin position="B7" pad="VCC"/>
-            <pin position="C1" pad="PA5"/>
-            <pin position="C2" pad="PA2"/>
-            <pin position="C3" pad="PA6"/>
-            <pin position="C4" pad="PA7"/>
-            <pin position="C5" pad="GND"/>
-            <pin position="C6" pad="PE1"/>
-            <pin position="C7" pad="GND"/>
-            <pin position="D1" pad="PB1"/>
-            <pin position="D2" pad="PB2"/>
-            <pin position="D3" pad="PB3"/>
-            <pin position="D4" pad="PB0"/>
-            <pin position="D5" pad="GND"/>
-            <pin position="D6" pad="PD7"/>
-            <pin position="D7" pad="PE0"/>
-            <pin position="E1" pad="GND"/>
-            <pin position="E2" pad="GND"/>
-            <pin position="E3" pad="PC3"/>
-            <pin position="E4" pad="GND"/>
-            <pin position="E5" pad="PD4"/>
-            <pin position="E6" pad="PD5"/>
-            <pin position="E7" pad="PD6"/>
-            <pin position="F1" pad="VCC"/>
-            <pin position="F2" pad="PC0"/>
-            <pin position="F3" pad="PC4"/>
-            <pin position="F4" pad="PC6"/>
-            <pin position="F5" pad="PD0"/>
-            <pin position="F6" pad="PD1"/>
-            <pin position="F7" pad="PD3"/>
-            <pin position="G1" pad="PC1"/>
-            <pin position="G2" pad="PC2"/>
-            <pin position="G3" pad="PC5"/>
-            <pin position="G4" pad="PC7"/>
-            <pin position="G5" pad="GND"/>
-            <pin position="G6" pad="VCC"/>
-            <pin position="G7" pad="PD2"/>
+            <pin position="A1" pad-key="pa3"/>
+            <pin position="A2" pad-key="avcc"/>
+            <pin position="A3" pad-key="gnd"/>
+            <pin position="A4" pad-key="pr1"/>
+            <pin position="A5" pad-key="pr0"/>
+            <pin position="A6" pad-key="pdi"/>
+            <pin position="A7" pad-key="pe3"/>
+            <pin position="B1" pad-key="pa4"/>
+            <pin position="B2" pad-key="pa1"/>
+            <pin position="B3" pad-key="pa0"/>
+            <pin position="B4" pad-key="gnd"/>
+            <pin position="B5" pad-key="reset"/>
+            <pin position="B6" pad-key="pe2"/>
+            <pin position="B7" pad-key="vcc"/>
+            <pin position="C1" pad-key="pa5"/>
+            <pin position="C2" pad-key="pa2"/>
+            <pin position="C3" pad-key="pa6"/>
+            <pin position="C4" pad-key="pa7"/>
+            <pin position="C5" pad-key="gnd"/>
+            <pin position="C6" pad-key="pe1"/>
+            <pin position="C7" pad-key="gnd"/>
+            <pin position="D1" pad-key="pb1"/>
+            <pin position="D2" pad-key="pb2"/>
+            <pin position="D3" pad-key="pb3"/>
+            <pin position="D4" pad-key="pb0"/>
+            <pin position="D5" pad-key="gnd"/>
+            <pin position="D6" pad-key="pd7"/>
+            <pin position="D7" pad-key="pe0"/>
+            <pin position="E1" pad-key="gnd"/>
+            <pin position="E2" pad-key="gnd"/>
+            <pin position="E3" pad-key="pc3"/>
+            <pin position="E4" pad-key="gnd"/>
+            <pin position="E5" pad-key="pd4"/>
+            <pin position="E6" pad-key="pd5"/>
+            <pin position="E7" pad-key="pd6"/>
+            <pin position="F1" pad-key="vcc"/>
+            <pin position="F2" pad-key="pc0"/>
+            <pin position="F3" pad-key="pc4"/>
+            <pin position="F4" pad-key="pc6"/>
+            <pin position="F5" pad-key="pd0"/>
+            <pin position="F6" pad-key="pd1"/>
+            <pin position="F7" pad-key="pd3"/>
+            <pin position="G1" pad-key="pc1"/>
+            <pin position="G2" pad-key="pc2"/>
+            <pin position="G3" pad-key="pc5"/>
+            <pin position="G4" pad-key="pc7"/>
+            <pin position="G5" pad-key="gnd"/>
+            <pin position="G6" pad-key="vcc"/>
+            <pin position="G7" pad-key="pd2"/>
         </pinout>
     </pinouts>
     <variants>
-        <variant name="ATxmega16C4-AU" pinout-key="qfn_qfp_44" package="TQFP44"/>
-        <variant name="ATxmega16C4-MH" pinout-key="qfn_qfp_44" package="VQFN44"/>
-        <variant name="ATxmega16C4-CU" pinout-key="bga_49" package="VFBGA49"/>
-        <variant name="ATxmega16C4-AN" pinout-key="qfn_qfp_44" package="TQFP44"/>
-        <variant name="ATxmega16C4-M7" pinout-key="bga_49" package="VFBGA49"/>
+        <variant key="atxmega16c4_au" name="ATxmega16C4-AU" pinout-key="qfn_qfp_44"/>
+        <variant key="atxmega16c4_mh" name="ATxmega16C4-MH" pinout-key="qfn_qfp_44"/>
+        <variant key="atxmega16c4_cu" name="ATxmega16C4-CU" pinout-key="bga_49"/>
+        <variant key="atxmega16c4_an" name="ATxmega16C4-AN" pinout-key="qfn_qfp_44"/>
+        <variant key="atxmega16c4_m7" name="ATxmega16C4-M7" pinout-key="bga_49"/>
     </variants>
 </device>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA16D4.xml b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA16D4.xml
index 7cb88cb8..3fb87d40 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA16D4.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA16D4.xml
@@ -81,12 +81,12 @@
         <peripheral key="osc" name="OSC" module-key="i6079">
             <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"/>
-                <signal pad-id="pr0" function="TOSC" group="TOSC2"/>
-                <signal pad-id="pr1" function="TOSC" group="TOSC1"/>
-                <signal pad-id="pe2" function="TOSC_ALT" group="TOSC2"/>
-                <signal pad-id="pe3" function="TOSC_ALT" group="TOSC1"/>
+                <signal pad-key="pr0" function="XTAL" group="XTAL2"/>
+                <signal pad-key="pr1" function="XTAL" group="XTAL1"/>
+                <signal pad-key="pr0" function="TOSC" group="TOSC2"/>
+                <signal pad-key="pr1" function="TOSC" group="TOSC1"/>
+                <signal pad-key="pe2" function="TOSC_ALT" group="TOSC2"/>
+                <signal pad-key="pe3" function="TOSC_ALT" group="TOSC1"/>
             </signals>
         </peripheral>
         <peripheral key="dfllrc32m" name="DFLLRC32M" module-key="i6055">
@@ -128,34 +128,34 @@
         <peripheral key="aca" name="ACA" module-key="i6077">
             <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"/>
-                <signal pad-id="pa2" index="2" function="AC" group="AC"/>
-                <signal pad-id="pa3" index="3" function="AC" group="AC"/>
-                <signal pad-id="pa4" index="4" function="AC" group="AC"/>
-                <signal pad-id="pa5" index="5" function="AC" group="AC"/>
-                <signal pad-id="pa6" index="6" function="AC" group="AC"/>
-                <signal pad-id="pa7" index="7" function="AC" group="AC"/>
-                <signal pad-id="pa7" index="0" function="ACOUT" group="ACOUT"/>
+                <signal pad-key="pa0" index="0" function="AC" group="AC"/>
+                <signal pad-key="pa1" index="1" function="AC" group="AC"/>
+                <signal pad-key="pa2" index="2" function="AC" group="AC"/>
+                <signal pad-key="pa3" index="3" function="AC" group="AC"/>
+                <signal pad-key="pa4" index="4" function="AC" group="AC"/>
+                <signal pad-key="pa5" index="5" function="AC" group="AC"/>
+                <signal pad-key="pa6" index="6" function="AC" group="AC"/>
+                <signal pad-key="pa7" index="7" function="AC" group="AC"/>
+                <signal pad-key="pa7" index="0" function="ACOUT" group="ACOUT"/>
             </signals>
         </peripheral>
         <peripheral key="adca" name="ADCA" module-key="i6099">
             <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"/>
-                <signal pad-id="pa2" index="2" function="ADC" group="ADC"/>
-                <signal pad-id="pa3" index="3" function="ADC" group="ADC"/>
-                <signal pad-id="pa4" index="4" function="ADC" group="ADC"/>
-                <signal pad-id="pa5" index="5" function="ADC" group="ADC"/>
-                <signal pad-id="pa6" index="6" function="ADC" group="ADC"/>
-                <signal pad-id="pa7" index="7" function="ADC" group="ADC"/>
-                <signal pad-id="pb0" index="8" function="ADC" group="ADC"/>
-                <signal pad-id="pb1" index="9" function="ADC" group="ADC"/>
-                <signal pad-id="pb2" index="10" function="ADC" group="ADC"/>
-                <signal pad-id="pb3" index="11" function="ADC" group="ADC"/>
-                <signal pad-id="pa0" index="0" function="AREF" group="REFA"/>
-                <signal pad-id="pb0" index="0" function="AREF" group="REFB"/>
+                <signal pad-key="pa0" index="0" function="ADC" group="ADC"/>
+                <signal pad-key="pa1" index="1" function="ADC" group="ADC"/>
+                <signal pad-key="pa2" index="2" function="ADC" group="ADC"/>
+                <signal pad-key="pa3" index="3" function="ADC" group="ADC"/>
+                <signal pad-key="pa4" index="4" function="ADC" group="ADC"/>
+                <signal pad-key="pa5" index="5" function="ADC" group="ADC"/>
+                <signal pad-key="pa6" index="6" function="ADC" group="ADC"/>
+                <signal pad-key="pa7" index="7" function="ADC" group="ADC"/>
+                <signal pad-key="pb0" index="8" function="ADC" group="ADC"/>
+                <signal pad-key="pb1" index="9" function="ADC" group="ADC"/>
+                <signal pad-key="pb2" index="10" function="ADC" group="ADC"/>
+                <signal pad-key="pb3" index="11" function="ADC" group="ADC"/>
+                <signal pad-key="pa0" index="0" function="AREF" group="REFA"/>
+                <signal pad-key="pb0" index="0" function="AREF" group="REFB"/>
             </signals>
         </peripheral>
         <peripheral key="rtc" name="RTC" module-key="i6093">
@@ -164,25 +164,25 @@
         <peripheral key="twic" name="TWIC" module-key="i6089">
             <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"/>
+                <signal pad-key="pc0" function="TWI" group="SDA"/>
+                <signal pad-key="pc1" function="TWI" group="SCL"/>
             </signals>
         </peripheral>
         <peripheral key="twie" name="TWIE" module-key="i6089">
             <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"/>
+                <signal pad-key="pe0" function="TWI" group="SDA"/>
+                <signal pad-key="pe1" function="TWI" group="SCL"/>
             </signals>
         </peripheral>
         <peripheral key="port_cfg" name="PORT_CFG" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pc7" function="EVOUT" group="EVOUT" field="EVOUT"/>
-                <signal pad-id="pc4" function="EVOUT_ALT" group="EVOUT" field="CLKEVPIN"/>
-                <signal pad-id="pc6" function="RTCOUTC" group="RTCOUT"/>
+                <signal pad-key="pc7" function="CLKOUT" group="CLKOUT" field="CLKOUT"/>
+                <signal pad-key="pc4" function="CLKOUT_ALT" group="CLKOUT" field="CLKEVPIN"/>
+                <signal pad-key="pc7" function="EVOUT" group="EVOUT" field="EVOUT"/>
+                <signal pad-key="pc4" function="EVOUT_ALT" group="EVOUT" field="CLKEVPIN"/>
+                <signal pad-key="pc6" function="RTCOUTC" group="RTCOUT"/>
             </signals>
         </peripheral>
         <peripheral key="vport0" name="VPORT0" module-key="gpio_port">
@@ -200,98 +200,98 @@
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pa2" index="2" function="PORTA" group="P"/>
-                <signal pad-id="pa3" index="3" function="PORTA" group="P"/>
-                <signal pad-id="pa4" index="4" function="PORTA" group="P"/>
-                <signal pad-id="pa5" index="5" function="PORTA" group="P"/>
-                <signal pad-id="pa6" index="6" function="PORTA" group="P"/>
-                <signal pad-id="pa7" index="7" function="PORTA" group="P"/>
+                <signal pad-key="pa0" index="0" function="PORTA" group="P"/>
+                <signal pad-key="pa1" index="1" function="PORTA" group="P"/>
+                <signal pad-key="pa2" index="2" function="PORTA" group="P"/>
+                <signal pad-key="pa3" index="3" function="PORTA" group="P"/>
+                <signal pad-key="pa4" index="4" function="PORTA" group="P"/>
+                <signal pad-key="pa5" index="5" function="PORTA" group="P"/>
+                <signal pad-key="pa6" index="6" function="PORTA" group="P"/>
+                <signal pad-key="pa7" index="7" function="PORTA" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pb2" index="2" function="PORTB" group="P"/>
-                <signal pad-id="pb3" index="3" function="PORTB" group="P"/>
+                <signal pad-key="pb0" index="0" function="PORTB" group="P"/>
+                <signal pad-key="pb1" index="1" function="PORTB" group="P"/>
+                <signal pad-key="pb2" index="2" function="PORTB" group="P"/>
+                <signal pad-key="pb3" index="3" function="PORTB" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pc2" index="2" function="PORTC" group="P"/>
-                <signal pad-id="pc3" index="3" function="PORTC" group="P"/>
-                <signal pad-id="pc4" index="4" function="PORTC" group="P"/>
-                <signal pad-id="pc5" index="5" function="PORTC" group="P"/>
-                <signal pad-id="pc6" index="6" function="PORTC" group="P"/>
-                <signal pad-id="pc7" index="7" function="PORTC" group="P"/>
+                <signal pad-key="pc0" index="0" function="PORTC" group="P"/>
+                <signal pad-key="pc1" index="1" function="PORTC" group="P"/>
+                <signal pad-key="pc2" index="2" function="PORTC" group="P"/>
+                <signal pad-key="pc3" index="3" function="PORTC" group="P"/>
+                <signal pad-key="pc4" index="4" function="PORTC" group="P"/>
+                <signal pad-key="pc5" index="5" function="PORTC" group="P"/>
+                <signal pad-key="pc6" index="6" function="PORTC" group="P"/>
+                <signal pad-key="pc7" index="7" function="PORTC" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pd2" index="2" function="PORTD" group="P"/>
-                <signal pad-id="pd3" index="3" function="PORTD" group="P"/>
-                <signal pad-id="pd4" index="4" function="PORTD" group="P"/>
-                <signal pad-id="pd5" index="5" function="PORTD" group="P"/>
-                <signal pad-id="pd6" index="6" function="PORTD" group="P"/>
-                <signal pad-id="pd7" index="7" function="PORTD" group="P"/>
+                <signal pad-key="pd0" index="0" function="PORTD" group="P"/>
+                <signal pad-key="pd1" index="1" function="PORTD" group="P"/>
+                <signal pad-key="pd2" index="2" function="PORTD" group="P"/>
+                <signal pad-key="pd3" index="3" function="PORTD" group="P"/>
+                <signal pad-key="pd4" index="4" function="PORTD" group="P"/>
+                <signal pad-key="pd5" index="5" function="PORTD" group="P"/>
+                <signal pad-key="pd6" index="6" function="PORTD" group="P"/>
+                <signal pad-key="pd7" index="7" function="PORTD" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="porte" name="PORTE" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pe2" index="2" function="PORTE" group="P"/>
-                <signal pad-id="pe3" index="3" function="PORTE" group="P"/>
+                <signal pad-key="pe0" index="0" function="PORTE" group="P"/>
+                <signal pad-key="pe1" index="1" function="PORTE" group="P"/>
+                <signal pad-key="pe2" index="2" function="PORTE" group="P"/>
+                <signal pad-key="pe3" index="3" function="PORTE" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portr" name="PORTR" module-key="gpio_port">
             <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"/>
+                <signal pad-key="pr0" index="0" function="PORTR" group="P"/>
+                <signal pad-key="pr1" index="1" function="PORTR" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="tcc0" name="TCC0" module-key="i6090_tc">
             <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"/>
-                <signal pad-id="pc2" function="TCC" group="OC0C" field="TC0C"/>
-                <signal pad-id="pc3" function="TCC" group="OC0D" field="TC0D"/>
-                <signal pad-id="pc4" function="TCC_ALT" group="OC0A" field="TC0A"/>
-                <signal pad-id="pc5" function="TCC_ALT" group="OC0B" field="TC0B"/>
-                <signal pad-id="pc6" function="TCC_ALT" group="OC0C" field="TC0C"/>
-                <signal pad-id="pc7" function="TCC_ALT" group="OC0D" field="TC0D"/>
+                <signal pad-key="pc0" function="TCC" group="OC0A" field="TC0A"/>
+                <signal pad-key="pc1" function="TCC" group="OC0B" field="TC0B"/>
+                <signal pad-key="pc2" function="TCC" group="OC0C" field="TC0C"/>
+                <signal pad-key="pc3" function="TCC" group="OC0D" field="TC0D"/>
+                <signal pad-key="pc4" function="TCC_ALT" group="OC0A" field="TC0A"/>
+                <signal pad-key="pc5" function="TCC_ALT" group="OC0B" field="TC0B"/>
+                <signal pad-key="pc6" function="TCC_ALT" group="OC0C" field="TC0C"/>
+                <signal pad-key="pc7" function="TCC_ALT" group="OC0D" field="TC0D"/>
             </signals>
         </peripheral>
         <peripheral key="tcc1" name="TCC1" module-key="i6090_tc">
             <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"/>
+                <signal pad-key="pc4" function="TCC" group="OC1A"/>
+                <signal pad-key="pc5" function="TCC" group="OC1B"/>
             </signals>
         </peripheral>
         <peripheral key="awexc" name="AWEXC" module-key="i6090_tc">
             <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"/>
-                <signal pad-id="pc2" function="AWEX" group="OC0BLS"/>
-                <signal pad-id="pc3" function="AWEX" group="OC0BHS"/>
-                <signal pad-id="pc4" function="AWEX" group="OC0CLS"/>
-                <signal pad-id="pc5" function="AWEX" group="OC0CHS"/>
-                <signal pad-id="pc6" function="AWEX" group="OC0DLS"/>
-                <signal pad-id="pc7" function="AWEX" group="OC0DHS"/>
+                <signal pad-key="pc0" function="AWEX" group="OC0ALS"/>
+                <signal pad-key="pc1" function="AWEX" group="OC0AHS"/>
+                <signal pad-key="pc2" function="AWEX" group="OC0BLS"/>
+                <signal pad-key="pc3" function="AWEX" group="OC0BHS"/>
+                <signal pad-key="pc4" function="AWEX" group="OC0CLS"/>
+                <signal pad-key="pc5" function="AWEX" group="OC0CHS"/>
+                <signal pad-key="pc6" function="AWEX" group="OC0DLS"/>
+                <signal pad-key="pc7" function="AWEX" group="OC0DHS"/>
             </signals>
         </peripheral>
         <peripheral key="hiresc" name="HIRESC" module-key="i6090_tc">
@@ -300,73 +300,73 @@
         <peripheral key="tcd0" name="TCD0" module-key="i6090_tc">
             <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"/>
-                <signal pad-id="pd2" function="TCC" group="OC0C"/>
-                <signal pad-id="pd3" function="TCC" group="OC0D"/>
+                <signal pad-key="pd0" function="TCC" group="OC0A"/>
+                <signal pad-key="pd1" function="TCC" group="OC0B"/>
+                <signal pad-key="pd2" function="TCC" group="OC0C"/>
+                <signal pad-key="pd3" function="TCC" group="OC0D"/>
             </signals>
         </peripheral>
         <peripheral key="tce0" name="TCE0" module-key="i6090_tc">
             <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"/>
-                <signal pad-id="pe2" function="TCE" group="OC0C"/>
-                <signal pad-id="pe3" function="TCE" group="OC0D"/>
+                <signal pad-key="pe0" function="TCE" group="OC0A"/>
+                <signal pad-key="pe1" function="TCE" group="OC0B"/>
+                <signal pad-key="pe2" function="TCE" group="OC0C"/>
+                <signal pad-key="pe3" function="TCE" group="OC0D"/>
             </signals>
         </peripheral>
         <peripheral key="tcc2" name="TCC2" module-key="i6090_tc2">
             <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"/>
-                <signal pad-id="pc2" function="TCC2" group="LOC2C"/>
-                <signal pad-id="pc3" function="TCC2" group="LOC2D"/>
-                <signal pad-id="pc4" function="TCC2" group="HOC2A"/>
-                <signal pad-id="pc5" function="TCC2" group="HOC2B"/>
-                <signal pad-id="pc6" function="TCC2" group="HOC2C"/>
-                <signal pad-id="pc7" function="TCC2" group="HOC2D"/>
+                <signal pad-key="pc0" function="TCC2" group="LOC2A"/>
+                <signal pad-key="pc1" function="TCC2" group="LOC2B"/>
+                <signal pad-key="pc2" function="TCC2" group="LOC2C"/>
+                <signal pad-key="pc3" function="TCC2" group="LOC2D"/>
+                <signal pad-key="pc4" function="TCC2" group="HOC2A"/>
+                <signal pad-key="pc5" function="TCC2" group="HOC2B"/>
+                <signal pad-key="pc6" function="TCC2" group="HOC2C"/>
+                <signal pad-key="pc7" function="TCC2" group="HOC2D"/>
             </signals>
         </peripheral>
         <peripheral key="usartc0" name="USARTC0" module-key="i6090_usart">
             <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"/>
-                <signal pad-id="pc3" function="USART" group="TXD" field="USART0"/>
-                <signal pad-id="pc5" function="USART_ALT" group="XCK" field="USART0"/>
-                <signal pad-id="pc6" function="USART_ALT" group="RXD" field="USART0"/>
-                <signal pad-id="pc7" function="USART_ALT" group="TXD" field="USART0"/>
+                <signal pad-key="pc1" function="USART" group="XCK" field="USART0"/>
+                <signal pad-key="pc2" function="USART" group="RXD" field="USART0"/>
+                <signal pad-key="pc3" function="USART" group="TXD" field="USART0"/>
+                <signal pad-key="pc5" function="USART_ALT" group="XCK" field="USART0"/>
+                <signal pad-key="pc6" function="USART_ALT" group="RXD" field="USART0"/>
+                <signal pad-key="pc7" function="USART_ALT" group="TXD" field="USART0"/>
             </signals>
         </peripheral>
         <peripheral key="usartd0" name="USARTD0" module-key="i6090_usart">
             <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"/>
-                <signal pad-id="pd3" function="TCC" group="TXD"/>
+                <signal pad-key="pd1" function="TCC" group="XCK"/>
+                <signal pad-key="pd2" function="TCC" group="RXD"/>
+                <signal pad-key="pd3" function="TCC" group="TXD"/>
             </signals>
         </peripheral>
         <peripheral key="spic" name="SPIC" module-key="i6090_spi">
             <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"/>
-                <signal pad-id="pc6" function="SPI" group="MISO" field="SPI"/>
-                <signal pad-id="pc7" function="SPI" group="SCK" field="SPI"/>
-                <signal pad-id="pc4" function="SPI_ALT" group="SS" field="SPI"/>
-                <signal pad-id="pc5" function="SPI_ALT" group="SCK" field="SPI"/>
-                <signal pad-id="pc6" function="SPI_ALT" group="MISO" field="SPI"/>
-                <signal pad-id="pc7" function="SPI_ALT" group="MOSI" field="SPI"/>
+                <signal pad-key="pc4" function="SPI" group="SS" field="SPI"/>
+                <signal pad-key="pc5" function="SPI" group="MOSI" field="SPI"/>
+                <signal pad-key="pc6" function="SPI" group="MISO" field="SPI"/>
+                <signal pad-key="pc7" function="SPI" group="SCK" field="SPI"/>
+                <signal pad-key="pc4" function="SPI_ALT" group="SS" field="SPI"/>
+                <signal pad-key="pc5" function="SPI_ALT" group="SCK" field="SPI"/>
+                <signal pad-key="pc6" function="SPI_ALT" group="MISO" field="SPI"/>
+                <signal pad-key="pc7" function="SPI_ALT" group="MOSI" field="SPI"/>
             </signals>
         </peripheral>
         <peripheral key="spid" name="SPID" module-key="i6090_spi">
             <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"/>
-                <signal pad-id="pd6" function="SPI" group="MISO"/>
-                <signal pad-id="pd7" function="SPI" group="SCK"/>
+                <signal pad-key="pd4" function="SPI" group="SS"/>
+                <signal pad-key="pd5" function="SPI" group="MOSI"/>
+                <signal pad-key="pd6" function="SPI" group="MISO"/>
+                <signal pad-key="pd7" function="SPI" group="SCK"/>
             </signals>
         </peripheral>
         <peripheral key="ircom" name="IRCOM" module-key="i6090_ircom">
@@ -1334,110 +1334,151 @@
             </register-group>
         </module>
     </modules>
+    <pads>
+        <pad key="pa5" name="PA5"/>
+        <pad key="pa6" name="PA6"/>
+        <pad key="pa7" name="PA7"/>
+        <pad key="pb0" name="PB0"/>
+        <pad key="pb1" name="PB1"/>
+        <pad key="pb2" name="PB2"/>
+        <pad key="pb3" name="PB3"/>
+        <pad key="gnd" name="GND"/>
+        <pad key="vcc" name="VCC"/>
+        <pad key="pc0" name="PC0"/>
+        <pad key="pc1" name="PC1"/>
+        <pad key="pc2" name="PC2"/>
+        <pad key="pc3" name="PC3"/>
+        <pad key="pc4" name="PC4"/>
+        <pad key="pc5" name="PC5"/>
+        <pad key="pc6" name="PC6"/>
+        <pad key="pc7" name="PC7"/>
+        <pad key="pd0" name="PD0"/>
+        <pad key="pd1" name="PD1"/>
+        <pad key="pd2" name="PD2"/>
+        <pad key="pd3" name="PD3"/>
+        <pad key="pd4" name="PD4"/>
+        <pad key="pd5" name="PD5"/>
+        <pad key="pd6" name="PD6"/>
+        <pad key="pd7" name="PD7"/>
+        <pad key="pe0" name="PE0"/>
+        <pad key="pe1" name="PE1"/>
+        <pad key="pe2" name="PE2"/>
+        <pad key="pe3" name="PE3"/>
+        <pad key="pdi" name="PDI"/>
+        <pad key="reset" name="RESET"/>
+        <pad key="pr0" name="PR0"/>
+        <pad key="pr1" name="PR1"/>
+        <pad key="avcc" name="AVCC"/>
+        <pad key="pa0" name="PA0"/>
+        <pad key="pa1" name="PA1"/>
+        <pad key="pa2" name="PA2"/>
+        <pad key="pa3" name="PA3"/>
+        <pad key="pa4" name="PA4"/>
+    </pads>
     <pinouts>
         <pinout key="qfn_qfp_44" name="QFN_QFP_44" type="qfn">
-            <pin position="1" pad="PA5"/>
-            <pin position="2" pad="PA6"/>
-            <pin position="3" pad="PA7"/>
-            <pin position="4" pad="PB0"/>
-            <pin position="5" pad="PB1"/>
-            <pin position="6" pad="PB2"/>
-            <pin position="7" pad="PB3"/>
-            <pin position="8" pad="GND"/>
-            <pin position="9" pad="VCC"/>
-            <pin position="10" pad="PC0"/>
-            <pin position="11" pad="PC1"/>
-            <pin position="12" pad="PC2"/>
-            <pin position="13" pad="PC3"/>
-            <pin position="14" pad="PC4"/>
-            <pin position="15" pad="PC5"/>
-            <pin position="16" pad="PC6"/>
-            <pin position="17" pad="PC7"/>
-            <pin position="18" pad="GND"/>
-            <pin position="19" pad="VCC"/>
-            <pin position="20" pad="PD0"/>
-            <pin position="21" pad="PD1"/>
-            <pin position="22" pad="PD2"/>
-            <pin position="23" pad="PD3"/>
-            <pin position="24" pad="PD4"/>
-            <pin position="25" pad="PD5"/>
-            <pin position="26" pad="PD6"/>
-            <pin position="27" pad="PD7"/>
-            <pin position="28" pad="PE0"/>
-            <pin position="29" pad="PE1"/>
-            <pin position="30" pad="GND"/>
-            <pin position="31" pad="VCC"/>
-            <pin position="32" pad="PE2"/>
-            <pin position="33" pad="PE3"/>
-            <pin position="34" pad="PDI"/>
-            <pin position="35" pad="RESET"/>
-            <pin position="36" pad="PR0"/>
-            <pin position="37" pad="PR1"/>
-            <pin position="38" pad="GND"/>
-            <pin position="39" pad="AVCC"/>
-            <pin position="40" pad="PA0"/>
-            <pin position="41" pad="PA1"/>
-            <pin position="42" pad="PA2"/>
-            <pin position="43" pad="PA3"/>
-            <pin position="44" pad="PA4"/>
+            <pin position="1" pad-key="pa5"/>
+            <pin position="2" pad-key="pa6"/>
+            <pin position="3" pad-key="pa7"/>
+            <pin position="4" pad-key="pb0"/>
+            <pin position="5" pad-key="pb1"/>
+            <pin position="6" pad-key="pb2"/>
+            <pin position="7" pad-key="pb3"/>
+            <pin position="8" pad-key="gnd"/>
+            <pin position="9" pad-key="vcc"/>
+            <pin position="10" pad-key="pc0"/>
+            <pin position="11" pad-key="pc1"/>
+            <pin position="12" pad-key="pc2"/>
+            <pin position="13" pad-key="pc3"/>
+            <pin position="14" pad-key="pc4"/>
+            <pin position="15" pad-key="pc5"/>
+            <pin position="16" pad-key="pc6"/>
+            <pin position="17" pad-key="pc7"/>
+            <pin position="18" pad-key="gnd"/>
+            <pin position="19" pad-key="vcc"/>
+            <pin position="20" pad-key="pd0"/>
+            <pin position="21" pad-key="pd1"/>
+            <pin position="22" pad-key="pd2"/>
+            <pin position="23" pad-key="pd3"/>
+            <pin position="24" pad-key="pd4"/>
+            <pin position="25" pad-key="pd5"/>
+            <pin position="26" pad-key="pd6"/>
+            <pin position="27" pad-key="pd7"/>
+            <pin position="28" pad-key="pe0"/>
+            <pin position="29" pad-key="pe1"/>
+            <pin position="30" pad-key="gnd"/>
+            <pin position="31" pad-key="vcc"/>
+            <pin position="32" pad-key="pe2"/>
+            <pin position="33" pad-key="pe3"/>
+            <pin position="34" pad-key="pdi"/>
+            <pin position="35" pad-key="reset"/>
+            <pin position="36" pad-key="pr0"/>
+            <pin position="37" pad-key="pr1"/>
+            <pin position="38" pad-key="gnd"/>
+            <pin position="39" pad-key="avcc"/>
+            <pin position="40" pad-key="pa0"/>
+            <pin position="41" pad-key="pa1"/>
+            <pin position="42" pad-key="pa2"/>
+            <pin position="43" pad-key="pa3"/>
+            <pin position="44" pad-key="pa4"/>
         </pinout>
         <pinout key="bga_49" name="BGA_49" type="bga">
-            <pin position="A1" pad="PA3"/>
-            <pin position="A2" pad="AVCC"/>
-            <pin position="A3" pad="GND"/>
-            <pin position="A4" pad="PR1"/>
-            <pin position="A5" pad="PR0"/>
-            <pin position="A6" pad="PDI"/>
-            <pin position="A7" pad="PE3"/>
-            <pin position="B1" pad="PA4"/>
-            <pin position="B2" pad="PA1"/>
-            <pin position="B3" pad="PA0"/>
-            <pin position="B4" pad="GND"/>
-            <pin position="B5" pad="RESET"/>
-            <pin position="B6" pad="PE2"/>
-            <pin position="B7" pad="VCC"/>
-            <pin position="C1" pad="PA5"/>
-            <pin position="C2" pad="PA2"/>
-            <pin position="C3" pad="PA6"/>
-            <pin position="C4" pad="PA7"/>
-            <pin position="C5" pad="GND"/>
-            <pin position="C6" pad="PE1"/>
-            <pin position="C7" pad="GND"/>
-            <pin position="D1" pad="PB1"/>
-            <pin position="D2" pad="PB2"/>
-            <pin position="D3" pad="PB3"/>
-            <pin position="D4" pad="PB0"/>
-            <pin position="D5" pad="GND"/>
-            <pin position="D6" pad="PD7"/>
-            <pin position="D7" pad="PE0"/>
-            <pin position="E1" pad="GND"/>
-            <pin position="E2" pad="GND"/>
-            <pin position="E3" pad="PC3"/>
-            <pin position="E4" pad="GND"/>
-            <pin position="E5" pad="PD4"/>
-            <pin position="E6" pad="PD5"/>
-            <pin position="E7" pad="PD6"/>
-            <pin position="F1" pad="VCC"/>
-            <pin position="F2" pad="PC0"/>
-            <pin position="F3" pad="PC4"/>
-            <pin position="F4" pad="PC6"/>
-            <pin position="F5" pad="PD0"/>
-            <pin position="F6" pad="PD1"/>
-            <pin position="F7" pad="PD3"/>
-            <pin position="G1" pad="PC1"/>
-            <pin position="G2" pad="PC2"/>
-            <pin position="G3" pad="PC5"/>
-            <pin position="G4" pad="PC7"/>
-            <pin position="G5" pad="GND"/>
-            <pin position="G6" pad="VCC"/>
-            <pin position="G7" pad="PD2"/>
+            <pin position="A1" pad-key="pa3"/>
+            <pin position="A2" pad-key="avcc"/>
+            <pin position="A3" pad-key="gnd"/>
+            <pin position="A4" pad-key="pr1"/>
+            <pin position="A5" pad-key="pr0"/>
+            <pin position="A6" pad-key="pdi"/>
+            <pin position="A7" pad-key="pe3"/>
+            <pin position="B1" pad-key="pa4"/>
+            <pin position="B2" pad-key="pa1"/>
+            <pin position="B3" pad-key="pa0"/>
+            <pin position="B4" pad-key="gnd"/>
+            <pin position="B5" pad-key="reset"/>
+            <pin position="B6" pad-key="pe2"/>
+            <pin position="B7" pad-key="vcc"/>
+            <pin position="C1" pad-key="pa5"/>
+            <pin position="C2" pad-key="pa2"/>
+            <pin position="C3" pad-key="pa6"/>
+            <pin position="C4" pad-key="pa7"/>
+            <pin position="C5" pad-key="gnd"/>
+            <pin position="C6" pad-key="pe1"/>
+            <pin position="C7" pad-key="gnd"/>
+            <pin position="D1" pad-key="pb1"/>
+            <pin position="D2" pad-key="pb2"/>
+            <pin position="D3" pad-key="pb3"/>
+            <pin position="D4" pad-key="pb0"/>
+            <pin position="D5" pad-key="gnd"/>
+            <pin position="D6" pad-key="pd7"/>
+            <pin position="D7" pad-key="pe0"/>
+            <pin position="E1" pad-key="gnd"/>
+            <pin position="E2" pad-key="gnd"/>
+            <pin position="E3" pad-key="pc3"/>
+            <pin position="E4" pad-key="gnd"/>
+            <pin position="E5" pad-key="pd4"/>
+            <pin position="E6" pad-key="pd5"/>
+            <pin position="E7" pad-key="pd6"/>
+            <pin position="F1" pad-key="vcc"/>
+            <pin position="F2" pad-key="pc0"/>
+            <pin position="F3" pad-key="pc4"/>
+            <pin position="F4" pad-key="pc6"/>
+            <pin position="F5" pad-key="pd0"/>
+            <pin position="F6" pad-key="pd1"/>
+            <pin position="F7" pad-key="pd3"/>
+            <pin position="G1" pad-key="pc1"/>
+            <pin position="G2" pad-key="pc2"/>
+            <pin position="G3" pad-key="pc5"/>
+            <pin position="G4" pad-key="pc7"/>
+            <pin position="G5" pad-key="gnd"/>
+            <pin position="G6" pad-key="vcc"/>
+            <pin position="G7" pad-key="pd2"/>
         </pinout>
     </pinouts>
     <variants>
-        <variant name="ATxmega16D4-AU" pinout-key="qfn_qfp_44" package="TQFP44"/>
-        <variant name="ATxmega16D4-MH" pinout-key="qfn_qfp_44" package="VQFN44"/>
-        <variant name="ATxmega16D4-CU" pinout-key="bga_49" package="VFBGA49"/>
-        <variant name="ATxmega16D4-AN" pinout-key="qfn_qfp_44" package="TQFP44"/>
-        <variant name="ATxmega16D4-M7" pinout-key="bga_49" package="VFBGA49"/>
+        <variant key="atxmega16d4_au" name="ATxmega16D4-AU" pinout-key="qfn_qfp_44"/>
+        <variant key="atxmega16d4_mh" name="ATxmega16D4-MH" pinout-key="qfn_qfp_44"/>
+        <variant key="atxmega16d4_cu" name="ATxmega16D4-CU" pinout-key="bga_49"/>
+        <variant key="atxmega16d4_an" name="ATxmega16D4-AN" pinout-key="qfn_qfp_44"/>
+        <variant key="atxmega16d4_m7" name="ATxmega16D4-M7" pinout-key="bga_49"/>
     </variants>
 </device>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA16E5.xml b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA16E5.xml
index bf317a9d..920ce08d 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA16E5.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA16E5.xml
@@ -83,7 +83,7 @@
         <peripheral key="clk" name="CLK" module-key="i6073_clk">
             <register-group-instance register-group-key="clk" address-space-key="data" offset="0x40"/>
             <signals>
-                <signal pad-id="pc4" function="EXTERNAL_CLOCK" group="EXTCLK"/>
+                <signal pad-key="pc4" function="EXTERNAL_CLOCK" group="EXTCLK"/>
             </signals>
         </peripheral>
         <peripheral key="pr" name="PR" module-key="i6073_pr">
@@ -95,10 +95,10 @@
         <peripheral key="osc" name="OSC" module-key="i6079">
             <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"/>
-                <signal pad-id="pr0" function="TOSC" group="TOSC2"/>
-                <signal pad-id="pr1" function="TOSC" group="TOSC1"/>
+                <signal pad-key="pr0" function="XTAL" group="XTAL2"/>
+                <signal pad-key="pr1" function="XTAL" group="XTAL1"/>
+                <signal pad-key="pr0" function="TOSC" group="TOSC2"/>
+                <signal pad-key="pr1" function="TOSC" group="TOSC1"/>
             </signals>
         </peripheral>
         <peripheral key="dfllrc32m" name="DFLLRC32M" module-key="i6055">
@@ -119,14 +119,14 @@
         <peripheral key="portcfg" name="PORTCFG" module-key="i6075_portcfg">
             <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"/>
-                <signal pad-id="pr0" function="CLKOUTR" group="CLKOUT" field="CLKOUT"/>
-                <signal pad-id="pd7" function="EVOUTD" group="EVOUT" field="EVOUT"/>
-                <signal pad-id="pd4" function="EVOUTD_ALT" group="EVOUT" field="CLKEVPIN"/>
-                <signal pad-id="pr0" function="EVOUTR" group="EVOUT" field="EVOUT"/>
-                <signal pad-id="pd6" function="RTCOUTD" group="RTCOUT" field="RTCOUT"/>
-                <signal pad-id="pr0" function="RTCOUTR" group="RTCOUT" field="RTCOUT"/>
+                <signal pad-key="pd7" function="CLKOUTD" group="CLKOUT" field="CLKOUT"/>
+                <signal pad-key="pd4" function="CLKOUTD_ALT" group="CLKOUT" field="CLKEVPIN"/>
+                <signal pad-key="pr0" function="CLKOUTR" group="CLKOUT" field="CLKOUT"/>
+                <signal pad-key="pd7" function="EVOUTD" group="EVOUT" field="EVOUT"/>
+                <signal pad-key="pd4" function="EVOUTD_ALT" group="EVOUT" field="CLKEVPIN"/>
+                <signal pad-key="pr0" function="EVOUTR" group="EVOUT" field="EVOUT"/>
+                <signal pad-key="pd6" function="RTCOUTD" group="RTCOUT" field="RTCOUT"/>
+                <signal pad-key="pr0" function="RTCOUTR" group="RTCOUT" field="RTCOUT"/>
             </signals>
         </peripheral>
         <peripheral key="crc" name="CRC" module-key="i6111">
@@ -144,54 +144,54 @@
         <peripheral key="adca" name="ADCA" module-key="i6110">
             <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"/>
-                <signal pad-id="pa2" index="2" function="ADC" group="ADC"/>
-                <signal pad-id="pa3" index="3" function="ADC" group="ADC"/>
-                <signal pad-id="pa4" index="4" function="ADC" group="ADC"/>
-                <signal pad-id="pa5" index="5" function="ADC" group="ADC"/>
-                <signal pad-id="pa6" index="6" function="ADC" group="ADC"/>
-                <signal pad-id="pa7" index="7" function="ADC" group="ADC"/>
-                <signal pad-id="pd0" index="8" function="ADC" group="ADC"/>
-                <signal pad-id="pd1" index="9" function="ADC" group="ADC"/>
-                <signal pad-id="pd2" index="10" function="ADC" group="ADC"/>
-                <signal pad-id="pd3" index="11" function="ADC" group="ADC"/>
-                <signal pad-id="pd4" index="12" function="ADC" group="ADC"/>
-                <signal pad-id="pd5" index="13" function="ADC" group="ADC"/>
-                <signal pad-id="pd6" index="14" function="ADC" group="ADC"/>
-                <signal pad-id="pd7" index="15" function="ADC" group="ADC"/>
-                <signal pad-id="pa0" index="0" function="AREF" group="REFA"/>
-                <signal pad-id="pd0" index="0" function="AREF" group="REFD"/>
+                <signal pad-key="pa0" index="0" function="ADC" group="ADC"/>
+                <signal pad-key="pa1" index="1" function="ADC" group="ADC"/>
+                <signal pad-key="pa2" index="2" function="ADC" group="ADC"/>
+                <signal pad-key="pa3" index="3" function="ADC" group="ADC"/>
+                <signal pad-key="pa4" index="4" function="ADC" group="ADC"/>
+                <signal pad-key="pa5" index="5" function="ADC" group="ADC"/>
+                <signal pad-key="pa6" index="6" function="ADC" group="ADC"/>
+                <signal pad-key="pa7" index="7" function="ADC" group="ADC"/>
+                <signal pad-key="pd0" index="8" function="ADC" group="ADC"/>
+                <signal pad-key="pd1" index="9" function="ADC" group="ADC"/>
+                <signal pad-key="pd2" index="10" function="ADC" group="ADC"/>
+                <signal pad-key="pd3" index="11" function="ADC" group="ADC"/>
+                <signal pad-key="pd4" index="12" function="ADC" group="ADC"/>
+                <signal pad-key="pd5" index="13" function="ADC" group="ADC"/>
+                <signal pad-key="pd6" index="14" function="ADC" group="ADC"/>
+                <signal pad-key="pd7" index="15" function="ADC" group="ADC"/>
+                <signal pad-key="pa0" index="0" function="AREF" group="REFA"/>
+                <signal pad-key="pd0" index="0" function="AREF" group="REFD"/>
             </signals>
         </peripheral>
         <peripheral key="daca" name="DACA" module-key="i6059">
             <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"/>
-                <signal pad-id="pa0" index="0" function="AREF" group="REFA"/>
-                <signal pad-id="pd0" index="0" function="AREF" group="REFD"/>
+                <signal pad-key="pa2" index="0" function="DAC" group="DAC"/>
+                <signal pad-key="pa3" index="1" function="DAC" group="DAC"/>
+                <signal pad-key="pa0" index="0" function="AREF" group="REFA"/>
+                <signal pad-key="pd0" index="0" function="AREF" group="REFD"/>
             </signals>
         </peripheral>
         <peripheral key="aca" name="ACA" module-key="i6077">
             <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"/>
-                <signal pad-id="pa2" index="2" function="AC" group="AC"/>
-                <signal pad-id="pa3" index="3" function="AC" group="AC"/>
-                <signal pad-id="pa4" index="4" function="AC" group="AC"/>
-                <signal pad-id="pa5" index="5" function="AC" group="AC"/>
-                <signal pad-id="pa6" index="6" function="AC" group="AC"/>
-                <signal pad-id="pa7" index="7" function="AC" group="AC"/>
-                <signal pad-id="pa6" index="1" function="ACOUT_PA" group="ACOUT" field="ACOUT"/>
-                <signal pad-id="pa7" index="0" function="ACOUT_PA" group="ACOUT" field="ACOUT"/>
-                <signal pad-id="pc6" index="1" function="ACOUT_PC" group="ACOUT" field="ACOUT"/>
-                <signal pad-id="pc7" index="0" function="ACOUT_PC" group="ACOUT" field="ACOUT"/>
-                <signal pad-id="pd6" index="1" function="ACOUT_PD" group="ACOUT" field="ACOUT"/>
-                <signal pad-id="pd7" index="0" function="ACOUT_PD" group="ACOUT" field="ACOUT"/>
-                <signal pad-id="pr0" index="1" function="ACOUT_PR" group="ACOUT" field="ACOUT"/>
-                <signal pad-id="pr1" index="0" function="ACOUT_PR" group="ACOUT" field="ACOUT"/>
+                <signal pad-key="pa0" index="0" function="AC" group="AC"/>
+                <signal pad-key="pa1" index="1" function="AC" group="AC"/>
+                <signal pad-key="pa2" index="2" function="AC" group="AC"/>
+                <signal pad-key="pa3" index="3" function="AC" group="AC"/>
+                <signal pad-key="pa4" index="4" function="AC" group="AC"/>
+                <signal pad-key="pa5" index="5" function="AC" group="AC"/>
+                <signal pad-key="pa6" index="6" function="AC" group="AC"/>
+                <signal pad-key="pa7" index="7" function="AC" group="AC"/>
+                <signal pad-key="pa6" index="1" function="ACOUT_PA" group="ACOUT" field="ACOUT"/>
+                <signal pad-key="pa7" index="0" function="ACOUT_PA" group="ACOUT" field="ACOUT"/>
+                <signal pad-key="pc6" index="1" function="ACOUT_PC" group="ACOUT" field="ACOUT"/>
+                <signal pad-key="pc7" index="0" function="ACOUT_PC" group="ACOUT" field="ACOUT"/>
+                <signal pad-key="pd6" index="1" function="ACOUT_PD" group="ACOUT" field="ACOUT"/>
+                <signal pad-key="pd7" index="0" function="ACOUT_PD" group="ACOUT" field="ACOUT"/>
+                <signal pad-key="pr0" index="1" function="ACOUT_PR" group="ACOUT" field="ACOUT"/>
+                <signal pad-key="pr1" index="0" function="ACOUT_PR" group="ACOUT" field="ACOUT"/>
             </signals>
         </peripheral>
         <peripheral key="rtc" name="RTC" module-key="i6093">
@@ -200,110 +200,110 @@
         <peripheral key="xcl" name="XCL" module-key="i3008">
             <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"/>
-                <signal pad-id="pc2" index="0" function="XCLIN_LSB_PC" group="IN"/>
-                <signal pad-id="pc3" index="3" function="XCLIN_LSB_PC" group="IN"/>
-                <signal pad-id="pc4" index="1" function="XCLIN_MSB_PC" group="IN"/>
-                <signal pad-id="pc5" index="2" function="XCLIN_MSB_PC" group="IN"/>
-                <signal pad-id="pc6" index="0" function="XCLIN_MSB_PC" group="IN"/>
-                <signal pad-id="pc7" index="3" function="XCLIN_MSB_PC" group="IN"/>
-                <signal pad-id="pd0" index="1" function="XCLIN_LSB_PD" group="IN"/>
-                <signal pad-id="pd1" index="2" function="XCLIN_LSB_PD" group="IN"/>
-                <signal pad-id="pd2" index="0" function="XCLIN_LSB_PD" group="IN"/>
-                <signal pad-id="pd3" index="3" function="XCLIN_LSB_PD" group="IN"/>
-                <signal pad-id="pd4" index="1" function="XCLIN_MSB_PD" group="IN"/>
-                <signal pad-id="pd5" index="2" function="XCLIN_MSB_PD" group="IN"/>
-                <signal pad-id="pd6" index="0" function="XCLIN_MSB_PD" group="IN"/>
-                <signal pad-id="pd7" index="3" function="XCLIN_MSB_PD" group="IN"/>
-                <signal pad-id="pc0" index="0" function="XCLOUT_LSB_PC" group="OUT"/>
-                <signal pad-id="pc4" index="0" function="XCLOUT_MSB_PC" group="OUT"/>
-                <signal pad-id="pd0" index="0" function="XCLOUT_LSB_PD" group="OUT"/>
-                <signal pad-id="pd4" index="0" function="XCLOUT_LSB_PD" group="OUT"/>
-                <signal pad-id="pd2" index="0" function="XCL_OCOUT" group="OC"/>
-                <signal pad-id="pd3" index="1" function="XCL_OCOUT" group="OC"/>
+                <signal pad-key="pc0" index="1" function="XCLIN_LSB_PC" group="IN"/>
+                <signal pad-key="pc1" index="2" function="XCLIN_LSB_PC" group="IN"/>
+                <signal pad-key="pc2" index="0" function="XCLIN_LSB_PC" group="IN"/>
+                <signal pad-key="pc3" index="3" function="XCLIN_LSB_PC" group="IN"/>
+                <signal pad-key="pc4" index="1" function="XCLIN_MSB_PC" group="IN"/>
+                <signal pad-key="pc5" index="2" function="XCLIN_MSB_PC" group="IN"/>
+                <signal pad-key="pc6" index="0" function="XCLIN_MSB_PC" group="IN"/>
+                <signal pad-key="pc7" index="3" function="XCLIN_MSB_PC" group="IN"/>
+                <signal pad-key="pd0" index="1" function="XCLIN_LSB_PD" group="IN"/>
+                <signal pad-key="pd1" index="2" function="XCLIN_LSB_PD" group="IN"/>
+                <signal pad-key="pd2" index="0" function="XCLIN_LSB_PD" group="IN"/>
+                <signal pad-key="pd3" index="3" function="XCLIN_LSB_PD" group="IN"/>
+                <signal pad-key="pd4" index="1" function="XCLIN_MSB_PD" group="IN"/>
+                <signal pad-key="pd5" index="2" function="XCLIN_MSB_PD" group="IN"/>
+                <signal pad-key="pd6" index="0" function="XCLIN_MSB_PD" group="IN"/>
+                <signal pad-key="pd7" index="3" function="XCLIN_MSB_PD" group="IN"/>
+                <signal pad-key="pc0" index="0" function="XCLOUT_LSB_PC" group="OUT"/>
+                <signal pad-key="pc4" index="0" function="XCLOUT_MSB_PC" group="OUT"/>
+                <signal pad-key="pd0" index="0" function="XCLOUT_LSB_PD" group="OUT"/>
+                <signal pad-key="pd4" index="0" function="XCLOUT_LSB_PD" group="OUT"/>
+                <signal pad-key="pd2" index="0" function="XCL_OCOUT" group="OC"/>
+                <signal pad-key="pd3" index="1" function="XCL_OCOUT" group="OC"/>
             </signals>
         </peripheral>
         <peripheral key="twic" name="TWIC" module-key="i6089">
             <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"/>
-                <signal pad-id="pd0" function="TWI_BRIDGE" group="SDA"/>
-                <signal pad-id="pd1" function="TWI_BRIDGE" group="SCL"/>
+                <signal pad-key="pc0" function="TWI" group="SDA"/>
+                <signal pad-key="pc1" function="TWI" group="SCL"/>
+                <signal pad-key="pd0" function="TWI_BRIDGE" group="SDA"/>
+                <signal pad-key="pd1" function="TWI_BRIDGE" group="SCL"/>
             </signals>
         </peripheral>
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pa2" index="2" function="PORTA" group="P"/>
-                <signal pad-id="pa3" index="3" function="PORTA" group="P"/>
-                <signal pad-id="pa4" index="4" function="PORTA" group="P"/>
-                <signal pad-id="pa5" index="5" function="PORTA" group="P"/>
-                <signal pad-id="pa6" index="6" function="PORTA" group="P"/>
-                <signal pad-id="pa7" index="7" function="PORTA" group="P"/>
+                <signal pad-key="pa0" index="0" function="PORTA" group="P"/>
+                <signal pad-key="pa1" index="1" function="PORTA" group="P"/>
+                <signal pad-key="pa2" index="2" function="PORTA" group="P"/>
+                <signal pad-key="pa3" index="3" function="PORTA" group="P"/>
+                <signal pad-key="pa4" index="4" function="PORTA" group="P"/>
+                <signal pad-key="pa5" index="5" function="PORTA" group="P"/>
+                <signal pad-key="pa6" index="6" function="PORTA" group="P"/>
+                <signal pad-key="pa7" index="7" function="PORTA" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pc2" index="2" function="PORTC" group="P"/>
-                <signal pad-id="pc3" index="3" function="PORTC" group="P"/>
-                <signal pad-id="pc4" index="4" function="PORTC" group="P"/>
-                <signal pad-id="pc5" index="5" function="PORTC" group="P"/>
-                <signal pad-id="pc6" index="6" function="PORTC" group="P"/>
-                <signal pad-id="pc7" index="7" function="PORTC" group="P"/>
+                <signal pad-key="pc0" index="0" function="PORTC" group="P"/>
+                <signal pad-key="pc1" index="1" function="PORTC" group="P"/>
+                <signal pad-key="pc2" index="2" function="PORTC" group="P"/>
+                <signal pad-key="pc3" index="3" function="PORTC" group="P"/>
+                <signal pad-key="pc4" index="4" function="PORTC" group="P"/>
+                <signal pad-key="pc5" index="5" function="PORTC" group="P"/>
+                <signal pad-key="pc6" index="6" function="PORTC" group="P"/>
+                <signal pad-key="pc7" index="7" function="PORTC" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pd2" index="2" function="PORTD" group="P"/>
-                <signal pad-id="pd3" index="3" function="PORTD" group="P"/>
-                <signal pad-id="pd4" index="4" function="PORTD" group="P"/>
-                <signal pad-id="pd5" index="5" function="PORTD" group="P"/>
-                <signal pad-id="pd6" index="6" function="PORTD" group="P"/>
-                <signal pad-id="pd7" index="7" function="PORTD" group="P"/>
+                <signal pad-key="pd0" index="0" function="PORTD" group="P"/>
+                <signal pad-key="pd1" index="1" function="PORTD" group="P"/>
+                <signal pad-key="pd2" index="2" function="PORTD" group="P"/>
+                <signal pad-key="pd3" index="3" function="PORTD" group="P"/>
+                <signal pad-key="pd4" index="4" function="PORTD" group="P"/>
+                <signal pad-key="pd5" index="5" function="PORTD" group="P"/>
+                <signal pad-key="pd6" index="6" function="PORTD" group="P"/>
+                <signal pad-key="pd7" index="7" function="PORTD" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portr" name="PORTR" module-key="gpio_port">
             <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"/>
+                <signal pad-key="pr0" index="0" function="PORTR" group="P"/>
+                <signal pad-key="pr1" index="1" function="PORTR" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="tcc4" name="TCC4" module-key="i3007_tc">
             <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"/>
-                <signal pad-id="pc2" function="TC4" group="OC4C" field="TC4C"/>
-                <signal pad-id="pc3" function="TC4" group="OC4D" field="TC4D"/>
-                <signal pad-id="pc4" function="TC4_ALT" group="OC4A" field="TC4A"/>
-                <signal pad-id="pc5" function="TC4_ALT" group="OC4B" field="TC4B"/>
-                <signal pad-id="pc6" function="TC4_ALT" group="OC4C" field="TC4C"/>
-                <signal pad-id="pc7" function="TC4_ALT" group="OC4D" field="TC4D"/>
+                <signal pad-key="pc0" function="TC4" group="OC4A" field="TC4A"/>
+                <signal pad-key="pc1" function="TC4" group="OC4B" field="TC4B"/>
+                <signal pad-key="pc2" function="TC4" group="OC4C" field="TC4C"/>
+                <signal pad-key="pc3" function="TC4" group="OC4D" field="TC4D"/>
+                <signal pad-key="pc4" function="TC4_ALT" group="OC4A" field="TC4A"/>
+                <signal pad-key="pc5" function="TC4_ALT" group="OC4B" field="TC4B"/>
+                <signal pad-key="pc6" function="TC4_ALT" group="OC4C" field="TC4C"/>
+                <signal pad-key="pc7" function="TC4_ALT" group="OC4D" field="TC4D"/>
             </signals>
         </peripheral>
         <peripheral key="tcc5" name="TCC5" module-key="i3007_tc">
             <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"/>
+                <signal pad-key="pc4" function="TC5" group="OC5A"/>
+                <signal pad-key="pc5" function="TC5" group="OC5B"/>
             </signals>
         </peripheral>
         <peripheral key="tcd5" name="TCD5" module-key="i3007_tc">
             <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"/>
+                <signal pad-key="pd4" function="TC5" group="OC5A"/>
+                <signal pad-key="pd5" function="TC5" group="OC5B"/>
             </signals>
         </peripheral>
         <peripheral key="faultc4" name="FAULTC4" module-key="i3620_fault">
@@ -315,14 +315,14 @@
         <peripheral key="wexc" name="WEXC" module-key="i3007_wex">
             <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"/>
-                <signal pad-id="pc2" function="WEX" group="OC4BLS"/>
-                <signal pad-id="pc3" function="WEX" group="OC4BHS"/>
-                <signal pad-id="pc4" function="WEX" group="OC4CLS"/>
-                <signal pad-id="pc5" function="WEX" group="OC4CHS"/>
-                <signal pad-id="pc6" function="WEX" group="OC4DLS"/>
-                <signal pad-id="pc7" function="WEX" group="OC4DHS"/>
+                <signal pad-key="pc0" function="WEX" group="OC4ALS"/>
+                <signal pad-key="pc1" function="WEX" group="OC4AHS"/>
+                <signal pad-key="pc2" function="WEX" group="OC4BLS"/>
+                <signal pad-key="pc3" function="WEX" group="OC4BHS"/>
+                <signal pad-key="pc4" function="WEX" group="OC4CLS"/>
+                <signal pad-key="pc5" function="WEX" group="OC4CHS"/>
+                <signal pad-key="pc6" function="WEX" group="OC4DLS"/>
+                <signal pad-key="pc7" function="WEX" group="OC4DHS"/>
             </signals>
         </peripheral>
         <peripheral key="hiresc" name="HIRESC" module-key="i3620_hires">
@@ -331,32 +331,32 @@
         <peripheral key="usartc0" name="USARTC0" module-key="i4000">
             <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"/>
-                <signal pad-id="pc3" function="USART" group="TXD" field="USART0"/>
-                <signal pad-id="pc5" function="USART_ALT" group="XCK" field="USART0"/>
-                <signal pad-id="pc6" function="USART_ALT" group="RXD" field="USART0"/>
-                <signal pad-id="pc7" function="USART_ALT" group="TXD" field="USART0"/>
+                <signal pad-key="pc1" function="USART" group="XCK" field="USART0"/>
+                <signal pad-key="pc2" function="USART" group="RXD" field="USART0"/>
+                <signal pad-key="pc3" function="USART" group="TXD" field="USART0"/>
+                <signal pad-key="pc5" function="USART_ALT" group="XCK" field="USART0"/>
+                <signal pad-key="pc6" function="USART_ALT" group="RXD" field="USART0"/>
+                <signal pad-key="pc7" function="USART_ALT" group="TXD" field="USART0"/>
             </signals>
         </peripheral>
         <peripheral key="usartd0" name="USARTD0" module-key="i4000">
             <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"/>
-                <signal pad-id="pd3" function="USART" group="TXD" field="USART0"/>
-                <signal pad-id="pd5" function="USART_ALT" group="XCK" field="USART0"/>
-                <signal pad-id="pd6" function="USART_ALT" group="RXD" field="USART0"/>
-                <signal pad-id="pd7" function="USART_ALT" group="TXD" field="USART0"/>
+                <signal pad-key="pd1" function="USART" group="XCK" field="USART0"/>
+                <signal pad-key="pd2" function="USART" group="RXD" field="USART0"/>
+                <signal pad-key="pd3" function="USART" group="TXD" field="USART0"/>
+                <signal pad-key="pd5" function="USART_ALT" group="XCK" field="USART0"/>
+                <signal pad-key="pd6" function="USART_ALT" group="RXD" field="USART0"/>
+                <signal pad-key="pd7" function="USART_ALT" group="TXD" field="USART0"/>
             </signals>
         </peripheral>
         <peripheral key="spic" name="SPIC" module-key="i6090_spi">
             <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"/>
-                <signal pad-id="pc6" function="SPI" group="MISO"/>
-                <signal pad-id="pc7" function="SPI" group="MOSI"/>
+                <signal pad-key="pc4" function="SPI" group="SS"/>
+                <signal pad-key="pc5" function="SPI" group="SCK"/>
+                <signal pad-key="pc6" function="SPI" group="MISO"/>
+                <signal pad-key="pc7" function="SPI" group="MOSI"/>
             </signals>
         </peripheral>
         <peripheral key="ircom" name="IRCOM" module-key="i6090_ircom">
@@ -1763,48 +1763,81 @@
             </register-group>
         </module>
     </modules>
+    <pads>
+        <pad key="gnd" name="GND"/>
+        <pad key="pa4" name="PA4"/>
+        <pad key="pa3" name="PA3"/>
+        <pad key="pa2" name="PA2"/>
+        <pad key="pa1" name="PA1"/>
+        <pad key="pa0" name="PA0"/>
+        <pad key="pdi" name="PDI"/>
+        <pad key="reset" name="RESET"/>
+        <pad key="pc7" name="PC7"/>
+        <pad key="pc6" name="PC6"/>
+        <pad key="pc5" name="PC5"/>
+        <pad key="pc4" name="PC4"/>
+        <pad key="pc3" name="PC3"/>
+        <pad key="pc2" name="PC2"/>
+        <pad key="pc1" name="PC1"/>
+        <pad key="pc0" name="PC0"/>
+        <pad key="vcc" name="VCC"/>
+        <pad key="pr1" name="PR1"/>
+        <pad key="pr0" name="PR0"/>
+        <pad key="pd7" name="PD7"/>
+        <pad key="pd6" name="PD6"/>
+        <pad key="pd5" name="PD5"/>
+        <pad key="pd4" name="PD4"/>
+        <pad key="pd3" name="PD3"/>
+        <pad key="pd2" name="PD2"/>
+        <pad key="pd1" name="PD1"/>
+        <pad key="pd0" name="PD0"/>
+        <pad key="pa7" name="PA7"/>
+        <pad key="pa6" name="PA6"/>
+        <pad key="pa5" name="PA5"/>
+        <pad key="avcc" name="AVCC"/>
+    </pads>
     <pinouts>
         <pinout key="qfp_qfn_32" name="QFP_QFN_32" type="qfn">
-            <pin position="1" pad="GND"/>
-            <pin position="2" pad="PA4"/>
-            <pin position="3" pad="PA3"/>
-            <pin position="4" pad="PA2"/>
-            <pin position="5" pad="PA1"/>
-            <pin position="6" pad="PA0"/>
-            <pin position="7" pad="PDI"/>
-            <pin position="8" pad="RESET"/>
-            <pin position="9" pad="PC7"/>
-            <pin position="10" pad="PC6"/>
-            <pin position="11" pad="PC5"/>
-            <pin position="12" pad="PC4"/>
-            <pin position="13" pad="PC3"/>
-            <pin position="14" pad="PC2"/>
-            <pin position="15" pad="PC1"/>
-            <pin position="16" pad="PC0"/>
-            <pin position="17" pad="VCC"/>
-            <pin position="18" pad="GND"/>
-            <pin position="19" pad="PR1"/>
-            <pin position="20" pad="PR0"/>
-            <pin position="21" pad="PD7"/>
-            <pin position="22" pad="PD6"/>
-            <pin position="23" pad="PD5"/>
-            <pin position="24" pad="PD4"/>
-            <pin position="25" pad="PD3"/>
-            <pin position="26" pad="PD2"/>
-            <pin position="27" pad="PD1"/>
-            <pin position="28" pad="PD0"/>
-            <pin position="29" pad="PA7"/>
-            <pin position="30" pad="PA6"/>
-            <pin position="31" pad="PA5"/>
-            <pin position="32" pad="AVCC"/>
+            <pin position="1" pad-key="gnd"/>
+            <pin position="2" pad-key="pa4"/>
+            <pin position="3" pad-key="pa3"/>
+            <pin position="4" pad-key="pa2"/>
+            <pin position="5" pad-key="pa1"/>
+            <pin position="6" pad-key="pa0"/>
+            <pin position="7" pad-key="pdi"/>
+            <pin position="8" pad-key="reset"/>
+            <pin position="9" pad-key="pc7"/>
+            <pin position="10" pad-key="pc6"/>
+            <pin position="11" pad-key="pc5"/>
+            <pin position="12" pad-key="pc4"/>
+            <pin position="13" pad-key="pc3"/>
+            <pin position="14" pad-key="pc2"/>
+            <pin position="15" pad-key="pc1"/>
+            <pin position="16" pad-key="pc0"/>
+            <pin position="17" pad-key="vcc"/>
+            <pin position="18" pad-key="gnd"/>
+            <pin position="19" pad-key="pr1"/>
+            <pin position="20" pad-key="pr0"/>
+            <pin position="21" pad-key="pd7"/>
+            <pin position="22" pad-key="pd6"/>
+            <pin position="23" pad-key="pd5"/>
+            <pin position="24" pad-key="pd4"/>
+            <pin position="25" pad-key="pd3"/>
+            <pin position="26" pad-key="pd2"/>
+            <pin position="27" pad-key="pd1"/>
+            <pin position="28" pad-key="pd0"/>
+            <pin position="29" pad-key="pa7"/>
+            <pin position="30" pad-key="pa6"/>
+            <pin position="31" pad-key="pa5"/>
+            <pin position="32" pad-key="avcc"/>
         </pinout>
     </pinouts>
     <variants>
-        <variant name="ATxmega16E5-AU" pinout-key="qfp_qfn_32" package="TQFP32"/>
-        <variant name="ATxmega16E5-MU" pinout-key="qfp_qfn_32" package="VQFN32"/>
-        <variant name="ATxmega16E5-M4U" pinout-key="qfp_qfn_32" package="UQFN32"/>
-        <variant name="ATxmega16E5-AN" pinout-key="qfp_qfn_32" package="TQFP32"/>
-        <variant name="ATxmega16E5-MN" pinout-key="qfp_qfn_32" package="VQFN32"/>
-        <variant name="ATxmega16E5-M4N" pinout-key="qfp_qfn_32" package="UQFN32"/>
+        <variant key="atxmega16e5_au" name="ATxmega16E5-AU" pinout-key="qfp_qfn_32"/>
+        <variant key="atxmega16e5_mu" name="ATxmega16E5-MU" pinout-key="qfp_qfn_32"/>
+        <variant key="atxmega16e5_m4u" name="ATxmega16E5-M4U" pinout-key="qfp_qfn_32"/>
+        <variant key="atxmega16e5_an" name="ATxmega16E5-AN" pinout-key="qfp_qfn_32"/>
+        <variant key="atxmega16e5_mn" name="ATxmega16E5-MN" pinout-key="qfp_qfn_32"/>
+        <variant key="atxmega16e5_m4n" name="ATxmega16E5-M4N" pinout-key="qfp_qfn_32"/>
     </variants>
 </device>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA192A3.xml b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA192A3.xml
index b741637f..f1983ba7 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA192A3.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA192A3.xml
@@ -160,86 +160,86 @@
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pa2" index="2" function="PORTA" group="P"/>
-                <signal pad-id="pa3" index="3" function="PORTA" group="P"/>
-                <signal pad-id="pa4" index="4" function="PORTA" group="P"/>
-                <signal pad-id="pa5" index="5" function="PORTA" group="P"/>
-                <signal pad-id="pa6" index="6" function="PORTA" group="P"/>
-                <signal pad-id="pa7" index="7" function="PORTA" group="P"/>
+                <signal pad-key="pa0" index="0" function="PORTA" group="P"/>
+                <signal pad-key="pa1" index="1" function="PORTA" group="P"/>
+                <signal pad-key="pa2" index="2" function="PORTA" group="P"/>
+                <signal pad-key="pa3" index="3" function="PORTA" group="P"/>
+                <signal pad-key="pa4" index="4" function="PORTA" group="P"/>
+                <signal pad-key="pa5" index="5" function="PORTA" group="P"/>
+                <signal pad-key="pa6" index="6" function="PORTA" group="P"/>
+                <signal pad-key="pa7" index="7" function="PORTA" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pb2" index="2" function="PORTB" group="P"/>
-                <signal pad-id="pb3" index="3" function="PORTB" group="P"/>
-                <signal pad-id="pb4" index="4" function="PORTB" group="P"/>
-                <signal pad-id="pb5" index="5" function="PORTB" group="P"/>
-                <signal pad-id="pb6" index="6" function="PORTB" group="P"/>
-                <signal pad-id="pb7" index="7" function="PORTB" group="P"/>
+                <signal pad-key="pb0" index="0" function="PORTB" group="P"/>
+                <signal pad-key="pb1" index="1" function="PORTB" group="P"/>
+                <signal pad-key="pb2" index="2" function="PORTB" group="P"/>
+                <signal pad-key="pb3" index="3" function="PORTB" group="P"/>
+                <signal pad-key="pb4" index="4" function="PORTB" group="P"/>
+                <signal pad-key="pb5" index="5" function="PORTB" group="P"/>
+                <signal pad-key="pb6" index="6" function="PORTB" group="P"/>
+                <signal pad-key="pb7" index="7" function="PORTB" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pc2" index="2" function="PORTC" group="P"/>
-                <signal pad-id="pc3" index="3" function="PORTC" group="P"/>
-                <signal pad-id="pc4" index="4" function="PORTC" group="P"/>
-                <signal pad-id="pc5" index="5" function="PORTC" group="P"/>
-                <signal pad-id="pc6" index="6" function="PORTC" group="P"/>
-                <signal pad-id="pc7" index="7" function="PORTC" group="P"/>
+                <signal pad-key="pc0" index="0" function="PORTC" group="P"/>
+                <signal pad-key="pc1" index="1" function="PORTC" group="P"/>
+                <signal pad-key="pc2" index="2" function="PORTC" group="P"/>
+                <signal pad-key="pc3" index="3" function="PORTC" group="P"/>
+                <signal pad-key="pc4" index="4" function="PORTC" group="P"/>
+                <signal pad-key="pc5" index="5" function="PORTC" group="P"/>
+                <signal pad-key="pc6" index="6" function="PORTC" group="P"/>
+                <signal pad-key="pc7" index="7" function="PORTC" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pd2" index="2" function="PORTD" group="P"/>
-                <signal pad-id="pd3" index="3" function="PORTD" group="P"/>
-                <signal pad-id="pd4" index="4" function="PORTD" group="P"/>
-                <signal pad-id="pd5" index="5" function="PORTD" group="P"/>
-                <signal pad-id="pd6" index="6" function="PORTD" group="P"/>
-                <signal pad-id="pd7" index="7" function="PORTD" group="P"/>
+                <signal pad-key="pd0" index="0" function="PORTD" group="P"/>
+                <signal pad-key="pd1" index="1" function="PORTD" group="P"/>
+                <signal pad-key="pd2" index="2" function="PORTD" group="P"/>
+                <signal pad-key="pd3" index="3" function="PORTD" group="P"/>
+                <signal pad-key="pd4" index="4" function="PORTD" group="P"/>
+                <signal pad-key="pd5" index="5" function="PORTD" group="P"/>
+                <signal pad-key="pd6" index="6" function="PORTD" group="P"/>
+                <signal pad-key="pd7" index="7" function="PORTD" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="porte" name="PORTE" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pe2" index="2" function="PORTE" group="P"/>
-                <signal pad-id="pe3" index="3" function="PORTE" group="P"/>
-                <signal pad-id="pe4" index="4" function="PORTE" group="P"/>
-                <signal pad-id="pe5" index="5" function="PORTE" group="P"/>
-                <signal pad-id="pe6" index="6" function="PORTE" group="P"/>
-                <signal pad-id="pe7" index="7" function="PORTE" group="P"/>
+                <signal pad-key="pe0" index="0" function="PORTE" group="P"/>
+                <signal pad-key="pe1" index="1" function="PORTE" group="P"/>
+                <signal pad-key="pe2" index="2" function="PORTE" group="P"/>
+                <signal pad-key="pe3" index="3" function="PORTE" group="P"/>
+                <signal pad-key="pe4" index="4" function="PORTE" group="P"/>
+                <signal pad-key="pe5" index="5" function="PORTE" group="P"/>
+                <signal pad-key="pe6" index="6" function="PORTE" group="P"/>
+                <signal pad-key="pe7" index="7" function="PORTE" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portf" name="PORTF" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pf2" index="2" function="PORTF" group="P"/>
-                <signal pad-id="pf3" index="3" function="PORTF" group="P"/>
-                <signal pad-id="pf4" index="4" function="PORTF" group="P"/>
-                <signal pad-id="pf5" index="5" function="PORTF" group="P"/>
-                <signal pad-id="pf6" index="6" function="PORTF" group="P"/>
-                <signal pad-id="pf7" index="7" function="PORTF" group="P"/>
+                <signal pad-key="pf0" index="0" function="PORTF" group="P"/>
+                <signal pad-key="pf1" index="1" function="PORTF" group="P"/>
+                <signal pad-key="pf2" index="2" function="PORTF" group="P"/>
+                <signal pad-key="pf3" index="3" function="PORTF" group="P"/>
+                <signal pad-key="pf4" index="4" function="PORTF" group="P"/>
+                <signal pad-key="pf5" index="5" function="PORTF" group="P"/>
+                <signal pad-key="pf6" index="6" function="PORTF" group="P"/>
+                <signal pad-key="pf7" index="7" function="PORTF" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portr" name="PORTR" module-key="gpio_port">
             <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"/>
+                <signal pad-key="pr0" index="0" function="PORTR" group="P"/>
+                <signal pad-key="pr1" index="1" function="PORTR" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="tcc0" name="TCC0" module-key="i6090_tc">
@@ -1384,76 +1384,133 @@
             </register-group>
         </module>
     </modules>
+    <pads>
+        <pad key="pa3" name="PA3"/>
+        <pad key="pa4" name="PA4"/>
+        <pad key="pa5" name="PA5"/>
+        <pad key="pa6" name="PA6"/>
+        <pad key="pa7" name="PA7"/>
+        <pad key="pb0" name="PB0"/>
+        <pad key="pb1" name="PB1"/>
+        <pad key="pb2" name="PB2"/>
+        <pad key="pb3" name="PB3"/>
+        <pad key="pb4" name="PB4"/>
+        <pad key="pb5" name="PB5"/>
+        <pad key="pb6" name="PB6"/>
+        <pad key="pb7" name="PB7"/>
+        <pad key="gnd" name="GND"/>
+        <pad key="vcc" name="VCC"/>
+        <pad key="pc0" name="PC0"/>
+        <pad key="pc1" name="PC1"/>
+        <pad key="pc2" name="PC2"/>
+        <pad key="pc3" name="PC3"/>
+        <pad key="pc4" name="PC4"/>
+        <pad key="pc5" name="PC5"/>
+        <pad key="pc6" name="PC6"/>
+        <pad key="pc7" name="PC7"/>
+        <pad key="pd0" name="PD0"/>
+        <pad key="pd1" name="PD1"/>
+        <pad key="pd2" name="PD2"/>
+        <pad key="pd3" name="PD3"/>
+        <pad key="pd4" name="PD4"/>
+        <pad key="pd5" name="PD5"/>
+        <pad key="pd6" name="PD6"/>
+        <pad key="pd7" name="PD7"/>
+        <pad key="pe0" name="PE0"/>
+        <pad key="pe1" name="PE1"/>
+        <pad key="pe2" name="PE2"/>
+        <pad key="pe3" name="PE3"/>
+        <pad key="pe4" name="PE4"/>
+        <pad key="pe5" name="PE5"/>
+        <pad key="pe6" name="PE6"/>
+        <pad key="pe7" name="PE7"/>
+        <pad key="pf0" name="PF0"/>
+        <pad key="pf1" name="PF1"/>
+        <pad key="pf2" name="PF2"/>
+        <pad key="pf3" name="PF3"/>
+        <pad key="pf4" name="PF4"/>
+        <pad key="pf5" name="PF5"/>
+        <pad key="pf6" name="PF6"/>
+        <pad key="pf7" name="PF7"/>
+        <pad key="pdi" name="PDI"/>
+        <pad key="reset" name="RESET"/>
+        <pad key="pr0" name="PR0"/>
+        <pad key="pr1" name="PR1"/>
+        <pad key="avcc" name="AVCC"/>
+        <pad key="pa0" name="PA0"/>
+        <pad key="pa1" name="PA1"/>
+        <pad key="pa2" name="PA2"/>
+    </pads>
     <pinouts>
         <pinout key="qfp_qfn_64" name="QFP_QFN_64" type="qfn">
-            <pin position="1" pad="PA3"/>
-            <pin position="2" pad="PA4"/>
-            <pin position="3" pad="PA5"/>
-            <pin position="4" pad="PA6"/>
-            <pin position="5" pad="PA7"/>
-            <pin position="6" pad="PB0"/>
-            <pin position="7" pad="PB1"/>
-            <pin position="8" pad="PB2"/>
-            <pin position="9" pad="PB3"/>
-            <pin position="10" pad="PB4"/>
-            <pin position="11" pad="PB5"/>
-            <pin position="12" pad="PB6"/>
-            <pin position="13" pad="PB7"/>
-            <pin position="14" pad="GND"/>
-            <pin position="15" pad="VCC"/>
-            <pin position="16" pad="PC0"/>
-            <pin position="17" pad="PC1"/>
-            <pin position="18" pad="PC2"/>
-            <pin position="19" pad="PC3"/>
-            <pin position="20" pad="PC4"/>
-            <pin position="21" pad="PC5"/>
-            <pin position="22" pad="PC6"/>
-            <pin position="23" pad="PC7"/>
-            <pin position="24" pad="GND"/>
-            <pin position="25" pad="VCC"/>
-            <pin position="26" pad="PD0"/>
-            <pin position="27" pad="PD1"/>
-            <pin position="28" pad="PD2"/>
-            <pin position="29" pad="PD3"/>
-            <pin position="30" pad="PD4"/>
-            <pin position="31" pad="PD5"/>
-            <pin position="32" pad="PD6"/>
-            <pin position="33" pad="PD7"/>
-            <pin position="34" pad="GND"/>
-            <pin position="35" pad="VCC"/>
-            <pin position="36" pad="PE0"/>
-            <pin position="37" pad="PE1"/>
-            <pin position="38" pad="PE2"/>
-            <pin position="39" pad="PE3"/>
-            <pin position="40" pad="PE4"/>
-            <pin position="41" pad="PE5"/>
-            <pin position="42" pad="PE6"/>
-            <pin position="43" pad="PE7"/>
-            <pin position="44" pad="GND"/>
-            <pin position="45" pad="VCC"/>
-            <pin position="46" pad="PF0"/>
-            <pin position="47" pad="PF1"/>
-            <pin position="48" pad="PF2"/>
-            <pin position="49" pad="PF3"/>
-            <pin position="50" pad="PF4"/>
-            <pin position="51" pad="PF5"/>
-            <pin position="52" pad="GND"/>
-            <pin position="53" pad="VCC"/>
-            <pin position="54" pad="PF6"/>
-            <pin position="55" pad="PF7"/>
-            <pin position="56" pad="PDI"/>
-            <pin position="57" pad="RESET"/>
-            <pin position="58" pad="PR0"/>
-            <pin position="59" pad="PR1"/>
-            <pin position="60" pad="GND"/>
-            <pin position="61" pad="AVCC"/>
-            <pin position="62" pad="PA0"/>
-            <pin position="63" pad="PA1"/>
-            <pin position="64" pad="PA2"/>
+            <pin position="1" pad-key="pa3"/>
+            <pin position="2" pad-key="pa4"/>
+            <pin position="3" pad-key="pa5"/>
+            <pin position="4" pad-key="pa6"/>
+            <pin position="5" pad-key="pa7"/>
+            <pin position="6" pad-key="pb0"/>
+            <pin position="7" pad-key="pb1"/>
+            <pin position="8" pad-key="pb2"/>
+            <pin position="9" pad-key="pb3"/>
+            <pin position="10" pad-key="pb4"/>
+            <pin position="11" pad-key="pb5"/>
+            <pin position="12" pad-key="pb6"/>
+            <pin position="13" pad-key="pb7"/>
+            <pin position="14" pad-key="gnd"/>
+            <pin position="15" pad-key="vcc"/>
+            <pin position="16" pad-key="pc0"/>
+            <pin position="17" pad-key="pc1"/>
+            <pin position="18" pad-key="pc2"/>
+            <pin position="19" pad-key="pc3"/>
+            <pin position="20" pad-key="pc4"/>
+            <pin position="21" pad-key="pc5"/>
+            <pin position="22" pad-key="pc6"/>
+            <pin position="23" pad-key="pc7"/>
+            <pin position="24" pad-key="gnd"/>
+            <pin position="25" pad-key="vcc"/>
+            <pin position="26" pad-key="pd0"/>
+            <pin position="27" pad-key="pd1"/>
+            <pin position="28" pad-key="pd2"/>
+            <pin position="29" pad-key="pd3"/>
+            <pin position="30" pad-key="pd4"/>
+            <pin position="31" pad-key="pd5"/>
+            <pin position="32" pad-key="pd6"/>
+            <pin position="33" pad-key="pd7"/>
+            <pin position="34" pad-key="gnd"/>
+            <pin position="35" pad-key="vcc"/>
+            <pin position="36" pad-key="pe0"/>
+            <pin position="37" pad-key="pe1"/>
+            <pin position="38" pad-key="pe2"/>
+            <pin position="39" pad-key="pe3"/>
+            <pin position="40" pad-key="pe4"/>
+            <pin position="41" pad-key="pe5"/>
+            <pin position="42" pad-key="pe6"/>
+            <pin position="43" pad-key="pe7"/>
+            <pin position="44" pad-key="gnd"/>
+            <pin position="45" pad-key="vcc"/>
+            <pin position="46" pad-key="pf0"/>
+            <pin position="47" pad-key="pf1"/>
+            <pin position="48" pad-key="pf2"/>
+            <pin position="49" pad-key="pf3"/>
+            <pin position="50" pad-key="pf4"/>
+            <pin position="51" pad-key="pf5"/>
+            <pin position="52" pad-key="gnd"/>
+            <pin position="53" pad-key="vcc"/>
+            <pin position="54" pad-key="pf6"/>
+            <pin position="55" pad-key="pf7"/>
+            <pin position="56" pad-key="pdi"/>
+            <pin position="57" pad-key="reset"/>
+            <pin position="58" pad-key="pr0"/>
+            <pin position="59" pad-key="pr1"/>
+            <pin position="60" pad-key="gnd"/>
+            <pin position="61" pad-key="avcc"/>
+            <pin position="62" pad-key="pa0"/>
+            <pin position="63" pad-key="pa1"/>
+            <pin position="64" pad-key="pa2"/>
         </pinout>
     </pinouts>
     <variants>
-        <variant name="ATXMEGA192A3-AU" pinout-key="qfp_qfn_64" package="TQFP64"/>
-        <variant name="ATXMEGA192A3-MH" pinout-key="qfp_qfn_64" package="QFN64"/>
+        <variant key="atxmega192a3_au" name="ATXMEGA192A3-AU" pinout-key="qfp_qfn_64"/>
+        <variant key="atxmega192a3_mh" name="ATXMEGA192A3-MH" pinout-key="qfp_qfn_64"/>
     </variants>
 </device>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA192A3U.xml b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA192A3U.xml
index ff16f084..607af686 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA192A3U.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA192A3U.xml
@@ -94,10 +94,10 @@
         <peripheral key="osc" name="OSC" module-key="i6079">
             <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"/>
-                <signal pad-id="pe2" function="TOSC" group="TOSC2"/>
-                <signal pad-id="pe3" function="TOSC" group="TOSC1"/>
+                <signal pad-key="pr0" function="XTAL" group="XTAL2"/>
+                <signal pad-key="pr1" function="XTAL" group="XTAL1"/>
+                <signal pad-key="pe2" function="TOSC" group="TOSC2"/>
+                <signal pad-key="pe3" function="TOSC" group="TOSC1"/>
             </signals>
         </peripheral>
         <peripheral key="dfllrc32m" name="DFLLRC32M" module-key="i6055">
@@ -121,19 +121,19 @@
         <peripheral key="portcfg" name="PORTCFG" module-key="i6075_portcfg">
             <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"/>
-                <signal pad-id="pd7" function="CLKOUTD" group="CLKOUT" field="CLKOUT"/>
-                <signal pad-id="pd4" function="CLKOUTD_ALT" group="CLKOUT" field="CLKEVPIN"/>
-                <signal pad-id="pe7" function="CLKOUTE" group="CLKOUT" field="CLKOUT"/>
-                <signal pad-id="pe4" function="CLKOUTE_ALT" group="CLKOUT" field="CLKEVPIN"/>
-                <signal pad-id="pc7" function="EVOUTC" group="EVOUT" field="EVOUT"/>
-                <signal pad-id="pc4" function="EVOUTC_ALT" group="EVOUT" field="CLKEVPIN"/>
-                <signal pad-id="pd7" function="EVOUTD" group="EVOUT" field="EVOUT"/>
-                <signal pad-id="pd4" function="EVOUTD_ALT" group="EVOUT" field="CLKEVPIN"/>
-                <signal pad-id="pe7" function="EVOUTE" group="EVOUT" field="EVOUT"/>
-                <signal pad-id="pe4" function="EVOUTE_ALT" group="EVOUT" field="CLKEVPIN"/>
-                <signal pad-id="pc6" function="RTCOUTC" group="RTCOUT"/>
+                <signal pad-key="pc7" function="CLKOUTC" group="CLKOUT" field="CLKOUT"/>
+                <signal pad-key="pc4" function="CLKOUTC_ALT" group="CLKOUT" field="CLKEVPIN"/>
+                <signal pad-key="pd7" function="CLKOUTD" group="CLKOUT" field="CLKOUT"/>
+                <signal pad-key="pd4" function="CLKOUTD_ALT" group="CLKOUT" field="CLKEVPIN"/>
+                <signal pad-key="pe7" function="CLKOUTE" group="CLKOUT" field="CLKOUT"/>
+                <signal pad-key="pe4" function="CLKOUTE_ALT" group="CLKOUT" field="CLKEVPIN"/>
+                <signal pad-key="pc7" function="EVOUTC" group="EVOUT" field="EVOUT"/>
+                <signal pad-key="pc4" function="EVOUTC_ALT" group="EVOUT" field="CLKEVPIN"/>
+                <signal pad-key="pd7" function="EVOUTD" group="EVOUT" field="EVOUT"/>
+                <signal pad-key="pd4" function="EVOUTD_ALT" group="EVOUT" field="CLKEVPIN"/>
+                <signal pad-key="pe7" function="EVOUTE" group="EVOUT" field="EVOUT"/>
+                <signal pad-key="pe4" function="EVOUTE_ALT" group="EVOUT" field="CLKEVPIN"/>
+                <signal pad-key="pc6" function="RTCOUTC" group="RTCOUT"/>
             </signals>
         </peripheral>
         <peripheral key="aes" name="AES" module-key="i6096">
@@ -154,78 +154,78 @@
         <peripheral key="adca" name="ADCA" module-key="i6099">
             <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"/>
-                <signal pad-id="pa2" index="2" function="ADC" group="ADC"/>
-                <signal pad-id="pa3" index="3" function="ADC" group="ADC"/>
-                <signal pad-id="pa4" index="4" function="ADC" group="ADC"/>
-                <signal pad-id="pa5" index="5" function="ADC" group="ADC"/>
-                <signal pad-id="pa6" index="6" function="ADC" group="ADC"/>
-                <signal pad-id="pa7" index="7" function="ADC" group="ADC"/>
-                <signal pad-id="pb0" index="8" function="ADC" group="ADC"/>
-                <signal pad-id="pb1" index="9" function="ADC" group="ADC"/>
-                <signal pad-id="pb2" index="10" function="ADC" group="ADC"/>
-                <signal pad-id="pb3" index="11" function="ADC" group="ADC"/>
-                <signal pad-id="pb4" index="12" function="ADC" group="ADC"/>
-                <signal pad-id="pb5" index="13" function="ADC" group="ADC"/>
-                <signal pad-id="pb6" index="14" function="ADC" group="ADC"/>
-                <signal pad-id="pb7" index="15" function="ADC" group="ADC"/>
-                <signal pad-id="pa0" index="0" function="AREF" group="REFA"/>
-                <signal pad-id="pb0" index="0" function="AREF" group="REFB"/>
+                <signal pad-key="pa0" index="0" function="ADC" group="ADC"/>
+                <signal pad-key="pa1" index="1" function="ADC" group="ADC"/>
+                <signal pad-key="pa2" index="2" function="ADC" group="ADC"/>
+                <signal pad-key="pa3" index="3" function="ADC" group="ADC"/>
+                <signal pad-key="pa4" index="4" function="ADC" group="ADC"/>
+                <signal pad-key="pa5" index="5" function="ADC" group="ADC"/>
+                <signal pad-key="pa6" index="6" function="ADC" group="ADC"/>
+                <signal pad-key="pa7" index="7" function="ADC" group="ADC"/>
+                <signal pad-key="pb0" index="8" function="ADC" group="ADC"/>
+                <signal pad-key="pb1" index="9" function="ADC" group="ADC"/>
+                <signal pad-key="pb2" index="10" function="ADC" group="ADC"/>
+                <signal pad-key="pb3" index="11" function="ADC" group="ADC"/>
+                <signal pad-key="pb4" index="12" function="ADC" group="ADC"/>
+                <signal pad-key="pb5" index="13" function="ADC" group="ADC"/>
+                <signal pad-key="pb6" index="14" function="ADC" group="ADC"/>
+                <signal pad-key="pb7" index="15" function="ADC" group="ADC"/>
+                <signal pad-key="pa0" index="0" function="AREF" group="REFA"/>
+                <signal pad-key="pb0" index="0" function="AREF" group="REFB"/>
             </signals>
         </peripheral>
         <peripheral key="adcb" name="ADCB" module-key="i6099">
             <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"/>
-                <signal pad-id="pb2" index="2" function="ADC" group="ADC"/>
-                <signal pad-id="pb3" index="3" function="ADC" group="ADC"/>
-                <signal pad-id="pb4" index="4" function="ADC" group="ADC"/>
-                <signal pad-id="pb5" index="5" function="ADC" group="ADC"/>
-                <signal pad-id="pb6" index="6" function="ADC" group="ADC"/>
-                <signal pad-id="pb7" index="7" function="ADC" group="ADC"/>
-                <signal pad-id="pa0" index="0" function="AREF" group="REFA"/>
-                <signal pad-id="pb0" index="0" function="AREF" group="REFB"/>
+                <signal pad-key="pb0" index="0" function="ADC" group="ADC"/>
+                <signal pad-key="pb1" index="1" function="ADC" group="ADC"/>
+                <signal pad-key="pb2" index="2" function="ADC" group="ADC"/>
+                <signal pad-key="pb3" index="3" function="ADC" group="ADC"/>
+                <signal pad-key="pb4" index="4" function="ADC" group="ADC"/>
+                <signal pad-key="pb5" index="5" function="ADC" group="ADC"/>
+                <signal pad-key="pb6" index="6" function="ADC" group="ADC"/>
+                <signal pad-key="pb7" index="7" function="ADC" group="ADC"/>
+                <signal pad-key="pa0" index="0" function="AREF" group="REFA"/>
+                <signal pad-key="pb0" index="0" function="AREF" group="REFB"/>
             </signals>
         </peripheral>
         <peripheral key="dacb" name="DACB" module-key="i6059">
             <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"/>
-                <signal pad-id="pa0" index="0" function="AREF" group="REFA"/>
-                <signal pad-id="pb0" index="0" function="AREF" group="REFB"/>
+                <signal pad-key="pb2" index="0" function="DAC" group="DAC"/>
+                <signal pad-key="pb3" index="1" function="DAC" group="DAC"/>
+                <signal pad-key="pa0" index="0" function="AREF" group="REFA"/>
+                <signal pad-key="pb0" index="0" function="AREF" group="REFB"/>
             </signals>
         </peripheral>
         <peripheral key="aca" name="ACA" module-key="i6077">
             <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"/>
-                <signal pad-id="pa2" index="2" function="AC" group="AC"/>
-                <signal pad-id="pa3" index="3" function="AC" group="AC"/>
-                <signal pad-id="pa4" index="4" function="AC" group="AC"/>
-                <signal pad-id="pa5" index="5" function="AC" group="AC"/>
-                <signal pad-id="pa6" index="6" function="AC" group="AC"/>
-                <signal pad-id="pa7" index="7" function="AC" group="AC"/>
-                <signal pad-id="pa6" index="1" function="ACOUT" group="ACOUT"/>
-                <signal pad-id="pa7" index="0" function="ACOUT" group="ACOUT"/>
+                <signal pad-key="pa0" index="0" function="AC" group="AC"/>
+                <signal pad-key="pa1" index="1" function="AC" group="AC"/>
+                <signal pad-key="pa2" index="2" function="AC" group="AC"/>
+                <signal pad-key="pa3" index="3" function="AC" group="AC"/>
+                <signal pad-key="pa4" index="4" function="AC" group="AC"/>
+                <signal pad-key="pa5" index="5" function="AC" group="AC"/>
+                <signal pad-key="pa6" index="6" function="AC" group="AC"/>
+                <signal pad-key="pa7" index="7" function="AC" group="AC"/>
+                <signal pad-key="pa6" index="1" function="ACOUT" group="ACOUT"/>
+                <signal pad-key="pa7" index="0" function="ACOUT" group="ACOUT"/>
             </signals>
         </peripheral>
         <peripheral key="acb" name="ACB" module-key="i6077">
             <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"/>
-                <signal pad-id="pb2" index="2" function="AC" group="AC"/>
-                <signal pad-id="pb3" index="3" function="AC" group="AC"/>
-                <signal pad-id="pb4" index="4" function="AC" group="AC"/>
-                <signal pad-id="pb5" index="5" function="AC" group="AC"/>
-                <signal pad-id="pb6" index="6" function="AC" group="AC"/>
-                <signal pad-id="pb7" index="7" function="AC" group="AC"/>
-                <signal pad-id="pb6" index="1" function="ACOUT" group="ACOUT"/>
-                <signal pad-id="pb7" index="0" function="ACOUT" group="ACOUT"/>
+                <signal pad-key="pb0" index="0" function="AC" group="AC"/>
+                <signal pad-key="pb1" index="1" function="AC" group="AC"/>
+                <signal pad-key="pb2" index="2" function="AC" group="AC"/>
+                <signal pad-key="pb3" index="3" function="AC" group="AC"/>
+                <signal pad-key="pb4" index="4" function="AC" group="AC"/>
+                <signal pad-key="pb5" index="5" function="AC" group="AC"/>
+                <signal pad-key="pb6" index="6" function="AC" group="AC"/>
+                <signal pad-key="pb7" index="7" function="AC" group="AC"/>
+                <signal pad-key="pb6" index="1" function="ACOUT" group="ACOUT"/>
+                <signal pad-key="pb7" index="0" function="ACOUT" group="ACOUT"/>
             </signals>
         </peripheral>
         <peripheral key="rtc" name="RTC" module-key="i6093">
@@ -234,262 +234,262 @@
         <peripheral key="twic" name="TWIC" module-key="i6089">
             <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"/>
-                <signal pad-id="pc0" function="TWI_EXT" group="SDAIN"/>
-                <signal pad-id="pc1" function="TWI_EXT" group="SCLIN"/>
-                <signal pad-id="pc2" function="TWI_EXT" group="SDAOUT"/>
-                <signal pad-id="pc3" function="TWI_EXT" group="SCLOUT"/>
+                <signal pad-key="pc0" function="TWI" group="SDA"/>
+                <signal pad-key="pc1" function="TWI" group="SCL"/>
+                <signal pad-key="pc0" function="TWI_EXT" group="SDAIN"/>
+                <signal pad-key="pc1" function="TWI_EXT" group="SCLIN"/>
+                <signal pad-key="pc2" function="TWI_EXT" group="SDAOUT"/>
+                <signal pad-key="pc3" function="TWI_EXT" group="SCLOUT"/>
             </signals>
         </peripheral>
         <peripheral key="twie" name="TWIE" module-key="i6089">
             <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"/>
-                <signal pad-id="pe0" function="TWI_EXT" group="SDAIN"/>
-                <signal pad-id="pe1" function="TWI_EXT" group="SCLIN"/>
-                <signal pad-id="pe2" function="TWI_EXT" group="SDAOUT"/>
-                <signal pad-id="pe3" function="TWI_EXT" group="SCLOUT"/>
+                <signal pad-key="pe0" function="TWI" group="SDA"/>
+                <signal pad-key="pe1" function="TWI" group="SCL"/>
+                <signal pad-key="pe0" function="TWI_EXT" group="SDAIN"/>
+                <signal pad-key="pe1" function="TWI_EXT" group="SCLIN"/>
+                <signal pad-key="pe2" function="TWI_EXT" group="SDAOUT"/>
+                <signal pad-key="pe3" function="TWI_EXT" group="SCLOUT"/>
             </signals>
         </peripheral>
         <peripheral key="usb" name="USB" module-key="i3005">
             <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"/>
+                <signal pad-key="pd6" function="USB" group="DN"/>
+                <signal pad-key="pd7" function="USB" group="DP"/>
             </signals>
         </peripheral>
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pa2" index="2" function="PORTA" group="P"/>
-                <signal pad-id="pa3" index="3" function="PORTA" group="P"/>
-                <signal pad-id="pa4" index="4" function="PORTA" group="P"/>
-                <signal pad-id="pa5" index="5" function="PORTA" group="P"/>
-                <signal pad-id="pa6" index="6" function="PORTA" group="P"/>
-                <signal pad-id="pa7" index="7" function="PORTA" group="P"/>
+                <signal pad-key="pa0" index="0" function="PORTA" group="P"/>
+                <signal pad-key="pa1" index="1" function="PORTA" group="P"/>
+                <signal pad-key="pa2" index="2" function="PORTA" group="P"/>
+                <signal pad-key="pa3" index="3" function="PORTA" group="P"/>
+                <signal pad-key="pa4" index="4" function="PORTA" group="P"/>
+                <signal pad-key="pa5" index="5" function="PORTA" group="P"/>
+                <signal pad-key="pa6" index="6" function="PORTA" group="P"/>
+                <signal pad-key="pa7" index="7" function="PORTA" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pb2" index="2" function="PORTB" group="P"/>
-                <signal pad-id="pb3" index="3" function="PORTB" group="P"/>
-                <signal pad-id="pb4" index="4" function="PORTB" group="P"/>
-                <signal pad-id="pb5" index="5" function="PORTB" group="P"/>
-                <signal pad-id="pb6" index="6" function="PORTB" group="P"/>
-                <signal pad-id="pb7" index="7" function="PORTB" group="P"/>
+                <signal pad-key="pb0" index="0" function="PORTB" group="P"/>
+                <signal pad-key="pb1" index="1" function="PORTB" group="P"/>
+                <signal pad-key="pb2" index="2" function="PORTB" group="P"/>
+                <signal pad-key="pb3" index="3" function="PORTB" group="P"/>
+                <signal pad-key="pb4" index="4" function="PORTB" group="P"/>
+                <signal pad-key="pb5" index="5" function="PORTB" group="P"/>
+                <signal pad-key="pb6" index="6" function="PORTB" group="P"/>
+                <signal pad-key="pb7" index="7" function="PORTB" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pc2" index="2" function="PORTC" group="P"/>
-                <signal pad-id="pc3" index="3" function="PORTC" group="P"/>
-                <signal pad-id="pc4" index="4" function="PORTC" group="P"/>
-                <signal pad-id="pc5" index="5" function="PORTC" group="P"/>
-                <signal pad-id="pc6" index="6" function="PORTC" group="P"/>
-                <signal pad-id="pc7" index="7" function="PORTC" group="P"/>
+                <signal pad-key="pc0" index="0" function="PORTC" group="P"/>
+                <signal pad-key="pc1" index="1" function="PORTC" group="P"/>
+                <signal pad-key="pc2" index="2" function="PORTC" group="P"/>
+                <signal pad-key="pc3" index="3" function="PORTC" group="P"/>
+                <signal pad-key="pc4" index="4" function="PORTC" group="P"/>
+                <signal pad-key="pc5" index="5" function="PORTC" group="P"/>
+                <signal pad-key="pc6" index="6" function="PORTC" group="P"/>
+                <signal pad-key="pc7" index="7" function="PORTC" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pd2" index="2" function="PORTD" group="P"/>
-                <signal pad-id="pd3" index="3" function="PORTD" group="P"/>
-                <signal pad-id="pd4" index="4" function="PORTD" group="P"/>
-                <signal pad-id="pd5" index="5" function="PORTD" group="P"/>
-                <signal pad-id="pd6" index="6" function="PORTD" group="P"/>
-                <signal pad-id="pd7" index="7" function="PORTD" group="P"/>
+                <signal pad-key="pd0" index="0" function="PORTD" group="P"/>
+                <signal pad-key="pd1" index="1" function="PORTD" group="P"/>
+                <signal pad-key="pd2" index="2" function="PORTD" group="P"/>
+                <signal pad-key="pd3" index="3" function="PORTD" group="P"/>
+                <signal pad-key="pd4" index="4" function="PORTD" group="P"/>
+                <signal pad-key="pd5" index="5" function="PORTD" group="P"/>
+                <signal pad-key="pd6" index="6" function="PORTD" group="P"/>
+                <signal pad-key="pd7" index="7" function="PORTD" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="porte" name="PORTE" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pe2" index="2" function="PORTE" group="P"/>
-                <signal pad-id="pe3" index="3" function="PORTE" group="P"/>
-                <signal pad-id="pe4" index="4" function="PORTE" group="P"/>
-                <signal pad-id="pe5" index="5" function="PORTE" group="P"/>
-                <signal pad-id="pe6" index="6" function="PORTE" group="P"/>
-                <signal pad-id="pe7" index="7" function="PORTE" group="P"/>
+                <signal pad-key="pe0" index="0" function="PORTE" group="P"/>
+                <signal pad-key="pe1" index="1" function="PORTE" group="P"/>
+                <signal pad-key="pe2" index="2" function="PORTE" group="P"/>
+                <signal pad-key="pe3" index="3" function="PORTE" group="P"/>
+                <signal pad-key="pe4" index="4" function="PORTE" group="P"/>
+                <signal pad-key="pe5" index="5" function="PORTE" group="P"/>
+                <signal pad-key="pe6" index="6" function="PORTE" group="P"/>
+                <signal pad-key="pe7" index="7" function="PORTE" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portf" name="PORTF" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pf2" index="2" function="PORTF" group="P"/>
-                <signal pad-id="pf3" index="3" function="PORTF" group="P"/>
-                <signal pad-id="pf4" index="4" function="PORTF" group="P"/>
-                <signal pad-id="pf5" index="5" function="PORTF" group="P"/>
-                <signal pad-id="pf6" index="6" function="PORTF" group="P"/>
-                <signal pad-id="pf7" index="7" function="PORTF" group="P"/>
+                <signal pad-key="pf0" index="0" function="PORTF" group="P"/>
+                <signal pad-key="pf1" index="1" function="PORTF" group="P"/>
+                <signal pad-key="pf2" index="2" function="PORTF" group="P"/>
+                <signal pad-key="pf3" index="3" function="PORTF" group="P"/>
+                <signal pad-key="pf4" index="4" function="PORTF" group="P"/>
+                <signal pad-key="pf5" index="5" function="PORTF" group="P"/>
+                <signal pad-key="pf6" index="6" function="PORTF" group="P"/>
+                <signal pad-key="pf7" index="7" function="PORTF" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portr" name="PORTR" module-key="gpio_port">
             <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"/>
+                <signal pad-key="pr0" index="0" function="PORTR" group="P"/>
+                <signal pad-key="pr1" index="1" function="PORTR" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="tcc0" name="TCC0" module-key="i6090_tc">
             <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"/>
-                <signal pad-id="pc2" function="TC0" group="OC0C" field="TC0C"/>
-                <signal pad-id="pc3" function="TC0" group="OC0D" field="TC0D"/>
-                <signal pad-id="pc4" function="TC0_ALT" group="OC0A" field="TC0A"/>
-                <signal pad-id="pc5" function="TC0_ALT" group="OC0B" field="TC0B"/>
-                <signal pad-id="pc6" function="TC0_ALT" group="OC0C" field="TC0C"/>
-                <signal pad-id="pc7" function="TC0_ALT" group="OC0D" field="TC0D"/>
+                <signal pad-key="pc0" function="TC0" group="OC0A" field="TC0A"/>
+                <signal pad-key="pc1" function="TC0" group="OC0B" field="TC0B"/>
+                <signal pad-key="pc2" function="TC0" group="OC0C" field="TC0C"/>
+                <signal pad-key="pc3" function="TC0" group="OC0D" field="TC0D"/>
+                <signal pad-key="pc4" function="TC0_ALT" group="OC0A" field="TC0A"/>
+                <signal pad-key="pc5" function="TC0_ALT" group="OC0B" field="TC0B"/>
+                <signal pad-key="pc6" function="TC0_ALT" group="OC0C" field="TC0C"/>
+                <signal pad-key="pc7" function="TC0_ALT" group="OC0D" field="TC0D"/>
             </signals>
         </peripheral>
         <peripheral key="tcc1" name="TCC1" module-key="i6090_tc">
             <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"/>
+                <signal pad-key="pc4" function="TC1" group="OC1A"/>
+                <signal pad-key="pc5" function="TC1" group="OC1B"/>
             </signals>
         </peripheral>
         <peripheral key="tcd0" name="TCD0" module-key="i6090_tc">
             <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"/>
-                <signal pad-id="pd2" function="TC0" group="OC0C" field="TC0C"/>
-                <signal pad-id="pd3" function="TC0" group="OC0D" field="TC0D"/>
-                <signal pad-id="pd4" function="TC0_ALT" group="OC0A" field="TC0A"/>
-                <signal pad-id="pd5" function="TC0_ALT" group="OC0B" field="TC0B"/>
-                <signal pad-id="pd6" function="TC0_ALT" group="OC0C" field="TC0C"/>
-                <signal pad-id="pd7" function="TC0_ALT" group="OC0D" field="TC0D"/>
+                <signal pad-key="pd0" function="TC0" group="OC0A" field="TC0A"/>
+                <signal pad-key="pd1" function="TC0" group="OC0B" field="TC0B"/>
+                <signal pad-key="pd2" function="TC0" group="OC0C" field="TC0C"/>
+                <signal pad-key="pd3" function="TC0" group="OC0D" field="TC0D"/>
+                <signal pad-key="pd4" function="TC0_ALT" group="OC0A" field="TC0A"/>
+                <signal pad-key="pd5" function="TC0_ALT" group="OC0B" field="TC0B"/>
+                <signal pad-key="pd6" function="TC0_ALT" group="OC0C" field="TC0C"/>
+                <signal pad-key="pd7" function="TC0_ALT" group="OC0D" field="TC0D"/>
             </signals>
         </peripheral>
         <peripheral key="tcd1" name="TCD1" module-key="i6090_tc">
             <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"/>
+                <signal pad-key="pd4" function="TC1" group="OC1A"/>
+                <signal pad-key="pd5" function="TC1" group="OC1B"/>
             </signals>
         </peripheral>
         <peripheral key="tce0" name="TCE0" module-key="i6090_tc">
             <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"/>
-                <signal pad-id="pe2" function="TC0" group="OC0C" field="TC0C"/>
-                <signal pad-id="pe3" function="TC0" group="OC0D" field="TC0D"/>
-                <signal pad-id="pe4" function="TC0_ALT" group="OC0A" field="TC0A"/>
-                <signal pad-id="pe5" function="TC0_ALT" group="OC0B" field="TC0B"/>
-                <signal pad-id="pe6" function="TC0_ALT" group="OC0C" field="TC0C"/>
-                <signal pad-id="pe7" function="TC0_ALT" group="OC0D" field="TC0D"/>
+                <signal pad-key="pe0" function="TC0" group="OC0A" field="TC0A"/>
+                <signal pad-key="pe1" function="TC0" group="OC0B" field="TC0B"/>
+                <signal pad-key="pe2" function="TC0" group="OC0C" field="TC0C"/>
+                <signal pad-key="pe3" function="TC0" group="OC0D" field="TC0D"/>
+                <signal pad-key="pe4" function="TC0_ALT" group="OC0A" field="TC0A"/>
+                <signal pad-key="pe5" function="TC0_ALT" group="OC0B" field="TC0B"/>
+                <signal pad-key="pe6" function="TC0_ALT" group="OC0C" field="TC0C"/>
+                <signal pad-key="pe7" function="TC0_ALT" group="OC0D" field="TC0D"/>
             </signals>
         </peripheral>
         <peripheral key="tce1" name="TCE1" module-key="i6090_tc">
             <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"/>
+                <signal pad-key="pe4" function="TC1" group="OC1A"/>
+                <signal pad-key="pe5" function="TC1" group="OC1B"/>
             </signals>
         </peripheral>
         <peripheral key="tcf0" name="TCF0" module-key="i6090_tc">
             <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"/>
-                <signal pad-id="pf2" function="TC0" group="OC0C"/>
-                <signal pad-id="pf3" function="TC0" group="OC0D"/>
+                <signal pad-key="pf0" function="TC0" group="OC0A"/>
+                <signal pad-key="pf1" function="TC0" group="OC0B"/>
+                <signal pad-key="pf2" function="TC0" group="OC0C"/>
+                <signal pad-key="pf3" function="TC0" group="OC0D"/>
             </signals>
         </peripheral>
         <peripheral key="tcc2" name="TCC2" module-key="i6090_tc2">
             <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"/>
-                <signal pad-id="pc2" function="TC2" group="LOC2C"/>
-                <signal pad-id="pc3" function="TC2" group="LOC2D"/>
-                <signal pad-id="pc4" function="TC2" group="HOC2A"/>
-                <signal pad-id="pc5" function="TC2" group="HOC2B"/>
-                <signal pad-id="pc6" function="TC2" group="HOC2C"/>
-                <signal pad-id="pc7" function="TC2" group="HOC2D"/>
+                <signal pad-key="pc0" function="TC2" group="LOC2A"/>
+                <signal pad-key="pc1" function="TC2" group="LOC2B"/>
+                <signal pad-key="pc2" function="TC2" group="LOC2C"/>
+                <signal pad-key="pc3" function="TC2" group="LOC2D"/>
+                <signal pad-key="pc4" function="TC2" group="HOC2A"/>
+                <signal pad-key="pc5" function="TC2" group="HOC2B"/>
+                <signal pad-key="pc6" function="TC2" group="HOC2C"/>
+                <signal pad-key="pc7" function="TC2" group="HOC2D"/>
             </signals>
         </peripheral>
         <peripheral key="tcd2" name="TCD2" module-key="i6090_tc2">
             <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"/>
-                <signal pad-id="pd2" function="TC2" group="LOC2C"/>
-                <signal pad-id="pd3" function="TC2" group="LOC2D"/>
-                <signal pad-id="pd4" function="TC2" group="HOC2A"/>
-                <signal pad-id="pd5" function="TC2" group="HOC2B"/>
-                <signal pad-id="pd6" function="TC2" group="HOC2C"/>
-                <signal pad-id="pd7" function="TC2" group="HOC2D"/>
+                <signal pad-key="pd0" function="TC2" group="LOC2A"/>
+                <signal pad-key="pd1" function="TC2" group="LOC2B"/>
+                <signal pad-key="pd2" function="TC2" group="LOC2C"/>
+                <signal pad-key="pd3" function="TC2" group="LOC2D"/>
+                <signal pad-key="pd4" function="TC2" group="HOC2A"/>
+                <signal pad-key="pd5" function="TC2" group="HOC2B"/>
+                <signal pad-key="pd6" function="TC2" group="HOC2C"/>
+                <signal pad-key="pd7" function="TC2" group="HOC2D"/>
             </signals>
         </peripheral>
         <peripheral key="tce2" name="TCE2" module-key="i6090_tc2">
             <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"/>
-                <signal pad-id="pe2" function="TC2" group="LOC2C"/>
-                <signal pad-id="pe3" function="TC2" group="LOC2D"/>
-                <signal pad-id="pe4" function="TC2" group="HOC2A"/>
-                <signal pad-id="pe5" function="TC2" group="HOC2B"/>
-                <signal pad-id="pe6" function="TC2" group="HOC2C"/>
-                <signal pad-id="pe7" function="TC2" group="HOC2D"/>
+                <signal pad-key="pe0" function="TC2" group="LOC2A"/>
+                <signal pad-key="pe1" function="TC2" group="LOC2B"/>
+                <signal pad-key="pe2" function="TC2" group="LOC2C"/>
+                <signal pad-key="pe3" function="TC2" group="LOC2D"/>
+                <signal pad-key="pe4" function="TC2" group="HOC2A"/>
+                <signal pad-key="pe5" function="TC2" group="HOC2B"/>
+                <signal pad-key="pe6" function="TC2" group="HOC2C"/>
+                <signal pad-key="pe7" function="TC2" group="HOC2D"/>
             </signals>
         </peripheral>
         <peripheral key="tcf2" name="TCF2" module-key="i6090_tc2">
             <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"/>
-                <signal pad-id="pf2" function="TC2" group="LOC2C"/>
-                <signal pad-id="pf3" function="TC2" group="LOC2D"/>
-                <signal pad-id="pf4" function="TC2" group="HOC2A"/>
-                <signal pad-id="pf5" function="TC2" group="HOC2B"/>
-                <signal pad-id="pf6" function="TC2" group="HOC2C"/>
-                <signal pad-id="pf7" function="TC2" group="HOC2D"/>
+                <signal pad-key="pf0" function="TC2" group="LOC2A"/>
+                <signal pad-key="pf1" function="TC2" group="LOC2B"/>
+                <signal pad-key="pf2" function="TC2" group="LOC2C"/>
+                <signal pad-key="pf3" function="TC2" group="LOC2D"/>
+                <signal pad-key="pf4" function="TC2" group="HOC2A"/>
+                <signal pad-key="pf5" function="TC2" group="HOC2B"/>
+                <signal pad-key="pf6" function="TC2" group="HOC2C"/>
+                <signal pad-key="pf7" function="TC2" group="HOC2D"/>
             </signals>
         </peripheral>
         <peripheral key="awexc" name="AWEXC" module-key="i6090_awex">
             <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"/>
-                <signal pad-id="pc2" function="AWEX" group="OC0BLS"/>
-                <signal pad-id="pc3" function="AWEX" group="OC0BHS"/>
-                <signal pad-id="pc4" function="AWEX" group="OC0CLS"/>
-                <signal pad-id="pc5" function="AWEX" group="OC0CHS"/>
-                <signal pad-id="pc6" function="AWEX" group="OC0DLS"/>
-                <signal pad-id="pc7" function="AWEX" group="OC0DHS"/>
+                <signal pad-key="pc0" function="AWEX" group="OC0ALS"/>
+                <signal pad-key="pc1" function="AWEX" group="OC0AHS"/>
+                <signal pad-key="pc2" function="AWEX" group="OC0BLS"/>
+                <signal pad-key="pc3" function="AWEX" group="OC0BHS"/>
+                <signal pad-key="pc4" function="AWEX" group="OC0CLS"/>
+                <signal pad-key="pc5" function="AWEX" group="OC0CHS"/>
+                <signal pad-key="pc6" function="AWEX" group="OC0DLS"/>
+                <signal pad-key="pc7" function="AWEX" group="OC0DHS"/>
             </signals>
         </peripheral>
         <peripheral key="awexe" name="AWEXE" module-key="i6090_awex">
             <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"/>
-                <signal pad-id="pe2" function="AWEX" group="OC0BLS"/>
-                <signal pad-id="pe3" function="AWEX" group="OC0BHS"/>
-                <signal pad-id="pe4" function="AWEX" group="OC0CLS"/>
-                <signal pad-id="pe5" function="AWEX" group="OC0CHS"/>
-                <signal pad-id="pe6" function="AWEX" group="OC0DLS"/>
-                <signal pad-id="pe7" function="AWEX" group="OC0DHS"/>
+                <signal pad-key="pe0" function="AWEX" group="OC0ALS"/>
+                <signal pad-key="pe1" function="AWEX" group="OC0AHS"/>
+                <signal pad-key="pe2" function="AWEX" group="OC0BLS"/>
+                <signal pad-key="pe3" function="AWEX" group="OC0BHS"/>
+                <signal pad-key="pe4" function="AWEX" group="OC0CLS"/>
+                <signal pad-key="pe5" function="AWEX" group="OC0CHS"/>
+                <signal pad-key="pe6" function="AWEX" group="OC0DLS"/>
+                <signal pad-key="pe7" function="AWEX" group="OC0DHS"/>
             </signals>
         </peripheral>
         <peripheral key="hiresc" name="HIRESC" module-key="i6090_hires">
@@ -507,108 +507,108 @@
         <peripheral key="usartc0" name="USARTC0" module-key="i6090_usart">
             <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"/>
-                <signal pad-id="pc3" function="USART" group="TXD" field="USART0"/>
-                <signal pad-id="pc5" function="USART_ALT" group="XCK" field="USART0"/>
-                <signal pad-id="pc6" function="USART_ALT" group="RXD" field="USART0"/>
-                <signal pad-id="pc7" function="USART_ALT" group="TXD" field="USART0"/>
+                <signal pad-key="pc1" function="USART" group="XCK" field="USART0"/>
+                <signal pad-key="pc2" function="USART" group="RXD" field="USART0"/>
+                <signal pad-key="pc3" function="USART" group="TXD" field="USART0"/>
+                <signal pad-key="pc5" function="USART_ALT" group="XCK" field="USART0"/>
+                <signal pad-key="pc6" function="USART_ALT" group="RXD" field="USART0"/>
+                <signal pad-key="pc7" function="USART_ALT" group="TXD" field="USART0"/>
             </signals>
         </peripheral>
         <peripheral key="usartc1" name="USARTC1" module-key="i6090_usart">
             <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"/>
-                <signal pad-id="pd7" function="USART" group="TXD"/>
+                <signal pad-key="pd5" function="USART" group="XCK"/>
+                <signal pad-key="pd6" function="USART" group="RXD"/>
+                <signal pad-key="pd7" function="USART" group="TXD"/>
             </signals>
         </peripheral>
         <peripheral key="usartd0" name="USARTD0" module-key="i6090_usart">
             <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"/>
-                <signal pad-id="pd3" function="USART" group="TXD" field="USART0"/>
-                <signal pad-id="pd5" function="USART_ALT" group="XCK" field="USART0"/>
-                <signal pad-id="pd6" function="USART_ALT" group="RXD" field="USART0"/>
-                <signal pad-id="pd7" function="USART_ALT" group="TXD" field="USART0"/>
+                <signal pad-key="pd1" function="USART" group="XCK" field="USART0"/>
+                <signal pad-key="pd2" function="USART" group="RXD" field="USART0"/>
+                <signal pad-key="pd3" function="USART" group="TXD" field="USART0"/>
+                <signal pad-key="pd5" function="USART_ALT" group="XCK" field="USART0"/>
+                <signal pad-key="pd6" function="USART_ALT" group="RXD" field="USART0"/>
+                <signal pad-key="pd7" function="USART_ALT" group="TXD" field="USART0"/>
             </signals>
         </peripheral>
         <peripheral key="usartd1" name="USARTD1" module-key="i6090_usart">
             <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"/>
-                <signal pad-id="pd7" function="USART" group="TXD"/>
+                <signal pad-key="pd5" function="USART" group="XCK"/>
+                <signal pad-key="pd6" function="USART" group="RXD"/>
+                <signal pad-key="pd7" function="USART" group="TXD"/>
             </signals>
         </peripheral>
         <peripheral key="usarte0" name="USARTE0" module-key="i6090_usart">
             <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"/>
-                <signal pad-id="pe3" function="USART" group="TXD" field="USART0"/>
-                <signal pad-id="pe5" function="USART_ALT" group="XCK" field="USART0"/>
-                <signal pad-id="pe6" function="USART_ALT" group="RXD" field="USART0"/>
-                <signal pad-id="pe7" function="USART_ALT" group="TXD" field="USART0"/>
+                <signal pad-key="pe1" function="USART" group="XCK" field="USART0"/>
+                <signal pad-key="pe2" function="USART" group="RXD" field="USART0"/>
+                <signal pad-key="pe3" function="USART" group="TXD" field="USART0"/>
+                <signal pad-key="pe5" function="USART_ALT" group="XCK" field="USART0"/>
+                <signal pad-key="pe6" function="USART_ALT" group="RXD" field="USART0"/>
+                <signal pad-key="pe7" function="USART_ALT" group="TXD" field="USART0"/>
             </signals>
         </peripheral>
         <peripheral key="usarte1" name="USARTE1" module-key="i6090_usart">
             <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"/>
-                <signal pad-id="pe7" function="USART" group="TXD"/>
+                <signal pad-key="pe5" function="USART" group="XCK"/>
+                <signal pad-key="pe6" function="USART" group="RXD"/>
+                <signal pad-key="pe7" function="USART" group="TXD"/>
             </signals>
         </peripheral>
         <peripheral key="usartf0" name="USARTF0" module-key="i6090_usart">
             <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"/>
-                <signal pad-id="pf3" function="USART" group="TXD" field="USART0"/>
-                <signal pad-id="pf5" function="USART_ALT" group="XCK" field="USART0"/>
-                <signal pad-id="pf6" function="USART_ALT" group="RXD" field="USART0"/>
-                <signal pad-id="pf7" function="USART_ALT" group="TXD" field="USART0"/>
+                <signal pad-key="pf1" function="USART" group="XCK" field="USART0"/>
+                <signal pad-key="pf2" function="USART" group="RXD" field="USART0"/>
+                <signal pad-key="pf3" function="USART" group="TXD" field="USART0"/>
+                <signal pad-key="pf5" function="USART_ALT" group="XCK" field="USART0"/>
+                <signal pad-key="pf6" function="USART_ALT" group="RXD" field="USART0"/>
+                <signal pad-key="pf7" function="USART_ALT" group="TXD" field="USART0"/>
             </signals>
         </peripheral>
         <peripheral key="spic" name="SPIC" module-key="i6090_spi">
             <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"/>
-                <signal pad-id="pc6" function="SPI" group="MISO" field="SPI"/>
-                <signal pad-id="pc7" function="SPI" group="SCK" field="SPI"/>
-                <signal pad-id="pc4" function="SPI_ALT" group="SS" field="SPI"/>
-                <signal pad-id="pc5" function="SPI_ALT" group="SCK" field="SPI"/>
-                <signal pad-id="pc6" function="SPI_ALT" group="MISO" field="SPI"/>
-                <signal pad-id="pc7" function="SPI_ALT" group="MOSI" field="SPI"/>
+                <signal pad-key="pc4" function="SPI" group="SS" field="SPI"/>
+                <signal pad-key="pc5" function="SPI" group="MOSI" field="SPI"/>
+                <signal pad-key="pc6" function="SPI" group="MISO" field="SPI"/>
+                <signal pad-key="pc7" function="SPI" group="SCK" field="SPI"/>
+                <signal pad-key="pc4" function="SPI_ALT" group="SS" field="SPI"/>
+                <signal pad-key="pc5" function="SPI_ALT" group="SCK" field="SPI"/>
+                <signal pad-key="pc6" function="SPI_ALT" group="MISO" field="SPI"/>
+                <signal pad-key="pc7" function="SPI_ALT" group="MOSI" field="SPI"/>
             </signals>
         </peripheral>
         <peripheral key="spid" name="SPID" module-key="i6090_spi">
             <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"/>
-                <signal pad-id="pd6" function="SPI" group="MISO" field="SPI"/>
-                <signal pad-id="pd7" function="SPI" group="SCK" field="SPI"/>
-                <signal pad-id="pd4" function="SPI_ALT" group="SS" field="SPI"/>
-                <signal pad-id="pd5" function="SPI_ALT" group="SCK" field="SPI"/>
-                <signal pad-id="pd6" function="SPI_ALT" group="MISO" field="SPI"/>
-                <signal pad-id="pd7" function="SPI_ALT" group="MOSI" field="SPI"/>
+                <signal pad-key="pd4" function="SPI" group="SS" field="SPI"/>
+                <signal pad-key="pd5" function="SPI" group="MOSI" field="SPI"/>
+                <signal pad-key="pd6" function="SPI" group="MISO" field="SPI"/>
+                <signal pad-key="pd7" function="SPI" group="SCK" field="SPI"/>
+                <signal pad-key="pd4" function="SPI_ALT" group="SS" field="SPI"/>
+                <signal pad-key="pd5" function="SPI_ALT" group="SCK" field="SPI"/>
+                <signal pad-key="pd6" function="SPI_ALT" group="MISO" field="SPI"/>
+                <signal pad-key="pd7" function="SPI_ALT" group="MOSI" field="SPI"/>
             </signals>
         </peripheral>
         <peripheral key="spie" name="SPIE" module-key="i6090_spi">
             <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"/>
-                <signal pad-id="pe6" function="SPI" group="MISO" field="SPI"/>
-                <signal pad-id="pe7" function="SPI" group="SCK" field="SPI"/>
-                <signal pad-id="pe4" function="SPI_ALT" group="SS" field="SPI"/>
-                <signal pad-id="pe5" function="SPI_ALT" group="SCK" field="SPI"/>
-                <signal pad-id="pe6" function="SPI_ALT" group="MISO" field="SPI"/>
-                <signal pad-id="pe7" function="SPI_ALT" group="MOSI" field="SPI"/>
+                <signal pad-key="pe4" function="SPI" group="SS" field="SPI"/>
+                <signal pad-key="pe5" function="SPI" group="MOSI" field="SPI"/>
+                <signal pad-key="pe6" function="SPI" group="MISO" field="SPI"/>
+                <signal pad-key="pe7" function="SPI" group="SCK" field="SPI"/>
+                <signal pad-key="pe4" function="SPI_ALT" group="SS" field="SPI"/>
+                <signal pad-key="pe5" function="SPI_ALT" group="SCK" field="SPI"/>
+                <signal pad-key="pe6" function="SPI_ALT" group="MISO" field="SPI"/>
+                <signal pad-key="pe7" function="SPI_ALT" group="MOSI" field="SPI"/>
             </signals>
         </peripheral>
         <peripheral key="ircom" name="IRCOM" module-key="i6090_ircom">
@@ -1978,78 +1978,135 @@
             </register-group>
         </module>
     </modules>
+    <pads>
+        <pad key="pa3" name="PA3"/>
+        <pad key="pa4" name="PA4"/>
+        <pad key="pa5" name="PA5"/>
+        <pad key="pa6" name="PA6"/>
+        <pad key="pa7" name="PA7"/>
+        <pad key="pb0" name="PB0"/>
+        <pad key="pb1" name="PB1"/>
+        <pad key="pb2" name="PB2"/>
+        <pad key="pb3" name="PB3"/>
+        <pad key="pb4" name="PB4"/>
+        <pad key="pb5" name="PB5"/>
+        <pad key="pb6" name="PB6"/>
+        <pad key="pb7" name="PB7"/>
+        <pad key="gnd" name="GND"/>
+        <pad key="vcc" name="VCC"/>
+        <pad key="pc0" name="PC0"/>
+        <pad key="pc1" name="PC1"/>
+        <pad key="pc2" name="PC2"/>
+        <pad key="pc3" name="PC3"/>
+        <pad key="pc4" name="PC4"/>
+        <pad key="pc5" name="PC5"/>
+        <pad key="pc6" name="PC6"/>
+        <pad key="pc7" name="PC7"/>
+        <pad key="pd0" name="PD0"/>
+        <pad key="pd1" name="PD1"/>
+        <pad key="pd2" name="PD2"/>
+        <pad key="pd3" name="PD3"/>
+        <pad key="pd4" name="PD4"/>
+        <pad key="pd5" name="PD5"/>
+        <pad key="pd6" name="PD6"/>
+        <pad key="pd7" name="PD7"/>
+        <pad key="pe0" name="PE0"/>
+        <pad key="pe1" name="PE1"/>
+        <pad key="pe2" name="PE2"/>
+        <pad key="pe3" name="PE3"/>
+        <pad key="pe4" name="PE4"/>
+        <pad key="pe5" name="PE5"/>
+        <pad key="pe6" name="PE6"/>
+        <pad key="pe7" name="PE7"/>
+        <pad key="pf0" name="PF0"/>
+        <pad key="pf1" name="PF1"/>
+        <pad key="pf2" name="PF2"/>
+        <pad key="pf3" name="PF3"/>
+        <pad key="pf4" name="PF4"/>
+        <pad key="pf5" name="PF5"/>
+        <pad key="pf6" name="PF6"/>
+        <pad key="pf7" name="PF7"/>
+        <pad key="pdi" name="PDI"/>
+        <pad key="reset" name="RESET"/>
+        <pad key="pr0" name="PR0"/>
+        <pad key="pr1" name="PR1"/>
+        <pad key="avcc" name="AVCC"/>
+        <pad key="pa0" name="PA0"/>
+        <pad key="pa1" name="PA1"/>
+        <pad key="pa2" name="PA2"/>
+    </pads>
     <pinouts>
         <pinout key="qfp_qfn_64" name="QFP_QFN_64" type="qfn">
-            <pin position="1" pad="PA3"/>
-            <pin position="2" pad="PA4"/>
-            <pin position="3" pad="PA5"/>
-            <pin position="4" pad="PA6"/>
-            <pin position="5" pad="PA7"/>
-            <pin position="6" pad="PB0"/>
-            <pin position="7" pad="PB1"/>
-            <pin position="8" pad="PB2"/>
-            <pin position="9" pad="PB3"/>
-            <pin position="10" pad="PB4"/>
-            <pin position="11" pad="PB5"/>
-            <pin position="12" pad="PB6"/>
-            <pin position="13" pad="PB7"/>
-            <pin position="14" pad="GND"/>
-            <pin position="15" pad="VCC"/>
-            <pin position="16" pad="PC0"/>
-            <pin position="17" pad="PC1"/>
-            <pin position="18" pad="PC2"/>
-            <pin position="19" pad="PC3"/>
-            <pin position="20" pad="PC4"/>
-            <pin position="21" pad="PC5"/>
-            <pin position="22" pad="PC6"/>
-            <pin position="23" pad="PC7"/>
-            <pin position="24" pad="GND"/>
-            <pin position="25" pad="VCC"/>
-            <pin position="26" pad="PD0"/>
-            <pin position="27" pad="PD1"/>
-            <pin position="28" pad="PD2"/>
-            <pin position="29" pad="PD3"/>
-            <pin position="30" pad="PD4"/>
-            <pin position="31" pad="PD5"/>
-            <pin position="32" pad="PD6"/>
-            <pin position="33" pad="PD7"/>
-            <pin position="34" pad="GND"/>
-            <pin position="35" pad="VCC"/>
-            <pin position="36" pad="PE0"/>
-            <pin position="37" pad="PE1"/>
-            <pin position="38" pad="PE2"/>
-            <pin position="39" pad="PE3"/>
-            <pin position="40" pad="PE4"/>
-            <pin position="41" pad="PE5"/>
-            <pin position="42" pad="PE6"/>
-            <pin position="43" pad="PE7"/>
-            <pin position="44" pad="GND"/>
-            <pin position="45" pad="VCC"/>
-            <pin position="46" pad="PF0"/>
-            <pin position="47" pad="PF1"/>
-            <pin position="48" pad="PF2"/>
-            <pin position="49" pad="PF3"/>
-            <pin position="50" pad="PF4"/>
-            <pin position="51" pad="PF5"/>
-            <pin position="52" pad="GND"/>
-            <pin position="53" pad="VCC"/>
-            <pin position="54" pad="PF6"/>
-            <pin position="55" pad="PF7"/>
-            <pin position="56" pad="PDI"/>
-            <pin position="57" pad="RESET"/>
-            <pin position="58" pad="PR0"/>
-            <pin position="59" pad="PR1"/>
-            <pin position="60" pad="GND"/>
-            <pin position="61" pad="AVCC"/>
-            <pin position="62" pad="PA0"/>
-            <pin position="63" pad="PA1"/>
-            <pin position="64" pad="PA2"/>
+            <pin position="1" pad-key="pa3"/>
+            <pin position="2" pad-key="pa4"/>
+            <pin position="3" pad-key="pa5"/>
+            <pin position="4" pad-key="pa6"/>
+            <pin position="5" pad-key="pa7"/>
+            <pin position="6" pad-key="pb0"/>
+            <pin position="7" pad-key="pb1"/>
+            <pin position="8" pad-key="pb2"/>
+            <pin position="9" pad-key="pb3"/>
+            <pin position="10" pad-key="pb4"/>
+            <pin position="11" pad-key="pb5"/>
+            <pin position="12" pad-key="pb6"/>
+            <pin position="13" pad-key="pb7"/>
+            <pin position="14" pad-key="gnd"/>
+            <pin position="15" pad-key="vcc"/>
+            <pin position="16" pad-key="pc0"/>
+            <pin position="17" pad-key="pc1"/>
+            <pin position="18" pad-key="pc2"/>
+            <pin position="19" pad-key="pc3"/>
+            <pin position="20" pad-key="pc4"/>
+            <pin position="21" pad-key="pc5"/>
+            <pin position="22" pad-key="pc6"/>
+            <pin position="23" pad-key="pc7"/>
+            <pin position="24" pad-key="gnd"/>
+            <pin position="25" pad-key="vcc"/>
+            <pin position="26" pad-key="pd0"/>
+            <pin position="27" pad-key="pd1"/>
+            <pin position="28" pad-key="pd2"/>
+            <pin position="29" pad-key="pd3"/>
+            <pin position="30" pad-key="pd4"/>
+            <pin position="31" pad-key="pd5"/>
+            <pin position="32" pad-key="pd6"/>
+            <pin position="33" pad-key="pd7"/>
+            <pin position="34" pad-key="gnd"/>
+            <pin position="35" pad-key="vcc"/>
+            <pin position="36" pad-key="pe0"/>
+            <pin position="37" pad-key="pe1"/>
+            <pin position="38" pad-key="pe2"/>
+            <pin position="39" pad-key="pe3"/>
+            <pin position="40" pad-key="pe4"/>
+            <pin position="41" pad-key="pe5"/>
+            <pin position="42" pad-key="pe6"/>
+            <pin position="43" pad-key="pe7"/>
+            <pin position="44" pad-key="gnd"/>
+            <pin position="45" pad-key="vcc"/>
+            <pin position="46" pad-key="pf0"/>
+            <pin position="47" pad-key="pf1"/>
+            <pin position="48" pad-key="pf2"/>
+            <pin position="49" pad-key="pf3"/>
+            <pin position="50" pad-key="pf4"/>
+            <pin position="51" pad-key="pf5"/>
+            <pin position="52" pad-key="gnd"/>
+            <pin position="53" pad-key="vcc"/>
+            <pin position="54" pad-key="pf6"/>
+            <pin position="55" pad-key="pf7"/>
+            <pin position="56" pad-key="pdi"/>
+            <pin position="57" pad-key="reset"/>
+            <pin position="58" pad-key="pr0"/>
+            <pin position="59" pad-key="pr1"/>
+            <pin position="60" pad-key="gnd"/>
+            <pin position="61" pad-key="avcc"/>
+            <pin position="62" pad-key="pa0"/>
+            <pin position="63" pad-key="pa1"/>
+            <pin position="64" pad-key="pa2"/>
         </pinout>
     </pinouts>
     <variants>
-        <variant name="ATxmega192A3U-AU" pinout-key="qfp_qfn_64" package="TQFP64"/>
-        <variant name="ATxmega192A3U-MH" pinout-key="qfp_qfn_64" package="QFN64"/>
-        <variant name="ATxmega192A3U-AN" pinout-key="qfp_qfn_64" package="TQFP64"/>
-        <variant name="ATxmega192A3U-MN" pinout-key="qfp_qfn_64" package="QFN64"/>
+        <variant key="atxmega192a3u_au" name="ATxmega192A3U-AU" pinout-key="qfp_qfn_64"/>
+        <variant key="atxmega192a3u_mh" name="ATxmega192A3U-MH" pinout-key="qfp_qfn_64"/>
+        <variant key="atxmega192a3u_an" name="ATxmega192A3U-AN" pinout-key="qfp_qfn_64"/>
+        <variant key="atxmega192a3u_mn" name="ATxmega192A3U-MN" pinout-key="qfp_qfn_64"/>
     </variants>
 </device>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA192C3.xml b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA192C3.xml
index 6caf674b..3193e109 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA192C3.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA192C3.xml
@@ -143,86 +143,86 @@
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pa2" index="2" function="PORTA" group="P"/>
-                <signal pad-id="pa3" index="3" function="PORTA" group="P"/>
-                <signal pad-id="pa4" index="4" function="PORTA" group="P"/>
-                <signal pad-id="pa5" index="5" function="PORTA" group="P"/>
-                <signal pad-id="pa6" index="6" function="PORTA" group="P"/>
-                <signal pad-id="pa7" index="7" function="PORTA" group="P"/>
+                <signal pad-key="pa0" index="0" function="PORTA" group="P"/>
+                <signal pad-key="pa1" index="1" function="PORTA" group="P"/>
+                <signal pad-key="pa2" index="2" function="PORTA" group="P"/>
+                <signal pad-key="pa3" index="3" function="PORTA" group="P"/>
+                <signal pad-key="pa4" index="4" function="PORTA" group="P"/>
+                <signal pad-key="pa5" index="5" function="PORTA" group="P"/>
+                <signal pad-key="pa6" index="6" function="PORTA" group="P"/>
+                <signal pad-key="pa7" index="7" function="PORTA" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pb2" index="2" function="PORTB" group="P"/>
-                <signal pad-id="pb3" index="3" function="PORTB" group="P"/>
-                <signal pad-id="pb4" index="4" function="PORTB" group="P"/>
-                <signal pad-id="pb5" index="5" function="PORTB" group="P"/>
-                <signal pad-id="pb6" index="6" function="PORTB" group="P"/>
-                <signal pad-id="pb7" index="7" function="PORTB" group="P"/>
+                <signal pad-key="pb0" index="0" function="PORTB" group="P"/>
+                <signal pad-key="pb1" index="1" function="PORTB" group="P"/>
+                <signal pad-key="pb2" index="2" function="PORTB" group="P"/>
+                <signal pad-key="pb3" index="3" function="PORTB" group="P"/>
+                <signal pad-key="pb4" index="4" function="PORTB" group="P"/>
+                <signal pad-key="pb5" index="5" function="PORTB" group="P"/>
+                <signal pad-key="pb6" index="6" function="PORTB" group="P"/>
+                <signal pad-key="pb7" index="7" function="PORTB" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pc2" index="2" function="PORTC" group="P"/>
-                <signal pad-id="pc3" index="3" function="PORTC" group="P"/>
-                <signal pad-id="pc4" index="4" function="PORTC" group="P"/>
-                <signal pad-id="pc5" index="5" function="PORTC" group="P"/>
-                <signal pad-id="pc6" index="6" function="PORTC" group="P"/>
-                <signal pad-id="pc7" index="7" function="PORTC" group="P"/>
+                <signal pad-key="pc0" index="0" function="PORTC" group="P"/>
+                <signal pad-key="pc1" index="1" function="PORTC" group="P"/>
+                <signal pad-key="pc2" index="2" function="PORTC" group="P"/>
+                <signal pad-key="pc3" index="3" function="PORTC" group="P"/>
+                <signal pad-key="pc4" index="4" function="PORTC" group="P"/>
+                <signal pad-key="pc5" index="5" function="PORTC" group="P"/>
+                <signal pad-key="pc6" index="6" function="PORTC" group="P"/>
+                <signal pad-key="pc7" index="7" function="PORTC" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pd2" index="2" function="PORTD" group="P"/>
-                <signal pad-id="pd3" index="3" function="PORTD" group="P"/>
-                <signal pad-id="pd4" index="4" function="PORTD" group="P"/>
-                <signal pad-id="pd5" index="5" function="PORTD" group="P"/>
-                <signal pad-id="pd6" index="6" function="PORTD" group="P"/>
-                <signal pad-id="pd7" index="7" function="PORTD" group="P"/>
+                <signal pad-key="pd0" index="0" function="PORTD" group="P"/>
+                <signal pad-key="pd1" index="1" function="PORTD" group="P"/>
+                <signal pad-key="pd2" index="2" function="PORTD" group="P"/>
+                <signal pad-key="pd3" index="3" function="PORTD" group="P"/>
+                <signal pad-key="pd4" index="4" function="PORTD" group="P"/>
+                <signal pad-key="pd5" index="5" function="PORTD" group="P"/>
+                <signal pad-key="pd6" index="6" function="PORTD" group="P"/>
+                <signal pad-key="pd7" index="7" function="PORTD" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="porte" name="PORTE" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pe2" index="2" function="PORTE" group="P"/>
-                <signal pad-id="pe3" index="3" function="PORTE" group="P"/>
-                <signal pad-id="pe4" index="4" function="PORTE" group="P"/>
-                <signal pad-id="pe5" index="5" function="PORTE" group="P"/>
-                <signal pad-id="pe6" index="6" function="PORTE" group="P"/>
-                <signal pad-id="pe7" index="7" function="PORTE" group="P"/>
+                <signal pad-key="pe0" index="0" function="PORTE" group="P"/>
+                <signal pad-key="pe1" index="1" function="PORTE" group="P"/>
+                <signal pad-key="pe2" index="2" function="PORTE" group="P"/>
+                <signal pad-key="pe3" index="3" function="PORTE" group="P"/>
+                <signal pad-key="pe4" index="4" function="PORTE" group="P"/>
+                <signal pad-key="pe5" index="5" function="PORTE" group="P"/>
+                <signal pad-key="pe6" index="6" function="PORTE" group="P"/>
+                <signal pad-key="pe7" index="7" function="PORTE" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portf" name="PORTF" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pf2" index="2" function="PORTF" group="P"/>
-                <signal pad-id="pf3" index="3" function="PORTF" group="P"/>
-                <signal pad-id="pf4" index="4" function="PORTF" group="P"/>
-                <signal pad-id="pf5" index="5" function="PORTF" group="P"/>
-                <signal pad-id="pf6" index="6" function="PORTF" group="P"/>
-                <signal pad-id="pf7" index="7" function="PORTF" group="P"/>
+                <signal pad-key="pf0" index="0" function="PORTF" group="P"/>
+                <signal pad-key="pf1" index="1" function="PORTF" group="P"/>
+                <signal pad-key="pf2" index="2" function="PORTF" group="P"/>
+                <signal pad-key="pf3" index="3" function="PORTF" group="P"/>
+                <signal pad-key="pf4" index="4" function="PORTF" group="P"/>
+                <signal pad-key="pf5" index="5" function="PORTF" group="P"/>
+                <signal pad-key="pf6" index="6" function="PORTF" group="P"/>
+                <signal pad-key="pf7" index="7" function="PORTF" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portr" name="PORTR" module-key="gpio_port">
             <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"/>
+                <signal pad-key="pr0" index="0" function="PORTR" group="P"/>
+                <signal pad-key="pr1" index="1" function="PORTR" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="tcc0" name="TCC0" module-key="i6090_tc">
@@ -1406,76 +1406,133 @@
             </register-group>
         </module>
     </modules>
+    <pads>
+        <pad key="pa3" name="PA3"/>
+        <pad key="pa4" name="PA4"/>
+        <pad key="pa5" name="PA5"/>
+        <pad key="pa6" name="PA6"/>
+        <pad key="pa7" name="PA7"/>
+        <pad key="pb0" name="PB0"/>
+        <pad key="pb1" name="PB1"/>
+        <pad key="pb2" name="PB2"/>
+        <pad key="pb3" name="PB3"/>
+        <pad key="pb4" name="PB4"/>
+        <pad key="pb5" name="PB5"/>
+        <pad key="pb6" name="PB6"/>
+        <pad key="pb7" name="PB7"/>
+        <pad key="gnd" name="GND"/>
+        <pad key="vcc" name="VCC"/>
+        <pad key="pc0" name="PC0"/>
+        <pad key="pc1" name="PC1"/>
+        <pad key="pc2" name="PC2"/>
+        <pad key="pc3" name="PC3"/>
+        <pad key="pc4" name="PC4"/>
+        <pad key="pc5" name="PC5"/>
+        <pad key="pc6" name="PC6"/>
+        <pad key="pc7" name="PC7"/>
+        <pad key="pd0" name="PD0"/>
+        <pad key="pd1" name="PD1"/>
+        <pad key="pd2" name="PD2"/>
+        <pad key="pd3" name="PD3"/>
+        <pad key="pd4" name="PD4"/>
+        <pad key="pd5" name="PD5"/>
+        <pad key="pd6" name="PD6"/>
+        <pad key="pd7" name="PD7"/>
+        <pad key="pe0" name="PE0"/>
+        <pad key="pe1" name="PE1"/>
+        <pad key="pe2" name="PE2"/>
+        <pad key="pe3" name="PE3"/>
+        <pad key="pe4" name="PE4"/>
+        <pad key="pe5" name="PE5"/>
+        <pad key="pe6" name="PE6"/>
+        <pad key="pe7" name="PE7"/>
+        <pad key="pf0" name="PF0"/>
+        <pad key="pf1" name="PF1"/>
+        <pad key="pf2" name="PF2"/>
+        <pad key="pf3" name="PF3"/>
+        <pad key="pf4" name="PF4"/>
+        <pad key="pf5" name="PF5"/>
+        <pad key="pf6" name="PF6"/>
+        <pad key="pf7" name="PF7"/>
+        <pad key="pdi" name="PDI"/>
+        <pad key="reset" name="RESET"/>
+        <pad key="pr0" name="PR0"/>
+        <pad key="pr1" name="PR1"/>
+        <pad key="avcc" name="AVCC"/>
+        <pad key="pa0" name="PA0"/>
+        <pad key="pa1" name="PA1"/>
+        <pad key="pa2" name="PA2"/>
+    </pads>
     <pinouts>
         <pinout key="qfp_qfn_64" name="QFP_QFN_64" type="qfn">
-            <pin position="1" pad="PA3"/>
-            <pin position="2" pad="PA4"/>
-            <pin position="3" pad="PA5"/>
-            <pin position="4" pad="PA6"/>
-            <pin position="5" pad="PA7"/>
-            <pin position="6" pad="PB0"/>
-            <pin position="7" pad="PB1"/>
-            <pin position="8" pad="PB2"/>
-            <pin position="9" pad="PB3"/>
-            <pin position="10" pad="PB4"/>
-            <pin position="11" pad="PB5"/>
-            <pin position="12" pad="PB6"/>
-            <pin position="13" pad="PB7"/>
-            <pin position="14" pad="GND"/>
-            <pin position="15" pad="VCC"/>
-            <pin position="16" pad="PC0"/>
-            <pin position="17" pad="PC1"/>
-            <pin position="18" pad="PC2"/>
-            <pin position="19" pad="PC3"/>
-            <pin position="20" pad="PC4"/>
-            <pin position="21" pad="PC5"/>
-            <pin position="22" pad="PC6"/>
-            <pin position="23" pad="PC7"/>
-            <pin position="24" pad="GND"/>
-            <pin position="25" pad="VCC"/>
-            <pin position="26" pad="PD0"/>
-            <pin position="27" pad="PD1"/>
-            <pin position="28" pad="PD2"/>
-            <pin position="29" pad="PD3"/>
-            <pin position="30" pad="PD4"/>
-            <pin position="31" pad="PD5"/>
-            <pin position="32" pad="PD6"/>
-            <pin position="33" pad="PD7"/>
-            <pin position="34" pad="GND"/>
-            <pin position="35" pad="VCC"/>
-            <pin position="36" pad="PE0"/>
-            <pin position="37" pad="PE1"/>
-            <pin position="38" pad="PE2"/>
-            <pin position="39" pad="PE3"/>
-            <pin position="40" pad="PE4"/>
-            <pin position="41" pad="PE5"/>
-            <pin position="42" pad="PE6"/>
-            <pin position="43" pad="PE7"/>
-            <pin position="44" pad="GND"/>
-            <pin position="45" pad="VCC"/>
-            <pin position="46" pad="PF0"/>
-            <pin position="47" pad="PF1"/>
-            <pin position="48" pad="PF2"/>
-            <pin position="49" pad="PF3"/>
-            <pin position="50" pad="PF4"/>
-            <pin position="51" pad="PF5"/>
-            <pin position="52" pad="GND"/>
-            <pin position="53" pad="VCC"/>
-            <pin position="54" pad="PF6"/>
-            <pin position="55" pad="PF7"/>
-            <pin position="56" pad="PDI"/>
-            <pin position="57" pad="RESET"/>
-            <pin position="58" pad="PR0"/>
-            <pin position="59" pad="PR1"/>
-            <pin position="60" pad="GND"/>
-            <pin position="61" pad="AVCC"/>
-            <pin position="62" pad="PA0"/>
-            <pin position="63" pad="PA1"/>
-            <pin position="64" pad="PA2"/>
+            <pin position="1" pad-key="pa3"/>
+            <pin position="2" pad-key="pa4"/>
+            <pin position="3" pad-key="pa5"/>
+            <pin position="4" pad-key="pa6"/>
+            <pin position="5" pad-key="pa7"/>
+            <pin position="6" pad-key="pb0"/>
+            <pin position="7" pad-key="pb1"/>
+            <pin position="8" pad-key="pb2"/>
+            <pin position="9" pad-key="pb3"/>
+            <pin position="10" pad-key="pb4"/>
+            <pin position="11" pad-key="pb5"/>
+            <pin position="12" pad-key="pb6"/>
+            <pin position="13" pad-key="pb7"/>
+            <pin position="14" pad-key="gnd"/>
+            <pin position="15" pad-key="vcc"/>
+            <pin position="16" pad-key="pc0"/>
+            <pin position="17" pad-key="pc1"/>
+            <pin position="18" pad-key="pc2"/>
+            <pin position="19" pad-key="pc3"/>
+            <pin position="20" pad-key="pc4"/>
+            <pin position="21" pad-key="pc5"/>
+            <pin position="22" pad-key="pc6"/>
+            <pin position="23" pad-key="pc7"/>
+            <pin position="24" pad-key="gnd"/>
+            <pin position="25" pad-key="vcc"/>
+            <pin position="26" pad-key="pd0"/>
+            <pin position="27" pad-key="pd1"/>
+            <pin position="28" pad-key="pd2"/>
+            <pin position="29" pad-key="pd3"/>
+            <pin position="30" pad-key="pd4"/>
+            <pin position="31" pad-key="pd5"/>
+            <pin position="32" pad-key="pd6"/>
+            <pin position="33" pad-key="pd7"/>
+            <pin position="34" pad-key="gnd"/>
+            <pin position="35" pad-key="vcc"/>
+            <pin position="36" pad-key="pe0"/>
+            <pin position="37" pad-key="pe1"/>
+            <pin position="38" pad-key="pe2"/>
+            <pin position="39" pad-key="pe3"/>
+            <pin position="40" pad-key="pe4"/>
+            <pin position="41" pad-key="pe5"/>
+            <pin position="42" pad-key="pe6"/>
+            <pin position="43" pad-key="pe7"/>
+            <pin position="44" pad-key="gnd"/>
+            <pin position="45" pad-key="vcc"/>
+            <pin position="46" pad-key="pf0"/>
+            <pin position="47" pad-key="pf1"/>
+            <pin position="48" pad-key="pf2"/>
+            <pin position="49" pad-key="pf3"/>
+            <pin position="50" pad-key="pf4"/>
+            <pin position="51" pad-key="pf5"/>
+            <pin position="52" pad-key="gnd"/>
+            <pin position="53" pad-key="vcc"/>
+            <pin position="54" pad-key="pf6"/>
+            <pin position="55" pad-key="pf7"/>
+            <pin position="56" pad-key="pdi"/>
+            <pin position="57" pad-key="reset"/>
+            <pin position="58" pad-key="pr0"/>
+            <pin position="59" pad-key="pr1"/>
+            <pin position="60" pad-key="gnd"/>
+            <pin position="61" pad-key="avcc"/>
+            <pin position="62" pad-key="pa0"/>
+            <pin position="63" pad-key="pa1"/>
+            <pin position="64" pad-key="pa2"/>
         </pinout>
     </pinouts>
     <variants>
-        <variant name="ATXMEGA192C3-AU" pinout-key="qfp_qfn_64" package="TQFP64"/>
-        <variant name="ATXMEGA192C3-MH" pinout-key="qfp_qfn_64" package="QFN64"/>
+        <variant key="atxmega192c3_au" name="ATXMEGA192C3-AU" pinout-key="qfp_qfn_64"/>
+        <variant key="atxmega192c3_mh" name="ATXMEGA192C3-MH" pinout-key="qfp_qfn_64"/>
     </variants>
 </device>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA192D3.xml b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA192D3.xml
index 89495089..bcf62bdf 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA192D3.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA192D3.xml
@@ -81,10 +81,10 @@
         <peripheral key="osc" name="OSC" module-key="i6079">
             <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"/>
-                <signal pad-id="pe2" function="TOSC" group="TOSC2"/>
-                <signal pad-id="pe3" function="TOSC" group="TOSC1"/>
+                <signal pad-key="pr0" function="XTAL" group="XTAL2"/>
+                <signal pad-key="pr1" function="XTAL" group="XTAL1"/>
+                <signal pad-key="pe2" function="TOSC" group="TOSC2"/>
+                <signal pad-key="pe3" function="TOSC" group="TOSC1"/>
             </signals>
         </peripheral>
         <peripheral key="dfllrc32m" name="DFLLRC32M" module-key="i6055">
@@ -126,39 +126,39 @@
         <peripheral key="aca" name="ACA" module-key="i6077">
             <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"/>
-                <signal pad-id="pa2" index="2" function="AC" group="AC"/>
-                <signal pad-id="pa3" index="3" function="AC" group="AC"/>
-                <signal pad-id="pa4" index="4" function="AC" group="AC"/>
-                <signal pad-id="pa5" index="5" function="AC" group="AC"/>
-                <signal pad-id="pa6" index="6" function="AC" group="AC"/>
-                <signal pad-id="pa7" index="7" function="AC" group="AC"/>
-                <signal pad-id="pa6" index="1" function="ACOUT" group="ACOUT"/>
-                <signal pad-id="pa7" index="0" function="ACOUT" group="ACOUT"/>
+                <signal pad-key="pa0" index="0" function="AC" group="AC"/>
+                <signal pad-key="pa1" index="1" function="AC" group="AC"/>
+                <signal pad-key="pa2" index="2" function="AC" group="AC"/>
+                <signal pad-key="pa3" index="3" function="AC" group="AC"/>
+                <signal pad-key="pa4" index="4" function="AC" group="AC"/>
+                <signal pad-key="pa5" index="5" function="AC" group="AC"/>
+                <signal pad-key="pa6" index="6" function="AC" group="AC"/>
+                <signal pad-key="pa7" index="7" function="AC" group="AC"/>
+                <signal pad-key="pa6" index="1" function="ACOUT" group="ACOUT"/>
+                <signal pad-key="pa7" index="0" function="ACOUT" group="ACOUT"/>
             </signals>
         </peripheral>
         <peripheral key="adca" name="ADCA" module-key="i6110">
             <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"/>
-                <signal pad-id="pa2" index="2" function="ADC" group="ADC"/>
-                <signal pad-id="pa3" index="3" function="ADC" group="ADC"/>
-                <signal pad-id="pa4" index="4" function="ADC" group="ADC"/>
-                <signal pad-id="pa5" index="5" function="ADC" group="ADC"/>
-                <signal pad-id="pa6" index="6" function="ADC" group="ADC"/>
-                <signal pad-id="pa7" index="7" function="ADC" group="ADC"/>
-                <signal pad-id="pb0" index="8" function="ADC" group="ADC"/>
-                <signal pad-id="pb1" index="9" function="ADC" group="ADC"/>
-                <signal pad-id="pb2" index="10" function="ADC" group="ADC"/>
-                <signal pad-id="pb3" index="11" function="ADC" group="ADC"/>
-                <signal pad-id="pb4" index="12" function="ADC" group="ADC"/>
-                <signal pad-id="pb5" index="13" function="ADC" group="ADC"/>
-                <signal pad-id="pb6" index="14" function="ADC" group="ADC"/>
-                <signal pad-id="pb7" index="15" function="ADC" group="ADC"/>
-                <signal pad-id="pa0" index="0" function="AREF" group="REFA"/>
-                <signal pad-id="pb0" index="0" function="AREF" group="REFB"/>
+                <signal pad-key="pa0" index="0" function="ADC" group="ADC"/>
+                <signal pad-key="pa1" index="1" function="ADC" group="ADC"/>
+                <signal pad-key="pa2" index="2" function="ADC" group="ADC"/>
+                <signal pad-key="pa3" index="3" function="ADC" group="ADC"/>
+                <signal pad-key="pa4" index="4" function="ADC" group="ADC"/>
+                <signal pad-key="pa5" index="5" function="ADC" group="ADC"/>
+                <signal pad-key="pa6" index="6" function="ADC" group="ADC"/>
+                <signal pad-key="pa7" index="7" function="ADC" group="ADC"/>
+                <signal pad-key="pb0" index="8" function="ADC" group="ADC"/>
+                <signal pad-key="pb1" index="9" function="ADC" group="ADC"/>
+                <signal pad-key="pb2" index="10" function="ADC" group="ADC"/>
+                <signal pad-key="pb3" index="11" function="ADC" group="ADC"/>
+                <signal pad-key="pb4" index="12" function="ADC" group="ADC"/>
+                <signal pad-key="pb5" index="13" function="ADC" group="ADC"/>
+                <signal pad-key="pb6" index="14" function="ADC" group="ADC"/>
+                <signal pad-key="pb7" index="15" function="ADC" group="ADC"/>
+                <signal pad-key="pa0" index="0" function="AREF" group="REFA"/>
+                <signal pad-key="pb0" index="0" function="AREF" group="REFB"/>
             </signals>
         </peripheral>
         <peripheral key="rtc" name="RTC" module-key="i6093">
@@ -167,25 +167,25 @@
         <peripheral key="twic" name="TWIC" module-key="i6089">
             <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"/>
+                <signal pad-key="pc0" function="TWI" group="SDA"/>
+                <signal pad-key="pc1" function="TWI" group="SCL"/>
             </signals>
         </peripheral>
         <peripheral key="twie" name="TWIE" module-key="i6089">
             <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"/>
+                <signal pad-key="pe0" function="TWI" group="SDA"/>
+                <signal pad-key="pe1" function="TWI" group="SCL"/>
             </signals>
         </peripheral>
         <peripheral key="port_cfg" name="PORT_CFG" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pc7" function="EVOUT" group="EVOUT" field="EVOUT"/>
-                <signal pad-id="pc4" function="EVOUT_ALT" group="EVOUT" field="CLKEVPIN"/>
-                <signal pad-id="pc6" function="RTCOUTC" group="RTCOUT"/>
+                <signal pad-key="pc7" function="CLKOUT" group="CLKOUT" field="CLKOUT"/>
+                <signal pad-key="pc4" function="CLKOUT_ALT" group="CLKOUT" field="CLKEVPIN"/>
+                <signal pad-key="pc7" function="EVOUT" group="EVOUT" field="EVOUT"/>
+                <signal pad-key="pc4" function="EVOUT_ALT" group="EVOUT" field="CLKEVPIN"/>
+                <signal pad-key="pc6" function="RTCOUTC" group="RTCOUT"/>
             </signals>
         </peripheral>
         <peripheral key="vport0" name="VPORT0" module-key="gpio_port">
@@ -203,119 +203,119 @@
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pa2" index="2" function="PORTA" group="P"/>
-                <signal pad-id="pa3" index="3" function="PORTA" group="P"/>
-                <signal pad-id="pa4" index="4" function="PORTA" group="P"/>
-                <signal pad-id="pa5" index="5" function="PORTA" group="P"/>
-                <signal pad-id="pa6" index="6" function="PORTA" group="P"/>
-                <signal pad-id="pa7" index="7" function="PORTA" group="P"/>
+                <signal pad-key="pa0" index="0" function="PORTA" group="P"/>
+                <signal pad-key="pa1" index="1" function="PORTA" group="P"/>
+                <signal pad-key="pa2" index="2" function="PORTA" group="P"/>
+                <signal pad-key="pa3" index="3" function="PORTA" group="P"/>
+                <signal pad-key="pa4" index="4" function="PORTA" group="P"/>
+                <signal pad-key="pa5" index="5" function="PORTA" group="P"/>
+                <signal pad-key="pa6" index="6" function="PORTA" group="P"/>
+                <signal pad-key="pa7" index="7" function="PORTA" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pb2" index="2" function="PORTB" group="P"/>
-                <signal pad-id="pb3" index="3" function="PORTB" group="P"/>
-                <signal pad-id="pb4" index="4" function="PORTB" group="P"/>
-                <signal pad-id="pb5" index="5" function="PORTB" group="P"/>
-                <signal pad-id="pb6" index="6" function="PORTB" group="P"/>
-                <signal pad-id="pb7" index="7" function="PORTB" group="P"/>
+                <signal pad-key="pb0" index="0" function="PORTB" group="P"/>
+                <signal pad-key="pb1" index="1" function="PORTB" group="P"/>
+                <signal pad-key="pb2" index="2" function="PORTB" group="P"/>
+                <signal pad-key="pb3" index="3" function="PORTB" group="P"/>
+                <signal pad-key="pb4" index="4" function="PORTB" group="P"/>
+                <signal pad-key="pb5" index="5" function="PORTB" group="P"/>
+                <signal pad-key="pb6" index="6" function="PORTB" group="P"/>
+                <signal pad-key="pb7" index="7" function="PORTB" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pc2" index="2" function="PORTC" group="P"/>
-                <signal pad-id="pc3" index="3" function="PORTC" group="P"/>
-                <signal pad-id="pc4" index="4" function="PORTC" group="P"/>
-                <signal pad-id="pc5" index="5" function="PORTC" group="P"/>
-                <signal pad-id="pc6" index="6" function="PORTC" group="P"/>
-                <signal pad-id="pc7" index="7" function="PORTC" group="P"/>
+                <signal pad-key="pc0" index="0" function="PORTC" group="P"/>
+                <signal pad-key="pc1" index="1" function="PORTC" group="P"/>
+                <signal pad-key="pc2" index="2" function="PORTC" group="P"/>
+                <signal pad-key="pc3" index="3" function="PORTC" group="P"/>
+                <signal pad-key="pc4" index="4" function="PORTC" group="P"/>
+                <signal pad-key="pc5" index="5" function="PORTC" group="P"/>
+                <signal pad-key="pc6" index="6" function="PORTC" group="P"/>
+                <signal pad-key="pc7" index="7" function="PORTC" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pd2" index="2" function="PORTD" group="P"/>
-                <signal pad-id="pd3" index="3" function="PORTD" group="P"/>
-                <signal pad-id="pd4" index="4" function="PORTD" group="P"/>
-                <signal pad-id="pd5" index="5" function="PORTD" group="P"/>
-                <signal pad-id="pd6" index="6" function="PORTD" group="P"/>
-                <signal pad-id="pd7" index="7" function="PORTD" group="P"/>
+                <signal pad-key="pd0" index="0" function="PORTD" group="P"/>
+                <signal pad-key="pd1" index="1" function="PORTD" group="P"/>
+                <signal pad-key="pd2" index="2" function="PORTD" group="P"/>
+                <signal pad-key="pd3" index="3" function="PORTD" group="P"/>
+                <signal pad-key="pd4" index="4" function="PORTD" group="P"/>
+                <signal pad-key="pd5" index="5" function="PORTD" group="P"/>
+                <signal pad-key="pd6" index="6" function="PORTD" group="P"/>
+                <signal pad-key="pd7" index="7" function="PORTD" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="porte" name="PORTE" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pe2" index="2" function="PORTE" group="P"/>
-                <signal pad-id="pe3" index="3" function="PORTE" group="P"/>
-                <signal pad-id="pe4" index="4" function="PORTE" group="P"/>
-                <signal pad-id="pe5" index="5" function="PORTE" group="P"/>
-                <signal pad-id="pe6" index="6" function="PORTE" group="P"/>
-                <signal pad-id="pe7" index="7" function="PORTE" group="P"/>
+                <signal pad-key="pe0" index="0" function="PORTE" group="P"/>
+                <signal pad-key="pe1" index="1" function="PORTE" group="P"/>
+                <signal pad-key="pe2" index="2" function="PORTE" group="P"/>
+                <signal pad-key="pe3" index="3" function="PORTE" group="P"/>
+                <signal pad-key="pe4" index="4" function="PORTE" group="P"/>
+                <signal pad-key="pe5" index="5" function="PORTE" group="P"/>
+                <signal pad-key="pe6" index="6" function="PORTE" group="P"/>
+                <signal pad-key="pe7" index="7" function="PORTE" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portf" name="PORTF" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pf2" index="2" function="PORTF" group="P"/>
-                <signal pad-id="pf3" index="3" function="PORTF" group="P"/>
-                <signal pad-id="pf4" index="4" function="PORTF" group="P"/>
-                <signal pad-id="pf5" index="5" function="PORTF" group="P"/>
-                <signal pad-id="pf6" index="6" function="PORTF" group="P"/>
-                <signal pad-id="pf7" index="7" function="PORTF" group="P"/>
+                <signal pad-key="pf0" index="0" function="PORTF" group="P"/>
+                <signal pad-key="pf1" index="1" function="PORTF" group="P"/>
+                <signal pad-key="pf2" index="2" function="PORTF" group="P"/>
+                <signal pad-key="pf3" index="3" function="PORTF" group="P"/>
+                <signal pad-key="pf4" index="4" function="PORTF" group="P"/>
+                <signal pad-key="pf5" index="5" function="PORTF" group="P"/>
+                <signal pad-key="pf6" index="6" function="PORTF" group="P"/>
+                <signal pad-key="pf7" index="7" function="PORTF" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portr" name="PORTR" module-key="gpio_port">
             <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"/>
+                <signal pad-key="pr0" index="0" function="PORTR" group="P"/>
+                <signal pad-key="pr1" index="1" function="PORTR" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="tcc0" name="TCC0" module-key="i6090_tc">
             <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"/>
-                <signal pad-id="pc2" function="TC0" group="OC0C" field="TC0C"/>
-                <signal pad-id="pc3" function="TC0" group="OC0D" field="TC0D"/>
-                <signal pad-id="pc4" function="TC0_ALT" group="OC0A" field="TC0A"/>
-                <signal pad-id="pc5" function="TC0_ALT" group="OC0B" field="TC0B"/>
-                <signal pad-id="pc6" function="TC0_ALT" group="OC0C" field="TC0C"/>
-                <signal pad-id="pc7" function="TC0_ALT" group="OC0D" field="TC0D"/>
+                <signal pad-key="pc0" function="TC0" group="OC0A" field="TC0A"/>
+                <signal pad-key="pc1" function="TC0" group="OC0B" field="TC0B"/>
+                <signal pad-key="pc2" function="TC0" group="OC0C" field="TC0C"/>
+                <signal pad-key="pc3" function="TC0" group="OC0D" field="TC0D"/>
+                <signal pad-key="pc4" function="TC0_ALT" group="OC0A" field="TC0A"/>
+                <signal pad-key="pc5" function="TC0_ALT" group="OC0B" field="TC0B"/>
+                <signal pad-key="pc6" function="TC0_ALT" group="OC0C" field="TC0C"/>
+                <signal pad-key="pc7" function="TC0_ALT" group="OC0D" field="TC0D"/>
             </signals>
         </peripheral>
         <peripheral key="tcc1" name="TCC1" module-key="i6090_tc">
             <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"/>
+                <signal pad-key="pc4" function="TC1" group="OC1A"/>
+                <signal pad-key="pc5" function="TC1" group="OC1B"/>
             </signals>
         </peripheral>
         <peripheral key="awexc" name="AWEXC" module-key="i6090_tc">
             <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"/>
-                <signal pad-id="pc2" function="AWEX" group="OC0BLS"/>
-                <signal pad-id="pc3" function="AWEX" group="OC0BHS"/>
-                <signal pad-id="pc4" function="AWEX" group="OC0CLS"/>
-                <signal pad-id="pc5" function="AWEX" group="OC0CHS"/>
-                <signal pad-id="pc6" function="AWEX" group="OC0DLS"/>
-                <signal pad-id="pc7" function="AWEX" group="OC0DHS"/>
+                <signal pad-key="pc0" function="AWEX" group="OC0ALS"/>
+                <signal pad-key="pc1" function="AWEX" group="OC0AHS"/>
+                <signal pad-key="pc2" function="AWEX" group="OC0BLS"/>
+                <signal pad-key="pc3" function="AWEX" group="OC0BHS"/>
+                <signal pad-key="pc4" function="AWEX" group="OC0CLS"/>
+                <signal pad-key="pc5" function="AWEX" group="OC0CHS"/>
+                <signal pad-key="pc6" function="AWEX" group="OC0DLS"/>
+                <signal pad-key="pc7" function="AWEX" group="OC0DHS"/>
             </signals>
         </peripheral>
         <peripheral key="hiresc" name="HIRESC" module-key="i6090_tc">
@@ -324,19 +324,19 @@
         <peripheral key="tcd0" name="TCD0" module-key="i6090_tc">
             <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"/>
-                <signal pad-id="pd2" function="TC0" group="OC0C"/>
-                <signal pad-id="pd3" function="TC0" group="OC0D"/>
+                <signal pad-key="pd0" function="TC0" group="OC0A"/>
+                <signal pad-key="pd1" function="TC0" group="OC0B"/>
+                <signal pad-key="pd2" function="TC0" group="OC0C"/>
+                <signal pad-key="pd3" function="TC0" group="OC0D"/>
             </signals>
         </peripheral>
         <peripheral key="tce0" name="TCE0" module-key="i6090_tc">
             <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"/>
-                <signal pad-id="pe2" function="TC0" group="OC0C"/>
-                <signal pad-id="pe3" function="TC0" group="OC0D"/>
+                <signal pad-key="pe0" function="TC0" group="OC0A"/>
+                <signal pad-key="pe1" function="TC0" group="OC0B"/>
+                <signal pad-key="pe2" function="TC0" group="OC0C"/>
+                <signal pad-key="pe3" function="TC0" group="OC0D"/>
             </signals>
         </peripheral>
         <peripheral key="awexe" name="AWEXE" module-key="i6090_tc">
@@ -345,111 +345,111 @@
         <peripheral key="tcf0" name="TCF0" module-key="i6090_tc">
             <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"/>
-                <signal pad-id="pf2" function="TC0" group="OC0C"/>
-                <signal pad-id="pf3" function="TC0" group="OC0D"/>
+                <signal pad-key="pf0" function="TC0" group="OC0A"/>
+                <signal pad-key="pf1" function="TC0" group="OC0B"/>
+                <signal pad-key="pf2" function="TC0" group="OC0C"/>
+                <signal pad-key="pf3" function="TC0" group="OC0D"/>
             </signals>
         </peripheral>
         <peripheral key="tcc2" name="TCC2" module-key="i6090_tc2">
             <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"/>
-                <signal pad-id="pc2" function="TC2" group="LOC2C"/>
-                <signal pad-id="pc3" function="TC2" group="LOC2D"/>
-                <signal pad-id="pc4" function="TC2" group="HOC2A"/>
-                <signal pad-id="pc5" function="TC2" group="HOC2B"/>
-                <signal pad-id="pc6" function="TC2" group="HOC2C"/>
-                <signal pad-id="pc7" function="TC2" group="HOC2D"/>
+                <signal pad-key="pc0" function="TC2" group="LOC2A"/>
+                <signal pad-key="pc1" function="TC2" group="LOC2B"/>
+                <signal pad-key="pc2" function="TC2" group="LOC2C"/>
+                <signal pad-key="pc3" function="TC2" group="LOC2D"/>
+                <signal pad-key="pc4" function="TC2" group="HOC2A"/>
+                <signal pad-key="pc5" function="TC2" group="HOC2B"/>
+                <signal pad-key="pc6" function="TC2" group="HOC2C"/>
+                <signal pad-key="pc7" function="TC2" group="HOC2D"/>
             </signals>
         </peripheral>
         <peripheral key="tcd2" name="TCD2" module-key="i6090_tc2">
             <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"/>
-                <signal pad-id="pd2" function="TC2" group="LOC2C"/>
-                <signal pad-id="pd3" function="TC2" group="LOC2D"/>
-                <signal pad-id="pd4" function="TC2" group="HOC2A"/>
-                <signal pad-id="pd5" function="TC2" group="HOC2B"/>
-                <signal pad-id="pd6" function="TC2" group="HOC2C"/>
-                <signal pad-id="pd7" function="TC2" group="HOC2D"/>
+                <signal pad-key="pd0" function="TC2" group="LOC2A"/>
+                <signal pad-key="pd1" function="TC2" group="LOC2B"/>
+                <signal pad-key="pd2" function="TC2" group="LOC2C"/>
+                <signal pad-key="pd3" function="TC2" group="LOC2D"/>
+                <signal pad-key="pd4" function="TC2" group="HOC2A"/>
+                <signal pad-key="pd5" function="TC2" group="HOC2B"/>
+                <signal pad-key="pd6" function="TC2" group="HOC2C"/>
+                <signal pad-key="pd7" function="TC2" group="HOC2D"/>
             </signals>
         </peripheral>
         <peripheral key="tce2" name="TCE2" module-key="i6090_tc2">
             <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"/>
-                <signal pad-id="pe2" function="TC2" group="LOC2C"/>
-                <signal pad-id="pe3" function="TC2" group="LOC2D"/>
-                <signal pad-id="pe4" function="TC2" group="HOC2A"/>
-                <signal pad-id="pe5" function="TC2" group="HOC2B"/>
-                <signal pad-id="pe6" function="TC2" group="HOC2C"/>
-                <signal pad-id="pe7" function="TC2" group="HOC2D"/>
+                <signal pad-key="pe0" function="TC2" group="LOC2A"/>
+                <signal pad-key="pe1" function="TC2" group="LOC2B"/>
+                <signal pad-key="pe2" function="TC2" group="LOC2C"/>
+                <signal pad-key="pe3" function="TC2" group="LOC2D"/>
+                <signal pad-key="pe4" function="TC2" group="HOC2A"/>
+                <signal pad-key="pe5" function="TC2" group="HOC2B"/>
+                <signal pad-key="pe6" function="TC2" group="HOC2C"/>
+                <signal pad-key="pe7" function="TC2" group="HOC2D"/>
             </signals>
         </peripheral>
         <peripheral key="tcf2" name="TCF2" module-key="i6090_tc2">
             <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"/>
-                <signal pad-id="pf2" function="TC2" group="LOC2C"/>
-                <signal pad-id="pf3" function="TC2" group="LOC2D"/>
-                <signal pad-id="pf4" function="TC2" group="HOC2A"/>
-                <signal pad-id="pf5" function="TC2" group="HOC2B"/>
-                <signal pad-id="pf6" function="TC2" group="HOC2C"/>
-                <signal pad-id="pf7" function="TC2" group="HOC2D"/>
+                <signal pad-key="pf0" function="TC2" group="LOC2A"/>
+                <signal pad-key="pf1" function="TC2" group="LOC2B"/>
+                <signal pad-key="pf2" function="TC2" group="LOC2C"/>
+                <signal pad-key="pf3" function="TC2" group="LOC2D"/>
+                <signal pad-key="pf4" function="TC2" group="HOC2A"/>
+                <signal pad-key="pf5" function="TC2" group="HOC2B"/>
+                <signal pad-key="pf6" function="TC2" group="HOC2C"/>
+                <signal pad-key="pf7" function="TC2" group="HOC2D"/>
             </signals>
         </peripheral>
         <peripheral key="usartc0" name="USARTC0" module-key="i6090_usart">
             <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"/>
-                <signal pad-id="pc3" function="USART" group="TXD" field="USART0"/>
-                <signal pad-id="pc5" function="USART_ALT" group="XCK" field="USART0"/>
-                <signal pad-id="pc6" function="USART_ALT" group="RXD" field="USART0"/>
-                <signal pad-id="pc7" function="USART_ALT" group="TXD" field="USART0"/>
+                <signal pad-key="pc1" function="USART" group="XCK" field="USART0"/>
+                <signal pad-key="pc2" function="USART" group="RXD" field="USART0"/>
+                <signal pad-key="pc3" function="USART" group="TXD" field="USART0"/>
+                <signal pad-key="pc5" function="USART_ALT" group="XCK" field="USART0"/>
+                <signal pad-key="pc6" function="USART_ALT" group="RXD" field="USART0"/>
+                <signal pad-key="pc7" function="USART_ALT" group="TXD" field="USART0"/>
             </signals>
         </peripheral>
         <peripheral key="usartd0" name="USARTD0" module-key="i6090_usart">
             <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"/>
-                <signal pad-id="pd3" function="USART" group="TXD"/>
+                <signal pad-key="pd1" function="USART" group="XCK"/>
+                <signal pad-key="pd2" function="USART" group="RXD"/>
+                <signal pad-key="pd3" function="USART" group="TXD"/>
             </signals>
         </peripheral>
         <peripheral key="usarte0" name="USARTE0" module-key="i6090_usart">
             <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"/>
-                <signal pad-id="pe3" function="USART" group="TXD"/>
+                <signal pad-key="pe1" function="USART" group="XCK"/>
+                <signal pad-key="pe2" function="USART" group="RXD"/>
+                <signal pad-key="pe3" function="USART" group="TXD"/>
             </signals>
         </peripheral>
         <peripheral key="spic" name="SPIC" module-key="i6090_spi">
             <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"/>
-                <signal pad-id="pc6" function="SPI" group="MISO" field="SPI"/>
-                <signal pad-id="pc7" function="SPI" group="SCK" field="SPI"/>
-                <signal pad-id="pc4" function="SPI_ALT" group="SS" field="SPI"/>
-                <signal pad-id="pc5" function="SPI_ALT" group="SCK" field="SPI"/>
-                <signal pad-id="pc6" function="SPI_ALT" group="MISO" field="SPI"/>
-                <signal pad-id="pc7" function="SPI_ALT" group="MOSI" field="SPI"/>
+                <signal pad-key="pc4" function="SPI" group="SS" field="SPI"/>
+                <signal pad-key="pc5" function="SPI" group="MOSI" field="SPI"/>
+                <signal pad-key="pc6" function="SPI" group="MISO" field="SPI"/>
+                <signal pad-key="pc7" function="SPI" group="SCK" field="SPI"/>
+                <signal pad-key="pc4" function="SPI_ALT" group="SS" field="SPI"/>
+                <signal pad-key="pc5" function="SPI_ALT" group="SCK" field="SPI"/>
+                <signal pad-key="pc6" function="SPI_ALT" group="MISO" field="SPI"/>
+                <signal pad-key="pc7" function="SPI_ALT" group="MOSI" field="SPI"/>
             </signals>
         </peripheral>
         <peripheral key="spid" name="SPID" module-key="i6090_spi">
             <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"/>
-                <signal pad-id="pd6" function="SPI" group="MISO"/>
-                <signal pad-id="pd7" function="SPI" group="SCK"/>
+                <signal pad-key="pd4" function="SPI" group="SS"/>
+                <signal pad-key="pd5" function="SPI" group="MOSI"/>
+                <signal pad-key="pd6" function="SPI" group="MISO"/>
+                <signal pad-key="pd7" function="SPI" group="SCK"/>
             </signals>
         </peripheral>
         <peripheral key="spie" name="SPIE" module-key="i6090_spi">
@@ -1408,78 +1408,135 @@
             </register-group>
         </module>
     </modules>
+    <pads>
+        <pad key="pa3" name="PA3"/>
+        <pad key="pa4" name="PA4"/>
+        <pad key="pa5" name="PA5"/>
+        <pad key="pa6" name="PA6"/>
+        <pad key="pa7" name="PA7"/>
+        <pad key="pb0" name="PB0"/>
+        <pad key="pb1" name="PB1"/>
+        <pad key="pb2" name="PB2"/>
+        <pad key="pb3" name="PB3"/>
+        <pad key="pb4" name="PB4"/>
+        <pad key="pb5" name="PB5"/>
+        <pad key="pb6" name="PB6"/>
+        <pad key="pb7" name="PB7"/>
+        <pad key="gnd" name="GND"/>
+        <pad key="vcc" name="VCC"/>
+        <pad key="pc0" name="PC0"/>
+        <pad key="pc1" name="PC1"/>
+        <pad key="pc2" name="PC2"/>
+        <pad key="pc3" name="PC3"/>
+        <pad key="pc4" name="PC4"/>
+        <pad key="pc5" name="PC5"/>
+        <pad key="pc6" name="PC6"/>
+        <pad key="pc7" name="PC7"/>
+        <pad key="pd0" name="PD0"/>
+        <pad key="pd1" name="PD1"/>
+        <pad key="pd2" name="PD2"/>
+        <pad key="pd3" name="PD3"/>
+        <pad key="pd4" name="PD4"/>
+        <pad key="pd5" name="PD5"/>
+        <pad key="pd6" name="PD6"/>
+        <pad key="pd7" name="PD7"/>
+        <pad key="pe0" name="PE0"/>
+        <pad key="pe1" name="PE1"/>
+        <pad key="pe2" name="PE2"/>
+        <pad key="pe3" name="PE3"/>
+        <pad key="pe4" name="PE4"/>
+        <pad key="pe5" name="PE5"/>
+        <pad key="pe6" name="PE6"/>
+        <pad key="pe7" name="PE7"/>
+        <pad key="pf0" name="PF0"/>
+        <pad key="pf1" name="PF1"/>
+        <pad key="pf2" name="PF2"/>
+        <pad key="pf3" name="PF3"/>
+        <pad key="pf4" name="PF4"/>
+        <pad key="pf5" name="PF5"/>
+        <pad key="pf6" name="PF6"/>
+        <pad key="pf7" name="PF7"/>
+        <pad key="pdi" name="PDI"/>
+        <pad key="reset" name="RESET"/>
+        <pad key="pr0" name="PR0"/>
+        <pad key="pr1" name="PR1"/>
+        <pad key="avcc" name="AVCC"/>
+        <pad key="pa0" name="PA0"/>
+        <pad key="pa1" name="PA1"/>
+        <pad key="pa2" name="PA2"/>
+    </pads>
     <pinouts>
         <pinout key="qfp_qfn_64" name="QFP_QFN_64" type="qfn">
-            <pin position="1" pad="PA3"/>
-            <pin position="2" pad="PA4"/>
-            <pin position="3" pad="PA5"/>
-            <pin position="4" pad="PA6"/>
-            <pin position="5" pad="PA7"/>
-            <pin position="6" pad="PB0"/>
-            <pin position="7" pad="PB1"/>
-            <pin position="8" pad="PB2"/>
-            <pin position="9" pad="PB3"/>
-            <pin position="10" pad="PB4"/>
-            <pin position="11" pad="PB5"/>
-            <pin position="12" pad="PB6"/>
-            <pin position="13" pad="PB7"/>
-            <pin position="14" pad="GND"/>
-            <pin position="15" pad="VCC"/>
-            <pin position="16" pad="PC0"/>
-            <pin position="17" pad="PC1"/>
-            <pin position="18" pad="PC2"/>
-            <pin position="19" pad="PC3"/>
-            <pin position="20" pad="PC4"/>
-            <pin position="21" pad="PC5"/>
-            <pin position="22" pad="PC6"/>
-            <pin position="23" pad="PC7"/>
-            <pin position="24" pad="GND"/>
-            <pin position="25" pad="VCC"/>
-            <pin position="26" pad="PD0"/>
-            <pin position="27" pad="PD1"/>
-            <pin position="28" pad="PD2"/>
-            <pin position="29" pad="PD3"/>
-            <pin position="30" pad="PD4"/>
-            <pin position="31" pad="PD5"/>
-            <pin position="32" pad="PD6"/>
-            <pin position="33" pad="PD7"/>
-            <pin position="34" pad="GND"/>
-            <pin position="35" pad="VCC"/>
-            <pin position="36" pad="PE0"/>
-            <pin position="37" pad="PE1"/>
-            <pin position="38" pad="PE2"/>
-            <pin position="39" pad="PE3"/>
-            <pin position="40" pad="PE4"/>
-            <pin position="41" pad="PE5"/>
-            <pin position="42" pad="PE6"/>
-            <pin position="43" pad="PE7"/>
-            <pin position="44" pad="GND"/>
-            <pin position="45" pad="VCC"/>
-            <pin position="46" pad="PF0"/>
-            <pin position="47" pad="PF1"/>
-            <pin position="48" pad="PF2"/>
-            <pin position="49" pad="PF3"/>
-            <pin position="50" pad="PF4"/>
-            <pin position="51" pad="PF5"/>
-            <pin position="52" pad="GND"/>
-            <pin position="53" pad="VCC"/>
-            <pin position="54" pad="PF6"/>
-            <pin position="55" pad="PF7"/>
-            <pin position="56" pad="PDI"/>
-            <pin position="57" pad="RESET"/>
-            <pin position="58" pad="PR0"/>
-            <pin position="59" pad="PR1"/>
-            <pin position="60" pad="GND"/>
-            <pin position="61" pad="AVCC"/>
-            <pin position="62" pad="PA0"/>
-            <pin position="63" pad="PA1"/>
-            <pin position="64" pad="PA2"/>
+            <pin position="1" pad-key="pa3"/>
+            <pin position="2" pad-key="pa4"/>
+            <pin position="3" pad-key="pa5"/>
+            <pin position="4" pad-key="pa6"/>
+            <pin position="5" pad-key="pa7"/>
+            <pin position="6" pad-key="pb0"/>
+            <pin position="7" pad-key="pb1"/>
+            <pin position="8" pad-key="pb2"/>
+            <pin position="9" pad-key="pb3"/>
+            <pin position="10" pad-key="pb4"/>
+            <pin position="11" pad-key="pb5"/>
+            <pin position="12" pad-key="pb6"/>
+            <pin position="13" pad-key="pb7"/>
+            <pin position="14" pad-key="gnd"/>
+            <pin position="15" pad-key="vcc"/>
+            <pin position="16" pad-key="pc0"/>
+            <pin position="17" pad-key="pc1"/>
+            <pin position="18" pad-key="pc2"/>
+            <pin position="19" pad-key="pc3"/>
+            <pin position="20" pad-key="pc4"/>
+            <pin position="21" pad-key="pc5"/>
+            <pin position="22" pad-key="pc6"/>
+            <pin position="23" pad-key="pc7"/>
+            <pin position="24" pad-key="gnd"/>
+            <pin position="25" pad-key="vcc"/>
+            <pin position="26" pad-key="pd0"/>
+            <pin position="27" pad-key="pd1"/>
+            <pin position="28" pad-key="pd2"/>
+            <pin position="29" pad-key="pd3"/>
+            <pin position="30" pad-key="pd4"/>
+            <pin position="31" pad-key="pd5"/>
+            <pin position="32" pad-key="pd6"/>
+            <pin position="33" pad-key="pd7"/>
+            <pin position="34" pad-key="gnd"/>
+            <pin position="35" pad-key="vcc"/>
+            <pin position="36" pad-key="pe0"/>
+            <pin position="37" pad-key="pe1"/>
+            <pin position="38" pad-key="pe2"/>
+            <pin position="39" pad-key="pe3"/>
+            <pin position="40" pad-key="pe4"/>
+            <pin position="41" pad-key="pe5"/>
+            <pin position="42" pad-key="pe6"/>
+            <pin position="43" pad-key="pe7"/>
+            <pin position="44" pad-key="gnd"/>
+            <pin position="45" pad-key="vcc"/>
+            <pin position="46" pad-key="pf0"/>
+            <pin position="47" pad-key="pf1"/>
+            <pin position="48" pad-key="pf2"/>
+            <pin position="49" pad-key="pf3"/>
+            <pin position="50" pad-key="pf4"/>
+            <pin position="51" pad-key="pf5"/>
+            <pin position="52" pad-key="gnd"/>
+            <pin position="53" pad-key="vcc"/>
+            <pin position="54" pad-key="pf6"/>
+            <pin position="55" pad-key="pf7"/>
+            <pin position="56" pad-key="pdi"/>
+            <pin position="57" pad-key="reset"/>
+            <pin position="58" pad-key="pr0"/>
+            <pin position="59" pad-key="pr1"/>
+            <pin position="60" pad-key="gnd"/>
+            <pin position="61" pad-key="avcc"/>
+            <pin position="62" pad-key="pa0"/>
+            <pin position="63" pad-key="pa1"/>
+            <pin position="64" pad-key="pa2"/>
         </pinout>
     </pinouts>
     <variants>
-        <variant name="ATxmega192D3-AU" pinout-key="qfp_qfn_64" package="TQFP64"/>
-        <variant name="ATxmega192D3-MH" pinout-key="qfp_qfn_64" package="QFN64"/>
-        <variant name="ATxmega192D3-AN" pinout-key="qfp_qfn_64" package="TQFP64"/>
-        <variant name="ATxmega192D3-MN" pinout-key="qfp_qfn_64" package="QFN64"/>
+        <variant key="atxmega192d3_au" name="ATxmega192D3-AU" pinout-key="qfp_qfn_64"/>
+        <variant key="atxmega192d3_mh" name="ATxmega192D3-MH" pinout-key="qfp_qfn_64"/>
+        <variant key="atxmega192d3_an" name="ATxmega192D3-AN" pinout-key="qfp_qfn_64"/>
+        <variant key="atxmega192d3_mn" name="ATxmega192D3-MN" pinout-key="qfp_qfn_64"/>
     </variants>
 </device>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA256A3.xml b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA256A3.xml
index 2dc2be40..e804e939 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA256A3.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA256A3.xml
@@ -160,86 +160,86 @@
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pa2" index="2" function="PORTA" group="P"/>
-                <signal pad-id="pa3" index="3" function="PORTA" group="P"/>
-                <signal pad-id="pa4" index="4" function="PORTA" group="P"/>
-                <signal pad-id="pa5" index="5" function="PORTA" group="P"/>
-                <signal pad-id="pa6" index="6" function="PORTA" group="P"/>
-                <signal pad-id="pa7" index="7" function="PORTA" group="P"/>
+                <signal pad-key="pa0" index="0" function="PORTA" group="P"/>
+                <signal pad-key="pa1" index="1" function="PORTA" group="P"/>
+                <signal pad-key="pa2" index="2" function="PORTA" group="P"/>
+                <signal pad-key="pa3" index="3" function="PORTA" group="P"/>
+                <signal pad-key="pa4" index="4" function="PORTA" group="P"/>
+                <signal pad-key="pa5" index="5" function="PORTA" group="P"/>
+                <signal pad-key="pa6" index="6" function="PORTA" group="P"/>
+                <signal pad-key="pa7" index="7" function="PORTA" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pb2" index="2" function="PORTB" group="P"/>
-                <signal pad-id="pb3" index="3" function="PORTB" group="P"/>
-                <signal pad-id="pb4" index="4" function="PORTB" group="P"/>
-                <signal pad-id="pb5" index="5" function="PORTB" group="P"/>
-                <signal pad-id="pb6" index="6" function="PORTB" group="P"/>
-                <signal pad-id="pb7" index="7" function="PORTB" group="P"/>
+                <signal pad-key="pb0" index="0" function="PORTB" group="P"/>
+                <signal pad-key="pb1" index="1" function="PORTB" group="P"/>
+                <signal pad-key="pb2" index="2" function="PORTB" group="P"/>
+                <signal pad-key="pb3" index="3" function="PORTB" group="P"/>
+                <signal pad-key="pb4" index="4" function="PORTB" group="P"/>
+                <signal pad-key="pb5" index="5" function="PORTB" group="P"/>
+                <signal pad-key="pb6" index="6" function="PORTB" group="P"/>
+                <signal pad-key="pb7" index="7" function="PORTB" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pc2" index="2" function="PORTC" group="P"/>
-                <signal pad-id="pc3" index="3" function="PORTC" group="P"/>
-                <signal pad-id="pc4" index="4" function="PORTC" group="P"/>
-                <signal pad-id="pc5" index="5" function="PORTC" group="P"/>
-                <signal pad-id="pc6" index="6" function="PORTC" group="P"/>
-                <signal pad-id="pc7" index="7" function="PORTC" group="P"/>
+                <signal pad-key="pc0" index="0" function="PORTC" group="P"/>
+                <signal pad-key="pc1" index="1" function="PORTC" group="P"/>
+                <signal pad-key="pc2" index="2" function="PORTC" group="P"/>
+                <signal pad-key="pc3" index="3" function="PORTC" group="P"/>
+                <signal pad-key="pc4" index="4" function="PORTC" group="P"/>
+                <signal pad-key="pc5" index="5" function="PORTC" group="P"/>
+                <signal pad-key="pc6" index="6" function="PORTC" group="P"/>
+                <signal pad-key="pc7" index="7" function="PORTC" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pd2" index="2" function="PORTD" group="P"/>
-                <signal pad-id="pd3" index="3" function="PORTD" group="P"/>
-                <signal pad-id="pd4" index="4" function="PORTD" group="P"/>
-                <signal pad-id="pd5" index="5" function="PORTD" group="P"/>
-                <signal pad-id="pd6" index="6" function="PORTD" group="P"/>
-                <signal pad-id="pd7" index="7" function="PORTD" group="P"/>
+                <signal pad-key="pd0" index="0" function="PORTD" group="P"/>
+                <signal pad-key="pd1" index="1" function="PORTD" group="P"/>
+                <signal pad-key="pd2" index="2" function="PORTD" group="P"/>
+                <signal pad-key="pd3" index="3" function="PORTD" group="P"/>
+                <signal pad-key="pd4" index="4" function="PORTD" group="P"/>
+                <signal pad-key="pd5" index="5" function="PORTD" group="P"/>
+                <signal pad-key="pd6" index="6" function="PORTD" group="P"/>
+                <signal pad-key="pd7" index="7" function="PORTD" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="porte" name="PORTE" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pe2" index="2" function="PORTE" group="P"/>
-                <signal pad-id="pe3" index="3" function="PORTE" group="P"/>
-                <signal pad-id="pe4" index="4" function="PORTE" group="P"/>
-                <signal pad-id="pe5" index="5" function="PORTE" group="P"/>
-                <signal pad-id="pe6" index="6" function="PORTE" group="P"/>
-                <signal pad-id="pe7" index="7" function="PORTE" group="P"/>
+                <signal pad-key="pe0" index="0" function="PORTE" group="P"/>
+                <signal pad-key="pe1" index="1" function="PORTE" group="P"/>
+                <signal pad-key="pe2" index="2" function="PORTE" group="P"/>
+                <signal pad-key="pe3" index="3" function="PORTE" group="P"/>
+                <signal pad-key="pe4" index="4" function="PORTE" group="P"/>
+                <signal pad-key="pe5" index="5" function="PORTE" group="P"/>
+                <signal pad-key="pe6" index="6" function="PORTE" group="P"/>
+                <signal pad-key="pe7" index="7" function="PORTE" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portf" name="PORTF" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pf2" index="2" function="PORTF" group="P"/>
-                <signal pad-id="pf3" index="3" function="PORTF" group="P"/>
-                <signal pad-id="pf4" index="4" function="PORTF" group="P"/>
-                <signal pad-id="pf5" index="5" function="PORTF" group="P"/>
-                <signal pad-id="pf6" index="6" function="PORTF" group="P"/>
-                <signal pad-id="pf7" index="7" function="PORTF" group="P"/>
+                <signal pad-key="pf0" index="0" function="PORTF" group="P"/>
+                <signal pad-key="pf1" index="1" function="PORTF" group="P"/>
+                <signal pad-key="pf2" index="2" function="PORTF" group="P"/>
+                <signal pad-key="pf3" index="3" function="PORTF" group="P"/>
+                <signal pad-key="pf4" index="4" function="PORTF" group="P"/>
+                <signal pad-key="pf5" index="5" function="PORTF" group="P"/>
+                <signal pad-key="pf6" index="6" function="PORTF" group="P"/>
+                <signal pad-key="pf7" index="7" function="PORTF" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portr" name="PORTR" module-key="gpio_port">
             <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"/>
+                <signal pad-key="pr0" index="0" function="PORTR" group="P"/>
+                <signal pad-key="pr1" index="1" function="PORTR" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="tcc0" name="TCC0" module-key="i6090_tc">
@@ -1384,76 +1384,133 @@
             </register-group>
         </module>
     </modules>
+    <pads>
+        <pad key="pa3" name="PA3"/>
+        <pad key="pa4" name="PA4"/>
+        <pad key="pa5" name="PA5"/>
+        <pad key="pa6" name="PA6"/>
+        <pad key="pa7" name="PA7"/>
+        <pad key="pb0" name="PB0"/>
+        <pad key="pb1" name="PB1"/>
+        <pad key="pb2" name="PB2"/>
+        <pad key="pb3" name="PB3"/>
+        <pad key="pb4" name="PB4"/>
+        <pad key="pb5" name="PB5"/>
+        <pad key="pb6" name="PB6"/>
+        <pad key="pb7" name="PB7"/>
+        <pad key="gnd" name="GND"/>
+        <pad key="vcc" name="VCC"/>
+        <pad key="pc0" name="PC0"/>
+        <pad key="pc1" name="PC1"/>
+        <pad key="pc2" name="PC2"/>
+        <pad key="pc3" name="PC3"/>
+        <pad key="pc4" name="PC4"/>
+        <pad key="pc5" name="PC5"/>
+        <pad key="pc6" name="PC6"/>
+        <pad key="pc7" name="PC7"/>
+        <pad key="pd0" name="PD0"/>
+        <pad key="pd1" name="PD1"/>
+        <pad key="pd2" name="PD2"/>
+        <pad key="pd3" name="PD3"/>
+        <pad key="pd4" name="PD4"/>
+        <pad key="pd5" name="PD5"/>
+        <pad key="pd6" name="PD6"/>
+        <pad key="pd7" name="PD7"/>
+        <pad key="pe0" name="PE0"/>
+        <pad key="pe1" name="PE1"/>
+        <pad key="pe2" name="PE2"/>
+        <pad key="pe3" name="PE3"/>
+        <pad key="pe4" name="PE4"/>
+        <pad key="pe5" name="PE5"/>
+        <pad key="pe6" name="PE6"/>
+        <pad key="pe7" name="PE7"/>
+        <pad key="pf0" name="PF0"/>
+        <pad key="pf1" name="PF1"/>
+        <pad key="pf2" name="PF2"/>
+        <pad key="pf3" name="PF3"/>
+        <pad key="pf4" name="PF4"/>
+        <pad key="pf5" name="PF5"/>
+        <pad key="pf6" name="PF6"/>
+        <pad key="pf7" name="PF7"/>
+        <pad key="pdi" name="PDI"/>
+        <pad key="reset" name="RESET"/>
+        <pad key="pr0" name="PR0"/>
+        <pad key="pr1" name="PR1"/>
+        <pad key="avcc" name="AVCC"/>
+        <pad key="pa0" name="PA0"/>
+        <pad key="pa1" name="PA1"/>
+        <pad key="pa2" name="PA2"/>
+    </pads>
     <pinouts>
         <pinout key="qfp_qfn_64" name="QFP_QFN_64" type="qfn">
-            <pin position="1" pad="PA3"/>
-            <pin position="2" pad="PA4"/>
-            <pin position="3" pad="PA5"/>
-            <pin position="4" pad="PA6"/>
-            <pin position="5" pad="PA7"/>
-            <pin position="6" pad="PB0"/>
-            <pin position="7" pad="PB1"/>
-            <pin position="8" pad="PB2"/>
-            <pin position="9" pad="PB3"/>
-            <pin position="10" pad="PB4"/>
-            <pin position="11" pad="PB5"/>
-            <pin position="12" pad="PB6"/>
-            <pin position="13" pad="PB7"/>
-            <pin position="14" pad="GND"/>
-            <pin position="15" pad="VCC"/>
-            <pin position="16" pad="PC0"/>
-            <pin position="17" pad="PC1"/>
-            <pin position="18" pad="PC2"/>
-            <pin position="19" pad="PC3"/>
-            <pin position="20" pad="PC4"/>
-            <pin position="21" pad="PC5"/>
-            <pin position="22" pad="PC6"/>
-            <pin position="23" pad="PC7"/>
-            <pin position="24" pad="GND"/>
-            <pin position="25" pad="VCC"/>
-            <pin position="26" pad="PD0"/>
-            <pin position="27" pad="PD1"/>
-            <pin position="28" pad="PD2"/>
-            <pin position="29" pad="PD3"/>
-            <pin position="30" pad="PD4"/>
-            <pin position="31" pad="PD5"/>
-            <pin position="32" pad="PD6"/>
-            <pin position="33" pad="PD7"/>
-            <pin position="34" pad="GND"/>
-            <pin position="35" pad="VCC"/>
-            <pin position="36" pad="PE0"/>
-            <pin position="37" pad="PE1"/>
-            <pin position="38" pad="PE2"/>
-            <pin position="39" pad="PE3"/>
-            <pin position="40" pad="PE4"/>
-            <pin position="41" pad="PE5"/>
-            <pin position="42" pad="PE6"/>
-            <pin position="43" pad="PE7"/>
-            <pin position="44" pad="GND"/>
-            <pin position="45" pad="VCC"/>
-            <pin position="46" pad="PF0"/>
-            <pin position="47" pad="PF1"/>
-            <pin position="48" pad="PF2"/>
-            <pin position="49" pad="PF3"/>
-            <pin position="50" pad="PF4"/>
-            <pin position="51" pad="PF5"/>
-            <pin position="52" pad="GND"/>
-            <pin position="53" pad="VCC"/>
-            <pin position="54" pad="PF6"/>
-            <pin position="55" pad="PF7"/>
-            <pin position="56" pad="PDI"/>
-            <pin position="57" pad="RESET"/>
-            <pin position="58" pad="PR0"/>
-            <pin position="59" pad="PR1"/>
-            <pin position="60" pad="GND"/>
-            <pin position="61" pad="AVCC"/>
-            <pin position="62" pad="PA0"/>
-            <pin position="63" pad="PA1"/>
-            <pin position="64" pad="PA2"/>
+            <pin position="1" pad-key="pa3"/>
+            <pin position="2" pad-key="pa4"/>
+            <pin position="3" pad-key="pa5"/>
+            <pin position="4" pad-key="pa6"/>
+            <pin position="5" pad-key="pa7"/>
+            <pin position="6" pad-key="pb0"/>
+            <pin position="7" pad-key="pb1"/>
+            <pin position="8" pad-key="pb2"/>
+            <pin position="9" pad-key="pb3"/>
+            <pin position="10" pad-key="pb4"/>
+            <pin position="11" pad-key="pb5"/>
+            <pin position="12" pad-key="pb6"/>
+            <pin position="13" pad-key="pb7"/>
+            <pin position="14" pad-key="gnd"/>
+            <pin position="15" pad-key="vcc"/>
+            <pin position="16" pad-key="pc0"/>
+            <pin position="17" pad-key="pc1"/>
+            <pin position="18" pad-key="pc2"/>
+            <pin position="19" pad-key="pc3"/>
+            <pin position="20" pad-key="pc4"/>
+            <pin position="21" pad-key="pc5"/>
+            <pin position="22" pad-key="pc6"/>
+            <pin position="23" pad-key="pc7"/>
+            <pin position="24" pad-key="gnd"/>
+            <pin position="25" pad-key="vcc"/>
+            <pin position="26" pad-key="pd0"/>
+            <pin position="27" pad-key="pd1"/>
+            <pin position="28" pad-key="pd2"/>
+            <pin position="29" pad-key="pd3"/>
+            <pin position="30" pad-key="pd4"/>
+            <pin position="31" pad-key="pd5"/>
+            <pin position="32" pad-key="pd6"/>
+            <pin position="33" pad-key="pd7"/>
+            <pin position="34" pad-key="gnd"/>
+            <pin position="35" pad-key="vcc"/>
+            <pin position="36" pad-key="pe0"/>
+            <pin position="37" pad-key="pe1"/>
+            <pin position="38" pad-key="pe2"/>
+            <pin position="39" pad-key="pe3"/>
+            <pin position="40" pad-key="pe4"/>
+            <pin position="41" pad-key="pe5"/>
+            <pin position="42" pad-key="pe6"/>
+            <pin position="43" pad-key="pe7"/>
+            <pin position="44" pad-key="gnd"/>
+            <pin position="45" pad-key="vcc"/>
+            <pin position="46" pad-key="pf0"/>
+            <pin position="47" pad-key="pf1"/>
+            <pin position="48" pad-key="pf2"/>
+            <pin position="49" pad-key="pf3"/>
+            <pin position="50" pad-key="pf4"/>
+            <pin position="51" pad-key="pf5"/>
+            <pin position="52" pad-key="gnd"/>
+            <pin position="53" pad-key="vcc"/>
+            <pin position="54" pad-key="pf6"/>
+            <pin position="55" pad-key="pf7"/>
+            <pin position="56" pad-key="pdi"/>
+            <pin position="57" pad-key="reset"/>
+            <pin position="58" pad-key="pr0"/>
+            <pin position="59" pad-key="pr1"/>
+            <pin position="60" pad-key="gnd"/>
+            <pin position="61" pad-key="avcc"/>
+            <pin position="62" pad-key="pa0"/>
+            <pin position="63" pad-key="pa1"/>
+            <pin position="64" pad-key="pa2"/>
         </pinout>
     </pinouts>
     <variants>
-        <variant name="ATXMEGA256A3-AU" pinout-key="qfp_qfn_64" package="TQFP64"/>
-        <variant name="ATXMEGA256A3-MH" pinout-key="qfp_qfn_64" package="QFN64"/>
+        <variant key="atxmega256a3_au" name="ATXMEGA256A3-AU" pinout-key="qfp_qfn_64"/>
+        <variant key="atxmega256a3_mh" name="ATXMEGA256A3-MH" pinout-key="qfp_qfn_64"/>
     </variants>
 </device>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA256A3B.xml b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA256A3B.xml
index 705d21e4..9751d647 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA256A3B.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA256A3B.xml
@@ -160,86 +160,86 @@
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pa2" index="2" function="PORTA" group="P"/>
-                <signal pad-id="pa3" index="3" function="PORTA" group="P"/>
-                <signal pad-id="pa4" index="4" function="PORTA" group="P"/>
-                <signal pad-id="pa5" index="5" function="PORTA" group="P"/>
-                <signal pad-id="pa6" index="6" function="PORTA" group="P"/>
-                <signal pad-id="pa7" index="7" function="PORTA" group="P"/>
+                <signal pad-key="pa0" index="0" function="PORTA" group="P"/>
+                <signal pad-key="pa1" index="1" function="PORTA" group="P"/>
+                <signal pad-key="pa2" index="2" function="PORTA" group="P"/>
+                <signal pad-key="pa3" index="3" function="PORTA" group="P"/>
+                <signal pad-key="pa4" index="4" function="PORTA" group="P"/>
+                <signal pad-key="pa5" index="5" function="PORTA" group="P"/>
+                <signal pad-key="pa6" index="6" function="PORTA" group="P"/>
+                <signal pad-key="pa7" index="7" function="PORTA" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pb2" index="2" function="PORTB" group="P"/>
-                <signal pad-id="pb3" index="3" function="PORTB" group="P"/>
-                <signal pad-id="pb4" index="4" function="PORTB" group="P"/>
-                <signal pad-id="pb5" index="5" function="PORTB" group="P"/>
-                <signal pad-id="pb6" index="6" function="PORTB" group="P"/>
-                <signal pad-id="pb7" index="7" function="PORTB" group="P"/>
+                <signal pad-key="pb0" index="0" function="PORTB" group="P"/>
+                <signal pad-key="pb1" index="1" function="PORTB" group="P"/>
+                <signal pad-key="pb2" index="2" function="PORTB" group="P"/>
+                <signal pad-key="pb3" index="3" function="PORTB" group="P"/>
+                <signal pad-key="pb4" index="4" function="PORTB" group="P"/>
+                <signal pad-key="pb5" index="5" function="PORTB" group="P"/>
+                <signal pad-key="pb6" index="6" function="PORTB" group="P"/>
+                <signal pad-key="pb7" index="7" function="PORTB" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pc2" index="2" function="PORTC" group="P"/>
-                <signal pad-id="pc3" index="3" function="PORTC" group="P"/>
-                <signal pad-id="pc4" index="4" function="PORTC" group="P"/>
-                <signal pad-id="pc5" index="5" function="PORTC" group="P"/>
-                <signal pad-id="pc6" index="6" function="PORTC" group="P"/>
-                <signal pad-id="pc7" index="7" function="PORTC" group="P"/>
+                <signal pad-key="pc0" index="0" function="PORTC" group="P"/>
+                <signal pad-key="pc1" index="1" function="PORTC" group="P"/>
+                <signal pad-key="pc2" index="2" function="PORTC" group="P"/>
+                <signal pad-key="pc3" index="3" function="PORTC" group="P"/>
+                <signal pad-key="pc4" index="4" function="PORTC" group="P"/>
+                <signal pad-key="pc5" index="5" function="PORTC" group="P"/>
+                <signal pad-key="pc6" index="6" function="PORTC" group="P"/>
+                <signal pad-key="pc7" index="7" function="PORTC" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pd2" index="2" function="PORTD" group="P"/>
-                <signal pad-id="pd3" index="3" function="PORTD" group="P"/>
-                <signal pad-id="pd4" index="4" function="PORTD" group="P"/>
-                <signal pad-id="pd5" index="5" function="PORTD" group="P"/>
-                <signal pad-id="pd6" index="6" function="PORTD" group="P"/>
-                <signal pad-id="pd7" index="7" function="PORTD" group="P"/>
+                <signal pad-key="pd0" index="0" function="PORTD" group="P"/>
+                <signal pad-key="pd1" index="1" function="PORTD" group="P"/>
+                <signal pad-key="pd2" index="2" function="PORTD" group="P"/>
+                <signal pad-key="pd3" index="3" function="PORTD" group="P"/>
+                <signal pad-key="pd4" index="4" function="PORTD" group="P"/>
+                <signal pad-key="pd5" index="5" function="PORTD" group="P"/>
+                <signal pad-key="pd6" index="6" function="PORTD" group="P"/>
+                <signal pad-key="pd7" index="7" function="PORTD" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="porte" name="PORTE" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pe2" index="2" function="PORTE" group="P"/>
-                <signal pad-id="pe3" index="3" function="PORTE" group="P"/>
-                <signal pad-id="pe4" index="4" function="PORTE" group="P"/>
-                <signal pad-id="pe5" index="5" function="PORTE" group="P"/>
-                <signal pad-id="pe6" index="6" function="PORTE" group="P"/>
-                <signal pad-id="pe7" index="7" function="PORTE" group="P"/>
+                <signal pad-key="pe0" index="0" function="PORTE" group="P"/>
+                <signal pad-key="pe1" index="1" function="PORTE" group="P"/>
+                <signal pad-key="pe2" index="2" function="PORTE" group="P"/>
+                <signal pad-key="pe3" index="3" function="PORTE" group="P"/>
+                <signal pad-key="pe4" index="4" function="PORTE" group="P"/>
+                <signal pad-key="pe5" index="5" function="PORTE" group="P"/>
+                <signal pad-key="pe6" index="6" function="PORTE" group="P"/>
+                <signal pad-key="pe7" index="7" function="PORTE" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portf" name="PORTF" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pf2" index="2" function="PORTF" group="P"/>
-                <signal pad-id="pf3" index="3" function="PORTF" group="P"/>
-                <signal pad-id="pf4" index="4" function="PORTF" group="P"/>
-                <signal pad-id="pf5" index="5" function="PORTF" group="P"/>
-                <signal pad-id="pf6" index="6" function="PORTF" group="P"/>
-                <signal pad-id="pf7" index="7" function="PORTF" group="P"/>
+                <signal pad-key="pf0" index="0" function="PORTF" group="P"/>
+                <signal pad-key="pf1" index="1" function="PORTF" group="P"/>
+                <signal pad-key="pf2" index="2" function="PORTF" group="P"/>
+                <signal pad-key="pf3" index="3" function="PORTF" group="P"/>
+                <signal pad-key="pf4" index="4" function="PORTF" group="P"/>
+                <signal pad-key="pf5" index="5" function="PORTF" group="P"/>
+                <signal pad-key="pf6" index="6" function="PORTF" group="P"/>
+                <signal pad-key="pf7" index="7" function="PORTF" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portr" name="PORTR" module-key="gpio_port">
             <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"/>
+                <signal pad-key="pr0" index="0" function="PORTR" group="P"/>
+                <signal pad-key="pr1" index="1" function="PORTR" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="tcc0" name="TCC0" module-key="i6090_tc">
@@ -1399,76 +1399,133 @@
             </register-group>
         </module>
     </modules>
+    <pads>
+        <pad key="pa3" name="PA3"/>
+        <pad key="pa4" name="PA4"/>
+        <pad key="pa5" name="PA5"/>
+        <pad key="pa6" name="PA6"/>
+        <pad key="pa7" name="PA7"/>
+        <pad key="pb0" name="PB0"/>
+        <pad key="pb1" name="PB1"/>
+        <pad key="pb2" name="PB2"/>
+        <pad key="pb3" name="PB3"/>
+        <pad key="pb4" name="PB4"/>
+        <pad key="pb5" name="PB5"/>
+        <pad key="pb6" name="PB6"/>
+        <pad key="pb7" name="PB7"/>
+        <pad key="gnd" name="GND"/>
+        <pad key="vcc" name="VCC"/>
+        <pad key="pc0" name="PC0"/>
+        <pad key="pc1" name="PC1"/>
+        <pad key="pc2" name="PC2"/>
+        <pad key="pc3" name="PC3"/>
+        <pad key="pc4" name="PC4"/>
+        <pad key="pc5" name="PC5"/>
+        <pad key="pc6" name="PC6"/>
+        <pad key="pc7" name="PC7"/>
+        <pad key="pd0" name="PD0"/>
+        <pad key="pd1" name="PD1"/>
+        <pad key="pd2" name="PD2"/>
+        <pad key="pd3" name="PD3"/>
+        <pad key="pd4" name="PD4"/>
+        <pad key="pd5" name="PD5"/>
+        <pad key="pd6" name="PD6"/>
+        <pad key="pd7" name="PD7"/>
+        <pad key="pe0" name="PE0"/>
+        <pad key="pe1" name="PE1"/>
+        <pad key="pe2" name="PE2"/>
+        <pad key="pe3" name="PE3"/>
+        <pad key="pe4" name="PE4"/>
+        <pad key="pe5" name="PE5"/>
+        <pad key="pe6" name="PE6"/>
+        <pad key="pe7" name="PE7"/>
+        <pad key="pf0" name="PF0"/>
+        <pad key="pf1" name="PF1"/>
+        <pad key="pf2" name="PF2"/>
+        <pad key="pf3" name="PF3"/>
+        <pad key="pf4" name="PF4"/>
+        <pad key="pf5" name="PF5"/>
+        <pad key="pf6" name="PF6"/>
+        <pad key="pf7" name="PF7"/>
+        <pad key="pdi" name="PDI"/>
+        <pad key="reset" name="RESET"/>
+        <pad key="pr0" name="PR0"/>
+        <pad key="pr1" name="PR1"/>
+        <pad key="avcc" name="AVCC"/>
+        <pad key="pa0" name="PA0"/>
+        <pad key="pa1" name="PA1"/>
+        <pad key="pa2" name="PA2"/>
+    </pads>
     <pinouts>
         <pinout key="qfp_qfn_64" name="QFP_QFN_64" type="qfn">
-            <pin position="1" pad="PA3"/>
-            <pin position="2" pad="PA4"/>
-            <pin position="3" pad="PA5"/>
-            <pin position="4" pad="PA6"/>
-            <pin position="5" pad="PA7"/>
-            <pin position="6" pad="PB0"/>
-            <pin position="7" pad="PB1"/>
-            <pin position="8" pad="PB2"/>
-            <pin position="9" pad="PB3"/>
-            <pin position="10" pad="PB4"/>
-            <pin position="11" pad="PB5"/>
-            <pin position="12" pad="PB6"/>
-            <pin position="13" pad="PB7"/>
-            <pin position="14" pad="GND"/>
-            <pin position="15" pad="VCC"/>
-            <pin position="16" pad="PC0"/>
-            <pin position="17" pad="PC1"/>
-            <pin position="18" pad="PC2"/>
-            <pin position="19" pad="PC3"/>
-            <pin position="20" pad="PC4"/>
-            <pin position="21" pad="PC5"/>
-            <pin position="22" pad="PC6"/>
-            <pin position="23" pad="PC7"/>
-            <pin position="24" pad="GND"/>
-            <pin position="25" pad="VCC"/>
-            <pin position="26" pad="PD0"/>
-            <pin position="27" pad="PD1"/>
-            <pin position="28" pad="PD2"/>
-            <pin position="29" pad="PD3"/>
-            <pin position="30" pad="PD4"/>
-            <pin position="31" pad="PD5"/>
-            <pin position="32" pad="PD6"/>
-            <pin position="33" pad="PD7"/>
-            <pin position="34" pad="GND"/>
-            <pin position="35" pad="VCC"/>
-            <pin position="36" pad="PE0"/>
-            <pin position="37" pad="PE1"/>
-            <pin position="38" pad="PE2"/>
-            <pin position="39" pad="PE3"/>
-            <pin position="40" pad="PE4"/>
-            <pin position="41" pad="PE5"/>
-            <pin position="42" pad="PE6"/>
-            <pin position="43" pad="PE7"/>
-            <pin position="44" pad="GND"/>
-            <pin position="45" pad="VCC"/>
-            <pin position="46" pad="PF0"/>
-            <pin position="47" pad="PF1"/>
-            <pin position="48" pad="PF2"/>
-            <pin position="49" pad="PF3"/>
-            <pin position="50" pad="PF4"/>
-            <pin position="51" pad="PF5"/>
-            <pin position="52" pad="GND"/>
-            <pin position="53" pad="VCC"/>
-            <pin position="54" pad="PF6"/>
-            <pin position="55" pad="PF7"/>
-            <pin position="56" pad="PDI"/>
-            <pin position="57" pad="RESET"/>
-            <pin position="58" pad="PR0"/>
-            <pin position="59" pad="PR1"/>
-            <pin position="60" pad="GND"/>
-            <pin position="61" pad="AVCC"/>
-            <pin position="62" pad="PA0"/>
-            <pin position="63" pad="PA1"/>
-            <pin position="64" pad="PA2"/>
+            <pin position="1" pad-key="pa3"/>
+            <pin position="2" pad-key="pa4"/>
+            <pin position="3" pad-key="pa5"/>
+            <pin position="4" pad-key="pa6"/>
+            <pin position="5" pad-key="pa7"/>
+            <pin position="6" pad-key="pb0"/>
+            <pin position="7" pad-key="pb1"/>
+            <pin position="8" pad-key="pb2"/>
+            <pin position="9" pad-key="pb3"/>
+            <pin position="10" pad-key="pb4"/>
+            <pin position="11" pad-key="pb5"/>
+            <pin position="12" pad-key="pb6"/>
+            <pin position="13" pad-key="pb7"/>
+            <pin position="14" pad-key="gnd"/>
+            <pin position="15" pad-key="vcc"/>
+            <pin position="16" pad-key="pc0"/>
+            <pin position="17" pad-key="pc1"/>
+            <pin position="18" pad-key="pc2"/>
+            <pin position="19" pad-key="pc3"/>
+            <pin position="20" pad-key="pc4"/>
+            <pin position="21" pad-key="pc5"/>
+            <pin position="22" pad-key="pc6"/>
+            <pin position="23" pad-key="pc7"/>
+            <pin position="24" pad-key="gnd"/>
+            <pin position="25" pad-key="vcc"/>
+            <pin position="26" pad-key="pd0"/>
+            <pin position="27" pad-key="pd1"/>
+            <pin position="28" pad-key="pd2"/>
+            <pin position="29" pad-key="pd3"/>
+            <pin position="30" pad-key="pd4"/>
+            <pin position="31" pad-key="pd5"/>
+            <pin position="32" pad-key="pd6"/>
+            <pin position="33" pad-key="pd7"/>
+            <pin position="34" pad-key="gnd"/>
+            <pin position="35" pad-key="vcc"/>
+            <pin position="36" pad-key="pe0"/>
+            <pin position="37" pad-key="pe1"/>
+            <pin position="38" pad-key="pe2"/>
+            <pin position="39" pad-key="pe3"/>
+            <pin position="40" pad-key="pe4"/>
+            <pin position="41" pad-key="pe5"/>
+            <pin position="42" pad-key="pe6"/>
+            <pin position="43" pad-key="pe7"/>
+            <pin position="44" pad-key="gnd"/>
+            <pin position="45" pad-key="vcc"/>
+            <pin position="46" pad-key="pf0"/>
+            <pin position="47" pad-key="pf1"/>
+            <pin position="48" pad-key="pf2"/>
+            <pin position="49" pad-key="pf3"/>
+            <pin position="50" pad-key="pf4"/>
+            <pin position="51" pad-key="pf5"/>
+            <pin position="52" pad-key="gnd"/>
+            <pin position="53" pad-key="vcc"/>
+            <pin position="54" pad-key="pf6"/>
+            <pin position="55" pad-key="pf7"/>
+            <pin position="56" pad-key="pdi"/>
+            <pin position="57" pad-key="reset"/>
+            <pin position="58" pad-key="pr0"/>
+            <pin position="59" pad-key="pr1"/>
+            <pin position="60" pad-key="gnd"/>
+            <pin position="61" pad-key="avcc"/>
+            <pin position="62" pad-key="pa0"/>
+            <pin position="63" pad-key="pa1"/>
+            <pin position="64" pad-key="pa2"/>
         </pinout>
     </pinouts>
     <variants>
-        <variant name="ATXMEGA256A3B-AU" pinout-key="qfp_qfn_64" package="TQFP64"/>
-        <variant name="ATXMEGA256A3B-MH" pinout-key="qfp_qfn_64" package="QFN64"/>
+        <variant key="atxmega256a3b_au" name="ATXMEGA256A3B-AU" pinout-key="qfp_qfn_64"/>
+        <variant key="atxmega256a3b_mh" name="ATXMEGA256A3B-MH" pinout-key="qfp_qfn_64"/>
     </variants>
 </device>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA256A3BU.xml b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA256A3BU.xml
index 28462e6f..f4ba9bfe 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA256A3BU.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA256A3BU.xml
@@ -94,10 +94,10 @@
         <peripheral key="osc" name="OSC" module-key="i6079">
             <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"/>
-                <signal pad-id="tosc2" function="TOSC" group="TOSC2"/>
-                <signal pad-id="tosc1" function="TOSC" group="TOSC1"/>
+                <signal pad-key="pr0" function="XTAL" group="XTAL2"/>
+                <signal pad-key="pr1" function="XTAL" group="XTAL1"/>
+                <signal pad-key="tosc2" function="TOSC" group="TOSC2"/>
+                <signal pad-key="tosc1" function="TOSC" group="TOSC1"/>
             </signals>
         </peripheral>
         <peripheral key="dfllrc32m" name="DFLLRC32M" module-key="i6055">
@@ -121,19 +121,17 @@
         <peripheral key="portcfg" name="PORTCFG" module-key="i6075_portcfg">
             <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"/>
-                <signal pad-id="pd7" function="CLKOUTD" group="CLKOUT" field="CLKOUT"/>
-                <signal pad-id="pd4" function="CLKOUTD_ALT" group="CLKOUT" field="CLKEVPIN"/>
-                <signal pad-id="pe7" function="CLKOUTE" group="CLKOUT" field="CLKOUT"/>
-                <signal pad-id="pe4" function="CLKOUTE_ALT" group="CLKOUT" field="CLKEVPIN"/>
-                <signal pad-id="pc7" function="EVOUTC" group="EVOUT" field="EVOUT"/>
-                <signal pad-id="pc4" function="EVOUTC_ALT" group="EVOUT" field="CLKEVPIN"/>
-                <signal pad-id="pd7" function="EVOUTD" group="EVOUT" field="EVOUT"/>
-                <signal pad-id="pd4" function="EVOUTD_ALT" group="EVOUT" field="CLKEVPIN"/>
-                <signal pad-id="pe7" function="EVOUTE" group="EVOUT" field="EVOUT"/>
-                <signal pad-id="pe4" function="EVOUTE_ALT" group="EVOUT" field="CLKEVPIN"/>
-                <signal pad-id="pc6" function="RTCOUTC" group="RTCOUT"/>
+                <signal pad-key="pc7" function="CLKOUTC" group="CLKOUT" field="CLKOUT"/>
+                <signal pad-key="pc4" function="CLKOUTC_ALT" group="CLKOUT" field="CLKEVPIN"/>
+                <signal pad-key="pd7" function="CLKOUTD" group="CLKOUT" field="CLKOUT"/>
+                <signal pad-key="pd4" function="CLKOUTD_ALT" group="CLKOUT" field="CLKEVPIN"/>
+                <signal pad-key="pe4" function="CLKOUTE_ALT" group="CLKOUT" field="CLKEVPIN"/>
+                <signal pad-key="pc7" function="EVOUTC" group="EVOUT" field="EVOUT"/>
+                <signal pad-key="pc4" function="EVOUTC_ALT" group="EVOUT" field="CLKEVPIN"/>
+                <signal pad-key="pd7" function="EVOUTD" group="EVOUT" field="EVOUT"/>
+                <signal pad-key="pd4" function="EVOUTD_ALT" group="EVOUT" field="CLKEVPIN"/>
+                <signal pad-key="pe4" function="EVOUTE_ALT" group="EVOUT" field="CLKEVPIN"/>
+                <signal pad-key="pc6" function="RTCOUTC" group="RTCOUT"/>
             </signals>
         </peripheral>
         <peripheral key="aes" name="AES" module-key="i6096">
@@ -145,7 +143,7 @@
         <peripheral key="vbat" name="VBAT" module-key="i6107">
             <register-group-instance register-group-key="vbat" address-space-key="data" offset="0xF0"/>
             <signals>
-                <signal pad-id="vbat" function="VBAT" group="VBAT"/>
+                <signal pad-key="vbat" function="VBAT" group="VBAT"/>
             </signals>
         </peripheral>
         <peripheral key="dma" name="DMA" module-key="i3000">
@@ -160,78 +158,78 @@
         <peripheral key="adca" name="ADCA" module-key="i6099">
             <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"/>
-                <signal pad-id="pa2" index="2" function="ADC" group="ADC"/>
-                <signal pad-id="pa3" index="3" function="ADC" group="ADC"/>
-                <signal pad-id="pa4" index="4" function="ADC" group="ADC"/>
-                <signal pad-id="pa5" index="5" function="ADC" group="ADC"/>
-                <signal pad-id="pa6" index="6" function="ADC" group="ADC"/>
-                <signal pad-id="pa7" index="7" function="ADC" group="ADC"/>
-                <signal pad-id="pb0" index="8" function="ADC" group="ADC"/>
-                <signal pad-id="pb1" index="9" function="ADC" group="ADC"/>
-                <signal pad-id="pb2" index="10" function="ADC" group="ADC"/>
-                <signal pad-id="pb3" index="11" function="ADC" group="ADC"/>
-                <signal pad-id="pb4" index="12" function="ADC" group="ADC"/>
-                <signal pad-id="pb5" index="13" function="ADC" group="ADC"/>
-                <signal pad-id="pb6" index="14" function="ADC" group="ADC"/>
-                <signal pad-id="pb7" index="15" function="ADC" group="ADC"/>
-                <signal pad-id="pa0" index="0" function="AREF" group="REFA"/>
-                <signal pad-id="pb0" index="0" function="AREF" group="REFB"/>
+                <signal pad-key="pa0" index="0" function="ADC" group="ADC"/>
+                <signal pad-key="pa1" index="1" function="ADC" group="ADC"/>
+                <signal pad-key="pa2" index="2" function="ADC" group="ADC"/>
+                <signal pad-key="pa3" index="3" function="ADC" group="ADC"/>
+                <signal pad-key="pa4" index="4" function="ADC" group="ADC"/>
+                <signal pad-key="pa5" index="5" function="ADC" group="ADC"/>
+                <signal pad-key="pa6" index="6" function="ADC" group="ADC"/>
+                <signal pad-key="pa7" index="7" function="ADC" group="ADC"/>
+                <signal pad-key="pb0" index="8" function="ADC" group="ADC"/>
+                <signal pad-key="pb1" index="9" function="ADC" group="ADC"/>
+                <signal pad-key="pb2" index="10" function="ADC" group="ADC"/>
+                <signal pad-key="pb3" index="11" function="ADC" group="ADC"/>
+                <signal pad-key="pb4" index="12" function="ADC" group="ADC"/>
+                <signal pad-key="pb5" index="13" function="ADC" group="ADC"/>
+                <signal pad-key="pb6" index="14" function="ADC" group="ADC"/>
+                <signal pad-key="pb7" index="15" function="ADC" group="ADC"/>
+                <signal pad-key="pa0" index="0" function="AREF" group="REFA"/>
+                <signal pad-key="pb0" index="0" function="AREF" group="REFB"/>
             </signals>
         </peripheral>
         <peripheral key="adcb" name="ADCB" module-key="i6099">
             <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"/>
-                <signal pad-id="pb2" index="2" function="ADC" group="ADC"/>
-                <signal pad-id="pb3" index="3" function="ADC" group="ADC"/>
-                <signal pad-id="pb4" index="4" function="ADC" group="ADC"/>
-                <signal pad-id="pb5" index="5" function="ADC" group="ADC"/>
-                <signal pad-id="pb6" index="6" function="ADC" group="ADC"/>
-                <signal pad-id="pb7" index="7" function="ADC" group="ADC"/>
-                <signal pad-id="pa0" index="0" function="AREF" group="REFA"/>
-                <signal pad-id="pb0" index="0" function="AREF" group="REFB"/>
+                <signal pad-key="pb0" index="0" function="ADC" group="ADC"/>
+                <signal pad-key="pb1" index="1" function="ADC" group="ADC"/>
+                <signal pad-key="pb2" index="2" function="ADC" group="ADC"/>
+                <signal pad-key="pb3" index="3" function="ADC" group="ADC"/>
+                <signal pad-key="pb4" index="4" function="ADC" group="ADC"/>
+                <signal pad-key="pb5" index="5" function="ADC" group="ADC"/>
+                <signal pad-key="pb6" index="6" function="ADC" group="ADC"/>
+                <signal pad-key="pb7" index="7" function="ADC" group="ADC"/>
+                <signal pad-key="pa0" index="0" function="AREF" group="REFA"/>
+                <signal pad-key="pb0" index="0" function="AREF" group="REFB"/>
             </signals>
         </peripheral>
         <peripheral key="dacb" name="DACB" module-key="i6059">
             <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"/>
-                <signal pad-id="pa0" index="0" function="AREF" group="REFA"/>
-                <signal pad-id="pb0" index="0" function="AREF" group="REFB"/>
+                <signal pad-key="pb2" index="0" function="DAC" group="DAC"/>
+                <signal pad-key="pb3" index="1" function="DAC" group="DAC"/>
+                <signal pad-key="pa0" index="0" function="AREF" group="REFA"/>
+                <signal pad-key="pb0" index="0" function="AREF" group="REFB"/>
             </signals>
         </peripheral>
         <peripheral key="aca" name="ACA" module-key="i6077">
             <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"/>
-                <signal pad-id="pa2" index="2" function="AC" group="AC"/>
-                <signal pad-id="pa3" index="3" function="AC" group="AC"/>
-                <signal pad-id="pa4" index="4" function="AC" group="AC"/>
-                <signal pad-id="pa5" index="5" function="AC" group="AC"/>
-                <signal pad-id="pa6" index="6" function="AC" group="AC"/>
-                <signal pad-id="pa7" index="7" function="AC" group="AC"/>
-                <signal pad-id="pa6" index="1" function="ACOUT" group="ACOUT"/>
-                <signal pad-id="pa7" index="0" function="ACOUT" group="ACOUT"/>
+                <signal pad-key="pa0" index="0" function="AC" group="AC"/>
+                <signal pad-key="pa1" index="1" function="AC" group="AC"/>
+                <signal pad-key="pa2" index="2" function="AC" group="AC"/>
+                <signal pad-key="pa3" index="3" function="AC" group="AC"/>
+                <signal pad-key="pa4" index="4" function="AC" group="AC"/>
+                <signal pad-key="pa5" index="5" function="AC" group="AC"/>
+                <signal pad-key="pa6" index="6" function="AC" group="AC"/>
+                <signal pad-key="pa7" index="7" function="AC" group="AC"/>
+                <signal pad-key="pa6" index="1" function="ACOUT" group="ACOUT"/>
+                <signal pad-key="pa7" index="0" function="ACOUT" group="ACOUT"/>
             </signals>
         </peripheral>
         <peripheral key="acb" name="ACB" module-key="i6077">
             <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"/>
-                <signal pad-id="pb2" index="2" function="AC" group="AC"/>
-                <signal pad-id="pb3" index="3" function="AC" group="AC"/>
-                <signal pad-id="pb4" index="4" function="AC" group="AC"/>
-                <signal pad-id="pb5" index="5" function="AC" group="AC"/>
-                <signal pad-id="pb6" index="6" function="AC" group="AC"/>
-                <signal pad-id="pb7" index="7" function="AC" group="AC"/>
-                <signal pad-id="pb6" index="1" function="ACOUT" group="ACOUT"/>
-                <signal pad-id="pb7" index="0" function="ACOUT" group="ACOUT"/>
+                <signal pad-key="pb0" index="0" function="AC" group="AC"/>
+                <signal pad-key="pb1" index="1" function="AC" group="AC"/>
+                <signal pad-key="pb2" index="2" function="AC" group="AC"/>
+                <signal pad-key="pb3" index="3" function="AC" group="AC"/>
+                <signal pad-key="pb4" index="4" function="AC" group="AC"/>
+                <signal pad-key="pb5" index="5" function="AC" group="AC"/>
+                <signal pad-key="pb6" index="6" function="AC" group="AC"/>
+                <signal pad-key="pb7" index="7" function="AC" group="AC"/>
+                <signal pad-key="pb6" index="1" function="ACOUT" group="ACOUT"/>
+                <signal pad-key="pb7" index="0" function="ACOUT" group="ACOUT"/>
             </signals>
         </peripheral>
         <peripheral key="rtc32" name="RTC32" module-key="i6106">
@@ -240,199 +238,199 @@
         <peripheral key="twic" name="TWIC" module-key="i6089">
             <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"/>
-                <signal pad-id="pc0" function="TWI_EXT" group="SDAIN"/>
-                <signal pad-id="pc1" function="TWI_EXT" group="SCLIN"/>
-                <signal pad-id="pc2" function="TWI_EXT" group="SDAOUT"/>
-                <signal pad-id="pc3" function="TWI_EXT" group="SCLOUT"/>
+                <signal pad-key="pc0" function="TWI" group="SDA"/>
+                <signal pad-key="pc1" function="TWI" group="SCL"/>
+                <signal pad-key="pc0" function="TWI_EXT" group="SDAIN"/>
+                <signal pad-key="pc1" function="TWI_EXT" group="SCLIN"/>
+                <signal pad-key="pc2" function="TWI_EXT" group="SDAOUT"/>
+                <signal pad-key="pc3" function="TWI_EXT" group="SCLOUT"/>
             </signals>
         </peripheral>
         <peripheral key="twie" name="TWIE" module-key="i6089">
             <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"/>
+                <signal pad-key="pe0" function="TWI" group="SDA"/>
+                <signal pad-key="pe1" function="TWI" group="SCL"/>
             </signals>
         </peripheral>
         <peripheral key="usb" name="USB" module-key="i3005">
             <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"/>
+                <signal pad-key="pd6" function="USB" group="DN"/>
+                <signal pad-key="pd7" function="USB" group="DP"/>
             </signals>
         </peripheral>
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pa2" index="2" function="PORTA" group="P"/>
-                <signal pad-id="pa3" index="3" function="PORTA" group="P"/>
-                <signal pad-id="pa4" index="4" function="PORTA" group="P"/>
-                <signal pad-id="pa5" index="5" function="PORTA" group="P"/>
-                <signal pad-id="pa6" index="6" function="PORTA" group="P"/>
-                <signal pad-id="pa7" index="7" function="PORTA" group="P"/>
+                <signal pad-key="pa0" index="0" function="PORTA" group="P"/>
+                <signal pad-key="pa1" index="1" function="PORTA" group="P"/>
+                <signal pad-key="pa2" index="2" function="PORTA" group="P"/>
+                <signal pad-key="pa3" index="3" function="PORTA" group="P"/>
+                <signal pad-key="pa4" index="4" function="PORTA" group="P"/>
+                <signal pad-key="pa5" index="5" function="PORTA" group="P"/>
+                <signal pad-key="pa6" index="6" function="PORTA" group="P"/>
+                <signal pad-key="pa7" index="7" function="PORTA" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pb2" index="2" function="PORTB" group="P"/>
-                <signal pad-id="pb3" index="3" function="PORTB" group="P"/>
-                <signal pad-id="pb4" index="4" function="PORTB" group="P"/>
-                <signal pad-id="pb5" index="5" function="PORTB" group="P"/>
-                <signal pad-id="pb6" index="6" function="PORTB" group="P"/>
-                <signal pad-id="pb7" index="7" function="PORTB" group="P"/>
+                <signal pad-key="pb0" index="0" function="PORTB" group="P"/>
+                <signal pad-key="pb1" index="1" function="PORTB" group="P"/>
+                <signal pad-key="pb2" index="2" function="PORTB" group="P"/>
+                <signal pad-key="pb3" index="3" function="PORTB" group="P"/>
+                <signal pad-key="pb4" index="4" function="PORTB" group="P"/>
+                <signal pad-key="pb5" index="5" function="PORTB" group="P"/>
+                <signal pad-key="pb6" index="6" function="PORTB" group="P"/>
+                <signal pad-key="pb7" index="7" function="PORTB" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pc2" index="2" function="PORTC" group="P"/>
-                <signal pad-id="pc3" index="3" function="PORTC" group="P"/>
-                <signal pad-id="pc4" index="4" function="PORTC" group="P"/>
-                <signal pad-id="pc5" index="5" function="PORTC" group="P"/>
-                <signal pad-id="pc6" index="6" function="PORTC" group="P"/>
-                <signal pad-id="pc7" index="7" function="PORTC" group="P"/>
+                <signal pad-key="pc0" index="0" function="PORTC" group="P"/>
+                <signal pad-key="pc1" index="1" function="PORTC" group="P"/>
+                <signal pad-key="pc2" index="2" function="PORTC" group="P"/>
+                <signal pad-key="pc3" index="3" function="PORTC" group="P"/>
+                <signal pad-key="pc4" index="4" function="PORTC" group="P"/>
+                <signal pad-key="pc5" index="5" function="PORTC" group="P"/>
+                <signal pad-key="pc6" index="6" function="PORTC" group="P"/>
+                <signal pad-key="pc7" index="7" function="PORTC" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pd2" index="2" function="PORTD" group="P"/>
-                <signal pad-id="pd3" index="3" function="PORTD" group="P"/>
-                <signal pad-id="pd4" index="4" function="PORTD" group="P"/>
-                <signal pad-id="pd5" index="5" function="PORTD" group="P"/>
-                <signal pad-id="pd6" index="6" function="PORTD" group="P"/>
-                <signal pad-id="pd7" index="7" function="PORTD" group="P"/>
+                <signal pad-key="pd0" index="0" function="PORTD" group="P"/>
+                <signal pad-key="pd1" index="1" function="PORTD" group="P"/>
+                <signal pad-key="pd2" index="2" function="PORTD" group="P"/>
+                <signal pad-key="pd3" index="3" function="PORTD" group="P"/>
+                <signal pad-key="pd4" index="4" function="PORTD" group="P"/>
+                <signal pad-key="pd5" index="5" function="PORTD" group="P"/>
+                <signal pad-key="pd6" index="6" function="PORTD" group="P"/>
+                <signal pad-key="pd7" index="7" function="PORTD" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="porte" name="PORTE" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pe2" index="2" function="PORTE" group="P"/>
-                <signal pad-id="pe3" index="3" function="PORTE" group="P"/>
-                <signal pad-id="pe4" index="4" function="PORTE" group="P"/>
-                <signal pad-id="pe5" index="5" function="PORTE" group="P"/>
+                <signal pad-key="pe0" index="0" function="PORTE" group="P"/>
+                <signal pad-key="pe1" index="1" function="PORTE" group="P"/>
+                <signal pad-key="pe2" index="2" function="PORTE" group="P"/>
+                <signal pad-key="pe3" index="3" function="PORTE" group="P"/>
+                <signal pad-key="pe4" index="4" function="PORTE" group="P"/>
+                <signal pad-key="pe5" index="5" function="PORTE" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portf" name="PORTF" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pf2" index="2" function="PORTF" group="P"/>
-                <signal pad-id="pf3" index="3" function="PORTF" group="P"/>
-                <signal pad-id="pf4" index="4" function="PORTF" group="P"/>
-                <signal pad-id="pf6" index="6" function="PORTF" group="P"/>
-                <signal pad-id="pf7" index="7" function="PORTF" group="P"/>
+                <signal pad-key="pf0" index="0" function="PORTF" group="P"/>
+                <signal pad-key="pf1" index="1" function="PORTF" group="P"/>
+                <signal pad-key="pf2" index="2" function="PORTF" group="P"/>
+                <signal pad-key="pf3" index="3" function="PORTF" group="P"/>
+                <signal pad-key="pf4" index="4" function="PORTF" group="P"/>
+                <signal pad-key="pf6" index="6" function="PORTF" group="P"/>
+                <signal pad-key="pf7" index="7" function="PORTF" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portr" name="PORTR" module-key="gpio_port">
             <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"/>
+                <signal pad-key="pr0" index="0" function="PORTR" group="P"/>
+                <signal pad-key="pr1" index="1" function="PORTR" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="tcc0" name="TCC0" module-key="i6090_tc">
             <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"/>
-                <signal pad-id="pc2" function="TC0" group="OC0C" field="TC0C"/>
-                <signal pad-id="pc3" function="TC0" group="OC0D" field="TC0D"/>
-                <signal pad-id="pc4" function="TC0_ALT" group="OC0A" field="TC0A"/>
-                <signal pad-id="pc5" function="TC0_ALT" group="OC0B" field="TC0B"/>
-                <signal pad-id="pc6" function="TC0_ALT" group="OC0C" field="TC0C"/>
-                <signal pad-id="pc7" function="TC0_ALT" group="OC0D" field="TC0D"/>
+                <signal pad-key="pc0" function="TC0" group="OC0A" field="TC0A"/>
+                <signal pad-key="pc1" function="TC0" group="OC0B" field="TC0B"/>
+                <signal pad-key="pc2" function="TC0" group="OC0C" field="TC0C"/>
+                <signal pad-key="pc3" function="TC0" group="OC0D" field="TC0D"/>
+                <signal pad-key="pc4" function="TC0_ALT" group="OC0A" field="TC0A"/>
+                <signal pad-key="pc5" function="TC0_ALT" group="OC0B" field="TC0B"/>
+                <signal pad-key="pc6" function="TC0_ALT" group="OC0C" field="TC0C"/>
+                <signal pad-key="pc7" function="TC0_ALT" group="OC0D" field="TC0D"/>
             </signals>
         </peripheral>
         <peripheral key="tcc1" name="TCC1" module-key="i6090_tc">
             <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"/>
+                <signal pad-key="pc4" function="TC1" group="OC1A"/>
+                <signal pad-key="pc5" function="TC1" group="OC1B"/>
             </signals>
         </peripheral>
         <peripheral key="tcd0" name="TCD0" module-key="i6090_tc">
             <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"/>
-                <signal pad-id="pd2" function="TC0" group="OC0C" field="TC0C"/>
-                <signal pad-id="pd3" function="TC0" group="OC0D" field="TC0D"/>
-                <signal pad-id="pd4" function="TC0_ALT" group="OC0A" field="TC0A"/>
-                <signal pad-id="pd5" function="TC0_ALT" group="OC0B" field="TC0B"/>
-                <signal pad-id="pd6" function="TC0_ALT" group="OC0C" field="TC0C"/>
-                <signal pad-id="pd7" function="TC0_ALT" group="OC0D" field="TC0D"/>
+                <signal pad-key="pd0" function="TC0" group="OC0A" field="TC0A"/>
+                <signal pad-key="pd1" function="TC0" group="OC0B" field="TC0B"/>
+                <signal pad-key="pd2" function="TC0" group="OC0C" field="TC0C"/>
+                <signal pad-key="pd3" function="TC0" group="OC0D" field="TC0D"/>
+                <signal pad-key="pd4" function="TC0_ALT" group="OC0A" field="TC0A"/>
+                <signal pad-key="pd5" function="TC0_ALT" group="OC0B" field="TC0B"/>
+                <signal pad-key="pd6" function="TC0_ALT" group="OC0C" field="TC0C"/>
+                <signal pad-key="pd7" function="TC0_ALT" group="OC0D" field="TC0D"/>
             </signals>
         </peripheral>
         <peripheral key="tcd1" name="TCD1" module-key="i6090_tc">
             <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"/>
+                <signal pad-key="pd4" function="TC1" group="OC1A"/>
+                <signal pad-key="pd5" function="TC1" group="OC1B"/>
             </signals>
         </peripheral>
         <peripheral key="tce0" name="TCE0" module-key="i6090_tc">
             <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"/>
-                <signal pad-id="pe2" function="TC0" group="OC0C"/>
-                <signal pad-id="pe3" function="TC0" group="OC0D"/>
+                <signal pad-key="pe0" function="TC0" group="OC0A"/>
+                <signal pad-key="pe1" function="TC0" group="OC0B"/>
+                <signal pad-key="pe2" function="TC0" group="OC0C"/>
+                <signal pad-key="pe3" function="TC0" group="OC0D"/>
             </signals>
         </peripheral>
         <peripheral key="tce1" name="TCE1" module-key="i6090_tc">
             <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"/>
+                <signal pad-key="pe4" function="TC1" group="OC1A"/>
+                <signal pad-key="pe5" function="TC1" group="OC1B"/>
             </signals>
         </peripheral>
         <peripheral key="tcf0" name="TCF0" module-key="i6090_tc">
             <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"/>
-                <signal pad-id="pf2" function="TC0" group="OC0C"/>
-                <signal pad-id="pf3" function="TC0" group="OC0D"/>
+                <signal pad-key="pf0" function="TC0" group="OC0A"/>
+                <signal pad-key="pf1" function="TC0" group="OC0B"/>
+                <signal pad-key="pf2" function="TC0" group="OC0C"/>
+                <signal pad-key="pf3" function="TC0" group="OC0D"/>
             </signals>
         </peripheral>
         <peripheral key="tcc2" name="TCC2" module-key="i6090_tc2">
             <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"/>
-                <signal pad-id="pc2" function="TC2" group="LOC2C"/>
-                <signal pad-id="pc3" function="TC2" group="LOC2D"/>
-                <signal pad-id="pc4" function="TC2" group="HOC2A"/>
-                <signal pad-id="pc5" function="TC2" group="HOC2B"/>
-                <signal pad-id="pc6" function="TC2" group="HOC2C"/>
-                <signal pad-id="pc7" function="TC2" group="HOC2D"/>
+                <signal pad-key="pc0" function="TC2" group="LOC2A"/>
+                <signal pad-key="pc1" function="TC2" group="LOC2B"/>
+                <signal pad-key="pc2" function="TC2" group="LOC2C"/>
+                <signal pad-key="pc3" function="TC2" group="LOC2D"/>
+                <signal pad-key="pc4" function="TC2" group="HOC2A"/>
+                <signal pad-key="pc5" function="TC2" group="HOC2B"/>
+                <signal pad-key="pc6" function="TC2" group="HOC2C"/>
+                <signal pad-key="pc7" function="TC2" group="HOC2D"/>
             </signals>
         </peripheral>
         <peripheral key="tcd2" name="TCD2" module-key="i6090_tc2">
             <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"/>
-                <signal pad-id="pd2" function="TC2" group="LOC2C"/>
-                <signal pad-id="pd3" function="TC2" group="LOC2D"/>
-                <signal pad-id="pd4" function="TC2" group="HOC2A"/>
-                <signal pad-id="pd5" function="TC2" group="HOC2B"/>
-                <signal pad-id="pd6" function="TC2" group="HOC2C"/>
-                <signal pad-id="pd7" function="TC2" group="HOC2D"/>
+                <signal pad-key="pd0" function="TC2" group="LOC2A"/>
+                <signal pad-key="pd1" function="TC2" group="LOC2B"/>
+                <signal pad-key="pd2" function="TC2" group="LOC2C"/>
+                <signal pad-key="pd3" function="TC2" group="LOC2D"/>
+                <signal pad-key="pd4" function="TC2" group="HOC2A"/>
+                <signal pad-key="pd5" function="TC2" group="HOC2B"/>
+                <signal pad-key="pd6" function="TC2" group="HOC2C"/>
+                <signal pad-key="pd7" function="TC2" group="HOC2D"/>
             </signals>
         </peripheral>
         <peripheral key="tce2" name="TCE2" module-key="i6090_tc2">
@@ -444,14 +442,14 @@
         <peripheral key="awexc" name="AWEXC" module-key="i6090_awex">
             <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"/>
-                <signal pad-id="pc2" function="AWEX" group="OC0BLS"/>
-                <signal pad-id="pc3" function="AWEX" group="OC0BHS"/>
-                <signal pad-id="pc4" function="AWEX" group="OC0CLS"/>
-                <signal pad-id="pc5" function="AWEX" group="OC0CHS"/>
-                <signal pad-id="pc6" function="AWEX" group="OC0DLS"/>
-                <signal pad-id="pc7" function="AWEX" group="OC0DHS"/>
+                <signal pad-key="pc0" function="AWEX" group="OC0ALS"/>
+                <signal pad-key="pc1" function="AWEX" group="OC0AHS"/>
+                <signal pad-key="pc2" function="AWEX" group="OC0BLS"/>
+                <signal pad-key="pc3" function="AWEX" group="OC0BHS"/>
+                <signal pad-key="pc4" function="AWEX" group="OC0CLS"/>
+                <signal pad-key="pc5" function="AWEX" group="OC0CHS"/>
+                <signal pad-key="pc6" function="AWEX" group="OC0DLS"/>
+                <signal pad-key="pc7" function="AWEX" group="OC0DHS"/>
             </signals>
         </peripheral>
         <peripheral key="awexe" name="AWEXE" module-key="i6090_awex">
@@ -472,81 +470,81 @@
         <peripheral key="usartc0" name="USARTC0" module-key="i6090_usart">
             <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"/>
-                <signal pad-id="pc3" function="USART" group="TXD" field="USART0"/>
-                <signal pad-id="pc5" function="USART_ALT" group="XCK" field="USART0"/>
-                <signal pad-id="pc6" function="USART_ALT" group="RXD" field="USART0"/>
-                <signal pad-id="pc7" function="USART_ALT" group="TXD" field="USART0"/>
+                <signal pad-key="pc1" function="USART" group="XCK" field="USART0"/>
+                <signal pad-key="pc2" function="USART" group="RXD" field="USART0"/>
+                <signal pad-key="pc3" function="USART" group="TXD" field="USART0"/>
+                <signal pad-key="pc5" function="USART_ALT" group="XCK" field="USART0"/>
+                <signal pad-key="pc6" function="USART_ALT" group="RXD" field="USART0"/>
+                <signal pad-key="pc7" function="USART_ALT" group="TXD" field="USART0"/>
             </signals>
         </peripheral>
         <peripheral key="usartc1" name="USARTC1" module-key="i6090_usart">
             <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"/>
-                <signal pad-id="pd7" function="USART" group="TXD"/>
+                <signal pad-key="pd5" function="USART" group="XCK"/>
+                <signal pad-key="pd6" function="USART" group="RXD"/>
+                <signal pad-key="pd7" function="USART" group="TXD"/>
             </signals>
         </peripheral>
         <peripheral key="usartd0" name="USARTD0" module-key="i6090_usart">
             <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"/>
-                <signal pad-id="pd3" function="USART" group="TXD" field="USART0"/>
-                <signal pad-id="pd5" function="USART_ALT" group="XCK" field="USART0"/>
-                <signal pad-id="pd6" function="USART_ALT" group="RXD" field="USART0"/>
-                <signal pad-id="pd7" function="USART_ALT" group="TXD" field="USART0"/>
+                <signal pad-key="pd1" function="USART" group="XCK" field="USART0"/>
+                <signal pad-key="pd2" function="USART" group="RXD" field="USART0"/>
+                <signal pad-key="pd3" function="USART" group="TXD" field="USART0"/>
+                <signal pad-key="pd5" function="USART_ALT" group="XCK" field="USART0"/>
+                <signal pad-key="pd6" function="USART_ALT" group="RXD" field="USART0"/>
+                <signal pad-key="pd7" function="USART_ALT" group="TXD" field="USART0"/>
             </signals>
         </peripheral>
         <peripheral key="usartd1" name="USARTD1" module-key="i6090_usart">
             <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"/>
-                <signal pad-id="pd7" function="USART" group="TXD"/>
+                <signal pad-key="pd5" function="USART" group="XCK"/>
+                <signal pad-key="pd6" function="USART" group="RXD"/>
+                <signal pad-key="pd7" function="USART" group="TXD"/>
             </signals>
         </peripheral>
         <peripheral key="usarte0" name="USARTE0" module-key="i6090_usart">
             <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"/>
-                <signal pad-id="pe3" function="USART" group="TXD"/>
+                <signal pad-key="pe1" function="USART" group="XCK"/>
+                <signal pad-key="pe2" function="USART" group="RXD"/>
+                <signal pad-key="pe3" function="USART" group="TXD"/>
             </signals>
         </peripheral>
         <peripheral key="usartf0" name="USARTF0" module-key="i6090_usart">
             <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"/>
-                <signal pad-id="pf3" function="USART" group="TXD"/>
+                <signal pad-key="pf1" function="USART" group="XCK"/>
+                <signal pad-key="pf2" function="USART" group="RXD"/>
+                <signal pad-key="pf3" function="USART" group="TXD"/>
             </signals>
         </peripheral>
         <peripheral key="spic" name="SPIC" module-key="i6090_spi">
             <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"/>
-                <signal pad-id="pc6" function="SPI" group="MISO" field="SPI"/>
-                <signal pad-id="pc7" function="SPI" group="SCK" field="SPI"/>
-                <signal pad-id="pc4" function="SPI_ALT" group="SS" field="SPI"/>
-                <signal pad-id="pc5" function="SPI_ALT" group="SCK" field="SPI"/>
-                <signal pad-id="pc6" function="SPI_ALT" group="MISO" field="SPI"/>
-                <signal pad-id="pc7" function="SPI_ALT" group="MOSI" field="SPI"/>
+                <signal pad-key="pc4" function="SPI" group="SS" field="SPI"/>
+                <signal pad-key="pc5" function="SPI" group="MOSI" field="SPI"/>
+                <signal pad-key="pc6" function="SPI" group="MISO" field="SPI"/>
+                <signal pad-key="pc7" function="SPI" group="SCK" field="SPI"/>
+                <signal pad-key="pc4" function="SPI_ALT" group="SS" field="SPI"/>
+                <signal pad-key="pc5" function="SPI_ALT" group="SCK" field="SPI"/>
+                <signal pad-key="pc6" function="SPI_ALT" group="MISO" field="SPI"/>
+                <signal pad-key="pc7" function="SPI_ALT" group="MOSI" field="SPI"/>
             </signals>
         </peripheral>
         <peripheral key="spid" name="SPID" module-key="i6090_spi">
             <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"/>
-                <signal pad-id="pd6" function="SPI" group="MISO" field="SPI"/>
-                <signal pad-id="pd7" function="SPI" group="SCK" field="SPI"/>
-                <signal pad-id="pd4" function="SPI_ALT" group="SS" field="SPI"/>
-                <signal pad-id="pd5" function="SPI_ALT" group="SCK" field="SPI"/>
-                <signal pad-id="pd6" function="SPI_ALT" group="MISO" field="SPI"/>
-                <signal pad-id="pd7" function="SPI_ALT" group="MOSI" field="SPI"/>
+                <signal pad-key="pd4" function="SPI" group="SS" field="SPI"/>
+                <signal pad-key="pd5" function="SPI" group="MOSI" field="SPI"/>
+                <signal pad-key="pd6" function="SPI" group="MISO" field="SPI"/>
+                <signal pad-key="pd7" function="SPI" group="SCK" field="SPI"/>
+                <signal pad-key="pd4" function="SPI_ALT" group="SS" field="SPI"/>
+                <signal pad-key="pd5" function="SPI_ALT" group="SCK" field="SPI"/>
+                <signal pad-key="pd6" function="SPI_ALT" group="MISO" field="SPI"/>
+                <signal pad-key="pd7" function="SPI_ALT" group="MOSI" field="SPI"/>
             </signals>
         </peripheral>
         <peripheral key="ircom" name="IRCOM" module-key="i6090_ircom">
@@ -1928,76 +1926,133 @@
             </register-group>
         </module>
     </modules>
+    <pads>
+        <pad key="pa3" name="PA3"/>
+        <pad key="pa4" name="PA4"/>
+        <pad key="pa5" name="PA5"/>
+        <pad key="pa6" name="PA6"/>
+        <pad key="pa7" name="PA7"/>
+        <pad key="pb0" name="PB0"/>
+        <pad key="pb1" name="PB1"/>
+        <pad key="pb2" name="PB2"/>
+        <pad key="pb3" name="PB3"/>
+        <pad key="pb4" name="PB4"/>
+        <pad key="pb5" name="PB5"/>
+        <pad key="pb6" name="PB6"/>
+        <pad key="pb7" name="PB7"/>
+        <pad key="gnd" name="GND"/>
+        <pad key="vcc" name="VCC"/>
+        <pad key="pc0" name="PC0"/>
+        <pad key="pc1" name="PC1"/>
+        <pad key="pc2" name="PC2"/>
+        <pad key="pc3" name="PC3"/>
+        <pad key="pc4" name="PC4"/>
+        <pad key="pc5" name="PC5"/>
+        <pad key="pc6" name="PC6"/>
+        <pad key="pc7" name="PC7"/>
+        <pad key="pd0" name="PD0"/>
+        <pad key="pd1" name="PD1"/>
+        <pad key="pd2" name="PD2"/>
+        <pad key="pd3" name="PD3"/>
+        <pad key="pd4" name="PD4"/>
+        <pad key="pd5" name="PD5"/>
+        <pad key="pd6" name="PD6"/>
+        <pad key="pd7" name="PD7"/>
+        <pad key="pe0" name="PE0"/>
+        <pad key="pe1" name="PE1"/>
+        <pad key="pe2" name="PE2"/>
+        <pad key="pe3" name="PE3"/>
+        <pad key="pe4" name="PE4"/>
+        <pad key="pe5" name="PE5"/>
+        <pad key="tosc2" name="TOSC2"/>
+        <pad key="tosc1" name="TOSC1"/>
+        <pad key="pf0" name="PF0"/>
+        <pad key="pf1" name="PF1"/>
+        <pad key="pf2" name="PF2"/>
+        <pad key="pf3" name="PF3"/>
+        <pad key="pf4" name="PF4"/>
+        <pad key="vbat" name="VBAT"/>
+        <pad key="pf6" name="PF6"/>
+        <pad key="pf7" name="PF7"/>
+        <pad key="pdi" name="PDI"/>
+        <pad key="reset" name="RESET"/>
+        <pad key="pr0" name="PR0"/>
+        <pad key="pr1" name="PR1"/>
+        <pad key="avcc" name="AVCC"/>
+        <pad key="pa0" name="PA0"/>
+        <pad key="pa1" name="PA1"/>
+        <pad key="pa2" name="PA2"/>
+    </pads>
     <pinouts>
         <pinout key="qfp_qfn_64" name="QFP_QFN_64" type="qfn">
-            <pin position="1" pad="PA3"/>
-            <pin position="2" pad="PA4"/>
-            <pin position="3" pad="PA5"/>
-            <pin position="4" pad="PA6"/>
-            <pin position="5" pad="PA7"/>
-            <pin position="6" pad="PB0"/>
-            <pin position="7" pad="PB1"/>
-            <pin position="8" pad="PB2"/>
-            <pin position="9" pad="PB3"/>
-            <pin position="10" pad="PB4"/>
-            <pin position="11" pad="PB5"/>
-            <pin position="12" pad="PB6"/>
-            <pin position="13" pad="PB7"/>
-            <pin position="14" pad="GND"/>
-            <pin position="15" pad="VCC"/>
-            <pin position="16" pad="PC0"/>
-            <pin position="17" pad="PC1"/>
-            <pin position="18" pad="PC2"/>
-            <pin position="19" pad="PC3"/>
-            <pin position="20" pad="PC4"/>
-            <pin position="21" pad="PC5"/>
-            <pin position="22" pad="PC6"/>
-            <pin position="23" pad="PC7"/>
-            <pin position="24" pad="GND"/>
-            <pin position="25" pad="VCC"/>
-            <pin position="26" pad="PD0"/>
-            <pin position="27" pad="PD1"/>
-            <pin position="28" pad="PD2"/>
-            <pin position="29" pad="PD3"/>
-            <pin position="30" pad="PD4"/>
-            <pin position="31" pad="PD5"/>
-            <pin position="32" pad="PD6"/>
-            <pin position="33" pad="PD7"/>
-            <pin position="34" pad="GND"/>
-            <pin position="35" pad="VCC"/>
-            <pin position="36" pad="PE0"/>
-            <pin position="37" pad="PE1"/>
-            <pin position="38" pad="PE2"/>
-            <pin position="39" pad="PE3"/>
-            <pin position="40" pad="PE4"/>
-            <pin position="41" pad="PE5"/>
-            <pin position="42" pad="TOSC2"/>
-            <pin position="43" pad="TOSC1"/>
-            <pin position="44" pad="GND"/>
-            <pin position="45" pad="VCC"/>
-            <pin position="46" pad="PF0"/>
-            <pin position="47" pad="PF1"/>
-            <pin position="48" pad="PF2"/>
-            <pin position="49" pad="PF3"/>
-            <pin position="50" pad="PF4"/>
-            <pin position="51" pad="VBAT"/>
-            <pin position="52" pad="GND"/>
-            <pin position="53" pad="VCC"/>
-            <pin position="54" pad="PF6"/>
-            <pin position="55" pad="PF7"/>
-            <pin position="56" pad="PDI"/>
-            <pin position="57" pad="RESET"/>
-            <pin position="58" pad="PR0"/>
-            <pin position="59" pad="PR1"/>
-            <pin position="60" pad="GND"/>
-            <pin position="61" pad="AVCC"/>
-            <pin position="62" pad="PA0"/>
-            <pin position="63" pad="PA1"/>
-            <pin position="64" pad="PA2"/>
+            <pin position="1" pad-key="pa3"/>
+            <pin position="2" pad-key="pa4"/>
+            <pin position="3" pad-key="pa5"/>
+            <pin position="4" pad-key="pa6"/>
+            <pin position="5" pad-key="pa7"/>
+            <pin position="6" pad-key="pb0"/>
+            <pin position="7" pad-key="pb1"/>
+            <pin position="8" pad-key="pb2"/>
+            <pin position="9" pad-key="pb3"/>
+            <pin position="10" pad-key="pb4"/>
+            <pin position="11" pad-key="pb5"/>
+            <pin position="12" pad-key="pb6"/>
+            <pin position="13" pad-key="pb7"/>
+            <pin position="14" pad-key="gnd"/>
+            <pin position="15" pad-key="vcc"/>
+            <pin position="16" pad-key="pc0"/>
+            <pin position="17" pad-key="pc1"/>
+            <pin position="18" pad-key="pc2"/>
+            <pin position="19" pad-key="pc3"/>
+            <pin position="20" pad-key="pc4"/>
+            <pin position="21" pad-key="pc5"/>
+            <pin position="22" pad-key="pc6"/>
+            <pin position="23" pad-key="pc7"/>
+            <pin position="24" pad-key="gnd"/>
+            <pin position="25" pad-key="vcc"/>
+            <pin position="26" pad-key="pd0"/>
+            <pin position="27" pad-key="pd1"/>
+            <pin position="28" pad-key="pd2"/>
+            <pin position="29" pad-key="pd3"/>
+            <pin position="30" pad-key="pd4"/>
+            <pin position="31" pad-key="pd5"/>
+            <pin position="32" pad-key="pd6"/>
+            <pin position="33" pad-key="pd7"/>
+            <pin position="34" pad-key="gnd"/>
+            <pin position="35" pad-key="vcc"/>
+            <pin position="36" pad-key="pe0"/>
+            <pin position="37" pad-key="pe1"/>
+            <pin position="38" pad-key="pe2"/>
+            <pin position="39" pad-key="pe3"/>
+            <pin position="40" pad-key="pe4"/>
+            <pin position="41" pad-key="pe5"/>
+            <pin position="42" pad-key="tosc2"/>
+            <pin position="43" pad-key="tosc1"/>
+            <pin position="44" pad-key="gnd"/>
+            <pin position="45" pad-key="vcc"/>
+            <pin position="46" pad-key="pf0"/>
+            <pin position="47" pad-key="pf1"/>
+            <pin position="48" pad-key="pf2"/>
+            <pin position="49" pad-key="pf3"/>
+            <pin position="50" pad-key="pf4"/>
+            <pin position="51" pad-key="vbat"/>
+            <pin position="52" pad-key="gnd"/>
+            <pin position="53" pad-key="vcc"/>
+            <pin position="54" pad-key="pf6"/>
+            <pin position="55" pad-key="pf7"/>
+            <pin position="56" pad-key="pdi"/>
+            <pin position="57" pad-key="reset"/>
+            <pin position="58" pad-key="pr0"/>
+            <pin position="59" pad-key="pr1"/>
+            <pin position="60" pad-key="gnd"/>
+            <pin position="61" pad-key="avcc"/>
+            <pin position="62" pad-key="pa0"/>
+            <pin position="63" pad-key="pa1"/>
+            <pin position="64" pad-key="pa2"/>
         </pinout>
     </pinouts>
     <variants>
-        <variant name="ATxmega256A3BU-AU" pinout-key="qfp_qfn_64" package="TQFP64"/>
-        <variant name="ATxmega256A3BU-MH" pinout-key="qfp_qfn_64" package="QFN64"/>
+        <variant key="atxmega256a3bu_au" name="ATxmega256A3BU-AU" pinout-key="qfp_qfn_64"/>
+        <variant key="atxmega256a3bu_mh" name="ATxmega256A3BU-MH" pinout-key="qfp_qfn_64"/>
     </variants>
 </device>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA256A3U.xml b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA256A3U.xml
index feba7369..ccb9a683 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA256A3U.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA256A3U.xml
@@ -94,10 +94,10 @@
         <peripheral key="osc" name="OSC" module-key="i6079">
             <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"/>
-                <signal pad-id="pe2" function="TOSC" group="TOSC2"/>
-                <signal pad-id="pe3" function="TOSC" group="TOSC1"/>
+                <signal pad-key="pr0" function="XTAL" group="XTAL2"/>
+                <signal pad-key="pr1" function="XTAL" group="XTAL1"/>
+                <signal pad-key="pe2" function="TOSC" group="TOSC2"/>
+                <signal pad-key="pe3" function="TOSC" group="TOSC1"/>
             </signals>
         </peripheral>
         <peripheral key="dfllrc32m" name="DFLLRC32M" module-key="i6055">
@@ -121,19 +121,19 @@
         <peripheral key="portcfg" name="PORTCFG" module-key="i6075_portcfg">
             <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"/>
-                <signal pad-id="pd7" function="CLKOUTD" group="CLKOUT" field="CLKOUT"/>
-                <signal pad-id="pd4" function="CLKOUTD_ALT" group="CLKOUT" field="CLKEVPIN"/>
-                <signal pad-id="pe7" function="CLKOUTE" group="CLKOUT" field="CLKOUT"/>
-                <signal pad-id="pe4" function="CLKOUTE_ALT" group="CLKOUT" field="CLKEVPIN"/>
-                <signal pad-id="pc7" function="EVOUTC" group="EVOUT" field="EVOUT"/>
-                <signal pad-id="pc4" function="EVOUTC_ALT" group="EVOUT" field="CLKEVPIN"/>
-                <signal pad-id="pd7" function="EVOUTD" group="EVOUT" field="EVOUT"/>
-                <signal pad-id="pd4" function="EVOUTD_ALT" group="EVOUT" field="CLKEVPIN"/>
-                <signal pad-id="pe7" function="EVOUTE" group="EVOUT" field="EVOUT"/>
-                <signal pad-id="pe4" function="EVOUTE_ALT" group="EVOUT" field="CLKEVPIN"/>
-                <signal pad-id="pc6" function="RTCOUTC" group="RTCOUT"/>
+                <signal pad-key="pc7" function="CLKOUTC" group="CLKOUT" field="CLKOUT"/>
+                <signal pad-key="pc4" function="CLKOUTC_ALT" group="CLKOUT" field="CLKEVPIN"/>
+                <signal pad-key="pd7" function="CLKOUTD" group="CLKOUT" field="CLKOUT"/>
+                <signal pad-key="pd4" function="CLKOUTD_ALT" group="CLKOUT" field="CLKEVPIN"/>
+                <signal pad-key="pe7" function="CLKOUTE" group="CLKOUT" field="CLKOUT"/>
+                <signal pad-key="pe4" function="CLKOUTE_ALT" group="CLKOUT" field="CLKEVPIN"/>
+                <signal pad-key="pc7" function="EVOUTC" group="EVOUT" field="EVOUT"/>
+                <signal pad-key="pc4" function="EVOUTC_ALT" group="EVOUT" field="CLKEVPIN"/>
+                <signal pad-key="pd7" function="EVOUTD" group="EVOUT" field="EVOUT"/>
+                <signal pad-key="pd4" function="EVOUTD_ALT" group="EVOUT" field="CLKEVPIN"/>
+                <signal pad-key="pe7" function="EVOUTE" group="EVOUT" field="EVOUT"/>
+                <signal pad-key="pe4" function="EVOUTE_ALT" group="EVOUT" field="CLKEVPIN"/>
+                <signal pad-key="pc6" function="RTCOUTC" group="RTCOUT"/>
             </signals>
         </peripheral>
         <peripheral key="aes" name="AES" module-key="i6096">
@@ -154,78 +154,78 @@
         <peripheral key="adca" name="ADCA" module-key="i6099">
             <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"/>
-                <signal pad-id="pa2" index="2" function="ADC" group="ADC"/>
-                <signal pad-id="pa3" index="3" function="ADC" group="ADC"/>
-                <signal pad-id="pa4" index="4" function="ADC" group="ADC"/>
-                <signal pad-id="pa5" index="5" function="ADC" group="ADC"/>
-                <signal pad-id="pa6" index="6" function="ADC" group="ADC"/>
-                <signal pad-id="pa7" index="7" function="ADC" group="ADC"/>
-                <signal pad-id="pb0" index="8" function="ADC" group="ADC"/>
-                <signal pad-id="pb1" index="9" function="ADC" group="ADC"/>
-                <signal pad-id="pb2" index="10" function="ADC" group="ADC"/>
-                <signal pad-id="pb3" index="11" function="ADC" group="ADC"/>
-                <signal pad-id="pb4" index="12" function="ADC" group="ADC"/>
-                <signal pad-id="pb5" index="13" function="ADC" group="ADC"/>
-                <signal pad-id="pb6" index="14" function="ADC" group="ADC"/>
-                <signal pad-id="pb7" index="15" function="ADC" group="ADC"/>
-                <signal pad-id="pa0" index="0" function="AREF" group="REFA"/>
-                <signal pad-id="pb0" index="0" function="AREF" group="REFB"/>
+                <signal pad-key="pa0" index="0" function="ADC" group="ADC"/>
+                <signal pad-key="pa1" index="1" function="ADC" group="ADC"/>
+                <signal pad-key="pa2" index="2" function="ADC" group="ADC"/>
+                <signal pad-key="pa3" index="3" function="ADC" group="ADC"/>
+                <signal pad-key="pa4" index="4" function="ADC" group="ADC"/>
+                <signal pad-key="pa5" index="5" function="ADC" group="ADC"/>
+                <signal pad-key="pa6" index="6" function="ADC" group="ADC"/>
+                <signal pad-key="pa7" index="7" function="ADC" group="ADC"/>
+                <signal pad-key="pb0" index="8" function="ADC" group="ADC"/>
+                <signal pad-key="pb1" index="9" function="ADC" group="ADC"/>
+                <signal pad-key="pb2" index="10" function="ADC" group="ADC"/>
+                <signal pad-key="pb3" index="11" function="ADC" group="ADC"/>
+                <signal pad-key="pb4" index="12" function="ADC" group="ADC"/>
+                <signal pad-key="pb5" index="13" function="ADC" group="ADC"/>
+                <signal pad-key="pb6" index="14" function="ADC" group="ADC"/>
+                <signal pad-key="pb7" index="15" function="ADC" group="ADC"/>
+                <signal pad-key="pa0" index="0" function="AREF" group="REFA"/>
+                <signal pad-key="pb0" index="0" function="AREF" group="REFB"/>
             </signals>
         </peripheral>
         <peripheral key="adcb" name="ADCB" module-key="i6099">
             <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"/>
-                <signal pad-id="pb2" index="2" function="ADC" group="ADC"/>
-                <signal pad-id="pb3" index="3" function="ADC" group="ADC"/>
-                <signal pad-id="pb4" index="4" function="ADC" group="ADC"/>
-                <signal pad-id="pb5" index="5" function="ADC" group="ADC"/>
-                <signal pad-id="pb6" index="6" function="ADC" group="ADC"/>
-                <signal pad-id="pb7" index="7" function="ADC" group="ADC"/>
-                <signal pad-id="pa0" index="0" function="AREF" group="REFA"/>
-                <signal pad-id="pb0" index="0" function="AREF" group="REFB"/>
+                <signal pad-key="pb0" index="0" function="ADC" group="ADC"/>
+                <signal pad-key="pb1" index="1" function="ADC" group="ADC"/>
+                <signal pad-key="pb2" index="2" function="ADC" group="ADC"/>
+                <signal pad-key="pb3" index="3" function="ADC" group="ADC"/>
+                <signal pad-key="pb4" index="4" function="ADC" group="ADC"/>
+                <signal pad-key="pb5" index="5" function="ADC" group="ADC"/>
+                <signal pad-key="pb6" index="6" function="ADC" group="ADC"/>
+                <signal pad-key="pb7" index="7" function="ADC" group="ADC"/>
+                <signal pad-key="pa0" index="0" function="AREF" group="REFA"/>
+                <signal pad-key="pb0" index="0" function="AREF" group="REFB"/>
             </signals>
         </peripheral>
         <peripheral key="dacb" name="DACB" module-key="i6059">
             <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"/>
-                <signal pad-id="pa0" index="0" function="AREF" group="REFA"/>
-                <signal pad-id="pb0" index="0" function="AREF" group="REFB"/>
+                <signal pad-key="pb2" index="0" function="DAC" group="DAC"/>
+                <signal pad-key="pb3" index="1" function="DAC" group="DAC"/>
+                <signal pad-key="pa0" index="0" function="AREF" group="REFA"/>
+                <signal pad-key="pb0" index="0" function="AREF" group="REFB"/>
             </signals>
         </peripheral>
         <peripheral key="aca" name="ACA" module-key="i6077">
             <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"/>
-                <signal pad-id="pa2" index="2" function="AC" group="AC"/>
-                <signal pad-id="pa3" index="3" function="AC" group="AC"/>
-                <signal pad-id="pa4" index="4" function="AC" group="AC"/>
-                <signal pad-id="pa5" index="5" function="AC" group="AC"/>
-                <signal pad-id="pa6" index="6" function="AC" group="AC"/>
-                <signal pad-id="pa7" index="7" function="AC" group="AC"/>
-                <signal pad-id="pa6" index="1" function="ACOUT" group="ACOUT"/>
-                <signal pad-id="pa7" index="0" function="ACOUT" group="ACOUT"/>
+                <signal pad-key="pa0" index="0" function="AC" group="AC"/>
+                <signal pad-key="pa1" index="1" function="AC" group="AC"/>
+                <signal pad-key="pa2" index="2" function="AC" group="AC"/>
+                <signal pad-key="pa3" index="3" function="AC" group="AC"/>
+                <signal pad-key="pa4" index="4" function="AC" group="AC"/>
+                <signal pad-key="pa5" index="5" function="AC" group="AC"/>
+                <signal pad-key="pa6" index="6" function="AC" group="AC"/>
+                <signal pad-key="pa7" index="7" function="AC" group="AC"/>
+                <signal pad-key="pa6" index="1" function="ACOUT" group="ACOUT"/>
+                <signal pad-key="pa7" index="0" function="ACOUT" group="ACOUT"/>
             </signals>
         </peripheral>
         <peripheral key="acb" name="ACB" module-key="i6077">
             <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"/>
-                <signal pad-id="pb2" index="2" function="AC" group="AC"/>
-                <signal pad-id="pb3" index="3" function="AC" group="AC"/>
-                <signal pad-id="pb4" index="4" function="AC" group="AC"/>
-                <signal pad-id="pb5" index="5" function="AC" group="AC"/>
-                <signal pad-id="pb6" index="6" function="AC" group="AC"/>
-                <signal pad-id="pb7" index="7" function="AC" group="AC"/>
-                <signal pad-id="pb6" index="1" function="ACOUT" group="ACOUT"/>
-                <signal pad-id="pb7" index="0" function="ACOUT" group="ACOUT"/>
+                <signal pad-key="pb0" index="0" function="AC" group="AC"/>
+                <signal pad-key="pb1" index="1" function="AC" group="AC"/>
+                <signal pad-key="pb2" index="2" function="AC" group="AC"/>
+                <signal pad-key="pb3" index="3" function="AC" group="AC"/>
+                <signal pad-key="pb4" index="4" function="AC" group="AC"/>
+                <signal pad-key="pb5" index="5" function="AC" group="AC"/>
+                <signal pad-key="pb6" index="6" function="AC" group="AC"/>
+                <signal pad-key="pb7" index="7" function="AC" group="AC"/>
+                <signal pad-key="pb6" index="1" function="ACOUT" group="ACOUT"/>
+                <signal pad-key="pb7" index="0" function="ACOUT" group="ACOUT"/>
             </signals>
         </peripheral>
         <peripheral key="rtc" name="RTC" module-key="i6093">
@@ -234,262 +234,262 @@
         <peripheral key="twic" name="TWIC" module-key="i6089">
             <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"/>
-                <signal pad-id="pc0" function="TWI_EXT" group="SDAIN"/>
-                <signal pad-id="pc1" function="TWI_EXT" group="SCLIN"/>
-                <signal pad-id="pc2" function="TWI_EXT" group="SDAOUT"/>
-                <signal pad-id="pc3" function="TWI_EXT" group="SCLOUT"/>
+                <signal pad-key="pc0" function="TWI" group="SDA"/>
+                <signal pad-key="pc1" function="TWI" group="SCL"/>
+                <signal pad-key="pc0" function="TWI_EXT" group="SDAIN"/>
+                <signal pad-key="pc1" function="TWI_EXT" group="SCLIN"/>
+                <signal pad-key="pc2" function="TWI_EXT" group="SDAOUT"/>
+                <signal pad-key="pc3" function="TWI_EXT" group="SCLOUT"/>
             </signals>
         </peripheral>
         <peripheral key="twie" name="TWIE" module-key="i6089">
             <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"/>
-                <signal pad-id="pe0" function="TWI_EXT" group="SDAIN"/>
-                <signal pad-id="pe1" function="TWI_EXT" group="SCLIN"/>
-                <signal pad-id="pe2" function="TWI_EXT" group="SDAOUT"/>
-                <signal pad-id="pe3" function="TWI_EXT" group="SCLOUT"/>
+                <signal pad-key="pe0" function="TWI" group="SDA"/>
+                <signal pad-key="pe1" function="TWI" group="SCL"/>
+                <signal pad-key="pe0" function="TWI_EXT" group="SDAIN"/>
+                <signal pad-key="pe1" function="TWI_EXT" group="SCLIN"/>
+                <signal pad-key="pe2" function="TWI_EXT" group="SDAOUT"/>
+                <signal pad-key="pe3" function="TWI_EXT" group="SCLOUT"/>
             </signals>
         </peripheral>
         <peripheral key="usb" name="USB" module-key="i3005">
             <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"/>
+                <signal pad-key="pd6" function="USB" group="DN"/>
+                <signal pad-key="pd7" function="USB" group="DP"/>
             </signals>
         </peripheral>
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pa2" index="2" function="PORTA" group="P"/>
-                <signal pad-id="pa3" index="3" function="PORTA" group="P"/>
-                <signal pad-id="pa4" index="4" function="PORTA" group="P"/>
-                <signal pad-id="pa5" index="5" function="PORTA" group="P"/>
-                <signal pad-id="pa6" index="6" function="PORTA" group="P"/>
-                <signal pad-id="pa7" index="7" function="PORTA" group="P"/>
+                <signal pad-key="pa0" index="0" function="PORTA" group="P"/>
+                <signal pad-key="pa1" index="1" function="PORTA" group="P"/>
+                <signal pad-key="pa2" index="2" function="PORTA" group="P"/>
+                <signal pad-key="pa3" index="3" function="PORTA" group="P"/>
+                <signal pad-key="pa4" index="4" function="PORTA" group="P"/>
+                <signal pad-key="pa5" index="5" function="PORTA" group="P"/>
+                <signal pad-key="pa6" index="6" function="PORTA" group="P"/>
+                <signal pad-key="pa7" index="7" function="PORTA" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pb2" index="2" function="PORTB" group="P"/>
-                <signal pad-id="pb3" index="3" function="PORTB" group="P"/>
-                <signal pad-id="pb4" index="4" function="PORTB" group="P"/>
-                <signal pad-id="pb5" index="5" function="PORTB" group="P"/>
-                <signal pad-id="pb6" index="6" function="PORTB" group="P"/>
-                <signal pad-id="pb7" index="7" function="PORTB" group="P"/>
+                <signal pad-key="pb0" index="0" function="PORTB" group="P"/>
+                <signal pad-key="pb1" index="1" function="PORTB" group="P"/>
+                <signal pad-key="pb2" index="2" function="PORTB" group="P"/>
+                <signal pad-key="pb3" index="3" function="PORTB" group="P"/>
+                <signal pad-key="pb4" index="4" function="PORTB" group="P"/>
+                <signal pad-key="pb5" index="5" function="PORTB" group="P"/>
+                <signal pad-key="pb6" index="6" function="PORTB" group="P"/>
+                <signal pad-key="pb7" index="7" function="PORTB" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pc2" index="2" function="PORTC" group="P"/>
-                <signal pad-id="pc3" index="3" function="PORTC" group="P"/>
-                <signal pad-id="pc4" index="4" function="PORTC" group="P"/>
-                <signal pad-id="pc5" index="5" function="PORTC" group="P"/>
-                <signal pad-id="pc6" index="6" function="PORTC" group="P"/>
-                <signal pad-id="pc7" index="7" function="PORTC" group="P"/>
+                <signal pad-key="pc0" index="0" function="PORTC" group="P"/>
+                <signal pad-key="pc1" index="1" function="PORTC" group="P"/>
+                <signal pad-key="pc2" index="2" function="PORTC" group="P"/>
+                <signal pad-key="pc3" index="3" function="PORTC" group="P"/>
+                <signal pad-key="pc4" index="4" function="PORTC" group="P"/>
+                <signal pad-key="pc5" index="5" function="PORTC" group="P"/>
+                <signal pad-key="pc6" index="6" function="PORTC" group="P"/>
+                <signal pad-key="pc7" index="7" function="PORTC" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pd2" index="2" function="PORTD" group="P"/>
-                <signal pad-id="pd3" index="3" function="PORTD" group="P"/>
-                <signal pad-id="pd4" index="4" function="PORTD" group="P"/>
-                <signal pad-id="pd5" index="5" function="PORTD" group="P"/>
-                <signal pad-id="pd6" index="6" function="PORTD" group="P"/>
-                <signal pad-id="pd7" index="7" function="PORTD" group="P"/>
+                <signal pad-key="pd0" index="0" function="PORTD" group="P"/>
+                <signal pad-key="pd1" index="1" function="PORTD" group="P"/>
+                <signal pad-key="pd2" index="2" function="PORTD" group="P"/>
+                <signal pad-key="pd3" index="3" function="PORTD" group="P"/>
+                <signal pad-key="pd4" index="4" function="PORTD" group="P"/>
+                <signal pad-key="pd5" index="5" function="PORTD" group="P"/>
+                <signal pad-key="pd6" index="6" function="PORTD" group="P"/>
+                <signal pad-key="pd7" index="7" function="PORTD" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="porte" name="PORTE" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pe2" index="2" function="PORTE" group="P"/>
-                <signal pad-id="pe3" index="3" function="PORTE" group="P"/>
-                <signal pad-id="pe4" index="4" function="PORTE" group="P"/>
-                <signal pad-id="pe5" index="5" function="PORTE" group="P"/>
-                <signal pad-id="pe6" index="6" function="PORTE" group="P"/>
-                <signal pad-id="pe7" index="7" function="PORTE" group="P"/>
+                <signal pad-key="pe0" index="0" function="PORTE" group="P"/>
+                <signal pad-key="pe1" index="1" function="PORTE" group="P"/>
+                <signal pad-key="pe2" index="2" function="PORTE" group="P"/>
+                <signal pad-key="pe3" index="3" function="PORTE" group="P"/>
+                <signal pad-key="pe4" index="4" function="PORTE" group="P"/>
+                <signal pad-key="pe5" index="5" function="PORTE" group="P"/>
+                <signal pad-key="pe6" index="6" function="PORTE" group="P"/>
+                <signal pad-key="pe7" index="7" function="PORTE" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portf" name="PORTF" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pf2" index="2" function="PORTF" group="P"/>
-                <signal pad-id="pf3" index="3" function="PORTF" group="P"/>
-                <signal pad-id="pf4" index="4" function="PORTF" group="P"/>
-                <signal pad-id="pf5" index="5" function="PORTF" group="P"/>
-                <signal pad-id="pf6" index="6" function="PORTF" group="P"/>
-                <signal pad-id="pf7" index="7" function="PORTF" group="P"/>
+                <signal pad-key="pf0" index="0" function="PORTF" group="P"/>
+                <signal pad-key="pf1" index="1" function="PORTF" group="P"/>
+                <signal pad-key="pf2" index="2" function="PORTF" group="P"/>
+                <signal pad-key="pf3" index="3" function="PORTF" group="P"/>
+                <signal pad-key="pf4" index="4" function="PORTF" group="P"/>
+                <signal pad-key="pf5" index="5" function="PORTF" group="P"/>
+                <signal pad-key="pf6" index="6" function="PORTF" group="P"/>
+                <signal pad-key="pf7" index="7" function="PORTF" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portr" name="PORTR" module-key="gpio_port">
             <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"/>
+                <signal pad-key="pr0" index="0" function="PORTR" group="P"/>
+                <signal pad-key="pr1" index="1" function="PORTR" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="tcc0" name="TCC0" module-key="i6090_tc">
             <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"/>
-                <signal pad-id="pc2" function="TC0" group="OC0C" field="TC0C"/>
-                <signal pad-id="pc3" function="TC0" group="OC0D" field="TC0D"/>
-                <signal pad-id="pc4" function="TC0_ALT" group="OC0A" field="TC0A"/>
-                <signal pad-id="pc5" function="TC0_ALT" group="OC0B" field="TC0B"/>
-                <signal pad-id="pc6" function="TC0_ALT" group="OC0C" field="TC0C"/>
-                <signal pad-id="pc7" function="TC0_ALT" group="OC0D" field="TC0D"/>
+                <signal pad-key="pc0" function="TC0" group="OC0A" field="TC0A"/>
+                <signal pad-key="pc1" function="TC0" group="OC0B" field="TC0B"/>
+                <signal pad-key="pc2" function="TC0" group="OC0C" field="TC0C"/>
+                <signal pad-key="pc3" function="TC0" group="OC0D" field="TC0D"/>
+                <signal pad-key="pc4" function="TC0_ALT" group="OC0A" field="TC0A"/>
+                <signal pad-key="pc5" function="TC0_ALT" group="OC0B" field="TC0B"/>
+                <signal pad-key="pc6" function="TC0_ALT" group="OC0C" field="TC0C"/>
+                <signal pad-key="pc7" function="TC0_ALT" group="OC0D" field="TC0D"/>
             </signals>
         </peripheral>
         <peripheral key="tcc1" name="TCC1" module-key="i6090_tc">
             <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"/>
+                <signal pad-key="pc4" function="TC1" group="OC1A"/>
+                <signal pad-key="pc5" function="TC1" group="OC1B"/>
             </signals>
         </peripheral>
         <peripheral key="tcd0" name="TCD0" module-key="i6090_tc">
             <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"/>
-                <signal pad-id="pd2" function="TC0" group="OC0C" field="TC0C"/>
-                <signal pad-id="pd3" function="TC0" group="OC0D" field="TC0D"/>
-                <signal pad-id="pd4" function="TC0_ALT" group="OC0A" field="TC0A"/>
-                <signal pad-id="pd5" function="TC0_ALT" group="OC0B" field="TC0B"/>
-                <signal pad-id="pd6" function="TC0_ALT" group="OC0C" field="TC0C"/>
-                <signal pad-id="pd7" function="TC0_ALT" group="OC0D" field="TC0D"/>
+                <signal pad-key="pd0" function="TC0" group="OC0A" field="TC0A"/>
+                <signal pad-key="pd1" function="TC0" group="OC0B" field="TC0B"/>
+                <signal pad-key="pd2" function="TC0" group="OC0C" field="TC0C"/>
+                <signal pad-key="pd3" function="TC0" group="OC0D" field="TC0D"/>
+                <signal pad-key="pd4" function="TC0_ALT" group="OC0A" field="TC0A"/>
+                <signal pad-key="pd5" function="TC0_ALT" group="OC0B" field="TC0B"/>
+                <signal pad-key="pd6" function="TC0_ALT" group="OC0C" field="TC0C"/>
+                <signal pad-key="pd7" function="TC0_ALT" group="OC0D" field="TC0D"/>
             </signals>
         </peripheral>
         <peripheral key="tcd1" name="TCD1" module-key="i6090_tc">
             <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"/>
+                <signal pad-key="pd4" function="TC1" group="OC1A"/>
+                <signal pad-key="pd5" function="TC1" group="OC1B"/>
             </signals>
         </peripheral>
         <peripheral key="tce0" name="TCE0" module-key="i6090_tc">
             <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"/>
-                <signal pad-id="pe2" function="TC0" group="OC0C" field="TC0C"/>
-                <signal pad-id="pe3" function="TC0" group="OC0D" field="TC0D"/>
-                <signal pad-id="pe4" function="TC0_ALT" group="OC0A" field="TC0A"/>
-                <signal pad-id="pe5" function="TC0_ALT" group="OC0B" field="TC0B"/>
-                <signal pad-id="pe6" function="TC0_ALT" group="OC0C" field="TC0C"/>
-                <signal pad-id="pe7" function="TC0_ALT" group="OC0D" field="TC0D"/>
+                <signal pad-key="pe0" function="TC0" group="OC0A" field="TC0A"/>
+                <signal pad-key="pe1" function="TC0" group="OC0B" field="TC0B"/>
+                <signal pad-key="pe2" function="TC0" group="OC0C" field="TC0C"/>
+                <signal pad-key="pe3" function="TC0" group="OC0D" field="TC0D"/>
+                <signal pad-key="pe4" function="TC0_ALT" group="OC0A" field="TC0A"/>
+                <signal pad-key="pe5" function="TC0_ALT" group="OC0B" field="TC0B"/>
+                <signal pad-key="pe6" function="TC0_ALT" group="OC0C" field="TC0C"/>
+                <signal pad-key="pe7" function="TC0_ALT" group="OC0D" field="TC0D"/>
             </signals>
         </peripheral>
         <peripheral key="tce1" name="TCE1" module-key="i6090_tc">
             <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"/>
+                <signal pad-key="pe4" function="TC1" group="OC1A"/>
+                <signal pad-key="pe5" function="TC1" group="OC1B"/>
             </signals>
         </peripheral>
         <peripheral key="tcf0" name="TCF0" module-key="i6090_tc">
             <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"/>
-                <signal pad-id="pf2" function="TC0" group="OC0C"/>
-                <signal pad-id="pf3" function="TC0" group="OC0D"/>
+                <signal pad-key="pf0" function="TC0" group="OC0A"/>
+                <signal pad-key="pf1" function="TC0" group="OC0B"/>
+                <signal pad-key="pf2" function="TC0" group="OC0C"/>
+                <signal pad-key="pf3" function="TC0" group="OC0D"/>
             </signals>
         </peripheral>
         <peripheral key="tcc2" name="TCC2" module-key="i6090_tc2">
             <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"/>
-                <signal pad-id="pc2" function="TC2" group="LOC2C"/>
-                <signal pad-id="pc3" function="TC2" group="LOC2D"/>
-                <signal pad-id="pc4" function="TC2" group="HOC2A"/>
-                <signal pad-id="pc5" function="TC2" group="HOC2B"/>
-                <signal pad-id="pc6" function="TC2" group="HOC2C"/>
-                <signal pad-id="pc7" function="TC2" group="HOC2D"/>
+                <signal pad-key="pc0" function="TC2" group="LOC2A"/>
+                <signal pad-key="pc1" function="TC2" group="LOC2B"/>
+                <signal pad-key="pc2" function="TC2" group="LOC2C"/>
+                <signal pad-key="pc3" function="TC2" group="LOC2D"/>
+                <signal pad-key="pc4" function="TC2" group="HOC2A"/>
+                <signal pad-key="pc5" function="TC2" group="HOC2B"/>
+                <signal pad-key="pc6" function="TC2" group="HOC2C"/>
+                <signal pad-key="pc7" function="TC2" group="HOC2D"/>
             </signals>
         </peripheral>
         <peripheral key="tcd2" name="TCD2" module-key="i6090_tc2">
             <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"/>
-                <signal pad-id="pd2" function="TC2" group="LOC2C"/>
-                <signal pad-id="pd3" function="TC2" group="LOC2D"/>
-                <signal pad-id="pd4" function="TC2" group="HOC2A"/>
-                <signal pad-id="pd5" function="TC2" group="HOC2B"/>
-                <signal pad-id="pd6" function="TC2" group="HOC2C"/>
-                <signal pad-id="pd7" function="TC2" group="HOC2D"/>
+                <signal pad-key="pd0" function="TC2" group="LOC2A"/>
+                <signal pad-key="pd1" function="TC2" group="LOC2B"/>
+                <signal pad-key="pd2" function="TC2" group="LOC2C"/>
+                <signal pad-key="pd3" function="TC2" group="LOC2D"/>
+                <signal pad-key="pd4" function="TC2" group="HOC2A"/>
+                <signal pad-key="pd5" function="TC2" group="HOC2B"/>
+                <signal pad-key="pd6" function="TC2" group="HOC2C"/>
+                <signal pad-key="pd7" function="TC2" group="HOC2D"/>
             </signals>
         </peripheral>
         <peripheral key="tce2" name="TCE2" module-key="i6090_tc2">
             <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"/>
-                <signal pad-id="pe2" function="TC2" group="LOC2C"/>
-                <signal pad-id="pe3" function="TC2" group="LOC2D"/>
-                <signal pad-id="pe4" function="TC2" group="HOC2A"/>
-                <signal pad-id="pe5" function="TC2" group="HOC2B"/>
-                <signal pad-id="pe6" function="TC2" group="HOC2C"/>
-                <signal pad-id="pe7" function="TC2" group="HOC2D"/>
+                <signal pad-key="pe0" function="TC2" group="LOC2A"/>
+                <signal pad-key="pe1" function="TC2" group="LOC2B"/>
+                <signal pad-key="pe2" function="TC2" group="LOC2C"/>
+                <signal pad-key="pe3" function="TC2" group="LOC2D"/>
+                <signal pad-key="pe4" function="TC2" group="HOC2A"/>
+                <signal pad-key="pe5" function="TC2" group="HOC2B"/>
+                <signal pad-key="pe6" function="TC2" group="HOC2C"/>
+                <signal pad-key="pe7" function="TC2" group="HOC2D"/>
             </signals>
         </peripheral>
         <peripheral key="tcf2" name="TCF2" module-key="i6090_tc2">
             <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"/>
-                <signal pad-id="pf2" function="TC2" group="LOC2C"/>
-                <signal pad-id="pf3" function="TC2" group="LOC2D"/>
-                <signal pad-id="pf4" function="TC2" group="HOC2A"/>
-                <signal pad-id="pf5" function="TC2" group="HOC2B"/>
-                <signal pad-id="pf6" function="TC2" group="HOC2C"/>
-                <signal pad-id="pf7" function="TC2" group="HOC2D"/>
+                <signal pad-key="pf0" function="TC2" group="LOC2A"/>
+                <signal pad-key="pf1" function="TC2" group="LOC2B"/>
+                <signal pad-key="pf2" function="TC2" group="LOC2C"/>
+                <signal pad-key="pf3" function="TC2" group="LOC2D"/>
+                <signal pad-key="pf4" function="TC2" group="HOC2A"/>
+                <signal pad-key="pf5" function="TC2" group="HOC2B"/>
+                <signal pad-key="pf6" function="TC2" group="HOC2C"/>
+                <signal pad-key="pf7" function="TC2" group="HOC2D"/>
             </signals>
         </peripheral>
         <peripheral key="awexc" name="AWEXC" module-key="i6090_awex">
             <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"/>
-                <signal pad-id="pc2" function="AWEX" group="OC0BLS"/>
-                <signal pad-id="pc3" function="AWEX" group="OC0BHS"/>
-                <signal pad-id="pc4" function="AWEX" group="OC0CLS"/>
-                <signal pad-id="pc5" function="AWEX" group="OC0CHS"/>
-                <signal pad-id="pc6" function="AWEX" group="OC0DLS"/>
-                <signal pad-id="pc7" function="AWEX" group="OC0DHS"/>
+                <signal pad-key="pc0" function="AWEX" group="OC0ALS"/>
+                <signal pad-key="pc1" function="AWEX" group="OC0AHS"/>
+                <signal pad-key="pc2" function="AWEX" group="OC0BLS"/>
+                <signal pad-key="pc3" function="AWEX" group="OC0BHS"/>
+                <signal pad-key="pc4" function="AWEX" group="OC0CLS"/>
+                <signal pad-key="pc5" function="AWEX" group="OC0CHS"/>
+                <signal pad-key="pc6" function="AWEX" group="OC0DLS"/>
+                <signal pad-key="pc7" function="AWEX" group="OC0DHS"/>
             </signals>
         </peripheral>
         <peripheral key="awexe" name="AWEXE" module-key="i6090_awex">
             <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"/>
-                <signal pad-id="pe2" function="AWEX" group="OC0BLS"/>
-                <signal pad-id="pe3" function="AWEX" group="OC0BHS"/>
-                <signal pad-id="pe4" function="AWEX" group="OC0CLS"/>
-                <signal pad-id="pe5" function="AWEX" group="OC0CHS"/>
-                <signal pad-id="pe6" function="AWEX" group="OC0DLS"/>
-                <signal pad-id="pe7" function="AWEX" group="OC0DHS"/>
+                <signal pad-key="pe0" function="AWEX" group="OC0ALS"/>
+                <signal pad-key="pe1" function="AWEX" group="OC0AHS"/>
+                <signal pad-key="pe2" function="AWEX" group="OC0BLS"/>
+                <signal pad-key="pe3" function="AWEX" group="OC0BHS"/>
+                <signal pad-key="pe4" function="AWEX" group="OC0CLS"/>
+                <signal pad-key="pe5" function="AWEX" group="OC0CHS"/>
+                <signal pad-key="pe6" function="AWEX" group="OC0DLS"/>
+                <signal pad-key="pe7" function="AWEX" group="OC0DHS"/>
             </signals>
         </peripheral>
         <peripheral key="hiresc" name="HIRESC" module-key="i6090_hires">
@@ -507,108 +507,108 @@
         <peripheral key="usartc0" name="USARTC0" module-key="i6090_usart">
             <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"/>
-                <signal pad-id="pc3" function="USART" group="TXD" field="USART0"/>
-                <signal pad-id="pc5" function="USART_ALT" group="XCK" field="USART0"/>
-                <signal pad-id="pc6" function="USART_ALT" group="RXD" field="USART0"/>
-                <signal pad-id="pc7" function="USART_ALT" group="TXD" field="USART0"/>
+                <signal pad-key="pc1" function="USART" group="XCK" field="USART0"/>
+                <signal pad-key="pc2" function="USART" group="RXD" field="USART0"/>
+                <signal pad-key="pc3" function="USART" group="TXD" field="USART0"/>
+                <signal pad-key="pc5" function="USART_ALT" group="XCK" field="USART0"/>
+                <signal pad-key="pc6" function="USART_ALT" group="RXD" field="USART0"/>
+                <signal pad-key="pc7" function="USART_ALT" group="TXD" field="USART0"/>
             </signals>
         </peripheral>
         <peripheral key="usartc1" name="USARTC1" module-key="i6090_usart">
             <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"/>
-                <signal pad-id="pd7" function="USART" group="TXD"/>
+                <signal pad-key="pd5" function="USART" group="XCK"/>
+                <signal pad-key="pd6" function="USART" group="RXD"/>
+                <signal pad-key="pd7" function="USART" group="TXD"/>
             </signals>
         </peripheral>
         <peripheral key="usartd0" name="USARTD0" module-key="i6090_usart">
             <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"/>
-                <signal pad-id="pd3" function="USART" group="TXD" field="USART0"/>
-                <signal pad-id="pd5" function="USART_ALT" group="XCK" field="USART0"/>
-                <signal pad-id="pd6" function="USART_ALT" group="RXD" field="USART0"/>
-                <signal pad-id="pd7" function="USART_ALT" group="TXD" field="USART0"/>
+                <signal pad-key="pd1" function="USART" group="XCK" field="USART0"/>
+                <signal pad-key="pd2" function="USART" group="RXD" field="USART0"/>
+                <signal pad-key="pd3" function="USART" group="TXD" field="USART0"/>
+                <signal pad-key="pd5" function="USART_ALT" group="XCK" field="USART0"/>
+                <signal pad-key="pd6" function="USART_ALT" group="RXD" field="USART0"/>
+                <signal pad-key="pd7" function="USART_ALT" group="TXD" field="USART0"/>
             </signals>
         </peripheral>
         <peripheral key="usartd1" name="USARTD1" module-key="i6090_usart">
             <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"/>
-                <signal pad-id="pd7" function="USART" group="TXD"/>
+                <signal pad-key="pd5" function="USART" group="XCK"/>
+                <signal pad-key="pd6" function="USART" group="RXD"/>
+                <signal pad-key="pd7" function="USART" group="TXD"/>
             </signals>
         </peripheral>
         <peripheral key="usarte0" name="USARTE0" module-key="i6090_usart">
             <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"/>
-                <signal pad-id="pe3" function="USART" group="TXD" field="USART0"/>
-                <signal pad-id="pe5" function="USART_ALT" group="XCK" field="USART0"/>
-                <signal pad-id="pe6" function="USART_ALT" group="RXD" field="USART0"/>
-                <signal pad-id="pe7" function="USART_ALT" group="TXD" field="USART0"/>
+                <signal pad-key="pe1" function="USART" group="XCK" field="USART0"/>
+                <signal pad-key="pe2" function="USART" group="RXD" field="USART0"/>
+                <signal pad-key="pe3" function="USART" group="TXD" field="USART0"/>
+                <signal pad-key="pe5" function="USART_ALT" group="XCK" field="USART0"/>
+                <signal pad-key="pe6" function="USART_ALT" group="RXD" field="USART0"/>
+                <signal pad-key="pe7" function="USART_ALT" group="TXD" field="USART0"/>
             </signals>
         </peripheral>
         <peripheral key="usarte1" name="USARTE1" module-key="i6090_usart">
             <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"/>
-                <signal pad-id="pe7" function="USART" group="TXD"/>
+                <signal pad-key="pe5" function="USART" group="XCK"/>
+                <signal pad-key="pe6" function="USART" group="RXD"/>
+                <signal pad-key="pe7" function="USART" group="TXD"/>
             </signals>
         </peripheral>
         <peripheral key="usartf0" name="USARTF0" module-key="i6090_usart">
             <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"/>
-                <signal pad-id="pf3" function="USART" group="TXD" field="USART0"/>
-                <signal pad-id="pf5" function="USART_ALT" group="XCK" field="USART0"/>
-                <signal pad-id="pf6" function="USART_ALT" group="RXD" field="USART0"/>
-                <signal pad-id="pf7" function="USART_ALT" group="TXD" field="USART0"/>
+                <signal pad-key="pf1" function="USART" group="XCK" field="USART0"/>
+                <signal pad-key="pf2" function="USART" group="RXD" field="USART0"/>
+                <signal pad-key="pf3" function="USART" group="TXD" field="USART0"/>
+                <signal pad-key="pf5" function="USART_ALT" group="XCK" field="USART0"/>
+                <signal pad-key="pf6" function="USART_ALT" group="RXD" field="USART0"/>
+                <signal pad-key="pf7" function="USART_ALT" group="TXD" field="USART0"/>
             </signals>
         </peripheral>
         <peripheral key="spic" name="SPIC" module-key="i6090_spi">
             <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"/>
-                <signal pad-id="pc6" function="SPI" group="MISO" field="SPI"/>
-                <signal pad-id="pc7" function="SPI" group="SCK" field="SPI"/>
-                <signal pad-id="pc4" function="SPI_ALT" group="SS" field="SPI"/>
-                <signal pad-id="pc5" function="SPI_ALT" group="SCK" field="SPI"/>
-                <signal pad-id="pc6" function="SPI_ALT" group="MISO" field="SPI"/>
-                <signal pad-id="pc7" function="SPI_ALT" group="MOSI" field="SPI"/>
+                <signal pad-key="pc4" function="SPI" group="SS" field="SPI"/>
+                <signal pad-key="pc5" function="SPI" group="MOSI" field="SPI"/>
+                <signal pad-key="pc6" function="SPI" group="MISO" field="SPI"/>
+                <signal pad-key="pc7" function="SPI" group="SCK" field="SPI"/>
+                <signal pad-key="pc4" function="SPI_ALT" group="SS" field="SPI"/>
+                <signal pad-key="pc5" function="SPI_ALT" group="SCK" field="SPI"/>
+                <signal pad-key="pc6" function="SPI_ALT" group="MISO" field="SPI"/>
+                <signal pad-key="pc7" function="SPI_ALT" group="MOSI" field="SPI"/>
             </signals>
         </peripheral>
         <peripheral key="spid" name="SPID" module-key="i6090_spi">
             <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"/>
-                <signal pad-id="pd6" function="SPI" group="MISO" field="SPI"/>
-                <signal pad-id="pd7" function="SPI" group="SCK" field="SPI"/>
-                <signal pad-id="pd4" function="SPI_ALT" group="SS" field="SPI"/>
-                <signal pad-id="pd5" function="SPI_ALT" group="SCK" field="SPI"/>
-                <signal pad-id="pd6" function="SPI_ALT" group="MISO" field="SPI"/>
-                <signal pad-id="pd7" function="SPI_ALT" group="MOSI" field="SPI"/>
+                <signal pad-key="pd4" function="SPI" group="SS" field="SPI"/>
+                <signal pad-key="pd5" function="SPI" group="MOSI" field="SPI"/>
+                <signal pad-key="pd6" function="SPI" group="MISO" field="SPI"/>
+                <signal pad-key="pd7" function="SPI" group="SCK" field="SPI"/>
+                <signal pad-key="pd4" function="SPI_ALT" group="SS" field="SPI"/>
+                <signal pad-key="pd5" function="SPI_ALT" group="SCK" field="SPI"/>
+                <signal pad-key="pd6" function="SPI_ALT" group="MISO" field="SPI"/>
+                <signal pad-key="pd7" function="SPI_ALT" group="MOSI" field="SPI"/>
             </signals>
         </peripheral>
         <peripheral key="spie" name="SPIE" module-key="i6090_spi">
             <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"/>
-                <signal pad-id="pe6" function="SPI" group="MISO" field="SPI"/>
-                <signal pad-id="pe7" function="SPI" group="SCK" field="SPI"/>
-                <signal pad-id="pe4" function="SPI_ALT" group="SS" field="SPI"/>
-                <signal pad-id="pe5" function="SPI_ALT" group="SCK" field="SPI"/>
-                <signal pad-id="pe6" function="SPI_ALT" group="MISO" field="SPI"/>
-                <signal pad-id="pe7" function="SPI_ALT" group="MOSI" field="SPI"/>
+                <signal pad-key="pe4" function="SPI" group="SS" field="SPI"/>
+                <signal pad-key="pe5" function="SPI" group="MOSI" field="SPI"/>
+                <signal pad-key="pe6" function="SPI" group="MISO" field="SPI"/>
+                <signal pad-key="pe7" function="SPI" group="SCK" field="SPI"/>
+                <signal pad-key="pe4" function="SPI_ALT" group="SS" field="SPI"/>
+                <signal pad-key="pe5" function="SPI_ALT" group="SCK" field="SPI"/>
+                <signal pad-key="pe6" function="SPI_ALT" group="MISO" field="SPI"/>
+                <signal pad-key="pe7" function="SPI_ALT" group="MOSI" field="SPI"/>
             </signals>
         </peripheral>
         <peripheral key="ircom" name="IRCOM" module-key="i6090_ircom">
@@ -1978,78 +1978,135 @@
             </register-group>
         </module>
     </modules>
+    <pads>
+        <pad key="pa3" name="PA3"/>
+        <pad key="pa4" name="PA4"/>
+        <pad key="pa5" name="PA5"/>
+        <pad key="pa6" name="PA6"/>
+        <pad key="pa7" name="PA7"/>
+        <pad key="pb0" name="PB0"/>
+        <pad key="pb1" name="PB1"/>
+        <pad key="pb2" name="PB2"/>
+        <pad key="pb3" name="PB3"/>
+        <pad key="pb4" name="PB4"/>
+        <pad key="pb5" name="PB5"/>
+        <pad key="pb6" name="PB6"/>
+        <pad key="pb7" name="PB7"/>
+        <pad key="gnd" name="GND"/>
+        <pad key="vcc" name="VCC"/>
+        <pad key="pc0" name="PC0"/>
+        <pad key="pc1" name="PC1"/>
+        <pad key="pc2" name="PC2"/>
+        <pad key="pc3" name="PC3"/>
+        <pad key="pc4" name="PC4"/>
+        <pad key="pc5" name="PC5"/>
+        <pad key="pc6" name="PC6"/>
+        <pad key="pc7" name="PC7"/>
+        <pad key="pd0" name="PD0"/>
+        <pad key="pd1" name="PD1"/>
+        <pad key="pd2" name="PD2"/>
+        <pad key="pd3" name="PD3"/>
+        <pad key="pd4" name="PD4"/>
+        <pad key="pd5" name="PD5"/>
+        <pad key="pd6" name="PD6"/>
+        <pad key="pd7" name="PD7"/>
+        <pad key="pe0" name="PE0"/>
+        <pad key="pe1" name="PE1"/>
+        <pad key="pe2" name="PE2"/>
+        <pad key="pe3" name="PE3"/>
+        <pad key="pe4" name="PE4"/>
+        <pad key="pe5" name="PE5"/>
+        <pad key="pe6" name="PE6"/>
+        <pad key="pe7" name="PE7"/>
+        <pad key="pf0" name="PF0"/>
+        <pad key="pf1" name="PF1"/>
+        <pad key="pf2" name="PF2"/>
+        <pad key="pf3" name="PF3"/>
+        <pad key="pf4" name="PF4"/>
+        <pad key="pf5" name="PF5"/>
+        <pad key="pf6" name="PF6"/>
+        <pad key="pf7" name="PF7"/>
+        <pad key="pdi" name="PDI"/>
+        <pad key="reset" name="RESET"/>
+        <pad key="pr0" name="PR0"/>
+        <pad key="pr1" name="PR1"/>
+        <pad key="avcc" name="AVCC"/>
+        <pad key="pa0" name="PA0"/>
+        <pad key="pa1" name="PA1"/>
+        <pad key="pa2" name="PA2"/>
+    </pads>
     <pinouts>
         <pinout key="qfp_qfn_64" name="QFP_QFN_64" type="qfn">
-            <pin position="1" pad="PA3"/>
-            <pin position="2" pad="PA4"/>
-            <pin position="3" pad="PA5"/>
-            <pin position="4" pad="PA6"/>
-            <pin position="5" pad="PA7"/>
-            <pin position="6" pad="PB0"/>
-            <pin position="7" pad="PB1"/>
-            <pin position="8" pad="PB2"/>
-            <pin position="9" pad="PB3"/>
-            <pin position="10" pad="PB4"/>
-            <pin position="11" pad="PB5"/>
-            <pin position="12" pad="PB6"/>
-            <pin position="13" pad="PB7"/>
-            <pin position="14" pad="GND"/>
-            <pin position="15" pad="VCC"/>
-            <pin position="16" pad="PC0"/>
-            <pin position="17" pad="PC1"/>
-            <pin position="18" pad="PC2"/>
-            <pin position="19" pad="PC3"/>
-            <pin position="20" pad="PC4"/>
-            <pin position="21" pad="PC5"/>
-            <pin position="22" pad="PC6"/>
-            <pin position="23" pad="PC7"/>
-            <pin position="24" pad="GND"/>
-            <pin position="25" pad="VCC"/>
-            <pin position="26" pad="PD0"/>
-            <pin position="27" pad="PD1"/>
-            <pin position="28" pad="PD2"/>
-            <pin position="29" pad="PD3"/>
-            <pin position="30" pad="PD4"/>
-            <pin position="31" pad="PD5"/>
-            <pin position="32" pad="PD6"/>
-            <pin position="33" pad="PD7"/>
-            <pin position="34" pad="GND"/>
-            <pin position="35" pad="VCC"/>
-            <pin position="36" pad="PE0"/>
-            <pin position="37" pad="PE1"/>
-            <pin position="38" pad="PE2"/>
-            <pin position="39" pad="PE3"/>
-            <pin position="40" pad="PE4"/>
-            <pin position="41" pad="PE5"/>
-            <pin position="42" pad="PE6"/>
-            <pin position="43" pad="PE7"/>
-            <pin position="44" pad="GND"/>
-            <pin position="45" pad="VCC"/>
-            <pin position="46" pad="PF0"/>
-            <pin position="47" pad="PF1"/>
-            <pin position="48" pad="PF2"/>
-            <pin position="49" pad="PF3"/>
-            <pin position="50" pad="PF4"/>
-            <pin position="51" pad="PF5"/>
-            <pin position="52" pad="GND"/>
-            <pin position="53" pad="VCC"/>
-            <pin position="54" pad="PF6"/>
-            <pin position="55" pad="PF7"/>
-            <pin position="56" pad="PDI"/>
-            <pin position="57" pad="RESET"/>
-            <pin position="58" pad="PR0"/>
-            <pin position="59" pad="PR1"/>
-            <pin position="60" pad="GND"/>
-            <pin position="61" pad="AVCC"/>
-            <pin position="62" pad="PA0"/>
-            <pin position="63" pad="PA1"/>
-            <pin position="64" pad="PA2"/>
+            <pin position="1" pad-key="pa3"/>
+            <pin position="2" pad-key="pa4"/>
+            <pin position="3" pad-key="pa5"/>
+            <pin position="4" pad-key="pa6"/>
+            <pin position="5" pad-key="pa7"/>
+            <pin position="6" pad-key="pb0"/>
+            <pin position="7" pad-key="pb1"/>
+            <pin position="8" pad-key="pb2"/>
+            <pin position="9" pad-key="pb3"/>
+            <pin position="10" pad-key="pb4"/>
+            <pin position="11" pad-key="pb5"/>
+            <pin position="12" pad-key="pb6"/>
+            <pin position="13" pad-key="pb7"/>
+            <pin position="14" pad-key="gnd"/>
+            <pin position="15" pad-key="vcc"/>
+            <pin position="16" pad-key="pc0"/>
+            <pin position="17" pad-key="pc1"/>
+            <pin position="18" pad-key="pc2"/>
+            <pin position="19" pad-key="pc3"/>
+            <pin position="20" pad-key="pc4"/>
+            <pin position="21" pad-key="pc5"/>
+            <pin position="22" pad-key="pc6"/>
+            <pin position="23" pad-key="pc7"/>
+            <pin position="24" pad-key="gnd"/>
+            <pin position="25" pad-key="vcc"/>
+            <pin position="26" pad-key="pd0"/>
+            <pin position="27" pad-key="pd1"/>
+            <pin position="28" pad-key="pd2"/>
+            <pin position="29" pad-key="pd3"/>
+            <pin position="30" pad-key="pd4"/>
+            <pin position="31" pad-key="pd5"/>
+            <pin position="32" pad-key="pd6"/>
+            <pin position="33" pad-key="pd7"/>
+            <pin position="34" pad-key="gnd"/>
+            <pin position="35" pad-key="vcc"/>
+            <pin position="36" pad-key="pe0"/>
+            <pin position="37" pad-key="pe1"/>
+            <pin position="38" pad-key="pe2"/>
+            <pin position="39" pad-key="pe3"/>
+            <pin position="40" pad-key="pe4"/>
+            <pin position="41" pad-key="pe5"/>
+            <pin position="42" pad-key="pe6"/>
+            <pin position="43" pad-key="pe7"/>
+            <pin position="44" pad-key="gnd"/>
+            <pin position="45" pad-key="vcc"/>
+            <pin position="46" pad-key="pf0"/>
+            <pin position="47" pad-key="pf1"/>
+            <pin position="48" pad-key="pf2"/>
+            <pin position="49" pad-key="pf3"/>
+            <pin position="50" pad-key="pf4"/>
+            <pin position="51" pad-key="pf5"/>
+            <pin position="52" pad-key="gnd"/>
+            <pin position="53" pad-key="vcc"/>
+            <pin position="54" pad-key="pf6"/>
+            <pin position="55" pad-key="pf7"/>
+            <pin position="56" pad-key="pdi"/>
+            <pin position="57" pad-key="reset"/>
+            <pin position="58" pad-key="pr0"/>
+            <pin position="59" pad-key="pr1"/>
+            <pin position="60" pad-key="gnd"/>
+            <pin position="61" pad-key="avcc"/>
+            <pin position="62" pad-key="pa0"/>
+            <pin position="63" pad-key="pa1"/>
+            <pin position="64" pad-key="pa2"/>
         </pinout>
     </pinouts>
     <variants>
-        <variant name="ATxmega256A3U-AU" pinout-key="qfp_qfn_64" package="TQFP64"/>
-        <variant name="ATxmega256A3U-MH" pinout-key="qfp_qfn_64" package="QFN64"/>
-        <variant name="ATxmega256A3U-AN" pinout-key="qfp_qfn_64" package="TQFP64"/>
-        <variant name="ATxmega256A3U-MN" pinout-key="qfp_qfn_64" package="QFN64"/>
+        <variant key="atxmega256a3u_au" name="ATxmega256A3U-AU" pinout-key="qfp_qfn_64"/>
+        <variant key="atxmega256a3u_mh" name="ATxmega256A3U-MH" pinout-key="qfp_qfn_64"/>
+        <variant key="atxmega256a3u_an" name="ATxmega256A3U-AN" pinout-key="qfp_qfn_64"/>
+        <variant key="atxmega256a3u_mn" name="ATxmega256A3U-MN" pinout-key="qfp_qfn_64"/>
     </variants>
 </device>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA256C3.xml b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA256C3.xml
index 99fcc480..a42f126e 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA256C3.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA256C3.xml
@@ -92,10 +92,10 @@
         <peripheral key="osc" name="OSC" module-key="i6079">
             <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"/>
-                <signal pad-id="pe2" function="TOSC" group="TOSC2"/>
-                <signal pad-id="pe3" function="TOSC" group="TOSC1"/>
+                <signal pad-key="pr0" function="XTAL" group="XTAL2"/>
+                <signal pad-key="pr1" function="XTAL" group="XTAL1"/>
+                <signal pad-key="pe2" function="TOSC" group="TOSC2"/>
+                <signal pad-key="pe3" function="TOSC" group="TOSC1"/>
             </signals>
         </peripheral>
         <peripheral key="dfllrc32m" name="DFLLRC32M" module-key="i6055">
@@ -119,11 +119,11 @@
         <peripheral key="portcfg" name="PORTCFG" module-key="i6075_portcfg">
             <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"/>
-                <signal pad-id="pc7" function="EVOUT" group="EVOUT" field="EVOUT"/>
-                <signal pad-id="pc4" function="EVOUT_ALT" group="EVOUT" field="CLKEVPIN"/>
-                <signal pad-id="pc6" function="RTCOUTC" group="RTCOUT"/>
+                <signal pad-key="pc7" function="CLKOUT" group="CLKOUT" field="CLKOUT"/>
+                <signal pad-key="pc4" function="CLKOUT_ALT" group="CLKOUT" field="CLKEVPIN"/>
+                <signal pad-key="pc7" function="EVOUT" group="EVOUT" field="EVOUT"/>
+                <signal pad-key="pc4" function="EVOUT_ALT" group="EVOUT" field="CLKEVPIN"/>
+                <signal pad-key="pc6" function="RTCOUTC" group="RTCOUT"/>
             </signals>
         </peripheral>
         <peripheral key="crc" name="CRC" module-key="i6111">
@@ -138,39 +138,39 @@
         <peripheral key="adca" name="ADCA" module-key="i6110">
             <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"/>
-                <signal pad-id="pa2" index="2" function="ADC" group="ADC"/>
-                <signal pad-id="pa3" index="3" function="ADC" group="ADC"/>
-                <signal pad-id="pa4" index="4" function="ADC" group="ADC"/>
-                <signal pad-id="pa5" index="5" function="ADC" group="ADC"/>
-                <signal pad-id="pa6" index="6" function="ADC" group="ADC"/>
-                <signal pad-id="pa7" index="7" function="ADC" group="ADC"/>
-                <signal pad-id="pb0" index="8" function="ADC" group="ADC"/>
-                <signal pad-id="pb1" index="9" function="ADC" group="ADC"/>
-                <signal pad-id="pb2" index="10" function="ADC" group="ADC"/>
-                <signal pad-id="pb3" index="11" function="ADC" group="ADC"/>
-                <signal pad-id="pb4" index="12" function="ADC" group="ADC"/>
-                <signal pad-id="pb5" index="13" function="ADC" group="ADC"/>
-                <signal pad-id="pb6" index="14" function="ADC" group="ADC"/>
-                <signal pad-id="pb7" index="15" function="ADC" group="ADC"/>
-                <signal pad-id="pa0" index="0" function="AREF" group="REFA"/>
-                <signal pad-id="pb0" index="0" function="AREF" group="REFB"/>
+                <signal pad-key="pa0" index="0" function="ADC" group="ADC"/>
+                <signal pad-key="pa1" index="1" function="ADC" group="ADC"/>
+                <signal pad-key="pa2" index="2" function="ADC" group="ADC"/>
+                <signal pad-key="pa3" index="3" function="ADC" group="ADC"/>
+                <signal pad-key="pa4" index="4" function="ADC" group="ADC"/>
+                <signal pad-key="pa5" index="5" function="ADC" group="ADC"/>
+                <signal pad-key="pa6" index="6" function="ADC" group="ADC"/>
+                <signal pad-key="pa7" index="7" function="ADC" group="ADC"/>
+                <signal pad-key="pb0" index="8" function="ADC" group="ADC"/>
+                <signal pad-key="pb1" index="9" function="ADC" group="ADC"/>
+                <signal pad-key="pb2" index="10" function="ADC" group="ADC"/>
+                <signal pad-key="pb3" index="11" function="ADC" group="ADC"/>
+                <signal pad-key="pb4" index="12" function="ADC" group="ADC"/>
+                <signal pad-key="pb5" index="13" function="ADC" group="ADC"/>
+                <signal pad-key="pb6" index="14" function="ADC" group="ADC"/>
+                <signal pad-key="pb7" index="15" function="ADC" group="ADC"/>
+                <signal pad-key="pa0" index="0" function="AREF" group="REFA"/>
+                <signal pad-key="pb0" index="0" function="AREF" group="REFB"/>
             </signals>
         </peripheral>
         <peripheral key="aca" name="ACA" module-key="i6077">
             <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"/>
-                <signal pad-id="pa2" index="2" function="AC" group="AC"/>
-                <signal pad-id="pa3" index="3" function="AC" group="AC"/>
-                <signal pad-id="pa4" index="4" function="AC" group="AC"/>
-                <signal pad-id="pa5" index="5" function="AC" group="AC"/>
-                <signal pad-id="pa6" index="6" function="AC" group="AC"/>
-                <signal pad-id="pa7" index="7" function="AC" group="AC"/>
-                <signal pad-id="pa6" index="1" function="ACOUT" group="ACOUT"/>
-                <signal pad-id="pa7" index="0" function="ACOUT" group="ACOUT"/>
+                <signal pad-key="pa0" index="0" function="AC" group="AC"/>
+                <signal pad-key="pa1" index="1" function="AC" group="AC"/>
+                <signal pad-key="pa2" index="2" function="AC" group="AC"/>
+                <signal pad-key="pa3" index="3" function="AC" group="AC"/>
+                <signal pad-key="pa4" index="4" function="AC" group="AC"/>
+                <signal pad-key="pa5" index="5" function="AC" group="AC"/>
+                <signal pad-key="pa6" index="6" function="AC" group="AC"/>
+                <signal pad-key="pa7" index="7" function="AC" group="AC"/>
+                <signal pad-key="pa6" index="1" function="ACOUT" group="ACOUT"/>
+                <signal pad-key="pa7" index="0" function="ACOUT" group="ACOUT"/>
             </signals>
         </peripheral>
         <peripheral key="rtc" name="RTC" module-key="i6093">
@@ -179,219 +179,219 @@
         <peripheral key="twic" name="TWIC" module-key="i6089">
             <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"/>
+                <signal pad-key="pc0" function="TWI" group="SDA"/>
+                <signal pad-key="pc1" function="TWI" group="SCL"/>
             </signals>
         </peripheral>
         <peripheral key="twie" name="TWIE" module-key="i6089">
             <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"/>
+                <signal pad-key="pe0" function="TWI" group="SDA"/>
+                <signal pad-key="pe1" function="TWI" group="SCL"/>
             </signals>
         </peripheral>
         <peripheral key="usb" name="USB" module-key="i3005">
             <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"/>
+                <signal pad-key="pd6" function="USB" group="DN"/>
+                <signal pad-key="pd7" function="USB" group="DP"/>
             </signals>
         </peripheral>
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pa2" index="2" function="PORTA" group="P"/>
-                <signal pad-id="pa3" index="3" function="PORTA" group="P"/>
-                <signal pad-id="pa4" index="4" function="PORTA" group="P"/>
-                <signal pad-id="pa5" index="5" function="PORTA" group="P"/>
-                <signal pad-id="pa6" index="6" function="PORTA" group="P"/>
-                <signal pad-id="pa7" index="7" function="PORTA" group="P"/>
+                <signal pad-key="pa0" index="0" function="PORTA" group="P"/>
+                <signal pad-key="pa1" index="1" function="PORTA" group="P"/>
+                <signal pad-key="pa2" index="2" function="PORTA" group="P"/>
+                <signal pad-key="pa3" index="3" function="PORTA" group="P"/>
+                <signal pad-key="pa4" index="4" function="PORTA" group="P"/>
+                <signal pad-key="pa5" index="5" function="PORTA" group="P"/>
+                <signal pad-key="pa6" index="6" function="PORTA" group="P"/>
+                <signal pad-key="pa7" index="7" function="PORTA" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pb2" index="2" function="PORTB" group="P"/>
-                <signal pad-id="pb3" index="3" function="PORTB" group="P"/>
-                <signal pad-id="pb4" index="4" function="PORTB" group="P"/>
-                <signal pad-id="pb5" index="5" function="PORTB" group="P"/>
-                <signal pad-id="pb6" index="6" function="PORTB" group="P"/>
-                <signal pad-id="pb7" index="7" function="PORTB" group="P"/>
+                <signal pad-key="pb0" index="0" function="PORTB" group="P"/>
+                <signal pad-key="pb1" index="1" function="PORTB" group="P"/>
+                <signal pad-key="pb2" index="2" function="PORTB" group="P"/>
+                <signal pad-key="pb3" index="3" function="PORTB" group="P"/>
+                <signal pad-key="pb4" index="4" function="PORTB" group="P"/>
+                <signal pad-key="pb5" index="5" function="PORTB" group="P"/>
+                <signal pad-key="pb6" index="6" function="PORTB" group="P"/>
+                <signal pad-key="pb7" index="7" function="PORTB" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pc2" index="2" function="PORTC" group="P"/>
-                <signal pad-id="pc3" index="3" function="PORTC" group="P"/>
-                <signal pad-id="pc4" index="4" function="PORTC" group="P"/>
-                <signal pad-id="pc5" index="5" function="PORTC" group="P"/>
-                <signal pad-id="pc6" index="6" function="PORTC" group="P"/>
-                <signal pad-id="pc7" index="7" function="PORTC" group="P"/>
+                <signal pad-key="pc0" index="0" function="PORTC" group="P"/>
+                <signal pad-key="pc1" index="1" function="PORTC" group="P"/>
+                <signal pad-key="pc2" index="2" function="PORTC" group="P"/>
+                <signal pad-key="pc3" index="3" function="PORTC" group="P"/>
+                <signal pad-key="pc4" index="4" function="PORTC" group="P"/>
+                <signal pad-key="pc5" index="5" function="PORTC" group="P"/>
+                <signal pad-key="pc6" index="6" function="PORTC" group="P"/>
+                <signal pad-key="pc7" index="7" function="PORTC" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pd2" index="2" function="PORTD" group="P"/>
-                <signal pad-id="pd3" index="3" function="PORTD" group="P"/>
-                <signal pad-id="pd4" index="4" function="PORTD" group="P"/>
-                <signal pad-id="pd5" index="5" function="PORTD" group="P"/>
-                <signal pad-id="pd6" index="6" function="PORTD" group="P"/>
-                <signal pad-id="pd7" index="7" function="PORTD" group="P"/>
+                <signal pad-key="pd0" index="0" function="PORTD" group="P"/>
+                <signal pad-key="pd1" index="1" function="PORTD" group="P"/>
+                <signal pad-key="pd2" index="2" function="PORTD" group="P"/>
+                <signal pad-key="pd3" index="3" function="PORTD" group="P"/>
+                <signal pad-key="pd4" index="4" function="PORTD" group="P"/>
+                <signal pad-key="pd5" index="5" function="PORTD" group="P"/>
+                <signal pad-key="pd6" index="6" function="PORTD" group="P"/>
+                <signal pad-key="pd7" index="7" function="PORTD" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="porte" name="PORTE" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pe2" index="2" function="PORTE" group="P"/>
-                <signal pad-id="pe3" index="3" function="PORTE" group="P"/>
-                <signal pad-id="pe4" index="4" function="PORTE" group="P"/>
-                <signal pad-id="pe5" index="5" function="PORTE" group="P"/>
-                <signal pad-id="pe6" index="6" function="PORTE" group="P"/>
-                <signal pad-id="pe7" index="7" function="PORTE" group="P"/>
+                <signal pad-key="pe0" index="0" function="PORTE" group="P"/>
+                <signal pad-key="pe1" index="1" function="PORTE" group="P"/>
+                <signal pad-key="pe2" index="2" function="PORTE" group="P"/>
+                <signal pad-key="pe3" index="3" function="PORTE" group="P"/>
+                <signal pad-key="pe4" index="4" function="PORTE" group="P"/>
+                <signal pad-key="pe5" index="5" function="PORTE" group="P"/>
+                <signal pad-key="pe6" index="6" function="PORTE" group="P"/>
+                <signal pad-key="pe7" index="7" function="PORTE" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portf" name="PORTF" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pf2" index="2" function="PORTF" group="P"/>
-                <signal pad-id="pf3" index="3" function="PORTF" group="P"/>
-                <signal pad-id="pf4" index="4" function="PORTF" group="P"/>
-                <signal pad-id="pf5" index="5" function="PORTF" group="P"/>
-                <signal pad-id="pf6" index="6" function="PORTF" group="P"/>
-                <signal pad-id="pf7" index="7" function="PORTF" group="P"/>
+                <signal pad-key="pf0" index="0" function="PORTF" group="P"/>
+                <signal pad-key="pf1" index="1" function="PORTF" group="P"/>
+                <signal pad-key="pf2" index="2" function="PORTF" group="P"/>
+                <signal pad-key="pf3" index="3" function="PORTF" group="P"/>
+                <signal pad-key="pf4" index="4" function="PORTF" group="P"/>
+                <signal pad-key="pf5" index="5" function="PORTF" group="P"/>
+                <signal pad-key="pf6" index="6" function="PORTF" group="P"/>
+                <signal pad-key="pf7" index="7" function="PORTF" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portr" name="PORTR" module-key="gpio_port">
             <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"/>
+                <signal pad-key="pr0" index="0" function="PORTR" group="P"/>
+                <signal pad-key="pr1" index="1" function="PORTR" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="tcc0" name="TCC0" module-key="i6090_tc">
             <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"/>
-                <signal pad-id="pc2" function="TC0" group="OC0C" field="TC0C"/>
-                <signal pad-id="pc3" function="TC0" group="OC0D" field="TC0D"/>
-                <signal pad-id="pc4" function="TC0_ALT" group="OC0A" field="TC0A"/>
-                <signal pad-id="pc5" function="TC0_ALT" group="OC0B" field="TC0B"/>
-                <signal pad-id="pc6" function="TC0_ALT" group="OC0C" field="TC0C"/>
-                <signal pad-id="pc7" function="TC0_ALT" group="OC0D" field="TC0D"/>
+                <signal pad-key="pc0" function="TC0" group="OC0A" field="TC0A"/>
+                <signal pad-key="pc1" function="TC0" group="OC0B" field="TC0B"/>
+                <signal pad-key="pc2" function="TC0" group="OC0C" field="TC0C"/>
+                <signal pad-key="pc3" function="TC0" group="OC0D" field="TC0D"/>
+                <signal pad-key="pc4" function="TC0_ALT" group="OC0A" field="TC0A"/>
+                <signal pad-key="pc5" function="TC0_ALT" group="OC0B" field="TC0B"/>
+                <signal pad-key="pc6" function="TC0_ALT" group="OC0C" field="TC0C"/>
+                <signal pad-key="pc7" function="TC0_ALT" group="OC0D" field="TC0D"/>
             </signals>
         </peripheral>
         <peripheral key="tcc1" name="TCC1" module-key="i6090_tc">
             <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"/>
+                <signal pad-key="pc4" function="TC1" group="OC1A"/>
+                <signal pad-key="pc5" function="TC1" group="OC1B"/>
             </signals>
         </peripheral>
         <peripheral key="tcd0" name="TCD0" module-key="i6090_tc">
             <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"/>
-                <signal pad-id="pd2" function="TC0" group="OC0C"/>
-                <signal pad-id="pd3" function="TC0" group="OC0D"/>
+                <signal pad-key="pd0" function="TC0" group="OC0A"/>
+                <signal pad-key="pd1" function="TC0" group="OC0B"/>
+                <signal pad-key="pd2" function="TC0" group="OC0C"/>
+                <signal pad-key="pd3" function="TC0" group="OC0D"/>
             </signals>
         </peripheral>
         <peripheral key="tce0" name="TCE0" module-key="i6090_tc">
             <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"/>
-                <signal pad-id="pe2" function="TC0" group="OC0C"/>
-                <signal pad-id="pe3" function="TC0" group="OC0D"/>
+                <signal pad-key="pe0" function="TC0" group="OC0A"/>
+                <signal pad-key="pe1" function="TC0" group="OC0B"/>
+                <signal pad-key="pe2" function="TC0" group="OC0C"/>
+                <signal pad-key="pe3" function="TC0" group="OC0D"/>
             </signals>
         </peripheral>
         <peripheral key="tcf0" name="TCF0" module-key="i6090_tc">
             <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"/>
-                <signal pad-id="pf2" function="TC0" group="OC0C"/>
-                <signal pad-id="pf3" function="TC0" group="OC0D"/>
+                <signal pad-key="pf0" function="TC0" group="OC0A"/>
+                <signal pad-key="pf1" function="TC0" group="OC0B"/>
+                <signal pad-key="pf2" function="TC0" group="OC0C"/>
+                <signal pad-key="pf3" function="TC0" group="OC0D"/>
             </signals>
         </peripheral>
         <peripheral key="tcc2" name="TCC2" module-key="i6090_tc2">
             <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"/>
-                <signal pad-id="pc2" function="TC2" group="LOC2C"/>
-                <signal pad-id="pc3" function="TC2" group="LOC2D"/>
-                <signal pad-id="pc4" function="TC2" group="HOC2A"/>
-                <signal pad-id="pc5" function="TC2" group="HOC2B"/>
-                <signal pad-id="pc6" function="TC2" group="HOC2C"/>
-                <signal pad-id="pc7" function="TC2" group="HOC2D"/>
+                <signal pad-key="pc0" function="TC2" group="LOC2A"/>
+                <signal pad-key="pc1" function="TC2" group="LOC2B"/>
+                <signal pad-key="pc2" function="TC2" group="LOC2C"/>
+                <signal pad-key="pc3" function="TC2" group="LOC2D"/>
+                <signal pad-key="pc4" function="TC2" group="HOC2A"/>
+                <signal pad-key="pc5" function="TC2" group="HOC2B"/>
+                <signal pad-key="pc6" function="TC2" group="HOC2C"/>
+                <signal pad-key="pc7" function="TC2" group="HOC2D"/>
             </signals>
         </peripheral>
         <peripheral key="tcd2" name="TCD2" module-key="i6090_tc2">
             <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"/>
-                <signal pad-id="pd2" function="TC2" group="LOC2C"/>
-                <signal pad-id="pd3" function="TC2" group="LOC2D"/>
-                <signal pad-id="pd4" function="TC2" group="HOC2A"/>
-                <signal pad-id="pd5" function="TC2" group="HOC2B"/>
-                <signal pad-id="pd6" function="TC2" group="HOC2C"/>
-                <signal pad-id="pd7" function="TC2" group="HOC2D"/>
+                <signal pad-key="pd0" function="TC2" group="LOC2A"/>
+                <signal pad-key="pd1" function="TC2" group="LOC2B"/>
+                <signal pad-key="pd2" function="TC2" group="LOC2C"/>
+                <signal pad-key="pd3" function="TC2" group="LOC2D"/>
+                <signal pad-key="pd4" function="TC2" group="HOC2A"/>
+                <signal pad-key="pd5" function="TC2" group="HOC2B"/>
+                <signal pad-key="pd6" function="TC2" group="HOC2C"/>
+                <signal pad-key="pd7" function="TC2" group="HOC2D"/>
             </signals>
         </peripheral>
         <peripheral key="tce2" name="TCE2" module-key="i6090_tc2">
             <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"/>
-                <signal pad-id="pe2" function="TC2" group="LOC2C"/>
-                <signal pad-id="pe3" function="TC2" group="LOC2D"/>
-                <signal pad-id="pe4" function="TC2" group="HOC2A"/>
-                <signal pad-id="pe5" function="TC2" group="HOC2B"/>
-                <signal pad-id="pe6" function="TC2" group="HOC2C"/>
-                <signal pad-id="pe7" function="TC2" group="HOC2D"/>
+                <signal pad-key="pe0" function="TC2" group="LOC2A"/>
+                <signal pad-key="pe1" function="TC2" group="LOC2B"/>
+                <signal pad-key="pe2" function="TC2" group="LOC2C"/>
+                <signal pad-key="pe3" function="TC2" group="LOC2D"/>
+                <signal pad-key="pe4" function="TC2" group="HOC2A"/>
+                <signal pad-key="pe5" function="TC2" group="HOC2B"/>
+                <signal pad-key="pe6" function="TC2" group="HOC2C"/>
+                <signal pad-key="pe7" function="TC2" group="HOC2D"/>
             </signals>
         </peripheral>
         <peripheral key="tcf2" name="TCF2" module-key="i6090_tc2">
             <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"/>
-                <signal pad-id="pf2" function="TC2" group="LOC2C"/>
-                <signal pad-id="pf3" function="TC2" group="LOC2D"/>
-                <signal pad-id="pf4" function="TC2" group="HOC2A"/>
-                <signal pad-id="pf5" function="TC2" group="HOC2B"/>
-                <signal pad-id="pf6" function="TC2" group="HOC2C"/>
-                <signal pad-id="pf7" function="TC2" group="HOC2D"/>
+                <signal pad-key="pf0" function="TC2" group="LOC2A"/>
+                <signal pad-key="pf1" function="TC2" group="LOC2B"/>
+                <signal pad-key="pf2" function="TC2" group="LOC2C"/>
+                <signal pad-key="pf3" function="TC2" group="LOC2D"/>
+                <signal pad-key="pf4" function="TC2" group="HOC2A"/>
+                <signal pad-key="pf5" function="TC2" group="HOC2B"/>
+                <signal pad-key="pf6" function="TC2" group="HOC2C"/>
+                <signal pad-key="pf7" function="TC2" group="HOC2D"/>
             </signals>
         </peripheral>
         <peripheral key="awexc" name="AWEXC" module-key="i6090_awex">
             <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"/>
-                <signal pad-id="pc2" function="AWEX" group="OC0BLS"/>
-                <signal pad-id="pc3" function="AWEX" group="OC0BHS"/>
-                <signal pad-id="pc4" function="AWEX" group="OC0CLS"/>
-                <signal pad-id="pc5" function="AWEX" group="OC0CHS"/>
-                <signal pad-id="pc6" function="AWEX" group="OC0DLS"/>
-                <signal pad-id="pc7" function="AWEX" group="OC0DHS"/>
+                <signal pad-key="pc0" function="AWEX" group="OC0ALS"/>
+                <signal pad-key="pc1" function="AWEX" group="OC0AHS"/>
+                <signal pad-key="pc2" function="AWEX" group="OC0BLS"/>
+                <signal pad-key="pc3" function="AWEX" group="OC0BHS"/>
+                <signal pad-key="pc4" function="AWEX" group="OC0CLS"/>
+                <signal pad-key="pc5" function="AWEX" group="OC0CHS"/>
+                <signal pad-key="pc6" function="AWEX" group="OC0DLS"/>
+                <signal pad-key="pc7" function="AWEX" group="OC0DHS"/>
             </signals>
         </peripheral>
         <peripheral key="hiresc" name="HIRESC" module-key="i6090_hires">
@@ -400,50 +400,50 @@
         <peripheral key="usartc0" name="USARTC0" module-key="i6090_usart">
             <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"/>
-                <signal pad-id="pc3" function="USART" group="TXD" field="USART0"/>
-                <signal pad-id="pc5" function="USART_ALT" group="XCK" field="USART0"/>
-                <signal pad-id="pc6" function="USART_ALT" group="RXD" field="USART0"/>
-                <signal pad-id="pc7" function="USART_ALT" group="TXD" field="USART0"/>
+                <signal pad-key="pc1" function="USART" group="XCK" field="USART0"/>
+                <signal pad-key="pc2" function="USART" group="RXD" field="USART0"/>
+                <signal pad-key="pc3" function="USART" group="TXD" field="USART0"/>
+                <signal pad-key="pc5" function="USART_ALT" group="XCK" field="USART0"/>
+                <signal pad-key="pc6" function="USART_ALT" group="RXD" field="USART0"/>
+                <signal pad-key="pc7" function="USART_ALT" group="TXD" field="USART0"/>
             </signals>
         </peripheral>
         <peripheral key="usartd0" name="USARTD0" module-key="i6090_usart">
             <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"/>
-                <signal pad-id="pd3" function="USART" group="TXD"/>
+                <signal pad-key="pd1" function="USART" group="XCK"/>
+                <signal pad-key="pd2" function="USART" group="RXD"/>
+                <signal pad-key="pd3" function="USART" group="TXD"/>
             </signals>
         </peripheral>
         <peripheral key="usarte0" name="USARTE0" module-key="i6090_usart">
             <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"/>
-                <signal pad-id="pe3" function="USART" group="TXD"/>
+                <signal pad-key="pe1" function="USART" group="XCK"/>
+                <signal pad-key="pe2" function="USART" group="RXD"/>
+                <signal pad-key="pe3" function="USART" group="TXD"/>
             </signals>
         </peripheral>
         <peripheral key="spic" name="SPIC" module-key="i6090_spi">
             <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"/>
-                <signal pad-id="pc6" function="SPI" group="MISO" field="SPI"/>
-                <signal pad-id="pc7" function="SPI" group="SCK" field="SPI"/>
-                <signal pad-id="pc4" function="SPI_ALT" group="SS" field="SPI"/>
-                <signal pad-id="pc5" function="SPI_ALT" group="SCK" field="SPI"/>
-                <signal pad-id="pc6" function="SPI_ALT" group="MISO" field="SPI"/>
-                <signal pad-id="pc7" function="SPI_ALT" group="MOSI" field="SPI"/>
+                <signal pad-key="pc4" function="SPI" group="SS" field="SPI"/>
+                <signal pad-key="pc5" function="SPI" group="MOSI" field="SPI"/>
+                <signal pad-key="pc6" function="SPI" group="MISO" field="SPI"/>
+                <signal pad-key="pc7" function="SPI" group="SCK" field="SPI"/>
+                <signal pad-key="pc4" function="SPI_ALT" group="SS" field="SPI"/>
+                <signal pad-key="pc5" function="SPI_ALT" group="SCK" field="SPI"/>
+                <signal pad-key="pc6" function="SPI_ALT" group="MISO" field="SPI"/>
+                <signal pad-key="pc7" function="SPI_ALT" group="MOSI" field="SPI"/>
             </signals>
         </peripheral>
         <peripheral key="spid" name="SPID" module-key="i6090_spi">
             <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"/>
-                <signal pad-id="pd6" function="SPI" group="MISO"/>
-                <signal pad-id="pd7" function="SPI" group="SCK"/>
+                <signal pad-key="pd4" function="SPI" group="SS"/>
+                <signal pad-key="pd5" function="SPI" group="MOSI"/>
+                <signal pad-key="pd6" function="SPI" group="MISO"/>
+                <signal pad-key="pd7" function="SPI" group="SCK"/>
             </signals>
         </peripheral>
         <peripheral key="ircom" name="IRCOM" module-key="i6090_ircom">
@@ -1579,78 +1579,135 @@
             </register-group>
         </module>
     </modules>
+    <pads>
+        <pad key="pa3" name="PA3"/>
+        <pad key="pa4" name="PA4"/>
+        <pad key="pa5" name="PA5"/>
+        <pad key="pa6" name="PA6"/>
+        <pad key="pa7" name="PA7"/>
+        <pad key="pb0" name="PB0"/>
+        <pad key="pb1" name="PB1"/>
+        <pad key="pb2" name="PB2"/>
+        <pad key="pb3" name="PB3"/>
+        <pad key="pb4" name="PB4"/>
+        <pad key="pb5" name="PB5"/>
+        <pad key="pb6" name="PB6"/>
+        <pad key="pb7" name="PB7"/>
+        <pad key="gnd" name="GND"/>
+        <pad key="vcc" name="VCC"/>
+        <pad key="pc0" name="PC0"/>
+        <pad key="pc1" name="PC1"/>
+        <pad key="pc2" name="PC2"/>
+        <pad key="pc3" name="PC3"/>
+        <pad key="pc4" name="PC4"/>
+        <pad key="pc5" name="PC5"/>
+        <pad key="pc6" name="PC6"/>
+        <pad key="pc7" name="PC7"/>
+        <pad key="pd0" name="PD0"/>
+        <pad key="pd1" name="PD1"/>
+        <pad key="pd2" name="PD2"/>
+        <pad key="pd3" name="PD3"/>
+        <pad key="pd4" name="PD4"/>
+        <pad key="pd5" name="PD5"/>
+        <pad key="pd6" name="PD6"/>
+        <pad key="pd7" name="PD7"/>
+        <pad key="pe0" name="PE0"/>
+        <pad key="pe1" name="PE1"/>
+        <pad key="pe2" name="PE2"/>
+        <pad key="pe3" name="PE3"/>
+        <pad key="pe4" name="PE4"/>
+        <pad key="pe5" name="PE5"/>
+        <pad key="pe6" name="PE6"/>
+        <pad key="pe7" name="PE7"/>
+        <pad key="pf0" name="PF0"/>
+        <pad key="pf1" name="PF1"/>
+        <pad key="pf2" name="PF2"/>
+        <pad key="pf3" name="PF3"/>
+        <pad key="pf4" name="PF4"/>
+        <pad key="pf5" name="PF5"/>
+        <pad key="pf6" name="PF6"/>
+        <pad key="pf7" name="PF7"/>
+        <pad key="pdi" name="PDI"/>
+        <pad key="reset" name="RESET"/>
+        <pad key="pr0" name="PR0"/>
+        <pad key="pr1" name="PR1"/>
+        <pad key="avcc" name="AVCC"/>
+        <pad key="pa0" name="PA0"/>
+        <pad key="pa1" name="PA1"/>
+        <pad key="pa2" name="PA2"/>
+    </pads>
     <pinouts>
         <pinout key="qfp_qfn_64" name="QFP_QFN_64" type="qfn">
-            <pin position="1" pad="PA3"/>
-            <pin position="2" pad="PA4"/>
-            <pin position="3" pad="PA5"/>
-            <pin position="4" pad="PA6"/>
-            <pin position="5" pad="PA7"/>
-            <pin position="6" pad="PB0"/>
-            <pin position="7" pad="PB1"/>
-            <pin position="8" pad="PB2"/>
-            <pin position="9" pad="PB3"/>
-            <pin position="10" pad="PB4"/>
-            <pin position="11" pad="PB5"/>
-            <pin position="12" pad="PB6"/>
-            <pin position="13" pad="PB7"/>
-            <pin position="14" pad="GND"/>
-            <pin position="15" pad="VCC"/>
-            <pin position="16" pad="PC0"/>
-            <pin position="17" pad="PC1"/>
-            <pin position="18" pad="PC2"/>
-            <pin position="19" pad="PC3"/>
-            <pin position="20" pad="PC4"/>
-            <pin position="21" pad="PC5"/>
-            <pin position="22" pad="PC6"/>
-            <pin position="23" pad="PC7"/>
-            <pin position="24" pad="GND"/>
-            <pin position="25" pad="VCC"/>
-            <pin position="26" pad="PD0"/>
-            <pin position="27" pad="PD1"/>
-            <pin position="28" pad="PD2"/>
-            <pin position="29" pad="PD3"/>
-            <pin position="30" pad="PD4"/>
-            <pin position="31" pad="PD5"/>
-            <pin position="32" pad="PD6"/>
-            <pin position="33" pad="PD7"/>
-            <pin position="34" pad="GND"/>
-            <pin position="35" pad="VCC"/>
-            <pin position="36" pad="PE0"/>
-            <pin position="37" pad="PE1"/>
-            <pin position="38" pad="PE2"/>
-            <pin position="39" pad="PE3"/>
-            <pin position="40" pad="PE4"/>
-            <pin position="41" pad="PE5"/>
-            <pin position="42" pad="PE6"/>
-            <pin position="43" pad="PE7"/>
-            <pin position="44" pad="GND"/>
-            <pin position="45" pad="VCC"/>
-            <pin position="46" pad="PF0"/>
-            <pin position="47" pad="PF1"/>
-            <pin position="48" pad="PF2"/>
-            <pin position="49" pad="PF3"/>
-            <pin position="50" pad="PF4"/>
-            <pin position="51" pad="PF5"/>
-            <pin position="52" pad="GND"/>
-            <pin position="53" pad="VCC"/>
-            <pin position="54" pad="PF6"/>
-            <pin position="55" pad="PF7"/>
-            <pin position="56" pad="PDI"/>
-            <pin position="57" pad="RESET"/>
-            <pin position="58" pad="PR0"/>
-            <pin position="59" pad="PR1"/>
-            <pin position="60" pad="GND"/>
-            <pin position="61" pad="AVCC"/>
-            <pin position="62" pad="PA0"/>
-            <pin position="63" pad="PA1"/>
-            <pin position="64" pad="PA2"/>
+            <pin position="1" pad-key="pa3"/>
+            <pin position="2" pad-key="pa4"/>
+            <pin position="3" pad-key="pa5"/>
+            <pin position="4" pad-key="pa6"/>
+            <pin position="5" pad-key="pa7"/>
+            <pin position="6" pad-key="pb0"/>
+            <pin position="7" pad-key="pb1"/>
+            <pin position="8" pad-key="pb2"/>
+            <pin position="9" pad-key="pb3"/>
+            <pin position="10" pad-key="pb4"/>
+            <pin position="11" pad-key="pb5"/>
+            <pin position="12" pad-key="pb6"/>
+            <pin position="13" pad-key="pb7"/>
+            <pin position="14" pad-key="gnd"/>
+            <pin position="15" pad-key="vcc"/>
+            <pin position="16" pad-key="pc0"/>
+            <pin position="17" pad-key="pc1"/>
+            <pin position="18" pad-key="pc2"/>
+            <pin position="19" pad-key="pc3"/>
+            <pin position="20" pad-key="pc4"/>
+            <pin position="21" pad-key="pc5"/>
+            <pin position="22" pad-key="pc6"/>
+            <pin position="23" pad-key="pc7"/>
+            <pin position="24" pad-key="gnd"/>
+            <pin position="25" pad-key="vcc"/>
+            <pin position="26" pad-key="pd0"/>
+            <pin position="27" pad-key="pd1"/>
+            <pin position="28" pad-key="pd2"/>
+            <pin position="29" pad-key="pd3"/>
+            <pin position="30" pad-key="pd4"/>
+            <pin position="31" pad-key="pd5"/>
+            <pin position="32" pad-key="pd6"/>
+            <pin position="33" pad-key="pd7"/>
+            <pin position="34" pad-key="gnd"/>
+            <pin position="35" pad-key="vcc"/>
+            <pin position="36" pad-key="pe0"/>
+            <pin position="37" pad-key="pe1"/>
+            <pin position="38" pad-key="pe2"/>
+            <pin position="39" pad-key="pe3"/>
+            <pin position="40" pad-key="pe4"/>
+            <pin position="41" pad-key="pe5"/>
+            <pin position="42" pad-key="pe6"/>
+            <pin position="43" pad-key="pe7"/>
+            <pin position="44" pad-key="gnd"/>
+            <pin position="45" pad-key="vcc"/>
+            <pin position="46" pad-key="pf0"/>
+            <pin position="47" pad-key="pf1"/>
+            <pin position="48" pad-key="pf2"/>
+            <pin position="49" pad-key="pf3"/>
+            <pin position="50" pad-key="pf4"/>
+            <pin position="51" pad-key="pf5"/>
+            <pin position="52" pad-key="gnd"/>
+            <pin position="53" pad-key="vcc"/>
+            <pin position="54" pad-key="pf6"/>
+            <pin position="55" pad-key="pf7"/>
+            <pin position="56" pad-key="pdi"/>
+            <pin position="57" pad-key="reset"/>
+            <pin position="58" pad-key="pr0"/>
+            <pin position="59" pad-key="pr1"/>
+            <pin position="60" pad-key="gnd"/>
+            <pin position="61" pad-key="avcc"/>
+            <pin position="62" pad-key="pa0"/>
+            <pin position="63" pad-key="pa1"/>
+            <pin position="64" pad-key="pa2"/>
         </pinout>
     </pinouts>
     <variants>
-        <variant name="ATxmega256C3-AU" pinout-key="qfp_qfn_64" package="TQFP64"/>
-        <variant name="ATxmega256C3-MH" pinout-key="qfp_qfn_64" package="QFN64"/>
-        <variant name="ATxmega256C3-AN" pinout-key="qfp_qfn_64" package="TQFP64"/>
-        <variant name="ATxmega256C3-M7" pinout-key="qfp_qfn_64" package="QFN64"/>
+        <variant key="atxmega256c3_au" name="ATxmega256C3-AU" pinout-key="qfp_qfn_64"/>
+        <variant key="atxmega256c3_mh" name="ATxmega256C3-MH" pinout-key="qfp_qfn_64"/>
+        <variant key="atxmega256c3_an" name="ATxmega256C3-AN" pinout-key="qfp_qfn_64"/>
+        <variant key="atxmega256c3_m7" name="ATxmega256C3-M7" pinout-key="qfp_qfn_64"/>
     </variants>
 </device>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA256D3.xml b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA256D3.xml
index 41e707fb..44b26fd7 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA256D3.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA256D3.xml
@@ -81,10 +81,10 @@
         <peripheral key="osc" name="OSC" module-key="i6079">
             <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"/>
-                <signal pad-id="pe2" function="TOSC" group="TOSC2"/>
-                <signal pad-id="pe3" function="TOSC" group="TOSC1"/>
+                <signal pad-key="pr0" function="XTAL" group="XTAL2"/>
+                <signal pad-key="pr1" function="XTAL" group="XTAL1"/>
+                <signal pad-key="pe2" function="TOSC" group="TOSC2"/>
+                <signal pad-key="pe3" function="TOSC" group="TOSC1"/>
             </signals>
         </peripheral>
         <peripheral key="dfllrc32m" name="DFLLRC32M" module-key="i6055">
@@ -126,39 +126,39 @@
         <peripheral key="aca" name="ACA" module-key="i6077">
             <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"/>
-                <signal pad-id="pa2" index="2" function="AC" group="AC"/>
-                <signal pad-id="pa3" index="3" function="AC" group="AC"/>
-                <signal pad-id="pa4" index="4" function="AC" group="AC"/>
-                <signal pad-id="pa5" index="5" function="AC" group="AC"/>
-                <signal pad-id="pa6" index="6" function="AC" group="AC"/>
-                <signal pad-id="pa7" index="7" function="AC" group="AC"/>
-                <signal pad-id="pa6" index="1" function="ACOUT" group="ACOUT"/>
-                <signal pad-id="pa7" index="0" function="ACOUT" group="ACOUT"/>
+                <signal pad-key="pa0" index="0" function="AC" group="AC"/>
+                <signal pad-key="pa1" index="1" function="AC" group="AC"/>
+                <signal pad-key="pa2" index="2" function="AC" group="AC"/>
+                <signal pad-key="pa3" index="3" function="AC" group="AC"/>
+                <signal pad-key="pa4" index="4" function="AC" group="AC"/>
+                <signal pad-key="pa5" index="5" function="AC" group="AC"/>
+                <signal pad-key="pa6" index="6" function="AC" group="AC"/>
+                <signal pad-key="pa7" index="7" function="AC" group="AC"/>
+                <signal pad-key="pa6" index="1" function="ACOUT" group="ACOUT"/>
+                <signal pad-key="pa7" index="0" function="ACOUT" group="ACOUT"/>
             </signals>
         </peripheral>
         <peripheral key="adca" name="ADCA" module-key="i6110">
             <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"/>
-                <signal pad-id="pa2" index="2" function="ADC" group="ADC"/>
-                <signal pad-id="pa3" index="3" function="ADC" group="ADC"/>
-                <signal pad-id="pa4" index="4" function="ADC" group="ADC"/>
-                <signal pad-id="pa5" index="5" function="ADC" group="ADC"/>
-                <signal pad-id="pa6" index="6" function="ADC" group="ADC"/>
-                <signal pad-id="pa7" index="7" function="ADC" group="ADC"/>
-                <signal pad-id="pb0" index="8" function="ADC" group="ADC"/>
-                <signal pad-id="pb1" index="9" function="ADC" group="ADC"/>
-                <signal pad-id="pb2" index="10" function="ADC" group="ADC"/>
-                <signal pad-id="pb3" index="11" function="ADC" group="ADC"/>
-                <signal pad-id="pb4" index="12" function="ADC" group="ADC"/>
-                <signal pad-id="pb5" index="13" function="ADC" group="ADC"/>
-                <signal pad-id="pb6" index="14" function="ADC" group="ADC"/>
-                <signal pad-id="pb7" index="15" function="ADC" group="ADC"/>
-                <signal pad-id="pa0" index="0" function="AREF" group="REFA"/>
-                <signal pad-id="pb0" index="0" function="AREF" group="REFB"/>
+                <signal pad-key="pa0" index="0" function="ADC" group="ADC"/>
+                <signal pad-key="pa1" index="1" function="ADC" group="ADC"/>
+                <signal pad-key="pa2" index="2" function="ADC" group="ADC"/>
+                <signal pad-key="pa3" index="3" function="ADC" group="ADC"/>
+                <signal pad-key="pa4" index="4" function="ADC" group="ADC"/>
+                <signal pad-key="pa5" index="5" function="ADC" group="ADC"/>
+                <signal pad-key="pa6" index="6" function="ADC" group="ADC"/>
+                <signal pad-key="pa7" index="7" function="ADC" group="ADC"/>
+                <signal pad-key="pb0" index="8" function="ADC" group="ADC"/>
+                <signal pad-key="pb1" index="9" function="ADC" group="ADC"/>
+                <signal pad-key="pb2" index="10" function="ADC" group="ADC"/>
+                <signal pad-key="pb3" index="11" function="ADC" group="ADC"/>
+                <signal pad-key="pb4" index="12" function="ADC" group="ADC"/>
+                <signal pad-key="pb5" index="13" function="ADC" group="ADC"/>
+                <signal pad-key="pb6" index="14" function="ADC" group="ADC"/>
+                <signal pad-key="pb7" index="15" function="ADC" group="ADC"/>
+                <signal pad-key="pa0" index="0" function="AREF" group="REFA"/>
+                <signal pad-key="pb0" index="0" function="AREF" group="REFB"/>
             </signals>
         </peripheral>
         <peripheral key="rtc" name="RTC" module-key="i6093">
@@ -167,25 +167,25 @@
         <peripheral key="twic" name="TWIC" module-key="i6089">
             <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"/>
+                <signal pad-key="pc0" function="TWI" group="SDA"/>
+                <signal pad-key="pc1" function="TWI" group="SCL"/>
             </signals>
         </peripheral>
         <peripheral key="twie" name="TWIE" module-key="i6089">
             <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"/>
+                <signal pad-key="pe0" function="TWI" group="SDA"/>
+                <signal pad-key="pe1" function="TWI" group="SCL"/>
             </signals>
         </peripheral>
         <peripheral key="port_cfg" name="PORT_CFG" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pc7" function="EVOUT" group="EVOUT" field="EVOUT"/>
-                <signal pad-id="pc4" function="EVOUT_ALT" group="EVOUT" field="CLKEVPIN"/>
-                <signal pad-id="pc6" function="RTCOUTC" group="RTCOUT"/>
+                <signal pad-key="pc7" function="CLKOUT" group="CLKOUT" field="CLKOUT"/>
+                <signal pad-key="pc4" function="CLKOUT_ALT" group="CLKOUT" field="CLKEVPIN"/>
+                <signal pad-key="pc7" function="EVOUT" group="EVOUT" field="EVOUT"/>
+                <signal pad-key="pc4" function="EVOUT_ALT" group="EVOUT" field="CLKEVPIN"/>
+                <signal pad-key="pc6" function="RTCOUTC" group="RTCOUT"/>
             </signals>
         </peripheral>
         <peripheral key="vport0" name="VPORT0" module-key="gpio_port">
@@ -203,119 +203,119 @@
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pa2" index="2" function="PORTA" group="P"/>
-                <signal pad-id="pa3" index="3" function="PORTA" group="P"/>
-                <signal pad-id="pa4" index="4" function="PORTA" group="P"/>
-                <signal pad-id="pa5" index="5" function="PORTA" group="P"/>
-                <signal pad-id="pa6" index="6" function="PORTA" group="P"/>
-                <signal pad-id="pa7" index="7" function="PORTA" group="P"/>
+                <signal pad-key="pa0" index="0" function="PORTA" group="P"/>
+                <signal pad-key="pa1" index="1" function="PORTA" group="P"/>
+                <signal pad-key="pa2" index="2" function="PORTA" group="P"/>
+                <signal pad-key="pa3" index="3" function="PORTA" group="P"/>
+                <signal pad-key="pa4" index="4" function="PORTA" group="P"/>
+                <signal pad-key="pa5" index="5" function="PORTA" group="P"/>
+                <signal pad-key="pa6" index="6" function="PORTA" group="P"/>
+                <signal pad-key="pa7" index="7" function="PORTA" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pb2" index="2" function="PORTB" group="P"/>
-                <signal pad-id="pb3" index="3" function="PORTB" group="P"/>
-                <signal pad-id="pb4" index="4" function="PORTB" group="P"/>
-                <signal pad-id="pb5" index="5" function="PORTB" group="P"/>
-                <signal pad-id="pb6" index="6" function="PORTB" group="P"/>
-                <signal pad-id="pb7" index="7" function="PORTB" group="P"/>
+                <signal pad-key="pb0" index="0" function="PORTB" group="P"/>
+                <signal pad-key="pb1" index="1" function="PORTB" group="P"/>
+                <signal pad-key="pb2" index="2" function="PORTB" group="P"/>
+                <signal pad-key="pb3" index="3" function="PORTB" group="P"/>
+                <signal pad-key="pb4" index="4" function="PORTB" group="P"/>
+                <signal pad-key="pb5" index="5" function="PORTB" group="P"/>
+                <signal pad-key="pb6" index="6" function="PORTB" group="P"/>
+                <signal pad-key="pb7" index="7" function="PORTB" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pc2" index="2" function="PORTC" group="P"/>
-                <signal pad-id="pc3" index="3" function="PORTC" group="P"/>
-                <signal pad-id="pc4" index="4" function="PORTC" group="P"/>
-                <signal pad-id="pc5" index="5" function="PORTC" group="P"/>
-                <signal pad-id="pc6" index="6" function="PORTC" group="P"/>
-                <signal pad-id="pc7" index="7" function="PORTC" group="P"/>
+                <signal pad-key="pc0" index="0" function="PORTC" group="P"/>
+                <signal pad-key="pc1" index="1" function="PORTC" group="P"/>
+                <signal pad-key="pc2" index="2" function="PORTC" group="P"/>
+                <signal pad-key="pc3" index="3" function="PORTC" group="P"/>
+                <signal pad-key="pc4" index="4" function="PORTC" group="P"/>
+                <signal pad-key="pc5" index="5" function="PORTC" group="P"/>
+                <signal pad-key="pc6" index="6" function="PORTC" group="P"/>
+                <signal pad-key="pc7" index="7" function="PORTC" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pd2" index="2" function="PORTD" group="P"/>
-                <signal pad-id="pd3" index="3" function="PORTD" group="P"/>
-                <signal pad-id="pd4" index="4" function="PORTD" group="P"/>
-                <signal pad-id="pd5" index="5" function="PORTD" group="P"/>
-                <signal pad-id="pd6" index="6" function="PORTD" group="P"/>
-                <signal pad-id="pd7" index="7" function="PORTD" group="P"/>
+                <signal pad-key="pd0" index="0" function="PORTD" group="P"/>
+                <signal pad-key="pd1" index="1" function="PORTD" group="P"/>
+                <signal pad-key="pd2" index="2" function="PORTD" group="P"/>
+                <signal pad-key="pd3" index="3" function="PORTD" group="P"/>
+                <signal pad-key="pd4" index="4" function="PORTD" group="P"/>
+                <signal pad-key="pd5" index="5" function="PORTD" group="P"/>
+                <signal pad-key="pd6" index="6" function="PORTD" group="P"/>
+                <signal pad-key="pd7" index="7" function="PORTD" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="porte" name="PORTE" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pe2" index="2" function="PORTE" group="P"/>
-                <signal pad-id="pe3" index="3" function="PORTE" group="P"/>
-                <signal pad-id="pe4" index="4" function="PORTE" group="P"/>
-                <signal pad-id="pe5" index="5" function="PORTE" group="P"/>
-                <signal pad-id="pe6" index="6" function="PORTE" group="P"/>
-                <signal pad-id="pe7" index="7" function="PORTE" group="P"/>
+                <signal pad-key="pe0" index="0" function="PORTE" group="P"/>
+                <signal pad-key="pe1" index="1" function="PORTE" group="P"/>
+                <signal pad-key="pe2" index="2" function="PORTE" group="P"/>
+                <signal pad-key="pe3" index="3" function="PORTE" group="P"/>
+                <signal pad-key="pe4" index="4" function="PORTE" group="P"/>
+                <signal pad-key="pe5" index="5" function="PORTE" group="P"/>
+                <signal pad-key="pe6" index="6" function="PORTE" group="P"/>
+                <signal pad-key="pe7" index="7" function="PORTE" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portf" name="PORTF" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pf2" index="2" function="PORTF" group="P"/>
-                <signal pad-id="pf3" index="3" function="PORTF" group="P"/>
-                <signal pad-id="pf4" index="4" function="PORTF" group="P"/>
-                <signal pad-id="pf5" index="5" function="PORTF" group="P"/>
-                <signal pad-id="pf6" index="6" function="PORTF" group="P"/>
-                <signal pad-id="pf7" index="7" function="PORTF" group="P"/>
+                <signal pad-key="pf0" index="0" function="PORTF" group="P"/>
+                <signal pad-key="pf1" index="1" function="PORTF" group="P"/>
+                <signal pad-key="pf2" index="2" function="PORTF" group="P"/>
+                <signal pad-key="pf3" index="3" function="PORTF" group="P"/>
+                <signal pad-key="pf4" index="4" function="PORTF" group="P"/>
+                <signal pad-key="pf5" index="5" function="PORTF" group="P"/>
+                <signal pad-key="pf6" index="6" function="PORTF" group="P"/>
+                <signal pad-key="pf7" index="7" function="PORTF" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portr" name="PORTR" module-key="gpio_port">
             <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"/>
+                <signal pad-key="pr0" index="0" function="PORTR" group="P"/>
+                <signal pad-key="pr1" index="1" function="PORTR" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="tcc0" name="TCC0" module-key="i6090_tc">
             <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"/>
-                <signal pad-id="pc2" function="TC0" group="OC0C" field="TC0C"/>
-                <signal pad-id="pc3" function="TC0" group="OC0D" field="TC0D"/>
-                <signal pad-id="pc4" function="TC0_ALT" group="OC0A" field="TC0A"/>
-                <signal pad-id="pc5" function="TC0_ALT" group="OC0B" field="TC0B"/>
-                <signal pad-id="pc6" function="TC0_ALT" group="OC0C" field="TC0C"/>
-                <signal pad-id="pc7" function="TC0_ALT" group="OC0D" field="TC0D"/>
+                <signal pad-key="pc0" function="TC0" group="OC0A" field="TC0A"/>
+                <signal pad-key="pc1" function="TC0" group="OC0B" field="TC0B"/>
+                <signal pad-key="pc2" function="TC0" group="OC0C" field="TC0C"/>
+                <signal pad-key="pc3" function="TC0" group="OC0D" field="TC0D"/>
+                <signal pad-key="pc4" function="TC0_ALT" group="OC0A" field="TC0A"/>
+                <signal pad-key="pc5" function="TC0_ALT" group="OC0B" field="TC0B"/>
+                <signal pad-key="pc6" function="TC0_ALT" group="OC0C" field="TC0C"/>
+                <signal pad-key="pc7" function="TC0_ALT" group="OC0D" field="TC0D"/>
             </signals>
         </peripheral>
         <peripheral key="tcc1" name="TCC1" module-key="i6090_tc">
             <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"/>
+                <signal pad-key="pc4" function="TC1" group="OC1A"/>
+                <signal pad-key="pc5" function="TC1" group="OC1B"/>
             </signals>
         </peripheral>
         <peripheral key="awexc" name="AWEXC" module-key="i6090_tc">
             <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"/>
-                <signal pad-id="pc2" function="AWEX" group="OC0BLS"/>
-                <signal pad-id="pc3" function="AWEX" group="OC0BHS"/>
-                <signal pad-id="pc4" function="AWEX" group="OC0CLS"/>
-                <signal pad-id="pc5" function="AWEX" group="OC0CHS"/>
-                <signal pad-id="pc6" function="AWEX" group="OC0DLS"/>
-                <signal pad-id="pc7" function="AWEX" group="OC0DHS"/>
+                <signal pad-key="pc0" function="AWEX" group="OC0ALS"/>
+                <signal pad-key="pc1" function="AWEX" group="OC0AHS"/>
+                <signal pad-key="pc2" function="AWEX" group="OC0BLS"/>
+                <signal pad-key="pc3" function="AWEX" group="OC0BHS"/>
+                <signal pad-key="pc4" function="AWEX" group="OC0CLS"/>
+                <signal pad-key="pc5" function="AWEX" group="OC0CHS"/>
+                <signal pad-key="pc6" function="AWEX" group="OC0DLS"/>
+                <signal pad-key="pc7" function="AWEX" group="OC0DHS"/>
             </signals>
         </peripheral>
         <peripheral key="hiresc" name="HIRESC" module-key="i6090_tc">
@@ -324,19 +324,19 @@
         <peripheral key="tcd0" name="TCD0" module-key="i6090_tc">
             <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"/>
-                <signal pad-id="pd2" function="TC0" group="OC0C"/>
-                <signal pad-id="pd3" function="TC0" group="OC0D"/>
+                <signal pad-key="pd0" function="TC0" group="OC0A"/>
+                <signal pad-key="pd1" function="TC0" group="OC0B"/>
+                <signal pad-key="pd2" function="TC0" group="OC0C"/>
+                <signal pad-key="pd3" function="TC0" group="OC0D"/>
             </signals>
         </peripheral>
         <peripheral key="tce0" name="TCE0" module-key="i6090_tc">
             <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"/>
-                <signal pad-id="pe2" function="TC0" group="OC0C"/>
-                <signal pad-id="pe3" function="TC0" group="OC0D"/>
+                <signal pad-key="pe0" function="TC0" group="OC0A"/>
+                <signal pad-key="pe1" function="TC0" group="OC0B"/>
+                <signal pad-key="pe2" function="TC0" group="OC0C"/>
+                <signal pad-key="pe3" function="TC0" group="OC0D"/>
             </signals>
         </peripheral>
         <peripheral key="awexe" name="AWEXE" module-key="i6090_tc">
@@ -345,111 +345,111 @@
         <peripheral key="tcf0" name="TCF0" module-key="i6090_tc">
             <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"/>
-                <signal pad-id="pf2" function="TC0" group="OC0C"/>
-                <signal pad-id="pf3" function="TC0" group="OC0D"/>
+                <signal pad-key="pf0" function="TC0" group="OC0A"/>
+                <signal pad-key="pf1" function="TC0" group="OC0B"/>
+                <signal pad-key="pf2" function="TC0" group="OC0C"/>
+                <signal pad-key="pf3" function="TC0" group="OC0D"/>
             </signals>
         </peripheral>
         <peripheral key="tcc2" name="TCC2" module-key="i6090_tc2">
             <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"/>
-                <signal pad-id="pc2" function="TC2" group="LOC2C"/>
-                <signal pad-id="pc3" function="TC2" group="LOC2D"/>
-                <signal pad-id="pc4" function="TC2" group="HOC2A"/>
-                <signal pad-id="pc5" function="TC2" group="HOC2B"/>
-                <signal pad-id="pc6" function="TC2" group="HOC2C"/>
-                <signal pad-id="pc7" function="TC2" group="HOC2D"/>
+                <signal pad-key="pc0" function="TC2" group="LOC2A"/>
+                <signal pad-key="pc1" function="TC2" group="LOC2B"/>
+                <signal pad-key="pc2" function="TC2" group="LOC2C"/>
+                <signal pad-key="pc3" function="TC2" group="LOC2D"/>
+                <signal pad-key="pc4" function="TC2" group="HOC2A"/>
+                <signal pad-key="pc5" function="TC2" group="HOC2B"/>
+                <signal pad-key="pc6" function="TC2" group="HOC2C"/>
+                <signal pad-key="pc7" function="TC2" group="HOC2D"/>
             </signals>
         </peripheral>
         <peripheral key="tcd2" name="TCD2" module-key="i6090_tc2">
             <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"/>
-                <signal pad-id="pd2" function="TC2" group="LOC2C"/>
-                <signal pad-id="pd3" function="TC2" group="LOC2D"/>
-                <signal pad-id="pd4" function="TC2" group="HOC2A"/>
-                <signal pad-id="pd5" function="TC2" group="HOC2B"/>
-                <signal pad-id="pd6" function="TC2" group="HOC2C"/>
-                <signal pad-id="pd7" function="TC2" group="HOC2D"/>
+                <signal pad-key="pd0" function="TC2" group="LOC2A"/>
+                <signal pad-key="pd1" function="TC2" group="LOC2B"/>
+                <signal pad-key="pd2" function="TC2" group="LOC2C"/>
+                <signal pad-key="pd3" function="TC2" group="LOC2D"/>
+                <signal pad-key="pd4" function="TC2" group="HOC2A"/>
+                <signal pad-key="pd5" function="TC2" group="HOC2B"/>
+                <signal pad-key="pd6" function="TC2" group="HOC2C"/>
+                <signal pad-key="pd7" function="TC2" group="HOC2D"/>
             </signals>
         </peripheral>
         <peripheral key="tce2" name="TCE2" module-key="i6090_tc2">
             <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"/>
-                <signal pad-id="pe2" function="TC2" group="LOC2C"/>
-                <signal pad-id="pe3" function="TC2" group="LOC2D"/>
-                <signal pad-id="pe4" function="TC2" group="HOC2A"/>
-                <signal pad-id="pe5" function="TC2" group="HOC2B"/>
-                <signal pad-id="pe6" function="TC2" group="HOC2C"/>
-                <signal pad-id="pe7" function="TC2" group="HOC2D"/>
+                <signal pad-key="pe0" function="TC2" group="LOC2A"/>
+                <signal pad-key="pe1" function="TC2" group="LOC2B"/>
+                <signal pad-key="pe2" function="TC2" group="LOC2C"/>
+                <signal pad-key="pe3" function="TC2" group="LOC2D"/>
+                <signal pad-key="pe4" function="TC2" group="HOC2A"/>
+                <signal pad-key="pe5" function="TC2" group="HOC2B"/>
+                <signal pad-key="pe6" function="TC2" group="HOC2C"/>
+                <signal pad-key="pe7" function="TC2" group="HOC2D"/>
             </signals>
         </peripheral>
         <peripheral key="tcf2" name="TCF2" module-key="i6090_tc2">
             <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"/>
-                <signal pad-id="pf2" function="TC2" group="LOC2C"/>
-                <signal pad-id="pf3" function="TC2" group="LOC2D"/>
-                <signal pad-id="pf4" function="TC2" group="HOC2A"/>
-                <signal pad-id="pf5" function="TC2" group="HOC2B"/>
-                <signal pad-id="pf6" function="TC2" group="HOC2C"/>
-                <signal pad-id="pf7" function="TC2" group="HOC2D"/>
+                <signal pad-key="pf0" function="TC2" group="LOC2A"/>
+                <signal pad-key="pf1" function="TC2" group="LOC2B"/>
+                <signal pad-key="pf2" function="TC2" group="LOC2C"/>
+                <signal pad-key="pf3" function="TC2" group="LOC2D"/>
+                <signal pad-key="pf4" function="TC2" group="HOC2A"/>
+                <signal pad-key="pf5" function="TC2" group="HOC2B"/>
+                <signal pad-key="pf6" function="TC2" group="HOC2C"/>
+                <signal pad-key="pf7" function="TC2" group="HOC2D"/>
             </signals>
         </peripheral>
         <peripheral key="usartc0" name="USARTC0" module-key="i6090_usart">
             <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"/>
-                <signal pad-id="pc3" function="USART" group="TXD" field="USART0"/>
-                <signal pad-id="pc5" function="USART_ALT" group="XCK" field="USART0"/>
-                <signal pad-id="pc6" function="USART_ALT" group="RXD" field="USART0"/>
-                <signal pad-id="pc7" function="USART_ALT" group="TXD" field="USART0"/>
+                <signal pad-key="pc1" function="USART" group="XCK" field="USART0"/>
+                <signal pad-key="pc2" function="USART" group="RXD" field="USART0"/>
+                <signal pad-key="pc3" function="USART" group="TXD" field="USART0"/>
+                <signal pad-key="pc5" function="USART_ALT" group="XCK" field="USART0"/>
+                <signal pad-key="pc6" function="USART_ALT" group="RXD" field="USART0"/>
+                <signal pad-key="pc7" function="USART_ALT" group="TXD" field="USART0"/>
             </signals>
         </peripheral>
         <peripheral key="usartd0" name="USARTD0" module-key="i6090_usart">
             <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"/>
-                <signal pad-id="pd3" function="USART" group="TXD"/>
+                <signal pad-key="pd1" function="USART" group="XCK"/>
+                <signal pad-key="pd2" function="USART" group="RXD"/>
+                <signal pad-key="pd3" function="USART" group="TXD"/>
             </signals>
         </peripheral>
         <peripheral key="usarte0" name="USARTE0" module-key="i6090_usart">
             <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"/>
-                <signal pad-id="pe3" function="USART" group="TXD"/>
+                <signal pad-key="pe1" function="USART" group="XCK"/>
+                <signal pad-key="pe2" function="USART" group="RXD"/>
+                <signal pad-key="pe3" function="USART" group="TXD"/>
             </signals>
         </peripheral>
         <peripheral key="spic" name="SPIC" module-key="i6090_spi">
             <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"/>
-                <signal pad-id="pc6" function="SPI" group="MISO" field="SPI"/>
-                <signal pad-id="pc7" function="SPI" group="SCK" field="SPI"/>
-                <signal pad-id="pc4" function="SPI_ALT" group="SS" field="SPI"/>
-                <signal pad-id="pc5" function="SPI_ALT" group="SCK" field="SPI"/>
-                <signal pad-id="pc6" function="SPI_ALT" group="MISO" field="SPI"/>
-                <signal pad-id="pc7" function="SPI_ALT" group="MOSI" field="SPI"/>
+                <signal pad-key="pc4" function="SPI" group="SS" field="SPI"/>
+                <signal pad-key="pc5" function="SPI" group="MOSI" field="SPI"/>
+                <signal pad-key="pc6" function="SPI" group="MISO" field="SPI"/>
+                <signal pad-key="pc7" function="SPI" group="SCK" field="SPI"/>
+                <signal pad-key="pc4" function="SPI_ALT" group="SS" field="SPI"/>
+                <signal pad-key="pc5" function="SPI_ALT" group="SCK" field="SPI"/>
+                <signal pad-key="pc6" function="SPI_ALT" group="MISO" field="SPI"/>
+                <signal pad-key="pc7" function="SPI_ALT" group="MOSI" field="SPI"/>
             </signals>
         </peripheral>
         <peripheral key="spid" name="SPID" module-key="i6090_spi">
             <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"/>
-                <signal pad-id="pd6" function="SPI" group="MISO"/>
-                <signal pad-id="pd7" function="SPI" group="SCK"/>
+                <signal pad-key="pd4" function="SPI" group="SS"/>
+                <signal pad-key="pd5" function="SPI" group="MOSI"/>
+                <signal pad-key="pd6" function="SPI" group="MISO"/>
+                <signal pad-key="pd7" function="SPI" group="SCK"/>
             </signals>
         </peripheral>
         <peripheral key="spie" name="SPIE" module-key="i6090_spi">
@@ -1407,78 +1407,135 @@
             </register-group>
         </module>
     </modules>
+    <pads>
+        <pad key="pa3" name="PA3"/>
+        <pad key="pa4" name="PA4"/>
+        <pad key="pa5" name="PA5"/>
+        <pad key="pa6" name="PA6"/>
+        <pad key="pa7" name="PA7"/>
+        <pad key="pb0" name="PB0"/>
+        <pad key="pb1" name="PB1"/>
+        <pad key="pb2" name="PB2"/>
+        <pad key="pb3" name="PB3"/>
+        <pad key="pb4" name="PB4"/>
+        <pad key="pb5" name="PB5"/>
+        <pad key="pb6" name="PB6"/>
+        <pad key="pb7" name="PB7"/>
+        <pad key="gnd" name="GND"/>
+        <pad key="vcc" name="VCC"/>
+        <pad key="pc0" name="PC0"/>
+        <pad key="pc1" name="PC1"/>
+        <pad key="pc2" name="PC2"/>
+        <pad key="pc3" name="PC3"/>
+        <pad key="pc4" name="PC4"/>
+        <pad key="pc5" name="PC5"/>
+        <pad key="pc6" name="PC6"/>
+        <pad key="pc7" name="PC7"/>
+        <pad key="pd0" name="PD0"/>
+        <pad key="pd1" name="PD1"/>
+        <pad key="pd2" name="PD2"/>
+        <pad key="pd3" name="PD3"/>
+        <pad key="pd4" name="PD4"/>
+        <pad key="pd5" name="PD5"/>
+        <pad key="pd6" name="PD6"/>
+        <pad key="pd7" name="PD7"/>
+        <pad key="pe0" name="PE0"/>
+        <pad key="pe1" name="PE1"/>
+        <pad key="pe2" name="PE2"/>
+        <pad key="pe3" name="PE3"/>
+        <pad key="pe4" name="PE4"/>
+        <pad key="pe5" name="PE5"/>
+        <pad key="pe6" name="PE6"/>
+        <pad key="pe7" name="PE7"/>
+        <pad key="pf0" name="PF0"/>
+        <pad key="pf1" name="PF1"/>
+        <pad key="pf2" name="PF2"/>
+        <pad key="pf3" name="PF3"/>
+        <pad key="pf4" name="PF4"/>
+        <pad key="pf5" name="PF5"/>
+        <pad key="pf6" name="PF6"/>
+        <pad key="pf7" name="PF7"/>
+        <pad key="pdi" name="PDI"/>
+        <pad key="reset" name="RESET"/>
+        <pad key="pr0" name="PR0"/>
+        <pad key="pr1" name="PR1"/>
+        <pad key="avcc" name="AVCC"/>
+        <pad key="pa0" name="PA0"/>
+        <pad key="pa1" name="PA1"/>
+        <pad key="pa2" name="PA2"/>
+    </pads>
     <pinouts>
         <pinout key="qfp_qfn_64" name="QFP_QFN_64" type="qfn">
-            <pin position="1" pad="PA3"/>
-            <pin position="2" pad="PA4"/>
-            <pin position="3" pad="PA5"/>
-            <pin position="4" pad="PA6"/>
-            <pin position="5" pad="PA7"/>
-            <pin position="6" pad="PB0"/>
-            <pin position="7" pad="PB1"/>
-            <pin position="8" pad="PB2"/>
-            <pin position="9" pad="PB3"/>
-            <pin position="10" pad="PB4"/>
-            <pin position="11" pad="PB5"/>
-            <pin position="12" pad="PB6"/>
-            <pin position="13" pad="PB7"/>
-            <pin position="14" pad="GND"/>
-            <pin position="15" pad="VCC"/>
-            <pin position="16" pad="PC0"/>
-            <pin position="17" pad="PC1"/>
-            <pin position="18" pad="PC2"/>
-            <pin position="19" pad="PC3"/>
-            <pin position="20" pad="PC4"/>
-            <pin position="21" pad="PC5"/>
-            <pin position="22" pad="PC6"/>
-            <pin position="23" pad="PC7"/>
-            <pin position="24" pad="GND"/>
-            <pin position="25" pad="VCC"/>
-            <pin position="26" pad="PD0"/>
-            <pin position="27" pad="PD1"/>
-            <pin position="28" pad="PD2"/>
-            <pin position="29" pad="PD3"/>
-            <pin position="30" pad="PD4"/>
-            <pin position="31" pad="PD5"/>
-            <pin position="32" pad="PD6"/>
-            <pin position="33" pad="PD7"/>
-            <pin position="34" pad="GND"/>
-            <pin position="35" pad="VCC"/>
-            <pin position="36" pad="PE0"/>
-            <pin position="37" pad="PE1"/>
-            <pin position="38" pad="PE2"/>
-            <pin position="39" pad="PE3"/>
-            <pin position="40" pad="PE4"/>
-            <pin position="41" pad="PE5"/>
-            <pin position="42" pad="PE6"/>
-            <pin position="43" pad="PE7"/>
-            <pin position="44" pad="GND"/>
-            <pin position="45" pad="VCC"/>
-            <pin position="46" pad="PF0"/>
-            <pin position="47" pad="PF1"/>
-            <pin position="48" pad="PF2"/>
-            <pin position="49" pad="PF3"/>
-            <pin position="50" pad="PF4"/>
-            <pin position="51" pad="PF5"/>
-            <pin position="52" pad="GND"/>
-            <pin position="53" pad="VCC"/>
-            <pin position="54" pad="PF6"/>
-            <pin position="55" pad="PF7"/>
-            <pin position="56" pad="PDI"/>
-            <pin position="57" pad="RESET"/>
-            <pin position="58" pad="PR0"/>
-            <pin position="59" pad="PR1"/>
-            <pin position="60" pad="GND"/>
-            <pin position="61" pad="AVCC"/>
-            <pin position="62" pad="PA0"/>
-            <pin position="63" pad="PA1"/>
-            <pin position="64" pad="PA2"/>
+            <pin position="1" pad-key="pa3"/>
+            <pin position="2" pad-key="pa4"/>
+            <pin position="3" pad-key="pa5"/>
+            <pin position="4" pad-key="pa6"/>
+            <pin position="5" pad-key="pa7"/>
+            <pin position="6" pad-key="pb0"/>
+            <pin position="7" pad-key="pb1"/>
+            <pin position="8" pad-key="pb2"/>
+            <pin position="9" pad-key="pb3"/>
+            <pin position="10" pad-key="pb4"/>
+            <pin position="11" pad-key="pb5"/>
+            <pin position="12" pad-key="pb6"/>
+            <pin position="13" pad-key="pb7"/>
+            <pin position="14" pad-key="gnd"/>
+            <pin position="15" pad-key="vcc"/>
+            <pin position="16" pad-key="pc0"/>
+            <pin position="17" pad-key="pc1"/>
+            <pin position="18" pad-key="pc2"/>
+            <pin position="19" pad-key="pc3"/>
+            <pin position="20" pad-key="pc4"/>
+            <pin position="21" pad-key="pc5"/>
+            <pin position="22" pad-key="pc6"/>
+            <pin position="23" pad-key="pc7"/>
+            <pin position="24" pad-key="gnd"/>
+            <pin position="25" pad-key="vcc"/>
+            <pin position="26" pad-key="pd0"/>
+            <pin position="27" pad-key="pd1"/>
+            <pin position="28" pad-key="pd2"/>
+            <pin position="29" pad-key="pd3"/>
+            <pin position="30" pad-key="pd4"/>
+            <pin position="31" pad-key="pd5"/>
+            <pin position="32" pad-key="pd6"/>
+            <pin position="33" pad-key="pd7"/>
+            <pin position="34" pad-key="gnd"/>
+            <pin position="35" pad-key="vcc"/>
+            <pin position="36" pad-key="pe0"/>
+            <pin position="37" pad-key="pe1"/>
+            <pin position="38" pad-key="pe2"/>
+            <pin position="39" pad-key="pe3"/>
+            <pin position="40" pad-key="pe4"/>
+            <pin position="41" pad-key="pe5"/>
+            <pin position="42" pad-key="pe6"/>
+            <pin position="43" pad-key="pe7"/>
+            <pin position="44" pad-key="gnd"/>
+            <pin position="45" pad-key="vcc"/>
+            <pin position="46" pad-key="pf0"/>
+            <pin position="47" pad-key="pf1"/>
+            <pin position="48" pad-key="pf2"/>
+            <pin position="49" pad-key="pf3"/>
+            <pin position="50" pad-key="pf4"/>
+            <pin position="51" pad-key="pf5"/>
+            <pin position="52" pad-key="gnd"/>
+            <pin position="53" pad-key="vcc"/>
+            <pin position="54" pad-key="pf6"/>
+            <pin position="55" pad-key="pf7"/>
+            <pin position="56" pad-key="pdi"/>
+            <pin position="57" pad-key="reset"/>
+            <pin position="58" pad-key="pr0"/>
+            <pin position="59" pad-key="pr1"/>
+            <pin position="60" pad-key="gnd"/>
+            <pin position="61" pad-key="avcc"/>
+            <pin position="62" pad-key="pa0"/>
+            <pin position="63" pad-key="pa1"/>
+            <pin position="64" pad-key="pa2"/>
         </pinout>
     </pinouts>
     <variants>
-        <variant name="ATxmega256D3-AU" pinout-key="qfp_qfn_64" package="TQFP64"/>
-        <variant name="ATxmega256D3-MH" pinout-key="qfp_qfn_64" package="QFN64"/>
-        <variant name="ATxmega256D3-AN" pinout-key="qfp_qfn_64" package="TQFP64"/>
-        <variant name="ATxmega256D3-MN" pinout-key="qfp_qfn_64" package="QFN64"/>
+        <variant key="atxmega256d3_au" name="ATxmega256D3-AU" pinout-key="qfp_qfn_64"/>
+        <variant key="atxmega256d3_mh" name="ATxmega256D3-MH" pinout-key="qfp_qfn_64"/>
+        <variant key="atxmega256d3_an" name="ATxmega256D3-AN" pinout-key="qfp_qfn_64"/>
+        <variant key="atxmega256d3_mn" name="ATxmega256D3-MN" pinout-key="qfp_qfn_64"/>
     </variants>
 </device>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA32A4.xml b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA32A4.xml
index 9ca3be14..fed9f1e1 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA32A4.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA32A4.xml
@@ -153,65 +153,65 @@
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pa2" index="2" function="PORTA" group="P"/>
-                <signal pad-id="pa3" index="3" function="PORTA" group="P"/>
-                <signal pad-id="pa4" index="4" function="PORTA" group="P"/>
-                <signal pad-id="pa5" index="5" function="PORTA" group="P"/>
-                <signal pad-id="pa6" index="6" function="PORTA" group="P"/>
-                <signal pad-id="pa7" index="7" function="PORTA" group="P"/>
+                <signal pad-key="pa0" index="0" function="PORTA" group="P"/>
+                <signal pad-key="pa1" index="1" function="PORTA" group="P"/>
+                <signal pad-key="pa2" index="2" function="PORTA" group="P"/>
+                <signal pad-key="pa3" index="3" function="PORTA" group="P"/>
+                <signal pad-key="pa4" index="4" function="PORTA" group="P"/>
+                <signal pad-key="pa5" index="5" function="PORTA" group="P"/>
+                <signal pad-key="pa6" index="6" function="PORTA" group="P"/>
+                <signal pad-key="pa7" index="7" function="PORTA" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pb2" index="2" function="PORTB" group="P"/>
-                <signal pad-id="pb3" index="3" function="PORTB" group="P"/>
+                <signal pad-key="pb0" index="0" function="PORTB" group="P"/>
+                <signal pad-key="pb1" index="1" function="PORTB" group="P"/>
+                <signal pad-key="pb2" index="2" function="PORTB" group="P"/>
+                <signal pad-key="pb3" index="3" function="PORTB" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pc2" index="2" function="PORTC" group="P"/>
-                <signal pad-id="pc3" index="3" function="PORTC" group="P"/>
-                <signal pad-id="pc4" index="4" function="PORTC" group="P"/>
-                <signal pad-id="pc5" index="5" function="PORTC" group="P"/>
-                <signal pad-id="pc6" index="6" function="PORTC" group="P"/>
-                <signal pad-id="pc7" index="7" function="PORTC" group="P"/>
+                <signal pad-key="pc0" index="0" function="PORTC" group="P"/>
+                <signal pad-key="pc1" index="1" function="PORTC" group="P"/>
+                <signal pad-key="pc2" index="2" function="PORTC" group="P"/>
+                <signal pad-key="pc3" index="3" function="PORTC" group="P"/>
+                <signal pad-key="pc4" index="4" function="PORTC" group="P"/>
+                <signal pad-key="pc5" index="5" function="PORTC" group="P"/>
+                <signal pad-key="pc6" index="6" function="PORTC" group="P"/>
+                <signal pad-key="pc7" index="7" function="PORTC" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pd2" index="2" function="PORTD" group="P"/>
-                <signal pad-id="pd3" index="3" function="PORTD" group="P"/>
-                <signal pad-id="pd4" index="4" function="PORTD" group="P"/>
-                <signal pad-id="pd5" index="5" function="PORTD" group="P"/>
-                <signal pad-id="pd6" index="6" function="PORTD" group="P"/>
-                <signal pad-id="pd7" index="7" function="PORTD" group="P"/>
+                <signal pad-key="pd0" index="0" function="PORTD" group="P"/>
+                <signal pad-key="pd1" index="1" function="PORTD" group="P"/>
+                <signal pad-key="pd2" index="2" function="PORTD" group="P"/>
+                <signal pad-key="pd3" index="3" function="PORTD" group="P"/>
+                <signal pad-key="pd4" index="4" function="PORTD" group="P"/>
+                <signal pad-key="pd5" index="5" function="PORTD" group="P"/>
+                <signal pad-key="pd6" index="6" function="PORTD" group="P"/>
+                <signal pad-key="pd7" index="7" function="PORTD" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="porte" name="PORTE" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pe2" index="2" function="PORTE" group="P"/>
-                <signal pad-id="pe3" index="3" function="PORTE" group="P"/>
+                <signal pad-key="pe0" index="0" function="PORTE" group="P"/>
+                <signal pad-key="pe1" index="1" function="PORTE" group="P"/>
+                <signal pad-key="pe2" index="2" function="PORTE" group="P"/>
+                <signal pad-key="pe3" index="3" function="PORTE" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portr" name="PORTR" module-key="gpio_port">
             <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"/>
+                <signal pad-key="pr0" index="0" function="PORTR" group="P"/>
+                <signal pad-key="pr1" index="1" function="PORTR" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="tcc0" name="TCC0" module-key="i6090_tc">
@@ -1325,56 +1325,97 @@
             </register-group>
         </module>
     </modules>
+    <pads>
+        <pad key="pa5" name="PA5"/>
+        <pad key="pa6" name="PA6"/>
+        <pad key="pa7" name="PA7"/>
+        <pad key="pb0" name="PB0"/>
+        <pad key="pb1" name="PB1"/>
+        <pad key="pb2" name="PB2"/>
+        <pad key="pb3" name="PB3"/>
+        <pad key="gnd" name="GND"/>
+        <pad key="vcc" name="VCC"/>
+        <pad key="pc0" name="PC0"/>
+        <pad key="pc1" name="PC1"/>
+        <pad key="pc2" name="PC2"/>
+        <pad key="pc3" name="PC3"/>
+        <pad key="pc4" name="PC4"/>
+        <pad key="pc5" name="PC5"/>
+        <pad key="pc6" name="PC6"/>
+        <pad key="pc7" name="PC7"/>
+        <pad key="pd0" name="PD0"/>
+        <pad key="pd1" name="PD1"/>
+        <pad key="pd2" name="PD2"/>
+        <pad key="pd3" name="PD3"/>
+        <pad key="pd4" name="PD4"/>
+        <pad key="pd5" name="PD5"/>
+        <pad key="pd6" name="PD6"/>
+        <pad key="pd7" name="PD7"/>
+        <pad key="pe0" name="PE0"/>
+        <pad key="pe1" name="PE1"/>
+        <pad key="pe2" name="PE2"/>
+        <pad key="pe3" name="PE3"/>
+        <pad key="pdi" name="PDI"/>
+        <pad key="reset" name="RESET"/>
+        <pad key="pr0" name="PR0"/>
+        <pad key="pr1" name="PR1"/>
+        <pad key="avcc" name="AVCC"/>
+        <pad key="pa0" name="PA0"/>
+        <pad key="pa1" name="PA1"/>
+        <pad key="pa2" name="PA2"/>
+        <pad key="pa3" name="PA3"/>
+        <pad key="pa4" name="PA4"/>
+    </pads>
     <pinouts>
         <pinout key="qfp_qfn_44" name="QFP_QFN_44" type="qfn">
-            <pin position="1" pad="PA5"/>
-            <pin position="2" pad="PA6"/>
-            <pin position="3" pad="PA7"/>
-            <pin position="4" pad="PB0"/>
-            <pin position="5" pad="PB1"/>
-            <pin position="6" pad="PB2"/>
-            <pin position="7" pad="PB3"/>
-            <pin position="8" pad="GND"/>
-            <pin position="9" pad="VCC"/>
-            <pin position="10" pad="PC0"/>
-            <pin position="11" pad="PC1"/>
-            <pin position="12" pad="PC2"/>
-            <pin position="13" pad="PC3"/>
-            <pin position="14" pad="PC4"/>
-            <pin position="15" pad="PC5"/>
-            <pin position="16" pad="PC6"/>
-            <pin position="17" pad="PC7"/>
-            <pin position="18" pad="GND"/>
-            <pin position="19" pad="VCC"/>
-            <pin position="20" pad="PD0"/>
-            <pin position="21" pad="PD1"/>
-            <pin position="22" pad="PD2"/>
-            <pin position="23" pad="PD3"/>
-            <pin position="24" pad="PD4"/>
-            <pin position="25" pad="PD5"/>
-            <pin position="26" pad="PD6"/>
-            <pin position="27" pad="PD7"/>
-            <pin position="28" pad="PE0"/>
-            <pin position="29" pad="PE1"/>
-            <pin position="30" pad="GND"/>
-            <pin position="31" pad="VCC"/>
-            <pin position="32" pad="PE2"/>
-            <pin position="33" pad="PE3"/>
-            <pin position="34" pad="PDI"/>
-            <pin position="35" pad="RESET"/>
-            <pin position="36" pad="PR0"/>
-            <pin position="37" pad="PR1"/>
-            <pin position="38" pad="GND"/>
-            <pin position="39" pad="AVCC"/>
-            <pin position="40" pad="PA0"/>
-            <pin position="41" pad="PA1"/>
-            <pin position="42" pad="PA2"/>
-            <pin position="43" pad="PA3"/>
-            <pin position="44" pad="PA4"/>
+            <pin position="1" pad-key="pa5"/>
+            <pin position="2" pad-key="pa6"/>
+            <pin position="3" pad-key="pa7"/>
+            <pin position="4" pad-key="pb0"/>
+            <pin position="5" pad-key="pb1"/>
+            <pin position="6" pad-key="pb2"/>
+            <pin position="7" pad-key="pb3"/>
+            <pin position="8" pad-key="gnd"/>
+            <pin position="9" pad-key="vcc"/>
+            <pin position="10" pad-key="pc0"/>
+            <pin position="11" pad-key="pc1"/>
+            <pin position="12" pad-key="pc2"/>
+            <pin position="13" pad-key="pc3"/>
+            <pin position="14" pad-key="pc4"/>
+            <pin position="15" pad-key="pc5"/>
+            <pin position="16" pad-key="pc6"/>
+            <pin position="17" pad-key="pc7"/>
+            <pin position="18" pad-key="gnd"/>
+            <pin position="19" pad-key="vcc"/>
+            <pin position="20" pad-key="pd0"/>
+            <pin position="21" pad-key="pd1"/>
+            <pin position="22" pad-key="pd2"/>
+            <pin position="23" pad-key="pd3"/>
+            <pin position="24" pad-key="pd4"/>
+            <pin position="25" pad-key="pd5"/>
+            <pin position="26" pad-key="pd6"/>
+            <pin position="27" pad-key="pd7"/>
+            <pin position="28" pad-key="pe0"/>
+            <pin position="29" pad-key="pe1"/>
+            <pin position="30" pad-key="gnd"/>
+            <pin position="31" pad-key="vcc"/>
+            <pin position="32" pad-key="pe2"/>
+            <pin position="33" pad-key="pe3"/>
+            <pin position="34" pad-key="pdi"/>
+            <pin position="35" pad-key="reset"/>
+            <pin position="36" pad-key="pr0"/>
+            <pin position="37" pad-key="pr1"/>
+            <pin position="38" pad-key="gnd"/>
+            <pin position="39" pad-key="avcc"/>
+            <pin position="40" pad-key="pa0"/>
+            <pin position="41" pad-key="pa1"/>
+            <pin position="42" pad-key="pa2"/>
+            <pin position="43" pad-key="pa3"/>
+            <pin position="44" pad-key="pa4"/>
         </pinout>
     </pinouts>
     <variants>
-        <variant name="ATXMEGA32A4-AU" pinout-key="qfp_qfn_44" package="TQFP44"/>
-        <variant name="ATXMEGA32A4-MH" pinout-key="qfp_qfn_44" package="VQFN44"/>
+        <variant key="atxmega32a4_au" name="ATXMEGA32A4-AU" pinout-key="qfp_qfn_44"/>
+        <variant key="atxmega32a4_mh" name="ATXMEGA32A4-MH" pinout-key="qfp_qfn_44"/>
     </variants>
 </device>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA32A4U.xml b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA32A4U.xml
index 97328cd0..5a218adb 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA32A4U.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA32A4U.xml
@@ -92,12 +92,12 @@
         <peripheral key="osc" name="OSC" module-key="i6079">
             <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"/>
-                <signal pad-id="pr0" function="TOSC" group="TOSC2" field="TOSCSEL"/>
-                <signal pad-id="pr1" function="TOSC" group="TOSC1" field="TOSCSEL"/>
-                <signal pad-id="pe2" function="TOSC_ALT" group="TOSC2" field="TOSCSEL"/>
-                <signal pad-id="pe3" function="TOSC_ALT" group="TOSC1" field="TOSCSEL"/>
+                <signal pad-key="pr0" function="XTAL" group="XTAL2"/>
+                <signal pad-key="pr1" function="XTAL" group="XTAL1"/>
+                <signal pad-key="pr0" function="TOSC" group="TOSC2" field="TOSCSEL"/>
+                <signal pad-key="pr1" function="TOSC" group="TOSC1" field="TOSCSEL"/>
+                <signal pad-key="pe2" function="TOSC_ALT" group="TOSC2" field="TOSCSEL"/>
+                <signal pad-key="pe3" function="TOSC_ALT" group="TOSC1" field="TOSCSEL"/>
             </signals>
         </peripheral>
         <peripheral key="dfllrc32m" name="DFLLRC32M" module-key="i6055">
@@ -121,15 +121,15 @@
         <peripheral key="portcfg" name="PORTCFG" module-key="i6075_portcfg">
             <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"/>
-                <signal pad-id="pd7" function="CLKOUTD" group="CLKOUT" field="CLKOUT"/>
-                <signal pad-id="pd4" function="CLKOUTD_ALT" group="CLKOUT" field="CLKEVPIN"/>
-                <signal pad-id="pc7" function="EVOUTC" group="EVOUT" field="EVOUT"/>
-                <signal pad-id="pc4" function="EVOUTC_ALT" group="EVOUT" field="CLKEVPIN"/>
-                <signal pad-id="pd7" function="EVOUTD" group="EVOUT" field="EVOUT"/>
-                <signal pad-id="pd4" function="EVOUTD_ALT" group="EVOUT" field="CLKEVPIN"/>
-                <signal pad-id="pc6" function="RTCOUTC" group="RTCOUT"/>
+                <signal pad-key="pc7" function="CLKOUTC" group="CLKOUT" field="CLKOUT"/>
+                <signal pad-key="pc4" function="CLKOUTC_ALT" group="CLKOUT" field="CLKEVPIN"/>
+                <signal pad-key="pd7" function="CLKOUTD" group="CLKOUT" field="CLKOUT"/>
+                <signal pad-key="pd4" function="CLKOUTD_ALT" group="CLKOUT" field="CLKEVPIN"/>
+                <signal pad-key="pc7" function="EVOUTC" group="EVOUT" field="EVOUT"/>
+                <signal pad-key="pc4" function="EVOUTC_ALT" group="EVOUT" field="CLKEVPIN"/>
+                <signal pad-key="pd7" function="EVOUTD" group="EVOUT" field="EVOUT"/>
+                <signal pad-key="pd4" function="EVOUTD_ALT" group="EVOUT" field="CLKEVPIN"/>
+                <signal pad-key="pc6" function="RTCOUTC" group="RTCOUT"/>
             </signals>
         </peripheral>
         <peripheral key="aes" name="AES" module-key="i6096">
@@ -150,44 +150,44 @@
         <peripheral key="adca" name="ADCA" module-key="i6099">
             <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"/>
-                <signal pad-id="pa2" index="2" function="ADC" group="ADC"/>
-                <signal pad-id="pa3" index="3" function="ADC" group="ADC"/>
-                <signal pad-id="pa4" index="4" function="ADC" group="ADC"/>
-                <signal pad-id="pa5" index="5" function="ADC" group="ADC"/>
-                <signal pad-id="pa6" index="6" function="ADC" group="ADC"/>
-                <signal pad-id="pa7" index="7" function="ADC" group="ADC"/>
-                <signal pad-id="pb0" index="8" function="ADC" group="ADC"/>
-                <signal pad-id="pb1" index="9" function="ADC" group="ADC"/>
-                <signal pad-id="pb2" index="10" function="ADC" group="ADC"/>
-                <signal pad-id="pb3" index="11" function="ADC" group="ADC"/>
-                <signal pad-id="pa0" index="0" function="AREF" group="REFA"/>
-                <signal pad-id="pb0" index="0" function="AREF" group="REFB"/>
+                <signal pad-key="pa0" index="0" function="ADC" group="ADC"/>
+                <signal pad-key="pa1" index="1" function="ADC" group="ADC"/>
+                <signal pad-key="pa2" index="2" function="ADC" group="ADC"/>
+                <signal pad-key="pa3" index="3" function="ADC" group="ADC"/>
+                <signal pad-key="pa4" index="4" function="ADC" group="ADC"/>
+                <signal pad-key="pa5" index="5" function="ADC" group="ADC"/>
+                <signal pad-key="pa6" index="6" function="ADC" group="ADC"/>
+                <signal pad-key="pa7" index="7" function="ADC" group="ADC"/>
+                <signal pad-key="pb0" index="8" function="ADC" group="ADC"/>
+                <signal pad-key="pb1" index="9" function="ADC" group="ADC"/>
+                <signal pad-key="pb2" index="10" function="ADC" group="ADC"/>
+                <signal pad-key="pb3" index="11" function="ADC" group="ADC"/>
+                <signal pad-key="pa0" index="0" function="AREF" group="REFA"/>
+                <signal pad-key="pb0" index="0" function="AREF" group="REFB"/>
             </signals>
         </peripheral>
         <peripheral key="dacb" name="DACB" module-key="i6059">
             <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"/>
-                <signal pad-id="pa0" index="0" function="AREF" group="REFA"/>
-                <signal pad-id="pb0" index="0" function="AREF" group="REFB"/>
+                <signal pad-key="pb2" index="0" function="DAC" group="DAC"/>
+                <signal pad-key="pb3" index="1" function="DAC" group="DAC"/>
+                <signal pad-key="pa0" index="0" function="AREF" group="REFA"/>
+                <signal pad-key="pb0" index="0" function="AREF" group="REFB"/>
             </signals>
         </peripheral>
         <peripheral key="aca" name="ACA" module-key="i6077">
             <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"/>
-                <signal pad-id="pa2" index="2" function="AC" group="AC"/>
-                <signal pad-id="pa3" index="3" function="AC" group="AC"/>
-                <signal pad-id="pa4" index="4" function="AC" group="AC"/>
-                <signal pad-id="pa5" index="5" function="AC" group="AC"/>
-                <signal pad-id="pa6" index="6" function="AC" group="AC"/>
-                <signal pad-id="pa7" index="7" function="AC" group="AC"/>
-                <signal pad-id="pa6" index="1" function="ACOUT" group="ACOUT"/>
-                <signal pad-id="pa7" index="0" function="ACOUT" group="ACOUT"/>
+                <signal pad-key="pa0" index="0" function="AC" group="AC"/>
+                <signal pad-key="pa1" index="1" function="AC" group="AC"/>
+                <signal pad-key="pa2" index="2" function="AC" group="AC"/>
+                <signal pad-key="pa3" index="3" function="AC" group="AC"/>
+                <signal pad-key="pa4" index="4" function="AC" group="AC"/>
+                <signal pad-key="pa5" index="5" function="AC" group="AC"/>
+                <signal pad-key="pa6" index="6" function="AC" group="AC"/>
+                <signal pad-key="pa7" index="7" function="AC" group="AC"/>
+                <signal pad-key="pa6" index="1" function="ACOUT" group="ACOUT"/>
+                <signal pad-key="pa7" index="0" function="ACOUT" group="ACOUT"/>
             </signals>
         </peripheral>
         <peripheral key="rtc" name="RTC" module-key="i6093">
@@ -196,178 +196,178 @@
         <peripheral key="twic" name="TWIC" module-key="i6089">
             <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"/>
-                <signal pad-id="pc0" function="TWI_EXT" group="SDAIN"/>
-                <signal pad-id="pc1" function="TWI_EXT" group="SCLIN"/>
-                <signal pad-id="pc2" function="TWI_EXT" group="SDAOUT"/>
-                <signal pad-id="pc3" function="TWI_EXT" group="SCLOUT"/>
+                <signal pad-key="pc0" function="TWI" group="SDA"/>
+                <signal pad-key="pc1" function="TWI" group="SCL"/>
+                <signal pad-key="pc0" function="TWI_EXT" group="SDAIN"/>
+                <signal pad-key="pc1" function="TWI_EXT" group="SCLIN"/>
+                <signal pad-key="pc2" function="TWI_EXT" group="SDAOUT"/>
+                <signal pad-key="pc3" function="TWI_EXT" group="SCLOUT"/>
             </signals>
         </peripheral>
         <peripheral key="twie" name="TWIE" module-key="i6089">
             <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"/>
+                <signal pad-key="pe0" function="TWI" group="SDA"/>
+                <signal pad-key="pe1" function="TWI" group="SCL"/>
             </signals>
         </peripheral>
         <peripheral key="usb" name="USB" module-key="i3005">
             <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"/>
+                <signal pad-key="pd6" function="USB" group="DN"/>
+                <signal pad-key="pd7" function="USB" group="DP"/>
             </signals>
         </peripheral>
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pa2" index="2" function="PORTA" group="P"/>
-                <signal pad-id="pa3" index="3" function="PORTA" group="P"/>
-                <signal pad-id="pa4" index="4" function="PORTA" group="P"/>
-                <signal pad-id="pa5" index="5" function="PORTA" group="P"/>
-                <signal pad-id="pa6" index="6" function="PORTA" group="P"/>
-                <signal pad-id="pa7" index="7" function="PORTA" group="P"/>
+                <signal pad-key="pa0" index="0" function="PORTA" group="P"/>
+                <signal pad-key="pa1" index="1" function="PORTA" group="P"/>
+                <signal pad-key="pa2" index="2" function="PORTA" group="P"/>
+                <signal pad-key="pa3" index="3" function="PORTA" group="P"/>
+                <signal pad-key="pa4" index="4" function="PORTA" group="P"/>
+                <signal pad-key="pa5" index="5" function="PORTA" group="P"/>
+                <signal pad-key="pa6" index="6" function="PORTA" group="P"/>
+                <signal pad-key="pa7" index="7" function="PORTA" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pb2" index="2" function="PORTB" group="P"/>
-                <signal pad-id="pb3" index="3" function="PORTB" group="P"/>
+                <signal pad-key="pb0" index="0" function="PORTB" group="P"/>
+                <signal pad-key="pb1" index="1" function="PORTB" group="P"/>
+                <signal pad-key="pb2" index="2" function="PORTB" group="P"/>
+                <signal pad-key="pb3" index="3" function="PORTB" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pc2" index="2" function="PORTC" group="P"/>
-                <signal pad-id="pc3" index="3" function="PORTC" group="P"/>
-                <signal pad-id="pc4" index="4" function="PORTC" group="P"/>
-                <signal pad-id="pc5" index="5" function="PORTC" group="P"/>
-                <signal pad-id="pc6" index="6" function="PORTC" group="P"/>
-                <signal pad-id="pc7" index="7" function="PORTC" group="P"/>
+                <signal pad-key="pc0" index="0" function="PORTC" group="P"/>
+                <signal pad-key="pc1" index="1" function="PORTC" group="P"/>
+                <signal pad-key="pc2" index="2" function="PORTC" group="P"/>
+                <signal pad-key="pc3" index="3" function="PORTC" group="P"/>
+                <signal pad-key="pc4" index="4" function="PORTC" group="P"/>
+                <signal pad-key="pc5" index="5" function="PORTC" group="P"/>
+                <signal pad-key="pc6" index="6" function="PORTC" group="P"/>
+                <signal pad-key="pc7" index="7" function="PORTC" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pd2" index="2" function="PORTD" group="P"/>
-                <signal pad-id="pd3" index="3" function="PORTD" group="P"/>
-                <signal pad-id="pd4" index="4" function="PORTD" group="P"/>
-                <signal pad-id="pd5" index="5" function="PORTD" group="P"/>
-                <signal pad-id="pd6" index="6" function="PORTD" group="P"/>
-                <signal pad-id="pd7" index="7" function="PORTD" group="P"/>
+                <signal pad-key="pd0" index="0" function="PORTD" group="P"/>
+                <signal pad-key="pd1" index="1" function="PORTD" group="P"/>
+                <signal pad-key="pd2" index="2" function="PORTD" group="P"/>
+                <signal pad-key="pd3" index="3" function="PORTD" group="P"/>
+                <signal pad-key="pd4" index="4" function="PORTD" group="P"/>
+                <signal pad-key="pd5" index="5" function="PORTD" group="P"/>
+                <signal pad-key="pd6" index="6" function="PORTD" group="P"/>
+                <signal pad-key="pd7" index="7" function="PORTD" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="porte" name="PORTE" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pe2" index="2" function="PORTE" group="P"/>
-                <signal pad-id="pe3" index="3" function="PORTE" group="P"/>
+                <signal pad-key="pe0" index="0" function="PORTE" group="P"/>
+                <signal pad-key="pe1" index="1" function="PORTE" group="P"/>
+                <signal pad-key="pe2" index="2" function="PORTE" group="P"/>
+                <signal pad-key="pe3" index="3" function="PORTE" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portr" name="PORTR" module-key="gpio_port">
             <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"/>
+                <signal pad-key="pr0" index="0" function="PORTR" group="P"/>
+                <signal pad-key="pr1" index="1" function="PORTR" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="tcc0" name="TCC0" module-key="i6090_tc">
             <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"/>
-                <signal pad-id="pc2" function="TC0" group="OC0C" field="TC0C"/>
-                <signal pad-id="pc3" function="TC0" group="OC0D" field="TC0D"/>
-                <signal pad-id="pc4" function="TC0_ALT" group="OC0A" field="TC0A"/>
-                <signal pad-id="pc5" function="TC0_ALT" group="OC0B" field="TC0B"/>
-                <signal pad-id="pc6" function="TC0_ALT" group="OC0C" field="TC0C"/>
-                <signal pad-id="pc7" function="TC0_ALT" group="OC0D" field="TC0D"/>
+                <signal pad-key="pc0" function="TC0" group="OC0A" field="TC0A"/>
+                <signal pad-key="pc1" function="TC0" group="OC0B" field="TC0B"/>
+                <signal pad-key="pc2" function="TC0" group="OC0C" field="TC0C"/>
+                <signal pad-key="pc3" function="TC0" group="OC0D" field="TC0D"/>
+                <signal pad-key="pc4" function="TC0_ALT" group="OC0A" field="TC0A"/>
+                <signal pad-key="pc5" function="TC0_ALT" group="OC0B" field="TC0B"/>
+                <signal pad-key="pc6" function="TC0_ALT" group="OC0C" field="TC0C"/>
+                <signal pad-key="pc7" function="TC0_ALT" group="OC0D" field="TC0D"/>
             </signals>
         </peripheral>
         <peripheral key="tcc1" name="TCC1" module-key="i6090_tc">
             <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"/>
+                <signal pad-key="pc4" function="TC1" group="OC1A"/>
+                <signal pad-key="pc5" function="TC1" group="OC1B"/>
             </signals>
         </peripheral>
         <peripheral key="tcd0" name="TCD0" module-key="i6090_tc">
             <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"/>
-                <signal pad-id="pd2" function="TC0" group="OC0C"/>
-                <signal pad-id="pd3" function="TC0" group="OC0D"/>
-                <signal pad-id="pd4" function="TC0_ALT" group="OC0A"/>
-                <signal pad-id="pd5" function="TC0_ALT" group="OC0B"/>
-                <signal pad-id="pd6" function="TC0_ALT" group="OC0C"/>
-                <signal pad-id="pd7" function="TC0_ALT" group="OC0D"/>
+                <signal pad-key="pd0" function="TC0" group="OC0A"/>
+                <signal pad-key="pd1" function="TC0" group="OC0B"/>
+                <signal pad-key="pd2" function="TC0" group="OC0C"/>
+                <signal pad-key="pd3" function="TC0" group="OC0D"/>
+                <signal pad-key="pd4" function="TC0_ALT" group="OC0A"/>
+                <signal pad-key="pd5" function="TC0_ALT" group="OC0B"/>
+                <signal pad-key="pd6" function="TC0_ALT" group="OC0C"/>
+                <signal pad-key="pd7" function="TC0_ALT" group="OC0D"/>
             </signals>
         </peripheral>
         <peripheral key="tcd1" name="TCD1" module-key="i6090_tc">
             <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"/>
+                <signal pad-key="pd4" function="TC1" group="OC1A"/>
+                <signal pad-key="pd5" function="TC1" group="OC1B"/>
             </signals>
         </peripheral>
         <peripheral key="tce0" name="TCE0" module-key="i6090_tc">
             <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"/>
-                <signal pad-id="pe2" function="TC0" group="OC0C"/>
-                <signal pad-id="pe3" function="TC0" group="OC0D"/>
+                <signal pad-key="pe0" function="TC0" group="OC0A"/>
+                <signal pad-key="pe1" function="TC0" group="OC0B"/>
+                <signal pad-key="pe2" function="TC0" group="OC0C"/>
+                <signal pad-key="pe3" function="TC0" group="OC0D"/>
             </signals>
         </peripheral>
         <peripheral key="tcc2" name="TCC2" module-key="i6090_tc2">
             <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"/>
-                <signal pad-id="pc2" function="TC2" group="LOC2C"/>
-                <signal pad-id="pc3" function="TC2" group="LOC2D"/>
-                <signal pad-id="pc4" function="TC2" group="HOC2A"/>
-                <signal pad-id="pc5" function="TC2" group="HOC2B"/>
-                <signal pad-id="pc6" function="TC2" group="HOC2C"/>
-                <signal pad-id="pc7" function="TC2" group="HOC2D"/>
+                <signal pad-key="pc0" function="TC2" group="LOC2A"/>
+                <signal pad-key="pc1" function="TC2" group="LOC2B"/>
+                <signal pad-key="pc2" function="TC2" group="LOC2C"/>
+                <signal pad-key="pc3" function="TC2" group="LOC2D"/>
+                <signal pad-key="pc4" function="TC2" group="HOC2A"/>
+                <signal pad-key="pc5" function="TC2" group="HOC2B"/>
+                <signal pad-key="pc6" function="TC2" group="HOC2C"/>
+                <signal pad-key="pc7" function="TC2" group="HOC2D"/>
             </signals>
         </peripheral>
         <peripheral key="tcd2" name="TCD2" module-key="i6090_tc2">
             <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"/>
-                <signal pad-id="pd2" function="TC2" group="LOC2C"/>
-                <signal pad-id="pd3" function="TC2" group="LOC2D"/>
-                <signal pad-id="pd4" function="TC2" group="HOC2A"/>
-                <signal pad-id="pd5" function="TC2" group="HOC2B"/>
-                <signal pad-id="pd6" function="TC2" group="HOC2C"/>
-                <signal pad-id="pd7" function="TC2" group="HOC2D"/>
+                <signal pad-key="pd0" function="TC2" group="LOC2A"/>
+                <signal pad-key="pd1" function="TC2" group="LOC2B"/>
+                <signal pad-key="pd2" function="TC2" group="LOC2C"/>
+                <signal pad-key="pd3" function="TC2" group="LOC2D"/>
+                <signal pad-key="pd4" function="TC2" group="HOC2A"/>
+                <signal pad-key="pd5" function="TC2" group="HOC2B"/>
+                <signal pad-key="pd6" function="TC2" group="HOC2C"/>
+                <signal pad-key="pd7" function="TC2" group="HOC2D"/>
             </signals>
         </peripheral>
         <peripheral key="awexc" name="AWEXC" module-key="i6090_awex">
             <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"/>
-                <signal pad-id="pc2" function="AWEX" group="OC0BLS"/>
-                <signal pad-id="pc3" function="AWEX" group="OC0BHS"/>
-                <signal pad-id="pc4" function="AWEX" group="OC0CLS"/>
-                <signal pad-id="pc5" function="AWEX" group="OC0CHS"/>
-                <signal pad-id="pc6" function="AWEX" group="OC0DLS"/>
-                <signal pad-id="pc7" function="AWEX" group="OC0DHS"/>
+                <signal pad-key="pc0" function="AWEX" group="OC0ALS"/>
+                <signal pad-key="pc1" function="AWEX" group="OC0AHS"/>
+                <signal pad-key="pc2" function="AWEX" group="OC0BLS"/>
+                <signal pad-key="pc3" function="AWEX" group="OC0BHS"/>
+                <signal pad-key="pc4" function="AWEX" group="OC0CLS"/>
+                <signal pad-key="pc5" function="AWEX" group="OC0CHS"/>
+                <signal pad-key="pc6" function="AWEX" group="OC0DLS"/>
+                <signal pad-key="pc7" function="AWEX" group="OC0DHS"/>
             </signals>
         </peripheral>
         <peripheral key="hiresc" name="HIRESC" module-key="i6090_hires">
@@ -382,73 +382,73 @@
         <peripheral key="usartc0" name="USARTC0" module-key="i6090_usart">
             <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"/>
-                <signal pad-id="pc3" function="USART" group="TXD" field="USART0"/>
-                <signal pad-id="pc5" function="USART_ALT" group="XCK" field="USART0"/>
-                <signal pad-id="pc6" function="USART_ALT" group="RXD" field="USART0"/>
-                <signal pad-id="pc7" function="USART_ALT" group="TXD" field="USART0"/>
+                <signal pad-key="pc1" function="USART" group="XCK" field="USART0"/>
+                <signal pad-key="pc2" function="USART" group="RXD" field="USART0"/>
+                <signal pad-key="pc3" function="USART" group="TXD" field="USART0"/>
+                <signal pad-key="pc5" function="USART_ALT" group="XCK" field="USART0"/>
+                <signal pad-key="pc6" function="USART_ALT" group="RXD" field="USART0"/>
+                <signal pad-key="pc7" function="USART_ALT" group="TXD" field="USART0"/>
             </signals>
         </peripheral>
         <peripheral key="usartc1" name="USARTC1" module-key="i6090_usart">
             <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"/>
-                <signal pad-id="pd7" function="USART" group="TXD"/>
+                <signal pad-key="pd5" function="USART" group="XCK"/>
+                <signal pad-key="pd6" function="USART" group="RXD"/>
+                <signal pad-key="pd7" function="USART" group="TXD"/>
             </signals>
         </peripheral>
         <peripheral key="usartd0" name="USARTD0" module-key="i6090_usart">
             <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"/>
-                <signal pad-id="pd3" function="USART" group="TXD" field="USART0"/>
-                <signal pad-id="pd5" function="USART_ALT" group="XCK" field="USART0"/>
-                <signal pad-id="pd6" function="USART_ALT" group="RXD" field="USART0"/>
-                <signal pad-id="pd7" function="USART_ALT" group="TXD" field="USART0"/>
+                <signal pad-key="pd1" function="USART" group="XCK" field="USART0"/>
+                <signal pad-key="pd2" function="USART" group="RXD" field="USART0"/>
+                <signal pad-key="pd3" function="USART" group="TXD" field="USART0"/>
+                <signal pad-key="pd5" function="USART_ALT" group="XCK" field="USART0"/>
+                <signal pad-key="pd6" function="USART_ALT" group="RXD" field="USART0"/>
+                <signal pad-key="pd7" function="USART_ALT" group="TXD" field="USART0"/>
             </signals>
         </peripheral>
         <peripheral key="usartd1" name="USARTD1" module-key="i6090_usart">
             <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"/>
-                <signal pad-id="pd7" function="USART" group="TXD"/>
+                <signal pad-key="pd5" function="USART" group="XCK"/>
+                <signal pad-key="pd6" function="USART" group="RXD"/>
+                <signal pad-key="pd7" function="USART" group="TXD"/>
             </signals>
         </peripheral>
         <peripheral key="usarte0" name="USARTE0" module-key="i6090_usart">
             <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"/>
-                <signal pad-id="pe3" function="USART" group="TXD"/>
+                <signal pad-key="pe1" function="USART" group="XCK"/>
+                <signal pad-key="pe2" function="USART" group="RXD"/>
+                <signal pad-key="pe3" function="USART" group="TXD"/>
             </signals>
         </peripheral>
         <peripheral key="spic" name="SPIC" module-key="i6090_spi">
             <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"/>
-                <signal pad-id="pc6" function="SPI" group="MISO" field="SPI"/>
-                <signal pad-id="pc7" function="SPI" group="SCK" field="SPI"/>
-                <signal pad-id="pc4" function="SPI_ALT" group="SS" field="SPI"/>
-                <signal pad-id="pc5" function="SPI_ALT" group="SCK" field="SPI"/>
-                <signal pad-id="pc6" function="SPI_ALT" group="MISO" field="SPI"/>
-                <signal pad-id="pc7" function="SPI_ALT" group="MOSI" field="SPI"/>
+                <signal pad-key="pc4" function="SPI" group="SS" field="SPI"/>
+                <signal pad-key="pc5" function="SPI" group="MOSI" field="SPI"/>
+                <signal pad-key="pc6" function="SPI" group="MISO" field="SPI"/>
+                <signal pad-key="pc7" function="SPI" group="SCK" field="SPI"/>
+                <signal pad-key="pc4" function="SPI_ALT" group="SS" field="SPI"/>
+                <signal pad-key="pc5" function="SPI_ALT" group="SCK" field="SPI"/>
+                <signal pad-key="pc6" function="SPI_ALT" group="MISO" field="SPI"/>
+                <signal pad-key="pc7" function="SPI_ALT" group="MOSI" field="SPI"/>
             </signals>
         </peripheral>
         <peripheral key="spid" name="SPID" module-key="i6090_spi">
             <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"/>
-                <signal pad-id="pd6" function="SPI" group="MISO" field="SPI"/>
-                <signal pad-id="pd7" function="SPI" group="SCK" field="SPI"/>
-                <signal pad-id="pd4" function="SPI_ALT" group="SS" field="SPI"/>
-                <signal pad-id="pd5" function="SPI_ALT" group="SCK" field="SPI"/>
-                <signal pad-id="pd6" function="SPI_ALT" group="MISO" field="SPI"/>
-                <signal pad-id="pd7" function="SPI_ALT" group="MOSI" field="SPI"/>
+                <signal pad-key="pd4" function="SPI" group="SS" field="SPI"/>
+                <signal pad-key="pd5" function="SPI" group="MOSI" field="SPI"/>
+                <signal pad-key="pd6" function="SPI" group="MISO" field="SPI"/>
+                <signal pad-key="pd7" function="SPI" group="SCK" field="SPI"/>
+                <signal pad-key="pd4" function="SPI_ALT" group="SS" field="SPI"/>
+                <signal pad-key="pd5" function="SPI_ALT" group="SCK" field="SPI"/>
+                <signal pad-key="pd6" function="SPI_ALT" group="MISO" field="SPI"/>
+                <signal pad-key="pd7" function="SPI_ALT" group="MOSI" field="SPI"/>
             </signals>
         </peripheral>
         <peripheral key="ircom" name="IRCOM" module-key="i6090_ircom">
@@ -1809,110 +1809,152 @@
             </register-group>
         </module>
     </modules>
+    <pads>
+        <pad key="pa5" name="PA5"/>
+        <pad key="pa6" name="PA6"/>
+        <pad key="pa7" name="PA7"/>
+        <pad key="pb0" name="PB0"/>
+        <pad key="pb1" name="PB1"/>
+        <pad key="pb2" name="PB2"/>
+        <pad key="pb3" name="PB3"/>
+        <pad key="gnd" name="GND"/>
+        <pad key="vcc" name="VCC"/>
+        <pad key="pc0" name="PC0"/>
+        <pad key="pc1" name="PC1"/>
+        <pad key="pc2" name="PC2"/>
+        <pad key="pc3" name="PC3"/>
+        <pad key="pc4" name="PC4"/>
+        <pad key="pc5" name="PC5"/>
+        <pad key="pc6" name="PC6"/>
+        <pad key="pc7" name="PC7"/>
+        <pad key="pd0" name="PD0"/>
+        <pad key="pd1" name="PD1"/>
+        <pad key="pd2" name="PD2"/>
+        <pad key="pd3" name="PD3"/>
+        <pad key="pd4" name="PD4"/>
+        <pad key="pd5" name="PD5"/>
+        <pad key="pd6" name="PD6"/>
+        <pad key="pd7" name="PD7"/>
+        <pad key="pe0" name="PE0"/>
+        <pad key="pe1" name="PE1"/>
+        <pad key="pe2" name="PE2"/>
+        <pad key="pe3" name="PE3"/>
+        <pad key="pdi" name="PDI"/>
+        <pad key="reset" name="RESET"/>
+        <pad key="pr0" name="PR0"/>
+        <pad key="pr1" name="PR1"/>
+        <pad key="avcc" name="AVCC"/>
+        <pad key="pa0" name="PA0"/>
+        <pad key="pa1" name="PA1"/>
+        <pad key="pa2" name="PA2"/>
+        <pad key="pa3" name="PA3"/>
+        <pad key="pa4" name="PA4"/>
+        <pad key="pdi_data" name="PDI_DATA"/>
+    </pads>
     <pinouts>
         <pinout key="qfp_qfn_44" name="QFP_QFN_44" type="qfn">
-            <pin position="1" pad="PA5"/>
-            <pin position="2" pad="PA6"/>
-            <pin position="3" pad="PA7"/>
-            <pin position="4" pad="PB0"/>
-            <pin position="5" pad="PB1"/>
-            <pin position="6" pad="PB2"/>
-            <pin position="7" pad="PB3"/>
-            <pin position="8" pad="GND"/>
-            <pin position="9" pad="VCC"/>
-            <pin position="10" pad="PC0"/>
-            <pin position="11" pad="PC1"/>
-            <pin position="12" pad="PC2"/>
-            <pin position="13" pad="PC3"/>
-            <pin position="14" pad="PC4"/>
-            <pin position="15" pad="PC5"/>
-            <pin position="16" pad="PC6"/>
-            <pin position="17" pad="PC7"/>
-            <pin position="18" pad="GND"/>
-            <pin position="19" pad="VCC"/>
-            <pin position="20" pad="PD0"/>
-            <pin position="21" pad="PD1"/>
-            <pin position="22" pad="PD2"/>
-            <pin position="23" pad="PD3"/>
-            <pin position="24" pad="PD4"/>
-            <pin position="25" pad="PD5"/>
-            <pin position="26" pad="PD6"/>
-            <pin position="27" pad="PD7"/>
-            <pin position="28" pad="PE0"/>
-            <pin position="29" pad="PE1"/>
-            <pin position="30" pad="GND"/>
-            <pin position="31" pad="VCC"/>
-            <pin position="32" pad="PE2"/>
-            <pin position="33" pad="PE3"/>
-            <pin position="34" pad="PDI"/>
-            <pin position="35" pad="RESET"/>
-            <pin position="36" pad="PR0"/>
-            <pin position="37" pad="PR1"/>
-            <pin position="38" pad="GND"/>
-            <pin position="39" pad="AVCC"/>
-            <pin position="40" pad="PA0"/>
-            <pin position="41" pad="PA1"/>
-            <pin position="42" pad="PA2"/>
-            <pin position="43" pad="PA3"/>
-            <pin position="44" pad="PA4"/>
+            <pin position="1" pad-key="pa5"/>
+            <pin position="2" pad-key="pa6"/>
+            <pin position="3" pad-key="pa7"/>
+            <pin position="4" pad-key="pb0"/>
+            <pin position="5" pad-key="pb1"/>
+            <pin position="6" pad-key="pb2"/>
+            <pin position="7" pad-key="pb3"/>
+            <pin position="8" pad-key="gnd"/>
+            <pin position="9" pad-key="vcc"/>
+            <pin position="10" pad-key="pc0"/>
+            <pin position="11" pad-key="pc1"/>
+            <pin position="12" pad-key="pc2"/>
+            <pin position="13" pad-key="pc3"/>
+            <pin position="14" pad-key="pc4"/>
+            <pin position="15" pad-key="pc5"/>
+            <pin position="16" pad-key="pc6"/>
+            <pin position="17" pad-key="pc7"/>
+            <pin position="18" pad-key="gnd"/>
+            <pin position="19" pad-key="vcc"/>
+            <pin position="20" pad-key="pd0"/>
+            <pin position="21" pad-key="pd1"/>
+            <pin position="22" pad-key="pd2"/>
+            <pin position="23" pad-key="pd3"/>
+            <pin position="24" pad-key="pd4"/>
+            <pin position="25" pad-key="pd5"/>
+            <pin position="26" pad-key="pd6"/>
+            <pin position="27" pad-key="pd7"/>
+            <pin position="28" pad-key="pe0"/>
+            <pin position="29" pad-key="pe1"/>
+            <pin position="30" pad-key="gnd"/>
+            <pin position="31" pad-key="vcc"/>
+            <pin position="32" pad-key="pe2"/>
+            <pin position="33" pad-key="pe3"/>
+            <pin position="34" pad-key="pdi"/>
+            <pin position="35" pad-key="reset"/>
+            <pin position="36" pad-key="pr0"/>
+            <pin position="37" pad-key="pr1"/>
+            <pin position="38" pad-key="gnd"/>
+            <pin position="39" pad-key="avcc"/>
+            <pin position="40" pad-key="pa0"/>
+            <pin position="41" pad-key="pa1"/>
+            <pin position="42" pad-key="pa2"/>
+            <pin position="43" pad-key="pa3"/>
+            <pin position="44" pad-key="pa4"/>
         </pinout>
         <pinout key="bga_49" name="BGA_49" type="bga">
-            <pin position="A1" pad="PA3"/>
-            <pin position="A2" pad="AVCC"/>
-            <pin position="A3" pad="GND"/>
-            <pin position="A4" pad="PR1"/>
-            <pin position="A5" pad="PR0"/>
-            <pin position="A6" pad="PDI_DATA"/>
-            <pin position="A7" pad="PE3"/>
-            <pin position="B1" pad="PA4"/>
-            <pin position="B2" pad="PA1"/>
-            <pin position="B3" pad="PA0"/>
-            <pin position="B4" pad="GND"/>
-            <pin position="B5" pad="RESET"/>
-            <pin position="B6" pad="PE2"/>
-            <pin position="B7" pad="VCC"/>
-            <pin position="C1" pad="PA5"/>
-            <pin position="C2" pad="PA2"/>
-            <pin position="C3" pad="PA6"/>
-            <pin position="C4" pad="PA7"/>
-            <pin position="C5" pad="GND"/>
-            <pin position="C6" pad="PE1"/>
-            <pin position="C7" pad="GND"/>
-            <pin position="D1" pad="PB1"/>
-            <pin position="D2" pad="PB2"/>
-            <pin position="D3" pad="PB3"/>
-            <pin position="D4" pad="PB0"/>
-            <pin position="D5" pad="GND"/>
-            <pin position="D6" pad="PD7"/>
-            <pin position="D7" pad="PE0"/>
-            <pin position="E1" pad="GND"/>
-            <pin position="E2" pad="GND"/>
-            <pin position="E3" pad="PC3"/>
-            <pin position="E4" pad="GND"/>
-            <pin position="E5" pad="PD4"/>
-            <pin position="E6" pad="PD5"/>
-            <pin position="E7" pad="PD6"/>
-            <pin position="F1" pad="VCC"/>
-            <pin position="F2" pad="PC0"/>
-            <pin position="F3" pad="PC4"/>
-            <pin position="F4" pad="PC6"/>
-            <pin position="F5" pad="PD0"/>
-            <pin position="F6" pad="PD1"/>
-            <pin position="F7" pad="PD3"/>
-            <pin position="G1" pad="PC1"/>
-            <pin position="G2" pad="PC2"/>
-            <pin position="G3" pad="PC5"/>
-            <pin position="G4" pad="PC7"/>
-            <pin position="G5" pad="GND"/>
-            <pin position="G6" pad="VCC"/>
-            <pin position="G7" pad="PD2"/>
+            <pin position="A1" pad-key="pa3"/>
+            <pin position="A2" pad-key="avcc"/>
+            <pin position="A3" pad-key="gnd"/>
+            <pin position="A4" pad-key="pr1"/>
+            <pin position="A5" pad-key="pr0"/>
+            <pin position="A6" pad-key="pdi_data"/>
+            <pin position="A7" pad-key="pe3"/>
+            <pin position="B1" pad-key="pa4"/>
+            <pin position="B2" pad-key="pa1"/>
+            <pin position="B3" pad-key="pa0"/>
+            <pin position="B4" pad-key="gnd"/>
+            <pin position="B5" pad-key="reset"/>
+            <pin position="B6" pad-key="pe2"/>
+            <pin position="B7" pad-key="vcc"/>
+            <pin position="C1" pad-key="pa5"/>
+            <pin position="C2" pad-key="pa2"/>
+            <pin position="C3" pad-key="pa6"/>
+            <pin position="C4" pad-key="pa7"/>
+            <pin position="C5" pad-key="gnd"/>
+            <pin position="C6" pad-key="pe1"/>
+            <pin position="C7" pad-key="gnd"/>
+            <pin position="D1" pad-key="pb1"/>
+            <pin position="D2" pad-key="pb2"/>
+            <pin position="D3" pad-key="pb3"/>
+            <pin position="D4" pad-key="pb0"/>
+            <pin position="D5" pad-key="gnd"/>
+            <pin position="D6" pad-key="pd7"/>
+            <pin position="D7" pad-key="pe0"/>
+            <pin position="E1" pad-key="gnd"/>
+            <pin position="E2" pad-key="gnd"/>
+            <pin position="E3" pad-key="pc3"/>
+            <pin position="E4" pad-key="gnd"/>
+            <pin position="E5" pad-key="pd4"/>
+            <pin position="E6" pad-key="pd5"/>
+            <pin position="E7" pad-key="pd6"/>
+            <pin position="F1" pad-key="vcc"/>
+            <pin position="F2" pad-key="pc0"/>
+            <pin position="F3" pad-key="pc4"/>
+            <pin position="F4" pad-key="pc6"/>
+            <pin position="F5" pad-key="pd0"/>
+            <pin position="F6" pad-key="pd1"/>
+            <pin position="F7" pad-key="pd3"/>
+            <pin position="G1" pad-key="pc1"/>
+            <pin position="G2" pad-key="pc2"/>
+            <pin position="G3" pad-key="pc5"/>
+            <pin position="G4" pad-key="pc7"/>
+            <pin position="G5" pad-key="gnd"/>
+            <pin position="G6" pad-key="vcc"/>
+            <pin position="G7" pad-key="pd2"/>
         </pinout>
     </pinouts>
     <variants>
-        <variant name="ATxmega32A4U-AU" pinout-key="qfp_qfn_44" package="TQFP44"/>
-        <variant name="ATxmega32A4U-MH" pinout-key="qfp_qfn_44" package="VQFN44"/>
-        <variant name="ATxmega32A4U-CU" pinout-key="bga_49" package="VFBGA49"/>
-        <variant name="ATxmega32A4U-AN" pinout-key="qfp_qfn_44" package="TQFP44"/>
-        <variant name="ATxmega32A4U-M7" pinout-key="qfp_qfn_44" package="VQFN44"/>
+        <variant key="atxmega32a4u_au" name="ATxmega32A4U-AU" pinout-key="qfp_qfn_44"/>
+        <variant key="atxmega32a4u_mh" name="ATxmega32A4U-MH" pinout-key="qfp_qfn_44"/>
+        <variant key="atxmega32a4u_cu" name="ATxmega32A4U-CU" pinout-key="bga_49"/>
+        <variant key="atxmega32a4u_an" name="ATxmega32A4U-AN" pinout-key="qfp_qfn_44"/>
+        <variant key="atxmega32a4u_m7" name="ATxmega32A4U-M7" pinout-key="qfp_qfn_44"/>
     </variants>
 </device>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA32C3.xml b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA32C3.xml
index 3c0aba31..e4f97558 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA32C3.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA32C3.xml
@@ -92,10 +92,10 @@
         <peripheral key="osc" name="OSC" module-key="i6079">
             <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"/>
-                <signal pad-id="pe2" function="TOSC" group="TOSC2"/>
-                <signal pad-id="pe3" function="TOSC" group="TOSC1"/>
+                <signal pad-key="pr0" function="XTAL" group="XTAL2"/>
+                <signal pad-key="pr1" function="XTAL" group="XTAL1"/>
+                <signal pad-key="pe2" function="TOSC" group="TOSC2"/>
+                <signal pad-key="pe3" function="TOSC" group="TOSC1"/>
             </signals>
         </peripheral>
         <peripheral key="dfllrc32m" name="DFLLRC32M" module-key="i6055">
@@ -119,11 +119,11 @@
         <peripheral key="portcfg" name="PORTCFG" module-key="i6075_portcfg">
             <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"/>
-                <signal pad-id="pc7" function="EVOUT" group="EVOUT" field="EVOUT"/>
-                <signal pad-id="pc4" function="EVOUT_ALT" group="EVOUT" field="CLKEVPIN"/>
-                <signal pad-id="pc6" function="RTCOUTC" group="RTCOUT"/>
+                <signal pad-key="pc7" function="CLKOUT" group="CLKOUT" field="CLKOUT"/>
+                <signal pad-key="pc4" function="CLKOUT_ALT" group="CLKOUT" field="CLKEVPIN"/>
+                <signal pad-key="pc7" function="EVOUT" group="EVOUT" field="EVOUT"/>
+                <signal pad-key="pc4" function="EVOUT_ALT" group="EVOUT" field="CLKEVPIN"/>
+                <signal pad-key="pc6" function="RTCOUTC" group="RTCOUT"/>
             </signals>
         </peripheral>
         <peripheral key="crc" name="CRC" module-key="i6111">
@@ -138,39 +138,39 @@
         <peripheral key="adca" name="ADCA" module-key="i6110">
             <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"/>
-                <signal pad-id="pa2" index="2" function="ADC" group="ADC"/>
-                <signal pad-id="pa3" index="3" function="ADC" group="ADC"/>
-                <signal pad-id="pa4" index="4" function="ADC" group="ADC"/>
-                <signal pad-id="pa5" index="5" function="ADC" group="ADC"/>
-                <signal pad-id="pa6" index="6" function="ADC" group="ADC"/>
-                <signal pad-id="pa7" index="7" function="ADC" group="ADC"/>
-                <signal pad-id="pb0" index="8" function="ADC" group="ADC"/>
-                <signal pad-id="pb1" index="9" function="ADC" group="ADC"/>
-                <signal pad-id="pb2" index="10" function="ADC" group="ADC"/>
-                <signal pad-id="pb3" index="11" function="ADC" group="ADC"/>
-                <signal pad-id="pb4" index="12" function="ADC" group="ADC"/>
-                <signal pad-id="pb5" index="13" function="ADC" group="ADC"/>
-                <signal pad-id="pb6" index="14" function="ADC" group="ADC"/>
-                <signal pad-id="pb7" index="15" function="ADC" group="ADC"/>
-                <signal pad-id="pa0" index="0" function="AREF" group="REFA"/>
-                <signal pad-id="pb0" index="0" function="AREF" group="REFB"/>
+                <signal pad-key="pa0" index="0" function="ADC" group="ADC"/>
+                <signal pad-key="pa1" index="1" function="ADC" group="ADC"/>
+                <signal pad-key="pa2" index="2" function="ADC" group="ADC"/>
+                <signal pad-key="pa3" index="3" function="ADC" group="ADC"/>
+                <signal pad-key="pa4" index="4" function="ADC" group="ADC"/>
+                <signal pad-key="pa5" index="5" function="ADC" group="ADC"/>
+                <signal pad-key="pa6" index="6" function="ADC" group="ADC"/>
+                <signal pad-key="pa7" index="7" function="ADC" group="ADC"/>
+                <signal pad-key="pb0" index="8" function="ADC" group="ADC"/>
+                <signal pad-key="pb1" index="9" function="ADC" group="ADC"/>
+                <signal pad-key="pb2" index="10" function="ADC" group="ADC"/>
+                <signal pad-key="pb3" index="11" function="ADC" group="ADC"/>
+                <signal pad-key="pb4" index="12" function="ADC" group="ADC"/>
+                <signal pad-key="pb5" index="13" function="ADC" group="ADC"/>
+                <signal pad-key="pb6" index="14" function="ADC" group="ADC"/>
+                <signal pad-key="pb7" index="15" function="ADC" group="ADC"/>
+                <signal pad-key="pa0" index="0" function="AREF" group="REFA"/>
+                <signal pad-key="pb0" index="0" function="AREF" group="REFB"/>
             </signals>
         </peripheral>
         <peripheral key="aca" name="ACA" module-key="i6077">
             <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"/>
-                <signal pad-id="pa2" index="2" function="AC" group="AC"/>
-                <signal pad-id="pa3" index="3" function="AC" group="AC"/>
-                <signal pad-id="pa4" index="4" function="AC" group="AC"/>
-                <signal pad-id="pa5" index="5" function="AC" group="AC"/>
-                <signal pad-id="pa6" index="6" function="AC" group="AC"/>
-                <signal pad-id="pa7" index="7" function="AC" group="AC"/>
-                <signal pad-id="pa6" index="1" function="ACOUT" group="ACOUT"/>
-                <signal pad-id="pa7" index="0" function="ACOUT" group="ACOUT"/>
+                <signal pad-key="pa0" index="0" function="AC" group="AC"/>
+                <signal pad-key="pa1" index="1" function="AC" group="AC"/>
+                <signal pad-key="pa2" index="2" function="AC" group="AC"/>
+                <signal pad-key="pa3" index="3" function="AC" group="AC"/>
+                <signal pad-key="pa4" index="4" function="AC" group="AC"/>
+                <signal pad-key="pa5" index="5" function="AC" group="AC"/>
+                <signal pad-key="pa6" index="6" function="AC" group="AC"/>
+                <signal pad-key="pa7" index="7" function="AC" group="AC"/>
+                <signal pad-key="pa6" index="1" function="ACOUT" group="ACOUT"/>
+                <signal pad-key="pa7" index="0" function="ACOUT" group="ACOUT"/>
             </signals>
         </peripheral>
         <peripheral key="rtc" name="RTC" module-key="i6093">
@@ -179,219 +179,219 @@
         <peripheral key="twic" name="TWIC" module-key="i6089">
             <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"/>
+                <signal pad-key="pc0" function="TWI" group="SDA"/>
+                <signal pad-key="pc1" function="TWI" group="SCL"/>
             </signals>
         </peripheral>
         <peripheral key="twie" name="TWIE" module-key="i6089">
             <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"/>
+                <signal pad-key="pe0" function="TWI" group="SDA"/>
+                <signal pad-key="pe1" function="TWI" group="SCL"/>
             </signals>
         </peripheral>
         <peripheral key="usb" name="USB" module-key="i3005">
             <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"/>
+                <signal pad-key="pd6" function="USB" group="DN"/>
+                <signal pad-key="pd7" function="USB" group="DP"/>
             </signals>
         </peripheral>
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pa2" index="2" function="PORTA" group="P"/>
-                <signal pad-id="pa3" index="3" function="PORTA" group="P"/>
-                <signal pad-id="pa4" index="4" function="PORTA" group="P"/>
-                <signal pad-id="pa5" index="5" function="PORTA" group="P"/>
-                <signal pad-id="pa6" index="6" function="PORTA" group="P"/>
-                <signal pad-id="pa7" index="7" function="PORTA" group="P"/>
+                <signal pad-key="pa0" index="0" function="PORTA" group="P"/>
+                <signal pad-key="pa1" index="1" function="PORTA" group="P"/>
+                <signal pad-key="pa2" index="2" function="PORTA" group="P"/>
+                <signal pad-key="pa3" index="3" function="PORTA" group="P"/>
+                <signal pad-key="pa4" index="4" function="PORTA" group="P"/>
+                <signal pad-key="pa5" index="5" function="PORTA" group="P"/>
+                <signal pad-key="pa6" index="6" function="PORTA" group="P"/>
+                <signal pad-key="pa7" index="7" function="PORTA" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pb2" index="2" function="PORTB" group="P"/>
-                <signal pad-id="pb3" index="3" function="PORTB" group="P"/>
-                <signal pad-id="pb4" index="4" function="PORTB" group="P"/>
-                <signal pad-id="pb5" index="5" function="PORTB" group="P"/>
-                <signal pad-id="pb6" index="6" function="PORTB" group="P"/>
-                <signal pad-id="pb7" index="7" function="PORTB" group="P"/>
+                <signal pad-key="pb0" index="0" function="PORTB" group="P"/>
+                <signal pad-key="pb1" index="1" function="PORTB" group="P"/>
+                <signal pad-key="pb2" index="2" function="PORTB" group="P"/>
+                <signal pad-key="pb3" index="3" function="PORTB" group="P"/>
+                <signal pad-key="pb4" index="4" function="PORTB" group="P"/>
+                <signal pad-key="pb5" index="5" function="PORTB" group="P"/>
+                <signal pad-key="pb6" index="6" function="PORTB" group="P"/>
+                <signal pad-key="pb7" index="7" function="PORTB" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pc2" index="2" function="PORTC" group="P"/>
-                <signal pad-id="pc3" index="3" function="PORTC" group="P"/>
-                <signal pad-id="pc4" index="4" function="PORTC" group="P"/>
-                <signal pad-id="pc5" index="5" function="PORTC" group="P"/>
-                <signal pad-id="pc6" index="6" function="PORTC" group="P"/>
-                <signal pad-id="pc7" index="7" function="PORTC" group="P"/>
+                <signal pad-key="pc0" index="0" function="PORTC" group="P"/>
+                <signal pad-key="pc1" index="1" function="PORTC" group="P"/>
+                <signal pad-key="pc2" index="2" function="PORTC" group="P"/>
+                <signal pad-key="pc3" index="3" function="PORTC" group="P"/>
+                <signal pad-key="pc4" index="4" function="PORTC" group="P"/>
+                <signal pad-key="pc5" index="5" function="PORTC" group="P"/>
+                <signal pad-key="pc6" index="6" function="PORTC" group="P"/>
+                <signal pad-key="pc7" index="7" function="PORTC" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pd2" index="2" function="PORTD" group="P"/>
-                <signal pad-id="pd3" index="3" function="PORTD" group="P"/>
-                <signal pad-id="pd4" index="4" function="PORTD" group="P"/>
-                <signal pad-id="pd5" index="5" function="PORTD" group="P"/>
-                <signal pad-id="pd6" index="6" function="PORTD" group="P"/>
-                <signal pad-id="pd7" index="7" function="PORTD" group="P"/>
+                <signal pad-key="pd0" index="0" function="PORTD" group="P"/>
+                <signal pad-key="pd1" index="1" function="PORTD" group="P"/>
+                <signal pad-key="pd2" index="2" function="PORTD" group="P"/>
+                <signal pad-key="pd3" index="3" function="PORTD" group="P"/>
+                <signal pad-key="pd4" index="4" function="PORTD" group="P"/>
+                <signal pad-key="pd5" index="5" function="PORTD" group="P"/>
+                <signal pad-key="pd6" index="6" function="PORTD" group="P"/>
+                <signal pad-key="pd7" index="7" function="PORTD" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="porte" name="PORTE" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pe2" index="2" function="PORTE" group="P"/>
-                <signal pad-id="pe3" index="3" function="PORTE" group="P"/>
-                <signal pad-id="pe4" index="4" function="PORTE" group="P"/>
-                <signal pad-id="pe5" index="5" function="PORTE" group="P"/>
-                <signal pad-id="pe6" index="6" function="PORTE" group="P"/>
-                <signal pad-id="pe7" index="7" function="PORTE" group="P"/>
+                <signal pad-key="pe0" index="0" function="PORTE" group="P"/>
+                <signal pad-key="pe1" index="1" function="PORTE" group="P"/>
+                <signal pad-key="pe2" index="2" function="PORTE" group="P"/>
+                <signal pad-key="pe3" index="3" function="PORTE" group="P"/>
+                <signal pad-key="pe4" index="4" function="PORTE" group="P"/>
+                <signal pad-key="pe5" index="5" function="PORTE" group="P"/>
+                <signal pad-key="pe6" index="6" function="PORTE" group="P"/>
+                <signal pad-key="pe7" index="7" function="PORTE" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portf" name="PORTF" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pf2" index="2" function="PORTF" group="P"/>
-                <signal pad-id="pf3" index="3" function="PORTF" group="P"/>
-                <signal pad-id="pf4" index="4" function="PORTF" group="P"/>
-                <signal pad-id="pf5" index="5" function="PORTF" group="P"/>
-                <signal pad-id="pf6" index="6" function="PORTF" group="P"/>
-                <signal pad-id="pf7" index="7" function="PORTF" group="P"/>
+                <signal pad-key="pf0" index="0" function="PORTF" group="P"/>
+                <signal pad-key="pf1" index="1" function="PORTF" group="P"/>
+                <signal pad-key="pf2" index="2" function="PORTF" group="P"/>
+                <signal pad-key="pf3" index="3" function="PORTF" group="P"/>
+                <signal pad-key="pf4" index="4" function="PORTF" group="P"/>
+                <signal pad-key="pf5" index="5" function="PORTF" group="P"/>
+                <signal pad-key="pf6" index="6" function="PORTF" group="P"/>
+                <signal pad-key="pf7" index="7" function="PORTF" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portr" name="PORTR" module-key="gpio_port">
             <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"/>
+                <signal pad-key="pr0" index="0" function="PORTR" group="P"/>
+                <signal pad-key="pr1" index="1" function="PORTR" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="tcc0" name="TCC0" module-key="i6090_tc">
             <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"/>
-                <signal pad-id="pc2" function="TC0" group="OC0C" field="TC0C"/>
-                <signal pad-id="pc3" function="TC0" group="OC0D" field="TC0D"/>
-                <signal pad-id="pc4" function="TC0_ALT" group="OC0A" field="TC0A"/>
-                <signal pad-id="pc5" function="TC0_ALT" group="OC0B" field="TC0B"/>
-                <signal pad-id="pc6" function="TC0_ALT" group="OC0C" field="TC0C"/>
-                <signal pad-id="pc7" function="TC0_ALT" group="OC0D" field="TC0D"/>
+                <signal pad-key="pc0" function="TC0" group="OC0A" field="TC0A"/>
+                <signal pad-key="pc1" function="TC0" group="OC0B" field="TC0B"/>
+                <signal pad-key="pc2" function="TC0" group="OC0C" field="TC0C"/>
+                <signal pad-key="pc3" function="TC0" group="OC0D" field="TC0D"/>
+                <signal pad-key="pc4" function="TC0_ALT" group="OC0A" field="TC0A"/>
+                <signal pad-key="pc5" function="TC0_ALT" group="OC0B" field="TC0B"/>
+                <signal pad-key="pc6" function="TC0_ALT" group="OC0C" field="TC0C"/>
+                <signal pad-key="pc7" function="TC0_ALT" group="OC0D" field="TC0D"/>
             </signals>
         </peripheral>
         <peripheral key="tcc1" name="TCC1" module-key="i6090_tc">
             <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"/>
+                <signal pad-key="pc4" function="TC1" group="OC1A"/>
+                <signal pad-key="pc5" function="TC1" group="OC1B"/>
             </signals>
         </peripheral>
         <peripheral key="tcd0" name="TCD0" module-key="i6090_tc">
             <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"/>
-                <signal pad-id="pd2" function="TC0" group="OC0C"/>
-                <signal pad-id="pd3" function="TC0" group="OC0D"/>
+                <signal pad-key="pd0" function="TC0" group="OC0A"/>
+                <signal pad-key="pd1" function="TC0" group="OC0B"/>
+                <signal pad-key="pd2" function="TC0" group="OC0C"/>
+                <signal pad-key="pd3" function="TC0" group="OC0D"/>
             </signals>
         </peripheral>
         <peripheral key="tce0" name="TCE0" module-key="i6090_tc">
             <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"/>
-                <signal pad-id="pe2" function="TC0" group="OC0C"/>
-                <signal pad-id="pe3" function="TC0" group="OC0D"/>
+                <signal pad-key="pe0" function="TC0" group="OC0A"/>
+                <signal pad-key="pe1" function="TC0" group="OC0B"/>
+                <signal pad-key="pe2" function="TC0" group="OC0C"/>
+                <signal pad-key="pe3" function="TC0" group="OC0D"/>
             </signals>
         </peripheral>
         <peripheral key="tcf0" name="TCF0" module-key="i6090_tc">
             <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"/>
-                <signal pad-id="pf2" function="TC0" group="OC0C"/>
-                <signal pad-id="pf3" function="TC0" group="OC0D"/>
+                <signal pad-key="pf0" function="TC0" group="OC0A"/>
+                <signal pad-key="pf1" function="TC0" group="OC0B"/>
+                <signal pad-key="pf2" function="TC0" group="OC0C"/>
+                <signal pad-key="pf3" function="TC0" group="OC0D"/>
             </signals>
         </peripheral>
         <peripheral key="tcc2" name="TCC2" module-key="i6090_tc2">
             <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"/>
-                <signal pad-id="pc2" function="TC2" group="LOC2C"/>
-                <signal pad-id="pc3" function="TC2" group="LOC2D"/>
-                <signal pad-id="pc4" function="TC2" group="HOC2A"/>
-                <signal pad-id="pc5" function="TC2" group="HOC2B"/>
-                <signal pad-id="pc6" function="TC2" group="HOC2C"/>
-                <signal pad-id="pc7" function="TC2" group="HOC2D"/>
+                <signal pad-key="pc0" function="TC2" group="LOC2A"/>
+                <signal pad-key="pc1" function="TC2" group="LOC2B"/>
+                <signal pad-key="pc2" function="TC2" group="LOC2C"/>
+                <signal pad-key="pc3" function="TC2" group="LOC2D"/>
+                <signal pad-key="pc4" function="TC2" group="HOC2A"/>
+                <signal pad-key="pc5" function="TC2" group="HOC2B"/>
+                <signal pad-key="pc6" function="TC2" group="HOC2C"/>
+                <signal pad-key="pc7" function="TC2" group="HOC2D"/>
             </signals>
         </peripheral>
         <peripheral key="tcd2" name="TCD2" module-key="i6090_tc2">
             <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"/>
-                <signal pad-id="pd2" function="TC2" group="LOC2C"/>
-                <signal pad-id="pd3" function="TC2" group="LOC2D"/>
-                <signal pad-id="pd4" function="TC2" group="HOC2A"/>
-                <signal pad-id="pd5" function="TC2" group="HOC2B"/>
-                <signal pad-id="pd6" function="TC2" group="HOC2C"/>
-                <signal pad-id="pd7" function="TC2" group="HOC2D"/>
+                <signal pad-key="pd0" function="TC2" group="LOC2A"/>
+                <signal pad-key="pd1" function="TC2" group="LOC2B"/>
+                <signal pad-key="pd2" function="TC2" group="LOC2C"/>
+                <signal pad-key="pd3" function="TC2" group="LOC2D"/>
+                <signal pad-key="pd4" function="TC2" group="HOC2A"/>
+                <signal pad-key="pd5" function="TC2" group="HOC2B"/>
+                <signal pad-key="pd6" function="TC2" group="HOC2C"/>
+                <signal pad-key="pd7" function="TC2" group="HOC2D"/>
             </signals>
         </peripheral>
         <peripheral key="tce2" name="TCE2" module-key="i6090_tc2">
             <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"/>
-                <signal pad-id="pe2" function="TC2" group="LOC2C"/>
-                <signal pad-id="pe3" function="TC2" group="LOC2D"/>
-                <signal pad-id="pe4" function="TC2" group="HOC2A"/>
-                <signal pad-id="pe5" function="TC2" group="HOC2B"/>
-                <signal pad-id="pe6" function="TC2" group="HOC2C"/>
-                <signal pad-id="pe7" function="TC2" group="HOC2D"/>
+                <signal pad-key="pe0" function="TC2" group="LOC2A"/>
+                <signal pad-key="pe1" function="TC2" group="LOC2B"/>
+                <signal pad-key="pe2" function="TC2" group="LOC2C"/>
+                <signal pad-key="pe3" function="TC2" group="LOC2D"/>
+                <signal pad-key="pe4" function="TC2" group="HOC2A"/>
+                <signal pad-key="pe5" function="TC2" group="HOC2B"/>
+                <signal pad-key="pe6" function="TC2" group="HOC2C"/>
+                <signal pad-key="pe7" function="TC2" group="HOC2D"/>
             </signals>
         </peripheral>
         <peripheral key="tcf2" name="TCF2" module-key="i6090_tc2">
             <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"/>
-                <signal pad-id="pf2" function="TC2" group="LOC2C"/>
-                <signal pad-id="pf3" function="TC2" group="LOC2D"/>
-                <signal pad-id="pf4" function="TC2" group="HOC2A"/>
-                <signal pad-id="pf5" function="TC2" group="HOC2B"/>
-                <signal pad-id="pf6" function="TC2" group="HOC2C"/>
-                <signal pad-id="pf7" function="TC2" group="HOC2D"/>
+                <signal pad-key="pf0" function="TC2" group="LOC2A"/>
+                <signal pad-key="pf1" function="TC2" group="LOC2B"/>
+                <signal pad-key="pf2" function="TC2" group="LOC2C"/>
+                <signal pad-key="pf3" function="TC2" group="LOC2D"/>
+                <signal pad-key="pf4" function="TC2" group="HOC2A"/>
+                <signal pad-key="pf5" function="TC2" group="HOC2B"/>
+                <signal pad-key="pf6" function="TC2" group="HOC2C"/>
+                <signal pad-key="pf7" function="TC2" group="HOC2D"/>
             </signals>
         </peripheral>
         <peripheral key="awexc" name="AWEXC" module-key="i6090_awex">
             <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"/>
-                <signal pad-id="pc2" function="AWEX" group="OC0BLS"/>
-                <signal pad-id="pc3" function="AWEX" group="OC0BHS"/>
-                <signal pad-id="pc4" function="AWEX" group="OC0CLS"/>
-                <signal pad-id="pc5" function="AWEX" group="OC0CHS"/>
-                <signal pad-id="pc6" function="AWEX" group="OC0DLS"/>
-                <signal pad-id="pc7" function="AWEX" group="OC0DHS"/>
+                <signal pad-key="pc0" function="AWEX" group="OC0ALS"/>
+                <signal pad-key="pc1" function="AWEX" group="OC0AHS"/>
+                <signal pad-key="pc2" function="AWEX" group="OC0BLS"/>
+                <signal pad-key="pc3" function="AWEX" group="OC0BHS"/>
+                <signal pad-key="pc4" function="AWEX" group="OC0CLS"/>
+                <signal pad-key="pc5" function="AWEX" group="OC0CHS"/>
+                <signal pad-key="pc6" function="AWEX" group="OC0DLS"/>
+                <signal pad-key="pc7" function="AWEX" group="OC0DHS"/>
             </signals>
         </peripheral>
         <peripheral key="hiresc" name="HIRESC" module-key="i6090_hires">
@@ -400,50 +400,50 @@
         <peripheral key="usartc0" name="USARTC0" module-key="i6090_usart">
             <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"/>
-                <signal pad-id="pc3" function="USART" group="TXD" field="USART0"/>
-                <signal pad-id="pc5" function="USART_ALT" group="XCK" field="USART0"/>
-                <signal pad-id="pc6" function="USART_ALT" group="RXD" field="USART0"/>
-                <signal pad-id="pc7" function="USART_ALT" group="TXD" field="USART0"/>
+                <signal pad-key="pc1" function="USART" group="XCK" field="USART0"/>
+                <signal pad-key="pc2" function="USART" group="RXD" field="USART0"/>
+                <signal pad-key="pc3" function="USART" group="TXD" field="USART0"/>
+                <signal pad-key="pc5" function="USART_ALT" group="XCK" field="USART0"/>
+                <signal pad-key="pc6" function="USART_ALT" group="RXD" field="USART0"/>
+                <signal pad-key="pc7" function="USART_ALT" group="TXD" field="USART0"/>
             </signals>
         </peripheral>
         <peripheral key="usartd0" name="USARTD0" module-key="i6090_usart">
             <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"/>
-                <signal pad-id="pd3" function="USART" group="TXD"/>
+                <signal pad-key="pd1" function="USART" group="XCK"/>
+                <signal pad-key="pd2" function="USART" group="RXD"/>
+                <signal pad-key="pd3" function="USART" group="TXD"/>
             </signals>
         </peripheral>
         <peripheral key="usarte0" name="USARTE0" module-key="i6090_usart">
             <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"/>
-                <signal pad-id="pe3" function="USART" group="TXD"/>
+                <signal pad-key="pe1" function="USART" group="XCK"/>
+                <signal pad-key="pe2" function="USART" group="RXD"/>
+                <signal pad-key="pe3" function="USART" group="TXD"/>
             </signals>
         </peripheral>
         <peripheral key="spic" name="SPIC" module-key="i6090_spi">
             <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"/>
-                <signal pad-id="pc6" function="SPI" group="MISO" field="SPI"/>
-                <signal pad-id="pc7" function="SPI" group="SCK" field="SPI"/>
-                <signal pad-id="pc4" function="SPI_ALT" group="SS" field="SPI"/>
-                <signal pad-id="pc5" function="SPI_ALT" group="SCK" field="SPI"/>
-                <signal pad-id="pc6" function="SPI_ALT" group="MISO" field="SPI"/>
-                <signal pad-id="pc7" function="SPI_ALT" group="MOSI" field="SPI"/>
+                <signal pad-key="pc4" function="SPI" group="SS" field="SPI"/>
+                <signal pad-key="pc5" function="SPI" group="MOSI" field="SPI"/>
+                <signal pad-key="pc6" function="SPI" group="MISO" field="SPI"/>
+                <signal pad-key="pc7" function="SPI" group="SCK" field="SPI"/>
+                <signal pad-key="pc4" function="SPI_ALT" group="SS" field="SPI"/>
+                <signal pad-key="pc5" function="SPI_ALT" group="SCK" field="SPI"/>
+                <signal pad-key="pc6" function="SPI_ALT" group="MISO" field="SPI"/>
+                <signal pad-key="pc7" function="SPI_ALT" group="MOSI" field="SPI"/>
             </signals>
         </peripheral>
         <peripheral key="spid" name="SPID" module-key="i6090_spi">
             <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"/>
-                <signal pad-id="pd6" function="SPI" group="MISO"/>
-                <signal pad-id="pd7" function="SPI" group="SCK"/>
+                <signal pad-key="pd4" function="SPI" group="SS"/>
+                <signal pad-key="pd5" function="SPI" group="MOSI"/>
+                <signal pad-key="pd6" function="SPI" group="MISO"/>
+                <signal pad-key="pd7" function="SPI" group="SCK"/>
             </signals>
         </peripheral>
         <peripheral key="ircom" name="IRCOM" module-key="i6090_ircom">
@@ -1579,78 +1579,135 @@
             </register-group>
         </module>
     </modules>
+    <pads>
+        <pad key="pa3" name="PA3"/>
+        <pad key="pa4" name="PA4"/>
+        <pad key="pa5" name="PA5"/>
+        <pad key="pa6" name="PA6"/>
+        <pad key="pa7" name="PA7"/>
+        <pad key="pb0" name="PB0"/>
+        <pad key="pb1" name="PB1"/>
+        <pad key="pb2" name="PB2"/>
+        <pad key="pb3" name="PB3"/>
+        <pad key="pb4" name="PB4"/>
+        <pad key="pb5" name="PB5"/>
+        <pad key="pb6" name="PB6"/>
+        <pad key="pb7" name="PB7"/>
+        <pad key="gnd" name="GND"/>
+        <pad key="vcc" name="VCC"/>
+        <pad key="pc0" name="PC0"/>
+        <pad key="pc1" name="PC1"/>
+        <pad key="pc2" name="PC2"/>
+        <pad key="pc3" name="PC3"/>
+        <pad key="pc4" name="PC4"/>
+        <pad key="pc5" name="PC5"/>
+        <pad key="pc6" name="PC6"/>
+        <pad key="pc7" name="PC7"/>
+        <pad key="pd0" name="PD0"/>
+        <pad key="pd1" name="PD1"/>
+        <pad key="pd2" name="PD2"/>
+        <pad key="pd3" name="PD3"/>
+        <pad key="pd4" name="PD4"/>
+        <pad key="pd5" name="PD5"/>
+        <pad key="pd6" name="PD6"/>
+        <pad key="pd7" name="PD7"/>
+        <pad key="pe0" name="PE0"/>
+        <pad key="pe1" name="PE1"/>
+        <pad key="pe2" name="PE2"/>
+        <pad key="pe3" name="PE3"/>
+        <pad key="pe4" name="PE4"/>
+        <pad key="pe5" name="PE5"/>
+        <pad key="pe6" name="PE6"/>
+        <pad key="pe7" name="PE7"/>
+        <pad key="pf0" name="PF0"/>
+        <pad key="pf1" name="PF1"/>
+        <pad key="pf2" name="PF2"/>
+        <pad key="pf3" name="PF3"/>
+        <pad key="pf4" name="PF4"/>
+        <pad key="pf5" name="PF5"/>
+        <pad key="pf6" name="PF6"/>
+        <pad key="pf7" name="PF7"/>
+        <pad key="pdi" name="PDI"/>
+        <pad key="reset" name="RESET"/>
+        <pad key="pr0" name="PR0"/>
+        <pad key="pr1" name="PR1"/>
+        <pad key="avcc" name="AVCC"/>
+        <pad key="pa0" name="PA0"/>
+        <pad key="pa1" name="PA1"/>
+        <pad key="pa2" name="PA2"/>
+    </pads>
     <pinouts>
         <pinout key="qfp_qfn_64" name="QFP_QFN_64" type="qfn">
-            <pin position="1" pad="PA3"/>
-            <pin position="2" pad="PA4"/>
-            <pin position="3" pad="PA5"/>
-            <pin position="4" pad="PA6"/>
-            <pin position="5" pad="PA7"/>
-            <pin position="6" pad="PB0"/>
-            <pin position="7" pad="PB1"/>
-            <pin position="8" pad="PB2"/>
-            <pin position="9" pad="PB3"/>
-            <pin position="10" pad="PB4"/>
-            <pin position="11" pad="PB5"/>
-            <pin position="12" pad="PB6"/>
-            <pin position="13" pad="PB7"/>
-            <pin position="14" pad="GND"/>
-            <pin position="15" pad="VCC"/>
-            <pin position="16" pad="PC0"/>
-            <pin position="17" pad="PC1"/>
-            <pin position="18" pad="PC2"/>
-            <pin position="19" pad="PC3"/>
-            <pin position="20" pad="PC4"/>
-            <pin position="21" pad="PC5"/>
-            <pin position="22" pad="PC6"/>
-            <pin position="23" pad="PC7"/>
-            <pin position="24" pad="GND"/>
-            <pin position="25" pad="VCC"/>
-            <pin position="26" pad="PD0"/>
-            <pin position="27" pad="PD1"/>
-            <pin position="28" pad="PD2"/>
-            <pin position="29" pad="PD3"/>
-            <pin position="30" pad="PD4"/>
-            <pin position="31" pad="PD5"/>
-            <pin position="32" pad="PD6"/>
-            <pin position="33" pad="PD7"/>
-            <pin position="34" pad="GND"/>
-            <pin position="35" pad="VCC"/>
-            <pin position="36" pad="PE0"/>
-            <pin position="37" pad="PE1"/>
-            <pin position="38" pad="PE2"/>
-            <pin position="39" pad="PE3"/>
-            <pin position="40" pad="PE4"/>
-            <pin position="41" pad="PE5"/>
-            <pin position="42" pad="PE6"/>
-            <pin position="43" pad="PE7"/>
-            <pin position="44" pad="GND"/>
-            <pin position="45" pad="VCC"/>
-            <pin position="46" pad="PF0"/>
-            <pin position="47" pad="PF1"/>
-            <pin position="48" pad="PF2"/>
-            <pin position="49" pad="PF3"/>
-            <pin position="50" pad="PF4"/>
-            <pin position="51" pad="PF5"/>
-            <pin position="52" pad="GND"/>
-            <pin position="53" pad="VCC"/>
-            <pin position="54" pad="PF6"/>
-            <pin position="55" pad="PF7"/>
-            <pin position="56" pad="PDI"/>
-            <pin position="57" pad="RESET"/>
-            <pin position="58" pad="PR0"/>
-            <pin position="59" pad="PR1"/>
-            <pin position="60" pad="GND"/>
-            <pin position="61" pad="AVCC"/>
-            <pin position="62" pad="PA0"/>
-            <pin position="63" pad="PA1"/>
-            <pin position="64" pad="PA2"/>
+            <pin position="1" pad-key="pa3"/>
+            <pin position="2" pad-key="pa4"/>
+            <pin position="3" pad-key="pa5"/>
+            <pin position="4" pad-key="pa6"/>
+            <pin position="5" pad-key="pa7"/>
+            <pin position="6" pad-key="pb0"/>
+            <pin position="7" pad-key="pb1"/>
+            <pin position="8" pad-key="pb2"/>
+            <pin position="9" pad-key="pb3"/>
+            <pin position="10" pad-key="pb4"/>
+            <pin position="11" pad-key="pb5"/>
+            <pin position="12" pad-key="pb6"/>
+            <pin position="13" pad-key="pb7"/>
+            <pin position="14" pad-key="gnd"/>
+            <pin position="15" pad-key="vcc"/>
+            <pin position="16" pad-key="pc0"/>
+            <pin position="17" pad-key="pc1"/>
+            <pin position="18" pad-key="pc2"/>
+            <pin position="19" pad-key="pc3"/>
+            <pin position="20" pad-key="pc4"/>
+            <pin position="21" pad-key="pc5"/>
+            <pin position="22" pad-key="pc6"/>
+            <pin position="23" pad-key="pc7"/>
+            <pin position="24" pad-key="gnd"/>
+            <pin position="25" pad-key="vcc"/>
+            <pin position="26" pad-key="pd0"/>
+            <pin position="27" pad-key="pd1"/>
+            <pin position="28" pad-key="pd2"/>
+            <pin position="29" pad-key="pd3"/>
+            <pin position="30" pad-key="pd4"/>
+            <pin position="31" pad-key="pd5"/>
+            <pin position="32" pad-key="pd6"/>
+            <pin position="33" pad-key="pd7"/>
+            <pin position="34" pad-key="gnd"/>
+            <pin position="35" pad-key="vcc"/>
+            <pin position="36" pad-key="pe0"/>
+            <pin position="37" pad-key="pe1"/>
+            <pin position="38" pad-key="pe2"/>
+            <pin position="39" pad-key="pe3"/>
+            <pin position="40" pad-key="pe4"/>
+            <pin position="41" pad-key="pe5"/>
+            <pin position="42" pad-key="pe6"/>
+            <pin position="43" pad-key="pe7"/>
+            <pin position="44" pad-key="gnd"/>
+            <pin position="45" pad-key="vcc"/>
+            <pin position="46" pad-key="pf0"/>
+            <pin position="47" pad-key="pf1"/>
+            <pin position="48" pad-key="pf2"/>
+            <pin position="49" pad-key="pf3"/>
+            <pin position="50" pad-key="pf4"/>
+            <pin position="51" pad-key="pf5"/>
+            <pin position="52" pad-key="gnd"/>
+            <pin position="53" pad-key="vcc"/>
+            <pin position="54" pad-key="pf6"/>
+            <pin position="55" pad-key="pf7"/>
+            <pin position="56" pad-key="pdi"/>
+            <pin position="57" pad-key="reset"/>
+            <pin position="58" pad-key="pr0"/>
+            <pin position="59" pad-key="pr1"/>
+            <pin position="60" pad-key="gnd"/>
+            <pin position="61" pad-key="avcc"/>
+            <pin position="62" pad-key="pa0"/>
+            <pin position="63" pad-key="pa1"/>
+            <pin position="64" pad-key="pa2"/>
         </pinout>
     </pinouts>
     <variants>
-        <variant name="ATxmega32C3-AU" pinout-key="qfp_qfn_64" package="TQFP64"/>
-        <variant name="ATxmega32C3-MH" pinout-key="qfp_qfn_64" package="QFN64"/>
-        <variant name="ATxmega32C3-AN" pinout-key="qfp_qfn_64" package="TQFP64"/>
-        <variant name="ATxmega32C3-M7" pinout-key="qfp_qfn_64" package="QFN64"/>
+        <variant key="atxmega32c3_au" name="ATxmega32C3-AU" pinout-key="qfp_qfn_64"/>
+        <variant key="atxmega32c3_mh" name="ATxmega32C3-MH" pinout-key="qfp_qfn_64"/>
+        <variant key="atxmega32c3_an" name="ATxmega32C3-AN" pinout-key="qfp_qfn_64"/>
+        <variant key="atxmega32c3_m7" name="ATxmega32C3-M7" pinout-key="qfp_qfn_64"/>
     </variants>
 </device>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA32C4.xml b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA32C4.xml
index e6de0894..98b54138 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA32C4.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA32C4.xml
@@ -92,12 +92,12 @@
         <peripheral key="osc" name="OSC" module-key="i6079">
             <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"/>
-                <signal pad-id="pr0" function="TOSC" group="TOSC2"/>
-                <signal pad-id="pr1" function="TOSC" group="TOSC1"/>
-                <signal pad-id="pe2" function="TOSC_ALT" group="TOSC2"/>
-                <signal pad-id="pe3" function="TOSC_ALT" group="TOSC1"/>
+                <signal pad-key="pr0" function="XTAL" group="XTAL2"/>
+                <signal pad-key="pr1" function="XTAL" group="XTAL1"/>
+                <signal pad-key="pr0" function="TOSC" group="TOSC2"/>
+                <signal pad-key="pr1" function="TOSC" group="TOSC1"/>
+                <signal pad-key="pe2" function="TOSC_ALT" group="TOSC2"/>
+                <signal pad-key="pe3" function="TOSC_ALT" group="TOSC1"/>
             </signals>
         </peripheral>
         <peripheral key="dfllrc32m" name="DFLLRC32M" module-key="i6055">
@@ -121,11 +121,11 @@
         <peripheral key="portcfg" name="PORTCFG" module-key="i6075_portcfg">
             <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"/>
-                <signal pad-id="pc7" function="EVOUT" group="EVOUT" field="EVOUT"/>
-                <signal pad-id="pc4" function="EVOUT_ALT" group="EVOUT" field="CLKEVPIN"/>
-                <signal pad-id="pc6" function="RTCOUTC" group="RTCOUT"/>
+                <signal pad-key="pc7" function="CLKOUT" group="CLKOUT" field="CLKOUT"/>
+                <signal pad-key="pc4" function="CLKOUT_ALT" group="CLKOUT" field="CLKEVPIN"/>
+                <signal pad-key="pc7" function="EVOUT" group="EVOUT" field="EVOUT"/>
+                <signal pad-key="pc4" function="EVOUT_ALT" group="EVOUT" field="CLKEVPIN"/>
+                <signal pad-key="pc6" function="RTCOUTC" group="RTCOUT"/>
             </signals>
         </peripheral>
         <peripheral key="crc" name="CRC" module-key="i6111">
@@ -140,34 +140,34 @@
         <peripheral key="adca" name="ADCA" module-key="i6110">
             <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"/>
-                <signal pad-id="pa2" index="2" function="ADC" group="ADC"/>
-                <signal pad-id="pa3" index="3" function="ADC" group="ADC"/>
-                <signal pad-id="pa4" index="4" function="ADC" group="ADC"/>
-                <signal pad-id="pa5" index="5" function="ADC" group="ADC"/>
-                <signal pad-id="pa6" index="6" function="ADC" group="ADC"/>
-                <signal pad-id="pa7" index="7" function="ADC" group="ADC"/>
-                <signal pad-id="pb0" index="8" function="ADC" group="ADC"/>
-                <signal pad-id="pb1" index="9" function="ADC" group="ADC"/>
-                <signal pad-id="pb2" index="10" function="ADC" group="ADC"/>
-                <signal pad-id="pb3" index="11" function="ADC" group="ADC"/>
-                <signal pad-id="pa0" index="0" function="AREF" group="REFA"/>
-                <signal pad-id="pb0" index="0" function="AREF" group="REFB"/>
+                <signal pad-key="pa0" index="0" function="ADC" group="ADC"/>
+                <signal pad-key="pa1" index="1" function="ADC" group="ADC"/>
+                <signal pad-key="pa2" index="2" function="ADC" group="ADC"/>
+                <signal pad-key="pa3" index="3" function="ADC" group="ADC"/>
+                <signal pad-key="pa4" index="4" function="ADC" group="ADC"/>
+                <signal pad-key="pa5" index="5" function="ADC" group="ADC"/>
+                <signal pad-key="pa6" index="6" function="ADC" group="ADC"/>
+                <signal pad-key="pa7" index="7" function="ADC" group="ADC"/>
+                <signal pad-key="pb0" index="8" function="ADC" group="ADC"/>
+                <signal pad-key="pb1" index="9" function="ADC" group="ADC"/>
+                <signal pad-key="pb2" index="10" function="ADC" group="ADC"/>
+                <signal pad-key="pb3" index="11" function="ADC" group="ADC"/>
+                <signal pad-key="pa0" index="0" function="AREF" group="REFA"/>
+                <signal pad-key="pb0" index="0" function="AREF" group="REFB"/>
             </signals>
         </peripheral>
         <peripheral key="aca" name="ACA" module-key="i6077">
             <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"/>
-                <signal pad-id="pa2" index="2" function="AC" group="AC"/>
-                <signal pad-id="pa3" index="3" function="AC" group="AC"/>
-                <signal pad-id="pa4" index="4" function="AC" group="AC"/>
-                <signal pad-id="pa5" index="5" function="AC" group="AC"/>
-                <signal pad-id="pa6" index="6" function="AC" group="AC"/>
-                <signal pad-id="pa7" index="7" function="AC" group="AC"/>
-                <signal pad-id="pa7" index="0" function="ACOUT" group="ACOUT"/>
+                <signal pad-key="pa0" index="0" function="AC" group="AC"/>
+                <signal pad-key="pa1" index="1" function="AC" group="AC"/>
+                <signal pad-key="pa2" index="2" function="AC" group="AC"/>
+                <signal pad-key="pa3" index="3" function="AC" group="AC"/>
+                <signal pad-key="pa4" index="4" function="AC" group="AC"/>
+                <signal pad-key="pa5" index="5" function="AC" group="AC"/>
+                <signal pad-key="pa6" index="6" function="AC" group="AC"/>
+                <signal pad-key="pa7" index="7" function="AC" group="AC"/>
+                <signal pad-key="pa7" index="0" function="ACOUT" group="ACOUT"/>
             </signals>
         </peripheral>
         <peripheral key="rtc" name="RTC" module-key="i6093">
@@ -176,163 +176,163 @@
         <peripheral key="twic" name="TWIC" module-key="i6089">
             <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"/>
+                <signal pad-key="pc0" function="TWI" group="SDA"/>
+                <signal pad-key="pc1" function="TWI" group="SCL"/>
             </signals>
         </peripheral>
         <peripheral key="twie" name="TWIE" module-key="i6089">
             <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"/>
+                <signal pad-key="pe0" function="TWI" group="SDA"/>
+                <signal pad-key="pe1" function="TWI" group="SCL"/>
             </signals>
         </peripheral>
         <peripheral key="usb" name="USB" module-key="i3005">
             <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"/>
+                <signal pad-key="pd6" function="USB" group="DN"/>
+                <signal pad-key="pd7" function="USB" group="DP"/>
             </signals>
         </peripheral>
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pa2" index="2" function="PORTA" group="P"/>
-                <signal pad-id="pa3" index="3" function="PORTA" group="P"/>
-                <signal pad-id="pa4" index="4" function="PORTA" group="P"/>
-                <signal pad-id="pa5" index="5" function="PORTA" group="P"/>
-                <signal pad-id="pa6" index="6" function="PORTA" group="P"/>
-                <signal pad-id="pa7" index="7" function="PORTA" group="P"/>
+                <signal pad-key="pa0" index="0" function="PORTA" group="P"/>
+                <signal pad-key="pa1" index="1" function="PORTA" group="P"/>
+                <signal pad-key="pa2" index="2" function="PORTA" group="P"/>
+                <signal pad-key="pa3" index="3" function="PORTA" group="P"/>
+                <signal pad-key="pa4" index="4" function="PORTA" group="P"/>
+                <signal pad-key="pa5" index="5" function="PORTA" group="P"/>
+                <signal pad-key="pa6" index="6" function="PORTA" group="P"/>
+                <signal pad-key="pa7" index="7" function="PORTA" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pb2" index="2" function="PORTB" group="P"/>
-                <signal pad-id="pb3" index="3" function="PORTB" group="P"/>
+                <signal pad-key="pb0" index="0" function="PORTB" group="P"/>
+                <signal pad-key="pb1" index="1" function="PORTB" group="P"/>
+                <signal pad-key="pb2" index="2" function="PORTB" group="P"/>
+                <signal pad-key="pb3" index="3" function="PORTB" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pc2" index="2" function="PORTC" group="P"/>
-                <signal pad-id="pc3" index="3" function="PORTC" group="P"/>
-                <signal pad-id="pc4" index="4" function="PORTC" group="P"/>
-                <signal pad-id="pc5" index="5" function="PORTC" group="P"/>
-                <signal pad-id="pc6" index="6" function="PORTC" group="P"/>
-                <signal pad-id="pc7" index="7" function="PORTC" group="P"/>
+                <signal pad-key="pc0" index="0" function="PORTC" group="P"/>
+                <signal pad-key="pc1" index="1" function="PORTC" group="P"/>
+                <signal pad-key="pc2" index="2" function="PORTC" group="P"/>
+                <signal pad-key="pc3" index="3" function="PORTC" group="P"/>
+                <signal pad-key="pc4" index="4" function="PORTC" group="P"/>
+                <signal pad-key="pc5" index="5" function="PORTC" group="P"/>
+                <signal pad-key="pc6" index="6" function="PORTC" group="P"/>
+                <signal pad-key="pc7" index="7" function="PORTC" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pd2" index="2" function="PORTD" group="P"/>
-                <signal pad-id="pd3" index="3" function="PORTD" group="P"/>
-                <signal pad-id="pd4" index="4" function="PORTD" group="P"/>
-                <signal pad-id="pd5" index="5" function="PORTD" group="P"/>
-                <signal pad-id="pd6" index="6" function="PORTD" group="P"/>
-                <signal pad-id="pd7" index="7" function="PORTD" group="P"/>
+                <signal pad-key="pd0" index="0" function="PORTD" group="P"/>
+                <signal pad-key="pd1" index="1" function="PORTD" group="P"/>
+                <signal pad-key="pd2" index="2" function="PORTD" group="P"/>
+                <signal pad-key="pd3" index="3" function="PORTD" group="P"/>
+                <signal pad-key="pd4" index="4" function="PORTD" group="P"/>
+                <signal pad-key="pd5" index="5" function="PORTD" group="P"/>
+                <signal pad-key="pd6" index="6" function="PORTD" group="P"/>
+                <signal pad-key="pd7" index="7" function="PORTD" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="porte" name="PORTE" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pe2" index="2" function="PORTE" group="P"/>
-                <signal pad-id="pe3" index="3" function="PORTE" group="P"/>
+                <signal pad-key="pe0" index="0" function="PORTE" group="P"/>
+                <signal pad-key="pe1" index="1" function="PORTE" group="P"/>
+                <signal pad-key="pe2" index="2" function="PORTE" group="P"/>
+                <signal pad-key="pe3" index="3" function="PORTE" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portr" name="PORTR" module-key="gpio_port">
             <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"/>
+                <signal pad-key="pr0" index="0" function="PORTR" group="P"/>
+                <signal pad-key="pr1" index="1" function="PORTR" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="tcc0" name="TCC0" module-key="i6090_tc">
             <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"/>
-                <signal pad-id="pc2" function="TCC" group="OC0C" field="TC0C"/>
-                <signal pad-id="pc3" function="TCC" group="OC0D" field="TC0D"/>
-                <signal pad-id="pc4" function="TCC_ALT" group="OC0A" field="TC0A"/>
-                <signal pad-id="pc5" function="TCC_ALT" group="OC0B" field="TC0B"/>
-                <signal pad-id="pc6" function="TCC_ALT" group="OC0C" field="TC0C"/>
-                <signal pad-id="pc7" function="TCC_ALT" group="OC0D" field="TC0D"/>
+                <signal pad-key="pc0" function="TCC" group="OC0A" field="TC0A"/>
+                <signal pad-key="pc1" function="TCC" group="OC0B" field="TC0B"/>
+                <signal pad-key="pc2" function="TCC" group="OC0C" field="TC0C"/>
+                <signal pad-key="pc3" function="TCC" group="OC0D" field="TC0D"/>
+                <signal pad-key="pc4" function="TCC_ALT" group="OC0A" field="TC0A"/>
+                <signal pad-key="pc5" function="TCC_ALT" group="OC0B" field="TC0B"/>
+                <signal pad-key="pc6" function="TCC_ALT" group="OC0C" field="TC0C"/>
+                <signal pad-key="pc7" function="TCC_ALT" group="OC0D" field="TC0D"/>
             </signals>
         </peripheral>
         <peripheral key="tcc1" name="TCC1" module-key="i6090_tc">
             <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"/>
+                <signal pad-key="pc4" function="TCC" group="OC1A"/>
+                <signal pad-key="pc5" function="TCC" group="OC1B"/>
             </signals>
         </peripheral>
         <peripheral key="tcd0" name="TCD0" module-key="i6090_tc">
             <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"/>
-                <signal pad-id="pd2" function="TC0" group="OC0C"/>
-                <signal pad-id="pd3" function="TC0" group="OC0D"/>
+                <signal pad-key="pd0" function="TC0" group="OC0A"/>
+                <signal pad-key="pd1" function="TC0" group="OC0B"/>
+                <signal pad-key="pd2" function="TC0" group="OC0C"/>
+                <signal pad-key="pd3" function="TC0" group="OC0D"/>
             </signals>
         </peripheral>
         <peripheral key="tce0" name="TCE0" module-key="i6090_tc">
             <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"/>
-                <signal pad-id="pe2" function="TCE" group="OC0C"/>
-                <signal pad-id="pe3" function="TCE" group="OC0D"/>
+                <signal pad-key="pe0" function="TCE" group="OC0A"/>
+                <signal pad-key="pe1" function="TCE" group="OC0B"/>
+                <signal pad-key="pe2" function="TCE" group="OC0C"/>
+                <signal pad-key="pe3" function="TCE" group="OC0D"/>
             </signals>
         </peripheral>
         <peripheral key="tcc2" name="TCC2" module-key="i6090_tc2">
             <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"/>
-                <signal pad-id="pc2" function="TC2" group="LOC2C"/>
-                <signal pad-id="pc3" function="TC2" group="LOC2D"/>
-                <signal pad-id="pc4" function="TC2" group="HOC2A"/>
-                <signal pad-id="pc5" function="TC2" group="HOC2B"/>
-                <signal pad-id="pc6" function="TC2" group="HOC2C"/>
-                <signal pad-id="pc7" function="TC2" group="HOC2D"/>
+                <signal pad-key="pc0" function="TC2" group="LOC2A"/>
+                <signal pad-key="pc1" function="TC2" group="LOC2B"/>
+                <signal pad-key="pc2" function="TC2" group="LOC2C"/>
+                <signal pad-key="pc3" function="TC2" group="LOC2D"/>
+                <signal pad-key="pc4" function="TC2" group="HOC2A"/>
+                <signal pad-key="pc5" function="TC2" group="HOC2B"/>
+                <signal pad-key="pc6" function="TC2" group="HOC2C"/>
+                <signal pad-key="pc7" function="TC2" group="HOC2D"/>
             </signals>
         </peripheral>
         <peripheral key="tcd2" name="TCD2" module-key="i6090_tc2">
             <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"/>
-                <signal pad-id="pd2" function="TC2" group="LOC2C"/>
-                <signal pad-id="pd3" function="TC2" group="LOC2D"/>
-                <signal pad-id="pd4" function="TC2" group="HOC2A"/>
-                <signal pad-id="pd5" function="TC2" group="HOC2B"/>
-                <signal pad-id="pd6" function="TC2" group="HOC2C"/>
-                <signal pad-id="pd7" function="TC2" group="HOC2D"/>
+                <signal pad-key="pd0" function="TC2" group="LOC2A"/>
+                <signal pad-key="pd1" function="TC2" group="LOC2B"/>
+                <signal pad-key="pd2" function="TC2" group="LOC2C"/>
+                <signal pad-key="pd3" function="TC2" group="LOC2D"/>
+                <signal pad-key="pd4" function="TC2" group="HOC2A"/>
+                <signal pad-key="pd5" function="TC2" group="HOC2B"/>
+                <signal pad-key="pd6" function="TC2" group="HOC2C"/>
+                <signal pad-key="pd7" function="TC2" group="HOC2D"/>
             </signals>
         </peripheral>
         <peripheral key="awexc" name="AWEXC" module-key="i6090_awex">
             <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"/>
-                <signal pad-id="pc2" function="AWEX" group="OC0BLS"/>
-                <signal pad-id="pc3" function="AWEX" group="OC0BHS"/>
-                <signal pad-id="pc4" function="AWEX" group="OC0CLS"/>
-                <signal pad-id="pc5" function="AWEX" group="OC0CHS"/>
-                <signal pad-id="pc6" function="AWEX" group="OC0DLS"/>
-                <signal pad-id="pc7" function="AWEX" group="OC0DHS"/>
+                <signal pad-key="pc0" function="AWEX" group="OC0ALS"/>
+                <signal pad-key="pc1" function="AWEX" group="OC0AHS"/>
+                <signal pad-key="pc2" function="AWEX" group="OC0BLS"/>
+                <signal pad-key="pc3" function="AWEX" group="OC0BHS"/>
+                <signal pad-key="pc4" function="AWEX" group="OC0CLS"/>
+                <signal pad-key="pc5" function="AWEX" group="OC0CHS"/>
+                <signal pad-key="pc6" function="AWEX" group="OC0DLS"/>
+                <signal pad-key="pc7" function="AWEX" group="OC0DHS"/>
             </signals>
         </peripheral>
         <peripheral key="hiresc" name="HIRESC" module-key="i6090_hires">
@@ -341,50 +341,50 @@
         <peripheral key="usartc0" name="USARTC0" module-key="i6090_usart">
             <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"/>
-                <signal pad-id="pc3" function="USART" group="TXD" field="USART0"/>
-                <signal pad-id="pc5" function="USART_ALT" group="XCK" field="USART0"/>
-                <signal pad-id="pc6" function="USART_ALT" group="RXD" field="USART0"/>
-                <signal pad-id="pc7" function="USART_ALT" group="TXD" field="USART0"/>
+                <signal pad-key="pc1" function="USART" group="XCK" field="USART0"/>
+                <signal pad-key="pc2" function="USART" group="RXD" field="USART0"/>
+                <signal pad-key="pc3" function="USART" group="TXD" field="USART0"/>
+                <signal pad-key="pc5" function="USART_ALT" group="XCK" field="USART0"/>
+                <signal pad-key="pc6" function="USART_ALT" group="RXD" field="USART0"/>
+                <signal pad-key="pc7" function="USART_ALT" group="TXD" field="USART0"/>
             </signals>
         </peripheral>
         <peripheral key="usartc1" name="USARTC1" module-key="i6090_usart">
             <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"/>
-                <signal pad-id="pc7" function="USART" group="TXD"/>
+                <signal pad-key="pc5" function="USART" group="XCK"/>
+                <signal pad-key="pc6" function="USART" group="RXD"/>
+                <signal pad-key="pc7" function="USART" group="TXD"/>
             </signals>
         </peripheral>
         <peripheral key="usartd0" name="USARTD0" module-key="i6090_usart">
             <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"/>
-                <signal pad-id="pd3" function="USART" group="TXD"/>
+                <signal pad-key="pd1" function="USART" group="XCK"/>
+                <signal pad-key="pd2" function="USART" group="RXD"/>
+                <signal pad-key="pd3" function="USART" group="TXD"/>
             </signals>
         </peripheral>
         <peripheral key="spic" name="SPIC" module-key="i6090_spi">
             <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"/>
-                <signal pad-id="pc6" function="SPI" group="MISO" field="SPI"/>
-                <signal pad-id="pc7" function="SPI" group="SCK" field="SPI"/>
-                <signal pad-id="pc4" function="SPI_ALT" group="SS" field="SPI"/>
-                <signal pad-id="pc5" function="SPI_ALT" group="SCK" field="SPI"/>
-                <signal pad-id="pc6" function="SPI_ALT" group="MISO" field="SPI"/>
-                <signal pad-id="pc7" function="SPI_ALT" group="MOSI" field="SPI"/>
+                <signal pad-key="pc4" function="SPI" group="SS" field="SPI"/>
+                <signal pad-key="pc5" function="SPI" group="MOSI" field="SPI"/>
+                <signal pad-key="pc6" function="SPI" group="MISO" field="SPI"/>
+                <signal pad-key="pc7" function="SPI" group="SCK" field="SPI"/>
+                <signal pad-key="pc4" function="SPI_ALT" group="SS" field="SPI"/>
+                <signal pad-key="pc5" function="SPI_ALT" group="SCK" field="SPI"/>
+                <signal pad-key="pc6" function="SPI_ALT" group="MISO" field="SPI"/>
+                <signal pad-key="pc7" function="SPI_ALT" group="MOSI" field="SPI"/>
             </signals>
         </peripheral>
         <peripheral key="spid" name="SPID" module-key="i6090_spi">
             <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"/>
-                <signal pad-id="pd6" function="SPI" group="MISO"/>
-                <signal pad-id="pd7" function="SPI" group="SCK"/>
+                <signal pad-key="pd4" function="SPI" group="SS"/>
+                <signal pad-key="pd5" function="SPI" group="MOSI"/>
+                <signal pad-key="pd6" function="SPI" group="MISO"/>
+                <signal pad-key="pd7" function="SPI" group="SCK"/>
             </signals>
         </peripheral>
         <peripheral key="ircom" name="IRCOM" module-key="i6090_ircom">
@@ -1519,110 +1519,151 @@
             </register-group>
         </module>
     </modules>
+    <pads>
+        <pad key="pa5" name="PA5"/>
+        <pad key="pa6" name="PA6"/>
+        <pad key="pa7" name="PA7"/>
+        <pad key="pb0" name="PB0"/>
+        <pad key="pb1" name="PB1"/>
+        <pad key="pb2" name="PB2"/>
+        <pad key="pb3" name="PB3"/>
+        <pad key="gnd" name="GND"/>
+        <pad key="vcc" name="VCC"/>
+        <pad key="pc0" name="PC0"/>
+        <pad key="pc1" name="PC1"/>
+        <pad key="pc2" name="PC2"/>
+        <pad key="pc3" name="PC3"/>
+        <pad key="pc4" name="PC4"/>
+        <pad key="pc5" name="PC5"/>
+        <pad key="pc6" name="PC6"/>
+        <pad key="pc7" name="PC7"/>
+        <pad key="pd0" name="PD0"/>
+        <pad key="pd1" name="PD1"/>
+        <pad key="pd2" name="PD2"/>
+        <pad key="pd3" name="PD3"/>
+        <pad key="pd4" name="PD4"/>
+        <pad key="pd5" name="PD5"/>
+        <pad key="pd6" name="PD6"/>
+        <pad key="pd7" name="PD7"/>
+        <pad key="pe0" name="PE0"/>
+        <pad key="pe1" name="PE1"/>
+        <pad key="pe2" name="PE2"/>
+        <pad key="pe3" name="PE3"/>
+        <pad key="pdi" name="PDI"/>
+        <pad key="reset" name="RESET"/>
+        <pad key="pr0" name="PR0"/>
+        <pad key="pr1" name="PR1"/>
+        <pad key="avcc" name="AVCC"/>
+        <pad key="pa0" name="PA0"/>
+        <pad key="pa1" name="PA1"/>
+        <pad key="pa2" name="PA2"/>
+        <pad key="pa3" name="PA3"/>
+        <pad key="pa4" name="PA4"/>
+    </pads>
     <pinouts>
         <pinout key="qfn_qfp_44" name="QFN_QFP_44" type="qfn">
-            <pin position="1" pad="PA5"/>
-            <pin position="2" pad="PA6"/>
-            <pin position="3" pad="PA7"/>
-            <pin position="4" pad="PB0"/>
-            <pin position="5" pad="PB1"/>
-            <pin position="6" pad="PB2"/>
-            <pin position="7" pad="PB3"/>
-            <pin position="8" pad="GND"/>
-            <pin position="9" pad="VCC"/>
-            <pin position="10" pad="PC0"/>
-            <pin position="11" pad="PC1"/>
-            <pin position="12" pad="PC2"/>
-            <pin position="13" pad="PC3"/>
-            <pin position="14" pad="PC4"/>
-            <pin position="15" pad="PC5"/>
-            <pin position="16" pad="PC6"/>
-            <pin position="17" pad="PC7"/>
-            <pin position="18" pad="GND"/>
-            <pin position="19" pad="VCC"/>
-            <pin position="20" pad="PD0"/>
-            <pin position="21" pad="PD1"/>
-            <pin position="22" pad="PD2"/>
-            <pin position="23" pad="PD3"/>
-            <pin position="24" pad="PD4"/>
-            <pin position="25" pad="PD5"/>
-            <pin position="26" pad="PD6"/>
-            <pin position="27" pad="PD7"/>
-            <pin position="28" pad="PE0"/>
-            <pin position="29" pad="PE1"/>
-            <pin position="30" pad="GND"/>
-            <pin position="31" pad="VCC"/>
-            <pin position="32" pad="PE2"/>
-            <pin position="33" pad="PE3"/>
-            <pin position="34" pad="PDI"/>
-            <pin position="35" pad="RESET"/>
-            <pin position="36" pad="PR0"/>
-            <pin position="37" pad="PR1"/>
-            <pin position="38" pad="GND"/>
-            <pin position="39" pad="AVCC"/>
-            <pin position="40" pad="PA0"/>
-            <pin position="41" pad="PA1"/>
-            <pin position="42" pad="PA2"/>
-            <pin position="43" pad="PA3"/>
-            <pin position="44" pad="PA4"/>
+            <pin position="1" pad-key="pa5"/>
+            <pin position="2" pad-key="pa6"/>
+            <pin position="3" pad-key="pa7"/>
+            <pin position="4" pad-key="pb0"/>
+            <pin position="5" pad-key="pb1"/>
+            <pin position="6" pad-key="pb2"/>
+            <pin position="7" pad-key="pb3"/>
+            <pin position="8" pad-key="gnd"/>
+            <pin position="9" pad-key="vcc"/>
+            <pin position="10" pad-key="pc0"/>
+            <pin position="11" pad-key="pc1"/>
+            <pin position="12" pad-key="pc2"/>
+            <pin position="13" pad-key="pc3"/>
+            <pin position="14" pad-key="pc4"/>
+            <pin position="15" pad-key="pc5"/>
+            <pin position="16" pad-key="pc6"/>
+            <pin position="17" pad-key="pc7"/>
+            <pin position="18" pad-key="gnd"/>
+            <pin position="19" pad-key="vcc"/>
+            <pin position="20" pad-key="pd0"/>
+            <pin position="21" pad-key="pd1"/>
+            <pin position="22" pad-key="pd2"/>
+            <pin position="23" pad-key="pd3"/>
+            <pin position="24" pad-key="pd4"/>
+            <pin position="25" pad-key="pd5"/>
+            <pin position="26" pad-key="pd6"/>
+            <pin position="27" pad-key="pd7"/>
+            <pin position="28" pad-key="pe0"/>
+            <pin position="29" pad-key="pe1"/>
+            <pin position="30" pad-key="gnd"/>
+            <pin position="31" pad-key="vcc"/>
+            <pin position="32" pad-key="pe2"/>
+            <pin position="33" pad-key="pe3"/>
+            <pin position="34" pad-key="pdi"/>
+            <pin position="35" pad-key="reset"/>
+            <pin position="36" pad-key="pr0"/>
+            <pin position="37" pad-key="pr1"/>
+            <pin position="38" pad-key="gnd"/>
+            <pin position="39" pad-key="avcc"/>
+            <pin position="40" pad-key="pa0"/>
+            <pin position="41" pad-key="pa1"/>
+            <pin position="42" pad-key="pa2"/>
+            <pin position="43" pad-key="pa3"/>
+            <pin position="44" pad-key="pa4"/>
         </pinout>
         <pinout key="bga_49" name="BGA_49" type="bga">
-            <pin position="A1" pad="PA3"/>
-            <pin position="A2" pad="AVCC"/>
-            <pin position="A3" pad="GND"/>
-            <pin position="A4" pad="PR1"/>
-            <pin position="A5" pad="PR0"/>
-            <pin position="A6" pad="PDI"/>
-            <pin position="A7" pad="PE3"/>
-            <pin position="B1" pad="PA4"/>
-            <pin position="B2" pad="PA1"/>
-            <pin position="B3" pad="PA0"/>
-            <pin position="B4" pad="GND"/>
-            <pin position="B5" pad="RESET"/>
-            <pin position="B6" pad="PE2"/>
-            <pin position="B7" pad="VCC"/>
-            <pin position="C1" pad="PA5"/>
-            <pin position="C2" pad="PA2"/>
-            <pin position="C3" pad="PA6"/>
-            <pin position="C4" pad="PA7"/>
-            <pin position="C5" pad="GND"/>
-            <pin position="C6" pad="PE1"/>
-            <pin position="C7" pad="GND"/>
-            <pin position="D1" pad="PB1"/>
-            <pin position="D2" pad="PB2"/>
-            <pin position="D3" pad="PB3"/>
-            <pin position="D4" pad="PB0"/>
-            <pin position="D5" pad="GND"/>
-            <pin position="D6" pad="PD7"/>
-            <pin position="D7" pad="PE0"/>
-            <pin position="E1" pad="GND"/>
-            <pin position="E2" pad="GND"/>
-            <pin position="E3" pad="PC3"/>
-            <pin position="E4" pad="GND"/>
-            <pin position="E5" pad="PD4"/>
-            <pin position="E6" pad="PD5"/>
-            <pin position="E7" pad="PD6"/>
-            <pin position="F1" pad="VCC"/>
-            <pin position="F2" pad="PC0"/>
-            <pin position="F3" pad="PC4"/>
-            <pin position="F4" pad="PC6"/>
-            <pin position="F5" pad="PD0"/>
-            <pin position="F6" pad="PD1"/>
-            <pin position="F7" pad="PD3"/>
-            <pin position="G1" pad="PC1"/>
-            <pin position="G2" pad="PC2"/>
-            <pin position="G3" pad="PC5"/>
-            <pin position="G4" pad="PC7"/>
-            <pin position="G5" pad="GND"/>
-            <pin position="G6" pad="VCC"/>
-            <pin position="G7" pad="PD2"/>
+            <pin position="A1" pad-key="pa3"/>
+            <pin position="A2" pad-key="avcc"/>
+            <pin position="A3" pad-key="gnd"/>
+            <pin position="A4" pad-key="pr1"/>
+            <pin position="A5" pad-key="pr0"/>
+            <pin position="A6" pad-key="pdi"/>
+            <pin position="A7" pad-key="pe3"/>
+            <pin position="B1" pad-key="pa4"/>
+            <pin position="B2" pad-key="pa1"/>
+            <pin position="B3" pad-key="pa0"/>
+            <pin position="B4" pad-key="gnd"/>
+            <pin position="B5" pad-key="reset"/>
+            <pin position="B6" pad-key="pe2"/>
+            <pin position="B7" pad-key="vcc"/>
+            <pin position="C1" pad-key="pa5"/>
+            <pin position="C2" pad-key="pa2"/>
+            <pin position="C3" pad-key="pa6"/>
+            <pin position="C4" pad-key="pa7"/>
+            <pin position="C5" pad-key="gnd"/>
+            <pin position="C6" pad-key="pe1"/>
+            <pin position="C7" pad-key="gnd"/>
+            <pin position="D1" pad-key="pb1"/>
+            <pin position="D2" pad-key="pb2"/>
+            <pin position="D3" pad-key="pb3"/>
+            <pin position="D4" pad-key="pb0"/>
+            <pin position="D5" pad-key="gnd"/>
+            <pin position="D6" pad-key="pd7"/>
+            <pin position="D7" pad-key="pe0"/>
+            <pin position="E1" pad-key="gnd"/>
+            <pin position="E2" pad-key="gnd"/>
+            <pin position="E3" pad-key="pc3"/>
+            <pin position="E4" pad-key="gnd"/>
+            <pin position="E5" pad-key="pd4"/>
+            <pin position="E6" pad-key="pd5"/>
+            <pin position="E7" pad-key="pd6"/>
+            <pin position="F1" pad-key="vcc"/>
+            <pin position="F2" pad-key="pc0"/>
+            <pin position="F3" pad-key="pc4"/>
+            <pin position="F4" pad-key="pc6"/>
+            <pin position="F5" pad-key="pd0"/>
+            <pin position="F6" pad-key="pd1"/>
+            <pin position="F7" pad-key="pd3"/>
+            <pin position="G1" pad-key="pc1"/>
+            <pin position="G2" pad-key="pc2"/>
+            <pin position="G3" pad-key="pc5"/>
+            <pin position="G4" pad-key="pc7"/>
+            <pin position="G5" pad-key="gnd"/>
+            <pin position="G6" pad-key="vcc"/>
+            <pin position="G7" pad-key="pd2"/>
         </pinout>
     </pinouts>
     <variants>
-        <variant name="ATxmega32C4-AU" pinout-key="qfn_qfp_44" package="TQFP44"/>
-        <variant name="ATxmega32C4-MH" pinout-key="qfn_qfp_44" package="VQFN44"/>
-        <variant name="ATxmega32C4-CU" pinout-key="bga_49" package="VFBGA49"/>
-        <variant name="ATxmega32C4-AN" pinout-key="qfn_qfp_44" package="TQFP44"/>
-        <variant name="ATxmega32C4-M7" pinout-key="bga_49" package="VFBGA49"/>
+        <variant key="atxmega32c4_au" name="ATxmega32C4-AU" pinout-key="qfn_qfp_44"/>
+        <variant key="atxmega32c4_mh" name="ATxmega32C4-MH" pinout-key="qfn_qfp_44"/>
+        <variant key="atxmega32c4_cu" name="ATxmega32C4-CU" pinout-key="bga_49"/>
+        <variant key="atxmega32c4_an" name="ATxmega32C4-AN" pinout-key="qfn_qfp_44"/>
+        <variant key="atxmega32c4_m7" name="ATxmega32C4-M7" pinout-key="bga_49"/>
     </variants>
 </device>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA32D3.xml b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA32D3.xml
index f8cd47d1..1109ba52 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA32D3.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA32D3.xml
@@ -81,10 +81,10 @@
         <peripheral key="osc" name="OSC" module-key="i6079">
             <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"/>
-                <signal pad-id="pe2" function="TOSC" group="TOSC2"/>
-                <signal pad-id="pe3" function="TOSC" group="TOSC1"/>
+                <signal pad-key="pr0" function="XTAL" group="XTAL2"/>
+                <signal pad-key="pr1" function="XTAL" group="XTAL1"/>
+                <signal pad-key="pe2" function="TOSC" group="TOSC2"/>
+                <signal pad-key="pe3" function="TOSC" group="TOSC1"/>
             </signals>
         </peripheral>
         <peripheral key="dfllrc32m" name="DFLLRC32M" module-key="i6055">
@@ -126,39 +126,39 @@
         <peripheral key="aca" name="ACA" module-key="i6077">
             <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"/>
-                <signal pad-id="pa2" index="2" function="AC" group="AC"/>
-                <signal pad-id="pa3" index="3" function="AC" group="AC"/>
-                <signal pad-id="pa4" index="4" function="AC" group="AC"/>
-                <signal pad-id="pa5" index="5" function="AC" group="AC"/>
-                <signal pad-id="pa6" index="6" function="AC" group="AC"/>
-                <signal pad-id="pa7" index="7" function="AC" group="AC"/>
-                <signal pad-id="pa6" index="1" function="ACOUT" group="ACOUT"/>
-                <signal pad-id="pa7" index="0" function="ACOUT" group="ACOUT"/>
+                <signal pad-key="pa0" index="0" function="AC" group="AC"/>
+                <signal pad-key="pa1" index="1" function="AC" group="AC"/>
+                <signal pad-key="pa2" index="2" function="AC" group="AC"/>
+                <signal pad-key="pa3" index="3" function="AC" group="AC"/>
+                <signal pad-key="pa4" index="4" function="AC" group="AC"/>
+                <signal pad-key="pa5" index="5" function="AC" group="AC"/>
+                <signal pad-key="pa6" index="6" function="AC" group="AC"/>
+                <signal pad-key="pa7" index="7" function="AC" group="AC"/>
+                <signal pad-key="pa6" index="1" function="ACOUT" group="ACOUT"/>
+                <signal pad-key="pa7" index="0" function="ACOUT" group="ACOUT"/>
             </signals>
         </peripheral>
         <peripheral key="adca" name="ADCA" module-key="i6110">
             <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"/>
-                <signal pad-id="pa2" index="2" function="ADC" group="ADC"/>
-                <signal pad-id="pa3" index="3" function="ADC" group="ADC"/>
-                <signal pad-id="pa4" index="4" function="ADC" group="ADC"/>
-                <signal pad-id="pa5" index="5" function="ADC" group="ADC"/>
-                <signal pad-id="pa6" index="6" function="ADC" group="ADC"/>
-                <signal pad-id="pa7" index="7" function="ADC" group="ADC"/>
-                <signal pad-id="pb0" index="8" function="ADC" group="ADC"/>
-                <signal pad-id="pb1" index="9" function="ADC" group="ADC"/>
-                <signal pad-id="pb2" index="10" function="ADC" group="ADC"/>
-                <signal pad-id="pb3" index="11" function="ADC" group="ADC"/>
-                <signal pad-id="pb4" index="12" function="ADC" group="ADC"/>
-                <signal pad-id="pb5" index="13" function="ADC" group="ADC"/>
-                <signal pad-id="pb6" index="14" function="ADC" group="ADC"/>
-                <signal pad-id="pb7" index="15" function="ADC" group="ADC"/>
-                <signal pad-id="pa0" index="0" function="AREF" group="REFA"/>
-                <signal pad-id="pb0" index="0" function="AREF" group="REFB"/>
+                <signal pad-key="pa0" index="0" function="ADC" group="ADC"/>
+                <signal pad-key="pa1" index="1" function="ADC" group="ADC"/>
+                <signal pad-key="pa2" index="2" function="ADC" group="ADC"/>
+                <signal pad-key="pa3" index="3" function="ADC" group="ADC"/>
+                <signal pad-key="pa4" index="4" function="ADC" group="ADC"/>
+                <signal pad-key="pa5" index="5" function="ADC" group="ADC"/>
+                <signal pad-key="pa6" index="6" function="ADC" group="ADC"/>
+                <signal pad-key="pa7" index="7" function="ADC" group="ADC"/>
+                <signal pad-key="pb0" index="8" function="ADC" group="ADC"/>
+                <signal pad-key="pb1" index="9" function="ADC" group="ADC"/>
+                <signal pad-key="pb2" index="10" function="ADC" group="ADC"/>
+                <signal pad-key="pb3" index="11" function="ADC" group="ADC"/>
+                <signal pad-key="pb4" index="12" function="ADC" group="ADC"/>
+                <signal pad-key="pb5" index="13" function="ADC" group="ADC"/>
+                <signal pad-key="pb6" index="14" function="ADC" group="ADC"/>
+                <signal pad-key="pb7" index="15" function="ADC" group="ADC"/>
+                <signal pad-key="pa0" index="0" function="AREF" group="REFA"/>
+                <signal pad-key="pb0" index="0" function="AREF" group="REFB"/>
             </signals>
         </peripheral>
         <peripheral key="rtc" name="RTC" module-key="i6093">
@@ -167,25 +167,25 @@
         <peripheral key="twic" name="TWIC" module-key="i6089">
             <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"/>
+                <signal pad-key="pc0" function="TWI" group="SDA"/>
+                <signal pad-key="pc1" function="TWI" group="SCL"/>
             </signals>
         </peripheral>
         <peripheral key="twie" name="TWIE" module-key="i6089">
             <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"/>
+                <signal pad-key="pe0" function="TWI" group="SDA"/>
+                <signal pad-key="pe1" function="TWI" group="SCL"/>
             </signals>
         </peripheral>
         <peripheral key="port_cfg" name="PORT_CFG" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pc7" function="EVOUT" group="EVOUT" field="EVOUT"/>
-                <signal pad-id="pc4" function="EVOUT_ALT" group="EVOUT" field="CLKEVPIN"/>
-                <signal pad-id="pc6" function="RTCOUTC" group="RTCOUT"/>
+                <signal pad-key="pc7" function="CLKOUT" group="CLKOUT" field="CLKOUT"/>
+                <signal pad-key="pc4" function="CLKOUT_ALT" group="CLKOUT" field="CLKEVPIN"/>
+                <signal pad-key="pc7" function="EVOUT" group="EVOUT" field="EVOUT"/>
+                <signal pad-key="pc4" function="EVOUT_ALT" group="EVOUT" field="CLKEVPIN"/>
+                <signal pad-key="pc6" function="RTCOUTC" group="RTCOUT"/>
             </signals>
         </peripheral>
         <peripheral key="vport0" name="VPORT0" module-key="gpio_port">
@@ -203,119 +203,119 @@
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pa2" index="2" function="PORTA" group="P"/>
-                <signal pad-id="pa3" index="3" function="PORTA" group="P"/>
-                <signal pad-id="pa4" index="4" function="PORTA" group="P"/>
-                <signal pad-id="pa5" index="5" function="PORTA" group="P"/>
-                <signal pad-id="pa6" index="6" function="PORTA" group="P"/>
-                <signal pad-id="pa7" index="7" function="PORTA" group="P"/>
+                <signal pad-key="pa0" index="0" function="PORTA" group="P"/>
+                <signal pad-key="pa1" index="1" function="PORTA" group="P"/>
+                <signal pad-key="pa2" index="2" function="PORTA" group="P"/>
+                <signal pad-key="pa3" index="3" function="PORTA" group="P"/>
+                <signal pad-key="pa4" index="4" function="PORTA" group="P"/>
+                <signal pad-key="pa5" index="5" function="PORTA" group="P"/>
+                <signal pad-key="pa6" index="6" function="PORTA" group="P"/>
+                <signal pad-key="pa7" index="7" function="PORTA" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pb2" index="2" function="PORTB" group="P"/>
-                <signal pad-id="pb3" index="3" function="PORTB" group="P"/>
-                <signal pad-id="pb4" index="4" function="PORTB" group="P"/>
-                <signal pad-id="pb5" index="5" function="PORTB" group="P"/>
-                <signal pad-id="pb6" index="6" function="PORTB" group="P"/>
-                <signal pad-id="pb7" index="7" function="PORTB" group="P"/>
+                <signal pad-key="pb0" index="0" function="PORTB" group="P"/>
+                <signal pad-key="pb1" index="1" function="PORTB" group="P"/>
+                <signal pad-key="pb2" index="2" function="PORTB" group="P"/>
+                <signal pad-key="pb3" index="3" function="PORTB" group="P"/>
+                <signal pad-key="pb4" index="4" function="PORTB" group="P"/>
+                <signal pad-key="pb5" index="5" function="PORTB" group="P"/>
+                <signal pad-key="pb6" index="6" function="PORTB" group="P"/>
+                <signal pad-key="pb7" index="7" function="PORTB" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pc2" index="2" function="PORTC" group="P"/>
-                <signal pad-id="pc3" index="3" function="PORTC" group="P"/>
-                <signal pad-id="pc4" index="4" function="PORTC" group="P"/>
-                <signal pad-id="pc5" index="5" function="PORTC" group="P"/>
-                <signal pad-id="pc6" index="6" function="PORTC" group="P"/>
-                <signal pad-id="pc7" index="7" function="PORTC" group="P"/>
+                <signal pad-key="pc0" index="0" function="PORTC" group="P"/>
+                <signal pad-key="pc1" index="1" function="PORTC" group="P"/>
+                <signal pad-key="pc2" index="2" function="PORTC" group="P"/>
+                <signal pad-key="pc3" index="3" function="PORTC" group="P"/>
+                <signal pad-key="pc4" index="4" function="PORTC" group="P"/>
+                <signal pad-key="pc5" index="5" function="PORTC" group="P"/>
+                <signal pad-key="pc6" index="6" function="PORTC" group="P"/>
+                <signal pad-key="pc7" index="7" function="PORTC" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pd2" index="2" function="PORTD" group="P"/>
-                <signal pad-id="pd3" index="3" function="PORTD" group="P"/>
-                <signal pad-id="pd4" index="4" function="PORTD" group="P"/>
-                <signal pad-id="pd5" index="5" function="PORTD" group="P"/>
-                <signal pad-id="pd6" index="6" function="PORTD" group="P"/>
-                <signal pad-id="pd7" index="7" function="PORTD" group="P"/>
+                <signal pad-key="pd0" index="0" function="PORTD" group="P"/>
+                <signal pad-key="pd1" index="1" function="PORTD" group="P"/>
+                <signal pad-key="pd2" index="2" function="PORTD" group="P"/>
+                <signal pad-key="pd3" index="3" function="PORTD" group="P"/>
+                <signal pad-key="pd4" index="4" function="PORTD" group="P"/>
+                <signal pad-key="pd5" index="5" function="PORTD" group="P"/>
+                <signal pad-key="pd6" index="6" function="PORTD" group="P"/>
+                <signal pad-key="pd7" index="7" function="PORTD" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="porte" name="PORTE" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pe2" index="2" function="PORTE" group="P"/>
-                <signal pad-id="pe3" index="3" function="PORTE" group="P"/>
-                <signal pad-id="pe4" index="4" function="PORTE" group="P"/>
-                <signal pad-id="pe5" index="5" function="PORTE" group="P"/>
-                <signal pad-id="pe6" index="6" function="PORTE" group="P"/>
-                <signal pad-id="pe7" index="7" function="PORTE" group="P"/>
+                <signal pad-key="pe0" index="0" function="PORTE" group="P"/>
+                <signal pad-key="pe1" index="1" function="PORTE" group="P"/>
+                <signal pad-key="pe2" index="2" function="PORTE" group="P"/>
+                <signal pad-key="pe3" index="3" function="PORTE" group="P"/>
+                <signal pad-key="pe4" index="4" function="PORTE" group="P"/>
+                <signal pad-key="pe5" index="5" function="PORTE" group="P"/>
+                <signal pad-key="pe6" index="6" function="PORTE" group="P"/>
+                <signal pad-key="pe7" index="7" function="PORTE" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portf" name="PORTF" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pf2" index="2" function="PORTF" group="P"/>
-                <signal pad-id="pf3" index="3" function="PORTF" group="P"/>
-                <signal pad-id="pf4" index="4" function="PORTF" group="P"/>
-                <signal pad-id="pf5" index="5" function="PORTF" group="P"/>
-                <signal pad-id="pf6" index="6" function="PORTF" group="P"/>
-                <signal pad-id="pf7" index="7" function="PORTF" group="P"/>
+                <signal pad-key="pf0" index="0" function="PORTF" group="P"/>
+                <signal pad-key="pf1" index="1" function="PORTF" group="P"/>
+                <signal pad-key="pf2" index="2" function="PORTF" group="P"/>
+                <signal pad-key="pf3" index="3" function="PORTF" group="P"/>
+                <signal pad-key="pf4" index="4" function="PORTF" group="P"/>
+                <signal pad-key="pf5" index="5" function="PORTF" group="P"/>
+                <signal pad-key="pf6" index="6" function="PORTF" group="P"/>
+                <signal pad-key="pf7" index="7" function="PORTF" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portr" name="PORTR" module-key="gpio_port">
             <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"/>
+                <signal pad-key="pr0" index="0" function="PORTR" group="P"/>
+                <signal pad-key="pr1" index="1" function="PORTR" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="tcc0" name="TCC0" module-key="i6090_tc">
             <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"/>
-                <signal pad-id="pc2" function="TC0" group="OC0C" field="TC0C"/>
-                <signal pad-id="pc3" function="TC0" group="OC0D" field="TC0D"/>
-                <signal pad-id="pc4" function="TC0_ALT" group="OC0A" field="TC0A"/>
-                <signal pad-id="pc5" function="TC0_ALT" group="OC0B" field="TC0B"/>
-                <signal pad-id="pc6" function="TC0_ALT" group="OC0C" field="TC0C"/>
-                <signal pad-id="pc7" function="TC0_ALT" group="OC0D" field="TC0D"/>
+                <signal pad-key="pc0" function="TC0" group="OC0A" field="TC0A"/>
+                <signal pad-key="pc1" function="TC0" group="OC0B" field="TC0B"/>
+                <signal pad-key="pc2" function="TC0" group="OC0C" field="TC0C"/>
+                <signal pad-key="pc3" function="TC0" group="OC0D" field="TC0D"/>
+                <signal pad-key="pc4" function="TC0_ALT" group="OC0A" field="TC0A"/>
+                <signal pad-key="pc5" function="TC0_ALT" group="OC0B" field="TC0B"/>
+                <signal pad-key="pc6" function="TC0_ALT" group="OC0C" field="TC0C"/>
+                <signal pad-key="pc7" function="TC0_ALT" group="OC0D" field="TC0D"/>
             </signals>
         </peripheral>
         <peripheral key="tcc1" name="TCC1" module-key="i6090_tc">
             <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"/>
+                <signal pad-key="pc4" function="TC1" group="OC1A"/>
+                <signal pad-key="pc5" function="TC1" group="OC1B"/>
             </signals>
         </peripheral>
         <peripheral key="awexc" name="AWEXC" module-key="i6090_tc">
             <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"/>
-                <signal pad-id="pc2" function="AWEX" group="OC0BLS"/>
-                <signal pad-id="pc3" function="AWEX" group="OC0BHS"/>
-                <signal pad-id="pc4" function="AWEX" group="OC0CLS"/>
-                <signal pad-id="pc5" function="AWEX" group="OC0CHS"/>
-                <signal pad-id="pc6" function="AWEX" group="OC0DLS"/>
-                <signal pad-id="pc7" function="AWEX" group="OC0DHS"/>
+                <signal pad-key="pc0" function="AWEX" group="OC0ALS"/>
+                <signal pad-key="pc1" function="AWEX" group="OC0AHS"/>
+                <signal pad-key="pc2" function="AWEX" group="OC0BLS"/>
+                <signal pad-key="pc3" function="AWEX" group="OC0BHS"/>
+                <signal pad-key="pc4" function="AWEX" group="OC0CLS"/>
+                <signal pad-key="pc5" function="AWEX" group="OC0CHS"/>
+                <signal pad-key="pc6" function="AWEX" group="OC0DLS"/>
+                <signal pad-key="pc7" function="AWEX" group="OC0DHS"/>
             </signals>
         </peripheral>
         <peripheral key="hiresc" name="HIRESC" module-key="i6090_tc">
@@ -324,19 +324,19 @@
         <peripheral key="tcd0" name="TCD0" module-key="i6090_tc">
             <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"/>
-                <signal pad-id="pd2" function="TC0" group="OC0C"/>
-                <signal pad-id="pd3" function="TC0" group="OC0D"/>
+                <signal pad-key="pd0" function="TC0" group="OC0A"/>
+                <signal pad-key="pd1" function="TC0" group="OC0B"/>
+                <signal pad-key="pd2" function="TC0" group="OC0C"/>
+                <signal pad-key="pd3" function="TC0" group="OC0D"/>
             </signals>
         </peripheral>
         <peripheral key="tce0" name="TCE0" module-key="i6090_tc">
             <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"/>
-                <signal pad-id="pe2" function="TC0" group="OC0C"/>
-                <signal pad-id="pe3" function="TC0" group="OC0D"/>
+                <signal pad-key="pe0" function="TC0" group="OC0A"/>
+                <signal pad-key="pe1" function="TC0" group="OC0B"/>
+                <signal pad-key="pe2" function="TC0" group="OC0C"/>
+                <signal pad-key="pe3" function="TC0" group="OC0D"/>
             </signals>
         </peripheral>
         <peripheral key="awexe" name="AWEXE" module-key="i6090_tc">
@@ -345,111 +345,111 @@
         <peripheral key="tcf0" name="TCF0" module-key="i6090_tc">
             <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"/>
-                <signal pad-id="pf2" function="TC0" group="OC0C"/>
-                <signal pad-id="pf3" function="TC0" group="OC0D"/>
+                <signal pad-key="pf0" function="TC0" group="OC0A"/>
+                <signal pad-key="pf1" function="TC0" group="OC0B"/>
+                <signal pad-key="pf2" function="TC0" group="OC0C"/>
+                <signal pad-key="pf3" function="TC0" group="OC0D"/>
             </signals>
         </peripheral>
         <peripheral key="tcc2" name="TCC2" module-key="i6090_tc2">
             <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"/>
-                <signal pad-id="pc2" function="TC2" group="LOC2C"/>
-                <signal pad-id="pc3" function="TC2" group="LOC2D"/>
-                <signal pad-id="pc4" function="TC2" group="HOC2A"/>
-                <signal pad-id="pc5" function="TC2" group="HOC2B"/>
-                <signal pad-id="pc6" function="TC2" group="HOC2C"/>
-                <signal pad-id="pc7" function="TC2" group="HOC2D"/>
+                <signal pad-key="pc0" function="TC2" group="LOC2A"/>
+                <signal pad-key="pc1" function="TC2" group="LOC2B"/>
+                <signal pad-key="pc2" function="TC2" group="LOC2C"/>
+                <signal pad-key="pc3" function="TC2" group="LOC2D"/>
+                <signal pad-key="pc4" function="TC2" group="HOC2A"/>
+                <signal pad-key="pc5" function="TC2" group="HOC2B"/>
+                <signal pad-key="pc6" function="TC2" group="HOC2C"/>
+                <signal pad-key="pc7" function="TC2" group="HOC2D"/>
             </signals>
         </peripheral>
         <peripheral key="tcd2" name="TCD2" module-key="i6090_tc2">
             <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"/>
-                <signal pad-id="pd2" function="TC2" group="LOC2C"/>
-                <signal pad-id="pd3" function="TC2" group="LOC2D"/>
-                <signal pad-id="pd4" function="TC2" group="HOC2A"/>
-                <signal pad-id="pd5" function="TC2" group="HOC2B"/>
-                <signal pad-id="pd6" function="TC2" group="HOC2C"/>
-                <signal pad-id="pd7" function="TC2" group="HOC2D"/>
+                <signal pad-key="pd0" function="TC2" group="LOC2A"/>
+                <signal pad-key="pd1" function="TC2" group="LOC2B"/>
+                <signal pad-key="pd2" function="TC2" group="LOC2C"/>
+                <signal pad-key="pd3" function="TC2" group="LOC2D"/>
+                <signal pad-key="pd4" function="TC2" group="HOC2A"/>
+                <signal pad-key="pd5" function="TC2" group="HOC2B"/>
+                <signal pad-key="pd6" function="TC2" group="HOC2C"/>
+                <signal pad-key="pd7" function="TC2" group="HOC2D"/>
             </signals>
         </peripheral>
         <peripheral key="tce2" name="TCE2" module-key="i6090_tc2">
             <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"/>
-                <signal pad-id="pe2" function="TC2" group="LOC2C"/>
-                <signal pad-id="pe3" function="TC2" group="LOC2D"/>
-                <signal pad-id="pe4" function="TC2" group="HOC2A"/>
-                <signal pad-id="pe5" function="TC2" group="HOC2B"/>
-                <signal pad-id="pe6" function="TC2" group="HOC2C"/>
-                <signal pad-id="pe7" function="TC2" group="HOC2D"/>
+                <signal pad-key="pe0" function="TC2" group="LOC2A"/>
+                <signal pad-key="pe1" function="TC2" group="LOC2B"/>
+                <signal pad-key="pe2" function="TC2" group="LOC2C"/>
+                <signal pad-key="pe3" function="TC2" group="LOC2D"/>
+                <signal pad-key="pe4" function="TC2" group="HOC2A"/>
+                <signal pad-key="pe5" function="TC2" group="HOC2B"/>
+                <signal pad-key="pe6" function="TC2" group="HOC2C"/>
+                <signal pad-key="pe7" function="TC2" group="HOC2D"/>
             </signals>
         </peripheral>
         <peripheral key="tcf2" name="TCF2" module-key="i6090_tc2">
             <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"/>
-                <signal pad-id="pf2" function="TC2" group="LOC2C"/>
-                <signal pad-id="pf3" function="TC2" group="LOC2D"/>
-                <signal pad-id="pf4" function="TC2" group="HOC2A"/>
-                <signal pad-id="pf5" function="TC2" group="HOC2B"/>
-                <signal pad-id="pf6" function="TC2" group="HOC2C"/>
-                <signal pad-id="pf7" function="TC2" group="HOC2D"/>
+                <signal pad-key="pf0" function="TC2" group="LOC2A"/>
+                <signal pad-key="pf1" function="TC2" group="LOC2B"/>
+                <signal pad-key="pf2" function="TC2" group="LOC2C"/>
+                <signal pad-key="pf3" function="TC2" group="LOC2D"/>
+                <signal pad-key="pf4" function="TC2" group="HOC2A"/>
+                <signal pad-key="pf5" function="TC2" group="HOC2B"/>
+                <signal pad-key="pf6" function="TC2" group="HOC2C"/>
+                <signal pad-key="pf7" function="TC2" group="HOC2D"/>
             </signals>
         </peripheral>
         <peripheral key="usartc0" name="USARTC0" module-key="i6090_usart">
             <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"/>
-                <signal pad-id="pc3" function="USART" group="TXD" field="USART0"/>
-                <signal pad-id="pc5" function="USART_ALT" group="XCK" field="USART0"/>
-                <signal pad-id="pc6" function="USART_ALT" group="RXD" field="USART0"/>
-                <signal pad-id="pc7" function="USART_ALT" group="TXD" field="USART0"/>
+                <signal pad-key="pc1" function="USART" group="XCK" field="USART0"/>
+                <signal pad-key="pc2" function="USART" group="RXD" field="USART0"/>
+                <signal pad-key="pc3" function="USART" group="TXD" field="USART0"/>
+                <signal pad-key="pc5" function="USART_ALT" group="XCK" field="USART0"/>
+                <signal pad-key="pc6" function="USART_ALT" group="RXD" field="USART0"/>
+                <signal pad-key="pc7" function="USART_ALT" group="TXD" field="USART0"/>
             </signals>
         </peripheral>
         <peripheral key="usartd0" name="USARTD0" module-key="i6090_usart">
             <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"/>
-                <signal pad-id="pd3" function="USART" group="TXD"/>
+                <signal pad-key="pd1" function="USART" group="XCK"/>
+                <signal pad-key="pd2" function="USART" group="RXD"/>
+                <signal pad-key="pd3" function="USART" group="TXD"/>
             </signals>
         </peripheral>
         <peripheral key="usarte0" name="USARTE0" module-key="i6090_usart">
             <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"/>
-                <signal pad-id="pe3" function="USART" group="TXD"/>
+                <signal pad-key="pe1" function="USART" group="XCK"/>
+                <signal pad-key="pe2" function="USART" group="RXD"/>
+                <signal pad-key="pe3" function="USART" group="TXD"/>
             </signals>
         </peripheral>
         <peripheral key="spic" name="SPIC" module-key="i6090_spi">
             <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"/>
-                <signal pad-id="pc6" function="SPI" group="MISO" field="SPI"/>
-                <signal pad-id="pc7" function="SPI" group="SCK" field="SPI"/>
-                <signal pad-id="pc4" function="SPI_ALT" group="SS" field="SPI"/>
-                <signal pad-id="pc5" function="SPI_ALT" group="SCK" field="SPI"/>
-                <signal pad-id="pc6" function="SPI_ALT" group="MISO" field="SPI"/>
-                <signal pad-id="pc7" function="SPI_ALT" group="MOSI" field="SPI"/>
+                <signal pad-key="pc4" function="SPI" group="SS" field="SPI"/>
+                <signal pad-key="pc5" function="SPI" group="MOSI" field="SPI"/>
+                <signal pad-key="pc6" function="SPI" group="MISO" field="SPI"/>
+                <signal pad-key="pc7" function="SPI" group="SCK" field="SPI"/>
+                <signal pad-key="pc4" function="SPI_ALT" group="SS" field="SPI"/>
+                <signal pad-key="pc5" function="SPI_ALT" group="SCK" field="SPI"/>
+                <signal pad-key="pc6" function="SPI_ALT" group="MISO" field="SPI"/>
+                <signal pad-key="pc7" function="SPI_ALT" group="MOSI" field="SPI"/>
             </signals>
         </peripheral>
         <peripheral key="spid" name="SPID" module-key="i6090_spi">
             <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"/>
-                <signal pad-id="pd6" function="SPI" group="MISO"/>
-                <signal pad-id="pd7" function="SPI" group="SCK"/>
+                <signal pad-key="pd4" function="SPI" group="SS"/>
+                <signal pad-key="pd5" function="SPI" group="MOSI"/>
+                <signal pad-key="pd6" function="SPI" group="MISO"/>
+                <signal pad-key="pd7" function="SPI" group="SCK"/>
             </signals>
         </peripheral>
         <peripheral key="spie" name="SPIE" module-key="i6090_spi">
@@ -1407,78 +1407,135 @@
             </register-group>
         </module>
     </modules>
+    <pads>
+        <pad key="pa3" name="PA3"/>
+        <pad key="pa4" name="PA4"/>
+        <pad key="pa5" name="PA5"/>
+        <pad key="pa6" name="PA6"/>
+        <pad key="pa7" name="PA7"/>
+        <pad key="pb0" name="PB0"/>
+        <pad key="pb1" name="PB1"/>
+        <pad key="pb2" name="PB2"/>
+        <pad key="pb3" name="PB3"/>
+        <pad key="pb4" name="PB4"/>
+        <pad key="pb5" name="PB5"/>
+        <pad key="pb6" name="PB6"/>
+        <pad key="pb7" name="PB7"/>
+        <pad key="gnd" name="GND"/>
+        <pad key="vcc" name="VCC"/>
+        <pad key="pc0" name="PC0"/>
+        <pad key="pc1" name="PC1"/>
+        <pad key="pc2" name="PC2"/>
+        <pad key="pc3" name="PC3"/>
+        <pad key="pc4" name="PC4"/>
+        <pad key="pc5" name="PC5"/>
+        <pad key="pc6" name="PC6"/>
+        <pad key="pc7" name="PC7"/>
+        <pad key="pd0" name="PD0"/>
+        <pad key="pd1" name="PD1"/>
+        <pad key="pd2" name="PD2"/>
+        <pad key="pd3" name="PD3"/>
+        <pad key="pd4" name="PD4"/>
+        <pad key="pd5" name="PD5"/>
+        <pad key="pd6" name="PD6"/>
+        <pad key="pd7" name="PD7"/>
+        <pad key="pe0" name="PE0"/>
+        <pad key="pe1" name="PE1"/>
+        <pad key="pe2" name="PE2"/>
+        <pad key="pe3" name="PE3"/>
+        <pad key="pe4" name="PE4"/>
+        <pad key="pe5" name="PE5"/>
+        <pad key="pe6" name="PE6"/>
+        <pad key="pe7" name="PE7"/>
+        <pad key="pf0" name="PF0"/>
+        <pad key="pf1" name="PF1"/>
+        <pad key="pf2" name="PF2"/>
+        <pad key="pf3" name="PF3"/>
+        <pad key="pf4" name="PF4"/>
+        <pad key="pf5" name="PF5"/>
+        <pad key="pf6" name="PF6"/>
+        <pad key="pf7" name="PF7"/>
+        <pad key="pdi" name="PDI"/>
+        <pad key="reset" name="RESET"/>
+        <pad key="pr0" name="PR0"/>
+        <pad key="pr1" name="PR1"/>
+        <pad key="avcc" name="AVCC"/>
+        <pad key="pa0" name="PA0"/>
+        <pad key="pa1" name="PA1"/>
+        <pad key="pa2" name="PA2"/>
+    </pads>
     <pinouts>
         <pinout key="qfp_qfn_64" name="QFP_QFN_64" type="qfn">
-            <pin position="1" pad="PA3"/>
-            <pin position="2" pad="PA4"/>
-            <pin position="3" pad="PA5"/>
-            <pin position="4" pad="PA6"/>
-            <pin position="5" pad="PA7"/>
-            <pin position="6" pad="PB0"/>
-            <pin position="7" pad="PB1"/>
-            <pin position="8" pad="PB2"/>
-            <pin position="9" pad="PB3"/>
-            <pin position="10" pad="PB4"/>
-            <pin position="11" pad="PB5"/>
-            <pin position="12" pad="PB6"/>
-            <pin position="13" pad="PB7"/>
-            <pin position="14" pad="GND"/>
-            <pin position="15" pad="VCC"/>
-            <pin position="16" pad="PC0"/>
-            <pin position="17" pad="PC1"/>
-            <pin position="18" pad="PC2"/>
-            <pin position="19" pad="PC3"/>
-            <pin position="20" pad="PC4"/>
-            <pin position="21" pad="PC5"/>
-            <pin position="22" pad="PC6"/>
-            <pin position="23" pad="PC7"/>
-            <pin position="24" pad="GND"/>
-            <pin position="25" pad="VCC"/>
-            <pin position="26" pad="PD0"/>
-            <pin position="27" pad="PD1"/>
-            <pin position="28" pad="PD2"/>
-            <pin position="29" pad="PD3"/>
-            <pin position="30" pad="PD4"/>
-            <pin position="31" pad="PD5"/>
-            <pin position="32" pad="PD6"/>
-            <pin position="33" pad="PD7"/>
-            <pin position="34" pad="GND"/>
-            <pin position="35" pad="VCC"/>
-            <pin position="36" pad="PE0"/>
-            <pin position="37" pad="PE1"/>
-            <pin position="38" pad="PE2"/>
-            <pin position="39" pad="PE3"/>
-            <pin position="40" pad="PE4"/>
-            <pin position="41" pad="PE5"/>
-            <pin position="42" pad="PE6"/>
-            <pin position="43" pad="PE7"/>
-            <pin position="44" pad="GND"/>
-            <pin position="45" pad="VCC"/>
-            <pin position="46" pad="PF0"/>
-            <pin position="47" pad="PF1"/>
-            <pin position="48" pad="PF2"/>
-            <pin position="49" pad="PF3"/>
-            <pin position="50" pad="PF4"/>
-            <pin position="51" pad="PF5"/>
-            <pin position="52" pad="GND"/>
-            <pin position="53" pad="VCC"/>
-            <pin position="54" pad="PF6"/>
-            <pin position="55" pad="PF7"/>
-            <pin position="56" pad="PDI"/>
-            <pin position="57" pad="RESET"/>
-            <pin position="58" pad="PR0"/>
-            <pin position="59" pad="PR1"/>
-            <pin position="60" pad="GND"/>
-            <pin position="61" pad="AVCC"/>
-            <pin position="62" pad="PA0"/>
-            <pin position="63" pad="PA1"/>
-            <pin position="64" pad="PA2"/>
+            <pin position="1" pad-key="pa3"/>
+            <pin position="2" pad-key="pa4"/>
+            <pin position="3" pad-key="pa5"/>
+            <pin position="4" pad-key="pa6"/>
+            <pin position="5" pad-key="pa7"/>
+            <pin position="6" pad-key="pb0"/>
+            <pin position="7" pad-key="pb1"/>
+            <pin position="8" pad-key="pb2"/>
+            <pin position="9" pad-key="pb3"/>
+            <pin position="10" pad-key="pb4"/>
+            <pin position="11" pad-key="pb5"/>
+            <pin position="12" pad-key="pb6"/>
+            <pin position="13" pad-key="pb7"/>
+            <pin position="14" pad-key="gnd"/>
+            <pin position="15" pad-key="vcc"/>
+            <pin position="16" pad-key="pc0"/>
+            <pin position="17" pad-key="pc1"/>
+            <pin position="18" pad-key="pc2"/>
+            <pin position="19" pad-key="pc3"/>
+            <pin position="20" pad-key="pc4"/>
+            <pin position="21" pad-key="pc5"/>
+            <pin position="22" pad-key="pc6"/>
+            <pin position="23" pad-key="pc7"/>
+            <pin position="24" pad-key="gnd"/>
+            <pin position="25" pad-key="vcc"/>
+            <pin position="26" pad-key="pd0"/>
+            <pin position="27" pad-key="pd1"/>
+            <pin position="28" pad-key="pd2"/>
+            <pin position="29" pad-key="pd3"/>
+            <pin position="30" pad-key="pd4"/>
+            <pin position="31" pad-key="pd5"/>
+            <pin position="32" pad-key="pd6"/>
+            <pin position="33" pad-key="pd7"/>
+            <pin position="34" pad-key="gnd"/>
+            <pin position="35" pad-key="vcc"/>
+            <pin position="36" pad-key="pe0"/>
+            <pin position="37" pad-key="pe1"/>
+            <pin position="38" pad-key="pe2"/>
+            <pin position="39" pad-key="pe3"/>
+            <pin position="40" pad-key="pe4"/>
+            <pin position="41" pad-key="pe5"/>
+            <pin position="42" pad-key="pe6"/>
+            <pin position="43" pad-key="pe7"/>
+            <pin position="44" pad-key="gnd"/>
+            <pin position="45" pad-key="vcc"/>
+            <pin position="46" pad-key="pf0"/>
+            <pin position="47" pad-key="pf1"/>
+            <pin position="48" pad-key="pf2"/>
+            <pin position="49" pad-key="pf3"/>
+            <pin position="50" pad-key="pf4"/>
+            <pin position="51" pad-key="pf5"/>
+            <pin position="52" pad-key="gnd"/>
+            <pin position="53" pad-key="vcc"/>
+            <pin position="54" pad-key="pf6"/>
+            <pin position="55" pad-key="pf7"/>
+            <pin position="56" pad-key="pdi"/>
+            <pin position="57" pad-key="reset"/>
+            <pin position="58" pad-key="pr0"/>
+            <pin position="59" pad-key="pr1"/>
+            <pin position="60" pad-key="gnd"/>
+            <pin position="61" pad-key="avcc"/>
+            <pin position="62" pad-key="pa0"/>
+            <pin position="63" pad-key="pa1"/>
+            <pin position="64" pad-key="pa2"/>
         </pinout>
     </pinouts>
     <variants>
-        <variant name="ATxmega32D3-AU" pinout-key="qfp_qfn_64" package="TQFP64"/>
-        <variant name="ATxmega32D3-MH" pinout-key="qfp_qfn_64" package="QFN64"/>
-        <variant name="ATxmega32D3-AN" pinout-key="qfp_qfn_64" package="TQFP64"/>
-        <variant name="ATxmega32D3-MN" pinout-key="qfp_qfn_64" package="QFN64"/>
+        <variant key="atxmega32d3_au" name="ATxmega32D3-AU" pinout-key="qfp_qfn_64"/>
+        <variant key="atxmega32d3_mh" name="ATxmega32D3-MH" pinout-key="qfp_qfn_64"/>
+        <variant key="atxmega32d3_an" name="ATxmega32D3-AN" pinout-key="qfp_qfn_64"/>
+        <variant key="atxmega32d3_mn" name="ATxmega32D3-MN" pinout-key="qfp_qfn_64"/>
     </variants>
 </device>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA32D4.xml b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA32D4.xml
index 940965aa..ad1c5763 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA32D4.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA32D4.xml
@@ -81,12 +81,12 @@
         <peripheral key="osc" name="OSC" module-key="i6079">
             <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"/>
-                <signal pad-id="pr0" function="TOSC" group="TOSC2"/>
-                <signal pad-id="pr1" function="TOSC" group="TOSC1"/>
-                <signal pad-id="pe2" function="TOSC_ALT" group="TOSC2"/>
-                <signal pad-id="pe3" function="TOSC_ALT" group="TOSC1"/>
+                <signal pad-key="pr0" function="XTAL" group="XTAL2"/>
+                <signal pad-key="pr1" function="XTAL" group="XTAL1"/>
+                <signal pad-key="pr0" function="TOSC" group="TOSC2"/>
+                <signal pad-key="pr1" function="TOSC" group="TOSC1"/>
+                <signal pad-key="pe2" function="TOSC_ALT" group="TOSC2"/>
+                <signal pad-key="pe3" function="TOSC_ALT" group="TOSC1"/>
             </signals>
         </peripheral>
         <peripheral key="dfllrc32m" name="DFLLRC32M" module-key="i6055">
@@ -128,34 +128,34 @@
         <peripheral key="aca" name="ACA" module-key="i6077">
             <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"/>
-                <signal pad-id="pa2" index="2" function="AC" group="AC"/>
-                <signal pad-id="pa3" index="3" function="AC" group="AC"/>
-                <signal pad-id="pa4" index="4" function="AC" group="AC"/>
-                <signal pad-id="pa5" index="5" function="AC" group="AC"/>
-                <signal pad-id="pa6" index="6" function="AC" group="AC"/>
-                <signal pad-id="pa7" index="7" function="AC" group="AC"/>
-                <signal pad-id="pa7" index="0" function="ACOUT" group="ACOUT"/>
+                <signal pad-key="pa0" index="0" function="AC" group="AC"/>
+                <signal pad-key="pa1" index="1" function="AC" group="AC"/>
+                <signal pad-key="pa2" index="2" function="AC" group="AC"/>
+                <signal pad-key="pa3" index="3" function="AC" group="AC"/>
+                <signal pad-key="pa4" index="4" function="AC" group="AC"/>
+                <signal pad-key="pa5" index="5" function="AC" group="AC"/>
+                <signal pad-key="pa6" index="6" function="AC" group="AC"/>
+                <signal pad-key="pa7" index="7" function="AC" group="AC"/>
+                <signal pad-key="pa7" index="0" function="ACOUT" group="ACOUT"/>
             </signals>
         </peripheral>
         <peripheral key="adca" name="ADCA" module-key="i6099">
             <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"/>
-                <signal pad-id="pa2" index="2" function="ADC" group="ADC"/>
-                <signal pad-id="pa3" index="3" function="ADC" group="ADC"/>
-                <signal pad-id="pa4" index="4" function="ADC" group="ADC"/>
-                <signal pad-id="pa5" index="5" function="ADC" group="ADC"/>
-                <signal pad-id="pa6" index="6" function="ADC" group="ADC"/>
-                <signal pad-id="pa7" index="7" function="ADC" group="ADC"/>
-                <signal pad-id="pb0" index="8" function="ADC" group="ADC"/>
-                <signal pad-id="pb1" index="9" function="ADC" group="ADC"/>
-                <signal pad-id="pb2" index="10" function="ADC" group="ADC"/>
-                <signal pad-id="pb3" index="11" function="ADC" group="ADC"/>
-                <signal pad-id="pa0" index="0" function="AREF" group="REFA"/>
-                <signal pad-id="pb0" index="0" function="AREF" group="REFB"/>
+                <signal pad-key="pa0" index="0" function="ADC" group="ADC"/>
+                <signal pad-key="pa1" index="1" function="ADC" group="ADC"/>
+                <signal pad-key="pa2" index="2" function="ADC" group="ADC"/>
+                <signal pad-key="pa3" index="3" function="ADC" group="ADC"/>
+                <signal pad-key="pa4" index="4" function="ADC" group="ADC"/>
+                <signal pad-key="pa5" index="5" function="ADC" group="ADC"/>
+                <signal pad-key="pa6" index="6" function="ADC" group="ADC"/>
+                <signal pad-key="pa7" index="7" function="ADC" group="ADC"/>
+                <signal pad-key="pb0" index="8" function="ADC" group="ADC"/>
+                <signal pad-key="pb1" index="9" function="ADC" group="ADC"/>
+                <signal pad-key="pb2" index="10" function="ADC" group="ADC"/>
+                <signal pad-key="pb3" index="11" function="ADC" group="ADC"/>
+                <signal pad-key="pa0" index="0" function="AREF" group="REFA"/>
+                <signal pad-key="pb0" index="0" function="AREF" group="REFB"/>
             </signals>
         </peripheral>
         <peripheral key="rtc" name="RTC" module-key="i6093">
@@ -164,25 +164,25 @@
         <peripheral key="twic" name="TWIC" module-key="i6089">
             <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"/>
+                <signal pad-key="pc0" function="TWI" group="SDA"/>
+                <signal pad-key="pc1" function="TWI" group="SCL"/>
             </signals>
         </peripheral>
         <peripheral key="twie" name="TWIE" module-key="i6089">
             <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"/>
+                <signal pad-key="pe0" function="TWI" group="SDA"/>
+                <signal pad-key="pe1" function="TWI" group="SCL"/>
             </signals>
         </peripheral>
         <peripheral key="port_cfg" name="PORT_CFG" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pc7" function="EVOUT" group="EVOUT" field="EVOUT"/>
-                <signal pad-id="pc4" function="EVOUT_ALT" group="EVOUT" field="CLKEVPIN"/>
-                <signal pad-id="pc6" function="RTCOUTC" group="RTCOUT"/>
+                <signal pad-key="pc7" function="CLKOUT" group="CLKOUT" field="CLKOUT"/>
+                <signal pad-key="pc4" function="CLKOUT_ALT" group="CLKOUT" field="CLKEVPIN"/>
+                <signal pad-key="pc7" function="EVOUT" group="EVOUT" field="EVOUT"/>
+                <signal pad-key="pc4" function="EVOUT_ALT" group="EVOUT" field="CLKEVPIN"/>
+                <signal pad-key="pc6" function="RTCOUTC" group="RTCOUT"/>
             </signals>
         </peripheral>
         <peripheral key="vport0" name="VPORT0" module-key="gpio_port">
@@ -200,98 +200,98 @@
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pa2" index="2" function="PORTA" group="P"/>
-                <signal pad-id="pa3" index="3" function="PORTA" group="P"/>
-                <signal pad-id="pa4" index="4" function="PORTA" group="P"/>
-                <signal pad-id="pa5" index="5" function="PORTA" group="P"/>
-                <signal pad-id="pa6" index="6" function="PORTA" group="P"/>
-                <signal pad-id="pa7" index="7" function="PORTA" group="P"/>
+                <signal pad-key="pa0" index="0" function="PORTA" group="P"/>
+                <signal pad-key="pa1" index="1" function="PORTA" group="P"/>
+                <signal pad-key="pa2" index="2" function="PORTA" group="P"/>
+                <signal pad-key="pa3" index="3" function="PORTA" group="P"/>
+                <signal pad-key="pa4" index="4" function="PORTA" group="P"/>
+                <signal pad-key="pa5" index="5" function="PORTA" group="P"/>
+                <signal pad-key="pa6" index="6" function="PORTA" group="P"/>
+                <signal pad-key="pa7" index="7" function="PORTA" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pb2" index="2" function="PORTB" group="P"/>
-                <signal pad-id="pb3" index="3" function="PORTB" group="P"/>
+                <signal pad-key="pb0" index="0" function="PORTB" group="P"/>
+                <signal pad-key="pb1" index="1" function="PORTB" group="P"/>
+                <signal pad-key="pb2" index="2" function="PORTB" group="P"/>
+                <signal pad-key="pb3" index="3" function="PORTB" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pc2" index="2" function="PORTC" group="P"/>
-                <signal pad-id="pc3" index="3" function="PORTC" group="P"/>
-                <signal pad-id="pc4" index="4" function="PORTC" group="P"/>
-                <signal pad-id="pc5" index="5" function="PORTC" group="P"/>
-                <signal pad-id="pc6" index="6" function="PORTC" group="P"/>
-                <signal pad-id="pc7" index="7" function="PORTC" group="P"/>
+                <signal pad-key="pc0" index="0" function="PORTC" group="P"/>
+                <signal pad-key="pc1" index="1" function="PORTC" group="P"/>
+                <signal pad-key="pc2" index="2" function="PORTC" group="P"/>
+                <signal pad-key="pc3" index="3" function="PORTC" group="P"/>
+                <signal pad-key="pc4" index="4" function="PORTC" group="P"/>
+                <signal pad-key="pc5" index="5" function="PORTC" group="P"/>
+                <signal pad-key="pc6" index="6" function="PORTC" group="P"/>
+                <signal pad-key="pc7" index="7" function="PORTC" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pd2" index="2" function="PORTD" group="P"/>
-                <signal pad-id="pd3" index="3" function="PORTD" group="P"/>
-                <signal pad-id="pd4" index="4" function="PORTD" group="P"/>
-                <signal pad-id="pd5" index="5" function="PORTD" group="P"/>
-                <signal pad-id="pd6" index="6" function="PORTD" group="P"/>
-                <signal pad-id="pd7" index="7" function="PORTD" group="P"/>
+                <signal pad-key="pd0" index="0" function="PORTD" group="P"/>
+                <signal pad-key="pd1" index="1" function="PORTD" group="P"/>
+                <signal pad-key="pd2" index="2" function="PORTD" group="P"/>
+                <signal pad-key="pd3" index="3" function="PORTD" group="P"/>
+                <signal pad-key="pd4" index="4" function="PORTD" group="P"/>
+                <signal pad-key="pd5" index="5" function="PORTD" group="P"/>
+                <signal pad-key="pd6" index="6" function="PORTD" group="P"/>
+                <signal pad-key="pd7" index="7" function="PORTD" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="porte" name="PORTE" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pe2" index="2" function="PORTE" group="P"/>
-                <signal pad-id="pe3" index="3" function="PORTE" group="P"/>
+                <signal pad-key="pe0" index="0" function="PORTE" group="P"/>
+                <signal pad-key="pe1" index="1" function="PORTE" group="P"/>
+                <signal pad-key="pe2" index="2" function="PORTE" group="P"/>
+                <signal pad-key="pe3" index="3" function="PORTE" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portr" name="PORTR" module-key="gpio_port">
             <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"/>
+                <signal pad-key="pr0" index="0" function="PORTR" group="P"/>
+                <signal pad-key="pr1" index="1" function="PORTR" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="tcc0" name="TCC0" module-key="i6090_tc">
             <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"/>
-                <signal pad-id="pc2" function="TCC" group="OC0C" field="TC0C"/>
-                <signal pad-id="pc3" function="TCC" group="OC0D" field="TC0D"/>
-                <signal pad-id="pc4" function="TCC_ALT" group="OC0A" field="TC0A"/>
-                <signal pad-id="pc5" function="TCC_ALT" group="OC0B" field="TC0B"/>
-                <signal pad-id="pc6" function="TCC_ALT" group="OC0C" field="TC0C"/>
-                <signal pad-id="pc7" function="TCC_ALT" group="OC0D" field="TC0D"/>
+                <signal pad-key="pc0" function="TCC" group="OC0A" field="TC0A"/>
+                <signal pad-key="pc1" function="TCC" group="OC0B" field="TC0B"/>
+                <signal pad-key="pc2" function="TCC" group="OC0C" field="TC0C"/>
+                <signal pad-key="pc3" function="TCC" group="OC0D" field="TC0D"/>
+                <signal pad-key="pc4" function="TCC_ALT" group="OC0A" field="TC0A"/>
+                <signal pad-key="pc5" function="TCC_ALT" group="OC0B" field="TC0B"/>
+                <signal pad-key="pc6" function="TCC_ALT" group="OC0C" field="TC0C"/>
+                <signal pad-key="pc7" function="TCC_ALT" group="OC0D" field="TC0D"/>
             </signals>
         </peripheral>
         <peripheral key="tcc1" name="TCC1" module-key="i6090_tc">
             <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"/>
+                <signal pad-key="pc4" function="TCC" group="OC1A"/>
+                <signal pad-key="pc5" function="TCC" group="OC1B"/>
             </signals>
         </peripheral>
         <peripheral key="awexc" name="AWEXC" module-key="i6090_tc">
             <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"/>
-                <signal pad-id="pc2" function="AWEX" group="OC0BLS"/>
-                <signal pad-id="pc3" function="AWEX" group="OC0BHS"/>
-                <signal pad-id="pc4" function="AWEX" group="OC0CLS"/>
-                <signal pad-id="pc5" function="AWEX" group="OC0CHS"/>
-                <signal pad-id="pc6" function="AWEX" group="OC0DLS"/>
-                <signal pad-id="pc7" function="AWEX" group="OC0DHS"/>
+                <signal pad-key="pc0" function="AWEX" group="OC0ALS"/>
+                <signal pad-key="pc1" function="AWEX" group="OC0AHS"/>
+                <signal pad-key="pc2" function="AWEX" group="OC0BLS"/>
+                <signal pad-key="pc3" function="AWEX" group="OC0BHS"/>
+                <signal pad-key="pc4" function="AWEX" group="OC0CLS"/>
+                <signal pad-key="pc5" function="AWEX" group="OC0CHS"/>
+                <signal pad-key="pc6" function="AWEX" group="OC0DLS"/>
+                <signal pad-key="pc7" function="AWEX" group="OC0DHS"/>
             </signals>
         </peripheral>
         <peripheral key="hiresc" name="HIRESC" module-key="i6090_tc">
@@ -300,73 +300,73 @@
         <peripheral key="tcd0" name="TCD0" module-key="i6090_tc">
             <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"/>
-                <signal pad-id="pd2" function="TCC" group="OC0C"/>
-                <signal pad-id="pd3" function="TCC" group="OC0D"/>
+                <signal pad-key="pd0" function="TCC" group="OC0A"/>
+                <signal pad-key="pd1" function="TCC" group="OC0B"/>
+                <signal pad-key="pd2" function="TCC" group="OC0C"/>
+                <signal pad-key="pd3" function="TCC" group="OC0D"/>
             </signals>
         </peripheral>
         <peripheral key="tce0" name="TCE0" module-key="i6090_tc">
             <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"/>
-                <signal pad-id="pe2" function="TCE" group="OC0C"/>
-                <signal pad-id="pe3" function="TCE" group="OC0D"/>
+                <signal pad-key="pe0" function="TCE" group="OC0A"/>
+                <signal pad-key="pe1" function="TCE" group="OC0B"/>
+                <signal pad-key="pe2" function="TCE" group="OC0C"/>
+                <signal pad-key="pe3" function="TCE" group="OC0D"/>
             </signals>
         </peripheral>
         <peripheral key="tcc2" name="TCC2" module-key="i6090_tc2">
             <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"/>
-                <signal pad-id="pc2" function="TCC2" group="LOC2C"/>
-                <signal pad-id="pc3" function="TCC2" group="LOC2D"/>
-                <signal pad-id="pc4" function="TCC2" group="HOC2A"/>
-                <signal pad-id="pc5" function="TCC2" group="HOC2B"/>
-                <signal pad-id="pc6" function="TCC2" group="HOC2C"/>
-                <signal pad-id="pc7" function="TCC2" group="HOC2D"/>
+                <signal pad-key="pc0" function="TCC2" group="LOC2A"/>
+                <signal pad-key="pc1" function="TCC2" group="LOC2B"/>
+                <signal pad-key="pc2" function="TCC2" group="LOC2C"/>
+                <signal pad-key="pc3" function="TCC2" group="LOC2D"/>
+                <signal pad-key="pc4" function="TCC2" group="HOC2A"/>
+                <signal pad-key="pc5" function="TCC2" group="HOC2B"/>
+                <signal pad-key="pc6" function="TCC2" group="HOC2C"/>
+                <signal pad-key="pc7" function="TCC2" group="HOC2D"/>
             </signals>
         </peripheral>
         <peripheral key="usartc0" name="USARTC0" module-key="i6090_usart">
             <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"/>
-                <signal pad-id="pc3" function="USART" group="TXD" field="USART0"/>
-                <signal pad-id="pc5" function="USART_ALT" group="XCK" field="USART0"/>
-                <signal pad-id="pc6" function="USART_ALT" group="RXD" field="USART0"/>
-                <signal pad-id="pc7" function="USART_ALT" group="TXD" field="USART0"/>
+                <signal pad-key="pc1" function="USART" group="XCK" field="USART0"/>
+                <signal pad-key="pc2" function="USART" group="RXD" field="USART0"/>
+                <signal pad-key="pc3" function="USART" group="TXD" field="USART0"/>
+                <signal pad-key="pc5" function="USART_ALT" group="XCK" field="USART0"/>
+                <signal pad-key="pc6" function="USART_ALT" group="RXD" field="USART0"/>
+                <signal pad-key="pc7" function="USART_ALT" group="TXD" field="USART0"/>
             </signals>
         </peripheral>
         <peripheral key="usartd0" name="USARTD0" module-key="i6090_usart">
             <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"/>
-                <signal pad-id="pd3" function="USART" group="TXD"/>
+                <signal pad-key="pd1" function="USART" group="XCK"/>
+                <signal pad-key="pd2" function="USART" group="RXD"/>
+                <signal pad-key="pd3" function="USART" group="TXD"/>
             </signals>
         </peripheral>
         <peripheral key="spic" name="SPIC" module-key="i6090_spi">
             <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"/>
-                <signal pad-id="pc6" function="SPI" group="MISO" field="SPI"/>
-                <signal pad-id="pc7" function="SPI" group="SCK" field="SPI"/>
-                <signal pad-id="pc4" function="SPI_ALT" group="SS" field="SPI"/>
-                <signal pad-id="pc5" function="SPI_ALT" group="SCK" field="SPI"/>
-                <signal pad-id="pc6" function="SPI_ALT" group="MISO" field="SPI"/>
-                <signal pad-id="pc7" function="SPI_ALT" group="MOSI" field="SPI"/>
+                <signal pad-key="pc4" function="SPI" group="SS" field="SPI"/>
+                <signal pad-key="pc5" function="SPI" group="MOSI" field="SPI"/>
+                <signal pad-key="pc6" function="SPI" group="MISO" field="SPI"/>
+                <signal pad-key="pc7" function="SPI" group="SCK" field="SPI"/>
+                <signal pad-key="pc4" function="SPI_ALT" group="SS" field="SPI"/>
+                <signal pad-key="pc5" function="SPI_ALT" group="SCK" field="SPI"/>
+                <signal pad-key="pc6" function="SPI_ALT" group="MISO" field="SPI"/>
+                <signal pad-key="pc7" function="SPI_ALT" group="MOSI" field="SPI"/>
             </signals>
         </peripheral>
         <peripheral key="spid" name="SPID" module-key="i6090_spi">
             <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"/>
-                <signal pad-id="pd6" function="SPI" group="MISO"/>
-                <signal pad-id="pd7" function="SPI" group="SCK"/>
+                <signal pad-key="pd4" function="SPI" group="SS"/>
+                <signal pad-key="pd5" function="SPI" group="MOSI"/>
+                <signal pad-key="pd6" function="SPI" group="MISO"/>
+                <signal pad-key="pd7" function="SPI" group="SCK"/>
             </signals>
         </peripheral>
         <peripheral key="ircom" name="IRCOM" module-key="i6090_ircom">
@@ -1334,110 +1334,151 @@
             </register-group>
         </module>
     </modules>
+    <pads>
+        <pad key="pa5" name="PA5"/>
+        <pad key="pa6" name="PA6"/>
+        <pad key="pa7" name="PA7"/>
+        <pad key="pb0" name="PB0"/>
+        <pad key="pb1" name="PB1"/>
+        <pad key="pb2" name="PB2"/>
+        <pad key="pb3" name="PB3"/>
+        <pad key="gnd" name="GND"/>
+        <pad key="vcc" name="VCC"/>
+        <pad key="pc0" name="PC0"/>
+        <pad key="pc1" name="PC1"/>
+        <pad key="pc2" name="PC2"/>
+        <pad key="pc3" name="PC3"/>
+        <pad key="pc4" name="PC4"/>
+        <pad key="pc5" name="PC5"/>
+        <pad key="pc6" name="PC6"/>
+        <pad key="pc7" name="PC7"/>
+        <pad key="pd0" name="PD0"/>
+        <pad key="pd1" name="PD1"/>
+        <pad key="pd2" name="PD2"/>
+        <pad key="pd3" name="PD3"/>
+        <pad key="pd4" name="PD4"/>
+        <pad key="pd5" name="PD5"/>
+        <pad key="pd6" name="PD6"/>
+        <pad key="pd7" name="PD7"/>
+        <pad key="pe0" name="PE0"/>
+        <pad key="pe1" name="PE1"/>
+        <pad key="pe2" name="PE2"/>
+        <pad key="pe3" name="PE3"/>
+        <pad key="pdi" name="PDI"/>
+        <pad key="reset" name="RESET"/>
+        <pad key="pr0" name="PR0"/>
+        <pad key="pr1" name="PR1"/>
+        <pad key="avcc" name="AVCC"/>
+        <pad key="pa0" name="PA0"/>
+        <pad key="pa1" name="PA1"/>
+        <pad key="pa2" name="PA2"/>
+        <pad key="pa3" name="PA3"/>
+        <pad key="pa4" name="PA4"/>
+    </pads>
     <pinouts>
         <pinout key="qfn_qfp_44" name="QFN_QFP_44" type="qfn">
-            <pin position="1" pad="PA5"/>
-            <pin position="2" pad="PA6"/>
-            <pin position="3" pad="PA7"/>
-            <pin position="4" pad="PB0"/>
-            <pin position="5" pad="PB1"/>
-            <pin position="6" pad="PB2"/>
-            <pin position="7" pad="PB3"/>
-            <pin position="8" pad="GND"/>
-            <pin position="9" pad="VCC"/>
-            <pin position="10" pad="PC0"/>
-            <pin position="11" pad="PC1"/>
-            <pin position="12" pad="PC2"/>
-            <pin position="13" pad="PC3"/>
-            <pin position="14" pad="PC4"/>
-            <pin position="15" pad="PC5"/>
-            <pin position="16" pad="PC6"/>
-            <pin position="17" pad="PC7"/>
-            <pin position="18" pad="GND"/>
-            <pin position="19" pad="VCC"/>
-            <pin position="20" pad="PD0"/>
-            <pin position="21" pad="PD1"/>
-            <pin position="22" pad="PD2"/>
-            <pin position="23" pad="PD3"/>
-            <pin position="24" pad="PD4"/>
-            <pin position="25" pad="PD5"/>
-            <pin position="26" pad="PD6"/>
-            <pin position="27" pad="PD7"/>
-            <pin position="28" pad="PE0"/>
-            <pin position="29" pad="PE1"/>
-            <pin position="30" pad="GND"/>
-            <pin position="31" pad="VCC"/>
-            <pin position="32" pad="PE2"/>
-            <pin position="33" pad="PE3"/>
-            <pin position="34" pad="PDI"/>
-            <pin position="35" pad="RESET"/>
-            <pin position="36" pad="PR0"/>
-            <pin position="37" pad="PR1"/>
-            <pin position="38" pad="GND"/>
-            <pin position="39" pad="AVCC"/>
-            <pin position="40" pad="PA0"/>
-            <pin position="41" pad="PA1"/>
-            <pin position="42" pad="PA2"/>
-            <pin position="43" pad="PA3"/>
-            <pin position="44" pad="PA4"/>
+            <pin position="1" pad-key="pa5"/>
+            <pin position="2" pad-key="pa6"/>
+            <pin position="3" pad-key="pa7"/>
+            <pin position="4" pad-key="pb0"/>
+            <pin position="5" pad-key="pb1"/>
+            <pin position="6" pad-key="pb2"/>
+            <pin position="7" pad-key="pb3"/>
+            <pin position="8" pad-key="gnd"/>
+            <pin position="9" pad-key="vcc"/>
+            <pin position="10" pad-key="pc0"/>
+            <pin position="11" pad-key="pc1"/>
+            <pin position="12" pad-key="pc2"/>
+            <pin position="13" pad-key="pc3"/>
+            <pin position="14" pad-key="pc4"/>
+            <pin position="15" pad-key="pc5"/>
+            <pin position="16" pad-key="pc6"/>
+            <pin position="17" pad-key="pc7"/>
+            <pin position="18" pad-key="gnd"/>
+            <pin position="19" pad-key="vcc"/>
+            <pin position="20" pad-key="pd0"/>
+            <pin position="21" pad-key="pd1"/>
+            <pin position="22" pad-key="pd2"/>
+            <pin position="23" pad-key="pd3"/>
+            <pin position="24" pad-key="pd4"/>
+            <pin position="25" pad-key="pd5"/>
+            <pin position="26" pad-key="pd6"/>
+            <pin position="27" pad-key="pd7"/>
+            <pin position="28" pad-key="pe0"/>
+            <pin position="29" pad-key="pe1"/>
+            <pin position="30" pad-key="gnd"/>
+            <pin position="31" pad-key="vcc"/>
+            <pin position="32" pad-key="pe2"/>
+            <pin position="33" pad-key="pe3"/>
+            <pin position="34" pad-key="pdi"/>
+            <pin position="35" pad-key="reset"/>
+            <pin position="36" pad-key="pr0"/>
+            <pin position="37" pad-key="pr1"/>
+            <pin position="38" pad-key="gnd"/>
+            <pin position="39" pad-key="avcc"/>
+            <pin position="40" pad-key="pa0"/>
+            <pin position="41" pad-key="pa1"/>
+            <pin position="42" pad-key="pa2"/>
+            <pin position="43" pad-key="pa3"/>
+            <pin position="44" pad-key="pa4"/>
         </pinout>
         <pinout key="bga_49" name="BGA_49" type="bga">
-            <pin position="A1" pad="PA3"/>
-            <pin position="A2" pad="AVCC"/>
-            <pin position="A3" pad="GND"/>
-            <pin position="A4" pad="PR1"/>
-            <pin position="A5" pad="PR0"/>
-            <pin position="A6" pad="PDI"/>
-            <pin position="A7" pad="PE3"/>
-            <pin position="B1" pad="PA4"/>
-            <pin position="B2" pad="PA1"/>
-            <pin position="B3" pad="PA0"/>
-            <pin position="B4" pad="GND"/>
-            <pin position="B5" pad="RESET"/>
-            <pin position="B6" pad="PE2"/>
-            <pin position="B7" pad="VCC"/>
-            <pin position="C1" pad="PA5"/>
-            <pin position="C2" pad="PA2"/>
-            <pin position="C3" pad="PA6"/>
-            <pin position="C4" pad="PA7"/>
-            <pin position="C5" pad="GND"/>
-            <pin position="C6" pad="PE1"/>
-            <pin position="C7" pad="GND"/>
-            <pin position="D1" pad="PB1"/>
-            <pin position="D2" pad="PB2"/>
-            <pin position="D3" pad="PB3"/>
-            <pin position="D4" pad="PB0"/>
-            <pin position="D5" pad="GND"/>
-            <pin position="D6" pad="PD7"/>
-            <pin position="D7" pad="PE0"/>
-            <pin position="E1" pad="GND"/>
-            <pin position="E2" pad="GND"/>
-            <pin position="E3" pad="PC3"/>
-            <pin position="E4" pad="GND"/>
-            <pin position="E5" pad="PD4"/>
-            <pin position="E6" pad="PD5"/>
-            <pin position="E7" pad="PD6"/>
-            <pin position="F1" pad="VCC"/>
-            <pin position="F2" pad="PC0"/>
-            <pin position="F3" pad="PC4"/>
-            <pin position="F4" pad="PC6"/>
-            <pin position="F5" pad="PD0"/>
-            <pin position="F6" pad="PD1"/>
-            <pin position="F7" pad="PD3"/>
-            <pin position="G1" pad="PC1"/>
-            <pin position="G2" pad="PC2"/>
-            <pin position="G3" pad="PC5"/>
-            <pin position="G4" pad="PC7"/>
-            <pin position="G5" pad="GND"/>
-            <pin position="G6" pad="VCC"/>
-            <pin position="G7" pad="PD2"/>
+            <pin position="A1" pad-key="pa3"/>
+            <pin position="A2" pad-key="avcc"/>
+            <pin position="A3" pad-key="gnd"/>
+            <pin position="A4" pad-key="pr1"/>
+            <pin position="A5" pad-key="pr0"/>
+            <pin position="A6" pad-key="pdi"/>
+            <pin position="A7" pad-key="pe3"/>
+            <pin position="B1" pad-key="pa4"/>
+            <pin position="B2" pad-key="pa1"/>
+            <pin position="B3" pad-key="pa0"/>
+            <pin position="B4" pad-key="gnd"/>
+            <pin position="B5" pad-key="reset"/>
+            <pin position="B6" pad-key="pe2"/>
+            <pin position="B7" pad-key="vcc"/>
+            <pin position="C1" pad-key="pa5"/>
+            <pin position="C2" pad-key="pa2"/>
+            <pin position="C3" pad-key="pa6"/>
+            <pin position="C4" pad-key="pa7"/>
+            <pin position="C5" pad-key="gnd"/>
+            <pin position="C6" pad-key="pe1"/>
+            <pin position="C7" pad-key="gnd"/>
+            <pin position="D1" pad-key="pb1"/>
+            <pin position="D2" pad-key="pb2"/>
+            <pin position="D3" pad-key="pb3"/>
+            <pin position="D4" pad-key="pb0"/>
+            <pin position="D5" pad-key="gnd"/>
+            <pin position="D6" pad-key="pd7"/>
+            <pin position="D7" pad-key="pe0"/>
+            <pin position="E1" pad-key="gnd"/>
+            <pin position="E2" pad-key="gnd"/>
+            <pin position="E3" pad-key="pc3"/>
+            <pin position="E4" pad-key="gnd"/>
+            <pin position="E5" pad-key="pd4"/>
+            <pin position="E6" pad-key="pd5"/>
+            <pin position="E7" pad-key="pd6"/>
+            <pin position="F1" pad-key="vcc"/>
+            <pin position="F2" pad-key="pc0"/>
+            <pin position="F3" pad-key="pc4"/>
+            <pin position="F4" pad-key="pc6"/>
+            <pin position="F5" pad-key="pd0"/>
+            <pin position="F6" pad-key="pd1"/>
+            <pin position="F7" pad-key="pd3"/>
+            <pin position="G1" pad-key="pc1"/>
+            <pin position="G2" pad-key="pc2"/>
+            <pin position="G3" pad-key="pc5"/>
+            <pin position="G4" pad-key="pc7"/>
+            <pin position="G5" pad-key="gnd"/>
+            <pin position="G6" pad-key="vcc"/>
+            <pin position="G7" pad-key="pd2"/>
         </pinout>
     </pinouts>
     <variants>
-        <variant name="ATxmega32D4-AU" pinout-key="qfn_qfp_44" package="TQFP44"/>
-        <variant name="ATxmega32D4-MH" pinout-key="qfn_qfp_44" package="VQFN44"/>
-        <variant name="ATxmega32D4-CU" pinout-key="bga_49" package="VFBGA49"/>
-        <variant name="ATxmega32D4-AN" pinout-key="qfn_qfp_44" package="TQFP44"/>
-        <variant name="ATxmega32D4-M7" pinout-key="bga_49" package="VFBGA49"/>
+        <variant key="atxmega32d4_au" name="ATxmega32D4-AU" pinout-key="qfn_qfp_44"/>
+        <variant key="atxmega32d4_mh" name="ATxmega32D4-MH" pinout-key="qfn_qfp_44"/>
+        <variant key="atxmega32d4_cu" name="ATxmega32D4-CU" pinout-key="bga_49"/>
+        <variant key="atxmega32d4_an" name="ATxmega32D4-AN" pinout-key="qfn_qfp_44"/>
+        <variant key="atxmega32d4_m7" name="ATxmega32D4-M7" pinout-key="bga_49"/>
     </variants>
 </device>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA32E5.xml b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA32E5.xml
index 5581ce8c..ba86f45d 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA32E5.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA32E5.xml
@@ -83,7 +83,7 @@
         <peripheral key="clk" name="CLK" module-key="i6073_clk">
             <register-group-instance register-group-key="clk" address-space-key="data" offset="0x40"/>
             <signals>
-                <signal pad-id="pc4" function="EXTERNAL_CLOCK" group="EXTCLK"/>
+                <signal pad-key="pc4" function="EXTERNAL_CLOCK" group="EXTCLK"/>
             </signals>
         </peripheral>
         <peripheral key="pr" name="PR" module-key="i6073_pr">
@@ -95,10 +95,10 @@
         <peripheral key="osc" name="OSC" module-key="i6079">
             <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"/>
-                <signal pad-id="pr0" function="TOSC" group="TOSC2"/>
-                <signal pad-id="pr1" function="TOSC" group="TOSC1"/>
+                <signal pad-key="pr0" function="XTAL" group="XTAL2"/>
+                <signal pad-key="pr1" function="XTAL" group="XTAL1"/>
+                <signal pad-key="pr0" function="TOSC" group="TOSC2"/>
+                <signal pad-key="pr1" function="TOSC" group="TOSC1"/>
             </signals>
         </peripheral>
         <peripheral key="dfllrc32m" name="DFLLRC32M" module-key="i6055">
@@ -119,14 +119,14 @@
         <peripheral key="portcfg" name="PORTCFG" module-key="i6075_portcfg">
             <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"/>
-                <signal pad-id="pr0" function="CLKOUTR" group="CLKOUT" field="CLKOUT"/>
-                <signal pad-id="pd7" function="EVOUTD" group="EVOUT" field="EVOUT"/>
-                <signal pad-id="pd4" function="EVOUTD_ALT" group="EVOUT" field="CLKEVPIN"/>
-                <signal pad-id="pr0" function="EVOUTR" group="EVOUT" field="EVOUT"/>
-                <signal pad-id="pd6" function="RTCOUTD" group="RTCOUT" field="RTCOUT"/>
-                <signal pad-id="pr0" function="RTCOUTR" group="RTCOUT" field="RTCOUT"/>
+                <signal pad-key="pd7" function="CLKOUTD" group="CLKOUT" field="CLKOUT"/>
+                <signal pad-key="pd4" function="CLKOUTD_ALT" group="CLKOUT" field="CLKEVPIN"/>
+                <signal pad-key="pr0" function="CLKOUTR" group="CLKOUT" field="CLKOUT"/>
+                <signal pad-key="pd7" function="EVOUTD" group="EVOUT" field="EVOUT"/>
+                <signal pad-key="pd4" function="EVOUTD_ALT" group="EVOUT" field="CLKEVPIN"/>
+                <signal pad-key="pr0" function="EVOUTR" group="EVOUT" field="EVOUT"/>
+                <signal pad-key="pd6" function="RTCOUTD" group="RTCOUT" field="RTCOUT"/>
+                <signal pad-key="pr0" function="RTCOUTR" group="RTCOUT" field="RTCOUT"/>
             </signals>
         </peripheral>
         <peripheral key="crc" name="CRC" module-key="i6111">
@@ -144,54 +144,54 @@
         <peripheral key="adca" name="ADCA" module-key="i6110">
             <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"/>
-                <signal pad-id="pa2" index="2" function="ADC" group="ADC"/>
-                <signal pad-id="pa3" index="3" function="ADC" group="ADC"/>
-                <signal pad-id="pa4" index="4" function="ADC" group="ADC"/>
-                <signal pad-id="pa5" index="5" function="ADC" group="ADC"/>
-                <signal pad-id="pa6" index="6" function="ADC" group="ADC"/>
-                <signal pad-id="pa7" index="7" function="ADC" group="ADC"/>
-                <signal pad-id="pd0" index="8" function="ADC" group="ADC"/>
-                <signal pad-id="pd1" index="9" function="ADC" group="ADC"/>
-                <signal pad-id="pd2" index="10" function="ADC" group="ADC"/>
-                <signal pad-id="pd3" index="11" function="ADC" group="ADC"/>
-                <signal pad-id="pd4" index="12" function="ADC" group="ADC"/>
-                <signal pad-id="pd5" index="13" function="ADC" group="ADC"/>
-                <signal pad-id="pd6" index="14" function="ADC" group="ADC"/>
-                <signal pad-id="pd7" index="15" function="ADC" group="ADC"/>
-                <signal pad-id="pa0" index="0" function="AREF" group="REFA"/>
-                <signal pad-id="pd0" index="0" function="AREF" group="REFD"/>
+                <signal pad-key="pa0" index="0" function="ADC" group="ADC"/>
+                <signal pad-key="pa1" index="1" function="ADC" group="ADC"/>
+                <signal pad-key="pa2" index="2" function="ADC" group="ADC"/>
+                <signal pad-key="pa3" index="3" function="ADC" group="ADC"/>
+                <signal pad-key="pa4" index="4" function="ADC" group="ADC"/>
+                <signal pad-key="pa5" index="5" function="ADC" group="ADC"/>
+                <signal pad-key="pa6" index="6" function="ADC" group="ADC"/>
+                <signal pad-key="pa7" index="7" function="ADC" group="ADC"/>
+                <signal pad-key="pd0" index="8" function="ADC" group="ADC"/>
+                <signal pad-key="pd1" index="9" function="ADC" group="ADC"/>
+                <signal pad-key="pd2" index="10" function="ADC" group="ADC"/>
+                <signal pad-key="pd3" index="11" function="ADC" group="ADC"/>
+                <signal pad-key="pd4" index="12" function="ADC" group="ADC"/>
+                <signal pad-key="pd5" index="13" function="ADC" group="ADC"/>
+                <signal pad-key="pd6" index="14" function="ADC" group="ADC"/>
+                <signal pad-key="pd7" index="15" function="ADC" group="ADC"/>
+                <signal pad-key="pa0" index="0" function="AREF" group="REFA"/>
+                <signal pad-key="pd0" index="0" function="AREF" group="REFD"/>
             </signals>
         </peripheral>
         <peripheral key="daca" name="DACA" module-key="i6059">
             <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"/>
-                <signal pad-id="pa0" index="0" function="AREF" group="REFA"/>
-                <signal pad-id="pd0" index="0" function="AREF" group="REFD"/>
+                <signal pad-key="pa2" index="0" function="DAC" group="DAC"/>
+                <signal pad-key="pa3" index="1" function="DAC" group="DAC"/>
+                <signal pad-key="pa0" index="0" function="AREF" group="REFA"/>
+                <signal pad-key="pd0" index="0" function="AREF" group="REFD"/>
             </signals>
         </peripheral>
         <peripheral key="aca" name="ACA" module-key="i6077">
             <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"/>
-                <signal pad-id="pa2" index="2" function="AC" group="AC"/>
-                <signal pad-id="pa3" index="3" function="AC" group="AC"/>
-                <signal pad-id="pa4" index="4" function="AC" group="AC"/>
-                <signal pad-id="pa5" index="5" function="AC" group="AC"/>
-                <signal pad-id="pa6" index="6" function="AC" group="AC"/>
-                <signal pad-id="pa7" index="7" function="AC" group="AC"/>
-                <signal pad-id="pa6" index="1" function="ACOUT_PA" group="ACOUT" field="ACOUT"/>
-                <signal pad-id="pa7" index="0" function="ACOUT_PA" group="ACOUT" field="ACOUT"/>
-                <signal pad-id="pc6" index="1" function="ACOUT_PC" group="ACOUT" field="ACOUT"/>
-                <signal pad-id="pc7" index="0" function="ACOUT_PC" group="ACOUT" field="ACOUT"/>
-                <signal pad-id="pd6" index="1" function="ACOUT_PD" group="ACOUT" field="ACOUT"/>
-                <signal pad-id="pd7" index="0" function="ACOUT_PD" group="ACOUT" field="ACOUT"/>
-                <signal pad-id="pr0" index="1" function="ACOUT_PR" group="ACOUT" field="ACOUT"/>
-                <signal pad-id="pr1" index="0" function="ACOUT_PR" group="ACOUT" field="ACOUT"/>
+                <signal pad-key="pa0" index="0" function="AC" group="AC"/>
+                <signal pad-key="pa1" index="1" function="AC" group="AC"/>
+                <signal pad-key="pa2" index="2" function="AC" group="AC"/>
+                <signal pad-key="pa3" index="3" function="AC" group="AC"/>
+                <signal pad-key="pa4" index="4" function="AC" group="AC"/>
+                <signal pad-key="pa5" index="5" function="AC" group="AC"/>
+                <signal pad-key="pa6" index="6" function="AC" group="AC"/>
+                <signal pad-key="pa7" index="7" function="AC" group="AC"/>
+                <signal pad-key="pa6" index="1" function="ACOUT_PA" group="ACOUT" field="ACOUT"/>
+                <signal pad-key="pa7" index="0" function="ACOUT_PA" group="ACOUT" field="ACOUT"/>
+                <signal pad-key="pc6" index="1" function="ACOUT_PC" group="ACOUT" field="ACOUT"/>
+                <signal pad-key="pc7" index="0" function="ACOUT_PC" group="ACOUT" field="ACOUT"/>
+                <signal pad-key="pd6" index="1" function="ACOUT_PD" group="ACOUT" field="ACOUT"/>
+                <signal pad-key="pd7" index="0" function="ACOUT_PD" group="ACOUT" field="ACOUT"/>
+                <signal pad-key="pr0" index="1" function="ACOUT_PR" group="ACOUT" field="ACOUT"/>
+                <signal pad-key="pr1" index="0" function="ACOUT_PR" group="ACOUT" field="ACOUT"/>
             </signals>
         </peripheral>
         <peripheral key="rtc" name="RTC" module-key="i6093">
@@ -200,110 +200,110 @@
         <peripheral key="xcl" name="XCL" module-key="i3008">
             <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"/>
-                <signal pad-id="pc2" index="0" function="XCLIN_LSB_PC" group="IN"/>
-                <signal pad-id="pc3" index="3" function="XCLIN_LSB_PC" group="IN"/>
-                <signal pad-id="pc4" index="1" function="XCLIN_MSB_PC" group="IN"/>
-                <signal pad-id="pc5" index="2" function="XCLIN_MSB_PC" group="IN"/>
-                <signal pad-id="pc6" index="0" function="XCLIN_MSB_PC" group="IN"/>
-                <signal pad-id="pc7" index="3" function="XCLIN_MSB_PC" group="IN"/>
-                <signal pad-id="pd0" index="1" function="XCLIN_LSB_PD" group="IN"/>
-                <signal pad-id="pd1" index="2" function="XCLIN_LSB_PD" group="IN"/>
-                <signal pad-id="pd2" index="0" function="XCLIN_LSB_PD" group="IN"/>
-                <signal pad-id="pd3" index="3" function="XCLIN_LSB_PD" group="IN"/>
-                <signal pad-id="pd4" index="1" function="XCLIN_MSB_PD" group="IN"/>
-                <signal pad-id="pd5" index="2" function="XCLIN_MSB_PD" group="IN"/>
-                <signal pad-id="pd6" index="0" function="XCLIN_MSB_PD" group="IN"/>
-                <signal pad-id="pd7" index="3" function="XCLIN_MSB_PD" group="IN"/>
-                <signal pad-id="pc0" index="0" function="XCLOUT_LSB_PC" group="OUT"/>
-                <signal pad-id="pc4" index="0" function="XCLOUT_MSB_PC" group="OUT"/>
-                <signal pad-id="pd0" index="0" function="XCLOUT_LSB_PD" group="OUT"/>
-                <signal pad-id="pd4" index="0" function="XCLOUT_LSB_PD" group="OUT"/>
-                <signal pad-id="pd2" index="0" function="XCL_OCOUT" group="OC"/>
-                <signal pad-id="pd3" index="1" function="XCL_OCOUT" group="OC"/>
+                <signal pad-key="pc0" index="1" function="XCLIN_LSB_PC" group="IN"/>
+                <signal pad-key="pc1" index="2" function="XCLIN_LSB_PC" group="IN"/>
+                <signal pad-key="pc2" index="0" function="XCLIN_LSB_PC" group="IN"/>
+                <signal pad-key="pc3" index="3" function="XCLIN_LSB_PC" group="IN"/>
+                <signal pad-key="pc4" index="1" function="XCLIN_MSB_PC" group="IN"/>
+                <signal pad-key="pc5" index="2" function="XCLIN_MSB_PC" group="IN"/>
+                <signal pad-key="pc6" index="0" function="XCLIN_MSB_PC" group="IN"/>
+                <signal pad-key="pc7" index="3" function="XCLIN_MSB_PC" group="IN"/>
+                <signal pad-key="pd0" index="1" function="XCLIN_LSB_PD" group="IN"/>
+                <signal pad-key="pd1" index="2" function="XCLIN_LSB_PD" group="IN"/>
+                <signal pad-key="pd2" index="0" function="XCLIN_LSB_PD" group="IN"/>
+                <signal pad-key="pd3" index="3" function="XCLIN_LSB_PD" group="IN"/>
+                <signal pad-key="pd4" index="1" function="XCLIN_MSB_PD" group="IN"/>
+                <signal pad-key="pd5" index="2" function="XCLIN_MSB_PD" group="IN"/>
+                <signal pad-key="pd6" index="0" function="XCLIN_MSB_PD" group="IN"/>
+                <signal pad-key="pd7" index="3" function="XCLIN_MSB_PD" group="IN"/>
+                <signal pad-key="pc0" index="0" function="XCLOUT_LSB_PC" group="OUT"/>
+                <signal pad-key="pc4" index="0" function="XCLOUT_MSB_PC" group="OUT"/>
+                <signal pad-key="pd0" index="0" function="XCLOUT_LSB_PD" group="OUT"/>
+                <signal pad-key="pd4" index="0" function="XCLOUT_LSB_PD" group="OUT"/>
+                <signal pad-key="pd2" index="0" function="XCL_OCOUT" group="OC"/>
+                <signal pad-key="pd3" index="1" function="XCL_OCOUT" group="OC"/>
             </signals>
         </peripheral>
         <peripheral key="twic" name="TWIC" module-key="i6089">
             <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"/>
-                <signal pad-id="pd0" function="TWI_BRIDGE" group="SDA"/>
-                <signal pad-id="pd1" function="TWI_BRIDGE" group="SCL"/>
+                <signal pad-key="pc0" function="TWI" group="SDA"/>
+                <signal pad-key="pc1" function="TWI" group="SCL"/>
+                <signal pad-key="pd0" function="TWI_BRIDGE" group="SDA"/>
+                <signal pad-key="pd1" function="TWI_BRIDGE" group="SCL"/>
             </signals>
         </peripheral>
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pa2" index="2" function="PORTA" group="P"/>
-                <signal pad-id="pa3" index="3" function="PORTA" group="P"/>
-                <signal pad-id="pa4" index="4" function="PORTA" group="P"/>
-                <signal pad-id="pa5" index="5" function="PORTA" group="P"/>
-                <signal pad-id="pa6" index="6" function="PORTA" group="P"/>
-                <signal pad-id="pa7" index="7" function="PORTA" group="P"/>
+                <signal pad-key="pa0" index="0" function="PORTA" group="P"/>
+                <signal pad-key="pa1" index="1" function="PORTA" group="P"/>
+                <signal pad-key="pa2" index="2" function="PORTA" group="P"/>
+                <signal pad-key="pa3" index="3" function="PORTA" group="P"/>
+                <signal pad-key="pa4" index="4" function="PORTA" group="P"/>
+                <signal pad-key="pa5" index="5" function="PORTA" group="P"/>
+                <signal pad-key="pa6" index="6" function="PORTA" group="P"/>
+                <signal pad-key="pa7" index="7" function="PORTA" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pc2" index="2" function="PORTC" group="P"/>
-                <signal pad-id="pc3" index="3" function="PORTC" group="P"/>
-                <signal pad-id="pc4" index="4" function="PORTC" group="P"/>
-                <signal pad-id="pc5" index="5" function="PORTC" group="P"/>
-                <signal pad-id="pc6" index="6" function="PORTC" group="P"/>
-                <signal pad-id="pc7" index="7" function="PORTC" group="P"/>
+                <signal pad-key="pc0" index="0" function="PORTC" group="P"/>
+                <signal pad-key="pc1" index="1" function="PORTC" group="P"/>
+                <signal pad-key="pc2" index="2" function="PORTC" group="P"/>
+                <signal pad-key="pc3" index="3" function="PORTC" group="P"/>
+                <signal pad-key="pc4" index="4" function="PORTC" group="P"/>
+                <signal pad-key="pc5" index="5" function="PORTC" group="P"/>
+                <signal pad-key="pc6" index="6" function="PORTC" group="P"/>
+                <signal pad-key="pc7" index="7" function="PORTC" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pd2" index="2" function="PORTD" group="P"/>
-                <signal pad-id="pd3" index="3" function="PORTD" group="P"/>
-                <signal pad-id="pd4" index="4" function="PORTD" group="P"/>
-                <signal pad-id="pd5" index="5" function="PORTD" group="P"/>
-                <signal pad-id="pd6" index="6" function="PORTD" group="P"/>
-                <signal pad-id="pd7" index="7" function="PORTD" group="P"/>
+                <signal pad-key="pd0" index="0" function="PORTD" group="P"/>
+                <signal pad-key="pd1" index="1" function="PORTD" group="P"/>
+                <signal pad-key="pd2" index="2" function="PORTD" group="P"/>
+                <signal pad-key="pd3" index="3" function="PORTD" group="P"/>
+                <signal pad-key="pd4" index="4" function="PORTD" group="P"/>
+                <signal pad-key="pd5" index="5" function="PORTD" group="P"/>
+                <signal pad-key="pd6" index="6" function="PORTD" group="P"/>
+                <signal pad-key="pd7" index="7" function="PORTD" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portr" name="PORTR" module-key="gpio_port">
             <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"/>
+                <signal pad-key="pr0" index="0" function="PORTR" group="P"/>
+                <signal pad-key="pr1" index="1" function="PORTR" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="tcc4" name="TCC4" module-key="i3007_tc">
             <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"/>
-                <signal pad-id="pc2" function="TC4" group="OC4C" field="TC4C"/>
-                <signal pad-id="pc3" function="TC4" group="OC4D" field="TC4D"/>
-                <signal pad-id="pc4" function="TC4_ALT" group="OC4A" field="TC4A"/>
-                <signal pad-id="pc5" function="TC4_ALT" group="OC4B" field="TC4B"/>
-                <signal pad-id="pc6" function="TC4_ALT" group="OC4C" field="TC4C"/>
-                <signal pad-id="pc7" function="TC4_ALT" group="OC4D" field="TC4D"/>
+                <signal pad-key="pc0" function="TC4" group="OC4A" field="TC4A"/>
+                <signal pad-key="pc1" function="TC4" group="OC4B" field="TC4B"/>
+                <signal pad-key="pc2" function="TC4" group="OC4C" field="TC4C"/>
+                <signal pad-key="pc3" function="TC4" group="OC4D" field="TC4D"/>
+                <signal pad-key="pc4" function="TC4_ALT" group="OC4A" field="TC4A"/>
+                <signal pad-key="pc5" function="TC4_ALT" group="OC4B" field="TC4B"/>
+                <signal pad-key="pc6" function="TC4_ALT" group="OC4C" field="TC4C"/>
+                <signal pad-key="pc7" function="TC4_ALT" group="OC4D" field="TC4D"/>
             </signals>
         </peripheral>
         <peripheral key="tcc5" name="TCC5" module-key="i3007_tc">
             <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"/>
+                <signal pad-key="pc4" function="TC5" group="OC5A"/>
+                <signal pad-key="pc5" function="TC5" group="OC5B"/>
             </signals>
         </peripheral>
         <peripheral key="tcd5" name="TCD5" module-key="i3007_tc">
             <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"/>
+                <signal pad-key="pd4" function="TC5" group="OC5A"/>
+                <signal pad-key="pd5" function="TC5" group="OC5B"/>
             </signals>
         </peripheral>
         <peripheral key="faultc4" name="FAULTC4" module-key="i3620_fault">
@@ -315,14 +315,14 @@
         <peripheral key="wexc" name="WEXC" module-key="i3007_wex">
             <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"/>
-                <signal pad-id="pc2" function="WEX" group="OC4BLS"/>
-                <signal pad-id="pc3" function="WEX" group="OC4BHS"/>
-                <signal pad-id="pc4" function="WEX" group="OC4CLS"/>
-                <signal pad-id="pc5" function="WEX" group="OC4CHS"/>
-                <signal pad-id="pc6" function="WEX" group="OC4DLS"/>
-                <signal pad-id="pc7" function="WEX" group="OC4DHS"/>
+                <signal pad-key="pc0" function="WEX" group="OC4ALS"/>
+                <signal pad-key="pc1" function="WEX" group="OC4AHS"/>
+                <signal pad-key="pc2" function="WEX" group="OC4BLS"/>
+                <signal pad-key="pc3" function="WEX" group="OC4BHS"/>
+                <signal pad-key="pc4" function="WEX" group="OC4CLS"/>
+                <signal pad-key="pc5" function="WEX" group="OC4CHS"/>
+                <signal pad-key="pc6" function="WEX" group="OC4DLS"/>
+                <signal pad-key="pc7" function="WEX" group="OC4DHS"/>
             </signals>
         </peripheral>
         <peripheral key="hiresc" name="HIRESC" module-key="i3620_hires">
@@ -331,32 +331,32 @@
         <peripheral key="usartc0" name="USARTC0" module-key="i4000">
             <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"/>
-                <signal pad-id="pc3" function="USART" group="TXD" field="USART0"/>
-                <signal pad-id="pc5" function="USART_ALT" group="XCK" field="USART0"/>
-                <signal pad-id="pc6" function="USART_ALT" group="RXD" field="USART0"/>
-                <signal pad-id="pc7" function="USART_ALT" group="TXD" field="USART0"/>
+                <signal pad-key="pc1" function="USART" group="XCK" field="USART0"/>
+                <signal pad-key="pc2" function="USART" group="RXD" field="USART0"/>
+                <signal pad-key="pc3" function="USART" group="TXD" field="USART0"/>
+                <signal pad-key="pc5" function="USART_ALT" group="XCK" field="USART0"/>
+                <signal pad-key="pc6" function="USART_ALT" group="RXD" field="USART0"/>
+                <signal pad-key="pc7" function="USART_ALT" group="TXD" field="USART0"/>
             </signals>
         </peripheral>
         <peripheral key="usartd0" name="USARTD0" module-key="i4000">
             <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"/>
-                <signal pad-id="pd3" function="USART" group="TXD" field="USART0"/>
-                <signal pad-id="pd5" function="USART_ALT" group="XCK" field="USART0"/>
-                <signal pad-id="pd6" function="USART_ALT" group="RXD" field="USART0"/>
-                <signal pad-id="pd7" function="USART_ALT" group="TXD" field="USART0"/>
+                <signal pad-key="pd1" function="USART" group="XCK" field="USART0"/>
+                <signal pad-key="pd2" function="USART" group="RXD" field="USART0"/>
+                <signal pad-key="pd3" function="USART" group="TXD" field="USART0"/>
+                <signal pad-key="pd5" function="USART_ALT" group="XCK" field="USART0"/>
+                <signal pad-key="pd6" function="USART_ALT" group="RXD" field="USART0"/>
+                <signal pad-key="pd7" function="USART_ALT" group="TXD" field="USART0"/>
             </signals>
         </peripheral>
         <peripheral key="spic" name="SPIC" module-key="i6090_spi">
             <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"/>
-                <signal pad-id="pc6" function="SPI" group="MISO"/>
-                <signal pad-id="pc7" function="SPI" group="MOSI"/>
+                <signal pad-key="pc4" function="SPI" group="SS"/>
+                <signal pad-key="pc5" function="SPI" group="SCK"/>
+                <signal pad-key="pc6" function="SPI" group="MISO"/>
+                <signal pad-key="pc7" function="SPI" group="MOSI"/>
             </signals>
         </peripheral>
         <peripheral key="ircom" name="IRCOM" module-key="i6090_ircom">
@@ -1763,48 +1763,81 @@
             </register-group>
         </module>
     </modules>
+    <pads>
+        <pad key="gnd" name="GND"/>
+        <pad key="pa4" name="PA4"/>
+        <pad key="pa3" name="PA3"/>
+        <pad key="pa2" name="PA2"/>
+        <pad key="pa1" name="PA1"/>
+        <pad key="pa0" name="PA0"/>
+        <pad key="pdi" name="PDI"/>
+        <pad key="reset" name="RESET"/>
+        <pad key="pc7" name="PC7"/>
+        <pad key="pc6" name="PC6"/>
+        <pad key="pc5" name="PC5"/>
+        <pad key="pc4" name="PC4"/>
+        <pad key="pc3" name="PC3"/>
+        <pad key="pc2" name="PC2"/>
+        <pad key="pc1" name="PC1"/>
+        <pad key="pc0" name="PC0"/>
+        <pad key="vcc" name="VCC"/>
+        <pad key="pr1" name="PR1"/>
+        <pad key="pr0" name="PR0"/>
+        <pad key="pd7" name="PD7"/>
+        <pad key="pd6" name="PD6"/>
+        <pad key="pd5" name="PD5"/>
+        <pad key="pd4" name="PD4"/>
+        <pad key="pd3" name="PD3"/>
+        <pad key="pd2" name="PD2"/>
+        <pad key="pd1" name="PD1"/>
+        <pad key="pd0" name="PD0"/>
+        <pad key="pa7" name="PA7"/>
+        <pad key="pa6" name="PA6"/>
+        <pad key="pa5" name="PA5"/>
+        <pad key="avcc" name="AVCC"/>
+    </pads>
     <pinouts>
         <pinout key="qfp_qfn_32" name="QFP_QFN_32" type="qfn">
-            <pin position="1" pad="GND"/>
-            <pin position="2" pad="PA4"/>
-            <pin position="3" pad="PA3"/>
-            <pin position="4" pad="PA2"/>
-            <pin position="5" pad="PA1"/>
-            <pin position="6" pad="PA0"/>
-            <pin position="7" pad="PDI"/>
-            <pin position="8" pad="RESET"/>
-            <pin position="9" pad="PC7"/>
-            <pin position="10" pad="PC6"/>
-            <pin position="11" pad="PC5"/>
-            <pin position="12" pad="PC4"/>
-            <pin position="13" pad="PC3"/>
-            <pin position="14" pad="PC2"/>
-            <pin position="15" pad="PC1"/>
-            <pin position="16" pad="PC0"/>
-            <pin position="17" pad="VCC"/>
-            <pin position="18" pad="GND"/>
-            <pin position="19" pad="PR1"/>
-            <pin position="20" pad="PR0"/>
-            <pin position="21" pad="PD7"/>
-            <pin position="22" pad="PD6"/>
-            <pin position="23" pad="PD5"/>
-            <pin position="24" pad="PD4"/>
-            <pin position="25" pad="PD3"/>
-            <pin position="26" pad="PD2"/>
-            <pin position="27" pad="PD1"/>
-            <pin position="28" pad="PD0"/>
-            <pin position="29" pad="PA7"/>
-            <pin position="30" pad="PA6"/>
-            <pin position="31" pad="PA5"/>
-            <pin position="32" pad="AVCC"/>
+            <pin position="1" pad-key="gnd"/>
+            <pin position="2" pad-key="pa4"/>
+            <pin position="3" pad-key="pa3"/>
+            <pin position="4" pad-key="pa2"/>
+            <pin position="5" pad-key="pa1"/>
+            <pin position="6" pad-key="pa0"/>
+            <pin position="7" pad-key="pdi"/>
+            <pin position="8" pad-key="reset"/>
+            <pin position="9" pad-key="pc7"/>
+            <pin position="10" pad-key="pc6"/>
+            <pin position="11" pad-key="pc5"/>
+            <pin position="12" pad-key="pc4"/>
+            <pin position="13" pad-key="pc3"/>
+            <pin position="14" pad-key="pc2"/>
+            <pin position="15" pad-key="pc1"/>
+            <pin position="16" pad-key="pc0"/>
+            <pin position="17" pad-key="vcc"/>
+            <pin position="18" pad-key="gnd"/>
+            <pin position="19" pad-key="pr1"/>
+            <pin position="20" pad-key="pr0"/>
+            <pin position="21" pad-key="pd7"/>
+            <pin position="22" pad-key="pd6"/>
+            <pin position="23" pad-key="pd5"/>
+            <pin position="24" pad-key="pd4"/>
+            <pin position="25" pad-key="pd3"/>
+            <pin position="26" pad-key="pd2"/>
+            <pin position="27" pad-key="pd1"/>
+            <pin position="28" pad-key="pd0"/>
+            <pin position="29" pad-key="pa7"/>
+            <pin position="30" pad-key="pa6"/>
+            <pin position="31" pad-key="pa5"/>
+            <pin position="32" pad-key="avcc"/>
         </pinout>
     </pinouts>
     <variants>
-        <variant name="ATxmega32E5-AU" pinout-key="qfp_qfn_32" package="TQFP32"/>
-        <variant name="ATxmega32E5-MU" pinout-key="qfp_qfn_32" package="VQFN32"/>
-        <variant name="ATxmega32E5-M4U" pinout-key="qfp_qfn_32" package="UQFN32"/>
-        <variant name="ATxmega32E5-AN" pinout-key="qfp_qfn_32" package="TQFP32"/>
-        <variant name="ATxmega32E5-MN" pinout-key="qfp_qfn_32" package="VQFN32"/>
-        <variant name="ATxmega32E5-M4N" pinout-key="qfp_qfn_32" package="UQFN32"/>
+        <variant key="atxmega32e5_au" name="ATxmega32E5-AU" pinout-key="qfp_qfn_32"/>
+        <variant key="atxmega32e5_mu" name="ATxmega32E5-MU" pinout-key="qfp_qfn_32"/>
+        <variant key="atxmega32e5_m4u" name="ATxmega32E5-M4U" pinout-key="qfp_qfn_32"/>
+        <variant key="atxmega32e5_an" name="ATxmega32E5-AN" pinout-key="qfp_qfn_32"/>
+        <variant key="atxmega32e5_mn" name="ATxmega32E5-MN" pinout-key="qfp_qfn_32"/>
+        <variant key="atxmega32e5_m4n" name="ATxmega32E5-M4N" pinout-key="qfp_qfn_32"/>
     </variants>
 </device>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA384C3.xml b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA384C3.xml
index a2540cce..d4ddf76a 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA384C3.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA384C3.xml
@@ -92,10 +92,10 @@
         <peripheral key="osc" name="OSC" module-key="i6079">
             <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"/>
-                <signal pad-id="pe2" function="TOSC" group="TOSC2"/>
-                <signal pad-id="pe3" function="TOSC" group="TOSC1"/>
+                <signal pad-key="pr0" function="XTAL" group="XTAL2"/>
+                <signal pad-key="pr1" function="XTAL" group="XTAL1"/>
+                <signal pad-key="pe2" function="TOSC" group="TOSC2"/>
+                <signal pad-key="pe3" function="TOSC" group="TOSC1"/>
             </signals>
         </peripheral>
         <peripheral key="dfllrc32m" name="DFLLRC32M" module-key="i6055">
@@ -119,11 +119,11 @@
         <peripheral key="portcfg" name="PORTCFG" module-key="i6075_portcfg">
             <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"/>
-                <signal pad-id="pc7" function="EVOUT" group="EVOUT" field="EVOUT"/>
-                <signal pad-id="pc4" function="EVOUT_ALT" group="EVOUT" field="CLKEVPIN"/>
-                <signal pad-id="pc6" function="RTCOUTC" group="RTCOUT"/>
+                <signal pad-key="pc7" function="CLKOUT" group="CLKOUT" field="CLKOUT"/>
+                <signal pad-key="pc4" function="CLKOUT_ALT" group="CLKOUT" field="CLKEVPIN"/>
+                <signal pad-key="pc7" function="EVOUT" group="EVOUT" field="EVOUT"/>
+                <signal pad-key="pc4" function="EVOUT_ALT" group="EVOUT" field="CLKEVPIN"/>
+                <signal pad-key="pc6" function="RTCOUTC" group="RTCOUT"/>
             </signals>
         </peripheral>
         <peripheral key="aes" name="AES" module-key="i6096">
@@ -144,39 +144,39 @@
         <peripheral key="adca" name="ADCA" module-key="i6110">
             <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"/>
-                <signal pad-id="pa2" index="2" function="ADC" group="ADC"/>
-                <signal pad-id="pa3" index="3" function="ADC" group="ADC"/>
-                <signal pad-id="pa4" index="4" function="ADC" group="ADC"/>
-                <signal pad-id="pa5" index="5" function="ADC" group="ADC"/>
-                <signal pad-id="pa6" index="6" function="ADC" group="ADC"/>
-                <signal pad-id="pa7" index="7" function="ADC" group="ADC"/>
-                <signal pad-id="pb0" index="8" function="ADC" group="ADC"/>
-                <signal pad-id="pb1" index="9" function="ADC" group="ADC"/>
-                <signal pad-id="pb2" index="10" function="ADC" group="ADC"/>
-                <signal pad-id="pb3" index="11" function="ADC" group="ADC"/>
-                <signal pad-id="pb4" index="12" function="ADC" group="ADC"/>
-                <signal pad-id="pb5" index="13" function="ADC" group="ADC"/>
-                <signal pad-id="pb6" index="14" function="ADC" group="ADC"/>
-                <signal pad-id="pb7" index="15" function="ADC" group="ADC"/>
-                <signal pad-id="pa0" index="0" function="AREF" group="REFA"/>
-                <signal pad-id="pb0" index="0" function="AREF" group="REFB"/>
+                <signal pad-key="pa0" index="0" function="ADC" group="ADC"/>
+                <signal pad-key="pa1" index="1" function="ADC" group="ADC"/>
+                <signal pad-key="pa2" index="2" function="ADC" group="ADC"/>
+                <signal pad-key="pa3" index="3" function="ADC" group="ADC"/>
+                <signal pad-key="pa4" index="4" function="ADC" group="ADC"/>
+                <signal pad-key="pa5" index="5" function="ADC" group="ADC"/>
+                <signal pad-key="pa6" index="6" function="ADC" group="ADC"/>
+                <signal pad-key="pa7" index="7" function="ADC" group="ADC"/>
+                <signal pad-key="pb0" index="8" function="ADC" group="ADC"/>
+                <signal pad-key="pb1" index="9" function="ADC" group="ADC"/>
+                <signal pad-key="pb2" index="10" function="ADC" group="ADC"/>
+                <signal pad-key="pb3" index="11" function="ADC" group="ADC"/>
+                <signal pad-key="pb4" index="12" function="ADC" group="ADC"/>
+                <signal pad-key="pb5" index="13" function="ADC" group="ADC"/>
+                <signal pad-key="pb6" index="14" function="ADC" group="ADC"/>
+                <signal pad-key="pb7" index="15" function="ADC" group="ADC"/>
+                <signal pad-key="pa0" index="0" function="AREF" group="REFA"/>
+                <signal pad-key="pb0" index="0" function="AREF" group="REFB"/>
             </signals>
         </peripheral>
         <peripheral key="aca" name="ACA" module-key="i6077">
             <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"/>
-                <signal pad-id="pa2" index="2" function="AC" group="AC"/>
-                <signal pad-id="pa3" index="3" function="AC" group="AC"/>
-                <signal pad-id="pa4" index="4" function="AC" group="AC"/>
-                <signal pad-id="pa5" index="5" function="AC" group="AC"/>
-                <signal pad-id="pa6" index="6" function="AC" group="AC"/>
-                <signal pad-id="pa7" index="7" function="AC" group="AC"/>
-                <signal pad-id="pa6" index="1" function="ACOUT" group="ACOUT"/>
-                <signal pad-id="pa7" index="0" function="ACOUT" group="ACOUT"/>
+                <signal pad-key="pa0" index="0" function="AC" group="AC"/>
+                <signal pad-key="pa1" index="1" function="AC" group="AC"/>
+                <signal pad-key="pa2" index="2" function="AC" group="AC"/>
+                <signal pad-key="pa3" index="3" function="AC" group="AC"/>
+                <signal pad-key="pa4" index="4" function="AC" group="AC"/>
+                <signal pad-key="pa5" index="5" function="AC" group="AC"/>
+                <signal pad-key="pa6" index="6" function="AC" group="AC"/>
+                <signal pad-key="pa7" index="7" function="AC" group="AC"/>
+                <signal pad-key="pa6" index="1" function="ACOUT" group="ACOUT"/>
+                <signal pad-key="pa7" index="0" function="ACOUT" group="ACOUT"/>
             </signals>
         </peripheral>
         <peripheral key="rtc" name="RTC" module-key="i6093">
@@ -185,219 +185,219 @@
         <peripheral key="twic" name="TWIC" module-key="i6089">
             <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"/>
+                <signal pad-key="pc0" function="TWI" group="SDA"/>
+                <signal pad-key="pc1" function="TWI" group="SCL"/>
             </signals>
         </peripheral>
         <peripheral key="twie" name="TWIE" module-key="i6089">
             <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"/>
+                <signal pad-key="pe0" function="TWI" group="SDA"/>
+                <signal pad-key="pe1" function="TWI" group="SCL"/>
             </signals>
         </peripheral>
         <peripheral key="usb" name="USB" module-key="i3005">
             <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"/>
+                <signal pad-key="pd6" function="USB" group="DN"/>
+                <signal pad-key="pd7" function="USB" group="DP"/>
             </signals>
         </peripheral>
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pa2" index="2" function="PORTA" group="P"/>
-                <signal pad-id="pa3" index="3" function="PORTA" group="P"/>
-                <signal pad-id="pa4" index="4" function="PORTA" group="P"/>
-                <signal pad-id="pa5" index="5" function="PORTA" group="P"/>
-                <signal pad-id="pa6" index="6" function="PORTA" group="P"/>
-                <signal pad-id="pa7" index="7" function="PORTA" group="P"/>
+                <signal pad-key="pa0" index="0" function="PORTA" group="P"/>
+                <signal pad-key="pa1" index="1" function="PORTA" group="P"/>
+                <signal pad-key="pa2" index="2" function="PORTA" group="P"/>
+                <signal pad-key="pa3" index="3" function="PORTA" group="P"/>
+                <signal pad-key="pa4" index="4" function="PORTA" group="P"/>
+                <signal pad-key="pa5" index="5" function="PORTA" group="P"/>
+                <signal pad-key="pa6" index="6" function="PORTA" group="P"/>
+                <signal pad-key="pa7" index="7" function="PORTA" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pb2" index="2" function="PORTB" group="P"/>
-                <signal pad-id="pb3" index="3" function="PORTB" group="P"/>
-                <signal pad-id="pb4" index="4" function="PORTB" group="P"/>
-                <signal pad-id="pb5" index="5" function="PORTB" group="P"/>
-                <signal pad-id="pb6" index="6" function="PORTB" group="P"/>
-                <signal pad-id="pb7" index="7" function="PORTB" group="P"/>
+                <signal pad-key="pb0" index="0" function="PORTB" group="P"/>
+                <signal pad-key="pb1" index="1" function="PORTB" group="P"/>
+                <signal pad-key="pb2" index="2" function="PORTB" group="P"/>
+                <signal pad-key="pb3" index="3" function="PORTB" group="P"/>
+                <signal pad-key="pb4" index="4" function="PORTB" group="P"/>
+                <signal pad-key="pb5" index="5" function="PORTB" group="P"/>
+                <signal pad-key="pb6" index="6" function="PORTB" group="P"/>
+                <signal pad-key="pb7" index="7" function="PORTB" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pc2" index="2" function="PORTC" group="P"/>
-                <signal pad-id="pc3" index="3" function="PORTC" group="P"/>
-                <signal pad-id="pc4" index="4" function="PORTC" group="P"/>
-                <signal pad-id="pc5" index="5" function="PORTC" group="P"/>
-                <signal pad-id="pc6" index="6" function="PORTC" group="P"/>
-                <signal pad-id="pc7" index="7" function="PORTC" group="P"/>
+                <signal pad-key="pc0" index="0" function="PORTC" group="P"/>
+                <signal pad-key="pc1" index="1" function="PORTC" group="P"/>
+                <signal pad-key="pc2" index="2" function="PORTC" group="P"/>
+                <signal pad-key="pc3" index="3" function="PORTC" group="P"/>
+                <signal pad-key="pc4" index="4" function="PORTC" group="P"/>
+                <signal pad-key="pc5" index="5" function="PORTC" group="P"/>
+                <signal pad-key="pc6" index="6" function="PORTC" group="P"/>
+                <signal pad-key="pc7" index="7" function="PORTC" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pd2" index="2" function="PORTD" group="P"/>
-                <signal pad-id="pd3" index="3" function="PORTD" group="P"/>
-                <signal pad-id="pd4" index="4" function="PORTD" group="P"/>
-                <signal pad-id="pd5" index="5" function="PORTD" group="P"/>
-                <signal pad-id="pd6" index="6" function="PORTD" group="P"/>
-                <signal pad-id="pd7" index="7" function="PORTD" group="P"/>
+                <signal pad-key="pd0" index="0" function="PORTD" group="P"/>
+                <signal pad-key="pd1" index="1" function="PORTD" group="P"/>
+                <signal pad-key="pd2" index="2" function="PORTD" group="P"/>
+                <signal pad-key="pd3" index="3" function="PORTD" group="P"/>
+                <signal pad-key="pd4" index="4" function="PORTD" group="P"/>
+                <signal pad-key="pd5" index="5" function="PORTD" group="P"/>
+                <signal pad-key="pd6" index="6" function="PORTD" group="P"/>
+                <signal pad-key="pd7" index="7" function="PORTD" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="porte" name="PORTE" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pe2" index="2" function="PORTE" group="P"/>
-                <signal pad-id="pe3" index="3" function="PORTE" group="P"/>
-                <signal pad-id="pe4" index="4" function="PORTE" group="P"/>
-                <signal pad-id="pe5" index="5" function="PORTE" group="P"/>
-                <signal pad-id="pe6" index="6" function="PORTE" group="P"/>
-                <signal pad-id="pe7" index="7" function="PORTE" group="P"/>
+                <signal pad-key="pe0" index="0" function="PORTE" group="P"/>
+                <signal pad-key="pe1" index="1" function="PORTE" group="P"/>
+                <signal pad-key="pe2" index="2" function="PORTE" group="P"/>
+                <signal pad-key="pe3" index="3" function="PORTE" group="P"/>
+                <signal pad-key="pe4" index="4" function="PORTE" group="P"/>
+                <signal pad-key="pe5" index="5" function="PORTE" group="P"/>
+                <signal pad-key="pe6" index="6" function="PORTE" group="P"/>
+                <signal pad-key="pe7" index="7" function="PORTE" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portf" name="PORTF" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pf2" index="2" function="PORTF" group="P"/>
-                <signal pad-id="pf3" index="3" function="PORTF" group="P"/>
-                <signal pad-id="pf4" index="4" function="PORTF" group="P"/>
-                <signal pad-id="pf5" index="5" function="PORTF" group="P"/>
-                <signal pad-id="pf6" index="6" function="PORTF" group="P"/>
-                <signal pad-id="pf7" index="7" function="PORTF" group="P"/>
+                <signal pad-key="pf0" index="0" function="PORTF" group="P"/>
+                <signal pad-key="pf1" index="1" function="PORTF" group="P"/>
+                <signal pad-key="pf2" index="2" function="PORTF" group="P"/>
+                <signal pad-key="pf3" index="3" function="PORTF" group="P"/>
+                <signal pad-key="pf4" index="4" function="PORTF" group="P"/>
+                <signal pad-key="pf5" index="5" function="PORTF" group="P"/>
+                <signal pad-key="pf6" index="6" function="PORTF" group="P"/>
+                <signal pad-key="pf7" index="7" function="PORTF" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portr" name="PORTR" module-key="gpio_port">
             <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"/>
+                <signal pad-key="pr0" index="0" function="PORTR" group="P"/>
+                <signal pad-key="pr1" index="1" function="PORTR" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="tcc0" name="TCC0" module-key="i6090_tc">
             <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"/>
-                <signal pad-id="pc2" function="TC0" group="OC0C" field="TC0C"/>
-                <signal pad-id="pc3" function="TC0" group="OC0D" field="TC0D"/>
-                <signal pad-id="pc4" function="TC0_ALT" group="OC0A" field="TC0A"/>
-                <signal pad-id="pc5" function="TC0_ALT" group="OC0B" field="TC0B"/>
-                <signal pad-id="pc6" function="TC0_ALT" group="OC0C" field="TC0C"/>
-                <signal pad-id="pc7" function="TC0_ALT" group="OC0D" field="TC0D"/>
+                <signal pad-key="pc0" function="TC0" group="OC0A" field="TC0A"/>
+                <signal pad-key="pc1" function="TC0" group="OC0B" field="TC0B"/>
+                <signal pad-key="pc2" function="TC0" group="OC0C" field="TC0C"/>
+                <signal pad-key="pc3" function="TC0" group="OC0D" field="TC0D"/>
+                <signal pad-key="pc4" function="TC0_ALT" group="OC0A" field="TC0A"/>
+                <signal pad-key="pc5" function="TC0_ALT" group="OC0B" field="TC0B"/>
+                <signal pad-key="pc6" function="TC0_ALT" group="OC0C" field="TC0C"/>
+                <signal pad-key="pc7" function="TC0_ALT" group="OC0D" field="TC0D"/>
             </signals>
         </peripheral>
         <peripheral key="tcc1" name="TCC1" module-key="i6090_tc">
             <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"/>
+                <signal pad-key="pc4" function="TC1" group="OC1A"/>
+                <signal pad-key="pc5" function="TC1" group="OC1B"/>
             </signals>
         </peripheral>
         <peripheral key="tcd0" name="TCD0" module-key="i6090_tc">
             <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"/>
-                <signal pad-id="pd2" function="TC0" group="OC0C"/>
-                <signal pad-id="pd3" function="TC0" group="OC0D"/>
+                <signal pad-key="pd0" function="TC0" group="OC0A"/>
+                <signal pad-key="pd1" function="TC0" group="OC0B"/>
+                <signal pad-key="pd2" function="TC0" group="OC0C"/>
+                <signal pad-key="pd3" function="TC0" group="OC0D"/>
             </signals>
         </peripheral>
         <peripheral key="tce0" name="TCE0" module-key="i6090_tc">
             <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"/>
-                <signal pad-id="pe2" function="TC0" group="OC0C"/>
-                <signal pad-id="pe3" function="TC0" group="OC0D"/>
+                <signal pad-key="pe0" function="TC0" group="OC0A"/>
+                <signal pad-key="pe1" function="TC0" group="OC0B"/>
+                <signal pad-key="pe2" function="TC0" group="OC0C"/>
+                <signal pad-key="pe3" function="TC0" group="OC0D"/>
             </signals>
         </peripheral>
         <peripheral key="tcf0" name="TCF0" module-key="i6090_tc">
             <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"/>
-                <signal pad-id="pf2" function="TC0" group="OC0C"/>
-                <signal pad-id="pf3" function="TC0" group="OC0D"/>
+                <signal pad-key="pf0" function="TC0" group="OC0A"/>
+                <signal pad-key="pf1" function="TC0" group="OC0B"/>
+                <signal pad-key="pf2" function="TC0" group="OC0C"/>
+                <signal pad-key="pf3" function="TC0" group="OC0D"/>
             </signals>
         </peripheral>
         <peripheral key="tcc2" name="TCC2" module-key="i6090_tc2">
             <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"/>
-                <signal pad-id="pc2" function="TC2" group="LOC2C"/>
-                <signal pad-id="pc3" function="TC2" group="LOC2D"/>
-                <signal pad-id="pc4" function="TC2" group="HOC2A"/>
-                <signal pad-id="pc5" function="TC2" group="HOC2B"/>
-                <signal pad-id="pc6" function="TC2" group="HOC2C"/>
-                <signal pad-id="pc7" function="TC2" group="HOC2D"/>
+                <signal pad-key="pc0" function="TC2" group="LOC2A"/>
+                <signal pad-key="pc1" function="TC2" group="LOC2B"/>
+                <signal pad-key="pc2" function="TC2" group="LOC2C"/>
+                <signal pad-key="pc3" function="TC2" group="LOC2D"/>
+                <signal pad-key="pc4" function="TC2" group="HOC2A"/>
+                <signal pad-key="pc5" function="TC2" group="HOC2B"/>
+                <signal pad-key="pc6" function="TC2" group="HOC2C"/>
+                <signal pad-key="pc7" function="TC2" group="HOC2D"/>
             </signals>
         </peripheral>
         <peripheral key="tcd2" name="TCD2" module-key="i6090_tc2">
             <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"/>
-                <signal pad-id="pd2" function="TC2" group="LOC2C"/>
-                <signal pad-id="pd3" function="TC2" group="LOC2D"/>
-                <signal pad-id="pd4" function="TC2" group="HOC2A"/>
-                <signal pad-id="pd5" function="TC2" group="HOC2B"/>
-                <signal pad-id="pd6" function="TC2" group="HOC2C"/>
-                <signal pad-id="pd7" function="TC2" group="HOC2D"/>
+                <signal pad-key="pd0" function="TC2" group="LOC2A"/>
+                <signal pad-key="pd1" function="TC2" group="LOC2B"/>
+                <signal pad-key="pd2" function="TC2" group="LOC2C"/>
+                <signal pad-key="pd3" function="TC2" group="LOC2D"/>
+                <signal pad-key="pd4" function="TC2" group="HOC2A"/>
+                <signal pad-key="pd5" function="TC2" group="HOC2B"/>
+                <signal pad-key="pd6" function="TC2" group="HOC2C"/>
+                <signal pad-key="pd7" function="TC2" group="HOC2D"/>
             </signals>
         </peripheral>
         <peripheral key="tce2" name="TCE2" module-key="i6090_tc2">
             <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"/>
-                <signal pad-id="pe2" function="TC2" group="LOC2C"/>
-                <signal pad-id="pe3" function="TC2" group="LOC2D"/>
-                <signal pad-id="pe4" function="TC2" group="HOC2A"/>
-                <signal pad-id="pe5" function="TC2" group="HOC2B"/>
-                <signal pad-id="pe6" function="TC2" group="HOC2C"/>
-                <signal pad-id="pe7" function="TC2" group="HOC2D"/>
+                <signal pad-key="pe0" function="TC2" group="LOC2A"/>
+                <signal pad-key="pe1" function="TC2" group="LOC2B"/>
+                <signal pad-key="pe2" function="TC2" group="LOC2C"/>
+                <signal pad-key="pe3" function="TC2" group="LOC2D"/>
+                <signal pad-key="pe4" function="TC2" group="HOC2A"/>
+                <signal pad-key="pe5" function="TC2" group="HOC2B"/>
+                <signal pad-key="pe6" function="TC2" group="HOC2C"/>
+                <signal pad-key="pe7" function="TC2" group="HOC2D"/>
             </signals>
         </peripheral>
         <peripheral key="tcf2" name="TCF2" module-key="i6090_tc2">
             <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"/>
-                <signal pad-id="pf2" function="TC2" group="LOC2C"/>
-                <signal pad-id="pf3" function="TC2" group="LOC2D"/>
-                <signal pad-id="pf4" function="TC2" group="HOC2A"/>
-                <signal pad-id="pf5" function="TC2" group="HOC2B"/>
-                <signal pad-id="pf6" function="TC2" group="HOC2C"/>
-                <signal pad-id="pf7" function="TC2" group="HOC2D"/>
+                <signal pad-key="pf0" function="TC2" group="LOC2A"/>
+                <signal pad-key="pf1" function="TC2" group="LOC2B"/>
+                <signal pad-key="pf2" function="TC2" group="LOC2C"/>
+                <signal pad-key="pf3" function="TC2" group="LOC2D"/>
+                <signal pad-key="pf4" function="TC2" group="HOC2A"/>
+                <signal pad-key="pf5" function="TC2" group="HOC2B"/>
+                <signal pad-key="pf6" function="TC2" group="HOC2C"/>
+                <signal pad-key="pf7" function="TC2" group="HOC2D"/>
             </signals>
         </peripheral>
         <peripheral key="awexc" name="AWEXC" module-key="i6090_awex">
             <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"/>
-                <signal pad-id="pc2" function="AWEX" group="OC0BLS"/>
-                <signal pad-id="pc3" function="AWEX" group="OC0BHS"/>
-                <signal pad-id="pc4" function="AWEX" group="OC0CLS"/>
-                <signal pad-id="pc5" function="AWEX" group="OC0CHS"/>
-                <signal pad-id="pc6" function="AWEX" group="OC0DLS"/>
-                <signal pad-id="pc7" function="AWEX" group="OC0DHS"/>
+                <signal pad-key="pc0" function="AWEX" group="OC0ALS"/>
+                <signal pad-key="pc1" function="AWEX" group="OC0AHS"/>
+                <signal pad-key="pc2" function="AWEX" group="OC0BLS"/>
+                <signal pad-key="pc3" function="AWEX" group="OC0BHS"/>
+                <signal pad-key="pc4" function="AWEX" group="OC0CLS"/>
+                <signal pad-key="pc5" function="AWEX" group="OC0CHS"/>
+                <signal pad-key="pc6" function="AWEX" group="OC0DLS"/>
+                <signal pad-key="pc7" function="AWEX" group="OC0DHS"/>
             </signals>
         </peripheral>
         <peripheral key="hiresc" name="HIRESC" module-key="i6090_hires">
@@ -406,50 +406,50 @@
         <peripheral key="usartc0" name="USARTC0" module-key="i6090_usart">
             <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"/>
-                <signal pad-id="pc3" function="USART" group="TXD" field="USART0"/>
-                <signal pad-id="pc5" function="USART_ALT" group="XCK" field="USART0"/>
-                <signal pad-id="pc6" function="USART_ALT" group="RXD" field="USART0"/>
-                <signal pad-id="pc7" function="USART_ALT" group="TXD" field="USART0"/>
+                <signal pad-key="pc1" function="USART" group="XCK" field="USART0"/>
+                <signal pad-key="pc2" function="USART" group="RXD" field="USART0"/>
+                <signal pad-key="pc3" function="USART" group="TXD" field="USART0"/>
+                <signal pad-key="pc5" function="USART_ALT" group="XCK" field="USART0"/>
+                <signal pad-key="pc6" function="USART_ALT" group="RXD" field="USART0"/>
+                <signal pad-key="pc7" function="USART_ALT" group="TXD" field="USART0"/>
             </signals>
         </peripheral>
         <peripheral key="usartd0" name="USARTD0" module-key="i6090_usart">
             <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"/>
-                <signal pad-id="pd3" function="USART" group="TXD"/>
+                <signal pad-key="pd1" function="USART" group="XCK"/>
+                <signal pad-key="pd2" function="USART" group="RXD"/>
+                <signal pad-key="pd3" function="USART" group="TXD"/>
             </signals>
         </peripheral>
         <peripheral key="usarte0" name="USARTE0" module-key="i6090_usart">
             <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"/>
-                <signal pad-id="pe3" function="USART" group="TXD"/>
+                <signal pad-key="pe1" function="USART" group="XCK"/>
+                <signal pad-key="pe2" function="USART" group="RXD"/>
+                <signal pad-key="pe3" function="USART" group="TXD"/>
             </signals>
         </peripheral>
         <peripheral key="spic" name="SPIC" module-key="i6090_spi">
             <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"/>
-                <signal pad-id="pc6" function="SPI" group="MISO" field="SPI"/>
-                <signal pad-id="pc7" function="SPI" group="SCK" field="SPI"/>
-                <signal pad-id="pc4" function="SPI_ALT" group="SS" field="SPI"/>
-                <signal pad-id="pc5" function="SPI_ALT" group="SCK" field="SPI"/>
-                <signal pad-id="pc6" function="SPI_ALT" group="MISO" field="SPI"/>
-                <signal pad-id="pc7" function="SPI_ALT" group="MOSI" field="SPI"/>
+                <signal pad-key="pc4" function="SPI" group="SS" field="SPI"/>
+                <signal pad-key="pc5" function="SPI" group="MOSI" field="SPI"/>
+                <signal pad-key="pc6" function="SPI" group="MISO" field="SPI"/>
+                <signal pad-key="pc7" function="SPI" group="SCK" field="SPI"/>
+                <signal pad-key="pc4" function="SPI_ALT" group="SS" field="SPI"/>
+                <signal pad-key="pc5" function="SPI_ALT" group="SCK" field="SPI"/>
+                <signal pad-key="pc6" function="SPI_ALT" group="MISO" field="SPI"/>
+                <signal pad-key="pc7" function="SPI_ALT" group="MOSI" field="SPI"/>
             </signals>
         </peripheral>
         <peripheral key="spid" name="SPID" module-key="i6090_spi">
             <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"/>
-                <signal pad-id="pd6" function="SPI" group="MISO"/>
-                <signal pad-id="pd7" function="SPI" group="SCK"/>
+                <signal pad-key="pd4" function="SPI" group="SS"/>
+                <signal pad-key="pd5" function="SPI" group="MOSI"/>
+                <signal pad-key="pd6" function="SPI" group="MISO"/>
+                <signal pad-key="pd7" function="SPI" group="SCK"/>
             </signals>
         </peripheral>
         <peripheral key="ircom" name="IRCOM" module-key="i6090_ircom">
@@ -1683,78 +1683,135 @@
             </register-group>
         </module>
     </modules>
+    <pads>
+        <pad key="pa3" name="PA3"/>
+        <pad key="pa4" name="PA4"/>
+        <pad key="pa5" name="PA5"/>
+        <pad key="pa6" name="PA6"/>
+        <pad key="pa7" name="PA7"/>
+        <pad key="pb0" name="PB0"/>
+        <pad key="pb1" name="PB1"/>
+        <pad key="pb2" name="PB2"/>
+        <pad key="pb3" name="PB3"/>
+        <pad key="pb4" name="PB4"/>
+        <pad key="pb5" name="PB5"/>
+        <pad key="pb6" name="PB6"/>
+        <pad key="pb7" name="PB7"/>
+        <pad key="gnd" name="GND"/>
+        <pad key="vcc" name="VCC"/>
+        <pad key="pc0" name="PC0"/>
+        <pad key="pc1" name="PC1"/>
+        <pad key="pc2" name="PC2"/>
+        <pad key="pc3" name="PC3"/>
+        <pad key="pc4" name="PC4"/>
+        <pad key="pc5" name="PC5"/>
+        <pad key="pc6" name="PC6"/>
+        <pad key="pc7" name="PC7"/>
+        <pad key="pd0" name="PD0"/>
+        <pad key="pd1" name="PD1"/>
+        <pad key="pd2" name="PD2"/>
+        <pad key="pd3" name="PD3"/>
+        <pad key="pd4" name="PD4"/>
+        <pad key="pd5" name="PD5"/>
+        <pad key="pd6" name="PD6"/>
+        <pad key="pd7" name="PD7"/>
+        <pad key="pe0" name="PE0"/>
+        <pad key="pe1" name="PE1"/>
+        <pad key="pe2" name="PE2"/>
+        <pad key="pe3" name="PE3"/>
+        <pad key="pe4" name="PE4"/>
+        <pad key="pe5" name="PE5"/>
+        <pad key="pe6" name="PE6"/>
+        <pad key="pe7" name="PE7"/>
+        <pad key="pf0" name="PF0"/>
+        <pad key="pf1" name="PF1"/>
+        <pad key="pf2" name="PF2"/>
+        <pad key="pf3" name="PF3"/>
+        <pad key="pf4" name="PF4"/>
+        <pad key="pf5" name="PF5"/>
+        <pad key="pf6" name="PF6"/>
+        <pad key="pf7" name="PF7"/>
+        <pad key="pdi" name="PDI"/>
+        <pad key="reset" name="RESET"/>
+        <pad key="pr0" name="PR0"/>
+        <pad key="pr1" name="PR1"/>
+        <pad key="avcc" name="AVCC"/>
+        <pad key="pa0" name="PA0"/>
+        <pad key="pa1" name="PA1"/>
+        <pad key="pa2" name="PA2"/>
+    </pads>
     <pinouts>
         <pinout key="qfp_qfn_64" name="QFP_QFN_64" type="qfn">
-            <pin position="1" pad="PA3"/>
-            <pin position="2" pad="PA4"/>
-            <pin position="3" pad="PA5"/>
-            <pin position="4" pad="PA6"/>
-            <pin position="5" pad="PA7"/>
-            <pin position="6" pad="PB0"/>
-            <pin position="7" pad="PB1"/>
-            <pin position="8" pad="PB2"/>
-            <pin position="9" pad="PB3"/>
-            <pin position="10" pad="PB4"/>
-            <pin position="11" pad="PB5"/>
-            <pin position="12" pad="PB6"/>
-            <pin position="13" pad="PB7"/>
-            <pin position="14" pad="GND"/>
-            <pin position="15" pad="VCC"/>
-            <pin position="16" pad="PC0"/>
-            <pin position="17" pad="PC1"/>
-            <pin position="18" pad="PC2"/>
-            <pin position="19" pad="PC3"/>
-            <pin position="20" pad="PC4"/>
-            <pin position="21" pad="PC5"/>
-            <pin position="22" pad="PC6"/>
-            <pin position="23" pad="PC7"/>
-            <pin position="24" pad="GND"/>
-            <pin position="25" pad="VCC"/>
-            <pin position="26" pad="PD0"/>
-            <pin position="27" pad="PD1"/>
-            <pin position="28" pad="PD2"/>
-            <pin position="29" pad="PD3"/>
-            <pin position="30" pad="PD4"/>
-            <pin position="31" pad="PD5"/>
-            <pin position="32" pad="PD6"/>
-            <pin position="33" pad="PD7"/>
-            <pin position="34" pad="GND"/>
-            <pin position="35" pad="VCC"/>
-            <pin position="36" pad="PE0"/>
-            <pin position="37" pad="PE1"/>
-            <pin position="38" pad="PE2"/>
-            <pin position="39" pad="PE3"/>
-            <pin position="40" pad="PE4"/>
-            <pin position="41" pad="PE5"/>
-            <pin position="42" pad="PE6"/>
-            <pin position="43" pad="PE7"/>
-            <pin position="44" pad="GND"/>
-            <pin position="45" pad="VCC"/>
-            <pin position="46" pad="PF0"/>
-            <pin position="47" pad="PF1"/>
-            <pin position="48" pad="PF2"/>
-            <pin position="49" pad="PF3"/>
-            <pin position="50" pad="PF4"/>
-            <pin position="51" pad="PF5"/>
-            <pin position="52" pad="GND"/>
-            <pin position="53" pad="VCC"/>
-            <pin position="54" pad="PF6"/>
-            <pin position="55" pad="PF7"/>
-            <pin position="56" pad="PDI"/>
-            <pin position="57" pad="RESET"/>
-            <pin position="58" pad="PR0"/>
-            <pin position="59" pad="PR1"/>
-            <pin position="60" pad="GND"/>
-            <pin position="61" pad="AVCC"/>
-            <pin position="62" pad="PA0"/>
-            <pin position="63" pad="PA1"/>
-            <pin position="64" pad="PA2"/>
+            <pin position="1" pad-key="pa3"/>
+            <pin position="2" pad-key="pa4"/>
+            <pin position="3" pad-key="pa5"/>
+            <pin position="4" pad-key="pa6"/>
+            <pin position="5" pad-key="pa7"/>
+            <pin position="6" pad-key="pb0"/>
+            <pin position="7" pad-key="pb1"/>
+            <pin position="8" pad-key="pb2"/>
+            <pin position="9" pad-key="pb3"/>
+            <pin position="10" pad-key="pb4"/>
+            <pin position="11" pad-key="pb5"/>
+            <pin position="12" pad-key="pb6"/>
+            <pin position="13" pad-key="pb7"/>
+            <pin position="14" pad-key="gnd"/>
+            <pin position="15" pad-key="vcc"/>
+            <pin position="16" pad-key="pc0"/>
+            <pin position="17" pad-key="pc1"/>
+            <pin position="18" pad-key="pc2"/>
+            <pin position="19" pad-key="pc3"/>
+            <pin position="20" pad-key="pc4"/>
+            <pin position="21" pad-key="pc5"/>
+            <pin position="22" pad-key="pc6"/>
+            <pin position="23" pad-key="pc7"/>
+            <pin position="24" pad-key="gnd"/>
+            <pin position="25" pad-key="vcc"/>
+            <pin position="26" pad-key="pd0"/>
+            <pin position="27" pad-key="pd1"/>
+            <pin position="28" pad-key="pd2"/>
+            <pin position="29" pad-key="pd3"/>
+            <pin position="30" pad-key="pd4"/>
+            <pin position="31" pad-key="pd5"/>
+            <pin position="32" pad-key="pd6"/>
+            <pin position="33" pad-key="pd7"/>
+            <pin position="34" pad-key="gnd"/>
+            <pin position="35" pad-key="vcc"/>
+            <pin position="36" pad-key="pe0"/>
+            <pin position="37" pad-key="pe1"/>
+            <pin position="38" pad-key="pe2"/>
+            <pin position="39" pad-key="pe3"/>
+            <pin position="40" pad-key="pe4"/>
+            <pin position="41" pad-key="pe5"/>
+            <pin position="42" pad-key="pe6"/>
+            <pin position="43" pad-key="pe7"/>
+            <pin position="44" pad-key="gnd"/>
+            <pin position="45" pad-key="vcc"/>
+            <pin position="46" pad-key="pf0"/>
+            <pin position="47" pad-key="pf1"/>
+            <pin position="48" pad-key="pf2"/>
+            <pin position="49" pad-key="pf3"/>
+            <pin position="50" pad-key="pf4"/>
+            <pin position="51" pad-key="pf5"/>
+            <pin position="52" pad-key="gnd"/>
+            <pin position="53" pad-key="vcc"/>
+            <pin position="54" pad-key="pf6"/>
+            <pin position="55" pad-key="pf7"/>
+            <pin position="56" pad-key="pdi"/>
+            <pin position="57" pad-key="reset"/>
+            <pin position="58" pad-key="pr0"/>
+            <pin position="59" pad-key="pr1"/>
+            <pin position="60" pad-key="gnd"/>
+            <pin position="61" pad-key="avcc"/>
+            <pin position="62" pad-key="pa0"/>
+            <pin position="63" pad-key="pa1"/>
+            <pin position="64" pad-key="pa2"/>
         </pinout>
     </pinouts>
     <variants>
-        <variant name="ATxmega384C3-AU" pinout-key="qfp_qfn_64" package="TQFP64"/>
-        <variant name="ATxmega384C3-MH" pinout-key="qfp_qfn_64" package="QFN64"/>
-        <variant name="ATxmega384C3-AN" pinout-key="qfp_qfn_64" package="TQFP64"/>
-        <variant name="ATxmega384C3-M7" pinout-key="qfp_qfn_64" package="QFN64"/>
+        <variant key="atxmega384c3_au" name="ATxmega384C3-AU" pinout-key="qfp_qfn_64"/>
+        <variant key="atxmega384c3_mh" name="ATxmega384C3-MH" pinout-key="qfp_qfn_64"/>
+        <variant key="atxmega384c3_an" name="ATxmega384C3-AN" pinout-key="qfp_qfn_64"/>
+        <variant key="atxmega384c3_m7" name="ATxmega384C3-M7" pinout-key="qfp_qfn_64"/>
     </variants>
 </device>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA384D3.xml b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA384D3.xml
index 65a54c4e..18dc679e 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA384D3.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA384D3.xml
@@ -92,10 +92,10 @@
         <peripheral key="osc" name="OSC" module-key="i6079">
             <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"/>
-                <signal pad-id="pe2" function="TOSC" group="TOSC2"/>
-                <signal pad-id="pe3" function="TOSC" group="TOSC1"/>
+                <signal pad-key="pr0" function="XTAL" group="XTAL2"/>
+                <signal pad-key="pr1" function="XTAL" group="XTAL1"/>
+                <signal pad-key="pe2" function="TOSC" group="TOSC2"/>
+                <signal pad-key="pe3" function="TOSC" group="TOSC1"/>
             </signals>
         </peripheral>
         <peripheral key="dfllrc32m" name="DFLLRC32M" module-key="i6055">
@@ -119,11 +119,11 @@
         <peripheral key="portcfg" name="PORTCFG" module-key="i6075_portcfg">
             <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"/>
-                <signal pad-id="pc7" function="EVOUT" group="EVOUT" field="EVOUT"/>
-                <signal pad-id="pc4" function="EVOUT_ALT" group="EVOUT" field="CLKEVPIN"/>
-                <signal pad-id="pc6" function="RTCOUTC" group="RTCOUT"/>
+                <signal pad-key="pc7" function="CLKOUT" group="CLKOUT" field="CLKOUT"/>
+                <signal pad-key="pc4" function="CLKOUT_ALT" group="CLKOUT" field="CLKEVPIN"/>
+                <signal pad-key="pc7" function="EVOUT" group="EVOUT" field="EVOUT"/>
+                <signal pad-key="pc4" function="EVOUT_ALT" group="EVOUT" field="CLKEVPIN"/>
+                <signal pad-key="pc6" function="RTCOUTC" group="RTCOUT"/>
             </signals>
         </peripheral>
         <peripheral key="crc" name="CRC" module-key="i6111">
@@ -138,39 +138,39 @@
         <peripheral key="adca" name="ADCA" module-key="i6110">
             <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"/>
-                <signal pad-id="pa2" index="2" function="ADC" group="ADC"/>
-                <signal pad-id="pa3" index="3" function="ADC" group="ADC"/>
-                <signal pad-id="pa4" index="4" function="ADC" group="ADC"/>
-                <signal pad-id="pa5" index="5" function="ADC" group="ADC"/>
-                <signal pad-id="pa6" index="6" function="ADC" group="ADC"/>
-                <signal pad-id="pa7" index="7" function="ADC" group="ADC"/>
-                <signal pad-id="pb0" index="8" function="ADC" group="ADC"/>
-                <signal pad-id="pb1" index="9" function="ADC" group="ADC"/>
-                <signal pad-id="pb2" index="10" function="ADC" group="ADC"/>
-                <signal pad-id="pb3" index="11" function="ADC" group="ADC"/>
-                <signal pad-id="pb4" index="12" function="ADC" group="ADC"/>
-                <signal pad-id="pb5" index="13" function="ADC" group="ADC"/>
-                <signal pad-id="pb6" index="14" function="ADC" group="ADC"/>
-                <signal pad-id="pb7" index="15" function="ADC" group="ADC"/>
-                <signal pad-id="pa0" index="0" function="AREF" group="REFA"/>
-                <signal pad-id="pb0" index="0" function="AREF" group="REFB"/>
+                <signal pad-key="pa0" index="0" function="ADC" group="ADC"/>
+                <signal pad-key="pa1" index="1" function="ADC" group="ADC"/>
+                <signal pad-key="pa2" index="2" function="ADC" group="ADC"/>
+                <signal pad-key="pa3" index="3" function="ADC" group="ADC"/>
+                <signal pad-key="pa4" index="4" function="ADC" group="ADC"/>
+                <signal pad-key="pa5" index="5" function="ADC" group="ADC"/>
+                <signal pad-key="pa6" index="6" function="ADC" group="ADC"/>
+                <signal pad-key="pa7" index="7" function="ADC" group="ADC"/>
+                <signal pad-key="pb0" index="8" function="ADC" group="ADC"/>
+                <signal pad-key="pb1" index="9" function="ADC" group="ADC"/>
+                <signal pad-key="pb2" index="10" function="ADC" group="ADC"/>
+                <signal pad-key="pb3" index="11" function="ADC" group="ADC"/>
+                <signal pad-key="pb4" index="12" function="ADC" group="ADC"/>
+                <signal pad-key="pb5" index="13" function="ADC" group="ADC"/>
+                <signal pad-key="pb6" index="14" function="ADC" group="ADC"/>
+                <signal pad-key="pb7" index="15" function="ADC" group="ADC"/>
+                <signal pad-key="pa0" index="0" function="AREF" group="REFA"/>
+                <signal pad-key="pb0" index="0" function="AREF" group="REFB"/>
             </signals>
         </peripheral>
         <peripheral key="aca" name="ACA" module-key="i6077">
             <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"/>
-                <signal pad-id="pa2" index="2" function="AC" group="AC"/>
-                <signal pad-id="pa3" index="3" function="AC" group="AC"/>
-                <signal pad-id="pa4" index="4" function="AC" group="AC"/>
-                <signal pad-id="pa5" index="5" function="AC" group="AC"/>
-                <signal pad-id="pa6" index="6" function="AC" group="AC"/>
-                <signal pad-id="pa7" index="7" function="AC" group="AC"/>
-                <signal pad-id="pa6" index="1" function="ACOUT" group="ACOUT"/>
-                <signal pad-id="pa7" index="0" function="ACOUT" group="ACOUT"/>
+                <signal pad-key="pa0" index="0" function="AC" group="AC"/>
+                <signal pad-key="pa1" index="1" function="AC" group="AC"/>
+                <signal pad-key="pa2" index="2" function="AC" group="AC"/>
+                <signal pad-key="pa3" index="3" function="AC" group="AC"/>
+                <signal pad-key="pa4" index="4" function="AC" group="AC"/>
+                <signal pad-key="pa5" index="5" function="AC" group="AC"/>
+                <signal pad-key="pa6" index="6" function="AC" group="AC"/>
+                <signal pad-key="pa7" index="7" function="AC" group="AC"/>
+                <signal pad-key="pa6" index="1" function="ACOUT" group="ACOUT"/>
+                <signal pad-key="pa7" index="0" function="ACOUT" group="ACOUT"/>
             </signals>
         </peripheral>
         <peripheral key="rtc" name="RTC" module-key="i6093">
@@ -179,212 +179,212 @@
         <peripheral key="twic" name="TWIC" module-key="i6089">
             <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"/>
+                <signal pad-key="pc0" function="TWI" group="SDA"/>
+                <signal pad-key="pc1" function="TWI" group="SCL"/>
             </signals>
         </peripheral>
         <peripheral key="twie" name="TWIE" module-key="i6089">
             <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"/>
+                <signal pad-key="pe0" function="TWI" group="SDA"/>
+                <signal pad-key="pe1" function="TWI" group="SCL"/>
             </signals>
         </peripheral>
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pa2" index="2" function="PORTA" group="P"/>
-                <signal pad-id="pa3" index="3" function="PORTA" group="P"/>
-                <signal pad-id="pa4" index="4" function="PORTA" group="P"/>
-                <signal pad-id="pa5" index="5" function="PORTA" group="P"/>
-                <signal pad-id="pa6" index="6" function="PORTA" group="P"/>
-                <signal pad-id="pa7" index="7" function="PORTA" group="P"/>
+                <signal pad-key="pa0" index="0" function="PORTA" group="P"/>
+                <signal pad-key="pa1" index="1" function="PORTA" group="P"/>
+                <signal pad-key="pa2" index="2" function="PORTA" group="P"/>
+                <signal pad-key="pa3" index="3" function="PORTA" group="P"/>
+                <signal pad-key="pa4" index="4" function="PORTA" group="P"/>
+                <signal pad-key="pa5" index="5" function="PORTA" group="P"/>
+                <signal pad-key="pa6" index="6" function="PORTA" group="P"/>
+                <signal pad-key="pa7" index="7" function="PORTA" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pb2" index="2" function="PORTB" group="P"/>
-                <signal pad-id="pb3" index="3" function="PORTB" group="P"/>
-                <signal pad-id="pb4" index="4" function="PORTB" group="P"/>
-                <signal pad-id="pb5" index="5" function="PORTB" group="P"/>
-                <signal pad-id="pb6" index="6" function="PORTB" group="P"/>
-                <signal pad-id="pb7" index="7" function="PORTB" group="P"/>
+                <signal pad-key="pb0" index="0" function="PORTB" group="P"/>
+                <signal pad-key="pb1" index="1" function="PORTB" group="P"/>
+                <signal pad-key="pb2" index="2" function="PORTB" group="P"/>
+                <signal pad-key="pb3" index="3" function="PORTB" group="P"/>
+                <signal pad-key="pb4" index="4" function="PORTB" group="P"/>
+                <signal pad-key="pb5" index="5" function="PORTB" group="P"/>
+                <signal pad-key="pb6" index="6" function="PORTB" group="P"/>
+                <signal pad-key="pb7" index="7" function="PORTB" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pc2" index="2" function="PORTC" group="P"/>
-                <signal pad-id="pc3" index="3" function="PORTC" group="P"/>
-                <signal pad-id="pc4" index="4" function="PORTC" group="P"/>
-                <signal pad-id="pc5" index="5" function="PORTC" group="P"/>
-                <signal pad-id="pc6" index="6" function="PORTC" group="P"/>
-                <signal pad-id="pc7" index="7" function="PORTC" group="P"/>
+                <signal pad-key="pc0" index="0" function="PORTC" group="P"/>
+                <signal pad-key="pc1" index="1" function="PORTC" group="P"/>
+                <signal pad-key="pc2" index="2" function="PORTC" group="P"/>
+                <signal pad-key="pc3" index="3" function="PORTC" group="P"/>
+                <signal pad-key="pc4" index="4" function="PORTC" group="P"/>
+                <signal pad-key="pc5" index="5" function="PORTC" group="P"/>
+                <signal pad-key="pc6" index="6" function="PORTC" group="P"/>
+                <signal pad-key="pc7" index="7" function="PORTC" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pd2" index="2" function="PORTD" group="P"/>
-                <signal pad-id="pd3" index="3" function="PORTD" group="P"/>
-                <signal pad-id="pd4" index="4" function="PORTD" group="P"/>
-                <signal pad-id="pd5" index="5" function="PORTD" group="P"/>
-                <signal pad-id="pd6" index="6" function="PORTD" group="P"/>
-                <signal pad-id="pd7" index="7" function="PORTD" group="P"/>
+                <signal pad-key="pd0" index="0" function="PORTD" group="P"/>
+                <signal pad-key="pd1" index="1" function="PORTD" group="P"/>
+                <signal pad-key="pd2" index="2" function="PORTD" group="P"/>
+                <signal pad-key="pd3" index="3" function="PORTD" group="P"/>
+                <signal pad-key="pd4" index="4" function="PORTD" group="P"/>
+                <signal pad-key="pd5" index="5" function="PORTD" group="P"/>
+                <signal pad-key="pd6" index="6" function="PORTD" group="P"/>
+                <signal pad-key="pd7" index="7" function="PORTD" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="porte" name="PORTE" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pe2" index="2" function="PORTE" group="P"/>
-                <signal pad-id="pe3" index="3" function="PORTE" group="P"/>
-                <signal pad-id="pe4" index="4" function="PORTE" group="P"/>
-                <signal pad-id="pe5" index="5" function="PORTE" group="P"/>
-                <signal pad-id="pe6" index="6" function="PORTE" group="P"/>
-                <signal pad-id="pe7" index="7" function="PORTE" group="P"/>
+                <signal pad-key="pe0" index="0" function="PORTE" group="P"/>
+                <signal pad-key="pe1" index="1" function="PORTE" group="P"/>
+                <signal pad-key="pe2" index="2" function="PORTE" group="P"/>
+                <signal pad-key="pe3" index="3" function="PORTE" group="P"/>
+                <signal pad-key="pe4" index="4" function="PORTE" group="P"/>
+                <signal pad-key="pe5" index="5" function="PORTE" group="P"/>
+                <signal pad-key="pe6" index="6" function="PORTE" group="P"/>
+                <signal pad-key="pe7" index="7" function="PORTE" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portf" name="PORTF" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pf2" index="2" function="PORTF" group="P"/>
-                <signal pad-id="pf3" index="3" function="PORTF" group="P"/>
-                <signal pad-id="pf4" index="4" function="PORTF" group="P"/>
-                <signal pad-id="pf5" index="5" function="PORTF" group="P"/>
-                <signal pad-id="pf6" index="6" function="PORTF" group="P"/>
-                <signal pad-id="pf7" index="7" function="PORTF" group="P"/>
+                <signal pad-key="pf0" index="0" function="PORTF" group="P"/>
+                <signal pad-key="pf1" index="1" function="PORTF" group="P"/>
+                <signal pad-key="pf2" index="2" function="PORTF" group="P"/>
+                <signal pad-key="pf3" index="3" function="PORTF" group="P"/>
+                <signal pad-key="pf4" index="4" function="PORTF" group="P"/>
+                <signal pad-key="pf5" index="5" function="PORTF" group="P"/>
+                <signal pad-key="pf6" index="6" function="PORTF" group="P"/>
+                <signal pad-key="pf7" index="7" function="PORTF" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portr" name="PORTR" module-key="gpio_port">
             <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"/>
+                <signal pad-key="pr0" index="0" function="PORTR" group="P"/>
+                <signal pad-key="pr1" index="1" function="PORTR" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="tcc0" name="TCC0" module-key="i6090_tc">
             <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"/>
-                <signal pad-id="pc2" function="TC0" group="OC0C" field="TC0C"/>
-                <signal pad-id="pc3" function="TC0" group="OC0D" field="TC0D"/>
-                <signal pad-id="pc4" function="TC0_ALT" group="OC0A" field="TC0A"/>
-                <signal pad-id="pc5" function="TC0_ALT" group="OC0B" field="TC0B"/>
-                <signal pad-id="pc6" function="TC0_ALT" group="OC0C" field="TC0C"/>
-                <signal pad-id="pc7" function="TC0_ALT" group="OC0D" field="TC0D"/>
+                <signal pad-key="pc0" function="TC0" group="OC0A" field="TC0A"/>
+                <signal pad-key="pc1" function="TC0" group="OC0B" field="TC0B"/>
+                <signal pad-key="pc2" function="TC0" group="OC0C" field="TC0C"/>
+                <signal pad-key="pc3" function="TC0" group="OC0D" field="TC0D"/>
+                <signal pad-key="pc4" function="TC0_ALT" group="OC0A" field="TC0A"/>
+                <signal pad-key="pc5" function="TC0_ALT" group="OC0B" field="TC0B"/>
+                <signal pad-key="pc6" function="TC0_ALT" group="OC0C" field="TC0C"/>
+                <signal pad-key="pc7" function="TC0_ALT" group="OC0D" field="TC0D"/>
             </signals>
         </peripheral>
         <peripheral key="tcc1" name="TCC1" module-key="i6090_tc">
             <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"/>
+                <signal pad-key="pc4" function="TC1" group="OC1A"/>
+                <signal pad-key="pc5" function="TC1" group="OC1B"/>
             </signals>
         </peripheral>
         <peripheral key="tcd0" name="TCD0" module-key="i6090_tc">
             <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"/>
-                <signal pad-id="pd2" function="TC0" group="OC0C"/>
-                <signal pad-id="pd3" function="TC0" group="OC0D"/>
+                <signal pad-key="pd0" function="TC0" group="OC0A"/>
+                <signal pad-key="pd1" function="TC0" group="OC0B"/>
+                <signal pad-key="pd2" function="TC0" group="OC0C"/>
+                <signal pad-key="pd3" function="TC0" group="OC0D"/>
             </signals>
         </peripheral>
         <peripheral key="tce0" name="TCE0" module-key="i6090_tc">
             <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"/>
-                <signal pad-id="pe2" function="TC0" group="OC0C"/>
-                <signal pad-id="pe3" function="TC0" group="OC0D"/>
+                <signal pad-key="pe0" function="TC0" group="OC0A"/>
+                <signal pad-key="pe1" function="TC0" group="OC0B"/>
+                <signal pad-key="pe2" function="TC0" group="OC0C"/>
+                <signal pad-key="pe3" function="TC0" group="OC0D"/>
             </signals>
         </peripheral>
         <peripheral key="tcf0" name="TCF0" module-key="i6090_tc">
             <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"/>
-                <signal pad-id="pf2" function="TC0" group="OC0C"/>
-                <signal pad-id="pf3" function="TC0" group="OC0D"/>
+                <signal pad-key="pf0" function="TC0" group="OC0A"/>
+                <signal pad-key="pf1" function="TC0" group="OC0B"/>
+                <signal pad-key="pf2" function="TC0" group="OC0C"/>
+                <signal pad-key="pf3" function="TC0" group="OC0D"/>
             </signals>
         </peripheral>
         <peripheral key="tcc2" name="TCC2" module-key="i6090_tc2">
             <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"/>
-                <signal pad-id="pc2" function="TC2" group="LOC2C"/>
-                <signal pad-id="pc3" function="TC2" group="LOC2D"/>
-                <signal pad-id="pc4" function="TC2" group="HOC2A"/>
-                <signal pad-id="pc5" function="TC2" group="HOC2B"/>
-                <signal pad-id="pc6" function="TC2" group="HOC2C"/>
-                <signal pad-id="pc7" function="TC2" group="HOC2D"/>
+                <signal pad-key="pc0" function="TC2" group="LOC2A"/>
+                <signal pad-key="pc1" function="TC2" group="LOC2B"/>
+                <signal pad-key="pc2" function="TC2" group="LOC2C"/>
+                <signal pad-key="pc3" function="TC2" group="LOC2D"/>
+                <signal pad-key="pc4" function="TC2" group="HOC2A"/>
+                <signal pad-key="pc5" function="TC2" group="HOC2B"/>
+                <signal pad-key="pc6" function="TC2" group="HOC2C"/>
+                <signal pad-key="pc7" function="TC2" group="HOC2D"/>
             </signals>
         </peripheral>
         <peripheral key="tcd2" name="TCD2" module-key="i6090_tc2">
             <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"/>
-                <signal pad-id="pd2" function="TC2" group="LOC2C"/>
-                <signal pad-id="pd3" function="TC2" group="LOC2D"/>
-                <signal pad-id="pd4" function="TC2" group="HOC2A"/>
-                <signal pad-id="pd5" function="TC2" group="HOC2B"/>
-                <signal pad-id="pd6" function="TC2" group="HOC2C"/>
-                <signal pad-id="pd7" function="TC2" group="HOC2D"/>
+                <signal pad-key="pd0" function="TC2" group="LOC2A"/>
+                <signal pad-key="pd1" function="TC2" group="LOC2B"/>
+                <signal pad-key="pd2" function="TC2" group="LOC2C"/>
+                <signal pad-key="pd3" function="TC2" group="LOC2D"/>
+                <signal pad-key="pd4" function="TC2" group="HOC2A"/>
+                <signal pad-key="pd5" function="TC2" group="HOC2B"/>
+                <signal pad-key="pd6" function="TC2" group="HOC2C"/>
+                <signal pad-key="pd7" function="TC2" group="HOC2D"/>
             </signals>
         </peripheral>
         <peripheral key="tce2" name="TCE2" module-key="i6090_tc2">
             <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"/>
-                <signal pad-id="pe2" function="TC2" group="LOC2C"/>
-                <signal pad-id="pe3" function="TC2" group="LOC2D"/>
-                <signal pad-id="pe4" function="TC2" group="HOC2A"/>
-                <signal pad-id="pe5" function="TC2" group="HOC2B"/>
-                <signal pad-id="pe6" function="TC2" group="HOC2C"/>
-                <signal pad-id="pe7" function="TC2" group="HOC2D"/>
+                <signal pad-key="pe0" function="TC2" group="LOC2A"/>
+                <signal pad-key="pe1" function="TC2" group="LOC2B"/>
+                <signal pad-key="pe2" function="TC2" group="LOC2C"/>
+                <signal pad-key="pe3" function="TC2" group="LOC2D"/>
+                <signal pad-key="pe4" function="TC2" group="HOC2A"/>
+                <signal pad-key="pe5" function="TC2" group="HOC2B"/>
+                <signal pad-key="pe6" function="TC2" group="HOC2C"/>
+                <signal pad-key="pe7" function="TC2" group="HOC2D"/>
             </signals>
         </peripheral>
         <peripheral key="tcf2" name="TCF2" module-key="i6090_tc2">
             <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"/>
-                <signal pad-id="pf2" function="TC2" group="LOC2C"/>
-                <signal pad-id="pf3" function="TC2" group="LOC2D"/>
-                <signal pad-id="pf4" function="TC2" group="HOC2A"/>
-                <signal pad-id="pf5" function="TC2" group="HOC2B"/>
-                <signal pad-id="pf6" function="TC2" group="HOC2C"/>
-                <signal pad-id="pf7" function="TC2" group="HOC2D"/>
+                <signal pad-key="pf0" function="TC2" group="LOC2A"/>
+                <signal pad-key="pf1" function="TC2" group="LOC2B"/>
+                <signal pad-key="pf2" function="TC2" group="LOC2C"/>
+                <signal pad-key="pf3" function="TC2" group="LOC2D"/>
+                <signal pad-key="pf4" function="TC2" group="HOC2A"/>
+                <signal pad-key="pf5" function="TC2" group="HOC2B"/>
+                <signal pad-key="pf6" function="TC2" group="HOC2C"/>
+                <signal pad-key="pf7" function="TC2" group="HOC2D"/>
             </signals>
         </peripheral>
         <peripheral key="awexc" name="AWEXC" module-key="i6090_awex">
             <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"/>
-                <signal pad-id="pc2" function="AWEX" group="OC0BLS"/>
-                <signal pad-id="pc3" function="AWEX" group="OC0BHS"/>
-                <signal pad-id="pc4" function="AWEX" group="OC0CLS"/>
-                <signal pad-id="pc5" function="AWEX" group="OC0CHS"/>
-                <signal pad-id="pc6" function="AWEX" group="OC0DLS"/>
-                <signal pad-id="pc7" function="AWEX" group="OC0DHS"/>
+                <signal pad-key="pc0" function="AWEX" group="OC0ALS"/>
+                <signal pad-key="pc1" function="AWEX" group="OC0AHS"/>
+                <signal pad-key="pc2" function="AWEX" group="OC0BLS"/>
+                <signal pad-key="pc3" function="AWEX" group="OC0BHS"/>
+                <signal pad-key="pc4" function="AWEX" group="OC0CLS"/>
+                <signal pad-key="pc5" function="AWEX" group="OC0CHS"/>
+                <signal pad-key="pc6" function="AWEX" group="OC0DLS"/>
+                <signal pad-key="pc7" function="AWEX" group="OC0DHS"/>
             </signals>
         </peripheral>
         <peripheral key="hiresc" name="HIRESC" module-key="i6090_hires">
@@ -393,58 +393,58 @@
         <peripheral key="usartc0" name="USARTC0" module-key="i6090_usart">
             <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"/>
-                <signal pad-id="pc3" function="USART" group="TXD" field="USART0"/>
-                <signal pad-id="pc5" function="USART_ALT" group="XCK" field="USART0"/>
-                <signal pad-id="pc6" function="USART_ALT" group="RXD" field="USART0"/>
-                <signal pad-id="pc7" function="USART_ALT" group="TXD" field="USART0"/>
+                <signal pad-key="pc1" function="USART" group="XCK" field="USART0"/>
+                <signal pad-key="pc2" function="USART" group="RXD" field="USART0"/>
+                <signal pad-key="pc3" function="USART" group="TXD" field="USART0"/>
+                <signal pad-key="pc5" function="USART_ALT" group="XCK" field="USART0"/>
+                <signal pad-key="pc6" function="USART_ALT" group="RXD" field="USART0"/>
+                <signal pad-key="pc7" function="USART_ALT" group="TXD" field="USART0"/>
             </signals>
         </peripheral>
         <peripheral key="usartd0" name="USARTD0" module-key="i6090_usart">
             <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"/>
-                <signal pad-id="pd3" function="USART" group="TXD"/>
+                <signal pad-key="pd1" function="USART" group="XCK"/>
+                <signal pad-key="pd2" function="USART" group="RXD"/>
+                <signal pad-key="pd3" function="USART" group="TXD"/>
             </signals>
         </peripheral>
         <peripheral key="usarte0" name="USARTE0" module-key="i6090_usart">
             <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"/>
-                <signal pad-id="pe3" function="USART" group="TXD"/>
+                <signal pad-key="pe1" function="USART" group="XCK"/>
+                <signal pad-key="pe2" function="USART" group="RXD"/>
+                <signal pad-key="pe3" function="USART" group="TXD"/>
             </signals>
         </peripheral>
         <peripheral key="usartf0" name="USARTF0" module-key="i6090_usart">
             <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"/>
-                <signal pad-id="pf3" function="USART" group="TXD"/>
+                <signal pad-key="pf1" function="USART" group="XCK"/>
+                <signal pad-key="pf2" function="USART" group="RXD"/>
+                <signal pad-key="pf3" function="USART" group="TXD"/>
             </signals>
         </peripheral>
         <peripheral key="spic" name="SPIC" module-key="i6090_spi">
             <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"/>
-                <signal pad-id="pc6" function="SPI" group="MISO" field="SPI"/>
-                <signal pad-id="pc7" function="SPI" group="SCK" field="SPI"/>
-                <signal pad-id="pc4" function="SPI_ALT" group="SS" field="SPI"/>
-                <signal pad-id="pc5" function="SPI_ALT" group="SCK" field="SPI"/>
-                <signal pad-id="pc6" function="SPI_ALT" group="MISO" field="SPI"/>
-                <signal pad-id="pc7" function="SPI_ALT" group="MOSI" field="SPI"/>
+                <signal pad-key="pc4" function="SPI" group="SS" field="SPI"/>
+                <signal pad-key="pc5" function="SPI" group="MOSI" field="SPI"/>
+                <signal pad-key="pc6" function="SPI" group="MISO" field="SPI"/>
+                <signal pad-key="pc7" function="SPI" group="SCK" field="SPI"/>
+                <signal pad-key="pc4" function="SPI_ALT" group="SS" field="SPI"/>
+                <signal pad-key="pc5" function="SPI_ALT" group="SCK" field="SPI"/>
+                <signal pad-key="pc6" function="SPI_ALT" group="MISO" field="SPI"/>
+                <signal pad-key="pc7" function="SPI_ALT" group="MOSI" field="SPI"/>
             </signals>
         </peripheral>
         <peripheral key="spid" name="SPID" module-key="i6090_spi">
             <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"/>
-                <signal pad-id="pd6" function="SPI" group="MISO"/>
-                <signal pad-id="pd7" function="SPI" group="SCK"/>
+                <signal pad-key="pd4" function="SPI" group="SS"/>
+                <signal pad-key="pd5" function="SPI" group="MOSI"/>
+                <signal pad-key="pd6" function="SPI" group="MISO"/>
+                <signal pad-key="pd7" function="SPI" group="SCK"/>
             </signals>
         </peripheral>
         <peripheral key="ircom" name="IRCOM" module-key="i6090_ircom">
@@ -1433,78 +1433,135 @@
             </register-group>
         </module>
     </modules>
+    <pads>
+        <pad key="pa3" name="PA3"/>
+        <pad key="pa4" name="PA4"/>
+        <pad key="pa5" name="PA5"/>
+        <pad key="pa6" name="PA6"/>
+        <pad key="pa7" name="PA7"/>
+        <pad key="pb0" name="PB0"/>
+        <pad key="pb1" name="PB1"/>
+        <pad key="pb2" name="PB2"/>
+        <pad key="pb3" name="PB3"/>
+        <pad key="pb4" name="PB4"/>
+        <pad key="pb5" name="PB5"/>
+        <pad key="pb6" name="PB6"/>
+        <pad key="pb7" name="PB7"/>
+        <pad key="gnd" name="GND"/>
+        <pad key="vcc" name="VCC"/>
+        <pad key="pc0" name="PC0"/>
+        <pad key="pc1" name="PC1"/>
+        <pad key="pc2" name="PC2"/>
+        <pad key="pc3" name="PC3"/>
+        <pad key="pc4" name="PC4"/>
+        <pad key="pc5" name="PC5"/>
+        <pad key="pc6" name="PC6"/>
+        <pad key="pc7" name="PC7"/>
+        <pad key="pd0" name="PD0"/>
+        <pad key="pd1" name="PD1"/>
+        <pad key="pd2" name="PD2"/>
+        <pad key="pd3" name="PD3"/>
+        <pad key="pd4" name="PD4"/>
+        <pad key="pd5" name="PD5"/>
+        <pad key="pd6" name="PD6"/>
+        <pad key="pd7" name="PD7"/>
+        <pad key="pe0" name="PE0"/>
+        <pad key="pe1" name="PE1"/>
+        <pad key="pe2" name="PE2"/>
+        <pad key="pe3" name="PE3"/>
+        <pad key="pe4" name="PE4"/>
+        <pad key="pe5" name="PE5"/>
+        <pad key="pe6" name="PE6"/>
+        <pad key="pe7" name="PE7"/>
+        <pad key="pf0" name="PF0"/>
+        <pad key="pf1" name="PF1"/>
+        <pad key="pf2" name="PF2"/>
+        <pad key="pf3" name="PF3"/>
+        <pad key="pf4" name="PF4"/>
+        <pad key="pf5" name="PF5"/>
+        <pad key="pf6" name="PF6"/>
+        <pad key="pf7" name="PF7"/>
+        <pad key="pdi" name="PDI"/>
+        <pad key="reset" name="RESET"/>
+        <pad key="pr0" name="PR0"/>
+        <pad key="pr1" name="PR1"/>
+        <pad key="avcc" name="AVCC"/>
+        <pad key="pa0" name="PA0"/>
+        <pad key="pa1" name="PA1"/>
+        <pad key="pa2" name="PA2"/>
+    </pads>
     <pinouts>
         <pinout key="qfp_qfn_64" name="QFP_QFN_64" type="qfn">
-            <pin position="1" pad="PA3"/>
-            <pin position="2" pad="PA4"/>
-            <pin position="3" pad="PA5"/>
-            <pin position="4" pad="PA6"/>
-            <pin position="5" pad="PA7"/>
-            <pin position="6" pad="PB0"/>
-            <pin position="7" pad="PB1"/>
-            <pin position="8" pad="PB2"/>
-            <pin position="9" pad="PB3"/>
-            <pin position="10" pad="PB4"/>
-            <pin position="11" pad="PB5"/>
-            <pin position="12" pad="PB6"/>
-            <pin position="13" pad="PB7"/>
-            <pin position="14" pad="GND"/>
-            <pin position="15" pad="VCC"/>
-            <pin position="16" pad="PC0"/>
-            <pin position="17" pad="PC1"/>
-            <pin position="18" pad="PC2"/>
-            <pin position="19" pad="PC3"/>
-            <pin position="20" pad="PC4"/>
-            <pin position="21" pad="PC5"/>
-            <pin position="22" pad="PC6"/>
-            <pin position="23" pad="PC7"/>
-            <pin position="24" pad="GND"/>
-            <pin position="25" pad="VCC"/>
-            <pin position="26" pad="PD0"/>
-            <pin position="27" pad="PD1"/>
-            <pin position="28" pad="PD2"/>
-            <pin position="29" pad="PD3"/>
-            <pin position="30" pad="PD4"/>
-            <pin position="31" pad="PD5"/>
-            <pin position="32" pad="PD6"/>
-            <pin position="33" pad="PD7"/>
-            <pin position="34" pad="GND"/>
-            <pin position="35" pad="VCC"/>
-            <pin position="36" pad="PE0"/>
-            <pin position="37" pad="PE1"/>
-            <pin position="38" pad="PE2"/>
-            <pin position="39" pad="PE3"/>
-            <pin position="40" pad="PE4"/>
-            <pin position="41" pad="PE5"/>
-            <pin position="42" pad="PE6"/>
-            <pin position="43" pad="PE7"/>
-            <pin position="44" pad="GND"/>
-            <pin position="45" pad="VCC"/>
-            <pin position="46" pad="PF0"/>
-            <pin position="47" pad="PF1"/>
-            <pin position="48" pad="PF2"/>
-            <pin position="49" pad="PF3"/>
-            <pin position="50" pad="PF4"/>
-            <pin position="51" pad="PF5"/>
-            <pin position="52" pad="GND"/>
-            <pin position="53" pad="VCC"/>
-            <pin position="54" pad="PF6"/>
-            <pin position="55" pad="PF7"/>
-            <pin position="56" pad="PDI"/>
-            <pin position="57" pad="RESET"/>
-            <pin position="58" pad="PR0"/>
-            <pin position="59" pad="PR1"/>
-            <pin position="60" pad="GND"/>
-            <pin position="61" pad="AVCC"/>
-            <pin position="62" pad="PA0"/>
-            <pin position="63" pad="PA1"/>
-            <pin position="64" pad="PA2"/>
+            <pin position="1" pad-key="pa3"/>
+            <pin position="2" pad-key="pa4"/>
+            <pin position="3" pad-key="pa5"/>
+            <pin position="4" pad-key="pa6"/>
+            <pin position="5" pad-key="pa7"/>
+            <pin position="6" pad-key="pb0"/>
+            <pin position="7" pad-key="pb1"/>
+            <pin position="8" pad-key="pb2"/>
+            <pin position="9" pad-key="pb3"/>
+            <pin position="10" pad-key="pb4"/>
+            <pin position="11" pad-key="pb5"/>
+            <pin position="12" pad-key="pb6"/>
+            <pin position="13" pad-key="pb7"/>
+            <pin position="14" pad-key="gnd"/>
+            <pin position="15" pad-key="vcc"/>
+            <pin position="16" pad-key="pc0"/>
+            <pin position="17" pad-key="pc1"/>
+            <pin position="18" pad-key="pc2"/>
+            <pin position="19" pad-key="pc3"/>
+            <pin position="20" pad-key="pc4"/>
+            <pin position="21" pad-key="pc5"/>
+            <pin position="22" pad-key="pc6"/>
+            <pin position="23" pad-key="pc7"/>
+            <pin position="24" pad-key="gnd"/>
+            <pin position="25" pad-key="vcc"/>
+            <pin position="26" pad-key="pd0"/>
+            <pin position="27" pad-key="pd1"/>
+            <pin position="28" pad-key="pd2"/>
+            <pin position="29" pad-key="pd3"/>
+            <pin position="30" pad-key="pd4"/>
+            <pin position="31" pad-key="pd5"/>
+            <pin position="32" pad-key="pd6"/>
+            <pin position="33" pad-key="pd7"/>
+            <pin position="34" pad-key="gnd"/>
+            <pin position="35" pad-key="vcc"/>
+            <pin position="36" pad-key="pe0"/>
+            <pin position="37" pad-key="pe1"/>
+            <pin position="38" pad-key="pe2"/>
+            <pin position="39" pad-key="pe3"/>
+            <pin position="40" pad-key="pe4"/>
+            <pin position="41" pad-key="pe5"/>
+            <pin position="42" pad-key="pe6"/>
+            <pin position="43" pad-key="pe7"/>
+            <pin position="44" pad-key="gnd"/>
+            <pin position="45" pad-key="vcc"/>
+            <pin position="46" pad-key="pf0"/>
+            <pin position="47" pad-key="pf1"/>
+            <pin position="48" pad-key="pf2"/>
+            <pin position="49" pad-key="pf3"/>
+            <pin position="50" pad-key="pf4"/>
+            <pin position="51" pad-key="pf5"/>
+            <pin position="52" pad-key="gnd"/>
+            <pin position="53" pad-key="vcc"/>
+            <pin position="54" pad-key="pf6"/>
+            <pin position="55" pad-key="pf7"/>
+            <pin position="56" pad-key="pdi"/>
+            <pin position="57" pad-key="reset"/>
+            <pin position="58" pad-key="pr0"/>
+            <pin position="59" pad-key="pr1"/>
+            <pin position="60" pad-key="gnd"/>
+            <pin position="61" pad-key="avcc"/>
+            <pin position="62" pad-key="pa0"/>
+            <pin position="63" pad-key="pa1"/>
+            <pin position="64" pad-key="pa2"/>
         </pinout>
     </pinouts>
     <variants>
-        <variant name="ATxmega384D3-AU" pinout-key="qfp_qfn_64" package="TQFP64"/>
-        <variant name="ATxmega384D3-MH" pinout-key="qfp_qfn_64" package="QFN64"/>
-        <variant name="ATxmega384D3-AN" pinout-key="qfp_qfn_64" package="TQFP64"/>
-        <variant name="ATxmega384D3-MN" pinout-key="qfp_qfn_64" package="QFN64"/>
+        <variant key="atxmega384d3_au" name="ATxmega384D3-AU" pinout-key="qfp_qfn_64"/>
+        <variant key="atxmega384d3_mh" name="ATxmega384D3-MH" pinout-key="qfp_qfn_64"/>
+        <variant key="atxmega384d3_an" name="ATxmega384D3-AN" pinout-key="qfp_qfn_64"/>
+        <variant key="atxmega384d3_mn" name="ATxmega384D3-MN" pinout-key="qfp_qfn_64"/>
     </variants>
 </device>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA64A1.xml b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA64A1.xml
index fd49951f..3aedcfa6 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA64A1.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA64A1.xml
@@ -173,134 +173,134 @@
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pa2" index="2" function="PORTA" group="P"/>
-                <signal pad-id="pa3" index="3" function="PORTA" group="P"/>
-                <signal pad-id="pa4" index="4" function="PORTA" group="P"/>
-                <signal pad-id="pa5" index="5" function="PORTA" group="P"/>
-                <signal pad-id="pa6" index="6" function="PORTA" group="P"/>
-                <signal pad-id="pa7" index="7" function="PORTA" group="P"/>
+                <signal pad-key="pa0" index="0" function="PORTA" group="P"/>
+                <signal pad-key="pa1" index="1" function="PORTA" group="P"/>
+                <signal pad-key="pa2" index="2" function="PORTA" group="P"/>
+                <signal pad-key="pa3" index="3" function="PORTA" group="P"/>
+                <signal pad-key="pa4" index="4" function="PORTA" group="P"/>
+                <signal pad-key="pa5" index="5" function="PORTA" group="P"/>
+                <signal pad-key="pa6" index="6" function="PORTA" group="P"/>
+                <signal pad-key="pa7" index="7" function="PORTA" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pb2" index="2" function="PORTB" group="P"/>
-                <signal pad-id="pb3" index="3" function="PORTB" group="P"/>
-                <signal pad-id="pb4" index="4" function="PORTB" group="P"/>
-                <signal pad-id="pb5" index="5" function="PORTB" group="P"/>
-                <signal pad-id="pb6" index="6" function="PORTB" group="P"/>
-                <signal pad-id="pb7" index="7" function="PORTB" group="P"/>
+                <signal pad-key="pb0" index="0" function="PORTB" group="P"/>
+                <signal pad-key="pb1" index="1" function="PORTB" group="P"/>
+                <signal pad-key="pb2" index="2" function="PORTB" group="P"/>
+                <signal pad-key="pb3" index="3" function="PORTB" group="P"/>
+                <signal pad-key="pb4" index="4" function="PORTB" group="P"/>
+                <signal pad-key="pb5" index="5" function="PORTB" group="P"/>
+                <signal pad-key="pb6" index="6" function="PORTB" group="P"/>
+                <signal pad-key="pb7" index="7" function="PORTB" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pc2" index="2" function="PORTC" group="P"/>
-                <signal pad-id="pc3" index="3" function="PORTC" group="P"/>
-                <signal pad-id="pc4" index="4" function="PORTC" group="P"/>
-                <signal pad-id="pc5" index="5" function="PORTC" group="P"/>
-                <signal pad-id="pc6" index="6" function="PORTC" group="P"/>
-                <signal pad-id="pc7" index="7" function="PORTC" group="P"/>
+                <signal pad-key="pc0" index="0" function="PORTC" group="P"/>
+                <signal pad-key="pc1" index="1" function="PORTC" group="P"/>
+                <signal pad-key="pc2" index="2" function="PORTC" group="P"/>
+                <signal pad-key="pc3" index="3" function="PORTC" group="P"/>
+                <signal pad-key="pc4" index="4" function="PORTC" group="P"/>
+                <signal pad-key="pc5" index="5" function="PORTC" group="P"/>
+                <signal pad-key="pc6" index="6" function="PORTC" group="P"/>
+                <signal pad-key="pc7" index="7" function="PORTC" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pd2" index="2" function="PORTD" group="P"/>
-                <signal pad-id="pd3" index="3" function="PORTD" group="P"/>
-                <signal pad-id="pd4" index="4" function="PORTD" group="P"/>
-                <signal pad-id="pd5" index="5" function="PORTD" group="P"/>
-                <signal pad-id="pd6" index="6" function="PORTD" group="P"/>
-                <signal pad-id="pd7" index="7" function="PORTD" group="P"/>
+                <signal pad-key="pd0" index="0" function="PORTD" group="P"/>
+                <signal pad-key="pd1" index="1" function="PORTD" group="P"/>
+                <signal pad-key="pd2" index="2" function="PORTD" group="P"/>
+                <signal pad-key="pd3" index="3" function="PORTD" group="P"/>
+                <signal pad-key="pd4" index="4" function="PORTD" group="P"/>
+                <signal pad-key="pd5" index="5" function="PORTD" group="P"/>
+                <signal pad-key="pd6" index="6" function="PORTD" group="P"/>
+                <signal pad-key="pd7" index="7" function="PORTD" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="porte" name="PORTE" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pe2" index="2" function="PORTE" group="P"/>
-                <signal pad-id="pe3" index="3" function="PORTE" group="P"/>
-                <signal pad-id="pe4" index="4" function="PORTE" group="P"/>
-                <signal pad-id="pe5" index="5" function="PORTE" group="P"/>
-                <signal pad-id="pe6" index="6" function="PORTE" group="P"/>
-                <signal pad-id="pe7" index="7" function="PORTE" group="P"/>
+                <signal pad-key="pe0" index="0" function="PORTE" group="P"/>
+                <signal pad-key="pe1" index="1" function="PORTE" group="P"/>
+                <signal pad-key="pe2" index="2" function="PORTE" group="P"/>
+                <signal pad-key="pe3" index="3" function="PORTE" group="P"/>
+                <signal pad-key="pe4" index="4" function="PORTE" group="P"/>
+                <signal pad-key="pe5" index="5" function="PORTE" group="P"/>
+                <signal pad-key="pe6" index="6" function="PORTE" group="P"/>
+                <signal pad-key="pe7" index="7" function="PORTE" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portf" name="PORTF" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pf2" index="2" function="PORTF" group="P"/>
-                <signal pad-id="pf3" index="3" function="PORTF" group="P"/>
-                <signal pad-id="pf4" index="4" function="PORTF" group="P"/>
-                <signal pad-id="pf5" index="5" function="PORTF" group="P"/>
-                <signal pad-id="pf6" index="6" function="PORTF" group="P"/>
-                <signal pad-id="pf7" index="7" function="PORTF" group="P"/>
+                <signal pad-key="pf0" index="0" function="PORTF" group="P"/>
+                <signal pad-key="pf1" index="1" function="PORTF" group="P"/>
+                <signal pad-key="pf2" index="2" function="PORTF" group="P"/>
+                <signal pad-key="pf3" index="3" function="PORTF" group="P"/>
+                <signal pad-key="pf4" index="4" function="PORTF" group="P"/>
+                <signal pad-key="pf5" index="5" function="PORTF" group="P"/>
+                <signal pad-key="pf6" index="6" function="PORTF" group="P"/>
+                <signal pad-key="pf7" index="7" function="PORTF" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="porth" name="PORTH" module-key="gpio_port">
             <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"/>
-                <signal pad-id="ph2" index="2" function="PORTH" group="P"/>
-                <signal pad-id="ph3" index="3" function="PORTH" group="P"/>
-                <signal pad-id="ph4" index="4" function="PORTH" group="P"/>
-                <signal pad-id="ph5" index="5" function="PORTH" group="P"/>
-                <signal pad-id="ph6" index="6" function="PORTH" group="P"/>
-                <signal pad-id="ph7" index="7" function="PORTH" group="P"/>
+                <signal pad-key="ph0" index="0" function="PORTH" group="P"/>
+                <signal pad-key="ph1" index="1" function="PORTH" group="P"/>
+                <signal pad-key="ph2" index="2" function="PORTH" group="P"/>
+                <signal pad-key="ph3" index="3" function="PORTH" group="P"/>
+                <signal pad-key="ph4" index="4" function="PORTH" group="P"/>
+                <signal pad-key="ph5" index="5" function="PORTH" group="P"/>
+                <signal pad-key="ph6" index="6" function="PORTH" group="P"/>
+                <signal pad-key="ph7" index="7" function="PORTH" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portj" name="PORTJ" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pj2" index="2" function="PORTJ" group="P"/>
-                <signal pad-id="pj3" index="3" function="PORTJ" group="P"/>
-                <signal pad-id="pj4" index="4" function="PORTJ" group="P"/>
-                <signal pad-id="pj5" index="5" function="PORTJ" group="P"/>
-                <signal pad-id="pj6" index="6" function="PORTJ" group="P"/>
-                <signal pad-id="pj7" index="7" function="PORTJ" group="P"/>
+                <signal pad-key="pj0" index="0" function="PORTJ" group="P"/>
+                <signal pad-key="pj1" index="1" function="PORTJ" group="P"/>
+                <signal pad-key="pj2" index="2" function="PORTJ" group="P"/>
+                <signal pad-key="pj3" index="3" function="PORTJ" group="P"/>
+                <signal pad-key="pj4" index="4" function="PORTJ" group="P"/>
+                <signal pad-key="pj5" index="5" function="PORTJ" group="P"/>
+                <signal pad-key="pj6" index="6" function="PORTJ" group="P"/>
+                <signal pad-key="pj7" index="7" function="PORTJ" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portk" name="PORTK" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pk2" index="2" function="PORTK" group="P"/>
-                <signal pad-id="pk3" index="3" function="PORTK" group="P"/>
-                <signal pad-id="pk4" index="4" function="PORTK" group="P"/>
-                <signal pad-id="pk5" index="5" function="PORTK" group="P"/>
-                <signal pad-id="pk6" index="6" function="PORTK" group="P"/>
-                <signal pad-id="pk7" index="7" function="PORTK" group="P"/>
+                <signal pad-key="pk0" index="0" function="PORTK" group="P"/>
+                <signal pad-key="pk1" index="1" function="PORTK" group="P"/>
+                <signal pad-key="pk2" index="2" function="PORTK" group="P"/>
+                <signal pad-key="pk3" index="3" function="PORTK" group="P"/>
+                <signal pad-key="pk4" index="4" function="PORTK" group="P"/>
+                <signal pad-key="pk5" index="5" function="PORTK" group="P"/>
+                <signal pad-key="pk6" index="6" function="PORTK" group="P"/>
+                <signal pad-key="pk7" index="7" function="PORTK" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portq" name="PORTQ" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pq2" index="2" function="PORTQ" group="P"/>
-                <signal pad-id="pq3" index="3" function="PORTQ" group="P"/>
+                <signal pad-key="pq0" index="0" function="PORTQ" group="P"/>
+                <signal pad-key="pq1" index="1" function="PORTQ" group="P"/>
+                <signal pad-key="pq2" index="2" function="PORTQ" group="P"/>
+                <signal pad-key="pq3" index="3" function="PORTQ" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portr" name="PORTR" module-key="gpio_port">
             <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"/>
+                <signal pad-key="pr0" index="0" function="PORTR" group="P"/>
+                <signal pad-key="pr1" index="1" function="PORTR" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="tcc0" name="TCC0" module-key="i6090_tc">
@@ -1495,214 +1495,300 @@
             </register-group>
         </module>
     </modules>
+    <pads>
+        <pad key="pa6" name="PA6"/>
+        <pad key="pa7" name="PA7"/>
+        <pad key="gnd" name="GND"/>
+        <pad key="avcc" name="AVCC"/>
+        <pad key="pb0" name="PB0"/>
+        <pad key="pb1" name="PB1"/>
+        <pad key="pb2" name="PB2"/>
+        <pad key="pb3" name="PB3"/>
+        <pad key="pb4" name="PB4"/>
+        <pad key="pb5" name="PB5"/>
+        <pad key="pb6" name="PB6"/>
+        <pad key="pb7" name="PB7"/>
+        <pad key="vcc" name="VCC"/>
+        <pad key="pc0" name="PC0"/>
+        <pad key="pc1" name="PC1"/>
+        <pad key="pc2" name="PC2"/>
+        <pad key="pc3" name="PC3"/>
+        <pad key="pc4" name="PC4"/>
+        <pad key="pc5" name="PC5"/>
+        <pad key="pc6" name="PC6"/>
+        <pad key="pc7" name="PC7"/>
+        <pad key="pd0" name="PD0"/>
+        <pad key="pd1" name="PD1"/>
+        <pad key="pd2" name="PD2"/>
+        <pad key="pd3" name="PD3"/>
+        <pad key="pd4" name="PD4"/>
+        <pad key="pd5" name="PD5"/>
+        <pad key="pd6" name="PD6"/>
+        <pad key="pd7" name="PD7"/>
+        <pad key="pe0" name="PE0"/>
+        <pad key="pe1" name="PE1"/>
+        <pad key="pe2" name="PE2"/>
+        <pad key="pe3" name="PE3"/>
+        <pad key="pe4" name="PE4"/>
+        <pad key="pe5" name="PE5"/>
+        <pad key="pe6" name="PE6"/>
+        <pad key="pe7" name="PE7"/>
+        <pad key="pf0" name="PF0"/>
+        <pad key="pf1" name="PF1"/>
+        <pad key="pf2" name="PF2"/>
+        <pad key="pf3" name="PF3"/>
+        <pad key="pf4" name="PF4"/>
+        <pad key="pf5" name="PF5"/>
+        <pad key="pf6" name="PF6"/>
+        <pad key="pf7" name="PF7"/>
+        <pad key="ph0" name="PH0"/>
+        <pad key="ph1" name="PH1"/>
+        <pad key="ph2" name="PH2"/>
+        <pad key="ph3" name="PH3"/>
+        <pad key="ph4" name="PH4"/>
+        <pad key="ph5" name="PH5"/>
+        <pad key="ph6" name="PH6"/>
+        <pad key="ph7" name="PH7"/>
+        <pad key="pj0" name="PJ0"/>
+        <pad key="pj1" name="PJ1"/>
+        <pad key="pj2" name="PJ2"/>
+        <pad key="pj3" name="PJ3"/>
+        <pad key="pj4" name="PJ4"/>
+        <pad key="pj5" name="PJ5"/>
+        <pad key="pj6" name="PJ6"/>
+        <pad key="pj7" name="PJ7"/>
+        <pad key="pk0" name="PK0"/>
+        <pad key="pk1" name="PK1"/>
+        <pad key="pk2" name="PK2"/>
+        <pad key="pk3" name="PK3"/>
+        <pad key="pk4" name="PK4"/>
+        <pad key="pk5" name="PK5"/>
+        <pad key="pk6" name="PK6"/>
+        <pad key="pk7" name="PK7"/>
+        <pad key="pq0" name="PQ0"/>
+        <pad key="pq1" name="PQ1"/>
+        <pad key="pq2" name="PQ2"/>
+        <pad key="pq3" name="PQ3"/>
+        <pad key="pdi" name="PDI"/>
+        <pad key="reset" name="RESET"/>
+        <pad key="pr0" name="PR0"/>
+        <pad key="pr1" name="PR1"/>
+        <pad key="pa0" name="PA0"/>
+        <pad key="pa1" name="PA1"/>
+        <pad key="pa2" name="PA2"/>
+        <pad key="pa3" name="PA3"/>
+        <pad key="pa4" name="PA4"/>
+        <pad key="pa5" name="PA5"/>
+        <pad key="pdi_data" name="PDI_DATA"/>
+    </pads>
     <pinouts>
         <pinout key="tqfp100" name="TQFP100" type="qfp">
-            <pin position="1" pad="PA6"/>
-            <pin position="2" pad="PA7"/>
-            <pin position="3" pad="GND"/>
-            <pin position="4" pad="AVCC"/>
-            <pin position="5" pad="PB0"/>
-            <pin position="6" pad="PB1"/>
-            <pin position="7" pad="PB2"/>
-            <pin position="8" pad="PB3"/>
-            <pin position="9" pad="PB4"/>
-            <pin position="10" pad="PB5"/>
-            <pin position="11" pad="PB6"/>
-            <pin position="12" pad="PB7"/>
-            <pin position="13" pad="GND"/>
-            <pin position="14" pad="VCC"/>
-            <pin position="15" pad="PC0"/>
-            <pin position="16" pad="PC1"/>
-            <pin position="17" pad="PC2"/>
-            <pin position="18" pad="PC3"/>
-            <pin position="19" pad="PC4"/>
-            <pin position="20" pad="PC5"/>
-            <pin position="21" pad="PC6"/>
-            <pin position="22" pad="PC7"/>
-            <pin position="23" pad="GND"/>
-            <pin position="24" pad="VCC"/>
-            <pin position="25" pad="PD0"/>
-            <pin position="26" pad="PD1"/>
-            <pin position="27" pad="PD2"/>
-            <pin position="28" pad="PD3"/>
-            <pin position="29" pad="PD4"/>
-            <pin position="30" pad="PD5"/>
-            <pin position="31" pad="PD6"/>
-            <pin position="32" pad="PD7"/>
-            <pin position="33" pad="GND"/>
-            <pin position="34" pad="VCC"/>
-            <pin position="35" pad="PE0"/>
-            <pin position="36" pad="PE1"/>
-            <pin position="37" pad="PE2"/>
-            <pin position="38" pad="PE3"/>
-            <pin position="39" pad="PE4"/>
-            <pin position="40" pad="PE5"/>
-            <pin position="41" pad="PE6"/>
-            <pin position="42" pad="PE7"/>
-            <pin position="43" pad="GND"/>
-            <pin position="44" pad="VCC"/>
-            <pin position="45" pad="PF0"/>
-            <pin position="46" pad="PF1"/>
-            <pin position="47" pad="PF2"/>
-            <pin position="48" pad="PF3"/>
-            <pin position="49" pad="PF4"/>
-            <pin position="50" pad="PF5"/>
-            <pin position="51" pad="PF6"/>
-            <pin position="52" pad="PF7"/>
-            <pin position="53" pad="GND"/>
-            <pin position="54" pad="VCC"/>
-            <pin position="55" pad="PH0"/>
-            <pin position="56" pad="PH1"/>
-            <pin position="57" pad="PH2"/>
-            <pin position="58" pad="PH3"/>
-            <pin position="59" pad="PH4"/>
-            <pin position="60" pad="PH5"/>
-            <pin position="61" pad="PH6"/>
-            <pin position="62" pad="PH7"/>
-            <pin position="63" pad="GND"/>
-            <pin position="64" pad="VCC"/>
-            <pin position="65" pad="PJ0"/>
-            <pin position="66" pad="PJ1"/>
-            <pin position="67" pad="PJ2"/>
-            <pin position="68" pad="PJ3"/>
-            <pin position="69" pad="PJ4"/>
-            <pin position="70" pad="PJ5"/>
-            <pin position="71" pad="PJ6"/>
-            <pin position="72" pad="PJ7"/>
-            <pin position="73" pad="GND"/>
-            <pin position="74" pad="VCC"/>
-            <pin position="75" pad="PK0"/>
-            <pin position="76" pad="PK1"/>
-            <pin position="77" pad="PK2"/>
-            <pin position="78" pad="PK3"/>
-            <pin position="79" pad="PK4"/>
-            <pin position="80" pad="PK5"/>
-            <pin position="81" pad="PK6"/>
-            <pin position="82" pad="PK7"/>
-            <pin position="83" pad="VCC"/>
-            <pin position="84" pad="GND"/>
-            <pin position="85" pad="PQ0"/>
-            <pin position="86" pad="PQ1"/>
-            <pin position="87" pad="PQ2"/>
-            <pin position="88" pad="PQ3"/>
-            <pin position="89" pad="PDI"/>
-            <pin position="90" pad="RESET"/>
-            <pin position="91" pad="PR0"/>
-            <pin position="92" pad="PR1"/>
-            <pin position="93" pad="GND"/>
-            <pin position="94" pad="AVCC"/>
-            <pin position="95" pad="PA0"/>
-            <pin position="96" pad="PA1"/>
-            <pin position="97" pad="PA2"/>
-            <pin position="98" pad="PA3"/>
-            <pin position="99" pad="PA4"/>
-            <pin position="100" pad="PA5"/>
+            <pin position="1" pad-key="pa6"/>
+            <pin position="2" pad-key="pa7"/>
+            <pin position="3" pad-key="gnd"/>
+            <pin position="4" pad-key="avcc"/>
+            <pin position="5" pad-key="pb0"/>
+            <pin position="6" pad-key="pb1"/>
+            <pin position="7" pad-key="pb2"/>
+            <pin position="8" pad-key="pb3"/>
+            <pin position="9" pad-key="pb4"/>
+            <pin position="10" pad-key="pb5"/>
+            <pin position="11" pad-key="pb6"/>
+            <pin position="12" pad-key="pb7"/>
+            <pin position="13" pad-key="gnd"/>
+            <pin position="14" pad-key="vcc"/>
+            <pin position="15" pad-key="pc0"/>
+            <pin position="16" pad-key="pc1"/>
+            <pin position="17" pad-key="pc2"/>
+            <pin position="18" pad-key="pc3"/>
+            <pin position="19" pad-key="pc4"/>
+            <pin position="20" pad-key="pc5"/>
+            <pin position="21" pad-key="pc6"/>
+            <pin position="22" pad-key="pc7"/>
+            <pin position="23" pad-key="gnd"/>
+            <pin position="24" pad-key="vcc"/>
+            <pin position="25" pad-key="pd0"/>
+            <pin position="26" pad-key="pd1"/>
+            <pin position="27" pad-key="pd2"/>
+            <pin position="28" pad-key="pd3"/>
+            <pin position="29" pad-key="pd4"/>
+            <pin position="30" pad-key="pd5"/>
+            <pin position="31" pad-key="pd6"/>
+            <pin position="32" pad-key="pd7"/>
+            <pin position="33" pad-key="gnd"/>
+            <pin position="34" pad-key="vcc"/>
+            <pin position="35" pad-key="pe0"/>
+            <pin position="36" pad-key="pe1"/>
+            <pin position="37" pad-key="pe2"/>
+            <pin position="38" pad-key="pe3"/>
+            <pin position="39" pad-key="pe4"/>
+            <pin position="40" pad-key="pe5"/>
+            <pin position="41" pad-key="pe6"/>
+            <pin position="42" pad-key="pe7"/>
+            <pin position="43" pad-key="gnd"/>
+            <pin position="44" pad-key="vcc"/>
+            <pin position="45" pad-key="pf0"/>
+            <pin position="46" pad-key="pf1"/>
+            <pin position="47" pad-key="pf2"/>
+            <pin position="48" pad-key="pf3"/>
+            <pin position="49" pad-key="pf4"/>
+            <pin position="50" pad-key="pf5"/>
+            <pin position="51" pad-key="pf6"/>
+            <pin position="52" pad-key="pf7"/>
+            <pin position="53" pad-key="gnd"/>
+            <pin position="54" pad-key="vcc"/>
+            <pin position="55" pad-key="ph0"/>
+            <pin position="56" pad-key="ph1"/>
+            <pin position="57" pad-key="ph2"/>
+            <pin position="58" pad-key="ph3"/>
+            <pin position="59" pad-key="ph4"/>
+            <pin position="60" pad-key="ph5"/>
+            <pin position="61" pad-key="ph6"/>
+            <pin position="62" pad-key="ph7"/>
+            <pin position="63" pad-key="gnd"/>
+            <pin position="64" pad-key="vcc"/>
+            <pin position="65" pad-key="pj0"/>
+            <pin position="66" pad-key="pj1"/>
+            <pin position="67" pad-key="pj2"/>
+            <pin position="68" pad-key="pj3"/>
+            <pin position="69" pad-key="pj4"/>
+            <pin position="70" pad-key="pj5"/>
+            <pin position="71" pad-key="pj6"/>
+            <pin position="72" pad-key="pj7"/>
+            <pin position="73" pad-key="gnd"/>
+            <pin position="74" pad-key="vcc"/>
+            <pin position="75" pad-key="pk0"/>
+            <pin position="76" pad-key="pk1"/>
+            <pin position="77" pad-key="pk2"/>
+            <pin position="78" pad-key="pk3"/>
+            <pin position="79" pad-key="pk4"/>
+            <pin position="80" pad-key="pk5"/>
+            <pin position="81" pad-key="pk6"/>
+            <pin position="82" pad-key="pk7"/>
+            <pin position="83" pad-key="vcc"/>
+            <pin position="84" pad-key="gnd"/>
+            <pin position="85" pad-key="pq0"/>
+            <pin position="86" pad-key="pq1"/>
+            <pin position="87" pad-key="pq2"/>
+            <pin position="88" pad-key="pq3"/>
+            <pin position="89" pad-key="pdi"/>
+            <pin position="90" pad-key="reset"/>
+            <pin position="91" pad-key="pr0"/>
+            <pin position="92" pad-key="pr1"/>
+            <pin position="93" pad-key="gnd"/>
+            <pin position="94" pad-key="avcc"/>
+            <pin position="95" pad-key="pa0"/>
+            <pin position="96" pad-key="pa1"/>
+            <pin position="97" pad-key="pa2"/>
+            <pin position="98" pad-key="pa3"/>
+            <pin position="99" pad-key="pa4"/>
+            <pin position="100" pad-key="pa5"/>
         </pinout>
         <pinout key="bga100" name="BGA100" type="bga">
-            <pin position="A1" pad="PK0"/>
-            <pin position="A2" pad="VCC"/>
-            <pin position="A3" pad="GND"/>
-            <pin position="A4" pad="PJ3"/>
-            <pin position="A5" pad="VCC"/>
-            <pin position="A6" pad="GND"/>
-            <pin position="A7" pad="PH1"/>
-            <pin position="A8" pad="GND"/>
-            <pin position="A9" pad="VCC"/>
-            <pin position="A10" pad="PF7"/>
-            <pin position="B1" pad="PK3"/>
-            <pin position="B2" pad="PK2"/>
-            <pin position="B3" pad="PK1"/>
-            <pin position="B4" pad="PJ4"/>
-            <pin position="B5" pad="PH7"/>
-            <pin position="B6" pad="PH4"/>
-            <pin position="B7" pad="PH2"/>
-            <pin position="B8" pad="PH0"/>
-            <pin position="B9" pad="PF6"/>
-            <pin position="B10" pad="PF5"/>
-            <pin position="C1" pad="VCC"/>
-            <pin position="C2" pad="PK5"/>
-            <pin position="C3" pad="PK4"/>
-            <pin position="C4" pad="PJ5"/>
-            <pin position="C5" pad="PJ0"/>
-            <pin position="C6" pad="PH5"/>
-            <pin position="C7" pad="PH3"/>
-            <pin position="C8" pad="PF2"/>
-            <pin position="C9" pad="PF3"/>
-            <pin position="C10" pad="VCC"/>
-            <pin position="D1" pad="GND"/>
-            <pin position="D2" pad="PK6"/>
-            <pin position="D3" pad="PK7"/>
-            <pin position="D4" pad="PJ6"/>
-            <pin position="D5" pad="PJ1"/>
-            <pin position="D6" pad="PH6"/>
-            <pin position="D7" pad="PF0"/>
-            <pin position="D8" pad="PF1"/>
-            <pin position="D9" pad="PF4"/>
-            <pin position="D10" pad="GND"/>
-            <pin position="E1" pad="PQ0"/>
-            <pin position="E2" pad="PQ1"/>
-            <pin position="E3" pad="PQ2"/>
-            <pin position="E4" pad="PJ7"/>
-            <pin position="E5" pad="PJ2"/>
-            <pin position="E6" pad="PE7"/>
-            <pin position="E7" pad="PE6"/>
-            <pin position="E8" pad="PE5"/>
-            <pin position="E9" pad="PE4"/>
-            <pin position="E10" pad="PE3"/>
-            <pin position="F1" pad="PR1"/>
-            <pin position="F2" pad="PR0"/>
-            <pin position="F3" pad="RESET"/>
-            <pin position="F4" pad="PDI_DATA"/>
-            <pin position="F5" pad="PQ3"/>
-            <pin position="F6" pad="PC2"/>
-            <pin position="F7" pad="PE2"/>
-            <pin position="F8" pad="PE1"/>
-            <pin position="F9" pad="PE0"/>
-            <pin position="F10" pad="VCC"/>
-            <pin position="G1" pad="GND"/>
-            <pin position="G2" pad="PA1"/>
-            <pin position="G3" pad="PA4"/>
-            <pin position="G4" pad="PB3"/>
-            <pin position="G5" pad="PB4"/>
-            <pin position="G6" pad="PC1"/>
-            <pin position="G7" pad="PC6"/>
-            <pin position="G8" pad="PD7"/>
-            <pin position="G9" pad="PD6"/>
-            <pin position="G10" pad="GND"/>
-            <pin position="H1" pad="AVCC"/>
-            <pin position="H2" pad="PA2"/>
-            <pin position="H3" pad="PA5"/>
-            <pin position="H4" pad="PB2"/>
-            <pin position="H5" pad="PB5"/>
-            <pin position="H6" pad="PC0"/>
-            <pin position="H7" pad="PC5"/>
-            <pin position="H8" pad="PD5"/>
-            <pin position="H9" pad="PD4"/>
-            <pin position="H10" pad="PD3"/>
-            <pin position="J1" pad="PA0"/>
-            <pin position="J2" pad="PA3"/>
-            <pin position="J3" pad="PB0"/>
-            <pin position="J4" pad="PB1"/>
-            <pin position="J5" pad="PB6"/>
-            <pin position="J6" pad="PC3"/>
-            <pin position="J7" pad="PC4"/>
-            <pin position="J8" pad="PC7"/>
-            <pin position="J9" pad="PD2"/>
-            <pin position="J10" pad="PD1"/>
-            <pin position="K1" pad="PA6"/>
-            <pin position="K2" pad="PA7"/>
-            <pin position="K3" pad="GND"/>
-            <pin position="K4" pad="AVCC"/>
-            <pin position="K5" pad="PB7"/>
-            <pin position="K6" pad="VCC "/>
-            <pin position="K7" pad="GND"/>
-            <pin position="K8" pad="VCC"/>
-            <pin position="K9" pad="GND"/>
-            <pin position="K10" pad="PD0"/>
+            <pin position="A1" pad-key="pk0"/>
+            <pin position="A2" pad-key="vcc"/>
+            <pin position="A3" pad-key="gnd"/>
+            <pin position="A4" pad-key="pj3"/>
+            <pin position="A5" pad-key="vcc"/>
+            <pin position="A6" pad-key="gnd"/>
+            <pin position="A7" pad-key="ph1"/>
+            <pin position="A8" pad-key="gnd"/>
+            <pin position="A9" pad-key="vcc"/>
+            <pin position="A10" pad-key="pf7"/>
+            <pin position="B1" pad-key="pk3"/>
+            <pin position="B2" pad-key="pk2"/>
+            <pin position="B3" pad-key="pk1"/>
+            <pin position="B4" pad-key="pj4"/>
+            <pin position="B5" pad-key="ph7"/>
+            <pin position="B6" pad-key="ph4"/>
+            <pin position="B7" pad-key="ph2"/>
+            <pin position="B8" pad-key="ph0"/>
+            <pin position="B9" pad-key="pf6"/>
+            <pin position="B10" pad-key="pf5"/>
+            <pin position="C1" pad-key="vcc"/>
+            <pin position="C2" pad-key="pk5"/>
+            <pin position="C3" pad-key="pk4"/>
+            <pin position="C4" pad-key="pj5"/>
+            <pin position="C5" pad-key="pj0"/>
+            <pin position="C6" pad-key="ph5"/>
+            <pin position="C7" pad-key="ph3"/>
+            <pin position="C8" pad-key="pf2"/>
+            <pin position="C9" pad-key="pf3"/>
+            <pin position="C10" pad-key="vcc"/>
+            <pin position="D1" pad-key="gnd"/>
+            <pin position="D2" pad-key="pk6"/>
+            <pin position="D3" pad-key="pk7"/>
+            <pin position="D4" pad-key="pj6"/>
+            <pin position="D5" pad-key="pj1"/>
+            <pin position="D6" pad-key="ph6"/>
+            <pin position="D7" pad-key="pf0"/>
+            <pin position="D8" pad-key="pf1"/>
+            <pin position="D9" pad-key="pf4"/>
+            <pin position="D10" pad-key="gnd"/>
+            <pin position="E1" pad-key="pq0"/>
+            <pin position="E2" pad-key="pq1"/>
+            <pin position="E3" pad-key="pq2"/>
+            <pin position="E4" pad-key="pj7"/>
+            <pin position="E5" pad-key="pj2"/>
+            <pin position="E6" pad-key="pe7"/>
+            <pin position="E7" pad-key="pe6"/>
+            <pin position="E8" pad-key="pe5"/>
+            <pin position="E9" pad-key="pe4"/>
+            <pin position="E10" pad-key="pe3"/>
+            <pin position="F1" pad-key="pr1"/>
+            <pin position="F2" pad-key="pr0"/>
+            <pin position="F3" pad-key="reset"/>
+            <pin position="F4" pad-key="pdi_data"/>
+            <pin position="F5" pad-key="pq3"/>
+            <pin position="F6" pad-key="pc2"/>
+            <pin position="F7" pad-key="pe2"/>
+            <pin position="F8" pad-key="pe1"/>
+            <pin position="F9" pad-key="pe0"/>
+            <pin position="F10" pad-key="vcc"/>
+            <pin position="G1" pad-key="gnd"/>
+            <pin position="G2" pad-key="pa1"/>
+            <pin position="G3" pad-key="pa4"/>
+            <pin position="G4" pad-key="pb3"/>
+            <pin position="G5" pad-key="pb4"/>
+            <pin position="G6" pad-key="pc1"/>
+            <pin position="G7" pad-key="pc6"/>
+            <pin position="G8" pad-key="pd7"/>
+            <pin position="G9" pad-key="pd6"/>
+            <pin position="G10" pad-key="gnd"/>
+            <pin position="H1" pad-key="avcc"/>
+            <pin position="H2" pad-key="pa2"/>
+            <pin position="H3" pad-key="pa5"/>
+            <pin position="H4" pad-key="pb2"/>
+            <pin position="H5" pad-key="pb5"/>
+            <pin position="H6" pad-key="pc0"/>
+            <pin position="H7" pad-key="pc5"/>
+            <pin position="H8" pad-key="pd5"/>
+            <pin position="H9" pad-key="pd4"/>
+            <pin position="H10" pad-key="pd3"/>
+            <pin position="J1" pad-key="pa0"/>
+            <pin position="J2" pad-key="pa3"/>
+            <pin position="J3" pad-key="pb0"/>
+            <pin position="J4" pad-key="pb1"/>
+            <pin position="J5" pad-key="pb6"/>
+            <pin position="J6" pad-key="pc3"/>
+            <pin position="J7" pad-key="pc4"/>
+            <pin position="J8" pad-key="pc7"/>
+            <pin position="J9" pad-key="pd2"/>
+            <pin position="J10" pad-key="pd1"/>
+            <pin position="K1" pad-key="pa6"/>
+            <pin position="K2" pad-key="pa7"/>
+            <pin position="K3" pad-key="gnd"/>
+            <pin position="K4" pad-key="avcc"/>
+            <pin position="K5" pad-key="pb7"/>
+            <pin position="K6" pad-key="vcc"/>
+            <pin position="K7" pad-key="gnd"/>
+            <pin position="K8" pad-key="vcc"/>
+            <pin position="K9" pad-key="gnd"/>
+            <pin position="K10" pad-key="pd0"/>
         </pinout>
     </pinouts>
     <variants>
-        <variant name="ATXMEGA64A1-AU" pinout-key="tqfp100" package="TQFP100"/>
-        <variant name="ATXMEGA64A1-CU" pinout-key="bga100" package="CBGA100"/>
+        <variant key="atxmega64a1_au" name="ATXMEGA64A1-AU" pinout-key="tqfp100"/>
+        <variant key="atxmega64a1_cu" name="ATXMEGA64A1-CU" pinout-key="bga100"/>
     </variants>
 </device>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA64A1U.xml b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA64A1U.xml
index a67260f1..a9ce3192 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA64A1U.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA64A1U.xml
@@ -116,19 +116,19 @@
         <peripheral key="portcfg" name="PORTCFG" module-key="i6075_portcfg">
             <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"/>
-                <signal pad-id="pd7" function="CLKOUTD" group="CLKOUT" field="CLKOUT"/>
-                <signal pad-id="pd4" function="CLKOUTD_ALT" group="CLKOUT" field="CLKEVPIN"/>
-                <signal pad-id="pe7" function="CLKOUTE" group="CLKOUT" field="CLKOUT"/>
-                <signal pad-id="pe4" function="CLKOUTE_ALT" group="CLKOUT" field="CLKEVPIN"/>
-                <signal pad-id="pc7" function="EVOUTC" group="EVOUT" field="EVOUT"/>
-                <signal pad-id="pc4" function="EVOUTC_ALT" group="EVOUT" field="CLKEVPIN"/>
-                <signal pad-id="pd7" function="EVOUTD" group="EVOUT" field="EVOUT"/>
-                <signal pad-id="pd4" function="EVOUTD_ALT" group="EVOUT" field="CLKEVPIN"/>
-                <signal pad-id="pe7" function="EVOUTE" group="EVOUT" field="EVOUT"/>
-                <signal pad-id="pe4" function="EVOUTE_ALT" group="EVOUT" field="CLKEVPIN"/>
-                <signal pad-id="pc6" function="RTCOUTC" group="RTCOUT"/>
+                <signal pad-key="pc7" function="CLKOUTC" group="CLKOUT" field="CLKOUT"/>
+                <signal pad-key="pc4" function="CLKOUTC_ALT" group="CLKOUT" field="CLKEVPIN"/>
+                <signal pad-key="pd7" function="CLKOUTD" group="CLKOUT" field="CLKOUT"/>
+                <signal pad-key="pd4" function="CLKOUTD_ALT" group="CLKOUT" field="CLKEVPIN"/>
+                <signal pad-key="pe7" function="CLKOUTE" group="CLKOUT" field="CLKOUT"/>
+                <signal pad-key="pe4" function="CLKOUTE_ALT" group="CLKOUT" field="CLKEVPIN"/>
+                <signal pad-key="pc7" function="EVOUTC" group="EVOUT" field="EVOUT"/>
+                <signal pad-key="pc4" function="EVOUTC_ALT" group="EVOUT" field="CLKEVPIN"/>
+                <signal pad-key="pd7" function="EVOUTD" group="EVOUT" field="EVOUT"/>
+                <signal pad-key="pd4" function="EVOUTD_ALT" group="EVOUT" field="CLKEVPIN"/>
+                <signal pad-key="pe7" function="EVOUTE" group="EVOUT" field="EVOUT"/>
+                <signal pad-key="pe4" function="EVOUTE_ALT" group="EVOUT" field="CLKEVPIN"/>
+                <signal pad-key="pc6" function="RTCOUTC" group="RTCOUT"/>
             </signals>
         </peripheral>
         <peripheral key="aes" name="AES" module-key="i6096">
@@ -149,127 +149,127 @@
         <peripheral key="adca" name="ADCA" module-key="i6099">
             <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"/>
-                <signal pad-id="pa2" index="2" function="ADCPOS" group="ADC"/>
-                <signal pad-id="pa3" index="3" function="ADCPOS" group="ADC"/>
-                <signal pad-id="pa4" index="4" function="ADCPOS" group="ADC"/>
-                <signal pad-id="pa5" index="5" function="ADCPOS" group="ADC"/>
-                <signal pad-id="pa6" index="6" function="ADCPOS" group="ADC"/>
-                <signal pad-id="pa7" index="7" function="ADCPOS" group="ADC"/>
-                <signal pad-id="pb0" index="8" function="ADCPOS" group="ADC"/>
-                <signal pad-id="pb1" index="9" function="ADCPOS" group="ADC"/>
-                <signal pad-id="pb2" index="10" function="ADCPOS" group="ADC"/>
-                <signal pad-id="pb3" index="11" function="ADCPOS" group="ADC"/>
-                <signal pad-id="pb4" index="12" function="ADCPOS" group="ADC"/>
-                <signal pad-id="pb5" index="13" function="ADCPOS" group="ADC"/>
-                <signal pad-id="pb6" index="14" function="ADCPOS" group="ADC"/>
-                <signal pad-id="pb7" index="15" function="ADCPOS" group="ADC"/>
-                <signal pad-id="pa0" index="0" function="GAINPOS" group="ADC"/>
-                <signal pad-id="pa1" index="1" function="GAINPOS" group="ADC"/>
-                <signal pad-id="pa2" index="2" function="GAINPOS" group="ADC"/>
-                <signal pad-id="pa3" index="3" function="GAINPOS" group="ADC"/>
-                <signal pad-id="pa4" index="4" function="GAINPOS" group="ADC"/>
-                <signal pad-id="pa5" index="5" function="GAINPOS" group="ADC"/>
-                <signal pad-id="pa6" index="6" function="GAINPOS" group="ADC"/>
-                <signal pad-id="pa7" index="7" function="GAINPOS" group="ADC"/>
-                <signal pad-id="pa4" index="4" function="GAINNEG" group="ADC"/>
-                <signal pad-id="pa5" index="5" function="GAINNEG" group="ADC"/>
-                <signal pad-id="pa6" index="6" function="GAINNEG" group="ADC"/>
-                <signal pad-id="pa7" index="7" function="GAINNEG" group="ADC"/>
-                <signal pad-id="pa0" index="0" function="ADCNEG" group="ADC"/>
-                <signal pad-id="pa1" index="1" function="ADCNEG" group="ADC"/>
-                <signal pad-id="pa2" index="2" function="ADCNEG" group="ADC"/>
-                <signal pad-id="pa3" index="3" function="ADCNEG" group="ADC"/>
-                <signal pad-id="pa0" index="0" function="AREF" group="REFA"/>
-                <signal pad-id="pb0" index="0" function="AREF" group="REFB"/>
+                <signal pad-key="pa0" index="0" function="ADCPOS" group="ADC"/>
+                <signal pad-key="pa1" index="1" function="ADCPOS" group="ADC"/>
+                <signal pad-key="pa2" index="2" function="ADCPOS" group="ADC"/>
+                <signal pad-key="pa3" index="3" function="ADCPOS" group="ADC"/>
+                <signal pad-key="pa4" index="4" function="ADCPOS" group="ADC"/>
+                <signal pad-key="pa5" index="5" function="ADCPOS" group="ADC"/>
+                <signal pad-key="pa6" index="6" function="ADCPOS" group="ADC"/>
+                <signal pad-key="pa7" index="7" function="ADCPOS" group="ADC"/>
+                <signal pad-key="pb0" index="8" function="ADCPOS" group="ADC"/>
+                <signal pad-key="pb1" index="9" function="ADCPOS" group="ADC"/>
+                <signal pad-key="pb2" index="10" function="ADCPOS" group="ADC"/>
+                <signal pad-key="pb3" index="11" function="ADCPOS" group="ADC"/>
+                <signal pad-key="pb4" index="12" function="ADCPOS" group="ADC"/>
+                <signal pad-key="pb5" index="13" function="ADCPOS" group="ADC"/>
+                <signal pad-key="pb6" index="14" function="ADCPOS" group="ADC"/>
+                <signal pad-key="pb7" index="15" function="ADCPOS" group="ADC"/>
+                <signal pad-key="pa0" index="0" function="GAINPOS" group="ADC"/>
+                <signal pad-key="pa1" index="1" function="GAINPOS" group="ADC"/>
+                <signal pad-key="pa2" index="2" function="GAINPOS" group="ADC"/>
+                <signal pad-key="pa3" index="3" function="GAINPOS" group="ADC"/>
+                <signal pad-key="pa4" index="4" function="GAINPOS" group="ADC"/>
+                <signal pad-key="pa5" index="5" function="GAINPOS" group="ADC"/>
+                <signal pad-key="pa6" index="6" function="GAINPOS" group="ADC"/>
+                <signal pad-key="pa7" index="7" function="GAINPOS" group="ADC"/>
+                <signal pad-key="pa4" index="4" function="GAINNEG" group="ADC"/>
+                <signal pad-key="pa5" index="5" function="GAINNEG" group="ADC"/>
+                <signal pad-key="pa6" index="6" function="GAINNEG" group="ADC"/>
+                <signal pad-key="pa7" index="7" function="GAINNEG" group="ADC"/>
+                <signal pad-key="pa0" index="0" function="ADCNEG" group="ADC"/>
+                <signal pad-key="pa1" index="1" function="ADCNEG" group="ADC"/>
+                <signal pad-key="pa2" index="2" function="ADCNEG" group="ADC"/>
+                <signal pad-key="pa3" index="3" function="ADCNEG" group="ADC"/>
+                <signal pad-key="pa0" index="0" function="AREF" group="REFA"/>
+                <signal pad-key="pb0" index="0" function="AREF" group="REFB"/>
             </signals>
         </peripheral>
         <peripheral key="adcb" name="ADCB" module-key="i6099">
             <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"/>
-                <signal pad-id="pb2" index="2" function="ADCPOS" group="ADC"/>
-                <signal pad-id="pb3" index="3" function="ADCPOS" group="ADC"/>
-                <signal pad-id="pb4" index="4" function="ADCPOS" group="ADC"/>
-                <signal pad-id="pb5" index="5" function="ADCPOS" group="ADC"/>
-                <signal pad-id="pb6" index="6" function="ADCPOS" group="ADC"/>
-                <signal pad-id="pb7" index="7" function="ADCPOS" group="ADC"/>
-                <signal pad-id="pb0" index="0" function="GAINPOS" group="ADC"/>
-                <signal pad-id="pb1" index="1" function="GAINPOS" group="ADC"/>
-                <signal pad-id="pb2" index="2" function="GAINPOS" group="ADC"/>
-                <signal pad-id="pb3" index="3" function="GAINPOS" group="ADC"/>
-                <signal pad-id="pb4" index="4" function="GAINPOS" group="ADC"/>
-                <signal pad-id="pb5" index="5" function="GAINPOS" group="ADC"/>
-                <signal pad-id="pb6" index="6" function="GAINPOS" group="ADC"/>
-                <signal pad-id="pb7" index="7" function="GAINPOS" group="ADC"/>
-                <signal pad-id="pb4" index="4" function="ADCNEG" group="ADC"/>
-                <signal pad-id="pb5" index="5" function="ADCNEG" group="ADC"/>
-                <signal pad-id="pb6" index="6" function="ADCNEG" group="ADC"/>
-                <signal pad-id="pb7" index="7" function="ADCNEG" group="ADC"/>
-                <signal pad-id="pb4" index="4" function="GAINNEG" group="ADC"/>
-                <signal pad-id="pb5" index="5" function="GAINNEG" group="ADC"/>
-                <signal pad-id="pb6" index="6" function="GAINNEG" group="ADC"/>
-                <signal pad-id="pb7" index="7" function="GAINNEG" group="ADC"/>
-                <signal pad-id="pa0" index="0" function="AREF" group="REFA"/>
-                <signal pad-id="pb0" index="0" function="AREF" group="REFB"/>
+                <signal pad-key="pb0" index="0" function="ADCPOS" group="ADC"/>
+                <signal pad-key="pb1" index="1" function="ADCPOS" group="ADC"/>
+                <signal pad-key="pb2" index="2" function="ADCPOS" group="ADC"/>
+                <signal pad-key="pb3" index="3" function="ADCPOS" group="ADC"/>
+                <signal pad-key="pb4" index="4" function="ADCPOS" group="ADC"/>
+                <signal pad-key="pb5" index="5" function="ADCPOS" group="ADC"/>
+                <signal pad-key="pb6" index="6" function="ADCPOS" group="ADC"/>
+                <signal pad-key="pb7" index="7" function="ADCPOS" group="ADC"/>
+                <signal pad-key="pb0" index="0" function="GAINPOS" group="ADC"/>
+                <signal pad-key="pb1" index="1" function="GAINPOS" group="ADC"/>
+                <signal pad-key="pb2" index="2" function="GAINPOS" group="ADC"/>
+                <signal pad-key="pb3" index="3" function="GAINPOS" group="ADC"/>
+                <signal pad-key="pb4" index="4" function="GAINPOS" group="ADC"/>
+                <signal pad-key="pb5" index="5" function="GAINPOS" group="ADC"/>
+                <signal pad-key="pb6" index="6" function="GAINPOS" group="ADC"/>
+                <signal pad-key="pb7" index="7" function="GAINPOS" group="ADC"/>
+                <signal pad-key="pb4" index="4" function="ADCNEG" group="ADC"/>
+                <signal pad-key="pb5" index="5" function="ADCNEG" group="ADC"/>
+                <signal pad-key="pb6" index="6" function="ADCNEG" group="ADC"/>
+                <signal pad-key="pb7" index="7" function="ADCNEG" group="ADC"/>
+                <signal pad-key="pb4" index="4" function="GAINNEG" group="ADC"/>
+                <signal pad-key="pb5" index="5" function="GAINNEG" group="ADC"/>
+                <signal pad-key="pb6" index="6" function="GAINNEG" group="ADC"/>
+                <signal pad-key="pb7" index="7" function="GAINNEG" group="ADC"/>
+                <signal pad-key="pa0" index="0" function="AREF" group="REFA"/>
+                <signal pad-key="pb0" index="0" function="AREF" group="REFB"/>
             </signals>
         </peripheral>
         <peripheral key="daca" name="DACA" module-key="i6059">
             <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"/>
-                <signal pad-id="pa0" index="0" function="AREF" group="REFA"/>
-                <signal pad-id="pb0" index="0" function="AREF" group="REFB"/>
+                <signal pad-key="pa2" index="0" function="DAC" group="DAC"/>
+                <signal pad-key="pa3" index="1" function="DAC" group="DAC"/>
+                <signal pad-key="pa0" index="0" function="AREF" group="REFA"/>
+                <signal pad-key="pb0" index="0" function="AREF" group="REFB"/>
             </signals>
         </peripheral>
         <peripheral key="dacb" name="DACB" module-key="i6059">
             <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"/>
-                <signal pad-id="pa0" index="0" function="AREF" group="REFA"/>
-                <signal pad-id="pb0" index="0" function="AREF" group="REFB"/>
+                <signal pad-key="pb2" index="0" function="DAC" group="DAC"/>
+                <signal pad-key="pb3" index="1" function="DAC" group="DAC"/>
+                <signal pad-key="pa0" index="0" function="AREF" group="REFA"/>
+                <signal pad-key="pb0" index="0" function="AREF" group="REFB"/>
             </signals>
         </peripheral>
         <peripheral key="aca" name="ACA" module-key="i6077">
             <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"/>
-                <signal pad-id="pa2" index="2" function="ACPOS" group="AC"/>
-                <signal pad-id="pa3" index="3" function="ACPOS" group="AC"/>
-                <signal pad-id="pa4" index="4" function="ACPOS" group="AC"/>
-                <signal pad-id="pa5" index="5" function="ACPOS" group="AC"/>
-                <signal pad-id="pa6" index="6" function="ACPOS" group="AC"/>
-                <signal pad-id="pa0" index="0" function="ACNEG" group="AC"/>
-                <signal pad-id="pa1" index="1" function="ACNEG" group="AC"/>
-                <signal pad-id="pa3" index="3" function="ACNEG" group="AC"/>
-                <signal pad-id="pa5" index="5" function="ACNEG" group="AC"/>
-                <signal pad-id="pa7" index="7" function="ACNEG" group="AC"/>
-                <signal pad-id="pa6" index="1" function="ACOUT" group="ACOUT"/>
-                <signal pad-id="pa7" index="0" function="ACOUT" group="ACOUT"/>
+                <signal pad-key="pa0" index="0" function="ACPOS" group="AC"/>
+                <signal pad-key="pa1" index="1" function="ACPOS" group="AC"/>
+                <signal pad-key="pa2" index="2" function="ACPOS" group="AC"/>
+                <signal pad-key="pa3" index="3" function="ACPOS" group="AC"/>
+                <signal pad-key="pa4" index="4" function="ACPOS" group="AC"/>
+                <signal pad-key="pa5" index="5" function="ACPOS" group="AC"/>
+                <signal pad-key="pa6" index="6" function="ACPOS" group="AC"/>
+                <signal pad-key="pa0" index="0" function="ACNEG" group="AC"/>
+                <signal pad-key="pa1" index="1" function="ACNEG" group="AC"/>
+                <signal pad-key="pa3" index="3" function="ACNEG" group="AC"/>
+                <signal pad-key="pa5" index="5" function="ACNEG" group="AC"/>
+                <signal pad-key="pa7" index="7" function="ACNEG" group="AC"/>
+                <signal pad-key="pa6" index="1" function="ACOUT" group="ACOUT"/>
+                <signal pad-key="pa7" index="0" function="ACOUT" group="ACOUT"/>
             </signals>
         </peripheral>
         <peripheral key="acb" name="ACB" module-key="i6077">
             <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"/>
-                <signal pad-id="pb2" index="2" function="ACPOS" group="AC"/>
-                <signal pad-id="pb3" index="3" function="ACPOS" group="AC"/>
-                <signal pad-id="pb4" index="4" function="ACPOS" group="AC"/>
-                <signal pad-id="pb5" index="5" function="ACPOS" group="AC"/>
-                <signal pad-id="pb6" index="6" function="ACPOS" group="AC"/>
-                <signal pad-id="pb0" index="0" function="ACNEG" group="AC"/>
-                <signal pad-id="pb1" index="1" function="ACNEG" group="AC"/>
-                <signal pad-id="pb3" index="3" function="ACNEG" group="AC"/>
-                <signal pad-id="pb5" index="5" function="ACNEG" group="AC"/>
-                <signal pad-id="pb7" index="7" function="ACNEG" group="AC"/>
-                <signal pad-id="pb6" index="1" function="ACOUT" group="ACOUT"/>
-                <signal pad-id="pb7" index="0" function="ACOUT" group="ACOUT"/>
+                <signal pad-key="pb0" index="0" function="ACPOS" group="AC"/>
+                <signal pad-key="pb1" index="1" function="ACPOS" group="AC"/>
+                <signal pad-key="pb2" index="2" function="ACPOS" group="AC"/>
+                <signal pad-key="pb3" index="3" function="ACPOS" group="AC"/>
+                <signal pad-key="pb4" index="4" function="ACPOS" group="AC"/>
+                <signal pad-key="pb5" index="5" function="ACPOS" group="AC"/>
+                <signal pad-key="pb6" index="6" function="ACPOS" group="AC"/>
+                <signal pad-key="pb0" index="0" function="ACNEG" group="AC"/>
+                <signal pad-key="pb1" index="1" function="ACNEG" group="AC"/>
+                <signal pad-key="pb3" index="3" function="ACNEG" group="AC"/>
+                <signal pad-key="pb5" index="5" function="ACNEG" group="AC"/>
+                <signal pad-key="pb7" index="7" function="ACNEG" group="AC"/>
+                <signal pad-key="pb6" index="1" function="ACOUT" group="ACOUT"/>
+                <signal pad-key="pb7" index="0" function="ACOUT" group="ACOUT"/>
             </signals>
         </peripheral>
         <peripheral key="rtc" name="RTC" module-key="i6093">
@@ -278,352 +278,352 @@
         <peripheral key="ebi" name="EBI" module-key="i3001">
             <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"/>
-                <signal pad-id="ph2" index="2" function="EBIPORT0" group="PORT0"/>
-                <signal pad-id="ph3" index="3" function="EBIPORT0" group="PORT0"/>
-                <signal pad-id="ph4" index="4" function="EBIPORT0" group="PORT0"/>
-                <signal pad-id="ph5" index="5" function="EBIPORT0" group="PORT0"/>
-                <signal pad-id="ph6" index="6" function="EBIPORT0" group="PORT0"/>
-                <signal pad-id="ph7" index="7" function="EBIPORT0" group="PORT0"/>
-                <signal pad-id="pj0" index="0" function="EBIPORT1" group="PORT1"/>
-                <signal pad-id="pj1" index="1" function="EBIPORT1" group="PORT1"/>
-                <signal pad-id="pj2" index="2" function="EBIPORT1" group="PORT1"/>
-                <signal pad-id="pj3" index="3" function="EBIPORT1" group="PORT1"/>
-                <signal pad-id="pj4" index="4" function="EBIPORT1" group="PORT1"/>
-                <signal pad-id="pj5" index="5" function="EBIPORT1" group="PORT1"/>
-                <signal pad-id="pj6" index="6" function="EBIPORT1" group="PORT1"/>
-                <signal pad-id="pj7" index="7" function="EBIPORT1" group="PORT1"/>
-                <signal pad-id="pk0" index="0" function="EBIPORT2" group="PORT2"/>
-                <signal pad-id="pk1" index="1" function="EBIPORT2" group="PORT2"/>
-                <signal pad-id="pk2" index="2" function="EBIPORT2" group="PORT2"/>
-                <signal pad-id="pk3" index="3" function="EBIPORT2" group="PORT2"/>
-                <signal pad-id="pk4" index="4" function="EBIPORT2" group="PORT2"/>
-                <signal pad-id="pk5" index="5" function="EBIPORT2" group="PORT2"/>
-                <signal pad-id="pk6" index="6" function="EBIPORT2" group="PORT2"/>
-                <signal pad-id="pk7" index="7" function="EBIPORT2" group="PORT2"/>
-                <signal pad-id="pf0" index="0" function="EBIPORT3" group="PORT3"/>
-                <signal pad-id="pf1" index="1" function="EBIPORT3" group="PORT3"/>
-                <signal pad-id="pf2" index="2" function="EBIPORT3" group="PORT3"/>
-                <signal pad-id="pf3" index="3" function="EBIPORT3" group="PORT3"/>
-                <signal pad-id="pf4" index="4" function="EBIPORT3" group="PORT3"/>
-                <signal pad-id="pf5" index="5" function="EBIPORT3" group="PORT3"/>
-                <signal pad-id="pf6" index="6" function="EBIPORT3" group="PORT3"/>
-                <signal pad-id="pf7" index="7" function="EBIPORT3" group="PORT3"/>
+                <signal pad-key="ph0" index="0" function="EBIPORT0" group="PORT0"/>
+                <signal pad-key="ph1" index="1" function="EBIPORT0" group="PORT0"/>
+                <signal pad-key="ph2" index="2" function="EBIPORT0" group="PORT0"/>
+                <signal pad-key="ph3" index="3" function="EBIPORT0" group="PORT0"/>
+                <signal pad-key="ph4" index="4" function="EBIPORT0" group="PORT0"/>
+                <signal pad-key="ph5" index="5" function="EBIPORT0" group="PORT0"/>
+                <signal pad-key="ph6" index="6" function="EBIPORT0" group="PORT0"/>
+                <signal pad-key="ph7" index="7" function="EBIPORT0" group="PORT0"/>
+                <signal pad-key="pj0" index="0" function="EBIPORT1" group="PORT1"/>
+                <signal pad-key="pj1" index="1" function="EBIPORT1" group="PORT1"/>
+                <signal pad-key="pj2" index="2" function="EBIPORT1" group="PORT1"/>
+                <signal pad-key="pj3" index="3" function="EBIPORT1" group="PORT1"/>
+                <signal pad-key="pj4" index="4" function="EBIPORT1" group="PORT1"/>
+                <signal pad-key="pj5" index="5" function="EBIPORT1" group="PORT1"/>
+                <signal pad-key="pj6" index="6" function="EBIPORT1" group="PORT1"/>
+                <signal pad-key="pj7" index="7" function="EBIPORT1" group="PORT1"/>
+                <signal pad-key="pk0" index="0" function="EBIPORT2" group="PORT2"/>
+                <signal pad-key="pk1" index="1" function="EBIPORT2" group="PORT2"/>
+                <signal pad-key="pk2" index="2" function="EBIPORT2" group="PORT2"/>
+                <signal pad-key="pk3" index="3" function="EBIPORT2" group="PORT2"/>
+                <signal pad-key="pk4" index="4" function="EBIPORT2" group="PORT2"/>
+                <signal pad-key="pk5" index="5" function="EBIPORT2" group="PORT2"/>
+                <signal pad-key="pk6" index="6" function="EBIPORT2" group="PORT2"/>
+                <signal pad-key="pk7" index="7" function="EBIPORT2" group="PORT2"/>
+                <signal pad-key="pf0" index="0" function="EBIPORT3" group="PORT3"/>
+                <signal pad-key="pf1" index="1" function="EBIPORT3" group="PORT3"/>
+                <signal pad-key="pf2" index="2" function="EBIPORT3" group="PORT3"/>
+                <signal pad-key="pf3" index="3" function="EBIPORT3" group="PORT3"/>
+                <signal pad-key="pf4" index="4" function="EBIPORT3" group="PORT3"/>
+                <signal pad-key="pf5" index="5" function="EBIPORT3" group="PORT3"/>
+                <signal pad-key="pf6" index="6" function="EBIPORT3" group="PORT3"/>
+                <signal pad-key="pf7" index="7" function="EBIPORT3" group="PORT3"/>
             </signals>
         </peripheral>
         <peripheral key="twic" name="TWIC" module-key="i6089">
             <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"/>
+                <signal pad-key="pc0" function="TWIC" group="SDA"/>
+                <signal pad-key="pc1" function="TWIC" group="SCL"/>
             </signals>
         </peripheral>
         <peripheral key="twid" name="TWID" module-key="i6089">
             <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"/>
+                <signal pad-key="pd0" function="TWID" group="SDA"/>
+                <signal pad-key="pd1" function="TWID" group="SCL"/>
             </signals>
         </peripheral>
         <peripheral key="twie" name="TWIE" module-key="i6089">
             <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"/>
+                <signal pad-key="pe0" function="TWIE" group="SDA"/>
+                <signal pad-key="pe1" function="TWIE" group="SCL"/>
             </signals>
         </peripheral>
         <peripheral key="twif" name="TWIF" module-key="i6089">
             <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"/>
+                <signal pad-key="pf0" function="TWIF" group="SDA"/>
+                <signal pad-key="pf1" function="TWIF" group="SCL"/>
             </signals>
         </peripheral>
         <peripheral key="usb" name="USB" module-key="i3005">
             <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"/>
+                <signal pad-key="pd6" function="USB" group="DN"/>
+                <signal pad-key="pd7" function="USB" group="DP"/>
             </signals>
         </peripheral>
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pa2" index="2" function="PORTA" group="P"/>
-                <signal pad-id="pa3" index="3" function="PORTA" group="P"/>
-                <signal pad-id="pa4" index="4" function="PORTA" group="P"/>
-                <signal pad-id="pa5" index="5" function="PORTA" group="P"/>
-                <signal pad-id="pa6" index="6" function="PORTA" group="P"/>
-                <signal pad-id="pa7" index="7" function="PORTA" group="P"/>
+                <signal pad-key="pa0" index="0" function="PORTA" group="P"/>
+                <signal pad-key="pa1" index="1" function="PORTA" group="P"/>
+                <signal pad-key="pa2" index="2" function="PORTA" group="P"/>
+                <signal pad-key="pa3" index="3" function="PORTA" group="P"/>
+                <signal pad-key="pa4" index="4" function="PORTA" group="P"/>
+                <signal pad-key="pa5" index="5" function="PORTA" group="P"/>
+                <signal pad-key="pa6" index="6" function="PORTA" group="P"/>
+                <signal pad-key="pa7" index="7" function="PORTA" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pb2" index="2" function="PORTB" group="P"/>
-                <signal pad-id="pb3" index="3" function="PORTB" group="P"/>
-                <signal pad-id="pb4" index="4" function="PORTB" group="P"/>
-                <signal pad-id="pb5" index="5" function="PORTB" group="P"/>
-                <signal pad-id="pb6" index="6" function="PORTB" group="P"/>
-                <signal pad-id="pb7" index="7" function="PORTB" group="P"/>
+                <signal pad-key="pb0" index="0" function="PORTB" group="P"/>
+                <signal pad-key="pb1" index="1" function="PORTB" group="P"/>
+                <signal pad-key="pb2" index="2" function="PORTB" group="P"/>
+                <signal pad-key="pb3" index="3" function="PORTB" group="P"/>
+                <signal pad-key="pb4" index="4" function="PORTB" group="P"/>
+                <signal pad-key="pb5" index="5" function="PORTB" group="P"/>
+                <signal pad-key="pb6" index="6" function="PORTB" group="P"/>
+                <signal pad-key="pb7" index="7" function="PORTB" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pc2" index="2" function="PORTC" group="P"/>
-                <signal pad-id="pc3" index="3" function="PORTC" group="P"/>
-                <signal pad-id="pc4" index="4" function="PORTC" group="P"/>
-                <signal pad-id="pc5" index="5" function="PORTC" group="P"/>
-                <signal pad-id="pc6" index="6" function="PORTC" group="P"/>
-                <signal pad-id="pc7" index="7" function="PORTC" group="P"/>
+                <signal pad-key="pc0" index="0" function="PORTC" group="P"/>
+                <signal pad-key="pc1" index="1" function="PORTC" group="P"/>
+                <signal pad-key="pc2" index="2" function="PORTC" group="P"/>
+                <signal pad-key="pc3" index="3" function="PORTC" group="P"/>
+                <signal pad-key="pc4" index="4" function="PORTC" group="P"/>
+                <signal pad-key="pc5" index="5" function="PORTC" group="P"/>
+                <signal pad-key="pc6" index="6" function="PORTC" group="P"/>
+                <signal pad-key="pc7" index="7" function="PORTC" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pd2" index="2" function="PORTD" group="P"/>
-                <signal pad-id="pd3" index="3" function="PORTD" group="P"/>
-                <signal pad-id="pd4" index="4" function="PORTD" group="P"/>
-                <signal pad-id="pd5" index="5" function="PORTD" group="P"/>
-                <signal pad-id="pd6" index="6" function="PORTD" group="P"/>
-                <signal pad-id="pd7" index="7" function="PORTD" group="P"/>
+                <signal pad-key="pd0" index="0" function="PORTD" group="P"/>
+                <signal pad-key="pd1" index="1" function="PORTD" group="P"/>
+                <signal pad-key="pd2" index="2" function="PORTD" group="P"/>
+                <signal pad-key="pd3" index="3" function="PORTD" group="P"/>
+                <signal pad-key="pd4" index="4" function="PORTD" group="P"/>
+                <signal pad-key="pd5" index="5" function="PORTD" group="P"/>
+                <signal pad-key="pd6" index="6" function="PORTD" group="P"/>
+                <signal pad-key="pd7" index="7" function="PORTD" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="porte" name="PORTE" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pe2" index="2" function="PORTE" group="P"/>
-                <signal pad-id="pe3" index="3" function="PORTE" group="P"/>
-                <signal pad-id="pe4" index="4" function="PORTE" group="P"/>
-                <signal pad-id="pe5" index="5" function="PORTE" group="P"/>
-                <signal pad-id="pe6" index="6" function="PORTE" group="P"/>
-                <signal pad-id="pe7" index="7" function="PORTE" group="P"/>
+                <signal pad-key="pe0" index="0" function="PORTE" group="P"/>
+                <signal pad-key="pe1" index="1" function="PORTE" group="P"/>
+                <signal pad-key="pe2" index="2" function="PORTE" group="P"/>
+                <signal pad-key="pe3" index="3" function="PORTE" group="P"/>
+                <signal pad-key="pe4" index="4" function="PORTE" group="P"/>
+                <signal pad-key="pe5" index="5" function="PORTE" group="P"/>
+                <signal pad-key="pe6" index="6" function="PORTE" group="P"/>
+                <signal pad-key="pe7" index="7" function="PORTE" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portf" name="PORTF" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pf2" index="2" function="PORTF" group="P"/>
-                <signal pad-id="pf3" index="3" function="PORTF" group="P"/>
-                <signal pad-id="pf4" index="4" function="PORTF" group="P"/>
-                <signal pad-id="pf5" index="5" function="PORTF" group="P"/>
-                <signal pad-id="pf6" index="6" function="PORTF" group="P"/>
-                <signal pad-id="pf7" index="7" function="PORTF" group="P"/>
+                <signal pad-key="pf0" index="0" function="PORTF" group="P"/>
+                <signal pad-key="pf1" index="1" function="PORTF" group="P"/>
+                <signal pad-key="pf2" index="2" function="PORTF" group="P"/>
+                <signal pad-key="pf3" index="3" function="PORTF" group="P"/>
+                <signal pad-key="pf4" index="4" function="PORTF" group="P"/>
+                <signal pad-key="pf5" index="5" function="PORTF" group="P"/>
+                <signal pad-key="pf6" index="6" function="PORTF" group="P"/>
+                <signal pad-key="pf7" index="7" function="PORTF" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="porth" name="PORTH" module-key="gpio_port">
             <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"/>
-                <signal pad-id="ph2" index="2" function="PORTH" group="P"/>
-                <signal pad-id="ph3" index="3" function="PORTH" group="P"/>
-                <signal pad-id="ph4" index="4" function="PORTH" group="P"/>
-                <signal pad-id="ph5" index="5" function="PORTH" group="P"/>
-                <signal pad-id="ph6" index="6" function="PORTH" group="P"/>
-                <signal pad-id="ph7" index="7" function="PORTH" group="P"/>
+                <signal pad-key="ph0" index="0" function="PORTH" group="P"/>
+                <signal pad-key="ph1" index="1" function="PORTH" group="P"/>
+                <signal pad-key="ph2" index="2" function="PORTH" group="P"/>
+                <signal pad-key="ph3" index="3" function="PORTH" group="P"/>
+                <signal pad-key="ph4" index="4" function="PORTH" group="P"/>
+                <signal pad-key="ph5" index="5" function="PORTH" group="P"/>
+                <signal pad-key="ph6" index="6" function="PORTH" group="P"/>
+                <signal pad-key="ph7" index="7" function="PORTH" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portj" name="PORTJ" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pj2" index="2" function="PORTJ" group="P"/>
-                <signal pad-id="pj3" index="3" function="PORTJ" group="P"/>
-                <signal pad-id="pj4" index="4" function="PORTJ" group="P"/>
-                <signal pad-id="pj5" index="5" function="PORTJ" group="P"/>
-                <signal pad-id="pj6" index="6" function="PORTJ" group="P"/>
-                <signal pad-id="pj7" index="7" function="PORTJ" group="P"/>
+                <signal pad-key="pj0" index="0" function="PORTJ" group="P"/>
+                <signal pad-key="pj1" index="1" function="PORTJ" group="P"/>
+                <signal pad-key="pj2" index="2" function="PORTJ" group="P"/>
+                <signal pad-key="pj3" index="3" function="PORTJ" group="P"/>
+                <signal pad-key="pj4" index="4" function="PORTJ" group="P"/>
+                <signal pad-key="pj5" index="5" function="PORTJ" group="P"/>
+                <signal pad-key="pj6" index="6" function="PORTJ" group="P"/>
+                <signal pad-key="pj7" index="7" function="PORTJ" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portk" name="PORTK" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pk2" index="2" function="PORTK" group="P"/>
-                <signal pad-id="pk3" index="3" function="PORTK" group="P"/>
-                <signal pad-id="pk4" index="4" function="PORTK" group="P"/>
-                <signal pad-id="pk5" index="5" function="PORTK" group="P"/>
-                <signal pad-id="pk6" index="6" function="PORTK" group="P"/>
-                <signal pad-id="pk7" index="7" function="PORTK" group="P"/>
+                <signal pad-key="pk0" index="0" function="PORTK" group="P"/>
+                <signal pad-key="pk1" index="1" function="PORTK" group="P"/>
+                <signal pad-key="pk2" index="2" function="PORTK" group="P"/>
+                <signal pad-key="pk3" index="3" function="PORTK" group="P"/>
+                <signal pad-key="pk4" index="4" function="PORTK" group="P"/>
+                <signal pad-key="pk5" index="5" function="PORTK" group="P"/>
+                <signal pad-key="pk6" index="6" function="PORTK" group="P"/>
+                <signal pad-key="pk7" index="7" function="PORTK" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portq" name="PORTQ" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pq2" index="2" function="PORTQ" group="P"/>
-                <signal pad-id="pq3" index="3" function="PORTQ" group="P"/>
+                <signal pad-key="pq0" index="0" function="PORTQ" group="P"/>
+                <signal pad-key="pq1" index="1" function="PORTQ" group="P"/>
+                <signal pad-key="pq2" index="2" function="PORTQ" group="P"/>
+                <signal pad-key="pq3" index="3" function="PORTQ" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portr" name="PORTR" module-key="gpio_port">
             <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"/>
+                <signal pad-key="pr0" index="0" function="PORTR" group="P"/>
+                <signal pad-key="pr1" index="1" function="PORTR" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="tcc0" name="TCC0" module-key="i6090_tc">
             <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"/>
-                <signal pad-id="pc2" function="TCC" group="OC0C"/>
-                <signal pad-id="pc3" function="TCC" group="OC0D"/>
-                <signal pad-id="pc4" function="TCC_ALT" group="OC0A"/>
-                <signal pad-id="pc5" function="TCC_ALT" group="OC0B"/>
-                <signal pad-id="pc6" function="TCC_ALT" group="OC0C"/>
-                <signal pad-id="pc7" function="TCC_ALT" group="OC0D"/>
+                <signal pad-key="pc0" function="TCC" group="OC0A"/>
+                <signal pad-key="pc1" function="TCC" group="OC0B"/>
+                <signal pad-key="pc2" function="TCC" group="OC0C"/>
+                <signal pad-key="pc3" function="TCC" group="OC0D"/>
+                <signal pad-key="pc4" function="TCC_ALT" group="OC0A"/>
+                <signal pad-key="pc5" function="TCC_ALT" group="OC0B"/>
+                <signal pad-key="pc6" function="TCC_ALT" group="OC0C"/>
+                <signal pad-key="pc7" function="TCC_ALT" group="OC0D"/>
             </signals>
         </peripheral>
         <peripheral key="tcc1" name="TCC1" module-key="i6090_tc">
             <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"/>
+                <signal pad-key="pc4" function="TCC" group="OC1A"/>
+                <signal pad-key="pc5" function="TCC" group="OC1B"/>
             </signals>
         </peripheral>
         <peripheral key="tcd0" name="TCD0" module-key="i6090_tc">
             <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"/>
-                <signal pad-id="pd2" function="TCD" group="OC0C"/>
-                <signal pad-id="pd3" function="TCD" group="OC0D"/>
+                <signal pad-key="pd0" function="TCD" group="OC0A"/>
+                <signal pad-key="pd1" function="TCD" group="OC0B"/>
+                <signal pad-key="pd2" function="TCD" group="OC0C"/>
+                <signal pad-key="pd3" function="TCD" group="OC0D"/>
             </signals>
         </peripheral>
         <peripheral key="tcd1" name="TCD1" module-key="i6090_tc">
             <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"/>
+                <signal pad-key="pd4" function="TCD" group="OC1A"/>
+                <signal pad-key="pd5" function="TCD" group="OC1B"/>
             </signals>
         </peripheral>
         <peripheral key="tce0" name="TCE0" module-key="i6090_tc">
             <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"/>
-                <signal pad-id="pe2" function="TCE0" group="OC0C"/>
-                <signal pad-id="pe3" function="TCE0" group="OC0D"/>
+                <signal pad-key="pe0" function="TCE0" group="OC0A"/>
+                <signal pad-key="pe1" function="TCE0" group="OC0B"/>
+                <signal pad-key="pe2" function="TCE0" group="OC0C"/>
+                <signal pad-key="pe3" function="TCE0" group="OC0D"/>
             </signals>
         </peripheral>
         <peripheral key="tce1" name="TCE1" module-key="i6090_tc">
             <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"/>
+                <signal pad-key="pe4" function="TCE1" group="OC1A"/>
+                <signal pad-key="pe5" function="TCE1" group="OC1B"/>
             </signals>
         </peripheral>
         <peripheral key="tcf0" name="TCF0" module-key="i6090_tc">
             <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"/>
-                <signal pad-id="pf2" function="TCF0" group="OC0C"/>
-                <signal pad-id="pf3" function="TCF0" group="OC0D"/>
+                <signal pad-key="pf0" function="TCF0" group="OC0A"/>
+                <signal pad-key="pf1" function="TCF0" group="OC0B"/>
+                <signal pad-key="pf2" function="TCF0" group="OC0C"/>
+                <signal pad-key="pf3" function="TCF0" group="OC0D"/>
             </signals>
         </peripheral>
         <peripheral key="tcf1" name="TCF1" module-key="i6090_tc">
             <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"/>
+                <signal pad-key="pf4" function="TCF1" group="OC1A"/>
+                <signal pad-key="pf5" function="TCF1" group="OC1B"/>
             </signals>
         </peripheral>
         <peripheral key="tcc2" name="TCC2" module-key="i6090_tc2">
             <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"/>
-                <signal pad-id="pc2" function="TCC2" group="LOC2C"/>
-                <signal pad-id="pc3" function="TCC2" group="LOC2D"/>
-                <signal pad-id="pc4" function="TCC2" group="HOC2A"/>
-                <signal pad-id="pc5" function="TCC2" group="HOC2B"/>
-                <signal pad-id="pc6" function="TCC2" group="HOC2C"/>
-                <signal pad-id="pc7" function="TCC2" group="HOC2D"/>
+                <signal pad-key="pc0" function="TCC2" group="LOC2A"/>
+                <signal pad-key="pc1" function="TCC2" group="LOC2B"/>
+                <signal pad-key="pc2" function="TCC2" group="LOC2C"/>
+                <signal pad-key="pc3" function="TCC2" group="LOC2D"/>
+                <signal pad-key="pc4" function="TCC2" group="HOC2A"/>
+                <signal pad-key="pc5" function="TCC2" group="HOC2B"/>
+                <signal pad-key="pc6" function="TCC2" group="HOC2C"/>
+                <signal pad-key="pc7" function="TCC2" group="HOC2D"/>
             </signals>
         </peripheral>
         <peripheral key="tcd2" name="TCD2" module-key="i6090_tc2">
             <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"/>
-                <signal pad-id="pd2" function="TCD2" group="LOC2C"/>
-                <signal pad-id="pd3" function="TCD2" group="LOC2D"/>
-                <signal pad-id="pd4" function="TCD2" group="HOC2A"/>
-                <signal pad-id="pd5" function="TCD2" group="HOC2B"/>
-                <signal pad-id="pd6" function="TCD2" group="HOC2C"/>
-                <signal pad-id="pd7" function="TCD2" group="HOC2D"/>
+                <signal pad-key="pd0" function="TCD2" group="LOC2A"/>
+                <signal pad-key="pd1" function="TCD2" group="LOC2B"/>
+                <signal pad-key="pd2" function="TCD2" group="LOC2C"/>
+                <signal pad-key="pd3" function="TCD2" group="LOC2D"/>
+                <signal pad-key="pd4" function="TCD2" group="HOC2A"/>
+                <signal pad-key="pd5" function="TCD2" group="HOC2B"/>
+                <signal pad-key="pd6" function="TCD2" group="HOC2C"/>
+                <signal pad-key="pd7" function="TCD2" group="HOC2D"/>
             </signals>
         </peripheral>
         <peripheral key="tce2" name="TCE2" module-key="i6090_tc2">
             <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"/>
-                <signal pad-id="pe2" function="TCE2" group="LOC2C"/>
-                <signal pad-id="pe3" function="TCE2" group="LOC2D"/>
-                <signal pad-id="pe4" function="TCE2" group="HOC2A"/>
-                <signal pad-id="pe5" function="TCE2" group="HOC2B"/>
-                <signal pad-id="pe6" function="TCE2" group="HOC2C"/>
-                <signal pad-id="pe7" function="TCE2" group="HOC2D"/>
+                <signal pad-key="pe0" function="TCE2" group="LOC2A"/>
+                <signal pad-key="pe1" function="TCE2" group="LOC2B"/>
+                <signal pad-key="pe2" function="TCE2" group="LOC2C"/>
+                <signal pad-key="pe3" function="TCE2" group="LOC2D"/>
+                <signal pad-key="pe4" function="TCE2" group="HOC2A"/>
+                <signal pad-key="pe5" function="TCE2" group="HOC2B"/>
+                <signal pad-key="pe6" function="TCE2" group="HOC2C"/>
+                <signal pad-key="pe7" function="TCE2" group="HOC2D"/>
             </signals>
         </peripheral>
         <peripheral key="tcf2" name="TCF2" module-key="i6090_tc2">
             <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"/>
-                <signal pad-id="pf2" function="TCF2" group="LOC2C"/>
-                <signal pad-id="pf3" function="TCF2" group="LOC2D"/>
-                <signal pad-id="pf4" function="TCF2" group="HOC2A"/>
-                <signal pad-id="pf5" function="TCF2" group="HOC2B"/>
-                <signal pad-id="pf6" function="TCF2" group="HOC2C"/>
-                <signal pad-id="pf7" function="TCF2" group="HOC2D"/>
+                <signal pad-key="pf0" function="TCF2" group="LOC2A"/>
+                <signal pad-key="pf1" function="TCF2" group="LOC2B"/>
+                <signal pad-key="pf2" function="TCF2" group="LOC2C"/>
+                <signal pad-key="pf3" function="TCF2" group="LOC2D"/>
+                <signal pad-key="pf4" function="TCF2" group="HOC2A"/>
+                <signal pad-key="pf5" function="TCF2" group="HOC2B"/>
+                <signal pad-key="pf6" function="TCF2" group="HOC2C"/>
+                <signal pad-key="pf7" function="TCF2" group="HOC2D"/>
             </signals>
         </peripheral>
         <peripheral key="awexc" name="AWEXC" module-key="i6090_awex">
             <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"/>
-                <signal pad-id="pc2" function="AWEXC" group="OC0BLS"/>
-                <signal pad-id="pc3" function="AWEXC" group="OC0BHS"/>
-                <signal pad-id="pc4" function="AWEXC" group="OC0CLS"/>
-                <signal pad-id="pc5" function="AWEXC" group="OC0CHS"/>
-                <signal pad-id="pc6" function="AWEXC" group="OC0DLS"/>
-                <signal pad-id="pc7" function="AWEXC" group="OC0DHS"/>
+                <signal pad-key="pc0" function="AWEXC" group="OC0ALS"/>
+                <signal pad-key="pc1" function="AWEXC" group="OC0AHS"/>
+                <signal pad-key="pc2" function="AWEXC" group="OC0BLS"/>
+                <signal pad-key="pc3" function="AWEXC" group="OC0BHS"/>
+                <signal pad-key="pc4" function="AWEXC" group="OC0CLS"/>
+                <signal pad-key="pc5" function="AWEXC" group="OC0CHS"/>
+                <signal pad-key="pc6" function="AWEXC" group="OC0DLS"/>
+                <signal pad-key="pc7" function="AWEXC" group="OC0DHS"/>
             </signals>
         </peripheral>
         <peripheral key="awexe" name="AWEXE" module-key="i6090_awex">
             <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"/>
-                <signal pad-id="pe2" function="AWEXE" group="OC0BLS"/>
-                <signal pad-id="pe3" function="AWEXE" group="OC0BHS"/>
-                <signal pad-id="pe4" function="AWEXE" group="OC0CLS"/>
-                <signal pad-id="pe5" function="AWEXE" group="OC0CHS"/>
-                <signal pad-id="pe6" function="AWEXE" group="OC0DLS"/>
-                <signal pad-id="pe7" function="AWEXE" group="OC0DHS"/>
+                <signal pad-key="pe0" function="AWEXE" group="OC0ALS"/>
+                <signal pad-key="pe1" function="AWEXE" group="OC0AHS"/>
+                <signal pad-key="pe2" function="AWEXE" group="OC0BLS"/>
+                <signal pad-key="pe3" function="AWEXE" group="OC0BHS"/>
+                <signal pad-key="pe4" function="AWEXE" group="OC0CLS"/>
+                <signal pad-key="pe5" function="AWEXE" group="OC0CHS"/>
+                <signal pad-key="pe6" function="AWEXE" group="OC0DLS"/>
+                <signal pad-key="pe7" function="AWEXE" group="OC0DHS"/>
             </signals>
         </peripheral>
         <peripheral key="hiresc" name="HIRESC" module-key="i6090_hires">
@@ -641,104 +641,104 @@
         <peripheral key="usartc0" name="USARTC0" module-key="i6090_usart">
             <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"/>
-                <signal pad-id="pc3" function="USART" group="TXD"/>
-                <signal pad-id="pc5" function="USART_ALT" group="XCK"/>
-                <signal pad-id="pc6" function="USART_ALT" group="RXD"/>
-                <signal pad-id="pc7" function="USART_ALT" group="TXD"/>
+                <signal pad-key="pc1" function="USART" group="XCK"/>
+                <signal pad-key="pc2" function="USART" group="RXD"/>
+                <signal pad-key="pc3" function="USART" group="TXD"/>
+                <signal pad-key="pc5" function="USART_ALT" group="XCK"/>
+                <signal pad-key="pc6" function="USART_ALT" group="RXD"/>
+                <signal pad-key="pc7" function="USART_ALT" group="TXD"/>
             </signals>
         </peripheral>
         <peripheral key="usartc1" name="USARTC1" module-key="i6090_usart">
             <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"/>
-                <signal pad-id="pc7" function="USART" group="TXD"/>
+                <signal pad-key="pc5" function="USART" group="XCK"/>
+                <signal pad-key="pc6" function="USART" group="RXD"/>
+                <signal pad-key="pc7" function="USART" group="TXD"/>
             </signals>
         </peripheral>
         <peripheral key="usartd0" name="USARTD0" module-key="i6090_usart">
             <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"/>
-                <signal pad-id="pd3" function="USART" group="TXD"/>
+                <signal pad-key="pd1" function="USART" group="XCK"/>
+                <signal pad-key="pd2" function="USART" group="RXD"/>
+                <signal pad-key="pd3" function="USART" group="TXD"/>
             </signals>
         </peripheral>
         <peripheral key="usartd1" name="USARTD1" module-key="i6090_usart">
             <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"/>
-                <signal pad-id="pd7" function="USART" group="TXD"/>
+                <signal pad-key="pd5" function="USART" group="XCK"/>
+                <signal pad-key="pd6" function="USART" group="RXD"/>
+                <signal pad-key="pd7" function="USART" group="TXD"/>
             </signals>
         </peripheral>
         <peripheral key="usarte0" name="USARTE0" module-key="i6090_usart">
             <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"/>
-                <signal pad-id="pe3" function="USART" group="TXD"/>
+                <signal pad-key="pe1" function="USART" group="XCK"/>
+                <signal pad-key="pe2" function="USART" group="RXD"/>
+                <signal pad-key="pe3" function="USART" group="TXD"/>
             </signals>
         </peripheral>
         <peripheral key="usarte1" name="USARTE1" module-key="i6090_usart">
             <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"/>
-                <signal pad-id="pe7" function="USART" group="TXD"/>
+                <signal pad-key="pe5" function="USART" group="XCK"/>
+                <signal pad-key="pe6" function="USART" group="RXD"/>
+                <signal pad-key="pe7" function="USART" group="TXD"/>
             </signals>
         </peripheral>
         <peripheral key="usartf0" name="USARTF0" module-key="i6090_usart">
             <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"/>
-                <signal pad-id="pf3" function="USARTF0" group="TXD"/>
+                <signal pad-key="pf1" function="USARTF0" group="XCK"/>
+                <signal pad-key="pf2" function="USARTF0" group="RXD"/>
+                <signal pad-key="pf3" function="USARTF0" group="TXD"/>
             </signals>
         </peripheral>
         <peripheral key="usartf1" name="USARTF1" module-key="i6090_usart">
             <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"/>
-                <signal pad-id="pf7" function="USARTF1" group="TXD"/>
+                <signal pad-key="pf5" function="USARTF1" group="XCK"/>
+                <signal pad-key="pf6" function="USARTF1" group="RXD"/>
+                <signal pad-key="pf7" function="USARTF1" group="TXD"/>
             </signals>
         </peripheral>
         <peripheral key="spic" name="SPIC" module-key="i6090_spi">
             <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"/>
-                <signal pad-id="pc6" function="SPIC" group="MISO"/>
-                <signal pad-id="pc7" function="SPIC" group="SCK"/>
+                <signal pad-key="pc4" function="SPIC" group="SS"/>
+                <signal pad-key="pc5" function="SPIC" group="MOSI"/>
+                <signal pad-key="pc6" function="SPIC" group="MISO"/>
+                <signal pad-key="pc7" function="SPIC" group="SCK"/>
             </signals>
         </peripheral>
         <peripheral key="spid" name="SPID" module-key="i6090_spi">
             <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"/>
-                <signal pad-id="pd6" function="SPID" group="MISO"/>
-                <signal pad-id="pd7" function="SPID" group="SCK"/>
+                <signal pad-key="pd4" function="SPID" group="SS"/>
+                <signal pad-key="pd5" function="SPID" group="MOSI"/>
+                <signal pad-key="pd6" function="SPID" group="MISO"/>
+                <signal pad-key="pd7" function="SPID" group="SCK"/>
             </signals>
         </peripheral>
         <peripheral key="spie" name="SPIE" module-key="i6090_spi">
             <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"/>
-                <signal pad-id="pe6" function="SPIE" group="MISO"/>
-                <signal pad-id="pe7" function="SPIE" group="SCK"/>
+                <signal pad-key="pe4" function="SPIE" group="SS"/>
+                <signal pad-key="pe5" function="SPIE" group="MOSI"/>
+                <signal pad-key="pe6" function="SPIE" group="MISO"/>
+                <signal pad-key="pe7" function="SPIE" group="SCK"/>
             </signals>
         </peripheral>
         <peripheral key="spif" name="SPIF" module-key="i6090_spi">
             <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"/>
-                <signal pad-id="pf6" function="SPIF" group="MISO"/>
-                <signal pad-id="pf7" function="SPIF" group="SCK"/>
+                <signal pad-key="pf4" function="SPIF" group="SS"/>
+                <signal pad-key="pf5" function="SPIF" group="MOSI"/>
+                <signal pad-key="pf6" function="SPIF" group="MISO"/>
+                <signal pad-key="pf7" function="SPIF" group="SCK"/>
             </signals>
         </peripheral>
         <peripheral key="ircom" name="IRCOM" module-key="i6090_ircom">
@@ -2164,216 +2164,302 @@
             </register-group>
         </module>
     </modules>
+    <pads>
+        <pad key="pa6" name="PA6"/>
+        <pad key="pa7" name="PA7"/>
+        <pad key="gnd" name="GND"/>
+        <pad key="avcc" name="AVCC"/>
+        <pad key="pb0" name="PB0"/>
+        <pad key="pb1" name="PB1"/>
+        <pad key="pb2" name="PB2"/>
+        <pad key="pb3" name="PB3"/>
+        <pad key="pb4" name="PB4"/>
+        <pad key="pb5" name="PB5"/>
+        <pad key="pb6" name="PB6"/>
+        <pad key="pb7" name="PB7"/>
+        <pad key="vcc" name="VCC"/>
+        <pad key="pc0" name="PC0"/>
+        <pad key="pc1" name="PC1"/>
+        <pad key="pc2" name="PC2"/>
+        <pad key="pc3" name="PC3"/>
+        <pad key="pc4" name="PC4"/>
+        <pad key="pc5" name="PC5"/>
+        <pad key="pc6" name="PC6"/>
+        <pad key="pc7" name="PC7"/>
+        <pad key="pd0" name="PD0"/>
+        <pad key="pd1" name="PD1"/>
+        <pad key="pd2" name="PD2"/>
+        <pad key="pd3" name="PD3"/>
+        <pad key="pd4" name="PD4"/>
+        <pad key="pd5" name="PD5"/>
+        <pad key="pd6" name="PD6"/>
+        <pad key="pd7" name="PD7"/>
+        <pad key="pe0" name="PE0"/>
+        <pad key="pe1" name="PE1"/>
+        <pad key="pe2" name="PE2"/>
+        <pad key="pe3" name="PE3"/>
+        <pad key="pe4" name="PE4"/>
+        <pad key="pe5" name="PE5"/>
+        <pad key="pe6" name="PE6"/>
+        <pad key="pe7" name="PE7"/>
+        <pad key="pf0" name="PF0"/>
+        <pad key="pf1" name="PF1"/>
+        <pad key="pf2" name="PF2"/>
+        <pad key="pf3" name="PF3"/>
+        <pad key="pf4" name="PF4"/>
+        <pad key="pf5" name="PF5"/>
+        <pad key="pf6" name="PF6"/>
+        <pad key="pf7" name="PF7"/>
+        <pad key="ph0" name="PH0"/>
+        <pad key="ph1" name="PH1"/>
+        <pad key="ph2" name="PH2"/>
+        <pad key="ph3" name="PH3"/>
+        <pad key="ph4" name="PH4"/>
+        <pad key="ph5" name="PH5"/>
+        <pad key="ph6" name="PH6"/>
+        <pad key="ph7" name="PH7"/>
+        <pad key="pj0" name="PJ0"/>
+        <pad key="pj1" name="PJ1"/>
+        <pad key="pj2" name="PJ2"/>
+        <pad key="pj3" name="PJ3"/>
+        <pad key="pj4" name="PJ4"/>
+        <pad key="pj5" name="PJ5"/>
+        <pad key="pj6" name="PJ6"/>
+        <pad key="pj7" name="PJ7"/>
+        <pad key="pk0" name="PK0"/>
+        <pad key="pk1" name="PK1"/>
+        <pad key="pk2" name="PK2"/>
+        <pad key="pk3" name="PK3"/>
+        <pad key="pk4" name="PK4"/>
+        <pad key="pk5" name="PK5"/>
+        <pad key="pk6" name="PK6"/>
+        <pad key="pk7" name="PK7"/>
+        <pad key="pq0" name="PQ0"/>
+        <pad key="pq1" name="PQ1"/>
+        <pad key="pq2" name="PQ2"/>
+        <pad key="pq3" name="PQ3"/>
+        <pad key="pdi" name="PDI"/>
+        <pad key="reset" name="RESET"/>
+        <pad key="pr0" name="PR0"/>
+        <pad key="pr1" name="PR1"/>
+        <pad key="pa0" name="PA0"/>
+        <pad key="pa1" name="PA1"/>
+        <pad key="pa2" name="PA2"/>
+        <pad key="pa3" name="PA3"/>
+        <pad key="pa4" name="PA4"/>
+        <pad key="pa5" name="PA5"/>
+        <pad key="pdi_data" name="PDI_DATA"/>
+    </pads>
     <pinouts>
         <pinout key="tqfp100" name="TQFP100" type="qfp">
-            <pin position="1" pad="PA6"/>
-            <pin position="2" pad="PA7"/>
-            <pin position="3" pad="GND"/>
-            <pin position="4" pad="AVCC"/>
-            <pin position="5" pad="PB0"/>
-            <pin position="6" pad="PB1"/>
-            <pin position="7" pad="PB2"/>
-            <pin position="8" pad="PB3"/>
-            <pin position="9" pad="PB4"/>
-            <pin position="10" pad="PB5"/>
-            <pin position="11" pad="PB6"/>
-            <pin position="12" pad="PB7"/>
-            <pin position="13" pad="GND"/>
-            <pin position="14" pad="VCC"/>
-            <pin position="15" pad="PC0"/>
-            <pin position="16" pad="PC1"/>
-            <pin position="17" pad="PC2"/>
-            <pin position="18" pad="PC3"/>
-            <pin position="19" pad="PC4"/>
-            <pin position="20" pad="PC5"/>
-            <pin position="21" pad="PC6"/>
-            <pin position="22" pad="PC7"/>
-            <pin position="23" pad="GND"/>
-            <pin position="24" pad="VCC"/>
-            <pin position="25" pad="PD0"/>
-            <pin position="26" pad="PD1"/>
-            <pin position="27" pad="PD2"/>
-            <pin position="28" pad="PD3"/>
-            <pin position="29" pad="PD4"/>
-            <pin position="30" pad="PD5"/>
-            <pin position="31" pad="PD6"/>
-            <pin position="32" pad="PD7"/>
-            <pin position="33" pad="GND"/>
-            <pin position="34" pad="VCC"/>
-            <pin position="35" pad="PE0"/>
-            <pin position="36" pad="PE1"/>
-            <pin position="37" pad="PE2"/>
-            <pin position="38" pad="PE3"/>
-            <pin position="39" pad="PE4"/>
-            <pin position="40" pad="PE5"/>
-            <pin position="41" pad="PE6"/>
-            <pin position="42" pad="PE7"/>
-            <pin position="43" pad="GND"/>
-            <pin position="44" pad="VCC"/>
-            <pin position="45" pad="PF0"/>
-            <pin position="46" pad="PF1"/>
-            <pin position="47" pad="PF2"/>
-            <pin position="48" pad="PF3"/>
-            <pin position="49" pad="PF4"/>
-            <pin position="50" pad="PF5"/>
-            <pin position="51" pad="PF6"/>
-            <pin position="52" pad="PF7"/>
-            <pin position="53" pad="GND"/>
-            <pin position="54" pad="VCC"/>
-            <pin position="55" pad="PH0"/>
-            <pin position="56" pad="PH1"/>
-            <pin position="57" pad="PH2"/>
-            <pin position="58" pad="PH3"/>
-            <pin position="59" pad="PH4"/>
-            <pin position="60" pad="PH5"/>
-            <pin position="61" pad="PH6"/>
-            <pin position="62" pad="PH7"/>
-            <pin position="63" pad="GND"/>
-            <pin position="64" pad="VCC"/>
-            <pin position="65" pad="PJ0"/>
-            <pin position="66" pad="PJ1"/>
-            <pin position="67" pad="PJ2"/>
-            <pin position="68" pad="PJ3"/>
-            <pin position="69" pad="PJ4"/>
-            <pin position="70" pad="PJ5"/>
-            <pin position="71" pad="PJ6"/>
-            <pin position="72" pad="PJ7"/>
-            <pin position="73" pad="GND"/>
-            <pin position="74" pad="VCC"/>
-            <pin position="75" pad="PK0"/>
-            <pin position="76" pad="PK1"/>
-            <pin position="77" pad="PK2"/>
-            <pin position="78" pad="PK3"/>
-            <pin position="79" pad="PK4"/>
-            <pin position="80" pad="PK5"/>
-            <pin position="81" pad="PK6"/>
-            <pin position="82" pad="PK7"/>
-            <pin position="83" pad="VCC"/>
-            <pin position="84" pad="GND"/>
-            <pin position="85" pad="PQ0"/>
-            <pin position="86" pad="PQ1"/>
-            <pin position="87" pad="PQ2"/>
-            <pin position="88" pad="PQ3"/>
-            <pin position="89" pad="PDI"/>
-            <pin position="90" pad="RESET"/>
-            <pin position="91" pad="PR0"/>
-            <pin position="92" pad="PR1"/>
-            <pin position="93" pad="GND"/>
-            <pin position="94" pad="AVCC"/>
-            <pin position="95" pad="PA0"/>
-            <pin position="96" pad="PA1"/>
-            <pin position="97" pad="PA2"/>
-            <pin position="98" pad="PA3"/>
-            <pin position="99" pad="PA4"/>
-            <pin position="100" pad="PA5"/>
+            <pin position="1" pad-key="pa6"/>
+            <pin position="2" pad-key="pa7"/>
+            <pin position="3" pad-key="gnd"/>
+            <pin position="4" pad-key="avcc"/>
+            <pin position="5" pad-key="pb0"/>
+            <pin position="6" pad-key="pb1"/>
+            <pin position="7" pad-key="pb2"/>
+            <pin position="8" pad-key="pb3"/>
+            <pin position="9" pad-key="pb4"/>
+            <pin position="10" pad-key="pb5"/>
+            <pin position="11" pad-key="pb6"/>
+            <pin position="12" pad-key="pb7"/>
+            <pin position="13" pad-key="gnd"/>
+            <pin position="14" pad-key="vcc"/>
+            <pin position="15" pad-key="pc0"/>
+            <pin position="16" pad-key="pc1"/>
+            <pin position="17" pad-key="pc2"/>
+            <pin position="18" pad-key="pc3"/>
+            <pin position="19" pad-key="pc4"/>
+            <pin position="20" pad-key="pc5"/>
+            <pin position="21" pad-key="pc6"/>
+            <pin position="22" pad-key="pc7"/>
+            <pin position="23" pad-key="gnd"/>
+            <pin position="24" pad-key="vcc"/>
+            <pin position="25" pad-key="pd0"/>
+            <pin position="26" pad-key="pd1"/>
+            <pin position="27" pad-key="pd2"/>
+            <pin position="28" pad-key="pd3"/>
+            <pin position="29" pad-key="pd4"/>
+            <pin position="30" pad-key="pd5"/>
+            <pin position="31" pad-key="pd6"/>
+            <pin position="32" pad-key="pd7"/>
+            <pin position="33" pad-key="gnd"/>
+            <pin position="34" pad-key="vcc"/>
+            <pin position="35" pad-key="pe0"/>
+            <pin position="36" pad-key="pe1"/>
+            <pin position="37" pad-key="pe2"/>
+            <pin position="38" pad-key="pe3"/>
+            <pin position="39" pad-key="pe4"/>
+            <pin position="40" pad-key="pe5"/>
+            <pin position="41" pad-key="pe6"/>
+            <pin position="42" pad-key="pe7"/>
+            <pin position="43" pad-key="gnd"/>
+            <pin position="44" pad-key="vcc"/>
+            <pin position="45" pad-key="pf0"/>
+            <pin position="46" pad-key="pf1"/>
+            <pin position="47" pad-key="pf2"/>
+            <pin position="48" pad-key="pf3"/>
+            <pin position="49" pad-key="pf4"/>
+            <pin position="50" pad-key="pf5"/>
+            <pin position="51" pad-key="pf6"/>
+            <pin position="52" pad-key="pf7"/>
+            <pin position="53" pad-key="gnd"/>
+            <pin position="54" pad-key="vcc"/>
+            <pin position="55" pad-key="ph0"/>
+            <pin position="56" pad-key="ph1"/>
+            <pin position="57" pad-key="ph2"/>
+            <pin position="58" pad-key="ph3"/>
+            <pin position="59" pad-key="ph4"/>
+            <pin position="60" pad-key="ph5"/>
+            <pin position="61" pad-key="ph6"/>
+            <pin position="62" pad-key="ph7"/>
+            <pin position="63" pad-key="gnd"/>
+            <pin position="64" pad-key="vcc"/>
+            <pin position="65" pad-key="pj0"/>
+            <pin position="66" pad-key="pj1"/>
+            <pin position="67" pad-key="pj2"/>
+            <pin position="68" pad-key="pj3"/>
+            <pin position="69" pad-key="pj4"/>
+            <pin position="70" pad-key="pj5"/>
+            <pin position="71" pad-key="pj6"/>
+            <pin position="72" pad-key="pj7"/>
+            <pin position="73" pad-key="gnd"/>
+            <pin position="74" pad-key="vcc"/>
+            <pin position="75" pad-key="pk0"/>
+            <pin position="76" pad-key="pk1"/>
+            <pin position="77" pad-key="pk2"/>
+            <pin position="78" pad-key="pk3"/>
+            <pin position="79" pad-key="pk4"/>
+            <pin position="80" pad-key="pk5"/>
+            <pin position="81" pad-key="pk6"/>
+            <pin position="82" pad-key="pk7"/>
+            <pin position="83" pad-key="vcc"/>
+            <pin position="84" pad-key="gnd"/>
+            <pin position="85" pad-key="pq0"/>
+            <pin position="86" pad-key="pq1"/>
+            <pin position="87" pad-key="pq2"/>
+            <pin position="88" pad-key="pq3"/>
+            <pin position="89" pad-key="pdi"/>
+            <pin position="90" pad-key="reset"/>
+            <pin position="91" pad-key="pr0"/>
+            <pin position="92" pad-key="pr1"/>
+            <pin position="93" pad-key="gnd"/>
+            <pin position="94" pad-key="avcc"/>
+            <pin position="95" pad-key="pa0"/>
+            <pin position="96" pad-key="pa1"/>
+            <pin position="97" pad-key="pa2"/>
+            <pin position="98" pad-key="pa3"/>
+            <pin position="99" pad-key="pa4"/>
+            <pin position="100" pad-key="pa5"/>
         </pinout>
         <pinout key="bga100" name="BGA100" type="bga">
-            <pin position="A1" pad="PK0"/>
-            <pin position="A2" pad="VCC"/>
-            <pin position="A3" pad="GND"/>
-            <pin position="A4" pad="PJ3"/>
-            <pin position="A5" pad="VCC"/>
-            <pin position="A6" pad="GND"/>
-            <pin position="A7" pad="PH1"/>
-            <pin position="A8" pad="GND"/>
-            <pin position="A9" pad="VCC"/>
-            <pin position="A10" pad="PF7"/>
-            <pin position="B1" pad="PK3"/>
-            <pin position="B2" pad="PK2"/>
-            <pin position="B3" pad="PK1"/>
-            <pin position="B4" pad="PJ4"/>
-            <pin position="B5" pad="PH7"/>
-            <pin position="B6" pad="PH4"/>
-            <pin position="B7" pad="PH2"/>
-            <pin position="B8" pad="PH0"/>
-            <pin position="B9" pad="PF6"/>
-            <pin position="B10" pad="PF5"/>
-            <pin position="C1" pad="VCC"/>
-            <pin position="C2" pad="PK5"/>
-            <pin position="C3" pad="PK4"/>
-            <pin position="C4" pad="PJ5"/>
-            <pin position="C5" pad="PJ0"/>
-            <pin position="C6" pad="PH5"/>
-            <pin position="C7" pad="PH3"/>
-            <pin position="C8" pad="PF2"/>
-            <pin position="C9" pad="PF3"/>
-            <pin position="C10" pad="VCC"/>
-            <pin position="D1" pad="GND"/>
-            <pin position="D2" pad="PK6"/>
-            <pin position="D3" pad="PK7"/>
-            <pin position="D4" pad="PJ6"/>
-            <pin position="D5" pad="PJ1"/>
-            <pin position="D6" pad="PH6"/>
-            <pin position="D7" pad="PF0"/>
-            <pin position="D8" pad="PF1"/>
-            <pin position="D9" pad="PF4"/>
-            <pin position="D10" pad="GND"/>
-            <pin position="E1" pad="PQ0"/>
-            <pin position="E2" pad="PQ1"/>
-            <pin position="E3" pad="PQ2"/>
-            <pin position="E4" pad="PJ7"/>
-            <pin position="E5" pad="PJ2"/>
-            <pin position="E6" pad="PE7"/>
-            <pin position="E7" pad="PE6"/>
-            <pin position="E8" pad="PE5"/>
-            <pin position="E9" pad="PE4"/>
-            <pin position="E10" pad="PE3"/>
-            <pin position="F1" pad="PR1"/>
-            <pin position="F2" pad="PR0"/>
-            <pin position="F3" pad="RESET"/>
-            <pin position="F4" pad="PDI_DATA"/>
-            <pin position="F5" pad="PQ3"/>
-            <pin position="F6" pad="PC2"/>
-            <pin position="F7" pad="PE2"/>
-            <pin position="F8" pad="PE1"/>
-            <pin position="F9" pad="PE0"/>
-            <pin position="F10" pad="VCC"/>
-            <pin position="G1" pad="GND"/>
-            <pin position="G2" pad="PA1"/>
-            <pin position="G3" pad="PA4"/>
-            <pin position="G4" pad="PB3"/>
-            <pin position="G5" pad="PB4"/>
-            <pin position="G6" pad="PC1"/>
-            <pin position="G7" pad="PC6"/>
-            <pin position="G8" pad="PD7"/>
-            <pin position="G9" pad="PD6"/>
-            <pin position="G10" pad="GND"/>
-            <pin position="H1" pad="AVCC"/>
-            <pin position="H2" pad="PA2"/>
-            <pin position="H3" pad="PA5"/>
-            <pin position="H4" pad="PB2"/>
-            <pin position="H5" pad="PB5"/>
-            <pin position="H6" pad="PC0"/>
-            <pin position="H7" pad="PC5"/>
-            <pin position="H8" pad="PD5"/>
-            <pin position="H9" pad="PD4"/>
-            <pin position="H10" pad="PD3"/>
-            <pin position="J1" pad="PA0"/>
-            <pin position="J2" pad="PA3"/>
-            <pin position="J3" pad="PB0"/>
-            <pin position="J4" pad="PB1"/>
-            <pin position="J5" pad="PB6"/>
-            <pin position="J6" pad="PC3"/>
-            <pin position="J7" pad="PC4"/>
-            <pin position="J8" pad="PC7"/>
-            <pin position="J9" pad="PD2"/>
-            <pin position="J10" pad="PD1"/>
-            <pin position="K1" pad="PA6"/>
-            <pin position="K2" pad="PA7"/>
-            <pin position="K3" pad="GND"/>
-            <pin position="K4" pad="AVCC"/>
-            <pin position="K5" pad="PB7"/>
-            <pin position="K6" pad="VCC "/>
-            <pin position="K7" pad="GND"/>
-            <pin position="K8" pad="VCC"/>
-            <pin position="K9" pad="GND"/>
-            <pin position="K10" pad="PD0"/>
+            <pin position="A1" pad-key="pk0"/>
+            <pin position="A2" pad-key="vcc"/>
+            <pin position="A3" pad-key="gnd"/>
+            <pin position="A4" pad-key="pj3"/>
+            <pin position="A5" pad-key="vcc"/>
+            <pin position="A6" pad-key="gnd"/>
+            <pin position="A7" pad-key="ph1"/>
+            <pin position="A8" pad-key="gnd"/>
+            <pin position="A9" pad-key="vcc"/>
+            <pin position="A10" pad-key="pf7"/>
+            <pin position="B1" pad-key="pk3"/>
+            <pin position="B2" pad-key="pk2"/>
+            <pin position="B3" pad-key="pk1"/>
+            <pin position="B4" pad-key="pj4"/>
+            <pin position="B5" pad-key="ph7"/>
+            <pin position="B6" pad-key="ph4"/>
+            <pin position="B7" pad-key="ph2"/>
+            <pin position="B8" pad-key="ph0"/>
+            <pin position="B9" pad-key="pf6"/>
+            <pin position="B10" pad-key="pf5"/>
+            <pin position="C1" pad-key="vcc"/>
+            <pin position="C2" pad-key="pk5"/>
+            <pin position="C3" pad-key="pk4"/>
+            <pin position="C4" pad-key="pj5"/>
+            <pin position="C5" pad-key="pj0"/>
+            <pin position="C6" pad-key="ph5"/>
+            <pin position="C7" pad-key="ph3"/>
+            <pin position="C8" pad-key="pf2"/>
+            <pin position="C9" pad-key="pf3"/>
+            <pin position="C10" pad-key="vcc"/>
+            <pin position="D1" pad-key="gnd"/>
+            <pin position="D2" pad-key="pk6"/>
+            <pin position="D3" pad-key="pk7"/>
+            <pin position="D4" pad-key="pj6"/>
+            <pin position="D5" pad-key="pj1"/>
+            <pin position="D6" pad-key="ph6"/>
+            <pin position="D7" pad-key="pf0"/>
+            <pin position="D8" pad-key="pf1"/>
+            <pin position="D9" pad-key="pf4"/>
+            <pin position="D10" pad-key="gnd"/>
+            <pin position="E1" pad-key="pq0"/>
+            <pin position="E2" pad-key="pq1"/>
+            <pin position="E3" pad-key="pq2"/>
+            <pin position="E4" pad-key="pj7"/>
+            <pin position="E5" pad-key="pj2"/>
+            <pin position="E6" pad-key="pe7"/>
+            <pin position="E7" pad-key="pe6"/>
+            <pin position="E8" pad-key="pe5"/>
+            <pin position="E9" pad-key="pe4"/>
+            <pin position="E10" pad-key="pe3"/>
+            <pin position="F1" pad-key="pr1"/>
+            <pin position="F2" pad-key="pr0"/>
+            <pin position="F3" pad-key="reset"/>
+            <pin position="F4" pad-key="pdi_data"/>
+            <pin position="F5" pad-key="pq3"/>
+            <pin position="F6" pad-key="pc2"/>
+            <pin position="F7" pad-key="pe2"/>
+            <pin position="F8" pad-key="pe1"/>
+            <pin position="F9" pad-key="pe0"/>
+            <pin position="F10" pad-key="vcc"/>
+            <pin position="G1" pad-key="gnd"/>
+            <pin position="G2" pad-key="pa1"/>
+            <pin position="G3" pad-key="pa4"/>
+            <pin position="G4" pad-key="pb3"/>
+            <pin position="G5" pad-key="pb4"/>
+            <pin position="G6" pad-key="pc1"/>
+            <pin position="G7" pad-key="pc6"/>
+            <pin position="G8" pad-key="pd7"/>
+            <pin position="G9" pad-key="pd6"/>
+            <pin position="G10" pad-key="gnd"/>
+            <pin position="H1" pad-key="avcc"/>
+            <pin position="H2" pad-key="pa2"/>
+            <pin position="H3" pad-key="pa5"/>
+            <pin position="H4" pad-key="pb2"/>
+            <pin position="H5" pad-key="pb5"/>
+            <pin position="H6" pad-key="pc0"/>
+            <pin position="H7" pad-key="pc5"/>
+            <pin position="H8" pad-key="pd5"/>
+            <pin position="H9" pad-key="pd4"/>
+            <pin position="H10" pad-key="pd3"/>
+            <pin position="J1" pad-key="pa0"/>
+            <pin position="J2" pad-key="pa3"/>
+            <pin position="J3" pad-key="pb0"/>
+            <pin position="J4" pad-key="pb1"/>
+            <pin position="J5" pad-key="pb6"/>
+            <pin position="J6" pad-key="pc3"/>
+            <pin position="J7" pad-key="pc4"/>
+            <pin position="J8" pad-key="pc7"/>
+            <pin position="J9" pad-key="pd2"/>
+            <pin position="J10" pad-key="pd1"/>
+            <pin position="K1" pad-key="pa6"/>
+            <pin position="K2" pad-key="pa7"/>
+            <pin position="K3" pad-key="gnd"/>
+            <pin position="K4" pad-key="avcc"/>
+            <pin position="K5" pad-key="pb7"/>
+            <pin position="K6" pad-key="vcc"/>
+            <pin position="K7" pad-key="gnd"/>
+            <pin position="K8" pad-key="vcc"/>
+            <pin position="K9" pad-key="gnd"/>
+            <pin position="K10" pad-key="pd0"/>
         </pinout>
     </pinouts>
     <variants>
-        <variant name="ATxmega64A1U-AU" pinout-key="tqfp100" package="TQFP100"/>
-        <variant name="ATxmega64A1U-CU" pinout-key="bga100" package="BGA100"/>
-        <variant name="ATxmega64A1U-C7U" pinout-key="bga100" package="BGA100"/>
-        <variant name="ATxmega64A1U-AN" pinout-key="tqfp100" package="TQFP100"/>
+        <variant key="atxmega64a1u_au" name="ATxmega64A1U-AU" pinout-key="tqfp100"/>
+        <variant key="atxmega64a1u_cu" name="ATxmega64A1U-CU" pinout-key="bga100"/>
+        <variant key="atxmega64a1u_c7u" name="ATxmega64A1U-C7U" pinout-key="bga100"/>
+        <variant key="atxmega64a1u_an" name="ATxmega64A1U-AN" pinout-key="tqfp100"/>
     </variants>
 </device>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA64A3.xml b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA64A3.xml
index ee44c649..98965bd7 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA64A3.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA64A3.xml
@@ -160,86 +160,86 @@
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pa2" index="2" function="PORTA" group="P"/>
-                <signal pad-id="pa3" index="3" function="PORTA" group="P"/>
-                <signal pad-id="pa4" index="4" function="PORTA" group="P"/>
-                <signal pad-id="pa5" index="5" function="PORTA" group="P"/>
-                <signal pad-id="pa6" index="6" function="PORTA" group="P"/>
-                <signal pad-id="pa7" index="7" function="PORTA" group="P"/>
+                <signal pad-key="pa0" index="0" function="PORTA" group="P"/>
+                <signal pad-key="pa1" index="1" function="PORTA" group="P"/>
+                <signal pad-key="pa2" index="2" function="PORTA" group="P"/>
+                <signal pad-key="pa3" index="3" function="PORTA" group="P"/>
+                <signal pad-key="pa4" index="4" function="PORTA" group="P"/>
+                <signal pad-key="pa5" index="5" function="PORTA" group="P"/>
+                <signal pad-key="pa6" index="6" function="PORTA" group="P"/>
+                <signal pad-key="pa7" index="7" function="PORTA" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pb2" index="2" function="PORTB" group="P"/>
-                <signal pad-id="pb3" index="3" function="PORTB" group="P"/>
-                <signal pad-id="pb4" index="4" function="PORTB" group="P"/>
-                <signal pad-id="pb5" index="5" function="PORTB" group="P"/>
-                <signal pad-id="pb6" index="6" function="PORTB" group="P"/>
-                <signal pad-id="pb7" index="7" function="PORTB" group="P"/>
+                <signal pad-key="pb0" index="0" function="PORTB" group="P"/>
+                <signal pad-key="pb1" index="1" function="PORTB" group="P"/>
+                <signal pad-key="pb2" index="2" function="PORTB" group="P"/>
+                <signal pad-key="pb3" index="3" function="PORTB" group="P"/>
+                <signal pad-key="pb4" index="4" function="PORTB" group="P"/>
+                <signal pad-key="pb5" index="5" function="PORTB" group="P"/>
+                <signal pad-key="pb6" index="6" function="PORTB" group="P"/>
+                <signal pad-key="pb7" index="7" function="PORTB" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pc2" index="2" function="PORTC" group="P"/>
-                <signal pad-id="pc3" index="3" function="PORTC" group="P"/>
-                <signal pad-id="pc4" index="4" function="PORTC" group="P"/>
-                <signal pad-id="pc5" index="5" function="PORTC" group="P"/>
-                <signal pad-id="pc6" index="6" function="PORTC" group="P"/>
-                <signal pad-id="pc7" index="7" function="PORTC" group="P"/>
+                <signal pad-key="pc0" index="0" function="PORTC" group="P"/>
+                <signal pad-key="pc1" index="1" function="PORTC" group="P"/>
+                <signal pad-key="pc2" index="2" function="PORTC" group="P"/>
+                <signal pad-key="pc3" index="3" function="PORTC" group="P"/>
+                <signal pad-key="pc4" index="4" function="PORTC" group="P"/>
+                <signal pad-key="pc5" index="5" function="PORTC" group="P"/>
+                <signal pad-key="pc6" index="6" function="PORTC" group="P"/>
+                <signal pad-key="pc7" index="7" function="PORTC" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pd2" index="2" function="PORTD" group="P"/>
-                <signal pad-id="pd3" index="3" function="PORTD" group="P"/>
-                <signal pad-id="pd4" index="4" function="PORTD" group="P"/>
-                <signal pad-id="pd5" index="5" function="PORTD" group="P"/>
-                <signal pad-id="pd6" index="6" function="PORTD" group="P"/>
-                <signal pad-id="pd7" index="7" function="PORTD" group="P"/>
+                <signal pad-key="pd0" index="0" function="PORTD" group="P"/>
+                <signal pad-key="pd1" index="1" function="PORTD" group="P"/>
+                <signal pad-key="pd2" index="2" function="PORTD" group="P"/>
+                <signal pad-key="pd3" index="3" function="PORTD" group="P"/>
+                <signal pad-key="pd4" index="4" function="PORTD" group="P"/>
+                <signal pad-key="pd5" index="5" function="PORTD" group="P"/>
+                <signal pad-key="pd6" index="6" function="PORTD" group="P"/>
+                <signal pad-key="pd7" index="7" function="PORTD" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="porte" name="PORTE" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pe2" index="2" function="PORTE" group="P"/>
-                <signal pad-id="pe3" index="3" function="PORTE" group="P"/>
-                <signal pad-id="pe4" index="4" function="PORTE" group="P"/>
-                <signal pad-id="pe5" index="5" function="PORTE" group="P"/>
-                <signal pad-id="pe6" index="6" function="PORTE" group="P"/>
-                <signal pad-id="pe7" index="7" function="PORTE" group="P"/>
+                <signal pad-key="pe0" index="0" function="PORTE" group="P"/>
+                <signal pad-key="pe1" index="1" function="PORTE" group="P"/>
+                <signal pad-key="pe2" index="2" function="PORTE" group="P"/>
+                <signal pad-key="pe3" index="3" function="PORTE" group="P"/>
+                <signal pad-key="pe4" index="4" function="PORTE" group="P"/>
+                <signal pad-key="pe5" index="5" function="PORTE" group="P"/>
+                <signal pad-key="pe6" index="6" function="PORTE" group="P"/>
+                <signal pad-key="pe7" index="7" function="PORTE" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portf" name="PORTF" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pf2" index="2" function="PORTF" group="P"/>
-                <signal pad-id="pf3" index="3" function="PORTF" group="P"/>
-                <signal pad-id="pf4" index="4" function="PORTF" group="P"/>
-                <signal pad-id="pf5" index="5" function="PORTF" group="P"/>
-                <signal pad-id="pf6" index="6" function="PORTF" group="P"/>
-                <signal pad-id="pf7" index="7" function="PORTF" group="P"/>
+                <signal pad-key="pf0" index="0" function="PORTF" group="P"/>
+                <signal pad-key="pf1" index="1" function="PORTF" group="P"/>
+                <signal pad-key="pf2" index="2" function="PORTF" group="P"/>
+                <signal pad-key="pf3" index="3" function="PORTF" group="P"/>
+                <signal pad-key="pf4" index="4" function="PORTF" group="P"/>
+                <signal pad-key="pf5" index="5" function="PORTF" group="P"/>
+                <signal pad-key="pf6" index="6" function="PORTF" group="P"/>
+                <signal pad-key="pf7" index="7" function="PORTF" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portr" name="PORTR" module-key="gpio_port">
             <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"/>
+                <signal pad-key="pr0" index="0" function="PORTR" group="P"/>
+                <signal pad-key="pr1" index="1" function="PORTR" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="tcc0" name="TCC0" module-key="i6090_tc">
@@ -1384,76 +1384,133 @@
             </register-group>
         </module>
     </modules>
+    <pads>
+        <pad key="pa3" name="PA3"/>
+        <pad key="pa4" name="PA4"/>
+        <pad key="pa5" name="PA5"/>
+        <pad key="pa6" name="PA6"/>
+        <pad key="pa7" name="PA7"/>
+        <pad key="pb0" name="PB0"/>
+        <pad key="pb1" name="PB1"/>
+        <pad key="pb2" name="PB2"/>
+        <pad key="pb3" name="PB3"/>
+        <pad key="pb4" name="PB4"/>
+        <pad key="pb5" name="PB5"/>
+        <pad key="pb6" name="PB6"/>
+        <pad key="pb7" name="PB7"/>
+        <pad key="gnd" name="GND"/>
+        <pad key="vcc" name="VCC"/>
+        <pad key="pc0" name="PC0"/>
+        <pad key="pc1" name="PC1"/>
+        <pad key="pc2" name="PC2"/>
+        <pad key="pc3" name="PC3"/>
+        <pad key="pc4" name="PC4"/>
+        <pad key="pc5" name="PC5"/>
+        <pad key="pc6" name="PC6"/>
+        <pad key="pc7" name="PC7"/>
+        <pad key="pd0" name="PD0"/>
+        <pad key="pd1" name="PD1"/>
+        <pad key="pd2" name="PD2"/>
+        <pad key="pd3" name="PD3"/>
+        <pad key="pd4" name="PD4"/>
+        <pad key="pd5" name="PD5"/>
+        <pad key="pd6" name="PD6"/>
+        <pad key="pd7" name="PD7"/>
+        <pad key="pe0" name="PE0"/>
+        <pad key="pe1" name="PE1"/>
+        <pad key="pe2" name="PE2"/>
+        <pad key="pe3" name="PE3"/>
+        <pad key="pe4" name="PE4"/>
+        <pad key="pe5" name="PE5"/>
+        <pad key="pe6" name="PE6"/>
+        <pad key="pe7" name="PE7"/>
+        <pad key="pf0" name="PF0"/>
+        <pad key="pf1" name="PF1"/>
+        <pad key="pf2" name="PF2"/>
+        <pad key="pf3" name="PF3"/>
+        <pad key="pf4" name="PF4"/>
+        <pad key="pf5" name="PF5"/>
+        <pad key="pf6" name="PF6"/>
+        <pad key="pf7" name="PF7"/>
+        <pad key="pdi" name="PDI"/>
+        <pad key="reset" name="RESET"/>
+        <pad key="pr0" name="PR0"/>
+        <pad key="pr1" name="PR1"/>
+        <pad key="avcc" name="AVCC"/>
+        <pad key="pa0" name="PA0"/>
+        <pad key="pa1" name="PA1"/>
+        <pad key="pa2" name="PA2"/>
+    </pads>
     <pinouts>
         <pinout key="qfp_qfn_64" name="QFP_QFN_64" type="qfn">
-            <pin position="1" pad="PA3"/>
-            <pin position="2" pad="PA4"/>
-            <pin position="3" pad="PA5"/>
-            <pin position="4" pad="PA6"/>
-            <pin position="5" pad="PA7"/>
-            <pin position="6" pad="PB0"/>
-            <pin position="7" pad="PB1"/>
-            <pin position="8" pad="PB2"/>
-            <pin position="9" pad="PB3"/>
-            <pin position="10" pad="PB4"/>
-            <pin position="11" pad="PB5"/>
-            <pin position="12" pad="PB6"/>
-            <pin position="13" pad="PB7"/>
-            <pin position="14" pad="GND"/>
-            <pin position="15" pad="VCC"/>
-            <pin position="16" pad="PC0"/>
-            <pin position="17" pad="PC1"/>
-            <pin position="18" pad="PC2"/>
-            <pin position="19" pad="PC3"/>
-            <pin position="20" pad="PC4"/>
-            <pin position="21" pad="PC5"/>
-            <pin position="22" pad="PC6"/>
-            <pin position="23" pad="PC7"/>
-            <pin position="24" pad="GND"/>
-            <pin position="25" pad="VCC"/>
-            <pin position="26" pad="PD0"/>
-            <pin position="27" pad="PD1"/>
-            <pin position="28" pad="PD2"/>
-            <pin position="29" pad="PD3"/>
-            <pin position="30" pad="PD4"/>
-            <pin position="31" pad="PD5"/>
-            <pin position="32" pad="PD6"/>
-            <pin position="33" pad="PD7"/>
-            <pin position="34" pad="GND"/>
-            <pin position="35" pad="VCC"/>
-            <pin position="36" pad="PE0"/>
-            <pin position="37" pad="PE1"/>
-            <pin position="38" pad="PE2"/>
-            <pin position="39" pad="PE3"/>
-            <pin position="40" pad="PE4"/>
-            <pin position="41" pad="PE5"/>
-            <pin position="42" pad="PE6"/>
-            <pin position="43" pad="PE7"/>
-            <pin position="44" pad="GND"/>
-            <pin position="45" pad="VCC"/>
-            <pin position="46" pad="PF0"/>
-            <pin position="47" pad="PF1"/>
-            <pin position="48" pad="PF2"/>
-            <pin position="49" pad="PF3"/>
-            <pin position="50" pad="PF4"/>
-            <pin position="51" pad="PF5"/>
-            <pin position="52" pad="GND"/>
-            <pin position="53" pad="VCC"/>
-            <pin position="54" pad="PF6"/>
-            <pin position="55" pad="PF7"/>
-            <pin position="56" pad="PDI"/>
-            <pin position="57" pad="RESET"/>
-            <pin position="58" pad="PR0"/>
-            <pin position="59" pad="PR1"/>
-            <pin position="60" pad="GND"/>
-            <pin position="61" pad="AVCC"/>
-            <pin position="62" pad="PA0"/>
-            <pin position="63" pad="PA1"/>
-            <pin position="64" pad="PA2"/>
+            <pin position="1" pad-key="pa3"/>
+            <pin position="2" pad-key="pa4"/>
+            <pin position="3" pad-key="pa5"/>
+            <pin position="4" pad-key="pa6"/>
+            <pin position="5" pad-key="pa7"/>
+            <pin position="6" pad-key="pb0"/>
+            <pin position="7" pad-key="pb1"/>
+            <pin position="8" pad-key="pb2"/>
+            <pin position="9" pad-key="pb3"/>
+            <pin position="10" pad-key="pb4"/>
+            <pin position="11" pad-key="pb5"/>
+            <pin position="12" pad-key="pb6"/>
+            <pin position="13" pad-key="pb7"/>
+            <pin position="14" pad-key="gnd"/>
+            <pin position="15" pad-key="vcc"/>
+            <pin position="16" pad-key="pc0"/>
+            <pin position="17" pad-key="pc1"/>
+            <pin position="18" pad-key="pc2"/>
+            <pin position="19" pad-key="pc3"/>
+            <pin position="20" pad-key="pc4"/>
+            <pin position="21" pad-key="pc5"/>
+            <pin position="22" pad-key="pc6"/>
+            <pin position="23" pad-key="pc7"/>
+            <pin position="24" pad-key="gnd"/>
+            <pin position="25" pad-key="vcc"/>
+            <pin position="26" pad-key="pd0"/>
+            <pin position="27" pad-key="pd1"/>
+            <pin position="28" pad-key="pd2"/>
+            <pin position="29" pad-key="pd3"/>
+            <pin position="30" pad-key="pd4"/>
+            <pin position="31" pad-key="pd5"/>
+            <pin position="32" pad-key="pd6"/>
+            <pin position="33" pad-key="pd7"/>
+            <pin position="34" pad-key="gnd"/>
+            <pin position="35" pad-key="vcc"/>
+            <pin position="36" pad-key="pe0"/>
+            <pin position="37" pad-key="pe1"/>
+            <pin position="38" pad-key="pe2"/>
+            <pin position="39" pad-key="pe3"/>
+            <pin position="40" pad-key="pe4"/>
+            <pin position="41" pad-key="pe5"/>
+            <pin position="42" pad-key="pe6"/>
+            <pin position="43" pad-key="pe7"/>
+            <pin position="44" pad-key="gnd"/>
+            <pin position="45" pad-key="vcc"/>
+            <pin position="46" pad-key="pf0"/>
+            <pin position="47" pad-key="pf1"/>
+            <pin position="48" pad-key="pf2"/>
+            <pin position="49" pad-key="pf3"/>
+            <pin position="50" pad-key="pf4"/>
+            <pin position="51" pad-key="pf5"/>
+            <pin position="52" pad-key="gnd"/>
+            <pin position="53" pad-key="vcc"/>
+            <pin position="54" pad-key="pf6"/>
+            <pin position="55" pad-key="pf7"/>
+            <pin position="56" pad-key="pdi"/>
+            <pin position="57" pad-key="reset"/>
+            <pin position="58" pad-key="pr0"/>
+            <pin position="59" pad-key="pr1"/>
+            <pin position="60" pad-key="gnd"/>
+            <pin position="61" pad-key="avcc"/>
+            <pin position="62" pad-key="pa0"/>
+            <pin position="63" pad-key="pa1"/>
+            <pin position="64" pad-key="pa2"/>
         </pinout>
     </pinouts>
     <variants>
-        <variant name="ATXMEGA64A3-AU" pinout-key="qfp_qfn_64" package="TQFP64"/>
-        <variant name="ATXMEGA64A3-MH" pinout-key="qfp_qfn_64" package="QFN64"/>
+        <variant key="atxmega64a3_au" name="ATXMEGA64A3-AU" pinout-key="qfp_qfn_64"/>
+        <variant key="atxmega64a3_mh" name="ATXMEGA64A3-MH" pinout-key="qfp_qfn_64"/>
     </variants>
 </device>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA64A3U.xml b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA64A3U.xml
index dcf24beb..beca8819 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA64A3U.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA64A3U.xml
@@ -94,10 +94,10 @@
         <peripheral key="osc" name="OSC" module-key="i6079">
             <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"/>
-                <signal pad-id="pe2" function="TOSC" group="TOSC2"/>
-                <signal pad-id="pe3" function="TOSC" group="TOSC1"/>
+                <signal pad-key="pr0" function="XTAL" group="XTAL2"/>
+                <signal pad-key="pr1" function="XTAL" group="XTAL1"/>
+                <signal pad-key="pe2" function="TOSC" group="TOSC2"/>
+                <signal pad-key="pe3" function="TOSC" group="TOSC1"/>
             </signals>
         </peripheral>
         <peripheral key="dfllrc32m" name="DFLLRC32M" module-key="i6055">
@@ -121,19 +121,19 @@
         <peripheral key="portcfg" name="PORTCFG" module-key="i6075_portcfg">
             <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"/>
-                <signal pad-id="pd7" function="CLKOUTD" group="CLKOUT" field="CLKOUT"/>
-                <signal pad-id="pd4" function="CLKOUTD_ALT" group="CLKOUT" field="CLKEVPIN"/>
-                <signal pad-id="pe7" function="CLKOUTE" group="CLKOUT" field="CLKOUT"/>
-                <signal pad-id="pe4" function="CLKOUTE_ALT" group="CLKOUT" field="CLKEVPIN"/>
-                <signal pad-id="pc7" function="EVOUTC" group="EVOUT" field="EVOUT"/>
-                <signal pad-id="pc4" function="EVOUTC_ALT" group="EVOUT" field="CLKEVPIN"/>
-                <signal pad-id="pd7" function="EVOUTD" group="EVOUT" field="EVOUT"/>
-                <signal pad-id="pd4" function="EVOUTD_ALT" group="EVOUT" field="CLKEVPIN"/>
-                <signal pad-id="pe7" function="EVOUTE" group="EVOUT" field="EVOUT"/>
-                <signal pad-id="pe4" function="EVOUTE_ALT" group="EVOUT" field="CLKEVPIN"/>
-                <signal pad-id="pc6" function="RTCOUTC" group="RTCOUT"/>
+                <signal pad-key="pc7" function="CLKOUTC" group="CLKOUT" field="CLKOUT"/>
+                <signal pad-key="pc4" function="CLKOUTC_ALT" group="CLKOUT" field="CLKEVPIN"/>
+                <signal pad-key="pd7" function="CLKOUTD" group="CLKOUT" field="CLKOUT"/>
+                <signal pad-key="pd4" function="CLKOUTD_ALT" group="CLKOUT" field="CLKEVPIN"/>
+                <signal pad-key="pe7" function="CLKOUTE" group="CLKOUT" field="CLKOUT"/>
+                <signal pad-key="pe4" function="CLKOUTE_ALT" group="CLKOUT" field="CLKEVPIN"/>
+                <signal pad-key="pc7" function="EVOUTC" group="EVOUT" field="EVOUT"/>
+                <signal pad-key="pc4" function="EVOUTC_ALT" group="EVOUT" field="CLKEVPIN"/>
+                <signal pad-key="pd7" function="EVOUTD" group="EVOUT" field="EVOUT"/>
+                <signal pad-key="pd4" function="EVOUTD_ALT" group="EVOUT" field="CLKEVPIN"/>
+                <signal pad-key="pe7" function="EVOUTE" group="EVOUT" field="EVOUT"/>
+                <signal pad-key="pe4" function="EVOUTE_ALT" group="EVOUT" field="CLKEVPIN"/>
+                <signal pad-key="pc6" function="RTCOUTC" group="RTCOUT"/>
             </signals>
         </peripheral>
         <peripheral key="aes" name="AES" module-key="i6096">
@@ -154,78 +154,78 @@
         <peripheral key="adca" name="ADCA" module-key="i6099">
             <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"/>
-                <signal pad-id="pa2" index="2" function="ADC" group="ADC"/>
-                <signal pad-id="pa3" index="3" function="ADC" group="ADC"/>
-                <signal pad-id="pa4" index="4" function="ADC" group="ADC"/>
-                <signal pad-id="pa5" index="5" function="ADC" group="ADC"/>
-                <signal pad-id="pa6" index="6" function="ADC" group="ADC"/>
-                <signal pad-id="pa7" index="7" function="ADC" group="ADC"/>
-                <signal pad-id="pb0" index="8" function="ADC" group="ADC"/>
-                <signal pad-id="pb1" index="9" function="ADC" group="ADC"/>
-                <signal pad-id="pb2" index="10" function="ADC" group="ADC"/>
-                <signal pad-id="pb3" index="11" function="ADC" group="ADC"/>
-                <signal pad-id="pb4" index="12" function="ADC" group="ADC"/>
-                <signal pad-id="pb5" index="13" function="ADC" group="ADC"/>
-                <signal pad-id="pb6" index="14" function="ADC" group="ADC"/>
-                <signal pad-id="pb7" index="15" function="ADC" group="ADC"/>
-                <signal pad-id="pa0" index="0" function="AREF" group="REFA"/>
-                <signal pad-id="pb0" index="0" function="AREF" group="REFB"/>
+                <signal pad-key="pa0" index="0" function="ADC" group="ADC"/>
+                <signal pad-key="pa1" index="1" function="ADC" group="ADC"/>
+                <signal pad-key="pa2" index="2" function="ADC" group="ADC"/>
+                <signal pad-key="pa3" index="3" function="ADC" group="ADC"/>
+                <signal pad-key="pa4" index="4" function="ADC" group="ADC"/>
+                <signal pad-key="pa5" index="5" function="ADC" group="ADC"/>
+                <signal pad-key="pa6" index="6" function="ADC" group="ADC"/>
+                <signal pad-key="pa7" index="7" function="ADC" group="ADC"/>
+                <signal pad-key="pb0" index="8" function="ADC" group="ADC"/>
+                <signal pad-key="pb1" index="9" function="ADC" group="ADC"/>
+                <signal pad-key="pb2" index="10" function="ADC" group="ADC"/>
+                <signal pad-key="pb3" index="11" function="ADC" group="ADC"/>
+                <signal pad-key="pb4" index="12" function="ADC" group="ADC"/>
+                <signal pad-key="pb5" index="13" function="ADC" group="ADC"/>
+                <signal pad-key="pb6" index="14" function="ADC" group="ADC"/>
+                <signal pad-key="pb7" index="15" function="ADC" group="ADC"/>
+                <signal pad-key="pa0" index="0" function="AREF" group="REFA"/>
+                <signal pad-key="pb0" index="0" function="AREF" group="REFB"/>
             </signals>
         </peripheral>
         <peripheral key="adcb" name="ADCB" module-key="i6099">
             <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"/>
-                <signal pad-id="pb2" index="2" function="ADC" group="ADC"/>
-                <signal pad-id="pb3" index="3" function="ADC" group="ADC"/>
-                <signal pad-id="pb4" index="4" function="ADC" group="ADC"/>
-                <signal pad-id="pb5" index="5" function="ADC" group="ADC"/>
-                <signal pad-id="pb6" index="6" function="ADC" group="ADC"/>
-                <signal pad-id="pb7" index="7" function="ADC" group="ADC"/>
-                <signal pad-id="pa0" index="0" function="AREF" group="REFA"/>
-                <signal pad-id="pb0" index="0" function="AREF" group="REFB"/>
+                <signal pad-key="pb0" index="0" function="ADC" group="ADC"/>
+                <signal pad-key="pb1" index="1" function="ADC" group="ADC"/>
+                <signal pad-key="pb2" index="2" function="ADC" group="ADC"/>
+                <signal pad-key="pb3" index="3" function="ADC" group="ADC"/>
+                <signal pad-key="pb4" index="4" function="ADC" group="ADC"/>
+                <signal pad-key="pb5" index="5" function="ADC" group="ADC"/>
+                <signal pad-key="pb6" index="6" function="ADC" group="ADC"/>
+                <signal pad-key="pb7" index="7" function="ADC" group="ADC"/>
+                <signal pad-key="pa0" index="0" function="AREF" group="REFA"/>
+                <signal pad-key="pb0" index="0" function="AREF" group="REFB"/>
             </signals>
         </peripheral>
         <peripheral key="dacb" name="DACB" module-key="i6059">
             <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"/>
-                <signal pad-id="pa0" index="0" function="AREF" group="REFA"/>
-                <signal pad-id="pb0" index="0" function="AREF" group="REFB"/>
+                <signal pad-key="pb2" index="0" function="DAC" group="DAC"/>
+                <signal pad-key="pb3" index="1" function="DAC" group="DAC"/>
+                <signal pad-key="pa0" index="0" function="AREF" group="REFA"/>
+                <signal pad-key="pb0" index="0" function="AREF" group="REFB"/>
             </signals>
         </peripheral>
         <peripheral key="aca" name="ACA" module-key="i6077">
             <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"/>
-                <signal pad-id="pa2" index="2" function="AC" group="AC"/>
-                <signal pad-id="pa3" index="3" function="AC" group="AC"/>
-                <signal pad-id="pa4" index="4" function="AC" group="AC"/>
-                <signal pad-id="pa5" index="5" function="AC" group="AC"/>
-                <signal pad-id="pa6" index="6" function="AC" group="AC"/>
-                <signal pad-id="pa7" index="7" function="AC" group="AC"/>
-                <signal pad-id="pa6" index="1" function="ACOUT" group="ACOUT"/>
-                <signal pad-id="pa7" index="0" function="ACOUT" group="ACOUT"/>
+                <signal pad-key="pa0" index="0" function="AC" group="AC"/>
+                <signal pad-key="pa1" index="1" function="AC" group="AC"/>
+                <signal pad-key="pa2" index="2" function="AC" group="AC"/>
+                <signal pad-key="pa3" index="3" function="AC" group="AC"/>
+                <signal pad-key="pa4" index="4" function="AC" group="AC"/>
+                <signal pad-key="pa5" index="5" function="AC" group="AC"/>
+                <signal pad-key="pa6" index="6" function="AC" group="AC"/>
+                <signal pad-key="pa7" index="7" function="AC" group="AC"/>
+                <signal pad-key="pa6" index="1" function="ACOUT" group="ACOUT"/>
+                <signal pad-key="pa7" index="0" function="ACOUT" group="ACOUT"/>
             </signals>
         </peripheral>
         <peripheral key="acb" name="ACB" module-key="i6077">
             <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"/>
-                <signal pad-id="pb2" index="2" function="AC" group="AC"/>
-                <signal pad-id="pb3" index="3" function="AC" group="AC"/>
-                <signal pad-id="pb4" index="4" function="AC" group="AC"/>
-                <signal pad-id="pb5" index="5" function="AC" group="AC"/>
-                <signal pad-id="pb6" index="6" function="AC" group="AC"/>
-                <signal pad-id="pb7" index="7" function="AC" group="AC"/>
-                <signal pad-id="pb6" index="1" function="ACOUT" group="ACOUT"/>
-                <signal pad-id="pb7" index="0" function="ACOUT" group="ACOUT"/>
+                <signal pad-key="pb0" index="0" function="AC" group="AC"/>
+                <signal pad-key="pb1" index="1" function="AC" group="AC"/>
+                <signal pad-key="pb2" index="2" function="AC" group="AC"/>
+                <signal pad-key="pb3" index="3" function="AC" group="AC"/>
+                <signal pad-key="pb4" index="4" function="AC" group="AC"/>
+                <signal pad-key="pb5" index="5" function="AC" group="AC"/>
+                <signal pad-key="pb6" index="6" function="AC" group="AC"/>
+                <signal pad-key="pb7" index="7" function="AC" group="AC"/>
+                <signal pad-key="pb6" index="1" function="ACOUT" group="ACOUT"/>
+                <signal pad-key="pb7" index="0" function="ACOUT" group="ACOUT"/>
             </signals>
         </peripheral>
         <peripheral key="rtc" name="RTC" module-key="i6093">
@@ -234,262 +234,262 @@
         <peripheral key="twic" name="TWIC" module-key="i6089">
             <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"/>
-                <signal pad-id="pc0" function="TWI_EXT" group="SDAIN"/>
-                <signal pad-id="pc1" function="TWI_EXT" group="SCLIN"/>
-                <signal pad-id="pc2" function="TWI_EXT" group="SDAOUT"/>
-                <signal pad-id="pc3" function="TWI_EXT" group="SCLOUT"/>
+                <signal pad-key="pc0" function="TWI" group="SDA"/>
+                <signal pad-key="pc1" function="TWI" group="SCL"/>
+                <signal pad-key="pc0" function="TWI_EXT" group="SDAIN"/>
+                <signal pad-key="pc1" function="TWI_EXT" group="SCLIN"/>
+                <signal pad-key="pc2" function="TWI_EXT" group="SDAOUT"/>
+                <signal pad-key="pc3" function="TWI_EXT" group="SCLOUT"/>
             </signals>
         </peripheral>
         <peripheral key="twie" name="TWIE" module-key="i6089">
             <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"/>
-                <signal pad-id="pe0" function="TWI_EXT" group="SDAIN"/>
-                <signal pad-id="pe1" function="TWI_EXT" group="SCLIN"/>
-                <signal pad-id="pe2" function="TWI_EXT" group="SDAOUT"/>
-                <signal pad-id="pe3" function="TWI_EXT" group="SCLOUT"/>
+                <signal pad-key="pe0" function="TWI" group="SDA"/>
+                <signal pad-key="pe1" function="TWI" group="SCL"/>
+                <signal pad-key="pe0" function="TWI_EXT" group="SDAIN"/>
+                <signal pad-key="pe1" function="TWI_EXT" group="SCLIN"/>
+                <signal pad-key="pe2" function="TWI_EXT" group="SDAOUT"/>
+                <signal pad-key="pe3" function="TWI_EXT" group="SCLOUT"/>
             </signals>
         </peripheral>
         <peripheral key="usb" name="USB" module-key="i3005">
             <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"/>
+                <signal pad-key="pd6" function="USB" group="DN"/>
+                <signal pad-key="pd7" function="USB" group="DP"/>
             </signals>
         </peripheral>
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pa2" index="2" function="PORTA" group="P"/>
-                <signal pad-id="pa3" index="3" function="PORTA" group="P"/>
-                <signal pad-id="pa4" index="4" function="PORTA" group="P"/>
-                <signal pad-id="pa5" index="5" function="PORTA" group="P"/>
-                <signal pad-id="pa6" index="6" function="PORTA" group="P"/>
-                <signal pad-id="pa7" index="7" function="PORTA" group="P"/>
+                <signal pad-key="pa0" index="0" function="PORTA" group="P"/>
+                <signal pad-key="pa1" index="1" function="PORTA" group="P"/>
+                <signal pad-key="pa2" index="2" function="PORTA" group="P"/>
+                <signal pad-key="pa3" index="3" function="PORTA" group="P"/>
+                <signal pad-key="pa4" index="4" function="PORTA" group="P"/>
+                <signal pad-key="pa5" index="5" function="PORTA" group="P"/>
+                <signal pad-key="pa6" index="6" function="PORTA" group="P"/>
+                <signal pad-key="pa7" index="7" function="PORTA" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pb2" index="2" function="PORTB" group="P"/>
-                <signal pad-id="pb3" index="3" function="PORTB" group="P"/>
-                <signal pad-id="pb4" index="4" function="PORTB" group="P"/>
-                <signal pad-id="pb5" index="5" function="PORTB" group="P"/>
-                <signal pad-id="pb6" index="6" function="PORTB" group="P"/>
-                <signal pad-id="pb7" index="7" function="PORTB" group="P"/>
+                <signal pad-key="pb0" index="0" function="PORTB" group="P"/>
+                <signal pad-key="pb1" index="1" function="PORTB" group="P"/>
+                <signal pad-key="pb2" index="2" function="PORTB" group="P"/>
+                <signal pad-key="pb3" index="3" function="PORTB" group="P"/>
+                <signal pad-key="pb4" index="4" function="PORTB" group="P"/>
+                <signal pad-key="pb5" index="5" function="PORTB" group="P"/>
+                <signal pad-key="pb6" index="6" function="PORTB" group="P"/>
+                <signal pad-key="pb7" index="7" function="PORTB" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pc2" index="2" function="PORTC" group="P"/>
-                <signal pad-id="pc3" index="3" function="PORTC" group="P"/>
-                <signal pad-id="pc4" index="4" function="PORTC" group="P"/>
-                <signal pad-id="pc5" index="5" function="PORTC" group="P"/>
-                <signal pad-id="pc6" index="6" function="PORTC" group="P"/>
-                <signal pad-id="pc7" index="7" function="PORTC" group="P"/>
+                <signal pad-key="pc0" index="0" function="PORTC" group="P"/>
+                <signal pad-key="pc1" index="1" function="PORTC" group="P"/>
+                <signal pad-key="pc2" index="2" function="PORTC" group="P"/>
+                <signal pad-key="pc3" index="3" function="PORTC" group="P"/>
+                <signal pad-key="pc4" index="4" function="PORTC" group="P"/>
+                <signal pad-key="pc5" index="5" function="PORTC" group="P"/>
+                <signal pad-key="pc6" index="6" function="PORTC" group="P"/>
+                <signal pad-key="pc7" index="7" function="PORTC" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pd2" index="2" function="PORTD" group="P"/>
-                <signal pad-id="pd3" index="3" function="PORTD" group="P"/>
-                <signal pad-id="pd4" index="4" function="PORTD" group="P"/>
-                <signal pad-id="pd5" index="5" function="PORTD" group="P"/>
-                <signal pad-id="pd6" index="6" function="PORTD" group="P"/>
-                <signal pad-id="pd7" index="7" function="PORTD" group="P"/>
+                <signal pad-key="pd0" index="0" function="PORTD" group="P"/>
+                <signal pad-key="pd1" index="1" function="PORTD" group="P"/>
+                <signal pad-key="pd2" index="2" function="PORTD" group="P"/>
+                <signal pad-key="pd3" index="3" function="PORTD" group="P"/>
+                <signal pad-key="pd4" index="4" function="PORTD" group="P"/>
+                <signal pad-key="pd5" index="5" function="PORTD" group="P"/>
+                <signal pad-key="pd6" index="6" function="PORTD" group="P"/>
+                <signal pad-key="pd7" index="7" function="PORTD" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="porte" name="PORTE" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pe2" index="2" function="PORTE" group="P"/>
-                <signal pad-id="pe3" index="3" function="PORTE" group="P"/>
-                <signal pad-id="pe4" index="4" function="PORTE" group="P"/>
-                <signal pad-id="pe5" index="5" function="PORTE" group="P"/>
-                <signal pad-id="pe6" index="6" function="PORTE" group="P"/>
-                <signal pad-id="pe7" index="7" function="PORTE" group="P"/>
+                <signal pad-key="pe0" index="0" function="PORTE" group="P"/>
+                <signal pad-key="pe1" index="1" function="PORTE" group="P"/>
+                <signal pad-key="pe2" index="2" function="PORTE" group="P"/>
+                <signal pad-key="pe3" index="3" function="PORTE" group="P"/>
+                <signal pad-key="pe4" index="4" function="PORTE" group="P"/>
+                <signal pad-key="pe5" index="5" function="PORTE" group="P"/>
+                <signal pad-key="pe6" index="6" function="PORTE" group="P"/>
+                <signal pad-key="pe7" index="7" function="PORTE" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portf" name="PORTF" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pf2" index="2" function="PORTF" group="P"/>
-                <signal pad-id="pf3" index="3" function="PORTF" group="P"/>
-                <signal pad-id="pf4" index="4" function="PORTF" group="P"/>
-                <signal pad-id="pf5" index="5" function="PORTF" group="P"/>
-                <signal pad-id="pf6" index="6" function="PORTF" group="P"/>
-                <signal pad-id="pf7" index="7" function="PORTF" group="P"/>
+                <signal pad-key="pf0" index="0" function="PORTF" group="P"/>
+                <signal pad-key="pf1" index="1" function="PORTF" group="P"/>
+                <signal pad-key="pf2" index="2" function="PORTF" group="P"/>
+                <signal pad-key="pf3" index="3" function="PORTF" group="P"/>
+                <signal pad-key="pf4" index="4" function="PORTF" group="P"/>
+                <signal pad-key="pf5" index="5" function="PORTF" group="P"/>
+                <signal pad-key="pf6" index="6" function="PORTF" group="P"/>
+                <signal pad-key="pf7" index="7" function="PORTF" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portr" name="PORTR" module-key="gpio_port">
             <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"/>
+                <signal pad-key="pr0" index="0" function="PORTR" group="P"/>
+                <signal pad-key="pr1" index="1" function="PORTR" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="tcc0" name="TCC0" module-key="i6090_tc">
             <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"/>
-                <signal pad-id="pc2" function="TC0" group="OC0C" field="TC0C"/>
-                <signal pad-id="pc3" function="TC0" group="OC0D" field="TC0D"/>
-                <signal pad-id="pc4" function="TC0_ALT" group="OC0A" field="TC0A"/>
-                <signal pad-id="pc5" function="TC0_ALT" group="OC0B" field="TC0B"/>
-                <signal pad-id="pc6" function="TC0_ALT" group="OC0C" field="TC0C"/>
-                <signal pad-id="pc7" function="TC0_ALT" group="OC0D" field="TC0D"/>
+                <signal pad-key="pc0" function="TC0" group="OC0A" field="TC0A"/>
+                <signal pad-key="pc1" function="TC0" group="OC0B" field="TC0B"/>
+                <signal pad-key="pc2" function="TC0" group="OC0C" field="TC0C"/>
+                <signal pad-key="pc3" function="TC0" group="OC0D" field="TC0D"/>
+                <signal pad-key="pc4" function="TC0_ALT" group="OC0A" field="TC0A"/>
+                <signal pad-key="pc5" function="TC0_ALT" group="OC0B" field="TC0B"/>
+                <signal pad-key="pc6" function="TC0_ALT" group="OC0C" field="TC0C"/>
+                <signal pad-key="pc7" function="TC0_ALT" group="OC0D" field="TC0D"/>
             </signals>
         </peripheral>
         <peripheral key="tcc1" name="TCC1" module-key="i6090_tc">
             <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"/>
+                <signal pad-key="pc4" function="TC1" group="OC1A"/>
+                <signal pad-key="pc5" function="TC1" group="OC1B"/>
             </signals>
         </peripheral>
         <peripheral key="tcd0" name="TCD0" module-key="i6090_tc">
             <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"/>
-                <signal pad-id="pd2" function="TC0" group="OC0C" field="TC0C"/>
-                <signal pad-id="pd3" function="TC0" group="OC0D" field="TC0D"/>
-                <signal pad-id="pd4" function="TC0_ALT" group="OC0A" field="TC0A"/>
-                <signal pad-id="pd5" function="TC0_ALT" group="OC0B" field="TC0B"/>
-                <signal pad-id="pd6" function="TC0_ALT" group="OC0C" field="TC0C"/>
-                <signal pad-id="pd7" function="TC0_ALT" group="OC0D" field="TC0D"/>
+                <signal pad-key="pd0" function="TC0" group="OC0A" field="TC0A"/>
+                <signal pad-key="pd1" function="TC0" group="OC0B" field="TC0B"/>
+                <signal pad-key="pd2" function="TC0" group="OC0C" field="TC0C"/>
+                <signal pad-key="pd3" function="TC0" group="OC0D" field="TC0D"/>
+                <signal pad-key="pd4" function="TC0_ALT" group="OC0A" field="TC0A"/>
+                <signal pad-key="pd5" function="TC0_ALT" group="OC0B" field="TC0B"/>
+                <signal pad-key="pd6" function="TC0_ALT" group="OC0C" field="TC0C"/>
+                <signal pad-key="pd7" function="TC0_ALT" group="OC0D" field="TC0D"/>
             </signals>
         </peripheral>
         <peripheral key="tcd1" name="TCD1" module-key="i6090_tc">
             <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"/>
+                <signal pad-key="pd4" function="TC1" group="OC1A"/>
+                <signal pad-key="pd5" function="TC1" group="OC1B"/>
             </signals>
         </peripheral>
         <peripheral key="tce0" name="TCE0" module-key="i6090_tc">
             <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"/>
-                <signal pad-id="pe2" function="TC0" group="OC0C" field="TC0C"/>
-                <signal pad-id="pe3" function="TC0" group="OC0D" field="TC0D"/>
-                <signal pad-id="pe4" function="TC0_ALT" group="OC0A" field="TC0A"/>
-                <signal pad-id="pe5" function="TC0_ALT" group="OC0B" field="TC0B"/>
-                <signal pad-id="pe6" function="TC0_ALT" group="OC0C" field="TC0C"/>
-                <signal pad-id="pe7" function="TC0_ALT" group="OC0D" field="TC0D"/>
+                <signal pad-key="pe0" function="TC0" group="OC0A" field="TC0A"/>
+                <signal pad-key="pe1" function="TC0" group="OC0B" field="TC0B"/>
+                <signal pad-key="pe2" function="TC0" group="OC0C" field="TC0C"/>
+                <signal pad-key="pe3" function="TC0" group="OC0D" field="TC0D"/>
+                <signal pad-key="pe4" function="TC0_ALT" group="OC0A" field="TC0A"/>
+                <signal pad-key="pe5" function="TC0_ALT" group="OC0B" field="TC0B"/>
+                <signal pad-key="pe6" function="TC0_ALT" group="OC0C" field="TC0C"/>
+                <signal pad-key="pe7" function="TC0_ALT" group="OC0D" field="TC0D"/>
             </signals>
         </peripheral>
         <peripheral key="tce1" name="TCE1" module-key="i6090_tc">
             <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"/>
+                <signal pad-key="pe4" function="TC1" group="OC1A"/>
+                <signal pad-key="pe5" function="TC1" group="OC1B"/>
             </signals>
         </peripheral>
         <peripheral key="tcf0" name="TCF0" module-key="i6090_tc">
             <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"/>
-                <signal pad-id="pf2" function="TC0" group="OC0C"/>
-                <signal pad-id="pf3" function="TC0" group="OC0D"/>
+                <signal pad-key="pf0" function="TC0" group="OC0A"/>
+                <signal pad-key="pf1" function="TC0" group="OC0B"/>
+                <signal pad-key="pf2" function="TC0" group="OC0C"/>
+                <signal pad-key="pf3" function="TC0" group="OC0D"/>
             </signals>
         </peripheral>
         <peripheral key="tcc2" name="TCC2" module-key="i6090_tc2">
             <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"/>
-                <signal pad-id="pc2" function="TC2" group="LOC2C"/>
-                <signal pad-id="pc3" function="TC2" group="LOC2D"/>
-                <signal pad-id="pc4" function="TC2" group="HOC2A"/>
-                <signal pad-id="pc5" function="TC2" group="HOC2B"/>
-                <signal pad-id="pc6" function="TC2" group="HOC2C"/>
-                <signal pad-id="pc7" function="TC2" group="HOC2D"/>
+                <signal pad-key="pc0" function="TC2" group="LOC2A"/>
+                <signal pad-key="pc1" function="TC2" group="LOC2B"/>
+                <signal pad-key="pc2" function="TC2" group="LOC2C"/>
+                <signal pad-key="pc3" function="TC2" group="LOC2D"/>
+                <signal pad-key="pc4" function="TC2" group="HOC2A"/>
+                <signal pad-key="pc5" function="TC2" group="HOC2B"/>
+                <signal pad-key="pc6" function="TC2" group="HOC2C"/>
+                <signal pad-key="pc7" function="TC2" group="HOC2D"/>
             </signals>
         </peripheral>
         <peripheral key="tcd2" name="TCD2" module-key="i6090_tc2">
             <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"/>
-                <signal pad-id="pd2" function="TC2" group="LOC2C"/>
-                <signal pad-id="pd3" function="TC2" group="LOC2D"/>
-                <signal pad-id="pd4" function="TC2" group="HOC2A"/>
-                <signal pad-id="pd5" function="TC2" group="HOC2B"/>
-                <signal pad-id="pd6" function="TC2" group="HOC2C"/>
-                <signal pad-id="pd7" function="TC2" group="HOC2D"/>
+                <signal pad-key="pd0" function="TC2" group="LOC2A"/>
+                <signal pad-key="pd1" function="TC2" group="LOC2B"/>
+                <signal pad-key="pd2" function="TC2" group="LOC2C"/>
+                <signal pad-key="pd3" function="TC2" group="LOC2D"/>
+                <signal pad-key="pd4" function="TC2" group="HOC2A"/>
+                <signal pad-key="pd5" function="TC2" group="HOC2B"/>
+                <signal pad-key="pd6" function="TC2" group="HOC2C"/>
+                <signal pad-key="pd7" function="TC2" group="HOC2D"/>
             </signals>
         </peripheral>
         <peripheral key="tce2" name="TCE2" module-key="i6090_tc2">
             <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"/>
-                <signal pad-id="pe2" function="TC2" group="LOC2C"/>
-                <signal pad-id="pe3" function="TC2" group="LOC2D"/>
-                <signal pad-id="pe4" function="TC2" group="HOC2A"/>
-                <signal pad-id="pe5" function="TC2" group="HOC2B"/>
-                <signal pad-id="pe6" function="TC2" group="HOC2C"/>
-                <signal pad-id="pe7" function="TC2" group="HOC2D"/>
+                <signal pad-key="pe0" function="TC2" group="LOC2A"/>
+                <signal pad-key="pe1" function="TC2" group="LOC2B"/>
+                <signal pad-key="pe2" function="TC2" group="LOC2C"/>
+                <signal pad-key="pe3" function="TC2" group="LOC2D"/>
+                <signal pad-key="pe4" function="TC2" group="HOC2A"/>
+                <signal pad-key="pe5" function="TC2" group="HOC2B"/>
+                <signal pad-key="pe6" function="TC2" group="HOC2C"/>
+                <signal pad-key="pe7" function="TC2" group="HOC2D"/>
             </signals>
         </peripheral>
         <peripheral key="tcf2" name="TCF2" module-key="i6090_tc2">
             <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"/>
-                <signal pad-id="pf2" function="TC2" group="LOC2C"/>
-                <signal pad-id="pf3" function="TC2" group="LOC2D"/>
-                <signal pad-id="pf4" function="TC2" group="HOC2A"/>
-                <signal pad-id="pf5" function="TC2" group="HOC2B"/>
-                <signal pad-id="pf6" function="TC2" group="HOC2C"/>
-                <signal pad-id="pf7" function="TC2" group="HOC2D"/>
+                <signal pad-key="pf0" function="TC2" group="LOC2A"/>
+                <signal pad-key="pf1" function="TC2" group="LOC2B"/>
+                <signal pad-key="pf2" function="TC2" group="LOC2C"/>
+                <signal pad-key="pf3" function="TC2" group="LOC2D"/>
+                <signal pad-key="pf4" function="TC2" group="HOC2A"/>
+                <signal pad-key="pf5" function="TC2" group="HOC2B"/>
+                <signal pad-key="pf6" function="TC2" group="HOC2C"/>
+                <signal pad-key="pf7" function="TC2" group="HOC2D"/>
             </signals>
         </peripheral>
         <peripheral key="awexc" name="AWEXC" module-key="i6090_awex">
             <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"/>
-                <signal pad-id="pc2" function="AWEX" group="OC0BLS"/>
-                <signal pad-id="pc3" function="AWEX" group="OC0BHS"/>
-                <signal pad-id="pc4" function="AWEX" group="OC0CLS"/>
-                <signal pad-id="pc5" function="AWEX" group="OC0CHS"/>
-                <signal pad-id="pc6" function="AWEX" group="OC0DLS"/>
-                <signal pad-id="pc7" function="AWEX" group="OC0DHS"/>
+                <signal pad-key="pc0" function="AWEX" group="OC0ALS"/>
+                <signal pad-key="pc1" function="AWEX" group="OC0AHS"/>
+                <signal pad-key="pc2" function="AWEX" group="OC0BLS"/>
+                <signal pad-key="pc3" function="AWEX" group="OC0BHS"/>
+                <signal pad-key="pc4" function="AWEX" group="OC0CLS"/>
+                <signal pad-key="pc5" function="AWEX" group="OC0CHS"/>
+                <signal pad-key="pc6" function="AWEX" group="OC0DLS"/>
+                <signal pad-key="pc7" function="AWEX" group="OC0DHS"/>
             </signals>
         </peripheral>
         <peripheral key="awexe" name="AWEXE" module-key="i6090_awex">
             <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"/>
-                <signal pad-id="pe2" function="AWEX" group="OC0BLS"/>
-                <signal pad-id="pe3" function="AWEX" group="OC0BHS"/>
-                <signal pad-id="pe4" function="AWEX" group="OC0CLS"/>
-                <signal pad-id="pe5" function="AWEX" group="OC0CHS"/>
-                <signal pad-id="pe6" function="AWEX" group="OC0DLS"/>
-                <signal pad-id="pe7" function="AWEX" group="OC0DHS"/>
+                <signal pad-key="pe0" function="AWEX" group="OC0ALS"/>
+                <signal pad-key="pe1" function="AWEX" group="OC0AHS"/>
+                <signal pad-key="pe2" function="AWEX" group="OC0BLS"/>
+                <signal pad-key="pe3" function="AWEX" group="OC0BHS"/>
+                <signal pad-key="pe4" function="AWEX" group="OC0CLS"/>
+                <signal pad-key="pe5" function="AWEX" group="OC0CHS"/>
+                <signal pad-key="pe6" function="AWEX" group="OC0DLS"/>
+                <signal pad-key="pe7" function="AWEX" group="OC0DHS"/>
             </signals>
         </peripheral>
         <peripheral key="hiresc" name="HIRESC" module-key="i6090_hires">
@@ -507,108 +507,108 @@
         <peripheral key="usartc0" name="USARTC0" module-key="i6090_usart">
             <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"/>
-                <signal pad-id="pc3" function="USART" group="TXD" field="USART0"/>
-                <signal pad-id="pc5" function="USART_ALT" group="XCK" field="USART0"/>
-                <signal pad-id="pc6" function="USART_ALT" group="RXD" field="USART0"/>
-                <signal pad-id="pc7" function="USART_ALT" group="TXD" field="USART0"/>
+                <signal pad-key="pc1" function="USART" group="XCK" field="USART0"/>
+                <signal pad-key="pc2" function="USART" group="RXD" field="USART0"/>
+                <signal pad-key="pc3" function="USART" group="TXD" field="USART0"/>
+                <signal pad-key="pc5" function="USART_ALT" group="XCK" field="USART0"/>
+                <signal pad-key="pc6" function="USART_ALT" group="RXD" field="USART0"/>
+                <signal pad-key="pc7" function="USART_ALT" group="TXD" field="USART0"/>
             </signals>
         </peripheral>
         <peripheral key="usartc1" name="USARTC1" module-key="i6090_usart">
             <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"/>
-                <signal pad-id="pd7" function="USART" group="TXD"/>
+                <signal pad-key="pd5" function="USART" group="XCK"/>
+                <signal pad-key="pd6" function="USART" group="RXD"/>
+                <signal pad-key="pd7" function="USART" group="TXD"/>
             </signals>
         </peripheral>
         <peripheral key="usartd0" name="USARTD0" module-key="i6090_usart">
             <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"/>
-                <signal pad-id="pd3" function="USART" group="TXD" field="USART0"/>
-                <signal pad-id="pd5" function="USART_ALT" group="XCK" field="USART0"/>
-                <signal pad-id="pd6" function="USART_ALT" group="RXD" field="USART0"/>
-                <signal pad-id="pd7" function="USART_ALT" group="TXD" field="USART0"/>
+                <signal pad-key="pd1" function="USART" group="XCK" field="USART0"/>
+                <signal pad-key="pd2" function="USART" group="RXD" field="USART0"/>
+                <signal pad-key="pd3" function="USART" group="TXD" field="USART0"/>
+                <signal pad-key="pd5" function="USART_ALT" group="XCK" field="USART0"/>
+                <signal pad-key="pd6" function="USART_ALT" group="RXD" field="USART0"/>
+                <signal pad-key="pd7" function="USART_ALT" group="TXD" field="USART0"/>
             </signals>
         </peripheral>
         <peripheral key="usartd1" name="USARTD1" module-key="i6090_usart">
             <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"/>
-                <signal pad-id="pd7" function="USART" group="TXD"/>
+                <signal pad-key="pd5" function="USART" group="XCK"/>
+                <signal pad-key="pd6" function="USART" group="RXD"/>
+                <signal pad-key="pd7" function="USART" group="TXD"/>
             </signals>
         </peripheral>
         <peripheral key="usarte0" name="USARTE0" module-key="i6090_usart">
             <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"/>
-                <signal pad-id="pe3" function="USART" group="TXD" field="USART0"/>
-                <signal pad-id="pe5" function="USART_ALT" group="XCK" field="USART0"/>
-                <signal pad-id="pe6" function="USART_ALT" group="RXD" field="USART0"/>
-                <signal pad-id="pe7" function="USART_ALT" group="TXD" field="USART0"/>
+                <signal pad-key="pe1" function="USART" group="XCK" field="USART0"/>
+                <signal pad-key="pe2" function="USART" group="RXD" field="USART0"/>
+                <signal pad-key="pe3" function="USART" group="TXD" field="USART0"/>
+                <signal pad-key="pe5" function="USART_ALT" group="XCK" field="USART0"/>
+                <signal pad-key="pe6" function="USART_ALT" group="RXD" field="USART0"/>
+                <signal pad-key="pe7" function="USART_ALT" group="TXD" field="USART0"/>
             </signals>
         </peripheral>
         <peripheral key="usarte1" name="USARTE1" module-key="i6090_usart">
             <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"/>
-                <signal pad-id="pe7" function="USART" group="TXD"/>
+                <signal pad-key="pe5" function="USART" group="XCK"/>
+                <signal pad-key="pe6" function="USART" group="RXD"/>
+                <signal pad-key="pe7" function="USART" group="TXD"/>
             </signals>
         </peripheral>
         <peripheral key="usartf0" name="USARTF0" module-key="i6090_usart">
             <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"/>
-                <signal pad-id="pf3" function="USART" group="TXD" field="USART0"/>
-                <signal pad-id="pf5" function="USART_ALT" group="XCK" field="USART0"/>
-                <signal pad-id="pf6" function="USART_ALT" group="RXD" field="USART0"/>
-                <signal pad-id="pf7" function="USART_ALT" group="TXD" field="USART0"/>
+                <signal pad-key="pf1" function="USART" group="XCK" field="USART0"/>
+                <signal pad-key="pf2" function="USART" group="RXD" field="USART0"/>
+                <signal pad-key="pf3" function="USART" group="TXD" field="USART0"/>
+                <signal pad-key="pf5" function="USART_ALT" group="XCK" field="USART0"/>
+                <signal pad-key="pf6" function="USART_ALT" group="RXD" field="USART0"/>
+                <signal pad-key="pf7" function="USART_ALT" group="TXD" field="USART0"/>
             </signals>
         </peripheral>
         <peripheral key="spic" name="SPIC" module-key="i6090_spi">
             <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"/>
-                <signal pad-id="pc6" function="SPI" group="MISO" field="SPI"/>
-                <signal pad-id="pc7" function="SPI" group="SCK" field="SPI"/>
-                <signal pad-id="pc4" function="SPI_ALT" group="SS" field="SPI"/>
-                <signal pad-id="pc5" function="SPI_ALT" group="SCK" field="SPI"/>
-                <signal pad-id="pc6" function="SPI_ALT" group="MISO" field="SPI"/>
-                <signal pad-id="pc7" function="SPI_ALT" group="MOSI" field="SPI"/>
+                <signal pad-key="pc4" function="SPI" group="SS" field="SPI"/>
+                <signal pad-key="pc5" function="SPI" group="MOSI" field="SPI"/>
+                <signal pad-key="pc6" function="SPI" group="MISO" field="SPI"/>
+                <signal pad-key="pc7" function="SPI" group="SCK" field="SPI"/>
+                <signal pad-key="pc4" function="SPI_ALT" group="SS" field="SPI"/>
+                <signal pad-key="pc5" function="SPI_ALT" group="SCK" field="SPI"/>
+                <signal pad-key="pc6" function="SPI_ALT" group="MISO" field="SPI"/>
+                <signal pad-key="pc7" function="SPI_ALT" group="MOSI" field="SPI"/>
             </signals>
         </peripheral>
         <peripheral key="spid" name="SPID" module-key="i6090_spi">
             <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"/>
-                <signal pad-id="pd6" function="SPI" group="MISO" field="SPI"/>
-                <signal pad-id="pd7" function="SPI" group="SCK" field="SPI"/>
-                <signal pad-id="pd4" function="SPI_ALT" group="SS" field="SPI"/>
-                <signal pad-id="pd5" function="SPI_ALT" group="SCK" field="SPI"/>
-                <signal pad-id="pd6" function="SPI_ALT" group="MISO" field="SPI"/>
-                <signal pad-id="pd7" function="SPI_ALT" group="MOSI" field="SPI"/>
+                <signal pad-key="pd4" function="SPI" group="SS" field="SPI"/>
+                <signal pad-key="pd5" function="SPI" group="MOSI" field="SPI"/>
+                <signal pad-key="pd6" function="SPI" group="MISO" field="SPI"/>
+                <signal pad-key="pd7" function="SPI" group="SCK" field="SPI"/>
+                <signal pad-key="pd4" function="SPI_ALT" group="SS" field="SPI"/>
+                <signal pad-key="pd5" function="SPI_ALT" group="SCK" field="SPI"/>
+                <signal pad-key="pd6" function="SPI_ALT" group="MISO" field="SPI"/>
+                <signal pad-key="pd7" function="SPI_ALT" group="MOSI" field="SPI"/>
             </signals>
         </peripheral>
         <peripheral key="spie" name="SPIE" module-key="i6090_spi">
             <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"/>
-                <signal pad-id="pe6" function="SPI" group="MISO" field="SPI"/>
-                <signal pad-id="pe7" function="SPI" group="SCK" field="SPI"/>
-                <signal pad-id="pe4" function="SPI_ALT" group="SS" field="SPI"/>
-                <signal pad-id="pe5" function="SPI_ALT" group="SCK" field="SPI"/>
-                <signal pad-id="pe6" function="SPI_ALT" group="MISO" field="SPI"/>
-                <signal pad-id="pe7" function="SPI_ALT" group="MOSI" field="SPI"/>
+                <signal pad-key="pe4" function="SPI" group="SS" field="SPI"/>
+                <signal pad-key="pe5" function="SPI" group="MOSI" field="SPI"/>
+                <signal pad-key="pe6" function="SPI" group="MISO" field="SPI"/>
+                <signal pad-key="pe7" function="SPI" group="SCK" field="SPI"/>
+                <signal pad-key="pe4" function="SPI_ALT" group="SS" field="SPI"/>
+                <signal pad-key="pe5" function="SPI_ALT" group="SCK" field="SPI"/>
+                <signal pad-key="pe6" function="SPI_ALT" group="MISO" field="SPI"/>
+                <signal pad-key="pe7" function="SPI_ALT" group="MOSI" field="SPI"/>
             </signals>
         </peripheral>
         <peripheral key="ircom" name="IRCOM" module-key="i6090_ircom">
@@ -1978,78 +1978,135 @@
             </register-group>
         </module>
     </modules>
+    <pads>
+        <pad key="pa3" name="PA3"/>
+        <pad key="pa4" name="PA4"/>
+        <pad key="pa5" name="PA5"/>
+        <pad key="pa6" name="PA6"/>
+        <pad key="pa7" name="PA7"/>
+        <pad key="pb0" name="PB0"/>
+        <pad key="pb1" name="PB1"/>
+        <pad key="pb2" name="PB2"/>
+        <pad key="pb3" name="PB3"/>
+        <pad key="pb4" name="PB4"/>
+        <pad key="pb5" name="PB5"/>
+        <pad key="pb6" name="PB6"/>
+        <pad key="pb7" name="PB7"/>
+        <pad key="gnd" name="GND"/>
+        <pad key="vcc" name="VCC"/>
+        <pad key="pc0" name="PC0"/>
+        <pad key="pc1" name="PC1"/>
+        <pad key="pc2" name="PC2"/>
+        <pad key="pc3" name="PC3"/>
+        <pad key="pc4" name="PC4"/>
+        <pad key="pc5" name="PC5"/>
+        <pad key="pc6" name="PC6"/>
+        <pad key="pc7" name="PC7"/>
+        <pad key="pd0" name="PD0"/>
+        <pad key="pd1" name="PD1"/>
+        <pad key="pd2" name="PD2"/>
+        <pad key="pd3" name="PD3"/>
+        <pad key="pd4" name="PD4"/>
+        <pad key="pd5" name="PD5"/>
+        <pad key="pd6" name="PD6"/>
+        <pad key="pd7" name="PD7"/>
+        <pad key="pe0" name="PE0"/>
+        <pad key="pe1" name="PE1"/>
+        <pad key="pe2" name="PE2"/>
+        <pad key="pe3" name="PE3"/>
+        <pad key="pe4" name="PE4"/>
+        <pad key="pe5" name="PE5"/>
+        <pad key="pe6" name="PE6"/>
+        <pad key="pe7" name="PE7"/>
+        <pad key="pf0" name="PF0"/>
+        <pad key="pf1" name="PF1"/>
+        <pad key="pf2" name="PF2"/>
+        <pad key="pf3" name="PF3"/>
+        <pad key="pf4" name="PF4"/>
+        <pad key="pf5" name="PF5"/>
+        <pad key="pf6" name="PF6"/>
+        <pad key="pf7" name="PF7"/>
+        <pad key="pdi" name="PDI"/>
+        <pad key="reset" name="RESET"/>
+        <pad key="pr0" name="PR0"/>
+        <pad key="pr1" name="PR1"/>
+        <pad key="avcc" name="AVCC"/>
+        <pad key="pa0" name="PA0"/>
+        <pad key="pa1" name="PA1"/>
+        <pad key="pa2" name="PA2"/>
+    </pads>
     <pinouts>
         <pinout key="qfp_qfn_64" name="QFP_QFN_64" type="qfn">
-            <pin position="1" pad="PA3"/>
-            <pin position="2" pad="PA4"/>
-            <pin position="3" pad="PA5"/>
-            <pin position="4" pad="PA6"/>
-            <pin position="5" pad="PA7"/>
-            <pin position="6" pad="PB0"/>
-            <pin position="7" pad="PB1"/>
-            <pin position="8" pad="PB2"/>
-            <pin position="9" pad="PB3"/>
-            <pin position="10" pad="PB4"/>
-            <pin position="11" pad="PB5"/>
-            <pin position="12" pad="PB6"/>
-            <pin position="13" pad="PB7"/>
-            <pin position="14" pad="GND"/>
-            <pin position="15" pad="VCC"/>
-            <pin position="16" pad="PC0"/>
-            <pin position="17" pad="PC1"/>
-            <pin position="18" pad="PC2"/>
-            <pin position="19" pad="PC3"/>
-            <pin position="20" pad="PC4"/>
-            <pin position="21" pad="PC5"/>
-            <pin position="22" pad="PC6"/>
-            <pin position="23" pad="PC7"/>
-            <pin position="24" pad="GND"/>
-            <pin position="25" pad="VCC"/>
-            <pin position="26" pad="PD0"/>
-            <pin position="27" pad="PD1"/>
-            <pin position="28" pad="PD2"/>
-            <pin position="29" pad="PD3"/>
-            <pin position="30" pad="PD4"/>
-            <pin position="31" pad="PD5"/>
-            <pin position="32" pad="PD6"/>
-            <pin position="33" pad="PD7"/>
-            <pin position="34" pad="GND"/>
-            <pin position="35" pad="VCC"/>
-            <pin position="36" pad="PE0"/>
-            <pin position="37" pad="PE1"/>
-            <pin position="38" pad="PE2"/>
-            <pin position="39" pad="PE3"/>
-            <pin position="40" pad="PE4"/>
-            <pin position="41" pad="PE5"/>
-            <pin position="42" pad="PE6"/>
-            <pin position="43" pad="PE7"/>
-            <pin position="44" pad="GND"/>
-            <pin position="45" pad="VCC"/>
-            <pin position="46" pad="PF0"/>
-            <pin position="47" pad="PF1"/>
-            <pin position="48" pad="PF2"/>
-            <pin position="49" pad="PF3"/>
-            <pin position="50" pad="PF4"/>
-            <pin position="51" pad="PF5"/>
-            <pin position="52" pad="GND"/>
-            <pin position="53" pad="VCC"/>
-            <pin position="54" pad="PF6"/>
-            <pin position="55" pad="PF7"/>
-            <pin position="56" pad="PDI"/>
-            <pin position="57" pad="RESET"/>
-            <pin position="58" pad="PR0"/>
-            <pin position="59" pad="PR1"/>
-            <pin position="60" pad="GND"/>
-            <pin position="61" pad="AVCC"/>
-            <pin position="62" pad="PA0"/>
-            <pin position="63" pad="PA1"/>
-            <pin position="64" pad="PA2"/>
+            <pin position="1" pad-key="pa3"/>
+            <pin position="2" pad-key="pa4"/>
+            <pin position="3" pad-key="pa5"/>
+            <pin position="4" pad-key="pa6"/>
+            <pin position="5" pad-key="pa7"/>
+            <pin position="6" pad-key="pb0"/>
+            <pin position="7" pad-key="pb1"/>
+            <pin position="8" pad-key="pb2"/>
+            <pin position="9" pad-key="pb3"/>
+            <pin position="10" pad-key="pb4"/>
+            <pin position="11" pad-key="pb5"/>
+            <pin position="12" pad-key="pb6"/>
+            <pin position="13" pad-key="pb7"/>
+            <pin position="14" pad-key="gnd"/>
+            <pin position="15" pad-key="vcc"/>
+            <pin position="16" pad-key="pc0"/>
+            <pin position="17" pad-key="pc1"/>
+            <pin position="18" pad-key="pc2"/>
+            <pin position="19" pad-key="pc3"/>
+            <pin position="20" pad-key="pc4"/>
+            <pin position="21" pad-key="pc5"/>
+            <pin position="22" pad-key="pc6"/>
+            <pin position="23" pad-key="pc7"/>
+            <pin position="24" pad-key="gnd"/>
+            <pin position="25" pad-key="vcc"/>
+            <pin position="26" pad-key="pd0"/>
+            <pin position="27" pad-key="pd1"/>
+            <pin position="28" pad-key="pd2"/>
+            <pin position="29" pad-key="pd3"/>
+            <pin position="30" pad-key="pd4"/>
+            <pin position="31" pad-key="pd5"/>
+            <pin position="32" pad-key="pd6"/>
+            <pin position="33" pad-key="pd7"/>
+            <pin position="34" pad-key="gnd"/>
+            <pin position="35" pad-key="vcc"/>
+            <pin position="36" pad-key="pe0"/>
+            <pin position="37" pad-key="pe1"/>
+            <pin position="38" pad-key="pe2"/>
+            <pin position="39" pad-key="pe3"/>
+            <pin position="40" pad-key="pe4"/>
+            <pin position="41" pad-key="pe5"/>
+            <pin position="42" pad-key="pe6"/>
+            <pin position="43" pad-key="pe7"/>
+            <pin position="44" pad-key="gnd"/>
+            <pin position="45" pad-key="vcc"/>
+            <pin position="46" pad-key="pf0"/>
+            <pin position="47" pad-key="pf1"/>
+            <pin position="48" pad-key="pf2"/>
+            <pin position="49" pad-key="pf3"/>
+            <pin position="50" pad-key="pf4"/>
+            <pin position="51" pad-key="pf5"/>
+            <pin position="52" pad-key="gnd"/>
+            <pin position="53" pad-key="vcc"/>
+            <pin position="54" pad-key="pf6"/>
+            <pin position="55" pad-key="pf7"/>
+            <pin position="56" pad-key="pdi"/>
+            <pin position="57" pad-key="reset"/>
+            <pin position="58" pad-key="pr0"/>
+            <pin position="59" pad-key="pr1"/>
+            <pin position="60" pad-key="gnd"/>
+            <pin position="61" pad-key="avcc"/>
+            <pin position="62" pad-key="pa0"/>
+            <pin position="63" pad-key="pa1"/>
+            <pin position="64" pad-key="pa2"/>
         </pinout>
     </pinouts>
     <variants>
-        <variant name="ATxmega64A3U-AU" pinout-key="qfp_qfn_64" package="TQFP64"/>
-        <variant name="ATxmega64A3U-MH" pinout-key="qfp_qfn_64" package="QFN64"/>
-        <variant name="ATxmega64A3U-AN" pinout-key="qfp_qfn_64" package="TQFP64"/>
-        <variant name="ATxmega64A3U-MN" pinout-key="qfp_qfn_64" package="QFN64"/>
+        <variant key="atxmega64a3u_au" name="ATxmega64A3U-AU" pinout-key="qfp_qfn_64"/>
+        <variant key="atxmega64a3u_mh" name="ATxmega64A3U-MH" pinout-key="qfp_qfn_64"/>
+        <variant key="atxmega64a3u_an" name="ATxmega64A3U-AN" pinout-key="qfp_qfn_64"/>
+        <variant key="atxmega64a3u_mn" name="ATxmega64A3U-MN" pinout-key="qfp_qfn_64"/>
     </variants>
 </device>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA64A4U.xml b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA64A4U.xml
index 10ec35d1..2d45211f 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA64A4U.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA64A4U.xml
@@ -92,12 +92,12 @@
         <peripheral key="osc" name="OSC" module-key="i6079">
             <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"/>
-                <signal pad-id="pr0" function="TOSC" group="TOSC2" field="TOSCSEL"/>
-                <signal pad-id="pr1" function="TOSC" group="TOSC1" field="TOSCSEL"/>
-                <signal pad-id="pe2" function="TOSC_ALT" group="TOSC2" field="TOSCSEL"/>
-                <signal pad-id="pe3" function="TOSC_ALT" group="TOSC1" field="TOSCSEL"/>
+                <signal pad-key="pr0" function="XTAL" group="XTAL2"/>
+                <signal pad-key="pr1" function="XTAL" group="XTAL1"/>
+                <signal pad-key="pr0" function="TOSC" group="TOSC2" field="TOSCSEL"/>
+                <signal pad-key="pr1" function="TOSC" group="TOSC1" field="TOSCSEL"/>
+                <signal pad-key="pe2" function="TOSC_ALT" group="TOSC2" field="TOSCSEL"/>
+                <signal pad-key="pe3" function="TOSC_ALT" group="TOSC1" field="TOSCSEL"/>
             </signals>
         </peripheral>
         <peripheral key="dfllrc32m" name="DFLLRC32M" module-key="i6055">
@@ -121,15 +121,15 @@
         <peripheral key="portcfg" name="PORTCFG" module-key="i6075_portcfg">
             <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"/>
-                <signal pad-id="pd7" function="CLKOUTD" group="CLKOUT" field="CLKOUT"/>
-                <signal pad-id="pd4" function="CLKOUTD_ALT" group="CLKOUT" field="CLKEVPIN"/>
-                <signal pad-id="pc7" function="EVOUTC" group="EVOUT" field="EVOUT"/>
-                <signal pad-id="pc4" function="EVOUTC_ALT" group="EVOUT" field="CLKEVPIN"/>
-                <signal pad-id="pd7" function="EVOUTD" group="EVOUT" field="EVOUT"/>
-                <signal pad-id="pd4" function="EVOUTD_ALT" group="EVOUT" field="CLKEVPIN"/>
-                <signal pad-id="pc6" function="RTCOUTC" group="RTCOUT"/>
+                <signal pad-key="pc7" function="CLKOUTC" group="CLKOUT" field="CLKOUT"/>
+                <signal pad-key="pc4" function="CLKOUTC_ALT" group="CLKOUT" field="CLKEVPIN"/>
+                <signal pad-key="pd7" function="CLKOUTD" group="CLKOUT" field="CLKOUT"/>
+                <signal pad-key="pd4" function="CLKOUTD_ALT" group="CLKOUT" field="CLKEVPIN"/>
+                <signal pad-key="pc7" function="EVOUTC" group="EVOUT" field="EVOUT"/>
+                <signal pad-key="pc4" function="EVOUTC_ALT" group="EVOUT" field="CLKEVPIN"/>
+                <signal pad-key="pd7" function="EVOUTD" group="EVOUT" field="EVOUT"/>
+                <signal pad-key="pd4" function="EVOUTD_ALT" group="EVOUT" field="CLKEVPIN"/>
+                <signal pad-key="pc6" function="RTCOUTC" group="RTCOUT"/>
             </signals>
         </peripheral>
         <peripheral key="aes" name="AES" module-key="i6096">
@@ -150,44 +150,44 @@
         <peripheral key="adca" name="ADCA" module-key="i6099">
             <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"/>
-                <signal pad-id="pa2" index="2" function="ADC" group="ADC"/>
-                <signal pad-id="pa3" index="3" function="ADC" group="ADC"/>
-                <signal pad-id="pa4" index="4" function="ADC" group="ADC"/>
-                <signal pad-id="pa5" index="5" function="ADC" group="ADC"/>
-                <signal pad-id="pa6" index="6" function="ADC" group="ADC"/>
-                <signal pad-id="pa7" index="7" function="ADC" group="ADC"/>
-                <signal pad-id="pb0" index="8" function="ADC" group="ADC"/>
-                <signal pad-id="pb1" index="9" function="ADC" group="ADC"/>
-                <signal pad-id="pb2" index="10" function="ADC" group="ADC"/>
-                <signal pad-id="pb3" index="11" function="ADC" group="ADC"/>
-                <signal pad-id="pa0" index="0" function="AREF" group="REFA"/>
-                <signal pad-id="pb0" index="0" function="AREF" group="REFB"/>
+                <signal pad-key="pa0" index="0" function="ADC" group="ADC"/>
+                <signal pad-key="pa1" index="1" function="ADC" group="ADC"/>
+                <signal pad-key="pa2" index="2" function="ADC" group="ADC"/>
+                <signal pad-key="pa3" index="3" function="ADC" group="ADC"/>
+                <signal pad-key="pa4" index="4" function="ADC" group="ADC"/>
+                <signal pad-key="pa5" index="5" function="ADC" group="ADC"/>
+                <signal pad-key="pa6" index="6" function="ADC" group="ADC"/>
+                <signal pad-key="pa7" index="7" function="ADC" group="ADC"/>
+                <signal pad-key="pb0" index="8" function="ADC" group="ADC"/>
+                <signal pad-key="pb1" index="9" function="ADC" group="ADC"/>
+                <signal pad-key="pb2" index="10" function="ADC" group="ADC"/>
+                <signal pad-key="pb3" index="11" function="ADC" group="ADC"/>
+                <signal pad-key="pa0" index="0" function="AREF" group="REFA"/>
+                <signal pad-key="pb0" index="0" function="AREF" group="REFB"/>
             </signals>
         </peripheral>
         <peripheral key="dacb" name="DACB" module-key="i6059">
             <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"/>
-                <signal pad-id="pa0" index="0" function="AREF" group="REFA"/>
-                <signal pad-id="pb0" index="0" function="AREF" group="REFB"/>
+                <signal pad-key="pb2" index="0" function="DAC" group="DAC"/>
+                <signal pad-key="pb3" index="1" function="DAC" group="DAC"/>
+                <signal pad-key="pa0" index="0" function="AREF" group="REFA"/>
+                <signal pad-key="pb0" index="0" function="AREF" group="REFB"/>
             </signals>
         </peripheral>
         <peripheral key="aca" name="ACA" module-key="i6077">
             <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"/>
-                <signal pad-id="pa2" index="2" function="AC" group="AC"/>
-                <signal pad-id="pa3" index="3" function="AC" group="AC"/>
-                <signal pad-id="pa4" index="4" function="AC" group="AC"/>
-                <signal pad-id="pa5" index="5" function="AC" group="AC"/>
-                <signal pad-id="pa6" index="6" function="AC" group="AC"/>
-                <signal pad-id="pa7" index="7" function="AC" group="AC"/>
-                <signal pad-id="pa6" index="1" function="ACOUT" group="ACOUT"/>
-                <signal pad-id="pa7" index="0" function="ACOUT" group="ACOUT"/>
+                <signal pad-key="pa0" index="0" function="AC" group="AC"/>
+                <signal pad-key="pa1" index="1" function="AC" group="AC"/>
+                <signal pad-key="pa2" index="2" function="AC" group="AC"/>
+                <signal pad-key="pa3" index="3" function="AC" group="AC"/>
+                <signal pad-key="pa4" index="4" function="AC" group="AC"/>
+                <signal pad-key="pa5" index="5" function="AC" group="AC"/>
+                <signal pad-key="pa6" index="6" function="AC" group="AC"/>
+                <signal pad-key="pa7" index="7" function="AC" group="AC"/>
+                <signal pad-key="pa6" index="1" function="ACOUT" group="ACOUT"/>
+                <signal pad-key="pa7" index="0" function="ACOUT" group="ACOUT"/>
             </signals>
         </peripheral>
         <peripheral key="rtc" name="RTC" module-key="i6093">
@@ -196,178 +196,178 @@
         <peripheral key="twic" name="TWIC" module-key="i6089">
             <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"/>
-                <signal pad-id="pc0" function="TWI_EXT" group="SDAIN"/>
-                <signal pad-id="pc1" function="TWI_EXT" group="SCLIN"/>
-                <signal pad-id="pc2" function="TWI_EXT" group="SDAOUT"/>
-                <signal pad-id="pc3" function="TWI_EXT" group="SCLOUT"/>
+                <signal pad-key="pc0" function="TWI" group="SDA"/>
+                <signal pad-key="pc1" function="TWI" group="SCL"/>
+                <signal pad-key="pc0" function="TWI_EXT" group="SDAIN"/>
+                <signal pad-key="pc1" function="TWI_EXT" group="SCLIN"/>
+                <signal pad-key="pc2" function="TWI_EXT" group="SDAOUT"/>
+                <signal pad-key="pc3" function="TWI_EXT" group="SCLOUT"/>
             </signals>
         </peripheral>
         <peripheral key="twie" name="TWIE" module-key="i6089">
             <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"/>
+                <signal pad-key="pe0" function="TWI" group="SDA"/>
+                <signal pad-key="pe1" function="TWI" group="SCL"/>
             </signals>
         </peripheral>
         <peripheral key="usb" name="USB" module-key="i3005">
             <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"/>
+                <signal pad-key="pd6" function="USB" group="DN"/>
+                <signal pad-key="pd7" function="USB" group="DP"/>
             </signals>
         </peripheral>
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pa2" index="2" function="PORTA" group="P"/>
-                <signal pad-id="pa3" index="3" function="PORTA" group="P"/>
-                <signal pad-id="pa4" index="4" function="PORTA" group="P"/>
-                <signal pad-id="pa5" index="5" function="PORTA" group="P"/>
-                <signal pad-id="pa6" index="6" function="PORTA" group="P"/>
-                <signal pad-id="pa7" index="7" function="PORTA" group="P"/>
+                <signal pad-key="pa0" index="0" function="PORTA" group="P"/>
+                <signal pad-key="pa1" index="1" function="PORTA" group="P"/>
+                <signal pad-key="pa2" index="2" function="PORTA" group="P"/>
+                <signal pad-key="pa3" index="3" function="PORTA" group="P"/>
+                <signal pad-key="pa4" index="4" function="PORTA" group="P"/>
+                <signal pad-key="pa5" index="5" function="PORTA" group="P"/>
+                <signal pad-key="pa6" index="6" function="PORTA" group="P"/>
+                <signal pad-key="pa7" index="7" function="PORTA" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pb2" index="2" function="PORTB" group="P"/>
-                <signal pad-id="pb3" index="3" function="PORTB" group="P"/>
+                <signal pad-key="pb0" index="0" function="PORTB" group="P"/>
+                <signal pad-key="pb1" index="1" function="PORTB" group="P"/>
+                <signal pad-key="pb2" index="2" function="PORTB" group="P"/>
+                <signal pad-key="pb3" index="3" function="PORTB" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pc2" index="2" function="PORTC" group="P"/>
-                <signal pad-id="pc3" index="3" function="PORTC" group="P"/>
-                <signal pad-id="pc4" index="4" function="PORTC" group="P"/>
-                <signal pad-id="pc5" index="5" function="PORTC" group="P"/>
-                <signal pad-id="pc6" index="6" function="PORTC" group="P"/>
-                <signal pad-id="pc7" index="7" function="PORTC" group="P"/>
+                <signal pad-key="pc0" index="0" function="PORTC" group="P"/>
+                <signal pad-key="pc1" index="1" function="PORTC" group="P"/>
+                <signal pad-key="pc2" index="2" function="PORTC" group="P"/>
+                <signal pad-key="pc3" index="3" function="PORTC" group="P"/>
+                <signal pad-key="pc4" index="4" function="PORTC" group="P"/>
+                <signal pad-key="pc5" index="5" function="PORTC" group="P"/>
+                <signal pad-key="pc6" index="6" function="PORTC" group="P"/>
+                <signal pad-key="pc7" index="7" function="PORTC" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pd2" index="2" function="PORTD" group="P"/>
-                <signal pad-id="pd3" index="3" function="PORTD" group="P"/>
-                <signal pad-id="pd4" index="4" function="PORTD" group="P"/>
-                <signal pad-id="pd5" index="5" function="PORTD" group="P"/>
-                <signal pad-id="pd6" index="6" function="PORTD" group="P"/>
-                <signal pad-id="pd7" index="7" function="PORTD" group="P"/>
+                <signal pad-key="pd0" index="0" function="PORTD" group="P"/>
+                <signal pad-key="pd1" index="1" function="PORTD" group="P"/>
+                <signal pad-key="pd2" index="2" function="PORTD" group="P"/>
+                <signal pad-key="pd3" index="3" function="PORTD" group="P"/>
+                <signal pad-key="pd4" index="4" function="PORTD" group="P"/>
+                <signal pad-key="pd5" index="5" function="PORTD" group="P"/>
+                <signal pad-key="pd6" index="6" function="PORTD" group="P"/>
+                <signal pad-key="pd7" index="7" function="PORTD" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="porte" name="PORTE" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pe2" index="2" function="PORTE" group="P"/>
-                <signal pad-id="pe3" index="3" function="PORTE" group="P"/>
+                <signal pad-key="pe0" index="0" function="PORTE" group="P"/>
+                <signal pad-key="pe1" index="1" function="PORTE" group="P"/>
+                <signal pad-key="pe2" index="2" function="PORTE" group="P"/>
+                <signal pad-key="pe3" index="3" function="PORTE" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portr" name="PORTR" module-key="gpio_port">
             <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"/>
+                <signal pad-key="pr0" index="0" function="PORTR" group="P"/>
+                <signal pad-key="pr1" index="1" function="PORTR" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="tcc0" name="TCC0" module-key="i6090_tc">
             <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"/>
-                <signal pad-id="pc2" function="TC0" group="OC0C" field="TC0C"/>
-                <signal pad-id="pc3" function="TC0" group="OC0D" field="TC0D"/>
-                <signal pad-id="pc4" function="TC0_ALT" group="OC0A" field="TC0A"/>
-                <signal pad-id="pc5" function="TC0_ALT" group="OC0B" field="TC0B"/>
-                <signal pad-id="pc6" function="TC0_ALT" group="OC0C" field="TC0C"/>
-                <signal pad-id="pc7" function="TC0_ALT" group="OC0D" field="TC0D"/>
+                <signal pad-key="pc0" function="TC0" group="OC0A" field="TC0A"/>
+                <signal pad-key="pc1" function="TC0" group="OC0B" field="TC0B"/>
+                <signal pad-key="pc2" function="TC0" group="OC0C" field="TC0C"/>
+                <signal pad-key="pc3" function="TC0" group="OC0D" field="TC0D"/>
+                <signal pad-key="pc4" function="TC0_ALT" group="OC0A" field="TC0A"/>
+                <signal pad-key="pc5" function="TC0_ALT" group="OC0B" field="TC0B"/>
+                <signal pad-key="pc6" function="TC0_ALT" group="OC0C" field="TC0C"/>
+                <signal pad-key="pc7" function="TC0_ALT" group="OC0D" field="TC0D"/>
             </signals>
         </peripheral>
         <peripheral key="tcc1" name="TCC1" module-key="i6090_tc">
             <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"/>
+                <signal pad-key="pc4" function="TC1" group="OC1A"/>
+                <signal pad-key="pc5" function="TC1" group="OC1B"/>
             </signals>
         </peripheral>
         <peripheral key="tcd0" name="TCD0" module-key="i6090_tc">
             <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"/>
-                <signal pad-id="pd2" function="TC0" group="OC0C"/>
-                <signal pad-id="pd3" function="TC0" group="OC0D"/>
-                <signal pad-id="pd4" function="TC0_ALT" group="OC0A"/>
-                <signal pad-id="pd5" function="TC0_ALT" group="OC0B"/>
-                <signal pad-id="pd6" function="TC0_ALT" group="OC0C"/>
-                <signal pad-id="pd7" function="TC0_ALT" group="OC0D"/>
+                <signal pad-key="pd0" function="TC0" group="OC0A"/>
+                <signal pad-key="pd1" function="TC0" group="OC0B"/>
+                <signal pad-key="pd2" function="TC0" group="OC0C"/>
+                <signal pad-key="pd3" function="TC0" group="OC0D"/>
+                <signal pad-key="pd4" function="TC0_ALT" group="OC0A"/>
+                <signal pad-key="pd5" function="TC0_ALT" group="OC0B"/>
+                <signal pad-key="pd6" function="TC0_ALT" group="OC0C"/>
+                <signal pad-key="pd7" function="TC0_ALT" group="OC0D"/>
             </signals>
         </peripheral>
         <peripheral key="tcd1" name="TCD1" module-key="i6090_tc">
             <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"/>
+                <signal pad-key="pd4" function="TC1" group="OC1A"/>
+                <signal pad-key="pd5" function="TC1" group="OC1B"/>
             </signals>
         </peripheral>
         <peripheral key="tce0" name="TCE0" module-key="i6090_tc">
             <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"/>
-                <signal pad-id="pe2" function="TC0" group="OC0C"/>
-                <signal pad-id="pe3" function="TC0" group="OC0D"/>
+                <signal pad-key="pe0" function="TC0" group="OC0A"/>
+                <signal pad-key="pe1" function="TC0" group="OC0B"/>
+                <signal pad-key="pe2" function="TC0" group="OC0C"/>
+                <signal pad-key="pe3" function="TC0" group="OC0D"/>
             </signals>
         </peripheral>
         <peripheral key="tcc2" name="TCC2" module-key="i6090_tc2">
             <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"/>
-                <signal pad-id="pc2" function="TC2" group="LOC2C"/>
-                <signal pad-id="pc3" function="TC2" group="LOC2D"/>
-                <signal pad-id="pc4" function="TC2" group="HOC2A"/>
-                <signal pad-id="pc5" function="TC2" group="HOC2B"/>
-                <signal pad-id="pc6" function="TC2" group="HOC2C"/>
-                <signal pad-id="pc7" function="TC2" group="HOC2D"/>
+                <signal pad-key="pc0" function="TC2" group="LOC2A"/>
+                <signal pad-key="pc1" function="TC2" group="LOC2B"/>
+                <signal pad-key="pc2" function="TC2" group="LOC2C"/>
+                <signal pad-key="pc3" function="TC2" group="LOC2D"/>
+                <signal pad-key="pc4" function="TC2" group="HOC2A"/>
+                <signal pad-key="pc5" function="TC2" group="HOC2B"/>
+                <signal pad-key="pc6" function="TC2" group="HOC2C"/>
+                <signal pad-key="pc7" function="TC2" group="HOC2D"/>
             </signals>
         </peripheral>
         <peripheral key="tcd2" name="TCD2" module-key="i6090_tc2">
             <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"/>
-                <signal pad-id="pd2" function="TC2" group="LOC2C"/>
-                <signal pad-id="pd3" function="TC2" group="LOC2D"/>
-                <signal pad-id="pd4" function="TC2" group="HOC2A"/>
-                <signal pad-id="pd5" function="TC2" group="HOC2B"/>
-                <signal pad-id="pd6" function="TC2" group="HOC2C"/>
-                <signal pad-id="pd7" function="TC2" group="HOC2D"/>
+                <signal pad-key="pd0" function="TC2" group="LOC2A"/>
+                <signal pad-key="pd1" function="TC2" group="LOC2B"/>
+                <signal pad-key="pd2" function="TC2" group="LOC2C"/>
+                <signal pad-key="pd3" function="TC2" group="LOC2D"/>
+                <signal pad-key="pd4" function="TC2" group="HOC2A"/>
+                <signal pad-key="pd5" function="TC2" group="HOC2B"/>
+                <signal pad-key="pd6" function="TC2" group="HOC2C"/>
+                <signal pad-key="pd7" function="TC2" group="HOC2D"/>
             </signals>
         </peripheral>
         <peripheral key="awexc" name="AWEXC" module-key="i6090_awex">
             <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"/>
-                <signal pad-id="pc2" function="AWEX" group="OC0BLS"/>
-                <signal pad-id="pc3" function="AWEX" group="OC0BHS"/>
-                <signal pad-id="pc4" function="AWEX" group="OC0CLS"/>
-                <signal pad-id="pc5" function="AWEX" group="OC0CHS"/>
-                <signal pad-id="pc6" function="AWEX" group="OC0DLS"/>
-                <signal pad-id="pc7" function="AWEX" group="OC0DHS"/>
+                <signal pad-key="pc0" function="AWEX" group="OC0ALS"/>
+                <signal pad-key="pc1" function="AWEX" group="OC0AHS"/>
+                <signal pad-key="pc2" function="AWEX" group="OC0BLS"/>
+                <signal pad-key="pc3" function="AWEX" group="OC0BHS"/>
+                <signal pad-key="pc4" function="AWEX" group="OC0CLS"/>
+                <signal pad-key="pc5" function="AWEX" group="OC0CHS"/>
+                <signal pad-key="pc6" function="AWEX" group="OC0DLS"/>
+                <signal pad-key="pc7" function="AWEX" group="OC0DHS"/>
             </signals>
         </peripheral>
         <peripheral key="hiresc" name="HIRESC" module-key="i6090_hires">
@@ -382,73 +382,73 @@
         <peripheral key="usartc0" name="USARTC0" module-key="i6090_usart">
             <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"/>
-                <signal pad-id="pc3" function="USART" group="TXD" field="USART0"/>
-                <signal pad-id="pc5" function="USART_ALT" group="XCK" field="USART0"/>
-                <signal pad-id="pc6" function="USART_ALT" group="RXD" field="USART0"/>
-                <signal pad-id="pc7" function="USART_ALT" group="TXD" field="USART0"/>
+                <signal pad-key="pc1" function="USART" group="XCK" field="USART0"/>
+                <signal pad-key="pc2" function="USART" group="RXD" field="USART0"/>
+                <signal pad-key="pc3" function="USART" group="TXD" field="USART0"/>
+                <signal pad-key="pc5" function="USART_ALT" group="XCK" field="USART0"/>
+                <signal pad-key="pc6" function="USART_ALT" group="RXD" field="USART0"/>
+                <signal pad-key="pc7" function="USART_ALT" group="TXD" field="USART0"/>
             </signals>
         </peripheral>
         <peripheral key="usartc1" name="USARTC1" module-key="i6090_usart">
             <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"/>
-                <signal pad-id="pd7" function="USART" group="TXD"/>
+                <signal pad-key="pd5" function="USART" group="XCK"/>
+                <signal pad-key="pd6" function="USART" group="RXD"/>
+                <signal pad-key="pd7" function="USART" group="TXD"/>
             </signals>
         </peripheral>
         <peripheral key="usartd0" name="USARTD0" module-key="i6090_usart">
             <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"/>
-                <signal pad-id="pd3" function="USART" group="TXD" field="USART0"/>
-                <signal pad-id="pd5" function="USART_ALT" group="XCK" field="USART0"/>
-                <signal pad-id="pd6" function="USART_ALT" group="RXD" field="USART0"/>
-                <signal pad-id="pd7" function="USART_ALT" group="TXD" field="USART0"/>
+                <signal pad-key="pd1" function="USART" group="XCK" field="USART0"/>
+                <signal pad-key="pd2" function="USART" group="RXD" field="USART0"/>
+                <signal pad-key="pd3" function="USART" group="TXD" field="USART0"/>
+                <signal pad-key="pd5" function="USART_ALT" group="XCK" field="USART0"/>
+                <signal pad-key="pd6" function="USART_ALT" group="RXD" field="USART0"/>
+                <signal pad-key="pd7" function="USART_ALT" group="TXD" field="USART0"/>
             </signals>
         </peripheral>
         <peripheral key="usartd1" name="USARTD1" module-key="i6090_usart">
             <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"/>
-                <signal pad-id="pd7" function="USART" group="TXD"/>
+                <signal pad-key="pd5" function="USART" group="XCK"/>
+                <signal pad-key="pd6" function="USART" group="RXD"/>
+                <signal pad-key="pd7" function="USART" group="TXD"/>
             </signals>
         </peripheral>
         <peripheral key="usarte0" name="USARTE0" module-key="i6090_usart">
             <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"/>
-                <signal pad-id="pe3" function="USART" group="TXD"/>
+                <signal pad-key="pe1" function="USART" group="XCK"/>
+                <signal pad-key="pe2" function="USART" group="RXD"/>
+                <signal pad-key="pe3" function="USART" group="TXD"/>
             </signals>
         </peripheral>
         <peripheral key="spic" name="SPIC" module-key="i6090_spi">
             <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"/>
-                <signal pad-id="pc6" function="SPI" group="MISO" field="SPI"/>
-                <signal pad-id="pc7" function="SPI" group="SCK" field="SPI"/>
-                <signal pad-id="pc4" function="SPI_ALT" group="SS" field="SPI"/>
-                <signal pad-id="pc5" function="SPI_ALT" group="SCK" field="SPI"/>
-                <signal pad-id="pc6" function="SPI_ALT" group="MISO" field="SPI"/>
-                <signal pad-id="pc7" function="SPI_ALT" group="MOSI" field="SPI"/>
+                <signal pad-key="pc4" function="SPI" group="SS" field="SPI"/>
+                <signal pad-key="pc5" function="SPI" group="MOSI" field="SPI"/>
+                <signal pad-key="pc6" function="SPI" group="MISO" field="SPI"/>
+                <signal pad-key="pc7" function="SPI" group="SCK" field="SPI"/>
+                <signal pad-key="pc4" function="SPI_ALT" group="SS" field="SPI"/>
+                <signal pad-key="pc5" function="SPI_ALT" group="SCK" field="SPI"/>
+                <signal pad-key="pc6" function="SPI_ALT" group="MISO" field="SPI"/>
+                <signal pad-key="pc7" function="SPI_ALT" group="MOSI" field="SPI"/>
             </signals>
         </peripheral>
         <peripheral key="spid" name="SPID" module-key="i6090_spi">
             <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"/>
-                <signal pad-id="pd6" function="SPI" group="MISO" field="SPI"/>
-                <signal pad-id="pd7" function="SPI" group="SCK" field="SPI"/>
-                <signal pad-id="pd4" function="SPI_ALT" group="SS" field="SPI"/>
-                <signal pad-id="pd5" function="SPI_ALT" group="SCK" field="SPI"/>
-                <signal pad-id="pd6" function="SPI_ALT" group="MISO" field="SPI"/>
-                <signal pad-id="pd7" function="SPI_ALT" group="MOSI" field="SPI"/>
+                <signal pad-key="pd4" function="SPI" group="SS" field="SPI"/>
+                <signal pad-key="pd5" function="SPI" group="MOSI" field="SPI"/>
+                <signal pad-key="pd6" function="SPI" group="MISO" field="SPI"/>
+                <signal pad-key="pd7" function="SPI" group="SCK" field="SPI"/>
+                <signal pad-key="pd4" function="SPI_ALT" group="SS" field="SPI"/>
+                <signal pad-key="pd5" function="SPI_ALT" group="SCK" field="SPI"/>
+                <signal pad-key="pd6" function="SPI_ALT" group="MISO" field="SPI"/>
+                <signal pad-key="pd7" function="SPI_ALT" group="MOSI" field="SPI"/>
             </signals>
         </peripheral>
         <peripheral key="ircom" name="IRCOM" module-key="i6090_ircom">
@@ -1822,110 +1822,152 @@
             </register-group>
         </module>
     </modules>
+    <pads>
+        <pad key="pa5" name="PA5"/>
+        <pad key="pa6" name="PA6"/>
+        <pad key="pa7" name="PA7"/>
+        <pad key="pb0" name="PB0"/>
+        <pad key="pb1" name="PB1"/>
+        <pad key="pb2" name="PB2"/>
+        <pad key="pb3" name="PB3"/>
+        <pad key="gnd" name="GND"/>
+        <pad key="vcc" name="VCC"/>
+        <pad key="pc0" name="PC0"/>
+        <pad key="pc1" name="PC1"/>
+        <pad key="pc2" name="PC2"/>
+        <pad key="pc3" name="PC3"/>
+        <pad key="pc4" name="PC4"/>
+        <pad key="pc5" name="PC5"/>
+        <pad key="pc6" name="PC6"/>
+        <pad key="pc7" name="PC7"/>
+        <pad key="pd0" name="PD0"/>
+        <pad key="pd1" name="PD1"/>
+        <pad key="pd2" name="PD2"/>
+        <pad key="pd3" name="PD3"/>
+        <pad key="pd4" name="PD4"/>
+        <pad key="pd5" name="PD5"/>
+        <pad key="pd6" name="PD6"/>
+        <pad key="pd7" name="PD7"/>
+        <pad key="pe0" name="PE0"/>
+        <pad key="pe1" name="PE1"/>
+        <pad key="pe2" name="PE2"/>
+        <pad key="pe3" name="PE3"/>
+        <pad key="pdi" name="PDI"/>
+        <pad key="reset" name="RESET"/>
+        <pad key="pr0" name="PR0"/>
+        <pad key="pr1" name="PR1"/>
+        <pad key="avcc" name="AVCC"/>
+        <pad key="pa0" name="PA0"/>
+        <pad key="pa1" name="PA1"/>
+        <pad key="pa2" name="PA2"/>
+        <pad key="pa3" name="PA3"/>
+        <pad key="pa4" name="PA4"/>
+        <pad key="pdi_data" name="PDI_DATA"/>
+    </pads>
     <pinouts>
         <pinout key="qfp_qfn_44" name="QFP_QFN_44" type="qfn">
-            <pin position="1" pad="PA5"/>
-            <pin position="2" pad="PA6"/>
-            <pin position="3" pad="PA7"/>
-            <pin position="4" pad="PB0"/>
-            <pin position="5" pad="PB1"/>
-            <pin position="6" pad="PB2"/>
-            <pin position="7" pad="PB3"/>
-            <pin position="8" pad="GND"/>
-            <pin position="9" pad="VCC"/>
-            <pin position="10" pad="PC0"/>
-            <pin position="11" pad="PC1"/>
-            <pin position="12" pad="PC2"/>
-            <pin position="13" pad="PC3"/>
-            <pin position="14" pad="PC4"/>
-            <pin position="15" pad="PC5"/>
-            <pin position="16" pad="PC6"/>
-            <pin position="17" pad="PC7"/>
-            <pin position="18" pad="GND"/>
-            <pin position="19" pad="VCC"/>
-            <pin position="20" pad="PD0"/>
-            <pin position="21" pad="PD1"/>
-            <pin position="22" pad="PD2"/>
-            <pin position="23" pad="PD3"/>
-            <pin position="24" pad="PD4"/>
-            <pin position="25" pad="PD5"/>
-            <pin position="26" pad="PD6"/>
-            <pin position="27" pad="PD7"/>
-            <pin position="28" pad="PE0"/>
-            <pin position="29" pad="PE1"/>
-            <pin position="30" pad="GND"/>
-            <pin position="31" pad="VCC"/>
-            <pin position="32" pad="PE2"/>
-            <pin position="33" pad="PE3"/>
-            <pin position="34" pad="PDI"/>
-            <pin position="35" pad="RESET"/>
-            <pin position="36" pad="PR0"/>
-            <pin position="37" pad="PR1"/>
-            <pin position="38" pad="GND"/>
-            <pin position="39" pad="AVCC"/>
-            <pin position="40" pad="PA0"/>
-            <pin position="41" pad="PA1"/>
-            <pin position="42" pad="PA2"/>
-            <pin position="43" pad="PA3"/>
-            <pin position="44" pad="PA4"/>
+            <pin position="1" pad-key="pa5"/>
+            <pin position="2" pad-key="pa6"/>
+            <pin position="3" pad-key="pa7"/>
+            <pin position="4" pad-key="pb0"/>
+            <pin position="5" pad-key="pb1"/>
+            <pin position="6" pad-key="pb2"/>
+            <pin position="7" pad-key="pb3"/>
+            <pin position="8" pad-key="gnd"/>
+            <pin position="9" pad-key="vcc"/>
+            <pin position="10" pad-key="pc0"/>
+            <pin position="11" pad-key="pc1"/>
+            <pin position="12" pad-key="pc2"/>
+            <pin position="13" pad-key="pc3"/>
+            <pin position="14" pad-key="pc4"/>
+            <pin position="15" pad-key="pc5"/>
+            <pin position="16" pad-key="pc6"/>
+            <pin position="17" pad-key="pc7"/>
+            <pin position="18" pad-key="gnd"/>
+            <pin position="19" pad-key="vcc"/>
+            <pin position="20" pad-key="pd0"/>
+            <pin position="21" pad-key="pd1"/>
+            <pin position="22" pad-key="pd2"/>
+            <pin position="23" pad-key="pd3"/>
+            <pin position="24" pad-key="pd4"/>
+            <pin position="25" pad-key="pd5"/>
+            <pin position="26" pad-key="pd6"/>
+            <pin position="27" pad-key="pd7"/>
+            <pin position="28" pad-key="pe0"/>
+            <pin position="29" pad-key="pe1"/>
+            <pin position="30" pad-key="gnd"/>
+            <pin position="31" pad-key="vcc"/>
+            <pin position="32" pad-key="pe2"/>
+            <pin position="33" pad-key="pe3"/>
+            <pin position="34" pad-key="pdi"/>
+            <pin position="35" pad-key="reset"/>
+            <pin position="36" pad-key="pr0"/>
+            <pin position="37" pad-key="pr1"/>
+            <pin position="38" pad-key="gnd"/>
+            <pin position="39" pad-key="avcc"/>
+            <pin position="40" pad-key="pa0"/>
+            <pin position="41" pad-key="pa1"/>
+            <pin position="42" pad-key="pa2"/>
+            <pin position="43" pad-key="pa3"/>
+            <pin position="44" pad-key="pa4"/>
         </pinout>
         <pinout key="bga_49" name="BGA_49" type="bga">
-            <pin position="A1" pad="PA3"/>
-            <pin position="A2" pad="AVCC"/>
-            <pin position="A3" pad="GND"/>
-            <pin position="A4" pad="PR1"/>
-            <pin position="A5" pad="PR0"/>
-            <pin position="A6" pad="PDI_DATA"/>
-            <pin position="A7" pad="PE3"/>
-            <pin position="B1" pad="PA4"/>
-            <pin position="B2" pad="PA1"/>
-            <pin position="B3" pad="PA0"/>
-            <pin position="B4" pad="GND"/>
-            <pin position="B5" pad="RESET"/>
-            <pin position="B6" pad="PE2"/>
-            <pin position="B7" pad="VCC"/>
-            <pin position="C1" pad="PA5"/>
-            <pin position="C2" pad="PA2"/>
-            <pin position="C3" pad="PA6"/>
-            <pin position="C4" pad="PA7"/>
-            <pin position="C5" pad="GND"/>
-            <pin position="C6" pad="PE1"/>
-            <pin position="C7" pad="GND"/>
-            <pin position="D1" pad="PB1"/>
-            <pin position="D2" pad="PB2"/>
-            <pin position="D3" pad="PB3"/>
-            <pin position="D4" pad="PB0"/>
-            <pin position="D5" pad="GND"/>
-            <pin position="D6" pad="PD7"/>
-            <pin position="D7" pad="PE0"/>
-            <pin position="E1" pad="GND"/>
-            <pin position="E2" pad="GND"/>
-            <pin position="E3" pad="PC3"/>
-            <pin position="E4" pad="GND"/>
-            <pin position="E5" pad="PD4"/>
-            <pin position="E6" pad="PD5"/>
-            <pin position="E7" pad="PD6"/>
-            <pin position="F1" pad="VCC"/>
-            <pin position="F2" pad="PC0"/>
-            <pin position="F3" pad="PC4"/>
-            <pin position="F4" pad="PC6"/>
-            <pin position="F5" pad="PD0"/>
-            <pin position="F6" pad="PD1"/>
-            <pin position="F7" pad="PD3"/>
-            <pin position="G1" pad="PC1"/>
-            <pin position="G2" pad="PC2"/>
-            <pin position="G3" pad="PC5"/>
-            <pin position="G4" pad="PC7"/>
-            <pin position="G5" pad="GND"/>
-            <pin position="G6" pad="VCC"/>
-            <pin position="G7" pad="PD2"/>
+            <pin position="A1" pad-key="pa3"/>
+            <pin position="A2" pad-key="avcc"/>
+            <pin position="A3" pad-key="gnd"/>
+            <pin position="A4" pad-key="pr1"/>
+            <pin position="A5" pad-key="pr0"/>
+            <pin position="A6" pad-key="pdi_data"/>
+            <pin position="A7" pad-key="pe3"/>
+            <pin position="B1" pad-key="pa4"/>
+            <pin position="B2" pad-key="pa1"/>
+            <pin position="B3" pad-key="pa0"/>
+            <pin position="B4" pad-key="gnd"/>
+            <pin position="B5" pad-key="reset"/>
+            <pin position="B6" pad-key="pe2"/>
+            <pin position="B7" pad-key="vcc"/>
+            <pin position="C1" pad-key="pa5"/>
+            <pin position="C2" pad-key="pa2"/>
+            <pin position="C3" pad-key="pa6"/>
+            <pin position="C4" pad-key="pa7"/>
+            <pin position="C5" pad-key="gnd"/>
+            <pin position="C6" pad-key="pe1"/>
+            <pin position="C7" pad-key="gnd"/>
+            <pin position="D1" pad-key="pb1"/>
+            <pin position="D2" pad-key="pb2"/>
+            <pin position="D3" pad-key="pb3"/>
+            <pin position="D4" pad-key="pb0"/>
+            <pin position="D5" pad-key="gnd"/>
+            <pin position="D6" pad-key="pd7"/>
+            <pin position="D7" pad-key="pe0"/>
+            <pin position="E1" pad-key="gnd"/>
+            <pin position="E2" pad-key="gnd"/>
+            <pin position="E3" pad-key="pc3"/>
+            <pin position="E4" pad-key="gnd"/>
+            <pin position="E5" pad-key="pd4"/>
+            <pin position="E6" pad-key="pd5"/>
+            <pin position="E7" pad-key="pd6"/>
+            <pin position="F1" pad-key="vcc"/>
+            <pin position="F2" pad-key="pc0"/>
+            <pin position="F3" pad-key="pc4"/>
+            <pin position="F4" pad-key="pc6"/>
+            <pin position="F5" pad-key="pd0"/>
+            <pin position="F6" pad-key="pd1"/>
+            <pin position="F7" pad-key="pd3"/>
+            <pin position="G1" pad-key="pc1"/>
+            <pin position="G2" pad-key="pc2"/>
+            <pin position="G3" pad-key="pc5"/>
+            <pin position="G4" pad-key="pc7"/>
+            <pin position="G5" pad-key="gnd"/>
+            <pin position="G6" pad-key="vcc"/>
+            <pin position="G7" pad-key="pd2"/>
         </pinout>
     </pinouts>
     <variants>
-        <variant name="ATxmega64A4U-AU" pinout-key="qfp_qfn_44" package="TQFP44"/>
-        <variant name="ATxmega64A4U-MH" pinout-key="qfp_qfn_44" package="VQFN44PW"/>
-        <variant name="ATxmega64A4U-CU" pinout-key="bga_49" package="VFBGA49"/>
-        <variant name="ATxmega64A4U-AN" pinout-key="qfp_qfn_44" package="TQFP44"/>
-        <variant name="ATxmega64A4U-M7" pinout-key="qfp_qfn_44" package="VQFN44PW"/>
+        <variant key="atxmega64a4u_au" name="ATxmega64A4U-AU" pinout-key="qfp_qfn_44"/>
+        <variant key="atxmega64a4u_mh" name="ATxmega64A4U-MH" pinout-key="qfp_qfn_44"/>
+        <variant key="atxmega64a4u_cu" name="ATxmega64A4U-CU" pinout-key="bga_49"/>
+        <variant key="atxmega64a4u_an" name="ATxmega64A4U-AN" pinout-key="qfp_qfn_44"/>
+        <variant key="atxmega64a4u_m7" name="ATxmega64A4U-M7" pinout-key="qfp_qfn_44"/>
     </variants>
 </device>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA64B1.xml b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA64B1.xml
index 29b07623..a696c7af 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA64B1.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA64B1.xml
@@ -85,14 +85,14 @@
         <peripheral key="clk" name="CLK" module-key="i6073">
             <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"/>
-                <signal pad-id="pc2" index="2" function="EXTERNAL_CLOCK" group="EXTCLK"/>
-                <signal pad-id="pc3" index="3" function="EXTERNAL_CLOCK" group="EXTCLK"/>
-                <signal pad-id="pc4" index="4" function="EXTERNAL_CLOCK" group="EXTCLK"/>
-                <signal pad-id="pc5" index="5" function="EXTERNAL_CLOCK" group="EXTCLK"/>
-                <signal pad-id="pc6" index="6" function="EXTERNAL_CLOCK" group="EXTCLK"/>
-                <signal pad-id="pc7" index="7" function="EXTERNAL_CLOCK" group="EXTCLK"/>
+                <signal pad-key="pc0" index="0" function="EXTERNAL_CLOCK" group="EXTCLK"/>
+                <signal pad-key="pc1" index="1" function="EXTERNAL_CLOCK" group="EXTCLK"/>
+                <signal pad-key="pc2" index="2" function="EXTERNAL_CLOCK" group="EXTCLK"/>
+                <signal pad-key="pc3" index="3" function="EXTERNAL_CLOCK" group="EXTCLK"/>
+                <signal pad-key="pc4" index="4" function="EXTERNAL_CLOCK" group="EXTCLK"/>
+                <signal pad-key="pc5" index="5" function="EXTERNAL_CLOCK" group="EXTCLK"/>
+                <signal pad-key="pc6" index="6" function="EXTERNAL_CLOCK" group="EXTCLK"/>
+                <signal pad-key="pc7" index="7" function="EXTERNAL_CLOCK" group="EXTCLK"/>
             </signals>
         </peripheral>
         <peripheral key="sleep" name="SLEEP" module-key="i6081">
@@ -101,12 +101,12 @@
         <peripheral key="osc" name="OSC" module-key="i6079">
             <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"/>
-                <signal pad-id="pr0" function="TOSC" group="TOSC2"/>
-                <signal pad-id="pr1" function="TOSC" group="TOSC1"/>
-                <signal pad-id="pe6" function="TOSC_ALT" group="TOSC2"/>
-                <signal pad-id="pe7" function="TOSC_ALT" group="TOSC1"/>
+                <signal pad-key="pr0" function="XTAL" group="XTAL2"/>
+                <signal pad-key="pr1" function="XTAL" group="XTAL1"/>
+                <signal pad-key="pr0" function="TOSC" group="TOSC2"/>
+                <signal pad-key="pr1" function="TOSC" group="TOSC1"/>
+                <signal pad-key="pe6" function="TOSC_ALT" group="TOSC2"/>
+                <signal pad-key="pe7" function="TOSC_ALT" group="TOSC1"/>
             </signals>
         </peripheral>
         <peripheral key="dfllrc32m" name="DFLLRC32M" module-key="i6055">
@@ -133,11 +133,8 @@
         <peripheral key="portcfg" name="PORTCFG" module-key="i6075_portcfg">
             <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"/>
-                <signal pad-id="pd6" function="RTCOUTC" group="RTCOUT" field="RTCOUT"/>
-                <signal pad-id="pe7" function="CLKOUTE" group="CLKOUT" field="CLKOUT"/>
-                <signal pad-id="pe7" function="EVOUT" group="EVOUT" field="EVOUT"/>
+                <signal pad-key="pe7" function="CLKOUTE" group="CLKOUT" field="CLKOUT"/>
+                <signal pad-key="pe7" function="EVOUT" group="EVOUT" field="EVOUT"/>
             </signals>
         </peripheral>
         <peripheral key="aes" name="AES" module-key="i6096">
@@ -158,69 +155,68 @@
         <peripheral key="adca" name="ADCA" module-key="i6110">
             <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"/>
-                <signal pad-id="pa2" index="2" function="ADC" group="ADC"/>
-                <signal pad-id="pa3" index="3" function="ADC" group="ADC"/>
-                <signal pad-id="pa4" index="4" function="ADC" group="ADC"/>
-                <signal pad-id="pa5" index="5" function="ADC" group="ADC"/>
-                <signal pad-id="pa6" index="6" function="ADC" group="ADC"/>
-                <signal pad-id="pb0" index="7" function="ADC" group="ADC"/>
-                <signal pad-id="pb1" index="8" function="ADC" group="ADC"/>
-                <signal pad-id="pb2" index="9" function="ADC" group="ADC"/>
-                <signal pad-id="pb3" index="10" function="ADC" group="ADC"/>
-                <signal pad-id="pb4" index="11" function="ADC" group="ADC"/>
-                <signal pad-id="pb5" index="12" function="ADC" group="ADC"/>
-                <signal pad-id="pb6" index="13" function="ADC" group="ADC"/>
-                <signal pad-id="pb7" index="14" function="ADC" group="ADC"/>
-                <signal pad-id="pb8" index="15" function="ADC" group="ADC"/>
-                <signal pad-id="pa0" index="0" function="AREF" group="REFA"/>
-                <signal pad-id="pb0" index="0" function="AREF" group="REFB"/>
+                <signal pad-key="pa0" index="0" function="ADC" group="ADC"/>
+                <signal pad-key="pa1" index="1" function="ADC" group="ADC"/>
+                <signal pad-key="pa2" index="2" function="ADC" group="ADC"/>
+                <signal pad-key="pa3" index="3" function="ADC" group="ADC"/>
+                <signal pad-key="pa4" index="4" function="ADC" group="ADC"/>
+                <signal pad-key="pa5" index="5" function="ADC" group="ADC"/>
+                <signal pad-key="pa6" index="6" function="ADC" group="ADC"/>
+                <signal pad-key="pb0" index="7" function="ADC" group="ADC"/>
+                <signal pad-key="pb1" index="8" function="ADC" group="ADC"/>
+                <signal pad-key="pb2" index="9" function="ADC" group="ADC"/>
+                <signal pad-key="pb3" index="10" function="ADC" group="ADC"/>
+                <signal pad-key="pb4" index="11" function="ADC" group="ADC"/>
+                <signal pad-key="pb5" index="12" function="ADC" group="ADC"/>
+                <signal pad-key="pb6" index="13" function="ADC" group="ADC"/>
+                <signal pad-key="pb7" index="14" function="ADC" group="ADC"/>
+                <signal pad-key="pa0" index="0" function="AREF" group="REFA"/>
+                <signal pad-key="pb0" index="0" function="AREF" group="REFB"/>
             </signals>
         </peripheral>
         <peripheral key="adcb" name="ADCB" module-key="i6110">
             <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"/>
-                <signal pad-id="pb2" index="2" function="ADC" group="ADC"/>
-                <signal pad-id="pb3" index="3" function="ADC" group="ADC"/>
-                <signal pad-id="pb4" index="4" function="ADC" group="ADC"/>
-                <signal pad-id="pb5" index="5" function="ADC" group="ADC"/>
-                <signal pad-id="pb6" index="6" function="ADC" group="ADC"/>
-                <signal pad-id="pb7" index="7" function="ADC" group="ADC"/>
-                <signal pad-id="pa0" index="0" function="AREF" group="REFA"/>
-                <signal pad-id="pb0" index="0" function="AREF" group="REFB"/>
+                <signal pad-key="pb0" index="0" function="ADC" group="ADC"/>
+                <signal pad-key="pb1" index="1" function="ADC" group="ADC"/>
+                <signal pad-key="pb2" index="2" function="ADC" group="ADC"/>
+                <signal pad-key="pb3" index="3" function="ADC" group="ADC"/>
+                <signal pad-key="pb4" index="4" function="ADC" group="ADC"/>
+                <signal pad-key="pb5" index="5" function="ADC" group="ADC"/>
+                <signal pad-key="pb6" index="6" function="ADC" group="ADC"/>
+                <signal pad-key="pb7" index="7" function="ADC" group="ADC"/>
+                <signal pad-key="pa0" index="0" function="AREF" group="REFA"/>
+                <signal pad-key="pb0" index="0" function="AREF" group="REFB"/>
             </signals>
         </peripheral>
         <peripheral key="aca" name="ACA" module-key="i6077">
             <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"/>
-                <signal pad-id="pa2" index="2" function="AC" group="AC"/>
-                <signal pad-id="pa3" index="3" function="AC" group="AC"/>
-                <signal pad-id="pa4" index="4" function="AC" group="AC"/>
-                <signal pad-id="pa5" index="5" function="AC" group="AC"/>
-                <signal pad-id="pa6" index="6" function="AC" group="AC"/>
-                <signal pad-id="pa7" index="7" function="AC" group="AC"/>
-                <signal pad-id="pa6" index="1" function="ACOUT" group="ACOUT"/>
-                <signal pad-id="pa7" index="0" function="ACOUT" group="ACOUT"/>
+                <signal pad-key="pa0" index="0" function="AC" group="AC"/>
+                <signal pad-key="pa1" index="1" function="AC" group="AC"/>
+                <signal pad-key="pa2" index="2" function="AC" group="AC"/>
+                <signal pad-key="pa3" index="3" function="AC" group="AC"/>
+                <signal pad-key="pa4" index="4" function="AC" group="AC"/>
+                <signal pad-key="pa5" index="5" function="AC" group="AC"/>
+                <signal pad-key="pa6" index="6" function="AC" group="AC"/>
+                <signal pad-key="pa7" index="7" function="AC" group="AC"/>
+                <signal pad-key="pa6" index="1" function="ACOUT" group="ACOUT"/>
+                <signal pad-key="pa7" index="0" function="ACOUT" group="ACOUT"/>
             </signals>
         </peripheral>
         <peripheral key="acb" name="ACB" module-key="i6077">
             <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"/>
-                <signal pad-id="pb2" index="2" function="AC" group="AC"/>
-                <signal pad-id="pb3" index="3" function="AC" group="AC"/>
-                <signal pad-id="pb4" index="4" function="AC" group="AC"/>
-                <signal pad-id="pb5" index="5" function="AC" group="AC"/>
-                <signal pad-id="pb6" index="6" function="AC" group="AC"/>
-                <signal pad-id="pb7" index="7" function="AC" group="AC"/>
-                <signal pad-id="pb6" index="1" function="ACOUT" group="ACOUT"/>
-                <signal pad-id="pb7" index="0" function="ACOUT" group="ACOUT"/>
+                <signal pad-key="pb0" index="0" function="AC" group="AC"/>
+                <signal pad-key="pb1" index="1" function="AC" group="AC"/>
+                <signal pad-key="pb2" index="2" function="AC" group="AC"/>
+                <signal pad-key="pb3" index="3" function="AC" group="AC"/>
+                <signal pad-key="pb4" index="4" function="AC" group="AC"/>
+                <signal pad-key="pb5" index="5" function="AC" group="AC"/>
+                <signal pad-key="pb6" index="6" function="AC" group="AC"/>
+                <signal pad-key="pb7" index="7" function="AC" group="AC"/>
+                <signal pad-key="pb6" index="1" function="ACOUT" group="ACOUT"/>
+                <signal pad-key="pb7" index="0" function="ACOUT" group="ACOUT"/>
             </signals>
         </peripheral>
         <peripheral key="rtc" name="RTC" module-key="i6093">
@@ -229,180 +225,180 @@
         <peripheral key="twic" name="TWIC" module-key="i6089">
             <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"/>
+                <signal pad-key="pc0" function="TWI" group="SDA"/>
+                <signal pad-key="pc1" function="TWI" group="SCL"/>
             </signals>
         </peripheral>
         <peripheral key="usb" name="USB" module-key="i3005">
             <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"/>
+                <signal pad-key="pd0" function="USB" group="DN"/>
+                <signal pad-key="pd1" function="USB" group="DP"/>
             </signals>
         </peripheral>
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pa2" index="2" function="PORTA" group="P"/>
-                <signal pad-id="pa3" index="3" function="PORTA" group="P"/>
-                <signal pad-id="pa4" index="4" function="PORTA" group="P"/>
-                <signal pad-id="pa5" index="5" function="PORTA" group="P"/>
-                <signal pad-id="pa6" index="6" function="PORTA" group="P"/>
-                <signal pad-id="pa7" index="7" function="PORTA" group="P"/>
+                <signal pad-key="pa0" index="0" function="PORTA" group="P"/>
+                <signal pad-key="pa1" index="1" function="PORTA" group="P"/>
+                <signal pad-key="pa2" index="2" function="PORTA" group="P"/>
+                <signal pad-key="pa3" index="3" function="PORTA" group="P"/>
+                <signal pad-key="pa4" index="4" function="PORTA" group="P"/>
+                <signal pad-key="pa5" index="5" function="PORTA" group="P"/>
+                <signal pad-key="pa6" index="6" function="PORTA" group="P"/>
+                <signal pad-key="pa7" index="7" function="PORTA" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pb2" index="2" function="PORTB" group="P"/>
-                <signal pad-id="pb3" index="3" function="PORTB" group="P"/>
-                <signal pad-id="pb4" index="4" function="PORTB" group="P"/>
-                <signal pad-id="pb5" index="5" function="PORTB" group="P"/>
-                <signal pad-id="pb6" index="6" function="PORTB" group="P"/>
-                <signal pad-id="pb7" index="7" function="PORTB" group="P"/>
+                <signal pad-key="pb0" index="0" function="PORTB" group="P"/>
+                <signal pad-key="pb1" index="1" function="PORTB" group="P"/>
+                <signal pad-key="pb2" index="2" function="PORTB" group="P"/>
+                <signal pad-key="pb3" index="3" function="PORTB" group="P"/>
+                <signal pad-key="pb4" index="4" function="PORTB" group="P"/>
+                <signal pad-key="pb5" index="5" function="PORTB" group="P"/>
+                <signal pad-key="pb6" index="6" function="PORTB" group="P"/>
+                <signal pad-key="pb7" index="7" function="PORTB" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pc2" index="2" function="PORTC" group="P"/>
-                <signal pad-id="pc3" index="3" function="PORTC" group="P"/>
-                <signal pad-id="pc4" index="4" function="PORTC" group="P"/>
-                <signal pad-id="pc5" index="5" function="PORTC" group="P"/>
-                <signal pad-id="pc6" index="6" function="PORTC" group="P"/>
-                <signal pad-id="pc7" index="7" function="PORTC" group="P"/>
+                <signal pad-key="pc0" index="0" function="PORTC" group="P"/>
+                <signal pad-key="pc1" index="1" function="PORTC" group="P"/>
+                <signal pad-key="pc2" index="2" function="PORTC" group="P"/>
+                <signal pad-key="pc3" index="3" function="PORTC" group="P"/>
+                <signal pad-key="pc4" index="4" function="PORTC" group="P"/>
+                <signal pad-key="pc5" index="5" function="PORTC" group="P"/>
+                <signal pad-key="pc6" index="6" function="PORTC" group="P"/>
+                <signal pad-key="pc7" index="7" function="PORTC" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pd2" index="2" function="PORTD" group="P"/>
+                <signal pad-key="pd0" index="0" function="PORTD" group="P"/>
+                <signal pad-key="pd1" index="1" function="PORTD" group="P"/>
+                <signal pad-key="pd2" index="2" function="PORTD" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="porte" name="PORTE" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pe2" index="2" function="PORTE" group="P"/>
-                <signal pad-id="pe3" index="3" function="PORTE" group="P"/>
-                <signal pad-id="pe4" index="4" function="PORTE" group="P"/>
-                <signal pad-id="pe5" index="5" function="PORTE" group="P"/>
-                <signal pad-id="pe6" index="6" function="PORTE" group="P"/>
-                <signal pad-id="pe7" index="7" function="PORTE" group="P"/>
+                <signal pad-key="pe0" index="0" function="PORTE" group="P"/>
+                <signal pad-key="pe1" index="1" function="PORTE" group="P"/>
+                <signal pad-key="pe2" index="2" function="PORTE" group="P"/>
+                <signal pad-key="pe3" index="3" function="PORTE" group="P"/>
+                <signal pad-key="pe4" index="4" function="PORTE" group="P"/>
+                <signal pad-key="pe5" index="5" function="PORTE" group="P"/>
+                <signal pad-key="pe6" index="6" function="PORTE" group="P"/>
+                <signal pad-key="pe7" index="7" function="PORTE" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portg" name="PORTG" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pg2" index="2" function="PORTG" group="P"/>
-                <signal pad-id="pg3" index="3" function="PORTG" group="P"/>
-                <signal pad-id="pg4" index="4" function="PORTG" group="P"/>
-                <signal pad-id="pg5" index="5" function="PORTG" group="P"/>
-                <signal pad-id="pg6" index="6" function="PORTG" group="P"/>
-                <signal pad-id="pg7" index="7" function="PORTG" group="P"/>
+                <signal pad-key="pg0" index="0" function="PORTG" group="P"/>
+                <signal pad-key="pg1" index="1" function="PORTG" group="P"/>
+                <signal pad-key="pg2" index="2" function="PORTG" group="P"/>
+                <signal pad-key="pg3" index="3" function="PORTG" group="P"/>
+                <signal pad-key="pg4" index="4" function="PORTG" group="P"/>
+                <signal pad-key="pg5" index="5" function="PORTG" group="P"/>
+                <signal pad-key="pg6" index="6" function="PORTG" group="P"/>
+                <signal pad-key="pg7" index="7" function="PORTG" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portm" name="PORTM" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pm2" index="2" function="PORTM" group="P"/>
-                <signal pad-id="pm3" index="3" function="PORTM" group="P"/>
-                <signal pad-id="pm4" index="4" function="PORTM" group="P"/>
-                <signal pad-id="pm5" index="5" function="PORTM" group="P"/>
-                <signal pad-id="pm6" index="6" function="PORTM" group="P"/>
-                <signal pad-id="pm7" index="7" function="PORTM" group="P"/>
+                <signal pad-key="pm0" index="0" function="PORTM" group="P"/>
+                <signal pad-key="pm1" index="1" function="PORTM" group="P"/>
+                <signal pad-key="pm2" index="2" function="PORTM" group="P"/>
+                <signal pad-key="pm3" index="3" function="PORTM" group="P"/>
+                <signal pad-key="pm4" index="4" function="PORTM" group="P"/>
+                <signal pad-key="pm5" index="5" function="PORTM" group="P"/>
+                <signal pad-key="pm6" index="6" function="PORTM" group="P"/>
+                <signal pad-key="pm7" index="7" function="PORTM" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portr" name="PORTR" module-key="gpio_port">
             <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"/>
+                <signal pad-key="pr0" index="0" function="PORTR" group="P"/>
+                <signal pad-key="pr1" index="1" function="PORTR" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="tcc0" name="TCC0" module-key="i6090_tc">
             <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"/>
-                <signal pad-id="pc2" function="TC0" group="OC0C" field="TC0C"/>
-                <signal pad-id="pc3" function="TC0" group="OC0D" field="TC0D"/>
-                <signal pad-id="pc4" function="TC0_ALT" group="OC0A" field="TC0A"/>
-                <signal pad-id="pc5" function="TC0_ALT" group="OC0B" field="TC0B"/>
-                <signal pad-id="pc6" function="TC0_ALT" group="OC0C" field="TC0C"/>
-                <signal pad-id="pc7" function="TC0_ALT" group="OC0D" field="TC0D"/>
+                <signal pad-key="pc0" function="TC0" group="OC0A" field="TC0A"/>
+                <signal pad-key="pc1" function="TC0" group="OC0B" field="TC0B"/>
+                <signal pad-key="pc2" function="TC0" group="OC0C" field="TC0C"/>
+                <signal pad-key="pc3" function="TC0" group="OC0D" field="TC0D"/>
+                <signal pad-key="pc4" function="TC0_ALT" group="OC0A" field="TC0A"/>
+                <signal pad-key="pc5" function="TC0_ALT" group="OC0B" field="TC0B"/>
+                <signal pad-key="pc6" function="TC0_ALT" group="OC0C" field="TC0C"/>
+                <signal pad-key="pc7" function="TC0_ALT" group="OC0D" field="TC0D"/>
             </signals>
         </peripheral>
         <peripheral key="tcc1" name="TCC1" module-key="i6090_tc">
             <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"/>
+                <signal pad-key="pc4" function="TC1" group="OC1A"/>
+                <signal pad-key="pc5" function="TC1" group="OC1B"/>
             </signals>
         </peripheral>
         <peripheral key="tce0" name="TCE0" module-key="i6090_tc">
             <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"/>
-                <signal pad-id="pe2" function="TC0" group="OC0C" field="TC0C"/>
-                <signal pad-id="pe3" function="TC0" group="OC0D" field="TC0D"/>
-                <signal pad-id="pe4" function="TC0_ALT" group="OC0A" field="TC0A"/>
-                <signal pad-id="pe5" function="TC0_ALT" group="OC0B" field="TC0B"/>
-                <signal pad-id="pe6" function="TC0_ALT" group="OC0C" field="TC0C"/>
-                <signal pad-id="pe7" function="TC0_ALT" group="OC0D" field="TC0D"/>
+                <signal pad-key="pe0" function="TC0" group="OC0A" field="TC0A"/>
+                <signal pad-key="pe1" function="TC0" group="OC0B" field="TC0B"/>
+                <signal pad-key="pe2" function="TC0" group="OC0C" field="TC0C"/>
+                <signal pad-key="pe3" function="TC0" group="OC0D" field="TC0D"/>
+                <signal pad-key="pe4" function="TC0_ALT" group="OC0A" field="TC0A"/>
+                <signal pad-key="pe5" function="TC0_ALT" group="OC0B" field="TC0B"/>
+                <signal pad-key="pe6" function="TC0_ALT" group="OC0C" field="TC0C"/>
+                <signal pad-key="pe7" function="TC0_ALT" group="OC0D" field="TC0D"/>
             </signals>
         </peripheral>
         <peripheral key="tcc2" name="TCC2" module-key="i6090_tc2">
             <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"/>
-                <signal pad-id="pc2" function="TC2" group="LOC2C"/>
-                <signal pad-id="pc3" function="TC2" group="LOC2D"/>
-                <signal pad-id="pc4" function="TC2" group="HOC2A"/>
-                <signal pad-id="pc5" function="TC2" group="HOC2B"/>
-                <signal pad-id="pc6" function="TC2" group="HOC2C"/>
-                <signal pad-id="pc7" function="TC2" group="HOC2D"/>
+                <signal pad-key="pc0" function="TC2" group="LOC2A"/>
+                <signal pad-key="pc1" function="TC2" group="LOC2B"/>
+                <signal pad-key="pc2" function="TC2" group="LOC2C"/>
+                <signal pad-key="pc3" function="TC2" group="LOC2D"/>
+                <signal pad-key="pc4" function="TC2" group="HOC2A"/>
+                <signal pad-key="pc5" function="TC2" group="HOC2B"/>
+                <signal pad-key="pc6" function="TC2" group="HOC2C"/>
+                <signal pad-key="pc7" function="TC2" group="HOC2D"/>
             </signals>
         </peripheral>
         <peripheral key="tce2" name="TCE2" module-key="i6090_tc2">
             <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"/>
-                <signal pad-id="pe2" function="TC2" group="LOC2C"/>
-                <signal pad-id="pe3" function="TC2" group="LOC2D"/>
-                <signal pad-id="pe4" function="TC2" group="HOC2A"/>
-                <signal pad-id="pe5" function="TC2" group="HOC2B"/>
-                <signal pad-id="pe6" function="TC2" group="HOC2C"/>
-                <signal pad-id="pe7" function="TC2" group="HOC2D"/>
+                <signal pad-key="pe0" function="TC2" group="LOC2A"/>
+                <signal pad-key="pe1" function="TC2" group="LOC2B"/>
+                <signal pad-key="pe2" function="TC2" group="LOC2C"/>
+                <signal pad-key="pe3" function="TC2" group="LOC2D"/>
+                <signal pad-key="pe4" function="TC2" group="HOC2A"/>
+                <signal pad-key="pe5" function="TC2" group="HOC2B"/>
+                <signal pad-key="pe6" function="TC2" group="HOC2C"/>
+                <signal pad-key="pe7" function="TC2" group="HOC2D"/>
             </signals>
         </peripheral>
         <peripheral key="awexc" name="AWEXC" module-key="i6090_awex">
             <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"/>
-                <signal pad-id="pc2" function="AWEX" group="OC0BLS"/>
-                <signal pad-id="pc3" function="AWEX" group="OC0BHS"/>
-                <signal pad-id="pc4" function="AWEX" group="OC0CLS"/>
-                <signal pad-id="pc5" function="AWEX" group="OC0CHS"/>
-                <signal pad-id="pc6" function="AWEX" group="OC0DLS"/>
-                <signal pad-id="pc7" function="AWEX" group="OC0DHS"/>
+                <signal pad-key="pc0" function="AWEX" group="OC0ALS"/>
+                <signal pad-key="pc1" function="AWEX" group="OC0AHS"/>
+                <signal pad-key="pc2" function="AWEX" group="OC0BLS"/>
+                <signal pad-key="pc3" function="AWEX" group="OC0BHS"/>
+                <signal pad-key="pc4" function="AWEX" group="OC0CLS"/>
+                <signal pad-key="pc5" function="AWEX" group="OC0CHS"/>
+                <signal pad-key="pc6" function="AWEX" group="OC0DLS"/>
+                <signal pad-key="pc7" function="AWEX" group="OC0DHS"/>
             </signals>
         </peripheral>
         <peripheral key="hiresc" name="HIRESC" module-key="i6090_hires">
@@ -411,36 +407,36 @@
         <peripheral key="usartc0" name="USARTC0" module-key="i6090_usart">
             <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"/>
-                <signal pad-id="pc3" function="USART" group="TXD" field="USART0"/>
-                <signal pad-id="pc5" function="USART_ALT" group="XCK" field="USART0"/>
-                <signal pad-id="pc6" function="USART_ALT" group="RXD" field="USART0"/>
-                <signal pad-id="pc7" function="USART_ALT" group="TXD" field="USART0"/>
+                <signal pad-key="pc1" function="USART" group="XCK" field="USART0"/>
+                <signal pad-key="pc2" function="USART" group="RXD" field="USART0"/>
+                <signal pad-key="pc3" function="USART" group="TXD" field="USART0"/>
+                <signal pad-key="pc5" function="USART_ALT" group="XCK" field="USART0"/>
+                <signal pad-key="pc6" function="USART_ALT" group="RXD" field="USART0"/>
+                <signal pad-key="pc7" function="USART_ALT" group="TXD" field="USART0"/>
             </signals>
         </peripheral>
         <peripheral key="usarte0" name="USARTE0" module-key="i6090_usart">
             <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"/>
-                <signal pad-id="pe3" function="USART" group="TXD" field="USART0"/>
-                <signal pad-id="pe5" function="USART_ALT" group="XCK" field="USART0"/>
-                <signal pad-id="pe6" function="USART_ALT" group="RXD" field="USART0"/>
-                <signal pad-id="pe7" function="USART_ALT" group="TXD" field="USART0"/>
+                <signal pad-key="pe1" function="USART" group="XCK" field="USART0"/>
+                <signal pad-key="pe2" function="USART" group="RXD" field="USART0"/>
+                <signal pad-key="pe3" function="USART" group="TXD" field="USART0"/>
+                <signal pad-key="pe5" function="USART_ALT" group="XCK" field="USART0"/>
+                <signal pad-key="pe6" function="USART_ALT" group="RXD" field="USART0"/>
+                <signal pad-key="pe7" function="USART_ALT" group="TXD" field="USART0"/>
             </signals>
         </peripheral>
         <peripheral key="spic" name="SPIC" module-key="i6090_spi">
             <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"/>
-                <signal pad-id="pc6" function="SPI" group="MISO" field="SPI"/>
-                <signal pad-id="pc7" function="SPI" group="SCK" field="SPI"/>
-                <signal pad-id="pc4" function="SPI_ALT" group="SS" field="SPI"/>
-                <signal pad-id="pc5" function="SPI_ALT" group="SCK" field="SPI"/>
-                <signal pad-id="pc6" function="SPI_ALT" group="MISO" field="SPI"/>
-                <signal pad-id="pc7" function="SPI_ALT" group="MOSI" field="SPI"/>
+                <signal pad-key="pc4" function="SPI" group="SS" field="SPI"/>
+                <signal pad-key="pc5" function="SPI" group="MOSI" field="SPI"/>
+                <signal pad-key="pc6" function="SPI" group="MISO" field="SPI"/>
+                <signal pad-key="pc7" function="SPI" group="SCK" field="SPI"/>
+                <signal pad-key="pc4" function="SPI_ALT" group="SS" field="SPI"/>
+                <signal pad-key="pc5" function="SPI_ALT" group="SCK" field="SPI"/>
+                <signal pad-key="pc6" function="SPI_ALT" group="MISO" field="SPI"/>
+                <signal pad-key="pc7" function="SPI_ALT" group="MOSI" field="SPI"/>
             </signals>
         </peripheral>
         <peripheral key="ircom" name="IRCOM" module-key="i6090_ircom">
@@ -449,61 +445,61 @@
         <peripheral key="lcd" name="LCD" module-key="i3003">
             <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"/>
-                <signal pad-id="pg2" index="37" function="LCD_SEG" group="SEG"/>
-                <signal pad-id="pg3" index="36" function="LCD_SEG" group="SEG"/>
-                <signal pad-id="pg4" index="35" function="LCD_SEG" group="SEG"/>
-                <signal pad-id="pg5" index="34" function="LCD_SEG" group="SEG"/>
-                <signal pad-id="pg6" index="33" function="LCD_SEG" group="SEG"/>
-                <signal pad-id="pg7" index="32" function="LCD_SEG" group="SEG"/>
-                <signal pad-id="pm0" index="31" function="LCD_SEG" group="SEG"/>
-                <signal pad-id="pm1" index="30" function="LCD_SEG" group="SEG"/>
-                <signal pad-id="pm2" index="29" function="LCD_SEG" group="SEG"/>
-                <signal pad-id="pm3" index="28" function="LCD_SEG" group="SEG"/>
-                <signal pad-id="pm4" index="27" function="LCD_SEG" group="SEG"/>
-                <signal pad-id="pm5" index="26" function="LCD_SEG" group="SEG"/>
-                <signal pad-id="pm6" index="25" function="LCD_SEG" group="SEG"/>
-                <signal pad-id="pm7" index="24" function="LCD_SEG" group="SEG"/>
-                <signal pad-id="seg23" index="23" function="LCD_SEG" group="SEG"/>
-                <signal pad-id="seg22" index="22" function="LCD_SEG" group="SEG"/>
-                <signal pad-id="seg21" index="21" function="LCD_SEG" group="SEG"/>
-                <signal pad-id="seg20" index="20" function="LCD_SEG" group="SEG"/>
-                <signal pad-id="seg19" index="19" function="LCD_SEG" group="SEG"/>
-                <signal pad-id="seg18" index="18" function="LCD_SEG" group="SEG"/>
-                <signal pad-id="seg17" index="17" function="LCD_SEG" group="SEG"/>
-                <signal pad-id="seg16" index="16" function="LCD_SEG" group="SEG"/>
-                <signal pad-id="seg15" index="15" function="LCD_SEG" group="SEG"/>
-                <signal pad-id="seg14" index="14" function="LCD_SEG" group="SEG"/>
-                <signal pad-id="seg13" index="13" function="LCD_SEG" group="SEG"/>
-                <signal pad-id="seg12" index="12" function="LCD_SEG" group="SEG"/>
-                <signal pad-id="seg11" index="11" function="LCD_SEG" group="SEG"/>
-                <signal pad-id="seg10" index="10" function="LCD_SEG" group="SEG"/>
-                <signal pad-id="seg9" index="9" function="LCD_SEG" group="SEG"/>
-                <signal pad-id="seg8" index="8" function="LCD_SEG" group="SEG"/>
-                <signal pad-id="seg7" index="7" function="LCD_SEG" group="SEG"/>
-                <signal pad-id="seg6" index="6" function="LCD_SEG" group="SEG"/>
-                <signal pad-id="seg5" index="5" function="LCD_SEG" group="SEG"/>
-                <signal pad-id="seg4" index="4" function="LCD_SEG" group="SEG"/>
-                <signal pad-id="seg3" index="3" function="LCD_SEG" group="SEG"/>
-                <signal pad-id="seg2" index="2" function="LCD_SEG" group="SEG"/>
-                <signal pad-id="seg1" index="1" function="LCD_SEG" group="SEG"/>
-                <signal pad-id="seg0" index="0" function="LCD_SEG" group="SEG"/>
-                <signal pad-id="seg1" index="1" function="LCD_BLINK" group="BLINK"/>
-                <signal pad-id="seg0" index="0" function="LCD_BLINK" group="BLINK"/>
-                <signal pad-id="bias1" index="1" function="LCD_BIAS" group="BIAS"/>
-                <signal pad-id="bias2" index="2" function="LCD_BIAS" group="BIAS"/>
-                <signal pad-id="vlcd" function="LCD_BIAS" group="VLCD"/>
-                <signal pad-id="capl" function="LCD_BIAS" group="CAPL"/>
-                <signal pad-id="caph" function="LCD_BIAS" group="CAPH"/>
-                <signal pad-id="com0" index="0" function="LCD_COM" group="COM"/>
-                <signal pad-id="com1" index="1" function="LCD_COM" group="COM"/>
-                <signal pad-id="com2" index="2" function="LCD_COM" group="COM"/>
-                <signal pad-id="com3" index="3" function="LCD_COM" group="COM"/>
-                <signal pad-id="com3" index="0" function="LCD_COM_SWP" group="COM"/>
-                <signal pad-id="com2" index="1" function="LCD_COM_SWP" group="COM"/>
-                <signal pad-id="com1" index="2" function="LCD_COM_SWP" group="COM"/>
-                <signal pad-id="com0" index="3" function="LCD_COM_SWP" group="COM"/>
+                <signal pad-key="pg0" index="39" function="LCD_SEG" group="SEG"/>
+                <signal pad-key="pg1" index="38" function="LCD_SEG" group="SEG"/>
+                <signal pad-key="pg2" index="37" function="LCD_SEG" group="SEG"/>
+                <signal pad-key="pg3" index="36" function="LCD_SEG" group="SEG"/>
+                <signal pad-key="pg4" index="35" function="LCD_SEG" group="SEG"/>
+                <signal pad-key="pg5" index="34" function="LCD_SEG" group="SEG"/>
+                <signal pad-key="pg6" index="33" function="LCD_SEG" group="SEG"/>
+                <signal pad-key="pg7" index="32" function="LCD_SEG" group="SEG"/>
+                <signal pad-key="pm0" index="31" function="LCD_SEG" group="SEG"/>
+                <signal pad-key="pm1" index="30" function="LCD_SEG" group="SEG"/>
+                <signal pad-key="pm2" index="29" function="LCD_SEG" group="SEG"/>
+                <signal pad-key="pm3" index="28" function="LCD_SEG" group="SEG"/>
+                <signal pad-key="pm4" index="27" function="LCD_SEG" group="SEG"/>
+                <signal pad-key="pm5" index="26" function="LCD_SEG" group="SEG"/>
+                <signal pad-key="pm6" index="25" function="LCD_SEG" group="SEG"/>
+                <signal pad-key="pm7" index="24" function="LCD_SEG" group="SEG"/>
+                <signal pad-key="seg23" index="23" function="LCD_SEG" group="SEG"/>
+                <signal pad-key="seg22" index="22" function="LCD_SEG" group="SEG"/>
+                <signal pad-key="seg21" index="21" function="LCD_SEG" group="SEG"/>
+                <signal pad-key="seg20" index="20" function="LCD_SEG" group="SEG"/>
+                <signal pad-key="seg19" index="19" function="LCD_SEG" group="SEG"/>
+                <signal pad-key="seg18" index="18" function="LCD_SEG" group="SEG"/>
+                <signal pad-key="seg17" index="17" function="LCD_SEG" group="SEG"/>
+                <signal pad-key="seg16" index="16" function="LCD_SEG" group="SEG"/>
+                <signal pad-key="seg15" index="15" function="LCD_SEG" group="SEG"/>
+                <signal pad-key="seg14" index="14" function="LCD_SEG" group="SEG"/>
+                <signal pad-key="seg13" index="13" function="LCD_SEG" group="SEG"/>
+                <signal pad-key="seg12" index="12" function="LCD_SEG" group="SEG"/>
+                <signal pad-key="seg11" index="11" function="LCD_SEG" group="SEG"/>
+                <signal pad-key="seg10" index="10" function="LCD_SEG" group="SEG"/>
+                <signal pad-key="seg9" index="9" function="LCD_SEG" group="SEG"/>
+                <signal pad-key="seg8" index="8" function="LCD_SEG" group="SEG"/>
+                <signal pad-key="seg7" index="7" function="LCD_SEG" group="SEG"/>
+                <signal pad-key="seg6" index="6" function="LCD_SEG" group="SEG"/>
+                <signal pad-key="seg5" index="5" function="LCD_SEG" group="SEG"/>
+                <signal pad-key="seg4" index="4" function="LCD_SEG" group="SEG"/>
+                <signal pad-key="seg3" index="3" function="LCD_SEG" group="SEG"/>
+                <signal pad-key="seg2" index="2" function="LCD_SEG" group="SEG"/>
+                <signal pad-key="seg1" index="1" function="LCD_SEG" group="SEG"/>
+                <signal pad-key="seg0" index="0" function="LCD_SEG" group="SEG"/>
+                <signal pad-key="seg1" index="1" function="LCD_BLINK" group="BLINK"/>
+                <signal pad-key="seg0" index="0" function="LCD_BLINK" group="BLINK"/>
+                <signal pad-key="bias1" index="1" function="LCD_BIAS" group="BIAS"/>
+                <signal pad-key="bias2" index="2" function="LCD_BIAS" group="BIAS"/>
+                <signal pad-key="vlcd" function="LCD_BIAS" group="VLCD"/>
+                <signal pad-key="capl" function="LCD_BIAS" group="CAPL"/>
+                <signal pad-key="caph" function="LCD_BIAS" group="CAPH"/>
+                <signal pad-key="com0" index="0" function="LCD_COM" group="COM"/>
+                <signal pad-key="com1" index="1" function="LCD_COM" group="COM"/>
+                <signal pad-key="com2" index="2" function="LCD_COM" group="COM"/>
+                <signal pad-key="com3" index="3" function="LCD_COM" group="COM"/>
+                <signal pad-key="com3" index="0" function="LCD_COM_SWP" group="COM"/>
+                <signal pad-key="com2" index="1" function="LCD_COM_SWP" group="COM"/>
+                <signal pad-key="com1" index="2" function="LCD_COM_SWP" group="COM"/>
+                <signal pad-key="com0" index="3" function="LCD_COM_SWP" group="COM"/>
             </signals>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="i6570_fuse">
@@ -1799,214 +1795,308 @@
             </register-group>
         </module>
     </modules>
+    <pads>
+        <pad key="gnd" name="GND"/>
+        <pad key="pc0" name="PC0"/>
+        <pad key="pc1" name="PC1"/>
+        <pad key="pc2" name="PC2"/>
+        <pad key="pc3" name="PC3"/>
+        <pad key="pc4" name="PC4"/>
+        <pad key="pc5" name="PC5"/>
+        <pad key="pc6" name="PC6"/>
+        <pad key="pc7" name="PC7"/>
+        <pad key="vcc" name="VCC"/>
+        <pad key="pd0" name="PD0"/>
+        <pad key="pd1" name="PD1"/>
+        <pad key="pd2" name="PD2"/>
+        <pad key="reset" name="RESET"/>
+        <pad key="pdi" name="PDI"/>
+        <pad key="pe0" name="PE0"/>
+        <pad key="pe1" name="PE1"/>
+        <pad key="pe2" name="PE2"/>
+        <pad key="pe3" name="PE3"/>
+        <pad key="pe4" name="PE4"/>
+        <pad key="pe5" name="PE5"/>
+        <pad key="pe6" name="PE6"/>
+        <pad key="pe7" name="PE7"/>
+        <pad key="pg0" name="PG0"/>
+        <pad key="pg1" name="PG1"/>
+        <pad key="pg2" name="PG2"/>
+        <pad key="pg3" name="PG3"/>
+        <pad key="pg4" name="PG4"/>
+        <pad key="pg5" name="PG5"/>
+        <pad key="pg6" name="PG6"/>
+        <pad key="pg7" name="PG7"/>
+        <pad key="pm0" name="PM0"/>
+        <pad key="pm1" name="PM1"/>
+        <pad key="pm2" name="PM2"/>
+        <pad key="pm3" name="PM3"/>
+        <pad key="pm4" name="PM4"/>
+        <pad key="pm5" name="PM5"/>
+        <pad key="pm6" name="PM6"/>
+        <pad key="pm7" name="PM7"/>
+        <pad key="seg23" name="SEG23"/>
+        <pad key="seg22" name="SEG22"/>
+        <pad key="seg21" name="SEG21"/>
+        <pad key="seg20" name="SEG20"/>
+        <pad key="seg19" name="SEG19"/>
+        <pad key="seg18" name="SEG18"/>
+        <pad key="seg17" name="SEG17"/>
+        <pad key="seg16" name="SEG16"/>
+        <pad key="seg15" name="SEG15"/>
+        <pad key="seg14" name="SEG14"/>
+        <pad key="seg13" name="SEG13"/>
+        <pad key="seg12" name="SEG12"/>
+        <pad key="seg11" name="SEG11"/>
+        <pad key="seg10" name="SEG10"/>
+        <pad key="seg9" name="SEG9"/>
+        <pad key="seg8" name="SEG8"/>
+        <pad key="seg7" name="SEG7"/>
+        <pad key="seg6" name="SEG6"/>
+        <pad key="seg5" name="SEG5"/>
+        <pad key="seg4" name="SEG4"/>
+        <pad key="seg3" name="SEG3"/>
+        <pad key="seg2" name="SEG2"/>
+        <pad key="seg1" name="SEG1"/>
+        <pad key="seg0" name="SEG0"/>
+        <pad key="bias1" name="BIAS1"/>
+        <pad key="bias2" name="BIAS2"/>
+        <pad key="vlcd" name="VLCD"/>
+        <pad key="capl" name="CAPL"/>
+        <pad key="caph" name="CAPH"/>
+        <pad key="com0" name="COM0"/>
+        <pad key="com1" name="COM1"/>
+        <pad key="com2" name="COM2"/>
+        <pad key="com3" name="COM3"/>
+        <pad key="pr0" name="PR0"/>
+        <pad key="pr1" name="PR1"/>
+        <pad key="pa0" name="PA0"/>
+        <pad key="pa1" name="PA1"/>
+        <pad key="pa2" name="PA2"/>
+        <pad key="pa3" name="PA3"/>
+        <pad key="pa4" name="PA4"/>
+        <pad key="pa5" name="PA5"/>
+        <pad key="pa6" name="PA6"/>
+        <pad key="pa7" name="PA7"/>
+        <pad key="agnd" name="AGND"/>
+        <pad key="avcc" name="AVCC"/>
+        <pad key="pb0" name="PB0"/>
+        <pad key="pb1" name="PB1"/>
+        <pad key="pb2" name="PB2"/>
+        <pad key="pb3" name="PB3"/>
+        <pad key="pb4" name="PB4"/>
+        <pad key="pb5" name="PB5"/>
+        <pad key="pb6" name="PB6"/>
+        <pad key="pb7" name="PB7"/>
+    </pads>
     <pinouts>
         <pinout key="qfp_100" name="QFP_100" type="qfp">
-            <pin position="1" pad="GND"/>
-            <pin position="2" pad="PC0"/>
-            <pin position="3" pad="PC1"/>
-            <pin position="4" pad="PC2"/>
-            <pin position="5" pad="PC3"/>
-            <pin position="6" pad="PC4"/>
-            <pin position="7" pad="PC5"/>
-            <pin position="8" pad="PC6"/>
-            <pin position="9" pad="PC7"/>
-            <pin position="10" pad="GND"/>
-            <pin position="11" pad="VCC"/>
-            <pin position="12" pad="PD0"/>
-            <pin position="13" pad="PD1"/>
-            <pin position="14" pad="PD2"/>
-            <pin position="15" pad="RESET"/>
-            <pin position="16" pad="PDI"/>
-            <pin position="17" pad="GND"/>
-            <pin position="18" pad="VCC"/>
-            <pin position="19" pad="PE0"/>
-            <pin position="20" pad="PE1"/>
-            <pin position="21" pad="PE2"/>
-            <pin position="22" pad="PE3"/>
-            <pin position="23" pad="PE4"/>
-            <pin position="24" pad="PE5"/>
-            <pin position="25" pad="PE6"/>
-            <pin position="26" pad="PE7"/>
-            <pin position="27" pad="GND"/>
-            <pin position="28" pad="VCC"/>
-            <pin position="29" pad="PG0"/>
-            <pin position="30" pad="PG1"/>
-            <pin position="31" pad="PG2"/>
-            <pin position="32" pad="PG3"/>
-            <pin position="33" pad="PG4"/>
-            <pin position="34" pad="PG5"/>
-            <pin position="35" pad="PG6"/>
-            <pin position="36" pad="PG7"/>
-            <pin position="37" pad="PM0"/>
-            <pin position="38" pad="PM1"/>
-            <pin position="39" pad="PM2"/>
-            <pin position="40" pad="PM3"/>
-            <pin position="41" pad="PM4"/>
-            <pin position="42" pad="PM5"/>
-            <pin position="43" pad="PM6"/>
-            <pin position="44" pad="PM7"/>
-            <pin position="45" pad="SEG23"/>
-            <pin position="46" pad="SEG22"/>
-            <pin position="47" pad="SEG21"/>
-            <pin position="48" pad="SEG20"/>
-            <pin position="49" pad="SEG19"/>
-            <pin position="50" pad="SEG18"/>
-            <pin position="51" pad="SEG17"/>
-            <pin position="52" pad="SEG16"/>
-            <pin position="53" pad="SEG15"/>
-            <pin position="54" pad="SEG14"/>
-            <pin position="55" pad="SEG13"/>
-            <pin position="56" pad="SEG12"/>
-            <pin position="57" pad="SEG11"/>
-            <pin position="58" pad="SEG10"/>
-            <pin position="59" pad="SEG9"/>
-            <pin position="60" pad="SEG8"/>
-            <pin position="61" pad="SEG7"/>
-            <pin position="62" pad="SEG6"/>
-            <pin position="63" pad="SEG5"/>
-            <pin position="64" pad="SEG4"/>
-            <pin position="65" pad="SEG3"/>
-            <pin position="66" pad="SEG2"/>
-            <pin position="67" pad="SEG1"/>
-            <pin position="68" pad="SEG0"/>
-            <pin position="69" pad="GND"/>
-            <pin position="70" pad="VCC"/>
-            <pin position="71" pad="BIAS1"/>
-            <pin position="72" pad="BIAS2"/>
-            <pin position="73" pad="VLCD"/>
-            <pin position="74" pad="CAPL"/>
-            <pin position="75" pad="CAPH"/>
-            <pin position="76" pad="COM0"/>
-            <pin position="77" pad="COM1"/>
-            <pin position="78" pad="COM2"/>
-            <pin position="79" pad="COM3"/>
-            <pin position="80" pad="PR0"/>
-            <pin position="81" pad="PR1"/>
-            <pin position="82" pad="PA0"/>
-            <pin position="83" pad="PA1"/>
-            <pin position="84" pad="PA2"/>
-            <pin position="85" pad="PA3"/>
-            <pin position="86" pad="PA4"/>
-            <pin position="87" pad="PA5"/>
-            <pin position="88" pad="PA6"/>
-            <pin position="89" pad="PA7"/>
-            <pin position="90" pad="AGND"/>
-            <pin position="91" pad="AVCC"/>
-            <pin position="92" pad="PB0"/>
-            <pin position="93" pad="PB1"/>
-            <pin position="94" pad="PB2"/>
-            <pin position="95" pad="PB3"/>
-            <pin position="96" pad="PB4"/>
-            <pin position="97" pad="PB5"/>
-            <pin position="98" pad="PB6"/>
-            <pin position="99" pad="PB7"/>
-            <pin position="100" pad="GND"/>
+            <pin position="1" pad-key="gnd"/>
+            <pin position="2" pad-key="pc0"/>
+            <pin position="3" pad-key="pc1"/>
+            <pin position="4" pad-key="pc2"/>
+            <pin position="5" pad-key="pc3"/>
+            <pin position="6" pad-key="pc4"/>
+            <pin position="7" pad-key="pc5"/>
+            <pin position="8" pad-key="pc6"/>
+            <pin position="9" pad-key="pc7"/>
+            <pin position="10" pad-key="gnd"/>
+            <pin position="11" pad-key="vcc"/>
+            <pin position="12" pad-key="pd0"/>
+            <pin position="13" pad-key="pd1"/>
+            <pin position="14" pad-key="pd2"/>
+            <pin position="15" pad-key="reset"/>
+            <pin position="16" pad-key="pdi"/>
+            <pin position="17" pad-key="gnd"/>
+            <pin position="18" pad-key="vcc"/>
+            <pin position="19" pad-key="pe0"/>
+            <pin position="20" pad-key="pe1"/>
+            <pin position="21" pad-key="pe2"/>
+            <pin position="22" pad-key="pe3"/>
+            <pin position="23" pad-key="pe4"/>
+            <pin position="24" pad-key="pe5"/>
+            <pin position="25" pad-key="pe6"/>
+            <pin position="26" pad-key="pe7"/>
+            <pin position="27" pad-key="gnd"/>
+            <pin position="28" pad-key="vcc"/>
+            <pin position="29" pad-key="pg0"/>
+            <pin position="30" pad-key="pg1"/>
+            <pin position="31" pad-key="pg2"/>
+            <pin position="32" pad-key="pg3"/>
+            <pin position="33" pad-key="pg4"/>
+            <pin position="34" pad-key="pg5"/>
+            <pin position="35" pad-key="pg6"/>
+            <pin position="36" pad-key="pg7"/>
+            <pin position="37" pad-key="pm0"/>
+            <pin position="38" pad-key="pm1"/>
+            <pin position="39" pad-key="pm2"/>
+            <pin position="40" pad-key="pm3"/>
+            <pin position="41" pad-key="pm4"/>
+            <pin position="42" pad-key="pm5"/>
+            <pin position="43" pad-key="pm6"/>
+            <pin position="44" pad-key="pm7"/>
+            <pin position="45" pad-key="seg23"/>
+            <pin position="46" pad-key="seg22"/>
+            <pin position="47" pad-key="seg21"/>
+            <pin position="48" pad-key="seg20"/>
+            <pin position="49" pad-key="seg19"/>
+            <pin position="50" pad-key="seg18"/>
+            <pin position="51" pad-key="seg17"/>
+            <pin position="52" pad-key="seg16"/>
+            <pin position="53" pad-key="seg15"/>
+            <pin position="54" pad-key="seg14"/>
+            <pin position="55" pad-key="seg13"/>
+            <pin position="56" pad-key="seg12"/>
+            <pin position="57" pad-key="seg11"/>
+            <pin position="58" pad-key="seg10"/>
+            <pin position="59" pad-key="seg9"/>
+            <pin position="60" pad-key="seg8"/>
+            <pin position="61" pad-key="seg7"/>
+            <pin position="62" pad-key="seg6"/>
+            <pin position="63" pad-key="seg5"/>
+            <pin position="64" pad-key="seg4"/>
+            <pin position="65" pad-key="seg3"/>
+            <pin position="66" pad-key="seg2"/>
+            <pin position="67" pad-key="seg1"/>
+            <pin position="68" pad-key="seg0"/>
+            <pin position="69" pad-key="gnd"/>
+            <pin position="70" pad-key="vcc"/>
+            <pin position="71" pad-key="bias1"/>
+            <pin position="72" pad-key="bias2"/>
+            <pin position="73" pad-key="vlcd"/>
+            <pin position="74" pad-key="capl"/>
+            <pin position="75" pad-key="caph"/>
+            <pin position="76" pad-key="com0"/>
+            <pin position="77" pad-key="com1"/>
+            <pin position="78" pad-key="com2"/>
+            <pin position="79" pad-key="com3"/>
+            <pin position="80" pad-key="pr0"/>
+            <pin position="81" pad-key="pr1"/>
+            <pin position="82" pad-key="pa0"/>
+            <pin position="83" pad-key="pa1"/>
+            <pin position="84" pad-key="pa2"/>
+            <pin position="85" pad-key="pa3"/>
+            <pin position="86" pad-key="pa4"/>
+            <pin position="87" pad-key="pa5"/>
+            <pin position="88" pad-key="pa6"/>
+            <pin position="89" pad-key="pa7"/>
+            <pin position="90" pad-key="agnd"/>
+            <pin position="91" pad-key="avcc"/>
+            <pin position="92" pad-key="pb0"/>
+            <pin position="93" pad-key="pb1"/>
+            <pin position="94" pad-key="pb2"/>
+            <pin position="95" pad-key="pb3"/>
+            <pin position="96" pad-key="pb4"/>
+            <pin position="97" pad-key="pb5"/>
+            <pin position="98" pad-key="pb6"/>
+            <pin position="99" pad-key="pb7"/>
+            <pin position="100" pad-key="gnd"/>
         </pinout>
         <pinout key="bga_100" name="BGA_100" type="bga">
-            <pin position="A1" pad="PC0"/>
-            <pin position="A2" pad="VCC"/>
-            <pin position="A3" pad="PB6"/>
-            <pin position="A4" pad="PB2"/>
-            <pin position="A5" pad="AVCC"/>
-            <pin position="A6" pad="PA5"/>
-            <pin position="A7" pad="PA1"/>
-            <pin position="A8" pad="PR1"/>
-            <pin position="A9" pad="COM2"/>
-            <pin position="A10" pad="CAPH"/>
-            <pin position="B1" pad="PC3"/>
-            <pin position="B2" pad="GND"/>
-            <pin position="B3" pad="PB7"/>
-            <pin position="B4" pad="PB4"/>
-            <pin position="B5" pad="AGND"/>
-            <pin position="B6" pad="PA4"/>
-            <pin position="B7" pad="PA0"/>
-            <pin position="B8" pad="PR0"/>
-            <pin position="B9" pad="COM1"/>
-            <pin position="B10" pad="CAPL"/>
-            <pin position="C1" pad="PC5"/>
-            <pin position="C2" pad="PC4"/>
-            <pin position="C3" pad="PC1"/>
-            <pin position="C4" pad="PB5"/>
-            <pin position="C5" pad="PA7"/>
-            <pin position="C6" pad="PA3"/>
-            <pin position="C7" pad="COM3"/>
-            <pin position="C8" pad="COM0"/>
-            <pin position="C9" pad="BIAS2"/>
-            <pin position="C10" pad="BIAS1"/>
-            <pin position="D1" pad="VCC"/>
-            <pin position="D2" pad="GND"/>
-            <pin position="D3" pad="PD0"/>
-            <pin position="D4" pad="PC2"/>
-            <pin position="D5" pad="PB0"/>
-            <pin position="D6" pad="PA6"/>
-            <pin position="D7" pad="SEG0"/>
-            <pin position="D8" pad="VLCD"/>
-            <pin position="D9" pad="GND"/>
-            <pin position="D10" pad="VCC"/>
-            <pin position="E1" pad="PD2"/>
-            <pin position="E2" pad="RESET"/>
-            <pin position="E3" pad="PD1"/>
-            <pin position="E4" pad="PC6"/>
-            <pin position="E5" pad="PB1"/>
-            <pin position="E6" pad="PA2"/>
-            <pin position="E7" pad="SEG1"/>
-            <pin position="E8" pad="SEG4"/>
-            <pin position="E9" pad="SEG3"/>
-            <pin position="E10" pad="SEG2"/>
-            <pin position="F1" pad="VCC"/>
-            <pin position="F2" pad="GND"/>
-            <pin position="F3" pad="PDI"/>
-            <pin position="F4" pad="PC7"/>
-            <pin position="F5" pad="PB3"/>
-            <pin position="F6" pad="PM2"/>
-            <pin position="F7" pad="SEG10"/>
-            <pin position="F8" pad="SEG7"/>
-            <pin position="F9" pad="SEG6"/>
-            <pin position="F10" pad="SEG5"/>
-            <pin position="G1" pad="PE2"/>
-            <pin position="G2" pad="PE1"/>
-            <pin position="G3" pad="PE3"/>
-            <pin position="G4" pad="PE0"/>
-            <pin position="G5" pad="PE4"/>
-            <pin position="G6" pad="SEG23"/>
-            <pin position="G7" pad="SEG15"/>
-            <pin position="G8" pad="SEG13"/>
-            <pin position="G9" pad="SEG9"/>
-            <pin position="G10" pad="SEG8"/>
-            <pin position="H1" pad="PE5"/>
-            <pin position="H2" pad="PE6"/>
-            <pin position="H3" pad="PG1"/>
-            <pin position="H4" pad="PG4"/>
-            <pin position="H5" pad="PG7"/>
-            <pin position="H6" pad="PM5"/>
-            <pin position="H7" pad="SEG21"/>
-            <pin position="H8" pad="SEG18"/>
-            <pin position="H9" pad="SEG12"/>
-            <pin position="H10" pad="SEG11"/>
-            <pin position="J1" pad="PE7"/>
-            <pin position="J2" pad="PG0"/>
-            <pin position="J3" pad="PG3"/>
-            <pin position="J4" pad="PG6"/>
-            <pin position="J5" pad="PM1"/>
-            <pin position="J6" pad="PM4"/>
-            <pin position="J7" pad="PM7"/>
-            <pin position="J8" pad="SEG20"/>
-            <pin position="J9" pad="SEG16"/>
-            <pin position="J10" pad="SEG14"/>
-            <pin position="K1" pad="GND"/>
-            <pin position="K2" pad="VCC"/>
-            <pin position="K3" pad="PG2"/>
-            <pin position="K4" pad="PG5"/>
-            <pin position="K5" pad="PM0"/>
-            <pin position="K6" pad="PM3"/>
-            <pin position="K7" pad="PM6"/>
-            <pin position="K8" pad="SEG22"/>
-            <pin position="K9" pad="SEG19"/>
-            <pin position="K10" pad="SEG17"/>
+            <pin position="A1" pad-key="pc0"/>
+            <pin position="A2" pad-key="vcc"/>
+            <pin position="A3" pad-key="pb6"/>
+            <pin position="A4" pad-key="pb2"/>
+            <pin position="A5" pad-key="avcc"/>
+            <pin position="A6" pad-key="pa5"/>
+            <pin position="A7" pad-key="pa1"/>
+            <pin position="A8" pad-key="pr1"/>
+            <pin position="A9" pad-key="com2"/>
+            <pin position="A10" pad-key="caph"/>
+            <pin position="B1" pad-key="pc3"/>
+            <pin position="B2" pad-key="gnd"/>
+            <pin position="B3" pad-key="pb7"/>
+            <pin position="B4" pad-key="pb4"/>
+            <pin position="B5" pad-key="agnd"/>
+            <pin position="B6" pad-key="pa4"/>
+            <pin position="B7" pad-key="pa0"/>
+            <pin position="B8" pad-key="pr0"/>
+            <pin position="B9" pad-key="com1"/>
+            <pin position="B10" pad-key="capl"/>
+            <pin position="C1" pad-key="pc5"/>
+            <pin position="C2" pad-key="pc4"/>
+            <pin position="C3" pad-key="pc1"/>
+            <pin position="C4" pad-key="pb5"/>
+            <pin position="C5" pad-key="pa7"/>
+            <pin position="C6" pad-key="pa3"/>
+            <pin position="C7" pad-key="com3"/>
+            <pin position="C8" pad-key="com0"/>
+            <pin position="C9" pad-key="bias2"/>
+            <pin position="C10" pad-key="bias1"/>
+            <pin position="D1" pad-key="vcc"/>
+            <pin position="D2" pad-key="gnd"/>
+            <pin position="D3" pad-key="pd0"/>
+            <pin position="D4" pad-key="pc2"/>
+            <pin position="D5" pad-key="pb0"/>
+            <pin position="D6" pad-key="pa6"/>
+            <pin position="D7" pad-key="seg0"/>
+            <pin position="D8" pad-key="vlcd"/>
+            <pin position="D9" pad-key="gnd"/>
+            <pin position="D10" pad-key="vcc"/>
+            <pin position="E1" pad-key="pd2"/>
+            <pin position="E2" pad-key="reset"/>
+            <pin position="E3" pad-key="pd1"/>
+            <pin position="E4" pad-key="pc6"/>
+            <pin position="E5" pad-key="pb1"/>
+            <pin position="E6" pad-key="pa2"/>
+            <pin position="E7" pad-key="seg1"/>
+            <pin position="E8" pad-key="seg4"/>
+            <pin position="E9" pad-key="seg3"/>
+            <pin position="E10" pad-key="seg2"/>
+            <pin position="F1" pad-key="vcc"/>
+            <pin position="F2" pad-key="gnd"/>
+            <pin position="F3" pad-key="pdi"/>
+            <pin position="F4" pad-key="pc7"/>
+            <pin position="F5" pad-key="pb3"/>
+            <pin position="F6" pad-key="pm2"/>
+            <pin position="F7" pad-key="seg10"/>
+            <pin position="F8" pad-key="seg7"/>
+            <pin position="F9" pad-key="seg6"/>
+            <pin position="F10" pad-key="seg5"/>
+            <pin position="G1" pad-key="pe2"/>
+            <pin position="G2" pad-key="pe1"/>
+            <pin position="G3" pad-key="pe3"/>
+            <pin position="G4" pad-key="pe0"/>
+            <pin position="G5" pad-key="pe4"/>
+            <pin position="G6" pad-key="seg23"/>
+            <pin position="G7" pad-key="seg15"/>
+            <pin position="G8" pad-key="seg13"/>
+            <pin position="G9" pad-key="seg9"/>
+            <pin position="G10" pad-key="seg8"/>
+            <pin position="H1" pad-key="pe5"/>
+            <pin position="H2" pad-key="pe6"/>
+            <pin position="H3" pad-key="pg1"/>
+            <pin position="H4" pad-key="pg4"/>
+            <pin position="H5" pad-key="pg7"/>
+            <pin position="H6" pad-key="pm5"/>
+            <pin position="H7" pad-key="seg21"/>
+            <pin position="H8" pad-key="seg18"/>
+            <pin position="H9" pad-key="seg12"/>
+            <pin position="H10" pad-key="seg11"/>
+            <pin position="J1" pad-key="pe7"/>
+            <pin position="J2" pad-key="pg0"/>
+            <pin position="J3" pad-key="pg3"/>
+            <pin position="J4" pad-key="pg6"/>
+            <pin position="J5" pad-key="pm1"/>
+            <pin position="J6" pad-key="pm4"/>
+            <pin position="J7" pad-key="pm7"/>
+            <pin position="J8" pad-key="seg20"/>
+            <pin position="J9" pad-key="seg16"/>
+            <pin position="J10" pad-key="seg14"/>
+            <pin position="K1" pad-key="gnd"/>
+            <pin position="K2" pad-key="vcc"/>
+            <pin position="K3" pad-key="pg2"/>
+            <pin position="K4" pad-key="pg5"/>
+            <pin position="K5" pad-key="pm0"/>
+            <pin position="K6" pad-key="pm3"/>
+            <pin position="K7" pad-key="pm6"/>
+            <pin position="K8" pad-key="seg22"/>
+            <pin position="K9" pad-key="seg19"/>
+            <pin position="K10" pad-key="seg17"/>
         </pinout>
     </pinouts>
     <variants>
-        <variant name="ATxmega64B1-AU" pinout-key="qfp_100" package="TQFP100"/>
-        <variant name="ATxmega64B1-CU" pinout-key="bga_100" package="VFBGA100"/>
+        <variant key="atxmega64b1_au" name="ATxmega64B1-AU" pinout-key="qfp_100"/>
+        <variant key="atxmega64b1_cu" name="ATxmega64B1-CU" pinout-key="bga_100"/>
     </variants>
 </device>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA64B3.xml b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA64B3.xml
index 332f094e..b14ba8af 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA64B3.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA64B3.xml
@@ -85,14 +85,14 @@
         <peripheral key="clk" name="CLK" module-key="i6073">
             <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"/>
-                <signal pad-id="pc2" index="2" function="EXTERNAL_CLOCK" group="EXTCLK"/>
-                <signal pad-id="pc3" index="3" function="EXTERNAL_CLOCK" group="EXTCLK"/>
-                <signal pad-id="pc4" index="4" function="EXTERNAL_CLOCK" group="EXTCLK"/>
-                <signal pad-id="pc5" index="5" function="EXTERNAL_CLOCK" group="EXTCLK"/>
-                <signal pad-id="pc6" index="6" function="EXTERNAL_CLOCK" group="EXTCLK"/>
-                <signal pad-id="pc7" index="7" function="EXTERNAL_CLOCK" group="EXTCLK"/>
+                <signal pad-key="pc0" index="0" function="EXTERNAL_CLOCK" group="EXTCLK"/>
+                <signal pad-key="pc1" index="1" function="EXTERNAL_CLOCK" group="EXTCLK"/>
+                <signal pad-key="pc2" index="2" function="EXTERNAL_CLOCK" group="EXTCLK"/>
+                <signal pad-key="pc3" index="3" function="EXTERNAL_CLOCK" group="EXTCLK"/>
+                <signal pad-key="pc4" index="4" function="EXTERNAL_CLOCK" group="EXTCLK"/>
+                <signal pad-key="pc5" index="5" function="EXTERNAL_CLOCK" group="EXTCLK"/>
+                <signal pad-key="pc6" index="6" function="EXTERNAL_CLOCK" group="EXTCLK"/>
+                <signal pad-key="pc7" index="7" function="EXTERNAL_CLOCK" group="EXTCLK"/>
             </signals>
         </peripheral>
         <peripheral key="sleep" name="SLEEP" module-key="i6081">
@@ -101,10 +101,10 @@
         <peripheral key="osc" name="OSC" module-key="i6079">
             <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"/>
-                <signal pad-id="pr0" function="TOSC" group="TOSC2"/>
-                <signal pad-id="pr1" function="TOSC" group="TOSC1"/>
+                <signal pad-key="pr0" function="XTAL" group="XTAL2"/>
+                <signal pad-key="pr1" function="XTAL" group="XTAL1"/>
+                <signal pad-key="pr0" function="TOSC" group="TOSC2"/>
+                <signal pad-key="pr1" function="TOSC" group="TOSC1"/>
             </signals>
         </peripheral>
         <peripheral key="dfllrc32m" name="DFLLRC32M" module-key="i6055">
@@ -130,11 +130,6 @@
         </peripheral>
         <peripheral key="portcfg" name="PORTCFG" module-key="i6075_portcfg">
             <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"/>
-                <signal pad-id="pd6" function="RTCOUTC" group="RTCOUT" field="RTCOUT"/>
-            </signals>
         </peripheral>
         <peripheral key="aes" name="AES" module-key="i6096">
             <register-group-instance register-group-key="aes" address-space-key="data" offset="0xC0"/>
@@ -154,30 +149,30 @@
         <peripheral key="adcb" name="ADCB" module-key="i6110">
             <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"/>
-                <signal pad-id="pb2" index="2" function="ADC" group="ADC"/>
-                <signal pad-id="pb3" index="3" function="ADC" group="ADC"/>
-                <signal pad-id="pb4" index="4" function="ADC" group="ADC"/>
-                <signal pad-id="pb5" index="5" function="ADC" group="ADC"/>
-                <signal pad-id="pb6" index="6" function="ADC" group="ADC"/>
-                <signal pad-id="pb7" index="7" function="ADC" group="ADC"/>
-                <signal pad-id="pb0" index="0" function="AREF" group="REFB"/>
+                <signal pad-key="pb0" index="0" function="ADC" group="ADC"/>
+                <signal pad-key="pb1" index="1" function="ADC" group="ADC"/>
+                <signal pad-key="pb2" index="2" function="ADC" group="ADC"/>
+                <signal pad-key="pb3" index="3" function="ADC" group="ADC"/>
+                <signal pad-key="pb4" index="4" function="ADC" group="ADC"/>
+                <signal pad-key="pb5" index="5" function="ADC" group="ADC"/>
+                <signal pad-key="pb6" index="6" function="ADC" group="ADC"/>
+                <signal pad-key="pb7" index="7" function="ADC" group="ADC"/>
+                <signal pad-key="pb0" index="0" function="AREF" group="REFB"/>
             </signals>
         </peripheral>
         <peripheral key="acb" name="ACB" module-key="i6077">
             <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"/>
-                <signal pad-id="pb2" index="2" function="AC" group="AC"/>
-                <signal pad-id="pb3" index="3" function="AC" group="AC"/>
-                <signal pad-id="pb4" index="4" function="AC" group="AC"/>
-                <signal pad-id="pb5" index="5" function="AC" group="AC"/>
-                <signal pad-id="pb6" index="6" function="AC" group="AC"/>
-                <signal pad-id="pb7" index="7" function="AC" group="AC"/>
-                <signal pad-id="pb6" index="1" function="ACOUT" group="ACOUT"/>
-                <signal pad-id="pb7" index="0" function="ACOUT" group="ACOUT"/>
+                <signal pad-key="pb0" index="0" function="AC" group="AC"/>
+                <signal pad-key="pb1" index="1" function="AC" group="AC"/>
+                <signal pad-key="pb2" index="2" function="AC" group="AC"/>
+                <signal pad-key="pb3" index="3" function="AC" group="AC"/>
+                <signal pad-key="pb4" index="4" function="AC" group="AC"/>
+                <signal pad-key="pb5" index="5" function="AC" group="AC"/>
+                <signal pad-key="pb6" index="6" function="AC" group="AC"/>
+                <signal pad-key="pb7" index="7" function="AC" group="AC"/>
+                <signal pad-key="pb6" index="1" function="ACOUT" group="ACOUT"/>
+                <signal pad-key="pb7" index="0" function="ACOUT" group="ACOUT"/>
             </signals>
         </peripheral>
         <peripheral key="rtc" name="RTC" module-key="i6093">
@@ -186,127 +181,127 @@
         <peripheral key="twic" name="TWIC" module-key="i6089">
             <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"/>
+                <signal pad-key="pc0" function="TWI" group="SDA"/>
+                <signal pad-key="pc1" function="TWI" group="SCL"/>
             </signals>
         </peripheral>
         <peripheral key="usb" name="USB" module-key="i3005">
             <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"/>
+                <signal pad-key="pd0" function="USB" group="DN"/>
+                <signal pad-key="pd1" function="USB" group="DP"/>
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pb2" index="2" function="PORTB" group="P"/>
-                <signal pad-id="pb3" index="3" function="PORTB" group="P"/>
-                <signal pad-id="pb4" index="4" function="PORTB" group="P"/>
-                <signal pad-id="pb5" index="5" function="PORTB" group="P"/>
-                <signal pad-id="pb6" index="6" function="PORTB" group="P"/>
-                <signal pad-id="pb7" index="7" function="PORTB" group="P"/>
+                <signal pad-key="pb0" index="0" function="PORTB" group="P"/>
+                <signal pad-key="pb1" index="1" function="PORTB" group="P"/>
+                <signal pad-key="pb2" index="2" function="PORTB" group="P"/>
+                <signal pad-key="pb3" index="3" function="PORTB" group="P"/>
+                <signal pad-key="pb4" index="4" function="PORTB" group="P"/>
+                <signal pad-key="pb5" index="5" function="PORTB" group="P"/>
+                <signal pad-key="pb6" index="6" function="PORTB" group="P"/>
+                <signal pad-key="pb7" index="7" function="PORTB" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pc2" index="2" function="PORTC" group="P"/>
-                <signal pad-id="pc3" index="3" function="PORTC" group="P"/>
-                <signal pad-id="pc4" index="4" function="PORTC" group="P"/>
-                <signal pad-id="pc5" index="5" function="PORTC" group="P"/>
-                <signal pad-id="pc6" index="6" function="PORTC" group="P"/>
-                <signal pad-id="pc7" index="7" function="PORTC" group="P"/>
+                <signal pad-key="pc0" index="0" function="PORTC" group="P"/>
+                <signal pad-key="pc1" index="1" function="PORTC" group="P"/>
+                <signal pad-key="pc2" index="2" function="PORTC" group="P"/>
+                <signal pad-key="pc3" index="3" function="PORTC" group="P"/>
+                <signal pad-key="pc4" index="4" function="PORTC" group="P"/>
+                <signal pad-key="pc5" index="5" function="PORTC" group="P"/>
+                <signal pad-key="pc6" index="6" function="PORTC" group="P"/>
+                <signal pad-key="pc7" index="7" function="PORTC" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
             <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"/>
+                <signal pad-key="pd0" index="0" function="PORTD" group="P"/>
+                <signal pad-key="pd1" index="1" function="PORTD" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portg" name="PORTG" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pg2" index="2" function="PORTG" group="P"/>
-                <signal pad-id="pg3" index="3" function="PORTG" group="P"/>
-                <signal pad-id="pg4" index="4" function="PORTG" group="P"/>
-                <signal pad-id="pg5" index="5" function="PORTG" group="P"/>
-                <signal pad-id="pg6" index="6" function="PORTG" group="P"/>
-                <signal pad-id="pg7" index="7" function="PORTG" group="P"/>
+                <signal pad-key="pg0" index="0" function="PORTG" group="P"/>
+                <signal pad-key="pg1" index="1" function="PORTG" group="P"/>
+                <signal pad-key="pg2" index="2" function="PORTG" group="P"/>
+                <signal pad-key="pg3" index="3" function="PORTG" group="P"/>
+                <signal pad-key="pg4" index="4" function="PORTG" group="P"/>
+                <signal pad-key="pg5" index="5" function="PORTG" group="P"/>
+                <signal pad-key="pg6" index="6" function="PORTG" group="P"/>
+                <signal pad-key="pg7" index="7" function="PORTG" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portm" name="PORTM" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pm2" index="2" function="PORTM" group="P"/>
-                <signal pad-id="pm3" index="3" function="PORTM" group="P"/>
-                <signal pad-id="pm4" index="4" function="PORTM" group="P"/>
-                <signal pad-id="pm5" index="5" function="PORTM" group="P"/>
-                <signal pad-id="pm6" index="6" function="PORTM" group="P"/>
-                <signal pad-id="pm7" index="7" function="PORTM" group="P"/>
+                <signal pad-key="pm0" index="0" function="PORTM" group="P"/>
+                <signal pad-key="pm1" index="1" function="PORTM" group="P"/>
+                <signal pad-key="pm2" index="2" function="PORTM" group="P"/>
+                <signal pad-key="pm3" index="3" function="PORTM" group="P"/>
+                <signal pad-key="pm4" index="4" function="PORTM" group="P"/>
+                <signal pad-key="pm5" index="5" function="PORTM" group="P"/>
+                <signal pad-key="pm6" index="6" function="PORTM" group="P"/>
+                <signal pad-key="pm7" index="7" function="PORTM" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portr" name="PORTR" module-key="gpio_port">
             <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"/>
+                <signal pad-key="pr0" index="0" function="PORTR" group="P"/>
+                <signal pad-key="pr1" index="1" function="PORTR" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="tcc0" name="TCC0" module-key="i6090_tc">
             <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"/>
-                <signal pad-id="pc2" function="TC0" group="OC0C" field="TC0C"/>
-                <signal pad-id="pc3" function="TC0" group="OC0D" field="TC0D"/>
-                <signal pad-id="pc4" function="TC0_ALT" group="OC0A" field="TC0A"/>
-                <signal pad-id="pc5" function="TC0_ALT" group="OC0B" field="TC0B"/>
-                <signal pad-id="pc6" function="TC0_ALT" group="OC0C" field="TC0C"/>
-                <signal pad-id="pc7" function="TC0_ALT" group="OC0D" field="TC0D"/>
+                <signal pad-key="pc0" function="TC0" group="OC0A" field="TC0A"/>
+                <signal pad-key="pc1" function="TC0" group="OC0B" field="TC0B"/>
+                <signal pad-key="pc2" function="TC0" group="OC0C" field="TC0C"/>
+                <signal pad-key="pc3" function="TC0" group="OC0D" field="TC0D"/>
+                <signal pad-key="pc4" function="TC0_ALT" group="OC0A" field="TC0A"/>
+                <signal pad-key="pc5" function="TC0_ALT" group="OC0B" field="TC0B"/>
+                <signal pad-key="pc6" function="TC0_ALT" group="OC0C" field="TC0C"/>
+                <signal pad-key="pc7" function="TC0_ALT" group="OC0D" field="TC0D"/>
             </signals>
         </peripheral>
         <peripheral key="tcc1" name="TCC1" module-key="i6090_tc">
             <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"/>
+                <signal pad-key="pc4" function="TC1" group="OC1A"/>
+                <signal pad-key="pc5" function="TC1" group="OC1B"/>
             </signals>
         </peripheral>
         <peripheral key="tcc2" name="TCC2" module-key="i6090_tc2">
             <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"/>
-                <signal pad-id="pc2" function="TC2" group="LOC2C"/>
-                <signal pad-id="pc3" function="TC2" group="LOC2D"/>
-                <signal pad-id="pc4" function="TC2" group="HOC2A"/>
-                <signal pad-id="pc5" function="TC2" group="HOC2B"/>
-                <signal pad-id="pc6" function="TC2" group="HOC2C"/>
-                <signal pad-id="pc7" function="TC2" group="HOC2D"/>
+                <signal pad-key="pc0" function="TC2" group="LOC2A"/>
+                <signal pad-key="pc1" function="TC2" group="LOC2B"/>
+                <signal pad-key="pc2" function="TC2" group="LOC2C"/>
+                <signal pad-key="pc3" function="TC2" group="LOC2D"/>
+                <signal pad-key="pc4" function="TC2" group="HOC2A"/>
+                <signal pad-key="pc5" function="TC2" group="HOC2B"/>
+                <signal pad-key="pc6" function="TC2" group="HOC2C"/>
+                <signal pad-key="pc7" function="TC2" group="HOC2D"/>
             </signals>
         </peripheral>
         <peripheral key="awexc" name="AWEXC" module-key="i6090_awex">
             <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"/>
-                <signal pad-id="pc2" function="AWEX" group="OC0BLS"/>
-                <signal pad-id="pc3" function="AWEX" group="OC0BHS"/>
-                <signal pad-id="pc4" function="AWEX" group="OC0CLS"/>
-                <signal pad-id="pc5" function="AWEX" group="OC0CHS"/>
-                <signal pad-id="pc6" function="AWEX" group="OC0DLS"/>
-                <signal pad-id="pc7" function="AWEX" group="OC0DHS"/>
+                <signal pad-key="pc0" function="AWEX" group="OC0ALS"/>
+                <signal pad-key="pc1" function="AWEX" group="OC0AHS"/>
+                <signal pad-key="pc2" function="AWEX" group="OC0BLS"/>
+                <signal pad-key="pc3" function="AWEX" group="OC0BHS"/>
+                <signal pad-key="pc4" function="AWEX" group="OC0CLS"/>
+                <signal pad-key="pc5" function="AWEX" group="OC0CHS"/>
+                <signal pad-key="pc6" function="AWEX" group="OC0DLS"/>
+                <signal pad-key="pc7" function="AWEX" group="OC0DHS"/>
             </signals>
         </peripheral>
         <peripheral key="hiresc" name="HIRESC" module-key="i6090_hires">
@@ -315,25 +310,25 @@
         <peripheral key="usartc0" name="USARTC0" module-key="i6090_usart">
             <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"/>
-                <signal pad-id="pc3" function="USART" group="TXD" field="USART0"/>
-                <signal pad-id="pc5" function="USART_ALT" group="XCK" field="USART0"/>
-                <signal pad-id="pc6" function="USART_ALT" group="RXD" field="USART0"/>
-                <signal pad-id="pc7" function="USART_ALT" group="TXD" field="USART0"/>
+                <signal pad-key="pc1" function="USART" group="XCK" field="USART0"/>
+                <signal pad-key="pc2" function="USART" group="RXD" field="USART0"/>
+                <signal pad-key="pc3" function="USART" group="TXD" field="USART0"/>
+                <signal pad-key="pc5" function="USART_ALT" group="XCK" field="USART0"/>
+                <signal pad-key="pc6" function="USART_ALT" group="RXD" field="USART0"/>
+                <signal pad-key="pc7" function="USART_ALT" group="TXD" field="USART0"/>
             </signals>
         </peripheral>
         <peripheral key="spic" name="SPIC" module-key="i6090_spi">
             <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"/>
-                <signal pad-id="pc6" function="SPI" group="MISO" field="SPI"/>
-                <signal pad-id="pc7" function="SPI" group="SCK" field="SPI"/>
-                <signal pad-id="pc4" function="SPI_ALT" group="SS" field="SPI"/>
-                <signal pad-id="pc5" function="SPI_ALT" group="SCK" field="SPI"/>
-                <signal pad-id="pc6" function="SPI_ALT" group="MISO" field="SPI"/>
-                <signal pad-id="pc7" function="SPI_ALT" group="MOSI" field="SPI"/>
+                <signal pad-key="pc4" function="SPI" group="SS" field="SPI"/>
+                <signal pad-key="pc5" function="SPI" group="MOSI" field="SPI"/>
+                <signal pad-key="pc6" function="SPI" group="MISO" field="SPI"/>
+                <signal pad-key="pc7" function="SPI" group="SCK" field="SPI"/>
+                <signal pad-key="pc4" function="SPI_ALT" group="SS" field="SPI"/>
+                <signal pad-key="pc5" function="SPI_ALT" group="SCK" field="SPI"/>
+                <signal pad-key="pc6" function="SPI_ALT" group="MISO" field="SPI"/>
+                <signal pad-key="pc7" function="SPI_ALT" group="MOSI" field="SPI"/>
             </signals>
         </peripheral>
         <peripheral key="ircom" name="IRCOM" module-key="i6090_ircom">
@@ -342,46 +337,46 @@
         <peripheral key="lcd" name="LCD" module-key="i3003">
             <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"/>
-                <signal pad-id="pg2" index="22" function="LCD_SEG" group="SEG"/>
-                <signal pad-id="pg3" index="21" function="LCD_SEG" group="SEG"/>
-                <signal pad-id="pg4" index="20" function="LCD_SEG" group="SEG"/>
-                <signal pad-id="pg5" index="19" function="LCD_SEG" group="SEG"/>
-                <signal pad-id="pg6" index="18" function="LCD_SEG" group="SEG"/>
-                <signal pad-id="pg7" index="17" function="LCD_SEG" group="SEG"/>
-                <signal pad-id="pm0" index="16" function="LCD_SEG" group="SEG"/>
-                <signal pad-id="pm1" index="15" function="LCD_SEG" group="SEG"/>
-                <signal pad-id="pm2" index="14" function="LCD_SEG" group="SEG"/>
-                <signal pad-id="pm3" index="13" function="LCD_SEG" group="SEG"/>
-                <signal pad-id="pm4" index="12" function="LCD_SEG" group="SEG"/>
-                <signal pad-id="pm5" index="11" function="LCD_SEG" group="SEG"/>
-                <signal pad-id="pm6" index="10" function="LCD_SEG" group="SEG"/>
-                <signal pad-id="pm7" index="9" function="LCD_SEG" group="SEG"/>
-                <signal pad-id="seg8" index="8" function="LCD_SEG" group="SEG"/>
-                <signal pad-id="seg7" index="7" function="LCD_SEG" group="SEG"/>
-                <signal pad-id="seg6" index="6" function="LCD_SEG" group="SEG"/>
-                <signal pad-id="seg5" index="5" function="LCD_SEG" group="SEG"/>
-                <signal pad-id="seg4" index="4" function="LCD_SEG" group="SEG"/>
-                <signal pad-id="seg3" index="3" function="LCD_SEG" group="SEG"/>
-                <signal pad-id="seg2" index="2" function="LCD_SEG" group="SEG"/>
-                <signal pad-id="seg1" index="1" function="LCD_SEG" group="SEG"/>
-                <signal pad-id="seg0" index="0" function="LCD_SEG" group="SEG"/>
-                <signal pad-id="seg1" index="1" function="LCD_BLINK" group="BLINK"/>
-                <signal pad-id="seg0" index="0" function="LCD_BLINK" group="BLINK"/>
-                <signal pad-id="bias1" index="1" function="LCD_BIAS" group="BIAS"/>
-                <signal pad-id="bias2" index="2" function="LCD_BIAS" group="BIAS"/>
-                <signal pad-id="vlcd" function="LCD_BIAS" group="VLCD"/>
-                <signal pad-id="capl" function="LCD_BIAS" group="CAPL"/>
-                <signal pad-id="caph" function="LCD_BIAS" group="CAPH"/>
-                <signal pad-id="com0" index="0" function="LCD_COM" group="COM"/>
-                <signal pad-id="com1" index="1" function="LCD_COM" group="COM"/>
-                <signal pad-id="com2" index="2" function="LCD_COM" group="COM"/>
-                <signal pad-id="com3" index="3" function="LCD_COM" group="COM"/>
-                <signal pad-id="com3" index="0" function="LCD_COM_SWP" group="COM"/>
-                <signal pad-id="com2" index="1" function="LCD_COM_SWP" group="COM"/>
-                <signal pad-id="com1" index="2" function="LCD_COM_SWP" group="COM"/>
-                <signal pad-id="com0" index="3" function="LCD_COM_SWP" group="COM"/>
+                <signal pad-key="pg0" index="24" function="LCD_SEG" group="SEG"/>
+                <signal pad-key="pg1" index="23" function="LCD_SEG" group="SEG"/>
+                <signal pad-key="pg2" index="22" function="LCD_SEG" group="SEG"/>
+                <signal pad-key="pg3" index="21" function="LCD_SEG" group="SEG"/>
+                <signal pad-key="pg4" index="20" function="LCD_SEG" group="SEG"/>
+                <signal pad-key="pg5" index="19" function="LCD_SEG" group="SEG"/>
+                <signal pad-key="pg6" index="18" function="LCD_SEG" group="SEG"/>
+                <signal pad-key="pg7" index="17" function="LCD_SEG" group="SEG"/>
+                <signal pad-key="pm0" index="16" function="LCD_SEG" group="SEG"/>
+                <signal pad-key="pm1" index="15" function="LCD_SEG" group="SEG"/>
+                <signal pad-key="pm2" index="14" function="LCD_SEG" group="SEG"/>
+                <signal pad-key="pm3" index="13" function="LCD_SEG" group="SEG"/>
+                <signal pad-key="pm4" index="12" function="LCD_SEG" group="SEG"/>
+                <signal pad-key="pm5" index="11" function="LCD_SEG" group="SEG"/>
+                <signal pad-key="pm6" index="10" function="LCD_SEG" group="SEG"/>
+                <signal pad-key="pm7" index="9" function="LCD_SEG" group="SEG"/>
+                <signal pad-key="seg8" index="8" function="LCD_SEG" group="SEG"/>
+                <signal pad-key="seg7" index="7" function="LCD_SEG" group="SEG"/>
+                <signal pad-key="seg6" index="6" function="LCD_SEG" group="SEG"/>
+                <signal pad-key="seg5" index="5" function="LCD_SEG" group="SEG"/>
+                <signal pad-key="seg4" index="4" function="LCD_SEG" group="SEG"/>
+                <signal pad-key="seg3" index="3" function="LCD_SEG" group="SEG"/>
+                <signal pad-key="seg2" index="2" function="LCD_SEG" group="SEG"/>
+                <signal pad-key="seg1" index="1" function="LCD_SEG" group="SEG"/>
+                <signal pad-key="seg0" index="0" function="LCD_SEG" group="SEG"/>
+                <signal pad-key="seg1" index="1" function="LCD_BLINK" group="BLINK"/>
+                <signal pad-key="seg0" index="0" function="LCD_BLINK" group="BLINK"/>
+                <signal pad-key="bias1" index="1" function="LCD_BIAS" group="BIAS"/>
+                <signal pad-key="bias2" index="2" function="LCD_BIAS" group="BIAS"/>
+                <signal pad-key="vlcd" function="LCD_BIAS" group="VLCD"/>
+                <signal pad-key="capl" function="LCD_BIAS" group="CAPL"/>
+                <signal pad-key="caph" function="LCD_BIAS" group="CAPH"/>
+                <signal pad-key="com0" index="0" function="LCD_COM" group="COM"/>
+                <signal pad-key="com1" index="1" function="LCD_COM" group="COM"/>
+                <signal pad-key="com2" index="2" function="LCD_COM" group="COM"/>
+                <signal pad-key="com3" index="3" function="LCD_COM" group="COM"/>
+                <signal pad-key="com3" index="0" function="LCD_COM_SWP" group="COM"/>
+                <signal pad-key="com2" index="1" function="LCD_COM_SWP" group="COM"/>
+                <signal pad-key="com1" index="2" function="LCD_COM_SWP" group="COM"/>
+                <signal pad-key="com0" index="3" function="LCD_COM_SWP" group="COM"/>
             </signals>
         </peripheral>
         <peripheral key="fuse" name="FUSE" module-key="i6570_fuse">
@@ -1677,142 +1672,204 @@
             </register-group>
         </module>
     </modules>
+    <pads>
+        <pad key="pc0" name="PC0"/>
+        <pad key="pc1" name="PC1"/>
+        <pad key="pc2" name="PC2"/>
+        <pad key="pc3" name="PC3"/>
+        <pad key="pc4" name="PC4"/>
+        <pad key="pc5" name="PC5"/>
+        <pad key="pc6" name="PC6"/>
+        <pad key="pc7" name="PC7"/>
+        <pad key="gnd" name="GND"/>
+        <pad key="vcc" name="VCC"/>
+        <pad key="pd0" name="PD0"/>
+        <pad key="pd1" name="PD1"/>
+        <pad key="reset" name="RESET"/>
+        <pad key="pdi" name="PDI"/>
+        <pad key="pg0" name="PG0"/>
+        <pad key="pg1" name="PG1"/>
+        <pad key="pg2" name="PG2"/>
+        <pad key="pg3" name="PG3"/>
+        <pad key="pg4" name="PG4"/>
+        <pad key="pg5" name="PG5"/>
+        <pad key="pg6" name="PG6"/>
+        <pad key="pg7" name="PG7"/>
+        <pad key="pm0" name="PM0"/>
+        <pad key="pm1" name="PM1"/>
+        <pad key="pm2" name="PM2"/>
+        <pad key="pm3" name="PM3"/>
+        <pad key="pm4" name="PM4"/>
+        <pad key="pm5" name="PM5"/>
+        <pad key="pm6" name="PM6"/>
+        <pad key="pm7" name="PM7"/>
+        <pad key="seg8" name="SEG8"/>
+        <pad key="seg7" name="SEG7"/>
+        <pad key="seg6" name="SEG6"/>
+        <pad key="seg5" name="SEG5"/>
+        <pad key="seg4" name="SEG4"/>
+        <pad key="seg3" name="SEG3"/>
+        <pad key="seg2" name="SEG2"/>
+        <pad key="seg1" name="SEG1"/>
+        <pad key="seg0" name="SEG0"/>
+        <pad key="bias1" name="BIAS1"/>
+        <pad key="bias2" name="BIAS2"/>
+        <pad key="vlcd" name="VLCD"/>
+        <pad key="capl" name="CAPL"/>
+        <pad key="caph" name="CAPH"/>
+        <pad key="com0" name="COM0"/>
+        <pad key="com1" name="COM1"/>
+        <pad key="com2" name="COM2"/>
+        <pad key="com3" name="COM3"/>
+        <pad key="pr0" name="PR0"/>
+        <pad key="pr1" name="PR1"/>
+        <pad key="agnd" name="AGND"/>
+        <pad key="avcc" name="AVCC"/>
+        <pad key="pb0" name="PB0"/>
+        <pad key="pb1" name="PB1"/>
+        <pad key="pb2" name="PB2"/>
+        <pad key="pb3" name="PB3"/>
+        <pad key="pb4" name="PB4"/>
+        <pad key="pb5" name="PB5"/>
+        <pad key="pb6" name="PB6"/>
+        <pad key="pb7" name="PB7"/>
+    </pads>
     <pinouts>
         <pinout key="qfp_qfn_64" name="QFP_QFN_64" type="qfn">
-            <pin position="1" pad="PC0"/>
-            <pin position="2" pad="PC1"/>
-            <pin position="3" pad="PC2"/>
-            <pin position="4" pad="PC3"/>
-            <pin position="5" pad="PC4"/>
-            <pin position="6" pad="PC5"/>
-            <pin position="7" pad="PC6"/>
-            <pin position="8" pad="PC7"/>
-            <pin position="9" pad="GND"/>
-            <pin position="10" pad="VCC"/>
-            <pin position="11" pad="PD0"/>
-            <pin position="12" pad="PD1"/>
-            <pin position="13" pad="RESET"/>
-            <pin position="14" pad="PDI"/>
-            <pin position="15" pad="GND"/>
-            <pin position="16" pad="VCC"/>
-            <pin position="17" pad="PG0"/>
-            <pin position="18" pad="PG1"/>
-            <pin position="19" pad="PG2"/>
-            <pin position="20" pad="PG3"/>
-            <pin position="21" pad="PG4"/>
-            <pin position="22" pad="PG5"/>
-            <pin position="23" pad="PG6"/>
-            <pin position="24" pad="PG7"/>
-            <pin position="25" pad="PM0"/>
-            <pin position="26" pad="PM1"/>
-            <pin position="27" pad="PM2"/>
-            <pin position="28" pad="PM3"/>
-            <pin position="29" pad="PM4"/>
-            <pin position="30" pad="PM5"/>
-            <pin position="31" pad="PM6"/>
-            <pin position="32" pad="PM7"/>
-            <pin position="33" pad="SEG8"/>
-            <pin position="34" pad="SEG7"/>
-            <pin position="35" pad="SEG6"/>
-            <pin position="36" pad="SEG5"/>
-            <pin position="37" pad="SEG4"/>
-            <pin position="38" pad="SEG3"/>
-            <pin position="39" pad="SEG2"/>
-            <pin position="40" pad="SEG1"/>
-            <pin position="41" pad="SEG0"/>
-            <pin position="42" pad="GND"/>
-            <pin position="43" pad="VCC"/>
-            <pin position="44" pad="BIAS1"/>
-            <pin position="45" pad="BIAS2"/>
-            <pin position="46" pad="VLCD"/>
-            <pin position="47" pad="CAPL"/>
-            <pin position="48" pad="CAPH"/>
-            <pin position="49" pad="COM0"/>
-            <pin position="50" pad="COM1"/>
-            <pin position="51" pad="COM2"/>
-            <pin position="52" pad="COM3"/>
-            <pin position="53" pad="PR0"/>
-            <pin position="54" pad="PR1"/>
-            <pin position="55" pad="AGND"/>
-            <pin position="56" pad="AVCC"/>
-            <pin position="57" pad="PB0"/>
-            <pin position="58" pad="PB1"/>
-            <pin position="59" pad="PB2"/>
-            <pin position="60" pad="PB3"/>
-            <pin position="61" pad="PB4"/>
-            <pin position="62" pad="PB5"/>
-            <pin position="63" pad="PB6"/>
-            <pin position="64" pad="PB7"/>
+            <pin position="1" pad-key="pc0"/>
+            <pin position="2" pad-key="pc1"/>
+            <pin position="3" pad-key="pc2"/>
+            <pin position="4" pad-key="pc3"/>
+            <pin position="5" pad-key="pc4"/>
+            <pin position="6" pad-key="pc5"/>
+            <pin position="7" pad-key="pc6"/>
+            <pin position="8" pad-key="pc7"/>
+            <pin position="9" pad-key="gnd"/>
+            <pin position="10" pad-key="vcc"/>
+            <pin position="11" pad-key="pd0"/>
+            <pin position="12" pad-key="pd1"/>
+            <pin position="13" pad-key="reset"/>
+            <pin position="14" pad-key="pdi"/>
+            <pin position="15" pad-key="gnd"/>
+            <pin position="16" pad-key="vcc"/>
+            <pin position="17" pad-key="pg0"/>
+            <pin position="18" pad-key="pg1"/>
+            <pin position="19" pad-key="pg2"/>
+            <pin position="20" pad-key="pg3"/>
+            <pin position="21" pad-key="pg4"/>
+            <pin position="22" pad-key="pg5"/>
+            <pin position="23" pad-key="pg6"/>
+            <pin position="24" pad-key="pg7"/>
+            <pin position="25" pad-key="pm0"/>
+            <pin position="26" pad-key="pm1"/>
+            <pin position="27" pad-key="pm2"/>
+            <pin position="28" pad-key="pm3"/>
+            <pin position="29" pad-key="pm4"/>
+            <pin position="30" pad-key="pm5"/>
+            <pin position="31" pad-key="pm6"/>
+            <pin position="32" pad-key="pm7"/>
+            <pin position="33" pad-key="seg8"/>
+            <pin position="34" pad-key="seg7"/>
+            <pin position="35" pad-key="seg6"/>
+            <pin position="36" pad-key="seg5"/>
+            <pin position="37" pad-key="seg4"/>
+            <pin position="38" pad-key="seg3"/>
+            <pin position="39" pad-key="seg2"/>
+            <pin position="40" pad-key="seg1"/>
+            <pin position="41" pad-key="seg0"/>
+            <pin position="42" pad-key="gnd"/>
+            <pin position="43" pad-key="vcc"/>
+            <pin position="44" pad-key="bias1"/>
+            <pin position="45" pad-key="bias2"/>
+            <pin position="46" pad-key="vlcd"/>
+            <pin position="47" pad-key="capl"/>
+            <pin position="48" pad-key="caph"/>
+            <pin position="49" pad-key="com0"/>
+            <pin position="50" pad-key="com1"/>
+            <pin position="51" pad-key="com2"/>
+            <pin position="52" pad-key="com3"/>
+            <pin position="53" pad-key="pr0"/>
+            <pin position="54" pad-key="pr1"/>
+            <pin position="55" pad-key="agnd"/>
+            <pin position="56" pad-key="avcc"/>
+            <pin position="57" pad-key="pb0"/>
+            <pin position="58" pad-key="pb1"/>
+            <pin position="59" pad-key="pb2"/>
+            <pin position="60" pad-key="pb3"/>
+            <pin position="61" pad-key="pb4"/>
+            <pin position="62" pad-key="pb5"/>
+            <pin position="63" pad-key="pb6"/>
+            <pin position="64" pad-key="pb7"/>
         </pinout>
         <pinout key="drqfn_64" name="DRQFN_64" type="drqfn">
-            <pin position="A1" pad="PC0"/>
-            <pin position="B1" pad="PC1"/>
-            <pin position="A2" pad="PC2"/>
-            <pin position="B2" pad="PC3"/>
-            <pin position="A3" pad="PC4"/>
-            <pin position="B3" pad="PC5"/>
-            <pin position="A4" pad="PC6"/>
-            <pin position="B4" pad="GND"/>
-            <pin position="A5" pad="PC7"/>
-            <pin position="B5" pad="PD0"/>
-            <pin position="A6" pad="VCC"/>
-            <pin position="B6" pad="RESET"/>
-            <pin position="A7" pad="PD1"/>
-            <pin position="B7" pad="PDI"/>
-            <pin position="A8" pad="GND"/>
-            <pin position="A9" pad="PG0"/>
-            <pin position="B8" pad="VCC"/>
-            <pin position="A10" pad="PG2"/>
-            <pin position="B9" pad="PG1"/>
-            <pin position="A11" pad="PG3"/>
-            <pin position="B10" pad="PG4"/>
-            <pin position="A12" pad="PG5"/>
-            <pin position="B11" pad="PG6"/>
-            <pin position="A13" pad="PG7"/>
-            <pin position="B12" pad="PM0"/>
-            <pin position="A14" pad="PM1"/>
-            <pin position="B13" pad="PM2"/>
-            <pin position="A15" pad="PM3"/>
-            <pin position="B14" pad="PM5"/>
-            <pin position="A16" pad="PM4"/>
-            <pin position="B15" pad="PM7"/>
-            <pin position="A17" pad="PM6"/>
-            <pin position="A18" pad="SEG7"/>
-            <pin position="B16" pad="SEG8"/>
-            <pin position="A19" pad="SEG6"/>
-            <pin position="B17" pad="SEG5"/>
-            <pin position="A20" pad="SEG4"/>
-            <pin position="B18" pad="SEG3"/>
-            <pin position="A21" pad="SEG2"/>
-            <pin position="B19" pad="SEG1"/>
-            <pin position="A22" pad="SEG0"/>
-            <pin position="B20" pad="GND"/>
-            <pin position="A23" pad="VCC"/>
-            <pin position="B21" pad="BIAS1"/>
-            <pin position="A24" pad="BIAS2"/>
-            <pin position="B22" pad="VLCD"/>
-            <pin position="A25" pad="CAPL"/>
-            <pin position="A26" pad="CAPH"/>
-            <pin position="B23" pad="COM0"/>
-            <pin position="A27" pad="COM1"/>
-            <pin position="B24" pad="COM2"/>
-            <pin position="A28" pad="COM3"/>
-            <pin position="B25" pad="PR0"/>
-            <pin position="A29" pad="PR1"/>
-            <pin position="B26" pad="AGND"/>
-            <pin position="A30" pad="PB0"/>
-            <pin position="B27" pad="AVCC"/>
-            <pin position="A31" pad="PB1"/>
-            <pin position="B28" pad="PB2"/>
-            <pin position="A32" pad="PB3"/>
-            <pin position="B29" pad="PB4"/>
-            <pin position="A33" pad="PB5"/>
-            <pin position="B30" pad="PB7"/>
-            <pin position="A34" pad="PB6"/>
+            <pin position="A1" pad-key="pc0"/>
+            <pin position="B1" pad-key="pc1"/>
+            <pin position="A2" pad-key="pc2"/>
+            <pin position="B2" pad-key="pc3"/>
+            <pin position="A3" pad-key="pc4"/>
+            <pin position="B3" pad-key="pc5"/>
+            <pin position="A4" pad-key="pc6"/>
+            <pin position="B4" pad-key="gnd"/>
+            <pin position="A5" pad-key="pc7"/>
+            <pin position="B5" pad-key="pd0"/>
+            <pin position="A6" pad-key="vcc"/>
+            <pin position="B6" pad-key="reset"/>
+            <pin position="A7" pad-key="pd1"/>
+            <pin position="B7" pad-key="pdi"/>
+            <pin position="A8" pad-key="gnd"/>
+            <pin position="A9" pad-key="pg0"/>
+            <pin position="B8" pad-key="vcc"/>
+            <pin position="A10" pad-key="pg2"/>
+            <pin position="B9" pad-key="pg1"/>
+            <pin position="A11" pad-key="pg3"/>
+            <pin position="B10" pad-key="pg4"/>
+            <pin position="A12" pad-key="pg5"/>
+            <pin position="B11" pad-key="pg6"/>
+            <pin position="A13" pad-key="pg7"/>
+            <pin position="B12" pad-key="pm0"/>
+            <pin position="A14" pad-key="pm1"/>
+            <pin position="B13" pad-key="pm2"/>
+            <pin position="A15" pad-key="pm3"/>
+            <pin position="B14" pad-key="pm5"/>
+            <pin position="A16" pad-key="pm4"/>
+            <pin position="B15" pad-key="pm7"/>
+            <pin position="A17" pad-key="pm6"/>
+            <pin position="A18" pad-key="seg7"/>
+            <pin position="B16" pad-key="seg8"/>
+            <pin position="A19" pad-key="seg6"/>
+            <pin position="B17" pad-key="seg5"/>
+            <pin position="A20" pad-key="seg4"/>
+            <pin position="B18" pad-key="seg3"/>
+            <pin position="A21" pad-key="seg2"/>
+            <pin position="B19" pad-key="seg1"/>
+            <pin position="A22" pad-key="seg0"/>
+            <pin position="B20" pad-key="gnd"/>
+            <pin position="A23" pad-key="vcc"/>
+            <pin position="B21" pad-key="bias1"/>
+            <pin position="A24" pad-key="bias2"/>
+            <pin position="B22" pad-key="vlcd"/>
+            <pin position="A25" pad-key="capl"/>
+            <pin position="A26" pad-key="caph"/>
+            <pin position="B23" pad-key="com0"/>
+            <pin position="A27" pad-key="com1"/>
+            <pin position="B24" pad-key="com2"/>
+            <pin position="A28" pad-key="com3"/>
+            <pin position="B25" pad-key="pr0"/>
+            <pin position="A29" pad-key="pr1"/>
+            <pin position="B26" pad-key="agnd"/>
+            <pin position="A30" pad-key="pb0"/>
+            <pin position="B27" pad-key="avcc"/>
+            <pin position="A31" pad-key="pb1"/>
+            <pin position="B28" pad-key="pb2"/>
+            <pin position="A32" pad-key="pb3"/>
+            <pin position="B29" pad-key="pb4"/>
+            <pin position="A33" pad-key="pb5"/>
+            <pin position="B30" pad-key="pb7"/>
+            <pin position="A34" pad-key="pb6"/>
         </pinout>
     </pinouts>
     <variants>
-        <variant name="ATxmega64B3-AU" pinout-key="qfp_qfn_64" package="TQFP64"/>
-        <variant name="ATxmega64B3-MH" pinout-key="qfp_qfn_64" package="QFN64"/>
+        <variant key="atxmega64b3_au" name="ATxmega64B3-AU" pinout-key="qfp_qfn_64"/>
+        <variant key="atxmega64b3_mh" name="ATxmega64B3-MH" pinout-key="qfp_qfn_64"/>
     </variants>
 </device>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA64C3.xml b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA64C3.xml
index 30a22406..c682473b 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA64C3.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA64C3.xml
@@ -92,10 +92,10 @@
         <peripheral key="osc" name="OSC" module-key="i6079">
             <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"/>
-                <signal pad-id="pe2" function="TOSC" group="TOSC2"/>
-                <signal pad-id="pe3" function="TOSC" group="TOSC1"/>
+                <signal pad-key="pr0" function="XTAL" group="XTAL2"/>
+                <signal pad-key="pr1" function="XTAL" group="XTAL1"/>
+                <signal pad-key="pe2" function="TOSC" group="TOSC2"/>
+                <signal pad-key="pe3" function="TOSC" group="TOSC1"/>
             </signals>
         </peripheral>
         <peripheral key="dfllrc32m" name="DFLLRC32M" module-key="i6055">
@@ -119,11 +119,11 @@
         <peripheral key="portcfg" name="PORTCFG" module-key="i6075_portcfg">
             <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"/>
-                <signal pad-id="pc7" function="EVOUT" group="EVOUT" field="EVOUT"/>
-                <signal pad-id="pc4" function="EVOUT_ALT" group="EVOUT" field="CLKEVPIN"/>
-                <signal pad-id="pc6" function="RTCOUTC" group="RTCOUT"/>
+                <signal pad-key="pc7" function="CLKOUT" group="CLKOUT" field="CLKOUT"/>
+                <signal pad-key="pc4" function="CLKOUT_ALT" group="CLKOUT" field="CLKEVPIN"/>
+                <signal pad-key="pc7" function="EVOUT" group="EVOUT" field="EVOUT"/>
+                <signal pad-key="pc4" function="EVOUT_ALT" group="EVOUT" field="CLKEVPIN"/>
+                <signal pad-key="pc6" function="RTCOUTC" group="RTCOUT"/>
             </signals>
         </peripheral>
         <peripheral key="crc" name="CRC" module-key="i6111">
@@ -138,39 +138,39 @@
         <peripheral key="adca" name="ADCA" module-key="i6110">
             <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"/>
-                <signal pad-id="pa2" index="2" function="ADC" group="ADC"/>
-                <signal pad-id="pa3" index="3" function="ADC" group="ADC"/>
-                <signal pad-id="pa4" index="4" function="ADC" group="ADC"/>
-                <signal pad-id="pa5" index="5" function="ADC" group="ADC"/>
-                <signal pad-id="pa6" index="6" function="ADC" group="ADC"/>
-                <signal pad-id="pa7" index="7" function="ADC" group="ADC"/>
-                <signal pad-id="pb0" index="8" function="ADC" group="ADC"/>
-                <signal pad-id="pb1" index="9" function="ADC" group="ADC"/>
-                <signal pad-id="pb2" index="10" function="ADC" group="ADC"/>
-                <signal pad-id="pb3" index="11" function="ADC" group="ADC"/>
-                <signal pad-id="pb4" index="12" function="ADC" group="ADC"/>
-                <signal pad-id="pb5" index="13" function="ADC" group="ADC"/>
-                <signal pad-id="pb6" index="14" function="ADC" group="ADC"/>
-                <signal pad-id="pb7" index="15" function="ADC" group="ADC"/>
-                <signal pad-id="pa0" index="0" function="AREF" group="REFA"/>
-                <signal pad-id="pb0" index="0" function="AREF" group="REFB"/>
+                <signal pad-key="pa0" index="0" function="ADC" group="ADC"/>
+                <signal pad-key="pa1" index="1" function="ADC" group="ADC"/>
+                <signal pad-key="pa2" index="2" function="ADC" group="ADC"/>
+                <signal pad-key="pa3" index="3" function="ADC" group="ADC"/>
+                <signal pad-key="pa4" index="4" function="ADC" group="ADC"/>
+                <signal pad-key="pa5" index="5" function="ADC" group="ADC"/>
+                <signal pad-key="pa6" index="6" function="ADC" group="ADC"/>
+                <signal pad-key="pa7" index="7" function="ADC" group="ADC"/>
+                <signal pad-key="pb0" index="8" function="ADC" group="ADC"/>
+                <signal pad-key="pb1" index="9" function="ADC" group="ADC"/>
+                <signal pad-key="pb2" index="10" function="ADC" group="ADC"/>
+                <signal pad-key="pb3" index="11" function="ADC" group="ADC"/>
+                <signal pad-key="pb4" index="12" function="ADC" group="ADC"/>
+                <signal pad-key="pb5" index="13" function="ADC" group="ADC"/>
+                <signal pad-key="pb6" index="14" function="ADC" group="ADC"/>
+                <signal pad-key="pb7" index="15" function="ADC" group="ADC"/>
+                <signal pad-key="pa0" index="0" function="AREF" group="REFA"/>
+                <signal pad-key="pb0" index="0" function="AREF" group="REFB"/>
             </signals>
         </peripheral>
         <peripheral key="aca" name="ACA" module-key="i6077">
             <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"/>
-                <signal pad-id="pa2" index="2" function="AC" group="AC"/>
-                <signal pad-id="pa3" index="3" function="AC" group="AC"/>
-                <signal pad-id="pa4" index="4" function="AC" group="AC"/>
-                <signal pad-id="pa5" index="5" function="AC" group="AC"/>
-                <signal pad-id="pa6" index="6" function="AC" group="AC"/>
-                <signal pad-id="pa7" index="7" function="AC" group="AC"/>
-                <signal pad-id="pa6" index="1" function="ACOUT" group="ACOUT"/>
-                <signal pad-id="pa7" index="0" function="ACOUT" group="ACOUT"/>
+                <signal pad-key="pa0" index="0" function="AC" group="AC"/>
+                <signal pad-key="pa1" index="1" function="AC" group="AC"/>
+                <signal pad-key="pa2" index="2" function="AC" group="AC"/>
+                <signal pad-key="pa3" index="3" function="AC" group="AC"/>
+                <signal pad-key="pa4" index="4" function="AC" group="AC"/>
+                <signal pad-key="pa5" index="5" function="AC" group="AC"/>
+                <signal pad-key="pa6" index="6" function="AC" group="AC"/>
+                <signal pad-key="pa7" index="7" function="AC" group="AC"/>
+                <signal pad-key="pa6" index="1" function="ACOUT" group="ACOUT"/>
+                <signal pad-key="pa7" index="0" function="ACOUT" group="ACOUT"/>
             </signals>
         </peripheral>
         <peripheral key="rtc" name="RTC" module-key="i6093">
@@ -179,219 +179,219 @@
         <peripheral key="twic" name="TWIC" module-key="i6089">
             <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"/>
+                <signal pad-key="pc0" function="TWI" group="SDA"/>
+                <signal pad-key="pc1" function="TWI" group="SCL"/>
             </signals>
         </peripheral>
         <peripheral key="twie" name="TWIE" module-key="i6089">
             <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"/>
+                <signal pad-key="pe0" function="TWI" group="SDA"/>
+                <signal pad-key="pe1" function="TWI" group="SCL"/>
             </signals>
         </peripheral>
         <peripheral key="usb" name="USB" module-key="i3005">
             <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"/>
+                <signal pad-key="pd6" function="USB" group="DN"/>
+                <signal pad-key="pd7" function="USB" group="DP"/>
             </signals>
         </peripheral>
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pa2" index="2" function="PORTA" group="P"/>
-                <signal pad-id="pa3" index="3" function="PORTA" group="P"/>
-                <signal pad-id="pa4" index="4" function="PORTA" group="P"/>
-                <signal pad-id="pa5" index="5" function="PORTA" group="P"/>
-                <signal pad-id="pa6" index="6" function="PORTA" group="P"/>
-                <signal pad-id="pa7" index="7" function="PORTA" group="P"/>
+                <signal pad-key="pa0" index="0" function="PORTA" group="P"/>
+                <signal pad-key="pa1" index="1" function="PORTA" group="P"/>
+                <signal pad-key="pa2" index="2" function="PORTA" group="P"/>
+                <signal pad-key="pa3" index="3" function="PORTA" group="P"/>
+                <signal pad-key="pa4" index="4" function="PORTA" group="P"/>
+                <signal pad-key="pa5" index="5" function="PORTA" group="P"/>
+                <signal pad-key="pa6" index="6" function="PORTA" group="P"/>
+                <signal pad-key="pa7" index="7" function="PORTA" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pb2" index="2" function="PORTB" group="P"/>
-                <signal pad-id="pb3" index="3" function="PORTB" group="P"/>
-                <signal pad-id="pb4" index="4" function="PORTB" group="P"/>
-                <signal pad-id="pb5" index="5" function="PORTB" group="P"/>
-                <signal pad-id="pb6" index="6" function="PORTB" group="P"/>
-                <signal pad-id="pb7" index="7" function="PORTB" group="P"/>
+                <signal pad-key="pb0" index="0" function="PORTB" group="P"/>
+                <signal pad-key="pb1" index="1" function="PORTB" group="P"/>
+                <signal pad-key="pb2" index="2" function="PORTB" group="P"/>
+                <signal pad-key="pb3" index="3" function="PORTB" group="P"/>
+                <signal pad-key="pb4" index="4" function="PORTB" group="P"/>
+                <signal pad-key="pb5" index="5" function="PORTB" group="P"/>
+                <signal pad-key="pb6" index="6" function="PORTB" group="P"/>
+                <signal pad-key="pb7" index="7" function="PORTB" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pc2" index="2" function="PORTC" group="P"/>
-                <signal pad-id="pc3" index="3" function="PORTC" group="P"/>
-                <signal pad-id="pc4" index="4" function="PORTC" group="P"/>
-                <signal pad-id="pc5" index="5" function="PORTC" group="P"/>
-                <signal pad-id="pc6" index="6" function="PORTC" group="P"/>
-                <signal pad-id="pc7" index="7" function="PORTC" group="P"/>
+                <signal pad-key="pc0" index="0" function="PORTC" group="P"/>
+                <signal pad-key="pc1" index="1" function="PORTC" group="P"/>
+                <signal pad-key="pc2" index="2" function="PORTC" group="P"/>
+                <signal pad-key="pc3" index="3" function="PORTC" group="P"/>
+                <signal pad-key="pc4" index="4" function="PORTC" group="P"/>
+                <signal pad-key="pc5" index="5" function="PORTC" group="P"/>
+                <signal pad-key="pc6" index="6" function="PORTC" group="P"/>
+                <signal pad-key="pc7" index="7" function="PORTC" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pd2" index="2" function="PORTD" group="P"/>
-                <signal pad-id="pd3" index="3" function="PORTD" group="P"/>
-                <signal pad-id="pd4" index="4" function="PORTD" group="P"/>
-                <signal pad-id="pd5" index="5" function="PORTD" group="P"/>
-                <signal pad-id="pd6" index="6" function="PORTD" group="P"/>
-                <signal pad-id="pd7" index="7" function="PORTD" group="P"/>
+                <signal pad-key="pd0" index="0" function="PORTD" group="P"/>
+                <signal pad-key="pd1" index="1" function="PORTD" group="P"/>
+                <signal pad-key="pd2" index="2" function="PORTD" group="P"/>
+                <signal pad-key="pd3" index="3" function="PORTD" group="P"/>
+                <signal pad-key="pd4" index="4" function="PORTD" group="P"/>
+                <signal pad-key="pd5" index="5" function="PORTD" group="P"/>
+                <signal pad-key="pd6" index="6" function="PORTD" group="P"/>
+                <signal pad-key="pd7" index="7" function="PORTD" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="porte" name="PORTE" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pe2" index="2" function="PORTE" group="P"/>
-                <signal pad-id="pe3" index="3" function="PORTE" group="P"/>
-                <signal pad-id="pe4" index="4" function="PORTE" group="P"/>
-                <signal pad-id="pe5" index="5" function="PORTE" group="P"/>
-                <signal pad-id="pe6" index="6" function="PORTE" group="P"/>
-                <signal pad-id="pe7" index="7" function="PORTE" group="P"/>
+                <signal pad-key="pe0" index="0" function="PORTE" group="P"/>
+                <signal pad-key="pe1" index="1" function="PORTE" group="P"/>
+                <signal pad-key="pe2" index="2" function="PORTE" group="P"/>
+                <signal pad-key="pe3" index="3" function="PORTE" group="P"/>
+                <signal pad-key="pe4" index="4" function="PORTE" group="P"/>
+                <signal pad-key="pe5" index="5" function="PORTE" group="P"/>
+                <signal pad-key="pe6" index="6" function="PORTE" group="P"/>
+                <signal pad-key="pe7" index="7" function="PORTE" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portf" name="PORTF" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pf2" index="2" function="PORTF" group="P"/>
-                <signal pad-id="pf3" index="3" function="PORTF" group="P"/>
-                <signal pad-id="pf4" index="4" function="PORTF" group="P"/>
-                <signal pad-id="pf5" index="5" function="PORTF" group="P"/>
-                <signal pad-id="pf6" index="6" function="PORTF" group="P"/>
-                <signal pad-id="pf7" index="7" function="PORTF" group="P"/>
+                <signal pad-key="pf0" index="0" function="PORTF" group="P"/>
+                <signal pad-key="pf1" index="1" function="PORTF" group="P"/>
+                <signal pad-key="pf2" index="2" function="PORTF" group="P"/>
+                <signal pad-key="pf3" index="3" function="PORTF" group="P"/>
+                <signal pad-key="pf4" index="4" function="PORTF" group="P"/>
+                <signal pad-key="pf5" index="5" function="PORTF" group="P"/>
+                <signal pad-key="pf6" index="6" function="PORTF" group="P"/>
+                <signal pad-key="pf7" index="7" function="PORTF" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portr" name="PORTR" module-key="gpio_port">
             <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"/>
+                <signal pad-key="pr0" index="0" function="PORTR" group="P"/>
+                <signal pad-key="pr1" index="1" function="PORTR" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="tcc0" name="TCC0" module-key="i6090_tc">
             <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"/>
-                <signal pad-id="pc2" function="TC0" group="OC0C" field="TC0C"/>
-                <signal pad-id="pc3" function="TC0" group="OC0D" field="TC0D"/>
-                <signal pad-id="pc4" function="TC0_ALT" group="OC0A" field="TC0A"/>
-                <signal pad-id="pc5" function="TC0_ALT" group="OC0B" field="TC0B"/>
-                <signal pad-id="pc6" function="TC0_ALT" group="OC0C" field="TC0C"/>
-                <signal pad-id="pc7" function="TC0_ALT" group="OC0D" field="TC0D"/>
+                <signal pad-key="pc0" function="TC0" group="OC0A" field="TC0A"/>
+                <signal pad-key="pc1" function="TC0" group="OC0B" field="TC0B"/>
+                <signal pad-key="pc2" function="TC0" group="OC0C" field="TC0C"/>
+                <signal pad-key="pc3" function="TC0" group="OC0D" field="TC0D"/>
+                <signal pad-key="pc4" function="TC0_ALT" group="OC0A" field="TC0A"/>
+                <signal pad-key="pc5" function="TC0_ALT" group="OC0B" field="TC0B"/>
+                <signal pad-key="pc6" function="TC0_ALT" group="OC0C" field="TC0C"/>
+                <signal pad-key="pc7" function="TC0_ALT" group="OC0D" field="TC0D"/>
             </signals>
         </peripheral>
         <peripheral key="tcc1" name="TCC1" module-key="i6090_tc">
             <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"/>
+                <signal pad-key="pc4" function="TC1" group="OC1A"/>
+                <signal pad-key="pc5" function="TC1" group="OC1B"/>
             </signals>
         </peripheral>
         <peripheral key="tcd0" name="TCD0" module-key="i6090_tc">
             <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"/>
-                <signal pad-id="pd2" function="TC0" group="OC0C"/>
-                <signal pad-id="pd3" function="TC0" group="OC0D"/>
+                <signal pad-key="pd0" function="TC0" group="OC0A"/>
+                <signal pad-key="pd1" function="TC0" group="OC0B"/>
+                <signal pad-key="pd2" function="TC0" group="OC0C"/>
+                <signal pad-key="pd3" function="TC0" group="OC0D"/>
             </signals>
         </peripheral>
         <peripheral key="tce0" name="TCE0" module-key="i6090_tc">
             <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"/>
-                <signal pad-id="pe2" function="TC0" group="OC0C"/>
-                <signal pad-id="pe3" function="TC0" group="OC0D"/>
+                <signal pad-key="pe0" function="TC0" group="OC0A"/>
+                <signal pad-key="pe1" function="TC0" group="OC0B"/>
+                <signal pad-key="pe2" function="TC0" group="OC0C"/>
+                <signal pad-key="pe3" function="TC0" group="OC0D"/>
             </signals>
         </peripheral>
         <peripheral key="tcf0" name="TCF0" module-key="i6090_tc">
             <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"/>
-                <signal pad-id="pf2" function="TC0" group="OC0C"/>
-                <signal pad-id="pf3" function="TC0" group="OC0D"/>
+                <signal pad-key="pf0" function="TC0" group="OC0A"/>
+                <signal pad-key="pf1" function="TC0" group="OC0B"/>
+                <signal pad-key="pf2" function="TC0" group="OC0C"/>
+                <signal pad-key="pf3" function="TC0" group="OC0D"/>
             </signals>
         </peripheral>
         <peripheral key="tcc2" name="TCC2" module-key="i6090_tc2">
             <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"/>
-                <signal pad-id="pc2" function="TC2" group="LOC2C"/>
-                <signal pad-id="pc3" function="TC2" group="LOC2D"/>
-                <signal pad-id="pc4" function="TC2" group="HOC2A"/>
-                <signal pad-id="pc5" function="TC2" group="HOC2B"/>
-                <signal pad-id="pc6" function="TC2" group="HOC2C"/>
-                <signal pad-id="pc7" function="TC2" group="HOC2D"/>
+                <signal pad-key="pc0" function="TC2" group="LOC2A"/>
+                <signal pad-key="pc1" function="TC2" group="LOC2B"/>
+                <signal pad-key="pc2" function="TC2" group="LOC2C"/>
+                <signal pad-key="pc3" function="TC2" group="LOC2D"/>
+                <signal pad-key="pc4" function="TC2" group="HOC2A"/>
+                <signal pad-key="pc5" function="TC2" group="HOC2B"/>
+                <signal pad-key="pc6" function="TC2" group="HOC2C"/>
+                <signal pad-key="pc7" function="TC2" group="HOC2D"/>
             </signals>
         </peripheral>
         <peripheral key="tcd2" name="TCD2" module-key="i6090_tc2">
             <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"/>
-                <signal pad-id="pd2" function="TC2" group="LOC2C"/>
-                <signal pad-id="pd3" function="TC2" group="LOC2D"/>
-                <signal pad-id="pd4" function="TC2" group="HOC2A"/>
-                <signal pad-id="pd5" function="TC2" group="HOC2B"/>
-                <signal pad-id="pd6" function="TC2" group="HOC2C"/>
-                <signal pad-id="pd7" function="TC2" group="HOC2D"/>
+                <signal pad-key="pd0" function="TC2" group="LOC2A"/>
+                <signal pad-key="pd1" function="TC2" group="LOC2B"/>
+                <signal pad-key="pd2" function="TC2" group="LOC2C"/>
+                <signal pad-key="pd3" function="TC2" group="LOC2D"/>
+                <signal pad-key="pd4" function="TC2" group="HOC2A"/>
+                <signal pad-key="pd5" function="TC2" group="HOC2B"/>
+                <signal pad-key="pd6" function="TC2" group="HOC2C"/>
+                <signal pad-key="pd7" function="TC2" group="HOC2D"/>
             </signals>
         </peripheral>
         <peripheral key="tce2" name="TCE2" module-key="i6090_tc2">
             <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"/>
-                <signal pad-id="pe2" function="TC2" group="LOC2C"/>
-                <signal pad-id="pe3" function="TC2" group="LOC2D"/>
-                <signal pad-id="pe4" function="TC2" group="HOC2A"/>
-                <signal pad-id="pe5" function="TC2" group="HOC2B"/>
-                <signal pad-id="pe6" function="TC2" group="HOC2C"/>
-                <signal pad-id="pe7" function="TC2" group="HOC2D"/>
+                <signal pad-key="pe0" function="TC2" group="LOC2A"/>
+                <signal pad-key="pe1" function="TC2" group="LOC2B"/>
+                <signal pad-key="pe2" function="TC2" group="LOC2C"/>
+                <signal pad-key="pe3" function="TC2" group="LOC2D"/>
+                <signal pad-key="pe4" function="TC2" group="HOC2A"/>
+                <signal pad-key="pe5" function="TC2" group="HOC2B"/>
+                <signal pad-key="pe6" function="TC2" group="HOC2C"/>
+                <signal pad-key="pe7" function="TC2" group="HOC2D"/>
             </signals>
         </peripheral>
         <peripheral key="tcf2" name="TCF2" module-key="i6090_tc2">
             <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"/>
-                <signal pad-id="pf2" function="TC2" group="LOC2C"/>
-                <signal pad-id="pf3" function="TC2" group="LOC2D"/>
-                <signal pad-id="pf4" function="TC2" group="HOC2A"/>
-                <signal pad-id="pf5" function="TC2" group="HOC2B"/>
-                <signal pad-id="pf6" function="TC2" group="HOC2C"/>
-                <signal pad-id="pf7" function="TC2" group="HOC2D"/>
+                <signal pad-key="pf0" function="TC2" group="LOC2A"/>
+                <signal pad-key="pf1" function="TC2" group="LOC2B"/>
+                <signal pad-key="pf2" function="TC2" group="LOC2C"/>
+                <signal pad-key="pf3" function="TC2" group="LOC2D"/>
+                <signal pad-key="pf4" function="TC2" group="HOC2A"/>
+                <signal pad-key="pf5" function="TC2" group="HOC2B"/>
+                <signal pad-key="pf6" function="TC2" group="HOC2C"/>
+                <signal pad-key="pf7" function="TC2" group="HOC2D"/>
             </signals>
         </peripheral>
         <peripheral key="awexc" name="AWEXC" module-key="i6090_awex">
             <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"/>
-                <signal pad-id="pc2" function="AWEX" group="OC0BLS"/>
-                <signal pad-id="pc3" function="AWEX" group="OC0BHS"/>
-                <signal pad-id="pc4" function="AWEX" group="OC0CLS"/>
-                <signal pad-id="pc5" function="AWEX" group="OC0CHS"/>
-                <signal pad-id="pc6" function="AWEX" group="OC0DLS"/>
-                <signal pad-id="pc7" function="AWEX" group="OC0DHS"/>
+                <signal pad-key="pc0" function="AWEX" group="OC0ALS"/>
+                <signal pad-key="pc1" function="AWEX" group="OC0AHS"/>
+                <signal pad-key="pc2" function="AWEX" group="OC0BLS"/>
+                <signal pad-key="pc3" function="AWEX" group="OC0BHS"/>
+                <signal pad-key="pc4" function="AWEX" group="OC0CLS"/>
+                <signal pad-key="pc5" function="AWEX" group="OC0CHS"/>
+                <signal pad-key="pc6" function="AWEX" group="OC0DLS"/>
+                <signal pad-key="pc7" function="AWEX" group="OC0DHS"/>
             </signals>
         </peripheral>
         <peripheral key="hiresc" name="HIRESC" module-key="i6090_hires">
@@ -400,50 +400,50 @@
         <peripheral key="usartc0" name="USARTC0" module-key="i6090_usart">
             <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"/>
-                <signal pad-id="pc3" function="USART" group="TXD" field="USART0"/>
-                <signal pad-id="pc5" function="USART_ALT" group="XCK" field="USART0"/>
-                <signal pad-id="pc6" function="USART_ALT" group="RXD" field="USART0"/>
-                <signal pad-id="pc7" function="USART_ALT" group="TXD" field="USART0"/>
+                <signal pad-key="pc1" function="USART" group="XCK" field="USART0"/>
+                <signal pad-key="pc2" function="USART" group="RXD" field="USART0"/>
+                <signal pad-key="pc3" function="USART" group="TXD" field="USART0"/>
+                <signal pad-key="pc5" function="USART_ALT" group="XCK" field="USART0"/>
+                <signal pad-key="pc6" function="USART_ALT" group="RXD" field="USART0"/>
+                <signal pad-key="pc7" function="USART_ALT" group="TXD" field="USART0"/>
             </signals>
         </peripheral>
         <peripheral key="usartd0" name="USARTD0" module-key="i6090_usart">
             <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"/>
-                <signal pad-id="pd3" function="USART" group="TXD"/>
+                <signal pad-key="pd1" function="USART" group="XCK"/>
+                <signal pad-key="pd2" function="USART" group="RXD"/>
+                <signal pad-key="pd3" function="USART" group="TXD"/>
             </signals>
         </peripheral>
         <peripheral key="usarte0" name="USARTE0" module-key="i6090_usart">
             <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"/>
-                <signal pad-id="pe3" function="USART" group="TXD"/>
+                <signal pad-key="pe1" function="USART" group="XCK"/>
+                <signal pad-key="pe2" function="USART" group="RXD"/>
+                <signal pad-key="pe3" function="USART" group="TXD"/>
             </signals>
         </peripheral>
         <peripheral key="spic" name="SPIC" module-key="i6090_spi">
             <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"/>
-                <signal pad-id="pc6" function="SPI" group="MISO" field="SPI"/>
-                <signal pad-id="pc7" function="SPI" group="SCK" field="SPI"/>
-                <signal pad-id="pc4" function="SPI_ALT" group="SS" field="SPI"/>
-                <signal pad-id="pc5" function="SPI_ALT" group="SCK" field="SPI"/>
-                <signal pad-id="pc6" function="SPI_ALT" group="MISO" field="SPI"/>
-                <signal pad-id="pc7" function="SPI_ALT" group="MOSI" field="SPI"/>
+                <signal pad-key="pc4" function="SPI" group="SS" field="SPI"/>
+                <signal pad-key="pc5" function="SPI" group="MOSI" field="SPI"/>
+                <signal pad-key="pc6" function="SPI" group="MISO" field="SPI"/>
+                <signal pad-key="pc7" function="SPI" group="SCK" field="SPI"/>
+                <signal pad-key="pc4" function="SPI_ALT" group="SS" field="SPI"/>
+                <signal pad-key="pc5" function="SPI_ALT" group="SCK" field="SPI"/>
+                <signal pad-key="pc6" function="SPI_ALT" group="MISO" field="SPI"/>
+                <signal pad-key="pc7" function="SPI_ALT" group="MOSI" field="SPI"/>
             </signals>
         </peripheral>
         <peripheral key="spid" name="SPID" module-key="i6090_spi">
             <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"/>
-                <signal pad-id="pd6" function="SPI" group="MISO"/>
-                <signal pad-id="pd7" function="SPI" group="SCK"/>
+                <signal pad-key="pd4" function="SPI" group="SS"/>
+                <signal pad-key="pd5" function="SPI" group="MOSI"/>
+                <signal pad-key="pd6" function="SPI" group="MISO"/>
+                <signal pad-key="pd7" function="SPI" group="SCK"/>
             </signals>
         </peripheral>
         <peripheral key="ircom" name="IRCOM" module-key="i6090_ircom">
@@ -1579,78 +1579,135 @@
             </register-group>
         </module>
     </modules>
+    <pads>
+        <pad key="pa3" name="PA3"/>
+        <pad key="pa4" name="PA4"/>
+        <pad key="pa5" name="PA5"/>
+        <pad key="pa6" name="PA6"/>
+        <pad key="pa7" name="PA7"/>
+        <pad key="pb0" name="PB0"/>
+        <pad key="pb1" name="PB1"/>
+        <pad key="pb2" name="PB2"/>
+        <pad key="pb3" name="PB3"/>
+        <pad key="pb4" name="PB4"/>
+        <pad key="pb5" name="PB5"/>
+        <pad key="pb6" name="PB6"/>
+        <pad key="pb7" name="PB7"/>
+        <pad key="gnd" name="GND"/>
+        <pad key="vcc" name="VCC"/>
+        <pad key="pc0" name="PC0"/>
+        <pad key="pc1" name="PC1"/>
+        <pad key="pc2" name="PC2"/>
+        <pad key="pc3" name="PC3"/>
+        <pad key="pc4" name="PC4"/>
+        <pad key="pc5" name="PC5"/>
+        <pad key="pc6" name="PC6"/>
+        <pad key="pc7" name="PC7"/>
+        <pad key="pd0" name="PD0"/>
+        <pad key="pd1" name="PD1"/>
+        <pad key="pd2" name="PD2"/>
+        <pad key="pd3" name="PD3"/>
+        <pad key="pd4" name="PD4"/>
+        <pad key="pd5" name="PD5"/>
+        <pad key="pd6" name="PD6"/>
+        <pad key="pd7" name="PD7"/>
+        <pad key="pe0" name="PE0"/>
+        <pad key="pe1" name="PE1"/>
+        <pad key="pe2" name="PE2"/>
+        <pad key="pe3" name="PE3"/>
+        <pad key="pe4" name="PE4"/>
+        <pad key="pe5" name="PE5"/>
+        <pad key="pe6" name="PE6"/>
+        <pad key="pe7" name="PE7"/>
+        <pad key="pf0" name="PF0"/>
+        <pad key="pf1" name="PF1"/>
+        <pad key="pf2" name="PF2"/>
+        <pad key="pf3" name="PF3"/>
+        <pad key="pf4" name="PF4"/>
+        <pad key="pf5" name="PF5"/>
+        <pad key="pf6" name="PF6"/>
+        <pad key="pf7" name="PF7"/>
+        <pad key="pdi" name="PDI"/>
+        <pad key="reset" name="RESET"/>
+        <pad key="pr0" name="PR0"/>
+        <pad key="pr1" name="PR1"/>
+        <pad key="avcc" name="AVCC"/>
+        <pad key="pa0" name="PA0"/>
+        <pad key="pa1" name="PA1"/>
+        <pad key="pa2" name="PA2"/>
+    </pads>
     <pinouts>
         <pinout key="qfp_qfn_64" name="QFP_QFN_64" type="qfn">
-            <pin position="1" pad="PA3"/>
-            <pin position="2" pad="PA4"/>
-            <pin position="3" pad="PA5"/>
-            <pin position="4" pad="PA6"/>
-            <pin position="5" pad="PA7"/>
-            <pin position="6" pad="PB0"/>
-            <pin position="7" pad="PB1"/>
-            <pin position="8" pad="PB2"/>
-            <pin position="9" pad="PB3"/>
-            <pin position="10" pad="PB4"/>
-            <pin position="11" pad="PB5"/>
-            <pin position="12" pad="PB6"/>
-            <pin position="13" pad="PB7"/>
-            <pin position="14" pad="GND"/>
-            <pin position="15" pad="VCC"/>
-            <pin position="16" pad="PC0"/>
-            <pin position="17" pad="PC1"/>
-            <pin position="18" pad="PC2"/>
-            <pin position="19" pad="PC3"/>
-            <pin position="20" pad="PC4"/>
-            <pin position="21" pad="PC5"/>
-            <pin position="22" pad="PC6"/>
-            <pin position="23" pad="PC7"/>
-            <pin position="24" pad="GND"/>
-            <pin position="25" pad="VCC"/>
-            <pin position="26" pad="PD0"/>
-            <pin position="27" pad="PD1"/>
-            <pin position="28" pad="PD2"/>
-            <pin position="29" pad="PD3"/>
-            <pin position="30" pad="PD4"/>
-            <pin position="31" pad="PD5"/>
-            <pin position="32" pad="PD6"/>
-            <pin position="33" pad="PD7"/>
-            <pin position="34" pad="GND"/>
-            <pin position="35" pad="VCC"/>
-            <pin position="36" pad="PE0"/>
-            <pin position="37" pad="PE1"/>
-            <pin position="38" pad="PE2"/>
-            <pin position="39" pad="PE3"/>
-            <pin position="40" pad="PE4"/>
-            <pin position="41" pad="PE5"/>
-            <pin position="42" pad="PE6"/>
-            <pin position="43" pad="PE7"/>
-            <pin position="44" pad="GND"/>
-            <pin position="45" pad="VCC"/>
-            <pin position="46" pad="PF0"/>
-            <pin position="47" pad="PF1"/>
-            <pin position="48" pad="PF2"/>
-            <pin position="49" pad="PF3"/>
-            <pin position="50" pad="PF4"/>
-            <pin position="51" pad="PF5"/>
-            <pin position="52" pad="GND"/>
-            <pin position="53" pad="VCC"/>
-            <pin position="54" pad="PF6"/>
-            <pin position="55" pad="PF7"/>
-            <pin position="56" pad="PDI"/>
-            <pin position="57" pad="RESET"/>
-            <pin position="58" pad="PR0"/>
-            <pin position="59" pad="PR1"/>
-            <pin position="60" pad="GND"/>
-            <pin position="61" pad="AVCC"/>
-            <pin position="62" pad="PA0"/>
-            <pin position="63" pad="PA1"/>
-            <pin position="64" pad="PA2"/>
+            <pin position="1" pad-key="pa3"/>
+            <pin position="2" pad-key="pa4"/>
+            <pin position="3" pad-key="pa5"/>
+            <pin position="4" pad-key="pa6"/>
+            <pin position="5" pad-key="pa7"/>
+            <pin position="6" pad-key="pb0"/>
+            <pin position="7" pad-key="pb1"/>
+            <pin position="8" pad-key="pb2"/>
+            <pin position="9" pad-key="pb3"/>
+            <pin position="10" pad-key="pb4"/>
+            <pin position="11" pad-key="pb5"/>
+            <pin position="12" pad-key="pb6"/>
+            <pin position="13" pad-key="pb7"/>
+            <pin position="14" pad-key="gnd"/>
+            <pin position="15" pad-key="vcc"/>
+            <pin position="16" pad-key="pc0"/>
+            <pin position="17" pad-key="pc1"/>
+            <pin position="18" pad-key="pc2"/>
+            <pin position="19" pad-key="pc3"/>
+            <pin position="20" pad-key="pc4"/>
+            <pin position="21" pad-key="pc5"/>
+            <pin position="22" pad-key="pc6"/>
+            <pin position="23" pad-key="pc7"/>
+            <pin position="24" pad-key="gnd"/>
+            <pin position="25" pad-key="vcc"/>
+            <pin position="26" pad-key="pd0"/>
+            <pin position="27" pad-key="pd1"/>
+            <pin position="28" pad-key="pd2"/>
+            <pin position="29" pad-key="pd3"/>
+            <pin position="30" pad-key="pd4"/>
+            <pin position="31" pad-key="pd5"/>
+            <pin position="32" pad-key="pd6"/>
+            <pin position="33" pad-key="pd7"/>
+            <pin position="34" pad-key="gnd"/>
+            <pin position="35" pad-key="vcc"/>
+            <pin position="36" pad-key="pe0"/>
+            <pin position="37" pad-key="pe1"/>
+            <pin position="38" pad-key="pe2"/>
+            <pin position="39" pad-key="pe3"/>
+            <pin position="40" pad-key="pe4"/>
+            <pin position="41" pad-key="pe5"/>
+            <pin position="42" pad-key="pe6"/>
+            <pin position="43" pad-key="pe7"/>
+            <pin position="44" pad-key="gnd"/>
+            <pin position="45" pad-key="vcc"/>
+            <pin position="46" pad-key="pf0"/>
+            <pin position="47" pad-key="pf1"/>
+            <pin position="48" pad-key="pf2"/>
+            <pin position="49" pad-key="pf3"/>
+            <pin position="50" pad-key="pf4"/>
+            <pin position="51" pad-key="pf5"/>
+            <pin position="52" pad-key="gnd"/>
+            <pin position="53" pad-key="vcc"/>
+            <pin position="54" pad-key="pf6"/>
+            <pin position="55" pad-key="pf7"/>
+            <pin position="56" pad-key="pdi"/>
+            <pin position="57" pad-key="reset"/>
+            <pin position="58" pad-key="pr0"/>
+            <pin position="59" pad-key="pr1"/>
+            <pin position="60" pad-key="gnd"/>
+            <pin position="61" pad-key="avcc"/>
+            <pin position="62" pad-key="pa0"/>
+            <pin position="63" pad-key="pa1"/>
+            <pin position="64" pad-key="pa2"/>
         </pinout>
     </pinouts>
     <variants>
-        <variant name="ATxmega64C3-AU" pinout-key="qfp_qfn_64" package="TQFP64"/>
-        <variant name="ATxmega64C3-MH" pinout-key="qfp_qfn_64" package="QFN64"/>
-        <variant name="ATxmega64C3-AN" pinout-key="qfp_qfn_64" package="TQFP64"/>
-        <variant name="ATxmega64C3-M7" pinout-key="qfp_qfn_64" package="QFN64"/>
+        <variant key="atxmega64c3_au" name="ATxmega64C3-AU" pinout-key="qfp_qfn_64"/>
+        <variant key="atxmega64c3_mh" name="ATxmega64C3-MH" pinout-key="qfp_qfn_64"/>
+        <variant key="atxmega64c3_an" name="ATxmega64C3-AN" pinout-key="qfp_qfn_64"/>
+        <variant key="atxmega64c3_m7" name="ATxmega64C3-M7" pinout-key="qfp_qfn_64"/>
     </variants>
 </device>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA64D3.xml b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA64D3.xml
index 208c24a4..863ff339 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA64D3.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA64D3.xml
@@ -81,10 +81,10 @@
         <peripheral key="osc" name="OSC" module-key="i6079">
             <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"/>
-                <signal pad-id="pe2" function="TOSC" group="TOSC2"/>
-                <signal pad-id="pe3" function="TOSC" group="TOSC1"/>
+                <signal pad-key="pr0" function="XTAL" group="XTAL2"/>
+                <signal pad-key="pr1" function="XTAL" group="XTAL1"/>
+                <signal pad-key="pe2" function="TOSC" group="TOSC2"/>
+                <signal pad-key="pe3" function="TOSC" group="TOSC1"/>
             </signals>
         </peripheral>
         <peripheral key="dfllrc32m" name="DFLLRC32M" module-key="i6055">
@@ -126,39 +126,39 @@
         <peripheral key="aca" name="ACA" module-key="i6077">
             <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"/>
-                <signal pad-id="pa2" index="2" function="AC" group="AC"/>
-                <signal pad-id="pa3" index="3" function="AC" group="AC"/>
-                <signal pad-id="pa4" index="4" function="AC" group="AC"/>
-                <signal pad-id="pa5" index="5" function="AC" group="AC"/>
-                <signal pad-id="pa6" index="6" function="AC" group="AC"/>
-                <signal pad-id="pa7" index="7" function="AC" group="AC"/>
-                <signal pad-id="pa6" index="1" function="ACOUT" group="ACOUT"/>
-                <signal pad-id="pa7" index="0" function="ACOUT" group="ACOUT"/>
+                <signal pad-key="pa0" index="0" function="AC" group="AC"/>
+                <signal pad-key="pa1" index="1" function="AC" group="AC"/>
+                <signal pad-key="pa2" index="2" function="AC" group="AC"/>
+                <signal pad-key="pa3" index="3" function="AC" group="AC"/>
+                <signal pad-key="pa4" index="4" function="AC" group="AC"/>
+                <signal pad-key="pa5" index="5" function="AC" group="AC"/>
+                <signal pad-key="pa6" index="6" function="AC" group="AC"/>
+                <signal pad-key="pa7" index="7" function="AC" group="AC"/>
+                <signal pad-key="pa6" index="1" function="ACOUT" group="ACOUT"/>
+                <signal pad-key="pa7" index="0" function="ACOUT" group="ACOUT"/>
             </signals>
         </peripheral>
         <peripheral key="adca" name="ADCA" module-key="i6110">
             <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"/>
-                <signal pad-id="pa2" index="2" function="ADC" group="ADC"/>
-                <signal pad-id="pa3" index="3" function="ADC" group="ADC"/>
-                <signal pad-id="pa4" index="4" function="ADC" group="ADC"/>
-                <signal pad-id="pa5" index="5" function="ADC" group="ADC"/>
-                <signal pad-id="pa6" index="6" function="ADC" group="ADC"/>
-                <signal pad-id="pa7" index="7" function="ADC" group="ADC"/>
-                <signal pad-id="pb0" index="8" function="ADC" group="ADC"/>
-                <signal pad-id="pb1" index="9" function="ADC" group="ADC"/>
-                <signal pad-id="pb2" index="10" function="ADC" group="ADC"/>
-                <signal pad-id="pb3" index="11" function="ADC" group="ADC"/>
-                <signal pad-id="pb4" index="12" function="ADC" group="ADC"/>
-                <signal pad-id="pb5" index="13" function="ADC" group="ADC"/>
-                <signal pad-id="pb6" index="14" function="ADC" group="ADC"/>
-                <signal pad-id="pb7" index="15" function="ADC" group="ADC"/>
-                <signal pad-id="pa0" index="0" function="AREF" group="REFA"/>
-                <signal pad-id="pb0" index="0" function="AREF" group="REFB"/>
+                <signal pad-key="pa0" index="0" function="ADC" group="ADC"/>
+                <signal pad-key="pa1" index="1" function="ADC" group="ADC"/>
+                <signal pad-key="pa2" index="2" function="ADC" group="ADC"/>
+                <signal pad-key="pa3" index="3" function="ADC" group="ADC"/>
+                <signal pad-key="pa4" index="4" function="ADC" group="ADC"/>
+                <signal pad-key="pa5" index="5" function="ADC" group="ADC"/>
+                <signal pad-key="pa6" index="6" function="ADC" group="ADC"/>
+                <signal pad-key="pa7" index="7" function="ADC" group="ADC"/>
+                <signal pad-key="pb0" index="8" function="ADC" group="ADC"/>
+                <signal pad-key="pb1" index="9" function="ADC" group="ADC"/>
+                <signal pad-key="pb2" index="10" function="ADC" group="ADC"/>
+                <signal pad-key="pb3" index="11" function="ADC" group="ADC"/>
+                <signal pad-key="pb4" index="12" function="ADC" group="ADC"/>
+                <signal pad-key="pb5" index="13" function="ADC" group="ADC"/>
+                <signal pad-key="pb6" index="14" function="ADC" group="ADC"/>
+                <signal pad-key="pb7" index="15" function="ADC" group="ADC"/>
+                <signal pad-key="pa0" index="0" function="AREF" group="REFA"/>
+                <signal pad-key="pb0" index="0" function="AREF" group="REFB"/>
             </signals>
         </peripheral>
         <peripheral key="rtc" name="RTC" module-key="i6093">
@@ -167,25 +167,25 @@
         <peripheral key="twic" name="TWIC" module-key="i6089">
             <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"/>
+                <signal pad-key="pc0" function="TWI" group="SDA"/>
+                <signal pad-key="pc1" function="TWI" group="SCL"/>
             </signals>
         </peripheral>
         <peripheral key="twie" name="TWIE" module-key="i6089">
             <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"/>
+                <signal pad-key="pe0" function="TWI" group="SDA"/>
+                <signal pad-key="pe1" function="TWI" group="SCL"/>
             </signals>
         </peripheral>
         <peripheral key="port_cfg" name="PORT_CFG" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pc7" function="EVOUT" group="EVOUT" field="EVOUT"/>
-                <signal pad-id="pc4" function="EVOUT_ALT" group="EVOUT" field="CLKEVPIN"/>
-                <signal pad-id="pc6" function="RTCOUTC" group="RTCOUT"/>
+                <signal pad-key="pc7" function="CLKOUT" group="CLKOUT" field="CLKOUT"/>
+                <signal pad-key="pc4" function="CLKOUT_ALT" group="CLKOUT" field="CLKEVPIN"/>
+                <signal pad-key="pc7" function="EVOUT" group="EVOUT" field="EVOUT"/>
+                <signal pad-key="pc4" function="EVOUT_ALT" group="EVOUT" field="CLKEVPIN"/>
+                <signal pad-key="pc6" function="RTCOUTC" group="RTCOUT"/>
             </signals>
         </peripheral>
         <peripheral key="vport0" name="VPORT0" module-key="gpio_port">
@@ -203,119 +203,119 @@
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pa2" index="2" function="PORTA" group="P"/>
-                <signal pad-id="pa3" index="3" function="PORTA" group="P"/>
-                <signal pad-id="pa4" index="4" function="PORTA" group="P"/>
-                <signal pad-id="pa5" index="5" function="PORTA" group="P"/>
-                <signal pad-id="pa6" index="6" function="PORTA" group="P"/>
-                <signal pad-id="pa7" index="7" function="PORTA" group="P"/>
+                <signal pad-key="pa0" index="0" function="PORTA" group="P"/>
+                <signal pad-key="pa1" index="1" function="PORTA" group="P"/>
+                <signal pad-key="pa2" index="2" function="PORTA" group="P"/>
+                <signal pad-key="pa3" index="3" function="PORTA" group="P"/>
+                <signal pad-key="pa4" index="4" function="PORTA" group="P"/>
+                <signal pad-key="pa5" index="5" function="PORTA" group="P"/>
+                <signal pad-key="pa6" index="6" function="PORTA" group="P"/>
+                <signal pad-key="pa7" index="7" function="PORTA" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pb2" index="2" function="PORTB" group="P"/>
-                <signal pad-id="pb3" index="3" function="PORTB" group="P"/>
-                <signal pad-id="pb4" index="4" function="PORTB" group="P"/>
-                <signal pad-id="pb5" index="5" function="PORTB" group="P"/>
-                <signal pad-id="pb6" index="6" function="PORTB" group="P"/>
-                <signal pad-id="pb7" index="7" function="PORTB" group="P"/>
+                <signal pad-key="pb0" index="0" function="PORTB" group="P"/>
+                <signal pad-key="pb1" index="1" function="PORTB" group="P"/>
+                <signal pad-key="pb2" index="2" function="PORTB" group="P"/>
+                <signal pad-key="pb3" index="3" function="PORTB" group="P"/>
+                <signal pad-key="pb4" index="4" function="PORTB" group="P"/>
+                <signal pad-key="pb5" index="5" function="PORTB" group="P"/>
+                <signal pad-key="pb6" index="6" function="PORTB" group="P"/>
+                <signal pad-key="pb7" index="7" function="PORTB" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pc2" index="2" function="PORTC" group="P"/>
-                <signal pad-id="pc3" index="3" function="PORTC" group="P"/>
-                <signal pad-id="pc4" index="4" function="PORTC" group="P"/>
-                <signal pad-id="pc5" index="5" function="PORTC" group="P"/>
-                <signal pad-id="pc6" index="6" function="PORTC" group="P"/>
-                <signal pad-id="pc7" index="7" function="PORTC" group="P"/>
+                <signal pad-key="pc0" index="0" function="PORTC" group="P"/>
+                <signal pad-key="pc1" index="1" function="PORTC" group="P"/>
+                <signal pad-key="pc2" index="2" function="PORTC" group="P"/>
+                <signal pad-key="pc3" index="3" function="PORTC" group="P"/>
+                <signal pad-key="pc4" index="4" function="PORTC" group="P"/>
+                <signal pad-key="pc5" index="5" function="PORTC" group="P"/>
+                <signal pad-key="pc6" index="6" function="PORTC" group="P"/>
+                <signal pad-key="pc7" index="7" function="PORTC" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pd2" index="2" function="PORTD" group="P"/>
-                <signal pad-id="pd3" index="3" function="PORTD" group="P"/>
-                <signal pad-id="pd4" index="4" function="PORTD" group="P"/>
-                <signal pad-id="pd5" index="5" function="PORTD" group="P"/>
-                <signal pad-id="pd6" index="6" function="PORTD" group="P"/>
-                <signal pad-id="pd7" index="7" function="PORTD" group="P"/>
+                <signal pad-key="pd0" index="0" function="PORTD" group="P"/>
+                <signal pad-key="pd1" index="1" function="PORTD" group="P"/>
+                <signal pad-key="pd2" index="2" function="PORTD" group="P"/>
+                <signal pad-key="pd3" index="3" function="PORTD" group="P"/>
+                <signal pad-key="pd4" index="4" function="PORTD" group="P"/>
+                <signal pad-key="pd5" index="5" function="PORTD" group="P"/>
+                <signal pad-key="pd6" index="6" function="PORTD" group="P"/>
+                <signal pad-key="pd7" index="7" function="PORTD" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="porte" name="PORTE" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pe2" index="2" function="PORTE" group="P"/>
-                <signal pad-id="pe3" index="3" function="PORTE" group="P"/>
-                <signal pad-id="pe4" index="4" function="PORTE" group="P"/>
-                <signal pad-id="pe5" index="5" function="PORTE" group="P"/>
-                <signal pad-id="pe6" index="6" function="PORTE" group="P"/>
-                <signal pad-id="pe7" index="7" function="PORTE" group="P"/>
+                <signal pad-key="pe0" index="0" function="PORTE" group="P"/>
+                <signal pad-key="pe1" index="1" function="PORTE" group="P"/>
+                <signal pad-key="pe2" index="2" function="PORTE" group="P"/>
+                <signal pad-key="pe3" index="3" function="PORTE" group="P"/>
+                <signal pad-key="pe4" index="4" function="PORTE" group="P"/>
+                <signal pad-key="pe5" index="5" function="PORTE" group="P"/>
+                <signal pad-key="pe6" index="6" function="PORTE" group="P"/>
+                <signal pad-key="pe7" index="7" function="PORTE" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portf" name="PORTF" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pf2" index="2" function="PORTF" group="P"/>
-                <signal pad-id="pf3" index="3" function="PORTF" group="P"/>
-                <signal pad-id="pf4" index="4" function="PORTF" group="P"/>
-                <signal pad-id="pf5" index="5" function="PORTF" group="P"/>
-                <signal pad-id="pf6" index="6" function="PORTF" group="P"/>
-                <signal pad-id="pf7" index="7" function="PORTF" group="P"/>
+                <signal pad-key="pf0" index="0" function="PORTF" group="P"/>
+                <signal pad-key="pf1" index="1" function="PORTF" group="P"/>
+                <signal pad-key="pf2" index="2" function="PORTF" group="P"/>
+                <signal pad-key="pf3" index="3" function="PORTF" group="P"/>
+                <signal pad-key="pf4" index="4" function="PORTF" group="P"/>
+                <signal pad-key="pf5" index="5" function="PORTF" group="P"/>
+                <signal pad-key="pf6" index="6" function="PORTF" group="P"/>
+                <signal pad-key="pf7" index="7" function="PORTF" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portr" name="PORTR" module-key="gpio_port">
             <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"/>
+                <signal pad-key="pr0" index="0" function="PORTR" group="P"/>
+                <signal pad-key="pr1" index="1" function="PORTR" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="tcc0" name="TCC0" module-key="i6090_tc">
             <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"/>
-                <signal pad-id="pc2" function="TC0" group="OC0C" field="TC0C"/>
-                <signal pad-id="pc3" function="TC0" group="OC0D" field="TC0D"/>
-                <signal pad-id="pc4" function="TC0_ALT" group="OC0A" field="TC0A"/>
-                <signal pad-id="pc5" function="TC0_ALT" group="OC0B" field="TC0B"/>
-                <signal pad-id="pc6" function="TC0_ALT" group="OC0C" field="TC0C"/>
-                <signal pad-id="pc7" function="TC0_ALT" group="OC0D" field="TC0D"/>
+                <signal pad-key="pc0" function="TC0" group="OC0A" field="TC0A"/>
+                <signal pad-key="pc1" function="TC0" group="OC0B" field="TC0B"/>
+                <signal pad-key="pc2" function="TC0" group="OC0C" field="TC0C"/>
+                <signal pad-key="pc3" function="TC0" group="OC0D" field="TC0D"/>
+                <signal pad-key="pc4" function="TC0_ALT" group="OC0A" field="TC0A"/>
+                <signal pad-key="pc5" function="TC0_ALT" group="OC0B" field="TC0B"/>
+                <signal pad-key="pc6" function="TC0_ALT" group="OC0C" field="TC0C"/>
+                <signal pad-key="pc7" function="TC0_ALT" group="OC0D" field="TC0D"/>
             </signals>
         </peripheral>
         <peripheral key="tcc1" name="TCC1" module-key="i6090_tc">
             <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"/>
+                <signal pad-key="pc4" function="TC1" group="OC1A"/>
+                <signal pad-key="pc5" function="TC1" group="OC1B"/>
             </signals>
         </peripheral>
         <peripheral key="awexc" name="AWEXC" module-key="i6090_tc">
             <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"/>
-                <signal pad-id="pc2" function="AWEX" group="OC0BLS"/>
-                <signal pad-id="pc3" function="AWEX" group="OC0BHS"/>
-                <signal pad-id="pc4" function="AWEX" group="OC0CLS"/>
-                <signal pad-id="pc5" function="AWEX" group="OC0CHS"/>
-                <signal pad-id="pc6" function="AWEX" group="OC0DLS"/>
-                <signal pad-id="pc7" function="AWEX" group="OC0DHS"/>
+                <signal pad-key="pc0" function="AWEX" group="OC0ALS"/>
+                <signal pad-key="pc1" function="AWEX" group="OC0AHS"/>
+                <signal pad-key="pc2" function="AWEX" group="OC0BLS"/>
+                <signal pad-key="pc3" function="AWEX" group="OC0BHS"/>
+                <signal pad-key="pc4" function="AWEX" group="OC0CLS"/>
+                <signal pad-key="pc5" function="AWEX" group="OC0CHS"/>
+                <signal pad-key="pc6" function="AWEX" group="OC0DLS"/>
+                <signal pad-key="pc7" function="AWEX" group="OC0DHS"/>
             </signals>
         </peripheral>
         <peripheral key="hiresc" name="HIRESC" module-key="i6090_tc">
@@ -324,19 +324,19 @@
         <peripheral key="tcd0" name="TCD0" module-key="i6090_tc">
             <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"/>
-                <signal pad-id="pd2" function="TC0" group="OC0C"/>
-                <signal pad-id="pd3" function="TC0" group="OC0D"/>
+                <signal pad-key="pd0" function="TC0" group="OC0A"/>
+                <signal pad-key="pd1" function="TC0" group="OC0B"/>
+                <signal pad-key="pd2" function="TC0" group="OC0C"/>
+                <signal pad-key="pd3" function="TC0" group="OC0D"/>
             </signals>
         </peripheral>
         <peripheral key="tce0" name="TCE0" module-key="i6090_tc">
             <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"/>
-                <signal pad-id="pe2" function="TC0" group="OC0C"/>
-                <signal pad-id="pe3" function="TC0" group="OC0D"/>
+                <signal pad-key="pe0" function="TC0" group="OC0A"/>
+                <signal pad-key="pe1" function="TC0" group="OC0B"/>
+                <signal pad-key="pe2" function="TC0" group="OC0C"/>
+                <signal pad-key="pe3" function="TC0" group="OC0D"/>
             </signals>
         </peripheral>
         <peripheral key="awexe" name="AWEXE" module-key="i6090_tc">
@@ -345,111 +345,111 @@
         <peripheral key="tcf0" name="TCF0" module-key="i6090_tc">
             <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"/>
-                <signal pad-id="pf2" function="TC0" group="OC0C"/>
-                <signal pad-id="pf3" function="TC0" group="OC0D"/>
+                <signal pad-key="pf0" function="TC0" group="OC0A"/>
+                <signal pad-key="pf1" function="TC0" group="OC0B"/>
+                <signal pad-key="pf2" function="TC0" group="OC0C"/>
+                <signal pad-key="pf3" function="TC0" group="OC0D"/>
             </signals>
         </peripheral>
         <peripheral key="tcc2" name="TCC2" module-key="i6090_tc2">
             <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"/>
-                <signal pad-id="pc2" function="TC2" group="LOC2C"/>
-                <signal pad-id="pc3" function="TC2" group="LOC2D"/>
-                <signal pad-id="pc4" function="TC2" group="HOC2A"/>
-                <signal pad-id="pc5" function="TC2" group="HOC2B"/>
-                <signal pad-id="pc6" function="TC2" group="HOC2C"/>
-                <signal pad-id="pc7" function="TC2" group="HOC2D"/>
+                <signal pad-key="pc0" function="TC2" group="LOC2A"/>
+                <signal pad-key="pc1" function="TC2" group="LOC2B"/>
+                <signal pad-key="pc2" function="TC2" group="LOC2C"/>
+                <signal pad-key="pc3" function="TC2" group="LOC2D"/>
+                <signal pad-key="pc4" function="TC2" group="HOC2A"/>
+                <signal pad-key="pc5" function="TC2" group="HOC2B"/>
+                <signal pad-key="pc6" function="TC2" group="HOC2C"/>
+                <signal pad-key="pc7" function="TC2" group="HOC2D"/>
             </signals>
         </peripheral>
         <peripheral key="tcd2" name="TCD2" module-key="i6090_tc2">
             <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"/>
-                <signal pad-id="pd2" function="TC2" group="LOC2C"/>
-                <signal pad-id="pd3" function="TC2" group="LOC2D"/>
-                <signal pad-id="pd4" function="TC2" group="HOC2A"/>
-                <signal pad-id="pd5" function="TC2" group="HOC2B"/>
-                <signal pad-id="pd6" function="TC2" group="HOC2C"/>
-                <signal pad-id="pd7" function="TC2" group="HOC2D"/>
+                <signal pad-key="pd0" function="TC2" group="LOC2A"/>
+                <signal pad-key="pd1" function="TC2" group="LOC2B"/>
+                <signal pad-key="pd2" function="TC2" group="LOC2C"/>
+                <signal pad-key="pd3" function="TC2" group="LOC2D"/>
+                <signal pad-key="pd4" function="TC2" group="HOC2A"/>
+                <signal pad-key="pd5" function="TC2" group="HOC2B"/>
+                <signal pad-key="pd6" function="TC2" group="HOC2C"/>
+                <signal pad-key="pd7" function="TC2" group="HOC2D"/>
             </signals>
         </peripheral>
         <peripheral key="tce2" name="TCE2" module-key="i6090_tc2">
             <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"/>
-                <signal pad-id="pe2" function="TC2" group="LOC2C"/>
-                <signal pad-id="pe3" function="TC2" group="LOC2D"/>
-                <signal pad-id="pe4" function="TC2" group="HOC2A"/>
-                <signal pad-id="pe5" function="TC2" group="HOC2B"/>
-                <signal pad-id="pe6" function="TC2" group="HOC2C"/>
-                <signal pad-id="pe7" function="TC2" group="HOC2D"/>
+                <signal pad-key="pe0" function="TC2" group="LOC2A"/>
+                <signal pad-key="pe1" function="TC2" group="LOC2B"/>
+                <signal pad-key="pe2" function="TC2" group="LOC2C"/>
+                <signal pad-key="pe3" function="TC2" group="LOC2D"/>
+                <signal pad-key="pe4" function="TC2" group="HOC2A"/>
+                <signal pad-key="pe5" function="TC2" group="HOC2B"/>
+                <signal pad-key="pe6" function="TC2" group="HOC2C"/>
+                <signal pad-key="pe7" function="TC2" group="HOC2D"/>
             </signals>
         </peripheral>
         <peripheral key="tcf2" name="TCF2" module-key="i6090_tc2">
             <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"/>
-                <signal pad-id="pf2" function="TC2" group="LOC2C"/>
-                <signal pad-id="pf3" function="TC2" group="LOC2D"/>
-                <signal pad-id="pf4" function="TC2" group="HOC2A"/>
-                <signal pad-id="pf5" function="TC2" group="HOC2B"/>
-                <signal pad-id="pf6" function="TC2" group="HOC2C"/>
-                <signal pad-id="pf7" function="TC2" group="HOC2D"/>
+                <signal pad-key="pf0" function="TC2" group="LOC2A"/>
+                <signal pad-key="pf1" function="TC2" group="LOC2B"/>
+                <signal pad-key="pf2" function="TC2" group="LOC2C"/>
+                <signal pad-key="pf3" function="TC2" group="LOC2D"/>
+                <signal pad-key="pf4" function="TC2" group="HOC2A"/>
+                <signal pad-key="pf5" function="TC2" group="HOC2B"/>
+                <signal pad-key="pf6" function="TC2" group="HOC2C"/>
+                <signal pad-key="pf7" function="TC2" group="HOC2D"/>
             </signals>
         </peripheral>
         <peripheral key="usartc0" name="USARTC0" module-key="i6090_usart">
             <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"/>
-                <signal pad-id="pc3" function="USART" group="TXD" field="USART0"/>
-                <signal pad-id="pc5" function="USART_ALT" group="XCK" field="USART0"/>
-                <signal pad-id="pc6" function="USART_ALT" group="RXD" field="USART0"/>
-                <signal pad-id="pc7" function="USART_ALT" group="TXD" field="USART0"/>
+                <signal pad-key="pc1" function="USART" group="XCK" field="USART0"/>
+                <signal pad-key="pc2" function="USART" group="RXD" field="USART0"/>
+                <signal pad-key="pc3" function="USART" group="TXD" field="USART0"/>
+                <signal pad-key="pc5" function="USART_ALT" group="XCK" field="USART0"/>
+                <signal pad-key="pc6" function="USART_ALT" group="RXD" field="USART0"/>
+                <signal pad-key="pc7" function="USART_ALT" group="TXD" field="USART0"/>
             </signals>
         </peripheral>
         <peripheral key="usartd0" name="USARTD0" module-key="i6090_usart">
             <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"/>
-                <signal pad-id="pd3" function="USART" group="TXD"/>
+                <signal pad-key="pd1" function="USART" group="XCK"/>
+                <signal pad-key="pd2" function="USART" group="RXD"/>
+                <signal pad-key="pd3" function="USART" group="TXD"/>
             </signals>
         </peripheral>
         <peripheral key="usarte0" name="USARTE0" module-key="i6090_usart">
             <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"/>
-                <signal pad-id="pe3" function="USART" group="TXD"/>
+                <signal pad-key="pe1" function="USART" group="XCK"/>
+                <signal pad-key="pe2" function="USART" group="RXD"/>
+                <signal pad-key="pe3" function="USART" group="TXD"/>
             </signals>
         </peripheral>
         <peripheral key="spic" name="SPIC" module-key="i6090_spi">
             <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"/>
-                <signal pad-id="pc6" function="SPI" group="MISO" field="SPI"/>
-                <signal pad-id="pc7" function="SPI" group="SCK" field="SPI"/>
-                <signal pad-id="pc4" function="SPI_ALT" group="SS" field="SPI"/>
-                <signal pad-id="pc5" function="SPI_ALT" group="SCK" field="SPI"/>
-                <signal pad-id="pc6" function="SPI_ALT" group="MISO" field="SPI"/>
-                <signal pad-id="pc7" function="SPI_ALT" group="MOSI" field="SPI"/>
+                <signal pad-key="pc4" function="SPI" group="SS" field="SPI"/>
+                <signal pad-key="pc5" function="SPI" group="MOSI" field="SPI"/>
+                <signal pad-key="pc6" function="SPI" group="MISO" field="SPI"/>
+                <signal pad-key="pc7" function="SPI" group="SCK" field="SPI"/>
+                <signal pad-key="pc4" function="SPI_ALT" group="SS" field="SPI"/>
+                <signal pad-key="pc5" function="SPI_ALT" group="SCK" field="SPI"/>
+                <signal pad-key="pc6" function="SPI_ALT" group="MISO" field="SPI"/>
+                <signal pad-key="pc7" function="SPI_ALT" group="MOSI" field="SPI"/>
             </signals>
         </peripheral>
         <peripheral key="spid" name="SPID" module-key="i6090_spi">
             <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"/>
-                <signal pad-id="pd6" function="SPI" group="MISO"/>
-                <signal pad-id="pd7" function="SPI" group="SCK"/>
+                <signal pad-key="pd4" function="SPI" group="SS"/>
+                <signal pad-key="pd5" function="SPI" group="MOSI"/>
+                <signal pad-key="pd6" function="SPI" group="MISO"/>
+                <signal pad-key="pd7" function="SPI" group="SCK"/>
             </signals>
         </peripheral>
         <peripheral key="spie" name="SPIE" module-key="i6090_spi">
@@ -1408,78 +1408,135 @@
             </register-group>
         </module>
     </modules>
+    <pads>
+        <pad key="pa3" name="PA3"/>
+        <pad key="pa4" name="PA4"/>
+        <pad key="pa5" name="PA5"/>
+        <pad key="pa6" name="PA6"/>
+        <pad key="pa7" name="PA7"/>
+        <pad key="pb0" name="PB0"/>
+        <pad key="pb1" name="PB1"/>
+        <pad key="pb2" name="PB2"/>
+        <pad key="pb3" name="PB3"/>
+        <pad key="pb4" name="PB4"/>
+        <pad key="pb5" name="PB5"/>
+        <pad key="pb6" name="PB6"/>
+        <pad key="pb7" name="PB7"/>
+        <pad key="gnd" name="GND"/>
+        <pad key="vcc" name="VCC"/>
+        <pad key="pc0" name="PC0"/>
+        <pad key="pc1" name="PC1"/>
+        <pad key="pc2" name="PC2"/>
+        <pad key="pc3" name="PC3"/>
+        <pad key="pc4" name="PC4"/>
+        <pad key="pc5" name="PC5"/>
+        <pad key="pc6" name="PC6"/>
+        <pad key="pc7" name="PC7"/>
+        <pad key="pd0" name="PD0"/>
+        <pad key="pd1" name="PD1"/>
+        <pad key="pd2" name="PD2"/>
+        <pad key="pd3" name="PD3"/>
+        <pad key="pd4" name="PD4"/>
+        <pad key="pd5" name="PD5"/>
+        <pad key="pd6" name="PD6"/>
+        <pad key="pd7" name="PD7"/>
+        <pad key="pe0" name="PE0"/>
+        <pad key="pe1" name="PE1"/>
+        <pad key="pe2" name="PE2"/>
+        <pad key="pe3" name="PE3"/>
+        <pad key="pe4" name="PE4"/>
+        <pad key="pe5" name="PE5"/>
+        <pad key="pe6" name="PE6"/>
+        <pad key="pe7" name="PE7"/>
+        <pad key="pf0" name="PF0"/>
+        <pad key="pf1" name="PF1"/>
+        <pad key="pf2" name="PF2"/>
+        <pad key="pf3" name="PF3"/>
+        <pad key="pf4" name="PF4"/>
+        <pad key="pf5" name="PF5"/>
+        <pad key="pf6" name="PF6"/>
+        <pad key="pf7" name="PF7"/>
+        <pad key="pdi" name="PDI"/>
+        <pad key="reset" name="RESET"/>
+        <pad key="pr0" name="PR0"/>
+        <pad key="pr1" name="PR1"/>
+        <pad key="avcc" name="AVCC"/>
+        <pad key="pa0" name="PA0"/>
+        <pad key="pa1" name="PA1"/>
+        <pad key="pa2" name="PA2"/>
+    </pads>
     <pinouts>
         <pinout key="qfp_qfn_64" name="QFP_QFN_64" type="qfn">
-            <pin position="1" pad="PA3"/>
-            <pin position="2" pad="PA4"/>
-            <pin position="3" pad="PA5"/>
-            <pin position="4" pad="PA6"/>
-            <pin position="5" pad="PA7"/>
-            <pin position="6" pad="PB0"/>
-            <pin position="7" pad="PB1"/>
-            <pin position="8" pad="PB2"/>
-            <pin position="9" pad="PB3"/>
-            <pin position="10" pad="PB4"/>
-            <pin position="11" pad="PB5"/>
-            <pin position="12" pad="PB6"/>
-            <pin position="13" pad="PB7"/>
-            <pin position="14" pad="GND"/>
-            <pin position="15" pad="VCC"/>
-            <pin position="16" pad="PC0"/>
-            <pin position="17" pad="PC1"/>
-            <pin position="18" pad="PC2"/>
-            <pin position="19" pad="PC3"/>
-            <pin position="20" pad="PC4"/>
-            <pin position="21" pad="PC5"/>
-            <pin position="22" pad="PC6"/>
-            <pin position="23" pad="PC7"/>
-            <pin position="24" pad="GND"/>
-            <pin position="25" pad="VCC"/>
-            <pin position="26" pad="PD0"/>
-            <pin position="27" pad="PD1"/>
-            <pin position="28" pad="PD2"/>
-            <pin position="29" pad="PD3"/>
-            <pin position="30" pad="PD4"/>
-            <pin position="31" pad="PD5"/>
-            <pin position="32" pad="PD6"/>
-            <pin position="33" pad="PD7"/>
-            <pin position="34" pad="GND"/>
-            <pin position="35" pad="VCC"/>
-            <pin position="36" pad="PE0"/>
-            <pin position="37" pad="PE1"/>
-            <pin position="38" pad="PE2"/>
-            <pin position="39" pad="PE3"/>
-            <pin position="40" pad="PE4"/>
-            <pin position="41" pad="PE5"/>
-            <pin position="42" pad="PE6"/>
-            <pin position="43" pad="PE7"/>
-            <pin position="44" pad="GND"/>
-            <pin position="45" pad="VCC"/>
-            <pin position="46" pad="PF0"/>
-            <pin position="47" pad="PF1"/>
-            <pin position="48" pad="PF2"/>
-            <pin position="49" pad="PF3"/>
-            <pin position="50" pad="PF4"/>
-            <pin position="51" pad="PF5"/>
-            <pin position="52" pad="GND"/>
-            <pin position="53" pad="VCC"/>
-            <pin position="54" pad="PF6"/>
-            <pin position="55" pad="PF7"/>
-            <pin position="56" pad="PDI"/>
-            <pin position="57" pad="RESET"/>
-            <pin position="58" pad="PR0"/>
-            <pin position="59" pad="PR1"/>
-            <pin position="60" pad="GND"/>
-            <pin position="61" pad="AVCC"/>
-            <pin position="62" pad="PA0"/>
-            <pin position="63" pad="PA1"/>
-            <pin position="64" pad="PA2"/>
+            <pin position="1" pad-key="pa3"/>
+            <pin position="2" pad-key="pa4"/>
+            <pin position="3" pad-key="pa5"/>
+            <pin position="4" pad-key="pa6"/>
+            <pin position="5" pad-key="pa7"/>
+            <pin position="6" pad-key="pb0"/>
+            <pin position="7" pad-key="pb1"/>
+            <pin position="8" pad-key="pb2"/>
+            <pin position="9" pad-key="pb3"/>
+            <pin position="10" pad-key="pb4"/>
+            <pin position="11" pad-key="pb5"/>
+            <pin position="12" pad-key="pb6"/>
+            <pin position="13" pad-key="pb7"/>
+            <pin position="14" pad-key="gnd"/>
+            <pin position="15" pad-key="vcc"/>
+            <pin position="16" pad-key="pc0"/>
+            <pin position="17" pad-key="pc1"/>
+            <pin position="18" pad-key="pc2"/>
+            <pin position="19" pad-key="pc3"/>
+            <pin position="20" pad-key="pc4"/>
+            <pin position="21" pad-key="pc5"/>
+            <pin position="22" pad-key="pc6"/>
+            <pin position="23" pad-key="pc7"/>
+            <pin position="24" pad-key="gnd"/>
+            <pin position="25" pad-key="vcc"/>
+            <pin position="26" pad-key="pd0"/>
+            <pin position="27" pad-key="pd1"/>
+            <pin position="28" pad-key="pd2"/>
+            <pin position="29" pad-key="pd3"/>
+            <pin position="30" pad-key="pd4"/>
+            <pin position="31" pad-key="pd5"/>
+            <pin position="32" pad-key="pd6"/>
+            <pin position="33" pad-key="pd7"/>
+            <pin position="34" pad-key="gnd"/>
+            <pin position="35" pad-key="vcc"/>
+            <pin position="36" pad-key="pe0"/>
+            <pin position="37" pad-key="pe1"/>
+            <pin position="38" pad-key="pe2"/>
+            <pin position="39" pad-key="pe3"/>
+            <pin position="40" pad-key="pe4"/>
+            <pin position="41" pad-key="pe5"/>
+            <pin position="42" pad-key="pe6"/>
+            <pin position="43" pad-key="pe7"/>
+            <pin position="44" pad-key="gnd"/>
+            <pin position="45" pad-key="vcc"/>
+            <pin position="46" pad-key="pf0"/>
+            <pin position="47" pad-key="pf1"/>
+            <pin position="48" pad-key="pf2"/>
+            <pin position="49" pad-key="pf3"/>
+            <pin position="50" pad-key="pf4"/>
+            <pin position="51" pad-key="pf5"/>
+            <pin position="52" pad-key="gnd"/>
+            <pin position="53" pad-key="vcc"/>
+            <pin position="54" pad-key="pf6"/>
+            <pin position="55" pad-key="pf7"/>
+            <pin position="56" pad-key="pdi"/>
+            <pin position="57" pad-key="reset"/>
+            <pin position="58" pad-key="pr0"/>
+            <pin position="59" pad-key="pr1"/>
+            <pin position="60" pad-key="gnd"/>
+            <pin position="61" pad-key="avcc"/>
+            <pin position="62" pad-key="pa0"/>
+            <pin position="63" pad-key="pa1"/>
+            <pin position="64" pad-key="pa2"/>
         </pinout>
     </pinouts>
     <variants>
-        <variant name="ATxmega64D3-AU" pinout-key="qfp_qfn_64" package="TQFP64"/>
-        <variant name="ATxmega64D3-MH" pinout-key="qfp_qfn_64" package="QFN64"/>
-        <variant name="ATxmega64D3-AN" pinout-key="qfp_qfn_64" package="TQFP64"/>
-        <variant name="ATxmega64D3-MN" pinout-key="qfp_qfn_64" package="QFN64"/>
+        <variant key="atxmega64d3_au" name="ATxmega64D3-AU" pinout-key="qfp_qfn_64"/>
+        <variant key="atxmega64d3_mh" name="ATxmega64D3-MH" pinout-key="qfp_qfn_64"/>
+        <variant key="atxmega64d3_an" name="ATxmega64D3-AN" pinout-key="qfp_qfn_64"/>
+        <variant key="atxmega64d3_mn" name="ATxmega64D3-MN" pinout-key="qfp_qfn_64"/>
     </variants>
 </device>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA64D4.xml b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA64D4.xml
index c389457f..0c608208 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA64D4.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA64D4.xml
@@ -92,12 +92,12 @@
         <peripheral key="osc" name="OSC" module-key="i6079">
             <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"/>
-                <signal pad-id="pr0" function="TOSC" group="TOSC2"/>
-                <signal pad-id="pr1" function="TOSC" group="TOSC1"/>
-                <signal pad-id="pe2" function="TOSC_ALT" group="TOSC2"/>
-                <signal pad-id="pe3" function="TOSC_ALT" group="TOSC1"/>
+                <signal pad-key="pr0" function="XTAL" group="XTAL2"/>
+                <signal pad-key="pr1" function="XTAL" group="XTAL1"/>
+                <signal pad-key="pr0" function="TOSC" group="TOSC2"/>
+                <signal pad-key="pr1" function="TOSC" group="TOSC1"/>
+                <signal pad-key="pe2" function="TOSC_ALT" group="TOSC2"/>
+                <signal pad-key="pe3" function="TOSC_ALT" group="TOSC1"/>
             </signals>
         </peripheral>
         <peripheral key="dfllrc32m" name="DFLLRC32M" module-key="i6055">
@@ -121,11 +121,11 @@
         <peripheral key="portcfg" name="PORTCFG" module-key="i6075_portcfg">
             <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"/>
-                <signal pad-id="pc7" function="EVOUT" group="EVOUT" field="EVOUT"/>
-                <signal pad-id="pc4" function="EVOUT_ALT" group="EVOUT" field="CLKEVPIN"/>
-                <signal pad-id="pc6" function="RTCOUTC" group="RTCOUT"/>
+                <signal pad-key="pc7" function="CLKOUT" group="CLKOUT" field="CLKOUT"/>
+                <signal pad-key="pc4" function="CLKOUT_ALT" group="CLKOUT" field="CLKEVPIN"/>
+                <signal pad-key="pc7" function="EVOUT" group="EVOUT" field="EVOUT"/>
+                <signal pad-key="pc4" function="EVOUT_ALT" group="EVOUT" field="CLKEVPIN"/>
+                <signal pad-key="pc6" function="RTCOUTC" group="RTCOUT"/>
             </signals>
         </peripheral>
         <peripheral key="crc" name="CRC" module-key="i6111">
@@ -140,34 +140,34 @@
         <peripheral key="adca" name="ADCA" module-key="i6110">
             <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"/>
-                <signal pad-id="pa2" index="2" function="ADC" group="ADC"/>
-                <signal pad-id="pa3" index="3" function="ADC" group="ADC"/>
-                <signal pad-id="pa4" index="4" function="ADC" group="ADC"/>
-                <signal pad-id="pa5" index="5" function="ADC" group="ADC"/>
-                <signal pad-id="pa6" index="6" function="ADC" group="ADC"/>
-                <signal pad-id="pa7" index="7" function="ADC" group="ADC"/>
-                <signal pad-id="pb0" index="8" function="ADC" group="ADC"/>
-                <signal pad-id="pb1" index="9" function="ADC" group="ADC"/>
-                <signal pad-id="pb2" index="10" function="ADC" group="ADC"/>
-                <signal pad-id="pb3" index="11" function="ADC" group="ADC"/>
-                <signal pad-id="pa0" index="0" function="AREF" group="REFA"/>
-                <signal pad-id="pb0" index="0" function="AREF" group="REFB"/>
+                <signal pad-key="pa0" index="0" function="ADC" group="ADC"/>
+                <signal pad-key="pa1" index="1" function="ADC" group="ADC"/>
+                <signal pad-key="pa2" index="2" function="ADC" group="ADC"/>
+                <signal pad-key="pa3" index="3" function="ADC" group="ADC"/>
+                <signal pad-key="pa4" index="4" function="ADC" group="ADC"/>
+                <signal pad-key="pa5" index="5" function="ADC" group="ADC"/>
+                <signal pad-key="pa6" index="6" function="ADC" group="ADC"/>
+                <signal pad-key="pa7" index="7" function="ADC" group="ADC"/>
+                <signal pad-key="pb0" index="8" function="ADC" group="ADC"/>
+                <signal pad-key="pb1" index="9" function="ADC" group="ADC"/>
+                <signal pad-key="pb2" index="10" function="ADC" group="ADC"/>
+                <signal pad-key="pb3" index="11" function="ADC" group="ADC"/>
+                <signal pad-key="pa0" index="0" function="AREF" group="REFA"/>
+                <signal pad-key="pb0" index="0" function="AREF" group="REFB"/>
             </signals>
         </peripheral>
         <peripheral key="aca" name="ACA" module-key="i6077">
             <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"/>
-                <signal pad-id="pa2" index="2" function="AC" group="AC"/>
-                <signal pad-id="pa3" index="3" function="AC" group="AC"/>
-                <signal pad-id="pa4" index="4" function="AC" group="AC"/>
-                <signal pad-id="pa5" index="5" function="AC" group="AC"/>
-                <signal pad-id="pa6" index="6" function="AC" group="AC"/>
-                <signal pad-id="pa7" index="7" function="AC" group="AC"/>
-                <signal pad-id="pa7" index="0" function="ACOUT" group="ACOUT"/>
+                <signal pad-key="pa0" index="0" function="AC" group="AC"/>
+                <signal pad-key="pa1" index="1" function="AC" group="AC"/>
+                <signal pad-key="pa2" index="2" function="AC" group="AC"/>
+                <signal pad-key="pa3" index="3" function="AC" group="AC"/>
+                <signal pad-key="pa4" index="4" function="AC" group="AC"/>
+                <signal pad-key="pa5" index="5" function="AC" group="AC"/>
+                <signal pad-key="pa6" index="6" function="AC" group="AC"/>
+                <signal pad-key="pa7" index="7" function="AC" group="AC"/>
+                <signal pad-key="pa7" index="0" function="ACOUT" group="ACOUT"/>
             </signals>
         </peripheral>
         <peripheral key="rtc" name="RTC" module-key="i6093">
@@ -176,156 +176,156 @@
         <peripheral key="twic" name="TWIC" module-key="i6089">
             <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"/>
+                <signal pad-key="pc0" function="TWI" group="SDA"/>
+                <signal pad-key="pc1" function="TWI" group="SCL"/>
             </signals>
         </peripheral>
         <peripheral key="twie" name="TWIE" module-key="i6089">
             <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"/>
+                <signal pad-key="pe0" function="TWI" group="SDA"/>
+                <signal pad-key="pe1" function="TWI" group="SCL"/>
             </signals>
         </peripheral>
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pa2" index="2" function="PORTA" group="P"/>
-                <signal pad-id="pa3" index="3" function="PORTA" group="P"/>
-                <signal pad-id="pa4" index="4" function="PORTA" group="P"/>
-                <signal pad-id="pa5" index="5" function="PORTA" group="P"/>
-                <signal pad-id="pa6" index="6" function="PORTA" group="P"/>
-                <signal pad-id="pa7" index="7" function="PORTA" group="P"/>
+                <signal pad-key="pa0" index="0" function="PORTA" group="P"/>
+                <signal pad-key="pa1" index="1" function="PORTA" group="P"/>
+                <signal pad-key="pa2" index="2" function="PORTA" group="P"/>
+                <signal pad-key="pa3" index="3" function="PORTA" group="P"/>
+                <signal pad-key="pa4" index="4" function="PORTA" group="P"/>
+                <signal pad-key="pa5" index="5" function="PORTA" group="P"/>
+                <signal pad-key="pa6" index="6" function="PORTA" group="P"/>
+                <signal pad-key="pa7" index="7" function="PORTA" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pb2" index="2" function="PORTB" group="P"/>
-                <signal pad-id="pb3" index="3" function="PORTB" group="P"/>
+                <signal pad-key="pb0" index="0" function="PORTB" group="P"/>
+                <signal pad-key="pb1" index="1" function="PORTB" group="P"/>
+                <signal pad-key="pb2" index="2" function="PORTB" group="P"/>
+                <signal pad-key="pb3" index="3" function="PORTB" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pc2" index="2" function="PORTC" group="P"/>
-                <signal pad-id="pc3" index="3" function="PORTC" group="P"/>
-                <signal pad-id="pc4" index="4" function="PORTC" group="P"/>
-                <signal pad-id="pc5" index="5" function="PORTC" group="P"/>
-                <signal pad-id="pc6" index="6" function="PORTC" group="P"/>
-                <signal pad-id="pc7" index="7" function="PORTC" group="P"/>
+                <signal pad-key="pc0" index="0" function="PORTC" group="P"/>
+                <signal pad-key="pc1" index="1" function="PORTC" group="P"/>
+                <signal pad-key="pc2" index="2" function="PORTC" group="P"/>
+                <signal pad-key="pc3" index="3" function="PORTC" group="P"/>
+                <signal pad-key="pc4" index="4" function="PORTC" group="P"/>
+                <signal pad-key="pc5" index="5" function="PORTC" group="P"/>
+                <signal pad-key="pc6" index="6" function="PORTC" group="P"/>
+                <signal pad-key="pc7" index="7" function="PORTC" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pd2" index="2" function="PORTD" group="P"/>
-                <signal pad-id="pd3" index="3" function="PORTD" group="P"/>
-                <signal pad-id="pd4" index="4" function="PORTD" group="P"/>
-                <signal pad-id="pd5" index="5" function="PORTD" group="P"/>
-                <signal pad-id="pd6" index="6" function="PORTD" group="P"/>
-                <signal pad-id="pd7" index="7" function="PORTD" group="P"/>
+                <signal pad-key="pd0" index="0" function="PORTD" group="P"/>
+                <signal pad-key="pd1" index="1" function="PORTD" group="P"/>
+                <signal pad-key="pd2" index="2" function="PORTD" group="P"/>
+                <signal pad-key="pd3" index="3" function="PORTD" group="P"/>
+                <signal pad-key="pd4" index="4" function="PORTD" group="P"/>
+                <signal pad-key="pd5" index="5" function="PORTD" group="P"/>
+                <signal pad-key="pd6" index="6" function="PORTD" group="P"/>
+                <signal pad-key="pd7" index="7" function="PORTD" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="porte" name="PORTE" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pe2" index="2" function="PORTE" group="P"/>
-                <signal pad-id="pe3" index="3" function="PORTE" group="P"/>
+                <signal pad-key="pe0" index="0" function="PORTE" group="P"/>
+                <signal pad-key="pe1" index="1" function="PORTE" group="P"/>
+                <signal pad-key="pe2" index="2" function="PORTE" group="P"/>
+                <signal pad-key="pe3" index="3" function="PORTE" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portr" name="PORTR" module-key="gpio_port">
             <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"/>
+                <signal pad-key="pr0" index="0" function="PORTR" group="P"/>
+                <signal pad-key="pr1" index="1" function="PORTR" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="tcc0" name="TCC0" module-key="i6090_tc">
             <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"/>
-                <signal pad-id="pc2" function="TCC" group="OC0C" field="TC0C"/>
-                <signal pad-id="pc3" function="TCC" group="OC0D" field="TC0D"/>
-                <signal pad-id="pc4" function="TCC_ALT" group="OC0A" field="TC0A"/>
-                <signal pad-id="pc5" function="TCC_ALT" group="OC0B" field="TC0B"/>
-                <signal pad-id="pc6" function="TCC_ALT" group="OC0C" field="TC0C"/>
-                <signal pad-id="pc7" function="TCC_ALT" group="OC0D" field="TC0D"/>
+                <signal pad-key="pc0" function="TCC" group="OC0A" field="TC0A"/>
+                <signal pad-key="pc1" function="TCC" group="OC0B" field="TC0B"/>
+                <signal pad-key="pc2" function="TCC" group="OC0C" field="TC0C"/>
+                <signal pad-key="pc3" function="TCC" group="OC0D" field="TC0D"/>
+                <signal pad-key="pc4" function="TCC_ALT" group="OC0A" field="TC0A"/>
+                <signal pad-key="pc5" function="TCC_ALT" group="OC0B" field="TC0B"/>
+                <signal pad-key="pc6" function="TCC_ALT" group="OC0C" field="TC0C"/>
+                <signal pad-key="pc7" function="TCC_ALT" group="OC0D" field="TC0D"/>
             </signals>
         </peripheral>
         <peripheral key="tcc1" name="TCC1" module-key="i6090_tc">
             <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"/>
+                <signal pad-key="pc4" function="TCC" group="OC1A"/>
+                <signal pad-key="pc5" function="TCC" group="OC1B"/>
             </signals>
         </peripheral>
         <peripheral key="tcd0" name="TCD0" module-key="i6090_tc">
             <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"/>
-                <signal pad-id="pd2" function="TCC" group="OC0C"/>
-                <signal pad-id="pd3" function="TCC" group="OC0D"/>
+                <signal pad-key="pd0" function="TCC" group="OC0A"/>
+                <signal pad-key="pd1" function="TCC" group="OC0B"/>
+                <signal pad-key="pd2" function="TCC" group="OC0C"/>
+                <signal pad-key="pd3" function="TCC" group="OC0D"/>
             </signals>
         </peripheral>
         <peripheral key="tce0" name="TCE0" module-key="i6090_tc">
             <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"/>
-                <signal pad-id="pe2" function="TCE" group="OC0C"/>
-                <signal pad-id="pe3" function="TCE" group="OC0D"/>
+                <signal pad-key="pe0" function="TCE" group="OC0A"/>
+                <signal pad-key="pe1" function="TCE" group="OC0B"/>
+                <signal pad-key="pe2" function="TCE" group="OC0C"/>
+                <signal pad-key="pe3" function="TCE" group="OC0D"/>
             </signals>
         </peripheral>
         <peripheral key="tcc2" name="TCC2" module-key="i6090_tc2">
             <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"/>
-                <signal pad-id="pc2" function="TCC2" group="LOC2C"/>
-                <signal pad-id="pc3" function="TCC2" group="LOC2D"/>
-                <signal pad-id="pc4" function="TCC2" group="HOC2A"/>
-                <signal pad-id="pc5" function="TCC2" group="HOC2B"/>
-                <signal pad-id="pc6" function="TCC2" group="HOC2C"/>
-                <signal pad-id="pc7" function="TCC2" group="HOC2D"/>
+                <signal pad-key="pc0" function="TCC2" group="LOC2A"/>
+                <signal pad-key="pc1" function="TCC2" group="LOC2B"/>
+                <signal pad-key="pc2" function="TCC2" group="LOC2C"/>
+                <signal pad-key="pc3" function="TCC2" group="LOC2D"/>
+                <signal pad-key="pc4" function="TCC2" group="HOC2A"/>
+                <signal pad-key="pc5" function="TCC2" group="HOC2B"/>
+                <signal pad-key="pc6" function="TCC2" group="HOC2C"/>
+                <signal pad-key="pc7" function="TCC2" group="HOC2D"/>
             </signals>
         </peripheral>
         <peripheral key="tcd2" name="TCD2" module-key="i6090_tc2">
             <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"/>
-                <signal pad-id="pd2" function="TC2" group="LOC2C"/>
-                <signal pad-id="pd3" function="TC2" group="LOC2D"/>
-                <signal pad-id="pd4" function="TC2" group="HOC2A"/>
-                <signal pad-id="pd5" function="TC2" group="HOC2B"/>
-                <signal pad-id="pd6" function="TC2" group="HOC2C"/>
-                <signal pad-id="pd7" function="TC2" group="HOC2D"/>
+                <signal pad-key="pd0" function="TC2" group="LOC2A"/>
+                <signal pad-key="pd1" function="TC2" group="LOC2B"/>
+                <signal pad-key="pd2" function="TC2" group="LOC2C"/>
+                <signal pad-key="pd3" function="TC2" group="LOC2D"/>
+                <signal pad-key="pd4" function="TC2" group="HOC2A"/>
+                <signal pad-key="pd5" function="TC2" group="HOC2B"/>
+                <signal pad-key="pd6" function="TC2" group="HOC2C"/>
+                <signal pad-key="pd7" function="TC2" group="HOC2D"/>
             </signals>
         </peripheral>
         <peripheral key="awexc" name="AWEXC" module-key="i6090_awex">
             <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"/>
-                <signal pad-id="pc2" function="AWEX" group="OC0BLS"/>
-                <signal pad-id="pc3" function="AWEX" group="OC0BHS"/>
-                <signal pad-id="pc4" function="AWEX" group="OC0CLS"/>
-                <signal pad-id="pc5" function="AWEX" group="OC0CHS"/>
-                <signal pad-id="pc6" function="AWEX" group="OC0DLS"/>
-                <signal pad-id="pc7" function="AWEX" group="OC0DHS"/>
+                <signal pad-key="pc0" function="AWEX" group="OC0ALS"/>
+                <signal pad-key="pc1" function="AWEX" group="OC0AHS"/>
+                <signal pad-key="pc2" function="AWEX" group="OC0BLS"/>
+                <signal pad-key="pc3" function="AWEX" group="OC0BHS"/>
+                <signal pad-key="pc4" function="AWEX" group="OC0CLS"/>
+                <signal pad-key="pc5" function="AWEX" group="OC0CHS"/>
+                <signal pad-key="pc6" function="AWEX" group="OC0DLS"/>
+                <signal pad-key="pc7" function="AWEX" group="OC0DHS"/>
             </signals>
         </peripheral>
         <peripheral key="hiresc" name="HIRESC" module-key="i6090_hires">
@@ -334,42 +334,42 @@
         <peripheral key="usartc0" name="USARTC0" module-key="i6090_usart">
             <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"/>
-                <signal pad-id="pc3" function="USART" group="TXD" field="USART0"/>
-                <signal pad-id="pc5" function="USART_ALT" group="XCK" field="USART0"/>
-                <signal pad-id="pc6" function="USART_ALT" group="RXD" field="USART0"/>
-                <signal pad-id="pc7" function="USART_ALT" group="TXD" field="USART0"/>
+                <signal pad-key="pc1" function="USART" group="XCK" field="USART0"/>
+                <signal pad-key="pc2" function="USART" group="RXD" field="USART0"/>
+                <signal pad-key="pc3" function="USART" group="TXD" field="USART0"/>
+                <signal pad-key="pc5" function="USART_ALT" group="XCK" field="USART0"/>
+                <signal pad-key="pc6" function="USART_ALT" group="RXD" field="USART0"/>
+                <signal pad-key="pc7" function="USART_ALT" group="TXD" field="USART0"/>
             </signals>
         </peripheral>
         <peripheral key="usartd0" name="USARTD0" module-key="i6090_usart">
             <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"/>
-                <signal pad-id="pd3" function="USART" group="TXD"/>
+                <signal pad-key="pd1" function="USART" group="XCK"/>
+                <signal pad-key="pd2" function="USART" group="RXD"/>
+                <signal pad-key="pd3" function="USART" group="TXD"/>
             </signals>
         </peripheral>
         <peripheral key="spic" name="SPIC" module-key="i6090_spi">
             <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"/>
-                <signal pad-id="pc6" function="SPI" group="MISO" field="SPI"/>
-                <signal pad-id="pc7" function="SPI" group="SCK" field="SPI"/>
-                <signal pad-id="pc4" function="SPI_ALT" group="SS" field="SPI"/>
-                <signal pad-id="pc5" function="SPI_ALT" group="SCK" field="SPI"/>
-                <signal pad-id="pc6" function="SPI_ALT" group="MISO" field="SPI"/>
-                <signal pad-id="pc7" function="SPI_ALT" group="MOSI" field="SPI"/>
+                <signal pad-key="pc4" function="SPI" group="SS" field="SPI"/>
+                <signal pad-key="pc5" function="SPI" group="MOSI" field="SPI"/>
+                <signal pad-key="pc6" function="SPI" group="MISO" field="SPI"/>
+                <signal pad-key="pc7" function="SPI" group="SCK" field="SPI"/>
+                <signal pad-key="pc4" function="SPI_ALT" group="SS" field="SPI"/>
+                <signal pad-key="pc5" function="SPI_ALT" group="SCK" field="SPI"/>
+                <signal pad-key="pc6" function="SPI_ALT" group="MISO" field="SPI"/>
+                <signal pad-key="pc7" function="SPI_ALT" group="MOSI" field="SPI"/>
             </signals>
         </peripheral>
         <peripheral key="spid" name="SPID" module-key="i6090_spi">
             <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"/>
-                <signal pad-id="pd6" function="SPI" group="MISO"/>
-                <signal pad-id="pd7" function="SPI" group="SCK"/>
+                <signal pad-key="pd4" function="SPI" group="SS"/>
+                <signal pad-key="pd5" function="SPI" group="MOSI"/>
+                <signal pad-key="pd6" function="SPI" group="MISO"/>
+                <signal pad-key="pd7" function="SPI" group="SCK"/>
             </signals>
         </peripheral>
         <peripheral key="ircom" name="IRCOM" module-key="i6090_ircom">
@@ -1354,110 +1354,151 @@
             </register-group>
         </module>
     </modules>
+    <pads>
+        <pad key="pa5" name="PA5"/>
+        <pad key="pa6" name="PA6"/>
+        <pad key="pa7" name="PA7"/>
+        <pad key="pb0" name="PB0"/>
+        <pad key="pb1" name="PB1"/>
+        <pad key="pb2" name="PB2"/>
+        <pad key="pb3" name="PB3"/>
+        <pad key="gnd" name="GND"/>
+        <pad key="vcc" name="VCC"/>
+        <pad key="pc0" name="PC0"/>
+        <pad key="pc1" name="PC1"/>
+        <pad key="pc2" name="PC2"/>
+        <pad key="pc3" name="PC3"/>
+        <pad key="pc4" name="PC4"/>
+        <pad key="pc5" name="PC5"/>
+        <pad key="pc6" name="PC6"/>
+        <pad key="pc7" name="PC7"/>
+        <pad key="pd0" name="PD0"/>
+        <pad key="pd1" name="PD1"/>
+        <pad key="pd2" name="PD2"/>
+        <pad key="pd3" name="PD3"/>
+        <pad key="pd4" name="PD4"/>
+        <pad key="pd5" name="PD5"/>
+        <pad key="pd6" name="PD6"/>
+        <pad key="pd7" name="PD7"/>
+        <pad key="pe0" name="PE0"/>
+        <pad key="pe1" name="PE1"/>
+        <pad key="pe2" name="PE2"/>
+        <pad key="pe3" name="PE3"/>
+        <pad key="pdi" name="PDI"/>
+        <pad key="reset" name="RESET"/>
+        <pad key="pr0" name="PR0"/>
+        <pad key="pr1" name="PR1"/>
+        <pad key="avcc" name="AVCC"/>
+        <pad key="pa0" name="PA0"/>
+        <pad key="pa1" name="PA1"/>
+        <pad key="pa2" name="PA2"/>
+        <pad key="pa3" name="PA3"/>
+        <pad key="pa4" name="PA4"/>
+    </pads>
     <pinouts>
         <pinout key="qfn_qfp_44" name="QFN_QFP_44" type="qfn">
-            <pin position="1" pad="PA5"/>
-            <pin position="2" pad="PA6"/>
-            <pin position="3" pad="PA7"/>
-            <pin position="4" pad="PB0"/>
-            <pin position="5" pad="PB1"/>
-            <pin position="6" pad="PB2"/>
-            <pin position="7" pad="PB3"/>
-            <pin position="8" pad="GND"/>
-            <pin position="9" pad="VCC"/>
-            <pin position="10" pad="PC0"/>
-            <pin position="11" pad="PC1"/>
-            <pin position="12" pad="PC2"/>
-            <pin position="13" pad="PC3"/>
-            <pin position="14" pad="PC4"/>
-            <pin position="15" pad="PC5"/>
-            <pin position="16" pad="PC6"/>
-            <pin position="17" pad="PC7"/>
-            <pin position="18" pad="GND"/>
-            <pin position="19" pad="VCC"/>
-            <pin position="20" pad="PD0"/>
-            <pin position="21" pad="PD1"/>
-            <pin position="22" pad="PD2"/>
-            <pin position="23" pad="PD3"/>
-            <pin position="24" pad="PD4"/>
-            <pin position="25" pad="PD5"/>
-            <pin position="26" pad="PD6"/>
-            <pin position="27" pad="PD7"/>
-            <pin position="28" pad="PE0"/>
-            <pin position="29" pad="PE1"/>
-            <pin position="30" pad="GND"/>
-            <pin position="31" pad="VCC"/>
-            <pin position="32" pad="PE2"/>
-            <pin position="33" pad="PE3"/>
-            <pin position="34" pad="PDI"/>
-            <pin position="35" pad="RESET"/>
-            <pin position="36" pad="PR0"/>
-            <pin position="37" pad="PR1"/>
-            <pin position="38" pad="GND"/>
-            <pin position="39" pad="AVCC"/>
-            <pin position="40" pad="PA0"/>
-            <pin position="41" pad="PA1"/>
-            <pin position="42" pad="PA2"/>
-            <pin position="43" pad="PA3"/>
-            <pin position="44" pad="PA4"/>
+            <pin position="1" pad-key="pa5"/>
+            <pin position="2" pad-key="pa6"/>
+            <pin position="3" pad-key="pa7"/>
+            <pin position="4" pad-key="pb0"/>
+            <pin position="5" pad-key="pb1"/>
+            <pin position="6" pad-key="pb2"/>
+            <pin position="7" pad-key="pb3"/>
+            <pin position="8" pad-key="gnd"/>
+            <pin position="9" pad-key="vcc"/>
+            <pin position="10" pad-key="pc0"/>
+            <pin position="11" pad-key="pc1"/>
+            <pin position="12" pad-key="pc2"/>
+            <pin position="13" pad-key="pc3"/>
+            <pin position="14" pad-key="pc4"/>
+            <pin position="15" pad-key="pc5"/>
+            <pin position="16" pad-key="pc6"/>
+            <pin position="17" pad-key="pc7"/>
+            <pin position="18" pad-key="gnd"/>
+            <pin position="19" pad-key="vcc"/>
+            <pin position="20" pad-key="pd0"/>
+            <pin position="21" pad-key="pd1"/>
+            <pin position="22" pad-key="pd2"/>
+            <pin position="23" pad-key="pd3"/>
+            <pin position="24" pad-key="pd4"/>
+            <pin position="25" pad-key="pd5"/>
+            <pin position="26" pad-key="pd6"/>
+            <pin position="27" pad-key="pd7"/>
+            <pin position="28" pad-key="pe0"/>
+            <pin position="29" pad-key="pe1"/>
+            <pin position="30" pad-key="gnd"/>
+            <pin position="31" pad-key="vcc"/>
+            <pin position="32" pad-key="pe2"/>
+            <pin position="33" pad-key="pe3"/>
+            <pin position="34" pad-key="pdi"/>
+            <pin position="35" pad-key="reset"/>
+            <pin position="36" pad-key="pr0"/>
+            <pin position="37" pad-key="pr1"/>
+            <pin position="38" pad-key="gnd"/>
+            <pin position="39" pad-key="avcc"/>
+            <pin position="40" pad-key="pa0"/>
+            <pin position="41" pad-key="pa1"/>
+            <pin position="42" pad-key="pa2"/>
+            <pin position="43" pad-key="pa3"/>
+            <pin position="44" pad-key="pa4"/>
         </pinout>
         <pinout key="bga_49" name="BGA_49" type="bga">
-            <pin position="A1" pad="PA3"/>
-            <pin position="A2" pad="AVCC"/>
-            <pin position="A3" pad="GND"/>
-            <pin position="A4" pad="PR1"/>
-            <pin position="A5" pad="PR0"/>
-            <pin position="A6" pad="PDI"/>
-            <pin position="A7" pad="PE3"/>
-            <pin position="B1" pad="PA4"/>
-            <pin position="B2" pad="PA1"/>
-            <pin position="B3" pad="PA0"/>
-            <pin position="B4" pad="GND"/>
-            <pin position="B5" pad="RESET"/>
-            <pin position="B6" pad="PE2"/>
-            <pin position="B7" pad="VCC"/>
-            <pin position="C1" pad="PA5"/>
-            <pin position="C2" pad="PA2"/>
-            <pin position="C3" pad="PA6"/>
-            <pin position="C4" pad="PA7"/>
-            <pin position="C5" pad="GND"/>
-            <pin position="C6" pad="PE1"/>
-            <pin position="C7" pad="GND"/>
-            <pin position="D1" pad="PB1"/>
-            <pin position="D2" pad="PB2"/>
-            <pin position="D3" pad="PB3"/>
-            <pin position="D4" pad="PB0"/>
-            <pin position="D5" pad="GND"/>
-            <pin position="D6" pad="PD7"/>
-            <pin position="D7" pad="PE0"/>
-            <pin position="E1" pad="GND"/>
-            <pin position="E2" pad="GND"/>
-            <pin position="E3" pad="PC3"/>
-            <pin position="E4" pad="GND"/>
-            <pin position="E5" pad="PD4"/>
-            <pin position="E6" pad="PD5"/>
-            <pin position="E7" pad="PD6"/>
-            <pin position="F1" pad="VCC"/>
-            <pin position="F2" pad="PC0"/>
-            <pin position="F3" pad="PC4"/>
-            <pin position="F4" pad="PC6"/>
-            <pin position="F5" pad="PD0"/>
-            <pin position="F6" pad="PD1"/>
-            <pin position="F7" pad="PD3"/>
-            <pin position="G1" pad="PC1"/>
-            <pin position="G2" pad="PC2"/>
-            <pin position="G3" pad="PC5"/>
-            <pin position="G4" pad="PC7"/>
-            <pin position="G5" pad="GND"/>
-            <pin position="G6" pad="VCC"/>
-            <pin position="G7" pad="PD2"/>
+            <pin position="A1" pad-key="pa3"/>
+            <pin position="A2" pad-key="avcc"/>
+            <pin position="A3" pad-key="gnd"/>
+            <pin position="A4" pad-key="pr1"/>
+            <pin position="A5" pad-key="pr0"/>
+            <pin position="A6" pad-key="pdi"/>
+            <pin position="A7" pad-key="pe3"/>
+            <pin position="B1" pad-key="pa4"/>
+            <pin position="B2" pad-key="pa1"/>
+            <pin position="B3" pad-key="pa0"/>
+            <pin position="B4" pad-key="gnd"/>
+            <pin position="B5" pad-key="reset"/>
+            <pin position="B6" pad-key="pe2"/>
+            <pin position="B7" pad-key="vcc"/>
+            <pin position="C1" pad-key="pa5"/>
+            <pin position="C2" pad-key="pa2"/>
+            <pin position="C3" pad-key="pa6"/>
+            <pin position="C4" pad-key="pa7"/>
+            <pin position="C5" pad-key="gnd"/>
+            <pin position="C6" pad-key="pe1"/>
+            <pin position="C7" pad-key="gnd"/>
+            <pin position="D1" pad-key="pb1"/>
+            <pin position="D2" pad-key="pb2"/>
+            <pin position="D3" pad-key="pb3"/>
+            <pin position="D4" pad-key="pb0"/>
+            <pin position="D5" pad-key="gnd"/>
+            <pin position="D6" pad-key="pd7"/>
+            <pin position="D7" pad-key="pe0"/>
+            <pin position="E1" pad-key="gnd"/>
+            <pin position="E2" pad-key="gnd"/>
+            <pin position="E3" pad-key="pc3"/>
+            <pin position="E4" pad-key="gnd"/>
+            <pin position="E5" pad-key="pd4"/>
+            <pin position="E6" pad-key="pd5"/>
+            <pin position="E7" pad-key="pd6"/>
+            <pin position="F1" pad-key="vcc"/>
+            <pin position="F2" pad-key="pc0"/>
+            <pin position="F3" pad-key="pc4"/>
+            <pin position="F4" pad-key="pc6"/>
+            <pin position="F5" pad-key="pd0"/>
+            <pin position="F6" pad-key="pd1"/>
+            <pin position="F7" pad-key="pd3"/>
+            <pin position="G1" pad-key="pc1"/>
+            <pin position="G2" pad-key="pc2"/>
+            <pin position="G3" pad-key="pc5"/>
+            <pin position="G4" pad-key="pc7"/>
+            <pin position="G5" pad-key="gnd"/>
+            <pin position="G6" pad-key="vcc"/>
+            <pin position="G7" pad-key="pd2"/>
         </pinout>
     </pinouts>
     <variants>
-        <variant name="ATxmega64D4-AU" pinout-key="qfn_qfp_44" package="TQFP44"/>
-        <variant name="ATxmega64D4-MH" pinout-key="qfn_qfp_44" package="VQFN44"/>
-        <variant name="ATxmega64D4-CU" pinout-key="bga_49" package="VFBGA49"/>
-        <variant name="ATxmega64D4-AN" pinout-key="qfn_qfp_44" package="TQFP44"/>
-        <variant name="ATxmega64D4-M7" pinout-key="bga_49" package="VFBGA49"/>
+        <variant key="atxmega64d4_au" name="ATxmega64D4-AU" pinout-key="qfn_qfp_44"/>
+        <variant key="atxmega64d4_mh" name="ATxmega64D4-MH" pinout-key="qfn_qfp_44"/>
+        <variant key="atxmega64d4_cu" name="ATxmega64D4-CU" pinout-key="bga_49"/>
+        <variant key="atxmega64d4_an" name="ATxmega64D4-AN" pinout-key="qfn_qfp_44"/>
+        <variant key="atxmega64d4_m7" name="ATxmega64D4-M7" pinout-key="bga_49"/>
     </variants>
 </device>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA8E5.xml b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA8E5.xml
index 34e7b4c8..a1921103 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA8E5.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA8E5.xml
@@ -83,7 +83,7 @@
         <peripheral key="clk" name="CLK" module-key="i6073_clk">
             <register-group-instance register-group-key="clk" address-space-key="data" offset="0x40"/>
             <signals>
-                <signal pad-id="pc4" function="EXTERNAL_CLOCK" group="EXTCLK"/>
+                <signal pad-key="pc4" function="EXTERNAL_CLOCK" group="EXTCLK"/>
             </signals>
         </peripheral>
         <peripheral key="pr" name="PR" module-key="i6073_pr">
@@ -95,10 +95,10 @@
         <peripheral key="osc" name="OSC" module-key="i6079">
             <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"/>
-                <signal pad-id="pr0" function="TOSC" group="TOSC2"/>
-                <signal pad-id="pr1" function="TOSC" group="TOSC1"/>
+                <signal pad-key="pr0" function="XTAL" group="XTAL2"/>
+                <signal pad-key="pr1" function="XTAL" group="XTAL1"/>
+                <signal pad-key="pr0" function="TOSC" group="TOSC2"/>
+                <signal pad-key="pr1" function="TOSC" group="TOSC1"/>
             </signals>
         </peripheral>
         <peripheral key="dfllrc32m" name="DFLLRC32M" module-key="i6055">
@@ -119,14 +119,14 @@
         <peripheral key="portcfg" name="PORTCFG" module-key="i6075_portcfg">
             <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"/>
-                <signal pad-id="pr0" function="CLKOUTR" group="CLKOUT" field="CLKOUT"/>
-                <signal pad-id="pd7" function="EVOUTD" group="EVOUT" field="EVOUT"/>
-                <signal pad-id="pd4" function="EVOUTD_ALT" group="EVOUT" field="CLKEVPIN"/>
-                <signal pad-id="pr0" function="EVOUTR" group="EVOUT" field="EVOUT"/>
-                <signal pad-id="pd6" function="RTCOUTD" group="RTCOUT" field="RTCOUT"/>
-                <signal pad-id="pr0" function="RTCOUTR" group="RTCOUT" field="RTCOUT"/>
+                <signal pad-key="pd7" function="CLKOUTD" group="CLKOUT" field="CLKOUT"/>
+                <signal pad-key="pd4" function="CLKOUTD_ALT" group="CLKOUT" field="CLKEVPIN"/>
+                <signal pad-key="pr0" function="CLKOUTR" group="CLKOUT" field="CLKOUT"/>
+                <signal pad-key="pd7" function="EVOUTD" group="EVOUT" field="EVOUT"/>
+                <signal pad-key="pd4" function="EVOUTD_ALT" group="EVOUT" field="CLKEVPIN"/>
+                <signal pad-key="pr0" function="EVOUTR" group="EVOUT" field="EVOUT"/>
+                <signal pad-key="pd6" function="RTCOUTD" group="RTCOUT" field="RTCOUT"/>
+                <signal pad-key="pr0" function="RTCOUTR" group="RTCOUT" field="RTCOUT"/>
             </signals>
         </peripheral>
         <peripheral key="crc" name="CRC" module-key="i6111">
@@ -144,54 +144,54 @@
         <peripheral key="adca" name="ADCA" module-key="i6110">
             <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"/>
-                <signal pad-id="pa2" index="2" function="ADC" group="ADC"/>
-                <signal pad-id="pa3" index="3" function="ADC" group="ADC"/>
-                <signal pad-id="pa4" index="4" function="ADC" group="ADC"/>
-                <signal pad-id="pa5" index="5" function="ADC" group="ADC"/>
-                <signal pad-id="pa6" index="6" function="ADC" group="ADC"/>
-                <signal pad-id="pa7" index="7" function="ADC" group="ADC"/>
-                <signal pad-id="pd0" index="8" function="ADC" group="ADC"/>
-                <signal pad-id="pd1" index="9" function="ADC" group="ADC"/>
-                <signal pad-id="pd2" index="10" function="ADC" group="ADC"/>
-                <signal pad-id="pd3" index="11" function="ADC" group="ADC"/>
-                <signal pad-id="pd4" index="12" function="ADC" group="ADC"/>
-                <signal pad-id="pd5" index="13" function="ADC" group="ADC"/>
-                <signal pad-id="pd6" index="14" function="ADC" group="ADC"/>
-                <signal pad-id="pd7" index="15" function="ADC" group="ADC"/>
-                <signal pad-id="pa0" index="0" function="AREF" group="REFA"/>
-                <signal pad-id="pd0" index="0" function="AREF" group="REFD"/>
+                <signal pad-key="pa0" index="0" function="ADC" group="ADC"/>
+                <signal pad-key="pa1" index="1" function="ADC" group="ADC"/>
+                <signal pad-key="pa2" index="2" function="ADC" group="ADC"/>
+                <signal pad-key="pa3" index="3" function="ADC" group="ADC"/>
+                <signal pad-key="pa4" index="4" function="ADC" group="ADC"/>
+                <signal pad-key="pa5" index="5" function="ADC" group="ADC"/>
+                <signal pad-key="pa6" index="6" function="ADC" group="ADC"/>
+                <signal pad-key="pa7" index="7" function="ADC" group="ADC"/>
+                <signal pad-key="pd0" index="8" function="ADC" group="ADC"/>
+                <signal pad-key="pd1" index="9" function="ADC" group="ADC"/>
+                <signal pad-key="pd2" index="10" function="ADC" group="ADC"/>
+                <signal pad-key="pd3" index="11" function="ADC" group="ADC"/>
+                <signal pad-key="pd4" index="12" function="ADC" group="ADC"/>
+                <signal pad-key="pd5" index="13" function="ADC" group="ADC"/>
+                <signal pad-key="pd6" index="14" function="ADC" group="ADC"/>
+                <signal pad-key="pd7" index="15" function="ADC" group="ADC"/>
+                <signal pad-key="pa0" index="0" function="AREF" group="REFA"/>
+                <signal pad-key="pd0" index="0" function="AREF" group="REFD"/>
             </signals>
         </peripheral>
         <peripheral key="daca" name="DACA" module-key="i6059">
             <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"/>
-                <signal pad-id="pa0" index="0" function="AREF" group="REFA"/>
-                <signal pad-id="pd0" index="0" function="AREF" group="REFD"/>
+                <signal pad-key="pa2" index="0" function="DAC" group="DAC"/>
+                <signal pad-key="pa3" index="1" function="DAC" group="DAC"/>
+                <signal pad-key="pa0" index="0" function="AREF" group="REFA"/>
+                <signal pad-key="pd0" index="0" function="AREF" group="REFD"/>
             </signals>
         </peripheral>
         <peripheral key="aca" name="ACA" module-key="i6077">
             <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"/>
-                <signal pad-id="pa2" index="2" function="AC" group="AC"/>
-                <signal pad-id="pa3" index="3" function="AC" group="AC"/>
-                <signal pad-id="pa4" index="4" function="AC" group="AC"/>
-                <signal pad-id="pa5" index="5" function="AC" group="AC"/>
-                <signal pad-id="pa6" index="6" function="AC" group="AC"/>
-                <signal pad-id="pa7" index="7" function="AC" group="AC"/>
-                <signal pad-id="pa6" index="1" function="ACOUT_PA" group="ACOUT" field="ACOUT"/>
-                <signal pad-id="pa7" index="0" function="ACOUT_PA" group="ACOUT" field="ACOUT"/>
-                <signal pad-id="pc6" index="1" function="ACOUT_PC" group="ACOUT" field="ACOUT"/>
-                <signal pad-id="pc7" index="0" function="ACOUT_PC" group="ACOUT" field="ACOUT"/>
-                <signal pad-id="pd6" index="1" function="ACOUT_PD" group="ACOUT" field="ACOUT"/>
-                <signal pad-id="pd7" index="0" function="ACOUT_PD" group="ACOUT" field="ACOUT"/>
-                <signal pad-id="pr0" index="1" function="ACOUT_PR" group="ACOUT" field="ACOUT"/>
-                <signal pad-id="pr1" index="0" function="ACOUT_PR" group="ACOUT" field="ACOUT"/>
+                <signal pad-key="pa0" index="0" function="AC" group="AC"/>
+                <signal pad-key="pa1" index="1" function="AC" group="AC"/>
+                <signal pad-key="pa2" index="2" function="AC" group="AC"/>
+                <signal pad-key="pa3" index="3" function="AC" group="AC"/>
+                <signal pad-key="pa4" index="4" function="AC" group="AC"/>
+                <signal pad-key="pa5" index="5" function="AC" group="AC"/>
+                <signal pad-key="pa6" index="6" function="AC" group="AC"/>
+                <signal pad-key="pa7" index="7" function="AC" group="AC"/>
+                <signal pad-key="pa6" index="1" function="ACOUT_PA" group="ACOUT" field="ACOUT"/>
+                <signal pad-key="pa7" index="0" function="ACOUT_PA" group="ACOUT" field="ACOUT"/>
+                <signal pad-key="pc6" index="1" function="ACOUT_PC" group="ACOUT" field="ACOUT"/>
+                <signal pad-key="pc7" index="0" function="ACOUT_PC" group="ACOUT" field="ACOUT"/>
+                <signal pad-key="pd6" index="1" function="ACOUT_PD" group="ACOUT" field="ACOUT"/>
+                <signal pad-key="pd7" index="0" function="ACOUT_PD" group="ACOUT" field="ACOUT"/>
+                <signal pad-key="pr0" index="1" function="ACOUT_PR" group="ACOUT" field="ACOUT"/>
+                <signal pad-key="pr1" index="0" function="ACOUT_PR" group="ACOUT" field="ACOUT"/>
             </signals>
         </peripheral>
         <peripheral key="rtc" name="RTC" module-key="i6093">
@@ -200,110 +200,110 @@
         <peripheral key="xcl" name="XCL" module-key="i3008">
             <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"/>
-                <signal pad-id="pc2" index="0" function="XCLIN_LSB_PC" group="IN"/>
-                <signal pad-id="pc3" index="3" function="XCLIN_LSB_PC" group="IN"/>
-                <signal pad-id="pc4" index="1" function="XCLIN_MSB_PC" group="IN"/>
-                <signal pad-id="pc5" index="2" function="XCLIN_MSB_PC" group="IN"/>
-                <signal pad-id="pc6" index="0" function="XCLIN_MSB_PC" group="IN"/>
-                <signal pad-id="pc7" index="3" function="XCLIN_MSB_PC" group="IN"/>
-                <signal pad-id="pd0" index="1" function="XCLIN_LSB_PD" group="IN"/>
-                <signal pad-id="pd1" index="2" function="XCLIN_LSB_PD" group="IN"/>
-                <signal pad-id="pd2" index="0" function="XCLIN_LSB_PD" group="IN"/>
-                <signal pad-id="pd3" index="3" function="XCLIN_LSB_PD" group="IN"/>
-                <signal pad-id="pd4" index="1" function="XCLIN_MSB_PD" group="IN"/>
-                <signal pad-id="pd5" index="2" function="XCLIN_MSB_PD" group="IN"/>
-                <signal pad-id="pd6" index="0" function="XCLIN_MSB_PD" group="IN"/>
-                <signal pad-id="pd7" index="3" function="XCLIN_MSB_PD" group="IN"/>
-                <signal pad-id="pc0" index="0" function="XCLOUT_LSB_PC" group="OUT"/>
-                <signal pad-id="pc4" index="0" function="XCLOUT_MSB_PC" group="OUT"/>
-                <signal pad-id="pd0" index="0" function="XCLOUT_LSB_PD" group="OUT"/>
-                <signal pad-id="pd4" index="0" function="XCLOUT_LSB_PD" group="OUT"/>
-                <signal pad-id="pd2" index="0" function="XCL_OCOUT" group="OC"/>
-                <signal pad-id="pd3" index="1" function="XCL_OCOUT" group="OC"/>
+                <signal pad-key="pc0" index="1" function="XCLIN_LSB_PC" group="IN"/>
+                <signal pad-key="pc1" index="2" function="XCLIN_LSB_PC" group="IN"/>
+                <signal pad-key="pc2" index="0" function="XCLIN_LSB_PC" group="IN"/>
+                <signal pad-key="pc3" index="3" function="XCLIN_LSB_PC" group="IN"/>
+                <signal pad-key="pc4" index="1" function="XCLIN_MSB_PC" group="IN"/>
+                <signal pad-key="pc5" index="2" function="XCLIN_MSB_PC" group="IN"/>
+                <signal pad-key="pc6" index="0" function="XCLIN_MSB_PC" group="IN"/>
+                <signal pad-key="pc7" index="3" function="XCLIN_MSB_PC" group="IN"/>
+                <signal pad-key="pd0" index="1" function="XCLIN_LSB_PD" group="IN"/>
+                <signal pad-key="pd1" index="2" function="XCLIN_LSB_PD" group="IN"/>
+                <signal pad-key="pd2" index="0" function="XCLIN_LSB_PD" group="IN"/>
+                <signal pad-key="pd3" index="3" function="XCLIN_LSB_PD" group="IN"/>
+                <signal pad-key="pd4" index="1" function="XCLIN_MSB_PD" group="IN"/>
+                <signal pad-key="pd5" index="2" function="XCLIN_MSB_PD" group="IN"/>
+                <signal pad-key="pd6" index="0" function="XCLIN_MSB_PD" group="IN"/>
+                <signal pad-key="pd7" index="3" function="XCLIN_MSB_PD" group="IN"/>
+                <signal pad-key="pc0" index="0" function="XCLOUT_LSB_PC" group="OUT"/>
+                <signal pad-key="pc4" index="0" function="XCLOUT_MSB_PC" group="OUT"/>
+                <signal pad-key="pd0" index="0" function="XCLOUT_LSB_PD" group="OUT"/>
+                <signal pad-key="pd4" index="0" function="XCLOUT_LSB_PD" group="OUT"/>
+                <signal pad-key="pd2" index="0" function="XCL_OCOUT" group="OC"/>
+                <signal pad-key="pd3" index="1" function="XCL_OCOUT" group="OC"/>
             </signals>
         </peripheral>
         <peripheral key="twic" name="TWIC" module-key="i6089">
             <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"/>
-                <signal pad-id="pd0" function="TWI_BRIDGE" group="SDA"/>
-                <signal pad-id="pd1" function="TWI_BRIDGE" group="SCL"/>
+                <signal pad-key="pc0" function="TWI" group="SDA"/>
+                <signal pad-key="pc1" function="TWI" group="SCL"/>
+                <signal pad-key="pd0" function="TWI_BRIDGE" group="SDA"/>
+                <signal pad-key="pd1" function="TWI_BRIDGE" group="SCL"/>
             </signals>
         </peripheral>
         <peripheral key="porta" name="PORTA" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pa2" index="2" function="PORTA" group="P"/>
-                <signal pad-id="pa3" index="3" function="PORTA" group="P"/>
-                <signal pad-id="pa4" index="4" function="PORTA" group="P"/>
-                <signal pad-id="pa5" index="5" function="PORTA" group="P"/>
-                <signal pad-id="pa6" index="6" function="PORTA" group="P"/>
-                <signal pad-id="pa7" index="7" function="PORTA" group="P"/>
+                <signal pad-key="pa0" index="0" function="PORTA" group="P"/>
+                <signal pad-key="pa1" index="1" function="PORTA" group="P"/>
+                <signal pad-key="pa2" index="2" function="PORTA" group="P"/>
+                <signal pad-key="pa3" index="3" function="PORTA" group="P"/>
+                <signal pad-key="pa4" index="4" function="PORTA" group="P"/>
+                <signal pad-key="pa5" index="5" function="PORTA" group="P"/>
+                <signal pad-key="pa6" index="6" function="PORTA" group="P"/>
+                <signal pad-key="pa7" index="7" function="PORTA" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portc" name="PORTC" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pc2" index="2" function="PORTC" group="P"/>
-                <signal pad-id="pc3" index="3" function="PORTC" group="P"/>
-                <signal pad-id="pc4" index="4" function="PORTC" group="P"/>
-                <signal pad-id="pc5" index="5" function="PORTC" group="P"/>
-                <signal pad-id="pc6" index="6" function="PORTC" group="P"/>
-                <signal pad-id="pc7" index="7" function="PORTC" group="P"/>
+                <signal pad-key="pc0" index="0" function="PORTC" group="P"/>
+                <signal pad-key="pc1" index="1" function="PORTC" group="P"/>
+                <signal pad-key="pc2" index="2" function="PORTC" group="P"/>
+                <signal pad-key="pc3" index="3" function="PORTC" group="P"/>
+                <signal pad-key="pc4" index="4" function="PORTC" group="P"/>
+                <signal pad-key="pc5" index="5" function="PORTC" group="P"/>
+                <signal pad-key="pc6" index="6" function="PORTC" group="P"/>
+                <signal pad-key="pc7" index="7" function="PORTC" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portd" name="PORTD" module-key="gpio_port">
             <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"/>
-                <signal pad-id="pd2" index="2" function="PORTD" group="P"/>
-                <signal pad-id="pd3" index="3" function="PORTD" group="P"/>
-                <signal pad-id="pd4" index="4" function="PORTD" group="P"/>
-                <signal pad-id="pd5" index="5" function="PORTD" group="P"/>
-                <signal pad-id="pd6" index="6" function="PORTD" group="P"/>
-                <signal pad-id="pd7" index="7" function="PORTD" group="P"/>
+                <signal pad-key="pd0" index="0" function="PORTD" group="P"/>
+                <signal pad-key="pd1" index="1" function="PORTD" group="P"/>
+                <signal pad-key="pd2" index="2" function="PORTD" group="P"/>
+                <signal pad-key="pd3" index="3" function="PORTD" group="P"/>
+                <signal pad-key="pd4" index="4" function="PORTD" group="P"/>
+                <signal pad-key="pd5" index="5" function="PORTD" group="P"/>
+                <signal pad-key="pd6" index="6" function="PORTD" group="P"/>
+                <signal pad-key="pd7" index="7" function="PORTD" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="portr" name="PORTR" module-key="gpio_port">
             <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"/>
+                <signal pad-key="pr0" index="0" function="PORTR" group="P"/>
+                <signal pad-key="pr1" index="1" function="PORTR" group="P"/>
             </signals>
         </peripheral>
         <peripheral key="tcc4" name="TCC4" module-key="i3007_tc">
             <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"/>
-                <signal pad-id="pc2" function="TC4" group="OC4C" field="TC4C"/>
-                <signal pad-id="pc3" function="TC4" group="OC4D" field="TC4D"/>
-                <signal pad-id="pc4" function="TC4_ALT" group="OC4A" field="TC4A"/>
-                <signal pad-id="pc5" function="TC4_ALT" group="OC4B" field="TC4B"/>
-                <signal pad-id="pc6" function="TC4_ALT" group="OC4C" field="TC4C"/>
-                <signal pad-id="pc7" function="TC4_ALT" group="OC4D" field="TC4D"/>
+                <signal pad-key="pc0" function="TC4" group="OC4A" field="TC4A"/>
+                <signal pad-key="pc1" function="TC4" group="OC4B" field="TC4B"/>
+                <signal pad-key="pc2" function="TC4" group="OC4C" field="TC4C"/>
+                <signal pad-key="pc3" function="TC4" group="OC4D" field="TC4D"/>
+                <signal pad-key="pc4" function="TC4_ALT" group="OC4A" field="TC4A"/>
+                <signal pad-key="pc5" function="TC4_ALT" group="OC4B" field="TC4B"/>
+                <signal pad-key="pc6" function="TC4_ALT" group="OC4C" field="TC4C"/>
+                <signal pad-key="pc7" function="TC4_ALT" group="OC4D" field="TC4D"/>
             </signals>
         </peripheral>
         <peripheral key="tcc5" name="TCC5" module-key="i3007_tc">
             <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"/>
+                <signal pad-key="pc4" function="TC5" group="OC5A"/>
+                <signal pad-key="pc5" function="TC5" group="OC5B"/>
             </signals>
         </peripheral>
         <peripheral key="tcd5" name="TCD5" module-key="i3007_tc">
             <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"/>
+                <signal pad-key="pd4" function="TC5" group="OC5A"/>
+                <signal pad-key="pd5" function="TC5" group="OC5B"/>
             </signals>
         </peripheral>
         <peripheral key="faultc4" name="FAULTC4" module-key="i3620_fault">
@@ -315,14 +315,14 @@
         <peripheral key="wexc" name="WEXC" module-key="i3007_wex">
             <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"/>
-                <signal pad-id="pc2" function="WEX" group="OC4BLS"/>
-                <signal pad-id="pc3" function="WEX" group="OC4BHS"/>
-                <signal pad-id="pc4" function="WEX" group="OC4CLS"/>
-                <signal pad-id="pc5" function="WEX" group="OC4CHS"/>
-                <signal pad-id="pc6" function="WEX" group="OC4DLS"/>
-                <signal pad-id="pc7" function="WEX" group="OC4DHS"/>
+                <signal pad-key="pc0" function="WEX" group="OC4ALS"/>
+                <signal pad-key="pc1" function="WEX" group="OC4AHS"/>
+                <signal pad-key="pc2" function="WEX" group="OC4BLS"/>
+                <signal pad-key="pc3" function="WEX" group="OC4BHS"/>
+                <signal pad-key="pc4" function="WEX" group="OC4CLS"/>
+                <signal pad-key="pc5" function="WEX" group="OC4CHS"/>
+                <signal pad-key="pc6" function="WEX" group="OC4DLS"/>
+                <signal pad-key="pc7" function="WEX" group="OC4DHS"/>
             </signals>
         </peripheral>
         <peripheral key="hiresc" name="HIRESC" module-key="i3620_hires">
@@ -331,32 +331,32 @@
         <peripheral key="usartc0" name="USARTC0" module-key="i4000">
             <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"/>
-                <signal pad-id="pc3" function="USART" group="TXD" field="USART0"/>
-                <signal pad-id="pc5" function="USART_ALT" group="XCK" field="USART0"/>
-                <signal pad-id="pc6" function="USART_ALT" group="RXD" field="USART0"/>
-                <signal pad-id="pc7" function="USART_ALT" group="TXD" field="USART0"/>
+                <signal pad-key="pc1" function="USART" group="XCK" field="USART0"/>
+                <signal pad-key="pc2" function="USART" group="RXD" field="USART0"/>
+                <signal pad-key="pc3" function="USART" group="TXD" field="USART0"/>
+                <signal pad-key="pc5" function="USART_ALT" group="XCK" field="USART0"/>
+                <signal pad-key="pc6" function="USART_ALT" group="RXD" field="USART0"/>
+                <signal pad-key="pc7" function="USART_ALT" group="TXD" field="USART0"/>
             </signals>
         </peripheral>
         <peripheral key="usartd0" name="USARTD0" module-key="i4000">
             <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"/>
-                <signal pad-id="pd3" function="USART" group="TXD" field="USART0"/>
-                <signal pad-id="pd5" function="USART_ALT" group="XCK" field="USART0"/>
-                <signal pad-id="pd6" function="USART_ALT" group="RXD" field="USART0"/>
-                <signal pad-id="pd7" function="USART_ALT" group="TXD" field="USART0"/>
+                <signal pad-key="pd1" function="USART" group="XCK" field="USART0"/>
+                <signal pad-key="pd2" function="USART" group="RXD" field="USART0"/>
+                <signal pad-key="pd3" function="USART" group="TXD" field="USART0"/>
+                <signal pad-key="pd5" function="USART_ALT" group="XCK" field="USART0"/>
+                <signal pad-key="pd6" function="USART_ALT" group="RXD" field="USART0"/>
+                <signal pad-key="pd7" function="USART_ALT" group="TXD" field="USART0"/>
             </signals>
         </peripheral>
         <peripheral key="spic" name="SPIC" module-key="i6090_spi">
             <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"/>
-                <signal pad-id="pc6" function="SPI" group="MISO"/>
-                <signal pad-id="pc7" function="SPI" group="MOSI"/>
+                <signal pad-key="pc4" function="SPI" group="SS"/>
+                <signal pad-key="pc5" function="SPI" group="SCK"/>
+                <signal pad-key="pc6" function="SPI" group="MISO"/>
+                <signal pad-key="pc7" function="SPI" group="MOSI"/>
             </signals>
         </peripheral>
         <peripheral key="ircom" name="IRCOM" module-key="i6090_ircom">
@@ -1763,48 +1763,81 @@
             </register-group>
         </module>
     </modules>
+    <pads>
+        <pad key="gnd" name="GND"/>
+        <pad key="pa4" name="PA4"/>
+        <pad key="pa3" name="PA3"/>
+        <pad key="pa2" name="PA2"/>
+        <pad key="pa1" name="PA1"/>
+        <pad key="pa0" name="PA0"/>
+        <pad key="pdi" name="PDI"/>
+        <pad key="reset" name="RESET"/>
+        <pad key="pc7" name="PC7"/>
+        <pad key="pc6" name="PC6"/>
+        <pad key="pc5" name="PC5"/>
+        <pad key="pc4" name="PC4"/>
+        <pad key="pc3" name="PC3"/>
+        <pad key="pc2" name="PC2"/>
+        <pad key="pc1" name="PC1"/>
+        <pad key="pc0" name="PC0"/>
+        <pad key="vcc" name="VCC"/>
+        <pad key="pr1" name="PR1"/>
+        <pad key="pr0" name="PR0"/>
+        <pad key="pd7" name="PD7"/>
+        <pad key="pd6" name="PD6"/>
+        <pad key="pd5" name="PD5"/>
+        <pad key="pd4" name="PD4"/>
+        <pad key="pd3" name="PD3"/>
+        <pad key="pd2" name="PD2"/>
+        <pad key="pd1" name="PD1"/>
+        <pad key="pd0" name="PD0"/>
+        <pad key="pa7" name="PA7"/>
+        <pad key="pa6" name="PA6"/>
+        <pad key="pa5" name="PA5"/>
+        <pad key="avcc" name="AVCC"/>
+    </pads>
     <pinouts>
         <pinout key="qfp_qfn_32" name="QFP_QFN_32" type="qfn">
-            <pin position="1" pad="GND"/>
-            <pin position="2" pad="PA4"/>
-            <pin position="3" pad="PA3"/>
-            <pin position="4" pad="PA2"/>
-            <pin position="5" pad="PA1"/>
-            <pin position="6" pad="PA0"/>
-            <pin position="7" pad="PDI"/>
-            <pin position="8" pad="RESET"/>
-            <pin position="9" pad="PC7"/>
-            <pin position="10" pad="PC6"/>
-            <pin position="11" pad="PC5"/>
-            <pin position="12" pad="PC4"/>
-            <pin position="13" pad="PC3"/>
-            <pin position="14" pad="PC2"/>
-            <pin position="15" pad="PC1"/>
-            <pin position="16" pad="PC0"/>
-            <pin position="17" pad="VCC"/>
-            <pin position="18" pad="GND"/>
-            <pin position="19" pad="PR1"/>
-            <pin position="20" pad="PR0"/>
-            <pin position="21" pad="PD7"/>
-            <pin position="22" pad="PD6"/>
-            <pin position="23" pad="PD5"/>
-            <pin position="24" pad="PD4"/>
-            <pin position="25" pad="PD3"/>
-            <pin position="26" pad="PD2"/>
-            <pin position="27" pad="PD1"/>
-            <pin position="28" pad="PD0"/>
-            <pin position="29" pad="PA7"/>
-            <pin position="30" pad="PA6"/>
-            <pin position="31" pad="PA5"/>
-            <pin position="32" pad="AVCC"/>
+            <pin position="1" pad-key="gnd"/>
+            <pin position="2" pad-key="pa4"/>
+            <pin position="3" pad-key="pa3"/>
+            <pin position="4" pad-key="pa2"/>
+            <pin position="5" pad-key="pa1"/>
+            <pin position="6" pad-key="pa0"/>
+            <pin position="7" pad-key="pdi"/>
+            <pin position="8" pad-key="reset"/>
+            <pin position="9" pad-key="pc7"/>
+            <pin position="10" pad-key="pc6"/>
+            <pin position="11" pad-key="pc5"/>
+            <pin position="12" pad-key="pc4"/>
+            <pin position="13" pad-key="pc3"/>
+            <pin position="14" pad-key="pc2"/>
+            <pin position="15" pad-key="pc1"/>
+            <pin position="16" pad-key="pc0"/>
+            <pin position="17" pad-key="vcc"/>
+            <pin position="18" pad-key="gnd"/>
+            <pin position="19" pad-key="pr1"/>
+            <pin position="20" pad-key="pr0"/>
+            <pin position="21" pad-key="pd7"/>
+            <pin position="22" pad-key="pd6"/>
+            <pin position="23" pad-key="pd5"/>
+            <pin position="24" pad-key="pd4"/>
+            <pin position="25" pad-key="pd3"/>
+            <pin position="26" pad-key="pd2"/>
+            <pin position="27" pad-key="pd1"/>
+            <pin position="28" pad-key="pd0"/>
+            <pin position="29" pad-key="pa7"/>
+            <pin position="30" pad-key="pa6"/>
+            <pin position="31" pad-key="pa5"/>
+            <pin position="32" pad-key="avcc"/>
         </pinout>
     </pinouts>
     <variants>
-        <variant name="ATxmega8E5-AU" pinout-key="qfp_qfn_32" package="TQFP32"/>
-        <variant name="ATxmega8E5-MU" pinout-key="qfp_qfn_32" package="VQFN32"/>
-        <variant name="ATxmega8E5-M4U" pinout-key="qfp_qfn_32" package="UQFN32"/>
-        <variant name="ATxmega8E5-AN" pinout-key="qfp_qfn_32" package="TQFP32"/>
-        <variant name="ATxmega8E5-MN" pinout-key="qfp_qfn_32" package="VQFN32"/>
-        <variant name="ATxmega8E5-M4N" pinout-key="qfp_qfn_32" package="UQFN32"/>
+        <variant key="atxmega8e5_au" name="ATxmega8E5-AU" pinout-key="qfp_qfn_32"/>
+        <variant key="atxmega8e5_mu" name="ATxmega8E5-MU" pinout-key="qfp_qfn_32"/>
+        <variant key="atxmega8e5_m4u" name="ATxmega8E5-M4U" pinout-key="qfp_qfn_32"/>
+        <variant key="atxmega8e5_an" name="ATxmega8E5-AN" pinout-key="qfp_qfn_32"/>
+        <variant key="atxmega8e5_mn" name="ATxmega8E5-MN" pinout-key="qfp_qfn_32"/>
+        <variant key="atxmega8e5_m4n" name="ATxmega8E5-M4N" pinout-key="qfp_qfn_32"/>
     </variants>
 </device>