diff --git a/build/scripts/TargetDescriptionFiles/TargetDescriptionFile.php b/build/scripts/TargetDescriptionFiles/TargetDescriptionFile.php
index 87f1b047..6caa14c0 100644
--- a/build/scripts/TargetDescriptionFiles/TargetDescriptionFile.php
+++ b/build/scripts/TargetDescriptionFiles/TargetDescriptionFile.php
@@ -388,6 +388,10 @@ class TargetDescriptionFile
             if (!empty($variantValidationFailures)) {
                 $failures[] = 'Variant validation failures: ' . implode(", ", $variantValidationFailures);
             }
+
+            if (empty($this->pinoutsMappedByName[strtolower($variant->pinout)])) {
+                $failures[] = 'Pinout ("' . $variant->pinout . '") for variant "' . $variant->name . '" not found.';
+            }
         }
 
         if (empty($this->pinoutsMappedByName)) {
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY261.xml b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY261.xml
index ca08e1bd..a060e4e8 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY261.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/TINY/ATTINY261.xml
@@ -999,7 +999,7 @@
             <pin pad="PA1" position="19"/>
             <pin pad="PA0" position="20"/>
         </pinout>
-        <pinout name="QFN32">
+        <pinout name="QFN_32">
             <pin position="1" pad="NC"/>
             <pin position="2" pad="PB3"/>
             <pin position="3" pad="NC"/>
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA128A1.xml b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA128A1.xml
index e27da1a9..7cf693a9 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA128A1.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA128A1.xml
@@ -3,7 +3,7 @@
     <variants>
         <variant ordercode="ATXMEGA128A1-AU" package="TQFP100" pinout="TQFP100" speedmax="32000000" tempmax="0"
                  tempmin="0" vccmax="3.6" vccmin="1.6"/>
-        <variant ordercode="ATXMEGA128A1-CU" package="CBGA100" pinout="CBGA100" speedmax="32000000" tempmax="0"
+        <variant ordercode="ATXMEGA128A1-CU" package="CBGA100" pinout="BGA100" speedmax="32000000" tempmax="0"
                  tempmin="0" vccmax="3.6" vccmin="1.6"/>
     </variants>
     <device name="ATxmega128A1" architecture="AVR8_XMEGA" family="AVR XMEGA">
diff --git a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA64A1.xml b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA64A1.xml
index 66ebbb07..61db179b 100644
--- a/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA64A1.xml
+++ b/src/Targets/TargetDescriptionFiles/AVR8/XMEGA/ATXMEGA64A1.xml
@@ -3,7 +3,7 @@
     <variants>
         <variant ordercode="ATXMEGA64A1-AU" package="TQFP100" pinout="TQFP100" speedmax="32000000" tempmax="0"
                  tempmin="0" vccmax="3.6" vccmin="1.6"/>
-        <variant ordercode="ATXMEGA64A1-CU" package="CBGA100" pinout="CBGA100" speedmax="32000000" tempmax="0"
+        <variant ordercode="ATXMEGA64A1-CU" package="CBGA100" pinout="BGA100" speedmax="32000000" tempmax="0"
                  tempmin="0" vccmax="3.6" vccmin="1.6"/>
     </variants>
     <device name="ATxmega64A1" architecture="AVR8_XMEGA" family="AVR XMEGA">