diff --git a/build/scripts/ConvertAtdfToTdf.php b/build/scripts/ConvertAtdfToTdf.php
index 7818825d..2c1a516a 100644
--- a/build/scripts/ConvertAtdfToTdf.php
+++ b/build/scripts/ConvertAtdfToTdf.php
@@ -1,7 +1,7 @@
 <?php
 
 use Targets\TargetDescriptionFiles\Services\Xml\AtdfService;
-use Targets\TargetDescriptionFiles\AVR8\Services\ValidationService;
+use Targets\TargetDescriptionFiles\Avr8\Services\ValidationService;
 use Targets\TargetDescriptionFiles\Services\Xml\XmlService;
 
 /*
@@ -32,7 +32,7 @@ if (empty(ATDF_PATH)) {
 require_once __DIR__ . '/Targets/TargetDescriptionFiles/Services/AtdfService.php';
 require_once __DIR__ . '/Targets/TargetDescriptionFiles/Services/Xml/XmlService.php';
 require_once __DIR__ . '/Targets/TargetDescriptionFiles/Services/ValidationService.php';
-require_once __DIR__ . '/Targets/TargetDescriptionFiles/AVR8/Services/ValidationService.php';
+require_once __DIR__ . '/Targets/TargetDescriptionFiles/Avr8/Services/ValidationService.php';
 
 $atdfService = new AtdfService();
 $avrValidationService = new ValidationService();
diff --git a/build/scripts/GenerateBriefTargetDescriptors.php b/build/scripts/GenerateBriefTargetDescriptors.php
index fa2fa25a..d461fd6b 100644
--- a/build/scripts/GenerateBriefTargetDescriptors.php
+++ b/build/scripts/GenerateBriefTargetDescriptors.php
@@ -36,7 +36,7 @@ require_once __DIR__ . '/Targets/TargetDescriptionFiles/Services/DiscoveryServic
 require_once __DIR__ . '/Targets/TargetDescriptionFiles/Services/Xml/XmlService.php';
 require_once __DIR__ . '/Targets/TargetDescriptionFiles/TargetFamily.php';
 
-require_once __DIR__ . '/Targets/TargetDescriptionFiles/AVR8/Avr8TargetDescriptionFile.php';
+require_once __DIR__ . '/Targets/TargetDescriptionFiles/Avr8/Avr8TargetDescriptionFile.php';
 
 $discoveryService = new DiscoveryService();
 $xmlService = new XmlService();
diff --git a/build/scripts/Targets/TargetDescriptionFiles/AVR8/Avr8TargetDescriptionFile.php b/build/scripts/Targets/TargetDescriptionFiles/Avr8/Avr8TargetDescriptionFile.php
similarity index 100%
rename from build/scripts/Targets/TargetDescriptionFiles/AVR8/Avr8TargetDescriptionFile.php
rename to build/scripts/Targets/TargetDescriptionFiles/Avr8/Avr8TargetDescriptionFile.php
diff --git a/build/scripts/Targets/TargetDescriptionFiles/AVR8/AvrFamily.php b/build/scripts/Targets/TargetDescriptionFiles/Avr8/AvrFamily.php
similarity index 100%
rename from build/scripts/Targets/TargetDescriptionFiles/AVR8/AvrFamily.php
rename to build/scripts/Targets/TargetDescriptionFiles/Avr8/AvrFamily.php
diff --git a/build/scripts/Targets/TargetDescriptionFiles/AVR8/AvrIsa.php b/build/scripts/Targets/TargetDescriptionFiles/Avr8/AvrIsa.php
similarity index 100%
rename from build/scripts/Targets/TargetDescriptionFiles/AVR8/AvrIsa.php
rename to build/scripts/Targets/TargetDescriptionFiles/Avr8/AvrIsa.php
diff --git a/build/scripts/Targets/TargetDescriptionFiles/AVR8/BootSection.php b/build/scripts/Targets/TargetDescriptionFiles/Avr8/BootSection.php
similarity index 100%
rename from build/scripts/Targets/TargetDescriptionFiles/AVR8/BootSection.php
rename to build/scripts/Targets/TargetDescriptionFiles/Avr8/BootSection.php
diff --git a/build/scripts/Targets/TargetDescriptionFiles/AVR8/DebugWireParameters.php b/build/scripts/Targets/TargetDescriptionFiles/Avr8/DebugWireParameters.php
similarity index 100%
rename from build/scripts/Targets/TargetDescriptionFiles/AVR8/DebugWireParameters.php
rename to build/scripts/Targets/TargetDescriptionFiles/Avr8/DebugWireParameters.php
diff --git a/build/scripts/Targets/TargetDescriptionFiles/AVR8/FuseBitsDescriptor.php b/build/scripts/Targets/TargetDescriptionFiles/Avr8/FuseBitsDescriptor.php
similarity index 100%
rename from build/scripts/Targets/TargetDescriptionFiles/AVR8/FuseBitsDescriptor.php
rename to build/scripts/Targets/TargetDescriptionFiles/Avr8/FuseBitsDescriptor.php
diff --git a/build/scripts/Targets/TargetDescriptionFiles/AVR8/IspParameters.php b/build/scripts/Targets/TargetDescriptionFiles/Avr8/IspParameters.php
similarity index 100%
rename from build/scripts/Targets/TargetDescriptionFiles/AVR8/IspParameters.php
rename to build/scripts/Targets/TargetDescriptionFiles/Avr8/IspParameters.php
diff --git a/build/scripts/Targets/TargetDescriptionFiles/AVR8/JtagParameters.php b/build/scripts/Targets/TargetDescriptionFiles/Avr8/JtagParameters.php
similarity index 100%
rename from build/scripts/Targets/TargetDescriptionFiles/AVR8/JtagParameters.php
rename to build/scripts/Targets/TargetDescriptionFiles/Avr8/JtagParameters.php
diff --git a/build/scripts/Targets/TargetDescriptionFiles/AVR8/PdiParameters.php b/build/scripts/Targets/TargetDescriptionFiles/Avr8/PdiParameters.php
similarity index 100%
rename from build/scripts/Targets/TargetDescriptionFiles/AVR8/PdiParameters.php
rename to build/scripts/Targets/TargetDescriptionFiles/Avr8/PdiParameters.php
diff --git a/build/scripts/Targets/TargetDescriptionFiles/AVR8/Services/ValidationService.php b/build/scripts/Targets/TargetDescriptionFiles/Avr8/Services/ValidationService.php
similarity index 99%
rename from build/scripts/Targets/TargetDescriptionFiles/AVR8/Services/ValidationService.php
rename to build/scripts/Targets/TargetDescriptionFiles/Avr8/Services/ValidationService.php
index 4e397fe9..67128762 100644
--- a/build/scripts/Targets/TargetDescriptionFiles/AVR8/Services/ValidationService.php
+++ b/build/scripts/Targets/TargetDescriptionFiles/Avr8/Services/ValidationService.php
@@ -1,5 +1,5 @@
 <?php
-namespace Targets\TargetDescriptionFiles\AVR8\Services;
+namespace Targets\TargetDescriptionFiles\Avr8\Services;
 
 use Targets\TargetDescriptionFiles\Avr8\Avr8TargetDescriptionFile;
 use Targets\TargetDescriptionFiles\Avr8\AvrFamily;
diff --git a/build/scripts/Targets/TargetDescriptionFiles/AVR8/Signature.php b/build/scripts/Targets/TargetDescriptionFiles/Avr8/Signature.php
similarity index 100%
rename from build/scripts/Targets/TargetDescriptionFiles/AVR8/Signature.php
rename to build/scripts/Targets/TargetDescriptionFiles/Avr8/Signature.php
diff --git a/build/scripts/Targets/TargetDescriptionFiles/AVR8/UpdiParameters.php b/build/scripts/Targets/TargetDescriptionFiles/Avr8/UpdiParameters.php
similarity index 100%
rename from build/scripts/Targets/TargetDescriptionFiles/AVR8/UpdiParameters.php
rename to build/scripts/Targets/TargetDescriptionFiles/Avr8/UpdiParameters.php
diff --git a/build/scripts/Targets/TargetDescriptionFiles/Services/AtdfService.php b/build/scripts/Targets/TargetDescriptionFiles/Services/AtdfService.php
index 9289a75a..5052accc 100644
--- a/build/scripts/Targets/TargetDescriptionFiles/Services/AtdfService.php
+++ b/build/scripts/Targets/TargetDescriptionFiles/Services/AtdfService.php
@@ -6,7 +6,7 @@ use DOMNode;
 use DOMElement;
 use DOMNodeList;
 use RuntimeException;
-use Targets\TargetDescriptionFiles\AVR8\Services\ValidationService;
+use Targets\TargetDescriptionFiles\Avr8\Services\ValidationService;
 use Targets\TargetDescriptionFiles\Pad;
 use Targets\TargetDescriptionFiles\Services\StringService;
 use Targets\TargetDescriptionFiles\Avr8\Avr8TargetDescriptionFile;
@@ -34,7 +34,7 @@ use Targets\TargetDescriptionFiles\Variant;
 use Targets\TargetPhysicalInterface;
 
 require_once __DIR__ . '/StringService.php';
-require_once __DIR__ . '/../AVR8/Avr8TargetDescriptionFile.php';
+require_once __DIR__ . '/../Avr8/Avr8TargetDescriptionFile.php';
 
 /**
  * This AtdfService provides ATDF -> TDF conversion.
diff --git a/build/scripts/Targets/TargetDescriptionFiles/Services/Xml/XmlService.php b/build/scripts/Targets/TargetDescriptionFiles/Services/Xml/XmlService.php
index b213ece5..87796d6f 100644
--- a/build/scripts/Targets/TargetDescriptionFiles/Services/Xml/XmlService.php
+++ b/build/scripts/Targets/TargetDescriptionFiles/Services/Xml/XmlService.php
@@ -11,7 +11,7 @@ use Targets\TargetDescriptionFiles\TargetFamily;
 require_once __DIR__ . '/FromXmlService.php';
 require_once __DIR__ . '/ToXmlService.php';
 require_once __DIR__ . '/../../TargetDescriptionFile.php';
-require_once __DIR__ . '/../../AVR8/Avr8TargetDescriptionFile.php';
+require_once __DIR__ . '/../../Avr8/Avr8TargetDescriptionFile.php';
 
 require_once __DIR__ . '/Exceptions/XmlParsingException.php';
 
diff --git a/build/scripts/ValidateTargetDescriptionFiles.php b/build/scripts/ValidateTargetDescriptionFiles.php
index 9bca12d1..dd790ae7 100644
--- a/build/scripts/ValidateTargetDescriptionFiles.php
+++ b/build/scripts/ValidateTargetDescriptionFiles.php
@@ -19,12 +19,12 @@ if (!file_exists(TDF_PATH)) {
 require_once __DIR__ . '/Targets/TargetDescriptionFiles/Services/DiscoveryService.php';
 require_once __DIR__ . '/Targets/TargetDescriptionFiles/Services/Xml/XmlService.php';
 require_once __DIR__ . '/Targets/TargetDescriptionFiles/Services/ValidationService.php';
-require_once __DIR__ . '/Targets/TargetDescriptionFiles/AVR8/Services/ValidationService.php';
+require_once __DIR__ . '/Targets/TargetDescriptionFiles/Avr8/Services/ValidationService.php';
 require_once __DIR__ . '/Targets/TargetDescriptionFiles/RiscV/Services/ValidationService.php';
 
 $xmlService = new XmlService();
 
-$avrValidationService = new \Targets\TargetDescriptionFiles\AVR8\Services\ValidationService();
+$avrValidationService = new \Targets\TargetDescriptionFiles\Avr8\Services\ValidationService();
 $rvValidationService = new \Targets\TargetDescriptionFiles\RiscV\Services\ValidationService();
 
 $xmlFiles = [];