From a63dd1b4ef24a796a363f6fe50aa2071e4ef04ca Mon Sep 17 00:00:00 2001
From: Nav <nav@navnav.me>
Date: Wed, 27 Nov 2024 20:02:43 +0000
Subject: [PATCH] Corrected architecture string in AVR8 TDFs

---
 .../AVR8/Avr8TargetDescriptionFile.php           |  6 ++++++
 .../TargetDescriptionFiles/AVR8/AvrIsa.php       | 12 ++++++++++++
 .../AVR8/Services/ValidationService.php          | 16 +++++++++++++++-
 .../AVR8/D-SERIES/AVR128DA28.xml                 |  2 +-
 .../AVR8/D-SERIES/AVR128DA32.xml                 |  2 +-
 .../AVR8/D-SERIES/AVR128DA48.xml                 |  2 +-
 .../AVR8/D-SERIES/AVR128DA64.xml                 |  2 +-
 .../AVR8/D-SERIES/AVR128DB28.xml                 |  2 +-
 .../AVR8/D-SERIES/AVR128DB32.xml                 |  2 +-
 .../AVR8/D-SERIES/AVR128DB48.xml                 |  2 +-
 .../AVR8/D-SERIES/AVR128DB64.xml                 |  2 +-
 .../AVR8/D-SERIES/AVR16DD14.xml                  |  2 +-
 .../AVR8/D-SERIES/AVR16DD20.xml                  |  2 +-
 .../AVR8/D-SERIES/AVR16DD28.xml                  |  2 +-
 .../AVR8/D-SERIES/AVR16DD32.xml                  |  2 +-
 .../AVR8/D-SERIES/AVR32DA28.xml                  |  2 +-
 .../AVR8/D-SERIES/AVR32DA32.xml                  |  2 +-
 .../AVR8/D-SERIES/AVR32DA48.xml                  |  2 +-
 .../AVR8/D-SERIES/AVR32DB28.xml                  |  2 +-
 .../AVR8/D-SERIES/AVR32DB32.xml                  |  2 +-
 .../AVR8/D-SERIES/AVR32DB48.xml                  |  2 +-
 .../AVR8/D-SERIES/AVR32DD14.xml                  |  2 +-
 .../AVR8/D-SERIES/AVR32DD20.xml                  |  2 +-
 .../AVR8/D-SERIES/AVR32DD28.xml                  |  2 +-
 .../AVR8/D-SERIES/AVR32DD32.xml                  |  2 +-
 .../AVR8/D-SERIES/AVR64DA28.xml                  |  2 +-
 .../AVR8/D-SERIES/AVR64DA32.xml                  |  2 +-
 .../AVR8/D-SERIES/AVR64DA48.xml                  |  2 +-
 .../AVR8/D-SERIES/AVR64DA64.xml                  |  2 +-
 .../AVR8/D-SERIES/AVR64DB28.xml                  |  2 +-
 .../AVR8/D-SERIES/AVR64DB32.xml                  |  2 +-
 .../AVR8/D-SERIES/AVR64DB48.xml                  |  2 +-
 .../AVR8/D-SERIES/AVR64DB64.xml                  |  2 +-
 .../AVR8/D-SERIES/AVR64DD14.xml                  |  2 +-
 .../AVR8/D-SERIES/AVR64DD20.xml                  |  2 +-
 .../AVR8/D-SERIES/AVR64DD28.xml                  |  2 +-
 .../AVR8/D-SERIES/AVR64DD32.xml                  |  2 +-
 .../AVR8/E-SERIES/AVR64EA28.xml                  |  2 +-
 .../AVR8/E-SERIES/AVR64EA32.xml                  |  2 +-
 .../AVR8/E-SERIES/AVR64EA48.xml                  |  2 +-
 .../AVR8/MEGA/AT90CAN128.xml                     |  2 +-
 .../AVR8/MEGA/AT90CAN32.xml                      |  2 +-
 .../AVR8/MEGA/AT90CAN64.xml                      |  2 +-
 .../AVR8/MEGA/AT90PWM1.xml                       |  2 +-
 .../AVR8/MEGA/AT90PWM161.xml                     |  2 +-
 .../AVR8/MEGA/AT90PWM216.xml                     |  2 +-
 .../AVR8/MEGA/AT90PWM2B.xml                      |  2 +-
 .../AVR8/MEGA/AT90PWM316.xml                     |  2 +-
 .../AVR8/MEGA/AT90PWM3B.xml                      |  2 +-
 .../AVR8/MEGA/AT90PWM81.xml                      |  2 +-
 .../AVR8/MEGA/AT90USB1286.xml                    |  2 +-
 .../AVR8/MEGA/AT90USB1287.xml                    |  2 +-
 .../AVR8/MEGA/AT90USB162.xml                     |  2 +-
 .../AVR8/MEGA/AT90USB646.xml                     |  2 +-
 .../AVR8/MEGA/AT90USB647.xml                     |  2 +-
 .../AVR8/MEGA/AT90USB82.xml                      |  2 +-
 .../AVR8/MEGA/ATMEGA128.xml                      |  2 +-
 .../AVR8/MEGA/ATMEGA1280.xml                     |  2 +-
 .../AVR8/MEGA/ATMEGA1281.xml                     |  2 +-
 .../AVR8/MEGA/ATMEGA1284.xml                     |  2 +-
 .../AVR8/MEGA/ATMEGA1284P.xml                    |  2 +-
 .../AVR8/MEGA/ATMEGA1284RFR2.xml                 |  2 +-
 .../AVR8/MEGA/ATMEGA128A.xml                     |  2 +-
 .../AVR8/MEGA/ATMEGA128RFA1.xml                  |  2 +-
 .../AVR8/MEGA/ATMEGA128RFR2.xml                  |  2 +-
 .../AVR8/MEGA/ATMEGA16.xml                       |  2 +-
 .../AVR8/MEGA/ATMEGA1608.xml                     |  2 +-
 .../AVR8/MEGA/ATMEGA1609.xml                     |  2 +-
 .../AVR8/MEGA/ATMEGA162.xml                      |  2 +-
 .../AVR8/MEGA/ATMEGA164A.xml                     |  2 +-
 .../AVR8/MEGA/ATMEGA164P.xml                     |  2 +-
 .../AVR8/MEGA/ATMEGA164PA.xml                    |  2 +-
 .../AVR8/MEGA/ATMEGA165A.xml                     |  2 +-
 .../AVR8/MEGA/ATMEGA165P.xml                     |  2 +-
 .../AVR8/MEGA/ATMEGA165PA.xml                    |  2 +-
 .../AVR8/MEGA/ATMEGA168.xml                      |  2 +-
 .../AVR8/MEGA/ATMEGA168A.xml                     |  2 +-
 .../AVR8/MEGA/ATMEGA168P.xml                     |  2 +-
 .../AVR8/MEGA/ATMEGA168PA.xml                    |  2 +-
 .../AVR8/MEGA/ATMEGA168PB.xml                    |  2 +-
 .../AVR8/MEGA/ATMEGA169A.xml                     |  2 +-
 .../AVR8/MEGA/ATMEGA169P.xml                     |  2 +-
 .../AVR8/MEGA/ATMEGA169PA.xml                    |  2 +-
 .../AVR8/MEGA/ATMEGA16A.xml                      |  2 +-
 .../AVR8/MEGA/ATMEGA16M1.xml                     |  2 +-
 .../AVR8/MEGA/ATMEGA16U2.xml                     |  2 +-
 .../AVR8/MEGA/ATMEGA16U4.xml                     |  2 +-
 .../AVR8/MEGA/ATMEGA2560.xml                     |  2 +-
 .../AVR8/MEGA/ATMEGA2561.xml                     |  2 +-
 .../AVR8/MEGA/ATMEGA2564RFR2.xml                 |  2 +-
 .../AVR8/MEGA/ATMEGA256RFR2.xml                  |  2 +-
 .../AVR8/MEGA/ATMEGA32.xml                       |  2 +-
 .../AVR8/MEGA/ATMEGA3208.xml                     |  2 +-
 .../AVR8/MEGA/ATMEGA3209.xml                     |  2 +-
 .../AVR8/MEGA/ATMEGA324A.xml                     |  2 +-
 .../AVR8/MEGA/ATMEGA324P.xml                     |  2 +-
 .../AVR8/MEGA/ATMEGA324PA.xml                    |  2 +-
 .../AVR8/MEGA/ATMEGA324PB.xml                    |  2 +-
 .../AVR8/MEGA/ATMEGA325.xml                      |  2 +-
 .../AVR8/MEGA/ATMEGA3250.xml                     |  2 +-
 .../AVR8/MEGA/ATMEGA3250A.xml                    |  2 +-
 .../AVR8/MEGA/ATMEGA3250P.xml                    |  2 +-
 .../AVR8/MEGA/ATMEGA3250PA.xml                   |  2 +-
 .../AVR8/MEGA/ATMEGA325A.xml                     |  2 +-
 .../AVR8/MEGA/ATMEGA325P.xml                     |  2 +-
 .../AVR8/MEGA/ATMEGA325PA.xml                    |  2 +-
 .../AVR8/MEGA/ATMEGA328.xml                      |  2 +-
 .../AVR8/MEGA/ATMEGA328P.xml                     |  2 +-
 .../AVR8/MEGA/ATMEGA328PB.xml                    |  2 +-
 .../AVR8/MEGA/ATMEGA329.xml                      |  2 +-
 .../AVR8/MEGA/ATMEGA3290.xml                     |  2 +-
 .../AVR8/MEGA/ATMEGA3290A.xml                    |  2 +-
 .../AVR8/MEGA/ATMEGA3290P.xml                    |  2 +-
 .../AVR8/MEGA/ATMEGA3290PA.xml                   |  2 +-
 .../AVR8/MEGA/ATMEGA329A.xml                     |  2 +-
 .../AVR8/MEGA/ATMEGA329P.xml                     |  2 +-
 .../AVR8/MEGA/ATMEGA329PA.xml                    |  2 +-
 .../AVR8/MEGA/ATMEGA32A.xml                      |  2 +-
 .../AVR8/MEGA/ATMEGA32C1.xml                     |  2 +-
 .../AVR8/MEGA/ATMEGA32M1.xml                     |  2 +-
 .../AVR8/MEGA/ATMEGA32U2.xml                     |  2 +-
 .../AVR8/MEGA/ATMEGA32U4.xml                     |  2 +-
 .../AVR8/MEGA/ATMEGA406.xml                      |  2 +-
 .../AVR8/MEGA/ATMEGA48.xml                       |  2 +-
 .../AVR8/MEGA/ATMEGA4808.xml                     |  2 +-
 .../AVR8/MEGA/ATMEGA4809.xml                     |  2 +-
 .../AVR8/MEGA/ATMEGA48A.xml                      |  2 +-
 .../AVR8/MEGA/ATMEGA48P.xml                      |  2 +-
 .../AVR8/MEGA/ATMEGA48PA.xml                     |  2 +-
 .../AVR8/MEGA/ATMEGA48PB.xml                     |  2 +-
 .../AVR8/MEGA/ATMEGA64.xml                       |  2 +-
 .../AVR8/MEGA/ATMEGA640.xml                      |  2 +-
 .../AVR8/MEGA/ATMEGA644.xml                      |  2 +-
 .../AVR8/MEGA/ATMEGA644A.xml                     |  2 +-
 .../AVR8/MEGA/ATMEGA644P.xml                     |  2 +-
 .../AVR8/MEGA/ATMEGA644PA.xml                    |  2 +-
 .../AVR8/MEGA/ATMEGA644RFR2.xml                  |  2 +-
 .../AVR8/MEGA/ATMEGA645.xml                      |  2 +-
 .../AVR8/MEGA/ATMEGA6450.xml                     |  2 +-
 .../AVR8/MEGA/ATMEGA6450A.xml                    |  2 +-
 .../AVR8/MEGA/ATMEGA6450P.xml                    |  2 +-
 .../AVR8/MEGA/ATMEGA645A.xml                     |  2 +-
 .../AVR8/MEGA/ATMEGA645P.xml                     |  2 +-
 .../AVR8/MEGA/ATMEGA649.xml                      |  2 +-
 .../AVR8/MEGA/ATMEGA6490.xml                     |  2 +-
 .../AVR8/MEGA/ATMEGA6490A.xml                    |  2 +-
 .../AVR8/MEGA/ATMEGA6490P.xml                    |  2 +-
 .../AVR8/MEGA/ATMEGA649A.xml                     |  2 +-
 .../AVR8/MEGA/ATMEGA649P.xml                     |  2 +-
 .../AVR8/MEGA/ATMEGA64A.xml                      |  2 +-
 .../AVR8/MEGA/ATMEGA64C1.xml                     |  2 +-
 .../AVR8/MEGA/ATMEGA64M1.xml                     |  2 +-
 .../AVR8/MEGA/ATMEGA64RFR2.xml                   |  2 +-
 .../AVR8/MEGA/ATMEGA808.xml                      |  2 +-
 .../AVR8/MEGA/ATMEGA809.xml                      |  2 +-
 .../AVR8/MEGA/ATMEGA88.xml                       |  2 +-
 .../AVR8/MEGA/ATMEGA88A.xml                      |  2 +-
 .../AVR8/MEGA/ATMEGA88P.xml                      |  2 +-
 .../AVR8/MEGA/ATMEGA88PA.xml                     |  2 +-
 .../AVR8/MEGA/ATMEGA88PB.xml                     |  2 +-
 .../AVR8/MEGA/ATMEGA8U2.xml                      |  2 +-
 .../AVR8/TINY/ATTINY13.xml                       |  2 +-
 .../AVR8/TINY/ATTINY13A.xml                      |  2 +-
 .../AVR8/TINY/ATTINY1604.xml                     |  2 +-
 .../AVR8/TINY/ATTINY1606.xml                     |  2 +-
 .../AVR8/TINY/ATTINY1607.xml                     |  2 +-
 .../AVR8/TINY/ATTINY1614.xml                     |  2 +-
 .../AVR8/TINY/ATTINY1616.xml                     |  2 +-
 .../AVR8/TINY/ATTINY1617.xml                     |  2 +-
 .../AVR8/TINY/ATTINY1624.xml                     |  2 +-
 .../AVR8/TINY/ATTINY1626.xml                     |  2 +-
 .../AVR8/TINY/ATTINY1627.xml                     |  2 +-
 .../AVR8/TINY/ATTINY1634.xml                     |  2 +-
 .../AVR8/TINY/ATTINY167.xml                      |  2 +-
 .../AVR8/TINY/ATTINY202.xml                      |  2 +-
 .../AVR8/TINY/ATTINY204.xml                      |  2 +-
 .../AVR8/TINY/ATTINY212.xml                      |  2 +-
 .../AVR8/TINY/ATTINY214.xml                      |  2 +-
 .../AVR8/TINY/ATTINY2313.xml                     |  2 +-
 .../AVR8/TINY/ATTINY2313A.xml                    |  2 +-
 .../AVR8/TINY/ATTINY24.xml                       |  2 +-
 .../AVR8/TINY/ATTINY24A.xml                      |  2 +-
 .../AVR8/TINY/ATTINY25.xml                       |  2 +-
 .../AVR8/TINY/ATTINY261.xml                      |  2 +-
 .../AVR8/TINY/ATTINY261A.xml                     |  2 +-
 .../AVR8/TINY/ATTINY3216.xml                     |  2 +-
 .../AVR8/TINY/ATTINY3217.xml                     |  2 +-
 .../AVR8/TINY/ATTINY402.xml                      |  2 +-
 .../AVR8/TINY/ATTINY404.xml                      |  2 +-
 .../AVR8/TINY/ATTINY406.xml                      |  2 +-
 .../AVR8/TINY/ATTINY412.xml                      |  2 +-
 .../AVR8/TINY/ATTINY414.xml                      |  2 +-
 .../AVR8/TINY/ATTINY416.xml                      |  2 +-
 .../AVR8/TINY/ATTINY417.xml                      |  2 +-
 .../AVR8/TINY/ATTINY4313.xml                     |  2 +-
 .../AVR8/TINY/ATTINY43U.xml                      |  2 +-
 .../AVR8/TINY/ATTINY44.xml                       |  2 +-
 .../AVR8/TINY/ATTINY441.xml                      |  2 +-
 .../AVR8/TINY/ATTINY44A.xml                      |  2 +-
 .../AVR8/TINY/ATTINY45.xml                       |  2 +-
 .../AVR8/TINY/ATTINY461.xml                      |  2 +-
 .../AVR8/TINY/ATTINY461A.xml                     |  2 +-
 .../AVR8/TINY/ATTINY48.xml                       |  2 +-
 .../AVR8/TINY/ATTINY804.xml                      |  2 +-
 .../AVR8/TINY/ATTINY806.xml                      |  2 +-
 .../AVR8/TINY/ATTINY807.xml                      |  2 +-
 .../AVR8/TINY/ATTINY814.xml                      |  2 +-
 .../AVR8/TINY/ATTINY816.xml                      |  2 +-
 .../AVR8/TINY/ATTINY817.xml                      |  2 +-
 .../AVR8/TINY/ATTINY828.xml                      |  2 +-
 .../AVR8/TINY/ATTINY84.xml                       |  2 +-
 .../AVR8/TINY/ATTINY841.xml                      |  2 +-
 .../AVR8/TINY/ATTINY84A.xml                      |  2 +-
 .../AVR8/TINY/ATTINY85.xml                       |  2 +-
 .../AVR8/TINY/ATTINY861.xml                      |  2 +-
 .../AVR8/TINY/ATTINY861A.xml                     |  2 +-
 .../AVR8/TINY/ATTINY87.xml                       |  2 +-
 .../AVR8/TINY/ATTINY88.xml                       |  2 +-
 .../AVR8/XMEGA/ATXMEGA128A1.xml                  |  2 +-
 .../AVR8/XMEGA/ATXMEGA128A1U.xml                 |  2 +-
 .../AVR8/XMEGA/ATXMEGA128A3.xml                  |  2 +-
 .../AVR8/XMEGA/ATXMEGA128A3U.xml                 |  2 +-
 .../AVR8/XMEGA/ATXMEGA128A4U.xml                 |  2 +-
 .../AVR8/XMEGA/ATXMEGA128B1.xml                  |  2 +-
 .../AVR8/XMEGA/ATXMEGA128B3.xml                  |  2 +-
 .../AVR8/XMEGA/ATXMEGA128C3.xml                  |  2 +-
 .../AVR8/XMEGA/ATXMEGA128D3.xml                  |  2 +-
 .../AVR8/XMEGA/ATXMEGA128D4.xml                  |  2 +-
 .../AVR8/XMEGA/ATXMEGA16A4.xml                   |  2 +-
 .../AVR8/XMEGA/ATXMEGA16A4U.xml                  |  2 +-
 .../AVR8/XMEGA/ATXMEGA16C4.xml                   |  2 +-
 .../AVR8/XMEGA/ATXMEGA16D4.xml                   |  2 +-
 .../AVR8/XMEGA/ATXMEGA16E5.xml                   |  2 +-
 .../AVR8/XMEGA/ATXMEGA192A3.xml                  |  2 +-
 .../AVR8/XMEGA/ATXMEGA192A3U.xml                 |  2 +-
 .../AVR8/XMEGA/ATXMEGA192C3.xml                  |  2 +-
 .../AVR8/XMEGA/ATXMEGA192D3.xml                  |  2 +-
 .../AVR8/XMEGA/ATXMEGA256A3.xml                  |  2 +-
 .../AVR8/XMEGA/ATXMEGA256A3B.xml                 |  2 +-
 .../AVR8/XMEGA/ATXMEGA256A3BU.xml                |  2 +-
 .../AVR8/XMEGA/ATXMEGA256A3U.xml                 |  2 +-
 .../AVR8/XMEGA/ATXMEGA256C3.xml                  |  2 +-
 .../AVR8/XMEGA/ATXMEGA256D3.xml                  |  2 +-
 .../AVR8/XMEGA/ATXMEGA32A4.xml                   |  2 +-
 .../AVR8/XMEGA/ATXMEGA32A4U.xml                  |  2 +-
 .../AVR8/XMEGA/ATXMEGA32C3.xml                   |  2 +-
 .../AVR8/XMEGA/ATXMEGA32C4.xml                   |  2 +-
 .../AVR8/XMEGA/ATXMEGA32D3.xml                   |  2 +-
 .../AVR8/XMEGA/ATXMEGA32D4.xml                   |  2 +-
 .../AVR8/XMEGA/ATXMEGA32E5.xml                   |  2 +-
 .../AVR8/XMEGA/ATXMEGA384C3.xml                  |  2 +-
 .../AVR8/XMEGA/ATXMEGA384D3.xml                  |  2 +-
 .../AVR8/XMEGA/ATXMEGA64A1.xml                   |  2 +-
 .../AVR8/XMEGA/ATXMEGA64A1U.xml                  |  2 +-
 .../AVR8/XMEGA/ATXMEGA64A3.xml                   |  2 +-
 .../AVR8/XMEGA/ATXMEGA64A3U.xml                  |  2 +-
 .../AVR8/XMEGA/ATXMEGA64A4U.xml                  |  2 +-
 .../AVR8/XMEGA/ATXMEGA64B1.xml                   |  2 +-
 .../AVR8/XMEGA/ATXMEGA64B3.xml                   |  2 +-
 .../AVR8/XMEGA/ATXMEGA64C3.xml                   |  2 +-
 .../AVR8/XMEGA/ATXMEGA64D3.xml                   |  2 +-
 .../AVR8/XMEGA/ATXMEGA64D4.xml                   |  2 +-
 .../AVR8/XMEGA/ATXMEGA8E5.xml                    |  2 +-
 263 files changed, 293 insertions(+), 261 deletions(-)
 create mode 100644 build/scripts/Targets/TargetDescriptionFiles/AVR8/AvrIsa.php

diff --git a/build/scripts/Targets/TargetDescriptionFiles/AVR8/Avr8TargetDescriptionFile.php b/build/scripts/Targets/TargetDescriptionFiles/AVR8/Avr8TargetDescriptionFile.php
index 545f96eb..3865e774 100644
--- a/build/scripts/Targets/TargetDescriptionFiles/AVR8/Avr8TargetDescriptionFile.php
+++ b/build/scripts/Targets/TargetDescriptionFiles/AVR8/Avr8TargetDescriptionFile.php
@@ -13,6 +13,7 @@ use Targets\TargetRegisterGroup;
 require_once __DIR__ . "/../TargetDescriptionFile.php";
 require_once __DIR__ . "/../Services/StringService.php";
 require_once __DIR__ . "/AvrFamily.php";
+require_once __DIR__ . "/AvrIsa.php";
 require_once __DIR__ . "/Signature.php";
 require_once __DIR__ . "/DebugWireParameters.php";
 require_once __DIR__ . "/IspParameters.php";
@@ -60,6 +61,11 @@ class Avr8TargetDescriptionFile extends TargetDescriptionFile
         return AvrFamily::tryFrom($this->deviceAttributesByName['avr-family']);
     }
 
+    public function getAvrIsa(): ?AvrIsa
+    {
+        return AvrIsa::tryFrom($this->deviceAttributesByName['architecture']);
+    }
+
     public function getDebugWireParameters(): DebugWireParameters
     {
         $output = new DebugWireParameters();
diff --git a/build/scripts/Targets/TargetDescriptionFiles/AVR8/AvrIsa.php b/build/scripts/Targets/TargetDescriptionFiles/AVR8/AvrIsa.php
new file mode 100644
index 00000000..0edd632a
--- /dev/null
+++ b/build/scripts/Targets/TargetDescriptionFiles/AVR8/AvrIsa.php
@@ -0,0 +1,12 @@
+<?php
+namespace Targets\TargetDescriptionFiles\Avr8;
+
+enum AvrIsa: string
+{
+    case AVR = 'AVR';
+    case AVR_E = 'AVRe';
+    case AVR_E_PLUS = 'AVRe+';
+    case AVR_XM = 'AVRxm';
+    case AVR_XT = 'AVRxt';
+    case AVR_RC = 'AVRrc';
+}
diff --git a/build/scripts/Targets/TargetDescriptionFiles/AVR8/Services/ValidationService.php b/build/scripts/Targets/TargetDescriptionFiles/AVR8/Services/ValidationService.php
index fc6e2d20..54f328d3 100644
--- a/build/scripts/Targets/TargetDescriptionFiles/AVR8/Services/ValidationService.php
+++ b/build/scripts/Targets/TargetDescriptionFiles/AVR8/Services/ValidationService.php
@@ -3,6 +3,7 @@ namespace Targets\TargetDescriptionFiles\AVR8\Services;
 
 use Targets\TargetDescriptionFiles\Avr8\Avr8TargetDescriptionFile;
 use Targets\TargetDescriptionFiles\Avr8\AvrFamily;
+use Targets\TargetDescriptionFiles\Avr8\AvrIsa;
 use Targets\TargetDescriptionFiles\Avr8\DebugWireParameters;
 use Targets\TargetDescriptionFiles\Avr8\IspParameters;
 use Targets\TargetDescriptionFiles\Avr8\JtagParameters;
@@ -96,7 +97,20 @@ class ValidationService extends \Targets\TargetDescriptionFiles\Services\Validat
 
         $family = $tdf->getAvrFamily();
         if ($family === null) {
-            $failures[] = 'Unknown AVR8 family';
+            $failures[] = 'Missing/unknown AVR8 family';
+        }
+
+        $isa = $tdf->getAvrIsa();
+        if ($isa === null) {
+            $failures[] = 'Missing/unknown AVR ISA';
+        }
+
+        if ($isa === AvrIsa::AVR_RC) {
+            /*
+             * The "reduced core" only implements 16 GPRs. Bloom assumes all AVRs have 32 GPRs.
+             * Not sure if any AVRrc targets even have debug support...
+             */
+            $failures[] = 'Bloom does not support AVRrc targets';
         }
 
         // The target must have at least one SP register, and it must reside in the CPU peripheral.
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR128DA28.xml b/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR128DA28.xml
index 2f40ed75..8cbb6379 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR128DA28.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR128DA28.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<device name="AVR128DA28" family="AVR8" configuration-value="avr128da28" architecture="AVR8X" avr-family="DA">
+<device name="AVR128DA28" family="AVR8" configuration-value="avr128da28" architecture="AVRxt" avr-family="DA">
     <property-groups>
         <property-group key="ocd_features">
             <property key="break_pin" value="PF6"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR128DA32.xml b/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR128DA32.xml
index bd8d98c1..4ca4e6e7 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR128DA32.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR128DA32.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<device name="AVR128DA32" family="AVR8" configuration-value="avr128da32" architecture="AVR8X" avr-family="DA">
+<device name="AVR128DA32" family="AVR8" configuration-value="avr128da32" architecture="AVRxt" avr-family="DA">
     <property-groups>
         <property-group key="ocd_features">
             <property key="break_pin" value="PF6"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR128DA48.xml b/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR128DA48.xml
index 652832dc..a1392555 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR128DA48.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR128DA48.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<device name="AVR128DA48" family="AVR8" configuration-value="avr128da48" architecture="AVR8X" avr-family="DA">
+<device name="AVR128DA48" family="AVR8" configuration-value="avr128da48" architecture="AVRxt" avr-family="DA">
     <property-groups>
         <property-group key="ocd_features">
             <property key="break_pin" value="PF6"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR128DA64.xml b/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR128DA64.xml
index 61aac5d8..44b34026 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR128DA64.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR128DA64.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<device name="AVR128DA64" family="AVR8" configuration-value="avr128da64" architecture="AVR8X" avr-family="DA">
+<device name="AVR128DA64" family="AVR8" configuration-value="avr128da64" architecture="AVRxt" avr-family="DA">
     <property-groups>
         <property-group key="ocd_features">
             <property key="break_pin" value="PF6"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR128DB28.xml b/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR128DB28.xml
index f5e35099..aa6bf2d5 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR128DB28.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR128DB28.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<device name="AVR128DB28" family="AVR8" configuration-value="avr128db28" architecture="AVR8X" avr-family="DB">
+<device name="AVR128DB28" family="AVR8" configuration-value="avr128db28" architecture="AVRxt" avr-family="DB">
     <property-groups>
         <property-group key="ocd_features">
             <property key="break_pin" value="PF6"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR128DB32.xml b/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR128DB32.xml
index 05e84894..409c013c 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR128DB32.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR128DB32.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<device name="AVR128DB32" family="AVR8" configuration-value="avr128db32" architecture="AVR8X" avr-family="DB">
+<device name="AVR128DB32" family="AVR8" configuration-value="avr128db32" architecture="AVRxt" avr-family="DB">
     <property-groups>
         <property-group key="ocd_features">
             <property key="break_pin" value="PF6"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR128DB48.xml b/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR128DB48.xml
index da441ed7..5f667587 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR128DB48.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR128DB48.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<device name="AVR128DB48" family="AVR8" configuration-value="avr128db48" architecture="AVR8X" avr-family="DB">
+<device name="AVR128DB48" family="AVR8" configuration-value="avr128db48" architecture="AVRxt" avr-family="DB">
     <property-groups>
         <property-group key="ocd_features">
             <property key="break_pin" value="PF6"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR128DB64.xml b/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR128DB64.xml
index 60c7919d..d3cf3de5 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR128DB64.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR128DB64.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<device name="AVR128DB64" family="AVR8" configuration-value="avr128db64" architecture="AVR8X" avr-family="DB">
+<device name="AVR128DB64" family="AVR8" configuration-value="avr128db64" architecture="AVRxt" avr-family="DB">
     <property-groups>
         <property-group key="ocd_features">
             <property key="break_pin" value="PF6"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR16DD14.xml b/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR16DD14.xml
index 0f94bd18..5dcd062e 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR16DD14.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR16DD14.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<device name="AVR16DD14" family="AVR8" configuration-value="avr16dd14" architecture="AVR8X" avr-family="DD">
+<device name="AVR16DD14" family="AVR8" configuration-value="avr16dd14" architecture="AVRxt" avr-family="DD">
     <property-groups>
         <property-group key="ocd_features">
             <property key="break_pin" value="PF6"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR16DD20.xml b/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR16DD20.xml
index 1ff6470b..c6d3c24e 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR16DD20.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR16DD20.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<device name="AVR16DD20" family="AVR8" configuration-value="avr16dd20" architecture="AVR8X" avr-family="DD">
+<device name="AVR16DD20" family="AVR8" configuration-value="avr16dd20" architecture="AVRxt" avr-family="DD">
     <property-groups>
         <property-group key="ocd_features">
             <property key="break_pin" value="PF6"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR16DD28.xml b/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR16DD28.xml
index 47762607..3bc37163 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR16DD28.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR16DD28.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<device name="AVR16DD28" family="AVR8" configuration-value="avr16dd28" architecture="AVR8X" avr-family="DD">
+<device name="AVR16DD28" family="AVR8" configuration-value="avr16dd28" architecture="AVRxt" avr-family="DD">
     <property-groups>
         <property-group key="ocd_features">
             <property key="break_pin" value="PF6"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR16DD32.xml b/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR16DD32.xml
index 34fbfff1..75d83e1d 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR16DD32.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR16DD32.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<device name="AVR16DD32" family="AVR8" configuration-value="avr16dd32" architecture="AVR8X" avr-family="DD">
+<device name="AVR16DD32" family="AVR8" configuration-value="avr16dd32" architecture="AVRxt" avr-family="DD">
     <property-groups>
         <property-group key="ocd_features">
             <property key="break_pin" value="PF6"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR32DA28.xml b/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR32DA28.xml
index f9fba4f0..a1566611 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR32DA28.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR32DA28.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<device name="AVR32DA28" family="AVR8" configuration-value="avr32da28" architecture="AVR8X" avr-family="DA">
+<device name="AVR32DA28" family="AVR8" configuration-value="avr32da28" architecture="AVRxt" avr-family="DA">
     <property-groups>
         <property-group key="ocd_features">
             <property key="break_pin" value="PF6"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR32DA32.xml b/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR32DA32.xml
index 5ab3e022..9dba8674 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR32DA32.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR32DA32.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<device name="AVR32DA32" family="AVR8" configuration-value="avr32da32" architecture="AVR8X" avr-family="DA">
+<device name="AVR32DA32" family="AVR8" configuration-value="avr32da32" architecture="AVRxt" avr-family="DA">
     <property-groups>
         <property-group key="ocd_features">
             <property key="break_pin" value="PF6"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR32DA48.xml b/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR32DA48.xml
index 78b87669..4975fdf7 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR32DA48.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR32DA48.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<device name="AVR32DA48" family="AVR8" configuration-value="avr32da48" architecture="AVR8X" avr-family="DA">
+<device name="AVR32DA48" family="AVR8" configuration-value="avr32da48" architecture="AVRxt" avr-family="DA">
     <property-groups>
         <property-group key="ocd_features">
             <property key="break_pin" value="PF6"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR32DB28.xml b/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR32DB28.xml
index 479274b1..b93a2dc0 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR32DB28.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR32DB28.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<device name="AVR32DB28" family="AVR8" configuration-value="avr32db28" architecture="AVR8X" avr-family="DB">
+<device name="AVR32DB28" family="AVR8" configuration-value="avr32db28" architecture="AVRxt" avr-family="DB">
     <property-groups>
         <property-group key="ocd_features">
             <property key="break_pin" value="PF6"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR32DB32.xml b/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR32DB32.xml
index c0dbd994..4827b941 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR32DB32.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR32DB32.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<device name="AVR32DB32" family="AVR8" configuration-value="avr32db32" architecture="AVR8X" avr-family="DB">
+<device name="AVR32DB32" family="AVR8" configuration-value="avr32db32" architecture="AVRxt" avr-family="DB">
     <property-groups>
         <property-group key="ocd_features">
             <property key="break_pin" value="PF6"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR32DB48.xml b/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR32DB48.xml
index 7f90aba9..fcc9ba41 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR32DB48.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR32DB48.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<device name="AVR32DB48" family="AVR8" configuration-value="avr32db48" architecture="AVR8X" avr-family="DB">
+<device name="AVR32DB48" family="AVR8" configuration-value="avr32db48" architecture="AVRxt" avr-family="DB">
     <property-groups>
         <property-group key="ocd_features">
             <property key="break_pin" value="PF6"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR32DD14.xml b/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR32DD14.xml
index 819ad745..2d6a7d5f 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR32DD14.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR32DD14.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<device name="AVR32DD14" family="AVR8" configuration-value="avr32dd14" architecture="AVR8X" avr-family="DD">
+<device name="AVR32DD14" family="AVR8" configuration-value="avr32dd14" architecture="AVRxt" avr-family="DD">
     <property-groups>
         <property-group key="ocd_features">
             <property key="break_pin" value="PF6"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR32DD20.xml b/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR32DD20.xml
index 1c541c30..ab3f4187 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR32DD20.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR32DD20.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<device name="AVR32DD20" family="AVR8" configuration-value="avr32dd20" architecture="AVR8X" avr-family="DD">
+<device name="AVR32DD20" family="AVR8" configuration-value="avr32dd20" architecture="AVRxt" avr-family="DD">
     <property-groups>
         <property-group key="ocd_features">
             <property key="break_pin" value="PF6"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR32DD28.xml b/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR32DD28.xml
index dc6ffb4d..c9e0f48a 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR32DD28.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR32DD28.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<device name="AVR32DD28" family="AVR8" configuration-value="avr32dd28" architecture="AVR8X" avr-family="DD">
+<device name="AVR32DD28" family="AVR8" configuration-value="avr32dd28" architecture="AVRxt" avr-family="DD">
     <property-groups>
         <property-group key="ocd_features">
             <property key="break_pin" value="PF6"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR32DD32.xml b/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR32DD32.xml
index 83706646..c1672e7a 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR32DD32.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR32DD32.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<device name="AVR32DD32" family="AVR8" configuration-value="avr32dd32" architecture="AVR8X" avr-family="DD">
+<device name="AVR32DD32" family="AVR8" configuration-value="avr32dd32" architecture="AVRxt" avr-family="DD">
     <property-groups>
         <property-group key="ocd_features">
             <property key="break_pin" value="PF6"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR64DA28.xml b/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR64DA28.xml
index 2d1d5e3a..92ded3df 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR64DA28.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR64DA28.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<device name="AVR64DA28" family="AVR8" configuration-value="avr64da28" architecture="AVR8X" avr-family="DA">
+<device name="AVR64DA28" family="AVR8" configuration-value="avr64da28" architecture="AVRxt" avr-family="DA">
     <property-groups>
         <property-group key="ocd_features">
             <property key="break_pin" value="PF6"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR64DA32.xml b/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR64DA32.xml
index 62c38614..9ef29ff1 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR64DA32.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR64DA32.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<device name="AVR64DA32" family="AVR8" configuration-value="avr64da32" architecture="AVR8X" avr-family="DA">
+<device name="AVR64DA32" family="AVR8" configuration-value="avr64da32" architecture="AVRxt" avr-family="DA">
     <property-groups>
         <property-group key="ocd_features">
             <property key="break_pin" value="PF6"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR64DA48.xml b/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR64DA48.xml
index 4027dcb0..1280921c 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR64DA48.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR64DA48.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<device name="AVR64DA48" family="AVR8" configuration-value="avr64da48" architecture="AVR8X" avr-family="DA">
+<device name="AVR64DA48" family="AVR8" configuration-value="avr64da48" architecture="AVRxt" avr-family="DA">
     <property-groups>
         <property-group key="ocd_features">
             <property key="break_pin" value="PF6"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR64DA64.xml b/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR64DA64.xml
index 8ca45aaa..0503130a 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR64DA64.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR64DA64.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<device name="AVR64DA64" family="AVR8" configuration-value="avr64da64" architecture="AVR8X" avr-family="DA">
+<device name="AVR64DA64" family="AVR8" configuration-value="avr64da64" architecture="AVRxt" avr-family="DA">
     <property-groups>
         <property-group key="ocd_features">
             <property key="break_pin" value="PF6"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR64DB28.xml b/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR64DB28.xml
index d18e691f..2b2f8cf8 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR64DB28.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR64DB28.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<device name="AVR64DB28" family="AVR8" configuration-value="avr64db28" architecture="AVR8X" avr-family="DB">
+<device name="AVR64DB28" family="AVR8" configuration-value="avr64db28" architecture="AVRxt" avr-family="DB">
     <property-groups>
         <property-group key="ocd_features">
             <property key="break_pin" value="PF6"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR64DB32.xml b/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR64DB32.xml
index b6b6eb0b..1c1697e5 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR64DB32.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR64DB32.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<device name="AVR64DB32" family="AVR8" configuration-value="avr64db32" architecture="AVR8X" avr-family="DB">
+<device name="AVR64DB32" family="AVR8" configuration-value="avr64db32" architecture="AVRxt" avr-family="DB">
     <property-groups>
         <property-group key="ocd_features">
             <property key="break_pin" value="PF6"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR64DB48.xml b/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR64DB48.xml
index 5160cdac..400e7fa3 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR64DB48.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR64DB48.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<device name="AVR64DB48" family="AVR8" configuration-value="avr64db48" architecture="AVR8X" avr-family="DB">
+<device name="AVR64DB48" family="AVR8" configuration-value="avr64db48" architecture="AVRxt" avr-family="DB">
     <property-groups>
         <property-group key="ocd_features">
             <property key="break_pin" value="PF6"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR64DB64.xml b/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR64DB64.xml
index bf506898..be613049 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR64DB64.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR64DB64.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<device name="AVR64DB64" family="AVR8" configuration-value="avr64db64" architecture="AVR8X" avr-family="DB">
+<device name="AVR64DB64" family="AVR8" configuration-value="avr64db64" architecture="AVRxt" avr-family="DB">
     <property-groups>
         <property-group key="ocd_features">
             <property key="break_pin" value="PF6"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR64DD14.xml b/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR64DD14.xml
index 1d4ef32c..dd527eb3 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR64DD14.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR64DD14.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<device name="AVR64DD14" family="AVR8" configuration-value="avr64dd14" architecture="AVR8X" avr-family="DD">
+<device name="AVR64DD14" family="AVR8" configuration-value="avr64dd14" architecture="AVRxt" avr-family="DD">
     <property-groups>
         <property-group key="ocd_features">
             <property key="break_pin" value="PF6"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR64DD20.xml b/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR64DD20.xml
index b721a16b..a19655eb 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR64DD20.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR64DD20.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<device name="AVR64DD20" family="AVR8" configuration-value="avr64dd20" architecture="AVR8X" avr-family="DD">
+<device name="AVR64DD20" family="AVR8" configuration-value="avr64dd20" architecture="AVRxt" avr-family="DD">
     <property-groups>
         <property-group key="ocd_features">
             <property key="break_pin" value="PF6"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR64DD28.xml b/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR64DD28.xml
index 0009a874..c946abb9 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR64DD28.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR64DD28.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<device name="AVR64DD28" family="AVR8" configuration-value="avr64dd28" architecture="AVR8X" avr-family="DD">
+<device name="AVR64DD28" family="AVR8" configuration-value="avr64dd28" architecture="AVRxt" avr-family="DD">
     <property-groups>
         <property-group key="ocd_features">
             <property key="break_pin" value="PF6"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR64DD32.xml b/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR64DD32.xml
index 66863374..6cb70b08 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR64DD32.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/D-SERIES/AVR64DD32.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<device name="AVR64DD32" family="AVR8" configuration-value="avr64dd32" architecture="AVR8X" avr-family="DD">
+<device name="AVR64DD32" family="AVR8" configuration-value="avr64dd32" architecture="AVRxt" avr-family="DD">
     <property-groups>
         <property-group key="ocd_features">
             <property key="break_pin" value="PF6"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/E-SERIES/AVR64EA28.xml b/src/Targets/TargetDescriptionFiles/AVR8/E-SERIES/AVR64EA28.xml
index 435d07bd..94305432 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/E-SERIES/AVR64EA28.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/E-SERIES/AVR64EA28.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<device name="AVR64EA28" family="AVR8" configuration-value="avr64ea28" architecture="AVR8X" avr-family="EA">
+<device name="AVR64EA28" family="AVR8" configuration-value="avr64ea28" architecture="AVRxt" avr-family="EA">
     <property-groups>
         <property-group key="programming_info">
             <property key="fuse_enabled_value" value="1"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/E-SERIES/AVR64EA32.xml b/src/Targets/TargetDescriptionFiles/AVR8/E-SERIES/AVR64EA32.xml
index d9143c65..d6a16701 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/E-SERIES/AVR64EA32.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/E-SERIES/AVR64EA32.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<device name="AVR64EA32" family="AVR8" configuration-value="avr64ea32" architecture="AVR8X" avr-family="EA">
+<device name="AVR64EA32" family="AVR8" configuration-value="avr64ea32" architecture="AVRxt" avr-family="EA">
     <property-groups>
         <property-group key="programming_info">
             <property key="fuse_enabled_value" value="1"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/E-SERIES/AVR64EA48.xml b/src/Targets/TargetDescriptionFiles/AVR8/E-SERIES/AVR64EA48.xml
index 2f96ad87..0748a922 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/E-SERIES/AVR64EA48.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/E-SERIES/AVR64EA48.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<device name="AVR64EA48" family="AVR8" configuration-value="avr64ea48" architecture="AVR8X" avr-family="EA">
+<device name="AVR64EA48" family="AVR8" configuration-value="avr64ea48" architecture="AVRxt" avr-family="EA">
     <property-groups>
         <property-group key="programming_info">
             <property key="fuse_enabled_value" value="1"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90CAN128.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90CAN128.xml
index 5f0b8620..f7e7ec09 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90CAN128.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90CAN128.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<device name="AT90CAN128" family="AVR8" configuration-value="at90can128" architecture="AVR8" avr-family="MEGA">
+<device name="AT90CAN128" family="AVR8" configuration-value="at90can128" architecture="AVRe+" avr-family="MEGA">
     <property-groups>
         <property-group key="signatures">
             <property key="jtagid" value="0x0978103F"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90CAN32.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90CAN32.xml
index 8df7c9b6..98e64190 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90CAN32.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90CAN32.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<device name="AT90CAN32" family="AVR8" configuration-value="at90can32" architecture="AVR8" avr-family="MEGA">
+<device name="AT90CAN32" family="AVR8" configuration-value="at90can32" architecture="AVRe+" avr-family="MEGA">
     <property-groups>
         <property-group key="signatures">
             <property key="jtagid" value="0x0958103F"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90CAN64.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90CAN64.xml
index 2c2da119..e18fb987 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90CAN64.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90CAN64.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<device name="AT90CAN64" family="AVR8" configuration-value="at90can64" architecture="AVR8" avr-family="MEGA">
+<device name="AT90CAN64" family="AVR8" configuration-value="at90can64" architecture="AVRe+" avr-family="MEGA">
     <property-groups>
         <property-group key="signatures">
             <property key="jtagid" value="0x0968103F"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90PWM1.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90PWM1.xml
index ea92d14c..83f4f8d0 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90PWM1.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90PWM1.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<device name="AT90PWM1" family="AVR8" configuration-value="at90pwm1" architecture="AVR8" avr-family="MEGA">
+<device name="AT90PWM1" family="AVR8" configuration-value="at90pwm1" architecture="AVRe+" avr-family="MEGA">
     <property-groups>
         <property-group key="signatures">
             <property key="jtagid" value="0x9383"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90PWM161.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90PWM161.xml
index 0d2590c5..cb4fea9a 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90PWM161.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90PWM161.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<device name="AT90PWM161" family="AVR8" configuration-value="at90pwm161" architecture="AVR8" avr-family="MEGA">
+<device name="AT90PWM161" family="AVR8" configuration-value="at90pwm161" architecture="AVRe+" avr-family="MEGA">
     <property-groups>
         <property-group key="signatures">
             <property key="jtagid" value="0x948B"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90PWM216.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90PWM216.xml
index d755495e..c881621b 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90PWM216.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90PWM216.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<device name="AT90PWM216" family="AVR8" configuration-value="at90pwm216" architecture="AVR8" avr-family="MEGA">
+<device name="AT90PWM216" family="AVR8" configuration-value="at90pwm216" architecture="AVRe+" avr-family="MEGA">
     <property-groups>
         <property-group key="signatures">
             <property key="jtagid" value="0x9483"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90PWM2B.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90PWM2B.xml
index 12bf3920..848fcef7 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90PWM2B.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90PWM2B.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<device name="AT90PWM2B" family="AVR8" configuration-value="at90pwm2b" architecture="AVR8" avr-family="MEGA">
+<device name="AT90PWM2B" family="AVR8" configuration-value="at90pwm2b" architecture="AVRe+" avr-family="MEGA">
     <property-groups>
         <property-group key="signatures">
             <property key="jtagid" value="0x9383"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90PWM316.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90PWM316.xml
index bf6856c0..2bb38957 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90PWM316.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90PWM316.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<device name="AT90PWM316" family="AVR8" configuration-value="at90pwm316" architecture="AVR8" avr-family="MEGA">
+<device name="AT90PWM316" family="AVR8" configuration-value="at90pwm316" architecture="AVRe+" avr-family="MEGA">
     <property-groups>
         <property-group key="signatures">
             <property key="jtagid" value="0x9483"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90PWM3B.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90PWM3B.xml
index e3808d8a..2909fb89 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90PWM3B.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90PWM3B.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<device name="AT90PWM3B" family="AVR8" configuration-value="at90pwm3b" architecture="AVR8" avr-family="MEGA">
+<device name="AT90PWM3B" family="AVR8" configuration-value="at90pwm3b" architecture="AVRe+" avr-family="MEGA">
     <property-groups>
         <property-group key="signatures">
             <property key="jtagid" value="0x9383"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90PWM81.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90PWM81.xml
index 93fdaf11..67b6a218 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90PWM81.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90PWM81.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<device name="AT90PWM81" family="AVR8" configuration-value="at90pwm81" architecture="AVR8" avr-family="MEGA">
+<device name="AT90PWM81" family="AVR8" configuration-value="at90pwm81" architecture="AVRe+" avr-family="MEGA">
     <property-groups>
         <property-group key="signatures">
             <property key="jtagid" value="0x9388"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90USB1286.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90USB1286.xml
index 8a432a0e..ad4a6e12 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90USB1286.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90USB1286.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<device name="AT90USB1286" family="AVR8" configuration-value="at90usb1286" architecture="AVR8" avr-family="MEGA">
+<device name="AT90USB1286" family="AVR8" configuration-value="at90usb1286" architecture="AVRe+" avr-family="MEGA">
     <property-groups>
         <property-group key="signatures">
             <property key="jtagid" value="0x0978203F"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90USB1287.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90USB1287.xml
index 417c0fc0..eda33884 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90USB1287.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90USB1287.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<device name="AT90USB1287" family="AVR8" configuration-value="at90usb1287" architecture="AVR8" avr-family="MEGA">
+<device name="AT90USB1287" family="AVR8" configuration-value="at90usb1287" architecture="AVRe+" avr-family="MEGA">
     <property-groups>
         <property-group key="signatures">
             <property key="jtagid" value="0x0978203F"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90USB162.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90USB162.xml
index e1ccec79..7424a199 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90USB162.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90USB162.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<device name="AT90USB162" family="AVR8" configuration-value="at90usb162" architecture="AVR8" avr-family="MEGA">
+<device name="AT90USB162" family="AVR8" configuration-value="at90usb162" architecture="AVRe+" avr-family="MEGA">
     <property-groups>
         <property-group key="signatures">
             <property key="jtagid" value="0x9482"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90USB646.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90USB646.xml
index 982ac512..a5fe2255 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90USB646.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90USB646.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<device name="AT90USB646" family="AVR8" configuration-value="at90usb646" architecture="AVR8" avr-family="MEGA">
+<device name="AT90USB646" family="AVR8" configuration-value="at90usb646" architecture="AVRe+" avr-family="MEGA">
     <property-groups>
         <property-group key="signatures">
             <property key="jtagid" value="0x0968203F"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90USB647.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90USB647.xml
index 201572c7..7725d67e 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90USB647.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90USB647.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<device name="AT90USB647" family="AVR8" configuration-value="at90usb647" architecture="AVR8" avr-family="MEGA">
+<device name="AT90USB647" family="AVR8" configuration-value="at90usb647" architecture="AVRe+" avr-family="MEGA">
     <property-groups>
         <property-group key="signatures">
             <property key="jtagid" value="0x0968203F"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90USB82.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90USB82.xml
index f88dff9e..78b73755 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90USB82.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90USB82.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<device name="AT90USB82" family="AVR8" configuration-value="at90usb82" architecture="AVR8" avr-family="MEGA">
+<device name="AT90USB82" family="AVR8" configuration-value="at90usb82" architecture="AVRe+" avr-family="MEGA">
     <property-groups>
         <property-group key="signatures">
             <property key="jtagid" value="0x9682"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA128.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA128.xml
index 60d60f1f..618484f6 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA128.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA128.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<device name="ATmega128" family="AVR8" configuration-value="atmega128" architecture="AVR8" avr-family="MEGA">
+<device name="ATmega128" family="AVR8" configuration-value="atmega128" architecture="AVRe+" avr-family="MEGA">
     <property-groups>
         <property-group key="signatures">
             <property key="jtagid" value="0x0970203F"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA1280.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA1280.xml
index 374c0cc4..a1d4b1f8 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA1280.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA1280.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<device name="ATmega1280" family="AVR8" configuration-value="atmega1280" architecture="AVR8" avr-family="MEGA">
+<device name="ATmega1280" family="AVR8" configuration-value="atmega1280" architecture="AVRe+" avr-family="MEGA">
     <property-groups>
         <property-group key="signatures">
             <property key="jtagid" value="0x0970303F"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA1281.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA1281.xml
index 1a6498e1..3d18af8d 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA1281.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA1281.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<device name="ATmega1281" family="AVR8" configuration-value="atmega1281" architecture="AVR8" avr-family="MEGA">
+<device name="ATmega1281" family="AVR8" configuration-value="atmega1281" architecture="AVRe+" avr-family="MEGA">
     <property-groups>
         <property-group key="signatures">
             <property key="jtagid" value="0x0970403F"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA1284.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA1284.xml
index 6f4ace8c..b495d3aa 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA1284.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA1284.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<device name="ATmega1284" family="AVR8" configuration-value="atmega1284" architecture="AVR8" avr-family="MEGA">
+<device name="ATmega1284" family="AVR8" configuration-value="atmega1284" architecture="AVRe+" avr-family="MEGA">
     <property-groups>
         <property-group key="signatures">
             <property key="jtagid" value="0x0970503F"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA1284P.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA1284P.xml
index e7c94a21..a0bd8cbb 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA1284P.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA1284P.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<device name="ATmega1284P" family="AVR8" configuration-value="atmega1284p" architecture="AVR8" avr-family="MEGA">
+<device name="ATmega1284P" family="AVR8" configuration-value="atmega1284p" architecture="AVRe+" avr-family="MEGA">
     <property-groups>
         <property-group key="signatures">
             <property key="jtagid" value="0x0970503F"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA1284RFR2.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA1284RFR2.xml
index d416027b..4988412d 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA1284RFR2.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA1284RFR2.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<device name="ATmega1284RFR2" family="AVR8" configuration-value="atmega1284rfr2" architecture="AVR8" avr-family="MEGA">
+<device name="ATmega1284RFR2" family="AVR8" configuration-value="atmega1284rfr2" architecture="AVRe+" avr-family="MEGA">
     <property-groups>
         <property-group key="signatures">
             <property key="jtagid" value="0x0A70303F"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA128A.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA128A.xml
index 51a17e05..6d13c920 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA128A.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA128A.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<device name="ATmega128A" family="AVR8" configuration-value="atmega128a" architecture="AVR8" avr-family="MEGA">
+<device name="ATmega128A" family="AVR8" configuration-value="atmega128a" architecture="AVRe+" avr-family="MEGA">
     <property-groups>
         <property-group key="signatures">
             <property key="jtagid" value="0x0970203F"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA128RFA1.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA128RFA1.xml
index 644f245b..f9bde93f 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA128RFA1.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA128RFA1.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<device name="ATmega128RFA1" family="AVR8" configuration-value="atmega128rfa1" architecture="AVR8" avr-family="MEGA">
+<device name="ATmega128RFA1" family="AVR8" configuration-value="atmega128rfa1" architecture="AVRe+" avr-family="MEGA">
     <property-groups>
         <property-group key="signatures">
             <property key="jtagid" value="0x0A70103F"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA128RFR2.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA128RFR2.xml
index da780e88..c018915d 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA128RFR2.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA128RFR2.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<device name="ATmega128RFR2" family="AVR8" configuration-value="atmega128rfr2" architecture="AVR8" avr-family="MEGA">
+<device name="ATmega128RFR2" family="AVR8" configuration-value="atmega128rfr2" architecture="AVRe+" avr-family="MEGA">
     <property-groups>
         <property-group key="signatures">
             <property key="jtagid" value="0x0A70203F"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA16.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA16.xml
index 404fb764..60c02671 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA16.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA16.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<device name="ATmega16" family="AVR8" configuration-value="atmega16" architecture="AVR8" avr-family="MEGA">
+<device name="ATmega16" family="AVR8" configuration-value="atmega16" architecture="AVRe+" avr-family="MEGA">
     <property-groups>
         <property-group key="signatures">
             <property key="jtagid" value="0x0940303F"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA1608.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA1608.xml
index 500de1e3..06c33dcc 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA1608.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA1608.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<device name="ATmega1608" family="AVR8" configuration-value="atmega1608" architecture="AVR8X" avr-family="MEGA">
+<device name="ATmega1608" family="AVR8" configuration-value="atmega1608" architecture="AVRxt" avr-family="MEGA">
     <property-groups>
         <property-group key="ocd_features">
             <property key="break_pin" value="PF6"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA1609.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA1609.xml
index 5e310f28..7adbb37b 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA1609.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA1609.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<device name="ATmega1609" family="AVR8" configuration-value="atmega1609" architecture="AVR8X" avr-family="MEGA">
+<device name="ATmega1609" family="AVR8" configuration-value="atmega1609" architecture="AVRxt" avr-family="MEGA">
     <property-groups>
         <property-group key="ocd_features">
             <property key="break_pin" value="PF6"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA162.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA162.xml
index a68354a0..e5ac293f 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA162.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA162.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<device name="ATmega162" family="AVR8" configuration-value="atmega162" architecture="AVR8" avr-family="MEGA">
+<device name="ATmega162" family="AVR8" configuration-value="atmega162" architecture="AVRe+" avr-family="MEGA">
     <property-groups>
         <property-group key="signatures">
             <property key="jtagid" value="0x0940403F"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA164A.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA164A.xml
index 2eb36267..b876797b 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA164A.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA164A.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<device name="ATmega164A" family="AVR8" configuration-value="atmega164a" architecture="AVR8" avr-family="MEGA">
+<device name="ATmega164A" family="AVR8" configuration-value="atmega164a" architecture="AVRe+" avr-family="MEGA">
     <property-groups>
         <property-group key="signatures">
             <property key="jtagid" value="0x0940a03F"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA164P.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA164P.xml
index 03013da6..9049a40e 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA164P.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA164P.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<device name="ATmega164P" family="AVR8" configuration-value="atmega164p" architecture="AVR8" avr-family="MEGA">
+<device name="ATmega164P" family="AVR8" configuration-value="atmega164p" architecture="AVRe+" avr-family="MEGA">
     <property-groups>
         <property-group key="signatures">
             <property key="jtagid" value="0x0940a03F"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA164PA.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA164PA.xml
index bad132cb..fdc23c1c 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA164PA.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA164PA.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<device name="ATmega164PA" family="AVR8" configuration-value="atmega164pa" architecture="AVR8" avr-family="MEGA">
+<device name="ATmega164PA" family="AVR8" configuration-value="atmega164pa" architecture="AVRe+" avr-family="MEGA">
     <property-groups>
         <property-group key="signatures">
             <property key="jtagid" value="0x0940a03F"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA165A.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA165A.xml
index fda3e101..81c6387a 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA165A.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA165A.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<device name="ATmega165A" family="AVR8" configuration-value="atmega165a" architecture="AVR8" avr-family="MEGA">
+<device name="ATmega165A" family="AVR8" configuration-value="atmega165a" architecture="AVRe+" avr-family="MEGA">
     <property-groups>
         <property-group key="signatures">
             <property key="jtagid" value="0x0940703F"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA165P.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA165P.xml
index 9999bd4e..4caea616 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA165P.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA165P.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<device name="ATmega165P" family="AVR8" configuration-value="atmega165p" architecture="AVR8" avr-family="MEGA">
+<device name="ATmega165P" family="AVR8" configuration-value="atmega165p" architecture="AVRe+" avr-family="MEGA">
     <property-groups>
         <property-group key="signatures">
             <property key="jtagid" value="0x0940703F"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA165PA.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA165PA.xml
index 8bf5c0a5..af42d15b 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA165PA.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA165PA.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<device name="ATmega165PA" family="AVR8" configuration-value="atmega165pa" architecture="AVR8" avr-family="MEGA">
+<device name="ATmega165PA" family="AVR8" configuration-value="atmega165pa" architecture="AVRe+" avr-family="MEGA">
     <property-groups>
         <property-group key="signatures">
             <property key="jtagid" value="0x0940703F"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA168.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA168.xml
index 49758155..7c86a789 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA168.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA168.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<device name="ATmega168" family="AVR8" configuration-value="atmega168" architecture="AVR8" avr-family="MEGA">
+<device name="ATmega168" family="AVR8" configuration-value="atmega168" architecture="AVRe+" avr-family="MEGA">
     <property-groups>
         <property-group key="signatures">
             <property key="jtagid" value="0x9406"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA168A.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA168A.xml
index 49144920..93461d8b 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA168A.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA168A.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<device name="ATmega168A" family="AVR8" configuration-value="atmega168a" architecture="AVR8" avr-family="MEGA">
+<device name="ATmega168A" family="AVR8" configuration-value="atmega168a" architecture="AVRe+" avr-family="MEGA">
     <property-groups>
         <property-group key="signatures">
             <property key="jtagid" value="0x940B"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA168P.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA168P.xml
index 6a6b30fe..4c7cb2ed 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA168P.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA168P.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<device name="ATmega168P" family="AVR8" configuration-value="atmega168p" architecture="AVR8" avr-family="MEGA">
+<device name="ATmega168P" family="AVR8" configuration-value="atmega168p" architecture="AVRe+" avr-family="MEGA">
     <property-groups>
         <property-group key="signatures">
             <property key="jtagid" value="0x940B"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA168PA.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA168PA.xml
index d663fa0c..e72f7b1d 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA168PA.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA168PA.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<device name="ATmega168PA" family="AVR8" configuration-value="atmega168pa" architecture="AVR8" avr-family="MEGA">
+<device name="ATmega168PA" family="AVR8" configuration-value="atmega168pa" architecture="AVRe+" avr-family="MEGA">
     <property-groups>
         <property-group key="signatures">
             <property key="jtagid" value="0x940B"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA168PB.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA168PB.xml
index 7291ac50..4af405d1 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA168PB.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA168PB.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<device name="ATmega168PB" family="AVR8" configuration-value="atmega168pb" architecture="AVR8" avr-family="MEGA">
+<device name="ATmega168PB" family="AVR8" configuration-value="atmega168pb" architecture="AVRe+" avr-family="MEGA">
     <property-groups>
         <property-group key="signatures">
             <property key="jtagid" value="0x9415"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA169A.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA169A.xml
index 8b4e3aa7..40ee4338 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA169A.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA169A.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<device name="ATmega169A" family="AVR8" configuration-value="atmega169a" architecture="AVR8" avr-family="MEGA">
+<device name="ATmega169A" family="AVR8" configuration-value="atmega169a" architecture="AVRe+" avr-family="MEGA">
     <property-groups>
         <property-group key="signatures">
             <property key="jtagid" value="0x0940503F"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA169P.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA169P.xml
index f30ce658..414c8ad3 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA169P.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA169P.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<device name="ATmega169P" family="AVR8" configuration-value="atmega169p" architecture="AVR8" avr-family="MEGA">
+<device name="ATmega169P" family="AVR8" configuration-value="atmega169p" architecture="AVRe+" avr-family="MEGA">
     <property-groups>
         <property-group key="signatures">
             <property key="jtagid" value="0x0940503F"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA169PA.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA169PA.xml
index 74a25adc..35b205e8 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA169PA.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA169PA.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<device name="ATmega169PA" family="AVR8" configuration-value="atmega169pa" architecture="AVR8" avr-family="MEGA">
+<device name="ATmega169PA" family="AVR8" configuration-value="atmega169pa" architecture="AVRe+" avr-family="MEGA">
     <property-groups>
         <property-group key="signatures">
             <property key="jtagid" value="0x0940503F"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA16A.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA16A.xml
index ab77d64c..e30cb8c1 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA16A.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA16A.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<device name="ATmega16A" family="AVR8" configuration-value="atmega16a" architecture="AVR8" avr-family="MEGA">
+<device name="ATmega16A" family="AVR8" configuration-value="atmega16a" architecture="AVRe+" avr-family="MEGA">
     <property-groups>
         <property-group key="signatures">
             <property key="jtagid" value="0x0940303F"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA16M1.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA16M1.xml
index 995e192e..9beeea4e 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA16M1.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA16M1.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<device name="ATmega16M1" family="AVR8" configuration-value="atmega16m1" architecture="AVR8" avr-family="MEGA">
+<device name="ATmega16M1" family="AVR8" configuration-value="atmega16m1" architecture="AVRe+" avr-family="MEGA">
     <property-groups>
         <property-group key="signatures">
             <property key="jtagid" value="0x9484"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA16U2.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA16U2.xml
index 0b7716a7..4363e036 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA16U2.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA16U2.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<device name="ATmega16U2" family="AVR8" configuration-value="atmega16u2" architecture="AVR8" avr-family="MEGA">
+<device name="ATmega16U2" family="AVR8" configuration-value="atmega16u2" architecture="AVRe+" avr-family="MEGA">
     <property-groups>
         <property-group key="signatures">
             <property key="jtagid" value="0x9489"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA16U4.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA16U4.xml
index fe99bfef..63f5cd9a 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA16U4.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA16U4.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<device name="ATmega16U4" family="AVR8" configuration-value="atmega16u4" architecture="AVR8" avr-family="MEGA">
+<device name="ATmega16U4" family="AVR8" configuration-value="atmega16u4" architecture="AVRe+" avr-family="MEGA">
     <property-groups>
         <property-group key="signatures">
             <property key="jtagid" value="0x0948803F"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA2560.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA2560.xml
index 09fa2ce0..55d7b904 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA2560.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA2560.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<device name="ATmega2560" family="AVR8" configuration-value="atmega2560" architecture="AVR8" avr-family="MEGA">
+<device name="ATmega2560" family="AVR8" configuration-value="atmega2560" architecture="AVRe+" avr-family="MEGA">
     <property-groups>
         <property-group key="signatures">
             <property key="jtagid" value="0x0980103F"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA2561.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA2561.xml
index 4d654690..240b27d4 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA2561.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA2561.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<device name="ATmega2561" family="AVR8" configuration-value="atmega2561" architecture="AVR8" avr-family="MEGA">
+<device name="ATmega2561" family="AVR8" configuration-value="atmega2561" architecture="AVRe+" avr-family="MEGA">
     <property-groups>
         <property-group key="signatures">
             <property key="jtagid" value="0x0980203F"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA2564RFR2.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA2564RFR2.xml
index f413ad48..c6f011f0 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA2564RFR2.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA2564RFR2.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<device name="ATmega2564RFR2" family="AVR8" configuration-value="atmega2564rfr2" architecture="AVR8" avr-family="MEGA">
+<device name="ATmega2564RFR2" family="AVR8" configuration-value="atmega2564rfr2" architecture="AVRe+" avr-family="MEGA">
     <property-groups>
         <property-group key="signatures">
             <property key="jtagid" value="0x0A80303F"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA256RFR2.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA256RFR2.xml
index c3379543..c412cb36 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA256RFR2.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA256RFR2.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<device name="ATmega256RFR2" family="AVR8" configuration-value="atmega256rfr2" architecture="AVR8" avr-family="MEGA">
+<device name="ATmega256RFR2" family="AVR8" configuration-value="atmega256rfr2" architecture="AVRe+" avr-family="MEGA">
     <property-groups>
         <property-group key="signatures">
             <property key="jtagid" value="0x0A80203F"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA32.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA32.xml
index d1da133d..f4dfc75b 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA32.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA32.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<device name="ATmega32" family="AVR8" configuration-value="atmega32" architecture="AVR8" avr-family="MEGA">
+<device name="ATmega32" family="AVR8" configuration-value="atmega32" architecture="AVRe+" avr-family="MEGA">
     <property-groups>
         <property-group key="signatures">
             <property key="jtagid" value="0x0950203F"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA3208.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA3208.xml
index 7d1181d0..58e6486b 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA3208.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA3208.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<device name="ATmega3208" family="AVR8" configuration-value="atmega3208" architecture="AVR8X" avr-family="MEGA">
+<device name="ATmega3208" family="AVR8" configuration-value="atmega3208" architecture="AVRxt" avr-family="MEGA">
     <property-groups>
         <property-group key="ocd_features">
             <property key="break_pin" value="PF6"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA3209.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA3209.xml
index 1a990ee7..08d75941 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA3209.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA3209.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<device name="ATmega3209" family="AVR8" configuration-value="atmega3209" architecture="AVR8X" avr-family="MEGA">
+<device name="ATmega3209" family="AVR8" configuration-value="atmega3209" architecture="AVRxt" avr-family="MEGA">
     <property-groups>
         <property-group key="ocd_features">
             <property key="break_pin" value="PF6"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA324A.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA324A.xml
index 084c869a..96c37579 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA324A.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA324A.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<device name="ATmega324A" family="AVR8" configuration-value="atmega324a" architecture="AVR8" avr-family="MEGA">
+<device name="ATmega324A" family="AVR8" configuration-value="atmega324a" architecture="AVRe+" avr-family="MEGA">
     <property-groups>
         <property-group key="signatures">
             <property key="jtagid" value="0x0951103F"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA324P.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA324P.xml
index 791ff5d6..274c0625 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA324P.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA324P.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<device name="ATmega324P" family="AVR8" configuration-value="atmega324p" architecture="AVR8" avr-family="MEGA">
+<device name="ATmega324P" family="AVR8" configuration-value="atmega324p" architecture="AVRe+" avr-family="MEGA">
     <property-groups>
         <property-group key="signatures">
             <property key="jtagid" value="0x0950803F"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA324PA.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA324PA.xml
index be4f5820..0b0d75a6 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA324PA.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA324PA.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<device name="ATmega324PA" family="AVR8" configuration-value="atmega324pa" architecture="AVR8" avr-family="MEGA">
+<device name="ATmega324PA" family="AVR8" configuration-value="atmega324pa" architecture="AVRe+" avr-family="MEGA">
     <property-groups>
         <property-group key="signatures">
             <property key="jtagid" value="0x0951103F"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA324PB.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA324PB.xml
index 883f6d2b..00542f77 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA324PB.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA324PB.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<device name="ATmega324PB" family="AVR8" configuration-value="atmega324pb" architecture="AVR8" avr-family="MEGA">
+<device name="ATmega324PB" family="AVR8" configuration-value="atmega324pb" architecture="AVRe+" avr-family="MEGA">
     <property-groups>
         <property-group key="signatures">
             <property key="jtagid" value="0x0951703F"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA325.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA325.xml
index be1c19e5..ebfd8ee0 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA325.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA325.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<device name="ATmega325" family="AVR8" configuration-value="atmega325" architecture="AVR8" avr-family="MEGA">
+<device name="ATmega325" family="AVR8" configuration-value="atmega325" architecture="AVRe+" avr-family="MEGA">
     <property-groups>
         <property-group key="signatures">
             <property key="jtagid" value="0x0950503F"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA3250.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA3250.xml
index 2f73aead..dcebd299 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA3250.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA3250.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<device name="ATmega3250" family="AVR8" configuration-value="atmega3250" architecture="AVR8" avr-family="MEGA">
+<device name="ATmega3250" family="AVR8" configuration-value="atmega3250" architecture="AVRe+" avr-family="MEGA">
     <property-groups>
         <property-group key="signatures">
             <property key="jtagid" value="0x0950603F"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA3250A.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA3250A.xml
index ef229fa7..4abf2569 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA3250A.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA3250A.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<device name="ATmega3250A" family="AVR8" configuration-value="atmega3250a" architecture="AVR8" avr-family="MEGA">
+<device name="ATmega3250A" family="AVR8" configuration-value="atmega3250a" architecture="AVRe+" avr-family="MEGA">
     <property-groups>
         <property-group key="signatures">
             <property key="jtagid" value="0x0950E03F"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA3250P.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA3250P.xml
index 7beee29f..9d910e53 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA3250P.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA3250P.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<device name="ATmega3250P" family="AVR8" configuration-value="atmega3250p" architecture="AVR8" avr-family="MEGA">
+<device name="ATmega3250P" family="AVR8" configuration-value="atmega3250p" architecture="AVRe+" avr-family="MEGA">
     <property-groups>
         <property-group key="signatures">
             <property key="jtagid" value="0x0950E03F"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA3250PA.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA3250PA.xml
index 7a92bab3..2c41a127 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA3250PA.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA3250PA.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<device name="ATmega3250PA" family="AVR8" configuration-value="atmega3250pa" architecture="AVR8" avr-family="MEGA">
+<device name="ATmega3250PA" family="AVR8" configuration-value="atmega3250pa" architecture="AVRe+" avr-family="MEGA">
     <property-groups>
         <property-group key="signatures">
             <property key="jtagid" value="0x0950E03F"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA325A.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA325A.xml
index f8fea05d..a15a9d24 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA325A.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA325A.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<device name="ATmega325A" family="AVR8" configuration-value="atmega325a" architecture="AVR8" avr-family="MEGA">
+<device name="ATmega325A" family="AVR8" configuration-value="atmega325a" architecture="AVRe+" avr-family="MEGA">
     <property-groups>
         <property-group key="signatures">
             <property key="jtagid" value="0x0950D03F"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA325P.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA325P.xml
index be310f92..87db883e 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA325P.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA325P.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<device name="ATmega325P" family="AVR8" configuration-value="atmega325p" architecture="AVR8" avr-family="MEGA">
+<device name="ATmega325P" family="AVR8" configuration-value="atmega325p" architecture="AVRe+" avr-family="MEGA">
     <property-groups>
         <property-group key="signatures">
             <property key="jtagid" value="0x0950D03F"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA325PA.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA325PA.xml
index 44807cf8..ad236cbe 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA325PA.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA325PA.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<device name="ATmega325PA" family="AVR8" configuration-value="atmega325pa" architecture="AVR8" avr-family="MEGA">
+<device name="ATmega325PA" family="AVR8" configuration-value="atmega325pa" architecture="AVRe+" avr-family="MEGA">
     <property-groups>
         <property-group key="signatures">
             <property key="jtagid" value="0x0950D03F"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA328.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA328.xml
index 450cee9f..dc36495c 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA328.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA328.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<device name="ATmega328" family="AVR8" configuration-value="atmega328" architecture="AVR8" avr-family="MEGA">
+<device name="ATmega328" family="AVR8" configuration-value="atmega328" architecture="AVRe+" avr-family="MEGA">
     <property-groups>
         <property-group key="signatures">
             <property key="jtagid" value="0x950F"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA328P.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA328P.xml
index 2b5bc933..f165c262 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA328P.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA328P.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<device name="ATmega328P" family="AVR8" configuration-value="atmega328p" architecture="AVR8" avr-family="MEGA">
+<device name="ATmega328P" family="AVR8" configuration-value="atmega328p" architecture="AVRe+" avr-family="MEGA">
     <property-groups>
         <property-group key="signatures">
             <property key="jtagid" value="0x950F"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA328PB.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA328PB.xml
index 6599d62b..b67f1a12 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA328PB.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA328PB.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<device name="ATmega328PB" family="AVR8" configuration-value="atmega328pb" architecture="AVR8" avr-family="MEGA">
+<device name="ATmega328PB" family="AVR8" configuration-value="atmega328pb" architecture="AVRe+" avr-family="MEGA">
     <property-groups>
         <property-group key="signatures">
             <property key="jtagid" value="0x9516"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA329.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA329.xml
index 4b7f0b4d..41cf743d 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA329.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA329.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<device name="ATmega329" family="AVR8" configuration-value="atmega329" architecture="AVR8" avr-family="MEGA">
+<device name="ATmega329" family="AVR8" configuration-value="atmega329" architecture="AVRe+" avr-family="MEGA">
     <property-groups>
         <property-group key="signatures">
             <property key="jtagid" value="0x0950303F"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA3290.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA3290.xml
index 32647b3f..1f483668 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA3290.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA3290.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<device name="ATmega3290" family="AVR8" configuration-value="atmega3290" architecture="AVR8" avr-family="MEGA">
+<device name="ATmega3290" family="AVR8" configuration-value="atmega3290" architecture="AVRe+" avr-family="MEGA">
     <property-groups>
         <property-group key="signatures">
             <property key="jtagid" value="0x0950403F"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA3290A.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA3290A.xml
index 1cdc573c..54ccc6cc 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA3290A.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA3290A.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<device name="ATmega3290A" family="AVR8" configuration-value="atmega3290a" architecture="AVR8" avr-family="MEGA">
+<device name="ATmega3290A" family="AVR8" configuration-value="atmega3290a" architecture="AVRe+" avr-family="MEGA">
     <property-groups>
         <property-group key="signatures">
             <property key="jtagid" value="0x0950C03F"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA3290P.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA3290P.xml
index 192cf143..96413eab 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA3290P.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA3290P.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<device name="ATmega3290P" family="AVR8" configuration-value="atmega3290p" architecture="AVR8" avr-family="MEGA">
+<device name="ATmega3290P" family="AVR8" configuration-value="atmega3290p" architecture="AVRe+" avr-family="MEGA">
     <property-groups>
         <property-group key="signatures">
             <property key="jtagid" value="0x0950C03F"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA3290PA.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA3290PA.xml
index 91bbc178..37285036 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA3290PA.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA3290PA.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<device name="ATmega3290PA" family="AVR8" configuration-value="atmega3290pa" architecture="AVR8" avr-family="MEGA">
+<device name="ATmega3290PA" family="AVR8" configuration-value="atmega3290pa" architecture="AVRe+" avr-family="MEGA">
     <property-groups>
         <property-group key="signatures">
             <property key="jtagid" value="0x0950C03F"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA329A.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA329A.xml
index cd161bad..7660228b 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA329A.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA329A.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<device name="ATmega329A" family="AVR8" configuration-value="atmega329a" architecture="AVR8" avr-family="MEGA">
+<device name="ATmega329A" family="AVR8" configuration-value="atmega329a" architecture="AVRe+" avr-family="MEGA">
     <property-groups>
         <property-group key="signatures">
             <property key="jtagid" value="0x0950B03F"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA329P.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA329P.xml
index ca496a9e..7b21786c 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA329P.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA329P.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<device name="ATmega329P" family="AVR8" configuration-value="atmega329p" architecture="AVR8" avr-family="MEGA">
+<device name="ATmega329P" family="AVR8" configuration-value="atmega329p" architecture="AVRe+" avr-family="MEGA">
     <property-groups>
         <property-group key="signatures">
             <property key="jtagid" value="0x0950B03F"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA329PA.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA329PA.xml
index 57dfccc1..a2be5438 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA329PA.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA329PA.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<device name="ATmega329PA" family="AVR8" configuration-value="atmega329pa" architecture="AVR8" avr-family="MEGA">
+<device name="ATmega329PA" family="AVR8" configuration-value="atmega329pa" architecture="AVRe+" avr-family="MEGA">
     <property-groups>
         <property-group key="signatures">
             <property key="jtagid" value="0x0950B03F"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA32A.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA32A.xml
index d5192bde..a7b73490 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA32A.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA32A.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<device name="ATmega32A" family="AVR8" configuration-value="atmega32a" architecture="AVR8" avr-family="MEGA">
+<device name="ATmega32A" family="AVR8" configuration-value="atmega32a" architecture="AVRe+" avr-family="MEGA">
     <property-groups>
         <property-group key="signatures">
             <property key="jtagid" value="0x0950203F"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA32C1.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA32C1.xml
index aa77b0f5..2b507475 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA32C1.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA32C1.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<device name="ATmega32C1" family="AVR8" configuration-value="atmega32c1" architecture="AVR8" avr-family="MEGA">
+<device name="ATmega32C1" family="AVR8" configuration-value="atmega32c1" architecture="AVRe+" avr-family="MEGA">
     <property-groups>
         <property-group key="signatures">
             <property key="jtagid" value="0x9586"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA32M1.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA32M1.xml
index 36b64eeb..9acfd449 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA32M1.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA32M1.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<device name="ATmega32M1" family="AVR8" configuration-value="atmega32m1" architecture="AVR8" avr-family="MEGA">
+<device name="ATmega32M1" family="AVR8" configuration-value="atmega32m1" architecture="AVRe+" avr-family="MEGA">
     <property-groups>
         <property-group key="signatures">
             <property key="jtagid" value="0x9584"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA32U2.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA32U2.xml
index 030c0801..0ccc2a65 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA32U2.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA32U2.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<device name="ATmega32U2" family="AVR8" configuration-value="atmega32u2" architecture="AVR8" avr-family="MEGA">
+<device name="ATmega32U2" family="AVR8" configuration-value="atmega32u2" architecture="AVRe+" avr-family="MEGA">
     <property-groups>
         <property-group key="signatures">
             <property key="jtagid" value="0x958A"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA32U4.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA32U4.xml
index 0b150617..ea88c7e2 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA32U4.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA32U4.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<device name="ATmega32U4" family="AVR8" configuration-value="atmega32u4" architecture="AVR8" avr-family="MEGA">
+<device name="ATmega32U4" family="AVR8" configuration-value="atmega32u4" architecture="AVRe+" avr-family="MEGA">
     <property-groups>
         <property-group key="signatures">
             <property key="jtagid" value="0x0958703F"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA406.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA406.xml
index 2fa87259..ba9a7a31 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA406.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA406.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<device name="ATmega406" family="AVR8" configuration-value="atmega406" architecture="AVR8" avr-family="MEGA">
+<device name="ATmega406" family="AVR8" configuration-value="atmega406" architecture="AVRe+" avr-family="MEGA">
     <property-groups>
         <property-group key="signatures">
             <property key="jtagid" value="0x0950703F"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA48.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA48.xml
index 3c475aab..5b4c2819 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA48.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA48.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<device name="ATmega48" family="AVR8" configuration-value="atmega48" architecture="AVR8" avr-family="MEGA">
+<device name="ATmega48" family="AVR8" configuration-value="atmega48" architecture="AVRe+" avr-family="MEGA">
     <property-groups>
         <property-group key="signatures">
             <property key="jtagid" value="0x9205"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA4808.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA4808.xml
index be484a87..07a0397b 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA4808.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA4808.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<device name="ATmega4808" family="AVR8" configuration-value="atmega4808" architecture="AVR8X" avr-family="MEGA">
+<device name="ATmega4808" family="AVR8" configuration-value="atmega4808" architecture="AVRxt" avr-family="MEGA">
     <property-groups>
         <property-group key="ocd_features">
             <property key="break_pin" value="PF6"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA4809.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA4809.xml
index fa20b3db..6b4da04f 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA4809.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA4809.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<device name="ATmega4809" family="AVR8" configuration-value="atmega4809" architecture="AVR8X" avr-family="MEGA">
+<device name="ATmega4809" family="AVR8" configuration-value="atmega4809" architecture="AVRxt" avr-family="MEGA">
     <property-groups>
         <property-group key="ocd_features">
             <property key="break_pin" value="PF6"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA48A.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA48A.xml
index e5095fb6..2b1951c4 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA48A.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA48A.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<device name="ATmega48A" family="AVR8" configuration-value="atmega48a" architecture="AVR8" avr-family="MEGA">
+<device name="ATmega48A" family="AVR8" configuration-value="atmega48a" architecture="AVRe+" avr-family="MEGA">
     <property-groups>
         <property-group key="signatures">
             <property key="jtagid" value="0x920A"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA48P.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA48P.xml
index 80c52916..cfb1fea8 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA48P.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA48P.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<device name="ATmega48P" family="AVR8" configuration-value="atmega48p" architecture="AVR8" avr-family="MEGA">
+<device name="ATmega48P" family="AVR8" configuration-value="atmega48p" architecture="AVRe+" avr-family="MEGA">
     <property-groups>
         <property-group key="signatures">
             <property key="jtagid" value="0x920A"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA48PA.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA48PA.xml
index a0a360e2..f014b061 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA48PA.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA48PA.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<device name="ATmega48PA" family="AVR8" configuration-value="atmega48pa" architecture="AVR8" avr-family="MEGA">
+<device name="ATmega48PA" family="AVR8" configuration-value="atmega48pa" architecture="AVRe+" avr-family="MEGA">
     <property-groups>
         <property-group key="signatures">
             <property key="jtagid" value="0x920A"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA48PB.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA48PB.xml
index 1a207bcc..0cdc9b6d 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA48PB.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA48PB.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<device name="ATmega48PB" family="AVR8" configuration-value="atmega48pb" architecture="AVR8" avr-family="MEGA">
+<device name="ATmega48PB" family="AVR8" configuration-value="atmega48pb" architecture="AVRe+" avr-family="MEGA">
     <property-groups>
         <property-group key="signatures">
             <property key="jtagid" value="0x9210"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA64.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA64.xml
index e1912081..3753627e 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA64.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA64.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<device name="ATmega64" family="AVR8" configuration-value="atmega64" architecture="AVR8" avr-family="MEGA">
+<device name="ATmega64" family="AVR8" configuration-value="atmega64" architecture="AVRe+" avr-family="MEGA">
     <property-groups>
         <property-group key="signatures">
             <property key="jtagid" value="0x0960203F"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA640.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA640.xml
index caebbe9f..b1765c13 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA640.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA640.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<device name="ATmega640" family="AVR8" configuration-value="atmega640" architecture="AVR8" avr-family="MEGA">
+<device name="ATmega640" family="AVR8" configuration-value="atmega640" architecture="AVRe+" avr-family="MEGA">
     <property-groups>
         <property-group key="signatures">
             <property key="jtagid" value="0x0960803F"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA644.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA644.xml
index 5d89a280..90de196f 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA644.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA644.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<device name="ATmega644" family="AVR8" configuration-value="atmega644" architecture="AVR8" avr-family="MEGA">
+<device name="ATmega644" family="AVR8" configuration-value="atmega644" architecture="AVRe+" avr-family="MEGA">
     <property-groups>
         <property-group key="signatures">
             <property key="jtagid" value="0x0960903f"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA644A.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA644A.xml
index b6fe7cdb..5bfe4218 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA644A.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA644A.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<device name="ATmega644A" family="AVR8" configuration-value="atmega644a" architecture="AVR8" avr-family="MEGA">
+<device name="ATmega644A" family="AVR8" configuration-value="atmega644a" architecture="AVRe+" avr-family="MEGA">
     <property-groups>
         <property-group key="signatures">
             <property key="jtagid" value="0x0960A03f"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA644P.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA644P.xml
index a40ef893..ca3b5131 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA644P.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA644P.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<device name="ATmega644P" family="AVR8" configuration-value="atmega644p" architecture="AVR8" avr-family="MEGA">
+<device name="ATmega644P" family="AVR8" configuration-value="atmega644p" architecture="AVRe+" avr-family="MEGA">
     <property-groups>
         <property-group key="signatures">
             <property key="jtagid" value="0x0960A03f"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA644PA.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA644PA.xml
index ebb6b85c..9f0b60db 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA644PA.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA644PA.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<device name="ATmega644PA" family="AVR8" configuration-value="atmega644pa" architecture="AVR8" avr-family="MEGA">
+<device name="ATmega644PA" family="AVR8" configuration-value="atmega644pa" architecture="AVRe+" avr-family="MEGA">
     <property-groups>
         <property-group key="signatures">
             <property key="jtagid" value="0x0960A03f"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA644RFR2.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA644RFR2.xml
index 8a85c5b2..80625ba3 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA644RFR2.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA644RFR2.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<device name="ATmega644RFR2" family="AVR8" configuration-value="atmega644rfr2" architecture="AVR8" avr-family="MEGA">
+<device name="ATmega644RFR2" family="AVR8" configuration-value="atmega644rfr2" architecture="AVRe+" avr-family="MEGA">
     <property-groups>
         <property-group key="signatures">
             <property key="jtagid" value="0x0A60303F"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA645.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA645.xml
index d01b74af..e8826711 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA645.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA645.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<device name="ATmega645" family="AVR8" configuration-value="atmega645" architecture="AVR8" avr-family="MEGA">
+<device name="ATmega645" family="AVR8" configuration-value="atmega645" architecture="AVRe+" avr-family="MEGA">
     <property-groups>
         <property-group key="signatures">
             <property key="jtagid" value="0x0960503F"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA6450.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA6450.xml
index eacb6491..3a9a9cbe 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA6450.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA6450.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<device name="ATmega6450" family="AVR8" configuration-value="atmega6450" architecture="AVR8" avr-family="MEGA">
+<device name="ATmega6450" family="AVR8" configuration-value="atmega6450" architecture="AVRe+" avr-family="MEGA">
     <property-groups>
         <property-group key="signatures">
             <property key="jtagid" value="0x0960603F"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA6450A.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA6450A.xml
index 94e4b7cb..b8e40949 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA6450A.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA6450A.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<device name="ATmega6450A" family="AVR8" configuration-value="atmega6450a" architecture="AVR8" avr-family="MEGA">
+<device name="ATmega6450A" family="AVR8" configuration-value="atmega6450a" architecture="AVRe+" avr-family="MEGA">
     <property-groups>
         <property-group key="signatures">
             <property key="jtagid" value="0x0960E03F"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA6450P.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA6450P.xml
index f91d392e..54180f53 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA6450P.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA6450P.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<device name="ATmega6450P" family="AVR8" configuration-value="atmega6450p" architecture="AVR8" avr-family="MEGA">
+<device name="ATmega6450P" family="AVR8" configuration-value="atmega6450p" architecture="AVRe+" avr-family="MEGA">
     <property-groups>
         <property-group key="signatures">
             <property key="jtagid" value="0x0960E03F"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA645A.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA645A.xml
index 41eb5cba..78f690f4 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA645A.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA645A.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<device name="ATmega645A" family="AVR8" configuration-value="atmega645a" architecture="AVR8" avr-family="MEGA">
+<device name="ATmega645A" family="AVR8" configuration-value="atmega645a" architecture="AVRe+" avr-family="MEGA">
     <property-groups>
         <property-group key="signatures">
             <property key="jtagid" value="0x0960D03F"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA645P.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA645P.xml
index 37b43661..49a1d9e6 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA645P.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA645P.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<device name="ATmega645P" family="AVR8" configuration-value="atmega645p" architecture="AVR8" avr-family="MEGA">
+<device name="ATmega645P" family="AVR8" configuration-value="atmega645p" architecture="AVRe+" avr-family="MEGA">
     <property-groups>
         <property-group key="signatures">
             <property key="jtagid" value="0x0960D03F"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA649.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA649.xml
index 08f59d90..c64cdbfd 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA649.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA649.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<device name="ATmega649" family="AVR8" configuration-value="atmega649" architecture="AVR8" avr-family="MEGA">
+<device name="ATmega649" family="AVR8" configuration-value="atmega649" architecture="AVRe+" avr-family="MEGA">
     <property-groups>
         <property-group key="signatures">
             <property key="jtagid" value="0x0960303F"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA6490.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA6490.xml
index 7ea92fb8..657a7338 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA6490.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA6490.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<device name="ATmega6490" family="AVR8" configuration-value="atmega6490" architecture="AVR8" avr-family="MEGA">
+<device name="ATmega6490" family="AVR8" configuration-value="atmega6490" architecture="AVRe+" avr-family="MEGA">
     <property-groups>
         <property-group key="signatures">
             <property key="jtagid" value="0x0960403F"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA6490A.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA6490A.xml
index 5cb72278..1b5f187e 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA6490A.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA6490A.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<device name="ATmega6490A" family="AVR8" configuration-value="atmega6490a" architecture="AVR8" avr-family="MEGA">
+<device name="ATmega6490A" family="AVR8" configuration-value="atmega6490a" architecture="AVRe+" avr-family="MEGA">
     <property-groups>
         <property-group key="signatures">
             <property key="jtagid" value="0x0960C03F"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA6490P.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA6490P.xml
index c0b8f252..2bc5e745 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA6490P.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA6490P.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<device name="ATmega6490P" family="AVR8" configuration-value="atmega6490p" architecture="AVR8" avr-family="MEGA">
+<device name="ATmega6490P" family="AVR8" configuration-value="atmega6490p" architecture="AVRe+" avr-family="MEGA">
     <property-groups>
         <property-group key="signatures">
             <property key="jtagid" value="0x0960C03F"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA649A.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA649A.xml
index f012f65f..94c538c7 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA649A.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA649A.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<device name="ATmega649A" family="AVR8" configuration-value="atmega649a" architecture="AVR8" avr-family="MEGA">
+<device name="ATmega649A" family="AVR8" configuration-value="atmega649a" architecture="AVRe+" avr-family="MEGA">
     <property-groups>
         <property-group key="signatures">
             <property key="jtagid" value="0x0960B03F"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA649P.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA649P.xml
index 46927e68..192fca20 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA649P.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA649P.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<device name="ATmega649P" family="AVR8" configuration-value="atmega649p" architecture="AVR8" avr-family="MEGA">
+<device name="ATmega649P" family="AVR8" configuration-value="atmega649p" architecture="AVRe+" avr-family="MEGA">
     <property-groups>
         <property-group key="signatures">
             <property key="jtagid" value="0x0960B03F"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA64A.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA64A.xml
index 25e20084..94e37856 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA64A.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA64A.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<device name="ATmega64A" family="AVR8" configuration-value="atmega64a" architecture="AVR8" avr-family="MEGA">
+<device name="ATmega64A" family="AVR8" configuration-value="atmega64a" architecture="AVRe+" avr-family="MEGA">
     <property-groups>
         <property-group key="signatures">
             <property key="jtagid" value="0x0960203F"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA64C1.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA64C1.xml
index 716793ef..8876f597 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA64C1.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA64C1.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<device name="ATmega64C1" family="AVR8" configuration-value="atmega64c1" architecture="AVR8" avr-family="MEGA">
+<device name="ATmega64C1" family="AVR8" configuration-value="atmega64c1" architecture="AVRe+" avr-family="MEGA">
     <property-groups>
         <property-group key="signatures">
             <property key="jtagid" value="0x9686"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA64M1.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA64M1.xml
index c93fae60..3b3193ba 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA64M1.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA64M1.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<device name="ATmega64M1" family="AVR8" configuration-value="atmega64m1" architecture="AVR8" avr-family="MEGA">
+<device name="ATmega64M1" family="AVR8" configuration-value="atmega64m1" architecture="AVRe+" avr-family="MEGA">
     <property-groups>
         <property-group key="signatures">
             <property key="jtagid" value="0x9684"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA64RFR2.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA64RFR2.xml
index a17aaddd..7bd1a8b2 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA64RFR2.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA64RFR2.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<device name="ATmega64RFR2" family="AVR8" configuration-value="atmega64rfr2" architecture="AVR8" avr-family="MEGA">
+<device name="ATmega64RFR2" family="AVR8" configuration-value="atmega64rfr2" architecture="AVRe+" avr-family="MEGA">
     <property-groups>
         <property-group key="signatures">
             <property key="jtagid" value="0x0A60203F"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA808.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA808.xml
index ba032faa..31aa27ab 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA808.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA808.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<device name="ATmega808" family="AVR8" configuration-value="atmega808" architecture="AVR8X" avr-family="MEGA">
+<device name="ATmega808" family="AVR8" configuration-value="atmega808" architecture="AVRxt" avr-family="MEGA">
     <property-groups>
         <property-group key="ocd_features">
             <property key="break_pin" value="PF6"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA809.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA809.xml
index a39e21b8..0c7f32ad 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA809.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA809.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<device name="ATmega809" family="AVR8" configuration-value="atmega809" architecture="AVR8X" avr-family="MEGA">
+<device name="ATmega809" family="AVR8" configuration-value="atmega809" architecture="AVRxt" avr-family="MEGA">
     <property-groups>
         <property-group key="ocd_features">
             <property key="break_pin" value="PF6"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA88.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA88.xml
index 0ed64c52..9923c8cb 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA88.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA88.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<device name="ATmega88" family="AVR8" configuration-value="atmega88" architecture="AVR8" avr-family="MEGA">
+<device name="ATmega88" family="AVR8" configuration-value="atmega88" architecture="AVRe+" avr-family="MEGA">
     <property-groups>
         <property-group key="signatures">
             <property key="jtagid" value="0x930A"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA88A.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA88A.xml
index 98263202..6e7a2352 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA88A.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA88A.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<device name="ATmega88A" family="AVR8" configuration-value="atmega88a" architecture="AVR8" avr-family="MEGA">
+<device name="ATmega88A" family="AVR8" configuration-value="atmega88a" architecture="AVRe+" avr-family="MEGA">
     <property-groups>
         <property-group key="signatures">
             <property key="jtagid" value="0x930F"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA88P.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA88P.xml
index 9332bb16..5feb9521 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA88P.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA88P.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<device name="ATmega88P" family="AVR8" configuration-value="atmega88p" architecture="AVR8" avr-family="MEGA">
+<device name="ATmega88P" family="AVR8" configuration-value="atmega88p" architecture="AVRe+" avr-family="MEGA">
     <property-groups>
         <property-group key="signatures">
             <property key="jtagid" value="0x930F"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA88PA.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA88PA.xml
index ea0c144a..2900eceb 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA88PA.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA88PA.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<device name="ATmega88PA" family="AVR8" configuration-value="atmega88pa" architecture="AVR8" avr-family="MEGA">
+<device name="ATmega88PA" family="AVR8" configuration-value="atmega88pa" architecture="AVRe+" avr-family="MEGA">
     <property-groups>
         <property-group key="signatures">
             <property key="jtagid" value="0x930F"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA88PB.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA88PB.xml
index a431d490..0c3e10a4 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA88PB.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA88PB.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<device name="ATmega88PB" family="AVR8" configuration-value="atmega88pb" architecture="AVR8" avr-family="MEGA">
+<device name="ATmega88PB" family="AVR8" configuration-value="atmega88pb" architecture="AVRe+" avr-family="MEGA">
     <property-groups>
         <property-group key="signatures">
             <property key="jtagid" value="0x9316"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA8U2.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA8U2.xml
index 7f9ffed2..06edc543 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA8U2.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA8U2.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<device name="ATmega8U2" family="AVR8" configuration-value="atmega8u2" architecture="AVR8" avr-family="MEGA">
+<device name="ATmega8U2" family="AVR8" configuration-value="atmega8u2" architecture="AVRe+" avr-family="MEGA">
     <property-groups>
         <property-group key="signatures">
             <property key="jtagid" value="0x9389"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY13.xml b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY13.xml
index 895c51c6..0fac6a3a 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY13.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY13.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<device name="ATtiny13" family="AVR8" configuration-value="attiny13" architecture="AVR8" avr-family="TINY">
+<device name="ATtiny13" family="AVR8" configuration-value="attiny13" architecture="AVRe" avr-family="TINY">
     <property-groups>
         <property-group key="signatures">
             <property key="jtagid" value="0x9007"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY13A.xml b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY13A.xml
index d0868a5f..5b058fbb 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY13A.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY13A.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<device name="ATtiny13A" family="AVR8" configuration-value="attiny13a" architecture="AVR8" avr-family="TINY">
+<device name="ATtiny13A" family="AVR8" configuration-value="attiny13a" architecture="AVRe" avr-family="TINY">
     <property-groups>
         <property-group key="signatures">
             <property key="jtagid" value="0x9007"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY1604.xml b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY1604.xml
index c5c33fa0..6cee2e0d 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY1604.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY1604.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<device name="ATtiny1604" family="AVR8" configuration-value="attiny1604" architecture="AVR8X" avr-family="TINY">
+<device name="ATtiny1604" family="AVR8" configuration-value="attiny1604" architecture="AVRxt" avr-family="TINY">
     <property-groups>
         <property-group key="ocd_features">
             <property key="break_pin" value="PA1"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY1606.xml b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY1606.xml
index 8c061aae..64a68808 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY1606.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY1606.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<device name="ATtiny1606" family="AVR8" configuration-value="attiny1606" architecture="AVR8X" avr-family="TINY">
+<device name="ATtiny1606" family="AVR8" configuration-value="attiny1606" architecture="AVRxt" avr-family="TINY">
     <property-groups>
         <property-group key="ocd_features">
             <property key="break_pin" value="PA1"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY1607.xml b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY1607.xml
index ef9a1744..a87b3279 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY1607.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY1607.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<device name="ATtiny1607" family="AVR8" configuration-value="attiny1607" architecture="AVR8X" avr-family="TINY">
+<device name="ATtiny1607" family="AVR8" configuration-value="attiny1607" architecture="AVRxt" avr-family="TINY">
     <property-groups>
         <property-group key="ocd_features">
             <property key="break_pin" value="PA1"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY1614.xml b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY1614.xml
index 85974933..83722d14 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY1614.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY1614.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<device name="ATtiny1614" family="AVR8" configuration-value="attiny1614" architecture="AVR8X" avr-family="TINY">
+<device name="ATtiny1614" family="AVR8" configuration-value="attiny1614" architecture="AVRxt" avr-family="TINY">
     <property-groups>
         <property-group key="ocd_features">
             <property key="break_pin" value="PA1"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY1616.xml b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY1616.xml
index 452fef43..2330a2d6 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY1616.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY1616.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<device name="ATtiny1616" family="AVR8" configuration-value="attiny1616" architecture="AVR8X" avr-family="TINY">
+<device name="ATtiny1616" family="AVR8" configuration-value="attiny1616" architecture="AVRxt" avr-family="TINY">
     <property-groups>
         <property-group key="ocd_features">
             <property key="break_pin" value="PA1"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY1617.xml b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY1617.xml
index 8e2ac423..e1c4b84b 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY1617.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY1617.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<device name="ATtiny1617" family="AVR8" configuration-value="attiny1617" architecture="AVR8X" avr-family="TINY">
+<device name="ATtiny1617" family="AVR8" configuration-value="attiny1617" architecture="AVRxt" avr-family="TINY">
     <property-groups>
         <property-group key="ocd_features">
             <property key="break_pin" value="PA1"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY1624.xml b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY1624.xml
index 13832d50..35210974 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY1624.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY1624.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<device name="ATtiny1624" family="AVR8" configuration-value="attiny1624" architecture="AVR8X" avr-family="TINY">
+<device name="ATtiny1624" family="AVR8" configuration-value="attiny1624" architecture="AVRxt" avr-family="TINY">
     <property-groups>
         <property-group key="ocd_features">
             <property key="break_pin" value="PA1"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY1626.xml b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY1626.xml
index 86979c56..4727aff9 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY1626.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY1626.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<device name="ATtiny1626" family="AVR8" configuration-value="attiny1626" architecture="AVR8X" avr-family="TINY">
+<device name="ATtiny1626" family="AVR8" configuration-value="attiny1626" architecture="AVRxt" avr-family="TINY">
     <property-groups>
         <property-group key="ocd_features">
             <property key="break_pin" value="PA1"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY1627.xml b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY1627.xml
index ae30c411..4cabe887 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY1627.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY1627.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<device name="ATtiny1627" family="AVR8" configuration-value="attiny1627" architecture="AVR8X" avr-family="TINY">
+<device name="ATtiny1627" family="AVR8" configuration-value="attiny1627" architecture="AVRxt" avr-family="TINY">
     <property-groups>
         <property-group key="ocd_features">
             <property key="break_pin" value="PA1"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY1634.xml b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY1634.xml
index a250098a..6c479dff 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY1634.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY1634.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<device name="ATtiny1634" family="AVR8" configuration-value="attiny1634" architecture="AVR8" avr-family="TINY">
+<device name="ATtiny1634" family="AVR8" configuration-value="attiny1634" architecture="AVRe" avr-family="TINY">
     <property-groups>
         <property-group key="signatures">
             <property key="signature0" value="0x1e"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY167.xml b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY167.xml
index 1bd72eda..e470d867 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY167.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY167.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<device name="ATtiny167" family="AVR8" configuration-value="attiny167" architecture="AVR8" avr-family="TINY">
+<device name="ATtiny167" family="AVR8" configuration-value="attiny167" architecture="AVRe" avr-family="TINY">
     <property-groups>
         <property-group key="signatures">
             <property key="jtagid" value="0x9487"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY202.xml b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY202.xml
index e2f614a7..aba43d9d 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY202.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY202.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<device name="ATtiny202" family="AVR8" configuration-value="attiny202" architecture="AVR8X" avr-family="TINY">
+<device name="ATtiny202" family="AVR8" configuration-value="attiny202" architecture="AVRxt" avr-family="TINY">
     <property-groups>
         <property-group key="ocd_features">
             <property key="break_pin" value="PA1"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY204.xml b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY204.xml
index b000fbde..57112e8d 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY204.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY204.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<device name="ATtiny204" family="AVR8" configuration-value="attiny204" architecture="AVR8X" avr-family="TINY">
+<device name="ATtiny204" family="AVR8" configuration-value="attiny204" architecture="AVRxt" avr-family="TINY">
     <property-groups>
         <property-group key="ocd_features">
             <property key="break_pin" value="PA1"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY212.xml b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY212.xml
index f15f27c3..9554b4ac 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY212.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY212.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<device name="ATtiny212" family="AVR8" configuration-value="attiny212" architecture="AVR8X" avr-family="TINY">
+<device name="ATtiny212" family="AVR8" configuration-value="attiny212" architecture="AVRxt" avr-family="TINY">
     <property-groups>
         <property-group key="ocd_features">
             <property key="break_pin" value="PA1"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY214.xml b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY214.xml
index 80802188..8bb2a023 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY214.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY214.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<device name="ATtiny214" family="AVR8" configuration-value="attiny214" architecture="AVR8X" avr-family="TINY">
+<device name="ATtiny214" family="AVR8" configuration-value="attiny214" architecture="AVRxt" avr-family="TINY">
     <property-groups>
         <property-group key="ocd_features">
             <property key="break_pin" value="PA1"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY2313.xml b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY2313.xml
index 58395736..4889d17b 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY2313.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY2313.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<device name="ATtiny2313" family="AVR8" configuration-value="attiny2313" architecture="AVR8" avr-family="TINY">
+<device name="ATtiny2313" family="AVR8" configuration-value="attiny2313" architecture="AVRe" avr-family="TINY">
     <property-groups>
         <property-group key="signatures">
             <property key="jtagid" value="0x910A"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY2313A.xml b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY2313A.xml
index dcc2ca7f..cf5c9b10 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY2313A.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY2313A.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<device name="ATtiny2313A" family="AVR8" configuration-value="attiny2313a" architecture="AVR8" avr-family="TINY">
+<device name="ATtiny2313A" family="AVR8" configuration-value="attiny2313a" architecture="AVRe" avr-family="TINY">
     <property-groups>
         <property-group key="signatures">
             <property key="jtagid" value="0x910A"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY24.xml b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY24.xml
index 68e1d4ad..9d9f2db7 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY24.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY24.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<device name="ATtiny24" family="AVR8" configuration-value="attiny24" architecture="AVR8" avr-family="TINY">
+<device name="ATtiny24" family="AVR8" configuration-value="attiny24" architecture="AVRe" avr-family="TINY">
     <property-groups>
         <property-group key="signatures">
             <property key="jtagid" value="0x910B"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY24A.xml b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY24A.xml
index 34294986..7e7791e5 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY24A.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY24A.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<device name="ATtiny24A" family="AVR8" configuration-value="attiny24a" architecture="AVR8" avr-family="TINY">
+<device name="ATtiny24A" family="AVR8" configuration-value="attiny24a" architecture="AVRe" avr-family="TINY">
     <property-groups>
         <property-group key="signatures">
             <property key="jtagid" value="0x910B"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY25.xml b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY25.xml
index 148188eb..851e6a98 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY25.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY25.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<device name="ATtiny25" family="AVR8" configuration-value="attiny25" architecture="AVR8" avr-family="TINY">
+<device name="ATtiny25" family="AVR8" configuration-value="attiny25" architecture="AVRe" avr-family="TINY">
     <property-groups>
         <property-group key="signatures">
             <property key="jtagid" value="0x9108"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY261.xml b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY261.xml
index 015788d4..c6e91a69 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY261.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY261.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<device name="ATtiny261" family="AVR8" configuration-value="attiny261" architecture="AVR8" avr-family="TINY">
+<device name="ATtiny261" family="AVR8" configuration-value="attiny261" architecture="AVRe" avr-family="TINY">
     <property-groups>
         <property-group key="signatures">
             <property key="jtagid" value="0x910C"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY261A.xml b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY261A.xml
index 156880ee..a13ae21c 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY261A.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY261A.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<device name="ATtiny261A" family="AVR8" configuration-value="attiny261a" architecture="AVR8" avr-family="TINY">
+<device name="ATtiny261A" family="AVR8" configuration-value="attiny261a" architecture="AVRe" avr-family="TINY">
     <property-groups>
         <property-group key="signatures">
             <property key="jtagid" value="0x910C"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY3216.xml b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY3216.xml
index dee4dec5..1dc9e9f2 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY3216.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY3216.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<device name="ATtiny3216" family="AVR8" configuration-value="attiny3216" architecture="AVR8X" avr-family="TINY">
+<device name="ATtiny3216" family="AVR8" configuration-value="attiny3216" architecture="AVRxt" avr-family="TINY">
     <property-groups>
         <property-group key="ocd_features">
             <property key="break_pin" value="PA1"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY3217.xml b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY3217.xml
index 950831ab..72f023df 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY3217.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY3217.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<device name="ATtiny3217" family="AVR8" configuration-value="attiny3217" architecture="AVR8X" avr-family="TINY">
+<device name="ATtiny3217" family="AVR8" configuration-value="attiny3217" architecture="AVRxt" avr-family="TINY">
     <property-groups>
         <property-group key="ocd_features">
             <property key="break_pin" value="PA1"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY402.xml b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY402.xml
index 4cfe9b96..71f2d83a 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY402.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY402.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<device name="ATtiny402" family="AVR8" configuration-value="attiny402" architecture="AVR8X" avr-family="TINY">
+<device name="ATtiny402" family="AVR8" configuration-value="attiny402" architecture="AVRxt" avr-family="TINY">
     <property-groups>
         <property-group key="ocd_features">
             <property key="break_pin" value="PA1"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY404.xml b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY404.xml
index 764960a4..012e442b 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY404.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY404.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<device name="ATtiny404" family="AVR8" configuration-value="attiny404" architecture="AVR8X" avr-family="TINY">
+<device name="ATtiny404" family="AVR8" configuration-value="attiny404" architecture="AVRxt" avr-family="TINY">
     <property-groups>
         <property-group key="ocd_features">
             <property key="break_pin" value="PA1"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY406.xml b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY406.xml
index 2ef62c4d..cb3c11ee 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY406.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY406.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<device name="ATtiny406" family="AVR8" configuration-value="attiny406" architecture="AVR8X" avr-family="TINY">
+<device name="ATtiny406" family="AVR8" configuration-value="attiny406" architecture="AVRxt" avr-family="TINY">
     <property-groups>
         <property-group key="ocd_features">
             <property key="break_pin" value="PA1"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY412.xml b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY412.xml
index ef5b546b..4992ddf6 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY412.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY412.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<device name="ATtiny412" family="AVR8" configuration-value="attiny412" architecture="AVR8X" avr-family="TINY">
+<device name="ATtiny412" family="AVR8" configuration-value="attiny412" architecture="AVRxt" avr-family="TINY">
     <property-groups>
         <property-group key="ocd_features">
             <property key="break_pin" value="PA1"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY414.xml b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY414.xml
index 0c35e9f7..391a7ab3 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY414.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY414.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<device name="ATtiny414" family="AVR8" configuration-value="attiny414" architecture="AVR8X" avr-family="TINY">
+<device name="ATtiny414" family="AVR8" configuration-value="attiny414" architecture="AVRxt" avr-family="TINY">
     <property-groups>
         <property-group key="ocd_features">
             <property key="break_pin" value="PA1"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY416.xml b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY416.xml
index 6706e14e..fb315c1a 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY416.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY416.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<device name="ATtiny416" family="AVR8" configuration-value="attiny416" architecture="AVR8X" avr-family="TINY">
+<device name="ATtiny416" family="AVR8" configuration-value="attiny416" architecture="AVRxt" avr-family="TINY">
     <property-groups>
         <property-group key="ocd_features">
             <property key="break_pin" value="PA1"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY417.xml b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY417.xml
index c023855d..f01ded03 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY417.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY417.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<device name="ATtiny417" family="AVR8" configuration-value="attiny417" architecture="AVR8X" avr-family="TINY">
+<device name="ATtiny417" family="AVR8" configuration-value="attiny417" architecture="AVRxt" avr-family="TINY">
     <property-groups>
         <property-group key="ocd_features">
             <property key="break_pin" value="PA1"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY4313.xml b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY4313.xml
index 1817fc60..1b09769d 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY4313.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY4313.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<device name="ATtiny4313" family="AVR8" configuration-value="attiny4313" architecture="AVR8" avr-family="TINY">
+<device name="ATtiny4313" family="AVR8" configuration-value="attiny4313" architecture="AVRe" avr-family="TINY">
     <property-groups>
         <property-group key="signatures">
             <property key="jtagid" value="0x920D"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY43U.xml b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY43U.xml
index 9de1463c..f3fc60e9 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY43U.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY43U.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<device name="ATtiny43U" family="AVR8" configuration-value="attiny43u" architecture="AVR8" avr-family="TINY">
+<device name="ATtiny43U" family="AVR8" configuration-value="attiny43u" architecture="AVRe" avr-family="TINY">
     <property-groups>
         <property-group key="signatures">
             <property key="jtagid" value="0x920C"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY44.xml b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY44.xml
index 1faf3dc7..8487b309 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY44.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY44.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<device name="ATtiny44" family="AVR8" configuration-value="attiny44" architecture="AVR8" avr-family="TINY">
+<device name="ATtiny44" family="AVR8" configuration-value="attiny44" architecture="AVRe" avr-family="TINY">
     <property-groups>
         <property-group key="signatures">
             <property key="jtagid" value="0x9207"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY441.xml b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY441.xml
index 80f78e76..78bd45f0 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY441.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY441.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<device name="ATtiny441" family="AVR8" configuration-value="attiny441" architecture="AVR8" avr-family="TINY">
+<device name="ATtiny441" family="AVR8" configuration-value="attiny441" architecture="AVRe" avr-family="TINY">
     <property-groups>
         <property-group key="signatures">
             <property key="jtagid" value="0x9215"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY44A.xml b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY44A.xml
index c2e4a21a..ebded282 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY44A.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY44A.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<device name="ATtiny44A" family="AVR8" configuration-value="attiny44a" architecture="AVR8" avr-family="TINY">
+<device name="ATtiny44A" family="AVR8" configuration-value="attiny44a" architecture="AVRe" avr-family="TINY">
     <property-groups>
         <property-group key="signatures">
             <property key="jtagid" value="0x9207"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY45.xml b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY45.xml
index 8e61f652..80f6fe71 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY45.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY45.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<device name="ATtiny45" family="AVR8" configuration-value="attiny45" architecture="AVR8" avr-family="TINY">
+<device name="ATtiny45" family="AVR8" configuration-value="attiny45" architecture="AVRe" avr-family="TINY">
     <property-groups>
         <property-group key="signatures">
             <property key="jtagid" value="0x9206"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY461.xml b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY461.xml
index 6e3bcfca..2c80915a 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY461.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY461.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<device name="ATtiny461" family="AVR8" configuration-value="attiny461" architecture="AVR8" avr-family="TINY">
+<device name="ATtiny461" family="AVR8" configuration-value="attiny461" architecture="AVRe" avr-family="TINY">
     <property-groups>
         <property-group key="signatures">
             <property key="jtagid" value="0x9208"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY461A.xml b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY461A.xml
index b357d4c1..207e5b5d 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY461A.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY461A.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<device name="ATtiny461A" family="AVR8" configuration-value="attiny461a" architecture="AVR8" avr-family="TINY">
+<device name="ATtiny461A" family="AVR8" configuration-value="attiny461a" architecture="AVRe" avr-family="TINY">
     <property-groups>
         <property-group key="signatures">
             <property key="jtagid" value="0x9208"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY48.xml b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY48.xml
index cb616091..ee7404c0 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY48.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY48.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<device name="ATtiny48" family="AVR8" configuration-value="attiny48" architecture="AVR8" avr-family="TINY">
+<device name="ATtiny48" family="AVR8" configuration-value="attiny48" architecture="AVRe" avr-family="TINY">
     <property-groups>
         <property-group key="signatures">
             <property key="jtagid" value="0x9209"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY804.xml b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY804.xml
index 2a50a6d1..5ee641f1 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY804.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY804.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<device name="ATtiny804" family="AVR8" configuration-value="attiny804" architecture="AVR8X" avr-family="TINY">
+<device name="ATtiny804" family="AVR8" configuration-value="attiny804" architecture="AVRxt" avr-family="TINY">
     <property-groups>
         <property-group key="ocd_features">
             <property key="break_pin" value="PA1"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY806.xml b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY806.xml
index d10d93c4..49dde831 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY806.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY806.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<device name="ATtiny806" family="AVR8" configuration-value="attiny806" architecture="AVR8X" avr-family="TINY">
+<device name="ATtiny806" family="AVR8" configuration-value="attiny806" architecture="AVRxt" avr-family="TINY">
     <property-groups>
         <property-group key="ocd_features">
             <property key="break_pin" value="PA1"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY807.xml b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY807.xml
index 3fa39b43..eefe4a46 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY807.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY807.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<device name="ATtiny807" family="AVR8" configuration-value="attiny807" architecture="AVR8X" avr-family="TINY">
+<device name="ATtiny807" family="AVR8" configuration-value="attiny807" architecture="AVRxt" avr-family="TINY">
     <property-groups>
         <property-group key="ocd_features">
             <property key="break_pin" value="PA1"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY814.xml b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY814.xml
index 1e9b13a9..c8db7702 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY814.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY814.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<device name="ATtiny814" family="AVR8" configuration-value="attiny814" architecture="AVR8X" avr-family="TINY">
+<device name="ATtiny814" family="AVR8" configuration-value="attiny814" architecture="AVRxt" avr-family="TINY">
     <property-groups>
         <property-group key="ocd_features">
             <property key="break_pin" value="PA1"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY816.xml b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY816.xml
index 0576be0f..1b336047 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY816.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY816.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<device name="ATtiny816" family="AVR8" configuration-value="attiny816" architecture="AVR8X" avr-family="TINY">
+<device name="ATtiny816" family="AVR8" configuration-value="attiny816" architecture="AVRxt" avr-family="TINY">
     <property-groups>
         <property-group key="ocd_features">
             <property key="break_pin" value="PA1"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY817.xml b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY817.xml
index 9854e36c..cbbe23a3 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY817.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY817.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<device name="ATtiny817" family="AVR8" configuration-value="attiny817" architecture="AVR8X" avr-family="TINY">
+<device name="ATtiny817" family="AVR8" configuration-value="attiny817" architecture="AVRxt" avr-family="TINY">
     <property-groups>
         <property-group key="ocd_features">
             <property key="break_pin" value="PA1"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY828.xml b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY828.xml
index 74450b60..7e438e93 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY828.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY828.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<device name="ATtiny828" family="AVR8" configuration-value="attiny828" architecture="AVR8" avr-family="TINY">
+<device name="ATtiny828" family="AVR8" configuration-value="attiny828" architecture="AVRe" avr-family="TINY">
     <property-groups>
         <property-group key="signatures">
             <property key="jtagid" value="0x9314"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY84.xml b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY84.xml
index 1d61487b..9908ac4c 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY84.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY84.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<device name="ATtiny84" family="AVR8" configuration-value="attiny84" architecture="AVR8" avr-family="TINY">
+<device name="ATtiny84" family="AVR8" configuration-value="attiny84" architecture="AVRe" avr-family="TINY">
     <property-groups>
         <property-group key="signatures">
             <property key="jtagid" value="0x930C"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY841.xml b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY841.xml
index 3891925c..b6c4e1ee 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY841.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY841.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<device name="ATtiny841" family="AVR8" configuration-value="attiny841" architecture="AVR8" avr-family="TINY">
+<device name="ATtiny841" family="AVR8" configuration-value="attiny841" architecture="AVRe" avr-family="TINY">
     <property-groups>
         <property-group key="signatures">
             <property key="jtagid" value="0x9315"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY84A.xml b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY84A.xml
index c5343334..0970d272 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY84A.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY84A.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<device name="ATtiny84A" family="AVR8" configuration-value="attiny84a" architecture="AVR8" avr-family="TINY">
+<device name="ATtiny84A" family="AVR8" configuration-value="attiny84a" architecture="AVRe" avr-family="TINY">
     <property-groups>
         <property-group key="signatures">
             <property key="jtagid" value="0x930C"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY85.xml b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY85.xml
index 5f45950b..3578256a 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY85.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY85.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<device name="ATtiny85" family="AVR8" configuration-value="attiny85" architecture="AVR8" avr-family="TINY">
+<device name="ATtiny85" family="AVR8" configuration-value="attiny85" architecture="AVRe" avr-family="TINY">
     <property-groups>
         <property-group key="signatures">
             <property key="jtagid" value="0x930B"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY861.xml b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY861.xml
index dbe7ab83..06b65ee8 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY861.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY861.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<device name="ATtiny861" family="AVR8" configuration-value="attiny861" architecture="AVR8" avr-family="TINY">
+<device name="ATtiny861" family="AVR8" configuration-value="attiny861" architecture="AVRe" avr-family="TINY">
     <property-groups>
         <property-group key="signatures">
             <property key="jtagid" value="0x930D"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY861A.xml b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY861A.xml
index abdcf109..8182abec 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY861A.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY861A.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<device name="ATtiny861A" family="AVR8" configuration-value="attiny861a" architecture="AVR8" avr-family="TINY">
+<device name="ATtiny861A" family="AVR8" configuration-value="attiny861a" architecture="AVRe" avr-family="TINY">
     <property-groups>
         <property-group key="signatures">
             <property key="jtagid" value="0x930D"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY87.xml b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY87.xml
index 0b1d26cc..2c18e90c 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY87.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY87.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<device name="ATtiny87" family="AVR8" configuration-value="attiny87" architecture="AVR8" avr-family="TINY">
+<device name="ATtiny87" family="AVR8" configuration-value="attiny87" architecture="AVRe" avr-family="TINY">
     <property-groups>
         <property-group key="signatures">
             <property key="jtagid" value="0x9387"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY88.xml b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY88.xml
index dd06b46d..300997e0 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY88.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY88.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<device name="ATtiny88" family="AVR8" configuration-value="attiny88" architecture="AVR8" avr-family="TINY">
+<device name="ATtiny88" family="AVR8" configuration-value="attiny88" architecture="AVRe" avr-family="TINY">
     <property-groups>
         <property-group key="signatures">
             <property key="jtagid" value="0x9311"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA128A1.xml b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA128A1.xml
index d23cce76..75aa5b81 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA128A1.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA128A1.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<device name="ATxmega128A1" family="AVR8" configuration-value="atxmega128a1" architecture="AVR8_XMEGA" avr-family="XMEGA">
+<device name="ATxmega128A1" family="AVR8" configuration-value="atxmega128a1" architecture="AVRxm" avr-family="XMEGA">
     <property-groups>
         <property-group key="signatures">
             <property key="jtagid" value="0x0974C03F"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA128A1U.xml b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA128A1U.xml
index b7e5b2c9..79a6809a 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA128A1U.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA128A1U.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<device name="ATxmega128A1U" family="AVR8" configuration-value="atxmega128a1u" architecture="AVR8_XMEGA" avr-family="XMEGA">
+<device name="ATxmega128A1U" family="AVR8" configuration-value="atxmega128a1u" architecture="AVRxm" avr-family="XMEGA">
     <property-groups>
         <property-group key="signatures">
             <property key="jtagid" value="0x0974C03F"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA128A3.xml b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA128A3.xml
index 1e4eb610..1d67bfc6 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA128A3.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA128A3.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<device name="ATxmega128A3" family="AVR8" configuration-value="atxmega128a3" architecture="AVR8_XMEGA" avr-family="XMEGA">
+<device name="ATxmega128A3" family="AVR8" configuration-value="atxmega128a3" architecture="AVRxm" avr-family="XMEGA">
     <property-groups>
         <property-group key="signatures">
             <property key="jtagid" value="0x0974203F"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA128A3U.xml b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA128A3U.xml
index 3ed25568..ddec1364 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA128A3U.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA128A3U.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<device name="ATxmega128A3U" family="AVR8" configuration-value="atxmega128a3u" architecture="AVR8_XMEGA" avr-family="XMEGA">
+<device name="ATxmega128A3U" family="AVR8" configuration-value="atxmega128a3u" architecture="AVRxm" avr-family="XMEGA">
     <property-groups>
         <property-group key="signatures">
             <property key="jtagid" value="0x0974203F"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA128A4U.xml b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA128A4U.xml
index 20ca01de..5795c0fa 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA128A4U.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA128A4U.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<device name="ATxmega128A4U" family="AVR8" configuration-value="atxmega128a4u" architecture="AVR8_XMEGA" avr-family="XMEGA">
+<device name="ATxmega128A4U" family="AVR8" configuration-value="atxmega128a4u" architecture="AVRxm" avr-family="XMEGA">
     <property-groups>
         <property-group key="signatures">
             <property key="signature0" value="0x1E"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA128B1.xml b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA128B1.xml
index a25d18ae..a2e65db0 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA128B1.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA128B1.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<device name="ATxmega128B1" family="AVR8" configuration-value="atxmega128b1" architecture="AVR8_XMEGA" avr-family="XMEGA">
+<device name="ATxmega128B1" family="AVR8" configuration-value="atxmega128b1" architecture="AVRxm" avr-family="XMEGA">
     <property-groups>
         <property-group key="signatures">
             <property key="jtagid" value="0x0974D03F"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA128B3.xml b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA128B3.xml
index 3386169a..a85a9be4 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA128B3.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA128B3.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<device name="ATxmega128B3" family="AVR8" configuration-value="atxmega128b3" architecture="AVR8_XMEGA" avr-family="XMEGA">
+<device name="ATxmega128B3" family="AVR8" configuration-value="atxmega128b3" architecture="AVRxm" avr-family="XMEGA">
     <property-groups>
         <property-group key="signatures">
             <property key="jtagid" value="0x0974B03F"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA128C3.xml b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA128C3.xml
index 9ad28e22..22b8b756 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA128C3.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA128C3.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<device name="ATxmega128C3" family="AVR8" configuration-value="atxmega128c3" architecture="AVR8_XMEGA" avr-family="XMEGA">
+<device name="ATxmega128C3" family="AVR8" configuration-value="atxmega128c3" architecture="AVRxm" avr-family="XMEGA">
     <property-groups>
         <property-group key="signatures">
             <property key="signature0" value="0x1E"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA128D3.xml b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA128D3.xml
index 4acbd4b0..e92f8b38 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA128D3.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA128D3.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<device name="ATxmega128D3" family="AVR8" configuration-value="atxmega128d3" architecture="AVR8_XMEGA" avr-family="XMEGA">
+<device name="ATxmega128D3" family="AVR8" configuration-value="atxmega128d3" architecture="AVRxm" avr-family="XMEGA">
     <property-groups>
         <property-group key="signatures">
             <property key="jtagid" value="0x0974803F"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA128D4.xml b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA128D4.xml
index fd46cf27..4d6fd66a 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA128D4.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA128D4.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<device name="ATxmega128D4" family="AVR8" configuration-value="atxmega128d4" architecture="AVR8_XMEGA" avr-family="XMEGA">
+<device name="ATxmega128D4" family="AVR8" configuration-value="atxmega128d4" architecture="AVRxm" avr-family="XMEGA">
     <property-groups>
         <property-group key="signatures">
             <property key="signature0" value="0x1E"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA16A4.xml b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA16A4.xml
index e0a62827..970ad859 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA16A4.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA16A4.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<device name="ATxmega16A4" family="AVR8" configuration-value="atxmega16a4" architecture="AVR8_XMEGA" avr-family="XMEGA">
+<device name="ATxmega16A4" family="AVR8" configuration-value="atxmega16a4" architecture="AVRxm" avr-family="XMEGA">
     <property-groups>
         <property-group key="signatures">
             <property key="jtagid" value="0x0944103F"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA16A4U.xml b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA16A4U.xml
index 20eed650..1f965835 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA16A4U.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA16A4U.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<device name="ATxmega16A4U" family="AVR8" configuration-value="atxmega16a4u" architecture="AVR8_XMEGA" avr-family="XMEGA">
+<device name="ATxmega16A4U" family="AVR8" configuration-value="atxmega16a4u" architecture="AVRxm" avr-family="XMEGA">
     <property-groups>
         <property-group key="signatures">
             <property key="signature0" value="0x1E"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA16C4.xml b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA16C4.xml
index c3c75d71..b19aed95 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA16C4.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA16C4.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<device name="ATxmega16C4" family="AVR8" configuration-value="atxmega16c4" architecture="AVR8_XMEGA" avr-family="XMEGA">
+<device name="ATxmega16C4" family="AVR8" configuration-value="atxmega16c4" architecture="AVRxm" avr-family="XMEGA">
     <property-groups>
         <property-group key="signatures">
             <property key="signature0" value="0x1E"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA16D4.xml b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA16D4.xml
index 53eaf716..74944d09 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA16D4.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA16D4.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<device name="ATxmega16D4" family="AVR8" configuration-value="atxmega16d4" architecture="AVR8_XMEGA" avr-family="XMEGA">
+<device name="ATxmega16D4" family="AVR8" configuration-value="atxmega16d4" architecture="AVRxm" avr-family="XMEGA">
     <property-groups>
         <property-group key="signatures">
             <property key="jtagid" value="0x0944203F"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA16E5.xml b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA16E5.xml
index 1c1d5018..5924a519 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA16E5.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA16E5.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<device name="ATxmega16E5" family="AVR8" configuration-value="atxmega16e5" architecture="AVR8_XMEGA" avr-family="XMEGA">
+<device name="ATxmega16E5" family="AVR8" configuration-value="atxmega16e5" architecture="AVRxm" avr-family="XMEGA">
     <property-groups>
         <property-group key="signatures">
             <property key="signature0" value="0x1E"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA192A3.xml b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA192A3.xml
index 37ec272b..af96adea 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA192A3.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA192A3.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<device name="ATxmega192A3" family="AVR8" configuration-value="atxmega192a3" architecture="AVR8_XMEGA" avr-family="XMEGA">
+<device name="ATxmega192A3" family="AVR8" configuration-value="atxmega192a3" architecture="AVRxm" avr-family="XMEGA">
     <property-groups>
         <property-group key="signatures">
             <property key="jtagid" value="0x0974403F"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA192A3U.xml b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA192A3U.xml
index cc548b54..dbaeff7c 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA192A3U.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA192A3U.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<device name="ATxmega192A3U" family="AVR8" configuration-value="atxmega192a3u" architecture="AVR8_XMEGA" avr-family="XMEGA">
+<device name="ATxmega192A3U" family="AVR8" configuration-value="atxmega192a3u" architecture="AVRxm" avr-family="XMEGA">
     <property-groups>
         <property-group key="signatures">
             <property key="jtagid" value="0x0974403F"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA192C3.xml b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA192C3.xml
index f1abd4d4..456a2e09 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA192C3.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA192C3.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<device name="ATxmega192C3" family="AVR8" configuration-value="atxmega192c3" architecture="AVR8_XMEGA" avr-family="XMEGA">
+<device name="ATxmega192C3" family="AVR8" configuration-value="atxmega192c3" architecture="AVRxm" avr-family="XMEGA">
     <property-groups>
         <property-group key="signatures">
             <property key="signature0" value="0x1E"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA192D3.xml b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA192D3.xml
index 7ecaeb24..2fecc3b3 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA192D3.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA192D3.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<device name="ATxmega192D3" family="AVR8" configuration-value="atxmega192d3" architecture="AVR8_XMEGA" avr-family="XMEGA">
+<device name="ATxmega192D3" family="AVR8" configuration-value="atxmega192d3" architecture="AVRxm" avr-family="XMEGA">
     <property-groups>
         <property-group key="signatures">
             <property key="jtagid" value="0x0974903F"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA256A3.xml b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA256A3.xml
index 457d00a3..c38af67c 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA256A3.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA256A3.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<device name="ATxmega256A3" family="AVR8" configuration-value="atxmega256a3" architecture="AVR8_XMEGA" avr-family="XMEGA">
+<device name="ATxmega256A3" family="AVR8" configuration-value="atxmega256a3" architecture="AVRxm" avr-family="XMEGA">
     <property-groups>
         <property-group key="signatures">
             <property key="jtagid" value="0x0984203F"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA256A3B.xml b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA256A3B.xml
index 0f6b7b57..f72d4d4c 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA256A3B.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA256A3B.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<device name="ATxmega256A3B" family="AVR8" configuration-value="atxmega256a3b" architecture="AVR8_XMEGA" avr-family="XMEGA">
+<device name="ATxmega256A3B" family="AVR8" configuration-value="atxmega256a3b" architecture="AVRxm" avr-family="XMEGA">
     <property-groups>
         <property-group key="signatures">
             <property key="jtagid" value="0x0984303F"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA256A3BU.xml b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA256A3BU.xml
index 78cba20d..a7b7d97a 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA256A3BU.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA256A3BU.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<device name="ATxmega256A3BU" family="AVR8" configuration-value="atxmega256a3bu" architecture="AVR8_XMEGA" avr-family="XMEGA">
+<device name="ATxmega256A3BU" family="AVR8" configuration-value="atxmega256a3bu" architecture="AVRxm" avr-family="XMEGA">
     <property-groups>
         <property-group key="signatures">
             <property key="jtagid" value="0x0984303F"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA256A3U.xml b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA256A3U.xml
index 88524c27..f4efde54 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA256A3U.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA256A3U.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<device name="ATxmega256A3U" family="AVR8" configuration-value="atxmega256a3u" architecture="AVR8_XMEGA" avr-family="XMEGA">
+<device name="ATxmega256A3U" family="AVR8" configuration-value="atxmega256a3u" architecture="AVRxm" avr-family="XMEGA">
     <property-groups>
         <property-group key="signatures">
             <property key="jtagid" value="0x0984203F"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA256C3.xml b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA256C3.xml
index 0754a7f5..3fd87925 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA256C3.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA256C3.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<device name="ATxmega256C3" family="AVR8" configuration-value="atxmega256c3" architecture="AVR8_XMEGA" avr-family="XMEGA">
+<device name="ATxmega256C3" family="AVR8" configuration-value="atxmega256c3" architecture="AVRxm" avr-family="XMEGA">
     <property-groups>
         <property-group key="signatures">
             <property key="signature0" value="0x1E"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA256D3.xml b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA256D3.xml
index 377ea1a4..33d84406 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA256D3.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA256D3.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<device name="ATxmega256D3" family="AVR8" configuration-value="atxmega256d3" architecture="AVR8_XMEGA" avr-family="XMEGA">
+<device name="ATxmega256D3" family="AVR8" configuration-value="atxmega256d3" architecture="AVRxm" avr-family="XMEGA">
     <property-groups>
         <property-group key="signatures">
             <property key="jtagid" value="0x0984403F"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA32A4.xml b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA32A4.xml
index 3255c6db..377e90af 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA32A4.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA32A4.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<device name="ATxmega32A4" family="AVR8" configuration-value="atxmega32a4" architecture="AVR8_XMEGA" avr-family="XMEGA">
+<device name="ATxmega32A4" family="AVR8" configuration-value="atxmega32a4" architecture="AVRxm" avr-family="XMEGA">
     <property-groups>
         <property-group key="signatures">
             <property key="jtagid" value="0x0954103F"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA32A4U.xml b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA32A4U.xml
index 51dc0bd9..33bf0f5e 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA32A4U.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA32A4U.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<device name="ATxmega32A4U" family="AVR8" configuration-value="atxmega32a4u" architecture="AVR8_XMEGA" avr-family="XMEGA">
+<device name="ATxmega32A4U" family="AVR8" configuration-value="atxmega32a4u" architecture="AVRxm" avr-family="XMEGA">
     <property-groups>
         <property-group key="signatures">
             <property key="signature0" value="0x1E"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA32C3.xml b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA32C3.xml
index 7c9ed0a1..246aef3c 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA32C3.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA32C3.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<device name="ATxmega32C3" family="AVR8" configuration-value="atxmega32c3" architecture="AVR8_XMEGA" avr-family="XMEGA">
+<device name="ATxmega32C3" family="AVR8" configuration-value="atxmega32c3" architecture="AVRxm" avr-family="XMEGA">
     <property-groups>
         <property-group key="signatures">
             <property key="signature0" value="0x1E"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA32C4.xml b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA32C4.xml
index 05bc0d90..fb3846d6 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA32C4.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA32C4.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<device name="ATxmega32C4" family="AVR8" configuration-value="atxmega32c4" architecture="AVR8_XMEGA" avr-family="XMEGA">
+<device name="ATxmega32C4" family="AVR8" configuration-value="atxmega32c4" architecture="AVRxm" avr-family="XMEGA">
     <property-groups>
         <property-group key="signatures">
             <property key="signature0" value="0x1E"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA32D3.xml b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA32D3.xml
index 0119a2e7..1487538b 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA32D3.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA32D3.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<device name="ATxmega32D3" family="AVR8" configuration-value="atxmega32d3" architecture="AVR8_XMEGA" avr-family="XMEGA">
+<device name="ATxmega32D3" family="AVR8" configuration-value="atxmega32d3" architecture="AVRxm" avr-family="XMEGA">
     <property-groups>
         <property-group key="signatures">
             <property key="jtagid" value="0x0954A03F"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA32D4.xml b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA32D4.xml
index 09190cc2..f6c06e3c 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA32D4.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA32D4.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<device name="ATxmega32D4" family="AVR8" configuration-value="atxmega32d4" architecture="AVR8_XMEGA" avr-family="XMEGA">
+<device name="ATxmega32D4" family="AVR8" configuration-value="atxmega32d4" architecture="AVRxm" avr-family="XMEGA">
     <property-groups>
         <property-group key="signatures">
             <property key="jtagid" value="0x0954203F"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA32E5.xml b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA32E5.xml
index 73251aad..b99c0e28 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA32E5.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA32E5.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<device name="ATxmega32E5" family="AVR8" configuration-value="atxmega32e5" architecture="AVR8_XMEGA" avr-family="XMEGA">
+<device name="ATxmega32E5" family="AVR8" configuration-value="atxmega32e5" architecture="AVRxm" avr-family="XMEGA">
     <property-groups>
         <property-group key="signatures">
             <property key="signature0" value="0x1E"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA384C3.xml b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA384C3.xml
index ab689cf7..66513991 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA384C3.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA384C3.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<device name="ATxmega384C3" family="AVR8" configuration-value="atxmega384c3" architecture="AVR8_XMEGA" avr-family="XMEGA">
+<device name="ATxmega384C3" family="AVR8" configuration-value="atxmega384c3" architecture="AVRxm" avr-family="XMEGA">
     <property-groups>
         <property-group key="signatures">
             <property key="signature0" value="0x1E"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA384D3.xml b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA384D3.xml
index d0790311..4011955a 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA384D3.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA384D3.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<device name="ATxmega384D3" family="AVR8" configuration-value="atxmega384d3" architecture="AVR8_XMEGA" avr-family="XMEGA">
+<device name="ATxmega384D3" family="AVR8" configuration-value="atxmega384d3" architecture="AVRxm" avr-family="XMEGA">
     <property-groups>
         <property-group key="signatures">
             <property key="signature0" value="0x1E"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA64A1.xml b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA64A1.xml
index 63269ae3..1f8259e8 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA64A1.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA64A1.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<device name="ATxmega64A1" family="AVR8" configuration-value="atxmega64a1" architecture="AVR8_XMEGA" avr-family="XMEGA">
+<device name="ATxmega64A1" family="AVR8" configuration-value="atxmega64a1" architecture="AVRxm" avr-family="XMEGA">
     <property-groups>
         <property-group key="signatures">
             <property key="jtagid" value="0x0964E03F"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA64A1U.xml b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA64A1U.xml
index 483066bd..79648b32 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA64A1U.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA64A1U.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<device name="ATxmega64A1U" family="AVR8" configuration-value="atxmega64a1u" architecture="AVR8_XMEGA" avr-family="XMEGA">
+<device name="ATxmega64A1U" family="AVR8" configuration-value="atxmega64a1u" architecture="AVRxm" avr-family="XMEGA">
     <property-groups>
         <property-group key="signatures">
             <property key="jtagid" value="0x0964E03F"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA64A3.xml b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA64A3.xml
index c9093b13..cfd963cf 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA64A3.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA64A3.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<device name="ATxmega64A3" family="AVR8" configuration-value="atxmega64a3" architecture="AVR8_XMEGA" avr-family="XMEGA">
+<device name="ATxmega64A3" family="AVR8" configuration-value="atxmega64a3" architecture="AVRxm" avr-family="XMEGA">
     <property-groups>
         <property-group key="signatures">
             <property key="jtagid" value="0x0964203F"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA64A3U.xml b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA64A3U.xml
index 69d829b2..9dd6864a 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA64A3U.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA64A3U.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<device name="ATxmega64A3U" family="AVR8" configuration-value="atxmega64a3u" architecture="AVR8_XMEGA" avr-family="XMEGA">
+<device name="ATxmega64A3U" family="AVR8" configuration-value="atxmega64a3u" architecture="AVRxm" avr-family="XMEGA">
     <property-groups>
         <property-group key="signatures">
             <property key="jtagid" value="0x0964203F"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA64A4U.xml b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA64A4U.xml
index 6771d466..7b7d0fac 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA64A4U.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA64A4U.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<device name="ATxmega64A4U" family="AVR8" configuration-value="atxmega64a4u" architecture="AVR8_XMEGA" avr-family="XMEGA">
+<device name="ATxmega64A4U" family="AVR8" configuration-value="atxmega64a4u" architecture="AVRxm" avr-family="XMEGA">
     <property-groups>
         <property-group key="signatures">
             <property key="signature0" value="0x1E"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA64B1.xml b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA64B1.xml
index 6ca9231d..be3b9e2d 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA64B1.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA64B1.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<device name="ATxmega64B1" family="AVR8" configuration-value="atxmega64b1" architecture="AVR8_XMEGA" avr-family="XMEGA">
+<device name="ATxmega64B1" family="AVR8" configuration-value="atxmega64b1" architecture="AVRxm" avr-family="XMEGA">
     <property-groups>
         <property-group key="signatures">
             <property key="jtagid" value="0x0965203F"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA64B3.xml b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA64B3.xml
index bd3c4f4f..87e19b0b 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA64B3.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA64B3.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<device name="ATxmega64B3" family="AVR8" configuration-value="atxmega64b3" architecture="AVR8_XMEGA" avr-family="XMEGA">
+<device name="ATxmega64B3" family="AVR8" configuration-value="atxmega64b3" architecture="AVRxm" avr-family="XMEGA">
     <property-groups>
         <property-group key="signatures">
             <property key="jtagid" value="0x0965103F"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA64C3.xml b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA64C3.xml
index 9ac8315a..924059cf 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA64C3.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA64C3.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<device name="ATxmega64C3" family="AVR8" configuration-value="atxmega64c3" architecture="AVR8_XMEGA" avr-family="XMEGA">
+<device name="ATxmega64C3" family="AVR8" configuration-value="atxmega64c3" architecture="AVRxm" avr-family="XMEGA">
     <property-groups>
         <property-group key="signatures">
             <property key="signature0" value="0x1E"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA64D3.xml b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA64D3.xml
index 7d12816b..edb493ac 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA64D3.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA64D3.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<device name="ATxmega64D3" family="AVR8" configuration-value="atxmega64d3" architecture="AVR8_XMEGA" avr-family="XMEGA">
+<device name="ATxmega64D3" family="AVR8" configuration-value="atxmega64d3" architecture="AVRxm" avr-family="XMEGA">
     <property-groups>
         <property-group key="signatures">
             <property key="jtagid" value="0x0964A03F"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA64D4.xml b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA64D4.xml
index f29e877b..d633ba5c 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA64D4.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA64D4.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<device name="ATxmega64D4" family="AVR8" configuration-value="atxmega64d4" architecture="AVR8_XMEGA" avr-family="XMEGA">
+<device name="ATxmega64D4" family="AVR8" configuration-value="atxmega64d4" architecture="AVRxm" avr-family="XMEGA">
     <property-groups>
         <property-group key="signatures">
             <property key="signature0" value="0x1E"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA8E5.xml b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA8E5.xml
index 002c3f34..860dc0fa 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA8E5.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA8E5.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<device name="ATxmega8E5" family="AVR8" configuration-value="atxmega8e5" architecture="AVR8_XMEGA" avr-family="XMEGA">
+<device name="ATxmega8E5" family="AVR8" configuration-value="atxmega8e5" architecture="AVRxm" avr-family="XMEGA">
     <property-groups>
         <property-group key="signatures">
             <property key="signature0" value="0x1E"/>