Refactored physical interfaces in TDFs and TDF scripts

src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90CAN128.xml

@@ -187,9 +187,9 @@
         </address-space>
     </address-spaces>
     <physical-interfaces>
-        <physical-interface name="ISP" type="isp"/>
-        <physical-interface name="HVPP" type="hvpp"/>
-        <physical-interface name="JTAG" type="megajtag"/>
+        <physical-interface value="isp"/>
+        <physical-interface value="hvpp"/>
+        <physical-interface value="jtag"/>
     </physical-interfaces>
     <peripherals>
         <peripheral key="porta" name="PORTA" module-key="gpio_port">

src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90CAN32.xml

@@ -187,9 +187,9 @@
         </address-space>
     </address-spaces>
     <physical-interfaces>
-        <physical-interface name="ISP" type="isp"/>
-        <physical-interface name="HVPP" type="hvpp"/>
-        <physical-interface name="JTAG" type="megajtag"/>
+        <physical-interface value="isp"/>
+        <physical-interface value="hvpp"/>
+        <physical-interface value="jtag"/>
     </physical-interfaces>
     <peripherals>
         <peripheral key="porta" name="PORTA" module-key="gpio_port">

src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90CAN64.xml

@@ -187,9 +187,9 @@
         </address-space>
     </address-spaces>
     <physical-interfaces>
-        <physical-interface name="ISP" type="isp"/>
-        <physical-interface name="HVPP" type="hvpp"/>
-        <physical-interface name="JTAG" type="megajtag"/>
+        <physical-interface value="isp"/>
+        <physical-interface value="hvpp"/>
+        <physical-interface value="jtag"/>
     </physical-interfaces>
     <peripherals>
         <peripheral key="porta" name="PORTA" module-key="gpio_port">

src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90PWM1.xml

@@ -186,9 +186,9 @@
         </address-space>
     </address-spaces>
     <physical-interfaces>
-        <physical-interface name="ISP" type="isp"/>
-        <physical-interface name="HVPP" type="hvpp"/>
-        <physical-interface name="debugWIRE" type="dw"/>
+        <physical-interface value="isp"/>
+        <physical-interface value="hvpp"/>
+        <physical-interface value="debug_wire"/>
     </physical-interfaces>
     <peripherals>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">

src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90PWM161.xml

@@ -186,9 +186,9 @@
         </address-space>
     </address-spaces>
     <physical-interfaces>
-        <physical-interface name="ISP" type="isp"/>
-        <physical-interface name="HVPP" type="hvpp"/>
-        <physical-interface name="debugWIRE" type="dw"/>
+        <physical-interface value="isp"/>
+        <physical-interface value="hvpp"/>
+        <physical-interface value="debug_wire"/>
     </physical-interfaces>
     <peripherals>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">

src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90PWM216.xml

@@ -186,9 +186,9 @@
         </address-space>
     </address-spaces>
     <physical-interfaces>
-        <physical-interface name="ISP" type="isp"/>
-        <physical-interface name="HVPP" type="hvpp"/>
-        <physical-interface name="debugWIRE" type="dw"/>
+        <physical-interface value="isp"/>
+        <physical-interface value="hvpp"/>
+        <physical-interface value="debug_wire"/>
     </physical-interfaces>
     <peripherals>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">

src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90PWM2B.xml

@@ -186,9 +186,9 @@
         </address-space>
     </address-spaces>
     <physical-interfaces>
-        <physical-interface name="ISP" type="isp"/>
-        <physical-interface name="HVPP" type="hvpp"/>
-        <physical-interface name="debugWIRE" type="dw"/>
+        <physical-interface value="isp"/>
+        <physical-interface value="hvpp"/>
+        <physical-interface value="debug_wire"/>
     </physical-interfaces>
     <peripherals>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">

src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90PWM316.xml

@@ -186,9 +186,9 @@
         </address-space>
     </address-spaces>
     <physical-interfaces>
-        <physical-interface name="ISP" type="isp"/>
-        <physical-interface name="HVPP" type="hvpp"/>
-        <physical-interface name="debugWIRE" type="dw"/>
+        <physical-interface value="isp"/>
+        <physical-interface value="hvpp"/>
+        <physical-interface value="debug_wire"/>
     </physical-interfaces>
     <peripherals>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">

src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90PWM3B.xml

@@ -186,9 +186,9 @@
         </address-space>
     </address-spaces>
     <physical-interfaces>
-        <physical-interface name="ISP" type="isp"/>
-        <physical-interface name="HVPP" type="hvpp"/>
-        <physical-interface name="debugWIRE" type="dw"/>
+        <physical-interface value="isp"/>
+        <physical-interface value="hvpp"/>
+        <physical-interface value="debug_wire"/>
     </physical-interfaces>
     <peripherals>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">

src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90PWM81.xml

@@ -186,9 +186,9 @@
         </address-space>
     </address-spaces>
     <physical-interfaces>
-        <physical-interface name="ISP" type="isp"/>
-        <physical-interface name="HVPP" type="hvpp"/>
-        <physical-interface name="debugWIRE" type="dw"/>
+        <physical-interface value="isp"/>
+        <physical-interface value="hvpp"/>
+        <physical-interface value="debug_wire"/>
     </physical-interfaces>
     <peripherals>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">

src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90USB1286.xml

@@ -187,9 +187,9 @@
         </address-space>
     </address-spaces>
     <physical-interfaces>
-        <physical-interface name="ISP" type="isp"/>
-        <physical-interface name="HVPP" type="hvpp"/>
-        <physical-interface name="JTAG" type="megajtag"/>
+        <physical-interface value="isp"/>
+        <physical-interface value="hvpp"/>
+        <physical-interface value="jtag"/>
     </physical-interfaces>
     <peripherals>
         <peripheral key="wdt" name="WDT" module-key="wdt">

src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90USB1287.xml

@@ -187,9 +187,9 @@
         </address-space>
     </address-spaces>
     <physical-interfaces>
-        <physical-interface name="ISP" type="isp"/>
-        <physical-interface name="HVPP" type="hvpp"/>
-        <physical-interface name="JTAG" type="megajtag"/>
+        <physical-interface value="isp"/>
+        <physical-interface value="hvpp"/>
+        <physical-interface value="jtag"/>
     </physical-interfaces>
     <peripherals>
         <peripheral key="wdt" name="WDT" module-key="wdt">

src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90USB162.xml

@@ -186,9 +186,9 @@
         </address-space>
     </address-spaces>
     <physical-interfaces>
-        <physical-interface name="ISP" type="isp"/>
-        <physical-interface name="HVPP" type="hvpp"/>
-        <physical-interface name="debugWIRE" type="dw"/>
+        <physical-interface value="isp"/>
+        <physical-interface value="hvpp"/>
+        <physical-interface value="debug_wire"/>
     </physical-interfaces>
     <peripherals>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">

src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90USB646.xml

@@ -187,9 +187,9 @@
         </address-space>
     </address-spaces>
     <physical-interfaces>
-        <physical-interface name="ISP" type="isp"/>
-        <physical-interface name="HVPP" type="hvpp"/>
-        <physical-interface name="JTAG" type="megajtag"/>
+        <physical-interface value="isp"/>
+        <physical-interface value="hvpp"/>
+        <physical-interface value="jtag"/>
     </physical-interfaces>
     <peripherals>
         <peripheral key="wdt" name="WDT" module-key="wdt">

src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90USB647.xml

@@ -187,9 +187,9 @@
         </address-space>
     </address-spaces>
     <physical-interfaces>
-        <physical-interface name="ISP" type="isp"/>
-        <physical-interface name="HVPP" type="hvpp"/>
-        <physical-interface name="JTAG" type="megajtag"/>
+        <physical-interface value="isp"/>
+        <physical-interface value="hvpp"/>
+        <physical-interface value="jtag"/>
     </physical-interfaces>
     <peripherals>
         <peripheral key="wdt" name="WDT" module-key="wdt">

src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90USB82.xml

@@ -186,9 +186,9 @@
         </address-space>
     </address-spaces>
     <physical-interfaces>
-        <physical-interface name="ISP" type="isp"/>
-        <physical-interface name="HVPP" type="hvpp"/>
-        <physical-interface name="debugWIRE" type="dw"/>
+        <physical-interface value="isp"/>
+        <physical-interface value="hvpp"/>
+        <physical-interface value="debug_wire"/>
     </physical-interfaces>
     <peripherals>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">

src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA128.xml

@@ -187,9 +187,9 @@
         </address-space>
     </address-spaces>
     <physical-interfaces>
-        <physical-interface name="ISP" type="isp"/>
-        <physical-interface name="HVPP" type="hvpp"/>
-        <physical-interface name="JTAG" type="megajtag"/>
+        <physical-interface value="isp"/>
+        <physical-interface value="hvpp"/>
+        <physical-interface value="jtag"/>
     </physical-interfaces>
     <peripherals>
         <peripheral key="ac" name="AC" module-key="ac">

src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA1280.xml

@@ -187,9 +187,9 @@
         </address-space>
     </address-spaces>
     <physical-interfaces>
-        <physical-interface name="ISP" type="isp"/>
-        <physical-interface name="HVPP" type="hvpp"/>
-        <physical-interface name="JTAG" type="megajtag"/>
+        <physical-interface value="isp"/>
+        <physical-interface value="hvpp"/>
+        <physical-interface value="jtag"/>
     </physical-interfaces>
     <peripherals>
         <peripheral key="ac" name="AC" module-key="ac">

src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA1281.xml

@@ -187,9 +187,9 @@
         </address-space>
     </address-spaces>
     <physical-interfaces>
-        <physical-interface name="ISP" type="isp"/>
-        <physical-interface name="HVPP" type="hvpp"/>
-        <physical-interface name="JTAG" type="megajtag"/>
+        <physical-interface value="isp"/>
+        <physical-interface value="hvpp"/>
+        <physical-interface value="jtag"/>
     </physical-interfaces>
     <peripherals>
         <peripheral key="ac" name="AC" module-key="ac">

src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA1284.xml

@@ -212,9 +212,9 @@
         </address-space>
     </address-spaces>
     <physical-interfaces>
-        <physical-interface name="ISP" type="isp"/>
-        <physical-interface name="HVPP" type="hvpp"/>
-        <physical-interface name="JTAG" type="megajtag"/>
+        <physical-interface value="isp"/>
+        <physical-interface value="hvpp"/>
+        <physical-interface value="jtag"/>
     </physical-interfaces>
     <peripherals>
         <peripheral key="ac" name="AC" module-key="ac">

src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA1284P.xml

@@ -212,9 +212,9 @@
         </address-space>
     </address-spaces>
     <physical-interfaces>
-        <physical-interface name="ISP" type="isp"/>
-        <physical-interface name="HVPP" type="hvpp"/>
-        <physical-interface name="JTAG" type="megajtag"/>
+        <physical-interface value="isp"/>
+        <physical-interface value="hvpp"/>
+        <physical-interface value="jtag"/>
     </physical-interfaces>
     <peripherals>
         <peripheral key="ac" name="AC" module-key="ac">

src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA1284RFR2.xml

@@ -189,9 +189,9 @@
         </address-space>
     </address-spaces>
     <physical-interfaces>
-        <physical-interface name="ISP" type="isp"/>
-        <physical-interface name="HVPP" type="hvpp"/>
-        <physical-interface name="JTAG" type="megajtag"/>
+        <physical-interface value="isp"/>
+        <physical-interface value="hvpp"/>
+        <physical-interface value="jtag"/>
     </physical-interfaces>
     <peripherals>
         <peripheral key="ac" name="AC" module-key="ac">

src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA128A.xml

@@ -187,9 +187,9 @@
         </address-space>
     </address-spaces>
     <physical-interfaces>
-        <physical-interface name="ISP" type="isp"/>
-        <physical-interface name="HVPP" type="hvpp"/>
-        <physical-interface name="JTAG" type="megajtag"/>
+        <physical-interface value="isp"/>
+        <physical-interface value="hvpp"/>
+        <physical-interface value="jtag"/>
     </physical-interfaces>
     <peripherals>
         <peripheral key="ac" name="AC" module-key="ac">

src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA128RFA1.xml

@@ -186,9 +186,9 @@
         </address-space>
     </address-spaces>
     <physical-interfaces>
-        <physical-interface name="ISP" type="isp"/>
-        <physical-interface name="HVPP" type="hvpp"/>
-        <physical-interface name="JTAG" type="megajtag"/>
+        <physical-interface value="isp"/>
+        <physical-interface value="hvpp"/>
+        <physical-interface value="jtag"/>
     </physical-interfaces>
     <peripherals>
         <peripheral key="ac" name="AC" module-key="ac">

src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA128RFR2.xml

@@ -189,9 +189,9 @@
         </address-space>
     </address-spaces>
     <physical-interfaces>
-        <physical-interface name="ISP" type="isp"/>
-        <physical-interface name="HVPP" type="hvpp"/>
-        <physical-interface name="JTAG" type="megajtag"/>
+        <physical-interface value="isp"/>
+        <physical-interface value="hvpp"/>
+        <physical-interface value="jtag"/>
     </physical-interfaces>
     <peripherals>
         <peripheral key="ac" name="AC" module-key="ac">

src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA16.xml

@@ -212,9 +212,9 @@
         </address-space>
     </address-spaces>
     <physical-interfaces>
-        <physical-interface name="ISP" type="isp"/>
-        <physical-interface name="HVPP" type="hvpp"/>
-        <physical-interface name="JTAG" type="megajtag"/>
+        <physical-interface value="isp"/>
+        <physical-interface value="hvpp"/>
+        <physical-interface value="jtag"/>
     </physical-interfaces>
     <peripherals>
         <peripheral key="tc0" name="TC0" module-key="tc8">

src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA1608.xml

@@ -39,7 +39,7 @@
         </address-space>
     </address-spaces>
     <physical-interfaces>
-        <physical-interface name="UPDI" type="updi"/>
+        <physical-interface value="updi"/>
     </physical-interfaces>
     <peripherals>
         <peripheral key="ac0" name="AC0" module-key="i2106">

src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA1609.xml

@@ -39,7 +39,7 @@
         </address-space>
     </address-spaces>
     <physical-interfaces>
-        <physical-interface name="UPDI" type="updi"/>
+        <physical-interface value="updi"/>
     </physical-interfaces>
     <peripherals>
         <peripheral key="ac0" name="AC0" module-key="i2106">

src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA162.xml

@@ -213,9 +213,9 @@
         </address-space>
     </address-spaces>
     <physical-interfaces>
-        <physical-interface name="ISP" type="isp"/>
-        <physical-interface name="HVPP" type="hvpp"/>
-        <physical-interface name="JTAG" type="megajtag"/>
+        <physical-interface value="isp"/>
+        <physical-interface value="hvpp"/>
+        <physical-interface value="jtag"/>
     </physical-interfaces>
     <peripherals>
         <peripheral key="tc1" name="TC1" module-key="tc16">

src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA164A.xml

@@ -212,9 +212,9 @@
         </address-space>
     </address-spaces>
     <physical-interfaces>
-        <physical-interface name="ISP" type="isp"/>
-        <physical-interface name="HVPP" type="hvpp"/>
-        <physical-interface name="JTAG" type="megajtag"/>
+        <physical-interface value="isp"/>
+        <physical-interface value="hvpp"/>
+        <physical-interface value="jtag"/>
     </physical-interfaces>
     <peripherals>
         <peripheral key="ac" name="AC" module-key="ac">

src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA164P.xml

@@ -212,9 +212,9 @@
         </address-space>
     </address-spaces>
     <physical-interfaces>
-        <physical-interface name="ISP" type="isp"/>
-        <physical-interface name="HVPP" type="hvpp"/>
-        <physical-interface name="JTAG" type="megajtag"/>
+        <physical-interface value="isp"/>
+        <physical-interface value="hvpp"/>
+        <physical-interface value="jtag"/>
     </physical-interfaces>
     <peripherals>
         <peripheral key="ac" name="AC" module-key="ac">

src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA164PA.xml

@@ -212,9 +212,9 @@
         </address-space>
     </address-spaces>
     <physical-interfaces>
-        <physical-interface name="ISP" type="isp"/>
-        <physical-interface name="HVPP" type="hvpp"/>
-        <physical-interface name="JTAG" type="megajtag"/>
+        <physical-interface value="isp"/>
+        <physical-interface value="hvpp"/>
+        <physical-interface value="jtag"/>
     </physical-interfaces>
     <peripherals>
         <peripheral key="ac" name="AC" module-key="ac">

src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA165A.xml

@@ -186,9 +186,9 @@
         </address-space>
     </address-spaces>
     <physical-interfaces>
-        <physical-interface name="ISP" type="isp"/>
-        <physical-interface name="HVPP" type="hvpp"/>
-        <physical-interface name="JTAG" type="megajtag"/>
+        <physical-interface value="isp"/>
+        <physical-interface value="hvpp"/>
+        <physical-interface value="jtag"/>
     </physical-interfaces>
     <peripherals>
         <peripheral key="tc0" name="TC0" module-key="tc8">

src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA165P.xml

@@ -186,9 +186,9 @@
         </address-space>
     </address-spaces>
     <physical-interfaces>
-        <physical-interface name="ISP" type="isp"/>
-        <physical-interface name="HVPP" type="hvpp"/>
-        <physical-interface name="JTAG" type="megajtag"/>
+        <physical-interface value="isp"/>
+        <physical-interface value="hvpp"/>
+        <physical-interface value="jtag"/>
     </physical-interfaces>
     <peripherals>
         <peripheral key="tc0" name="TC0" module-key="tc8">

src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA165PA.xml

@@ -186,9 +186,9 @@
         </address-space>
     </address-spaces>
     <physical-interfaces>
-        <physical-interface name="ISP" type="isp"/>
-        <physical-interface name="HVPP" type="hvpp"/>
-        <physical-interface name="JTAG" type="megajtag"/>
+        <physical-interface value="isp"/>
+        <physical-interface value="hvpp"/>
+        <physical-interface value="jtag"/>
     </physical-interfaces>
     <peripherals>
         <peripheral key="tc0" name="TC0" module-key="tc8">

src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA168.xml

@@ -212,9 +212,9 @@
         </address-space>
     </address-spaces>
     <physical-interfaces>
-        <physical-interface name="ISP" type="isp"/>
-        <physical-interface name="HVPP" type="hvpp"/>
-        <physical-interface name="debugWIRE" type="dw"/>
+        <physical-interface value="isp"/>
+        <physical-interface value="hvpp"/>
+        <physical-interface value="debug_wire"/>
     </physical-interfaces>
     <peripherals>
         <peripheral key="usart0" name="USART0" module-key="usart">

src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA168A.xml

@@ -212,9 +212,9 @@
         </address-space>
     </address-spaces>
     <physical-interfaces>
-        <physical-interface name="ISP" type="isp"/>
-        <physical-interface name="HVPP" type="hvpp"/>
-        <physical-interface name="debugWIRE" type="dw"/>
+        <physical-interface value="isp"/>
+        <physical-interface value="hvpp"/>
+        <physical-interface value="debug_wire"/>
     </physical-interfaces>
     <peripherals>
         <peripheral key="usart0" name="USART0" module-key="usart">

src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA168P.xml

@@ -212,9 +212,9 @@
         </address-space>
     </address-spaces>
     <physical-interfaces>
-        <physical-interface name="ISP" type="isp"/>
-        <physical-interface name="HVPP" type="hvpp"/>
-        <physical-interface name="debugWIRE" type="dw"/>
+        <physical-interface value="isp"/>
+        <physical-interface value="hvpp"/>
+        <physical-interface value="debug_wire"/>
     </physical-interfaces>
     <peripherals>
         <peripheral key="usart0" name="USART0" module-key="usart">

src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA168PA.xml

@@ -212,9 +212,9 @@
         </address-space>
     </address-spaces>
     <physical-interfaces>
-        <physical-interface name="ISP" type="isp"/>
-        <physical-interface name="HVPP" type="hvpp"/>
-        <physical-interface name="debugWIRE" type="dw"/>
+        <physical-interface value="isp"/>
+        <physical-interface value="hvpp"/>
+        <physical-interface value="debug_wire"/>
     </physical-interfaces>
     <peripherals>
         <peripheral key="usart0" name="USART0" module-key="usart">

src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA168PB.xml

@@ -212,9 +212,9 @@
         </address-space>
     </address-spaces>
     <physical-interfaces>
-        <physical-interface name="ISP" type="isp"/>
-        <physical-interface name="HVPP" type="hvpp"/>
-        <physical-interface name="debugWIRE" type="dw"/>
+        <physical-interface value="isp"/>
+        <physical-interface value="hvpp"/>
+        <physical-interface value="debug_wire"/>
     </physical-interfaces>
     <peripherals>
         <peripheral key="usart0" name="USART0" module-key="usart">

src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA169A.xml

@@ -186,9 +186,9 @@
         </address-space>
     </address-spaces>
     <physical-interfaces>
-        <physical-interface name="ISP" type="isp"/>
-        <physical-interface name="HVPP" type="hvpp"/>
-        <physical-interface name="JTAG" type="megajtag"/>
+        <physical-interface value="isp"/>
+        <physical-interface value="hvpp"/>
+        <physical-interface value="jtag"/>
     </physical-interfaces>
     <peripherals>
         <peripheral key="tc0" name="TC0" module-key="tc8">

src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA169P.xml

@@ -186,9 +186,9 @@
         </address-space>
     </address-spaces>
     <physical-interfaces>
-        <physical-interface name="ISP" type="isp"/>
-        <physical-interface name="HVPP" type="hvpp"/>
-        <physical-interface name="JTAG" type="megajtag"/>
+        <physical-interface value="isp"/>
+        <physical-interface value="hvpp"/>
+        <physical-interface value="jtag"/>
     </physical-interfaces>
     <peripherals>
         <peripheral key="tc0" name="TC0" module-key="tc8">

src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA169PA.xml

@@ -186,9 +186,9 @@
         </address-space>
     </address-spaces>
     <physical-interfaces>
-        <physical-interface name="ISP" type="isp"/>
-        <physical-interface name="HVPP" type="hvpp"/>
-        <physical-interface name="JTAG" type="megajtag"/>
+        <physical-interface value="isp"/>
+        <physical-interface value="hvpp"/>
+        <physical-interface value="jtag"/>
     </physical-interfaces>
     <peripherals>
         <peripheral key="tc0" name="TC0" module-key="tc8">

src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA16A.xml

@@ -212,9 +212,9 @@
         </address-space>
     </address-spaces>
     <physical-interfaces>
-        <physical-interface name="ISP" type="isp"/>
-        <physical-interface name="HVPP" type="hvpp"/>
-        <physical-interface name="JTAG" type="megajtag"/>
+        <physical-interface value="isp"/>
+        <physical-interface value="hvpp"/>
+        <physical-interface value="jtag"/>
     </physical-interfaces>
     <peripherals>
         <peripheral key="tc0" name="TC0" module-key="tc8">

src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA16M1.xml

@@ -186,9 +186,9 @@
         </address-space>
     </address-spaces>
     <physical-interfaces>
-        <physical-interface name="ISP" type="isp"/>
-        <physical-interface name="HVPP" type="hvpp"/>
-        <physical-interface name="debugWIRE" type="dw"/>
+        <physical-interface value="isp"/>
+        <physical-interface value="hvpp"/>
+        <physical-interface value="debug_wire"/>
     </physical-interfaces>
     <peripherals>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">

src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA16U2.xml

@@ -186,9 +186,9 @@
         </address-space>
     </address-spaces>
     <physical-interfaces>
-        <physical-interface name="ISP" type="isp"/>
-        <physical-interface name="HVPP" type="hvpp"/>
-        <physical-interface name="debugWIRE" type="dw"/>
+        <physical-interface value="isp"/>
+        <physical-interface value="hvpp"/>
+        <physical-interface value="debug_wire"/>
     </physical-interfaces>
     <peripherals>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">

src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA16U4.xml

@@ -186,9 +186,9 @@
         </address-space>
     </address-spaces>
     <physical-interfaces>
-        <physical-interface name="ISP" type="isp"/>
-        <physical-interface name="HVPP" type="hvpp"/>
-        <physical-interface name="JTAG" type="megajtag"/>
+        <physical-interface value="isp"/>
+        <physical-interface value="hvpp"/>
+        <physical-interface value="jtag"/>
     </physical-interfaces>
     <peripherals>
         <peripheral key="wdt" name="WDT" module-key="wdt">

src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA2560.xml

@@ -187,9 +187,9 @@
         </address-space>
     </address-spaces>
     <physical-interfaces>
-        <physical-interface name="ISP" type="isp"/>
-        <physical-interface name="HVPP" type="hvpp"/>
-        <physical-interface name="JTAG" type="megajtag"/>
+        <physical-interface value="isp"/>
+        <physical-interface value="hvpp"/>
+        <physical-interface value="jtag"/>
     </physical-interfaces>
     <peripherals>
         <peripheral key="ac" name="AC" module-key="ac">

src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA2561.xml

@@ -187,9 +187,9 @@
         </address-space>
     </address-spaces>
     <physical-interfaces>
-        <physical-interface name="ISP" type="isp"/>
-        <physical-interface name="HVPP" type="hvpp"/>
-        <physical-interface name="JTAG" type="megajtag"/>
+        <physical-interface value="isp"/>
+        <physical-interface value="hvpp"/>
+        <physical-interface value="jtag"/>
     </physical-interfaces>
     <peripherals>
         <peripheral key="ac" name="AC" module-key="ac">

src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA2564RFR2.xml

@@ -189,9 +189,9 @@
         </address-space>
     </address-spaces>
     <physical-interfaces>
-        <physical-interface name="ISP" type="isp"/>
-        <physical-interface name="HVPP" type="hvpp"/>
-        <physical-interface name="JTAG" type="megajtag"/>
+        <physical-interface value="isp"/>
+        <physical-interface value="hvpp"/>
+        <physical-interface value="jtag"/>
     </physical-interfaces>
     <peripherals>
         <peripheral key="ac" name="AC" module-key="ac">

src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA256RFR2.xml

@@ -189,9 +189,9 @@
         </address-space>
     </address-spaces>
     <physical-interfaces>
-        <physical-interface name="ISP" type="isp"/>
-        <physical-interface name="HVPP" type="hvpp"/>
-        <physical-interface name="JTAG" type="megajtag"/>
+        <physical-interface value="isp"/>
+        <physical-interface value="hvpp"/>
+        <physical-interface value="jtag"/>
     </physical-interfaces>
     <peripherals>
         <peripheral key="ac" name="AC" module-key="ac">

src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA32.xml

@@ -212,9 +212,9 @@
         </address-space>
     </address-spaces>
     <physical-interfaces>
-        <physical-interface name="ISP" type="isp"/>
-        <physical-interface name="HVPP" type="hvpp"/>
-        <physical-interface name="JTAG" type="megajtag"/>
+        <physical-interface value="isp"/>
+        <physical-interface value="hvpp"/>
+        <physical-interface value="jtag"/>
     </physical-interfaces>
     <peripherals>
         <peripheral key="eeprom" name="EEPROM" module-key="eeprom">

src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA3208.xml

@@ -38,7 +38,7 @@
         </address-space>
     </address-spaces>
     <physical-interfaces>
-        <physical-interface name="UPDI" type="updi"/>
+        <physical-interface value="updi"/>
     </physical-interfaces>
     <peripherals>
         <peripheral key="ac0" name="AC0" module-key="i2106">

src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA3209.xml

@@ -38,7 +38,7 @@
         </address-space>
     </address-spaces>
     <physical-interfaces>
-        <physical-interface name="UPDI" type="updi"/>
+        <physical-interface value="updi"/>
     </physical-interfaces>
     <peripherals>
         <peripheral key="ac0" name="AC0" module-key="i2106">

src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA324A.xml

@@ -212,9 +212,9 @@
         </address-space>
     </address-spaces>
     <physical-interfaces>
-        <physical-interface name="ISP" type="isp"/>
-        <physical-interface name="HVPP" type="hvpp"/>
-        <physical-interface name="JTAG" type="megajtag"/>
+        <physical-interface value="isp"/>
+        <physical-interface value="hvpp"/>
+        <physical-interface value="jtag"/>
     </physical-interfaces>
     <peripherals>
         <peripheral key="ac" name="AC" module-key="ac">

src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA324P.xml

@@ -212,9 +212,9 @@
         </address-space>
     </address-spaces>
     <physical-interfaces>
-        <physical-interface name="ISP" type="isp"/>
-        <physical-interface name="HVPP" type="hvpp"/>
-        <physical-interface name="JTAG" type="megajtag"/>
+        <physical-interface value="isp"/>
+        <physical-interface value="hvpp"/>
+        <physical-interface value="jtag"/>
     </physical-interfaces>
     <peripherals>
         <peripheral key="ac" name="AC" module-key="ac">

src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA324PA.xml

@@ -212,9 +212,9 @@
         </address-space>
     </address-spaces>
     <physical-interfaces>
-        <physical-interface name="ISP" type="isp"/>
-        <physical-interface name="HVPP" type="hvpp"/>
-        <physical-interface name="JTAG" type="megajtag"/>
+        <physical-interface value="isp"/>
+        <physical-interface value="hvpp"/>
+        <physical-interface value="jtag"/>
     </physical-interfaces>
     <peripherals>
         <peripheral key="ac" name="AC" module-key="ac">

src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA324PB.xml

@@ -212,9 +212,9 @@
         </address-space>
     </address-spaces>
     <physical-interfaces>
-        <physical-interface name="ISP" type="isp"/>
-        <physical-interface name="HVPP" type="hvpp"/>
-        <physical-interface name="JTAG" type="megajtag"/>
+        <physical-interface value="isp"/>
+        <physical-interface value="hvpp"/>
+        <physical-interface value="jtag"/>
     </physical-interfaces>
     <peripherals>
         <peripheral key="ac" name="AC" module-key="ac">

src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA325.xml

@@ -186,9 +186,9 @@
         </address-space>
     </address-spaces>
     <physical-interfaces>
-        <physical-interface name="ISP" type="isp"/>
-        <physical-interface name="HVPP" type="hvpp"/>
-        <physical-interface name="JTAG" type="megajtag"/>
+        <physical-interface value="isp"/>
+        <physical-interface value="hvpp"/>
+        <physical-interface value="jtag"/>
     </physical-interfaces>
     <peripherals>
         <peripheral key="adc" name="ADC" module-key="adc">

src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA3250.xml

@@ -186,9 +186,9 @@
         </address-space>
     </address-spaces>
     <physical-interfaces>
-        <physical-interface name="ISP" type="isp"/>
-        <physical-interface name="HVPP" type="hvpp"/>
-        <physical-interface name="JTAG" type="megajtag"/>
+        <physical-interface value="isp"/>
+        <physical-interface value="hvpp"/>
+        <physical-interface value="jtag"/>
     </physical-interfaces>
     <peripherals>
         <peripheral key="tc0" name="TC0" module-key="tc8">

src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA3250A.xml

@@ -186,9 +186,9 @@
         </address-space>
     </address-spaces>
     <physical-interfaces>
-        <physical-interface name="ISP" type="isp"/>
-        <physical-interface name="HVPP" type="hvpp"/>
-        <physical-interface name="JTAG" type="megajtag"/>
+        <physical-interface value="isp"/>
+        <physical-interface value="hvpp"/>
+        <physical-interface value="jtag"/>
     </physical-interfaces>
     <peripherals>
         <peripheral key="tc0" name="TC0" module-key="tc8">

src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA3250P.xml

@@ -186,9 +186,9 @@
         </address-space>
     </address-spaces>
     <physical-interfaces>
-        <physical-interface name="ISP" type="isp"/>
-        <physical-interface name="HVPP" type="hvpp"/>
-        <physical-interface name="JTAG" type="megajtag"/>
+        <physical-interface value="isp"/>
+        <physical-interface value="hvpp"/>
+        <physical-interface value="jtag"/>
     </physical-interfaces>
     <peripherals>
         <peripheral key="tc0" name="TC0" module-key="tc8">

src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA3250PA.xml

@@ -186,9 +186,9 @@
         </address-space>
     </address-spaces>
     <physical-interfaces>
-        <physical-interface name="ISP" type="isp"/>
-        <physical-interface name="HVPP" type="hvpp"/>
-        <physical-interface name="JTAG" type="megajtag"/>
+        <physical-interface value="isp"/>
+        <physical-interface value="hvpp"/>
+        <physical-interface value="jtag"/>
     </physical-interfaces>
     <peripherals>
         <peripheral key="tc0" name="TC0" module-key="tc8">

src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA325A.xml

@@ -186,9 +186,9 @@
         </address-space>
     </address-spaces>
     <physical-interfaces>
-        <physical-interface name="ISP" type="isp"/>
-        <physical-interface name="HVPP" type="hvpp"/>
-        <physical-interface name="JTAG" type="megajtag"/>
+        <physical-interface value="isp"/>
+        <physical-interface value="hvpp"/>
+        <physical-interface value="jtag"/>
     </physical-interfaces>
     <peripherals>
         <peripheral key="adc" name="ADC" module-key="adc">

src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA325P.xml

@@ -186,9 +186,9 @@
         </address-space>
     </address-spaces>
     <physical-interfaces>
-        <physical-interface name="ISP" type="isp"/>
-        <physical-interface name="HVPP" type="hvpp"/>
-        <physical-interface name="JTAG" type="megajtag"/>
+        <physical-interface value="isp"/>
+        <physical-interface value="hvpp"/>
+        <physical-interface value="jtag"/>
     </physical-interfaces>
     <peripherals>
         <peripheral key="adc" name="ADC" module-key="adc">

src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA325PA.xml

@@ -186,9 +186,9 @@
         </address-space>
     </address-spaces>
     <physical-interfaces>
-        <physical-interface name="ISP" type="isp"/>
-        <physical-interface name="HVPP" type="hvpp"/>
-        <physical-interface name="JTAG" type="megajtag"/>
+        <physical-interface value="isp"/>
+        <physical-interface value="hvpp"/>
+        <physical-interface value="jtag"/>
     </physical-interfaces>
     <peripherals>
         <peripheral key="adc" name="ADC" module-key="adc">

src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA328.xml

@@ -212,9 +212,9 @@
         </address-space>
     </address-spaces>
     <physical-interfaces>
-        <physical-interface name="ISP" type="isp"/>
-        <physical-interface name="HVPP" type="hvpp"/>
-        <physical-interface name="debugWIRE" type="dw"/>
+        <physical-interface value="isp"/>
+        <physical-interface value="hvpp"/>
+        <physical-interface value="debug_wire"/>
     </physical-interfaces>
     <peripherals>
         <peripheral key="usart0" name="USART0" module-key="usart">

src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA328P.xml

@@ -212,9 +212,9 @@
         </address-space>
     </address-spaces>
     <physical-interfaces>
-        <physical-interface name="ISP" type="isp"/>
-        <physical-interface name="HVPP" type="hvpp"/>
-        <physical-interface name="debugWIRE" type="dw"/>
+        <physical-interface value="isp"/>
+        <physical-interface value="hvpp"/>
+        <physical-interface value="debug_wire"/>
     </physical-interfaces>
     <peripherals>
         <peripheral key="usart0" name="USART0" module-key="usart">

src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA328PB.xml

@@ -209,9 +209,9 @@
         </address-space>
     </address-spaces>
     <physical-interfaces>
-        <physical-interface name="ISP" type="isp"/>
-        <physical-interface name="HVPP" type="hvpp"/>
-        <physical-interface name="debugWIRE" type="dw"/>
+        <physical-interface value="isp"/>
+        <physical-interface value="hvpp"/>
+        <physical-interface value="debug_wire"/>
     </physical-interfaces>
     <peripherals>
         <peripheral key="usart0" name="USART0" module-key="usart">

src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA329.xml

@@ -186,9 +186,9 @@
         </address-space>
     </address-spaces>
     <physical-interfaces>
-        <physical-interface name="ISP" type="isp"/>
-        <physical-interface name="HVPP" type="hvpp"/>
-        <physical-interface name="JTAG" type="megajtag"/>
+        <physical-interface value="isp"/>
+        <physical-interface value="hvpp"/>
+        <physical-interface value="jtag"/>
     </physical-interfaces>
     <peripherals>
         <peripheral key="tc0" name="TC0" module-key="tc8">

src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA3290.xml

@@ -186,9 +186,9 @@
         </address-space>
     </address-spaces>
     <physical-interfaces>
-        <physical-interface name="ISP" type="isp"/>
-        <physical-interface name="HVPP" type="hvpp"/>
-        <physical-interface name="JTAG" type="megajtag"/>
+        <physical-interface value="isp"/>
+        <physical-interface value="hvpp"/>
+        <physical-interface value="jtag"/>
     </physical-interfaces>
     <peripherals>
         <peripheral key="tc0" name="TC0" module-key="tc8">

src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA3290A.xml

@@ -186,9 +186,9 @@
         </address-space>
     </address-spaces>
     <physical-interfaces>
-        <physical-interface name="ISP" type="isp"/>
-        <physical-interface name="HVPP" type="hvpp"/>
-        <physical-interface name="JTAG" type="megajtag"/>
+        <physical-interface value="isp"/>
+        <physical-interface value="hvpp"/>
+        <physical-interface value="jtag"/>
     </physical-interfaces>
     <peripherals>
         <peripheral key="tc0" name="TC0" module-key="tc8">

src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA3290P.xml

@@ -186,9 +186,9 @@
         </address-space>
     </address-spaces>
     <physical-interfaces>
-        <physical-interface name="ISP" type="isp"/>
-        <physical-interface name="HVPP" type="hvpp"/>
-        <physical-interface name="JTAG" type="megajtag"/>
+        <physical-interface value="isp"/>
+        <physical-interface value="hvpp"/>
+        <physical-interface value="jtag"/>
     </physical-interfaces>
     <peripherals>
         <peripheral key="tc0" name="TC0" module-key="tc8">

src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA3290PA.xml

@@ -186,9 +186,9 @@
         </address-space>
     </address-spaces>
     <physical-interfaces>
-        <physical-interface name="ISP" type="isp"/>
-        <physical-interface name="HVPP" type="hvpp"/>
-        <physical-interface name="JTAG" type="megajtag"/>
+        <physical-interface value="isp"/>
+        <physical-interface value="hvpp"/>
+        <physical-interface value="jtag"/>
     </physical-interfaces>
     <peripherals>
         <peripheral key="tc0" name="TC0" module-key="tc8">

src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA329A.xml

@@ -186,9 +186,9 @@
         </address-space>
     </address-spaces>
     <physical-interfaces>
-        <physical-interface name="ISP" type="isp"/>
-        <physical-interface name="HVPP" type="hvpp"/>
-        <physical-interface name="JTAG" type="megajtag"/>
+        <physical-interface value="isp"/>
+        <physical-interface value="hvpp"/>
+        <physical-interface value="jtag"/>
     </physical-interfaces>
     <peripherals>
         <peripheral key="tc0" name="TC0" module-key="tc8">

src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA329P.xml

@@ -186,9 +186,9 @@
         </address-space>
     </address-spaces>
     <physical-interfaces>
-        <physical-interface name="ISP" type="isp"/>
-        <physical-interface name="HVPP" type="hvpp"/>
-        <physical-interface name="JTAG" type="megajtag"/>
+        <physical-interface value="isp"/>
+        <physical-interface value="hvpp"/>
+        <physical-interface value="jtag"/>
     </physical-interfaces>
     <peripherals>
         <peripheral key="tc0" name="TC0" module-key="tc8">

src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA329PA.xml

@@ -186,9 +186,9 @@
         </address-space>
     </address-spaces>
     <physical-interfaces>
-        <physical-interface name="ISP" type="isp"/>
-        <physical-interface name="HVPP" type="hvpp"/>
-        <physical-interface name="JTAG" type="megajtag"/>
+        <physical-interface value="isp"/>
+        <physical-interface value="hvpp"/>
+        <physical-interface value="jtag"/>
     </physical-interfaces>
     <peripherals>
         <peripheral key="tc0" name="TC0" module-key="tc8">

src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA32A.xml

@@ -212,9 +212,9 @@
         </address-space>
     </address-spaces>
     <physical-interfaces>
-        <physical-interface name="ISP" type="isp"/>
-        <physical-interface name="HVPP" type="hvpp"/>
-        <physical-interface name="JTAG" type="megajtag"/>
+        <physical-interface value="isp"/>
+        <physical-interface value="hvpp"/>
+        <physical-interface value="jtag"/>
     </physical-interfaces>
     <peripherals>
         <peripheral key="eeprom" name="EEPROM" module-key="eeprom">

src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA32C1.xml

@@ -186,9 +186,9 @@
         </address-space>
     </address-spaces>
     <physical-interfaces>
-        <physical-interface name="ISP" type="isp"/>
-        <physical-interface name="HVPP" type="hvpp"/>
-        <physical-interface name="debugWIRE" type="dw"/>
+        <physical-interface value="isp"/>
+        <physical-interface value="hvpp"/>
+        <physical-interface value="debug_wire"/>
     </physical-interfaces>
     <peripherals>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">

src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA32M1.xml

@@ -186,9 +186,9 @@
         </address-space>
     </address-spaces>
     <physical-interfaces>
-        <physical-interface name="ISP" type="isp"/>
-        <physical-interface name="HVPP" type="hvpp"/>
-        <physical-interface name="debugWIRE" type="dw"/>
+        <physical-interface value="isp"/>
+        <physical-interface value="hvpp"/>
+        <physical-interface value="debug_wire"/>
     </physical-interfaces>
     <peripherals>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">

src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA32U2.xml

@@ -186,9 +186,9 @@
         </address-space>
     </address-spaces>
     <physical-interfaces>
-        <physical-interface name="ISP" type="isp"/>
-        <physical-interface name="HVPP" type="hvpp"/>
-        <physical-interface name="debugWIRE" type="dw"/>
+        <physical-interface value="isp"/>
+        <physical-interface value="hvpp"/>
+        <physical-interface value="debug_wire"/>
     </physical-interfaces>
     <peripherals>
         <peripheral key="portb" name="PORTB" module-key="gpio_port">

src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA32U4.xml

@@ -186,9 +186,9 @@
         </address-space>
     </address-spaces>
     <physical-interfaces>
-        <physical-interface name="ISP" type="isp"/>
-        <physical-interface name="HVPP" type="hvpp"/>
-        <physical-interface name="JTAG" type="megajtag"/>
+        <physical-interface value="isp"/>
+        <physical-interface value="hvpp"/>
+        <physical-interface value="jtag"/>
     </physical-interfaces>
     <peripherals>
         <peripheral key="wdt" name="WDT" module-key="wdt">

src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA406.xml

@@ -87,8 +87,8 @@
         </address-space>
     </address-spaces>
     <physical-interfaces>
-        <physical-interface name="HVPP" type="hvpp"/>
-        <physical-interface name="JTAG" type="megajtag"/>
+        <physical-interface value="hvpp"/>
+        <physical-interface value="jtag"/>
     </physical-interfaces>
     <peripherals>
         <peripheral key="adc" name="ADC" module-key="adc">

src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA48.xml

@@ -190,9 +190,9 @@
         </address-space>
     </address-spaces>
     <physical-interfaces>
-        <physical-interface name="ISP" type="isp"/>
-        <physical-interface name="HVPP" type="hvpp"/>
-        <physical-interface name="debugWIRE" type="dw"/>
+        <physical-interface value="isp"/>
+        <physical-interface value="hvpp"/>
+        <physical-interface value="debug_wire"/>
     </physical-interfaces>
     <peripherals>
         <peripheral key="usart0" name="USART0" module-key="usart">

src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA4808.xml

@@ -38,7 +38,7 @@
         </address-space>
     </address-spaces>
     <physical-interfaces>
-        <physical-interface name="UPDI" type="updi"/>
+        <physical-interface value="updi"/>
     </physical-interfaces>
     <peripherals>
         <peripheral key="ac0" name="AC0" module-key="i2106">

src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA4809.xml

@@ -38,7 +38,7 @@
         </address-space>
     </address-spaces>
     <physical-interfaces>
-        <physical-interface name="UPDI" type="updi"/>
+        <physical-interface value="updi"/>
     </physical-interfaces>
     <peripherals>
         <peripheral key="ac0" name="AC0" module-key="i2106">

src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA48A.xml

@@ -190,9 +190,9 @@
         </address-space>
     </address-spaces>
     <physical-interfaces>
-        <physical-interface name="ISP" type="isp"/>
-        <physical-interface name="HVPP" type="hvpp"/>
-        <physical-interface name="debugWIRE" type="dw"/>
+        <physical-interface value="isp"/>
+        <physical-interface value="hvpp"/>
+        <physical-interface value="debug_wire"/>
     </physical-interfaces>
     <peripherals>
         <peripheral key="usart0" name="USART0" module-key="usart">

src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA48P.xml

@@ -190,9 +190,9 @@
         </address-space>
     </address-spaces>
     <physical-interfaces>
-        <physical-interface name="ISP" type="isp"/>
-        <physical-interface name="HVPP" type="hvpp"/>
-        <physical-interface name="debugWIRE" type="dw"/>
+        <physical-interface value="isp"/>
+        <physical-interface value="hvpp"/>
+        <physical-interface value="debug_wire"/>
     </physical-interfaces>
     <peripherals>
         <peripheral key="usart0" name="USART0" module-key="usart">

src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA48PA.xml

@@ -190,9 +190,9 @@
         </address-space>
     </address-spaces>
     <physical-interfaces>
-        <physical-interface name="ISP" type="isp"/>
-        <physical-interface name="HVPP" type="hvpp"/>
-        <physical-interface name="debugWIRE" type="dw"/>
+        <physical-interface value="isp"/>
+        <physical-interface value="hvpp"/>
+        <physical-interface value="debug_wire"/>
     </physical-interfaces>
     <peripherals>
         <peripheral key="usart0" name="USART0" module-key="usart">

src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA48PB.xml

@@ -190,9 +190,9 @@
         </address-space>
     </address-spaces>
     <physical-interfaces>
-        <physical-interface name="ISP" type="isp"/>
-        <physical-interface name="HVPP" type="hvpp"/>
-        <physical-interface name="debugWIRE" type="dw"/>
+        <physical-interface value="isp"/>
+        <physical-interface value="hvpp"/>
+        <physical-interface value="debug_wire"/>
     </physical-interfaces>
     <peripherals>
         <peripheral key="usart0" name="USART0" module-key="usart">

src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA64.xml

@@ -187,9 +187,9 @@
         </address-space>
     </address-spaces>
     <physical-interfaces>
-        <physical-interface name="ISP" type="isp"/>
-        <physical-interface name="HVPP" type="hvpp"/>
-        <physical-interface name="JTAG" type="megajtag"/>
+        <physical-interface value="isp"/>
+        <physical-interface value="hvpp"/>
+        <physical-interface value="jtag"/>
     </physical-interfaces>
     <peripherals>
         <peripheral key="ac" name="AC" module-key="ac">

src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA640.xml

@@ -187,9 +187,9 @@
         </address-space>
     </address-spaces>
     <physical-interfaces>
-        <physical-interface name="ISP" type="isp"/>
-        <physical-interface name="HVPP" type="hvpp"/>
-        <physical-interface name="JTAG" type="megajtag"/>
+        <physical-interface value="isp"/>
+        <physical-interface value="hvpp"/>
+        <physical-interface value="jtag"/>
     </physical-interfaces>
     <peripherals>
         <peripheral key="ac" name="AC" module-key="ac">

src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA644.xml

@@ -212,9 +212,9 @@
         </address-space>
     </address-spaces>
     <physical-interfaces>
-        <physical-interface name="ISP" type="isp"/>
-        <physical-interface name="HVPP" type="hvpp"/>
-        <physical-interface name="JTAG" type="megajtag"/>
+        <physical-interface value="isp"/>
+        <physical-interface value="hvpp"/>
+        <physical-interface value="jtag"/>
     </physical-interfaces>
     <peripherals>
         <peripheral key="ac" name="AC" module-key="ac">

src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA644A.xml

@@ -212,9 +212,9 @@
         </address-space>
     </address-spaces>
     <physical-interfaces>
-        <physical-interface name="ISP" type="isp"/>
-        <physical-interface name="HVPP" type="hvpp"/>
-        <physical-interface name="JTAG" type="megajtag"/>
+        <physical-interface value="isp"/>
+        <physical-interface value="hvpp"/>
+        <physical-interface value="jtag"/>
     </physical-interfaces>
     <peripherals>
         <peripheral key="ac" name="AC" module-key="ac">

src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA644P.xml

@@ -212,9 +212,9 @@
         </address-space>
     </address-spaces>
     <physical-interfaces>
-        <physical-interface name="ISP" type="isp"/>
-        <physical-interface name="HVPP" type="hvpp"/>
-        <physical-interface name="JTAG" type="megajtag"/>
+        <physical-interface value="isp"/>
+        <physical-interface value="hvpp"/>
+        <physical-interface value="jtag"/>
     </physical-interfaces>
     <peripherals>
         <peripheral key="ac" name="AC" module-key="ac">

src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA644PA.xml

@@ -212,9 +212,9 @@
         </address-space>
     </address-spaces>
     <physical-interfaces>
-        <physical-interface name="ISP" type="isp"/>
-        <physical-interface name="HVPP" type="hvpp"/>
-        <physical-interface name="JTAG" type="megajtag"/>
+        <physical-interface value="isp"/>
+        <physical-interface value="hvpp"/>
+        <physical-interface value="jtag"/>
     </physical-interfaces>
     <peripherals>
         <peripheral key="ac" name="AC" module-key="ac">

src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA644RFR2.xml

@@ -189,9 +189,9 @@
         </address-space>
     </address-spaces>
     <physical-interfaces>
-        <physical-interface name="ISP" type="isp"/>
-        <physical-interface name="HVPP" type="hvpp"/>
-        <physical-interface name="JTAG" type="megajtag"/>
+        <physical-interface value="isp"/>
+        <physical-interface value="hvpp"/>
+        <physical-interface value="jtag"/>
     </physical-interfaces>
     <peripherals>
         <peripheral key="ac" name="AC" module-key="ac">

src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA645.xml

@@ -186,9 +186,9 @@
         </address-space>
     </address-spaces>
     <physical-interfaces>
-        <physical-interface name="ISP" type="isp"/>
-        <physical-interface name="HVPP" type="hvpp"/>
-        <physical-interface name="JTAG" type="megajtag"/>
+        <physical-interface value="isp"/>
+        <physical-interface value="hvpp"/>
+        <physical-interface value="jtag"/>
     </physical-interfaces>
     <peripherals>
         <peripheral key="adc" name="ADC" module-key="adc">

src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA6450.xml

@@ -186,9 +186,9 @@
         </address-space>
     </address-spaces>
     <physical-interfaces>
-        <physical-interface name="ISP" type="isp"/>
-        <physical-interface name="HVPP" type="hvpp"/>
-        <physical-interface name="JTAG" type="megajtag"/>
+        <physical-interface value="isp"/>
+        <physical-interface value="hvpp"/>
+        <physical-interface value="jtag"/>
     </physical-interfaces>
     <peripherals>
         <peripheral key="adc" name="ADC" module-key="adc">

src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA6450A.xml

@@ -186,9 +186,9 @@
         </address-space>
     </address-spaces>
     <physical-interfaces>
-        <physical-interface name="ISP" type="isp"/>
-        <physical-interface name="HVPP" type="hvpp"/>
-        <physical-interface name="JTAG" type="megajtag"/>
+        <physical-interface value="isp"/>
+        <physical-interface value="hvpp"/>
+        <physical-interface value="jtag"/>
     </physical-interfaces>
     <peripherals>
         <peripheral key="adc" name="ADC" module-key="adc">