diff --git a/build/scripts/Targets/TargetDescriptionFiles/AVR8/Avr8TargetDescriptionFile.php b/build/scripts/Targets/TargetDescriptionFiles/AVR8/Avr8TargetDescriptionFile.php
index 8f299059..abaa42b0 100644
--- a/build/scripts/Targets/TargetDescriptionFiles/AVR8/Avr8TargetDescriptionFile.php
+++ b/build/scripts/Targets/TargetDescriptionFiles/AVR8/Avr8TargetDescriptionFile.php
@@ -110,7 +110,7 @@ class Avr8TargetDescriptionFile extends TargetDescriptionFile
             $output->ramStartAddress = $ramMemorySegment->startAddress;
         }
 
-        $output->bootSections = $this->getBootSections();
+        $output->bootSectionOptions = $this->getBootSectionOptions();
 
         $eepromMemorySegment = $this->getEepromSegment();
         if ($eepromMemorySegment instanceof MemorySegment) {
@@ -258,7 +258,7 @@ class Avr8TargetDescriptionFile extends TargetDescriptionFile
             $output->ramStartAddress = $ramMemorySegment->startAddress;
         }
 
-        $output->bootSections = $this->getBootSections();
+        $output->bootSectionOptions = $this->getBootSectionOptions();
 
         $eepromMemorySegment = $this->getEepromSegment();
         if ($eepromMemorySegment instanceof MemorySegment) {
@@ -499,11 +499,11 @@ class Avr8TargetDescriptionFile extends TargetDescriptionFile
             ?? $this->getMemorySegment('eeprom', 'internal_eeprom');
     }
 
-    private function getBootSections(): array
+    private function getBootSectionOptions(): array
     {
         $output = [];
 
-        $bootSectionPropertyGroups = $this->getPropertyGroup('boot_sections')->subPropertyGroups ?? [];
+        $bootSectionPropertyGroups = $this->getPropertyGroup('boot_section_options')->subPropertyGroups ?? [];
         foreach ($bootSectionPropertyGroups as $propertyGroup) {
             $output[] = new BootSection(
                 $this->stringService->tryStringToInt($propertyGroup->getPropertyValue('start_address')),
diff --git a/build/scripts/Targets/TargetDescriptionFiles/AVR8/DebugWireParameters.php b/build/scripts/Targets/TargetDescriptionFiles/AVR8/DebugWireParameters.php
index 301ff9b7..f2215e77 100644
--- a/build/scripts/Targets/TargetDescriptionFiles/AVR8/DebugWireParameters.php
+++ b/build/scripts/Targets/TargetDescriptionFiles/AVR8/DebugWireParameters.php
@@ -10,7 +10,7 @@ class DebugWireParameters
     public ?int $flashStartAddress = null;
 
     /** @var BootSection[]  */
-    public array $bootSections = [];
+    public array $bootSectionOptions = [];
 
     public ?int $ramStartAddress = null;
     public ?int $eepromSize = null;
diff --git a/build/scripts/Targets/TargetDescriptionFiles/AVR8/JtagParameters.php b/build/scripts/Targets/TargetDescriptionFiles/AVR8/JtagParameters.php
index b0de5b6d..f4c0003e 100644
--- a/build/scripts/Targets/TargetDescriptionFiles/AVR8/JtagParameters.php
+++ b/build/scripts/Targets/TargetDescriptionFiles/AVR8/JtagParameters.php
@@ -10,7 +10,7 @@ class JtagParameters
     public ?int $flashStartAddress = null;
 
     /** @var BootSection[]  */
-    public array $bootSections = [];
+    public array $bootSectionOptions = [];
 
     public ?int $ramStartAddress = null;
     public ?int $eepromSize = null;
diff --git a/build/scripts/Targets/TargetDescriptionFiles/AVR8/Services/ValidationService.php b/build/scripts/Targets/TargetDescriptionFiles/AVR8/Services/ValidationService.php
index 46f986cc..5f3268a0 100644
--- a/build/scripts/Targets/TargetDescriptionFiles/AVR8/Services/ValidationService.php
+++ b/build/scripts/Targets/TargetDescriptionFiles/AVR8/Services/ValidationService.php
@@ -265,8 +265,8 @@ class ValidationService extends \Targets\TargetDescriptionFiles\Services\Validat
             $failures[] = 'Missing flash start address';
         }
 
-        if (empty($parameters->bootSections)) {
-            $failures[] = 'Missing boot sections';
+        if (empty($parameters->bootSectionOptions)) {
+            $failures[] = 'Missing boot section options';
         }
 
         if ($parameters->ramStartAddress === null) {
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90CAN128.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90CAN128.xml
index 2dba67a7..57a10bd8 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90CAN128.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90CAN128.xml
@@ -137,7 +137,7 @@
             <property key="ppprogramlock_pulsewidth" value="0"/>
             <property key="ppprogramlock_polltimeout" value="5"/>
         </property-group>
-        <property-group key="boot_sections">
+        <property-group key="boot_section_options">
             <property-group key="boot_section_1">
                 <property key="start_address" value="0x0001FC00"/>
                 <property key="size" value="1024"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90CAN32.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90CAN32.xml
index 2bde8db3..e2e3dbc4 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90CAN32.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90CAN32.xml
@@ -137,7 +137,7 @@
             <property key="ppprogramlock_pulsewidth" value="0"/>
             <property key="ppprogramlock_polltimeout" value="5"/>
         </property-group>
-        <property-group key="boot_sections">
+        <property-group key="boot_section_options">
             <property-group key="boot_section_1">
                 <property key="start_address" value="0x00007C00"/>
                 <property key="size" value="1024"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90CAN64.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90CAN64.xml
index c80d42fa..41691c10 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90CAN64.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90CAN64.xml
@@ -137,7 +137,7 @@
             <property key="ppprogramlock_pulsewidth" value="0"/>
             <property key="ppprogramlock_polltimeout" value="5"/>
         </property-group>
-        <property-group key="boot_sections">
+        <property-group key="boot_section_options">
             <property-group key="boot_section_1">
                 <property key="start_address" value="0x0000FC00"/>
                 <property key="size" value="1024"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90PWM1.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90PWM1.xml
index 474edd1a..65b0649a 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90PWM1.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90PWM1.xml
@@ -137,7 +137,7 @@
             <property key="ppprogramlock_pulsewidth" value="0"/>
             <property key="ppprogramlock_polltimeout" value="5"/>
         </property-group>
-        <property-group key="boot_sections">
+        <property-group key="boot_section_options">
             <property-group key="boot_section_1">
                 <property key="start_address" value="0x00001F00"/>
                 <property key="size" value="256"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90PWM161.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90PWM161.xml
index 5b0367ff..8484566c 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90PWM161.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90PWM161.xml
@@ -137,7 +137,7 @@
             <property key="ppprogramlock_pulsewidth" value="0"/>
             <property key="ppprogramlock_polltimeout" value="5"/>
         </property-group>
-        <property-group key="boot_sections">
+        <property-group key="boot_section_options">
             <property-group key="boot_section_1">
                 <property key="start_address" value="0x00003F00"/>
                 <property key="size" value="256"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90PWM216.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90PWM216.xml
index 5c1e5595..a826d057 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90PWM216.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90PWM216.xml
@@ -137,7 +137,7 @@
             <property key="ppprogramlock_pulsewidth" value="0"/>
             <property key="ppprogramlock_polltimeout" value="5"/>
         </property-group>
-        <property-group key="boot_sections">
+        <property-group key="boot_section_options">
             <property-group key="boot_section_1">
                 <property key="start_address" value="0x00003E00"/>
                 <property key="size" value="512"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90PWM2B.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90PWM2B.xml
index f7b2f8ea..2cb10eae 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90PWM2B.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90PWM2B.xml
@@ -137,7 +137,7 @@
             <property key="ppprogramlock_pulsewidth" value="0"/>
             <property key="ppprogramlock_polltimeout" value="5"/>
         </property-group>
-        <property-group key="boot_sections">
+        <property-group key="boot_section_options">
             <property-group key="boot_section_1">
                 <property key="start_address" value="0x00001F00"/>
                 <property key="size" value="256"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90PWM316.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90PWM316.xml
index 07d697c0..9532a7e5 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90PWM316.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90PWM316.xml
@@ -137,7 +137,7 @@
             <property key="ppprogramlock_pulsewidth" value="0"/>
             <property key="ppprogramlock_polltimeout" value="5"/>
         </property-group>
-        <property-group key="boot_sections">
+        <property-group key="boot_section_options">
             <property-group key="boot_section_1">
                 <property key="start_address" value="0x00003E00"/>
                 <property key="size" value="512"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90PWM3B.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90PWM3B.xml
index b776d6c2..3a7aa8a1 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90PWM3B.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90PWM3B.xml
@@ -137,7 +137,7 @@
             <property key="ppprogramlock_pulsewidth" value="0"/>
             <property key="ppprogramlock_polltimeout" value="5"/>
         </property-group>
-        <property-group key="boot_sections">
+        <property-group key="boot_section_options">
             <property-group key="boot_section_1">
                 <property key="start_address" value="0x00001F00"/>
                 <property key="size" value="256"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90PWM81.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90PWM81.xml
index 7c1f1ea3..5fc5a6c7 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90PWM81.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90PWM81.xml
@@ -137,7 +137,7 @@
             <property key="ppprogramlock_pulsewidth" value="0"/>
             <property key="ppprogramlock_polltimeout" value="5"/>
         </property-group>
-        <property-group key="boot_sections">
+        <property-group key="boot_section_options">
             <property-group key="boot_section_1">
                 <property key="start_address" value="0x00001F00"/>
                 <property key="size" value="256"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90USB1286.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90USB1286.xml
index 203be06d..dc144217 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90USB1286.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90USB1286.xml
@@ -137,7 +137,7 @@
             <property key="ppprogramlock_pulsewidth" value="0"/>
             <property key="ppprogramlock_polltimeout" value="5"/>
         </property-group>
-        <property-group key="boot_sections">
+        <property-group key="boot_section_options">
             <property-group key="boot_section_1">
                 <property key="start_address" value="0x0001FC00"/>
                 <property key="size" value="1024"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90USB1287.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90USB1287.xml
index 64216e14..8832a20c 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90USB1287.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90USB1287.xml
@@ -137,7 +137,7 @@
             <property key="ppprogramlock_pulsewidth" value="0"/>
             <property key="ppprogramlock_polltimeout" value="5"/>
         </property-group>
-        <property-group key="boot_sections">
+        <property-group key="boot_section_options">
             <property-group key="boot_section_1">
                 <property key="start_address" value="0x0001FC00"/>
                 <property key="size" value="1024"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90USB162.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90USB162.xml
index 2075da7d..23ed12ab 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90USB162.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90USB162.xml
@@ -137,7 +137,7 @@
             <property key="ppprogramlock_pulsewidth" value="0"/>
             <property key="ppprogramlock_polltimeout" value="5"/>
         </property-group>
-        <property-group key="boot_sections">
+        <property-group key="boot_section_options">
             <property-group key="boot_section_1">
                 <property key="start_address" value="0x00003E00"/>
                 <property key="size" value="512"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90USB646.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90USB646.xml
index e6f5080e..05b66003 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90USB646.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90USB646.xml
@@ -137,7 +137,7 @@
             <property key="ppprogramlock_pulsewidth" value="0"/>
             <property key="ppprogramlock_polltimeout" value="5"/>
         </property-group>
-        <property-group key="boot_sections">
+        <property-group key="boot_section_options">
             <property-group key="boot_section_1">
                 <property key="start_address" value="0x0000FC00"/>
                 <property key="size" value="1024"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90USB647.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90USB647.xml
index 9b89a1c4..c7cc5259 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90USB647.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90USB647.xml
@@ -137,7 +137,7 @@
             <property key="ppprogramlock_pulsewidth" value="0"/>
             <property key="ppprogramlock_polltimeout" value="5"/>
         </property-group>
-        <property-group key="boot_sections">
+        <property-group key="boot_section_options">
             <property-group key="boot_section_1">
                 <property key="start_address" value="0x0000FC00"/>
                 <property key="size" value="1024"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90USB82.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90USB82.xml
index bac9cddd..78e9e23d 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90USB82.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90USB82.xml
@@ -137,7 +137,7 @@
             <property key="ppprogramlock_pulsewidth" value="0"/>
             <property key="ppprogramlock_polltimeout" value="5"/>
         </property-group>
-        <property-group key="boot_sections">
+        <property-group key="boot_section_options">
             <property-group key="boot_section_1">
                 <property key="start_address" value="0x00001E00"/>
                 <property key="size" value="512"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA128.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA128.xml
index 4233f141..b9a1d653 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA128.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA128.xml
@@ -137,7 +137,7 @@
             <property key="ppprogramlock_pulsewidth" value="0"/>
             <property key="ppprogramlock_polltimeout" value="5"/>
         </property-group>
-        <property-group key="boot_sections">
+        <property-group key="boot_section_options">
             <property-group key="boot_section_1">
                 <property key="start_address" value="0x0001FC00"/>
                 <property key="size" value="1024"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA1280.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA1280.xml
index 07694e6a..2112733d 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA1280.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA1280.xml
@@ -137,7 +137,7 @@
             <property key="ppprogramlock_pulsewidth" value="0"/>
             <property key="ppprogramlock_polltimeout" value="5"/>
         </property-group>
-        <property-group key="boot_sections">
+        <property-group key="boot_section_options">
             <property-group key="boot_section_1">
                 <property key="start_address" value="0x0001FC00"/>
                 <property key="size" value="1024"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA1281.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA1281.xml
index 756dc940..e30c9f96 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA1281.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA1281.xml
@@ -137,7 +137,7 @@
             <property key="ppprogramlock_pulsewidth" value="0"/>
             <property key="ppprogramlock_polltimeout" value="5"/>
         </property-group>
-        <property-group key="boot_sections">
+        <property-group key="boot_section_options">
             <property-group key="boot_section_1">
                 <property key="start_address" value="0x0001FC00"/>
                 <property key="size" value="1024"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA1284.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA1284.xml
index aed20e86..5115d836 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA1284.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA1284.xml
@@ -163,7 +163,7 @@
             <property key="ppprogramlock_pulsewidth" value="0"/>
             <property key="ppprogramlock_polltimeout" value="5"/>
         </property-group>
-        <property-group key="boot_sections">
+        <property-group key="boot_section_options">
             <property-group key="boot_section_1">
                 <property key="start_address" value="0x0001FC00"/>
                 <property key="size" value="1024"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA1284P.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA1284P.xml
index 9c1ce192..4f8d8396 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA1284P.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA1284P.xml
@@ -163,7 +163,7 @@
             <property key="ppprogramlock_pulsewidth" value="0"/>
             <property key="ppprogramlock_polltimeout" value="5"/>
         </property-group>
-        <property-group key="boot_sections">
+        <property-group key="boot_section_options">
             <property-group key="boot_section_1">
                 <property key="start_address" value="0x0001FC00"/>
                 <property key="size" value="1024"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA1284RFR2.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA1284RFR2.xml
index c606af56..99d4b9d7 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA1284RFR2.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA1284RFR2.xml
@@ -137,7 +137,7 @@
             <property key="ppprogramlock_pulsewidth" value="0"/>
             <property key="ppprogramlock_polltimeout" value="5"/>
         </property-group>
-        <property-group key="boot_sections">
+        <property-group key="boot_section_options">
             <property-group key="boot_section_1">
                 <property key="start_address" value="0x0001FC00"/>
                 <property key="size" value="1024"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA128A.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA128A.xml
index 7ac4fc24..11294a8d 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA128A.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA128A.xml
@@ -137,7 +137,7 @@
             <property key="ppprogramlock_pulsewidth" value="0"/>
             <property key="ppprogramlock_polltimeout" value="5"/>
         </property-group>
-        <property-group key="boot_sections">
+        <property-group key="boot_section_options">
             <property-group key="boot_section_1">
                 <property key="start_address" value="0x0001FC00"/>
                 <property key="size" value="1024"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA128RFA1.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA128RFA1.xml
index 646befa8..13370448 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA128RFA1.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA128RFA1.xml
@@ -137,7 +137,7 @@
             <property key="ppprogramlock_pulsewidth" value="0"/>
             <property key="ppprogramlock_polltimeout" value="5"/>
         </property-group>
-        <property-group key="boot_sections">
+        <property-group key="boot_section_options">
             <property-group key="boot_section_1">
                 <property key="start_address" value="0x0001FC00"/>
                 <property key="size" value="1024"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA128RFR2.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA128RFR2.xml
index ce7b46dd..e257dfe0 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA128RFR2.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA128RFR2.xml
@@ -137,7 +137,7 @@
             <property key="ppprogramlock_pulsewidth" value="0"/>
             <property key="ppprogramlock_polltimeout" value="5"/>
         </property-group>
-        <property-group key="boot_sections">
+        <property-group key="boot_section_options">
             <property-group key="boot_section_1">
                 <property key="start_address" value="0x0001FC00"/>
                 <property key="size" value="1024"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA16.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA16.xml
index e6075436..01479dc9 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA16.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA16.xml
@@ -163,7 +163,7 @@
             <property key="ppprogramlock_pulsewidth" value="0"/>
             <property key="ppprogramlock_polltimeout" value="5"/>
         </property-group>
-        <property-group key="boot_sections">
+        <property-group key="boot_section_options">
             <property-group key="boot_section_1">
                 <property key="start_address" value="0x00003F00"/>
                 <property key="size" value="256"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA162.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA162.xml
index c739b751..5f447c71 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA162.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA162.xml
@@ -163,7 +163,7 @@
             <property key="ppprogramlock_pulsewidth" value="0"/>
             <property key="ppprogramlock_polltimeout" value="5"/>
         </property-group>
-        <property-group key="boot_sections">
+        <property-group key="boot_section_options">
             <property-group key="boot_section_1">
                 <property key="start_address" value="0x00003F00"/>
                 <property key="size" value="256"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA164A.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA164A.xml
index 3ae7915d..c870ec87 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA164A.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA164A.xml
@@ -163,7 +163,7 @@
             <property key="ppprogramlock_pulsewidth" value="0"/>
             <property key="ppprogramlock_polltimeout" value="5"/>
         </property-group>
-        <property-group key="boot_sections">
+        <property-group key="boot_section_options">
             <property-group key="boot_section_1">
                 <property key="start_address" value="0x00003F00"/>
                 <property key="size" value="256"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA164P.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA164P.xml
index 4bb13e84..0d6720ac 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA164P.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA164P.xml
@@ -163,7 +163,7 @@
             <property key="ppprogramlock_pulsewidth" value="0"/>
             <property key="ppprogramlock_polltimeout" value="5"/>
         </property-group>
-        <property-group key="boot_sections">
+        <property-group key="boot_section_options">
             <property-group key="boot_section_1">
                 <property key="start_address" value="0x00003F00"/>
                 <property key="size" value="256"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA164PA.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA164PA.xml
index 9857a3c1..4d91d06f 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA164PA.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA164PA.xml
@@ -163,7 +163,7 @@
             <property key="ppprogramlock_pulsewidth" value="0"/>
             <property key="ppprogramlock_polltimeout" value="5"/>
         </property-group>
-        <property-group key="boot_sections">
+        <property-group key="boot_section_options">
             <property-group key="boot_section_1">
                 <property key="start_address" value="0x00003F00"/>
                 <property key="size" value="256"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA165A.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA165A.xml
index 502b6436..c595f6eb 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA165A.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA165A.xml
@@ -137,7 +137,7 @@
             <property key="ppprogramlock_pulsewidth" value="0"/>
             <property key="ppprogramlock_polltimeout" value="5"/>
         </property-group>
-        <property-group key="boot_sections">
+        <property-group key="boot_section_options">
             <property-group key="boot_section_1">
                 <property key="start_address" value="0x00003F00"/>
                 <property key="size" value="256"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA165P.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA165P.xml
index 10f9e600..4980495c 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA165P.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA165P.xml
@@ -137,7 +137,7 @@
             <property key="ppprogramlock_pulsewidth" value="0"/>
             <property key="ppprogramlock_polltimeout" value="5"/>
         </property-group>
-        <property-group key="boot_sections">
+        <property-group key="boot_section_options">
             <property-group key="boot_section_1">
                 <property key="start_address" value="0x00003F00"/>
                 <property key="size" value="256"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA165PA.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA165PA.xml
index 04566d45..f39ccc1c 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA165PA.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA165PA.xml
@@ -137,7 +137,7 @@
             <property key="ppprogramlock_pulsewidth" value="0"/>
             <property key="ppprogramlock_polltimeout" value="5"/>
         </property-group>
-        <property-group key="boot_sections">
+        <property-group key="boot_section_options">
             <property-group key="boot_section_1">
                 <property key="start_address" value="0x00003F00"/>
                 <property key="size" value="256"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA168.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA168.xml
index 6c487960..e31b8954 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA168.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA168.xml
@@ -163,7 +163,7 @@
             <property key="ppprogramlock_pulsewidth" value="0"/>
             <property key="ppprogramlock_polltimeout" value="5"/>
         </property-group>
-        <property-group key="boot_sections">
+        <property-group key="boot_section_options">
             <property-group key="boot_section_1">
                 <property key="start_address" value="0x00003F00"/>
                 <property key="size" value="256"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA168A.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA168A.xml
index 97812972..90736753 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA168A.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA168A.xml
@@ -163,7 +163,7 @@
             <property key="ppprogramlock_pulsewidth" value="0"/>
             <property key="ppprogramlock_polltimeout" value="5"/>
         </property-group>
-        <property-group key="boot_sections">
+        <property-group key="boot_section_options">
             <property-group key="boot_section_1">
                 <property key="start_address" value="0x00003F00"/>
                 <property key="size" value="256"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA168P.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA168P.xml
index 71716cb5..afb6b966 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA168P.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA168P.xml
@@ -163,7 +163,7 @@
             <property key="ppprogramlock_pulsewidth" value="0"/>
             <property key="ppprogramlock_polltimeout" value="5"/>
         </property-group>
-        <property-group key="boot_sections">
+        <property-group key="boot_section_options">
             <property-group key="boot_section_1">
                 <property key="start_address" value="0x00003F00"/>
                 <property key="size" value="256"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA168PA.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA168PA.xml
index 0f037ca3..8fb59d3f 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA168PA.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA168PA.xml
@@ -163,7 +163,7 @@
             <property key="ppprogramlock_pulsewidth" value="0"/>
             <property key="ppprogramlock_polltimeout" value="5"/>
         </property-group>
-        <property-group key="boot_sections">
+        <property-group key="boot_section_options">
             <property-group key="boot_section_1">
                 <property key="start_address" value="0x00003F00"/>
                 <property key="size" value="256"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA168PB.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA168PB.xml
index 591f0bfa..109fc603 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA168PB.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA168PB.xml
@@ -163,7 +163,7 @@
             <property key="ppprogramlock_pulsewidth" value="0"/>
             <property key="ppprogramlock_polltimeout" value="5"/>
         </property-group>
-        <property-group key="boot_sections">
+        <property-group key="boot_section_options">
             <property-group key="boot_section_1">
                 <property key="start_address" value="0x00003F00"/>
                 <property key="size" value="256"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA169A.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA169A.xml
index 0369839d..91d004e4 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA169A.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA169A.xml
@@ -137,7 +137,7 @@
             <property key="ppprogramlock_pulsewidth" value="0"/>
             <property key="ppprogramlock_polltimeout" value="5"/>
         </property-group>
-        <property-group key="boot_sections">
+        <property-group key="boot_section_options">
             <property-group key="boot_section_1">
                 <property key="start_address" value="0x00003F00"/>
                 <property key="size" value="256"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA169P.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA169P.xml
index 9eeea4bd..712bbe27 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA169P.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA169P.xml
@@ -137,7 +137,7 @@
             <property key="ppprogramlock_pulsewidth" value="0"/>
             <property key="ppprogramlock_polltimeout" value="5"/>
         </property-group>
-        <property-group key="boot_sections">
+        <property-group key="boot_section_options">
             <property-group key="boot_section_1">
                 <property key="start_address" value="0x00003F00"/>
                 <property key="size" value="256"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA169PA.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA169PA.xml
index 00c1e5b0..851a8dfc 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA169PA.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA169PA.xml
@@ -137,7 +137,7 @@
             <property key="ppprogramlock_pulsewidth" value="0"/>
             <property key="ppprogramlock_polltimeout" value="5"/>
         </property-group>
-        <property-group key="boot_sections">
+        <property-group key="boot_section_options">
             <property-group key="boot_section_1">
                 <property key="start_address" value="0x00003F00"/>
                 <property key="size" value="256"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA16A.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA16A.xml
index dc930c99..d448d53a 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA16A.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA16A.xml
@@ -163,7 +163,7 @@
             <property key="ppprogramlock_pulsewidth" value="0"/>
             <property key="ppprogramlock_polltimeout" value="5"/>
         </property-group>
-        <property-group key="boot_sections">
+        <property-group key="boot_section_options">
             <property-group key="boot_section_1">
                 <property key="start_address" value="0x00003F00"/>
                 <property key="size" value="256"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA16M1.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA16M1.xml
index 45dd5160..045c97ec 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA16M1.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA16M1.xml
@@ -137,7 +137,7 @@
             <property key="ppprogramlock_pulsewidth" value="0"/>
             <property key="ppprogramlock_polltimeout" value="5"/>
         </property-group>
-        <property-group key="boot_sections">
+        <property-group key="boot_section_options">
             <property-group key="boot_section_1">
                 <property key="start_address" value="0x00003E00"/>
                 <property key="size" value="512"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA16U2.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA16U2.xml
index a9e48047..4cb59292 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA16U2.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA16U2.xml
@@ -137,7 +137,7 @@
             <property key="ppprogramlock_pulsewidth" value="0"/>
             <property key="ppprogramlock_polltimeout" value="5"/>
         </property-group>
-        <property-group key="boot_sections">
+        <property-group key="boot_section_options">
             <property-group key="boot_section_1">
                 <property key="start_address" value="0x00003E00"/>
                 <property key="size" value="512"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA16U4.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA16U4.xml
index 2f33e7e9..e7ef0880 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA16U4.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA16U4.xml
@@ -137,7 +137,7 @@
             <property key="ppprogramlock_pulsewidth" value="0"/>
             <property key="ppprogramlock_polltimeout" value="5"/>
         </property-group>
-        <property-group key="boot_sections">
+        <property-group key="boot_section_options">
             <property-group key="boot_section_1">
                 <property key="start_address" value="0x00003E00"/>
                 <property key="size" value="512"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA2560.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA2560.xml
index 0e593d81..5462ec88 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA2560.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA2560.xml
@@ -137,7 +137,7 @@
             <property key="ppprogramlock_pulsewidth" value="0"/>
             <property key="ppprogramlock_polltimeout" value="5"/>
         </property-group>
-        <property-group key="boot_sections">
+        <property-group key="boot_section_options">
             <property-group key="boot_section_1">
                 <property key="start_address" value="0x0003FC00"/>
                 <property key="size" value="1024"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA2561.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA2561.xml
index 73db7650..e25b4847 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA2561.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA2561.xml
@@ -137,7 +137,7 @@
             <property key="ppprogramlock_pulsewidth" value="0"/>
             <property key="ppprogramlock_polltimeout" value="5"/>
         </property-group>
-        <property-group key="boot_sections">
+        <property-group key="boot_section_options">
             <property-group key="boot_section_1">
                 <property key="start_address" value="0x0003FC00"/>
                 <property key="size" value="1024"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA2564RFR2.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA2564RFR2.xml
index b26d8d39..943edd07 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA2564RFR2.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA2564RFR2.xml
@@ -137,7 +137,7 @@
             <property key="ppprogramlock_pulsewidth" value="0"/>
             <property key="ppprogramlock_polltimeout" value="5"/>
         </property-group>
-        <property-group key="boot_sections">
+        <property-group key="boot_section_options">
             <property-group key="boot_section_1">
                 <property key="start_address" value="0x0003FC00"/>
                 <property key="size" value="1024"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA256RFR2.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA256RFR2.xml
index 6f23bdd6..8092fec8 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA256RFR2.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA256RFR2.xml
@@ -137,7 +137,7 @@
             <property key="ppprogramlock_pulsewidth" value="0"/>
             <property key="ppprogramlock_polltimeout" value="5"/>
         </property-group>
-        <property-group key="boot_sections">
+        <property-group key="boot_section_options">
             <property-group key="boot_section_1">
                 <property key="start_address" value="0x0003FC00"/>
                 <property key="size" value="1024"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA32.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA32.xml
index 158aafd4..a60d1922 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA32.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA32.xml
@@ -163,7 +163,7 @@
             <property key="ppprogramlock_pulsewidth" value="0"/>
             <property key="ppprogramlock_polltimeout" value="5"/>
         </property-group>
-        <property-group key="boot_sections">
+        <property-group key="boot_section_options">
             <property-group key="boot_section_1">
                 <property key="start_address" value="0x00007E00"/>
                 <property key="size" value="512"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA324A.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA324A.xml
index 3279ed8b..40811b65 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA324A.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA324A.xml
@@ -163,7 +163,7 @@
             <property key="ppprogramlock_pulsewidth" value="0"/>
             <property key="ppprogramlock_polltimeout" value="5"/>
         </property-group>
-        <property-group key="boot_sections">
+        <property-group key="boot_section_options">
             <property-group key="boot_section_1">
                 <property key="start_address" value="0x00007E00"/>
                 <property key="size" value="512"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA324P.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA324P.xml
index 67b8f0f2..338cc620 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA324P.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA324P.xml
@@ -163,7 +163,7 @@
             <property key="ppprogramlock_pulsewidth" value="0"/>
             <property key="ppprogramlock_polltimeout" value="5"/>
         </property-group>
-        <property-group key="boot_sections">
+        <property-group key="boot_section_options">
             <property-group key="boot_section_1">
                 <property key="start_address" value="0x00007E00"/>
                 <property key="size" value="512"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA324PA.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA324PA.xml
index a6c1b4a7..e4cee12f 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA324PA.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA324PA.xml
@@ -163,7 +163,7 @@
             <property key="ppprogramlock_pulsewidth" value="0"/>
             <property key="ppprogramlock_polltimeout" value="5"/>
         </property-group>
-        <property-group key="boot_sections">
+        <property-group key="boot_section_options">
             <property-group key="boot_section_1">
                 <property key="start_address" value="0x00007E00"/>
                 <property key="size" value="512"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA324PB.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA324PB.xml
index 316cc557..e96dd96b 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA324PB.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA324PB.xml
@@ -163,7 +163,7 @@
             <property key="ppprogramlock_pulsewidth" value="0"/>
             <property key="ppprogramlock_polltimeout" value="5"/>
         </property-group>
-        <property-group key="boot_sections">
+        <property-group key="boot_section_options">
             <property-group key="boot_section_1">
                 <property key="start_address" value="0x00007E00"/>
                 <property key="size" value="512"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA325.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA325.xml
index 74e99268..84de50f9 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA325.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA325.xml
@@ -137,7 +137,7 @@
             <property key="ppprogramlock_pulsewidth" value="0"/>
             <property key="ppprogramlock_polltimeout" value="5"/>
         </property-group>
-        <property-group key="boot_sections">
+        <property-group key="boot_section_options">
             <property-group key="boot_section_1">
                 <property key="start_address" value="0x00007E00"/>
                 <property key="size" value="512"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA3250.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA3250.xml
index a9a08294..b3f8cd62 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA3250.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA3250.xml
@@ -137,7 +137,7 @@
             <property key="ppprogramlock_pulsewidth" value="0"/>
             <property key="ppprogramlock_polltimeout" value="5"/>
         </property-group>
-        <property-group key="boot_sections">
+        <property-group key="boot_section_options">
             <property-group key="boot_section_1">
                 <property key="start_address" value="0x00007E00"/>
                 <property key="size" value="512"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA3250A.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA3250A.xml
index 8d31c2ed..940ec87f 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA3250A.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA3250A.xml
@@ -137,7 +137,7 @@
             <property key="ppprogramlock_pulsewidth" value="0"/>
             <property key="ppprogramlock_polltimeout" value="5"/>
         </property-group>
-        <property-group key="boot_sections">
+        <property-group key="boot_section_options">
             <property-group key="boot_section_1">
                 <property key="start_address" value="0x00007E00"/>
                 <property key="size" value="512"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA3250P.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA3250P.xml
index c9d0b6ab..fbda541c 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA3250P.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA3250P.xml
@@ -137,7 +137,7 @@
             <property key="ppprogramlock_pulsewidth" value="0"/>
             <property key="ppprogramlock_polltimeout" value="5"/>
         </property-group>
-        <property-group key="boot_sections">
+        <property-group key="boot_section_options">
             <property-group key="boot_section_1">
                 <property key="start_address" value="0x00007E00"/>
                 <property key="size" value="512"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA3250PA.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA3250PA.xml
index 9dd5250a..8e331942 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA3250PA.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA3250PA.xml
@@ -137,7 +137,7 @@
             <property key="ppprogramlock_pulsewidth" value="0"/>
             <property key="ppprogramlock_polltimeout" value="5"/>
         </property-group>
-        <property-group key="boot_sections">
+        <property-group key="boot_section_options">
             <property-group key="boot_section_1">
                 <property key="start_address" value="0x00007E00"/>
                 <property key="size" value="512"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA325A.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA325A.xml
index 0d04c4cf..a202e37c 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA325A.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA325A.xml
@@ -137,7 +137,7 @@
             <property key="ppprogramlock_pulsewidth" value="0"/>
             <property key="ppprogramlock_polltimeout" value="5"/>
         </property-group>
-        <property-group key="boot_sections">
+        <property-group key="boot_section_options">
             <property-group key="boot_section_1">
                 <property key="start_address" value="0x00007E00"/>
                 <property key="size" value="512"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA325P.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA325P.xml
index 1d8ad7f8..0e46206f 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA325P.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA325P.xml
@@ -137,7 +137,7 @@
             <property key="ppprogramlock_pulsewidth" value="0"/>
             <property key="ppprogramlock_polltimeout" value="5"/>
         </property-group>
-        <property-group key="boot_sections">
+        <property-group key="boot_section_options">
             <property-group key="boot_section_1">
                 <property key="start_address" value="0x00007E00"/>
                 <property key="size" value="512"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA325PA.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA325PA.xml
index a5b488c5..9c9250c2 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA325PA.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA325PA.xml
@@ -137,7 +137,7 @@
             <property key="ppprogramlock_pulsewidth" value="0"/>
             <property key="ppprogramlock_polltimeout" value="5"/>
         </property-group>
-        <property-group key="boot_sections">
+        <property-group key="boot_section_options">
             <property-group key="boot_section_1">
                 <property key="start_address" value="0x00007E00"/>
                 <property key="size" value="512"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA328.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA328.xml
index 2fc8d94a..4d98b1b2 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA328.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA328.xml
@@ -163,7 +163,7 @@
             <property key="ppprogramlock_pulsewidth" value="0"/>
             <property key="ppprogramlock_polltimeout" value="5"/>
         </property-group>
-        <property-group key="boot_sections">
+        <property-group key="boot_section_options">
             <property-group key="boot_section_1">
                 <property key="start_address" value="0x00007E00"/>
                 <property key="size" value="512"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA328P.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA328P.xml
index 6d6b2e4e..05dd9dfc 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA328P.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA328P.xml
@@ -163,7 +163,7 @@
             <property key="ppprogramlock_pulsewidth" value="0"/>
             <property key="ppprogramlock_polltimeout" value="5"/>
         </property-group>
-        <property-group key="boot_sections">
+        <property-group key="boot_section_options">
             <property-group key="boot_section_1">
                 <property key="start_address" value="0x00007E00"/>
                 <property key="size" value="512"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA328PB.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA328PB.xml
index bd8e7bb1..ceb00ecf 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA328PB.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA328PB.xml
@@ -160,7 +160,7 @@
             <property key="ppprogramlock_pulsewidth" value="0"/>
             <property key="ppprogramlock_polltimeout" value="5"/>
         </property-group>
-        <property-group key="boot_sections">
+        <property-group key="boot_section_options">
             <property-group key="boot_section_1">
                 <property key="start_address" value="0x00007E00"/>
                 <property key="size" value="512"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA329.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA329.xml
index 5c328755..306cb2d9 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA329.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA329.xml
@@ -137,7 +137,7 @@
             <property key="ppprogramlock_pulsewidth" value="0"/>
             <property key="ppprogramlock_polltimeout" value="5"/>
         </property-group>
-        <property-group key="boot_sections">
+        <property-group key="boot_section_options">
             <property-group key="boot_section_1">
                 <property key="start_address" value="0x00007E00"/>
                 <property key="size" value="512"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA3290.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA3290.xml
index 10c4b91d..f820658d 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA3290.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA3290.xml
@@ -137,7 +137,7 @@
             <property key="ppprogramlock_pulsewidth" value="0"/>
             <property key="ppprogramlock_polltimeout" value="5"/>
         </property-group>
-        <property-group key="boot_sections">
+        <property-group key="boot_section_options">
             <property-group key="boot_section_1">
                 <property key="start_address" value="0x00007E00"/>
                 <property key="size" value="512"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA3290A.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA3290A.xml
index 4be11904..c669f048 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA3290A.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA3290A.xml
@@ -137,7 +137,7 @@
             <property key="ppprogramlock_pulsewidth" value="0"/>
             <property key="ppprogramlock_polltimeout" value="5"/>
         </property-group>
-        <property-group key="boot_sections">
+        <property-group key="boot_section_options">
             <property-group key="boot_section_1">
                 <property key="start_address" value="0x00007E00"/>
                 <property key="size" value="512"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA3290P.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA3290P.xml
index 6e3902a4..c67d22ac 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA3290P.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA3290P.xml
@@ -137,7 +137,7 @@
             <property key="ppprogramlock_pulsewidth" value="0"/>
             <property key="ppprogramlock_polltimeout" value="5"/>
         </property-group>
-        <property-group key="boot_sections">
+        <property-group key="boot_section_options">
             <property-group key="boot_section_1">
                 <property key="start_address" value="0x00007E00"/>
                 <property key="size" value="512"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA3290PA.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA3290PA.xml
index 2b6ea926..ff20839a 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA3290PA.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA3290PA.xml
@@ -137,7 +137,7 @@
             <property key="ppprogramlock_pulsewidth" value="0"/>
             <property key="ppprogramlock_polltimeout" value="5"/>
         </property-group>
-        <property-group key="boot_sections">
+        <property-group key="boot_section_options">
             <property-group key="boot_section_1">
                 <property key="start_address" value="0x00007E00"/>
                 <property key="size" value="512"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA329A.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA329A.xml
index bba6242a..f87a5d2f 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA329A.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA329A.xml
@@ -137,7 +137,7 @@
             <property key="ppprogramlock_pulsewidth" value="0"/>
             <property key="ppprogramlock_polltimeout" value="5"/>
         </property-group>
-        <property-group key="boot_sections">
+        <property-group key="boot_section_options">
             <property-group key="boot_section_1">
                 <property key="start_address" value="0x00007E00"/>
                 <property key="size" value="512"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA329P.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA329P.xml
index cce1d1d2..fd4be6a2 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA329P.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA329P.xml
@@ -137,7 +137,7 @@
             <property key="ppprogramlock_pulsewidth" value="0"/>
             <property key="ppprogramlock_polltimeout" value="5"/>
         </property-group>
-        <property-group key="boot_sections">
+        <property-group key="boot_section_options">
             <property-group key="boot_section_1">
                 <property key="start_address" value="0x00007E00"/>
                 <property key="size" value="512"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA329PA.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA329PA.xml
index f7543bbd..78301b84 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA329PA.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA329PA.xml
@@ -137,7 +137,7 @@
             <property key="ppprogramlock_pulsewidth" value="0"/>
             <property key="ppprogramlock_polltimeout" value="5"/>
         </property-group>
-        <property-group key="boot_sections">
+        <property-group key="boot_section_options">
             <property-group key="boot_section_1">
                 <property key="start_address" value="0x00007E00"/>
                 <property key="size" value="512"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA32A.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA32A.xml
index dd37639a..a8c8af80 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA32A.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA32A.xml
@@ -163,7 +163,7 @@
             <property key="ppprogramlock_pulsewidth" value="0"/>
             <property key="ppprogramlock_polltimeout" value="5"/>
         </property-group>
-        <property-group key="boot_sections">
+        <property-group key="boot_section_options">
             <property-group key="boot_section_1">
                 <property key="start_address" value="0x00007E00"/>
                 <property key="size" value="512"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA32C1.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA32C1.xml
index 025b1c86..9ee53b38 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA32C1.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA32C1.xml
@@ -137,7 +137,7 @@
             <property key="ppprogramlock_pulsewidth" value="0"/>
             <property key="ppprogramlock_polltimeout" value="5"/>
         </property-group>
-        <property-group key="boot_sections">
+        <property-group key="boot_section_options">
             <property-group key="boot_section_1">
                 <property key="start_address" value="0x00007E00"/>
                 <property key="size" value="512"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA32M1.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA32M1.xml
index 2c8ac1e6..f83ba34a 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA32M1.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA32M1.xml
@@ -137,7 +137,7 @@
             <property key="ppprogramlock_pulsewidth" value="0"/>
             <property key="ppprogramlock_polltimeout" value="5"/>
         </property-group>
-        <property-group key="boot_sections">
+        <property-group key="boot_section_options">
             <property-group key="boot_section_1">
                 <property key="start_address" value="0x00007E00"/>
                 <property key="size" value="512"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA32U2.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA32U2.xml
index 6d3ad0a3..52789bef 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA32U2.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA32U2.xml
@@ -137,7 +137,7 @@
             <property key="ppprogramlock_pulsewidth" value="0"/>
             <property key="ppprogramlock_polltimeout" value="5"/>
         </property-group>
-        <property-group key="boot_sections">
+        <property-group key="boot_section_options">
             <property-group key="boot_section_1">
                 <property key="start_address" value="0x00007E00"/>
                 <property key="size" value="512"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA32U4.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA32U4.xml
index 35f3155a..0c4f711d 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA32U4.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA32U4.xml
@@ -137,7 +137,7 @@
             <property key="ppprogramlock_pulsewidth" value="0"/>
             <property key="ppprogramlock_polltimeout" value="5"/>
         </property-group>
-        <property-group key="boot_sections">
+        <property-group key="boot_section_options">
             <property-group key="boot_section_1">
                 <property key="start_address" value="0x00007E00"/>
                 <property key="size" value="512"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA406.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA406.xml
index 65b15fd5..8aec3614 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA406.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA406.xml
@@ -41,7 +41,7 @@
             <property key="ppprogramlock_pulsewidth" value="0"/>
             <property key="ppprogramlock_polltimeout" value="5"/>
         </property-group>
-        <property-group key="boot_sections">
+        <property-group key="boot_section_options">
             <property-group key="boot_section_1">
                 <property key="start_address" value="0x00009E00"/>
                 <property key="size" value="512"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA64.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA64.xml
index 48af9344..475e407b 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA64.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA64.xml
@@ -137,7 +137,7 @@
             <property key="ppprogramlock_pulsewidth" value="0"/>
             <property key="ppprogramlock_polltimeout" value="5"/>
         </property-group>
-        <property-group key="boot_sections">
+        <property-group key="boot_section_options">
             <property-group key="boot_section_1">
                 <property key="start_address" value="0x0000FC00"/>
                 <property key="size" value="1024"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA640.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA640.xml
index c877e74c..f61ae9e7 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA640.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA640.xml
@@ -137,7 +137,7 @@
             <property key="ppprogramlock_pulsewidth" value="0"/>
             <property key="ppprogramlock_polltimeout" value="5"/>
         </property-group>
-        <property-group key="boot_sections">
+        <property-group key="boot_section_options">
             <property-group key="boot_section_1">
                 <property key="start_address" value="0x0000FC00"/>
                 <property key="size" value="1024"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA644.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA644.xml
index bd5d9957..3538e6fc 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA644.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA644.xml
@@ -163,7 +163,7 @@
             <property key="ppprogramlock_pulsewidth" value="0"/>
             <property key="ppprogramlock_polltimeout" value="5"/>
         </property-group>
-        <property-group key="boot_sections">
+        <property-group key="boot_section_options">
             <property-group key="boot_section_1">
                 <property key="start_address" value="0x0000FC00"/>
                 <property key="size" value="1024"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA644A.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA644A.xml
index 3b2492a6..be09b31c 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA644A.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA644A.xml
@@ -163,7 +163,7 @@
             <property key="ppprogramlock_pulsewidth" value="0"/>
             <property key="ppprogramlock_polltimeout" value="5"/>
         </property-group>
-        <property-group key="boot_sections">
+        <property-group key="boot_section_options">
             <property-group key="boot_section_1">
                 <property key="start_address" value="0x0000FC00"/>
                 <property key="size" value="1024"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA644P.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA644P.xml
index a160ba0a..f4c7a710 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA644P.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA644P.xml
@@ -163,7 +163,7 @@
             <property key="ppprogramlock_pulsewidth" value="0"/>
             <property key="ppprogramlock_polltimeout" value="5"/>
         </property-group>
-        <property-group key="boot_sections">
+        <property-group key="boot_section_options">
             <property-group key="boot_section_1">
                 <property key="start_address" value="0x0000FC00"/>
                 <property key="size" value="1024"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA644PA.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA644PA.xml
index 2479eb17..e5c3d28c 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA644PA.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA644PA.xml
@@ -163,7 +163,7 @@
             <property key="ppprogramlock_pulsewidth" value="0"/>
             <property key="ppprogramlock_polltimeout" value="5"/>
         </property-group>
-        <property-group key="boot_sections">
+        <property-group key="boot_section_options">
             <property-group key="boot_section_1">
                 <property key="start_address" value="0x0000FC00"/>
                 <property key="size" value="1024"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA644RFR2.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA644RFR2.xml
index 4bb52c1f..a39ede79 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA644RFR2.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA644RFR2.xml
@@ -137,7 +137,7 @@
             <property key="ppprogramlock_pulsewidth" value="0"/>
             <property key="ppprogramlock_polltimeout" value="5"/>
         </property-group>
-        <property-group key="boot_sections">
+        <property-group key="boot_section_options">
             <property-group key="boot_section_1">
                 <property key="start_address" value="0x0000FC00"/>
                 <property key="size" value="1024"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA645.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA645.xml
index cda70864..87a885eb 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA645.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA645.xml
@@ -137,7 +137,7 @@
             <property key="ppprogramlock_pulsewidth" value="0"/>
             <property key="ppprogramlock_polltimeout" value="5"/>
         </property-group>
-        <property-group key="boot_sections">
+        <property-group key="boot_section_options">
             <property-group key="boot_section_1">
                 <property key="start_address" value="0x0000FC00"/>
                 <property key="size" value="1024"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA6450.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA6450.xml
index 56e9ba32..a6998e3d 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA6450.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA6450.xml
@@ -137,7 +137,7 @@
             <property key="ppprogramlock_pulsewidth" value="0"/>
             <property key="ppprogramlock_polltimeout" value="5"/>
         </property-group>
-        <property-group key="boot_sections">
+        <property-group key="boot_section_options">
             <property-group key="boot_section_1">
                 <property key="start_address" value="0x0000FC00"/>
                 <property key="size" value="1024"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA6450A.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA6450A.xml
index f6c3ba38..41364a4d 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA6450A.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA6450A.xml
@@ -137,7 +137,7 @@
             <property key="ppprogramlock_pulsewidth" value="0"/>
             <property key="ppprogramlock_polltimeout" value="5"/>
         </property-group>
-        <property-group key="boot_sections">
+        <property-group key="boot_section_options">
             <property-group key="boot_section_1">
                 <property key="start_address" value="0x0000FC00"/>
                 <property key="size" value="1024"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA6450P.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA6450P.xml
index 60e01d4a..5ccefbf6 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA6450P.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA6450P.xml
@@ -137,7 +137,7 @@
             <property key="ppprogramlock_pulsewidth" value="0"/>
             <property key="ppprogramlock_polltimeout" value="5"/>
         </property-group>
-        <property-group key="boot_sections">
+        <property-group key="boot_section_options">
             <property-group key="boot_section_1">
                 <property key="start_address" value="0x0000FC00"/>
                 <property key="size" value="1024"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA645A.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA645A.xml
index 9b2824a2..7659d9fa 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA645A.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA645A.xml
@@ -137,7 +137,7 @@
             <property key="ppprogramlock_pulsewidth" value="0"/>
             <property key="ppprogramlock_polltimeout" value="5"/>
         </property-group>
-        <property-group key="boot_sections">
+        <property-group key="boot_section_options">
             <property-group key="boot_section_1">
                 <property key="start_address" value="0x0000FC00"/>
                 <property key="size" value="1024"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA645P.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA645P.xml
index 1becd58c..5b3c2cdf 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA645P.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA645P.xml
@@ -137,7 +137,7 @@
             <property key="ppprogramlock_pulsewidth" value="0"/>
             <property key="ppprogramlock_polltimeout" value="5"/>
         </property-group>
-        <property-group key="boot_sections">
+        <property-group key="boot_section_options">
             <property-group key="boot_section_1">
                 <property key="start_address" value="0x0000FC00"/>
                 <property key="size" value="1024"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA649.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA649.xml
index 5562b2e4..ca8322a1 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA649.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA649.xml
@@ -137,7 +137,7 @@
             <property key="ppprogramlock_pulsewidth" value="0"/>
             <property key="ppprogramlock_polltimeout" value="5"/>
         </property-group>
-        <property-group key="boot_sections">
+        <property-group key="boot_section_options">
             <property-group key="boot_section_1">
                 <property key="start_address" value="0x0000FC00"/>
                 <property key="size" value="1024"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA6490.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA6490.xml
index 06652dcb..df50dfa2 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA6490.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA6490.xml
@@ -137,7 +137,7 @@
             <property key="ppprogramlock_pulsewidth" value="0"/>
             <property key="ppprogramlock_polltimeout" value="5"/>
         </property-group>
-        <property-group key="boot_sections">
+        <property-group key="boot_section_options">
             <property-group key="boot_section_1">
                 <property key="start_address" value="0x0000FC00"/>
                 <property key="size" value="1024"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA6490A.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA6490A.xml
index 5f39cb38..e16f7d03 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA6490A.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA6490A.xml
@@ -137,7 +137,7 @@
             <property key="ppprogramlock_pulsewidth" value="0"/>
             <property key="ppprogramlock_polltimeout" value="5"/>
         </property-group>
-        <property-group key="boot_sections">
+        <property-group key="boot_section_options">
             <property-group key="boot_section_1">
                 <property key="start_address" value="0x0000FC00"/>
                 <property key="size" value="1024"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA6490P.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA6490P.xml
index 108398b9..78d28e4c 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA6490P.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA6490P.xml
@@ -137,7 +137,7 @@
             <property key="ppprogramlock_pulsewidth" value="0"/>
             <property key="ppprogramlock_polltimeout" value="5"/>
         </property-group>
-        <property-group key="boot_sections">
+        <property-group key="boot_section_options">
             <property-group key="boot_section_1">
                 <property key="start_address" value="0x0000FC00"/>
                 <property key="size" value="1024"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA649A.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA649A.xml
index f158f7eb..0f15905c 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA649A.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA649A.xml
@@ -137,7 +137,7 @@
             <property key="ppprogramlock_pulsewidth" value="0"/>
             <property key="ppprogramlock_polltimeout" value="5"/>
         </property-group>
-        <property-group key="boot_sections">
+        <property-group key="boot_section_options">
             <property-group key="boot_section_1">
                 <property key="start_address" value="0x0000FC00"/>
                 <property key="size" value="1024"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA649P.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA649P.xml
index d5f7a266..3fab0bc7 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA649P.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA649P.xml
@@ -137,7 +137,7 @@
             <property key="ppprogramlock_pulsewidth" value="0"/>
             <property key="ppprogramlock_polltimeout" value="5"/>
         </property-group>
-        <property-group key="boot_sections">
+        <property-group key="boot_section_options">
             <property-group key="boot_section_1">
                 <property key="start_address" value="0x0000FC00"/>
                 <property key="size" value="1024"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA64A.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA64A.xml
index 5d299885..3acceb97 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA64A.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA64A.xml
@@ -137,7 +137,7 @@
             <property key="ppprogramlock_pulsewidth" value="0"/>
             <property key="ppprogramlock_polltimeout" value="5"/>
         </property-group>
-        <property-group key="boot_sections">
+        <property-group key="boot_section_options">
             <property-group key="boot_section_1">
                 <property key="start_address" value="0x0000FC00"/>
                 <property key="size" value="1024"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA64C1.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA64C1.xml
index 2cb0f914..52f53f64 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA64C1.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA64C1.xml
@@ -137,7 +137,7 @@
             <property key="ppprogramlock_pulsewidth" value="0"/>
             <property key="ppprogramlock_polltimeout" value="5"/>
         </property-group>
-        <property-group key="boot_sections">
+        <property-group key="boot_section_options">
             <property-group key="boot_section_1">
                 <property key="start_address" value="0x0000FC00"/>
                 <property key="size" value="1024"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA64M1.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA64M1.xml
index 05618dea..ddd4a968 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA64M1.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA64M1.xml
@@ -137,7 +137,7 @@
             <property key="ppprogramlock_pulsewidth" value="0"/>
             <property key="ppprogramlock_polltimeout" value="5"/>
         </property-group>
-        <property-group key="boot_sections">
+        <property-group key="boot_section_options">
             <property-group key="boot_section_1">
                 <property key="start_address" value="0x0000FC00"/>
                 <property key="size" value="1024"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA64RFR2.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA64RFR2.xml
index 3972c6c2..176b1980 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA64RFR2.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA64RFR2.xml
@@ -137,7 +137,7 @@
             <property key="ppprogramlock_pulsewidth" value="0"/>
             <property key="ppprogramlock_polltimeout" value="5"/>
         </property-group>
-        <property-group key="boot_sections">
+        <property-group key="boot_section_options">
             <property-group key="boot_section_1">
                 <property key="start_address" value="0x0000FC00"/>
                 <property key="size" value="1024"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA88.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA88.xml
index e536be9b..3f5d881c 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA88.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA88.xml
@@ -163,7 +163,7 @@
             <property key="ppprogramlock_pulsewidth" value="0"/>
             <property key="ppprogramlock_polltimeout" value="5"/>
         </property-group>
-        <property-group key="boot_sections">
+        <property-group key="boot_section_options">
             <property-group key="boot_section_1">
                 <property key="start_address" value="0x00001F00"/>
                 <property key="size" value="256"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA88A.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA88A.xml
index 0367d72e..d9a009f9 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA88A.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA88A.xml
@@ -163,7 +163,7 @@
             <property key="ppprogramlock_pulsewidth" value="0"/>
             <property key="ppprogramlock_polltimeout" value="5"/>
         </property-group>
-        <property-group key="boot_sections">
+        <property-group key="boot_section_options">
             <property-group key="boot_section_1">
                 <property key="start_address" value="0x00001F00"/>
                 <property key="size" value="256"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA88P.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA88P.xml
index cb63987c..7c5d6fd7 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA88P.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA88P.xml
@@ -163,7 +163,7 @@
             <property key="ppprogramlock_pulsewidth" value="0"/>
             <property key="ppprogramlock_polltimeout" value="5"/>
         </property-group>
-        <property-group key="boot_sections">
+        <property-group key="boot_section_options">
             <property-group key="boot_section_1">
                 <property key="start_address" value="0x00001F00"/>
                 <property key="size" value="256"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA88PA.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA88PA.xml
index a1dc319c..e93b2b99 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA88PA.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA88PA.xml
@@ -163,7 +163,7 @@
             <property key="ppprogramlock_pulsewidth" value="0"/>
             <property key="ppprogramlock_polltimeout" value="5"/>
         </property-group>
-        <property-group key="boot_sections">
+        <property-group key="boot_section_options">
             <property-group key="boot_section_1">
                 <property key="start_address" value="0x00001F00"/>
                 <property key="size" value="256"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA88PB.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA88PB.xml
index 0a6e6ff0..5cda09ae 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA88PB.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA88PB.xml
@@ -163,7 +163,7 @@
             <property key="ppprogramlock_pulsewidth" value="0"/>
             <property key="ppprogramlock_polltimeout" value="5"/>
         </property-group>
-        <property-group key="boot_sections">
+        <property-group key="boot_section_options">
             <property-group key="boot_section_1">
                 <property key="start_address" value="0x00001F00"/>
                 <property key="size" value="256"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA8U2.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA8U2.xml
index b5a6cbe8..a1555de4 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA8U2.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA8U2.xml
@@ -137,7 +137,7 @@
             <property key="ppprogramlock_pulsewidth" value="0"/>
             <property key="ppprogramlock_polltimeout" value="5"/>
         </property-group>
-        <property-group key="boot_sections">
+        <property-group key="boot_section_options">
             <property-group key="boot_section_1">
                 <property key="start_address" value="0x00001E00"/>
                 <property key="size" value="512"/>