diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90USB1286.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90USB1286.xml
index 748059d0..9c05da9f 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90USB1286.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90USB1286.xml
@@ -975,8 +975,8 @@
         <pad key="pe6" name="PE6"/>
         <pad key="pe7" name="PE7"/>
         <pad key="uvcc" name="UVCC"/>
-        <pad key="d-" name="D-"/>
-        <pad key="d+" name="D+"/>
+        <pad key="dn" name="D-"/>
+        <pad key="dp" name="D+"/>
         <pad key="ugnd" name="UGND"/>
         <pad key="ucap" name="UCAP"/>
         <pad key="vbus" name="VBUS"/>
@@ -1040,8 +1040,8 @@
             <pin position="1" pad-key="pe6"/>
             <pin position="2" pad-key="pe7"/>
             <pin position="3" pad-key="uvcc"/>
-            <pin position="4" pad-key="d-"/>
-            <pin position="5" pad-key="d+"/>
+            <pin position="4" pad-key="dn"/>
+            <pin position="5" pad-key="dp"/>
             <pin position="6" pad-key="ugnd"/>
             <pin position="7" pad-key="ucap"/>
             <pin position="8" pad-key="vbus"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90USB1287.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90USB1287.xml
index a59d7f92..2070e013 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90USB1287.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90USB1287.xml
@@ -1097,8 +1097,8 @@
         <pad key="pe6" name="PE6"/>
         <pad key="pe7" name="PE7"/>
         <pad key="uvcc" name="UVCC"/>
-        <pad key="d-" name="D-"/>
-        <pad key="d+" name="D+"/>
+        <pad key="dn" name="D-"/>
+        <pad key="dp" name="D+"/>
         <pad key="ugnd" name="UGND"/>
         <pad key="ucap" name="UCAP"/>
         <pad key="vbus" name="VBUS"/>
@@ -1162,8 +1162,8 @@
             <pin position="1" pad-key="pe6"/>
             <pin position="2" pad-key="pe7"/>
             <pin position="3" pad-key="uvcc"/>
-            <pin position="4" pad-key="d-"/>
-            <pin position="5" pad-key="d+"/>
+            <pin position="4" pad-key="dn"/>
+            <pin position="5" pad-key="dp"/>
             <pin position="6" pad-key="ugnd"/>
             <pin position="7" pad-key="ucap"/>
             <pin position="8" pad-key="vbus"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90USB162.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90USB162.xml
index 9fdf29af..a9d0aaa8 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90USB162.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90USB162.xml
@@ -782,8 +782,8 @@
         <pad key="pc4" name="PC4"/>
         <pad key="ucap" name="UCAP"/>
         <pad key="ugnd" name="UGND"/>
-        <pad key="d+" name="D+"/>
-        <pad key="d-" name="D-"/>
+        <pad key="dp" name="D+"/>
+        <pad key="dn" name="D-"/>
         <pad key="uvcc" name="UVCC"/>
         <pad key="avcc" name="AVCC"/>
     </pads>
@@ -817,8 +817,8 @@
             <pin position="26" pad-key="pc4"/>
             <pin position="27" pad-key="ucap"/>
             <pin position="28" pad-key="ugnd"/>
-            <pin position="29" pad-key="d+"/>
-            <pin position="30" pad-key="d-"/>
+            <pin position="29" pad-key="dp"/>
+            <pin position="30" pad-key="dn"/>
             <pin position="31" pad-key="uvcc"/>
             <pin position="32" pad-key="avcc"/>
         </pinout>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90USB646.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90USB646.xml
index e8676479..34e54e86 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90USB646.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90USB646.xml
@@ -1097,8 +1097,8 @@
         <pad key="pe6" name="PE6"/>
         <pad key="pe7" name="PE7"/>
         <pad key="uvcc" name="UVCC"/>
-        <pad key="d-" name="D-"/>
-        <pad key="d+" name="D+"/>
+        <pad key="dn" name="D-"/>
+        <pad key="dp" name="D+"/>
         <pad key="ugnd" name="UGND"/>
         <pad key="ucap" name="UCAP"/>
         <pad key="vbus" name="VBUS"/>
@@ -1162,8 +1162,8 @@
             <pin position="1" pad-key="pe6"/>
             <pin position="2" pad-key="pe7"/>
             <pin position="3" pad-key="uvcc"/>
-            <pin position="4" pad-key="d-"/>
-            <pin position="5" pad-key="d+"/>
+            <pin position="4" pad-key="dn"/>
+            <pin position="5" pad-key="dp"/>
             <pin position="6" pad-key="ugnd"/>
             <pin position="7" pad-key="ucap"/>
             <pin position="8" pad-key="vbus"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90USB647.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90USB647.xml
index 03ea2749..541899c0 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90USB647.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90USB647.xml
@@ -1097,8 +1097,8 @@
         <pad key="pe6" name="PE6"/>
         <pad key="pe7" name="PE7"/>
         <pad key="uvcc" name="UVCC"/>
-        <pad key="d-" name="D-"/>
-        <pad key="d+" name="D+"/>
+        <pad key="dn" name="D-"/>
+        <pad key="dp" name="D+"/>
         <pad key="ugnd" name="UGND"/>
         <pad key="ucap" name="UCAP"/>
         <pad key="vbus" name="VBUS"/>
@@ -1162,8 +1162,8 @@
             <pin position="1" pad-key="pe6"/>
             <pin position="2" pad-key="pe7"/>
             <pin position="3" pad-key="uvcc"/>
-            <pin position="4" pad-key="d-"/>
-            <pin position="5" pad-key="d+"/>
+            <pin position="4" pad-key="dn"/>
+            <pin position="5" pad-key="dp"/>
             <pin position="6" pad-key="ugnd"/>
             <pin position="7" pad-key="ucap"/>
             <pin position="8" pad-key="vbus"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90USB82.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90USB82.xml
index 8108a9fb..db45b1bb 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90USB82.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90USB82.xml
@@ -782,8 +782,8 @@
         <pad key="pc4" name="PC4"/>
         <pad key="ucap" name="UCAP"/>
         <pad key="ugnd" name="UGND"/>
-        <pad key="d+" name="D+"/>
-        <pad key="d-" name="D-"/>
+        <pad key="dp" name="D+"/>
+        <pad key="dn" name="D-"/>
         <pad key="uvcc" name="UVCC"/>
         <pad key="avcc" name="AVCC"/>
     </pads>
@@ -817,8 +817,8 @@
             <pin position="26" pad-key="pc4"/>
             <pin position="27" pad-key="ucap"/>
             <pin position="28" pad-key="ugnd"/>
-            <pin position="29" pad-key="d+"/>
-            <pin position="30" pad-key="d-"/>
+            <pin position="29" pad-key="dp"/>
+            <pin position="30" pad-key="dn"/>
             <pin position="31" pad-key="uvcc"/>
             <pin position="32" pad-key="avcc"/>
         </pinout>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA16U2.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA16U2.xml
index 5625a0cf..f347c518 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA16U2.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA16U2.xml
@@ -873,8 +873,8 @@
         <pad key="pc4" name="PC4"/>
         <pad key="ucap" name="UCAP"/>
         <pad key="ugnd" name="UGND"/>
-        <pad key="d+" name="D+"/>
-        <pad key="d-" name="D-"/>
+        <pad key="dp" name="D+"/>
+        <pad key="dn" name="D-"/>
         <pad key="uvcc" name="UVCC"/>
         <pad key="avcc" name="AVCC"/>
     </pads>
@@ -908,8 +908,8 @@
             <pin position="26" pad-key="pc4"/>
             <pin position="27" pad-key="ucap"/>
             <pin position="28" pad-key="ugnd"/>
-            <pin position="29" pad-key="d+"/>
-            <pin position="30" pad-key="d-"/>
+            <pin position="29" pad-key="dp"/>
+            <pin position="30" pad-key="dn"/>
             <pin position="31" pad-key="uvcc"/>
             <pin position="32" pad-key="avcc"/>
         </pinout>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA32U2.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA32U2.xml
index cf6eba63..7133d697 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA32U2.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA32U2.xml
@@ -847,8 +847,8 @@
         <pad key="pc4" name="PC4"/>
         <pad key="ucap" name="UCAP"/>
         <pad key="ugnd" name="UGND"/>
-        <pad key="d+" name="D+"/>
-        <pad key="d-" name="D-"/>
+        <pad key="dp" name="D+"/>
+        <pad key="dn" name="D-"/>
         <pad key="uvcc" name="UVCC"/>
         <pad key="avcc" name="AVCC"/>
     </pads>
@@ -882,8 +882,8 @@
             <pin position="26" pad-key="pc4"/>
             <pin position="27" pad-key="ucap"/>
             <pin position="28" pad-key="ugnd"/>
-            <pin position="29" pad-key="d+"/>
-            <pin position="30" pad-key="d-"/>
+            <pin position="29" pad-key="dp"/>
+            <pin position="30" pad-key="dn"/>
             <pin position="31" pad-key="uvcc"/>
             <pin position="32" pad-key="avcc"/>
         </pinout>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA8U2.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA8U2.xml
index 693073ac..33e0dec8 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA8U2.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA8U2.xml
@@ -847,8 +847,8 @@
         <pad key="pc4" name="PC4"/>
         <pad key="ucap" name="UCAP"/>
         <pad key="ugnd" name="UGND"/>
-        <pad key="d+" name="D+"/>
-        <pad key="d-" name="D-"/>
+        <pad key="dp" name="D+"/>
+        <pad key="dn" name="D-"/>
         <pad key="uvcc" name="UVCC"/>
         <pad key="avcc" name="AVCC"/>
     </pads>
@@ -882,8 +882,8 @@
             <pin position="26" pad-key="pc4"/>
             <pin position="27" pad-key="ucap"/>
             <pin position="28" pad-key="ugnd"/>
-            <pin position="29" pad-key="d+"/>
-            <pin position="30" pad-key="d-"/>
+            <pin position="29" pad-key="dp"/>
+            <pin position="30" pad-key="dn"/>
             <pin position="31" pad-key="uvcc"/>
             <pin position="32" pad-key="avcc"/>
         </pinout>