Currently the naming of civ specific champion and mercenary units in the templates/units/ folder is rather inconsistent; it appears to be designed at a time when all factions were supposed to have only one infantry champion and one cavalry champion. The current naming scheme makes it hard to add new champion units; e.g. Athens has the following champion units:
athen_champion_infantry.xml
athen_champion_marine.xml
athen_champion_ranged.xml
athen_thureophoros.xml
This patch applies a consistent naming scheme, similar to how citizen soldiers are named, which makes it more suitable for future additions and mods; e.g. Athens' champions are now named:
athen_champion_hoplite_infantry.xml
athen_champion_sword_infantry.xml
athen_champion_archer_infantry.xml
athen_champion_javelin_infantry.xml
Renamed templates/units/ files:
* all *_champion_* files
* all *_kardakes_* files
* all *_marine files
* all *_merc_* files
* Greek thorakites and thureophoros files
Furthermore:
* applied “equine transport” requirement to Persian trireme
* removed now obsolete pers_cavalry_*_trireme files
* Athenian docks can no longer train marine soldiers (to prevent other factions from training their own units at captured Athenian docks).
* the cart *_gaul, *_iber, *_ital files are kept unchanged for now.
* the *_black_cloak files are kept unchanged for now.
All unit templates appear twice (once for adding the file with its new name and once for deleting the file with its old name), so this patch is actually smaller than it appears at first glance.
Update: also checked and corrected the /maps/ files