diff --git a/build/scripts/Targets/TargetDescriptionFiles/Services/ValidationService.php b/build/scripts/Targets/TargetDescriptionFiles/Services/ValidationService.php
index edadfd23..360a6321 100644
--- a/build/scripts/Targets/TargetDescriptionFiles/Services/ValidationService.php
+++ b/build/scripts/Targets/TargetDescriptionFiles/Services/ValidationService.php
@@ -678,8 +678,8 @@ class ValidationService
                 $failures[] = 'Missing RESET signal';
             }
 
-            if (!$containsSignal('SCK')) {
-                $failures[] = 'Missing SCK signal';
+            if (!$containsSignal('SCLK')) {
+                $failures[] = 'Missing SCLK signal';
             }
 
             if (!$containsSignal('MOSI')) {
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90PWM1.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90PWM1.xml
index 987ee4c4..0c83209e 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90PWM1.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90PWM1.xml
@@ -196,7 +196,7 @@
                 <signal name="RESET" pad-key="pe0"/>
                 <signal name="MOSI" pad-key="pd3"/>
                 <signal name="MISO" pad-key="pd2"/>
-                <signal name="SCK" pad-key="pd4"/>
+                <signal name="SCLK" pad-key="pd4"/>
             </signals>
         </physical-interface>
         <physical-interface value="hvpp"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90PWM161.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90PWM161.xml
index cfd392b4..4c5e913e 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90PWM161.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90PWM161.xml
@@ -196,7 +196,7 @@
                 <signal name="RESET" pad-key="pe0"/>
                 <signal name="MOSI" pad-key="pb4"/>
                 <signal name="MISO" pad-key="pb6"/>
-                <signal name="SCK" pad-key="pb5"/>
+                <signal name="SCLK" pad-key="pb5"/>
             </signals>
         </physical-interface>
         <physical-interface value="hvpp"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90PWM216.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90PWM216.xml
index 15331d19..18135aa8 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90PWM216.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90PWM216.xml
@@ -196,7 +196,7 @@
                 <signal name="RESET" pad-key="pe0"/>
                 <signal name="MOSI" pad-key="pd3"/>
                 <signal name="MISO" pad-key="pd2"/>
-                <signal name="SCK" pad-key="pd4"/>
+                <signal name="SCLK" pad-key="pd4"/>
             </signals>
         </physical-interface>
         <physical-interface value="hvpp"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90PWM2B.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90PWM2B.xml
index 9c5aaaec..52f5db56 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90PWM2B.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90PWM2B.xml
@@ -196,7 +196,7 @@
                 <signal name="RESET" pad-key="pe0"/>
                 <signal name="MOSI" pad-key="pd3"/>
                 <signal name="MISO" pad-key="pd2"/>
-                <signal name="SCK" pad-key="pd4"/>
+                <signal name="SCLK" pad-key="pd4"/>
             </signals>
         </physical-interface>
         <physical-interface value="hvpp"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90PWM316.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90PWM316.xml
index b251512c..42c49ea8 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90PWM316.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90PWM316.xml
@@ -196,7 +196,7 @@
                 <signal name="RESET" pad-key="pe0"/>
                 <signal name="MOSI" pad-key="pd3"/>
                 <signal name="MISO" pad-key="pd2"/>
-                <signal name="SCK" pad-key="pd4"/>
+                <signal name="SCLK" pad-key="pd4"/>
             </signals>
         </physical-interface>
         <physical-interface value="hvpp"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90PWM3B.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90PWM3B.xml
index 6b769dda..30100741 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90PWM3B.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90PWM3B.xml
@@ -196,7 +196,7 @@
                 <signal name="RESET" pad-key="pe0"/>
                 <signal name="MOSI" pad-key="pd3"/>
                 <signal name="MISO" pad-key="pd2"/>
-                <signal name="SCK" pad-key="pd4"/>
+                <signal name="SCLK" pad-key="pd4"/>
             </signals>
         </physical-interface>
         <physical-interface value="hvpp"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90PWM81.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90PWM81.xml
index 0c183071..968519a0 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90PWM81.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90PWM81.xml
@@ -196,7 +196,7 @@
                 <signal name="RESET" pad-key="pe0"/>
                 <signal name="MOSI" pad-key="pb4"/>
                 <signal name="MISO" pad-key="pb6"/>
-                <signal name="SCK" pad-key="pb5"/>
+                <signal name="SCLK" pad-key="pb5"/>
             </signals>
         </physical-interface>
         <physical-interface value="hvpp"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90USB162.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90USB162.xml
index c77a69a9..9fdf29af 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90USB162.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90USB162.xml
@@ -196,7 +196,7 @@
                 <signal name="RESET" pad-key="pc1"/>
                 <signal name="MOSI" pad-key="pb2"/>
                 <signal name="MISO" pad-key="pb3"/>
-                <signal name="SCK" pad-key="pb1"/>
+                <signal name="SCLK" pad-key="pb1"/>
             </signals>
         </physical-interface>
         <physical-interface value="hvpp"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90USB82.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90USB82.xml
index a68e56b2..8108a9fb 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90USB82.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/AT90USB82.xml
@@ -196,7 +196,7 @@
                 <signal name="RESET" pad-key="pc1"/>
                 <signal name="MOSI" pad-key="pb2"/>
                 <signal name="MISO" pad-key="pb3"/>
-                <signal name="SCK" pad-key="pb1"/>
+                <signal name="SCLK" pad-key="pb1"/>
             </signals>
         </physical-interface>
         <physical-interface value="hvpp"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA1284RFR2.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA1284RFR2.xml
index 8f8e57bf..9b7c855a 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA1284RFR2.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA1284RFR2.xml
@@ -192,7 +192,7 @@
         <physical-interface value="isp">
             <signals>
                 <signal name="RESET" pad-key="rstn"/>
-                <signal name="SCK" pad-key="pb1"/>
+                <signal name="SCLK" pad-key="pb1"/>
                 <signal name="MOSI" pad-key="pb2"/>
                 <signal name="MISO" pad-key="pb3"/>
             </signals>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA128RFA1.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA128RFA1.xml
index e0b8056b..f317c36f 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA128RFA1.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA128RFA1.xml
@@ -189,7 +189,7 @@
         <physical-interface value="isp">
             <signals>
                 <signal name="RESET" pad-key="rstn"/>
-                <signal name="SCK" pad-key="pb1"/>
+                <signal name="SCLK" pad-key="pb1"/>
                 <signal name="MOSI" pad-key="pb2"/>
                 <signal name="MISO" pad-key="pb3"/>
             </signals>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA128RFR2.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA128RFR2.xml
index 2c75b3aa..27d69e5b 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA128RFR2.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA128RFR2.xml
@@ -192,7 +192,7 @@
         <physical-interface value="isp">
             <signals>
                 <signal name="RESET" pad-key="rstn"/>
-                <signal name="SCK" pad-key="pb1"/>
+                <signal name="SCLK" pad-key="pb1"/>
                 <signal name="MOSI" pad-key="pb2"/>
                 <signal name="MISO" pad-key="pb3"/>
             </signals>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA162.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA162.xml
index d6f77040..9a692763 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA162.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA162.xml
@@ -216,7 +216,7 @@
         <physical-interface value="isp">
             <signals>
                 <signal name="RESET" pad-key="reset"/>
-                <signal name="SCK" pad-key="pb7"/>
+                <signal name="SCLK" pad-key="pb7"/>
                 <signal name="MOSI" pad-key="pb5"/>
                 <signal name="MISO" pad-key="pb6"/>
             </signals>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA165A.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA165A.xml
index e6cb5571..ebec3667 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA165A.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA165A.xml
@@ -189,7 +189,7 @@
         <physical-interface value="isp">
             <signals>
                 <signal name="RESET" pad-key="pg5"/>
-                <signal name="SCK" pad-key="pb1"/>
+                <signal name="SCLK" pad-key="pb1"/>
                 <signal name="MOSI" pad-key="pb2"/>
                 <signal name="MISO" pad-key="pb3"/>
             </signals>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA165P.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA165P.xml
index 3b3c3e4d..137f38ac 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA165P.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA165P.xml
@@ -189,7 +189,7 @@
         <physical-interface value="isp">
             <signals>
                 <signal name="RESET" pad-key="pg5"/>
-                <signal name="SCK" pad-key="pb1"/>
+                <signal name="SCLK" pad-key="pb1"/>
                 <signal name="MOSI" pad-key="pb2"/>
                 <signal name="MISO" pad-key="pb3"/>
             </signals>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA165PA.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA165PA.xml
index f27b2476..f345809f 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA165PA.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA165PA.xml
@@ -189,7 +189,7 @@
         <physical-interface value="isp">
             <signals>
                 <signal name="RESET" pad-key="pg5"/>
-                <signal name="SCK" pad-key="pb1"/>
+                <signal name="SCLK" pad-key="pb1"/>
                 <signal name="MOSI" pad-key="pb2"/>
                 <signal name="MISO" pad-key="pb3"/>
             </signals>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA168.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA168.xml
index 109c36dc..278f8f1c 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA168.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA168.xml
@@ -222,7 +222,7 @@
                 <signal name="RESET" pad-key="pc6"/>
                 <signal name="MOSI" pad-key="pb3"/>
                 <signal name="MISO" pad-key="pb4"/>
-                <signal name="SCK" pad-key="pb5"/>
+                <signal name="SCLK" pad-key="pb5"/>
             </signals>
         </physical-interface>
         <physical-interface value="hvpp"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA168A.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA168A.xml
index ef6824ac..fd0da70a 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA168A.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA168A.xml
@@ -222,7 +222,7 @@
                 <signal name="RESET" pad-key="pc6"/>
                 <signal name="MOSI" pad-key="pb3"/>
                 <signal name="MISO" pad-key="pb4"/>
-                <signal name="SCK" pad-key="pb5"/>
+                <signal name="SCLK" pad-key="pb5"/>
             </signals>
         </physical-interface>
         <physical-interface value="hvpp"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA168P.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA168P.xml
index 68c4bf91..b56e6e57 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA168P.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA168P.xml
@@ -222,7 +222,7 @@
                 <signal name="RESET" pad-key="pc6"/>
                 <signal name="MOSI" pad-key="pb3"/>
                 <signal name="MISO" pad-key="pb4"/>
-                <signal name="SCK" pad-key="pb5"/>
+                <signal name="SCLK" pad-key="pb5"/>
             </signals>
         </physical-interface>
         <physical-interface value="hvpp"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA168PA.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA168PA.xml
index 73556009..c2b41ea9 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA168PA.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA168PA.xml
@@ -222,7 +222,7 @@
                 <signal name="RESET" pad-key="pc6"/>
                 <signal name="MOSI" pad-key="pb3"/>
                 <signal name="MISO" pad-key="pb4"/>
-                <signal name="SCK" pad-key="pb5"/>
+                <signal name="SCLK" pad-key="pb5"/>
             </signals>
         </physical-interface>
         <physical-interface value="hvpp"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA168PB.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA168PB.xml
index 42e4181d..c43318d7 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA168PB.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA168PB.xml
@@ -222,7 +222,7 @@
                 <signal name="RESET" pad-key="pc6"/>
                 <signal name="MOSI" pad-key="pb3"/>
                 <signal name="MISO" pad-key="pb4"/>
-                <signal name="SCK" pad-key="pb5"/>
+                <signal name="SCLK" pad-key="pb5"/>
             </signals>
         </physical-interface>
         <physical-interface value="hvpp"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA16M1.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA16M1.xml
index c20e4403..d0aefb6b 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA16M1.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA16M1.xml
@@ -196,7 +196,7 @@
                 <signal name="RESET" pad-key="pe0"/>
                 <signal name="MOSI" pad-key="pd3"/>
                 <signal name="MISO" pad-key="pd2"/>
-                <signal name="SCK" pad-key="pd4"/>
+                <signal name="SCLK" pad-key="pd4"/>
             </signals>
         </physical-interface>
         <physical-interface value="hvpp"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA16U2.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA16U2.xml
index 090f8a18..1acda473 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA16U2.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA16U2.xml
@@ -196,7 +196,7 @@
                 <signal name="RESET" pad-key="pc1"/>
                 <signal name="MOSI" pad-key="pb2"/>
                 <signal name="MISO" pad-key="pb3"/>
-                <signal name="SCK" pad-key="pb1"/>
+                <signal name="SCLK" pad-key="pb1"/>
             </signals>
         </physical-interface>
         <physical-interface value="hvpp"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA2564RFR2.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA2564RFR2.xml
index fb909a61..8c914c50 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA2564RFR2.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA2564RFR2.xml
@@ -192,7 +192,7 @@
         <physical-interface value="isp">
             <signals>
                 <signal name="RESET" pad-key="rstn"/>
-                <signal name="SCK" pad-key="pb1"/>
+                <signal name="SCLK" pad-key="pb1"/>
                 <signal name="MOSI" pad-key="pb2"/>
                 <signal name="MISO" pad-key="pb3"/>
             </signals>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA256RFR2.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA256RFR2.xml
index 4e60b177..e7ff8c81 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA256RFR2.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA256RFR2.xml
@@ -192,7 +192,7 @@
         <physical-interface value="isp">
             <signals>
                 <signal name="RESET" pad-key="rstn"/>
-                <signal name="SCK" pad-key="pb1"/>
+                <signal name="SCLK" pad-key="pb1"/>
                 <signal name="MOSI" pad-key="pb2"/>
                 <signal name="MISO" pad-key="pb3"/>
             </signals>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA325.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA325.xml
index b99d3bb4..83a619cd 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA325.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA325.xml
@@ -189,7 +189,7 @@
         <physical-interface value="isp">
             <signals>
                 <signal name="RESET" pad-key="pg5"/>
-                <signal name="SCK" pad-key="pb1"/>
+                <signal name="SCLK" pad-key="pb1"/>
                 <signal name="MOSI" pad-key="pb2"/>
                 <signal name="MISO" pad-key="pb3"/>
             </signals>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA3250.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA3250.xml
index f199fffd..9f02919a 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA3250.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA3250.xml
@@ -189,7 +189,7 @@
         <physical-interface value="isp">
             <signals>
                 <signal name="RESET" pad-key="pg5"/>
-                <signal name="SCK" pad-key="pb1"/>
+                <signal name="SCLK" pad-key="pb1"/>
                 <signal name="MOSI" pad-key="pb2"/>
                 <signal name="MISO" pad-key="pb3"/>
             </signals>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA3250A.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA3250A.xml
index 230719c1..51c16b7b 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA3250A.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA3250A.xml
@@ -189,7 +189,7 @@
         <physical-interface value="isp">
             <signals>
                 <signal name="RESET" pad-key="pg5"/>
-                <signal name="SCK" pad-key="pb1"/>
+                <signal name="SCLK" pad-key="pb1"/>
                 <signal name="MOSI" pad-key="pb2"/>
                 <signal name="MISO" pad-key="pb3"/>
             </signals>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA3250P.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA3250P.xml
index f9d15f19..296f3af8 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA3250P.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA3250P.xml
@@ -189,7 +189,7 @@
         <physical-interface value="isp">
             <signals>
                 <signal name="RESET" pad-key="pg5"/>
-                <signal name="SCK" pad-key="pb1"/>
+                <signal name="SCLK" pad-key="pb1"/>
                 <signal name="MOSI" pad-key="pb2"/>
                 <signal name="MISO" pad-key="pb3"/>
             </signals>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA3250PA.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA3250PA.xml
index bd1d1174..3cfbaff7 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA3250PA.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA3250PA.xml
@@ -189,7 +189,7 @@
         <physical-interface value="isp">
             <signals>
                 <signal name="RESET" pad-key="pg5"/>
-                <signal name="SCK" pad-key="pb1"/>
+                <signal name="SCLK" pad-key="pb1"/>
                 <signal name="MOSI" pad-key="pb2"/>
                 <signal name="MISO" pad-key="pb3"/>
             </signals>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA325A.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA325A.xml
index 79e3c3da..0ae81a0f 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA325A.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA325A.xml
@@ -189,7 +189,7 @@
         <physical-interface value="isp">
             <signals>
                 <signal name="RESET" pad-key="pg5"/>
-                <signal name="SCK" pad-key="pb1"/>
+                <signal name="SCLK" pad-key="pb1"/>
                 <signal name="MOSI" pad-key="pb2"/>
                 <signal name="MISO" pad-key="pb3"/>
             </signals>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA325P.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA325P.xml
index d89b4cbd..ad1177f4 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA325P.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA325P.xml
@@ -189,7 +189,7 @@
         <physical-interface value="isp">
             <signals>
                 <signal name="RESET" pad-key="pg5"/>
-                <signal name="SCK" pad-key="pb1"/>
+                <signal name="SCLK" pad-key="pb1"/>
                 <signal name="MOSI" pad-key="pb2"/>
                 <signal name="MISO" pad-key="pb3"/>
             </signals>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA325PA.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA325PA.xml
index ef720060..1d775125 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA325PA.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA325PA.xml
@@ -189,7 +189,7 @@
         <physical-interface value="isp">
             <signals>
                 <signal name="RESET" pad-key="pg5"/>
-                <signal name="SCK" pad-key="pb1"/>
+                <signal name="SCLK" pad-key="pb1"/>
                 <signal name="MOSI" pad-key="pb2"/>
                 <signal name="MISO" pad-key="pb3"/>
             </signals>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA328.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA328.xml
index 81aa3168..7704ef61 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA328.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA328.xml
@@ -222,7 +222,7 @@
                 <signal name="RESET" pad-key="pc6"/>
                 <signal name="MOSI" pad-key="pb3"/>
                 <signal name="MISO" pad-key="pb4"/>
-                <signal name="SCK" pad-key="pb5"/>
+                <signal name="SCLK" pad-key="pb5"/>
             </signals>
         </physical-interface>
         <physical-interface value="hvpp"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA328P.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA328P.xml
index 3762fdfc..976aa0cc 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA328P.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA328P.xml
@@ -222,7 +222,7 @@
                 <signal name="RESET" pad-key="pc6"/>
                 <signal name="MOSI" pad-key="pb3"/>
                 <signal name="MISO" pad-key="pb4"/>
-                <signal name="SCK" pad-key="pb5"/>
+                <signal name="SCLK" pad-key="pb5"/>
             </signals>
         </physical-interface>
         <physical-interface value="hvpp"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA328PB.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA328PB.xml
index bd6d9756..8660e5a0 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA328PB.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA328PB.xml
@@ -219,7 +219,7 @@
                 <signal name="RESET" pad-key="pc6"/>
                 <signal name="MOSI" pad-key="pb3"/>
                 <signal name="MISO" pad-key="pb4"/>
-                <signal name="SCK" pad-key="pb5"/>
+                <signal name="SCLK" pad-key="pb5"/>
             </signals>
         </physical-interface>
         <physical-interface value="hvpp"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA329.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA329.xml
index 63ba59b7..fada3aca 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA329.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA329.xml
@@ -189,7 +189,7 @@
         <physical-interface value="isp">
             <signals>
                 <signal name="RESET" pad-key="pg5"/>
-                <signal name="SCK" pad-key="pb1"/>
+                <signal name="SCLK" pad-key="pb1"/>
                 <signal name="MOSI" pad-key="pb2"/>
                 <signal name="MISO" pad-key="pb3"/>
             </signals>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA3290.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA3290.xml
index bd4da539..3dcf3e45 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA3290.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA3290.xml
@@ -189,7 +189,7 @@
         <physical-interface value="isp">
             <signals>
                 <signal name="RESET" pad-key="pg5"/>
-                <signal name="SCK" pad-key="pb1"/>
+                <signal name="SCLK" pad-key="pb1"/>
                 <signal name="MOSI" pad-key="pb2"/>
                 <signal name="MISO" pad-key="pb3"/>
             </signals>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA3290A.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA3290A.xml
index 229ac5b8..361ff171 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA3290A.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA3290A.xml
@@ -189,7 +189,7 @@
         <physical-interface value="isp">
             <signals>
                 <signal name="RESET" pad-key="pg5"/>
-                <signal name="SCK" pad-key="pb1"/>
+                <signal name="SCLK" pad-key="pb1"/>
                 <signal name="MOSI" pad-key="pb2"/>
                 <signal name="MISO" pad-key="pb3"/>
             </signals>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA3290P.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA3290P.xml
index 10498bb6..8f319d8d 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA3290P.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA3290P.xml
@@ -189,7 +189,7 @@
         <physical-interface value="isp">
             <signals>
                 <signal name="RESET" pad-key="pg5"/>
-                <signal name="SCK" pad-key="pb1"/>
+                <signal name="SCLK" pad-key="pb1"/>
                 <signal name="MOSI" pad-key="pb2"/>
                 <signal name="MISO" pad-key="pb3"/>
             </signals>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA3290PA.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA3290PA.xml
index 8b488ff8..320d7398 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA3290PA.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA3290PA.xml
@@ -189,7 +189,7 @@
         <physical-interface value="isp">
             <signals>
                 <signal name="RESET" pad-key="pg5"/>
-                <signal name="SCK" pad-key="pb1"/>
+                <signal name="SCLK" pad-key="pb1"/>
                 <signal name="MOSI" pad-key="pb2"/>
                 <signal name="MISO" pad-key="pb3"/>
             </signals>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA32A.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA32A.xml
index a5f744ef..2ba0af4e 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA32A.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA32A.xml
@@ -215,7 +215,7 @@
         <physical-interface value="isp">
             <signals>
                 <signal name="RESET" pad-key="reset"/>
-                <signal name="SCK" pad-key="pb7"/>
+                <signal name="SCLK" pad-key="pb7"/>
                 <signal name="MOSI" pad-key="pb5"/>
                 <signal name="MISO" pad-key="pb6"/>
             </signals>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA32C1.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA32C1.xml
index 856c2422..d8d087a7 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA32C1.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA32C1.xml
@@ -196,7 +196,7 @@
                 <signal name="RESET" pad-key="pe0"/>
                 <signal name="MOSI" pad-key="pd3"/>
                 <signal name="MISO" pad-key="pd2"/>
-                <signal name="SCK" pad-key="pd4"/>
+                <signal name="SCLK" pad-key="pd4"/>
             </signals>
         </physical-interface>
         <physical-interface value="hvpp"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA32M1.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA32M1.xml
index 4423c0ae..cfa44369 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA32M1.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA32M1.xml
@@ -196,7 +196,7 @@
                 <signal name="RESET" pad-key="pe0"/>
                 <signal name="MOSI" pad-key="pd3"/>
                 <signal name="MISO" pad-key="pd2"/>
-                <signal name="SCK" pad-key="pd4"/>
+                <signal name="SCLK" pad-key="pd4"/>
             </signals>
         </physical-interface>
         <physical-interface value="hvpp"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA32U2.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA32U2.xml
index 21996866..bf2bdf90 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA32U2.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA32U2.xml
@@ -196,7 +196,7 @@
                 <signal name="RESET" pad-key="pc1"/>
                 <signal name="MOSI" pad-key="pb2"/>
                 <signal name="MISO" pad-key="pb3"/>
-                <signal name="SCK" pad-key="pb1"/>
+                <signal name="SCLK" pad-key="pb1"/>
             </signals>
         </physical-interface>
         <physical-interface value="hvpp"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA48.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA48.xml
index a2731402..5bde06d4 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA48.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA48.xml
@@ -200,7 +200,7 @@
                 <signal name="RESET" pad-key="pc6"/>
                 <signal name="MOSI" pad-key="pb3"/>
                 <signal name="MISO" pad-key="pb4"/>
-                <signal name="SCK" pad-key="pb5"/>
+                <signal name="SCLK" pad-key="pb5"/>
             </signals>
         </physical-interface>
         <physical-interface value="hvpp"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA48A.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA48A.xml
index ab8aa004..0ab3d9f3 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA48A.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA48A.xml
@@ -200,7 +200,7 @@
                 <signal name="RESET" pad-key="pc6"/>
                 <signal name="MOSI" pad-key="pb3"/>
                 <signal name="MISO" pad-key="pb4"/>
-                <signal name="SCK" pad-key="pb5"/>
+                <signal name="SCLK" pad-key="pb5"/>
             </signals>
         </physical-interface>
         <physical-interface value="hvpp"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA48P.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA48P.xml
index ec837bba..51986d7c 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA48P.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA48P.xml
@@ -200,7 +200,7 @@
                 <signal name="RESET" pad-key="pc6"/>
                 <signal name="MOSI" pad-key="pb3"/>
                 <signal name="MISO" pad-key="pb4"/>
-                <signal name="SCK" pad-key="pb5"/>
+                <signal name="SCLK" pad-key="pb5"/>
             </signals>
         </physical-interface>
         <physical-interface value="hvpp"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA48PA.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA48PA.xml
index 73ddbbdb..9aa61781 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA48PA.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA48PA.xml
@@ -200,7 +200,7 @@
                 <signal name="RESET" pad-key="pc6"/>
                 <signal name="MOSI" pad-key="pb3"/>
                 <signal name="MISO" pad-key="pb4"/>
-                <signal name="SCK" pad-key="pb5"/>
+                <signal name="SCLK" pad-key="pb5"/>
             </signals>
         </physical-interface>
         <physical-interface value="hvpp"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA48PB.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA48PB.xml
index 23267ed8..6c82c881 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA48PB.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA48PB.xml
@@ -200,7 +200,7 @@
                 <signal name="RESET" pad-key="pc6"/>
                 <signal name="MOSI" pad-key="pb3"/>
                 <signal name="MISO" pad-key="pb4"/>
-                <signal name="SCK" pad-key="pb5"/>
+                <signal name="SCLK" pad-key="pb5"/>
             </signals>
         </physical-interface>
         <physical-interface value="hvpp"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA644RFR2.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA644RFR2.xml
index a47fbdcd..22252b8a 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA644RFR2.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA644RFR2.xml
@@ -192,7 +192,7 @@
         <physical-interface value="isp">
             <signals>
                 <signal name="RESET" pad-key="rstn"/>
-                <signal name="SCK" pad-key="pb1"/>
+                <signal name="SCLK" pad-key="pb1"/>
                 <signal name="MOSI" pad-key="pb2"/>
                 <signal name="MISO" pad-key="pb3"/>
             </signals>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA645.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA645.xml
index e727916b..939a0882 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA645.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA645.xml
@@ -189,7 +189,7 @@
         <physical-interface value="isp">
             <signals>
                 <signal name="RESET" pad-key="pg5"/>
-                <signal name="SCK" pad-key="pb1"/>
+                <signal name="SCLK" pad-key="pb1"/>
                 <signal name="MOSI" pad-key="pb2"/>
                 <signal name="MISO" pad-key="pb3"/>
             </signals>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA6450.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA6450.xml
index 4416f5c8..8af26dcf 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA6450.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA6450.xml
@@ -189,7 +189,7 @@
         <physical-interface value="isp">
             <signals>
                 <signal name="RESET" pad-key="pg5"/>
-                <signal name="SCK" pad-key="pb1"/>
+                <signal name="SCLK" pad-key="pb1"/>
                 <signal name="MOSI" pad-key="pb2"/>
                 <signal name="MISO" pad-key="pb3"/>
             </signals>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA6450A.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA6450A.xml
index c5578a1f..014b24df 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA6450A.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA6450A.xml
@@ -189,7 +189,7 @@
         <physical-interface value="isp">
             <signals>
                 <signal name="RESET" pad-key="pg5"/>
-                <signal name="SCK" pad-key="pb1"/>
+                <signal name="SCLK" pad-key="pb1"/>
                 <signal name="MOSI" pad-key="pb2"/>
                 <signal name="MISO" pad-key="pb3"/>
             </signals>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA6450P.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA6450P.xml
index 0acef758..80c06f0b 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA6450P.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA6450P.xml
@@ -189,7 +189,7 @@
         <physical-interface value="isp">
             <signals>
                 <signal name="RESET" pad-key="pg5"/>
-                <signal name="SCK" pad-key="pb1"/>
+                <signal name="SCLK" pad-key="pb1"/>
                 <signal name="MOSI" pad-key="pb2"/>
                 <signal name="MISO" pad-key="pb3"/>
             </signals>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA645A.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA645A.xml
index f1111c38..a44a8eac 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA645A.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA645A.xml
@@ -189,7 +189,7 @@
         <physical-interface value="isp">
             <signals>
                 <signal name="RESET" pad-key="pg5"/>
-                <signal name="SCK" pad-key="pb1"/>
+                <signal name="SCLK" pad-key="pb1"/>
                 <signal name="MOSI" pad-key="pb2"/>
                 <signal name="MISO" pad-key="pb3"/>
             </signals>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA645P.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA645P.xml
index 898a4447..fbb8f843 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA645P.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA645P.xml
@@ -189,7 +189,7 @@
         <physical-interface value="isp">
             <signals>
                 <signal name="RESET" pad-key="pg5"/>
-                <signal name="SCK" pad-key="pb1"/>
+                <signal name="SCLK" pad-key="pb1"/>
                 <signal name="MOSI" pad-key="pb2"/>
                 <signal name="MISO" pad-key="pb3"/>
             </signals>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA649.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA649.xml
index c391851b..6abf04c4 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA649.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA649.xml
@@ -189,7 +189,7 @@
         <physical-interface value="isp">
             <signals>
                 <signal name="RESET" pad-key="pg5"/>
-                <signal name="SCK" pad-key="pb1"/>
+                <signal name="SCLK" pad-key="pb1"/>
                 <signal name="MOSI" pad-key="pb2"/>
                 <signal name="MISO" pad-key="pb3"/>
             </signals>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA6490.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA6490.xml
index d5c74da0..a3a6c1b2 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA6490.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA6490.xml
@@ -189,7 +189,7 @@
         <physical-interface value="isp">
             <signals>
                 <signal name="RESET" pad-key="pg5"/>
-                <signal name="SCK" pad-key="pb1"/>
+                <signal name="SCLK" pad-key="pb1"/>
                 <signal name="MOSI" pad-key="pb2"/>
                 <signal name="MISO" pad-key="pb3"/>
             </signals>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA6490A.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA6490A.xml
index 2bc8fbb7..e6343e7f 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA6490A.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA6490A.xml
@@ -189,7 +189,7 @@
         <physical-interface value="isp">
             <signals>
                 <signal name="RESET" pad-key="pg5"/>
-                <signal name="SCK" pad-key="pb1"/>
+                <signal name="SCLK" pad-key="pb1"/>
                 <signal name="MOSI" pad-key="pb2"/>
                 <signal name="MISO" pad-key="pb3"/>
             </signals>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA6490P.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA6490P.xml
index a7428ad6..46b23934 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA6490P.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA6490P.xml
@@ -189,7 +189,7 @@
         <physical-interface value="isp">
             <signals>
                 <signal name="RESET" pad-key="pg5"/>
-                <signal name="SCK" pad-key="pb1"/>
+                <signal name="SCLK" pad-key="pb1"/>
                 <signal name="MOSI" pad-key="pb2"/>
                 <signal name="MISO" pad-key="pb3"/>
             </signals>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA64C1.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA64C1.xml
index 79edf148..579ee371 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA64C1.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA64C1.xml
@@ -196,7 +196,7 @@
                 <signal name="RESET" pad-key="pe0"/>
                 <signal name="MOSI" pad-key="pd3"/>
                 <signal name="MISO" pad-key="pd2"/>
-                <signal name="SCK" pad-key="pd4"/>
+                <signal name="SCLK" pad-key="pd4"/>
             </signals>
         </physical-interface>
         <physical-interface value="hvpp"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA64M1.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA64M1.xml
index 501d5711..cedd3ba6 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA64M1.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA64M1.xml
@@ -196,7 +196,7 @@
                 <signal name="RESET" pad-key="pe0"/>
                 <signal name="MOSI" pad-key="pd3"/>
                 <signal name="MISO" pad-key="pd2"/>
-                <signal name="SCK" pad-key="pd4"/>
+                <signal name="SCLK" pad-key="pd4"/>
             </signals>
         </physical-interface>
         <physical-interface value="hvpp"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA64RFR2.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA64RFR2.xml
index e82ddd9f..dce66bc1 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA64RFR2.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA64RFR2.xml
@@ -192,7 +192,7 @@
         <physical-interface value="isp">
             <signals>
                 <signal name="RESET" pad-key="rstn"/>
-                <signal name="SCK" pad-key="pb1"/>
+                <signal name="SCLK" pad-key="pb1"/>
                 <signal name="MOSI" pad-key="pb2"/>
                 <signal name="MISO" pad-key="pb3"/>
             </signals>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA88.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA88.xml
index 3053909f..d4b35587 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA88.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA88.xml
@@ -222,7 +222,7 @@
                 <signal name="RESET" pad-key="pc6"/>
                 <signal name="MOSI" pad-key="pb3"/>
                 <signal name="MISO" pad-key="pb4"/>
-                <signal name="SCK" pad-key="pb5"/>
+                <signal name="SCLK" pad-key="pb5"/>
             </signals>
         </physical-interface>
         <physical-interface value="hvpp"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA88A.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA88A.xml
index 7aa50fe3..cd300a26 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA88A.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA88A.xml
@@ -222,7 +222,7 @@
                 <signal name="RESET" pad-key="pc6"/>
                 <signal name="MOSI" pad-key="pb3"/>
                 <signal name="MISO" pad-key="pb4"/>
-                <signal name="SCK" pad-key="pb5"/>
+                <signal name="SCLK" pad-key="pb5"/>
             </signals>
         </physical-interface>
         <physical-interface value="hvpp"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA88P.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA88P.xml
index 282f4d71..81442284 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA88P.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA88P.xml
@@ -222,7 +222,7 @@
                 <signal name="RESET" pad-key="pc6"/>
                 <signal name="MOSI" pad-key="pb3"/>
                 <signal name="MISO" pad-key="pb4"/>
-                <signal name="SCK" pad-key="pb5"/>
+                <signal name="SCLK" pad-key="pb5"/>
             </signals>
         </physical-interface>
         <physical-interface value="hvpp"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA88PA.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA88PA.xml
index 178167eb..92c946eb 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA88PA.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA88PA.xml
@@ -222,7 +222,7 @@
                 <signal name="RESET" pad-key="pc6"/>
                 <signal name="MOSI" pad-key="pb3"/>
                 <signal name="MISO" pad-key="pb4"/>
-                <signal name="SCK" pad-key="pb5"/>
+                <signal name="SCLK" pad-key="pb5"/>
             </signals>
         </physical-interface>
         <physical-interface value="hvpp"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA88PB.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA88PB.xml
index 53ab2136..a73e4a02 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA88PB.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA88PB.xml
@@ -222,7 +222,7 @@
                 <signal name="RESET" pad-key="pc6"/>
                 <signal name="MOSI" pad-key="pb3"/>
                 <signal name="MISO" pad-key="pb4"/>
-                <signal name="SCK" pad-key="pb5"/>
+                <signal name="SCLK" pad-key="pb5"/>
             </signals>
         </physical-interface>
         <physical-interface value="hvpp"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA8U2.xml b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA8U2.xml
index b2fc6352..cb8a6111 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA8U2.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/MEGA/ATMEGA8U2.xml
@@ -196,7 +196,7 @@
                 <signal name="RESET" pad-key="pc1"/>
                 <signal name="MOSI" pad-key="pb2"/>
                 <signal name="MISO" pad-key="pb3"/>
-                <signal name="SCK" pad-key="pb1"/>
+                <signal name="SCLK" pad-key="pb1"/>
             </signals>
         </physical-interface>
         <physical-interface value="hvpp"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY13.xml b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY13.xml
index 630ebfea..b79a800a 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY13.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY13.xml
@@ -172,7 +172,7 @@
                 <signal name="RESET" pad-key="pb5"/>
                 <signal name="MOSI" pad-key="pb0"/>
                 <signal name="MISO" pad-key="pb1"/>
-                <signal name="SCK" pad-key="pb2"/>
+                <signal name="SCLK" pad-key="pb2"/>
             </signals>
         </physical-interface>
         <physical-interface value="hvsp"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY13A.xml b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY13A.xml
index 41dbad02..2345ef7b 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY13A.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY13A.xml
@@ -172,7 +172,7 @@
                 <signal name="RESET" pad-key="pb5"/>
                 <signal name="MOSI" pad-key="pb0"/>
                 <signal name="MISO" pad-key="pb1"/>
-                <signal name="SCK" pad-key="pb2"/>
+                <signal name="SCLK" pad-key="pb2"/>
             </signals>
         </physical-interface>
         <physical-interface value="hvsp"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY1634.xml b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY1634.xml
index 5d2c8a7c..29ff3721 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY1634.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY1634.xml
@@ -172,7 +172,7 @@
                 <signal name="RESET" pad-key="pc3"/>
                 <signal name="MOSI" pad-key="pb1"/>
                 <signal name="MISO" pad-key="pb2"/>
-                <signal name="SCK" pad-key="pc1"/>
+                <signal name="SCLK" pad-key="pc1"/>
             </signals>
         </physical-interface>
         <physical-interface value="hvpp"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY167.xml b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY167.xml
index 05d44d47..82b02c2a 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY167.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY167.xml
@@ -174,7 +174,7 @@
                 <signal name="RESET" pad-key="pb7"/>
                 <signal name="MOSI" pad-key="pa4"/>
                 <signal name="MISO" pad-key="pa2"/>
-                <signal name="SCK" pad-key="pa5"/>
+                <signal name="SCLK" pad-key="pa5"/>
             </signals>
         </physical-interface>
         <physical-interface value="hvpp"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY2313.xml b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY2313.xml
index 8ba370ce..ad762dce 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY2313.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY2313.xml
@@ -200,7 +200,7 @@
                 <signal name="RESET" pad-key="pa2"/>
                 <signal name="MOSI" pad-key="pb5"/>
                 <signal name="MISO" pad-key="pb6"/>
-                <signal name="SCK" pad-key="pb7"/>
+                <signal name="SCLK" pad-key="pb7"/>
             </signals>
         </physical-interface>
         <physical-interface value="hvpp"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY2313A.xml b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY2313A.xml
index bbe8706a..96b3e534 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY2313A.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY2313A.xml
@@ -200,7 +200,7 @@
                 <signal name="RESET" pad-key="pa2"/>
                 <signal name="MOSI" pad-key="pb5"/>
                 <signal name="MISO" pad-key="pb6"/>
-                <signal name="SCK" pad-key="pb7"/>
+                <signal name="SCLK" pad-key="pb7"/>
             </signals>
         </physical-interface>
         <physical-interface value="hvpp"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY24.xml b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY24.xml
index 60c46a5a..ac8ba0de 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY24.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY24.xml
@@ -172,7 +172,7 @@
                 <signal name="RESET" pad-key="pb3"/>
                 <signal name="MOSI" pad-key="pa6"/>
                 <signal name="MISO" pad-key="pa5"/>
-                <signal name="SCK" pad-key="pa4"/>
+                <signal name="SCLK" pad-key="pa4"/>
             </signals>
         </physical-interface>
         <physical-interface value="hvsp"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY24A.xml b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY24A.xml
index c68e17c7..13f9ad07 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY24A.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY24A.xml
@@ -172,7 +172,7 @@
                 <signal name="RESET" pad-key="pb3"/>
                 <signal name="MOSI" pad-key="pa6"/>
                 <signal name="MISO" pad-key="pa5"/>
-                <signal name="SCK" pad-key="pa4"/>
+                <signal name="SCLK" pad-key="pa4"/>
             </signals>
         </physical-interface>
         <physical-interface value="hvsp"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY25.xml b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY25.xml
index 9c74b7a7..0b534e81 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY25.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY25.xml
@@ -172,7 +172,7 @@
                 <signal name="RESET" pad-key="pb5"/>
                 <signal name="MOSI" pad-key="pb0"/>
                 <signal name="MISO" pad-key="pb1"/>
-                <signal name="SCK" pad-key="pb2"/>
+                <signal name="SCLK" pad-key="pb2"/>
             </signals>
         </physical-interface>
         <physical-interface value="hvsp"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY261.xml b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY261.xml
index c0af7c3d..0a601b57 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY261.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY261.xml
@@ -200,7 +200,7 @@
                 <signal name="RESET" pad-key="pb7"/>
                 <signal name="MOSI" pad-key="pb0"/>
                 <signal name="MISO" pad-key="pb1"/>
-                <signal name="SCK" pad-key="pb2"/>
+                <signal name="SCLK" pad-key="pb2"/>
             </signals>
         </physical-interface>
         <physical-interface value="hvpp"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY261A.xml b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY261A.xml
index 5e982f80..54ced54f 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY261A.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY261A.xml
@@ -200,7 +200,7 @@
                 <signal name="RESET" pad-key="pb7"/>
                 <signal name="MOSI" pad-key="pb0"/>
                 <signal name="MISO" pad-key="pb1"/>
-                <signal name="SCK" pad-key="pb2"/>
+                <signal name="SCLK" pad-key="pb2"/>
             </signals>
         </physical-interface>
         <physical-interface value="hvpp"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY4313.xml b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY4313.xml
index 031f7653..95e5c529 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY4313.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY4313.xml
@@ -200,7 +200,7 @@
                 <signal name="RESET" pad-key="pa2"/>
                 <signal name="MOSI" pad-key="pb5"/>
                 <signal name="MISO" pad-key="pb6"/>
-                <signal name="SCK" pad-key="pb7"/>
+                <signal name="SCLK" pad-key="pb7"/>
             </signals>
         </physical-interface>
         <physical-interface value="hvpp"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY43U.xml b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY43U.xml
index 9e4bb9ce..0133f11a 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY43U.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY43U.xml
@@ -174,7 +174,7 @@
                 <signal name="RESET" pad-key="pa7"/>
                 <signal name="MOSI" pad-key="pb4"/>
                 <signal name="MISO" pad-key="pb5"/>
-                <signal name="SCK" pad-key="pb6"/>
+                <signal name="SCLK" pad-key="pb6"/>
             </signals>
         </physical-interface>
         <physical-interface value="hvpp"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY44.xml b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY44.xml
index 4d112ce4..821382a5 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY44.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY44.xml
@@ -172,7 +172,7 @@
                 <signal name="RESET" pad-key="pb3"/>
                 <signal name="MOSI" pad-key="pa6"/>
                 <signal name="MISO" pad-key="pa5"/>
-                <signal name="SCK" pad-key="pa4"/>
+                <signal name="SCLK" pad-key="pa4"/>
             </signals>
         </physical-interface>
         <physical-interface value="hvsp"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY441.xml b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY441.xml
index 3778f7e1..b6f210dd 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY441.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY441.xml
@@ -173,7 +173,7 @@
                 <signal name="RESET" pad-key="pb3"/>
                 <signal name="MOSI" pad-key="pa6"/>
                 <signal name="MISO" pad-key="pa5"/>
-                <signal name="SCK" pad-key="pa4"/>
+                <signal name="SCLK" pad-key="pa4"/>
             </signals>
         </physical-interface>
         <physical-interface value="hvsp"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY44A.xml b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY44A.xml
index 5dfec33c..e1042d7e 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY44A.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY44A.xml
@@ -172,7 +172,7 @@
                 <signal name="RESET" pad-key="pb3"/>
                 <signal name="MOSI" pad-key="pa6"/>
                 <signal name="MISO" pad-key="pa5"/>
-                <signal name="SCK" pad-key="pa4"/>
+                <signal name="SCLK" pad-key="pa4"/>
             </signals>
         </physical-interface>
         <physical-interface value="hvsp"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY45.xml b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY45.xml
index 1ff8922d..2c362ab9 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY45.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY45.xml
@@ -172,7 +172,7 @@
                 <signal name="RESET" pad-key="pb5"/>
                 <signal name="MOSI" pad-key="pb0"/>
                 <signal name="MISO" pad-key="pb1"/>
-                <signal name="SCK" pad-key="pb2"/>
+                <signal name="SCLK" pad-key="pb2"/>
             </signals>
         </physical-interface>
         <physical-interface value="hvsp"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY461.xml b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY461.xml
index c7b2d3c5..58934d87 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY461.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY461.xml
@@ -200,7 +200,7 @@
                 <signal name="RESET" pad-key="pb7"/>
                 <signal name="MOSI" pad-key="pb0"/>
                 <signal name="MISO" pad-key="pb1"/>
-                <signal name="SCK" pad-key="pb2"/>
+                <signal name="SCLK" pad-key="pb2"/>
             </signals>
         </physical-interface>
         <physical-interface value="hvpp"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY461A.xml b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY461A.xml
index 2bf1fab4..ef80560c 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY461A.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY461A.xml
@@ -200,7 +200,7 @@
                 <signal name="RESET" pad-key="pb7"/>
                 <signal name="MOSI" pad-key="pb0"/>
                 <signal name="MISO" pad-key="pb1"/>
-                <signal name="SCK" pad-key="pb2"/>
+                <signal name="SCLK" pad-key="pb2"/>
             </signals>
         </physical-interface>
         <physical-interface value="hvpp"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY48.xml b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY48.xml
index 588df17c..71df0f56 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY48.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY48.xml
@@ -200,7 +200,7 @@
                 <signal name="RESET" pad-key="pc6"/>
                 <signal name="MOSI" pad-key="pb3"/>
                 <signal name="MISO" pad-key="pb4"/>
-                <signal name="SCK" pad-key="pb5"/>
+                <signal name="SCLK" pad-key="pb5"/>
             </signals>
         </physical-interface>
         <physical-interface value="hvpp"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY828.xml b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY828.xml
index 357d7497..89fdea71 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY828.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY828.xml
@@ -174,7 +174,7 @@
                 <signal name="RESET" pad-key="pd2"/>
                 <signal name="MOSI" pad-key="pd0"/>
                 <signal name="MISO" pad-key="pd1"/>
-                <signal name="SCK" pad-key="pd3"/>
+                <signal name="SCLK" pad-key="pd3"/>
             </signals>
         </physical-interface>
         <physical-interface value="hvpp"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY84.xml b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY84.xml
index ec676b51..71b48656 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY84.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY84.xml
@@ -172,7 +172,7 @@
                 <signal name="RESET" pad-key="pb3"/>
                 <signal name="MOSI" pad-key="pa6"/>
                 <signal name="MISO" pad-key="pa5"/>
-                <signal name="SCK" pad-key="pa4"/>
+                <signal name="SCLK" pad-key="pa4"/>
             </signals>
         </physical-interface>
         <physical-interface value="hvsp"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY841.xml b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY841.xml
index 9a36147f..b01b12b6 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY841.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY841.xml
@@ -173,7 +173,7 @@
                 <signal name="RESET" pad-key="pb3"/>
                 <signal name="MOSI" pad-key="pa6"/>
                 <signal name="MISO" pad-key="pa5"/>
-                <signal name="SCK" pad-key="pa4"/>
+                <signal name="SCLK" pad-key="pa4"/>
             </signals>
         </physical-interface>
         <physical-interface value="hvsp"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY84A.xml b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY84A.xml
index e33406a8..532bbcf5 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY84A.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY84A.xml
@@ -172,7 +172,7 @@
                 <signal name="RESET" pad-key="pb3"/>
                 <signal name="MOSI" pad-key="pa6"/>
                 <signal name="MISO" pad-key="pa5"/>
-                <signal name="SCK" pad-key="pa4"/>
+                <signal name="SCLK" pad-key="pa4"/>
             </signals>
         </physical-interface>
         <physical-interface value="hvsp"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY85.xml b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY85.xml
index ba338f19..ecc7251d 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY85.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY85.xml
@@ -172,7 +172,7 @@
                 <signal name="RESET" pad-key="pb5"/>
                 <signal name="MOSI" pad-key="pb0"/>
                 <signal name="MISO" pad-key="pb1"/>
-                <signal name="SCK" pad-key="pb2"/>
+                <signal name="SCLK" pad-key="pb2"/>
             </signals>
         </physical-interface>
         <physical-interface value="hvsp"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY861.xml b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY861.xml
index 4d86c435..7b9580dc 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY861.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY861.xml
@@ -200,7 +200,7 @@
                 <signal name="RESET" pad-key="pb7"/>
                 <signal name="MOSI" pad-key="pb0"/>
                 <signal name="MISO" pad-key="pb1"/>
-                <signal name="SCK" pad-key="pb2"/>
+                <signal name="SCLK" pad-key="pb2"/>
             </signals>
         </physical-interface>
         <physical-interface value="hvpp"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY861A.xml b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY861A.xml
index 0bce526a..154160e7 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY861A.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY861A.xml
@@ -200,7 +200,7 @@
                 <signal name="RESET" pad-key="pb7"/>
                 <signal name="MOSI" pad-key="pb0"/>
                 <signal name="MISO" pad-key="pb1"/>
-                <signal name="SCK" pad-key="pb2"/>
+                <signal name="SCLK" pad-key="pb2"/>
             </signals>
         </physical-interface>
         <physical-interface value="hvpp"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY87.xml b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY87.xml
index 97cc0a41..ca0773a6 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY87.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY87.xml
@@ -174,7 +174,7 @@
                 <signal name="RESET" pad-key="pb7"/>
                 <signal name="MOSI" pad-key="pa4"/>
                 <signal name="MISO" pad-key="pa2"/>
-                <signal name="SCK" pad-key="pa5"/>
+                <signal name="SCLK" pad-key="pa5"/>
             </signals>
         </physical-interface>
         <physical-interface value="hvpp"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY88.xml b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY88.xml
index dddf4795..d2e4b07d 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY88.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY88.xml
@@ -200,7 +200,7 @@
                 <signal name="RESET" pad-key="pc6"/>
                 <signal name="MOSI" pad-key="pb3"/>
                 <signal name="MISO" pad-key="pb4"/>
-                <signal name="SCK" pad-key="pb5"/>
+                <signal name="SCLK" pad-key="pb5"/>
             </signals>
         </physical-interface>
         <physical-interface value="hvpp"/>