diff --git a/dev/DataSource/Country/ISO3166_1_Alpha_2_Source.php b/dev/DataSource/Country/CountryAlpha2Source.php
similarity index 91%
rename from dev/DataSource/Country/ISO3166_1_Alpha_2_Source.php
rename to dev/DataSource/Country/CountryAlpha2Source.php
index 8237a16..eb71fee 100644
--- a/dev/DataSource/Country/ISO3166_1_Alpha_2_Source.php
+++ b/dev/DataSource/Country/CountryAlpha2Source.php
@@ -4,12 +4,12 @@
 
 namespace PrinsFrank\Standards\Dev\DataSource\Country;
 
-use PrinsFrank\Standards\Country\ISO3166_1_Alpha_2;
+use PrinsFrank\Standards\Country\CountryAlpha2;
 use PrinsFrank\Standards\Dev\DataSource\HtmlDataSource;
 use Symfony\Component\Panther\Client;
 use Symfony\Component\Panther\DomCrawler\Crawler;
 
-class ISO3166_1_Alpha_2_Source implements HtmlDataSource
+class CountryAlpha2Source implements HtmlDataSource
 {
     public static function url(): string
     {
@@ -43,7 +43,7 @@ public static function transformValue(string $value): string|int|null
 
     public static function getSpecFQN(): string
     {
-        return ISO3166_1_Alpha_2::class;
+        return CountryAlpha2::class;
     }
 
     public static function getKeyEnumFQN(): string
diff --git a/dev/DataSource/Country/ISO3166_1_Alpha_3_Source.php b/dev/DataSource/Country/CountryAlpha3Source.php
similarity index 91%
rename from dev/DataSource/Country/ISO3166_1_Alpha_3_Source.php
rename to dev/DataSource/Country/CountryAlpha3Source.php
index 659872e..9a2d3a8 100644
--- a/dev/DataSource/Country/ISO3166_1_Alpha_3_Source.php
+++ b/dev/DataSource/Country/CountryAlpha3Source.php
@@ -4,12 +4,12 @@
 
 namespace PrinsFrank\Standards\Dev\DataSource\Country;
 
-use PrinsFrank\Standards\Country\ISO3166_1_Alpha_3;
+use PrinsFrank\Standards\Country\CountryAlpha3;
 use PrinsFrank\Standards\Dev\DataSource\HtmlDataSource;
 use Symfony\Component\Panther\Client;
 use Symfony\Component\Panther\DomCrawler\Crawler;
 
-class ISO3166_1_Alpha_3_Source implements HtmlDataSource
+class CountryAlpha3Source implements HtmlDataSource
 {
     public static function url(): string
     {
@@ -43,7 +43,7 @@ public static function transformValue(string $value): string|int|null
 
     public static function getSpecFQN(): string
     {
-        return ISO3166_1_Alpha_3::class;
+        return CountryAlpha3::class;
     }
 
     public static function getKeyEnumFQN(): string
diff --git a/dev/DataSource/Country/ISO3166_1_Name_Source.php b/dev/DataSource/Country/CountryNameSource.php
similarity index 87%
rename from dev/DataSource/Country/ISO3166_1_Name_Source.php
rename to dev/DataSource/Country/CountryNameSource.php
index d249e7b..a1a3d0f 100644
--- a/dev/DataSource/Country/ISO3166_1_Name_Source.php
+++ b/dev/DataSource/Country/CountryNameSource.php
@@ -4,13 +4,13 @@
 
 namespace PrinsFrank\Standards\Dev\DataSource\Country;
 
-use PrinsFrank\Standards\Country\ISO3166_1_Alpha_2;
-use PrinsFrank\Standards\Country\ISO3166_1_Name;
+use PrinsFrank\Standards\Country\CountryAlpha2;
+use PrinsFrank\Standards\Country\CountryName;
 use PrinsFrank\Standards\Dev\DataSource\HtmlDataSource;
 use Symfony\Component\Panther\Client;
 use Symfony\Component\Panther\DomCrawler\Crawler;
 
-class ISO3166_1_Name_Source implements HtmlDataSource
+class CountryNameSource implements HtmlDataSource
 {
     public static function url(): string
     {
@@ -44,12 +44,12 @@ public static function transformValue(string $value): string|int|null
 
     public static function getSpecFQN(): string
     {
-        return ISO3166_1_Name::class;
+        return CountryName::class;
     }
 
     public static function getKeyEnumFQN(): string
     {
-        return ISO3166_1_Alpha_2::class;
+        return CountryAlpha2::class;
     }
 
     public static function afterPageLoad(Client $client, Crawler $crawler): void
diff --git a/dev/DataSource/Country/ISO3166_1_Numeric_Source.php b/dev/DataSource/Country/CountryNumericSource.php
similarity index 96%
rename from dev/DataSource/Country/ISO3166_1_Numeric_Source.php
rename to dev/DataSource/Country/CountryNumericSource.php
index 31147e2..b22a112 100644
--- a/dev/DataSource/Country/ISO3166_1_Numeric_Source.php
+++ b/dev/DataSource/Country/CountryNumericSource.php
@@ -9,7 +9,7 @@
 use Symfony\Component\Panther\Client;
 use Symfony\Component\Panther\DomCrawler\Crawler;
 
-class ISO3166_1_Numeric_Source implements HtmlDataSource
+class CountryNumericSource implements HtmlDataSource
 {
     public static function url(): string
     {
diff --git a/dev/DataSource/CountryShort/CountryAlpha2Source.php b/dev/DataSource/CountryShort/CountryAlpha2Source.php
deleted file mode 100644
index 6ecd28b..0000000
--- a/dev/DataSource/CountryShort/CountryAlpha2Source.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-declare(strict_types=1);
-
-namespace PrinsFrank\Standards\Dev\DataSource\CountryShort;
-
-use PrinsFrank\Standards\Country\CountryAlpha2;
-use PrinsFrank\Standards\Dev\DataSource\Country\ISO3166_1_Alpha_2_Source;
-
-class CountryAlpha2Source extends ISO3166_1_Alpha_2_Source
-{
-    public static function getSpecFQN(): string
-    {
-        return CountryAlpha2::class;
-    }
-}
diff --git a/dev/DataSource/CountryShort/CountryAlpha3Source.php b/dev/DataSource/CountryShort/CountryAlpha3Source.php
deleted file mode 100644
index 0062043..0000000
--- a/dev/DataSource/CountryShort/CountryAlpha3Source.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-declare(strict_types=1);
-
-namespace PrinsFrank\Standards\Dev\DataSource\CountryShort;
-
-use PrinsFrank\Standards\Country\CountryAlpha3;
-use PrinsFrank\Standards\Dev\DataSource\Country\ISO3166_1_Alpha_3_Source;
-
-class CountryAlpha3Source extends ISO3166_1_Alpha_3_Source
-{
-    public static function getSpecFQN(): string
-    {
-        return CountryAlpha3::class;
-    }
-}
diff --git a/dev/DataSource/CountryShort/CountryNameSource.php b/dev/DataSource/CountryShort/CountryNameSource.php
deleted file mode 100644
index 2b886fd..0000000
--- a/dev/DataSource/CountryShort/CountryNameSource.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-declare(strict_types=1);
-
-namespace PrinsFrank\Standards\Dev\DataSource\CountryShort;
-
-use PrinsFrank\Standards\Country\CountryName;
-use PrinsFrank\Standards\Dev\DataSource\Country\ISO3166_1_Name_Source;
-
-class CountryNameSource extends ISO3166_1_Name_Source
-{
-    public static function getSpecFQN(): string
-    {
-        return CountryName::class;
-    }
-}
diff --git a/dev/DataSource/CountryShort/CountryNumericSource.php b/dev/DataSource/CountryShort/CountryNumericSource.php
deleted file mode 100644
index d71fb69..0000000
--- a/dev/DataSource/CountryShort/CountryNumericSource.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-declare(strict_types=1);
-
-namespace PrinsFrank\Standards\Dev\DataSource\CountryShort;
-
-use PrinsFrank\Standards\Country\CountryNumeric;
-use PrinsFrank\Standards\Dev\DataSource\Country\ISO3166_1_Numeric_Source;
-
-class CountryNumericSource extends ISO3166_1_Numeric_Source
-{
-    public static function getSpecFQN(): string
-    {
-        return CountryNumeric::class;
-    }
-}
diff --git a/dev/DataSource/Currency/ISO4217_Alpha_3_Source.php b/dev/DataSource/Currency/CurrencyAlpha3Source.php
similarity index 96%
rename from dev/DataSource/Currency/ISO4217_Alpha_3_Source.php
rename to dev/DataSource/Currency/CurrencyAlpha3Source.php
index 00f09dc..900417f 100644
--- a/dev/DataSource/Currency/ISO4217_Alpha_3_Source.php
+++ b/dev/DataSource/Currency/CurrencyAlpha3Source.php
@@ -8,7 +8,7 @@
 use Symfony\Component\Panther\Client;
 use Symfony\Component\Panther\DomCrawler\Crawler;
 
-class ISO4217_Alpha_3_Source implements XmlDataSource
+class CurrencyAlpha3Source implements XmlDataSource
 {
     public static function url(): string
     {
diff --git a/dev/DataSource/Currency/ISO4217_Name_Source.php b/dev/DataSource/Currency/CurrencyNameSource.php
similarity index 96%
rename from dev/DataSource/Currency/ISO4217_Name_Source.php
rename to dev/DataSource/Currency/CurrencyNameSource.php
index ab2aa93..fde6d00 100644
--- a/dev/DataSource/Currency/ISO4217_Name_Source.php
+++ b/dev/DataSource/Currency/CurrencyNameSource.php
@@ -9,7 +9,7 @@
 use Symfony\Component\Panther\Client;
 use Symfony\Component\Panther\DomCrawler\Crawler;
 
-class ISO4217_Name_Source implements XmlDataSource
+class CurrencyNameSource implements XmlDataSource
 {
     public static function url(): string
     {
diff --git a/dev/DataSource/Currency/ISO4217_Numeric_Source.php b/dev/DataSource/Currency/CurrencyNumericSource.php
similarity index 96%
rename from dev/DataSource/Currency/ISO4217_Numeric_Source.php
rename to dev/DataSource/Currency/CurrencyNumericSource.php
index b700ee1..8485352 100644
--- a/dev/DataSource/Currency/ISO4217_Numeric_Source.php
+++ b/dev/DataSource/Currency/CurrencyNumericSource.php
@@ -8,7 +8,7 @@
 use Symfony\Component\Panther\Client;
 use Symfony\Component\Panther\DomCrawler\Crawler;
 
-class ISO4217_Numeric_Source implements XmlDataSource
+class CurrencyNumericSource implements XmlDataSource
 {
     public static function url(): string
     {
diff --git a/dev/DataSource/Language/ISO639_1_Alpha_2_Source.php b/dev/DataSource/Language/LanguageAlpha2Source.php
similarity index 96%
rename from dev/DataSource/Language/ISO639_1_Alpha_2_Source.php
rename to dev/DataSource/Language/LanguageAlpha2Source.php
index 9aeac3e..1d9943a 100644
--- a/dev/DataSource/Language/ISO639_1_Alpha_2_Source.php
+++ b/dev/DataSource/Language/LanguageAlpha2Source.php
@@ -8,7 +8,7 @@
 use Symfony\Component\Panther\Client;
 use Symfony\Component\Panther\DomCrawler\Crawler;
 
-class ISO639_1_Alpha_2_Source implements HtmlDataSource
+class LanguageAlpha2Source implements HtmlDataSource
 {
     public static function url(): string
     {
diff --git a/dev/DataSource/Language/ISO639_2_Alpha_3_Bibliographic_Source.php b/dev/DataSource/Language/LanguageAlpha3BibliographicSource.php
similarity index 95%
rename from dev/DataSource/Language/ISO639_2_Alpha_3_Bibliographic_Source.php
rename to dev/DataSource/Language/LanguageAlpha3BibliographicSource.php
index d170d78..894d7c5 100644
--- a/dev/DataSource/Language/ISO639_2_Alpha_3_Bibliographic_Source.php
+++ b/dev/DataSource/Language/LanguageAlpha3BibliographicSource.php
@@ -8,7 +8,7 @@
 use Symfony\Component\Panther\Client;
 use Symfony\Component\Panther\DomCrawler\Crawler;
 
-class ISO639_2_Alpha_3_Bibliographic_Source implements HtmlDataSource
+class LanguageAlpha3BibliographicSource implements HtmlDataSource
 {
     public static function url(): string
     {
diff --git a/dev/DataSource/Language/ISO639_2_Alpha_3_Common_Source.php b/dev/DataSource/Language/LanguageAlpha3CommonSource.php
similarity index 96%
rename from dev/DataSource/Language/ISO639_2_Alpha_3_Common_Source.php
rename to dev/DataSource/Language/LanguageAlpha3CommonSource.php
index 764aa1a..84e8137 100644
--- a/dev/DataSource/Language/ISO639_2_Alpha_3_Common_Source.php
+++ b/dev/DataSource/Language/LanguageAlpha3CommonSource.php
@@ -8,7 +8,7 @@
 use Symfony\Component\Panther\Client;
 use Symfony\Component\Panther\DomCrawler\Crawler;
 
-class ISO639_2_Alpha_3_Common_Source implements HtmlDataSource
+class LanguageAlpha3CommonSource implements HtmlDataSource
 {
     public static function url(): string
     {
diff --git a/dev/DataSource/Language/ISO639_2_Alpha_3_Terminology_Source.php b/dev/DataSource/Language/LanguageAlpha3TerminologySource.php
similarity index 95%
rename from dev/DataSource/Language/ISO639_2_Alpha_3_Terminology_Source.php
rename to dev/DataSource/Language/LanguageAlpha3TerminologySource.php
index 7459325..81d1148 100644
--- a/dev/DataSource/Language/ISO639_2_Alpha_3_Terminology_Source.php
+++ b/dev/DataSource/Language/LanguageAlpha3TerminologySource.php
@@ -8,7 +8,7 @@
 use Symfony\Component\Panther\Client;
 use Symfony\Component\Panther\DomCrawler\Crawler;
 
-class ISO639_2_Alpha_3_Terminology_Source implements HtmlDataSource
+class LanguageAlpha3TerminologySource implements HtmlDataSource
 {
     public static function url(): string
     {
diff --git a/dev/DataSource/Language/ISO639_Name_Source.php b/dev/DataSource/Language/LanguageNameSource.php
similarity index 96%
rename from dev/DataSource/Language/ISO639_Name_Source.php
rename to dev/DataSource/Language/LanguageNameSource.php
index 1c7b841..cf996d0 100644
--- a/dev/DataSource/Language/ISO639_Name_Source.php
+++ b/dev/DataSource/Language/LanguageNameSource.php
@@ -9,7 +9,7 @@
 use Symfony\Component\Panther\Client;
 use Symfony\Component\Panther\DomCrawler\Crawler;
 
-class ISO639_Name_Source implements HtmlDataSource
+class LanguageNameSource implements HtmlDataSource
 {
     public static function url(): string
     {
diff --git a/dev/DataSource/SpecType.php b/dev/DataSource/SpecType.php
index 47504ed..30428df 100644
--- a/dev/DataSource/SpecType.php
+++ b/dev/DataSource/SpecType.php
@@ -6,7 +6,6 @@
 enum SpecType
 {
     case COUNTRY;
-    case COUNTRY_SHORT;
     case CURRENCY;
     case HTTP_STATUS_CODES;
     case HTTP_METHODS;
diff --git a/dev/SpecUpdater.php b/dev/SpecUpdater.php
index a6a4b7e..7360ef8 100644
--- a/dev/SpecUpdater.php
+++ b/dev/SpecUpdater.php
@@ -5,26 +5,22 @@
 
 use Composer\Script\Event;
 use InvalidArgumentException;
-use PrinsFrank\Standards\Dev\DataSource\Country\ISO3166_1_Alpha_2_Source;
-use PrinsFrank\Standards\Dev\DataSource\Country\ISO3166_1_Alpha_3_Source;
-use PrinsFrank\Standards\Dev\DataSource\Country\ISO3166_1_Name_Source;
-use PrinsFrank\Standards\Dev\DataSource\Country\ISO3166_1_Numeric_Source;
-use PrinsFrank\Standards\Dev\DataSource\CountryShort\CountryAlpha2Source;
-use PrinsFrank\Standards\Dev\DataSource\CountryShort\CountryAlpha3Source;
-use PrinsFrank\Standards\Dev\DataSource\CountryShort\CountryNameSource;
-use PrinsFrank\Standards\Dev\DataSource\CountryShort\CountryNumericSource;
-use PrinsFrank\Standards\Dev\DataSource\Currency\ISO4217_Alpha_3_Source;
-use PrinsFrank\Standards\Dev\DataSource\Currency\ISO4217_Name_Source;
-use PrinsFrank\Standards\Dev\DataSource\Currency\ISO4217_Numeric_Source;
+use PrinsFrank\Standards\Dev\DataSource\Country\CountryAlpha2Source;
+use PrinsFrank\Standards\Dev\DataSource\Country\CountryAlpha3Source;
+use PrinsFrank\Standards\Dev\DataSource\Country\CountryNameSource;
+use PrinsFrank\Standards\Dev\DataSource\Country\CountryNumericSource;
+use PrinsFrank\Standards\Dev\DataSource\Currency\CurrencyAlpha3Source;
+use PrinsFrank\Standards\Dev\DataSource\Currency\CurrencyNameSource;
+use PrinsFrank\Standards\Dev\DataSource\Currency\CurrencyNumericSource;
 use PrinsFrank\Standards\Dev\DataSource\DataSource;
 use PrinsFrank\Standards\Dev\DataSource\HtmlDataSource;
 use PrinsFrank\Standards\Dev\DataSource\Http\HttpMethodSource;
 use PrinsFrank\Standards\Dev\DataSource\Http\HttpStatusCodeSource;
-use PrinsFrank\Standards\Dev\DataSource\Language\ISO639_1_Alpha_2_Source;
-use PrinsFrank\Standards\Dev\DataSource\Language\ISO639_2_Alpha_3_Bibliographic_Source;
-use PrinsFrank\Standards\Dev\DataSource\Language\ISO639_2_Alpha_3_Common_Source;
-use PrinsFrank\Standards\Dev\DataSource\Language\ISO639_2_Alpha_3_Terminology_Source;
-use PrinsFrank\Standards\Dev\DataSource\Language\ISO639_Name_Source;
+use PrinsFrank\Standards\Dev\DataSource\Language\LanguageAlpha2Source;
+use PrinsFrank\Standards\Dev\DataSource\Language\LanguageAlpha3BibliographicSource;
+use PrinsFrank\Standards\Dev\DataSource\Language\LanguageAlpha3CommonSource;
+use PrinsFrank\Standards\Dev\DataSource\Language\LanguageAlpha3TerminologySource;
+use PrinsFrank\Standards\Dev\DataSource\Language\LanguageNameSource;
 use PrinsFrank\Standards\Dev\DataSource\SpecType;
 use PrinsFrank\Standards\Dev\DataSource\XmlDataSource;
 use PrinsFrank\Standards\Dev\DataSourceExtractor\HtmlDataSourceExtractor;
@@ -39,14 +35,6 @@ class SpecUpdater
 {
     /** @var array<class-string<DataSource>> */
     public const COUNTRY_SOURCES = [
-        ISO3166_1_Numeric_Source::class,
-        ISO3166_1_Alpha_2_Source::class,
-        ISO3166_1_Alpha_3_Source::class,
-        ISO3166_1_Name_Source::class,
-    ];
-
-    /** @var array<class-string<DataSource>> */
-    public const COUNTRY_SHORT_SOURCES = [
         CountryNumericSource::class,
         CountryAlpha2Source::class,
         CountryAlpha3Source::class,
@@ -55,9 +43,9 @@ class SpecUpdater
 
     /** @var array<class-string<DataSource>> */
     public const CURRENCY_SOURCES = [
-        ISO4217_Alpha_3_Source::class,
-        ISO4217_Numeric_Source::class,
-        ISO4217_Name_Source::class,
+        CurrencyAlpha3Source::class,
+        CurrencyNumericSource::class,
+        CurrencyNameSource::class,
     ];
 
     /** @var array<class-string<DataSource>> */
@@ -72,11 +60,11 @@ class SpecUpdater
 
     /** @var array<class-string<DataSource>> */
     public const LANGUAGE_SOURCES = [
-        ISO639_1_Alpha_2_Source::class,
-        ISO639_2_Alpha_3_Bibliographic_Source::class,
-        ISO639_2_Alpha_3_Terminology_Source::class,
-        ISO639_2_Alpha_3_Common_Source::class,
-        ISO639_Name_Source::class,
+        LanguageAlpha2Source::class,
+        LanguageAlpha3BibliographicSource::class,
+        LanguageAlpha3TerminologySource::class,
+        LanguageAlpha3CommonSource::class,
+        LanguageNameSource::class,
     ];
 
     private const MAX_TRIES = 5;
@@ -91,7 +79,6 @@ public static function update(Event $event): void
 
         $sources = match (UnitEnum::tryFromKey(SpecType::class, strtoupper(str_replace('-', '_', $type)))) {
             SpecType::COUNTRY           => self::COUNTRY_SOURCES,
-            SpecType::COUNTRY_SHORT     => self::COUNTRY_SHORT_SOURCES,
             SpecType::CURRENCY          => self::CURRENCY_SOURCES,
             SpecType::HTTP_STATUS_CODES => self::HTTP_STATUS_CODE_SOURCES,
             SpecType::HTTP_METHODS      => self::HTTP_METHOD_SOURCES,