From 7195a9d3dc7fd884c418a74f1def6fa85b31e82c Mon Sep 17 00:00:00 2001
From: ProditorMagnus <public.ravana@gmail.com>
Date: Sat, 24 Aug 2024 01:10:36 +0300
Subject: [PATCH] AoA cleanup

---
 factions/RPG/RPG-AoA.cfg                      | 92 +++++++++++++++++++
 factions/default/default-AoA.cfg              | 42 ++++-----
 factions/heroes/heroes-AoA.cfg                | 40 ++++----
 info/collectAoAUnitIdReplacements.py          | 65 +++++++++++++
 info/postProcessAoA.py                        | 60 ++++++++++++
 .../Arbalester.cfg}                           |  2 +-
 .../Artificer.cfg}                            |  2 +-
 .../Balista.cfg}                              |  6 +-
 .../Bear_Knight.cfg}                          |  6 +-
 .../Bear_Rider.cfg}                           |  6 +-
 .../Bombard.cfg}                              |  2 +-
 .../Champion.cfg                              |  2 +-
 .../Count.cfg}                                |  2 +-
 .../Crossbowman.cfg}                          |  4 +-
 .../Engeener.cfg}                             |  4 +-
 .../Grand_Bear_Knight.cfg}                    |  4 +-
 .../Grand_Griffin_Knight.cfg}                 |  4 +-
 .../Great_Ballista.cfg}                       |  8 +-
 .../Griffin_Knight.cfg}                       |  6 +-
 .../Griffin_Rider.cfg}                        |  6 +-
 .../Guard.cfg}                                |  4 +-
 .../Handgunner.cfg}                           |  4 +-
 .../Heavy_Fighter.cfg}                        |  6 +-
 .../Lord.cfg}                                 |  4 +-
 .../Master_Engeener.cfg}                      |  4 +-
 .../Runes_Archmage.cfg}                       |  4 +-
 .../Runes_Mage.cfg}                           |  6 +-
 .../Runic_Scribe.cfg}                         |  6 +-
 .../Runic_Smith.cfg}                          |  6 +-
 .../Sentinel.cfg}                             |  4 +-
 .../Siege_Ballista.cfg}                       |  6 +-
 .../Silver_Guard.cfg}                         |  4 +-
 .../Thane.cfg                                 |  4 +-
 .../Tinker.cfg}                               |  4 +-
 .../Warrior.cfg}                              |  4 +-
 .../Apprentice.cfg}                           |  6 +-
 .../Arcanist.cfg}                             |  6 +-
 .../Battle_Archmage.cfg}                      |  6 +-
 .../Battle_Mage.cfg}                          |  8 +-
 .../Bowman.cfg}                               |  6 +-
 .../Champion.cfg                              |  4 +-
 .../Cleric.cfg}                               |  6 +-
 .../Conscript.cfg}                            |  6 +-
 .../Count.cfg}                                |  6 +-
 .../Crossbowman.cfg}                          |  6 +-
 .../Ducal_Guard.cfg}                          |  6 +-
 .../Duke.cfg}                                 |  4 +-
 .../Footdwarf.cfg}                            |  6 +-
 .../Grand_Arcanist.cfg}                       |  6 +-
 .../Grand_Master_Paladin.cfg}                 |  6 +-
 .../Great_Chevalier.cfg}                      |  6 +-
 .../Halberdier.cfg}                           |  6 +-
 .../Handgunner.cfg}                           |  4 +-
 .../Herald.cfg}                               |  4 +-
 .../High_Cleric.cfg}                          |  6 +-
 .../Initiate.cfg}                             |  6 +-
 .../Knight.cfg}                               |  6 +-
 .../Knight_On_Foots.cfg}                      |  8 +-
 .../Longbowman.cfg}                           |  6 +-
 .../Lord.cfg}                                 |  6 +-
 .../Mage.cfg                                  |  6 +-
 .../Master_Crossbowman.cfg}                   |  6 +-
 .../Master_Paladin.cfg}                       |  6 +-
 .../Noble.cfg                                 |  6 +-
 .../Nordic_Master_Archer.cfg}                 |  4 +-
 .../Paladin.cfg                               |  6 +-
 .../Peasant.cfg}                              |  6 +-
 .../Questing_Chevalier.cfg}                   |  8 +-
 .../Roi.cfg                                   |  4 +-
 .../Sergeant.cfg}                             |  4 +-
 .../Spearman.cfg}                             |  6 +-
 .../Squire.cfg}                               |  6 +-
 .../Canon.cfg => finn_empire/Cannon.cfg}      |  4 +-
 .../Capitaine.cfg => finn_empire/Captain.cfg} |  4 +-
 .../Citoyen.cfg => finn_empire/Citizen.cfg}   |  4 +-
 .../Commander.cfg}                            |  4 +-
 .../Crossbowman.cfg}                          |  4 +-
 .../Dueliste.cfg => finn_empire/Duelist.cfg}  |  6 +-
 .../Empereur.cfg => finn_empire/Emperor.cfg}  |  2 +-
 .../Enchanter.cfg}                            |  6 +-
 .../Enchanter_Apprentice.cfg}                 |  8 +-
 .../Bretteur.cfg => finn_empire/Fencer.cfg}   |  6 +-
 .../{empire => finn_empire}/General.cfg       |  2 +-
 .../Great_Cannon.cfg}                         |  4 +-
 .../Halberdier.cfg}                           |  2 +-
 .../Handgunner.cfg}                           |  4 +-
 .../Heavy_Crossbow.cfg}                       |  6 +-
 .../Helgrindian_Crossbowman.cfg}              |  6 +-
 .../Helgrindian_Heavy_Crossbowman.cfg}        |  4 +-
 .../Helgrindian_Heavy_Soldier.cfg}            |  4 +-
 .../Helgrindian_Soldier.cfg}                  |  6 +-
 .../{empire => finn_empire}/Lansquenet.cfg    |  2 +-
 .../Light_Cannon.cfg}                         |  6 +-
 .../Seigneur.cfg => finn_empire/Lord.cfg}     |  2 +-
 .../Master_At_Arms.cfg}                       |  6 +-
 .../Master_Crossbowman.cfg}                   |  4 +-
 .../Master_Enchanter.cfg}                     |  4 +-
 .../Mortier.cfg => finn_empire/Mortar.cfg}    |  2 +-
 .../{empire => finn_empire}/Noble.cfg         |  4 +-
 .../Piquier.cfg => finn_empire/Pikeman.cfg}   |  4 +-
 .../{empire => finn_empire}/Pistolier.cfg     |  2 +-
 .../Recrue.cfg => finn_empire/Recruit.cfg}    |  4 +-
 .../Reitre.cfg => finn_empire/Reiter.cfg}     |  4 +-
 .../Cavalier.cfg => finn_empire/Rider.cfg}    |  4 +-
 .../Sergent.cfg => finn_empire/Sergeant.cfg}  |  4 +-
 .../Sharpshooter.cfg}                         |  2 +-
 .../Epeiste.cfg => finn_empire/Swordman.cfg}  |  4 +-
 .../{Alchimiste.cfg => Alchemist.cfg}         |  4 +-
 .../{Apothicaire.cfg => Apothecary.cfg}       |  2 +-
 ...raidien.cfg => Astraidian_Crossbowman.cfg} |  4 +-
 .../galianos/{Citoyen.cfg => Citizen.cfg}     |  4 +-
 .../{Garde_civil.cfg => Civil_Guard.cfg}      |  6 +-
 units/AoA_units/galianos/Condotierre.cfg      |  2 +-
 ...e_a_pieds.cfg => Condotierre_On_Foots.cfg} |  6 +-
 ...avois.cfg => Crossbowman_With_Bulwark.cfg} |  6 +-
 ...niste_d'elite.cfg => Elite_Javelinist.cfg} |  4 +-
 .../{Lancier_d'elite.cfg => Elite_Lancer.cfg} |  4 +-
 .../{Epeiste_lourd.cfg => Elite_Swordman.cfg} |  4 +-
 .../galianos/{Escorteur.cfg => Escort.cfg}    |  2 +-
 .../galianos/{Fantassin.cfg => Footdwarf.cfg} |  4 +-
 .../{Spadassin.cfg => Galianos_Duelist.cfg}   |  6 +-
 units/AoA_units/galianos/Garde_forestier.cfg  | 50 ----------
 units/AoA_units/galianos/Gendarme.cfg         |  4 +-
 ...arme_a_pieds.cfg => Gendarme_On_Foots.cfg} |  6 +-
 units/AoA_units/galianos/General.cfg          |  2 +-
 ...{Fantassin_lourd.cfg => Heavy_Footman.cfg} |  4 +-
 .../{Piquier_lourd.cfg => Heavy_Pikemen.cfg}  |  4 +-
 .../{Herboriste.cfg => Herborist.cfg}         |  4 +-
 .../galianos/{Hussard.cfg => Hussar.cfg}      |  4 +-
 units/AoA_units/galianos/Imperator.cfg        |  2 +-
 .../{Javeleniste.cfg => Javelinist.cfg}       |  4 +-
 ..._pyromancien.cfg => Master_Pyromancer.cfg} |  4 +-
 .../galianos/{Milicien.cfg => Militia.cfg}    |  4 +-
 ...rier_monte.cfg => Mounted_Crossbowman.cfg} |  6 +-
 .../galianos/{Piquier.cfg => Pikeman.cfg}     |  4 +-
 .../{Pyromancien.cfg => Pyromancer.cfg}       |  4 +-
 .../galianos/{Rodeur.cfg => Ranger.cfg}       |  4 +-
 .../galianos/{Cavalier.cfg => Rider.cfg}      |  4 +-
 .../galianos/{Eclaireur.cfg => Scout.cfg}     |  4 +-
 .../{Escramoucheur.cfg => Skirmisher.cfg}     |  4 +-
 .../galianos/{Lancier.cfg => Spearman.cfg}    |  4 +-
 .../galianos/{Epeiste.cfg => Swordman.cfg}    |  4 +-
 .../Archbishop_Fighter.cfg}                   |  4 +-
 .../Aspirant_Templar.cfg}                     |  6 +-
 .../Bishop_Fighter.cfg}                       |  6 +-
 .../Crossbowman_With_Bulwark.cfg}             |  4 +-
 .../Feudal_Knight.cfg}                        |  6 +-
 .../Feudal_Levy.cfg}                          |  6 +-
 .../Gothic_Kight_On_Foots.cfg}                |  4 +-
 .../Gothic_Knight.cfg}                        |  4 +-
 .../Grand_Inquisitor.cfg}                     |  4 +-
 .../Grand_Mage.cfg}                           |  6 +-
 .../Grand_Master_Templar.cfg}                 |  4 +-
 .../{rovahr => kingdoms_rovahr}/Halbruder.cfg |  4 +-
 .../Heavy_Crossbow.cfg}                       |  6 +-
 .../Inquisitor.cfg}                           |  4 +-
 .../Knight_On_Foots.cfg}                      |  6 +-
 .../{rovahr => kingdoms_rovahr}/Konig.cfg     |  2 +-
 .../Longbowman.cfg}                           |  4 +-
 .../{rovahr => kingdoms_rovahr}/Mage.cfg      |  6 +-
 .../Men_At_Arms.cfg}                          |  6 +-
 .../Mercenary.cfg}                            |  4 +-
 .../Mercenary_Captain.cfg}                    |  4 +-
 .../Monk_Soldier.cfg}                         |  6 +-
 .../{rovahr => kingdoms_rovahr}/Novice.cfg    |  6 +-
 .../Peasant.cfg}                              |  4 +-
 .../Peasant_Crossbowman.cfg}                  |  6 +-
 .../Priest_Fighter.cfg}                       |  6 +-
 .../Ritterbruder.cfg                          |  2 +-
 .../Royal_Archer.cfg}                         |  4 +-
 .../Sergeant.cfg}                             |  2 +-
 .../Ecuyer.cfg => kingdoms_rovahr/Squire.cfg} |  4 +-
 .../Templar.cfg}                              |  4 +-
 .../Templar_Captain.cfg}                      |  4 +-
 .../Young_Knight.cfg}                         |  6 +-
 .../Ancient_Druid.cfg}                        |  6 +-
 .../Apprentice_Sorcerer.cfg}                  |  8 +-
 .../Arcanist.cfg}                             |  6 +-
 .../Archmage.cfg}                             |  4 +-
 .../Axe_Wielder.cfg}                          |  8 +-
 .../Chieftain.cfg}                            |  4 +-
 .../Clans_Longbowman.cfg}                     |  8 +-
 .../Clans_Pikeman.cfg}                        |  8 +-
 .../Clans_Warrior.cfg}                        |  8 +-
 .../Druid.cfg}                                |  6 +-
 .../Elder_Sorcerer.cfg}                       |  6 +-
 .../Elite_Sorcerer.cfg}                       |  8 +-
 .../Free_Archer.cfg}                          |  6 +-
 .../Gallowglass.cfg                           |  4 +-
 .../Grand_Arcanist.cfg}                       |  8 +-
 .../Heavy_Pikemen.cfg}                        |  8 +-
 .../High_King.cfg}                            |  6 +-
 .../Highlander.cfg                            |  6 +-
 .../Knight.cfg}                               |  6 +-
 .../Knight_Arcanist.cfg}                      |  6 +-
 .../Lord.cfg}                                 |  4 +-
 .../Mage_Blade.cfg}                           |  8 +-
 .../Magister.cfg                              |  4 +-
 .../Schiltron.cfg                             |  4 +-
 .../Scout.cfg}                                |  6 +-
 .../Sorcerer.cfg}                             |  8 +-
 .../Student.cfg}                              |  6 +-
 .../Villager.cfg}                             |  6 +-
 .../Warrior_Mage.cfg}                         |  8 +-
 .../Young_Druid.cfg}                          |  8 +-
 .../Archer_On_Griffin.cfg}                    |  4 +-
 .../Captain.cfg}                              |  4 +-
 .../Commander.cfg}                            |  2 +-
 .../Cuirassier.cfg                            |  4 +-
 .../Fighter.cfg}                              |  4 +-
 .../Footdwarf.cfg}                            |  4 +-
 .../Grand_Mage.cfg}                           |  4 +-
 .../Halberdier.cfg}                           |  4 +-
 .../Hammerer.cfg}                             |  2 +-
 .../Handgunner.cfg}                           |  4 +-
 .../Healer.cfg}                               |  6 +-
 .../Hunter.cfg}                               |  4 +-
 .../Hunter_On_Griffin.cfg}                    |  6 +-
 .../Mage.cfg}                                 |  6 +-
 .../Muskeeter.cfg}                            |  2 +-
 .../Ranger.cfg}                               |  2 +-
 .../Sergeant.cfg}                             |  4 +-
 .../Shaman.cfg}                               |  6 +-
 .../Shock_Soldier.cfg}                        |  6 +-
 .../Sorceress.cfg}                            |  6 +-
 .../Trapper.cfg}                              |  4 +-
 .../Veteran.cfg                               |  2 +-
 .../Veteran_Handgunner.cfg}                   |  6 +-
 .../Warden.cfg}                               |  2 +-
 .../Warrior.cfg}                              |  4 +-
 .../Wise.cfg}                                 |  4 +-
 .../Assassin.cfg}                             |  2 +-
 .../Bowman.cfg}                               |  2 +-
 .../Clan_Chief.cfg}                           |  6 +-
 .../Footman.cfg}                              |  2 +-
 .../Goblin_Bulwark.cfg}                       |  2 +-
 .../Goblin_Sentinel.cfg}                      |  2 +-
 .../Hunter.cfg}                               |  4 +-
 .../Leader.cfg}                               |  4 +-
 .../Medicine_Goblin.cfg}                      |  4 +-
 .../Shaman.cfg}                               |  2 +-
 .../Sneaky.cfg}                               |  4 +-
 .../Warlord.cfg}                              |  2 +-
 .../Warrior.cfg}                              |  4 +-
 .../Wolf_Archer.cfg}                          |  4 +-
 .../Wolf_Champion.cfg}                        |  2 +-
 .../Wolf_Rider.cfg}                           |  4 +-
 .../Archer_norse_jarldomsique.cfg}            |  8 +-
 .../{nord => norse_jarldoms}/Berserker.cfg    |  4 +-
 .../Chevalier_norse_jarldomsique.cfg}         |  6 +-
 .../Crossbowman.cfg}                          |  6 +-
 .../Destructive.cfg}                          |  4 +-
 .../Devastating.cfg}                          |  6 +-
 .../Double_Axe.cfg}                           |  8 +-
 .../Garde.cfg => norse_jarldoms/Guard.cfg}    |  6 +-
 .../Heavy_Crossbow.cfg}                       |  8 +-
 .../High_King.cfg}                            |  6 +-
 .../Hunter.cfg}                               |  6 +-
 .../{nord => norse_jarldoms}/Huskarl.cfg      |  6 +-
 .../{nord => norse_jarldoms}/Jarl.cfg         |  4 +-
 .../{nord => norse_jarldoms}/Maraudeur.cfg    |  6 +-
 .../Master_Crossbowman.cfg}                   |  6 +-
 .../Mounted_Archer.cfg}                       |  6 +-
 .../Mounted_Bowman.cfg}                       |  8 +-
 .../Mounted_Huskarl.cfg}                      |  8 +-
 .../Nordic_Master_Archer.cfg}                 |  4 +-
 .../Pluderer.cfg}                             |  6 +-
 .../{nord => norse_jarldoms}/Rempart.cfg      |  4 +-
 .../Cavalier.cfg => norse_jarldoms/Rider.cfg} |  6 +-
 .../Soldat.cfg => norse_jarldoms/Soldier.cfg} |  6 +-
 .../{nord => norse_jarldoms}/Thane.cfg        |  6 +-
 .../Varangian.cfg}                            |  4 +-
 .../{nord => norse_jarldoms}/Viking.cfg       |  6 +-
 .../Villager.cfg}                             |  6 +-
 .../Warlord.cfg}                              |  4 +-
 .../Warrior.cfg}                              |  6 +-
 .../Archdruid.cfg}                            |  2 +-
 .../Avenger.cfg}                              |  4 +-
 .../Blade_Dancer.cfg}                         | 10 +-
 .../Blademaster.cfg}                          |  4 +-
 .../Archer.cfg => rovahrian_elves/Bowman.cfg} |  6 +-
 .../Druide.cfg => rovahrian_elves/Druid.cfg}  |  4 +-
 .../Forest_Champion.cfg}                      |  4 +-
 .../Forest_Knight.cfg}                        |  6 +-
 .../Forest_Patrol.cfg}                        |  6 +-
 .../Healer.cfg}                               |  4 +-
 .../Heraut.cfg => rovahrian_elves/Herald.cfg} |  4 +-
 .../High_Lord.cfg}                            |  6 +-
 .../Seigneur.cfg => rovahrian_elves/Lord.cfg} |  6 +-
 .../{rov_elf => rovahrian_elves}/Mage.cfg     |  6 +-
 .../Magister.cfg}                             |  4 +-
 .../Master_Archer.cfg}                        |  6 +-
 .../{rov_elf => rovahrian_elves}/Noble.cfg    |  6 +-
 .../{rov_elf => rovahrian_elves}/Ranger.cfg   |  6 +-
 .../{rov_elf => rovahrian_elves}/Rempart.cfg  |  6 +-
 .../Rider.cfg}                                |  6 +-
 .../Royal_Guard.cfg}                          |  6 +-
 .../Scout.cfg}                                |  6 +-
 .../Spearman.cfg}                             |  6 +-
 .../Swordman.cfg}                             |  6 +-
 .../War_Archer.cfg}                           |  8 +-
 .../War_Dancer.cfg}                           |  8 +-
 units/AoA_units/units.cfg                     | 18 ++--
 303 files changed, 991 insertions(+), 824 deletions(-)
 create mode 100644 factions/RPG/RPG-AoA.cfg
 create mode 100644 info/collectAoAUnitIdReplacements.py
 create mode 100644 info/postProcessAoA.py
 rename units/AoA_units/{far_nains/Cranequinier.cfg => farengarian_dwarves_counties/Arbalester.cfg} (94%)
 rename units/AoA_units/{far_nains/Artificier.cfg => farengarian_dwarves_counties/Artificer.cfg} (95%)
 rename units/AoA_units/{far_nains/Baliste.cfg => farengarian_dwarves_counties/Balista.cfg} (85%)
 rename units/AoA_units/{far_nains/Chevalier-ours.cfg => farengarian_dwarves_counties/Bear_Knight.cfg} (87%)
 rename units/AoA_units/{far_nains/Oursier.cfg => farengarian_dwarves_counties/Bear_Rider.cfg} (87%)
 rename units/AoA_units/{far_nains/Bombarde.cfg => farengarian_dwarves_counties/Bombard.cfg} (96%)
 rename units/AoA_units/{far_nains => farengarian_dwarves_counties}/Champion.cfg (95%)
 rename units/AoA_units/{far_nains/Comte.cfg => farengarian_dwarves_counties/Count.cfg} (96%)
 rename units/AoA_units/{far_nains/Arbaletrier.cfg => farengarian_dwarves_counties/Crossbowman.cfg} (88%)
 rename units/AoA_units/{far_nains/Ingenieur.cfg => farengarian_dwarves_counties/Engeener.cfg} (89%)
 rename units/AoA_units/{far_nains/Grand-chevalier-ours.cfg => farengarian_dwarves_counties/Grand_Bear_Knight.cfg} (92%)
 rename units/AoA_units/{far_nains/Grand-chevalier-griffon.cfg => farengarian_dwarves_counties/Grand_Griffin_Knight.cfg} (93%)
 rename units/AoA_units/{far_nains/Grande-baliste.cfg => farengarian_dwarves_counties/Great_Ballista.cfg} (85%)
 rename units/AoA_units/{far_nains/Chevalier-griffon.cfg => farengarian_dwarves_counties/Griffin_Knight.cfg} (89%)
 rename units/AoA_units/{far_nains/Chevaucheur-de-griffon.cfg => farengarian_dwarves_counties/Griffin_Rider.cfg} (90%)
 rename units/AoA_units/{far_nains/Garde.cfg => farengarian_dwarves_counties/Guard.cfg} (90%)
 rename units/AoA_units/{far_nains/Arquebusier.cfg => farengarian_dwarves_counties/Handgunner.cfg} (89%)
 rename units/AoA_units/{far_nains/Guerrier-lourd.cfg => farengarian_dwarves_counties/Heavy_Fighter.cfg} (86%)
 rename units/AoA_units/{far_nains/Seigneur.cfg => farengarian_dwarves_counties/Lord.cfg} (91%)
 rename units/AoA_units/{far_nains/Maitre-ingenieur.cfg => farengarian_dwarves_counties/Master_Engeener.cfg} (92%)
 rename units/AoA_units/{far_nains/Archimage-des-runes.cfg => farengarian_dwarves_counties/Runes_Archmage.cfg} (94%)
 rename units/AoA_units/{far_nains/Mage-des-runes.cfg => farengarian_dwarves_counties/Runes_Mage.cfg} (90%)
 rename units/AoA_units/{far_nains/Scribe-runique.cfg => farengarian_dwarves_counties/Runic_Scribe.cfg} (88%)
 rename units/AoA_units/{far_nains/Forgeron-runique.cfg => farengarian_dwarves_counties/Runic_Smith.cfg} (90%)
 rename units/AoA_units/{far_nains/Sentinelle.cfg => farengarian_dwarves_counties/Sentinel.cfg} (89%)
 rename units/AoA_units/{far_nains/Baliste-de-siege.cfg => farengarian_dwarves_counties/Siege_Ballista.cfg} (90%)
 rename units/AoA_units/{far_nains/Garde-d'argent.cfg => farengarian_dwarves_counties/Silver_Guard.cfg} (94%)
 rename units/AoA_units/{far_nains => farengarian_dwarves_counties}/Thane.cfg (90%)
 rename units/AoA_units/{far_nains/Bricoleur.cfg => farengarian_dwarves_counties/Tinker.cfg} (86%)
 rename units/AoA_units/{far_nains/Guerrier.cfg => farengarian_dwarves_counties/Warrior.cfg} (81%)
 rename units/AoA_units/{farengar/Apprenti.cfg => farengarians_kingdoms/Apprentice.cfg} (89%)
 rename units/AoA_units/{farengar/Arcaniste.cfg => farengarians_kingdoms/Arcanist.cfg} (94%)
 rename units/AoA_units/{farengar/Archimage_de_bataille.cfg => farengarians_kingdoms/Battle_Archmage.cfg} (93%)
 rename units/AoA_units/{farengar/Mage_de_bataille.cfg => farengarians_kingdoms/Battle_Mage.cfg} (90%)
 rename units/AoA_units/{farengar/Archer.cfg => farengarians_kingdoms/Bowman.cfg} (86%)
 rename units/AoA_units/{farengar => farengarians_kingdoms}/Champion.cfg (95%)
 rename units/AoA_units/{farengar/Clerc.cfg => farengarians_kingdoms/Cleric.cfg} (93%)
 rename units/AoA_units/{farengar/Conscrit.cfg => farengarians_kingdoms/Conscript.cfg} (87%)
 rename units/AoA_units/{farengar/Comte.cfg => farengarians_kingdoms/Count.cfg} (91%)
 rename units/AoA_units/{farengar/Arbaletrier.cfg => farengarians_kingdoms/Crossbowman.cfg} (90%)
 rename units/AoA_units/{farengar/Garde_ducal.cfg => farengarians_kingdoms/Ducal_Guard.cfg} (93%)
 rename units/AoA_units/{farengar/Duc.cfg => farengarians_kingdoms/Duke.cfg} (95%)
 rename units/AoA_units/{farengar/Fantassin.cfg => farengarians_kingdoms/Footdwarf.cfg} (90%)
 rename units/AoA_units/{farengar/Grand_arcaniste.cfg => farengarians_kingdoms/Grand_Arcanist.cfg} (95%)
 rename units/AoA_units/{farengar/Grand_maitre_paladin.cfg => farengarians_kingdoms/Grand_Master_Paladin.cfg} (93%)
 rename units/AoA_units/{farengar/Grand_chevalier.cfg => farengarians_kingdoms/Great_Chevalier.cfg} (92%)
 rename units/AoA_units/{farengar/Hallebardier.cfg => farengarians_kingdoms/Halberdier.cfg} (91%)
 rename units/AoA_units/{farengar/Arquebusier.cfg => farengarians_kingdoms/Handgunner.cfg} (94%)
 rename units/AoA_units/{farengar/Heraut.cfg => farengarians_kingdoms/Herald.cfg} (94%)
 rename units/AoA_units/{farengar/Grand_clerc.cfg => farengarians_kingdoms/High_Cleric.cfg} (93%)
 rename units/AoA_units/{farengar/Initie.cfg => farengarians_kingdoms/Initiate.cfg} (91%)
 rename units/AoA_units/{farengar/Chevalier.cfg => farengarians_kingdoms/Knight.cfg} (91%)
 rename units/AoA_units/{farengar/Chevalier_a_pieds.cfg => farengarians_kingdoms/Knight_On_Foots.cfg} (88%)
 rename units/AoA_units/{farengar/Archer_long.cfg => farengarians_kingdoms/Longbowman.cfg} (91%)
 rename units/AoA_units/{farengar/Seigneur.cfg => farengarians_kingdoms/Lord.cfg} (91%)
 rename units/AoA_units/{farengar => farengarians_kingdoms}/Mage.cfg (92%)
 rename units/AoA_units/{farengar/Maitre_arbaletrier.cfg => farengarians_kingdoms/Master_Crossbowman.cfg} (92%)
 rename units/AoA_units/{farengar/Maitre_paladin.cfg => farengarians_kingdoms/Master_Paladin.cfg} (94%)
 rename units/AoA_units/{farengar => farengarians_kingdoms}/Noble.cfg (90%)
 rename units/AoA_units/{farengar/Maitre_archer.cfg => farengarians_kingdoms/Nordic_Master_Archer.cfg} (95%)
 rename units/AoA_units/{farengar => farengarians_kingdoms}/Paladin.cfg (93%)
 rename units/AoA_units/{farengar/Paysan.cfg => farengarians_kingdoms/Peasant.cfg} (88%)
 rename units/AoA_units/{farengar/Chevalier_errant.cfg => farengarians_kingdoms/Questing_Chevalier.cfg} (86%)
 rename units/AoA_units/{farengar => farengarians_kingdoms}/Roi.cfg (95%)
 rename units/AoA_units/{farengar/Sergent.cfg => farengarians_kingdoms/Sergeant.cfg} (94%)
 rename units/AoA_units/{farengar/Lancier.cfg => farengarians_kingdoms/Spearman.cfg} (90%)
 rename units/AoA_units/{farengar/Ecuyer.cfg => farengarians_kingdoms/Squire.cfg} (87%)
 rename units/AoA_units/{empire/Canon.cfg => finn_empire/Cannon.cfg} (93%)
 rename units/AoA_units/{empire/Capitaine.cfg => finn_empire/Captain.cfg} (93%)
 rename units/AoA_units/{empire/Citoyen.cfg => finn_empire/Citizen.cfg} (83%)
 rename units/AoA_units/{empire/Commandant.cfg => finn_empire/Commander.cfg} (93%)
 rename units/AoA_units/{empire/Arbaletrier.cfg => finn_empire/Crossbowman.cfg} (87%)
 rename units/AoA_units/{empire/Dueliste.cfg => finn_empire/Duelist.cfg} (93%)
 rename units/AoA_units/{empire/Empereur.cfg => finn_empire/Emperor.cfg} (97%)
 rename units/AoA_units/{empire/Enchanteur.cfg => finn_empire/Enchanter.cfg} (92%)
 rename units/AoA_units/{empire/Apprenti_enchanteur.cfg => finn_empire/Enchanter_Apprentice.cfg} (89%)
 rename units/AoA_units/{empire/Bretteur.cfg => finn_empire/Fencer.cfg} (93%)
 rename units/AoA_units/{empire => finn_empire}/General.cfg (97%)
 rename units/AoA_units/{empire/Canon_lourd.cfg => finn_empire/Great_Cannon.cfg} (95%)
 rename units/AoA_units/{empire/Hallebardier.cfg => finn_empire/Halberdier.cfg} (96%)
 rename units/AoA_units/{empire/Arquebusier.cfg => finn_empire/Handgunner.cfg} (92%)
 rename units/AoA_units/{empire/Arbaletrier_lourd.cfg => finn_empire/Heavy_Crossbow.cfg} (87%)
 rename units/AoA_units/{empire/Arbaletrier_helgrind.cfg => finn_empire/Helgrindian_Crossbowman.cfg} (86%)
 rename units/AoA_units/{empire/Arbaletrier_helgrind_lourd.cfg => finn_empire/Helgrindian_Heavy_Crossbowman.cfg} (91%)
 rename units/AoA_units/{empire/Soldat_helgrind_lourd.cfg => finn_empire/Helgrindian_Heavy_Soldier.cfg} (91%)
 rename units/AoA_units/{empire/Soldat_helgrind.cfg => finn_empire/Helgrindian_Soldier.cfg} (85%)
 rename units/AoA_units/{empire => finn_empire}/Lansquenet.cfg (96%)
 rename units/AoA_units/{empire/Canon_leger.cfg => finn_empire/Light_Cannon.cfg} (89%)
 rename units/AoA_units/{empire/Seigneur.cfg => finn_empire/Lord.cfg} (96%)
 rename units/AoA_units/{empire/Maitre_d_armes.cfg => finn_empire/Master_At_Arms.cfg} (93%)
 rename units/AoA_units/{empire/Maitre_arbaletrier.cfg => finn_empire/Master_Crossbowman.cfg} (93%)
 rename units/AoA_units/{empire/Maitre_enchanteur.cfg => finn_empire/Master_Enchanter.cfg} (94%)
 rename units/AoA_units/{empire/Mortier.cfg => finn_empire/Mortar.cfg} (97%)
 rename units/AoA_units/{empire => finn_empire}/Noble.cfg (91%)
 rename units/AoA_units/{empire/Piquier.cfg => finn_empire/Pikeman.cfg} (91%)
 rename units/AoA_units/{empire => finn_empire}/Pistolier.cfg (96%)
 rename units/AoA_units/{empire/Recrue.cfg => finn_empire/Recruit.cfg} (84%)
 rename units/AoA_units/{empire/Reitre.cfg => finn_empire/Reiter.cfg} (92%)
 rename units/AoA_units/{empire/Cavalier.cfg => finn_empire/Rider.cfg} (88%)
 rename units/AoA_units/{empire/Sergent.cfg => finn_empire/Sergeant.cfg} (93%)
 rename units/AoA_units/{empire/Tireur_d'elite.cfg => finn_empire/Sharpshooter.cfg} (96%)
 rename units/AoA_units/{empire/Epeiste.cfg => finn_empire/Swordman.cfg} (90%)
 rename units/AoA_units/galianos/{Alchimiste.cfg => Alchemist.cfg} (93%)
 rename units/AoA_units/galianos/{Apothicaire.cfg => Apothecary.cfg} (95%)
 rename units/AoA_units/galianos/{Arbaletrier_astraidien.cfg => Astraidian_Crossbowman.cfg} (92%)
 rename units/AoA_units/galianos/{Citoyen.cfg => Citizen.cfg} (84%)
 rename units/AoA_units/galianos/{Garde_civil.cfg => Civil_Guard.cfg} (88%)
 rename units/AoA_units/galianos/{Condotierre_a_pieds.cfg => Condotierre_On_Foots.cfg} (90%)
 rename units/AoA_units/galianos/{Arbaletrier_avec_pavois.cfg => Crossbowman_With_Bulwark.cfg} (88%)
 rename units/AoA_units/galianos/{Javeleniste_d'elite.cfg => Elite_Javelinist.cfg} (93%)
 rename units/AoA_units/galianos/{Lancier_d'elite.cfg => Elite_Lancer.cfg} (94%)
 rename units/AoA_units/galianos/{Epeiste_lourd.cfg => Elite_Swordman.cfg} (92%)
 rename units/AoA_units/galianos/{Escorteur.cfg => Escort.cfg} (96%)
 rename units/AoA_units/galianos/{Fantassin.cfg => Footdwarf.cfg} (91%)
 rename units/AoA_units/galianos/{Spadassin.cfg => Galianos_Duelist.cfg} (84%)
 delete mode 100644 units/AoA_units/galianos/Garde_forestier.cfg
 rename units/AoA_units/galianos/{Gendarme_a_pieds.cfg => Gendarme_On_Foots.cfg} (89%)
 rename units/AoA_units/galianos/{Fantassin_lourd.cfg => Heavy_Footman.cfg} (92%)
 rename units/AoA_units/galianos/{Piquier_lourd.cfg => Heavy_Pikemen.cfg} (93%)
 rename units/AoA_units/galianos/{Herboriste.cfg => Herborist.cfg} (90%)
 rename units/AoA_units/galianos/{Hussard.cfg => Hussar.cfg} (91%)
 rename units/AoA_units/galianos/{Javeleniste.cfg => Javelinist.cfg} (92%)
 rename units/AoA_units/galianos/{Maitre_pyromancien.cfg => Master_Pyromancer.cfg} (94%)
 rename units/AoA_units/galianos/{Milicien.cfg => Militia.cfg} (88%)
 rename units/AoA_units/galianos/{Arbaletrier_monte.cfg => Mounted_Crossbowman.cfg} (88%)
 rename units/AoA_units/galianos/{Piquier.cfg => Pikeman.cfg} (91%)
 rename units/AoA_units/galianos/{Pyromancien.cfg => Pyromancer.cfg} (92%)
 rename units/AoA_units/galianos/{Rodeur.cfg => Ranger.cfg} (94%)
 rename units/AoA_units/galianos/{Cavalier.cfg => Rider.cfg} (90%)
 rename units/AoA_units/galianos/{Eclaireur.cfg => Scout.cfg} (91%)
 rename units/AoA_units/galianos/{Escramoucheur.cfg => Skirmisher.cfg} (90%)
 rename units/AoA_units/galianos/{Lancier.cfg => Spearman.cfg} (92%)
 rename units/AoA_units/galianos/{Epeiste.cfg => Swordman.cfg} (90%)
 rename units/AoA_units/{rovahr/Archeveque_guerrier.cfg => kingdoms_rovahr/Archbishop_Fighter.cfg} (94%)
 rename units/AoA_units/{rovahr/Aspirant_templier.cfg => kingdoms_rovahr/Aspirant_Templar.cfg} (91%)
 rename units/AoA_units/{rovahr/Eveque_guerrier.cfg => kingdoms_rovahr/Bishop_Fighter.cfg} (90%)
 rename units/AoA_units/{rovahr/Arbaletrier_avec_pavois.cfg => kingdoms_rovahr/Crossbowman_With_Bulwark.cfg} (92%)
 rename units/AoA_units/{rovahr/Chevalier_feodal.cfg => kingdoms_rovahr/Feudal_Knight.cfg} (89%)
 rename units/AoA_units/{rovahr/levee_feodale.cfg => kingdoms_rovahr/Feudal_Levy.cfg} (84%)
 rename units/AoA_units/{rovahr/Chevalier_gothique_a_pieds.cfg => kingdoms_rovahr/Gothic_Kight_On_Foots.cfg} (91%)
 rename units/AoA_units/{rovahr/Chevalier_gothique.cfg => kingdoms_rovahr/Gothic_Knight.cfg} (94%)
 rename units/AoA_units/{rovahr/Grand_inquisiteur.cfg => kingdoms_rovahr/Grand_Inquisitor.cfg} (94%)
 rename units/AoA_units/{rovahr/Grand_mage.cfg => kingdoms_rovahr/Grand_Mage.cfg} (93%)
 rename units/AoA_units/{rovahr/Grand_maitre.cfg => kingdoms_rovahr/Grand_Master_Templar.cfg} (95%)
 rename units/AoA_units/{rovahr => kingdoms_rovahr}/Halbruder.cfg (92%)
 rename units/AoA_units/{rovahr/Arbaletrier_lourd.cfg => kingdoms_rovahr/Heavy_Crossbow.cfg} (89%)
 rename units/AoA_units/{rovahr/Inquisiteur.cfg => kingdoms_rovahr/Inquisitor.cfg} (93%)
 rename units/AoA_units/{rovahr/Chevalier_a_pieds.cfg => kingdoms_rovahr/Knight_On_Foots.cfg} (85%)
 rename units/AoA_units/{rovahr => kingdoms_rovahr}/Konig.cfg (96%)
 rename units/AoA_units/{rovahr/Archer_long.cfg => kingdoms_rovahr/Longbowman.cfg} (91%)
 rename units/AoA_units/{rovahr => kingdoms_rovahr}/Mage.cfg (92%)
 rename units/AoA_units/{rovahr/Homme_d_armes.cfg => kingdoms_rovahr/Men_At_Arms.cfg} (91%)
 rename units/AoA_units/{rovahr/Mercenaire.cfg => kingdoms_rovahr/Mercenary.cfg} (90%)
 rename units/AoA_units/{rovahr/Capitaine_mercenaire.cfg => kingdoms_rovahr/Mercenary_Captain.cfg} (92%)
 rename units/AoA_units/{rovahr/Moine-soldat.cfg => kingdoms_rovahr/Monk_Soldier.cfg} (88%)
 rename units/AoA_units/{rovahr => kingdoms_rovahr}/Novice.cfg (92%)
 rename units/AoA_units/{rovahr/Paysan.cfg => kingdoms_rovahr/Peasant.cfg} (88%)
 rename units/AoA_units/{rovahr/Arbaletrier_paysan.cfg => kingdoms_rovahr/Peasant_Crossbowman.cfg} (85%)
 rename units/AoA_units/{rovahr/Pretre_guerrier.cfg => kingdoms_rovahr/Priest_Fighter.cfg} (90%)
 rename units/AoA_units/{rovahr => kingdoms_rovahr}/Ritterbruder.cfg (96%)
 rename units/AoA_units/{rovahr/Archer_royal.cfg => kingdoms_rovahr/Royal_Archer.cfg} (94%)
 rename units/AoA_units/{rovahr/Sergent.cfg => kingdoms_rovahr/Sergeant.cfg} (97%)
 rename units/AoA_units/{rovahr/Ecuyer.cfg => kingdoms_rovahr/Squire.cfg} (89%)
 rename units/AoA_units/{rovahr/Templier.cfg => kingdoms_rovahr/Templar.cfg} (93%)
 rename units/AoA_units/{rovahr/Templier_capitaine.cfg => kingdoms_rovahr/Templar_Captain.cfg} (95%)
 rename units/AoA_units/{rovahr/Jeune_chevalier.cfg => kingdoms_rovahr/Young_Knight.cfg} (84%)
 rename units/AoA_units/{federation/Ancien_druide.cfg => mauve_islands_federation/Ancient_Druid.cfg} (93%)
 rename units/AoA_units/{federation/Apprenti_sorcegarde.cfg => mauve_islands_federation/Apprentice_Sorcerer.cfg} (88%)
 rename units/AoA_units/{federation/Arcaniste.cfg => mauve_islands_federation/Arcanist.cfg} (94%)
 rename units/AoA_units/{federation/Archimage.cfg => mauve_islands_federation/Archmage.cfg} (96%)
 rename units/AoA_units/{federation/Porteur_de_hache.cfg => mauve_islands_federation/Axe_Wielder.cfg} (89%)
 rename units/AoA_units/{federation/Chef_de_clan.cfg => mauve_islands_federation/Chieftain.cfg} (95%)
 rename units/AoA_units/{federation/Longbowman.cfg => mauve_islands_federation/Clans_Longbowman.cfg} (87%)
 rename units/AoA_units/{federation/Piquier_des_clans.cfg => mauve_islands_federation/Clans_Pikeman.cfg} (87%)
 rename units/AoA_units/{federation/Guerrier_des_clans.cfg => mauve_islands_federation/Clans_Warrior.cfg} (86%)
 rename units/AoA_units/{federation/Druide.cfg => mauve_islands_federation/Druid.cfg} (92%)
 rename units/AoA_units/{federation/Sorcegarde_emerite.cfg => mauve_islands_federation/Elder_Sorcerer.cfg} (93%)
 rename units/AoA_units/{federation/Sorcegarde_d'elite.cfg => mauve_islands_federation/Elite_Sorcerer.cfg} (89%)
 rename units/AoA_units/{federation/Franc-archer.cfg => mauve_islands_federation/Free_Archer.cfg} (92%)
 rename units/AoA_units/{federation => mauve_islands_federation}/Gallowglass.cfg (94%)
 rename units/AoA_units/{federation/Grand_arcaniste.cfg => mauve_islands_federation/Grand_Arcanist.cfg} (92%)
 rename units/AoA_units/{federation/Piquier_lourd.cfg => mauve_islands_federation/Heavy_Pikemen.cfg} (87%)
 rename units/AoA_units/{federation/Haut-roi.cfg => mauve_islands_federation/High_King.cfg} (92%)
 rename units/AoA_units/{federation => mauve_islands_federation}/Highlander.cfg (90%)
 rename units/AoA_units/{federation/Chevalier.cfg => mauve_islands_federation/Knight.cfg} (90%)
 rename units/AoA_units/{federation/Chevalier-arcaniste.cfg => mauve_islands_federation/Knight_Arcanist.cfg} (93%)
 rename units/AoA_units/{federation/Seigneur.cfg => mauve_islands_federation/Lord.cfg} (95%)
 rename units/AoA_units/{federation/Mage-lame.cfg => mauve_islands_federation/Mage_Blade.cfg} (90%)
 rename units/AoA_units/{federation => mauve_islands_federation}/Magister.cfg (95%)
 rename units/AoA_units/{federation => mauve_islands_federation}/Schiltron.cfg (95%)
 rename units/AoA_units/{federation/Eclaireur.cfg => mauve_islands_federation/Scout.cfg} (87%)
 rename units/AoA_units/{federation/Sorcegarde.cfg => mauve_islands_federation/Sorcerer.cfg} (89%)
 rename units/AoA_units/{federation/Etudiant.cfg => mauve_islands_federation/Student.cfg} (86%)
 rename units/AoA_units/{federation/Villageois.cfg => mauve_islands_federation/Villager.cfg} (83%)
 rename units/AoA_units/{federation/Guerrier-mage.cfg => mauve_islands_federation/Warrior_Mage.cfg} (89%)
 rename units/AoA_units/{federation/Jeune_druide.cfg => mauve_islands_federation/Young_Druid.cfg} (89%)
 rename units/AoA_units/{mork-darf/Archer-sur-griffon.cfg => morkenost_darfenlend/Archer_On_Griffin.cfg} (94%)
 rename units/AoA_units/{mork-darf/Capitaine.cfg => morkenost_darfenlend/Captain.cfg} (91%)
 rename units/AoA_units/{mork-darf/Commandant.cfg => morkenost_darfenlend/Commander.cfg} (95%)
 rename units/AoA_units/{mork-darf => morkenost_darfenlend}/Cuirassier.cfg (89%)
 rename units/AoA_units/{mork-darf/Combattant.cfg => morkenost_darfenlend/Fighter.cfg} (90%)
 rename units/AoA_units/{mork-darf/Fantassin.cfg => morkenost_darfenlend/Footdwarf.cfg} (88%)
 rename units/AoA_units/{mork-darf/Grande-magicienne.cfg => morkenost_darfenlend/Grand_Mage.cfg} (96%)
 rename units/AoA_units/{mork-darf/Hallebardier.cfg => morkenost_darfenlend/Halberdier.cfg} (91%)
 rename units/AoA_units/{mork-darf/Martelier.cfg => morkenost_darfenlend/Hammerer.cfg} (95%)
 rename units/AoA_units/{mork-darf/Arquebusier.cfg => morkenost_darfenlend/Handgunner.cfg} (89%)
 rename units/AoA_units/{mork-darf/Guerisseuse.cfg => morkenost_darfenlend/Healer.cfg} (90%)
 rename units/AoA_units/{mork-darf/Chasseur.cfg => morkenost_darfenlend/Hunter.cfg} (92%)
 rename units/AoA_units/{mork-darf/Chasseur-sur-griffon.cfg => morkenost_darfenlend/Hunter_On_Griffin.cfg} (90%)
 rename units/AoA_units/{mork-darf/Magicienne.cfg => morkenost_darfenlend/Mage.cfg} (92%)
 rename units/AoA_units/{mork-darf/Mousquetaire.cfg => morkenost_darfenlend/Muskeeter.cfg} (95%)
 rename units/AoA_units/{mork-darf/Rodeur.cfg => morkenost_darfenlend/Ranger.cfg} (96%)
 rename units/AoA_units/{mork-darf/Sergent.cfg => morkenost_darfenlend/Sergeant.cfg} (91%)
 rename units/AoA_units/{mork-darf/Chamane.cfg => morkenost_darfenlend/Shaman.cfg} (88%)
 rename units/AoA_units/{mork-darf/Soldat-lourd.cfg => morkenost_darfenlend/Shock_Soldier.cfg} (86%)
 rename units/AoA_units/{mork-darf/Ensorcelleuse.cfg => morkenost_darfenlend/Sorceress.cfg} (92%)
 rename units/AoA_units/{mork-darf/Traqueur.cfg => morkenost_darfenlend/Trapper.cfg} (92%)
 rename units/AoA_units/{mork-darf => morkenost_darfenlend}/Veteran.cfg (96%)
 rename units/AoA_units/{mork-darf/Arquebusier-veteran.cfg => morkenost_darfenlend/Veteran_Handgunner.cfg} (86%)
 rename units/AoA_units/{mork-darf/Protecteur.cfg => morkenost_darfenlend/Warden.cfg} (96%)
 rename units/AoA_units/{mork-darf/Guerrier.cfg => morkenost_darfenlend/Warrior.cfg} (88%)
 rename units/AoA_units/{mork-darf/Sage.cfg => morkenost_darfenlend/Wise.cfg} (95%)
 rename units/AoA_units/{gobmon/assassin.cfg => mountain_goblins/Assassin.cfg} (98%)
 rename units/AoA_units/{gobmon/archer.cfg => mountain_goblins/Bowman.cfg} (96%)
 rename units/AoA_units/{gobmon/chef-de-clan.cfg => mountain_goblins/Clan_Chief.cfg} (94%)
 rename units/AoA_units/{gobmon/fantassin.cfg => mountain_goblins/Footman.cfg} (97%)
 rename units/AoA_units/{gobmon/armor_2.cfg => mountain_goblins/Goblin_Bulwark.cfg} (97%)
 rename units/AoA_units/{gobmon/armor_1.cfg => mountain_goblins/Goblin_Sentinel.cfg} (97%)
 rename units/AoA_units/{gobmon/chasseur.cfg => mountain_goblins/Hunter.cfg} (91%)
 rename units/AoA_units/{gobmon/meneur.cfg => mountain_goblins/Leader.cfg} (89%)
 rename units/AoA_units/{gobmon/gobelin-medecine.cfg => mountain_goblins/Medicine_Goblin.cfg} (91%)
 rename units/AoA_units/{gobmon/chamane.cfg => mountain_goblins/Shaman.cfg} (98%)
 rename units/AoA_units/{gobmon/sournois.cfg => mountain_goblins/Sneaky.cfg} (97%)
 rename units/AoA_units/{gobmon/seigneur-de-guerre.cfg => mountain_goblins/Warlord.cfg} (98%)
 rename units/AoA_units/{gobmon/guerrier.cfg => mountain_goblins/Warrior.cfg} (88%)
 rename units/AoA_units/{gobmon/archer-loup.cfg => mountain_goblins/Wolf_Archer.cfg} (90%)
 rename units/AoA_units/{gobmon/champion-loup.cfg => mountain_goblins/Wolf_Champion.cfg} (95%)
 rename units/AoA_units/{gobmon/monteur-de-loup.cfg => mountain_goblins/Wolf_Rider.cfg} (90%)
 rename units/AoA_units/{nord/Archer_nordique.cfg => norse_jarldoms/Archer_norse_jarldomsique.cfg} (88%)
 rename units/AoA_units/{nord => norse_jarldoms}/Berserker.cfg (95%)
 rename units/AoA_units/{nord/Chevalier_nordique.cfg => norse_jarldoms/Chevalier_norse_jarldomsique.cfg} (94%)
 rename units/AoA_units/{nord/Arbaletrier.cfg => norse_jarldoms/Crossbowman.cfg} (91%)
 rename units/AoA_units/{nord/Destructeur.cfg => norse_jarldoms/Destructive.cfg} (95%)
 rename units/AoA_units/{nord/Ravageur.cfg => norse_jarldoms/Devastating.cfg} (91%)
 rename units/AoA_units/{nord/Double-hache.cfg => norse_jarldoms/Double_Axe.cfg} (85%)
 rename units/AoA_units/{nord/Garde.cfg => norse_jarldoms/Guard.cfg} (91%)
 rename units/AoA_units/{nord/Arbaletrier_lourd.cfg => norse_jarldoms/Heavy_Crossbow.cfg} (88%)
 rename units/AoA_units/{nord/Haut_roi.cfg => norse_jarldoms/High_King.cfg} (94%)
 rename units/AoA_units/{nord/Chasseur.cfg => norse_jarldoms/Hunter.cfg} (91%)
 rename units/AoA_units/{nord => norse_jarldoms}/Huskarl.cfg (92%)
 rename units/AoA_units/{nord => norse_jarldoms}/Jarl.cfg (96%)
 rename units/AoA_units/{nord => norse_jarldoms}/Maraudeur.cfg (90%)
 rename units/AoA_units/{nord/Maitre_arbaletrier.cfg => norse_jarldoms/Master_Crossbowman.cfg} (91%)
 rename units/AoA_units/{nord/Maitre_archer_monte.cfg => norse_jarldoms/Mounted_Archer.cfg} (92%)
 rename units/AoA_units/{nord/Archer_monte.cfg => norse_jarldoms/Mounted_Bowman.cfg} (89%)
 rename units/AoA_units/{nord/Huskarl_monte.cfg => norse_jarldoms/Mounted_Huskarl.cfg} (90%)
 rename units/AoA_units/{nord/Maitre_archer.cfg => norse_jarldoms/Nordic_Master_Archer.cfg} (94%)
 rename units/AoA_units/{nord/Pillard.cfg => norse_jarldoms/Pluderer.cfg} (90%)
 rename units/AoA_units/{nord => norse_jarldoms}/Rempart.cfg (95%)
 rename units/AoA_units/{nord/Cavalier.cfg => norse_jarldoms/Rider.cfg} (87%)
 rename units/AoA_units/{nord/Soldat.cfg => norse_jarldoms/Soldier.cfg} (92%)
 rename units/AoA_units/{nord => norse_jarldoms}/Thane.cfg (92%)
 rename units/AoA_units/{nord/Varegue.cfg => norse_jarldoms/Varangian.cfg} (95%)
 rename units/AoA_units/{nord => norse_jarldoms}/Viking.cfg (92%)
 rename units/AoA_units/{nord/Villageois.cfg => norse_jarldoms/Villager.cfg} (82%)
 rename units/AoA_units/{nord/Seigneur_de_guerre.cfg => norse_jarldoms/Warlord.cfg} (95%)
 rename units/AoA_units/{nord/Guerrier.cfg => norse_jarldoms/Warrior.cfg} (91%)
 rename units/AoA_units/{rov_elf/Archidruide.cfg => rovahrian_elves/Archdruid.cfg} (97%)
 rename units/AoA_units/{rov_elf/Vengeur.cfg => rovahrian_elves/Avenger.cfg} (95%)
 rename units/AoA_units/{rov_elf/Danse-lame.cfg => rovahrian_elves/Blade_Dancer.cfg} (85%)
 rename units/AoA_units/{rov_elf/Maitre-epeiste.cfg => rovahrian_elves/Blademaster.cfg} (94%)
 rename units/AoA_units/{rov_elf/Archer.cfg => rovahrian_elves/Bowman.cfg} (89%)
 rename units/AoA_units/{rov_elf/Druide.cfg => rovahrian_elves/Druid.cfg} (93%)
 rename units/AoA_units/{rov_elf/Champion-forestier.cfg => rovahrian_elves/Forest_Champion.cfg} (95%)
 rename units/AoA_units/{rov_elf/Chevalier-forestier.cfg => rovahrian_elves/Forest_Knight.cfg} (92%)
 rename units/AoA_units/{rov_elf/Patrouilleur-forestier.cfg => rovahrian_elves/Forest_Patrol.cfg} (91%)
 rename units/AoA_units/{rov_elf/Soigneur.cfg => rovahrian_elves/Healer.cfg} (92%)
 rename units/AoA_units/{rov_elf/Heraut.cfg => rovahrian_elves/Herald.cfg} (95%)
 rename units/AoA_units/{rov_elf/Haut-Seigneur.cfg => rovahrian_elves/High_Lord.cfg} (93%)
 rename units/AoA_units/{rov_elf/Seigneur.cfg => rovahrian_elves/Lord.cfg} (92%)
 rename units/AoA_units/{rov_elf => rovahrian_elves}/Mage.cfg (92%)
 rename units/AoA_units/{rov_elf/Magistere.cfg => rovahrian_elves/Magister.cfg} (95%)
 rename units/AoA_units/{rov_elf/Maitre-archer.cfg => rovahrian_elves/Master_Archer.cfg} (92%)
 rename units/AoA_units/{rov_elf => rovahrian_elves}/Noble.cfg (90%)
 rename units/AoA_units/{rov_elf => rovahrian_elves}/Ranger.cfg (92%)
 rename units/AoA_units/{rov_elf => rovahrian_elves}/Rempart.cfg (90%)
 rename units/AoA_units/{rov_elf/Cavalier.cfg => rovahrian_elves/Rider.cfg} (92%)
 rename units/AoA_units/{rov_elf/Garde-royal.cfg => rovahrian_elves/Royal_Guard.cfg} (92%)
 rename units/AoA_units/{rov_elf/Eclaireur.cfg => rovahrian_elves/Scout.cfg} (92%)
 rename units/AoA_units/{rov_elf/Lancier.cfg => rovahrian_elves/Spearman.cfg} (88%)
 rename units/AoA_units/{rov_elf/Epeiste.cfg => rovahrian_elves/Swordman.cfg} (90%)
 rename units/AoA_units/{rov_elf/Archer-de-guerre.cfg => rovahrian_elves/War_Archer.cfg} (89%)
 rename units/AoA_units/{rov_elf/Danse-guerre.cfg => rovahrian_elves/War_Dancer.cfg} (90%)

diff --git a/factions/RPG/RPG-AoA.cfg b/factions/RPG/RPG-AoA.cfg
new file mode 100644
index 000000000..9493d25ae
--- /dev/null
+++ b/factions/RPG/RPG-AoA.cfg
@@ -0,0 +1,92 @@
+#textdomain armies_of_amberan
+[multiplayer_side]
+    id=AE_AoA_side_empfinn
+    name= _ "AoA - Finn's Empire"
+    image="faction/Finn2.png"
+    type=random
+    leader=AE_AoA_finn_empire_Recruit,AE_AoA_finn_empire_Crossbowman,AE_AoA_finn_empire_Sergeant,AE_AoA_finn_empire_Rider,AE_AoA_finn_empire_Fencer,AE_AoA_finn_empire_Enchanter_Apprentice,AE_AoA_finn_empire_Handgunner,AE_AoA_finn_empire_Light_Cannon,AE_AoA_finn_empire_Citizen
+[/multiplayer_side]
+
+#textdomain armies_of_amberan
+[multiplayer_side]
+    id=AE_AoA_side_farengar
+    name= _ "AoA - Farengarians Kingdoms"
+    image="faction/Farengar2.png"
+    type=random
+    leader=AE_AoA_farengarians_kingdoms_Conscript,AE_AoA_farengarians_kingdoms_Bowman,AE_AoA_farengarians_kingdoms_Questing_Chevalier,AE_AoA_farengarians_kingdoms_Squire,AE_AoA_farengarians_kingdoms_Initiate,AE_AoA_farengarians_kingdoms_Noble,AE_AoA_farengarians_kingdoms_Apprentice,AE_AoA_farengarians_kingdoms_Peasant
+[/multiplayer_side]
+
+#textdomain armies_of_amberan
+[multiplayer_side]
+    id=AE_AoA_side_farnains
+    name= _ "AoA - Farengarian dwarves Counties"
+    image="faction/Comtes-nains2.png"
+    type=random
+    leader=AE_AoA_farengarian_dwarves_counties_Fighter,AE_AoA_farengarian_dwarves_counties_Crossbowman,AE_AoA_farengarian_dwarves_counties_Bear_Rider,AE_AoA_farengarian_dwarves_counties_Griffin_Rider,AE_AoA_farengarian_dwarves_counties_Tinker,AE_AoA_farengarian_dwarves_counties_Balista,AE_AoA_farengarian_dwarves_counties_Runic_Scribe
+    [ai]
+        recruitment_pattern=fighter,fighter,fighter,fighter,archer,archer,mixed fighter
+    [/ai]
+[/multiplayer_side]
+
+#textdomain armies_of_amberan
+[multiplayer_side]
+    id=AE_AoA_side_federation
+    name= _ "AoA - Mauve Islands Federation"
+    image="faction/Federation2.png"
+    type=random
+    leader=AE_AoA_mauve_islands_federation_Student,AE_AoA_mauve_islands_federation_Apprentice_Sorcerer,AE_AoA_mauve_islands_federation_Clans_Warrior,AE_AoA_mauve_islands_federation_Clans_Pikeman,AE_AoA_mauve_islands_federation_Scout,AE_AoA_mauve_islands_federation_Young_Druid,AE_AoA_mauve_islands_federation_Villager
+[/multiplayer_side]
+
+#textdomain armies_of_amberan
+[multiplayer_side]
+    id=AE_AoA_side_galianos
+    name= _ "AoA - Galianos Imperium"
+    image="faction/Galianos2.png"
+    type=random
+    leader=AE_AoA_galianos_Militia,AE_AoA_galianos_Civil_Guard,AE_AoA_galianos_Galianos_Duelist,AE_AoA_galianos_Rider,AE_AoA_galianos_Scout,AE_AoA_galianos_Hussar,AE_AoA_galianos_Herborist,AE_AoA_galianos_Alchemist,AE_AoA_galianos_Skirmisher,AE_AoA_galianos_Citizen
+[/multiplayer_side]
+
+#textdomain armies_of_amberan
+[multiplayer_side]
+    id=AE_AoA_side_gobmon
+    name= _ "AoA - Mountain Goblins"
+    image="faction/Gobmon2.png"
+    type=random
+    leader=AE_AoA_mountain_goblins_Warrior,AE_AoA_mountain_goblins_Hunter,AE_AoA_mountain_goblins_Leader,AE_AoA_mountain_goblins_Medicine_Goblin,AE_AoA_mountain_goblins_Sneaky,AE_AoA_mountain_goblins_Wolf_Rider
+[/multiplayer_side]
+
+#textdomain armies_of_amberan
+[multiplayer_side]
+    id=AE_AoA_side_morkdarf
+    name= _ "AoA - Dwarven Kingdoms of Morkenost and Darfenlend"
+    image="faction/Morkenost-Darfenlend2.png"
+    type=random
+    leader=AE_AoA_morkenost_darfenlend_Footdwarf,AE_AoA_morkenost_darfenlend_Handgunner,AE_AoA_morkenost_darfenlend_Shock_Soldier,AE_AoA_morkenost_darfenlend_Sergent,AE_AoA_morkenost_darfenlend_Shaman,AE_AoA_morkenost_darfenlend_Fighter,AE_AoA_morkenost_darfenlend_Hunter,AE_AoA_morkenost_darfenlend_Hunter_On_Griffin
+[/multiplayer_side]
+
+#textdomain armies_of_amberan
+[multiplayer_side]
+    id=AE_AoA_side_nordian
+    name= _ "AoA - Norse Jarldoms"
+    image="faction/Nord2.png"
+    type=random
+    leader=AE_AoA_norse_jarldoms_Warrior,AE_AoA_norse_jarldoms_Guard,AE_AoA_norse_jarldoms_Hunter,AE_AoA_norse_jarldoms_Rider,AE_AoA_norse_jarldoms_Double_Axe,AE_AoA_norse_jarldoms_Pluderer,AE_AoA_norse_jarldoms_Crossbowman,AE_AoA_norse_jarldoms_Villager
+[/multiplayer_side]
+
+#textdomain armies_of_amberan
+[multiplayer_side]
+    id=AE_AoA_side_rovahr
+    name= _ "AoA - Kingdoms of Rovahr"
+    image="faction/Rovahr2.png"
+    type=random
+    leader=AE_AoA_kingdoms_rovahr_Feudal_Levy,AE_AoA_kingdoms_rovahr_Peasant_Crossbowman,AE_AoA_kingdoms_rovahr_Squire,AE_AoA_kingdoms_rovahr_Young_Knight,AE_AoA_kingdoms_rovahr_Monk_Soldier,AE_AoA_kingdoms_rovahr_Aspirant_Templar,AE_AoA_kingdoms_rovahr_Novice,AE_AoA_kingdoms_rovahr_Peasant
+[/multiplayer_side]
+
+#textdomain armies_of_amberan
+[multiplayer_side]
+    id=AE_AoA_side_rovelf
+    name= _ "AoA - Rovahrian elves"
+    image="faction/Elfes-Rovahriens2.png"
+    type=random
+    leader=AE_AoA_rovahrian_elves_Spearman,AE_AoA_rovahrian_elves_Bowman,AE_AoA_rovahrian_elves_Noble,AE_AoA_rovahrian_elves_Healer,AE_AoA_rovahrian_elves_Blade_Dancer,AE_AoA_rovahrian_elves_Scout,AE_AoA_rovahrian_elves_Forest_Patrol
+[/multiplayer_side]
diff --git a/factions/default/default-AoA.cfg b/factions/default/default-AoA.cfg
index 3799155c3..908ef1518 100644
--- a/factions/default/default-AoA.cfg
+++ b/factions/default/default-AoA.cfg
@@ -4,8 +4,8 @@
     name= _ "AoA - Finn's Empire"
     image="faction/Finn2.png"
     type=random
-    leader=AE_AoA_empfinn_capitaine,AE_AoA_empfinn_epeiste,AE_AoA_empfinn_piquier,AE_AoA_empfinn_soldat_hel,AE_AoA_empfinn_arbaletrier_lourd,AE_AoA_empfinn_arbaletrier_hel,AE_AoA_empfinn_tireur,AE_AoA_empfinn_enchanteur,AE_AoA_empfinn_dueliste
-    recruit=AE_AoA_empfinn_recrue,AE_AoA_empfinn_arbaletrier,AE_AoA_empfinn_sergent,AE_AoA_empfinn_cavalier,AE_AoA_empfinn_bretteur,AE_AoA_empfinn_apprentiEnchanteur,AE_AoA_empfinn_arquebusier,AE_AoA_empfinn_canon_leger,AE_AoA_empfinn_citoyen
+    leader=AE_AoA_finn_empire_Captain,AE_AoA_finn_empire_Swordman,AE_AoA_finn_empire_Pikeman,AE_AoA_finn_empire_Helgrindian_Soldier,AE_AoA_finn_empire_Heavy_Crossbowman,AE_AoA_finn_empire_Helgrindian_Crossbowman,AE_AoA_finn_empire_Sharpshooter,AE_AoA_finn_empire_Enchanter,AE_AoA_finn_empire_Duelist
+    recruit=AE_AoA_finn_empire_Recruit,AE_AoA_finn_empire_Crossbowman,AE_AoA_finn_empire_Sergeant,AE_AoA_finn_empire_Rider,AE_AoA_finn_empire_Fencer,AE_AoA_finn_empire_Enchanter_Apprentice,AE_AoA_finn_empire_Handgunner,AE_AoA_finn_empire_Light_Cannon,AE_AoA_finn_empire_Citizen
     [ai]
         recruitment_pattern=fighter,fighter,fighter,fighter,archer,archer,healer,scout
     [/ai]
@@ -17,8 +17,8 @@
     name= _ "AoA - Farengarians Kingdoms"
     image="faction/Farengar2.png"
     type=random
-    leader=AE_AoA_farengar_seigneur,AE_AoA_farengar_mage,AE_AoA_farengar_arcaniste,AE_AoA_farengar_paladin,AE_AoA_farengar_chevalierAPieds,AE_AoA_farengar_archerLong,AE_AoA_farengar_arbaletrier,AE_AoA_farengar_clerc,AE_AoA_farengar_fantassin,AE_AoA_farengar_hallebardier
-    recruit=AE_AoA_farengar_conscrit,AE_AoA_farengar_archer,AE_AoA_farengar_chevalierErrant,AE_AoA_farengar_ecuyer,AE_AoA_farengar_initie,AE_AoA_farengar_noble,AE_AoA_farengar_apprenti,AE_AoA_farengar_paysan
+    leader=AE_AoA_farengarians_kingdoms_Lord,AE_AoA_farengarians_kingdoms_Mage,AE_AoA_farengarians_kingdoms_Arcanist,AE_AoA_farengarians_kingdoms_Paladin,AE_AoA_farengarians_kingdoms_Chevalier_On_Foots,AE_AoA_farengarians_kingdoms_Longbowman,AE_AoA_farengarians_kingdoms_Crossbowman,AE_AoA_farengarians_kingdoms_Cleric,AE_AoA_farengarians_kingdoms_Footman,AE_AoA_farengarians_kingdoms_Halberdier
+    recruit=AE_AoA_farengarians_kingdoms_Conscript,AE_AoA_farengarians_kingdoms_Bowman,AE_AoA_farengarians_kingdoms_Questing_Chevalier,AE_AoA_farengarians_kingdoms_Squire,AE_AoA_farengarians_kingdoms_Initiate,AE_AoA_farengarians_kingdoms_Noble,AE_AoA_farengarians_kingdoms_Apprentice,AE_AoA_farengarians_kingdoms_Peasant
     [ai]
         recruitment_pattern=fighter,fighter,fighter,fighter,archer,archer,mixed fighter,healer
     [/ai]
@@ -27,11 +27,11 @@
 #textdomain armies_of_amberan
 [multiplayer_side]
     id=AE_AoA_side_farnains
-    name= _ "AoA - Farengarian dwarve's Counties"
+    name= _ "AoA - Farengarian dwarves Counties"
     image="faction/Comtes-nains2.png"
     type=random
-    leader=AE_AoA_farnains_thane,AE_AoA_farnains_guerrierLourd,AE_AoA_farnains_garde,AE_AoA_farnains_sentinelle,AE_AoA_farnains_arquebusier,AE_AoA_farnains_ingenieur,AE_AoA_farnains_forgeronRunique
-    recruit=AE_AoA_farnains_guerrier,AE_AoA_farnains_arbaletrier,AE_AoA_farnains_oursier,AE_AoA_farnains_chevaucheurDeGriffon,AE_AoA_farnains_bricoleur,AE_AoA_farnains_baliste,AE_AoA_farnains_scribeRunique
+    leader=AE_AoA_farengarian_dwarves_counties_Thane,AE_AoA_farengarian_dwarves_counties_Heavy_Fighter,AE_AoA_farengarian_dwarves_counties_Guard,AE_AoA_farengarian_dwarves_counties_Sentinel,AE_AoA_farengarian_dwarves_counties_Handgunner,AE_AoA_farengarian_dwarves_counties_Engeener,AE_AoA_farengarian_dwarves_counties_Runic_Smith
+    recruit=AE_AoA_farengarian_dwarves_counties_Fighter,AE_AoA_farengarian_dwarves_counties_Crossbowman,AE_AoA_farengarian_dwarves_counties_Bear_Rider,AE_AoA_farengarian_dwarves_counties_Griffin_Rider,AE_AoA_farengarian_dwarves_counties_Tinker,AE_AoA_farengarian_dwarves_counties_Balista,AE_AoA_farengarian_dwarves_counties_Runic_Scribe
     [ai]
         recruitment_pattern=fighter,fighter,fighter,fighter,archer,archer,mixed fighter
     [/ai]
@@ -43,8 +43,8 @@
     name= _ "AoA - Mauve Islands Federation"
     image="faction/Federation2.png"
     type=random
-    leader=AE_AoA_federation_arcaniste,AE_AoA_federation_guerrierMage,AE_AoA_federation_mageLame,AE_AoA_federation_highlander,AE_AoA_federation_chevalier,AE_AoA_federation_piquierLourd,AE_AoA_federation_druide,AE_AoA_federation_porteurDeHache,AE_AoA_federation_longbowman,AE_AoA_federation_sorcegarde
-    recruit=AE_AoA_federation_etudiant,AE_AoA_federation_apprentiSorcegarde,AE_AoA_federation_guerrier,AE_AoA_federation_piquier,AE_AoA_federation_eclaireur,AE_AoA_federation_jeuneDruide,AE_AoA_federation_villageois
+    leader=AE_AoA_mauve_islands_federation_Arcanist,AE_AoA_mauve_islands_federation_Warrior_Mage,AE_AoA_mauve_islands_federation_Mage_Blade,AE_AoA_mauve_islands_federation_Highlander,AE_AoA_mauve_islands_federation_Knight,AE_AoA_mauve_islands_federation_Heavy_Pikeman,AE_AoA_mauve_islands_federation_Druid,AE_AoA_mauve_islands_federation_Axe_Wielder,AE_AoA_mauve_islands_federation_Clans_Longbowman,AE_AoA_mauve_islands_federation_Sorcerer
+    recruit=AE_AoA_mauve_islands_federation_Student,AE_AoA_mauve_islands_federation_Apprentice_Sorcerer,AE_AoA_mauve_islands_federation_Clans_Warrior,AE_AoA_mauve_islands_federation_Clans_Pikeman,AE_AoA_mauve_islands_federation_Scout,AE_AoA_mauve_islands_federation_Young_Druid,AE_AoA_mauve_islands_federation_Villager
     [ai]
         recruitment_pattern=fighter,fighter,fighter,mixed fighter,mixed fighter,healer,scout
     [/ai]
@@ -56,8 +56,8 @@
     name= _ "AoA - Galianos Imperium"
     image="faction/Galianos2.png"
     type=random
-    leader=AE_AoA_galianos_gendarmeAPieds,AE_AoA_galianos_epeiste,AE_AoA_galianos_fantassin,AE_AoA_galianos_piquier,AE_AoA_galianos_arbaletrierAvecPavois,AE_AoA_galianos_apothicaire,AE_AoA_galianos_pyromancien,AE_AoA_galianos_javeleniste,AE_AoA_galianos_gardeForestier
-    recruit=AE_AoA_galianos_milicien,AE_AoA_galianos_gardeCivil,AE_AoA_galianos_spadassin,AE_AoA_galianos_cavalier,AE_AoA_galianos_eclaireur,AE_AoA_galianos_hussard,AE_AoA_galianos_herboriste,AE_AoA_galianos_alchimiste,AE_AoA_galianos_escarmoucheur,AE_AoA_galianos_citoyen
+    leader=AE_AoA_galianos_Gendarme_On_Foots,AE_AoA_galianos_Swordman,AE_AoA_galianos_Footman,AE_AoA_galianos_Pikeman,AE_AoA_galianos_Crossbowman_With_Bulkward,AE_AoA_galianos_Apothecary,AE_AoA_galianos_Pyromancer,AE_AoA_galianos_Javelinist,AE_AoA_galianos_Ranger
+    recruit=AE_AoA_galianos_Militia,AE_AoA_galianos_Civil_Guard,AE_AoA_galianos_Galianos_Duelist,AE_AoA_galianos_Rider,AE_AoA_galianos_Scout,AE_AoA_galianos_Hussar,AE_AoA_galianos_Herborist,AE_AoA_galianos_Alchemist,AE_AoA_galianos_Skirmisher,AE_AoA_galianos_Citizen
     [ai]
         recruitment_pattern=fighter,fighter,fighter,fighter,archer,archer,healer,scout
     [/ai]
@@ -69,8 +69,8 @@
     name= _ "AoA - Mountain Goblins"
     image="faction/Gobmon2.png"
     type=random
-    leader=AE_AoA_gobmon_chefDeClan,AE_AoA_gobmon_chamane,AE_AoA_gobmon_archerLoup,AE_ext_northerns_Troll_Shaman
-    recruit=AE_AoA_gobmon_guerrier,AE_AoA_gobmon_chasseur,AE_AoA_gobmon_meneur,AE_AoA_gobmon_gobelinMedecine,AE_AoA_gobmon_sournois,AE_AoA_gobmon_monteurDeLoup,AE_ext_northerns_Troll_Whelp,AE_arc_orcs_Marabou_Stork,AE_ext_monsters_Young_Gryphon,AE_imp_Sidhe_Young_Bear
+    leader=AE_AoA_mountain_goblins_Clan_Chief,AE_AoA_mountain_goblins_Shaman,AE_AoA_mountain_goblins_Wolf_Archer,AE_ext_northerns_Troll_Shaman
+    recruit=AE_AoA_mountain_goblins_Warrior,AE_AoA_mountain_goblins_Hunter,AE_AoA_mountain_goblins_Leader,AE_AoA_mountain_goblins_Medicine_Goblin,AE_AoA_mountain_goblins_Sneaky,AE_AoA_mountain_goblins_Wolf_Rider,AE_ext_northerns_Troll_Whelp,AE_arc_orcs_Marabou_Stork,AE_ext_monsters_Young_Gryphon,AE_imp_Sidhe_Young_Bear
     [ai]
         recruitment_pattern=fighter,fighter,fighter,archer,archer,mixed fighter,healer,scout,scout
     [/ai]
@@ -82,8 +82,8 @@
     name= _ "AoA - Dwarven Kingdoms of Morkenost and Darfenlend"
     image="faction/Morkenost-Darfenlend2.png"
     type=random
-    leader=AE_AoA_morkdarf_capitaine,AE_AoA_morkdarf_hallebardier,AE_AoA_morkdarf_arquebusierVeteran,AE_AoA_morkdarf_cuirassier,AE_AoA_morkdarf_guerrier,AE_AoA_morkdarf_traqueur,AE_AoA_morkdarf_ensorcelleuse,AE_AoA_morkdarf_guerisseuse
-    recruit=AE_AoA_morkdarf_fantassin,AE_AoA_morkdarf_arquebusier,AE_AoA_morkdarf_soldatLourd,AE_AoA_morkdarf_sergent,AE_AoA_morkdarf_chamane,AE_AoA_morkdarf_combattant,AE_AoA_morkdarf_chasseur,AE_AoA_morkdarf_chasseurSurGriffon
+    leader=AE_AoA_morkenost_darfenlend_Captain,AE_AoA_morkenost_darfenlend_Halberdier,AE_AoA_morkenost_darfenlend_Veteran_Handgunner,AE_AoA_morkenost_darfenlend_Cuirassier,AE_AoA_morkenost_darfenlend_Warrior,AE_AoA_morkenost_darfenlend_Trapper,AE_AoA_morkenost_darfenlend_Sorceress,AE_AoA_morkenost_darfenlend_Healer
+    recruit=AE_AoA_morkenost_darfenlend_Footdwarf,AE_AoA_morkenost_darfenlend_Handgunner,AE_AoA_morkenost_darfenlend_Shock_Soldier,AE_AoA_morkenost_darfenlend_Sergent,AE_AoA_morkenost_darfenlend_Shaman,AE_AoA_morkenost_darfenlend_Fighter,AE_AoA_morkenost_darfenlend_Hunter,AE_AoA_morkenost_darfenlend_Hunter_On_Griffin
     [ai]
         recruitment_pattern=fighter,fighter,fighter,archer,archer,mixed fighter,healer,scout
     [/ai]
@@ -95,8 +95,8 @@
     name= _ "AoA - Norse Jarldoms"
     image="faction/Nord2.png"
     type=random
-    leader=AE_AoA_nordian_huskarl,AE_AoA_nordian_soldat,AE_AoA_nordian_arbaletrierLourd,AE_AoA_nordian_viking,AE_AoA_nordian_ravageur,AE_AoA_nordian_maraudeur,AE_AoA_nordian_archer
-    recruit=AE_AoA_nordian_guerrier,AE_AoA_nordian_garde,AE_AoA_nordian_chasseur,AE_AoA_nordian_cavalier,AE_AoA_nordian_doubleHache,AE_AoA_nordian_pillard,AE_AoA_nordian_arbaletrier,AE_AoA_nordian_villageois
+    leader=AE_AoA_norse_jarldoms_Huskarl,AE_AoA_norse_jarldoms_Soldier,AE_AoA_norse_jarldoms_Heavy_Crossbowman,AE_AoA_norse_jarldoms_Viking,AE_AoA_norse_jarldoms_Devastating,AE_AoA_norse_jarldoms_Maraudeur,AE_AoA_norse_jarldoms_Nordic_Bowman
+    recruit=AE_AoA_norse_jarldoms_Warrior,AE_AoA_norse_jarldoms_Guard,AE_AoA_norse_jarldoms_Hunter,AE_AoA_norse_jarldoms_Rider,AE_AoA_norse_jarldoms_Double_Axe,AE_AoA_norse_jarldoms_Pluderer,AE_AoA_norse_jarldoms_Crossbowman,AE_AoA_norse_jarldoms_Villager
     [ai]
         recruitment_pattern=fighter,fighter,fighter,mixed fighter,archer,scout
     [/ai]
@@ -108,8 +108,8 @@
     name= _ "AoA - Kingdoms of Rovahr"
     image="faction/Rovahr2.png"
     type=random
-    leader=AE_AoA_rovahr_chevalierAPieds,AE_AoA_rovahr_mercenaire,AE_AoA_rovahr_hommeDArmes,AE_AoA_rovahr_arbaletrierLourd,AE_AoA_rovahr_archerLong,AE_AoA_rovahr_templier,AE_AoA_rovahr_pretreGuerrier,AE_AoA_rovahr_inquisiteur,AE_AoA_rovahr_mage
-    recruit=AE_AoA_rovahr_leveeFeodale,AE_AoA_rovahr_arbaletrierPaysan,AE_AoA_rovahr_ecuyer,AE_AoA_rovahr_jeuneChevalier,AE_AoA_rovahr_moineSoldat,AE_AoA_rovahr_aspirantTemplier,AE_AoA_rovahr_novice,AE_AoA_rovahr_paysan
+    leader=AE_AoA_kingdoms_rovahr_Knight_On_Foots,AE_AoA_kingdoms_rovahr_Mercenary,AE_AoA_kingdoms_rovahr_Men_At_Arms,AE_AoA_kingdoms_rovahr_Heavy_Crossbow,AE_AoA_kingdoms_rovahr_Longbowman,AE_AoA_kingdoms_rovahr_Templar,AE_AoA_kingdoms_rovahr_Priest_Fighter,AE_AoA_kingdoms_rovahr_Inquisitor,AE_AoA_kingdoms_rovahr_Mage
+    recruit=AE_AoA_kingdoms_rovahr_Feudal_Levy,AE_AoA_kingdoms_rovahr_Peasant_Crossbowman,AE_AoA_kingdoms_rovahr_Squire,AE_AoA_kingdoms_rovahr_Young_Knight,AE_AoA_kingdoms_rovahr_Monk_Soldier,AE_AoA_kingdoms_rovahr_Aspirant_Templar,AE_AoA_kingdoms_rovahr_Novice,AE_AoA_kingdoms_rovahr_Peasant
     [ai]
         recruitment_pattern=fighter,fighter,fighter,fighter,archer,archer,mixed fighter,healer
     [/ai]
@@ -121,8 +121,8 @@
     name= _ "AoA - Rovahrian elves"
     image="faction/Elfes-Rovahriens2.png"
     type=random
-    leader=AE_AoA_rovelf_seigneur,AE_AoA_rovelf_mage,AE_AoA_rovelf_druide,AE_AoA_rovelf_epeiste,AE_AoA_rovelf_rempart,AE_AoA_rovelf_archerDeGuerre,AE_AoA_rovelf_ranger
-    recruit=AE_AoA_rovelf_lancier,AE_AoA_rovelf_archer,AE_AoA_rovelf_noble,AE_AoA_rovelf_soigneur,AE_AoA_rovelf_danseLame,AE_AoA_rovelf_eclaireur,AE_AoA_rovelf_patrouilleurForestier,Wose
+    leader=AE_AoA_rovahrian_elves_Lord,AE_AoA_rovahrian_elves_Mage,AE_AoA_rovahrian_elves_Druid,AE_AoA_rovahrian_elves_Swordman,AE_AoA_rovahrian_elves_Rempart,AE_AoA_rovahrian_elves_War_Archer,AE_AoA_rovahrian_elves_Ranger
+    recruit=AE_AoA_rovahrian_elves_Spearman,AE_AoA_rovahrian_elves_Bowman,AE_AoA_rovahrian_elves_Noble,AE_AoA_rovahrian_elves_Healer,AE_AoA_rovahrian_elves_Blade_Dancer,AE_AoA_rovahrian_elves_Scout,AE_AoA_rovahrian_elves_Forest_Patrol,Wose
     [ai]
         recruitment_pattern=fighter,fighter,fighter,archer,archer,mixed fighter,healer,scout
     [/ai]
diff --git a/factions/heroes/heroes-AoA.cfg b/factions/heroes/heroes-AoA.cfg
index f3c9a3669..dfcff0732 100644
--- a/factions/heroes/heroes-AoA.cfg
+++ b/factions/heroes/heroes-AoA.cfg
@@ -4,8 +4,8 @@
     name= _ "AoA - Finn's Empire"
     image="faction/Finn2.png"
     type=random
-    leader=AE_AoA_empfinn_commandant,AE_AoA_empfinn_lansquenet,AE_AoA_empfinn_hallebardier,AE_AoA_empfinn_soldat_lourd,AE_AoA_empfinn_maitreArbaletrier,AE_AoA_empfinn_arbaletrier_hel_lourd,AE_AoA_empfinn_maitreDArmes,AE_AoA_empfinn_maitreEnchanteur
-    recruit=AE_AoA_empfinn_recrue,AE_AoA_empfinn_arbaletrier,AE_AoA_empfinn_sergent,AE_AoA_empfinn_cavalier,AE_AoA_empfinn_bretteur,AE_AoA_empfinn_apprentiEnchanteur,AE_AoA_empfinn_arquebusier,AE_AoA_empfinn_capitaine,AE_AoA_empfinn_epeiste,AE_AoA_empfinn_piquier,AE_AoA_empfinn_soldat_hel,AE_AoA_empfinn_arbaletrier_lourd,AE_AoA_empfinn_arbaletrier_hel,AE_AoA_empfinn_tireur,AE_AoA_empfinn_noble,AE_AoA_empfinn_reitre,AE_AoA_empfinn_enchanteur,AE_AoA_empfinn_dueliste,AE_AoA_empfinn_canon_leger,AE_AoA_empfinn_canon,AE_AoA_empfinn_mortier,AE_AoA_empfinn_citoyen
+    leader=AE_AoA_finn_empire_Commander,AE_AoA_finn_empire_Lansquenet,AE_AoA_finn_empire_Halberdier,AE_AoA_finn_empire_Helgrindian_Heavy_Soldier,AE_AoA_finn_empire_Master_Crossbowman,AE_AoA_finn_empire_Helgrindian_Heavy_Crossbowman,AE_AoA_finn_empire_Master_At_Arms,AE_AoA_finn_empire_Master_Enchanter
+    recruit=AE_AoA_finn_empire_Recruit,AE_AoA_finn_empire_Crossbowman,AE_AoA_finn_empire_Sergeant,AE_AoA_finn_empire_Rider,AE_AoA_finn_empire_Fencer,AE_AoA_finn_empire_Enchanter_Apprentice,AE_AoA_finn_empire_Handgunner,AE_AoA_finn_empire_Captain,AE_AoA_finn_empire_Swordman,AE_AoA_finn_empire_Pikeman,AE_AoA_finn_empire_Helgrindian_Soldier,AE_AoA_finn_empire_Heavy_Crossbowman,AE_AoA_finn_empire_Helgrindian_Crossbowman,AE_AoA_finn_empire_Sharpshooter,AE_AoA_finn_empire_Noble,AE_AoA_finn_empire_Reiter,AE_AoA_finn_empire_Enchanter,AE_AoA_finn_empire_Duelist,AE_AoA_finn_empire_Light_Cannon,AE_AoA_finn_empire_Cannon,AE_AoA_finn_empire_Mortar,AE_AoA_finn_empire_Citizen
     [ai]
         recruitment_pattern=fighter,fighter,fighter,fighter,archer,archer,healer,scout,mixed fighter
     [/ai]
@@ -17,8 +17,8 @@
     name= _ "AoA - Farengarians Kingdoms"
     image="faction/Farengar2.png"
     type=random
-    leader=AE_AoA_farengar_comte,AE_AoA_farengar_maitrePaladin,AE_AoA_farengar_champion,AE_AoA_farengar_gardeDucal,AE_AoA_farengar_sergent,AE_AoA_farengar_maitreArcher,AE_AoA_farengar_maitreArbaletrier,AE_AoA_farengar_grandClerc,AE_AoA_farengar_mageDeBataille,AE_AoA_farengar_grandArcaniste
-    recruit=AE_AoA_farengar_conscrit,AE_AoA_farengar_archer,AE_AoA_farengar_chevalierErrant,AE_AoA_farengar_ecuyer,AE_AoA_farengar_initie,AE_AoA_farengar_noble,AE_AoA_farengar_apprenti,AE_AoA_farengar_seigneur,AE_AoA_farengar_mage,AE_AoA_farengar_arcaniste,AE_AoA_farengar_paladin,AE_AoA_farengar_chevalierAPieds,AE_AoA_farengar_archerLong,AE_AoA_farengar_arbaletrier,AE_AoA_farengar_clerc,AE_AoA_farengar_fantassin,AE_AoA_farengar_hallebardier,AE_AoA_farengar_chevalier,AE_AoA_farengar_lancier,AE_AoA_farengar_paysan,AE_AoA_farengar_arquebusier
+    leader=AE_AoA_farengarians_kingdoms_Count,AE_AoA_farengarians_kingdoms_Master_Paladin,AE_AoA_farengarians_kingdoms_Champion,AE_AoA_farengarians_kingdoms_Ducal_Guard,AE_AoA_farengarians_kingdoms_Sergeant,AE_AoA_farengarians_kingdoms_Archer,AE_AoA_farengarians_kingdoms_Master_Crossbowman,AE_AoA_farengarians_kingdoms_High_Cleric,AE_AoA_farengarians_kingdoms_Battle_Mage,AE_AoA_farengarians_kingdoms_Great_Arcanist
+    recruit=AE_AoA_farengarians_kingdoms_Conscript,AE_AoA_farengarians_kingdoms_Bowman,AE_AoA_farengarians_kingdoms_Questing_Chevalier,AE_AoA_farengarians_kingdoms_Squire,AE_AoA_farengarians_kingdoms_Initiate,AE_AoA_farengarians_kingdoms_Noble,AE_AoA_farengarians_kingdoms_Apprentice,AE_AoA_farengarians_kingdoms_Lord,AE_AoA_farengarians_kingdoms_Mage,AE_AoA_farengarians_kingdoms_Arcanist,AE_AoA_farengarians_kingdoms_Paladin,AE_AoA_farengarians_kingdoms_Chevalier_On_Foots,AE_AoA_farengarians_kingdoms_Longbowman,AE_AoA_farengarians_kingdoms_Crossbowman,AE_AoA_farengarians_kingdoms_Cleric,AE_AoA_farengarians_kingdoms_Footman,AE_AoA_farengarians_kingdoms_Halberdier,AE_AoA_farengarians_kingdoms_Chevalier,AE_AoA_farengarians_kingdoms_Lancer,AE_AoA_farengarians_kingdoms_Peasant,AE_AoA_farengarians_kingdoms_Handgunner
     [ai]
         recruitment_pattern=fighter,fighter,fighter,fighter,archer,archer,mixed fighter,healer
     [/ai]
@@ -30,8 +30,8 @@
     name= _ "AoA - Farengarian dwarve's Counties"
     image="faction/Comtes-nains2.png"
     type=random
-    leader=AE_AoA_farnains_seigneur,AE_AoA_farnains_gardeDArgent,AE_AoA_farnains_champion,AE_AoA_farnains_cranequinier,AE_AoA_farnains_artificier,AE_AoA_farnains_maitreIngenieur,AE_AoA_farnains_mageDesRunes
-    recruit=AE_AoA_farnains_guerrier,AE_AoA_farnains_arbaletrier,AE_AoA_farnains_oursier,AE_AoA_farnains_chevaucheurDeGriffon,AE_AoA_farnains_bricoleur,AE_AoA_farnains_baliste,AE_AoA_farnains_scribeRunique,AE_AoA_farnains_thane,AE_AoA_farnains_guerrierLourd,AE_AoA_farnains_garde,AE_AoA_farnains_sentinelle,AE_AoA_farnains_arquebusier,AE_AoA_farnains_ingenieur,AE_AoA_farnains_forgeronRunique,AE_AoA_farnains_chevalierOurs,AE_AoA_farnains_chevalierGriffon,AE_AoA_farnains_grandeBaliste,AE_AoA_farnains_bombarde
+    leader=AE_AoA_farengarian_dwarves_counties_Lord,AE_AoA_farengarian_dwarves_counties_Silver_Guard,AE_AoA_farengarian_dwarves_counties_Champion,AE_AoA_farengarian_dwarves_counties_Arbalester,AE_AoA_farengarian_dwarves_counties_Artificer,AE_AoA_farengarian_dwarves_counties_Master_Engeener,AE_AoA_farengarian_dwarves_counties_Runes_Mage
+    recruit=AE_AoA_farengarian_dwarves_counties_Fighter,AE_AoA_farengarian_dwarves_counties_Crossbowman,AE_AoA_farengarian_dwarves_counties_Bear_Rider,AE_AoA_farengarian_dwarves_counties_Griffin_Rider,AE_AoA_farengarian_dwarves_counties_Tinker,AE_AoA_farengarian_dwarves_counties_Balista,AE_AoA_farengarian_dwarves_counties_Runic_Scribe,AE_AoA_farengarian_dwarves_counties_Thane,AE_AoA_farengarian_dwarves_counties_Heavy_Fighter,AE_AoA_farengarian_dwarves_counties_Guard,AE_AoA_farengarian_dwarves_counties_Sentinel,AE_AoA_farengarian_dwarves_counties_Handgunner,AE_AoA_farengarian_dwarves_counties_Engeener,AE_AoA_farengarian_dwarves_counties_Runic_Smith,AE_AoA_farengarian_dwarves_counties_Bear_Knight,AE_AoA_farengarian_dwarves_counties_Griffin_Knight,AE_AoA_farengarian_dwarves_counties_Great_Ballista,AE_AoA_farengarian_dwarves_counties_Bombard
     [ai]
         recruitment_pattern=fighter,fighter,fighter,fighter,archer,archer,mixed fighter
     [/ai]
@@ -43,8 +43,8 @@
     name= _ "AoA - Mauve Islands Federation"
     image="faction/Federation2.png"
     type=random
-    leader=AE_AoA_federation_grandArcaniste,AE_AoA_federation_chevalierArcaniste,AE_AoA_federation_magister,AE_AoA_federation_chefDeClan,AE_AoA_federation_seigneur,AE_AoA_federation_schiltron,AE_AoA_federation_gallowglass,AE_AoA_federation_francArcher,AE_AoA_federation_ancienDruide,AE_AoA_federation_sorcegardeDElite
-    recruit=AE_AoA_federation_etudiant,AE_AoA_federation_apprentiSorcegarde,AE_AoA_federation_guerrier,AE_AoA_federation_piquier,AE_AoA_federation_eclaireur,AE_AoA_federation_jeuneDruide,AE_AoA_federation_arcaniste,AE_AoA_federation_guerrierMage,AE_AoA_federation_mageLame,AE_AoA_federation_highlander,AE_AoA_federation_chevalier,AE_AoA_federation_piquierLourd,AE_AoA_federation_druide,AE_AoA_federation_porteurDeHache,AE_AoA_federation_longbowman,AE_AoA_federation_sorcegarde,AE_AoA_federation_villageois
+    leader=AE_AoA_mauve_islands_federation_Grand_Arcanist,AE_AoA_mauve_islands_federation_Knight_Arcanist,AE_AoA_mauve_islands_federation_Magister,AE_AoA_mauve_islands_federation_Chieftain,AE_AoA_mauve_islands_federation_Lord,AE_AoA_mauve_islands_federation_Schiltron,AE_AoA_mauve_islands_federation_Gallowglass,AE_AoA_mauve_islands_federation_Free_Archer,AE_AoA_mauve_islands_federation_Ancient_Druid,AE_AoA_mauve_islands_federation_Elite_Sorcerer
+    recruit=AE_AoA_mauve_islands_federation_Student,AE_AoA_mauve_islands_federation_Apprentice_Sorcerer,AE_AoA_mauve_islands_federation_Clans_Warrior,AE_AoA_mauve_islands_federation_Clans_Pikeman,AE_AoA_mauve_islands_federation_Scout,AE_AoA_mauve_islands_federation_Young_Druid,AE_AoA_mauve_islands_federation_Arcanist,AE_AoA_mauve_islands_federation_Warrior_Mage,AE_AoA_mauve_islands_federation_Mage_Blade,AE_AoA_mauve_islands_federation_Highlander,AE_AoA_mauve_islands_federation_Knight,AE_AoA_mauve_islands_federation_Heavy_Pikeman,AE_AoA_mauve_islands_federation_Druid,AE_AoA_mauve_islands_federation_Axe_Wielder,AE_AoA_mauve_islands_federation_Clans_Longbowman,AE_AoA_mauve_islands_federation_Sorcerer,AE_AoA_mauve_islands_federation_Villager
     [ai]
         recruitment_pattern=fighter,fighter,fighter,mixed fighter,mixed fighter,healer,scout,archer
     [/ai]
@@ -56,8 +56,8 @@
     name= _ "AoA - Galianos Imperium"
     image="faction/Galianos2.png"
     type=random
-    leader=AE_AoA_galianos_condotierreAPieds,AE_AoA_galianos_fantassinLourd,AE_AoA_galianos_piquierLourd,AE_AoA_galianos_arbaletrierAstraidien,AE_AoA_galianos_epeisteLourd,AE_AoA_galianos_maitrePyromancien,AE_AoA_galianos_javelenisteDElite,AE_AoA_galianos_rodeur
-    recruit=AE_AoA_galianos_milicien,AE_AoA_galianos_gardeCivil,AE_AoA_galianos_cavalier,AE_AoA_galianos_spadassin,AE_AoA_galianos_eclaireur,AE_AoA_galianos_hussard,AE_AoA_galianos_herboriste,AE_AoA_galianos_alchimiste,AE_AoA_galianos_escarmoucheur,AE_AoA_galianos_epeiste,AE_AoA_galianos_gendarmeAPieds,AE_AoA_galianos_fantassin,AE_AoA_galianos_piquier,AE_AoA_galianos_arbaletrierAvecPavois,AE_AoA_galianos_apothicaire,AE_AoA_galianos_pyromancien,AE_AoA_galianos_javeleniste,AE_AoA_galianos_gardeForestier,AE_AoA_galianos_lancier,AE_AoA_galianos_gendarme,AE_AoA_galianos_arbaletrierMonte,AE_AoA_galianos_citoyen
+    leader=AE_AoA_galianos_Condotierre_On_Foots,AE_AoA_galianos_Heavy_Footman,AE_AoA_galianos_Heavy_Pikemen,AE_AoA_galianos_Astraidian_Crossbowman,AE_AoA_galianos_Elite_Swordman,AE_AoA_galianos_Master_Pyromancer,AE_AoA_galianos_Elite_Javelinist,AE_AoA_galianos_Veteran_Ranger
+    recruit=AE_AoA_galianos_Militia,AE_AoA_galianos_Civil_Guard,AE_AoA_galianos_Rider,AE_AoA_galianos_Galianos_Duelist,AE_AoA_galianos_Scout,AE_AoA_galianos_Hussar,AE_AoA_galianos_Herborist,AE_AoA_galianos_Alchemist,AE_AoA_galianos_Skirmisher,AE_AoA_galianos_Swordman,AE_AoA_galianos_Gendarme_On_Foots,AE_AoA_galianos_Footman,AE_AoA_galianos_Pikeman,AE_AoA_galianos_Crossbowman_With_Bulkward,AE_AoA_galianos_Apothecary,AE_AoA_galianos_Pyromancer,AE_AoA_galianos_Javelinist,AE_AoA_galianos_Ranger,AE_AoA_galianos_Lancer,AE_AoA_galianos_Gendarme,AE_AoA_galianos_Mounted_Crossbowman,AE_AoA_galianos_Citizen
     [ai]
         recruitment_pattern=fighter,fighter,fighter,fighter,archer,archer,healer,scout,mixed fighter
     [/ai]
@@ -69,8 +69,8 @@
     name= _ "AoA - Mountain Goblins"
     image="faction/Gobmon2.png"
     type=random
-    leader=AE_AoA_gobmon_seigneurDeGuerre,AE_AoA_gobmon_championLoup
-    recruit=AE_AoA_gobmon_guerrier,AE_AoA_gobmon_chasseur,AE_AoA_gobmon_meneur,AE_AoA_gobmon_gobelinMedecine,AE_AoA_gobmon_sournois,AE_AoA_gobmon_monteurDeLoup,AE_ext_northerns_Troll_Whelp,AE_AoA_gobmon_fantassin,AE_AoA_gobmon_archer,AE_AoA_gobmon_chefDeClan,AE_AoA_gobmon_chamane,AE_AoA_gobmon_assassin,AE_AoA_gobmon_archerLoup,Troll,Troll Rocklobber,AE_ext_northerns_Troll_Shaman,AE_arc_orcs_Marabou_Stork,AE_arc_orcs_Stork_Master,AE_ext_monsters_Young_Gryphon,AE_ext_monsters_Gryphon,AE_imp_Sidhe_Young_Bear,AE_imp_Sidhe_Bear
+    leader=AE_AoA_mountain_goblins_Warlord,AE_AoA_mountain_goblins_Wolf_Champion
+    recruit=AE_AoA_mountain_goblins_Warrior,AE_AoA_mountain_goblins_Hunter,AE_AoA_mountain_goblins_Leader,AE_AoA_mountain_goblins_Medicine_Goblin,AE_AoA_mountain_goblins_Sneaky,AE_AoA_mountain_goblins_Wolf_Rider,AE_ext_northerns_Troll_Whelp,AE_AoA_mountain_goblins_Footman,AE_AoA_mountain_goblins_Bowman,AE_AoA_mountain_goblins_Clan_Chief,AE_AoA_mountain_goblins_Shaman,AE_AoA_mountain_goblins_Assassin,AE_AoA_mountain_goblins_Wolf_Archer,Troll,Troll Rocklobber,AE_ext_northerns_Troll_Shaman,AE_arc_orcs_Marabou_Stork,AE_arc_orcs_Stork_Master,AE_ext_monsters_Young_Gryphon,AE_ext_monsters_Gryphon,AE_imp_Sidhe_Young_Bear,AE_imp_Sidhe_Bear
     [ai]
         recruitment_pattern=fighter,fighter,fighter,archer,archer,mixed fighter,healer,scout,scout
     [/ai]
@@ -82,8 +82,8 @@
     name= _ "AoA - Dwarven Kingdoms of Morkenost and Darfenlend"
     image="faction/Morkenost-Darfenlend2.png"
     type=random
-    leader=AE_AoA_morkdarf_commandant,AE_AoA_morkdarf_veteran,AE_AoA_morkdarf_mousquetaire,AE_AoA_morkdarf_martelier,AE_AoA_morkdarf_magicienne,AE_AoA_morkdarf_rodeur,AE_AoA_morkdarf_protecteur,AE_AoA_morkdarf_sage
-    recruit=AE_AoA_morkdarf_fantassin,AE_AoA_morkdarf_arquebusier,AE_AoA_morkdarf_soldatLourd,AE_AoA_morkdarf_sergent,AE_AoA_morkdarf_chamane,AE_AoA_morkdarf_combattant,AE_AoA_morkdarf_chasseur,AE_AoA_morkdarf_chasseurSurGriffon,AE_AoA_morkdarf_capitaine,AE_AoA_morkdarf_hallebardier,AE_AoA_morkdarf_arquebusierVeteran,AE_AoA_morkdarf_cuirassier,AE_AoA_morkdarf_guerrier,AE_AoA_morkdarf_traqueur,AE_AoA_morkdarf_ensorcelleuse,AE_AoA_morkdarf_guerisseuse,AE_AoA_morkdarf_archerSurGriffon
+    leader=AE_AoA_morkenost_darfenlend_Commander,AE_AoA_morkenost_darfenlend_Veteran,AE_AoA_morkenost_darfenlend_Muskeeter,AE_AoA_morkenost_darfenlend_Hammerer,AE_AoA_morkenost_darfenlend_Mage,AE_AoA_morkenost_darfenlend_Ranger,AE_AoA_morkenost_darfenlend_Warden,AE_AoA_morkenost_darfenlend_Wise
+    recruit=AE_AoA_morkenost_darfenlend_Footdwarf,AE_AoA_morkenost_darfenlend_Handgunner,AE_AoA_morkenost_darfenlend_Shock_Soldier,AE_AoA_morkenost_darfenlend_Sergent,AE_AoA_morkenost_darfenlend_Shaman,AE_AoA_morkenost_darfenlend_Fighter,AE_AoA_morkenost_darfenlend_Hunter,AE_AoA_morkenost_darfenlend_Hunter_On_Griffin,AE_AoA_morkenost_darfenlend_Captain,AE_AoA_morkenost_darfenlend_Halberdier,AE_AoA_morkenost_darfenlend_Veteran_Handgunner,AE_AoA_morkenost_darfenlend_Cuirassier,AE_AoA_morkenost_darfenlend_Warrior,AE_AoA_morkenost_darfenlend_Trapper,AE_AoA_morkenost_darfenlend_Sorceress,AE_AoA_morkenost_darfenlend_Healer,AE_AoA_morkenost_darfenlend_Archer_On_Griffin
     [ai]
         recruitment_pattern=fighter,fighter,fighter,archer,archer,mixed fighter,healer,scout
     [/ai]
@@ -95,8 +95,8 @@
     name= _ "AoA - Norse Jarldoms"
     image="faction/Nord2.png"
     type=random
-    leader=AE_AoA_nordian_thane,AE_AoA_nordian_rempart,AE_AoA_nordian_maitreArbaletrier,AE_AoA_nordian_maitreArcher,AE_AoA_nordian_varegue,AE_AoA_nordian_destructeur,AE_AoA_nordian_seigneurDeGuerre
-    recruit=AE_AoA_nordian_guerrier,AE_AoA_nordian_garde,AE_AoA_nordian_chasseur,AE_AoA_nordian_cavalier,AE_AoA_nordian_doubleHache,AE_AoA_nordian_pillard,AE_AoA_nordian_arbaletrier,AE_AoA_nordian_huskarl,AE_AoA_nordian_soldat,AE_AoA_nordian_arbaletrierLourd,AE_AoA_nordian_viking,AE_AoA_nordian_ravageur,AE_AoA_nordian_maraudeur,AE_AoA_nordian_berserker,AE_AoA_nordian_archer,AE_AoA_nordian_archerMonte,AE_AoA_nordian_huskarlMonte,AE_AoA_nordian_villageois
+    leader=AE_AoA_norse_jarldoms_Thane,AE_AoA_norse_jarldoms_Rempart,AE_AoA_norse_jarldoms_Master_Crossbowman,AE_AoA_norse_jarldoms_Nordic_Master_Archer,AE_AoA_norse_jarldoms_Varangian,AE_AoA_norse_jarldoms_Destructive,AE_AoA_norse_jarldoms_Warlord
+    recruit=AE_AoA_norse_jarldoms_Warrior,AE_AoA_norse_jarldoms_Guard,AE_AoA_norse_jarldoms_Hunter,AE_AoA_norse_jarldoms_Rider,AE_AoA_norse_jarldoms_Double_Axe,AE_AoA_norse_jarldoms_Pluderer,AE_AoA_norse_jarldoms_Crossbowman,AE_AoA_norse_jarldoms_Huskarl,AE_AoA_norse_jarldoms_Soldier,AE_AoA_norse_jarldoms_Heavy_Crossbowman,AE_AoA_norse_jarldoms_Viking,AE_AoA_norse_jarldoms_Devastating,AE_AoA_norse_jarldoms_Maraudeur,AE_AoA_norse_jarldoms_Berserker,AE_AoA_norse_jarldoms_Nordic_Bowman,AE_AoA_norse_jarldoms_Mounted_Bowman,AE_AoA_norse_jarldoms_Mounted_Huskarl,AE_AoA_norse_jarldoms_Villager
     [ai]
         recruitment_pattern=fighter,fighter,fighter,mixed fighter,archer,scout
     [/ai]
@@ -108,8 +108,8 @@
     name= _ "AoA - Kingdoms of Rovahr"
     image="faction/Rovahr2.png"
     type=random
-    leader=AE_AoA_rovahr_chevalierGothiqueAPieds,AE_AoA_rovahr_capitaineMercenaire,AE_AoA_rovahr_sergent,AE_AoA_rovahr_arbaletrierAvecPavois,AE_AoA_rovahr_archerRoyal,AE_AoA_rovahr_templierCapitaine,AE_AoA_rovahr_evequeGuerrier,AE_AoA_rovahr_grandInquisiteur,AE_AoA_rovahr_grandMage
-    recruit=AE_AoA_rovahr_leveeFeodale,AE_AoA_rovahr_arbaletrierPaysan,AE_AoA_rovahr_ecuyer,AE_AoA_rovahr_jeuneChevalier,AE_AoA_rovahr_moineSoldat,AE_AoA_rovahr_aspirantTemplier,AE_AoA_rovahr_novice,AE_AoA_rovahr_chevalierAPieds,AE_AoA_rovahr_mercenaire,AE_AoA_rovahr_hommeDArmes,AE_AoA_rovahr_arbaletrierLourd,AE_AoA_rovahr_archerLong,AE_AoA_rovahr_templier,AE_AoA_rovahr_pretreGuerrier,AE_AoA_rovahr_inquisiteur,AE_AoA_rovahr_mage,AE_AoA_rovahr_chevalierFeodal,AE_AoA_rovahr_halbruder,AE_AoA_rovahr_paysan
+    leader=AE_AoA_kingdoms_rovahr_Gothic_Kight_On_Foots,AE_AoA_kingdoms_rovahr_Mercenary_Captain,AE_AoA_kingdoms_rovahr_Sergeant,AE_AoA_kingdoms_rovahr_Crossbowman_With_Bulwark,AE_AoA_kingdoms_rovahr_Royal_Archer,AE_AoA_kingdoms_rovahr_Templar_Captain,AE_AoA_kingdoms_rovahr_Bishop_Fighter,AE_AoA_kingdoms_rovahr_Grand_Inquisitor,AE_AoA_kingdoms_rovahr_Grand_Mage
+    recruit=AE_AoA_kingdoms_rovahr_Feudal_Levy,AE_AoA_kingdoms_rovahr_Peasant_Crossbowman,AE_AoA_kingdoms_rovahr_Squire,AE_AoA_kingdoms_rovahr_Young_Knight,AE_AoA_kingdoms_rovahr_Monk_Soldier,AE_AoA_kingdoms_rovahr_Aspirant_Templar,AE_AoA_kingdoms_rovahr_Novice,AE_AoA_kingdoms_rovahr_Knight_On_Foots,AE_AoA_kingdoms_rovahr_Mercenary,AE_AoA_kingdoms_rovahr_Men_At_Arms,AE_AoA_kingdoms_rovahr_Heavy_Crossbow,AE_AoA_kingdoms_rovahr_Longbowman,AE_AoA_kingdoms_rovahr_Templar,AE_AoA_kingdoms_rovahr_Priest_Fighter,AE_AoA_kingdoms_rovahr_Inquisitor,AE_AoA_kingdoms_rovahr_Mage,AE_AoA_kingdoms_rovahr_Feudal_Knight,AE_AoA_kingdoms_rovahr_Halbruder,AE_AoA_kingdoms_rovahr_Peasant
     [ai]
         recruitment_pattern=fighter,fighter,fighter,fighter,archer,archer,mixed fighter,healer
     [/ai]
@@ -121,8 +121,8 @@
     name= _ "AoA - Rovahrian elves"
     image="faction/Elfes-Rovahriens2.png"
     type=random
-    leader=AE_AoA_rovelf_hautSeigneur,AE_AoA_rovelf_magister,AE_AoA_rovelf_archidruide,AE_AoA_rovelf_gardeRoyal,AE_AoA_rovelf_maitreEpeiste,AE_AoA_rovelf_maitreArcher,AE_AoA_rovelf_vengeur
-    recruit=AE_AoA_rovelf_lancier,AE_AoA_rovelf_archer,AE_AoA_rovelf_noble,AE_AoA_rovelf_soigneur,AE_AoA_rovelf_danseLame,AE_AoA_rovelf_eclaireur,AE_AoA_rovelf_patrouilleurForestier,Wose,AE_AoA_rovelf_seigneur,AE_AoA_rovelf_mage,AE_AoA_rovelf_druide,AE_AoA_rovelf_epeiste,AE_AoA_rovelf_rempart,AE_AoA_rovelf_archerDeGuerre,AE_AoA_rovelf_ranger,AE_AoA_rovelf_chevalierForestier,AE_AoA_rovelf_cavalier,AE_AoA_rovelf_danseGuerre,Elder Wose
+    leader=AE_AoA_rovahrian_elves_High_Lord,AE_AoA_rovahrian_elves_Magister,AE_AoA_rovahrian_elves_Archdruid,AE_AoA_rovahrian_elves_Royal_Guard,AE_AoA_rovahrian_elves_Blademaster,AE_AoA_rovahrian_elves_Master_Archer,AE_AoA_rovahrian_elves_Avenger
+    recruit=AE_AoA_rovahrian_elves_Spearman,AE_AoA_rovahrian_elves_Bowman,AE_AoA_rovahrian_elves_Noble,AE_AoA_rovahrian_elves_Healer,AE_AoA_rovahrian_elves_Blade_Dancer,AE_AoA_rovahrian_elves_Scout,AE_AoA_rovahrian_elves_Forest_Patrol,Wose,AE_AoA_rovahrian_elves_Lord,AE_AoA_rovahrian_elves_Mage,AE_AoA_rovahrian_elves_Druid,AE_AoA_rovahrian_elves_Swordman,AE_AoA_rovahrian_elves_Rempart,AE_AoA_rovahrian_elves_War_Archer,AE_AoA_rovahrian_elves_Ranger,AE_AoA_rovahrian_elves_Forest_Knight,AE_AoA_rovahrian_elves_Rider,AE_AoA_rovahrian_elves_War_Dancer,Elder Wose
     [ai]
         recruitment_pattern=fighter,fighter,fighter,archer,archer,mixed fighter,healer,scout
     [/ai]
diff --git a/info/collectAoAUnitIdReplacements.py b/info/collectAoAUnitIdReplacements.py
new file mode 100644
index 000000000..57c58965e
--- /dev/null
+++ b/info/collectAoAUnitIdReplacements.py
@@ -0,0 +1,65 @@
+#!/usr/bin/env python3
+import os
+from collections import defaultdict
+
+
+folder_to_faction = {
+	"empire": "finn_empire",
+	"far_nains": "farengarian_dwarves_counties",
+	"farengar": "farengarians_kingdoms",
+	"federation": "mauve_islands_federation",
+	"galianos": "galianos",
+	"gobmon": "mountain_goblins",
+	"mork-darf": "morkenost_darfenlend",
+	"nord": "norse_jarldoms",
+	"rov_elf": "rovahrian_elves",
+	"rovahr": "kingdoms_rovahr"
+}
+
+
+def get_unit_type_mapping(source="."):
+	unit_name_mapping = {}
+	unit_type_mapping = {}
+	unit_file_mapping = {}
+	for dname, dirs, files in os.walk(source):
+		if "units" not in dname:
+			continue
+		if "Ageless_Era" in dname or "images" in dname:
+			continue
+
+		for fname in files:
+			fpath = os.path.join(dname, fname)
+			faction_folder = dname.split("\\")[-1].split("/")[-1]
+
+			with open(fpath,encoding="utf8") as f:
+				unit_type = False
+				unit_type_name = None
+				old_type = None
+				for line in f:
+					if unit_type:
+						if "id=" in line:
+							old_type = line.split("=")[1].strip()
+							if "^" in old_type:
+								raise Exception("TODO")
+						elif "name=" in line:
+							unit_type_name = line.split("=")[1].replace('"',"").replace("_","").strip()
+						else:
+							raise Exception("Expected id after [unit_type]. " + line + dname + "/" + fname)
+						if old_type is not None and unit_type_name is not None:
+							faction = folder_to_faction[faction_folder]
+
+							visible_name = unit_type_name.title()
+							new_name = visible_name.replace(" ", "_").replace("-","_").replace("ü","u").replace("ö","o")
+							new_type = "AE_AoA_"+faction+"_" + new_name
+							unit_type_mapping[old_type] = new_type
+							unit_name_mapping[old_type] = unit_type_name+"¤"+visible_name
+							unit_file_mapping[fname] = new_name+".cfg"
+							break
+
+
+					if "[unit_type]" in line:
+						unit_type=True
+	return [unit_type_mapping, unit_file_mapping, unit_name_mapping]
+
+if __name__ == "__main__":
+	print(get_unit_type_mapping(source="../units/AoA_units"))
diff --git a/info/postProcessAoA.py b/info/postProcessAoA.py
new file mode 100644
index 000000000..41dce4ced
--- /dev/null
+++ b/info/postProcessAoA.py
@@ -0,0 +1,60 @@
+#!/usr/bin/env python3
+import os
+from collections import defaultdict
+from collectAoAUnitIdReplacements import get_unit_type_mapping
+
+folder_to_faction = {
+	"empire": "finn_empire",
+	"far_nains": "farengarian_dwarves_counties",
+	"farengar": "farengarians_kingdoms",
+	"federation": "mauve_islands_federation",
+	"galianos": "galianos",
+	"gobmon": "mountain_goblins",
+	"mork-darf": "morkenost_darfenlend",
+	"nord": "norse_jarldoms",
+	"rov_elf": "rovahrian_elves",
+	"rovahr": "kingdoms_rovahr"
+}
+
+replacements = [
+	("__DUMMY__","__DUMMY__")
+]
+
+for k,v in replacements:
+	if k[0] == "{" and v[0] == "{" and " " not in k+v:
+		if k[-1] == "}" and v[-1] == "}":
+			replacements.append(("#define "+k[1:-1], "#define "+v[1:-1]))
+		else:
+			replacements.append(("#define "+k[1:], "#define "+v[1:]))
+
+unit_type_mapping, unit_file_mapping, unit_name_mapping = get_unit_type_mapping("../units/AoA_units")
+for k in sorted(unit_type_mapping, key=lambda x: -len(x)):
+	replacements.append((k, unit_type_mapping[k]))
+
+eras = defaultdict(str)
+for dname, dirs, files in os.walk(".."):
+	if "AoA_units" not in dname and "AoA_data" not in dname and "factions" not in dname:
+		continue
+	directory_name = dname.split("\\")[-1]
+	print(dname, directory_name)
+	for fname in files:
+		fpath = os.path.join(dname, fname)
+		afpath = fpath
+		if directory_name in folder_to_faction:
+			afpath = afpath.replace(directory_name, folder_to_faction[directory_name])
+		# print(fpath, afpath)
+		with open(fpath,encoding="utf8") as f:
+			s = f.read()
+		for (find, replace) in replacements:
+			if find in s:
+				s = s.replace(find, replace)
+				old_name, new_name = unit_name_mapping[find].split("¤")
+				s = s.replace(old_name, new_name)
+
+		else:
+			if fname in unit_file_mapping:
+				afpath = afpath.replace(fname, unit_file_mapping[fname])
+				os.remove(fpath)
+			os.makedirs(os.path.dirname(afpath), exist_ok=True)
+			with open(afpath, "w", encoding="utf8") as f:
+				f.write(s)
diff --git a/units/AoA_units/far_nains/Cranequinier.cfg b/units/AoA_units/farengarian_dwarves_counties/Arbalester.cfg
similarity index 94%
rename from units/AoA_units/far_nains/Cranequinier.cfg
rename to units/AoA_units/farengarian_dwarves_counties/Arbalester.cfg
index be572b671..aca291312 100644
--- a/units/AoA_units/far_nains/Cranequinier.cfg
+++ b/units/AoA_units/farengarian_dwarves_counties/Arbalester.cfg
@@ -1,6 +1,6 @@
 #textdomain armies_of_amberan
 [unit_type]
-    id=AE_AoA_farnains_cranequinier
+    id=AE_AoA_farengarian_dwarves_counties_Arbalester
     name= _ "Arbalester"
     race=farNain
     gender=male
diff --git a/units/AoA_units/far_nains/Artificier.cfg b/units/AoA_units/farengarian_dwarves_counties/Artificer.cfg
similarity index 95%
rename from units/AoA_units/far_nains/Artificier.cfg
rename to units/AoA_units/farengarian_dwarves_counties/Artificer.cfg
index 9b6352d6c..7775e5a48 100644
--- a/units/AoA_units/far_nains/Artificier.cfg
+++ b/units/AoA_units/farengarian_dwarves_counties/Artificer.cfg
@@ -1,6 +1,6 @@
 #textdomain armies_of_amberan
 [unit_type]
-    id=AE_AoA_farnains_artificier
+    id=AE_AoA_farengarian_dwarves_counties_Artificer
     name= _ "Artificer"
     race=farNain
     gender=male
diff --git a/units/AoA_units/far_nains/Baliste.cfg b/units/AoA_units/farengarian_dwarves_counties/Balista.cfg
similarity index 85%
rename from units/AoA_units/far_nains/Baliste.cfg
rename to units/AoA_units/farengarian_dwarves_counties/Balista.cfg
index 2f3139990..ed683044d 100644
--- a/units/AoA_units/far_nains/Baliste.cfg
+++ b/units/AoA_units/farengarian_dwarves_counties/Balista.cfg
@@ -1,6 +1,6 @@
 #textdomain armies_of_amberan
 [unit_type]
-    id=AE_AoA_farnains_baliste
+    id=AE_AoA_farengarian_dwarves_counties_Balista
     name= _ "Balista"
     race=mechanical
     gender=male
@@ -14,7 +14,7 @@
     cost=18
     usage=archer
     description={AE_AOA_UNIT_NOTICE}+ _ "description a venir"
-    advances_to=AE_AoA_farnains_grandeBaliste,AE_AoA_farnains_bombarde
+    advances_to=AE_AoA_farengarian_dwarves_counties_Great_Ballista,AE_AoA_farengarian_dwarves_counties_Bombard
     die_sound={SOUND_LIST:DWARF_DIE}
     [resistance]
         blade=110
@@ -44,7 +44,7 @@
     [/attack]
     [attack]
         name=arbalete
-        description= _"balista"
+        description= _"ballista"
         type=pierce
         range=artillery
         damage=11
diff --git a/units/AoA_units/far_nains/Chevalier-ours.cfg b/units/AoA_units/farengarian_dwarves_counties/Bear_Knight.cfg
similarity index 87%
rename from units/AoA_units/far_nains/Chevalier-ours.cfg
rename to units/AoA_units/farengarian_dwarves_counties/Bear_Knight.cfg
index b6f89d3ec..ac8ac3354 100644
--- a/units/AoA_units/far_nains/Chevalier-ours.cfg
+++ b/units/AoA_units/farengarian_dwarves_counties/Bear_Knight.cfg
@@ -1,7 +1,7 @@
 #textdomain armies_of_amberan
 [unit_type]
-    id=AE_AoA_farnains_chevalierOurs
-    name= _ "Bear knight"
+    id=AE_AoA_farengarian_dwarves_counties_Bear_Knight
+    name= _ "Bear Knight"
     race=farNain
     gender=male
     image="units/Far_nains/Chevalier-ours.png"
@@ -14,7 +14,7 @@
     cost=36
     usage=fighter
     description={AE_AOA_UNIT_NOTICE}+ _ "description to come"
-    advances_to=AE_AoA_farnains_GrandchevalierOurs
+    advances_to=AE_AoA_farengarian_dwarves_counties_Grand_Bear_Knight
     die_sound={SOUND_LIST:DWARF_DIE}
     {DEFENSE_ANIM "units/Far_nains/Chevalier-ours.png" "units/Far_nains/Chevalier-ours.png" {SOUND_LIST:DWARF_HIT} }
     [resistance]
diff --git a/units/AoA_units/far_nains/Oursier.cfg b/units/AoA_units/farengarian_dwarves_counties/Bear_Rider.cfg
similarity index 87%
rename from units/AoA_units/far_nains/Oursier.cfg
rename to units/AoA_units/farengarian_dwarves_counties/Bear_Rider.cfg
index de4bc08ab..ad8afac54 100644
--- a/units/AoA_units/far_nains/Oursier.cfg
+++ b/units/AoA_units/farengarian_dwarves_counties/Bear_Rider.cfg
@@ -1,7 +1,7 @@
 #textdomain armies_of_amberan
 [unit_type]
-    id=AE_AoA_farnains_oursier
-    name= _ "Bear rider"
+    id=AE_AoA_farengarian_dwarves_counties_Bear_Rider
+    name= _ "Bear Rider"
     race=farNain
     gender=male
     image="units/Far_nains/Oursier.png"
@@ -14,7 +14,7 @@
     cost=21
     usage=fighter
     description={AE_AOA_UNIT_NOTICE}+ _ "description a venir"
-    advances_to=AE_AoA_farnains_chevalierOurs
+    advances_to=AE_AoA_farengarian_dwarves_counties_Bear_Knight
     die_sound={SOUND_LIST:DWARF_DIE}
     {DEFENSE_ANIM "units/Far_nains/Oursier.png" "units/Far_nains/Oursier.png" {SOUND_LIST:DWARF_HIT} }
     [resistance]
diff --git a/units/AoA_units/far_nains/Bombarde.cfg b/units/AoA_units/farengarian_dwarves_counties/Bombard.cfg
similarity index 96%
rename from units/AoA_units/far_nains/Bombarde.cfg
rename to units/AoA_units/farengarian_dwarves_counties/Bombard.cfg
index e6b737f85..b2ac9b9be 100644
--- a/units/AoA_units/far_nains/Bombarde.cfg
+++ b/units/AoA_units/farengarian_dwarves_counties/Bombard.cfg
@@ -1,6 +1,6 @@
 #textdomain armies_of_amberan
 [unit_type]
-    id=AE_AoA_farnains_bombarde
+    id=AE_AoA_farengarian_dwarves_counties_Bombard
     name= _ "Bombard"
     race=mechanical
     gender=male
diff --git a/units/AoA_units/far_nains/Champion.cfg b/units/AoA_units/farengarian_dwarves_counties/Champion.cfg
similarity index 95%
rename from units/AoA_units/far_nains/Champion.cfg
rename to units/AoA_units/farengarian_dwarves_counties/Champion.cfg
index 8957428ce..126aa2a7e 100644
--- a/units/AoA_units/far_nains/Champion.cfg
+++ b/units/AoA_units/farengarian_dwarves_counties/Champion.cfg
@@ -1,6 +1,6 @@
 #textdomain armies_of_amberan
 [unit_type]
-    id=AE_AoA_farnains_champion
+    id=AE_AoA_farengarian_dwarves_counties_Champion
     name= _ "Champion"
     race=farNain
     gender=male
diff --git a/units/AoA_units/far_nains/Comte.cfg b/units/AoA_units/farengarian_dwarves_counties/Count.cfg
similarity index 96%
rename from units/AoA_units/far_nains/Comte.cfg
rename to units/AoA_units/farengarian_dwarves_counties/Count.cfg
index fd6b02d8e..5fd2450c4 100644
--- a/units/AoA_units/far_nains/Comte.cfg
+++ b/units/AoA_units/farengarian_dwarves_counties/Count.cfg
@@ -1,6 +1,6 @@
 #textdomain armies_of_amberan
 [unit_type]
-    id=AE_AoA_farnains_comte
+    id=AE_AoA_farengarian_dwarves_counties_Count
     name= _ "Count"
     race=farNain
     gender=male
diff --git a/units/AoA_units/far_nains/Arbaletrier.cfg b/units/AoA_units/farengarian_dwarves_counties/Crossbowman.cfg
similarity index 88%
rename from units/AoA_units/far_nains/Arbaletrier.cfg
rename to units/AoA_units/farengarian_dwarves_counties/Crossbowman.cfg
index 3fc0c8aa0..101ef1b8e 100644
--- a/units/AoA_units/far_nains/Arbaletrier.cfg
+++ b/units/AoA_units/farengarian_dwarves_counties/Crossbowman.cfg
@@ -1,6 +1,6 @@
 #textdomain armies_of_amberan
 [unit_type]
-    id=AE_AoA_farnains_arbaletrier
+    id=AE_AoA_farengarian_dwarves_counties_Crossbowman
     name= _ "Crossbowman"
     race=farNain
     gender=male
@@ -14,7 +14,7 @@
     cost=18
     usage=archer
     description={AE_AOA_UNIT_NOTICE}+ _ "description to come"
-    advances_to=AE_AoA_farnains_sentinelle
+    advances_to=AE_AoA_farengarian_dwarves_counties_Sentinel
     die_sound={SOUND_LIST:DWARF_DIE}
     {DEFENSE_ANIM "units/Far_nains/Arbaletrier.png" "units/Far_nains/Arbaletrier.png" {SOUND_LIST:DWARF_HIT} }
     [attack]
diff --git a/units/AoA_units/far_nains/Ingenieur.cfg b/units/AoA_units/farengarian_dwarves_counties/Engeener.cfg
similarity index 89%
rename from units/AoA_units/far_nains/Ingenieur.cfg
rename to units/AoA_units/farengarian_dwarves_counties/Engeener.cfg
index d19ae53f2..365c51a2d 100644
--- a/units/AoA_units/far_nains/Ingenieur.cfg
+++ b/units/AoA_units/farengarian_dwarves_counties/Engeener.cfg
@@ -1,6 +1,6 @@
 #textdomain armies_of_amberan
 [unit_type]
-    id=AE_AoA_farnains_ingenieur
+    id=AE_AoA_farengarian_dwarves_counties_Engeener
     name= _ "Engeener"
     race=farNain
     gender=male
@@ -14,7 +14,7 @@
     cost=28
     usage=mixed fighter
     description={AE_AOA_UNIT_NOTICE}+ _ "description to come"
-    advances_to=AE_AoA_farnains_maitreIngenieur
+    advances_to=AE_AoA_farengarian_dwarves_counties_Master_Engeener
     die_sound={SOUND_LIST:DWARF_DIE}
     {DEFENSE_ANIM "units/Far_nains/Ingenieur.png" "units/Far_nains/Ingenieur.png" {SOUND_LIST:DWARF_HIT} }
     [abilities]
diff --git a/units/AoA_units/far_nains/Grand-chevalier-ours.cfg b/units/AoA_units/farengarian_dwarves_counties/Grand_Bear_Knight.cfg
similarity index 92%
rename from units/AoA_units/far_nains/Grand-chevalier-ours.cfg
rename to units/AoA_units/farengarian_dwarves_counties/Grand_Bear_Knight.cfg
index 69196d90d..0199c4583 100644
--- a/units/AoA_units/far_nains/Grand-chevalier-ours.cfg
+++ b/units/AoA_units/farengarian_dwarves_counties/Grand_Bear_Knight.cfg
@@ -1,7 +1,7 @@
 #textdomain armies_of_amberan
 [unit_type]
-    id=AE_AoA_farnains_GrandchevalierOurs
-    name= _ "Grand bear knight"
+    id=AE_AoA_farengarian_dwarves_counties_Grand_Bear_Knight
+    name= _ "Grand Bear Knight"
     race=farNain
     gender=male
     image="units/Far_nains/Grand-chevalier-ours.png"
diff --git a/units/AoA_units/far_nains/Grand-chevalier-griffon.cfg b/units/AoA_units/farengarian_dwarves_counties/Grand_Griffin_Knight.cfg
similarity index 93%
rename from units/AoA_units/far_nains/Grand-chevalier-griffon.cfg
rename to units/AoA_units/farengarian_dwarves_counties/Grand_Griffin_Knight.cfg
index e81537dd1..acb2f54a0 100644
--- a/units/AoA_units/far_nains/Grand-chevalier-griffon.cfg
+++ b/units/AoA_units/farengarian_dwarves_counties/Grand_Griffin_Knight.cfg
@@ -1,7 +1,7 @@
 #textdomain armies_of_amberan
 [unit_type]
-    id=AE_AoA_farnains_grandchevalierGriffon
-    name= _ "Grand griffin knight"
+    id=AE_AoA_farengarian_dwarves_counties_Grand_Griffin_Knight
+    name= _ "Grand Griffin Knight"
     race=farNain
     gender=male
     image="units/Far_nains/Grand-chevalier-griffon.png"
diff --git a/units/AoA_units/far_nains/Grande-baliste.cfg b/units/AoA_units/farengarian_dwarves_counties/Great_Ballista.cfg
similarity index 85%
rename from units/AoA_units/far_nains/Grande-baliste.cfg
rename to units/AoA_units/farengarian_dwarves_counties/Great_Ballista.cfg
index 0da28ba65..906e12cab 100644
--- a/units/AoA_units/far_nains/Grande-baliste.cfg
+++ b/units/AoA_units/farengarian_dwarves_counties/Great_Ballista.cfg
@@ -1,7 +1,7 @@
 #textdomain armies_of_amberan
 [unit_type]
-    id=AE_AoA_farnains_grandeBaliste
-    name= _ "Great balista"
+    id=AE_AoA_farengarian_dwarves_counties_Great_Ballista
+    name= _ "Great Ballista"
     race=mechanical
     gender=male
     image="units/Far_nains/Grande-baliste.png"
@@ -14,7 +14,7 @@
     cost=28
     usage=archer
     description={AE_AOA_UNIT_NOTICE}+ _ "description a venir"
-    advances_to=AE_AoA_farnains_balisteDeSiege
+    advances_to=AE_AoA_farengarian_dwarves_counties_Siege_Ballista
     die_sound={SOUND_LIST:DWARF_DIE}
     [resistance]
         blade=110
@@ -44,7 +44,7 @@
     [/attack]
     [attack]
         name=arbalete
-        description= _"balista"
+        description= _"ballista"
         type=pierce
         range=artillery
         damage=16
diff --git a/units/AoA_units/far_nains/Chevalier-griffon.cfg b/units/AoA_units/farengarian_dwarves_counties/Griffin_Knight.cfg
similarity index 89%
rename from units/AoA_units/far_nains/Chevalier-griffon.cfg
rename to units/AoA_units/farengarian_dwarves_counties/Griffin_Knight.cfg
index 6df62bff0..7aef8a14a 100644
--- a/units/AoA_units/far_nains/Chevalier-griffon.cfg
+++ b/units/AoA_units/farengarian_dwarves_counties/Griffin_Knight.cfg
@@ -1,7 +1,7 @@
 #textdomain armies_of_amberan
 [unit_type]
-    id=AE_AoA_farnains_chevalierGriffon
-    name= _ "Griffin knight"
+    id=AE_AoA_farengarian_dwarves_counties_Griffin_Knight
+    name= _ "Griffin Knight"
     race=farNain
     gender=male
     image="units/Far_nains/Chevalier-griffon.png"
@@ -14,7 +14,7 @@
     cost=52
     usage=fighter
     description={AE_AOA_UNIT_NOTICE}+ _ "description to come"
-    advances_to=AE_AoA_farnains_grandchevalierGriffon
+    advances_to=AE_AoA_farengarian_dwarves_counties_Grand_Griffin_Knight
     die_sound={SOUND_LIST:GRYPHON_DIE}
     {DEFENSE_ANIM "units/Far_nains/chgr/chgr-flying-4.png" "units/Far_nains/chgr/chgr-flying-5.png" {SOUND_LIST:GRYPHON_HIT} }
     [defense]
diff --git a/units/AoA_units/far_nains/Chevaucheur-de-griffon.cfg b/units/AoA_units/farengarian_dwarves_counties/Griffin_Rider.cfg
similarity index 90%
rename from units/AoA_units/far_nains/Chevaucheur-de-griffon.cfg
rename to units/AoA_units/farengarian_dwarves_counties/Griffin_Rider.cfg
index 54a6c9aba..677b2a389 100644
--- a/units/AoA_units/far_nains/Chevaucheur-de-griffon.cfg
+++ b/units/AoA_units/farengarian_dwarves_counties/Griffin_Rider.cfg
@@ -1,7 +1,7 @@
 #textdomain armies_of_amberan
 [unit_type]
-    id=AE_AoA_farnains_chevaucheurDeGriffon
-    name= _ "Griffin rider"
+    id=AE_AoA_farengarian_dwarves_counties_Griffin_Rider
+    name= _ "Griffin Rider"
     race=farNain
     gender=male
     image="units/Far_nains/Chevaucheur-de-griffon.png"
@@ -14,7 +14,7 @@
     cost=26
     usage=fighter
     description={AE_AOA_UNIT_NOTICE}+ _ "description to come"
-    advances_to=AE_AoA_farnains_chevalierGriffon
+    advances_to=AE_AoA_farengarian_dwarves_counties_Griffin_Knight
     die_sound={SOUND_LIST:GRYPHON_DIE}
     {DEFENSE_ANIM "units/Far_nains/cdg/cdg-flying-4.png" "units/Far_nains/cdg/cdg-flying-5.png" {SOUND_LIST:GRYPHON_HIT} }
     [defense]
diff --git a/units/AoA_units/far_nains/Garde.cfg b/units/AoA_units/farengarian_dwarves_counties/Guard.cfg
similarity index 90%
rename from units/AoA_units/far_nains/Garde.cfg
rename to units/AoA_units/farengarian_dwarves_counties/Guard.cfg
index ba665732f..64bfc2d8a 100644
--- a/units/AoA_units/far_nains/Garde.cfg
+++ b/units/AoA_units/farengarian_dwarves_counties/Guard.cfg
@@ -1,6 +1,6 @@
 #textdomain armies_of_amberan
 [unit_type]
-    id=AE_AoA_farnains_garde
+    id=AE_AoA_farengarian_dwarves_counties_Guard
     name= _ "Guard"
     race=farNain
     gender=male
@@ -14,7 +14,7 @@
     cost=32
     usage=fighter
     description={AE_AOA_UNIT_NOTICE}+ _ "description to come"
-    advances_to=AE_AoA_farnains_gardeDArgent
+    advances_to=AE_AoA_farengarian_dwarves_counties_Silver_Guard
     die_sound={SOUND_LIST:DWARF_DIE}
     {DEFENSE_ANIM "units/Far_nains/Garde.png" "units/Far_nains/Garde.png" {SOUND_LIST:DWARF_HIT} }
 
diff --git a/units/AoA_units/far_nains/Arquebusier.cfg b/units/AoA_units/farengarian_dwarves_counties/Handgunner.cfg
similarity index 89%
rename from units/AoA_units/far_nains/Arquebusier.cfg
rename to units/AoA_units/farengarian_dwarves_counties/Handgunner.cfg
index fe5b48731..4e850b2b5 100644
--- a/units/AoA_units/far_nains/Arquebusier.cfg
+++ b/units/AoA_units/farengarian_dwarves_counties/Handgunner.cfg
@@ -1,6 +1,6 @@
 #textdomain armies_of_amberan
 [unit_type]
-    id=AE_AoA_farnains_arquebusier
+    id=AE_AoA_farengarian_dwarves_counties_Handgunner
     name= _ "Handgunner"
     race=farNain
     gender=male
@@ -14,7 +14,7 @@
     cost=27
     usage=archer
     description={AE_AOA_UNIT_NOTICE}+ _ "description to come"
-    advances_to=AE_AoA_farnains_artificier
+    advances_to=AE_AoA_farengarian_dwarves_counties_Artificer
     die_sound={SOUND_LIST:DWARF_DIE}
     {DEFENSE_ANIM "units/Far_nains/Arquebusier.png" "units/Far_nains/Arquebusier.png" {SOUND_LIST:DWARF_HIT} }
     [abilities]
diff --git a/units/AoA_units/far_nains/Guerrier-lourd.cfg b/units/AoA_units/farengarian_dwarves_counties/Heavy_Fighter.cfg
similarity index 86%
rename from units/AoA_units/far_nains/Guerrier-lourd.cfg
rename to units/AoA_units/farengarian_dwarves_counties/Heavy_Fighter.cfg
index 430578f8d..3979aa381 100644
--- a/units/AoA_units/far_nains/Guerrier-lourd.cfg
+++ b/units/AoA_units/farengarian_dwarves_counties/Heavy_Fighter.cfg
@@ -1,7 +1,7 @@
 #textdomain armies_of_amberan
 [unit_type]
-    id=AE_AoA_farnains_guerrierLourd
-    name= _ "Heavy fighter"
+    id=AE_AoA_farengarian_dwarves_counties_Heavy_Fighter
+    name= _ "Heavy Fighter"
     race=farNain
     gender=male
     image="units/Far_nains/Guerrier-lourd.png"
@@ -14,7 +14,7 @@
     cost=38
     usage=fighter
     description={AE_AOA_UNIT_NOTICE}+ _ "description a venir"
-    advances_to=AE_AoA_farnains_champion
+    advances_to=AE_AoA_farengarian_dwarves_counties_Champion
     die_sound={SOUND_LIST:DWARF_DIE}
     {DEFENSE_ANIM "units/Far_nains/Guerrier-lourd.png" "units/Far_nains/Guerrier-lourd.png" {SOUND_LIST:DWARF_HIT} }
 
diff --git a/units/AoA_units/far_nains/Seigneur.cfg b/units/AoA_units/farengarian_dwarves_counties/Lord.cfg
similarity index 91%
rename from units/AoA_units/far_nains/Seigneur.cfg
rename to units/AoA_units/farengarian_dwarves_counties/Lord.cfg
index edc071533..b1d12b100 100644
--- a/units/AoA_units/far_nains/Seigneur.cfg
+++ b/units/AoA_units/farengarian_dwarves_counties/Lord.cfg
@@ -1,6 +1,6 @@
 #textdomain armies_of_amberan
 [unit_type]
-    id=AE_AoA_farnains_seigneur
+    id=AE_AoA_farengarian_dwarves_counties_Lord
     name= _ "Lord"
     race=farNain
     gender=male
@@ -14,7 +14,7 @@
     cost=72
     usage=fighter
     description={AE_AOA_UNIT_NOTICE}+ _ "description to come"
-    advances_to=AE_AoA_farnains_comte
+    advances_to=AE_AoA_farengarian_dwarves_counties_Count
     die_sound={SOUND_LIST:DWARF_DIE}
     {DEFENSE_ANIM "units/Far_nains/Seigneur.png" "units/Far_nains/Seigneur.png" {SOUND_LIST:DWARF_HIT} }
     [abilities]
diff --git a/units/AoA_units/far_nains/Maitre-ingenieur.cfg b/units/AoA_units/farengarian_dwarves_counties/Master_Engeener.cfg
similarity index 92%
rename from units/AoA_units/far_nains/Maitre-ingenieur.cfg
rename to units/AoA_units/farengarian_dwarves_counties/Master_Engeener.cfg
index f82d9e221..5bda1ea43 100644
--- a/units/AoA_units/far_nains/Maitre-ingenieur.cfg
+++ b/units/AoA_units/farengarian_dwarves_counties/Master_Engeener.cfg
@@ -1,7 +1,7 @@
 #textdomain armies_of_amberan
 [unit_type]
-    id=AE_AoA_farnains_maitreIngenieur
-    name= _ "Master engeener"
+    id=AE_AoA_farengarian_dwarves_counties_Master_Engeener
+    name= _ "Master Engeener"
     race=farNain
     gender=male
     image="units/Far_nains/Maitre-ingenieur.png"
diff --git a/units/AoA_units/far_nains/Archimage-des-runes.cfg b/units/AoA_units/farengarian_dwarves_counties/Runes_Archmage.cfg
similarity index 94%
rename from units/AoA_units/far_nains/Archimage-des-runes.cfg
rename to units/AoA_units/farengarian_dwarves_counties/Runes_Archmage.cfg
index 11bd25bdc..7dd49779b 100644
--- a/units/AoA_units/far_nains/Archimage-des-runes.cfg
+++ b/units/AoA_units/farengarian_dwarves_counties/Runes_Archmage.cfg
@@ -1,7 +1,7 @@
 #textdomain armies_of_amberan
 [unit_type]
-    id=AE_AoA_farnains_archimageDesRunes
-    name= _ "Runes archmage"
+    id=AE_AoA_farengarian_dwarves_counties_Runes_Archmage
+    name= _ "Runes Archmage"
     race=farNain
     gender=male
     image="units/Far_nains/Archimage-des-runes.png"
diff --git a/units/AoA_units/far_nains/Mage-des-runes.cfg b/units/AoA_units/farengarian_dwarves_counties/Runes_Mage.cfg
similarity index 90%
rename from units/AoA_units/far_nains/Mage-des-runes.cfg
rename to units/AoA_units/farengarian_dwarves_counties/Runes_Mage.cfg
index 3e91c617c..3246f708e 100644
--- a/units/AoA_units/far_nains/Mage-des-runes.cfg
+++ b/units/AoA_units/farengarian_dwarves_counties/Runes_Mage.cfg
@@ -1,7 +1,7 @@
 #textdomain armies_of_amberan
 [unit_type]
-    id=AE_AoA_farnains_mageDesRunes
-    name= _ "Runes mage"
+    id=AE_AoA_farengarian_dwarves_counties_Runes_Mage
+    name= _ "Runes Mage"
     race=farNain
     gender=male
     image="units/Far_nains/Mage-des-runes.png"
@@ -15,7 +15,7 @@
     cost=70
     usage=mixed fighter
     description={AE_AOA_UNIT_NOTICE}+ _ "description to come"
-    advances_to=AE_AoA_farnains_archimageDesRunes
+    advances_to=AE_AoA_farengarian_dwarves_counties_Runes_Archmage
     die_sound={SOUND_LIST:DWARF_DIE}
     {DEFENSE_ANIM "units/Far_nains/Mage-des-runes.png" "units/Far_nains/Mage-des-runes.png" {SOUND_LIST:DWARF_HIT} }
     [abilities]
diff --git a/units/AoA_units/far_nains/Scribe-runique.cfg b/units/AoA_units/farengarian_dwarves_counties/Runic_Scribe.cfg
similarity index 88%
rename from units/AoA_units/far_nains/Scribe-runique.cfg
rename to units/AoA_units/farengarian_dwarves_counties/Runic_Scribe.cfg
index 33d380e48..84c399659 100644
--- a/units/AoA_units/far_nains/Scribe-runique.cfg
+++ b/units/AoA_units/farengarian_dwarves_counties/Runic_Scribe.cfg
@@ -1,7 +1,7 @@
 #textdomain armies_of_amberan
 [unit_type]
-    id=AE_AoA_farnains_scribeRunique
-    name= _ "Runic scribe"
+    id=AE_AoA_farengarian_dwarves_counties_Runic_Scribe
+    name= _ "Runic Scribe"
     race=farNain
     gender=male
     image="units/Far_nains/Scribe-runique.png"
@@ -14,7 +14,7 @@
     cost=18
     usage=fighter
     description={AE_AOA_UNIT_NOTICE}+ _ "description a venir"
-    advances_to=AE_AoA_farnains_forgeronRunique
+    advances_to=AE_AoA_farengarian_dwarves_counties_Runic_Smith
     die_sound={SOUND_LIST:DWARF_DIE}
     {DEFENSE_ANIM "units/Far_nains/Scribe-runique.png" "units/Far_nains/Scribe-runique.png" {SOUND_LIST:DWARF_HIT} }
     [resistance]
diff --git a/units/AoA_units/far_nains/Forgeron-runique.cfg b/units/AoA_units/farengarian_dwarves_counties/Runic_Smith.cfg
similarity index 90%
rename from units/AoA_units/far_nains/Forgeron-runique.cfg
rename to units/AoA_units/farengarian_dwarves_counties/Runic_Smith.cfg
index f3d82a697..b9142560d 100644
--- a/units/AoA_units/far_nains/Forgeron-runique.cfg
+++ b/units/AoA_units/farengarian_dwarves_counties/Runic_Smith.cfg
@@ -1,7 +1,7 @@
 #textdomain armies_of_amberan
 [unit_type]
-    id=AE_AoA_farnains_forgeronRunique
-    name= _ "Runic smith"
+    id=AE_AoA_farengarian_dwarves_counties_Runic_Smith
+    name= _ "Runic Smith"
     race=farNain
     gender=male
     image="units/Far_nains/Forgeron-runique.png"
@@ -15,7 +15,7 @@
     cost=37
     usage=mixed fighter
     description={AE_AOA_UNIT_NOTICE}+ _ "description a venir"
-    advances_to=AE_AoA_farnains_mageDesRunes
+    advances_to=AE_AoA_farengarian_dwarves_counties_Runes_Mage
     die_sound={SOUND_LIST:DWARF_DIE}
     {DEFENSE_ANIM "units/Far_nains/Forgeron-runique.png" "units/Far_nains/Forgeron-runique.png" {SOUND_LIST:DWARF_HIT} }
     [abilities]
diff --git a/units/AoA_units/far_nains/Sentinelle.cfg b/units/AoA_units/farengarian_dwarves_counties/Sentinel.cfg
similarity index 89%
rename from units/AoA_units/far_nains/Sentinelle.cfg
rename to units/AoA_units/farengarian_dwarves_counties/Sentinel.cfg
index 17108e532..27ad8a25a 100644
--- a/units/AoA_units/far_nains/Sentinelle.cfg
+++ b/units/AoA_units/farengarian_dwarves_counties/Sentinel.cfg
@@ -1,6 +1,6 @@
 #textdomain armies_of_amberan
 [unit_type]
-    id=AE_AoA_farnains_sentinelle
+    id=AE_AoA_farengarian_dwarves_counties_Sentinel
     name= _ "Sentinel"
     race=farNain
     gender=male
@@ -14,7 +14,7 @@
     cost=25
     usage=archer
     description={AE_AOA_UNIT_NOTICE}+ _ "description to come"
-    advances_to=AE_AoA_farnains_cranequinier
+    advances_to=AE_AoA_farengarian_dwarves_counties_Arbalester
     die_sound={SOUND_LIST:DWARF_DIE}
     {DEFENSE_ANIM "units/Far_nains/Sentinelle.png" "units/Far_nains/Sentinelle.png" {SOUND_LIST:DWARF_HIT} }
     [attack]
diff --git a/units/AoA_units/far_nains/Baliste-de-siege.cfg b/units/AoA_units/farengarian_dwarves_counties/Siege_Ballista.cfg
similarity index 90%
rename from units/AoA_units/far_nains/Baliste-de-siege.cfg
rename to units/AoA_units/farengarian_dwarves_counties/Siege_Ballista.cfg
index 63f20cd9c..c8d2dcb92 100644
--- a/units/AoA_units/far_nains/Baliste-de-siege.cfg
+++ b/units/AoA_units/farengarian_dwarves_counties/Siege_Ballista.cfg
@@ -1,7 +1,7 @@
 #textdomain armies_of_amberan
 [unit_type]
-    id=AE_AoA_farnains_balisteDeSiege
-    name= _ "Siege balista"
+    id=AE_AoA_farengarian_dwarves_counties_Siege_Ballista
+    name= _ "Siege Ballista"
     race=mechanical
     gender=male
     image="units/Far_nains/Baliste-de-siege.png"
@@ -45,7 +45,7 @@
     [/attack]
     [attack]
         name=arbalete
-        description= _"balista"
+        description= _"ballista"
         type=pierce
         range=artillery
         damage=16
diff --git a/units/AoA_units/far_nains/Garde-d'argent.cfg b/units/AoA_units/farengarian_dwarves_counties/Silver_Guard.cfg
similarity index 94%
rename from units/AoA_units/far_nains/Garde-d'argent.cfg
rename to units/AoA_units/farengarian_dwarves_counties/Silver_Guard.cfg
index f3abf1d5f..2765ca801 100644
--- a/units/AoA_units/far_nains/Garde-d'argent.cfg
+++ b/units/AoA_units/farengarian_dwarves_counties/Silver_Guard.cfg
@@ -1,7 +1,7 @@
 #textdomain armies_of_amberan
 [unit_type]
-    id=AE_AoA_farnains_gardeDArgent
-    name= _ "Silver guard"
+    id=AE_AoA_farengarian_dwarves_counties_Silver_Guard
+    name= _ "Silver Guard"
     race=farNain
     gender=male
     image="units/Far_nains/Garde-d-argent.png"
diff --git a/units/AoA_units/far_nains/Thane.cfg b/units/AoA_units/farengarian_dwarves_counties/Thane.cfg
similarity index 90%
rename from units/AoA_units/far_nains/Thane.cfg
rename to units/AoA_units/farengarian_dwarves_counties/Thane.cfg
index a4c495fd9..d1facd5b3 100644
--- a/units/AoA_units/far_nains/Thane.cfg
+++ b/units/AoA_units/farengarian_dwarves_counties/Thane.cfg
@@ -1,6 +1,6 @@
 #textdomain armies_of_amberan
 [unit_type]
-    id=AE_AoA_farnains_thane
+    id=AE_AoA_farengarian_dwarves_counties_Thane
     name= _ "Thane"
     race=farNain
     gender=male
@@ -14,7 +14,7 @@
     cost=32
     usage=fighter
     description={AE_AOA_UNIT_NOTICE}+ _ "description to come"
-    advances_to=AE_AoA_farnains_seigneur
+    advances_to=AE_AoA_farengarian_dwarves_counties_Lord
     die_sound={SOUND_LIST:DWARF_DIE}
     {DEFENSE_ANIM "units/Far_nains/Thane.png" "units/Far_nains/Thane.png" {SOUND_LIST:DWARF_HIT} }
     [abilities]
diff --git a/units/AoA_units/far_nains/Bricoleur.cfg b/units/AoA_units/farengarian_dwarves_counties/Tinker.cfg
similarity index 86%
rename from units/AoA_units/far_nains/Bricoleur.cfg
rename to units/AoA_units/farengarian_dwarves_counties/Tinker.cfg
index e4b2e3bcc..0f9746e9e 100644
--- a/units/AoA_units/far_nains/Bricoleur.cfg
+++ b/units/AoA_units/farengarian_dwarves_counties/Tinker.cfg
@@ -1,6 +1,6 @@
 #textdomain armies_of_amberan
 [unit_type]
-    id=AE_AoA_farnains_bricoleur
+    id=AE_AoA_farengarian_dwarves_counties_Tinker
     name= _ "Tinker"
     race=farNain
     gender=male
@@ -14,7 +14,7 @@
     cost=18
     usage=mixed fighter
     description={AE_AOA_UNIT_NOTICE}+ _ "description a venir"
-    advances_to=AE_AoA_farnains_arquebusier,AE_AoA_farnains_ingenieur
+    advances_to=AE_AoA_farengarian_dwarves_counties_Handgunner,AE_AoA_farengarian_dwarves_counties_Engeener
     die_sound={SOUND_LIST:DWARF_DIE}
     {DEFENSE_ANIM "units/Far_nains/Bricoleur.png" "units/Far_nains/Bricoleur.png" {SOUND_LIST:DWARF_HIT} }
     [abilities]
diff --git a/units/AoA_units/far_nains/Guerrier.cfg b/units/AoA_units/farengarian_dwarves_counties/Warrior.cfg
similarity index 81%
rename from units/AoA_units/far_nains/Guerrier.cfg
rename to units/AoA_units/farengarian_dwarves_counties/Warrior.cfg
index 2929322d7..001324808 100644
--- a/units/AoA_units/far_nains/Guerrier.cfg
+++ b/units/AoA_units/farengarian_dwarves_counties/Warrior.cfg
@@ -1,6 +1,6 @@
 #textdomain armies_of_amberan
 [unit_type]
-    id=AE_AoA_farnains_guerrier
+    id=AE_AoA_farengarian_dwarves_counties_Fighter
     name= _ "Fighter"
     race=farNain
     gender=male
@@ -14,7 +14,7 @@
     cost=16
     usage=fighter
     description={AE_AOA_UNIT_NOTICE}+ _ "description to come"
-    advances_to=AE_AoA_farnains_guerrierLourd,AE_AoA_farnains_garde,AE_AoA_farnains_thane
+    advances_to=AE_AoA_farengarian_dwarves_counties_Heavy_Fighter,AE_AoA_farengarian_dwarves_counties_Guard,AE_AoA_farengarian_dwarves_counties_Thane
     die_sound={SOUND_LIST:DWARF_DIE}
     {DEFENSE_ANIM "units/Far_nains/Guerrier.png" "units/Far_nains/Guerrier.png" {SOUND_LIST:DWARF_HIT} }
 
diff --git a/units/AoA_units/farengar/Apprenti.cfg b/units/AoA_units/farengarians_kingdoms/Apprentice.cfg
similarity index 89%
rename from units/AoA_units/farengar/Apprenti.cfg
rename to units/AoA_units/farengarians_kingdoms/Apprentice.cfg
index 7b29852ba..96133cc8d 100644
--- a/units/AoA_units/farengar/Apprenti.cfg
+++ b/units/AoA_units/farengarians_kingdoms/Apprentice.cfg
@@ -1,6 +1,6 @@
 #textdomain armies_of_amberan
 [unit_type]
-    id=AE_AoA_farengar_apprenti
+    id=AE_AoA_farengarians_kingdoms_Apprentice
     name= _ "Apprentice"
     race=farengar
     gender=male,female
@@ -14,7 +14,7 @@
     cost=20
     usage=mixed fighter
     description={AE_AOA_UNIT_NOTICE}+ _ "description to come"
-    advances_to=AE_AoA_farengar_mage,AE_AoA_farengar_arcaniste
+    advances_to=AE_AoA_farengarians_kingdoms_Mage,AE_AoA_farengarians_kingdoms_Arcanist
     die_sound={SOUND_LIST:HUMAN_DIE}
     {DEFENSE_ANIM "units/farengar/Apprenti.png" "units/farengar/Apprenti.png" {SOUND_LIST:HUMAN_HIT} }
     [movement_costs]
@@ -51,7 +51,7 @@
     {STAFF_SOUND}
     {MISSILE_SOUND}
     [female]
-        name= _"female^Apprentice"
+        name= _"Apprentice"
         gender=female
         image="units/farengar/Apprenti2.png"
         die_sound={SOUND_LIST:HUMAN_FEMALE_DIE}
diff --git a/units/AoA_units/farengar/Arcaniste.cfg b/units/AoA_units/farengarians_kingdoms/Arcanist.cfg
similarity index 94%
rename from units/AoA_units/farengar/Arcaniste.cfg
rename to units/AoA_units/farengarians_kingdoms/Arcanist.cfg
index 0b3532da8..1ac5b1bfb 100644
--- a/units/AoA_units/farengar/Arcaniste.cfg
+++ b/units/AoA_units/farengarians_kingdoms/Arcanist.cfg
@@ -1,6 +1,6 @@
 #textdomain armies_of_amberan
 [unit_type]
-    id=AE_AoA_farengar_arcaniste
+    id=AE_AoA_farengarians_kingdoms_Arcanist
     name= _ "Arcanist"
     race=farengar
     gender=male,female
@@ -14,7 +14,7 @@
     cost=42
     usage=mixed fighter
     description={AE_AOA_UNIT_NOTICE}+ _ "description to come"
-    advances_to=AE_AoA_farengar_grandArcaniste
+    advances_to=AE_AoA_farengarians_kingdoms_Great_Arcanist
     die_sound={SOUND_LIST:HUMAN_DIE}
     {DEFENSE_ANIM "units/farengar/Arcaniste.png" "units/farengar/Arcaniste.png" {SOUND_LIST:HUMAN_HIT} }
     [resistance]
@@ -81,7 +81,7 @@
     {ICE_SOUND}
     {HOLYFIRE_SOUND}
     [female]
-        name= _"female^Arcanist"
+        name= _"Arcanist"
         gender=female
         image="units/farengar/Arcaniste2.png"
         die_sound={SOUND_LIST:HUMAN_FEMALE_DIE}
diff --git a/units/AoA_units/farengar/Archimage_de_bataille.cfg b/units/AoA_units/farengarians_kingdoms/Battle_Archmage.cfg
similarity index 93%
rename from units/AoA_units/farengar/Archimage_de_bataille.cfg
rename to units/AoA_units/farengarians_kingdoms/Battle_Archmage.cfg
index 34a92b5a2..862b58169 100644
--- a/units/AoA_units/farengar/Archimage_de_bataille.cfg
+++ b/units/AoA_units/farengarians_kingdoms/Battle_Archmage.cfg
@@ -1,7 +1,7 @@
 #textdomain armies_of_amberan
 [unit_type]
-    id=AE_AoA_farengar_archimageDeBataille
-    name= _ "Battle archmage"
+    id=AE_AoA_farengarians_kingdoms_Battle_Archmage
+    name= _ "Battle Archmage"
     race=farengar
     gender=male,female
     image="units/farengar/Archimage-de-bataille.png"
@@ -55,7 +55,7 @@
     {STAFF_SOUND}
     {FIREBALL_SOUND}
     [female]
-        name= _"female^Battle archmage"
+        name= _"Battle Archmage"
         gender=female
         image="units/farengar/Archimage-de-bataille2.png"
         die_sound={SOUND_LIST:HUMAN_FEMALE_DIE}
diff --git a/units/AoA_units/farengar/Mage_de_bataille.cfg b/units/AoA_units/farengarians_kingdoms/Battle_Mage.cfg
similarity index 90%
rename from units/AoA_units/farengar/Mage_de_bataille.cfg
rename to units/AoA_units/farengarians_kingdoms/Battle_Mage.cfg
index 5a7ad3a66..57c70b0a4 100644
--- a/units/AoA_units/farengar/Mage_de_bataille.cfg
+++ b/units/AoA_units/farengarians_kingdoms/Battle_Mage.cfg
@@ -1,7 +1,7 @@
 #textdomain armies_of_amberan
 [unit_type]
-    id=AE_AoA_farengar_mageDeBataille
-    name= _ "Battle mage"
+    id=AE_AoA_farengarians_kingdoms_Battle_Mage
+    name= _ "Battle Mage"
     race=farengar
     gender=male,female
     image="units/farengar/Mage-de-bataille.png"
@@ -14,7 +14,7 @@
     cost=62
     usage=mixed fighter
     description={AE_AOA_UNIT_NOTICE}+ _ "description to come"
-    advances_to=AE_AoA_farengar_archimageDeBataille
+    advances_to=AE_AoA_farengarians_kingdoms_Battle_Archmage
     die_sound={SOUND_LIST:HUMAN_DIE}
     {DEFENSE_ANIM "units/farengar/Mage-de-bataille.png" "units/farengar/Mage-de-bataille.png" {SOUND_LIST:HUMAN_OLD_HIT} }
     [resistance]
@@ -54,7 +54,7 @@
     {STAFF_SOUND}
     {FIREBALL_SOUND}
     [female]
-        name= _"female^Battle mage"
+        name= _"Battle Mage"
         gender=female
         image="units/farengar/Mage-de-bataille2.png"
         die_sound={SOUND_LIST:HUMAN_FEMALE_DIE}
diff --git a/units/AoA_units/farengar/Archer.cfg b/units/AoA_units/farengarians_kingdoms/Bowman.cfg
similarity index 86%
rename from units/AoA_units/farengar/Archer.cfg
rename to units/AoA_units/farengarians_kingdoms/Bowman.cfg
index 3404498c6..9a6c8eb6d 100644
--- a/units/AoA_units/farengar/Archer.cfg
+++ b/units/AoA_units/farengarians_kingdoms/Bowman.cfg
@@ -1,6 +1,6 @@
 #textdomain armies_of_amberan
 [unit_type]
-    id=AE_AoA_farengar_archer
+    id=AE_AoA_farengarians_kingdoms_Bowman
     name= _ "Bowman"
     race=farengar
     gender=male,female
@@ -14,7 +14,7 @@
     cost=14
     usage=archer
     description={AE_AOA_UNIT_NOTICE}+ _ "description to come"
-    advances_to=AE_AoA_farengar_archerLong,AE_AoA_farengar_arbaletrier,AE_AoA_farengar_arquebusier
+    advances_to=AE_AoA_farengarians_kingdoms_Longbowman,AE_AoA_farengarians_kingdoms_Crossbowman,AE_AoA_farengarians_kingdoms_Handgunner
     die_sound={SOUND_LIST:HUMAN_DIE}
     {DEFENSE_ANIM "units/farengar/Archer.png" "units/farengar/Archer.png" {SOUND_LIST:HUMAN_HIT} }
     [movement_costs]
@@ -44,7 +44,7 @@
     {SWORD_SOUND}
     {BOW_SOUND}
     [female]
-        name= _"female^Bowman"
+        name= _"Bowman"
         gender=female
         image="units/farengar/Archer2.png"
         die_sound={SOUND_LIST:HUMAN_FEMALE_DIE}
diff --git a/units/AoA_units/farengar/Champion.cfg b/units/AoA_units/farengarians_kingdoms/Champion.cfg
similarity index 95%
rename from units/AoA_units/farengar/Champion.cfg
rename to units/AoA_units/farengarians_kingdoms/Champion.cfg
index 719cbbf6e..de8a88c2f 100644
--- a/units/AoA_units/farengar/Champion.cfg
+++ b/units/AoA_units/farengarians_kingdoms/Champion.cfg
@@ -1,6 +1,6 @@
 #textdomain armies_of_amberan
 [unit_type]
-    id=AE_AoA_farengar_champion
+    id=AE_AoA_farengarians_kingdoms_Champion
     name= _ "Champion"
     race=farengar
     gender=male,female
@@ -54,7 +54,7 @@
     [/attack]
     {SWORD_SOUND}
     [female]
-        name= _"female^Champion"
+        name= _"Champion"
         gender=female
         image="units/farengar/Champion2.png"
         die_sound={SOUND_LIST:HUMAN_FEMALE_DIE}
diff --git a/units/AoA_units/farengar/Clerc.cfg b/units/AoA_units/farengarians_kingdoms/Cleric.cfg
similarity index 93%
rename from units/AoA_units/farengar/Clerc.cfg
rename to units/AoA_units/farengarians_kingdoms/Cleric.cfg
index 4121840d4..3f3223ece 100644
--- a/units/AoA_units/farengar/Clerc.cfg
+++ b/units/AoA_units/farengarians_kingdoms/Cleric.cfg
@@ -1,6 +1,6 @@
 #textdomain armies_of_amberan
 [unit_type]
-    id=AE_AoA_farengar_clerc
+    id=AE_AoA_farengarians_kingdoms_Cleric
     name= _ "Cleric"
     race=farengar
     gender=male,female
@@ -14,7 +14,7 @@
     cost=32
     usage=healer
     description={AE_AOA_UNIT_NOTICE}+ _ "description to come"
-    advances_to=AE_AoA_farengar_grandClerc
+    advances_to=AE_AoA_farengarians_kingdoms_High_Cleric
     die_sound={SOUND_LIST:HUMAN_DIE}
     {DEFENSE_ANIM "units/farengar/Clerc.png" "units/farengar/Clerc.png" {SOUND_LIST:HUMAN_HIT} }
     [abilities]
@@ -59,7 +59,7 @@
     {MACE_SOUND}
     {LIGHT_SOUND}
     [female]
-        name= _"female^Cleric"
+        name= _"Cleric"
         gender=female
         image="units/farengar/Clerc2.png"
         die_sound={SOUND_LIST:HUMAN_FEMALE_DIE}
diff --git a/units/AoA_units/farengar/Conscrit.cfg b/units/AoA_units/farengarians_kingdoms/Conscript.cfg
similarity index 87%
rename from units/AoA_units/farengar/Conscrit.cfg
rename to units/AoA_units/farengarians_kingdoms/Conscript.cfg
index 3bfac7680..0e148adf8 100644
--- a/units/AoA_units/farengar/Conscrit.cfg
+++ b/units/AoA_units/farengarians_kingdoms/Conscript.cfg
@@ -1,6 +1,6 @@
 #textdomain armies_of_amberan
 [unit_type]
-    id=AE_AoA_farengar_conscrit
+    id=AE_AoA_farengarians_kingdoms_Conscript
     name= _ "Conscript"
     race=farengar
     gender=male,female
@@ -14,7 +14,7 @@
     cost=13
     usage=fighter
     description={AE_AOA_UNIT_NOTICE}+ _ "description to come"
-    advances_to=AE_AoA_farengar_hallebardier,AE_AoA_farengar_fantassin
+    advances_to=AE_AoA_farengarians_kingdoms_Halberdier,AE_AoA_farengarians_kingdoms_Footman
     die_sound={SOUND_LIST:HUMAN_DIE}
     {DEFENSE_ANIM "units/farengar/Conscrit.png" "units/farengar/Conscrit.png" {SOUND_LIST:HUMAN_HIT} }
     [movement_costs]
@@ -37,7 +37,7 @@
     [/attack]
     {SPEAR_SOUND}
     [female]
-        name= _"female^Conscript"
+        name= _"Conscript"
         gender=female
         image="units/farengar/Conscrit2.png"
         die_sound={SOUND_LIST:HUMAN_FEMALE_DIE}
diff --git a/units/AoA_units/farengar/Comte.cfg b/units/AoA_units/farengarians_kingdoms/Count.cfg
similarity index 91%
rename from units/AoA_units/farengar/Comte.cfg
rename to units/AoA_units/farengarians_kingdoms/Count.cfg
index 97915e6f3..be78dcd1c 100644
--- a/units/AoA_units/farengar/Comte.cfg
+++ b/units/AoA_units/farengarians_kingdoms/Count.cfg
@@ -1,6 +1,6 @@
 #textdomain armies_of_amberan
 [unit_type]
-    id=AE_AoA_farengar_comte
+    id=AE_AoA_farengarians_kingdoms_Count
     name= _ "Count"
     race=farengar
     gender=male,female
@@ -14,7 +14,7 @@
     cost=54
     usage=fighter
     description={AE_AOA_UNIT_NOTICE}+ _ "description to come"
-    advances_to=AE_AoA_farengar_duc
+    advances_to=AE_AoA_farengarians_kingdoms_Duke
     [abilities]
         {ABILITY_LEADERSHIP}
     [/abilities]
@@ -42,7 +42,7 @@
     [/attack]
     {SWORD_SOUND}
     [female]
-        name= _"female^Countess"
+        name= _"Countess"
         gender=female
         image="units/farengar/Comte2.png"
         die_sound={SOUND_LIST:HUMAN_FEMALE_DIE}
diff --git a/units/AoA_units/farengar/Arbaletrier.cfg b/units/AoA_units/farengarians_kingdoms/Crossbowman.cfg
similarity index 90%
rename from units/AoA_units/farengar/Arbaletrier.cfg
rename to units/AoA_units/farengarians_kingdoms/Crossbowman.cfg
index 4e4b6e493..bb3dcfd77 100644
--- a/units/AoA_units/farengar/Arbaletrier.cfg
+++ b/units/AoA_units/farengarians_kingdoms/Crossbowman.cfg
@@ -1,6 +1,6 @@
 #textdomain armies_of_amberan
 [unit_type]
-    id=AE_AoA_farengar_arbaletrier
+    id=AE_AoA_farengarians_kingdoms_Crossbowman
     name= _ "Crossbowman"
     race=farengar
     gender=male,female
@@ -14,7 +14,7 @@
     cost=24
     usage=archer
     description={AE_AOA_UNIT_NOTICE}+ _ "description to come"
-    advances_to=AE_AoA_farengar_maitreArbaletrier
+    advances_to=AE_AoA_farengarians_kingdoms_Master_Crossbowman
     die_sound={SOUND_LIST:HUMAN_DIE}
     {DEFENSE_ANIM "units/farengar/Arbaletrier.png" "units/farengar/Arbaletrier.png" {SOUND_LIST:HUMAN_HIT} }
     [movement_costs]
@@ -44,7 +44,7 @@
     {SWORD_SOUND}
     {CROSSBOW_SOUND}
     [female]
-        name= _"female^Crossbowman"
+        name= _"Crossbowman"
         gender=female
         image="units/farengar/Arbaletrier2.png"
         die_sound={SOUND_LIST:HUMAN_FEMALE_DIE}
diff --git a/units/AoA_units/farengar/Garde_ducal.cfg b/units/AoA_units/farengarians_kingdoms/Ducal_Guard.cfg
similarity index 93%
rename from units/AoA_units/farengar/Garde_ducal.cfg
rename to units/AoA_units/farengarians_kingdoms/Ducal_Guard.cfg
index b071d469f..0a8044fdb 100644
--- a/units/AoA_units/farengar/Garde_ducal.cfg
+++ b/units/AoA_units/farengarians_kingdoms/Ducal_Guard.cfg
@@ -1,7 +1,7 @@
 #textdomain armies_of_amberan
 [unit_type]
-    id=AE_AoA_farengar_gardeDucal
-    name= _ "Ducal guard"
+    id=AE_AoA_farengarians_kingdoms_Ducal_Guard
+    name= _ "Ducal Guard"
     race=farengar
     gender=male,female
     image="units/farengar/Garde-ducal.png"
@@ -52,7 +52,7 @@
     {SPEAR_SOUND}
     {AXE_SOUND}
     [female]
-        name= _"female^Ducal guard"
+        name= _"Ducal Guard"
         gender=female
         image="units/farengar/Garde-ducal2.png"
         die_sound={SOUND_LIST:HUMAN_FEMALE_DIE}
diff --git a/units/AoA_units/farengar/Duc.cfg b/units/AoA_units/farengarians_kingdoms/Duke.cfg
similarity index 95%
rename from units/AoA_units/farengar/Duc.cfg
rename to units/AoA_units/farengarians_kingdoms/Duke.cfg
index 24389b17e..7f962717d 100644
--- a/units/AoA_units/farengar/Duc.cfg
+++ b/units/AoA_units/farengarians_kingdoms/Duke.cfg
@@ -1,6 +1,6 @@
 #textdomain armies_of_amberan
 [unit_type]
-    id=AE_AoA_farengar_duc
+    id=AE_AoA_farengarians_kingdoms_Duke
     name= _ "Duke"
     race=farengar
     gender=male,female
@@ -44,7 +44,7 @@
     [/attack]
     {SWORD_SOUND}
     [female]
-        name= _"female^Duchess"
+        name= _"Duchess"
         gender=female
         image="units/farengar/Duc2.png"
         die_sound={SOUND_LIST:HUMAN_FEMALE_DIE}
diff --git a/units/AoA_units/farengar/Fantassin.cfg b/units/AoA_units/farengarians_kingdoms/Footdwarf.cfg
similarity index 90%
rename from units/AoA_units/farengar/Fantassin.cfg
rename to units/AoA_units/farengarians_kingdoms/Footdwarf.cfg
index b9e7bb9b9..524f48d78 100644
--- a/units/AoA_units/farengar/Fantassin.cfg
+++ b/units/AoA_units/farengarians_kingdoms/Footdwarf.cfg
@@ -1,7 +1,7 @@
 
 #textdomain armies_of_amberan
 [unit_type]
-    id=AE_AoA_farengar_fantassin
+    id=AE_AoA_farengarians_kingdoms_Footman
     name= _ "Footman"
     race=farengar
     gender=male,female
@@ -15,7 +15,7 @@
     cost=27
     usage=fighter
     description={AE_AOA_UNIT_NOTICE}+ _ "description to come"
-    advances_to=AE_AoA_farengar_sergent
+    advances_to=AE_AoA_farengarians_kingdoms_Sergeant
     die_sound={SOUND_LIST:HUMAN_DIE}
     {DEFENSE_ANIM "units/farengar/Fantassin.png" "units/farengar/Fantassin.png" {SOUND_LIST:HUMAN_HIT} }
     [movement_costs]
@@ -39,7 +39,7 @@
     [/attack]
     {MACE_SOUND}
     [female]
-        name= _"female^Footman"
+        name= _"Footman"
         gender=female
         image="units/farengar/Fantassin2.png"
         die_sound={SOUND_LIST:HUMAN_FEMALE_DIE}
diff --git a/units/AoA_units/farengar/Grand_arcaniste.cfg b/units/AoA_units/farengarians_kingdoms/Grand_Arcanist.cfg
similarity index 95%
rename from units/AoA_units/farengar/Grand_arcaniste.cfg
rename to units/AoA_units/farengarians_kingdoms/Grand_Arcanist.cfg
index 4cc9539e6..6b7d2bb53 100644
--- a/units/AoA_units/farengar/Grand_arcaniste.cfg
+++ b/units/AoA_units/farengarians_kingdoms/Grand_Arcanist.cfg
@@ -1,7 +1,7 @@
 #textdomain armies_of_amberan
 [unit_type]
-    id=AE_AoA_farengar_grandArcaniste
-    name= _ "Great arcanist"
+    id=AE_AoA_farengarians_kingdoms_Great_Arcanist
+    name= _ "Great Arcanist"
     race=farengar
     gender=male,female
     image="units/farengar/Grand-arcaniste.png"
@@ -81,7 +81,7 @@
     {ICE_SOUND}
     {HOLYFIRE_SOUND}
     [female]
-        name= _"female^Great arcanist"
+        name= _"Great Arcanist"
         gender=female
         image="units/farengar/Grand-arcaniste2.png"
         die_sound={SOUND_LIST:HUMAN_FEMALE_DIE}
diff --git a/units/AoA_units/farengar/Grand_maitre_paladin.cfg b/units/AoA_units/farengarians_kingdoms/Grand_Master_Paladin.cfg
similarity index 93%
rename from units/AoA_units/farengar/Grand_maitre_paladin.cfg
rename to units/AoA_units/farengarians_kingdoms/Grand_Master_Paladin.cfg
index 9fd92f8e3..8b9f0061d 100644
--- a/units/AoA_units/farengar/Grand_maitre_paladin.cfg
+++ b/units/AoA_units/farengarians_kingdoms/Grand_Master_Paladin.cfg
@@ -1,7 +1,7 @@
 #textdomain armies_of_amberan
 [unit_type]
-    id=AE_AoA_farengar_grandMaitrePaladin
-    name= _ "Grand master paladin"
+    id=AE_AoA_farengarians_kingdoms_Grand_Master_Paladin
+    name= _ "Grand Master Paladin"
     race=farengar
     gender=male,female
     image="units/farengar/Grand-maitre.png"
@@ -71,7 +71,7 @@
     {SWORD_SOUND}
     {SMITE_SOUND}
     [female]
-        name= _"female^Grand master paladin"
+        name= _"Grand Master Paladin"
         gender=female
         image="units/farengar/Grande-maitresse.png"
         die_sound={SOUND_LIST:HUMAN_FEMALE_DIE}
diff --git a/units/AoA_units/farengar/Grand_chevalier.cfg b/units/AoA_units/farengarians_kingdoms/Great_Chevalier.cfg
similarity index 92%
rename from units/AoA_units/farengar/Grand_chevalier.cfg
rename to units/AoA_units/farengarians_kingdoms/Great_Chevalier.cfg
index e968463fc..b4bfad2ed 100644
--- a/units/AoA_units/farengar/Grand_chevalier.cfg
+++ b/units/AoA_units/farengarians_kingdoms/Great_Chevalier.cfg
@@ -1,7 +1,7 @@
 #textdomain armies_of_amberan
 [unit_type]
-    id=AE_AoA_farengar_grandChevalier
-    name= _ "Great chevalier"
+    id=AE_AoA_farengarians_kingdoms_Great_Chevalier
+    name= _ "Great Chevalier"
     race=farengar
     gender=male,female
     image="units/farengar/Grand-chevalier.png"
@@ -51,7 +51,7 @@
     {SWORD_SOUND}
     {LANCE_SOUND}
     [female]
-        name= _"female^Great chevalier"
+        name= _"Great Chevalier"
         gender=female
         image="units/farengar/Grand-chevalier2.png"
         die_sound={SOUND_LIST:HUMAN_FEMALE_DIE}
diff --git a/units/AoA_units/farengar/Hallebardier.cfg b/units/AoA_units/farengarians_kingdoms/Halberdier.cfg
similarity index 91%
rename from units/AoA_units/farengar/Hallebardier.cfg
rename to units/AoA_units/farengarians_kingdoms/Halberdier.cfg
index f9723279c..a4e478ab8 100644
--- a/units/AoA_units/farengar/Hallebardier.cfg
+++ b/units/AoA_units/farengarians_kingdoms/Halberdier.cfg
@@ -1,6 +1,6 @@
 #textdomain armies_of_amberan
 [unit_type]
-    id=AE_AoA_farengar_hallebardier
+    id=AE_AoA_farengarians_kingdoms_Halberdier
     name= _ "Halberdier"
     race=farengar
     gender=male,female
@@ -14,7 +14,7 @@
     cost=26
     usage=fighter
     description={AE_AOA_UNIT_NOTICE}+ _ "description to come"
-    advances_to=AE_AoA_farengar_gardeDucal
+    advances_to=AE_AoA_farengarians_kingdoms_Ducal_Guard
     die_sound={SOUND_LIST:HUMAN_DIE}
     {DEFENSE_ANIM "units/farengar/Hallebardier.png" "units/farengar/Hallebardier.png" {SOUND_LIST:HUMAN_HIT} }
     [movement_costs]
@@ -50,7 +50,7 @@
     {SPEAR_SOUND}
     {AXE_SOUND}
     [female]
-        name= _"female^Halberdier"
+        name= _"Halberdier"
         gender=female
         image="units/farengar/Hallebardier2.png"
         die_sound={SOUND_LIST:HUMAN_FEMALE_DIE}
diff --git a/units/AoA_units/farengar/Arquebusier.cfg b/units/AoA_units/farengarians_kingdoms/Handgunner.cfg
similarity index 94%
rename from units/AoA_units/farengar/Arquebusier.cfg
rename to units/AoA_units/farengarians_kingdoms/Handgunner.cfg
index 7db6dd7e1..6ef653e62 100644
--- a/units/AoA_units/farengar/Arquebusier.cfg
+++ b/units/AoA_units/farengarians_kingdoms/Handgunner.cfg
@@ -1,6 +1,6 @@
 #textdomain armies_of_amberan
 [unit_type]
-    id=AE_AoA_farengar_arquebusier
+    id=AE_AoA_farengarians_kingdoms_Handgunner
     name= _ "Handgunner"
     race=farengar
     gender=male,female
@@ -46,7 +46,7 @@
     {SWORD_SOUND}
     {PISTOL_SOUND}
     [female]
-        name= _"female^Handgunner"
+        name= _"Handgunner"
         gender=female
         image="units/farengar/Arquebusier2.png"
         die_sound={SOUND_LIST:HUMAN_FEMALE_DIE}
diff --git a/units/AoA_units/farengar/Heraut.cfg b/units/AoA_units/farengarians_kingdoms/Herald.cfg
similarity index 94%
rename from units/AoA_units/farengar/Heraut.cfg
rename to units/AoA_units/farengarians_kingdoms/Herald.cfg
index 2ba37b86a..c5be9aa52 100644
--- a/units/AoA_units/farengar/Heraut.cfg
+++ b/units/AoA_units/farengarians_kingdoms/Herald.cfg
@@ -1,6 +1,6 @@
 #textdomain armies_of_amberan
 [unit_type]
-    id=AE_AoA_farengar_heraut
+    id=AE_AoA_farengarians_kingdoms_Herald
     name= _ "Herald"
     race=farengar
     gender=male,female
@@ -35,7 +35,7 @@
     [/attack]
     {LANCE_SOUND}
     [female]
-        name= _"female^Herald"
+        name= _"Herald"
         gender=female
         image="units/farengar/Heraut2.png"
         die_sound={SOUND_LIST:HUMAN_FEMALE_DIE}
diff --git a/units/AoA_units/farengar/Grand_clerc.cfg b/units/AoA_units/farengarians_kingdoms/High_Cleric.cfg
similarity index 93%
rename from units/AoA_units/farengar/Grand_clerc.cfg
rename to units/AoA_units/farengarians_kingdoms/High_Cleric.cfg
index 358a2cc14..00c73269d 100644
--- a/units/AoA_units/farengar/Grand_clerc.cfg
+++ b/units/AoA_units/farengarians_kingdoms/High_Cleric.cfg
@@ -1,7 +1,7 @@
 #textdomain armies_of_amberan
 [unit_type]
-    id=AE_AoA_farengar_grandClerc
-    name= _ "High cleric"
+    id=AE_AoA_farengarians_kingdoms_High_Cleric
+    name= _ "High Cleric"
     race=farengar
     gender=male,female
     image="units/farengar/Grand-clerc.png"
@@ -56,7 +56,7 @@
     {MACE_SOUND}
     {LIGHT_SOUND}
     [female]
-        name= _"female^Great cleric"
+        name= _"Great cleric"
         gender=female
         image="units/farengar/Grand-clerc2.png"
         die_sound={SOUND_LIST:HUMAN_FEMALE_DIE}
diff --git a/units/AoA_units/farengar/Initie.cfg b/units/AoA_units/farengarians_kingdoms/Initiate.cfg
similarity index 91%
rename from units/AoA_units/farengar/Initie.cfg
rename to units/AoA_units/farengarians_kingdoms/Initiate.cfg
index e1efe83e2..583c80b65 100644
--- a/units/AoA_units/farengar/Initie.cfg
+++ b/units/AoA_units/farengarians_kingdoms/Initiate.cfg
@@ -1,6 +1,6 @@
 #textdomain armies_of_amberan
 [unit_type]
-    id=AE_AoA_farengar_initie
+    id=AE_AoA_farengarians_kingdoms_Initiate
     name= _ "Initiate"
     race=farengar
     gender=male,female
@@ -14,7 +14,7 @@
     cost=19
     usage=healer
     description={AE_AOA_UNIT_NOTICE}+ _ "description to come"
-    advances_to=AE_AoA_farengar_clerc
+    advances_to=AE_AoA_farengarians_kingdoms_Cleric
     die_sound={SOUND_LIST:HUMAN_DIE}
     {DEFENSE_ANIM "units/farengar/Initie.png" "units/farengar/Initie.png" {SOUND_LIST:HUMAN_HIT} }
     [abilities]
@@ -50,7 +50,7 @@
     {MACE_SOUND}
     {LIGHT_SOUND}
     [female]
-        name= _"female^Initiate"
+        name= _"Initiate"
         gender=female
         image="units/farengar/Initie2.png"
         die_sound={SOUND_LIST:HUMAN_FEMALE_DIE}
diff --git a/units/AoA_units/farengar/Chevalier.cfg b/units/AoA_units/farengarians_kingdoms/Knight.cfg
similarity index 91%
rename from units/AoA_units/farengar/Chevalier.cfg
rename to units/AoA_units/farengarians_kingdoms/Knight.cfg
index fb3bc6d5e..7fbda93ed 100644
--- a/units/AoA_units/farengar/Chevalier.cfg
+++ b/units/AoA_units/farengarians_kingdoms/Knight.cfg
@@ -1,6 +1,6 @@
 #textdomain armies_of_amberan
 [unit_type]
-    id=AE_AoA_farengar_chevalier
+    id=AE_AoA_farengarians_kingdoms_Chevalier
     name= _ "Chevalier"
     race=farengar
     gender=male,female
@@ -14,7 +14,7 @@
     cost=50
     usage=fighter
     description={AE_AOA_UNIT_NOTICE}+ _ "description to come"
-    advances_to=AE_AoA_farengar_grandChevalier
+    advances_to=AE_AoA_farengarians_kingdoms_Great_Chevalier
     die_sound={SOUND_LIST:HUMAN_DIE}
     {DEFENSE_ANIM "units/farengar/Chevalier.png" "units/farengar/Chevalier.png" {SOUND_LIST:HUMAN_HIT} }
     [defense]
@@ -49,7 +49,7 @@
     {SWORD_SOUND}
     {LANCE_SOUND}
     [female]
-        name= _"female^Chevalier"
+        name= _"Chevalier"
         gender=female
         image="units/farengar/Chevalier2.png"
         die_sound={SOUND_LIST:HUMAN_FEMALE_DIE}
diff --git a/units/AoA_units/farengar/Chevalier_a_pieds.cfg b/units/AoA_units/farengarians_kingdoms/Knight_On_Foots.cfg
similarity index 88%
rename from units/AoA_units/farengar/Chevalier_a_pieds.cfg
rename to units/AoA_units/farengarians_kingdoms/Knight_On_Foots.cfg
index c23bf1010..9f4aae714 100644
--- a/units/AoA_units/farengar/Chevalier_a_pieds.cfg
+++ b/units/AoA_units/farengarians_kingdoms/Knight_On_Foots.cfg
@@ -1,7 +1,7 @@
 #textdomain armies_of_amberan
 [unit_type]
-    id=AE_AoA_farengar_chevalierAPieds
-    name= _ "Chevalier on foots"
+    id=AE_AoA_farengarians_kingdoms_Chevalier_On_Foots
+    name= _ "Chevalier On Foots"
     race=farengar
     gender=male,female
     image="units/farengar/Chevalier-a-pieds.png"
@@ -14,7 +14,7 @@
     cost=31
     usage=fighter
     description={AE_AOA_UNIT_NOTICE}+ _ "description a venir"
-    advances_to=AE_AoA_farengar_champion
+    advances_to=AE_AoA_farengarians_kingdoms_Champion
     die_sound={SOUND_LIST:HUMAN_DIE}
     {DEFENSE_ANIM "units/farengar/Chevalier-a-pieds.png" "units/farengar/Chevalier-a-pieds.png" {SOUND_LIST:HUMAN_HIT} }
     {TRAIT_FEARLESS_MUSTHAVE}
@@ -51,7 +51,7 @@
     [/attack]
     {SWORD_SOUND}
     [female]
-        name= _"female^Chevalier on foots"
+        name= _"Chevalier On Foots"
         gender=female
         image="units/farengar/Chevalier-a-pieds2.png"
         die_sound={SOUND_LIST:HUMAN_FEMALE_DIE}
diff --git a/units/AoA_units/farengar/Archer_long.cfg b/units/AoA_units/farengarians_kingdoms/Longbowman.cfg
similarity index 91%
rename from units/AoA_units/farengar/Archer_long.cfg
rename to units/AoA_units/farengarians_kingdoms/Longbowman.cfg
index 76cb60125..78b23d000 100644
--- a/units/AoA_units/farengar/Archer_long.cfg
+++ b/units/AoA_units/farengarians_kingdoms/Longbowman.cfg
@@ -1,6 +1,6 @@
 #textdomain armies_of_amberan
 [unit_type]
-    id=AE_AoA_farengar_archerLong
+    id=AE_AoA_farengarians_kingdoms_Longbowman
     name= _ "Longbowman"
     race=farengar
     gender=male,female
@@ -14,7 +14,7 @@
     cost=23
     usage=archer
     description={AE_AOA_UNIT_NOTICE}+ _ "description to come"
-    advances_to=AE_AoA_farengar_maitreArcher
+    advances_to=AE_AoA_farengarians_kingdoms_Archer
     die_sound={SOUND_LIST:HUMAN_DIE}
     {DEFENSE_ANIM "units/farengar/Archer-long.png" "units/farengar/Archer-long.png" {SOUND_LIST:HUMAN_HIT} }
     [movement_costs]
@@ -44,7 +44,7 @@
     {SWORD_SOUND}
     {BOW_SOUND}
     [female]
-        name= _"female^longbowman"
+        name= _"longbowman"
         gender=female
         image="units/farengar/Archer-long2.png"
         die_sound={SOUND_LIST:HUMAN_FEMALE_DIE}
diff --git a/units/AoA_units/farengar/Seigneur.cfg b/units/AoA_units/farengarians_kingdoms/Lord.cfg
similarity index 91%
rename from units/AoA_units/farengar/Seigneur.cfg
rename to units/AoA_units/farengarians_kingdoms/Lord.cfg
index af55d03f4..4b4071a2b 100644
--- a/units/AoA_units/farengar/Seigneur.cfg
+++ b/units/AoA_units/farengarians_kingdoms/Lord.cfg
@@ -1,6 +1,6 @@
 #textdomain armies_of_amberan
 [unit_type]
-    id=AE_AoA_farengar_seigneur
+    id=AE_AoA_farengarians_kingdoms_Lord
     name= _ "Lord"
     race=farengar
     gender=male,female
@@ -14,7 +14,7 @@
     cost=31
     usage=fighter
     description={AE_AOA_UNIT_NOTICE}+ _ "description to come"
-    advances_to=AE_AoA_farengar_comte
+    advances_to=AE_AoA_farengarians_kingdoms_Count
     [abilities]
         {ABILITY_LEADERSHIP}
     [/abilities]
@@ -42,7 +42,7 @@
     [/attack]
     {SWORD_SOUND}
     [female]
-        name= _"female^Lady"
+        name= _"Lady"
         gender=female
         image="units/farengar/Seigneur2.png"
         die_sound={SOUND_LIST:HUMAN_FEMALE_DIE}
diff --git a/units/AoA_units/farengar/Mage.cfg b/units/AoA_units/farengarians_kingdoms/Mage.cfg
similarity index 92%
rename from units/AoA_units/farengar/Mage.cfg
rename to units/AoA_units/farengarians_kingdoms/Mage.cfg
index 52bec9175..f77721b16 100644
--- a/units/AoA_units/farengar/Mage.cfg
+++ b/units/AoA_units/farengarians_kingdoms/Mage.cfg
@@ -1,6 +1,6 @@
 #textdomain armies_of_amberan
 [unit_type]
-    id=AE_AoA_farengar_mage
+    id=AE_AoA_farengarians_kingdoms_Mage
     name= _ "Mage"
     race=farengar
     gender=male,female
@@ -14,7 +14,7 @@
     cost=37
     usage=mixed fighter
     description={AE_AOA_UNIT_NOTICE}+ _ "description to come"
-    advances_to=AE_AoA_farengar_mageDeBataille
+    advances_to=AE_AoA_farengarians_kingdoms_Battle_Mage
     die_sound={SOUND_LIST:HUMAN_DIE}
     {DEFENSE_ANIM "units/farengar/Mage.png" "units/farengar/Mage.png" {SOUND_LIST:HUMAN_HIT} }
     [resistance]
@@ -52,7 +52,7 @@
     {STAFF_SOUND}
     {FIREBALL_SOUND}
     [female]
-        name= _"female^Mage"
+        name= _"Mage"
         gender=female
         image="units/farengar/Mage2.png"
         die_sound={SOUND_LIST:HUMAN_FEMALE_DIE}
diff --git a/units/AoA_units/farengar/Maitre_arbaletrier.cfg b/units/AoA_units/farengarians_kingdoms/Master_Crossbowman.cfg
similarity index 92%
rename from units/AoA_units/farengar/Maitre_arbaletrier.cfg
rename to units/AoA_units/farengarians_kingdoms/Master_Crossbowman.cfg
index 57347af83..87fa377c2 100644
--- a/units/AoA_units/farengar/Maitre_arbaletrier.cfg
+++ b/units/AoA_units/farengarians_kingdoms/Master_Crossbowman.cfg
@@ -1,7 +1,7 @@
 #textdomain armies_of_amberan
 [unit_type]
-    id=AE_AoA_farengar_maitreArbaletrier
-    name= _ "Master crossbowman"
+    id=AE_AoA_farengarians_kingdoms_Master_Crossbowman
+    name= _ "Master Crossbowman"
     race=farengar
     gender=male,female
     image="units/farengar/Maitre-arbaletrier.png"
@@ -48,7 +48,7 @@
     {SWORD_SOUND}
     {CROSSBOW_SOUND}
     [female]
-        name= _"female^Master crossbowman"
+        name= _"Master Crossbowman"
         gender=female
         image="units/farengar/Maitre-arbaletrier2.png"
         die_sound={SOUND_LIST:HUMAN_FEMALE_DIE}
diff --git a/units/AoA_units/farengar/Maitre_paladin.cfg b/units/AoA_units/farengarians_kingdoms/Master_Paladin.cfg
similarity index 94%
rename from units/AoA_units/farengar/Maitre_paladin.cfg
rename to units/AoA_units/farengarians_kingdoms/Master_Paladin.cfg
index 6e0dba7ed..12bd4f2ab 100644
--- a/units/AoA_units/farengar/Maitre_paladin.cfg
+++ b/units/AoA_units/farengarians_kingdoms/Master_Paladin.cfg
@@ -1,7 +1,7 @@
 #textdomain armies_of_amberan
 [unit_type]
-    id=AE_AoA_farengar_maitrePaladin
-    name= _ "Master paladin"
+    id=AE_AoA_farengarians_kingdoms_Master_Paladin
+    name= _ "Master Paladin"
     race=farengar
     gender=male,female
     image="units/farengar/Maitre-paladin.png"
@@ -68,7 +68,7 @@
     {SWORD_SOUND}
     {SMITE_SOUND}
     [female]
-        name= _"female^Master paladin"
+        name= _"Master Paladin"
         gender=female
         image="units/farengar/Maitre-paladin2.png"
         die_sound={SOUND_LIST:HUMAN_FEMALE_DIE}
diff --git a/units/AoA_units/farengar/Noble.cfg b/units/AoA_units/farengarians_kingdoms/Noble.cfg
similarity index 90%
rename from units/AoA_units/farengar/Noble.cfg
rename to units/AoA_units/farengarians_kingdoms/Noble.cfg
index 50923598b..f3c4939f8 100644
--- a/units/AoA_units/farengar/Noble.cfg
+++ b/units/AoA_units/farengarians_kingdoms/Noble.cfg
@@ -1,6 +1,6 @@
 #textdomain armies_of_amberan
 [unit_type]
-    id=AE_AoA_farengar_noble
+    id=AE_AoA_farengarians_kingdoms_Noble
     name= _ "Noble"
     race=farengar
     gender=male,female
@@ -14,7 +14,7 @@
     cost=19
     usage=fighter
     description={AE_AOA_UNIT_NOTICE}+ _ "description to come"
-    advances_to=AE_AoA_farengar_seigneur
+    advances_to=AE_AoA_farengarians_kingdoms_Lord
     [abilities]
         {ABILITY_LEADERSHIP}
     [/abilities]
@@ -37,7 +37,7 @@
     [/attack]
     {SWORD_SOUND}
     [female]
-        name= _"female^Noble"
+        name= _"Noble"
         gender=female
         image="units/farengar/Noble2.png"
         die_sound={SOUND_LIST:HUMAN_FEMALE_DIE}
diff --git a/units/AoA_units/farengar/Maitre_archer.cfg b/units/AoA_units/farengarians_kingdoms/Nordic_Master_Archer.cfg
similarity index 95%
rename from units/AoA_units/farengar/Maitre_archer.cfg
rename to units/AoA_units/farengarians_kingdoms/Nordic_Master_Archer.cfg
index f49f10e37..c350bd395 100644
--- a/units/AoA_units/farengar/Maitre_archer.cfg
+++ b/units/AoA_units/farengarians_kingdoms/Nordic_Master_Archer.cfg
@@ -1,6 +1,6 @@
 #textdomain armies_of_amberan
 [unit_type]
-    id=AE_AoA_farengar_maitreArcher
+    id=AE_AoA_farengarians_kingdoms_Archer
     name= _ "Archer"
     race=farengar
     gender=male,female
@@ -45,7 +45,7 @@
     {SWORD_SOUND}
     {BOW_SOUND}
     [female]
-        name= _"female^Archer"
+        name= _"Archer"
         gender=female
         image="units/farengar/Maitre-archer2.png"
         die_sound={SOUND_LIST:HUMAN_FEMALE_DIE}
diff --git a/units/AoA_units/farengar/Paladin.cfg b/units/AoA_units/farengarians_kingdoms/Paladin.cfg
similarity index 93%
rename from units/AoA_units/farengar/Paladin.cfg
rename to units/AoA_units/farengarians_kingdoms/Paladin.cfg
index 2d429d58f..0febaa604 100644
--- a/units/AoA_units/farengar/Paladin.cfg
+++ b/units/AoA_units/farengarians_kingdoms/Paladin.cfg
@@ -1,6 +1,6 @@
 #textdomain armies_of_amberan
 [unit_type]
-    id=AE_AoA_farengar_paladin
+    id=AE_AoA_farengarians_kingdoms_Paladin
     name= _ "Paladin"
     race=farengar
     gender=male,female
@@ -14,7 +14,7 @@
     cost=30
     usage=fighter
     description={AE_AOA_UNIT_NOTICE}+ _ "description to come"
-    advances_to=AE_AoA_farengar_maitrePaladin
+    advances_to=AE_AoA_farengarians_kingdoms_Master_Paladin
     die_sound={SOUND_LIST:HUMAN_DIE}
     {DEFENSE_ANIM "units/farengar/Paladin.png" "units/farengar/Paladin.png" {SOUND_LIST:HUMAN_HIT} }
     {TRAIT_FEARLESS_MUSTHAVE}
@@ -67,7 +67,7 @@
     {SWORD_SOUND}
     {SMITE_SOUND}
     [female]
-        name= _"female^Paladin"
+        name= _"Paladin"
         gender=female
         image="units/farengar/Paladin2.png"
         die_sound={SOUND_LIST:HUMAN_FEMALE_DIE}
diff --git a/units/AoA_units/farengar/Paysan.cfg b/units/AoA_units/farengarians_kingdoms/Peasant.cfg
similarity index 88%
rename from units/AoA_units/farengar/Paysan.cfg
rename to units/AoA_units/farengarians_kingdoms/Peasant.cfg
index 72fc8a467..2bfedb12e 100644
--- a/units/AoA_units/farengar/Paysan.cfg
+++ b/units/AoA_units/farengarians_kingdoms/Peasant.cfg
@@ -1,6 +1,6 @@
 #textdomain armies_of_amberan
 [unit_type]
-    id=AE_AoA_farengar_paysan
+    id=AE_AoA_farengarians_kingdoms_Peasant
     name= _ "Peasant"
     race=farengar
     gender=male,female
@@ -14,7 +14,7 @@
     cost=8
     usage=fighter
     description={AE_AOA_UNIT_NOTICE}+ _ "description a venir"
-    advances_to=AE_AoA_farengar_conscrit,AE_AoA_farengar_archer
+    advances_to=AE_AoA_farengarians_kingdoms_Conscript,AE_AoA_farengarians_kingdoms_Bowman
     die_sound={SOUND_LIST:HUMAN_DIE}
     {DEFENSE_ANIM "units/farengar/Paysan.png" "units/farengar/Paysan.png" {SOUND_LIST:HUMAN_HIT} }
     [movement_costs]
@@ -44,7 +44,7 @@
     {SPEAR_SOUND}
     {JAVELIN_SOUND}
     [female]
-        name= _"female^Peasant"
+        name= _"Peasant"
         gender=female
         image="units/farengar/Paysan2.png"
         die_sound={SOUND_LIST:HUMAN_FEMALE_DIE}
diff --git a/units/AoA_units/farengar/Chevalier_errant.cfg b/units/AoA_units/farengarians_kingdoms/Questing_Chevalier.cfg
similarity index 86%
rename from units/AoA_units/farengar/Chevalier_errant.cfg
rename to units/AoA_units/farengarians_kingdoms/Questing_Chevalier.cfg
index 5258d812f..d04b6b43a 100644
--- a/units/AoA_units/farengar/Chevalier_errant.cfg
+++ b/units/AoA_units/farengarians_kingdoms/Questing_Chevalier.cfg
@@ -1,7 +1,7 @@
 #textdomain armies_of_amberan
 [unit_type]
-    id=AE_AoA_farengar_chevalierErrant
-    name= _ "Questing chevalier"
+    id=AE_AoA_farengarians_kingdoms_Questing_Chevalier
+    name= _ "Questing Chevalier"
     race=farengar
     gender=male,female
     image="units/farengar/Chevalier-errant.png"
@@ -14,7 +14,7 @@
     cost=20
     usage=fighter
     description={AE_AOA_UNIT_NOTICE}+ _ "description a venir"
-    advances_to=AE_AoA_farengar_chevalierAPieds,AE_AoA_farengar_paladin
+    advances_to=AE_AoA_farengarians_kingdoms_Chevalier_On_Foots,AE_AoA_farengarians_kingdoms_Paladin
     die_sound={SOUND_LIST:HUMAN_DIE}
     {DEFENSE_ANIM "units/farengar/Chevalier-errant.png" "units/farengar/Chevalier-errant.png" {SOUND_LIST:HUMAN_HIT} }
     {TRAIT_FEARLESS_MUSTHAVE}
@@ -50,7 +50,7 @@
     [/attack]
     {SWORD_SOUND}
     [female]
-        name= _"female^Questing chevalier"
+        name= _"Questing Chevalier"
         gender=female
         image="units/farengar/Chevalier-errant2.png"
         die_sound={SOUND_LIST:HUMAN_FEMALE_DIE}
diff --git a/units/AoA_units/farengar/Roi.cfg b/units/AoA_units/farengarians_kingdoms/Roi.cfg
similarity index 95%
rename from units/AoA_units/farengar/Roi.cfg
rename to units/AoA_units/farengarians_kingdoms/Roi.cfg
index 5eb64c348..cd11ef36a 100644
--- a/units/AoA_units/farengar/Roi.cfg
+++ b/units/AoA_units/farengarians_kingdoms/Roi.cfg
@@ -1,6 +1,6 @@
 #textdomain armies_of_amberan
 [unit_type]
-    id=AE_AoA_farengar_roi
+    id=AE_AoA_farengarians_kingdoms_Roi
     name= _ "Roi"
     race=farengar
     gender=male,female
@@ -46,7 +46,7 @@
     [/attack]
     {SWORD_SOUND}
     [female]
-        name= _"female^Reine"
+        name= _"Reine"
         gender=female
         image="units/farengar/Reine.png"
         die_sound={SOUND_LIST:HUMAN_FEMALE_DIE}
diff --git a/units/AoA_units/farengar/Sergent.cfg b/units/AoA_units/farengarians_kingdoms/Sergeant.cfg
similarity index 94%
rename from units/AoA_units/farengar/Sergent.cfg
rename to units/AoA_units/farengarians_kingdoms/Sergeant.cfg
index af594776b..84c18701d 100644
--- a/units/AoA_units/farengar/Sergent.cfg
+++ b/units/AoA_units/farengarians_kingdoms/Sergeant.cfg
@@ -1,6 +1,6 @@
 #textdomain armies_of_amberan
 [unit_type]
-    id=AE_AoA_farengar_sergent
+    id=AE_AoA_farengarians_kingdoms_Sergeant
     name= _ "Sergeant"
     race=farengar
     gender=male,female
@@ -39,7 +39,7 @@
     [/attack]
     {MACE_SOUND}
     [female]
-        name= _"female^Sergeant"
+        name= _"Sergeant"
         gender=female
         image="units/farengar/Sergent2.png"
         die_sound={SOUND_LIST:HUMAN_FEMALE_DIE}
diff --git a/units/AoA_units/farengar/Lancier.cfg b/units/AoA_units/farengarians_kingdoms/Spearman.cfg
similarity index 90%
rename from units/AoA_units/farengar/Lancier.cfg
rename to units/AoA_units/farengarians_kingdoms/Spearman.cfg
index e3ea4a9f2..ca40518aa 100644
--- a/units/AoA_units/farengar/Lancier.cfg
+++ b/units/AoA_units/farengarians_kingdoms/Spearman.cfg
@@ -1,6 +1,6 @@
 #textdomain armies_of_amberan
 [unit_type]
-    id=AE_AoA_farengar_lancier
+    id=AE_AoA_farengarians_kingdoms_Lancer
     name= _ "Lancer"
     race=farengar
     gender=male,female
@@ -14,7 +14,7 @@
     cost=47
     usage=fighter
     description={AE_AOA_UNIT_NOTICE}+ _ "description to come"
-    advances_to=AE_AoA_farengar_heraut
+    advances_to=AE_AoA_farengarians_kingdoms_Herald
     die_sound={SOUND_LIST:HUMAN_DIE}
     {DEFENSE_ANIM "units/farengar/Lancier.png" "units/farengar/Lancier.png" {SOUND_LIST:HUMAN_HIT} }
     [defense]
@@ -34,7 +34,7 @@
     [/attack]
     {LANCE_SOUND}
     [female]
-        name= _"female^Lancer"
+        name= _"Lancer"
         gender=female
         image="units/farengar/Lancier2.png"
         die_sound={SOUND_LIST:HUMAN_FEMALE_DIE}
diff --git a/units/AoA_units/farengar/Ecuyer.cfg b/units/AoA_units/farengarians_kingdoms/Squire.cfg
similarity index 87%
rename from units/AoA_units/farengar/Ecuyer.cfg
rename to units/AoA_units/farengarians_kingdoms/Squire.cfg
index fa8d2c88f..696d1db7c 100644
--- a/units/AoA_units/farengar/Ecuyer.cfg
+++ b/units/AoA_units/farengarians_kingdoms/Squire.cfg
@@ -1,6 +1,6 @@
 #textdomain armies_of_amberan
 [unit_type]
-    id=AE_AoA_farengar_ecuyer
+    id=AE_AoA_farengarians_kingdoms_Squire
     name= _ "Squire"
     race=farengar
     gender=male,female
@@ -14,7 +14,7 @@
     cost=24
     usage=fighter
     description={AE_AOA_UNIT_NOTICE}+ _ "description a venir"
-    advances_to=AE_AoA_farengar_chevalier,AE_AoA_farengar_lancier
+    advances_to=AE_AoA_farengarians_kingdoms_Chevalier,AE_AoA_farengarians_kingdoms_Lancer
     die_sound={SOUND_LIST:HUMAN_DIE}
     {DEFENSE_ANIM "units/farengar/Ecuyer.png" "units/farengar/Ecuyer.png" {SOUND_LIST:HUMAN_HIT} }
     [defense]
@@ -34,7 +34,7 @@
     [/attack]
     {SPEAR_SOUND}
     [female]
-        name= _"female^Squire"
+        name= _"Squire"
         gender=female
         image="units/farengar/Ecuyer2.png"
         die_sound={SOUND_LIST:HUMAN_FEMALE_DIE}
diff --git a/units/AoA_units/empire/Canon.cfg b/units/AoA_units/finn_empire/Cannon.cfg
similarity index 93%
rename from units/AoA_units/empire/Canon.cfg
rename to units/AoA_units/finn_empire/Cannon.cfg
index b8453f4bd..f1a8d6ee6 100644
--- a/units/AoA_units/empire/Canon.cfg
+++ b/units/AoA_units/finn_empire/Cannon.cfg
@@ -1,6 +1,6 @@
 #textdomain armies_of_amberan
 [unit_type]
-    id=AE_AoA_empfinn_canon
+    id=AE_AoA_finn_empire_Cannon
     name= _ "Cannon"
     race=mechanical
     gender=male
@@ -14,7 +14,7 @@
     cost=28
     usage=archer
     description={AE_AOA_UNIT_NOTICE}+ _ "description a venir"
-    advances_to=AE_AoA_empfinn_canon_lourd
+    advances_to=AE_AoA_finn_empire_Great_Cannon
     die_sound={SOUND_LIST:HUMAN_DIE}
 
     [resistance]
diff --git a/units/AoA_units/empire/Capitaine.cfg b/units/AoA_units/finn_empire/Captain.cfg
similarity index 93%
rename from units/AoA_units/empire/Capitaine.cfg
rename to units/AoA_units/finn_empire/Captain.cfg
index ad3267bac..3e6cdbebe 100644
--- a/units/AoA_units/empire/Capitaine.cfg
+++ b/units/AoA_units/finn_empire/Captain.cfg
@@ -1,6 +1,6 @@
 #textdomain armies_of_amberan
 [unit_type]
-    id=AE_AoA_empfinn_capitaine
+    id=AE_AoA_finn_empire_Captain
     name= _ "Captain"
     race=empfinn
     gender=male
@@ -14,7 +14,7 @@
     cost=31
     usage=fighter
     description={AE_AOA_UNIT_NOTICE}+ _ "description to come"
-    advances_to=AE_AoA_empfinn_commandant
+    advances_to=AE_AoA_finn_empire_Commander
     die_sound={SOUND_LIST:HUMAN_DIE}
     {DEFENSE_ANIM "units/empire/Capitaine.png" "units/empire/Capitaine.png" {SOUND_LIST:HUMAN_HIT} }
     [abilities]
diff --git a/units/AoA_units/empire/Citoyen.cfg b/units/AoA_units/finn_empire/Citizen.cfg
similarity index 83%
rename from units/AoA_units/empire/Citoyen.cfg
rename to units/AoA_units/finn_empire/Citizen.cfg
index ba8c0478e..2f0926495 100644
--- a/units/AoA_units/empire/Citoyen.cfg
+++ b/units/AoA_units/finn_empire/Citizen.cfg
@@ -1,6 +1,6 @@
 #textdomain armies_of_amberan
 [unit_type]
-    id=AE_AoA_empfinn_citoyen
+    id=AE_AoA_finn_empire_Citizen
     name= _ "Citizen"
     race=empfinn
     gender=male
@@ -14,7 +14,7 @@
     cost=8
     usage=fighter
     description={AE_AOA_UNIT_NOTICE}+ _ "description to come"
-    advances_to=AE_AoA_empfinn_recrue,AE_AoA_empfinn_arbaletrier,AE_AoA_empfinn_arquebusier
+    advances_to=AE_AoA_finn_empire_Recruit,AE_AoA_finn_empire_Crossbowman,AE_AoA_finn_empire_Handgunner
     die_sound={SOUND_LIST:HUMAN_DIE}
     {DEFENSE_ANIM "units/empire/Citoyen.png" "units/empire/Citoyen.png" {SOUND_LIST:HUMAN_HIT} }
     [attack]
diff --git a/units/AoA_units/empire/Commandant.cfg b/units/AoA_units/finn_empire/Commander.cfg
similarity index 93%
rename from units/AoA_units/empire/Commandant.cfg
rename to units/AoA_units/finn_empire/Commander.cfg
index 7176cae6b..0e817f7c6 100644
--- a/units/AoA_units/empire/Commandant.cfg
+++ b/units/AoA_units/finn_empire/Commander.cfg
@@ -1,6 +1,6 @@
 #textdomain armies_of_amberan
 [unit_type]
-    id=AE_AoA_empfinn_commandant
+    id=AE_AoA_finn_empire_Commander
     name= _ "Commander"
     race=empfinn
     gender=male
@@ -14,7 +14,7 @@
     cost=64
     usage=fighter
     description={AE_AOA_UNIT_NOTICE}+ _ "description to come"
-    advances_to=AE_AoA_empfinn_general
+    advances_to=AE_AoA_finn_empire_General
     die_sound={SOUND_LIST:HUMAN_DIE}
     {DEFENSE_ANIM "units/empire/Commandant.png" "units/empire/Commandant.png" {SOUND_LIST:HUMAN_HIT} }
     [resistance]
diff --git a/units/AoA_units/empire/Arbaletrier.cfg b/units/AoA_units/finn_empire/Crossbowman.cfg
similarity index 87%
rename from units/AoA_units/empire/Arbaletrier.cfg
rename to units/AoA_units/finn_empire/Crossbowman.cfg
index 7a6017053..1124fd725 100644
--- a/units/AoA_units/empire/Arbaletrier.cfg
+++ b/units/AoA_units/finn_empire/Crossbowman.cfg
@@ -1,6 +1,6 @@
 #textdomain armies_of_amberan
 [unit_type]
-    id=AE_AoA_empfinn_arbaletrier
+    id=AE_AoA_finn_empire_Crossbowman
     name= _ "Crossbowman"
     race=empfinn
     gender=male
@@ -14,7 +14,7 @@
     cost=14
     usage=archer
     description={AE_AOA_UNIT_NOTICE}+ _ "description to come"
-    advances_to=AE_AoA_empfinn_arbaletrier_lourd,AE_AoA_empfinn_arbaletrier_hel
+    advances_to=AE_AoA_finn_empire_Heavy_Crossbowman,AE_AoA_finn_empire_Helgrindian_Crossbowman
     die_sound={SOUND_LIST:HUMAN_DIE}
     {DEFENSE_ANIM "units/empire/Arbaletrier.png" "units/empire/Arbaletrier.png" {SOUND_LIST:HUMAN_HIT} }
     [abilities]
diff --git a/units/AoA_units/empire/Dueliste.cfg b/units/AoA_units/finn_empire/Duelist.cfg
similarity index 93%
rename from units/AoA_units/empire/Dueliste.cfg
rename to units/AoA_units/finn_empire/Duelist.cfg
index 1e51ae098..59efcaa06 100644
--- a/units/AoA_units/empire/Dueliste.cfg
+++ b/units/AoA_units/finn_empire/Duelist.cfg
@@ -1,6 +1,6 @@
 #textdomain armies_of_amberan
 [unit_type]
-    id=AE_AoA_empfinn_dueliste
+    id=AE_AoA_finn_empire_Duelist
     name= _ "Duelist"
     race=empfinn
     gender=male,female
@@ -14,7 +14,7 @@
     cost=34
     usage=fighter
     description={AE_AOA_UNIT_NOTICE}+ _ "description to come"
-    advances_to=AE_AoA_empfinn_maitreDArmes
+    advances_to=AE_AoA_finn_empire_Master_At_Arms
     die_sound={SOUND_LIST:HUMAN_DIE}
     {DEFENSE_ANIM "units/empire/Dueliste.png" "units/empire/Dueliste.png" {SOUND_LIST:HUMAN_HIT} }
     [resistance]
@@ -50,7 +50,7 @@
     {RAPIER_SOUND}
     {PISTOL_SOUND}
     [female]
-        name= _"female^Duelist"
+        name= _"Duelist"
         gender=female
         image="units/empire/Dueliste2.png"
         die_sound={SOUND_LIST:HUMAN_FEMALE_DIE}
diff --git a/units/AoA_units/empire/Empereur.cfg b/units/AoA_units/finn_empire/Emperor.cfg
similarity index 97%
rename from units/AoA_units/empire/Empereur.cfg
rename to units/AoA_units/finn_empire/Emperor.cfg
index b73a5accf..204d0ccbd 100644
--- a/units/AoA_units/empire/Empereur.cfg
+++ b/units/AoA_units/finn_empire/Emperor.cfg
@@ -1,6 +1,6 @@
 #textdomain armies_of_amberan
 [unit_type]
-    id=AE_AoA_empfinn_empereur
+    id=AE_AoA_finn_empire_Emperor
     name= _ "Emperor"
     race=empfinn
     gender=male
diff --git a/units/AoA_units/empire/Enchanteur.cfg b/units/AoA_units/finn_empire/Enchanter.cfg
similarity index 92%
rename from units/AoA_units/empire/Enchanteur.cfg
rename to units/AoA_units/finn_empire/Enchanter.cfg
index 11ccf1a9d..049224875 100644
--- a/units/AoA_units/empire/Enchanteur.cfg
+++ b/units/AoA_units/finn_empire/Enchanter.cfg
@@ -1,6 +1,6 @@
 #textdomain armies_of_amberan
 [unit_type]
-    id=AE_AoA_empfinn_enchanteur
+    id=AE_AoA_finn_empire_Enchanter
     name= _ "Enchanter"
     race=empfinn
     gender=male,female
@@ -14,7 +14,7 @@
     cost=32
     usage=healer
     description={AE_AOA_UNIT_NOTICE}+ _ "Enchantement !"
-    advances_to=AE_AoA_empfinn_maitreEnchanteur
+    advances_to=AE_AoA_finn_empire_Master_Enchanter
     die_sound={SOUND_LIST:HUMAN_DIE}
     {DEFENSE_ANIM "units/empire/Enchanteur.png" "units/empire/Enchanteur.png" {SOUND_LIST:HUMAN_HIT} }
     [abilities]
@@ -47,7 +47,7 @@
     [/attack]
     {SWORD_SOUND}
     [female]
-        name= _"female^Enchanter"
+        name= _"Enchanter"
         gender=female
         image="units/empire/Enchanteur2.png"
         die_sound={SOUND_LIST:HUMAN_FEMALE_DIE}
diff --git a/units/AoA_units/empire/Apprenti_enchanteur.cfg b/units/AoA_units/finn_empire/Enchanter_Apprentice.cfg
similarity index 89%
rename from units/AoA_units/empire/Apprenti_enchanteur.cfg
rename to units/AoA_units/finn_empire/Enchanter_Apprentice.cfg
index b227f9299..c02e8a799 100644
--- a/units/AoA_units/empire/Apprenti_enchanteur.cfg
+++ b/units/AoA_units/finn_empire/Enchanter_Apprentice.cfg
@@ -1,7 +1,7 @@
 #textdomain armies_of_amberan
 [unit_type]
-    id=AE_AoA_empfinn_apprentiEnchanteur
-    name= _ "Enchanter apprentice"
+    id=AE_AoA_finn_empire_Enchanter_Apprentice
+    name= _ "Enchanter Apprentice"
     race=empfinn
     gender=male,female
     image="units/empire/Apprenti-enchanteur.png"
@@ -14,7 +14,7 @@
     cost=16
     usage=healer
     description={AE_AOA_UNIT_NOTICE}+ _ "Enchantement !"
-    advances_to=AE_AoA_empfinn_enchanteur
+    advances_to=AE_AoA_finn_empire_Enchanter
     die_sound={SOUND_LIST:HUMAN_DIE}
     {DEFENSE_ANIM "units/empire/Apprenti-enchanteur.png" "units/empire/Apprenti-enchanteur.png" {SOUND_LIST:HUMAN_HIT} }
     [abilities]
@@ -46,7 +46,7 @@
     [/attack]
     {SWORD_SOUND}
     [female]
-        name= _"female^Enchanter apprentice"
+        name= _"Enchanter Apprentice"
         gender=female
         image="units/empire/Apprenti-enchanteur2.png"
         die_sound={SOUND_LIST:HUMAN_FEMALE_DIE}
diff --git a/units/AoA_units/empire/Bretteur.cfg b/units/AoA_units/finn_empire/Fencer.cfg
similarity index 93%
rename from units/AoA_units/empire/Bretteur.cfg
rename to units/AoA_units/finn_empire/Fencer.cfg
index d6f933e54..3c7e45ca1 100644
--- a/units/AoA_units/empire/Bretteur.cfg
+++ b/units/AoA_units/finn_empire/Fencer.cfg
@@ -1,6 +1,6 @@
 #textdomain armies_of_amberan
 [unit_type]
-    id=AE_AoA_empfinn_bretteur
+    id=AE_AoA_finn_empire_Fencer
     name= _ "Fencer"
     race=empfinn
     gender=male,female
@@ -14,7 +14,7 @@
     cost=19
     usage=fighter
     description={AE_AOA_UNIT_NOTICE}+ _ "description to come (ex stats = pv = 28)"
-    advances_to=AE_AoA_empfinn_dueliste
+    advances_to=AE_AoA_finn_empire_Duelist
     die_sound={SOUND_LIST:HUMAN_DIE}
     {DEFENSE_ANIM "units/empire/Bretteur.png" "units/empire/Bretteur.png" {SOUND_LIST:HUMAN_HIT} }
     [resistance]
@@ -47,7 +47,7 @@
     {RAPIER_SOUND}
     {PISTOL_SOUND}
     [female]
-        name= _"female^Fencer"
+        name= _"Fencer"
         gender=female
         image="units/empire/Bretteur2.png"
         die_sound={SOUND_LIST:HUMAN_FEMALE_DIE}
diff --git a/units/AoA_units/empire/General.cfg b/units/AoA_units/finn_empire/General.cfg
similarity index 97%
rename from units/AoA_units/empire/General.cfg
rename to units/AoA_units/finn_empire/General.cfg
index 5f14a2b9c..38b9a487b 100644
--- a/units/AoA_units/empire/General.cfg
+++ b/units/AoA_units/finn_empire/General.cfg
@@ -1,6 +1,6 @@
 #textdomain armies_of_amberan
 [unit_type]
-    id=AE_AoA_empfinn_general
+    id=AE_AoA_finn_empire_General
     name= _ "General"
     race=empfinn
     gender=male
diff --git a/units/AoA_units/empire/Canon_lourd.cfg b/units/AoA_units/finn_empire/Great_Cannon.cfg
similarity index 95%
rename from units/AoA_units/empire/Canon_lourd.cfg
rename to units/AoA_units/finn_empire/Great_Cannon.cfg
index c751c884c..acff87154 100644
--- a/units/AoA_units/empire/Canon_lourd.cfg
+++ b/units/AoA_units/finn_empire/Great_Cannon.cfg
@@ -1,7 +1,7 @@
 #textdomain armies_of_amberan
 [unit_type]
-    id=AE_AoA_empfinn_canon_lourd
-    name= _ "Great cannon"
+    id=AE_AoA_finn_empire_Great_Cannon
+    name= _ "Great Cannon"
     race=mechanical
     gender=male
     image="units/empire/Canon-lourd.png"
diff --git a/units/AoA_units/empire/Hallebardier.cfg b/units/AoA_units/finn_empire/Halberdier.cfg
similarity index 96%
rename from units/AoA_units/empire/Hallebardier.cfg
rename to units/AoA_units/finn_empire/Halberdier.cfg
index f4cc24b7c..faf549b6b 100644
--- a/units/AoA_units/empire/Hallebardier.cfg
+++ b/units/AoA_units/finn_empire/Halberdier.cfg
@@ -1,6 +1,6 @@
 #textdomain armies_of_amberan
 [unit_type]
-    id=AE_AoA_empfinn_hallebardier
+    id=AE_AoA_finn_empire_Halberdier
     name= _ "Halberdier"
     race=empfinn
     gender=male
diff --git a/units/AoA_units/empire/Arquebusier.cfg b/units/AoA_units/finn_empire/Handgunner.cfg
similarity index 92%
rename from units/AoA_units/empire/Arquebusier.cfg
rename to units/AoA_units/finn_empire/Handgunner.cfg
index fa8177030..d4ed42106 100644
--- a/units/AoA_units/empire/Arquebusier.cfg
+++ b/units/AoA_units/finn_empire/Handgunner.cfg
@@ -1,6 +1,6 @@
 #textdomain armies_of_amberan
 [unit_type]
-    id=AE_AoA_empfinn_arquebusier
+    id=AE_AoA_finn_empire_Handgunner
     name= _ "Handgunner"
     race=empfinn
     gender=male
@@ -14,7 +14,7 @@
     cost=17
     usage=archer
     description={AE_AOA_UNIT_NOTICE}+ _ "description to come"
-    advances_to=AE_AoA_empfinn_tireur
+    advances_to=AE_AoA_finn_empire_Sharpshooter
     die_sound={SOUND_LIST:HUMAN_DIE}
     {DEFENSE_ANIM "units/empire/Arquebusier.png" "units/empire/Arquebusier.png" {SOUND_LIST:HUMAN_HIT} }
 
diff --git a/units/AoA_units/empire/Arbaletrier_lourd.cfg b/units/AoA_units/finn_empire/Heavy_Crossbow.cfg
similarity index 87%
rename from units/AoA_units/empire/Arbaletrier_lourd.cfg
rename to units/AoA_units/finn_empire/Heavy_Crossbow.cfg
index 82972e915..ebb993257 100644
--- a/units/AoA_units/empire/Arbaletrier_lourd.cfg
+++ b/units/AoA_units/finn_empire/Heavy_Crossbow.cfg
@@ -1,7 +1,7 @@
 #textdomain armies_of_amberan
 [unit_type]
-    id=AE_AoA_empfinn_arbaletrier_lourd
-    name= _ "Heavy crossbowman"
+    id=AE_AoA_finn_empire_Heavy_Crossbowman
+    name= _ "Heavy Crossbowman"
     race=empfinn
     gender=male
     image="units/empire/Arbaletrier-lourd.png"
@@ -14,7 +14,7 @@
     cost=23
     usage=archer
     description={AE_AOA_UNIT_NOTICE}+ _ "description a venir"
-    advances_to=AE_AoA_empfinn_maitreArbaletrier
+    advances_to=AE_AoA_finn_empire_Master_Crossbowman
     die_sound={SOUND_LIST:HUMAN_DIE}
     {DEFENSE_ANIM "units/empire/Arbaletrier-lourd.png" "units/empire/Arbaletrier-lourd.png" {SOUND_LIST:HUMAN_HIT} }
     [abilities]
diff --git a/units/AoA_units/empire/Arbaletrier_helgrind.cfg b/units/AoA_units/finn_empire/Helgrindian_Crossbowman.cfg
similarity index 86%
rename from units/AoA_units/empire/Arbaletrier_helgrind.cfg
rename to units/AoA_units/finn_empire/Helgrindian_Crossbowman.cfg
index c520252d0..0580fab83 100644
--- a/units/AoA_units/empire/Arbaletrier_helgrind.cfg
+++ b/units/AoA_units/finn_empire/Helgrindian_Crossbowman.cfg
@@ -1,7 +1,7 @@
 #textdomain armies_of_amberan
 [unit_type]
-    id=AE_AoA_empfinn_arbaletrier_hel
-    name= _ "Helgrindian crossbowman"
+    id=AE_AoA_finn_empire_Helgrindian_Crossbowman
+    name= _ "Helgrindian Crossbowman"
     race=empfinn
     gender=male
     image="units/empire/Arbaletrier-helgrindois.png"
@@ -14,7 +14,7 @@
     cost=27
     usage=archer
     description={AE_AOA_UNIT_NOTICE}+ _ "description a venir"
-    advances_to=AE_AoA_empfinn_arbaletrier_hel_lourd
+    advances_to=AE_AoA_finn_empire_Helgrindian_Heavy_Crossbowman
     die_sound={SOUND_LIST:HUMAN_DIE}
     {DEFENSE_ANIM "units/empire/Arbaletrier-helgrindois.png" "units/empire/Arbaletrier-helgrindois.png" {SOUND_LIST:HUMAN_HIT} }
     [abilities]
diff --git a/units/AoA_units/empire/Arbaletrier_helgrind_lourd.cfg b/units/AoA_units/finn_empire/Helgrindian_Heavy_Crossbowman.cfg
similarity index 91%
rename from units/AoA_units/empire/Arbaletrier_helgrind_lourd.cfg
rename to units/AoA_units/finn_empire/Helgrindian_Heavy_Crossbowman.cfg
index 9c0401ad6..a7367ec9e 100644
--- a/units/AoA_units/empire/Arbaletrier_helgrind_lourd.cfg
+++ b/units/AoA_units/finn_empire/Helgrindian_Heavy_Crossbowman.cfg
@@ -1,7 +1,7 @@
 #textdomain armies_of_amberan
 [unit_type]
-    id=AE_AoA_empfinn_arbaletrier_hel_lourd
-    name= _ "Helgrindian heavy crossbowman"
+    id=AE_AoA_finn_empire_Helgrindian_Heavy_Crossbowman
+    name= _ "Helgrindian Heavy Crossbowman"
     race=empfinn
     gender=male
     image="units/empire/Arbaletrier-helgrindois-lourd.png"
diff --git a/units/AoA_units/empire/Soldat_helgrind_lourd.cfg b/units/AoA_units/finn_empire/Helgrindian_Heavy_Soldier.cfg
similarity index 91%
rename from units/AoA_units/empire/Soldat_helgrind_lourd.cfg
rename to units/AoA_units/finn_empire/Helgrindian_Heavy_Soldier.cfg
index 96156cbc7..5b16a637b 100644
--- a/units/AoA_units/empire/Soldat_helgrind_lourd.cfg
+++ b/units/AoA_units/finn_empire/Helgrindian_Heavy_Soldier.cfg
@@ -1,7 +1,7 @@
 #textdomain armies_of_amberan
 [unit_type]
-    id=AE_AoA_empfinn_soldat_lourd
-    name= _ "Helgrindian heavy soldier"
+    id=AE_AoA_finn_empire_Helgrindian_Heavy_Soldier
+    name= _ "Helgrindian Heavy Soldier"
     race=empfinn
     gender=male
     image="units/empire/Soldat-helgrindois-lourd.png"
diff --git a/units/AoA_units/empire/Soldat_helgrind.cfg b/units/AoA_units/finn_empire/Helgrindian_Soldier.cfg
similarity index 85%
rename from units/AoA_units/empire/Soldat_helgrind.cfg
rename to units/AoA_units/finn_empire/Helgrindian_Soldier.cfg
index f57aa1c5c..243124279 100644
--- a/units/AoA_units/empire/Soldat_helgrind.cfg
+++ b/units/AoA_units/finn_empire/Helgrindian_Soldier.cfg
@@ -1,7 +1,7 @@
 #textdomain armies_of_amberan
 [unit_type]
-    id=AE_AoA_empfinn_soldat_hel
-    name= _ "Helgrindian soldier"
+    id=AE_AoA_finn_empire_Helgrindian_Soldier
+    name= _ "Helgrindian Soldier"
     race=empfinn
     gender=male
     image="units/empire/Soldat-helgrindois.png"
@@ -14,7 +14,7 @@
     cost=24
     usage=fighter
     description={AE_AOA_UNIT_NOTICE}+ _ "description to come"
-    advances_to=AE_AoA_empfinn_soldat_lourd
+    advances_to=AE_AoA_finn_empire_Helgrindian_Heavy_Soldier
     die_sound={SOUND_LIST:HUMAN_DIE}
     {DEFENSE_ANIM "units/empire/Soldat-helgrindois.png" "units/empire/Soldat-helgrindois.png" {SOUND_LIST:HUMAN_HIT} }
     [abilities]
diff --git a/units/AoA_units/empire/Lansquenet.cfg b/units/AoA_units/finn_empire/Lansquenet.cfg
similarity index 96%
rename from units/AoA_units/empire/Lansquenet.cfg
rename to units/AoA_units/finn_empire/Lansquenet.cfg
index b589cbe9b..a0743d790 100644
--- a/units/AoA_units/empire/Lansquenet.cfg
+++ b/units/AoA_units/finn_empire/Lansquenet.cfg
@@ -1,6 +1,6 @@
 #textdomain armies_of_amberan
 [unit_type]
-    id=AE_AoA_empfinn_lansquenet
+    id=AE_AoA_finn_empire_Lansquenet
     name= _ "Lansquenet"
     race=empfinn
     gender=male
diff --git a/units/AoA_units/empire/Canon_leger.cfg b/units/AoA_units/finn_empire/Light_Cannon.cfg
similarity index 89%
rename from units/AoA_units/empire/Canon_leger.cfg
rename to units/AoA_units/finn_empire/Light_Cannon.cfg
index 3793fc66e..7ff36d8f5 100644
--- a/units/AoA_units/empire/Canon_leger.cfg
+++ b/units/AoA_units/finn_empire/Light_Cannon.cfg
@@ -1,7 +1,7 @@
 #textdomain armies_of_amberan
 [unit_type]
-    id=AE_AoA_empfinn_canon_leger
-    name= _ "Light cannon"
+    id=AE_AoA_finn_empire_Light_Cannon
+    name= _ "Light Cannon"
     race=mechanical
     gender=male
     image="units/empire/Canon-leger.png"
@@ -14,7 +14,7 @@
     cost=20
     usage=archer
     description={AE_AOA_UNIT_NOTICE}+ _ "description a venir"
-    advances_to=AE_AoA_empfinn_canon,AE_AoA_empfinn_mortier
+    advances_to=AE_AoA_finn_empire_Cannon,AE_AoA_finn_empire_Mortar
     die_sound={SOUND_LIST:HUMAN_DIE}
 
     [resistance]
diff --git a/units/AoA_units/empire/Seigneur.cfg b/units/AoA_units/finn_empire/Lord.cfg
similarity index 96%
rename from units/AoA_units/empire/Seigneur.cfg
rename to units/AoA_units/finn_empire/Lord.cfg
index dad3d6a60..4a4a77fd8 100644
--- a/units/AoA_units/empire/Seigneur.cfg
+++ b/units/AoA_units/finn_empire/Lord.cfg
@@ -1,6 +1,6 @@
 #textdomain armies_of_amberan
 [unit_type]
-    id=AE_AoA_empfinn_seigneur
+    id=AE_AoA_finn_empire_Lord
     name= _ "Lord"
     race=empfinn
     gender=male
diff --git a/units/AoA_units/empire/Maitre_d_armes.cfg b/units/AoA_units/finn_empire/Master_At_Arms.cfg
similarity index 93%
rename from units/AoA_units/empire/Maitre_d_armes.cfg
rename to units/AoA_units/finn_empire/Master_At_Arms.cfg
index 5dabe33e3..2d82b5d9c 100644
--- a/units/AoA_units/empire/Maitre_d_armes.cfg
+++ b/units/AoA_units/finn_empire/Master_At_Arms.cfg
@@ -1,7 +1,7 @@
 #textdomain armies_of_amberan
 [unit_type]
-    id=AE_AoA_empfinn_maitreDArmes
-    name= _ "Master at arms"
+    id=AE_AoA_finn_empire_Master_At_Arms
+    name= _ "Master At Arms"
     race=empfinn
     gender=male,female
     image="units/empire/Maitre-d-armes.png"
@@ -51,7 +51,7 @@
     {RAPIER_SOUND}
     {PISTOL_SOUND}
     [female]
-        name= _"female^Master at arms"
+        name= _"Master At Arms"
         gender=female
         image="units/empire/Maitre-d-armes2.png"
         die_sound={SOUND_LIST:HUMAN_FEMALE_DIE}
diff --git a/units/AoA_units/empire/Maitre_arbaletrier.cfg b/units/AoA_units/finn_empire/Master_Crossbowman.cfg
similarity index 93%
rename from units/AoA_units/empire/Maitre_arbaletrier.cfg
rename to units/AoA_units/finn_empire/Master_Crossbowman.cfg
index 79854db87..1f94b1ce2 100644
--- a/units/AoA_units/empire/Maitre_arbaletrier.cfg
+++ b/units/AoA_units/finn_empire/Master_Crossbowman.cfg
@@ -1,7 +1,7 @@
 #textdomain armies_of_amberan
 [unit_type]
-    id=AE_AoA_empfinn_maitreArbaletrier
-    name= _ "Master crossbowman"
+    id=AE_AoA_finn_empire_Master_Crossbowman
+    name= _ "Master Crossbowman"
     race=empfinn
     gender=male
     image="units/empire/Maitre-arbaletrier.png"
diff --git a/units/AoA_units/empire/Maitre_enchanteur.cfg b/units/AoA_units/finn_empire/Master_Enchanter.cfg
similarity index 94%
rename from units/AoA_units/empire/Maitre_enchanteur.cfg
rename to units/AoA_units/finn_empire/Master_Enchanter.cfg
index 3f44050b7..90c7554bc 100644
--- a/units/AoA_units/empire/Maitre_enchanteur.cfg
+++ b/units/AoA_units/finn_empire/Master_Enchanter.cfg
@@ -1,6 +1,6 @@
 #textdomain armies_of_amberan
 [unit_type]
-    id=AE_AoA_empfinn_maitreEnchanteur
+    id=AE_AoA_finn_empire_Master_Enchanter
     name= _ "Master Enchanter"
     race=empfinn
     gender=male,female
@@ -48,7 +48,7 @@
     [/attack]
     {SWORD_SOUND}
     [female]
-        name= _"female^Master Enchanter"
+        name= _"Master Enchanter"
         gender=female
         image="units/empire/Maitre-enchanteur2.png"
         die_sound={SOUND_LIST:HUMAN_FEMALE_DIE}
diff --git a/units/AoA_units/empire/Mortier.cfg b/units/AoA_units/finn_empire/Mortar.cfg
similarity index 97%
rename from units/AoA_units/empire/Mortier.cfg
rename to units/AoA_units/finn_empire/Mortar.cfg
index 6fdd2f7c6..7fe3e019b 100644
--- a/units/AoA_units/empire/Mortier.cfg
+++ b/units/AoA_units/finn_empire/Mortar.cfg
@@ -1,6 +1,6 @@
 #textdomain armies_of_amberan
 [unit_type]
-    id=AE_AoA_empfinn_mortier
+    id=AE_AoA_finn_empire_Mortar
     name= _ "Mortar"
     race=mechanical
     gender=male
diff --git a/units/AoA_units/empire/Noble.cfg b/units/AoA_units/finn_empire/Noble.cfg
similarity index 91%
rename from units/AoA_units/empire/Noble.cfg
rename to units/AoA_units/finn_empire/Noble.cfg
index 9456da84f..de2913d85 100644
--- a/units/AoA_units/empire/Noble.cfg
+++ b/units/AoA_units/finn_empire/Noble.cfg
@@ -1,6 +1,6 @@
 #textdomain armies_of_amberan
 [unit_type]
-    id=AE_AoA_empfinn_noble
+    id=AE_AoA_finn_empire_Noble
     name= _ "Noble"
     race=empfinn
     gender=male
@@ -14,7 +14,7 @@
     cost=29
     usage=scout
     description={AE_AOA_UNIT_NOTICE}+ _ "description to come"
-    advances_to=AE_AoA_empfinn_seigneur
+    advances_to=AE_AoA_finn_empire_Lord
     die_sound={SOUND_LIST:HUMAN_DIE}
     {DEFENSE_ANIM "units/empire/Noble.png" "units/empire/Noble.png" {SOUND_LIST:HUMAN_HIT} }
 
diff --git a/units/AoA_units/empire/Piquier.cfg b/units/AoA_units/finn_empire/Pikeman.cfg
similarity index 91%
rename from units/AoA_units/empire/Piquier.cfg
rename to units/AoA_units/finn_empire/Pikeman.cfg
index a5cef9e3f..9979595bf 100644
--- a/units/AoA_units/empire/Piquier.cfg
+++ b/units/AoA_units/finn_empire/Pikeman.cfg
@@ -1,6 +1,6 @@
 #textdomain armies_of_amberan
 [unit_type]
-    id=AE_AoA_empfinn_piquier
+    id=AE_AoA_finn_empire_Pikeman
     name= _ "Pikeman"
     race=empfinn
     gender=male
@@ -14,7 +14,7 @@
     cost=26
     usage=fighter
     description={AE_AOA_UNIT_NOTICE}+ _ "description a venir"
-    advances_to=AE_AoA_empfinn_hallebardier
+    advances_to=AE_AoA_finn_empire_Halberdier
     die_sound={SOUND_LIST:HUMAN_DIE}
     {DEFENSE_ANIM "units/empire/Piquier.png" "units/empire/Piquier.png" {SOUND_LIST:HUMAN_HIT} }
     [resistance]
diff --git a/units/AoA_units/empire/Pistolier.cfg b/units/AoA_units/finn_empire/Pistolier.cfg
similarity index 96%
rename from units/AoA_units/empire/Pistolier.cfg
rename to units/AoA_units/finn_empire/Pistolier.cfg
index 2013c9f8c..1d3f95df6 100644
--- a/units/AoA_units/empire/Pistolier.cfg
+++ b/units/AoA_units/finn_empire/Pistolier.cfg
@@ -1,6 +1,6 @@
 #textdomain armies_of_amberan
 [unit_type]
-    id=AE_AoA_empfinn_pistolier
+    id=AE_AoA_finn_empire_Pistolier
     name= _ "Pistolier"
     race=empfinn
     gender=male
diff --git a/units/AoA_units/empire/Recrue.cfg b/units/AoA_units/finn_empire/Recruit.cfg
similarity index 84%
rename from units/AoA_units/empire/Recrue.cfg
rename to units/AoA_units/finn_empire/Recruit.cfg
index b8247eb33..2f07e9e22 100644
--- a/units/AoA_units/empire/Recrue.cfg
+++ b/units/AoA_units/finn_empire/Recruit.cfg
@@ -1,6 +1,6 @@
 #textdomain armies_of_amberan
 [unit_type]
-    id=AE_AoA_empfinn_recrue
+    id=AE_AoA_finn_empire_Recruit
     name= _ "Recruit"
     race=empfinn
     gender=male
@@ -14,7 +14,7 @@
     cost=15
     usage=fighter
     description={AE_AOA_UNIT_NOTICE}+ _ "description to come"
-    advances_to=AE_AoA_empfinn_piquier,AE_AoA_empfinn_epeiste,AE_AoA_empfinn_soldat_hel
+    advances_to=AE_AoA_finn_empire_Pikeman,AE_AoA_finn_empire_Swordman,AE_AoA_finn_empire_Helgrindian_Soldier
     die_sound={SOUND_LIST:HUMAN_DIE}
     {DEFENSE_ANIM "units/empire/Recrue.png" "units/empire/Recrue.png" {SOUND_LIST:HUMAN_HIT} }
 
diff --git a/units/AoA_units/empire/Reitre.cfg b/units/AoA_units/finn_empire/Reiter.cfg
similarity index 92%
rename from units/AoA_units/empire/Reitre.cfg
rename to units/AoA_units/finn_empire/Reiter.cfg
index 1e993fe9d..b5393cbe7 100644
--- a/units/AoA_units/empire/Reitre.cfg
+++ b/units/AoA_units/finn_empire/Reiter.cfg
@@ -1,6 +1,6 @@
 #textdomain armies_of_amberan
 [unit_type]
-    id=AE_AoA_empfinn_reitre
+    id=AE_AoA_finn_empire_Reiter
     name= _ "Reiter"
     race=empfinn
     gender=male
@@ -14,7 +14,7 @@
     cost=32
     usage=mixed fighter
     description={AE_AOA_UNIT_NOTICE}+ _ "description to come"
-    advances_to=AE_AoA_empfinn_pistolier
+    advances_to=AE_AoA_finn_empire_Pistolier
     die_sound={SOUND_LIST:HUMAN_DIE}
     {DEFENSE_ANIM "units/empire/Reitre.png" "units/empire/Reitre.png" {SOUND_LIST:HUMAN_HIT} }
     [attack]
diff --git a/units/AoA_units/empire/Cavalier.cfg b/units/AoA_units/finn_empire/Rider.cfg
similarity index 88%
rename from units/AoA_units/empire/Cavalier.cfg
rename to units/AoA_units/finn_empire/Rider.cfg
index ed47ddb4c..6dafbc1da 100644
--- a/units/AoA_units/empire/Cavalier.cfg
+++ b/units/AoA_units/finn_empire/Rider.cfg
@@ -1,6 +1,6 @@
 #textdomain armies_of_amberan
 [unit_type]
-    id=AE_AoA_empfinn_cavalier
+    id=AE_AoA_finn_empire_Rider
     name= _ "Rider"
     race=empfinn
     gender=male
@@ -14,7 +14,7 @@
     cost=17
     usage=scout
     description={AE_AOA_UNIT_NOTICE}+ _ "description to come"
-    advances_to=AE_AoA_empfinn_noble,AE_AoA_empfinn_reitre
+    advances_to=AE_AoA_finn_empire_Noble,AE_AoA_finn_empire_Reiter
     die_sound={SOUND_LIST:HUMAN_DIE}
     {DEFENSE_ANIM "units/empire/Cavalier.png" "units/empire/Cavalier.png" {SOUND_LIST:HUMAN_HIT} }
     [resistance]
diff --git a/units/AoA_units/empire/Sergent.cfg b/units/AoA_units/finn_empire/Sergeant.cfg
similarity index 93%
rename from units/AoA_units/empire/Sergent.cfg
rename to units/AoA_units/finn_empire/Sergeant.cfg
index 6c5beccf4..41ac538ae 100644
--- a/units/AoA_units/empire/Sergent.cfg
+++ b/units/AoA_units/finn_empire/Sergeant.cfg
@@ -1,6 +1,6 @@
 #textdomain armies_of_amberan
 [unit_type]
-    id=AE_AoA_empfinn_sergent
+    id=AE_AoA_finn_empire_Sergeant
     name= _ "Sergeant"
     race=empfinn
     gender=male
@@ -14,7 +14,7 @@
     cost=19
     usage=fighter
     description={AE_AOA_UNIT_NOTICE}+ _ "description a venir"
-    advances_to=AE_AoA_empfinn_capitaine
+    advances_to=AE_AoA_finn_empire_Captain
     die_sound={SOUND_LIST:HUMAN_DIE}
     {DEFENSE_ANIM "units/empire/Sergent.png" "units/empire/Sergent.png" {SOUND_LIST:HUMAN_HIT} }
     [abilities]
diff --git a/units/AoA_units/empire/Tireur_d'elite.cfg b/units/AoA_units/finn_empire/Sharpshooter.cfg
similarity index 96%
rename from units/AoA_units/empire/Tireur_d'elite.cfg
rename to units/AoA_units/finn_empire/Sharpshooter.cfg
index 22e39fae6..0fdfd9bf9 100644
--- a/units/AoA_units/empire/Tireur_d'elite.cfg
+++ b/units/AoA_units/finn_empire/Sharpshooter.cfg
@@ -1,6 +1,6 @@
 #textdomain armies_of_amberan
 [unit_type]
-    id=AE_AoA_empfinn_tireur
+    id=AE_AoA_finn_empire_Sharpshooter
     name= _ "Sharpshooter"
     race=empfinn
     gender=male
diff --git a/units/AoA_units/empire/Epeiste.cfg b/units/AoA_units/finn_empire/Swordman.cfg
similarity index 90%
rename from units/AoA_units/empire/Epeiste.cfg
rename to units/AoA_units/finn_empire/Swordman.cfg
index 4083e2237..ddf6ac81a 100644
--- a/units/AoA_units/empire/Epeiste.cfg
+++ b/units/AoA_units/finn_empire/Swordman.cfg
@@ -1,6 +1,6 @@
 #textdomain armies_of_amberan
 [unit_type]
-    id=AE_AoA_empfinn_epeiste
+    id=AE_AoA_finn_empire_Swordman
     name= _ "Swordman"
     race=empfinn
     gender=male
@@ -14,7 +14,7 @@
     cost=26
     usage=fighter
     description={AE_AOA_UNIT_NOTICE}+ _ "description to come"
-    advances_to=AE_AoA_empfinn_lansquenet
+    advances_to=AE_AoA_finn_empire_Lansquenet
     die_sound={SOUND_LIST:HUMAN_DIE}
     {DEFENSE_ANIM "units/empire/Epeiste.png" "units/empire/Epeiste.png" {SOUND_LIST:HUMAN_HIT} }
     [resistance]
diff --git a/units/AoA_units/galianos/Alchimiste.cfg b/units/AoA_units/galianos/Alchemist.cfg
similarity index 93%
rename from units/AoA_units/galianos/Alchimiste.cfg
rename to units/AoA_units/galianos/Alchemist.cfg
index facfd08ca..6b32b1dec 100644
--- a/units/AoA_units/galianos/Alchimiste.cfg
+++ b/units/AoA_units/galianos/Alchemist.cfg
@@ -1,6 +1,6 @@
 #textdomain armies_of_amberan
 [unit_type]
-    id=AE_AoA_galianos_alchimiste
+    id=AE_AoA_galianos_Alchemist
     name= _ "Alchemist"
     race=galien
     gender=male
@@ -14,7 +14,7 @@
     cost=18
     usage=archer
     description={AE_AOA_UNIT_NOTICE}+ _ "description to come"
-    advances_to=AE_AoA_galianos_pyromancien
+    advances_to=AE_AoA_galianos_Pyromancer
     die_sound={SOUND_LIST:HUMAN_DIE}
     {DEFENSE_ANIM "units/galianos/Alchimiste.png" "units/galianos/Alchimiste.png" {SOUND_LIST:HUMAN_HIT} }
     ignore_race_traits=yes
diff --git a/units/AoA_units/galianos/Apothicaire.cfg b/units/AoA_units/galianos/Apothecary.cfg
similarity index 95%
rename from units/AoA_units/galianos/Apothicaire.cfg
rename to units/AoA_units/galianos/Apothecary.cfg
index bac05ab20..537783f33 100644
--- a/units/AoA_units/galianos/Apothicaire.cfg
+++ b/units/AoA_units/galianos/Apothecary.cfg
@@ -1,6 +1,6 @@
 #textdomain armies_of_amberan
 [unit_type]
-    id=AE_AoA_galianos_apothicaire
+    id=AE_AoA_galianos_Apothecary
     name= _ "Apothecary"
     race=galien
     gender=male
diff --git a/units/AoA_units/galianos/Arbaletrier_astraidien.cfg b/units/AoA_units/galianos/Astraidian_Crossbowman.cfg
similarity index 92%
rename from units/AoA_units/galianos/Arbaletrier_astraidien.cfg
rename to units/AoA_units/galianos/Astraidian_Crossbowman.cfg
index c1f0525f0..425094758 100644
--- a/units/AoA_units/galianos/Arbaletrier_astraidien.cfg
+++ b/units/AoA_units/galianos/Astraidian_Crossbowman.cfg
@@ -1,7 +1,7 @@
 #textdomain armies_of_amberan
 [unit_type]
-    id=AE_AoA_galianos_arbaletrierAstraidien
-    name= _ "Astraidian crossbowman"
+    id=AE_AoA_galianos_Astraidian_Crossbowman
+    name= _ "Astraidian Crossbowman"
     race=galien
     gender=male
     image="units/galianos/Arbaletrier-astraidien.png"
diff --git a/units/AoA_units/galianos/Citoyen.cfg b/units/AoA_units/galianos/Citizen.cfg
similarity index 84%
rename from units/AoA_units/galianos/Citoyen.cfg
rename to units/AoA_units/galianos/Citizen.cfg
index 04f5209b7..018195ee7 100644
--- a/units/AoA_units/galianos/Citoyen.cfg
+++ b/units/AoA_units/galianos/Citizen.cfg
@@ -1,6 +1,6 @@
 #textdomain armies_of_amberan
 [unit_type]
-    id=AE_AoA_galianos_citoyen
+    id=AE_AoA_galianos_Citizen
     name= _ "Citizen"
     race=galien
     gender=male
@@ -14,7 +14,7 @@
     cost=7
     usage=fighter
     description={AE_AOA_UNIT_NOTICE}+ _ "description to come"
-    advances_to=AE_AoA_galianos_milicien,AE_AoA_galianos_gardeCivil,AE_AoA_galianos_escarmoucheur
+    advances_to=AE_AoA_galianos_Militia,AE_AoA_galianos_Civil_Guard,AE_AoA_galianos_Skirmisher
     die_sound={SOUND_LIST:HUMAN_DIE}
     {DEFENSE_ANIM "units/galianos/Citoyen.png" "units/galianos/Citoyen.png" {SOUND_LIST:HUMAN_HIT} }
     [attack]
diff --git a/units/AoA_units/galianos/Garde_civil.cfg b/units/AoA_units/galianos/Civil_Guard.cfg
similarity index 88%
rename from units/AoA_units/galianos/Garde_civil.cfg
rename to units/AoA_units/galianos/Civil_Guard.cfg
index d2684d458..c850559d1 100644
--- a/units/AoA_units/galianos/Garde_civil.cfg
+++ b/units/AoA_units/galianos/Civil_Guard.cfg
@@ -1,7 +1,7 @@
 #textdomain armies_of_amberan
 [unit_type]
-    id=AE_AoA_galianos_gardeCivil
-    name= _ "Civil guard"
+    id=AE_AoA_galianos_Civil_Guard
+    name= _ "Civil Guard"
     race=galien
     gender=male
     image="units/galianos/Garde-civil.png"
@@ -14,7 +14,7 @@
     cost=15
     usage=archer
     description={AE_AOA_UNIT_NOTICE}+ _ "description to come"
-    advances_to=AE_AoA_galianos_arbaletrierAvecPavois
+    advances_to=AE_AoA_galianos_Crossbowman_With_Bulkward
     die_sound={SOUND_LIST:HUMAN_DIE}
     {DEFENSE_ANIM "units/galianos/Garde-civil.png" "units/galianos/Garde-civil.png" {SOUND_LIST:HUMAN_HIT} }
     [attack]
diff --git a/units/AoA_units/galianos/Condotierre.cfg b/units/AoA_units/galianos/Condotierre.cfg
index 9ad00fa25..7f3c8730b 100644
--- a/units/AoA_units/galianos/Condotierre.cfg
+++ b/units/AoA_units/galianos/Condotierre.cfg
@@ -1,6 +1,6 @@
 #textdomain armies_of_amberan
 [unit_type]
-    id=AE_AoA_galianos_condotierre
+    id=AE_AoA_galianos_Condotierre
     name= _ "Condotierre"
     race=galien
     gender=male
diff --git a/units/AoA_units/galianos/Condotierre_a_pieds.cfg b/units/AoA_units/galianos/Condotierre_On_Foots.cfg
similarity index 90%
rename from units/AoA_units/galianos/Condotierre_a_pieds.cfg
rename to units/AoA_units/galianos/Condotierre_On_Foots.cfg
index a4e83311f..a2e104762 100644
--- a/units/AoA_units/galianos/Condotierre_a_pieds.cfg
+++ b/units/AoA_units/galianos/Condotierre_On_Foots.cfg
@@ -1,7 +1,7 @@
 #textdomain armies_of_amberan
 [unit_type]
-    id=AE_AoA_galianos_condotierreAPieds
-    name= _ "Condotierre on foots"
+    id=AE_AoA_galianos_Condotierre_On_Foots
+    name= _ "Condotierre On Foots"
     race=galien
     gender=male
     image="units/galianos/Condotierre-a-pieds.png"
@@ -14,7 +14,7 @@
     cost=54
     usage=fighter
     description={AE_AOA_UNIT_NOTICE}+ _ "description to come"
-    advances_to=AE_AoA_galianos_general
+    advances_to=AE_AoA_galianos_General
     die_sound={SOUND_LIST:HUMAN_DIE}
     {DEFENSE_ANIM "units/galianos/Condotierre-a-pieds.png" "units/galianos/Condotierre-a-pieds.png" {SOUND_LIST:HUMAN_HIT} }
     [abilities]
diff --git a/units/AoA_units/galianos/Arbaletrier_avec_pavois.cfg b/units/AoA_units/galianos/Crossbowman_With_Bulwark.cfg
similarity index 88%
rename from units/AoA_units/galianos/Arbaletrier_avec_pavois.cfg
rename to units/AoA_units/galianos/Crossbowman_With_Bulwark.cfg
index ab61af4da..e8ceaa1f4 100644
--- a/units/AoA_units/galianos/Arbaletrier_avec_pavois.cfg
+++ b/units/AoA_units/galianos/Crossbowman_With_Bulwark.cfg
@@ -1,7 +1,7 @@
 #textdomain armies_of_amberan
 [unit_type]
-    id=AE_AoA_galianos_arbaletrierAvecPavois
-    name= _ "Crossbowman with bulkward"
+    id=AE_AoA_galianos_Crossbowman_With_Bulkward
+    name= _ "Crossbowman With Bulkward"
     race=galien
     gender=male
     image="units/galianos/Arbaletrier-avec-pavois.png"
@@ -14,7 +14,7 @@
     cost=25
     usage=archer
     description={AE_AOA_UNIT_NOTICE}+ _ "description a venir"
-    advances_to=AE_AoA_galianos_arbaletrierAstraidien
+    advances_to=AE_AoA_galianos_Astraidian_Crossbowman
     die_sound={SOUND_LIST:HUMAN_DIE}
     {DEFENSE_ANIM "units/galianos/Arbaletrier-avec-pavois.png" "units/galianos/Arbaletrier-avec-pavois.png" {SOUND_LIST:HUMAN_HIT} }
     [resistance]
diff --git a/units/AoA_units/galianos/Javeleniste_d'elite.cfg b/units/AoA_units/galianos/Elite_Javelinist.cfg
similarity index 93%
rename from units/AoA_units/galianos/Javeleniste_d'elite.cfg
rename to units/AoA_units/galianos/Elite_Javelinist.cfg
index 7dde491f3..91fe6a318 100644
--- a/units/AoA_units/galianos/Javeleniste_d'elite.cfg
+++ b/units/AoA_units/galianos/Elite_Javelinist.cfg
@@ -1,7 +1,7 @@
 #textdomain armies_of_amberan
 [unit_type]
-    id=AE_AoA_galianos_javelenisteDElite
-    name= _ "Elite javelinist"
+    id=AE_AoA_galianos_Elite_Javelinist
+    name= _ "Elite Javelinist"
     race=galien
     gender=male
     image="units/galianos/Javeleniste-d-elite.png"
diff --git a/units/AoA_units/galianos/Lancier_d'elite.cfg b/units/AoA_units/galianos/Elite_Lancer.cfg
similarity index 94%
rename from units/AoA_units/galianos/Lancier_d'elite.cfg
rename to units/AoA_units/galianos/Elite_Lancer.cfg
index 4f4c36b58..9076688a4 100644
--- a/units/AoA_units/galianos/Lancier_d'elite.cfg
+++ b/units/AoA_units/galianos/Elite_Lancer.cfg
@@ -1,7 +1,7 @@
 #textdomain armies_of_amberan
 [unit_type]
-    id=AE_AoA_galianos_lancierDElite
-    name= _ "Elite lancer"
+    id=AE_AoA_galianos_Elite_Lancer
+    name= _ "Elite Lancer"
     race=galien
     gender=male
     image="units/galianos/Lancier-d-elite.png"
diff --git a/units/AoA_units/galianos/Epeiste_lourd.cfg b/units/AoA_units/galianos/Elite_Swordman.cfg
similarity index 92%
rename from units/AoA_units/galianos/Epeiste_lourd.cfg
rename to units/AoA_units/galianos/Elite_Swordman.cfg
index 4a568e9fe..efacdd172 100644
--- a/units/AoA_units/galianos/Epeiste_lourd.cfg
+++ b/units/AoA_units/galianos/Elite_Swordman.cfg
@@ -1,7 +1,7 @@
 #textdomain armies_of_amberan
 [unit_type]
-    id=AE_AoA_galianos_epeisteLourd
-    name= _ "Elite swordman"
+    id=AE_AoA_galianos_Elite_Swordman
+    name= _ "Elite Swordman"
     race=galien
     gender=male
     image="units/galianos/Epeiste-d-elite.png"
diff --git a/units/AoA_units/galianos/Escorteur.cfg b/units/AoA_units/galianos/Escort.cfg
similarity index 96%
rename from units/AoA_units/galianos/Escorteur.cfg
rename to units/AoA_units/galianos/Escort.cfg
index 04bfef3ff..03a87642e 100644
--- a/units/AoA_units/galianos/Escorteur.cfg
+++ b/units/AoA_units/galianos/Escort.cfg
@@ -1,6 +1,6 @@
 #textdomain armies_of_amberan
 [unit_type]
-    id=AE_AoA_galianos_escorteur
+    id=AE_AoA_galianos_Escort
     name= _ "Escort"
     race=galien
     gender=male
diff --git a/units/AoA_units/galianos/Fantassin.cfg b/units/AoA_units/galianos/Footdwarf.cfg
similarity index 91%
rename from units/AoA_units/galianos/Fantassin.cfg
rename to units/AoA_units/galianos/Footdwarf.cfg
index 3f63616c0..86466798e 100644
--- a/units/AoA_units/galianos/Fantassin.cfg
+++ b/units/AoA_units/galianos/Footdwarf.cfg
@@ -1,6 +1,6 @@
 #textdomain armies_of_amberan
 [unit_type]
-    id=AE_AoA_galianos_fantassin
+    id=AE_AoA_galianos_Footman
     name= _ "Footman"
     race=galien
     gender=male
@@ -14,7 +14,7 @@
     cost=30
     usage=fighter
     description={AE_AOA_UNIT_NOTICE}+ _ "description to come"
-    advances_to=AE_AoA_galianos_fantassinLourd
+    advances_to=AE_AoA_galianos_Heavy_Footman
     die_sound={SOUND_LIST:HUMAN_DIE}
     {DEFENSE_ANIM "units/galianos/Fantassin.png" "units/galianos/Fantassin.png" {SOUND_LIST:HUMAN_HIT} }
     [resistance]
diff --git a/units/AoA_units/galianos/Spadassin.cfg b/units/AoA_units/galianos/Galianos_Duelist.cfg
similarity index 84%
rename from units/AoA_units/galianos/Spadassin.cfg
rename to units/AoA_units/galianos/Galianos_Duelist.cfg
index 2b45725cb..e939f61b3 100644
--- a/units/AoA_units/galianos/Spadassin.cfg
+++ b/units/AoA_units/galianos/Galianos_Duelist.cfg
@@ -1,7 +1,7 @@
 #textdomain armies_of_amberan
 [unit_type]
-    id=AE_AoA_galianos_spadassin
-    name= _ "Spadassin"
+    id=AE_AoA_galianos_Galianos_Duelist
+    name= _ "Galianos Duelist"
     race=galien
     gender=male
     image="units/galianos/Spadassin.png"
@@ -14,7 +14,7 @@
     cost=16
     usage=fighter
     description={AE_AOA_UNIT_NOTICE}+ _ "description to come"
-    advances_to=AE_AoA_galianos_epeiste,AE_AoA_galianos_gendarmeAPieds
+    advances_to=AE_AoA_galianos_Swordman,AE_AoA_galianos_Gendarme_On_Foots
     die_sound={SOUND_LIST:HUMAN_DIE}
     {DEFENSE_ANIM "units/galianos/Spadassin.png" "units/galianos/Spadassin.png" {SOUND_LIST:HUMAN_HIT} }
     [resistance]
diff --git a/units/AoA_units/galianos/Garde_forestier.cfg b/units/AoA_units/galianos/Garde_forestier.cfg
deleted file mode 100644
index 00555ef2e..000000000
--- a/units/AoA_units/galianos/Garde_forestier.cfg
+++ /dev/null
@@ -1,50 +0,0 @@
-#textdomain armies_of_amberan
-[unit_type]
-    id=AE_AoA_galianos_gardeForestier
-    name= _ "Ranger"
-    race=galien
-    gender=male
-    image="units/galianos/Garde-forestier.png"
-    hitpoints=45
-    movement_type=smallfoot
-    movement=6
-    experience=77
-    level=2
-    alignment=neutral
-    cost=28
-    usage=mixed fighter
-    description={AE_AOA_UNIT_NOTICE}+ _ "description to come"
-    advances_to=AE_AoA_galianos_rodeur
-    die_sound={SOUND_LIST:HUMAN_DIE}
-    {DEFENSE_ANIM "units/galianos/Garde-forestier.png" "units/galianos/Garde-forestier.png" {SOUND_LIST:HUMAN_HIT} }
-    [abilities]
-        {ABILITY_AMBUSH}
-    [/abilities]
-    [movement_costs]
-        swamp_water=2
-    [/movement_costs]
-    [defense]
-        forest=40
-        swamp_water=50
-    [/defense]
-    [attack]
-        name=epee
-        description= _"sword"
-        type=blade
-        range=melee
-        damage=7
-        number=3
-        icon=attacks/sword-human.png
-    [/attack]
-    [attack]
-        name=arc
-        description= _"bow"
-        type=pierce
-        range=ranged
-        damage=7
-        number=4
-        icon=attacks/bow.png
-    [/attack]
-    {SWORD_SOUND}
-    {BOW_SOUND}
-[/unit_type]
diff --git a/units/AoA_units/galianos/Gendarme.cfg b/units/AoA_units/galianos/Gendarme.cfg
index 739d31327..70cac6bd9 100644
--- a/units/AoA_units/galianos/Gendarme.cfg
+++ b/units/AoA_units/galianos/Gendarme.cfg
@@ -1,6 +1,6 @@
 #textdomain armies_of_amberan
 [unit_type]
-    id=AE_AoA_galianos_gendarme
+    id=AE_AoA_galianos_Gendarme
     name= _ "Gendarme"
     race=galien
     gender=male
@@ -14,7 +14,7 @@
     cost=30
     usage=scout
     description={AE_AOA_UNIT_NOTICE}+ _ "description to come"
-    advances_to=AE_AoA_galianos_condotierre
+    advances_to=AE_AoA_galianos_Condotierre
     die_sound={SOUND_LIST:HUMAN_DIE}
     {DEFENSE_ANIM "units/galianos/Gendarme.png" "units/galianos/Gendarme.png" {SOUND_LIST:HUMAN_HIT} }
     [resistance]
diff --git a/units/AoA_units/galianos/Gendarme_a_pieds.cfg b/units/AoA_units/galianos/Gendarme_On_Foots.cfg
similarity index 89%
rename from units/AoA_units/galianos/Gendarme_a_pieds.cfg
rename to units/AoA_units/galianos/Gendarme_On_Foots.cfg
index 82c42cbba..ca4c3e82e 100644
--- a/units/AoA_units/galianos/Gendarme_a_pieds.cfg
+++ b/units/AoA_units/galianos/Gendarme_On_Foots.cfg
@@ -1,7 +1,7 @@
 #textdomain armies_of_amberan
 [unit_type]
-    id=AE_AoA_galianos_gendarmeAPieds
-    name= _ "Gendarme on foots"
+    id=AE_AoA_galianos_Gendarme_On_Foots
+    name= _ "Gendarme On Foots"
     race=galien
     gender=male
     image="units/galianos/Gendarme-a-pieds.png"
@@ -14,7 +14,7 @@
     cost=32
     usage=fighter
     description={AE_AOA_UNIT_NOTICE}+ _ "description to come"
-    advances_to=AE_AoA_galianos_condotierreAPieds
+    advances_to=AE_AoA_galianos_Condotierre_On_Foots
     die_sound={SOUND_LIST:HUMAN_DIE}
     {DEFENSE_ANIM "units/galianos/Gendarme-a-pieds.png" "units/galianos/Gendarme-a-pieds.png" {SOUND_LIST:HUMAN_HIT} }
     [abilities]
diff --git a/units/AoA_units/galianos/General.cfg b/units/AoA_units/galianos/General.cfg
index 340c6e760..b8b2b2361 100644
--- a/units/AoA_units/galianos/General.cfg
+++ b/units/AoA_units/galianos/General.cfg
@@ -1,6 +1,6 @@
 #textdomain armies_of_amberan
 [unit_type]
-    id=AE_AoA_galianos_general
+    id=AE_AoA_galianos_General
     name= _ "General"
     race=galien
     gender=male
diff --git a/units/AoA_units/galianos/Fantassin_lourd.cfg b/units/AoA_units/galianos/Heavy_Footman.cfg
similarity index 92%
rename from units/AoA_units/galianos/Fantassin_lourd.cfg
rename to units/AoA_units/galianos/Heavy_Footman.cfg
index 7dc467a8f..2908bb403 100644
--- a/units/AoA_units/galianos/Fantassin_lourd.cfg
+++ b/units/AoA_units/galianos/Heavy_Footman.cfg
@@ -1,7 +1,7 @@
 #textdomain armies_of_amberan
 [unit_type]
-    id=AE_AoA_galianos_fantassinLourd
-    name= _ "Heavy footman"
+    id=AE_AoA_galianos_Heavy_Footman
+    name= _ "Heavy Footman"
     race=galien
     gender=male
     image="units/galianos/Fantassin-lourd.png"
diff --git a/units/AoA_units/galianos/Piquier_lourd.cfg b/units/AoA_units/galianos/Heavy_Pikemen.cfg
similarity index 93%
rename from units/AoA_units/galianos/Piquier_lourd.cfg
rename to units/AoA_units/galianos/Heavy_Pikemen.cfg
index 1f46e1fe1..c50944628 100644
--- a/units/AoA_units/galianos/Piquier_lourd.cfg
+++ b/units/AoA_units/galianos/Heavy_Pikemen.cfg
@@ -1,7 +1,7 @@
 #textdomain armies_of_amberan
 [unit_type]
-    id=AE_AoA_galianos_piquierLourd
-    name= _ "Heavy pikemen"
+    id=AE_AoA_galianos_Heavy_Pikemen
+    name= _ "Heavy Pikemen"
     race=galien
     gender=male
     image="units/galianos/Piquier-lourd.png"
diff --git a/units/AoA_units/galianos/Herboriste.cfg b/units/AoA_units/galianos/Herborist.cfg
similarity index 90%
rename from units/AoA_units/galianos/Herboriste.cfg
rename to units/AoA_units/galianos/Herborist.cfg
index 5a8284a66..30c5a0700 100644
--- a/units/AoA_units/galianos/Herboriste.cfg
+++ b/units/AoA_units/galianos/Herborist.cfg
@@ -1,6 +1,6 @@
 #textdomain armies_of_amberan
 [unit_type]
-    id=AE_AoA_galianos_herboriste
+    id=AE_AoA_galianos_Herborist
     name= _ "Herborist"
     race=galien
     gender=male
@@ -14,7 +14,7 @@
     cost=17
     usage=healer
     description={AE_AOA_UNIT_NOTICE}+ _ "description to come"
-    advances_to=AE_AoA_galianos_apothicaire
+    advances_to=AE_AoA_galianos_Apothecary
     die_sound={SOUND_LIST:HUMAN_DIE}
     {DEFENSE_ANIM "units/galianos/Herboriste.png" "units/galianos/Herboriste.png" {SOUND_LIST:HUMAN_HIT} }
     [abilities]
diff --git a/units/AoA_units/galianos/Hussard.cfg b/units/AoA_units/galianos/Hussar.cfg
similarity index 91%
rename from units/AoA_units/galianos/Hussard.cfg
rename to units/AoA_units/galianos/Hussar.cfg
index c52afec91..18cdc400f 100644
--- a/units/AoA_units/galianos/Hussard.cfg
+++ b/units/AoA_units/galianos/Hussar.cfg
@@ -1,6 +1,6 @@
 #textdomain armies_of_amberan
 [unit_type]
-    id=AE_AoA_galianos_hussard
+    id=AE_AoA_galianos_Hussar
     name= _ "Hussar"
     race=galien
     gender=male
@@ -14,7 +14,7 @@
     cost=23
     usage=fighter
     description={AE_AOA_UNIT_NOTICE}+ _ "description to come"
-    advances_to=AE_AoA_galianos_lancier
+    advances_to=AE_AoA_galianos_Lancer
     die_sound={SOUND_LIST:HUMAN_DIE}
     {DEFENSE_ANIM "units/galianos/Hussard.png" "units/galianos/Hussard.png" {SOUND_LIST:HUMAN_HIT} }
     [attack]
diff --git a/units/AoA_units/galianos/Imperator.cfg b/units/AoA_units/galianos/Imperator.cfg
index 977fd332a..f194d683e 100644
--- a/units/AoA_units/galianos/Imperator.cfg
+++ b/units/AoA_units/galianos/Imperator.cfg
@@ -1,6 +1,6 @@
 #textdomain armies_of_amberan
 [unit_type]
-    id=AE_AoA_galianos_imperator
+    id=AE_AoA_galianos_Imperator
     name= _ "Imperator"
     race=galien
     gender=male
diff --git a/units/AoA_units/galianos/Javeleniste.cfg b/units/AoA_units/galianos/Javelinist.cfg
similarity index 92%
rename from units/AoA_units/galianos/Javeleniste.cfg
rename to units/AoA_units/galianos/Javelinist.cfg
index 208ae81ab..8696e42db 100644
--- a/units/AoA_units/galianos/Javeleniste.cfg
+++ b/units/AoA_units/galianos/Javelinist.cfg
@@ -1,6 +1,6 @@
 #textdomain armies_of_amberan
 [unit_type]
-    id=AE_AoA_galianos_javeleniste
+    id=AE_AoA_galianos_Javelinist
     name= _ "Javelinist"
     race=galien
     gender=male
@@ -14,7 +14,7 @@
     cost=24
     usage=fighter
     description={AE_AOA_UNIT_NOTICE}+ _ "description to come"
-    advances_to=AE_AoA_galianos_javelenisteDElite
+    advances_to=AE_AoA_galianos_Elite_Javelinist
     die_sound={SOUND_LIST:HUMAN_DIE}
     {DEFENSE_ANIM "units/galianos/Javeleniste.png" "units/galianos/Javeleniste.png" {SOUND_LIST:HUMAN_HIT} }
     [movement_costs]
diff --git a/units/AoA_units/galianos/Maitre_pyromancien.cfg b/units/AoA_units/galianos/Master_Pyromancer.cfg
similarity index 94%
rename from units/AoA_units/galianos/Maitre_pyromancien.cfg
rename to units/AoA_units/galianos/Master_Pyromancer.cfg
index e9ca7a714..c44f214a3 100644
--- a/units/AoA_units/galianos/Maitre_pyromancien.cfg
+++ b/units/AoA_units/galianos/Master_Pyromancer.cfg
@@ -1,7 +1,7 @@
 #textdomain armies_of_amberan
 [unit_type]
-    id=AE_AoA_galianos_maitrePyromancien
-    name= _ "Master pyromancer"
+    id=AE_AoA_galianos_Master_Pyromancer
+    name= _ "Master Pyromancer"
     race=galien
     gender=male
     image="units/galianos/Maitre-pyromancien.png"
diff --git a/units/AoA_units/galianos/Milicien.cfg b/units/AoA_units/galianos/Militia.cfg
similarity index 88%
rename from units/AoA_units/galianos/Milicien.cfg
rename to units/AoA_units/galianos/Militia.cfg
index b723765be..28c8f3299 100644
--- a/units/AoA_units/galianos/Milicien.cfg
+++ b/units/AoA_units/galianos/Militia.cfg
@@ -1,6 +1,6 @@
 #textdomain armies_of_amberan
 [unit_type]
-    id=AE_AoA_galianos_milicien
+    id=AE_AoA_galianos_Militia
     name= _ "Militia"
     race=galien
     gender=male
@@ -14,7 +14,7 @@
     cost=14
     usage=fighter
     description={AE_AOA_UNIT_NOTICE}+ _ "description to come"
-    advances_to=AE_AoA_galianos_fantassin,AE_AoA_galianos_piquier
+    advances_to=AE_AoA_galianos_Footman,AE_AoA_galianos_Pikeman
     die_sound={SOUND_LIST:HUMAN_DIE}
     {DEFENSE_ANIM "units/galianos/Milicien.png" "units/galianos/Milicien.png" {SOUND_LIST:HUMAN_HIT} }
     [attack]
diff --git a/units/AoA_units/galianos/Arbaletrier_monte.cfg b/units/AoA_units/galianos/Mounted_Crossbowman.cfg
similarity index 88%
rename from units/AoA_units/galianos/Arbaletrier_monte.cfg
rename to units/AoA_units/galianos/Mounted_Crossbowman.cfg
index 90b788c37..d898c1465 100644
--- a/units/AoA_units/galianos/Arbaletrier_monte.cfg
+++ b/units/AoA_units/galianos/Mounted_Crossbowman.cfg
@@ -1,7 +1,7 @@
 #textdomain armies_of_amberan
 [unit_type]
-    id=AE_AoA_galianos_arbaletrierMonte
-    name= _ "Mounted crossbowman"
+    id=AE_AoA_galianos_Mounted_Crossbowman
+    name= _ "Mounted Crossbowman"
     race=galien
     gender=male
     image="units/galianos/Arbaletrier-monte.png"
@@ -14,7 +14,7 @@
     cost=31
     usage=scout
     description={AE_AOA_UNIT_NOTICE}+ _ "description to come"
-    advances_to=AE_AoA_galianos_escorteur
+    advances_to=AE_AoA_galianos_Escort
     die_sound={SOUND_LIST:HUMAN_DIE}
     {DEFENSE_ANIM "units/galianos/Arbaletrier-monte.png" "units/galianos/Arbaletrier-monte.png" {SOUND_LIST:HUMAN_HIT} }
     [attack]
diff --git a/units/AoA_units/galianos/Piquier.cfg b/units/AoA_units/galianos/Pikeman.cfg
similarity index 91%
rename from units/AoA_units/galianos/Piquier.cfg
rename to units/AoA_units/galianos/Pikeman.cfg
index e4ccb3ed8..b9bf8aa66 100644
--- a/units/AoA_units/galianos/Piquier.cfg
+++ b/units/AoA_units/galianos/Pikeman.cfg
@@ -1,6 +1,6 @@
 #textdomain armies_of_amberan
 [unit_type]
-    id=AE_AoA_galianos_piquier
+    id=AE_AoA_galianos_Pikeman
     name= _ "Pikeman"
     race=galien
     gender=male
@@ -14,7 +14,7 @@
     cost=26
     usage=fighter
     description={AE_AOA_UNIT_NOTICE}+ _ "description to come"
-    advances_to=AE_AoA_galianos_piquierLourd
+    advances_to=AE_AoA_galianos_Heavy_Pikemen
     die_sound={SOUND_LIST:HUMAN_DIE}
     {DEFENSE_ANIM "units/galianos/Piquier.png" "units/galianos/Piquier.png" {SOUND_LIST:HUMAN_HIT} }
     [resistance]
diff --git a/units/AoA_units/galianos/Pyromancien.cfg b/units/AoA_units/galianos/Pyromancer.cfg
similarity index 92%
rename from units/AoA_units/galianos/Pyromancien.cfg
rename to units/AoA_units/galianos/Pyromancer.cfg
index 9ea61d4a1..3887716fa 100644
--- a/units/AoA_units/galianos/Pyromancien.cfg
+++ b/units/AoA_units/galianos/Pyromancer.cfg
@@ -1,6 +1,6 @@
 #textdomain armies_of_amberan
 [unit_type]
-    id=AE_AoA_galianos_pyromancien
+    id=AE_AoA_galianos_Pyromancer
     name= _ "Pyromancer"
     race=galien
     gender=male
@@ -14,7 +14,7 @@
     cost=26
     usage=archer
     description={AE_AOA_UNIT_NOTICE}+ _ "description to come"
-    advances_to=AE_AoA_galianos_maitrePyromancien
+    advances_to=AE_AoA_galianos_Master_Pyromancer
     die_sound={SOUND_LIST:HUMAN_DIE}
     {DEFENSE_ANIM "units/galianos/Pyromancien.png" "units/galianos/Pyromancien.png" {SOUND_LIST:HUMAN_HIT} }
     ignore_race_traits=yes
diff --git a/units/AoA_units/galianos/Rodeur.cfg b/units/AoA_units/galianos/Ranger.cfg
similarity index 94%
rename from units/AoA_units/galianos/Rodeur.cfg
rename to units/AoA_units/galianos/Ranger.cfg
index 75fd0aecd..78f724362 100644
--- a/units/AoA_units/galianos/Rodeur.cfg
+++ b/units/AoA_units/galianos/Ranger.cfg
@@ -1,7 +1,7 @@
 #textdomain armies_of_amberan
 [unit_type]
-    id=AE_AoA_galianos_rodeur
-    name= _ "Veteran ranger"
+    id=AE_AoA_galianos_Veteran_Ranger
+    name= _ "Veteran Ranger"
     race=galien
     gender=male
     image="units/galianos/Rodeur.png"
diff --git a/units/AoA_units/galianos/Cavalier.cfg b/units/AoA_units/galianos/Rider.cfg
similarity index 90%
rename from units/AoA_units/galianos/Cavalier.cfg
rename to units/AoA_units/galianos/Rider.cfg
index 1efff482f..0c1d8dc09 100644
--- a/units/AoA_units/galianos/Cavalier.cfg
+++ b/units/AoA_units/galianos/Rider.cfg
@@ -1,6 +1,6 @@
 #textdomain armies_of_amberan
 [unit_type]
-    id=AE_AoA_galianos_cavalier
+    id=AE_AoA_galianos_Rider
     name= _ "Rider"
     race=galien
     gender=male
@@ -14,7 +14,7 @@
     cost=16
     usage=scout
     description={AE_AOA_UNIT_NOTICE}+ _ "description to come"
-    advances_to=AE_AoA_galianos_gendarme
+    advances_to=AE_AoA_galianos_Gendarme
     die_sound={SOUND_LIST:HUMAN_DIE}
     {DEFENSE_ANIM "units/galianos/Cavalier.png" "units/galianos/Cavalier.png" {SOUND_LIST:HUMAN_HIT} }
     [attack]
diff --git a/units/AoA_units/galianos/Eclaireur.cfg b/units/AoA_units/galianos/Scout.cfg
similarity index 91%
rename from units/AoA_units/galianos/Eclaireur.cfg
rename to units/AoA_units/galianos/Scout.cfg
index 6a2eafb24..e1551165d 100644
--- a/units/AoA_units/galianos/Eclaireur.cfg
+++ b/units/AoA_units/galianos/Scout.cfg
@@ -1,6 +1,6 @@
 #textdomain armies_of_amberan
 [unit_type]
-    id=AE_AoA_galianos_eclaireur
+    id=AE_AoA_galianos_Scout
     name= _ "Scout"
     race=galien
     gender=male
@@ -14,7 +14,7 @@
     cost=18
     usage=scout
     description={AE_AOA_UNIT_NOTICE}+ _ "description to come"
-    advances_to=AE_AoA_galianos_arbaletrierMonte
+    advances_to=AE_AoA_galianos_Mounted_Crossbowman
     die_sound={SOUND_LIST:HUMAN_DIE}
     {DEFENSE_ANIM "units/galianos/Eclaireur.png" "units/galianos/Eclaireur.png" {SOUND_LIST:HUMAN_HIT} }
     [attack]
diff --git a/units/AoA_units/galianos/Escramoucheur.cfg b/units/AoA_units/galianos/Skirmisher.cfg
similarity index 90%
rename from units/AoA_units/galianos/Escramoucheur.cfg
rename to units/AoA_units/galianos/Skirmisher.cfg
index 787e2c0c4..acf3f5e0a 100644
--- a/units/AoA_units/galianos/Escramoucheur.cfg
+++ b/units/AoA_units/galianos/Skirmisher.cfg
@@ -1,6 +1,6 @@
 #textdomain armies_of_amberan
 [unit_type]
-    id=AE_AoA_galianos_escarmoucheur
+    id=AE_AoA_galianos_Skirmisher
     name= _ "Skirmisher"
     race=galien
     gender=male
@@ -14,7 +14,7 @@
     cost=15
     usage=fighter
     description={AE_AOA_UNIT_NOTICE}+ _ "description to come"
-    advances_to=AE_AoA_galianos_javeleniste,AE_AoA_galianos_gardeForestier
+    advances_to=AE_AoA_galianos_Javelinist,AE_AoA_galianos_Ranger
     die_sound={SOUND_LIST:HUMAN_DIE}
     {DEFENSE_ANIM "units/galianos/Escarmoucheur.png" "units/galianos/Escarmoucheur.png" {SOUND_LIST:HUMAN_HIT} }
     [movement_costs]
diff --git a/units/AoA_units/galianos/Lancier.cfg b/units/AoA_units/galianos/Spearman.cfg
similarity index 92%
rename from units/AoA_units/galianos/Lancier.cfg
rename to units/AoA_units/galianos/Spearman.cfg
index faae99ef4..696dcd24f 100644
--- a/units/AoA_units/galianos/Lancier.cfg
+++ b/units/AoA_units/galianos/Spearman.cfg
@@ -1,6 +1,6 @@
 #textdomain armies_of_amberan
 [unit_type]
-    id=AE_AoA_galianos_lancier
+    id=AE_AoA_galianos_Lancer
     name= _ "Lancer"
     race=galien
     gender=male
@@ -14,7 +14,7 @@
     cost=48
     usage=fighter
     description={AE_AOA_UNIT_NOTICE}+ _ "description to come"
-    advances_to=AE_AoA_galianos_lancierDElite
+    advances_to=AE_AoA_galianos_Elite_Lancer
     die_sound={SOUND_LIST:HUMAN_DIE}
     {DEFENSE_ANIM "units/galianos/Lancier.png" "units/galianos/Lancier.png" {SOUND_LIST:HUMAN_HIT} }
     [attack]
diff --git a/units/AoA_units/galianos/Epeiste.cfg b/units/AoA_units/galianos/Swordman.cfg
similarity index 90%
rename from units/AoA_units/galianos/Epeiste.cfg
rename to units/AoA_units/galianos/Swordman.cfg
index 1fc2f9700..0e32e35f1 100644
--- a/units/AoA_units/galianos/Epeiste.cfg
+++ b/units/AoA_units/galianos/Swordman.cfg
@@ -1,6 +1,6 @@
 #textdomain armies_of_amberan
 [unit_type]
-    id=AE_AoA_galianos_epeiste
+    id=AE_AoA_galianos_Swordman
     name= _ "Swordman"
     race=galien
     gender=male
@@ -14,7 +14,7 @@
     cost=27
     usage=fighter
     description={AE_AOA_UNIT_NOTICE}+ _ "description to come"
-    advances_to=AE_AoA_galianos_epeisteLourd
+    advances_to=AE_AoA_galianos_Elite_Swordman
     die_sound={SOUND_LIST:HUMAN_DIE}
     {DEFENSE_ANIM "units/galianos/Epeiste.png" "units/galianos/Epeiste.png" {SOUND_LIST:HUMAN_HIT} }
     [resistance]
diff --git a/units/AoA_units/rovahr/Archeveque_guerrier.cfg b/units/AoA_units/kingdoms_rovahr/Archbishop_Fighter.cfg
similarity index 94%
rename from units/AoA_units/rovahr/Archeveque_guerrier.cfg
rename to units/AoA_units/kingdoms_rovahr/Archbishop_Fighter.cfg
index d058c6aea..7d49e06bf 100644
--- a/units/AoA_units/rovahr/Archeveque_guerrier.cfg
+++ b/units/AoA_units/kingdoms_rovahr/Archbishop_Fighter.cfg
@@ -1,7 +1,7 @@
 #textdomain armies_of_amberan
 [unit_type]
-    id=AE_AoA_rovahr_archevequeGuerrier
-    name= _ "Archbishop-fighter"
+    id=AE_AoA_kingdoms_rovahr_Archbishop_Fighter
+    name= _ "Archbishop-Fighter"
     race=rovahrien
     gender=male
     image="units/rovahr/Archeveque-guerrier.png"
diff --git a/units/AoA_units/rovahr/Aspirant_templier.cfg b/units/AoA_units/kingdoms_rovahr/Aspirant_Templar.cfg
similarity index 91%
rename from units/AoA_units/rovahr/Aspirant_templier.cfg
rename to units/AoA_units/kingdoms_rovahr/Aspirant_Templar.cfg
index fa8c71787..342c23eb6 100644
--- a/units/AoA_units/rovahr/Aspirant_templier.cfg
+++ b/units/AoA_units/kingdoms_rovahr/Aspirant_Templar.cfg
@@ -1,7 +1,7 @@
 #textdomain armies_of_amberan
 [unit_type]
-    id=AE_AoA_rovahr_aspirantTemplier
-    name= _ "Aspirant templar"
+    id=AE_AoA_kingdoms_rovahr_Aspirant_Templar
+    name= _ "Aspirant Templar"
     race=rovahrien
     gender=male
     image="units/rovahr/Aspirant-templier.png"
@@ -14,7 +14,7 @@
     cost=20
     usage=fighter
     description={AE_AOA_UNIT_NOTICE}+ _ "description to come"
-    advances_to=AE_AoA_rovahr_templier
+    advances_to=AE_AoA_kingdoms_rovahr_Templar
     die_sound={SOUND_LIST:HUMAN_DIE}
     {DEFENSE_ANIM "units/rovahr/Aspirant-templier.png" "units/rovahr/Aspirant-templier.png" {SOUND_LIST:HUMAN_HIT} }
     {TRAIT_FEARLESS}
diff --git a/units/AoA_units/rovahr/Eveque_guerrier.cfg b/units/AoA_units/kingdoms_rovahr/Bishop_Fighter.cfg
similarity index 90%
rename from units/AoA_units/rovahr/Eveque_guerrier.cfg
rename to units/AoA_units/kingdoms_rovahr/Bishop_Fighter.cfg
index e007076e9..d463e1cfe 100644
--- a/units/AoA_units/rovahr/Eveque_guerrier.cfg
+++ b/units/AoA_units/kingdoms_rovahr/Bishop_Fighter.cfg
@@ -1,7 +1,7 @@
 #textdomain armies_of_amberan
 [unit_type]
-    id=AE_AoA_rovahr_evequeGuerrier
-    name= _ "Bishop-fighter"
+    id=AE_AoA_kingdoms_rovahr_Bishop_Fighter
+    name= _ "Bishop-Fighter"
     race=rovahrien
     gender=male
     image="units/rovahr/Eveque-guerrier.png"
@@ -15,7 +15,7 @@
     cost=55
     usage=healer
     description={AE_AOA_UNIT_NOTICE}+ _ "description to come"
-    advances_to=AE_AoA_rovahr_archevequeGuerrier
+    advances_to=AE_AoA_kingdoms_rovahr_Archbishop_Fighter
     {TRAIT_FEARLESS}
     die_sound={SOUND_LIST:HUMAN_DIE}
     {DEFENSE_ANIM "units/rovahr/Eveque-guerrier.png" "units/rovahr/Eveque-guerrier.png" {SOUND_LIST:HUMAN_HIT} }
diff --git a/units/AoA_units/rovahr/Arbaletrier_avec_pavois.cfg b/units/AoA_units/kingdoms_rovahr/Crossbowman_With_Bulwark.cfg
similarity index 92%
rename from units/AoA_units/rovahr/Arbaletrier_avec_pavois.cfg
rename to units/AoA_units/kingdoms_rovahr/Crossbowman_With_Bulwark.cfg
index d496b97ff..e344d0870 100644
--- a/units/AoA_units/rovahr/Arbaletrier_avec_pavois.cfg
+++ b/units/AoA_units/kingdoms_rovahr/Crossbowman_With_Bulwark.cfg
@@ -1,7 +1,7 @@
 #textdomain armies_of_amberan
 [unit_type]
-    id=AE_AoA_rovahr_arbaletrierAvecPavois
-    name= _ "Crossbowman with bulwark"
+    id=AE_AoA_kingdoms_rovahr_Crossbowman_With_Bulwark
+    name= _ "Crossbowman With Bulwark"
     race=rovahrien
     gender=male
     image="units/rovahr/Arbaletrier-avec-pavois.png"
diff --git a/units/AoA_units/rovahr/Chevalier_feodal.cfg b/units/AoA_units/kingdoms_rovahr/Feudal_Knight.cfg
similarity index 89%
rename from units/AoA_units/rovahr/Chevalier_feodal.cfg
rename to units/AoA_units/kingdoms_rovahr/Feudal_Knight.cfg
index 31e357763..a769c4229 100644
--- a/units/AoA_units/rovahr/Chevalier_feodal.cfg
+++ b/units/AoA_units/kingdoms_rovahr/Feudal_Knight.cfg
@@ -1,7 +1,7 @@
 #textdomain armies_of_amberan
 [unit_type]
-    id=AE_AoA_rovahr_chevalierFeodal
-    name= _ "Feudal knight"
+    id=AE_AoA_kingdoms_rovahr_Feudal_Knight
+    name= _ "Feudal Knight"
     race=rovahrien
     gender=male
     image="units/rovahr/Chevalier-feodal.png"
@@ -14,7 +14,7 @@
     cost=48
     usage=fighter
     description={AE_AOA_UNIT_NOTICE}+ _ "description to come"
-    advances_to=AE_AoA_rovahr_chevalierGothique
+    advances_to=AE_AoA_kingdoms_rovahr_Gothic_Knight
     {TRAIT_FEARLESS}
     die_sound={SOUND_LIST:HUMAN_DIE}
     {DEFENSE_ANIM "units/rovahr/Chevalier-feodal.png" "units/rovahr/Chevalier-feodal.png" {SOUND_LIST:HUMAN_HIT} }
diff --git a/units/AoA_units/rovahr/levee_feodale.cfg b/units/AoA_units/kingdoms_rovahr/Feudal_Levy.cfg
similarity index 84%
rename from units/AoA_units/rovahr/levee_feodale.cfg
rename to units/AoA_units/kingdoms_rovahr/Feudal_Levy.cfg
index 4bd68fdeb..a24dfa638 100644
--- a/units/AoA_units/rovahr/levee_feodale.cfg
+++ b/units/AoA_units/kingdoms_rovahr/Feudal_Levy.cfg
@@ -1,7 +1,7 @@
 #textdomain armies_of_amberan
 [unit_type]
-    id=AE_AoA_rovahr_leveeFeodale
-    name= _ "Feudal levy"
+    id=AE_AoA_kingdoms_rovahr_Feudal_Levy
+    name= _ "Feudal Levy"
     race=rovahrien
     gender=male
     image="units/rovahr/Levee-feodale.png"
@@ -14,7 +14,7 @@
     cost=12
     usage=fighter
     description={AE_AOA_UNIT_NOTICE}+ _ "description to come"
-    advances_to=AE_AoA_rovahr_mercenaire,AE_AoA_rovahr_hommeDArmes
+    advances_to=AE_AoA_kingdoms_rovahr_Mercenary,AE_AoA_kingdoms_rovahr_Men_At_Arms
     {TRAIT_FEARLESS}
     die_sound={SOUND_LIST:HUMAN_DIE}
     {DEFENSE_ANIM "units/rovahr/Levee-feodale.png" "units/rovahr/Levee-feodale.png" {SOUND_LIST:HUMAN_HIT} }
diff --git a/units/AoA_units/rovahr/Chevalier_gothique_a_pieds.cfg b/units/AoA_units/kingdoms_rovahr/Gothic_Kight_On_Foots.cfg
similarity index 91%
rename from units/AoA_units/rovahr/Chevalier_gothique_a_pieds.cfg
rename to units/AoA_units/kingdoms_rovahr/Gothic_Kight_On_Foots.cfg
index cd767cb48..14a2c2e82 100644
--- a/units/AoA_units/rovahr/Chevalier_gothique_a_pieds.cfg
+++ b/units/AoA_units/kingdoms_rovahr/Gothic_Kight_On_Foots.cfg
@@ -1,7 +1,7 @@
 #textdomain armies_of_amberan
 [unit_type]
-    id=AE_AoA_rovahr_chevalierGothiqueAPieds
-    name= _ "Gothic kight on foots"
+    id=AE_AoA_kingdoms_rovahr_Gothic_Kight_On_Foots
+    name= _ "Gothic Kight On Foots"
     race=rovahrien
     gender=male
     image="units/rovahr/Chevalier-gothique-a-pieds.png"
diff --git a/units/AoA_units/rovahr/Chevalier_gothique.cfg b/units/AoA_units/kingdoms_rovahr/Gothic_Knight.cfg
similarity index 94%
rename from units/AoA_units/rovahr/Chevalier_gothique.cfg
rename to units/AoA_units/kingdoms_rovahr/Gothic_Knight.cfg
index fb14703c3..3730f75c2 100644
--- a/units/AoA_units/rovahr/Chevalier_gothique.cfg
+++ b/units/AoA_units/kingdoms_rovahr/Gothic_Knight.cfg
@@ -1,7 +1,7 @@
 #textdomain armies_of_amberan
 [unit_type]
-    id=AE_AoA_rovahr_chevalierGothique
-    name= _ "Gothic knight"
+    id=AE_AoA_kingdoms_rovahr_Gothic_Knight
+    name= _ "Gothic Knight"
     race=rovahrien
     gender=male
     image="units/rovahr/Chevalier-gothique.png"
diff --git a/units/AoA_units/rovahr/Grand_inquisiteur.cfg b/units/AoA_units/kingdoms_rovahr/Grand_Inquisitor.cfg
similarity index 94%
rename from units/AoA_units/rovahr/Grand_inquisiteur.cfg
rename to units/AoA_units/kingdoms_rovahr/Grand_Inquisitor.cfg
index 37481f910..3fe367864 100644
--- a/units/AoA_units/rovahr/Grand_inquisiteur.cfg
+++ b/units/AoA_units/kingdoms_rovahr/Grand_Inquisitor.cfg
@@ -1,7 +1,7 @@
 #textdomain armies_of_amberan
 [unit_type]
-    id=AE_AoA_rovahr_grandInquisiteur
-    name= _ "Grand inquisitor"
+    id=AE_AoA_kingdoms_rovahr_Grand_Inquisitor
+    name= _ "Grand Inquisitor"
     race=rovahrien
     gender=male
     image="units/rovahr/Grand-inquisiteur.png"
diff --git a/units/AoA_units/rovahr/Grand_mage.cfg b/units/AoA_units/kingdoms_rovahr/Grand_Mage.cfg
similarity index 93%
rename from units/AoA_units/rovahr/Grand_mage.cfg
rename to units/AoA_units/kingdoms_rovahr/Grand_Mage.cfg
index bcfc710dc..7232bdd9f 100644
--- a/units/AoA_units/rovahr/Grand_mage.cfg
+++ b/units/AoA_units/kingdoms_rovahr/Grand_Mage.cfg
@@ -1,7 +1,7 @@
 #textdomain armies_of_amberan
 [unit_type]
-    id=AE_AoA_rovahr_grandMage
-    name= _ "Grand mage"
+    id=AE_AoA_kingdoms_rovahr_Grand_Mage
+    name= _ "Grand Mage"
     race=rovahrien
     gender=male,female
     image="units/rovahr/Grand-mage.png"
@@ -53,7 +53,7 @@
     {STAFF_SOUND}
     {ICE_SOUND}
     [female]
-        name= _"female^Grand mage"
+        name= _"Grand Mage"
         gender=female
         image="units/rovahr/Grand-mage2.png"
         die_sound={SOUND_LIST:HUMAN_FEMALE_DIE}
diff --git a/units/AoA_units/rovahr/Grand_maitre.cfg b/units/AoA_units/kingdoms_rovahr/Grand_Master_Templar.cfg
similarity index 95%
rename from units/AoA_units/rovahr/Grand_maitre.cfg
rename to units/AoA_units/kingdoms_rovahr/Grand_Master_Templar.cfg
index e2e8e8851..2566a0376 100644
--- a/units/AoA_units/rovahr/Grand_maitre.cfg
+++ b/units/AoA_units/kingdoms_rovahr/Grand_Master_Templar.cfg
@@ -1,7 +1,7 @@
 #textdomain armies_of_amberan
 [unit_type]
-    id=AE_AoA_rovahr_grandMaitre
-    name= _ "Grand master templar"
+    id=AE_AoA_kingdoms_rovahr_Grand_Master_Templar
+    name= _ "Grand Master Templar"
     race=rovahrien
     gender=male
     image="units/rovahr/Grand-maitre.png"
diff --git a/units/AoA_units/rovahr/Halbruder.cfg b/units/AoA_units/kingdoms_rovahr/Halbruder.cfg
similarity index 92%
rename from units/AoA_units/rovahr/Halbruder.cfg
rename to units/AoA_units/kingdoms_rovahr/Halbruder.cfg
index 7c8250036..04193e905 100644
--- a/units/AoA_units/rovahr/Halbruder.cfg
+++ b/units/AoA_units/kingdoms_rovahr/Halbruder.cfg
@@ -1,6 +1,6 @@
 #textdomain armies_of_amberan
 [unit_type]
-    id=AE_AoA_rovahr_halbruder
+    id=AE_AoA_kingdoms_rovahr_Halbruder
     name= _ "Halbrüder"
     race=rovahrien
     gender=male
@@ -14,7 +14,7 @@
     cost=51
     usage=fighter
     description={AE_AOA_UNIT_NOTICE}+ _ "description to come"
-    advances_to=AE_AoA_rovahr_ritterbruder
+    advances_to=AE_AoA_kingdoms_rovahr_Ritterbruder
     {TRAIT_FEARLESS}
     die_sound={SOUND_LIST:HUMAN_DIE}
     {DEFENSE_ANIM "units/rovahr/Halbruder.png" "units/rovahr/Halbruder.png" {SOUND_LIST:HUMAN_HIT} }
diff --git a/units/AoA_units/rovahr/Arbaletrier_lourd.cfg b/units/AoA_units/kingdoms_rovahr/Heavy_Crossbow.cfg
similarity index 89%
rename from units/AoA_units/rovahr/Arbaletrier_lourd.cfg
rename to units/AoA_units/kingdoms_rovahr/Heavy_Crossbow.cfg
index 981d9be26..c327ffc43 100644
--- a/units/AoA_units/rovahr/Arbaletrier_lourd.cfg
+++ b/units/AoA_units/kingdoms_rovahr/Heavy_Crossbow.cfg
@@ -1,7 +1,7 @@
 #textdomain armies_of_amberan
 [unit_type]
-    id=AE_AoA_rovahr_arbaletrierLourd
-    name= _ "Heavy crossbow"
+    id=AE_AoA_kingdoms_rovahr_Heavy_Crossbow
+    name= _ "Heavy Crossbow"
     race=rovahrien
     gender=male
     image="units/rovahr/Arbaletrier-lourd.png"
@@ -14,7 +14,7 @@
     cost=24
     usage=archer
     description={AE_AOA_UNIT_NOTICE}+ _ "description to come"
-    advances_to=AE_AoA_rovahr_arbaletrierAvecPavois
+    advances_to=AE_AoA_kingdoms_rovahr_Crossbowman_With_Bulwark
     die_sound={SOUND_LIST:HUMAN_DIE}
     {DEFENSE_ANIM "units/rovahr/Arbaletrier-lourd.png" "units/rovahr/Arbaletrier-lourd.png" {SOUND_LIST:HUMAN_HIT} }
     {TRAIT_FEARLESS}
diff --git a/units/AoA_units/rovahr/Inquisiteur.cfg b/units/AoA_units/kingdoms_rovahr/Inquisitor.cfg
similarity index 93%
rename from units/AoA_units/rovahr/Inquisiteur.cfg
rename to units/AoA_units/kingdoms_rovahr/Inquisitor.cfg
index 4216cbd1f..bcc2a9afc 100644
--- a/units/AoA_units/rovahr/Inquisiteur.cfg
+++ b/units/AoA_units/kingdoms_rovahr/Inquisitor.cfg
@@ -1,6 +1,6 @@
 #textdomain armies_of_amberan
 [unit_type]
-    id=AE_AoA_rovahr_inquisiteur
+    id=AE_AoA_kingdoms_rovahr_Inquisitor
     name= _ "Inquisitor"
     race=rovahrien
     gender=male
@@ -14,7 +14,7 @@
     cost=35
     usage=fighter
     description={AE_AOA_UNIT_NOTICE}+ _ "description to come"
-    advances_to=AE_AoA_rovahr_grandInquisiteur
+    advances_to=AE_AoA_kingdoms_rovahr_Grand_Inquisitor
     {TRAIT_FEARLESS}
     die_sound={SOUND_LIST:HUMAN_DIE}
     {DEFENSE_ANIM "units/rovahr/Inquisiteur.png" "units/rovahr/Inquisiteur.png" {SOUND_LIST:HUMAN_HIT} }
diff --git a/units/AoA_units/rovahr/Chevalier_a_pieds.cfg b/units/AoA_units/kingdoms_rovahr/Knight_On_Foots.cfg
similarity index 85%
rename from units/AoA_units/rovahr/Chevalier_a_pieds.cfg
rename to units/AoA_units/kingdoms_rovahr/Knight_On_Foots.cfg
index 35a15a635..bc85912c8 100644
--- a/units/AoA_units/rovahr/Chevalier_a_pieds.cfg
+++ b/units/AoA_units/kingdoms_rovahr/Knight_On_Foots.cfg
@@ -1,7 +1,7 @@
 #textdomain armies_of_amberan
 [unit_type]
-    id=AE_AoA_rovahr_chevalierAPieds
-    name= _ "Knight on foots"
+    id=AE_AoA_kingdoms_rovahr_Knight_On_Foots
+    name= _ "Knight On Foots"
     race=rovahrien
     gender=male
     image="units/rovahr/Chevalier-a-pieds.png"
@@ -14,7 +14,7 @@
     cost=31
     usage=fighter
     description={AE_AOA_UNIT_NOTICE}+ _ "description to come"
-    advances_to=AE_AoA_rovahr_chevalierGothiqueAPieds
+    advances_to=AE_AoA_kingdoms_rovahr_Gothic_Kight_On_Foots
     {TRAIT_FEARLESS}
     die_sound={SOUND_LIST:HUMAN_DIE}
     {DEFENSE_ANIM "units/rovahr/Chevalier-a-pieds.png" "units/rovahr/Chevalier-a-pieds.png" {SOUND_LIST:HUMAN_HIT} }
diff --git a/units/AoA_units/rovahr/Konig.cfg b/units/AoA_units/kingdoms_rovahr/Konig.cfg
similarity index 96%
rename from units/AoA_units/rovahr/Konig.cfg
rename to units/AoA_units/kingdoms_rovahr/Konig.cfg
index 9edfb57e2..d07599fd0 100644
--- a/units/AoA_units/rovahr/Konig.cfg
+++ b/units/AoA_units/kingdoms_rovahr/Konig.cfg
@@ -1,6 +1,6 @@
 #textdomain armies_of_amberan
 [unit_type]
-    id=AE_AoA_rovahr_konig
+    id=AE_AoA_kingdoms_rovahr_Konig
     name= _ "König"
     race=rovahrien
     gender=male
diff --git a/units/AoA_units/rovahr/Archer_long.cfg b/units/AoA_units/kingdoms_rovahr/Longbowman.cfg
similarity index 91%
rename from units/AoA_units/rovahr/Archer_long.cfg
rename to units/AoA_units/kingdoms_rovahr/Longbowman.cfg
index 70e43462e..69cfa3b41 100644
--- a/units/AoA_units/rovahr/Archer_long.cfg
+++ b/units/AoA_units/kingdoms_rovahr/Longbowman.cfg
@@ -1,6 +1,6 @@
 #textdomain armies_of_amberan
 [unit_type]
-    id=AE_AoA_rovahr_archerLong
+    id=AE_AoA_kingdoms_rovahr_Longbowman
     name= _ "Longbowman"
     race=rovahrien
     gender=male
@@ -14,7 +14,7 @@
     cost=23
     usage=archer
     description={AE_AOA_UNIT_NOTICE}+ _ "description to come"
-    advances_to=AE_AoA_rovahr_archerRoyal
+    advances_to=AE_AoA_kingdoms_rovahr_Royal_Archer
     die_sound={SOUND_LIST:HUMAN_DIE}
     {DEFENSE_ANIM "units/rovahr/Archer-long.png" "units/rovahr/Archer-long.png" {SOUND_LIST:HUMAN_HIT} }
     {TRAIT_FEARLESS}
diff --git a/units/AoA_units/rovahr/Mage.cfg b/units/AoA_units/kingdoms_rovahr/Mage.cfg
similarity index 92%
rename from units/AoA_units/rovahr/Mage.cfg
rename to units/AoA_units/kingdoms_rovahr/Mage.cfg
index 9c13db603..3554e64dc 100644
--- a/units/AoA_units/rovahr/Mage.cfg
+++ b/units/AoA_units/kingdoms_rovahr/Mage.cfg
@@ -1,6 +1,6 @@
 #textdomain armies_of_amberan
 [unit_type]
-    id=AE_AoA_rovahr_mage
+    id=AE_AoA_kingdoms_rovahr_Mage
     name= _ "Mage"
     race=rovahrien
     gender=male,female
@@ -14,7 +14,7 @@
     cost=33
     usage=mixed fighter
     description={AE_AOA_UNIT_NOTICE}+ _ "description to come"
-    advances_to=AE_AoA_rovahr_grandMage
+    advances_to=AE_AoA_kingdoms_rovahr_Grand_Mage
     die_sound={SOUND_LIST:HUMAN_DIE}
     {DEFENSE_ANIM "units/rovahr/Mage.png" "units/rovahr/Mage.png" {SOUND_LIST:HUMAN_HIT} }
     [movement_costs]
@@ -51,7 +51,7 @@
     {STAFF_SOUND}
     {ICE_SOUND}
     [female]
-        name= _"female^Mage"
+        name= _"Mage"
         gender=female
         image="units/rovahr/Mage2.png"
         die_sound={SOUND_LIST:HUMAN_FEMALE_DIE}
diff --git a/units/AoA_units/rovahr/Homme_d_armes.cfg b/units/AoA_units/kingdoms_rovahr/Men_At_Arms.cfg
similarity index 91%
rename from units/AoA_units/rovahr/Homme_d_armes.cfg
rename to units/AoA_units/kingdoms_rovahr/Men_At_Arms.cfg
index 2b629011c..d4197983b 100644
--- a/units/AoA_units/rovahr/Homme_d_armes.cfg
+++ b/units/AoA_units/kingdoms_rovahr/Men_At_Arms.cfg
@@ -1,7 +1,7 @@
 #textdomain armies_of_amberan
 [unit_type]
-    id=AE_AoA_rovahr_hommeDArmes
-    name= _ "Men at arms"
+    id=AE_AoA_kingdoms_rovahr_Men_At_Arms
+    name= _ "Men At Arms"
     race=rovahrien
     gender=male
     image="units/rovahr/Homme-d-armes.png"
@@ -14,7 +14,7 @@
     cost=25
     usage=fighter
     description={AE_AOA_UNIT_NOTICE}+ _ "description to come"
-    advances_to=AE_AoA_rovahr_sergent
+    advances_to=AE_AoA_kingdoms_rovahr_Sergeant
     {TRAIT_FEARLESS}
     die_sound={SOUND_LIST:HUMAN_DIE}
     {DEFENSE_ANIM "units/rovahr/Homme-d-armes.png" "units/rovahr/Homme-d-armes.png" {SOUND_LIST:HUMAN_HIT} }
diff --git a/units/AoA_units/rovahr/Mercenaire.cfg b/units/AoA_units/kingdoms_rovahr/Mercenary.cfg
similarity index 90%
rename from units/AoA_units/rovahr/Mercenaire.cfg
rename to units/AoA_units/kingdoms_rovahr/Mercenary.cfg
index 3025b8eb8..f880890a5 100644
--- a/units/AoA_units/rovahr/Mercenaire.cfg
+++ b/units/AoA_units/kingdoms_rovahr/Mercenary.cfg
@@ -1,6 +1,6 @@
 #textdomain armies_of_amberan
 [unit_type]
-    id=AE_AoA_rovahr_mercenaire
+    id=AE_AoA_kingdoms_rovahr_Mercenary
     name= _ "Mercenary"
     race=rovahrien
     gender=male
@@ -14,7 +14,7 @@
     cost=28
     usage=fighter
     description={AE_AOA_UNIT_NOTICE}+ _ "description to come"
-    advances_to=AE_AoA_rovahr_capitaineMercenaire
+    advances_to=AE_AoA_kingdoms_rovahr_Mercenary_Captain
     {TRAIT_FEARLESS}
     die_sound={SOUND_LIST:HUMAN_DIE}
     {DEFENSE_ANIM "units/rovahr/Mercenaire.png" "units/rovahr/Mercenaire.png" {SOUND_LIST:HUMAN_HIT} }
diff --git a/units/AoA_units/rovahr/Capitaine_mercenaire.cfg b/units/AoA_units/kingdoms_rovahr/Mercenary_Captain.cfg
similarity index 92%
rename from units/AoA_units/rovahr/Capitaine_mercenaire.cfg
rename to units/AoA_units/kingdoms_rovahr/Mercenary_Captain.cfg
index 00105c0e3..7d576f2d5 100644
--- a/units/AoA_units/rovahr/Capitaine_mercenaire.cfg
+++ b/units/AoA_units/kingdoms_rovahr/Mercenary_Captain.cfg
@@ -1,7 +1,7 @@
 #textdomain armies_of_amberan
 [unit_type]
-    id=AE_AoA_rovahr_capitaineMercenaire
-    name= _ "Mercenary captain"
+    id=AE_AoA_kingdoms_rovahr_Mercenary_Captain
+    name= _ "Mercenary Captain"
     race=rovahrien
     gender=male
     image="units/rovahr/Capitaine-mercenaire.png"
diff --git a/units/AoA_units/rovahr/Moine-soldat.cfg b/units/AoA_units/kingdoms_rovahr/Monk_Soldier.cfg
similarity index 88%
rename from units/AoA_units/rovahr/Moine-soldat.cfg
rename to units/AoA_units/kingdoms_rovahr/Monk_Soldier.cfg
index 645f74286..e4aa5fe51 100644
--- a/units/AoA_units/rovahr/Moine-soldat.cfg
+++ b/units/AoA_units/kingdoms_rovahr/Monk_Soldier.cfg
@@ -1,7 +1,7 @@
 #textdomain armies_of_amberan
 [unit_type]
-    id=AE_AoA_rovahr_moineSoldat
-    name= _ "Monk-soldier"
+    id=AE_AoA_kingdoms_rovahr_Monk_Soldier
+    name= _ "Monk-Soldier"
     race=rovahrien
     gender=male
     image="units/rovahr/Moine-soldat.png"
@@ -14,7 +14,7 @@
     cost=19
     usage=healer
     description={AE_AOA_UNIT_NOTICE}+ _ "description to come"
-    advances_to=AE_AoA_rovahr_pretreGuerrier,AE_AoA_rovahr_inquisiteur
+    advances_to=AE_AoA_kingdoms_rovahr_Priest_Fighter,AE_AoA_kingdoms_rovahr_Inquisitor
     {TRAIT_FEARLESS}
     die_sound={SOUND_LIST:HUMAN_DIE}
     {DEFENSE_ANIM "units/rovahr/Moine-soldat.png" "units/rovahr/Moine-soldat.png" {SOUND_LIST:HUMAN_HIT} }
diff --git a/units/AoA_units/rovahr/Novice.cfg b/units/AoA_units/kingdoms_rovahr/Novice.cfg
similarity index 92%
rename from units/AoA_units/rovahr/Novice.cfg
rename to units/AoA_units/kingdoms_rovahr/Novice.cfg
index 8b6b877e9..7c7f84df3 100644
--- a/units/AoA_units/rovahr/Novice.cfg
+++ b/units/AoA_units/kingdoms_rovahr/Novice.cfg
@@ -1,6 +1,6 @@
 #textdomain armies_of_amberan
 [unit_type]
-    id=AE_AoA_rovahr_novice
+    id=AE_AoA_kingdoms_rovahr_Novice
     name= _ "Novice"
     race=rovahrien
     gender=male,female
@@ -14,7 +14,7 @@
     cost=19
     usage=mixed fighter
     description={AE_AOA_UNIT_NOTICE}+ _ "description to come"
-    advances_to=AE_AoA_rovahr_mage
+    advances_to=AE_AoA_kingdoms_rovahr_Mage
     die_sound={SOUND_LIST:HUMAN_DIE}
     {DEFENSE_ANIM "units/rovahr/Novice.png" "units/rovahr/Novice.png" {SOUND_LIST:HUMAN_HIT} }
     [movement_costs]
@@ -47,7 +47,7 @@
     {STAFF_SOUND}
     {ICE_SOUND}
     [female]
-        name= _"female^Novice"
+        name= _"Novice"
         gender=female
         image="units/rovahr/Novice2.png"
         die_sound={SOUND_LIST:HUMAN_FEMALE_DIE}
diff --git a/units/AoA_units/rovahr/Paysan.cfg b/units/AoA_units/kingdoms_rovahr/Peasant.cfg
similarity index 88%
rename from units/AoA_units/rovahr/Paysan.cfg
rename to units/AoA_units/kingdoms_rovahr/Peasant.cfg
index a7e095a1a..5f340c7fd 100644
--- a/units/AoA_units/rovahr/Paysan.cfg
+++ b/units/AoA_units/kingdoms_rovahr/Peasant.cfg
@@ -1,6 +1,6 @@
 #textdomain armies_of_amberan
 [unit_type]
-    id=AE_AoA_rovahr_paysan
+    id=AE_AoA_kingdoms_rovahr_Peasant
     name= _ "Peasant"
     race=rovahrien
     gender=male
@@ -14,7 +14,7 @@
     cost=8
     usage=fighter
     description={AE_AOA_UNIT_NOTICE}+ _ "description to come"
-    advances_to=AE_AoA_rovahr_leveeFeodale,AE_AoA_rovahr_arbaletrierPaysan
+    advances_to=AE_AoA_kingdoms_rovahr_Feudal_Levy,AE_AoA_kingdoms_rovahr_Peasant_Crossbowman
     {TRAIT_FEARLESS}
     die_sound={SOUND_LIST:HUMAN_DIE}
     {DEFENSE_ANIM "units/rovahr/Paysan.png" "units/rovahr/Paysan.png" {SOUND_LIST:HUMAN_HIT} }
diff --git a/units/AoA_units/rovahr/Arbaletrier_paysan.cfg b/units/AoA_units/kingdoms_rovahr/Peasant_Crossbowman.cfg
similarity index 85%
rename from units/AoA_units/rovahr/Arbaletrier_paysan.cfg
rename to units/AoA_units/kingdoms_rovahr/Peasant_Crossbowman.cfg
index ef5e3bb6e..dac04ac34 100644
--- a/units/AoA_units/rovahr/Arbaletrier_paysan.cfg
+++ b/units/AoA_units/kingdoms_rovahr/Peasant_Crossbowman.cfg
@@ -1,7 +1,7 @@
 #textdomain armies_of_amberan
 [unit_type]
-    id=AE_AoA_rovahr_arbaletrierPaysan
-    name= _ "Peasant crossbowman"
+    id=AE_AoA_kingdoms_rovahr_Peasant_Crossbowman
+    name= _ "Peasant Crossbowman"
     race=rovahrien
     gender=male
     image="units/rovahr/Arbaletrier-paysan.png"
@@ -14,7 +14,7 @@
     cost=15
     usage=archer
     description={AE_AOA_UNIT_NOTICE}+ _ "description to come"
-    advances_to=AE_AoA_rovahr_arbaletrierLourd,AE_AoA_rovahr_archerLong
+    advances_to=AE_AoA_kingdoms_rovahr_Heavy_Crossbow,AE_AoA_kingdoms_rovahr_Longbowman
     die_sound={SOUND_LIST:HUMAN_DIE}
     {DEFENSE_ANIM "units/rovahr/Arbaletrier-paysan.png" "units/rovahr/Arbaletrier-paysan.png" {SOUND_LIST:HUMAN_HIT} }
     {TRAIT_FEARLESS}
diff --git a/units/AoA_units/rovahr/Pretre_guerrier.cfg b/units/AoA_units/kingdoms_rovahr/Priest_Fighter.cfg
similarity index 90%
rename from units/AoA_units/rovahr/Pretre_guerrier.cfg
rename to units/AoA_units/kingdoms_rovahr/Priest_Fighter.cfg
index a7df9577c..60ef84caa 100644
--- a/units/AoA_units/rovahr/Pretre_guerrier.cfg
+++ b/units/AoA_units/kingdoms_rovahr/Priest_Fighter.cfg
@@ -1,7 +1,7 @@
 #textdomain armies_of_amberan
 [unit_type]
-    id=AE_AoA_rovahr_pretreGuerrier
-    name= _ "Priest-fighter"
+    id=AE_AoA_kingdoms_rovahr_Priest_Fighter
+    name= _ "Priest-Fighter"
     race=rovahrien
     gender=male
     image="units/rovahr/Pretre-guerrier.png"
@@ -14,7 +14,7 @@
     cost=33
     usage=healer
     description={AE_AOA_UNIT_NOTICE}+ _ "description to come"
-    advances_to=AE_AoA_rovahr_evequeGuerrier
+    advances_to=AE_AoA_kingdoms_rovahr_Bishop_Fighter
     {TRAIT_FEARLESS}
     die_sound={SOUND_LIST:HUMAN_DIE}
     {DEFENSE_ANIM "units/rovahr/Pretre-guerrier.png" "units/rovahr/Pretre-guerrier.png" {SOUND_LIST:HUMAN_HIT} }
diff --git a/units/AoA_units/rovahr/Ritterbruder.cfg b/units/AoA_units/kingdoms_rovahr/Ritterbruder.cfg
similarity index 96%
rename from units/AoA_units/rovahr/Ritterbruder.cfg
rename to units/AoA_units/kingdoms_rovahr/Ritterbruder.cfg
index 30972c4c5..0397e04f3 100644
--- a/units/AoA_units/rovahr/Ritterbruder.cfg
+++ b/units/AoA_units/kingdoms_rovahr/Ritterbruder.cfg
@@ -1,6 +1,6 @@
 #textdomain armies_of_amberan
 [unit_type]
-    id=AE_AoA_rovahr_ritterbruder
+    id=AE_AoA_kingdoms_rovahr_Ritterbruder
     name= _ "Ritterbrüder"
     race=rovahrien
     gender=male
diff --git a/units/AoA_units/rovahr/Archer_royal.cfg b/units/AoA_units/kingdoms_rovahr/Royal_Archer.cfg
similarity index 94%
rename from units/AoA_units/rovahr/Archer_royal.cfg
rename to units/AoA_units/kingdoms_rovahr/Royal_Archer.cfg
index a4e237a9c..6e65ba18a 100644
--- a/units/AoA_units/rovahr/Archer_royal.cfg
+++ b/units/AoA_units/kingdoms_rovahr/Royal_Archer.cfg
@@ -1,7 +1,7 @@
 #textdomain armies_of_amberan
 [unit_type]
-    id=AE_AoA_rovahr_archerRoyal
-    name= _ "Royal archer"
+    id=AE_AoA_kingdoms_rovahr_Royal_Archer
+    name= _ "Royal Archer"
     race=rovahrien
     gender=male
     image="units/rovahr/Archer-royal.png"
diff --git a/units/AoA_units/rovahr/Sergent.cfg b/units/AoA_units/kingdoms_rovahr/Sergeant.cfg
similarity index 97%
rename from units/AoA_units/rovahr/Sergent.cfg
rename to units/AoA_units/kingdoms_rovahr/Sergeant.cfg
index 23d5f8b7c..cefb105bb 100644
--- a/units/AoA_units/rovahr/Sergent.cfg
+++ b/units/AoA_units/kingdoms_rovahr/Sergeant.cfg
@@ -1,6 +1,6 @@
 #textdomain armies_of_amberan
 [unit_type]
-    id=AE_AoA_rovahr_sergent
+    id=AE_AoA_kingdoms_rovahr_Sergeant
     name= _ "Sergeant"
     race=rovahrien
     gender=male
diff --git a/units/AoA_units/rovahr/Ecuyer.cfg b/units/AoA_units/kingdoms_rovahr/Squire.cfg
similarity index 89%
rename from units/AoA_units/rovahr/Ecuyer.cfg
rename to units/AoA_units/kingdoms_rovahr/Squire.cfg
index c10e8eec6..78a96b52f 100644
--- a/units/AoA_units/rovahr/Ecuyer.cfg
+++ b/units/AoA_units/kingdoms_rovahr/Squire.cfg
@@ -1,6 +1,6 @@
 #textdomain armies_of_amberan
 [unit_type]
-    id=AE_AoA_rovahr_ecuyer
+    id=AE_AoA_kingdoms_rovahr_Squire
     name= _ "Squire"
     race=rovahrien
     gender=male
@@ -14,7 +14,7 @@
     cost=18
     usage=fighter
     description={AE_AOA_UNIT_NOTICE}+ _ "description to come"
-    advances_to=AE_AoA_rovahr_chevalierAPieds
+    advances_to=AE_AoA_kingdoms_rovahr_Knight_On_Foots
     {TRAIT_FEARLESS}
     die_sound={SOUND_LIST:HUMAN_DIE}
     {DEFENSE_ANIM "units/rovahr/Ecuyer.png" "units/rovahr/Ecuyer.png" {SOUND_LIST:HUMAN_HIT} }
diff --git a/units/AoA_units/rovahr/Templier.cfg b/units/AoA_units/kingdoms_rovahr/Templar.cfg
similarity index 93%
rename from units/AoA_units/rovahr/Templier.cfg
rename to units/AoA_units/kingdoms_rovahr/Templar.cfg
index 5cba3856f..bbe991716 100644
--- a/units/AoA_units/rovahr/Templier.cfg
+++ b/units/AoA_units/kingdoms_rovahr/Templar.cfg
@@ -1,6 +1,6 @@
 #textdomain armies_of_amberan
 [unit_type]
-    id=AE_AoA_rovahr_templier
+    id=AE_AoA_kingdoms_rovahr_Templar
     name= _ "Templar"
     race=rovahrien
     gender=male
@@ -14,7 +14,7 @@
     cost=36
     usage=fighter
     description={AE_AOA_UNIT_NOTICE}+ _ "description to come"
-    advances_to=AE_AoA_rovahr_templierCapitaine
+    advances_to=AE_AoA_kingdoms_rovahr_Templar_Captain
     {TRAIT_FEARLESS}
     die_sound={SOUND_LIST:HUMAN_DIE}
     {DEFENSE_ANIM "units/rovahr/Templier.png" "units/rovahr/Templier.png" {SOUND_LIST:HUMAN_HIT} }
diff --git a/units/AoA_units/rovahr/Templier_capitaine.cfg b/units/AoA_units/kingdoms_rovahr/Templar_Captain.cfg
similarity index 95%
rename from units/AoA_units/rovahr/Templier_capitaine.cfg
rename to units/AoA_units/kingdoms_rovahr/Templar_Captain.cfg
index 2b3244bc4..06dd8c29f 100644
--- a/units/AoA_units/rovahr/Templier_capitaine.cfg
+++ b/units/AoA_units/kingdoms_rovahr/Templar_Captain.cfg
@@ -1,7 +1,7 @@
 #textdomain armies_of_amberan
 [unit_type]
-    id=AE_AoA_rovahr_templierCapitaine
-    name= _ "Templar-captain"
+    id=AE_AoA_kingdoms_rovahr_Templar_Captain
+    name= _ "Templar-Captain"
     race=rovahrien
     gender=male
     image="units/rovahr/Templier-capitaine.png"
diff --git a/units/AoA_units/rovahr/Jeune_chevalier.cfg b/units/AoA_units/kingdoms_rovahr/Young_Knight.cfg
similarity index 84%
rename from units/AoA_units/rovahr/Jeune_chevalier.cfg
rename to units/AoA_units/kingdoms_rovahr/Young_Knight.cfg
index c2bb57ed1..b35c1df34 100644
--- a/units/AoA_units/rovahr/Jeune_chevalier.cfg
+++ b/units/AoA_units/kingdoms_rovahr/Young_Knight.cfg
@@ -1,7 +1,7 @@
 #textdomain armies_of_amberan
 [unit_type]
-    id=AE_AoA_rovahr_jeuneChevalier
-    name= _ "Young knight"
+    id=AE_AoA_kingdoms_rovahr_Young_Knight
+    name= _ "Young Knight"
     race=rovahrien
     gender=male
     image="units/rovahr/Jeune-chevalier.png"
@@ -14,7 +14,7 @@
     cost=24
     usage=fighter
     description={AE_AOA_UNIT_NOTICE}+ _ "description to come"
-    advances_to=AE_AoA_rovahr_chevalierFeodal,AE_AoA_rovahr_halbruder
+    advances_to=AE_AoA_kingdoms_rovahr_Feudal_Knight,AE_AoA_kingdoms_rovahr_Halbruder
     {TRAIT_FEARLESS}
     die_sound={SOUND_LIST:HUMAN_DIE}
     {DEFENSE_ANIM "units/rovahr/Jeune-chevalier.png" "units/rovahr/Jeune-chevalier.png" {SOUND_LIST:HUMAN_HIT} }
diff --git a/units/AoA_units/federation/Ancien_druide.cfg b/units/AoA_units/mauve_islands_federation/Ancient_Druid.cfg
similarity index 93%
rename from units/AoA_units/federation/Ancien_druide.cfg
rename to units/AoA_units/mauve_islands_federation/Ancient_Druid.cfg
index 5eef603ef..d6cd2eaff 100644
--- a/units/AoA_units/federation/Ancien_druide.cfg
+++ b/units/AoA_units/mauve_islands_federation/Ancient_Druid.cfg
@@ -1,7 +1,7 @@
 #textdomain armies_of_amberan
 [unit_type]
-    id=AE_AoA_federation_ancienDruide
-    name= _ "Ancient druid"
+    id=AE_AoA_mauve_islands_federation_Ancient_Druid
+    name= _ "Ancient Druid"
     race=mauvilien
     gender=male,female
     image="units/federation/Ancien-druide.png"
@@ -63,7 +63,7 @@
     {ENTANGLE_SOUND}
     {THORNS_SOUND}
     [female]
-        name= _"female^Ancient druid"
+        name= _"Ancient Druid"
         gender=female
         image="units/federation/Ancien-druide2.png"
         die_sound={SOUND_LIST:HUMAN_FEMALE_DIE}
diff --git a/units/AoA_units/federation/Apprenti_sorcegarde.cfg b/units/AoA_units/mauve_islands_federation/Apprentice_Sorcerer.cfg
similarity index 88%
rename from units/AoA_units/federation/Apprenti_sorcegarde.cfg
rename to units/AoA_units/mauve_islands_federation/Apprentice_Sorcerer.cfg
index dbc69bdcd..d4a9c006b 100644
--- a/units/AoA_units/federation/Apprenti_sorcegarde.cfg
+++ b/units/AoA_units/mauve_islands_federation/Apprentice_Sorcerer.cfg
@@ -1,7 +1,7 @@
 #textdomain armies_of_amberan
 [unit_type]
-    id=AE_AoA_federation_apprentiSorcegarde
-    name= _ "Apprentice sorcegarde"
+    id=AE_AoA_mauve_islands_federation_Apprentice_Sorcerer
+    name= _ "Apprentice Sorcerer"
     race=mauvilien
     gender=male,female
     image="units/federation/Apprenti-sorcegarde.png"
@@ -14,7 +14,7 @@
     cost=22
     usage=mixed fighter
     description={AE_AOA_UNIT_NOTICE}+ _ "description to come"
-    advances_to=AE_AoA_federation_sorcegarde
+    advances_to=AE_AoA_mauve_islands_federation_Sorcerer
     die_sound={SOUND_LIST:HUMAN_DIE}
     {DEFENSE_ANIM "units/federation/Apprenti-sorcegarde.png" "units/federation/Apprenti-sorcegarde.png" {SOUND_LIST:HUMAN_HIT} }
     [movement_costs]
@@ -47,7 +47,7 @@
     {FIREBALL_SOUND}
     {SPEAR_SOUND}
     [female]
-        name= _"female^Apprentice sorcegarde"
+        name= _"Apprentice Sorcerer"
         gender=female
         image="units/federation/Apprenti-sorcegarde2.png"
         die_sound={SOUND_LIST:HUMAN_FEMALE_DIE}
diff --git a/units/AoA_units/federation/Arcaniste.cfg b/units/AoA_units/mauve_islands_federation/Arcanist.cfg
similarity index 94%
rename from units/AoA_units/federation/Arcaniste.cfg
rename to units/AoA_units/mauve_islands_federation/Arcanist.cfg
index e07be8de9..fc2a93d3d 100644
--- a/units/AoA_units/federation/Arcaniste.cfg
+++ b/units/AoA_units/mauve_islands_federation/Arcanist.cfg
@@ -1,6 +1,6 @@
 #textdomain armies_of_amberan
 [unit_type]
-    id=AE_AoA_federation_arcaniste
+    id=AE_AoA_mauve_islands_federation_Arcanist
     name= _ "Arcanist"
     race=mauvilien
     gender=male,female
@@ -14,7 +14,7 @@
     cost=45
     usage=mixed fighter
     description={AE_AOA_UNIT_NOTICE}+ _ "description to come"
-    advances_to=AE_AoA_federation_grandArcaniste
+    advances_to=AE_AoA_mauve_islands_federation_Grand_Arcanist
     die_sound={SOUND_LIST:HUMAN_DIE}
     {DEFENSE_ANIM "units/federation/Arcaniste.png" "units/federation/Arcaniste.png" {SOUND_LIST:HUMAN_HIT} }
     [movement_costs]
@@ -82,7 +82,7 @@
     {HOLYFIRE_SOUND}
     {SWORD_SOUND}
     [female]
-        name= _"female^Arcanist"
+        name= _"Arcanist"
         gender=female
         image="units/federation/Arcaniste2.png"
         die_sound={SOUND_LIST:HUMAN_FEMALE_DIE}
diff --git a/units/AoA_units/federation/Archimage.cfg b/units/AoA_units/mauve_islands_federation/Archmage.cfg
similarity index 96%
rename from units/AoA_units/federation/Archimage.cfg
rename to units/AoA_units/mauve_islands_federation/Archmage.cfg
index ce58a1ba6..063886127 100644
--- a/units/AoA_units/federation/Archimage.cfg
+++ b/units/AoA_units/mauve_islands_federation/Archmage.cfg
@@ -1,6 +1,6 @@
 #textdomain armies_of_amberan
 [unit_type]
-    id=AE_AoA_federation_archimage
+    id=AE_AoA_mauve_islands_federation_Archmage
     name= _ "Archmage"
     race=mauvilien
     gender=male,female
@@ -84,7 +84,7 @@
     {HOLYFIRE_SOUND}
     {SWORD_SOUND}
     [female]
-        name= _"female^Archmage"
+        name= _"Archmage"
         gender=female
         image="units/federation/Archimage2.png"
         die_sound={SOUND_LIST:HUMAN_FEMALE_DIE}
diff --git a/units/AoA_units/federation/Porteur_de_hache.cfg b/units/AoA_units/mauve_islands_federation/Axe_Wielder.cfg
similarity index 89%
rename from units/AoA_units/federation/Porteur_de_hache.cfg
rename to units/AoA_units/mauve_islands_federation/Axe_Wielder.cfg
index 1d576ac17..7d42c95dd 100644
--- a/units/AoA_units/federation/Porteur_de_hache.cfg
+++ b/units/AoA_units/mauve_islands_federation/Axe_Wielder.cfg
@@ -1,7 +1,7 @@
 #textdomain armies_of_amberan
 [unit_type]
-    id=AE_AoA_federation_porteurDeHache
-    name= _ "Axe wielder"
+    id=AE_AoA_mauve_islands_federation_Axe_Wielder
+    name= _ "Axe Wielder"
     race=mauvilien
     gender=male,female
     image="units/federation/Porteur-de-hache.png"
@@ -14,7 +14,7 @@
     cost=30
     usage=scout
     description={AE_AOA_UNIT_NOTICE}+ _ "description to come"
-    advances_to=AE_AoA_federation_gallowglass
+    advances_to=AE_AoA_mauve_islands_federation_Gallowglass
     die_sound={SOUND_LIST:HUMAN_DIE}
     {DEFENSE_ANIM "units/federation/Porteur-de-hache.png" "units/federation/Porteur-de-hache.png" {SOUND_LIST:HUMAN_HIT} }
     [movement_costs]
@@ -46,7 +46,7 @@
     [/attack]
     {AXE_SOUND}
     [female]
-        name= _"female^Axe wielder"
+        name= _"Axe Wielder"
         gender=female
         image="units/federation/Porteur-de-hache2.png"
         die_sound={SOUND_LIST:HUMAN_FEMALE_DIE}
diff --git a/units/AoA_units/federation/Chef_de_clan.cfg b/units/AoA_units/mauve_islands_federation/Chieftain.cfg
similarity index 95%
rename from units/AoA_units/federation/Chef_de_clan.cfg
rename to units/AoA_units/mauve_islands_federation/Chieftain.cfg
index ab2ea0de4..14872a2eb 100644
--- a/units/AoA_units/federation/Chef_de_clan.cfg
+++ b/units/AoA_units/mauve_islands_federation/Chieftain.cfg
@@ -1,6 +1,6 @@
 #textdomain armies_of_amberan
 [unit_type]
-    id=AE_AoA_federation_chefDeClan
+    id=AE_AoA_mauve_islands_federation_Chieftain
     name= _ "Chieftain"
     race=mauvilien
     gender=male,female
@@ -52,7 +52,7 @@
     [/attack]
     {SWORD_SOUND}
     [female]
-        name= _"female^Chieftain"
+        name= _"Chieftain"
         gender=female
         image="units/federation/Chef-de-clan2.png"
         die_sound={SOUND_LIST:HUMAN_FEMALE_DIE}
diff --git a/units/AoA_units/federation/Longbowman.cfg b/units/AoA_units/mauve_islands_federation/Clans_Longbowman.cfg
similarity index 87%
rename from units/AoA_units/federation/Longbowman.cfg
rename to units/AoA_units/mauve_islands_federation/Clans_Longbowman.cfg
index 663e16ec2..c870ea48c 100644
--- a/units/AoA_units/federation/Longbowman.cfg
+++ b/units/AoA_units/mauve_islands_federation/Clans_Longbowman.cfg
@@ -1,7 +1,7 @@
 #textdomain armies_of_amberan
 [unit_type]
-    id=AE_AoA_federation_longbowman
-    name= _ "Clans longbowman"
+    id=AE_AoA_mauve_islands_federation_Clans_Longbowman
+    name= _ "Clans Longbowman"
     race=mauvilien
     gender=male,female
     image="units/federation/Longbowman.png"
@@ -14,7 +14,7 @@
     cost=25
     usage=archer
     description={AE_AOA_UNIT_NOTICE}+ _ "description to come"
-    advances_to=AE_AoA_federation_francArcher
+    advances_to=AE_AoA_mauve_islands_federation_Free_Archer
     die_sound={SOUND_LIST:HUMAN_DIE}
     {DEFENSE_ANIM "units/federation/Longbowman.png" "units/federation/Longbowman.png" {SOUND_LIST:HUMAN_HIT} }
     [movement_costs]
@@ -44,7 +44,7 @@
     {AXE_SOUND}
     {BOW_SOUND}
     [female]
-        name= _"female^Clans longbowman"
+        name= _"Clans Longbowman"
         gender=female
         image="units/federation/Longbowman2.png"
         die_sound={SOUND_LIST:HUMAN_FEMALE_DIE}
diff --git a/units/AoA_units/federation/Piquier_des_clans.cfg b/units/AoA_units/mauve_islands_federation/Clans_Pikeman.cfg
similarity index 87%
rename from units/AoA_units/federation/Piquier_des_clans.cfg
rename to units/AoA_units/mauve_islands_federation/Clans_Pikeman.cfg
index 29364fdfd..42e963649 100644
--- a/units/AoA_units/federation/Piquier_des_clans.cfg
+++ b/units/AoA_units/mauve_islands_federation/Clans_Pikeman.cfg
@@ -1,7 +1,7 @@
 #textdomain armies_of_amberan
 [unit_type]
-    id=AE_AoA_federation_piquier
-    name= _ "Clans pikeman"
+    id=AE_AoA_mauve_islands_federation_Clans_Pikeman
+    name= _ "Clans Pikeman"
     race=mauvilien
     gender=male,female
     image="units/federation/Piquier-des-clans.png"
@@ -14,7 +14,7 @@
     cost=14
     usage=fighter
     description={AE_AOA_UNIT_NOTICE}+ _ "description to come"
-    advances_to=AE_AoA_federation_piquierLourd
+    advances_to=AE_AoA_mauve_islands_federation_Heavy_Pikeman
     die_sound={SOUND_LIST:HUMAN_DIE}
     {DEFENSE_ANIM "units/federation/Piquier-des-clans.png" "units/federation/Piquier-des-clans.png" {SOUND_LIST:HUMAN_HIT} }
     [movement_costs]
@@ -37,7 +37,7 @@
     [/attack]
     {SPEAR_SOUND}
     [female]
-        name= _"female^Clans pikeman"
+        name= _"Clans Pikeman"
         gender=female
         image="units/federation/Piquier-des-clans2.png"
         die_sound={SOUND_LIST:HUMAN_FEMALE_DIE}
diff --git a/units/AoA_units/federation/Guerrier_des_clans.cfg b/units/AoA_units/mauve_islands_federation/Clans_Warrior.cfg
similarity index 86%
rename from units/AoA_units/federation/Guerrier_des_clans.cfg
rename to units/AoA_units/mauve_islands_federation/Clans_Warrior.cfg
index 8693bdce2..4c3e9a778 100644
--- a/units/AoA_units/federation/Guerrier_des_clans.cfg
+++ b/units/AoA_units/mauve_islands_federation/Clans_Warrior.cfg
@@ -1,7 +1,7 @@
 #textdomain armies_of_amberan
 [unit_type]
-    id=AE_AoA_federation_guerrier
-    name= _ "Clans warrior"
+    id=AE_AoA_mauve_islands_federation_Clans_Warrior
+    name= _ "Clans Warrior"
     race=mauvilien
     gender=male,female
     image="units/federation/Guerrier-des-clans.png"
@@ -14,7 +14,7 @@
     cost=16
     usage=fighter
     description={AE_AOA_UNIT_NOTICE}+ _ "description to come"
-    advances_to=AE_AoA_federation_highlander,AE_AoA_federation_chevalier
+    advances_to=AE_AoA_mauve_islands_federation_Highlander,AE_AoA_mauve_islands_federation_Knight
     die_sound={SOUND_LIST:HUMAN_DIE}
     {DEFENSE_ANIM "units/federation/Guerrier-des-clans.png" "units/federation/Guerrier-des-clans.png" {SOUND_LIST:HUMAN_HIT} }
     [movement_costs]
@@ -42,7 +42,7 @@
     [/attack]
     {SWORD_SOUND}
     [female]
-        name= _"female^Clans warrior"
+        name= _"Clans Warrior"
         gender=female
         image="units/federation/Guerrier-des-clans2.png"
         die_sound={SOUND_LIST:HUMAN_FEMALE_DIE}
diff --git a/units/AoA_units/federation/Druide.cfg b/units/AoA_units/mauve_islands_federation/Druid.cfg
similarity index 92%
rename from units/AoA_units/federation/Druide.cfg
rename to units/AoA_units/mauve_islands_federation/Druid.cfg
index da3f05a77..e2932f5ca 100644
--- a/units/AoA_units/federation/Druide.cfg
+++ b/units/AoA_units/mauve_islands_federation/Druid.cfg
@@ -1,6 +1,6 @@
 #textdomain armies_of_amberan
 [unit_type]
-    id=AE_AoA_federation_druide
+    id=AE_AoA_mauve_islands_federation_Druid
     name= _ "Druid"
     race=mauvilien
     gender=male,female
@@ -14,7 +14,7 @@
     cost=25
     usage=healer
     description={AE_AOA_UNIT_NOTICE}+ _ "description to come"
-    advances_to=AE_AoA_federation_ancienDruide
+    advances_to=AE_AoA_mauve_islands_federation_Ancient_Druid
     die_sound={SOUND_LIST:HUMAN_DIE}
     {DEFENSE_ANIM "units/federation/Druide.png" "units/federation/Druide.png" {SOUND_LIST:HUMAN_HIT} }
     [abilities]
@@ -61,7 +61,7 @@
     {ENTANGLE_SOUND}
     {THORNS_SOUND}
     [female]
-        name= _"female^Druid"
+        name= _"Druid"
         gender=female
         image="units/federation/Druide2.png"
         die_sound={SOUND_LIST:HUMAN_FEMALE_DIE}
diff --git a/units/AoA_units/federation/Sorcegarde_emerite.cfg b/units/AoA_units/mauve_islands_federation/Elder_Sorcerer.cfg
similarity index 93%
rename from units/AoA_units/federation/Sorcegarde_emerite.cfg
rename to units/AoA_units/mauve_islands_federation/Elder_Sorcerer.cfg
index 07a92f10e..3e12caed0 100644
--- a/units/AoA_units/federation/Sorcegarde_emerite.cfg
+++ b/units/AoA_units/mauve_islands_federation/Elder_Sorcerer.cfg
@@ -1,7 +1,7 @@
 #textdomain armies_of_amberan
 [unit_type]
-    id=AE_AoA_federation_sorcegardeEmerite
-    name= _ "Elder sorcegarde"
+    id=AE_AoA_mauve_islands_federation_Elder_Sorcerer
+    name= _ "Elder Sorcerer"
     race=mauvilien
     gender=male,female
     image="units/federation/Sorcegarde-emerite.png"
@@ -54,7 +54,7 @@
     {FIREBALL_SOUND}
     {SPEAR_SOUND}
     [female]
-        name= _"female^Elder sorcegarde"
+        name= _"Elder Sorcerer"
         gender=female
         image="units/federation/Sorcegarde-emerite2.png"
         die_sound={SOUND_LIST:HUMAN_FEMALE_DIE}
diff --git a/units/AoA_units/federation/Sorcegarde_d'elite.cfg b/units/AoA_units/mauve_islands_federation/Elite_Sorcerer.cfg
similarity index 89%
rename from units/AoA_units/federation/Sorcegarde_d'elite.cfg
rename to units/AoA_units/mauve_islands_federation/Elite_Sorcerer.cfg
index a448d190e..55027d54d 100644
--- a/units/AoA_units/federation/Sorcegarde_d'elite.cfg
+++ b/units/AoA_units/mauve_islands_federation/Elite_Sorcerer.cfg
@@ -1,7 +1,7 @@
 #textdomain armies_of_amberan
 [unit_type]
-    id=AE_AoA_federation_sorcegardeDElite
-    name= _ "Elite sorcegarde"
+    id=AE_AoA_mauve_islands_federation_Elite_Sorcerer
+    name= _ "Elite Sorcerer"
     race=mauvilien
     gender=male,female
     image="units/federation/Sorcegarde-d-elite.png"
@@ -14,7 +14,7 @@
     cost=69
     usage=mixed fighter
     description={AE_AOA_UNIT_NOTICE}+ _ "description to come"
-    advances_to=AE_AoA_federation_sorcegardeEmerite
+    advances_to=AE_AoA_mauve_islands_federation_Elder_Sorcerer
     die_sound={SOUND_LIST:HUMAN_DIE}
     {DEFENSE_ANIM "units/federation/Sorcegarde-d-elite.png" "units/federation/Sorcegarde-d-elite.png" {SOUND_LIST:HUMAN_HIT} }
     [resistance]
@@ -53,7 +53,7 @@
     {FIREBALL_SOUND}
     {SPEAR_SOUND}
     [female]
-        name= _"female^Elite sorcegarde"
+        name= _"Elite Sorcerer"
         gender=female
         image="units/federation/Sorcegarde-d-elite2.png"
         die_sound={SOUND_LIST:HUMAN_FEMALE_DIE}
diff --git a/units/AoA_units/federation/Franc-archer.cfg b/units/AoA_units/mauve_islands_federation/Free_Archer.cfg
similarity index 92%
rename from units/AoA_units/federation/Franc-archer.cfg
rename to units/AoA_units/mauve_islands_federation/Free_Archer.cfg
index 8db8f0fc5..dba0b9b55 100644
--- a/units/AoA_units/federation/Franc-archer.cfg
+++ b/units/AoA_units/mauve_islands_federation/Free_Archer.cfg
@@ -1,7 +1,7 @@
 #textdomain armies_of_amberan
 [unit_type]
-    id=AE_AoA_federation_francArcher
-    name= _ "Free archer"
+    id=AE_AoA_mauve_islands_federation_Free_Archer
+    name= _ "Free Archer"
     race=mauvilien
     gender=male,female
     image="units/federation/Franc-archer.png"
@@ -45,7 +45,7 @@
     {AXE_SOUND}
     {BOW_SOUND}
     [female]
-        name= _"female^Free archer"
+        name= _"Free Archer"
         gender=female
         image="units/federation/Franc-archer2.png"
         die_sound={SOUND_LIST:HUMAN_FEMALE_DIE}
diff --git a/units/AoA_units/federation/Gallowglass.cfg b/units/AoA_units/mauve_islands_federation/Gallowglass.cfg
similarity index 94%
rename from units/AoA_units/federation/Gallowglass.cfg
rename to units/AoA_units/mauve_islands_federation/Gallowglass.cfg
index 89a90bca4..a462132e3 100644
--- a/units/AoA_units/federation/Gallowglass.cfg
+++ b/units/AoA_units/mauve_islands_federation/Gallowglass.cfg
@@ -1,6 +1,6 @@
 #textdomain armies_of_amberan
 [unit_type]
-    id=AE_AoA_federation_gallowglass
+    id=AE_AoA_mauve_islands_federation_Gallowglass
     name= _ "Gallowglass"
     race=mauvilien
     gender=male,female
@@ -47,7 +47,7 @@
     [/attack]
     {AXE_SOUND}
     [female]
-        name= _"female^Gallowglass"
+        name= _"Gallowglass"
         gender=female
         image="units/federation/Gallowglass2.png"
         die_sound={SOUND_LIST:HUMAN_FEMALE_DIE}
diff --git a/units/AoA_units/federation/Grand_arcaniste.cfg b/units/AoA_units/mauve_islands_federation/Grand_Arcanist.cfg
similarity index 92%
rename from units/AoA_units/federation/Grand_arcaniste.cfg
rename to units/AoA_units/mauve_islands_federation/Grand_Arcanist.cfg
index 4b1c31a68..a701fcdb8 100644
--- a/units/AoA_units/federation/Grand_arcaniste.cfg
+++ b/units/AoA_units/mauve_islands_federation/Grand_Arcanist.cfg
@@ -1,7 +1,7 @@
 #textdomain armies_of_amberan
 [unit_type]
-    id=AE_AoA_federation_grandArcaniste
-    name= _ "Grand arcanist"
+    id=AE_AoA_mauve_islands_federation_Grand_Arcanist
+    name= _ "Grand Arcanist"
     race=mauvilien
     gender=male,female
     image="units/federation/Grand-arcaniste.png"
@@ -14,7 +14,7 @@
     cost=66
     usage=mixed fighter
     description={AE_AOA_UNIT_NOTICE}+ _ "description to come"
-    advances_to=AE_AoA_federation_archimage
+    advances_to=AE_AoA_mauve_islands_federation_Archmage
     die_sound={SOUND_LIST:HUMAN_DIE}
     {DEFENSE_ANIM "units/federation/Grand-arcaniste.png" "units/federation/Grand-arcaniste.png" {SOUND_LIST:HUMAN_HIT} }
     [resistance]
@@ -82,7 +82,7 @@
     {HOLYFIRE_SOUND}
     {SWORD_SOUND}
     [female]
-        name= _"female^Grand arcanist"
+        name= _"Grand Arcanist"
         gender=female
         image="units/federation/Grand-arcaniste2.png"
         die_sound={SOUND_LIST:HUMAN_FEMALE_DIE}
diff --git a/units/AoA_units/federation/Piquier_lourd.cfg b/units/AoA_units/mauve_islands_federation/Heavy_Pikemen.cfg
similarity index 87%
rename from units/AoA_units/federation/Piquier_lourd.cfg
rename to units/AoA_units/mauve_islands_federation/Heavy_Pikemen.cfg
index 423ae4f61..d1187a811 100644
--- a/units/AoA_units/federation/Piquier_lourd.cfg
+++ b/units/AoA_units/mauve_islands_federation/Heavy_Pikemen.cfg
@@ -1,7 +1,7 @@
 #textdomain armies_of_amberan
 [unit_type]
-    id=AE_AoA_federation_piquierLourd
-    name= _ "Heavy pikeman"
+    id=AE_AoA_mauve_islands_federation_Heavy_Pikeman
+    name= _ "Heavy Pikeman"
     race=mauvilien
     gender=male,female
     image="units/federation/Piquier-lourd.png"
@@ -14,7 +14,7 @@
     cost=26
     usage=fighter
     description={AE_AOA_UNIT_NOTICE}+ _ "description to come"
-    advances_to=AE_AoA_federation_schiltron
+    advances_to=AE_AoA_mauve_islands_federation_Schiltron
     die_sound={SOUND_LIST:HUMAN_DIE}
     {DEFENSE_ANIM "units/federation/Piquier-lourd.png" "units/federation/Piquier-lourd.png" {SOUND_LIST:HUMAN_HIT} }
     [movement_costs]
@@ -40,7 +40,7 @@
     [/attack]
     {SPEAR_SOUND}
     [female]
-        name= _"female^Heavy pikeman"
+        name= _"Heavy Pikeman"
         gender=female
         image="units/federation/Piquier-lourd2.png"
         die_sound={SOUND_LIST:HUMAN_FEMALE_DIE}
diff --git a/units/AoA_units/federation/Haut-roi.cfg b/units/AoA_units/mauve_islands_federation/High_King.cfg
similarity index 92%
rename from units/AoA_units/federation/Haut-roi.cfg
rename to units/AoA_units/mauve_islands_federation/High_King.cfg
index 67fbce3eb..290844b90 100644
--- a/units/AoA_units/federation/Haut-roi.cfg
+++ b/units/AoA_units/mauve_islands_federation/High_King.cfg
@@ -1,7 +1,7 @@
 #textdomain armies_of_amberan
 [unit_type]
-    id=AE_AoA_federation_hautRoi
-    name= _ "High king"
+    id=AE_AoA_mauve_islands_federation_High_King
+    name= _ "High King"
     race=mauvilien
     gender=male,female
     image="units/federation/Haut-roi.png"
@@ -38,7 +38,7 @@
     [/attack]
     {SWORD_SOUND}
     [female]
-        name= _"female^High queen"
+        name= _"High queen"
         gender=female
         image="units/federation/Haute-reine.png"
         die_sound={SOUND_LIST:HUMAN_FEMALE_DIE}
diff --git a/units/AoA_units/federation/Highlander.cfg b/units/AoA_units/mauve_islands_federation/Highlander.cfg
similarity index 90%
rename from units/AoA_units/federation/Highlander.cfg
rename to units/AoA_units/mauve_islands_federation/Highlander.cfg
index f6d00f47d..4ed0412bc 100644
--- a/units/AoA_units/federation/Highlander.cfg
+++ b/units/AoA_units/mauve_islands_federation/Highlander.cfg
@@ -1,6 +1,6 @@
 #textdomain armies_of_amberan
 [unit_type]
-    id=AE_AoA_federation_highlander
+    id=AE_AoA_mauve_islands_federation_Highlander
     name= _ "Highlander"
     race=mauvilien
     gender=male,female
@@ -14,7 +14,7 @@
     cost=34
     usage=fighter
     description={AE_AOA_UNIT_NOTICE}+ _ "description to come"
-    advances_to=AE_AoA_federation_chefDeClan
+    advances_to=AE_AoA_mauve_islands_federation_Chieftain
     die_sound={SOUND_LIST:HUMAN_DIE}
     {DEFENSE_ANIM "units/federation/Highlander.png" "units/federation/Highlander.png" {SOUND_LIST:HUMAN_HIT} }
     [movement_costs]
@@ -42,7 +42,7 @@
     [/attack]
     {SWORD_SOUND}
     [female]
-        name= _"female^Highlander"
+        name= _"Highlander"
         gender=female
         image="units/federation/Highlander2.png"
         die_sound={SOUND_LIST:HUMAN_FEMALE_DIE}
diff --git a/units/AoA_units/federation/Chevalier.cfg b/units/AoA_units/mauve_islands_federation/Knight.cfg
similarity index 90%
rename from units/AoA_units/federation/Chevalier.cfg
rename to units/AoA_units/mauve_islands_federation/Knight.cfg
index 4843478ca..1043d492d 100644
--- a/units/AoA_units/federation/Chevalier.cfg
+++ b/units/AoA_units/mauve_islands_federation/Knight.cfg
@@ -1,6 +1,6 @@
 #textdomain armies_of_amberan
 [unit_type]
-    id=AE_AoA_federation_chevalier
+    id=AE_AoA_mauve_islands_federation_Knight
     name= _ "Knight"
     race=mauvilien
     gender=male,female
@@ -14,7 +14,7 @@
     cost=29
     usage=fighter
     description={AE_AOA_UNIT_NOTICE}+ _ "description to come"
-    advances_to=AE_AoA_federation_seigneur
+    advances_to=AE_AoA_mauve_islands_federation_Lord
     die_sound={SOUND_LIST:HUMAN_DIE}
     {DEFENSE_ANIM "units/federation/Chevalier.png" "units/federation/Chevalier.png" {SOUND_LIST:HUMAN_HIT} }
     [movement_costs]
@@ -37,7 +37,7 @@
     [/attack]
     {SWORD_SOUND}
     [female]
-        name= _"female^Knight"
+        name= _"Knight"
         gender=female
         image="units/federation/Chevalier2.png"
         die_sound={SOUND_LIST:HUMAN_FEMALE_DIE}
diff --git a/units/AoA_units/federation/Chevalier-arcaniste.cfg b/units/AoA_units/mauve_islands_federation/Knight_Arcanist.cfg
similarity index 93%
rename from units/AoA_units/federation/Chevalier-arcaniste.cfg
rename to units/AoA_units/mauve_islands_federation/Knight_Arcanist.cfg
index 10d55f984..2733a45d3 100644
--- a/units/AoA_units/federation/Chevalier-arcaniste.cfg
+++ b/units/AoA_units/mauve_islands_federation/Knight_Arcanist.cfg
@@ -1,7 +1,7 @@
 #textdomain armies_of_amberan
 [unit_type]
-    id=AE_AoA_federation_chevalierArcaniste
-    name= _ "Knight-arcanist"
+    id=AE_AoA_mauve_islands_federation_Knight_Arcanist
+    name= _ "Knight-Arcanist"
     race=mauvilien
     gender=male,female
     image="units/federation/Chevalier-arcaniste.png"
@@ -60,7 +60,7 @@
     {HOLYFIRE_SOUND}
     {SWORD_SOUND}
     [female]
-        name= _"female^Knight-arcanist"
+        name= _"Knight-Arcanist"
         gender=female
         image="units/federation/Chevalier-arcaniste2.png"
         die_sound={SOUND_LIST:HUMAN_FEMALE_DIE}
diff --git a/units/AoA_units/federation/Seigneur.cfg b/units/AoA_units/mauve_islands_federation/Lord.cfg
similarity index 95%
rename from units/AoA_units/federation/Seigneur.cfg
rename to units/AoA_units/mauve_islands_federation/Lord.cfg
index afca5ec75..c7e2e663e 100644
--- a/units/AoA_units/federation/Seigneur.cfg
+++ b/units/AoA_units/mauve_islands_federation/Lord.cfg
@@ -1,6 +1,6 @@
 #textdomain armies_of_amberan
 [unit_type]
-    id=AE_AoA_federation_seigneur
+    id=AE_AoA_mauve_islands_federation_Lord
     name= _ "Lord"
     race=mauvilien
     gender=male,female
@@ -42,7 +42,7 @@
     [/attack]
     {SWORD_SOUND}
     [female]
-        name= _"female^Lady"
+        name= _"Lady"
         gender=female
         image="units/federation/Seigneur2.png"
         die_sound={SOUND_LIST:HUMAN_FEMALE_DIE}
diff --git a/units/AoA_units/federation/Mage-lame.cfg b/units/AoA_units/mauve_islands_federation/Mage_Blade.cfg
similarity index 90%
rename from units/AoA_units/federation/Mage-lame.cfg
rename to units/AoA_units/mauve_islands_federation/Mage_Blade.cfg
index f632118cf..76a0dabd5 100644
--- a/units/AoA_units/federation/Mage-lame.cfg
+++ b/units/AoA_units/mauve_islands_federation/Mage_Blade.cfg
@@ -1,7 +1,7 @@
 #textdomain armies_of_amberan
 [unit_type]
-    id=AE_AoA_federation_mageLame
-    name= _ "Mage-blade"
+    id=AE_AoA_mauve_islands_federation_Mage_Blade
+    name= _ "Mage-Blade"
     race=mauvilien
     gender=male,female
     image="units/federation/Mage-lame.png"
@@ -14,7 +14,7 @@
     cost=37
     usage=mixed fighter
     description={AE_AOA_UNIT_NOTICE}+ _ "description to come"
-    advances_to=AE_AoA_federation_magister
+    advances_to=AE_AoA_mauve_islands_federation_Magister
     die_sound={SOUND_LIST:HUMAN_DIE}
     {DEFENSE_ANIM "units/federation/Mage-lame.png" "units/federation/Mage-lame.png" {SOUND_LIST:HUMAN_HIT} }
     [movement_costs]
@@ -50,7 +50,7 @@
     {MISSILE_SOUND}
     {SWORD_SOUND}
     [female]
-        name= _"female^Mage-blade"
+        name= _"Mage-Blade"
         gender=female
         image="units/federation/Mage-lame2.png"
         die_sound={SOUND_LIST:HUMAN_FEMALE_DIE}
diff --git a/units/AoA_units/federation/Magister.cfg b/units/AoA_units/mauve_islands_federation/Magister.cfg
similarity index 95%
rename from units/AoA_units/federation/Magister.cfg
rename to units/AoA_units/mauve_islands_federation/Magister.cfg
index 0e2e97479..0f7953232 100644
--- a/units/AoA_units/federation/Magister.cfg
+++ b/units/AoA_units/mauve_islands_federation/Magister.cfg
@@ -1,6 +1,6 @@
 #textdomain armies_of_amberan
 [unit_type]
-    id=AE_AoA_federation_magister
+    id=AE_AoA_mauve_islands_federation_Magister
     name= _ "Magister"
     race=mauvilien
     gender=male,female
@@ -54,7 +54,7 @@
     {HOLYFIRE_SOUND}
     {SWORD_SOUND}
     [female]
-        name= _"female^Magister"
+        name= _"Magister"
         gender=female
         image="units/federation/Magister2.png"
         die_sound={SOUND_LIST:HUMAN_FEMALE_DIE}
diff --git a/units/AoA_units/federation/Schiltron.cfg b/units/AoA_units/mauve_islands_federation/Schiltron.cfg
similarity index 95%
rename from units/AoA_units/federation/Schiltron.cfg
rename to units/AoA_units/mauve_islands_federation/Schiltron.cfg
index c78e1a490..cfdd62612 100644
--- a/units/AoA_units/federation/Schiltron.cfg
+++ b/units/AoA_units/mauve_islands_federation/Schiltron.cfg
@@ -1,6 +1,6 @@
 #textdomain armies_of_amberan
 [unit_type]
-    id=AE_AoA_federation_schiltron
+    id=AE_AoA_mauve_islands_federation_Schiltron
     name= _ "Schiltron"
     race=mauvilien
     gender=male,female
@@ -53,7 +53,7 @@
     [/attack]
     {SPEAR_SOUND}
     [female]
-        name= _"female^Schiltron"
+        name= _"Schiltron"
         gender=female
         image="units/federation/Schiltron2.png"
         die_sound={SOUND_LIST:HUMAN_FEMALE_DIE}
diff --git a/units/AoA_units/federation/Eclaireur.cfg b/units/AoA_units/mauve_islands_federation/Scout.cfg
similarity index 87%
rename from units/AoA_units/federation/Eclaireur.cfg
rename to units/AoA_units/mauve_islands_federation/Scout.cfg
index 85e425be4..7fe18dab8 100644
--- a/units/AoA_units/federation/Eclaireur.cfg
+++ b/units/AoA_units/mauve_islands_federation/Scout.cfg
@@ -1,6 +1,6 @@
 #textdomain armies_of_amberan
 [unit_type]
-    id=AE_AoA_federation_eclaireur
+    id=AE_AoA_mauve_islands_federation_Scout
     name= _ "Scout"
     race=mauvilien
     gender=male,female
@@ -14,7 +14,7 @@
     cost=16
     usage=scout
     description={AE_AOA_UNIT_NOTICE}+ _ "description to come"
-    advances_to=AE_AoA_federation_porteurDeHache,AE_AoA_federation_longbowman
+    advances_to=AE_AoA_mauve_islands_federation_Axe_Wielder,AE_AoA_mauve_islands_federation_Clans_Longbowman
     die_sound={SOUND_LIST:HUMAN_DIE}
     {DEFENSE_ANIM "units/federation/Eclaireur.png" "units/federation/Eclaireur.png" {SOUND_LIST:HUMAN_HIT} }
     [movement_costs]
@@ -44,7 +44,7 @@
     {AXE_SOUND}
     {BOW_SOUND}
     [female]
-        name= _"female^Scout"
+        name= _"Scout"
         gender=female
         image="units/federation/Eclaireur2.png"
         die_sound={SOUND_LIST:HUMAN_FEMALE_DIE}
diff --git a/units/AoA_units/federation/Sorcegarde.cfg b/units/AoA_units/mauve_islands_federation/Sorcerer.cfg
similarity index 89%
rename from units/AoA_units/federation/Sorcegarde.cfg
rename to units/AoA_units/mauve_islands_federation/Sorcerer.cfg
index 0669a6877..d393b9191 100644
--- a/units/AoA_units/federation/Sorcegarde.cfg
+++ b/units/AoA_units/mauve_islands_federation/Sorcerer.cfg
@@ -1,7 +1,7 @@
 #textdomain armies_of_amberan
 [unit_type]
-    id=AE_AoA_federation_sorcegarde
-    name= _ "Sorcegarde"
+    id=AE_AoA_mauve_islands_federation_Sorcerer
+    name= _ "Sorcerer"
     race=mauvilien
     gender=male,female
     image="units/federation/Sorcegarde.png"
@@ -14,7 +14,7 @@
     cost=39
     usage=mixed fighter
     description={AE_AOA_UNIT_NOTICE}+ _ "description a venir"
-    advances_to=AE_AoA_federation_sorcegardeDElite
+    advances_to=AE_AoA_mauve_islands_federation_Elite_Sorcerer
     die_sound={SOUND_LIST:HUMAN_DIE}
     {DEFENSE_ANIM "units/federation/Sorcegarde.png" "units/federation/Sorcegarde.png" {SOUND_LIST:HUMAN_HIT} }
     [resistance]
@@ -51,7 +51,7 @@
     {FIREBALL_SOUND}
     {SPEAR_SOUND}
     [female]
-        name= _"female^Sorcegarde"
+        name= _"Sorcerer"
         gender=female
         image="units/federation/Sorcegarde2.png"
         die_sound={SOUND_LIST:HUMAN_FEMALE_DIE}
diff --git a/units/AoA_units/federation/Etudiant.cfg b/units/AoA_units/mauve_islands_federation/Student.cfg
similarity index 86%
rename from units/AoA_units/federation/Etudiant.cfg
rename to units/AoA_units/mauve_islands_federation/Student.cfg
index 98c23ae02..c9f0c7f99 100644
--- a/units/AoA_units/federation/Etudiant.cfg
+++ b/units/AoA_units/mauve_islands_federation/Student.cfg
@@ -1,6 +1,6 @@
 #textdomain armies_of_amberan
 [unit_type]
-    id=AE_AoA_federation_etudiant
+    id=AE_AoA_mauve_islands_federation_Student
     name= _ "Student"
     race=mauvilien
     gender=male,female
@@ -14,7 +14,7 @@
     cost=21
     usage=mixed fighter
     description={AE_AOA_UNIT_NOTICE}+ _ "description to come"
-    advances_to=AE_AoA_federation_guerrierMage,AE_AoA_federation_mageLame,AE_AoA_federation_arcaniste
+    advances_to=AE_AoA_mauve_islands_federation_Warrior_Mage,AE_AoA_mauve_islands_federation_Mage_Blade,AE_AoA_mauve_islands_federation_Arcanist
     die_sound={SOUND_LIST:HUMAN_DIE}
     {DEFENSE_ANIM "units/federation/Etudiant.png" "units/federation/Etudiant.png" {SOUND_LIST:HUMAN_HIT} }
     [movement_costs]
@@ -47,7 +47,7 @@
     {MISSILE_SOUND}
     {SWORD_SOUND}
     [female]
-        name= _"female^Student"
+        name= _"Student"
         gender=female
         image="units/federation/Etudiant2.png"
         die_sound={SOUND_LIST:HUMAN_FEMALE_DIE}
diff --git a/units/AoA_units/federation/Villageois.cfg b/units/AoA_units/mauve_islands_federation/Villager.cfg
similarity index 83%
rename from units/AoA_units/federation/Villageois.cfg
rename to units/AoA_units/mauve_islands_federation/Villager.cfg
index 778484168..e2e959b08 100644
--- a/units/AoA_units/federation/Villageois.cfg
+++ b/units/AoA_units/mauve_islands_federation/Villager.cfg
@@ -1,6 +1,6 @@
 #textdomain armies_of_amberan
 [unit_type]
-    id=AE_AoA_federation_villageois
+    id=AE_AoA_mauve_islands_federation_Villager
     name= _ "Villager"
     race=mauvilien
     gender=male,female
@@ -14,7 +14,7 @@
     cost=8
     usage=scout
     description={AE_AOA_UNIT_NOTICE}+ _ "description to come"
-    advances_to=AE_AoA_federation_guerrier,AE_AoA_federation_piquier,AE_AoA_federation_eclaireur
+    advances_to=AE_AoA_mauve_islands_federation_Clans_Warrior,AE_AoA_mauve_islands_federation_Clans_Pikeman,AE_AoA_mauve_islands_federation_Scout
     die_sound={SOUND_LIST:HUMAN_DIE}
     {DEFENSE_ANIM "units/federation/Villageois.png" "units/federation/Villageois.png" {SOUND_LIST:HUMAN_HIT} }
     [movement_costs]
@@ -34,7 +34,7 @@
     [/attack]
     {AXE_SOUND}
     [female]
-        name= _"female^Villager"
+        name= _"Villager"
         gender=female
         image="units/federation/Villageois2.png"
         die_sound={SOUND_LIST:HUMAN_FEMALE_DIE}
diff --git a/units/AoA_units/federation/Guerrier-mage.cfg b/units/AoA_units/mauve_islands_federation/Warrior_Mage.cfg
similarity index 89%
rename from units/AoA_units/federation/Guerrier-mage.cfg
rename to units/AoA_units/mauve_islands_federation/Warrior_Mage.cfg
index 73183307a..c983a0048 100644
--- a/units/AoA_units/federation/Guerrier-mage.cfg
+++ b/units/AoA_units/mauve_islands_federation/Warrior_Mage.cfg
@@ -1,7 +1,7 @@
 #textdomain armies_of_amberan
 [unit_type]
-    id=AE_AoA_federation_guerrierMage
-    name= _ "Warrior-mage"
+    id=AE_AoA_mauve_islands_federation_Warrior_Mage
+    name= _ "Warrior-Mage"
     race=mauvilien
     gender=male,female
     image="units/federation/Guerrier-mage.png"
@@ -14,7 +14,7 @@
     cost=35
     usage=fighter
     description={AE_AOA_UNIT_NOTICE}+ _ "description to come"
-    advances_to=AE_AoA_federation_chevalierArcaniste
+    advances_to=AE_AoA_mauve_islands_federation_Knight_Arcanist
     die_sound={SOUND_LIST:HUMAN_DIE}
     {DEFENSE_ANIM "units/federation/Guerrier-mage.png" "units/federation/Guerrier-mage.png" {SOUND_LIST:HUMAN_HIT} }
     [movement_costs]
@@ -55,7 +55,7 @@
     {MISSILE_SOUND}
     {SWORD_SOUND}
     [female]
-        name= _"female^Warrior-mage"
+        name= _"Warrior-Mage"
         gender=female
         image="units/federation/Guerrier-mage2.png"
         die_sound={SOUND_LIST:HUMAN_FEMALE_DIE}
diff --git a/units/AoA_units/federation/Jeune_druide.cfg b/units/AoA_units/mauve_islands_federation/Young_Druid.cfg
similarity index 89%
rename from units/AoA_units/federation/Jeune_druide.cfg
rename to units/AoA_units/mauve_islands_federation/Young_Druid.cfg
index 50a8164cf..e2106b32f 100644
--- a/units/AoA_units/federation/Jeune_druide.cfg
+++ b/units/AoA_units/mauve_islands_federation/Young_Druid.cfg
@@ -1,7 +1,7 @@
 #textdomain armies_of_amberan
 [unit_type]
-    id=AE_AoA_federation_jeuneDruide
-    name= _ "Young druid"
+    id=AE_AoA_mauve_islands_federation_Young_Druid
+    name= _ "Young Druid"
     race=mauvilien
     gender=male,female
     image="units/federation/Jeune-druide.png"
@@ -14,7 +14,7 @@
     cost=14
     usage=healer
     description={AE_AOA_UNIT_NOTICE}+ _ "description a venir"
-    advances_to=AE_AoA_federation_druide
+    advances_to=AE_AoA_mauve_islands_federation_Druid
     die_sound={SOUND_LIST:HUMAN_DIE}
     {DEFENSE_ANIM "units/federation/Jeune-druide.png" "units/federation/Jeune-druide.png" {SOUND_LIST:HUMAN_HIT} }
     [abilities]
@@ -49,7 +49,7 @@
     {STAFF_SOUND}
     {ENTANGLE_SOUND}
     [female]
-        name= _"female^Young druid"
+        name= _"Young Druid"
         gender=female
         image="units/federation/Jeune-druide2.png"
         die_sound={SOUND_LIST:HUMAN_FEMALE_DIE}
diff --git a/units/AoA_units/mork-darf/Archer-sur-griffon.cfg b/units/AoA_units/morkenost_darfenlend/Archer_On_Griffin.cfg
similarity index 94%
rename from units/AoA_units/mork-darf/Archer-sur-griffon.cfg
rename to units/AoA_units/morkenost_darfenlend/Archer_On_Griffin.cfg
index 7da9feaa0..a8afb4ff8 100644
--- a/units/AoA_units/mork-darf/Archer-sur-griffon.cfg
+++ b/units/AoA_units/morkenost_darfenlend/Archer_On_Griffin.cfg
@@ -1,7 +1,7 @@
 #textdomain armies_of_amberan
 [unit_type]
-    id=AE_AoA_morkdarf_archerSurGriffon
-    name= _ "Archer on griffin"
+    id=AE_AoA_morkenost_darfenlend_Archer_On_Griffin
+    name= _ "Archer On Griffin"
     race=darfen
     gender=male
     image="units/Mork-Darf/Archer-sur-griffon.png"
diff --git a/units/AoA_units/mork-darf/Capitaine.cfg b/units/AoA_units/morkenost_darfenlend/Captain.cfg
similarity index 91%
rename from units/AoA_units/mork-darf/Capitaine.cfg
rename to units/AoA_units/morkenost_darfenlend/Captain.cfg
index 58981b4bd..5596df240 100644
--- a/units/AoA_units/mork-darf/Capitaine.cfg
+++ b/units/AoA_units/morkenost_darfenlend/Captain.cfg
@@ -1,6 +1,6 @@
 #textdomain armies_of_amberan
 [unit_type]
-    id=AE_AoA_morkdarf_capitaine
+    id=AE_AoA_morkenost_darfenlend_Captain
     name= _ "Captain"
     race=morken
     gender=male
@@ -14,7 +14,7 @@
     cost=32
     usage=fighter
     description={AE_AOA_UNIT_NOTICE}+ _ "description to come"
-    advances_to=AE_AoA_morkdarf_commandant
+    advances_to=AE_AoA_morkenost_darfenlend_Commander
     die_sound={SOUND_LIST:DWARF_DIE}
     {DEFENSE_ANIM "units/Mork-Darf/Capitaine.png" "units/Mork-Darf/Capitaine.png" {SOUND_LIST:DWARF_HIT} }
 
diff --git a/units/AoA_units/mork-darf/Commandant.cfg b/units/AoA_units/morkenost_darfenlend/Commander.cfg
similarity index 95%
rename from units/AoA_units/mork-darf/Commandant.cfg
rename to units/AoA_units/morkenost_darfenlend/Commander.cfg
index c4d87e0f1..f7088711a 100644
--- a/units/AoA_units/mork-darf/Commandant.cfg
+++ b/units/AoA_units/morkenost_darfenlend/Commander.cfg
@@ -1,6 +1,6 @@
 #textdomain armies_of_amberan
 [unit_type]
-    id=AE_AoA_morkdarf_commandant
+    id=AE_AoA_morkenost_darfenlend_Commander
     name= _ "Commander"
     race=morken
     gender=male
diff --git a/units/AoA_units/mork-darf/Cuirassier.cfg b/units/AoA_units/morkenost_darfenlend/Cuirassier.cfg
similarity index 89%
rename from units/AoA_units/mork-darf/Cuirassier.cfg
rename to units/AoA_units/morkenost_darfenlend/Cuirassier.cfg
index 0c020c5d9..dd2a9105a 100644
--- a/units/AoA_units/mork-darf/Cuirassier.cfg
+++ b/units/AoA_units/morkenost_darfenlend/Cuirassier.cfg
@@ -1,6 +1,6 @@
 #textdomain armies_of_amberan
 [unit_type]
-    id=AE_AoA_morkdarf_cuirassier
+    id=AE_AoA_morkenost_darfenlend_Cuirassier
     name= _ "Cuirassier"
     race=morken
     gender=male
@@ -14,7 +14,7 @@
     cost=36
     usage=fighter
     description={AE_AOA_UNIT_NOTICE}+ _ "description to come"
-    advances_to=AE_AoA_morkdarf_martelier
+    advances_to=AE_AoA_morkenost_darfenlend_Hammerer
     die_sound={SOUND_LIST:DWARF_DIE}
     {DEFENSE_ANIM "units/Mork-Darf/Cuirassier.png" "units/Mork-Darf/Cuirassier.png" {SOUND_LIST:DWARF_HIT} }
     [defense]
diff --git a/units/AoA_units/mork-darf/Combattant.cfg b/units/AoA_units/morkenost_darfenlend/Fighter.cfg
similarity index 90%
rename from units/AoA_units/mork-darf/Combattant.cfg
rename to units/AoA_units/morkenost_darfenlend/Fighter.cfg
index f045bef74..1bbe399a5 100644
--- a/units/AoA_units/mork-darf/Combattant.cfg
+++ b/units/AoA_units/morkenost_darfenlend/Fighter.cfg
@@ -1,6 +1,6 @@
 #textdomain armies_of_amberan
 [unit_type]
-    id=AE_AoA_morkdarf_combattant
+    id=AE_AoA_morkenost_darfenlend_Fighter
     name= _ "Fighter"
     race=darfen
     gender=male
@@ -14,7 +14,7 @@
     cost=14
     usage=fighter
     description={AE_AOA_UNIT_NOTICE}+ _ "description to come"
-    advances_to=AE_AoA_morkdarf_guerrier
+    advances_to=AE_AoA_morkenost_darfenlend_Warrior
     die_sound={SOUND_LIST:DWARF_DIE}
     {DEFENSE_ANIM "units/Mork-Darf/Combattant.png" "units/Mork-Darf/Combattant.png" {SOUND_LIST:DWARF_HIT} }
     [movement_costs]
diff --git a/units/AoA_units/mork-darf/Fantassin.cfg b/units/AoA_units/morkenost_darfenlend/Footdwarf.cfg
similarity index 88%
rename from units/AoA_units/mork-darf/Fantassin.cfg
rename to units/AoA_units/morkenost_darfenlend/Footdwarf.cfg
index ca54c75e3..8a8cd388c 100644
--- a/units/AoA_units/mork-darf/Fantassin.cfg
+++ b/units/AoA_units/morkenost_darfenlend/Footdwarf.cfg
@@ -1,6 +1,6 @@
 #textdomain armies_of_amberan
 [unit_type]
-    id=AE_AoA_morkdarf_fantassin
+    id=AE_AoA_morkenost_darfenlend_Footdwarf
     name= _ "Footdwarf"
     race=morken
     gender=male
@@ -14,7 +14,7 @@
     cost=13
     usage=fighter
     description={AE_AOA_UNIT_NOTICE}+ _ "description to come"
-    advances_to=AE_AoA_morkdarf_hallebardier
+    advances_to=AE_AoA_morkenost_darfenlend_Halberdier
     die_sound={SOUND_LIST:DWARF_DIE}
     {DEFENSE_ANIM "units/Mork-Darf/Fantassin.png" "units/Mork-Darf/Fantassin.png" {SOUND_LIST:DWARF_HIT} }
 
diff --git a/units/AoA_units/mork-darf/Grande-magicienne.cfg b/units/AoA_units/morkenost_darfenlend/Grand_Mage.cfg
similarity index 96%
rename from units/AoA_units/mork-darf/Grande-magicienne.cfg
rename to units/AoA_units/morkenost_darfenlend/Grand_Mage.cfg
index 679a2c729..a230feb1b 100644
--- a/units/AoA_units/mork-darf/Grande-magicienne.cfg
+++ b/units/AoA_units/morkenost_darfenlend/Grand_Mage.cfg
@@ -1,7 +1,7 @@
 #textdomain armies_of_amberan
 [unit_type]
-    id=AE_AoA_morkdarf_grandeMagicienne
-    name= _ "female^Grand mage"
+    id=AE_AoA_morkenost_darfenlend_Grand_Mage
+    name= _ "Grand Mage"
     race=darfen
     gender=female
     image="units/Mork-Darf/Grande-magicienne.png"
diff --git a/units/AoA_units/mork-darf/Hallebardier.cfg b/units/AoA_units/morkenost_darfenlend/Halberdier.cfg
similarity index 91%
rename from units/AoA_units/mork-darf/Hallebardier.cfg
rename to units/AoA_units/morkenost_darfenlend/Halberdier.cfg
index 064e85a4c..ec5d40e7d 100644
--- a/units/AoA_units/mork-darf/Hallebardier.cfg
+++ b/units/AoA_units/morkenost_darfenlend/Halberdier.cfg
@@ -1,6 +1,6 @@
 #textdomain armies_of_amberan
 [unit_type]
-    id=AE_AoA_morkdarf_hallebardier
+    id=AE_AoA_morkenost_darfenlend_Halberdier
     name= _ "Halberdier"
     race=morken
     gender=male
@@ -14,7 +14,7 @@
     cost=32
     usage=fighter
     description={AE_AOA_UNIT_NOTICE}+ _ "description to come"
-    advances_to=AE_AoA_morkdarf_veteran
+    advances_to=AE_AoA_morkenost_darfenlend_Veteran
     die_sound={SOUND_LIST:DWARF_DIE}
     {DEFENSE_ANIM "units/Mork-Darf/Hallebardier.png" "units/Mork-Darf/Hallebardier.png" {SOUND_LIST:DWARF_HIT} }
 
diff --git a/units/AoA_units/mork-darf/Martelier.cfg b/units/AoA_units/morkenost_darfenlend/Hammerer.cfg
similarity index 95%
rename from units/AoA_units/mork-darf/Martelier.cfg
rename to units/AoA_units/morkenost_darfenlend/Hammerer.cfg
index cf8cfef39..fa1a32d66 100644
--- a/units/AoA_units/mork-darf/Martelier.cfg
+++ b/units/AoA_units/morkenost_darfenlend/Hammerer.cfg
@@ -1,6 +1,6 @@
 #textdomain armies_of_amberan
 [unit_type]
-    id=AE_AoA_morkdarf_martelier
+    id=AE_AoA_morkenost_darfenlend_Hammerer
     name= _ "Hammerer"
     race=morken
     gender=male
diff --git a/units/AoA_units/mork-darf/Arquebusier.cfg b/units/AoA_units/morkenost_darfenlend/Handgunner.cfg
similarity index 89%
rename from units/AoA_units/mork-darf/Arquebusier.cfg
rename to units/AoA_units/morkenost_darfenlend/Handgunner.cfg
index 2c2454cd8..73448de3f 100644
--- a/units/AoA_units/mork-darf/Arquebusier.cfg
+++ b/units/AoA_units/morkenost_darfenlend/Handgunner.cfg
@@ -1,6 +1,6 @@
 #textdomain armies_of_amberan
 [unit_type]
-    id=AE_AoA_morkdarf_arquebusier
+    id=AE_AoA_morkenost_darfenlend_Handgunner
     name= _ "Handgunner"
     race=morken
     gender=male
@@ -14,7 +14,7 @@
     cost=17
     usage=archer
     description={AE_AOA_UNIT_NOTICE}+ _ "description to come"
-    advances_to=AE_AoA_morkdarf_arquebusierVeteran
+    advances_to=AE_AoA_morkenost_darfenlend_Veteran_Handgunner
     die_sound={SOUND_LIST:DWARF_DIE}
     {DEFENSE_ANIM "units/Mork-Darf/Arquebusier.png" "units/Mork-Darf/Arquebusier.png" {SOUND_LIST:DWARF_HIT} }
     [attack]
diff --git a/units/AoA_units/mork-darf/Guerisseuse.cfg b/units/AoA_units/morkenost_darfenlend/Healer.cfg
similarity index 90%
rename from units/AoA_units/mork-darf/Guerisseuse.cfg
rename to units/AoA_units/morkenost_darfenlend/Healer.cfg
index 64f1a26f1..8aead4ca5 100644
--- a/units/AoA_units/mork-darf/Guerisseuse.cfg
+++ b/units/AoA_units/morkenost_darfenlend/Healer.cfg
@@ -1,7 +1,7 @@
 #textdomain armies_of_amberan
 [unit_type]
-    id=AE_AoA_morkdarf_guerisseuse
-    name= _ "female^Healer"
+    id=AE_AoA_morkenost_darfenlend_Healer
+    name= _ "Healer"
     race=darfen
     gender=female
     image="units/Mork-Darf/Guerisseuse.png"
@@ -14,7 +14,7 @@
     cost=32
     usage=healer
     description={AE_AOA_UNIT_NOTICE}+ _ "description to come"
-    advances_to=AE_AoA_morkdarf_sage
+    advances_to=AE_AoA_morkenost_darfenlend_Wise
     die_sound={SOUND_LIST:HUMAN_FEMALE_DIE}
     {DEFENSE_ANIM "units/Mork-Darf/Guerisseuse.png" "units/Mork-Darf/Guerisseuse.png" {SOUND_LIST:HUMAN_FEMALE_HIT} }
     [movement_costs]
diff --git a/units/AoA_units/mork-darf/Chasseur.cfg b/units/AoA_units/morkenost_darfenlend/Hunter.cfg
similarity index 92%
rename from units/AoA_units/mork-darf/Chasseur.cfg
rename to units/AoA_units/morkenost_darfenlend/Hunter.cfg
index 9d8178a96..287ba6586 100644
--- a/units/AoA_units/mork-darf/Chasseur.cfg
+++ b/units/AoA_units/morkenost_darfenlend/Hunter.cfg
@@ -1,6 +1,6 @@
 #textdomain armies_of_amberan
 [unit_type]
-    id=AE_AoA_morkdarf_chasseur
+    id=AE_AoA_morkenost_darfenlend_Hunter
     name= _ "Hunter"
     race=darfen
     gender=male
@@ -14,7 +14,7 @@
     cost=15
     usage=archer
     description={AE_AOA_UNIT_NOTICE}+ _ "description to come"
-    advances_to=AE_AoA_morkdarf_traqueur
+    advances_to=AE_AoA_morkenost_darfenlend_Trapper
     die_sound={SOUND_LIST:DWARF_DIE}
     {DEFENSE_ANIM "units/Mork-Darf/Chasseur.png" "units/Mork-Darf/Chasseur.png" {SOUND_LIST:DWARF_HIT} }
     [movement_costs]
diff --git a/units/AoA_units/mork-darf/Chasseur-sur-griffon.cfg b/units/AoA_units/morkenost_darfenlend/Hunter_On_Griffin.cfg
similarity index 90%
rename from units/AoA_units/mork-darf/Chasseur-sur-griffon.cfg
rename to units/AoA_units/morkenost_darfenlend/Hunter_On_Griffin.cfg
index 3c72d043d..d519e4999 100644
--- a/units/AoA_units/mork-darf/Chasseur-sur-griffon.cfg
+++ b/units/AoA_units/morkenost_darfenlend/Hunter_On_Griffin.cfg
@@ -1,7 +1,7 @@
 #textdomain armies_of_amberan
 [unit_type]
-    id=AE_AoA_morkdarf_chasseurSurGriffon
-    name= _ "Hunter on griffin"
+    id=AE_AoA_morkenost_darfenlend_Hunter_On_Griffin
+    name= _ "Hunter On Griffin"
     race=darfen
     gender=male
     image="units/Mork-Darf/Chasseur-sur-griffon.png"
@@ -14,7 +14,7 @@
     cost=24
     usage=scout
     description={AE_AOA_UNIT_NOTICE}+ _ "description to come"
-    advances_to=AE_AoA_morkdarf_archerSurGriffon
+    advances_to=AE_AoA_morkenost_darfenlend_Archer_On_Griffin
     die_sound={SOUND_LIST:GRYPHON_DIE}
     {DEFENSE_ANIM "units/Mork-Darf/Chasseur-sur-griffon.png" "units/Mork-Darf/Chasseur-sur-griffon.png" {SOUND_LIST:DWARF_HIT} }
     [defense]
diff --git a/units/AoA_units/mork-darf/Magicienne.cfg b/units/AoA_units/morkenost_darfenlend/Mage.cfg
similarity index 92%
rename from units/AoA_units/mork-darf/Magicienne.cfg
rename to units/AoA_units/morkenost_darfenlend/Mage.cfg
index d3b45428b..1be6269b2 100644
--- a/units/AoA_units/mork-darf/Magicienne.cfg
+++ b/units/AoA_units/morkenost_darfenlend/Mage.cfg
@@ -1,7 +1,7 @@
 #textdomain armies_of_amberan
 [unit_type]
-    id=AE_AoA_morkdarf_magicienne
-    name= _ "female^Mage"
+    id=AE_AoA_morkenost_darfenlend_Mage
+    name= _ "Mage"
     race=darfen
     gender=female
     image="units/Mork-Darf/Magicienne.png"
@@ -14,7 +14,7 @@
     cost=63
     usage=mixed fighter
     description={AE_AOA_UNIT_NOTICE}+ _ "description to come"
-    advances_to=AE_AoA_morkdarf_grandeMagicienne
+    advances_to=AE_AoA_morkenost_darfenlend_Grand_Mage
     die_sound={SOUND_LIST:HUMAN_FEMALE_DIE}
     {DEFENSE_ANIM "units/Mork-Darf/Magicienne.png" "units/Mork-Darf/Magicienne.png" {SOUND_LIST:HUMAN_FEMALE_HIT} }
     [movement_costs]
diff --git a/units/AoA_units/mork-darf/Mousquetaire.cfg b/units/AoA_units/morkenost_darfenlend/Muskeeter.cfg
similarity index 95%
rename from units/AoA_units/mork-darf/Mousquetaire.cfg
rename to units/AoA_units/morkenost_darfenlend/Muskeeter.cfg
index 6ed2cafc0..c14dc255e 100644
--- a/units/AoA_units/mork-darf/Mousquetaire.cfg
+++ b/units/AoA_units/morkenost_darfenlend/Muskeeter.cfg
@@ -1,6 +1,6 @@
 #textdomain armies_of_amberan
 [unit_type]
-    id=AE_AoA_morkdarf_mousquetaire
+    id=AE_AoA_morkenost_darfenlend_Muskeeter
     name= _ "Muskeeter"
     race=morken
     gender=male
diff --git a/units/AoA_units/mork-darf/Rodeur.cfg b/units/AoA_units/morkenost_darfenlend/Ranger.cfg
similarity index 96%
rename from units/AoA_units/mork-darf/Rodeur.cfg
rename to units/AoA_units/morkenost_darfenlend/Ranger.cfg
index 907fd1d76..c4d67cabc 100644
--- a/units/AoA_units/mork-darf/Rodeur.cfg
+++ b/units/AoA_units/morkenost_darfenlend/Ranger.cfg
@@ -1,6 +1,6 @@
 #textdomain armies_of_amberan
 [unit_type]
-    id=AE_AoA_morkdarf_rodeur
+    id=AE_AoA_morkenost_darfenlend_Ranger
     name= _ "Ranger"
     race=darfen
     gender=male
diff --git a/units/AoA_units/mork-darf/Sergent.cfg b/units/AoA_units/morkenost_darfenlend/Sergeant.cfg
similarity index 91%
rename from units/AoA_units/mork-darf/Sergent.cfg
rename to units/AoA_units/morkenost_darfenlend/Sergeant.cfg
index 0c8d3e163..89312244a 100644
--- a/units/AoA_units/mork-darf/Sergent.cfg
+++ b/units/AoA_units/morkenost_darfenlend/Sergeant.cfg
@@ -1,6 +1,6 @@
 #textdomain armies_of_amberan
 [unit_type]
-    id=AE_AoA_morkdarf_sergent
+    id=AE_AoA_morkenost_darfenlend_Sergent
     name= _ "Sergent"
     race=morken
     gender=male
@@ -14,7 +14,7 @@
     cost=20
     usage=fighter
     description={AE_AOA_UNIT_NOTICE}+ _ "description to come"
-    advances_to=AE_AoA_morkdarf_capitaine
+    advances_to=AE_AoA_morkenost_darfenlend_Captain
     die_sound={SOUND_LIST:DWARF_DIE}
     {DEFENSE_ANIM "units/Mork-Darf/Sergent.png" "units/Mork-Darf/Sergent.png" {SOUND_LIST:DWARF_HIT} }
 
diff --git a/units/AoA_units/mork-darf/Chamane.cfg b/units/AoA_units/morkenost_darfenlend/Shaman.cfg
similarity index 88%
rename from units/AoA_units/mork-darf/Chamane.cfg
rename to units/AoA_units/morkenost_darfenlend/Shaman.cfg
index 8e828785d..65ac44e36 100644
--- a/units/AoA_units/mork-darf/Chamane.cfg
+++ b/units/AoA_units/morkenost_darfenlend/Shaman.cfg
@@ -1,7 +1,7 @@
 #textdomain armies_of_amberan
 [unit_type]
-    id=AE_AoA_morkdarf_chamane
-    name= _ "female^Shaman"
+    id=AE_AoA_morkenost_darfenlend_Shaman
+    name= _ "Shaman"
     race=darfen
     gender=female
     image="units/Mork-Darf/Chamane.png"
@@ -14,7 +14,7 @@
     cost=21
     usage=healer
     description={AE_AOA_UNIT_NOTICE}+ _ "description to come"
-    advances_to=AE_AoA_morkdarf_ensorcelleuse,AE_AoA_morkdarf_guerisseuse
+    advances_to=AE_AoA_morkenost_darfenlend_Sorceress,AE_AoA_morkenost_darfenlend_Healer
     die_sound={SOUND_LIST:HUMAN_FEMALE_DIE}
     {DEFENSE_ANIM "units/Mork-Darf/Chamane.png" "units/Mork-Darf/Chamane.png" {SOUND_LIST:HUMAN_FEMALE_HIT} }
     [movement_costs]
diff --git a/units/AoA_units/mork-darf/Soldat-lourd.cfg b/units/AoA_units/morkenost_darfenlend/Shock_Soldier.cfg
similarity index 86%
rename from units/AoA_units/mork-darf/Soldat-lourd.cfg
rename to units/AoA_units/morkenost_darfenlend/Shock_Soldier.cfg
index 8a274642a..2f69fa235 100644
--- a/units/AoA_units/mork-darf/Soldat-lourd.cfg
+++ b/units/AoA_units/morkenost_darfenlend/Shock_Soldier.cfg
@@ -1,7 +1,7 @@
 #textdomain armies_of_amberan
 [unit_type]
-    id=AE_AoA_morkdarf_soldatLourd
-    name= _ "Shock soldier"
+    id=AE_AoA_morkenost_darfenlend_Shock_Soldier
+    name= _ "Shock Soldier"
     race=morken
     gender=male
     image="units/Mork-Darf/Soldat-lourd.png"
@@ -14,7 +14,7 @@
     cost=19
     usage=fighter
     description={AE_AOA_UNIT_NOTICE}+ _ "description to come"
-    advances_to=AE_AoA_morkdarf_cuirassier
+    advances_to=AE_AoA_morkenost_darfenlend_Cuirassier
     die_sound={SOUND_LIST:DWARF_DIE}
     {DEFENSE_ANIM "units/Mork-Darf/Soldat-lourd.png" "units/Mork-Darf/Soldat-lourd.png" {SOUND_LIST:DWARF_HIT} }
     [defense]
diff --git a/units/AoA_units/mork-darf/Ensorcelleuse.cfg b/units/AoA_units/morkenost_darfenlend/Sorceress.cfg
similarity index 92%
rename from units/AoA_units/mork-darf/Ensorcelleuse.cfg
rename to units/AoA_units/morkenost_darfenlend/Sorceress.cfg
index 9acf4aa16..a4a95d107 100644
--- a/units/AoA_units/mork-darf/Ensorcelleuse.cfg
+++ b/units/AoA_units/morkenost_darfenlend/Sorceress.cfg
@@ -1,7 +1,7 @@
 #textdomain armies_of_amberan
 [unit_type]
-    id=AE_AoA_morkdarf_ensorcelleuse
-    name= _ "female^Sorceress"
+    id=AE_AoA_morkenost_darfenlend_Sorceress
+    name= _ "Sorceress"
     race=darfen
     gender=female
     image="units/Mork-Darf/Ensorcelleuse.png"
@@ -14,7 +14,7 @@
     cost=35
     usage=mixed fighter
     description={AE_AOA_UNIT_NOTICE}+ _ "description to come"
-    advances_to=AE_AoA_morkdarf_magicienne
+    advances_to=AE_AoA_morkenost_darfenlend_Mage
     die_sound={SOUND_LIST:HUMAN_FEMALE_DIE}
     {DEFENSE_ANIM "units/Mork-Darf/Ensorcelleuse.png" "units/Mork-Darf/Ensorcelleuse.png" {SOUND_LIST:HUMAN_FEMALE_HIT} }
     [movement_costs]
diff --git a/units/AoA_units/mork-darf/Traqueur.cfg b/units/AoA_units/morkenost_darfenlend/Trapper.cfg
similarity index 92%
rename from units/AoA_units/mork-darf/Traqueur.cfg
rename to units/AoA_units/morkenost_darfenlend/Trapper.cfg
index e72b9cb2d..78875cf34 100644
--- a/units/AoA_units/mork-darf/Traqueur.cfg
+++ b/units/AoA_units/morkenost_darfenlend/Trapper.cfg
@@ -1,6 +1,6 @@
 #textdomain armies_of_amberan
 [unit_type]
-    id=AE_AoA_morkdarf_traqueur
+    id=AE_AoA_morkenost_darfenlend_Trapper
     name= _ "Trapper"
     race=darfen
     gender=male
@@ -14,7 +14,7 @@
     cost=33
     usage=archer
     description={AE_AOA_UNIT_NOTICE}+ _ "description to come"
-    advances_to=AE_AoA_morkdarf_rodeur
+    advances_to=AE_AoA_morkenost_darfenlend_Ranger
     die_sound={SOUND_LIST:DWARF_DIE}
     {DEFENSE_ANIM "units/Mork-Darf/Traqueur.png" "units/Mork-Darf/Traqueur.png" {SOUND_LIST:DWARF_HIT} }
     [movement_costs]
diff --git a/units/AoA_units/mork-darf/Veteran.cfg b/units/AoA_units/morkenost_darfenlend/Veteran.cfg
similarity index 96%
rename from units/AoA_units/mork-darf/Veteran.cfg
rename to units/AoA_units/morkenost_darfenlend/Veteran.cfg
index 5f84657f3..9af1d06ab 100644
--- a/units/AoA_units/mork-darf/Veteran.cfg
+++ b/units/AoA_units/morkenost_darfenlend/Veteran.cfg
@@ -1,6 +1,6 @@
 #textdomain armies_of_amberan
 [unit_type]
-    id=AE_AoA_morkdarf_veteran
+    id=AE_AoA_morkenost_darfenlend_Veteran
     name= _ "Veteran"
     race=morken
     gender=male
diff --git a/units/AoA_units/mork-darf/Arquebusier-veteran.cfg b/units/AoA_units/morkenost_darfenlend/Veteran_Handgunner.cfg
similarity index 86%
rename from units/AoA_units/mork-darf/Arquebusier-veteran.cfg
rename to units/AoA_units/morkenost_darfenlend/Veteran_Handgunner.cfg
index 57404c1d2..2d0293672 100644
--- a/units/AoA_units/mork-darf/Arquebusier-veteran.cfg
+++ b/units/AoA_units/morkenost_darfenlend/Veteran_Handgunner.cfg
@@ -1,7 +1,7 @@
 #textdomain armies_of_amberan
 [unit_type]
-    id=AE_AoA_morkdarf_arquebusierVeteran
-    name= _ "Veteran handgunner"
+    id=AE_AoA_morkenost_darfenlend_Veteran_Handgunner
+    name= _ "Veteran Handgunner"
     race=morken
     gender=male
     image="units/Mork-Darf/Arquebusier-veteran.png"
@@ -14,7 +14,7 @@
     cost=25
     usage=archer
     description={AE_AOA_UNIT_NOTICE}+ _ "description to come"
-    advances_to=AE_AoA_morkdarf_mousquetaire
+    advances_to=AE_AoA_morkenost_darfenlend_Muskeeter
     die_sound={SOUND_LIST:DWARF_DIE}
     {DEFENSE_ANIM "units/Mork-Darf/Arquebusier-veteran.png" "units/Mork-Darf/Arquebusier-veteran.png" {SOUND_LIST:DWARF_HIT} }
     [attack]
diff --git a/units/AoA_units/mork-darf/Protecteur.cfg b/units/AoA_units/morkenost_darfenlend/Warden.cfg
similarity index 96%
rename from units/AoA_units/mork-darf/Protecteur.cfg
rename to units/AoA_units/morkenost_darfenlend/Warden.cfg
index 996cbc3e4..061f284d7 100644
--- a/units/AoA_units/mork-darf/Protecteur.cfg
+++ b/units/AoA_units/morkenost_darfenlend/Warden.cfg
@@ -1,6 +1,6 @@
 #textdomain armies_of_amberan
 [unit_type]
-    id=AE_AoA_morkdarf_protecteur
+    id=AE_AoA_morkenost_darfenlend_Warden
     name= _ "Warden"
     race=darfen
     gender=male
diff --git a/units/AoA_units/mork-darf/Guerrier.cfg b/units/AoA_units/morkenost_darfenlend/Warrior.cfg
similarity index 88%
rename from units/AoA_units/mork-darf/Guerrier.cfg
rename to units/AoA_units/morkenost_darfenlend/Warrior.cfg
index b269911ee..f64827c19 100644
--- a/units/AoA_units/mork-darf/Guerrier.cfg
+++ b/units/AoA_units/morkenost_darfenlend/Warrior.cfg
@@ -1,6 +1,6 @@
 #textdomain armies_of_amberan
 [unit_type]
-    id=AE_AoA_morkdarf_guerrier
+    id=AE_AoA_morkenost_darfenlend_Warrior
     name= _ "Warrior"
     race=darfen
     gender=male
@@ -14,7 +14,7 @@
     cost=31
     usage=fighter
     description={AE_AOA_UNIT_NOTICE}+ _ "description to come"
-    advances_to=AE_AoA_morkdarf_protecteur
+    advances_to=AE_AoA_morkenost_darfenlend_Warden
     die_sound={SOUND_LIST:DWARF_DIE}
     {DEFENSE_ANIM "units/Mork-Darf/Guerrier.png" "units/Mork-Darf/Guerrier.png" {SOUND_LIST:DWARF_HIT} }
     [movement_costs]
diff --git a/units/AoA_units/mork-darf/Sage.cfg b/units/AoA_units/morkenost_darfenlend/Wise.cfg
similarity index 95%
rename from units/AoA_units/mork-darf/Sage.cfg
rename to units/AoA_units/morkenost_darfenlend/Wise.cfg
index 872ba1795..a7ba50e59 100644
--- a/units/AoA_units/mork-darf/Sage.cfg
+++ b/units/AoA_units/morkenost_darfenlend/Wise.cfg
@@ -1,7 +1,7 @@
 #textdomain armies_of_amberan
 [unit_type]
-    id=AE_AoA_morkdarf_sage
-    name= _ "female^Wise"
+    id=AE_AoA_morkenost_darfenlend_Wise
+    name= _ "Wise"
     race=darfen
     gender=female
     image="units/Mork-Darf/Sage.png"
diff --git a/units/AoA_units/gobmon/assassin.cfg b/units/AoA_units/mountain_goblins/Assassin.cfg
similarity index 98%
rename from units/AoA_units/gobmon/assassin.cfg
rename to units/AoA_units/mountain_goblins/Assassin.cfg
index 1a2538d45..0d9c81eea 100644
--- a/units/AoA_units/gobmon/assassin.cfg
+++ b/units/AoA_units/mountain_goblins/Assassin.cfg
@@ -1,6 +1,6 @@
 #textdomain armies_of_amberan
 [unit_type]
-    id=AE_AoA_gobmon_assassin
+    id=AE_AoA_mountain_goblins_Assassin
     name= _ "Assassin"
     race=gobmon
     gender=male
diff --git a/units/AoA_units/gobmon/archer.cfg b/units/AoA_units/mountain_goblins/Bowman.cfg
similarity index 96%
rename from units/AoA_units/gobmon/archer.cfg
rename to units/AoA_units/mountain_goblins/Bowman.cfg
index 713927aa6..4368c2870 100644
--- a/units/AoA_units/gobmon/archer.cfg
+++ b/units/AoA_units/mountain_goblins/Bowman.cfg
@@ -1,6 +1,6 @@
 #textdomain armies_of_amberan
 [unit_type]
-    id=AE_AoA_gobmon_archer
+    id=AE_AoA_mountain_goblins_Bowman
     name= _ "Bowman"
     race=gobmon
     gender=male
diff --git a/units/AoA_units/gobmon/chef-de-clan.cfg b/units/AoA_units/mountain_goblins/Clan_Chief.cfg
similarity index 94%
rename from units/AoA_units/gobmon/chef-de-clan.cfg
rename to units/AoA_units/mountain_goblins/Clan_Chief.cfg
index 0f9e58ead..1ad77e155 100644
--- a/units/AoA_units/gobmon/chef-de-clan.cfg
+++ b/units/AoA_units/mountain_goblins/Clan_Chief.cfg
@@ -1,7 +1,7 @@
 #textdomain armies_of_amberan
 [unit_type]
-    id=AE_AoA_gobmon_chefDeClan
-    name= _ "Clan chief"
+    id=AE_AoA_mountain_goblins_Clan_Chief
+    name= _ "Clan Chief"
     race=gobmon
     gender=male
     image="units/gobmon/chef-de-clan.png"
@@ -14,7 +14,7 @@
     cost=32
     usage=fighter
     description={AE_AOA_UNIT_NOTICE}+ _ "description to come"
-    advances_to=AE_AoA_gobmon_seigneurDeGuerre
+    advances_to=AE_AoA_mountain_goblins_Warlord
     die_sound={SOUND_LIST:GOBLIN_DIE}
     {DEFENSE_ANIM "units/gobmon/chef-de-clan.png" "units/gobmon/chef-de-clan.png" {SOUND_LIST:GOBLIN_HIT} }
     [abilities]
diff --git a/units/AoA_units/gobmon/fantassin.cfg b/units/AoA_units/mountain_goblins/Footman.cfg
similarity index 97%
rename from units/AoA_units/gobmon/fantassin.cfg
rename to units/AoA_units/mountain_goblins/Footman.cfg
index 489db2fc9..fdb660a81 100644
--- a/units/AoA_units/gobmon/fantassin.cfg
+++ b/units/AoA_units/mountain_goblins/Footman.cfg
@@ -1,6 +1,6 @@
 #textdomain armies_of_amberan
 [unit_type]
-    id=AE_AoA_gobmon_fantassin
+    id=AE_AoA_mountain_goblins_Footman
     name= _ "Footman"
     race=gobmon
     gender=male
diff --git a/units/AoA_units/gobmon/armor_2.cfg b/units/AoA_units/mountain_goblins/Goblin_Bulwark.cfg
similarity index 97%
rename from units/AoA_units/gobmon/armor_2.cfg
rename to units/AoA_units/mountain_goblins/Goblin_Bulwark.cfg
index 38c21f13f..843f39871 100644
--- a/units/AoA_units/gobmon/armor_2.cfg
+++ b/units/AoA_units/mountain_goblins/Goblin_Bulwark.cfg
@@ -1,6 +1,6 @@
 #textdomain wesnoth-Ageless_Era
 [unit_type]
-    id=AE_goblin_armor_2
+    id=AE_AoA_mountain_goblins_Goblin_Bulwark
     name= _ "Goblin Bulwark"
     race=gobmon
     gender=male
diff --git a/units/AoA_units/gobmon/armor_1.cfg b/units/AoA_units/mountain_goblins/Goblin_Sentinel.cfg
similarity index 97%
rename from units/AoA_units/gobmon/armor_1.cfg
rename to units/AoA_units/mountain_goblins/Goblin_Sentinel.cfg
index 39c3afe7a..9f6cc5f26 100644
--- a/units/AoA_units/gobmon/armor_1.cfg
+++ b/units/AoA_units/mountain_goblins/Goblin_Sentinel.cfg
@@ -1,6 +1,6 @@
 #textdomain wesnoth-Ageless_Era
 [unit_type]
-    id=AE_goblin_armor_1
+    id=AE_AoA_mountain_goblins_Goblin_Sentinel
     name= _ "Goblin Sentinel"
     race=gobmon
     gender=male
diff --git a/units/AoA_units/gobmon/chasseur.cfg b/units/AoA_units/mountain_goblins/Hunter.cfg
similarity index 91%
rename from units/AoA_units/gobmon/chasseur.cfg
rename to units/AoA_units/mountain_goblins/Hunter.cfg
index bba1be361..9eb25f7c3 100644
--- a/units/AoA_units/gobmon/chasseur.cfg
+++ b/units/AoA_units/mountain_goblins/Hunter.cfg
@@ -1,6 +1,6 @@
 #textdomain armies_of_amberan
 [unit_type]
-    id=AE_AoA_gobmon_chasseur
+    id=AE_AoA_mountain_goblins_Hunter
     name= _ "Hunter"
     race=gobmon
     gender=male
@@ -14,7 +14,7 @@
     cost=9
     usage=archer
     description={AE_AOA_UNIT_NOTICE}+ _ "description to come"
-    advances_to=AE_AoA_gobmon_archer
+    advances_to=AE_AoA_mountain_goblins_Bowman
     die_sound={SOUND_LIST:GOBLIN_DIE}
     {DEFENSE_ANIM "units/gobmon/chasseur.png" "units/gobmon/chasseur.png" {SOUND_LIST:GOBLIN_HIT} }
 
diff --git a/units/AoA_units/gobmon/meneur.cfg b/units/AoA_units/mountain_goblins/Leader.cfg
similarity index 89%
rename from units/AoA_units/gobmon/meneur.cfg
rename to units/AoA_units/mountain_goblins/Leader.cfg
index 21910b7fc..d26168455 100644
--- a/units/AoA_units/gobmon/meneur.cfg
+++ b/units/AoA_units/mountain_goblins/Leader.cfg
@@ -1,6 +1,6 @@
 #textdomain armies_of_amberan
 [unit_type]
-    id=AE_AoA_gobmon_meneur
+    id=AE_AoA_mountain_goblins_Leader
     name= _ "Leader"
     race=gobmon
     gender=male
@@ -14,7 +14,7 @@
     cost=12
     usage=fighter
     description={AE_AOA_UNIT_NOTICE}+ _ "description to come"
-    advances_to=AE_AoA_gobmon_chefDeClan
+    advances_to=AE_AoA_mountain_goblins_Clan_Chief
     die_sound={SOUND_LIST:GOBLIN_DIE}
     {DEFENSE_ANIM "units/gobmon/meneur.png" "units/gobmon/meneur.png" {SOUND_LIST:GOBLIN_HIT} }
     [abilities]
diff --git a/units/AoA_units/gobmon/gobelin-medecine.cfg b/units/AoA_units/mountain_goblins/Medicine_Goblin.cfg
similarity index 91%
rename from units/AoA_units/gobmon/gobelin-medecine.cfg
rename to units/AoA_units/mountain_goblins/Medicine_Goblin.cfg
index 4966243c6..d0c7003f2 100644
--- a/units/AoA_units/gobmon/gobelin-medecine.cfg
+++ b/units/AoA_units/mountain_goblins/Medicine_Goblin.cfg
@@ -1,6 +1,6 @@
 #textdomain armies_of_amberan
 [unit_type]
-    id=AE_AoA_gobmon_gobelinMedecine
+    id=AE_AoA_mountain_goblins_Medicine_Goblin
     name= _ "Medicine Goblin"
     race=gobmon
     gender=male
@@ -14,7 +14,7 @@
     cost=12
     usage=healer
     description={AE_AOA_UNIT_NOTICE}+ _ "description to come"
-    advances_to=AE_AoA_gobmon_chamane
+    advances_to=AE_AoA_mountain_goblins_Shaman
     die_sound={SOUND_LIST:GOBLIN_DIE}
     {DEFENSE_ANIM "units/gobmon/gobelin-medecine.png" "units/gobmon/gobelin-medecine.png" {SOUND_LIST:GOBLIN_HIT} }
     [abilities]
diff --git a/units/AoA_units/gobmon/chamane.cfg b/units/AoA_units/mountain_goblins/Shaman.cfg
similarity index 98%
rename from units/AoA_units/gobmon/chamane.cfg
rename to units/AoA_units/mountain_goblins/Shaman.cfg
index f5954ae64..96d626484 100644
--- a/units/AoA_units/gobmon/chamane.cfg
+++ b/units/AoA_units/mountain_goblins/Shaman.cfg
@@ -1,6 +1,6 @@
 #textdomain armies_of_amberan
 [unit_type]
-    id=AE_AoA_gobmon_chamane
+    id=AE_AoA_mountain_goblins_Shaman
     name= _ "Shaman"
     race=gobmon
     gender=male
diff --git a/units/AoA_units/gobmon/sournois.cfg b/units/AoA_units/mountain_goblins/Sneaky.cfg
similarity index 97%
rename from units/AoA_units/gobmon/sournois.cfg
rename to units/AoA_units/mountain_goblins/Sneaky.cfg
index 6db5d5f9d..e550cec84 100644
--- a/units/AoA_units/gobmon/sournois.cfg
+++ b/units/AoA_units/mountain_goblins/Sneaky.cfg
@@ -1,6 +1,6 @@
 #textdomain armies_of_amberan
 [unit_type]
-    id=AE_AoA_gobmon_sournois
+    id=AE_AoA_mountain_goblins_Sneaky
     name= _ "Sneaky"
     race=gobmon
     gender=male
@@ -14,7 +14,7 @@
     cost=19
     usage=mixed fighter
     description={AE_AOA_UNIT_NOTICE}+ _ "description to come"
-    advances_to=AE_AoA_gobmon_assassin
+    advances_to=AE_AoA_mountain_goblins_Assassin
     die_sound={SOUND_LIST:GOBLIN_DIE}
     {DEFENSE_ANIM "units/gobmon/sournois.png" "units/gobmon/sournois.png" {SOUND_LIST:GOBLIN_HIT} }
 
diff --git a/units/AoA_units/gobmon/seigneur-de-guerre.cfg b/units/AoA_units/mountain_goblins/Warlord.cfg
similarity index 98%
rename from units/AoA_units/gobmon/seigneur-de-guerre.cfg
rename to units/AoA_units/mountain_goblins/Warlord.cfg
index 233f286b9..aeaa14711 100644
--- a/units/AoA_units/gobmon/seigneur-de-guerre.cfg
+++ b/units/AoA_units/mountain_goblins/Warlord.cfg
@@ -1,6 +1,6 @@
 #textdomain armies_of_amberan
 [unit_type]
-    id=AE_AoA_gobmon_seigneurDeGuerre
+    id=AE_AoA_mountain_goblins_Warlord
     name= _ "Warlord"
     race=gobmon
     gender=male
diff --git a/units/AoA_units/gobmon/guerrier.cfg b/units/AoA_units/mountain_goblins/Warrior.cfg
similarity index 88%
rename from units/AoA_units/gobmon/guerrier.cfg
rename to units/AoA_units/mountain_goblins/Warrior.cfg
index 507c219fe..da985255d 100644
--- a/units/AoA_units/gobmon/guerrier.cfg
+++ b/units/AoA_units/mountain_goblins/Warrior.cfg
@@ -1,6 +1,6 @@
 #textdomain armies_of_amberan
 [unit_type]
-    id=AE_AoA_gobmon_guerrier
+    id=AE_AoA_mountain_goblins_Warrior
     name= _ "Warrior"
     race=gobmon
     gender=male
@@ -14,7 +14,7 @@
     cost=9
     usage=fighter
     description={AE_AOA_UNIT_NOTICE}+ _ "description to come"
-    advances_to=AE_AoA_gobmon_fantassin
+    advances_to=AE_AoA_mountain_goblins_Footman
     die_sound={SOUND_LIST:GOBLIN_DIE}
     {DEFENSE_ANIM "units/gobmon/guerrier.png" "units/gobmon/guerrier.png" {SOUND_LIST:GOBLIN_HIT} }
     [attack]
diff --git a/units/AoA_units/gobmon/archer-loup.cfg b/units/AoA_units/mountain_goblins/Wolf_Archer.cfg
similarity index 90%
rename from units/AoA_units/gobmon/archer-loup.cfg
rename to units/AoA_units/mountain_goblins/Wolf_Archer.cfg
index a4dd9e025..b9db33238 100644
--- a/units/AoA_units/gobmon/archer-loup.cfg
+++ b/units/AoA_units/mountain_goblins/Wolf_Archer.cfg
@@ -1,6 +1,6 @@
 #textdomain armies_of_amberan
 [unit_type]
-    id=AE_AoA_gobmon_archerLoup
+    id=AE_AoA_mountain_goblins_Wolf_Archer
     name= _ "Wolf Archer"
     race=gobmon
     gender=male
@@ -14,7 +14,7 @@
     cost=29
     usage=scout
     description={AE_AOA_UNIT_NOTICE}+ _ "description to come"
-    advances_to=AE_AoA_gobmon_championLoup
+    advances_to=AE_AoA_mountain_goblins_Wolf_Champion
     die_sound={SOUND_LIST:GOBLIN_DIE}
     {DEFENSE_ANIM "units/gobmon/archer-loup.png" "units/gobmon/archer-loup.png" {SOUND_LIST:GOBLIN_HIT} }
     [attack]
diff --git a/units/AoA_units/gobmon/champion-loup.cfg b/units/AoA_units/mountain_goblins/Wolf_Champion.cfg
similarity index 95%
rename from units/AoA_units/gobmon/champion-loup.cfg
rename to units/AoA_units/mountain_goblins/Wolf_Champion.cfg
index c9740bd7b..49d81e281 100644
--- a/units/AoA_units/gobmon/champion-loup.cfg
+++ b/units/AoA_units/mountain_goblins/Wolf_Champion.cfg
@@ -1,6 +1,6 @@
 #textdomain armies_of_amberan
 [unit_type]
-    id=AE_AoA_gobmon_championLoup
+    id=AE_AoA_mountain_goblins_Wolf_Champion
     name= _ "Wolf Champion"
     race=gobmon
     gender=male
diff --git a/units/AoA_units/gobmon/monteur-de-loup.cfg b/units/AoA_units/mountain_goblins/Wolf_Rider.cfg
similarity index 90%
rename from units/AoA_units/gobmon/monteur-de-loup.cfg
rename to units/AoA_units/mountain_goblins/Wolf_Rider.cfg
index c15d945d7..bfa7439e6 100644
--- a/units/AoA_units/gobmon/monteur-de-loup.cfg
+++ b/units/AoA_units/mountain_goblins/Wolf_Rider.cfg
@@ -1,6 +1,6 @@
 #textdomain armies_of_amberan
 [unit_type]
-    id=AE_AoA_gobmon_monteurDeLoup
+    id=AE_AoA_mountain_goblins_Wolf_Rider
     name= _ "Wolf Rider"
     race=gobmon
     gender=male
@@ -14,7 +14,7 @@
     cost=19
     usage=scout
     description={AE_AOA_UNIT_NOTICE}+ _ "description to come"
-    advances_to=AE_AoA_gobmon_archerLoup
+    advances_to=AE_AoA_mountain_goblins_Wolf_Archer
     die_sound={SOUND_LIST:GOBLIN_DIE}
     {DEFENSE_ANIM "units/gobmon/monteur-de-loup.png" "units/gobmon/monteur-de-loup.png" {SOUND_LIST:GOBLIN_HIT} }
     [attack]
diff --git a/units/AoA_units/nord/Archer_nordique.cfg b/units/AoA_units/norse_jarldoms/Archer_norse_jarldomsique.cfg
similarity index 88%
rename from units/AoA_units/nord/Archer_nordique.cfg
rename to units/AoA_units/norse_jarldoms/Archer_norse_jarldomsique.cfg
index c79cdbcb3..6680cb6c3 100644
--- a/units/AoA_units/nord/Archer_nordique.cfg
+++ b/units/AoA_units/norse_jarldoms/Archer_norse_jarldomsique.cfg
@@ -1,7 +1,7 @@
 #textdomain armies_of_amberan
 [unit_type]
-    id=AE_AoA_nordian_archer
-    name= _ "Nordic bowman"
+    id=AE_AoA_norse_jarldoms_Nordic_Bowman
+    name= _ "Nordic Bowman"
     race=nordian
     gender=male,female
     image="units/nord/Archer-nordique.png"
@@ -14,7 +14,7 @@
     cost=25
     usage=archer
     description={AE_AOA_UNIT_NOTICE}+ _ "description to come"
-    advances_to=AE_AoA_nordian_maitreArcher
+    advances_to=AE_AoA_norse_jarldoms_Nordic_Master_Archer
     die_sound={SOUND_LIST:HUMAN_DIE}
     {DEFENSE_ANIM "units/nord/Archer-nordique.png" "units/nord/Archer-nordique.png" {SOUND_LIST:HUMAN_HIT} }
 
@@ -44,7 +44,7 @@
     {SWORD_SOUND}
     {BOW_SOUND}
     [female]
-        name= _"female^Nordic bowman"
+        name= _"Nordic Bowman"
         gender=female
         image="units/nord/Archer-nordique2.png"
         die_sound={SOUND_LIST:HUMAN_FEMALE_DIE}
diff --git a/units/AoA_units/nord/Berserker.cfg b/units/AoA_units/norse_jarldoms/Berserker.cfg
similarity index 95%
rename from units/AoA_units/nord/Berserker.cfg
rename to units/AoA_units/norse_jarldoms/Berserker.cfg
index f55dcb021..eb51d71b7 100644
--- a/units/AoA_units/nord/Berserker.cfg
+++ b/units/AoA_units/norse_jarldoms/Berserker.cfg
@@ -1,6 +1,6 @@
 #textdomain armies_of_amberan
 [unit_type]
-    id=AE_AoA_nordian_berserker
+    id=AE_AoA_norse_jarldoms_Berserker
     name= _ "Berserker"
     race=nordian
     gender=male,female
@@ -46,7 +46,7 @@
     {AXE_SOUND}
     {HATCHET_SOUND}
     [female]
-        name= _"female^Berserker"
+        name= _"Berserker"
         gender=female
         image="units/nord/Berserker2.png"
         die_sound={SOUND_LIST:HUMAN_FEMALE_DIE}
diff --git a/units/AoA_units/nord/Chevalier_nordique.cfg b/units/AoA_units/norse_jarldoms/Chevalier_norse_jarldomsique.cfg
similarity index 94%
rename from units/AoA_units/nord/Chevalier_nordique.cfg
rename to units/AoA_units/norse_jarldoms/Chevalier_norse_jarldomsique.cfg
index ced11dd85..d143b945f 100644
--- a/units/AoA_units/nord/Chevalier_nordique.cfg
+++ b/units/AoA_units/norse_jarldoms/Chevalier_norse_jarldomsique.cfg
@@ -1,7 +1,7 @@
 #textdomain armies_of_amberan
 [unit_type]
-    id=AE_AoA_nordian_chevalier
-    name= _ "Nordic knight"
+    id=AE_AoA_norse_jarldoms_Nordic_Knight
+    name= _ "Nordic Knight"
     race=nordian
     gender=male,female
     image="units/nord/Chevalier-nordique.png"
@@ -55,7 +55,7 @@
     [/attack]
     {AXE_SOUND}
     [female]
-        name= _"female^Nordic knight"
+        name= _"Nordic Knight"
         gender=female
         image="units/nord/Chevalier-nordique2.png"
         die_sound={SOUND_LIST:HUMAN_FEMALE_DIE}
diff --git a/units/AoA_units/nord/Arbaletrier.cfg b/units/AoA_units/norse_jarldoms/Crossbowman.cfg
similarity index 91%
rename from units/AoA_units/nord/Arbaletrier.cfg
rename to units/AoA_units/norse_jarldoms/Crossbowman.cfg
index 7ae7003b0..a7390f0fd 100644
--- a/units/AoA_units/nord/Arbaletrier.cfg
+++ b/units/AoA_units/norse_jarldoms/Crossbowman.cfg
@@ -1,6 +1,6 @@
 #textdomain armies_of_amberan
 [unit_type]
-    id=AE_AoA_nordian_arbaletrier
+    id=AE_AoA_norse_jarldoms_Crossbowman
     name= _ "Crossbowman"
     race=nordian
     gender=male,female
@@ -14,7 +14,7 @@
     cost=16
     usage=mixed fighter
     description={AE_AOA_UNIT_NOTICE}+ _ "description to come"
-    advances_to=AE_AoA_nordian_arbaletrierLourd
+    advances_to=AE_AoA_norse_jarldoms_Heavy_Crossbowman
     die_sound={SOUND_LIST:HUMAN_DIE}
     {DEFENSE_ANIM "units/nord/Arbaletrier.png" "units/nord/Arbaletrier.png" {SOUND_LIST:HUMAN_HIT} }
 
@@ -44,7 +44,7 @@
     {SWORD_SOUND}
     {CROSSBOW_SOUND}
     [female]
-        name= _"female^Crossbowman"
+        name= _"Crossbowman"
         gender=female
         image="units/nord/Arbaletrier2.png"
         die_sound={SOUND_LIST:HUMAN_FEMALE_DIE}
diff --git a/units/AoA_units/nord/Destructeur.cfg b/units/AoA_units/norse_jarldoms/Destructive.cfg
similarity index 95%
rename from units/AoA_units/nord/Destructeur.cfg
rename to units/AoA_units/norse_jarldoms/Destructive.cfg
index fc0c56b58..30df9e703 100644
--- a/units/AoA_units/nord/Destructeur.cfg
+++ b/units/AoA_units/norse_jarldoms/Destructive.cfg
@@ -1,6 +1,6 @@
 #textdomain armies_of_amberan
 [unit_type]
-    id=AE_AoA_nordian_destructeur
+    id=AE_AoA_norse_jarldoms_Destructive
     name= _ "Destructive"
     race=nordian
     gender=male,female
@@ -62,7 +62,7 @@
     {FIRE_SOUND}
     {HATCHET_SOUND}
     [female]
-        name= _"female^Destructive"
+        name= _"Destructive"
         gender=female
         image="units/nord/Destructeur2.png"
         die_sound={SOUND_LIST:HUMAN_FEMALE_DIE}
diff --git a/units/AoA_units/nord/Ravageur.cfg b/units/AoA_units/norse_jarldoms/Devastating.cfg
similarity index 91%
rename from units/AoA_units/nord/Ravageur.cfg
rename to units/AoA_units/norse_jarldoms/Devastating.cfg
index 31c40b1b3..9ef1e3533 100644
--- a/units/AoA_units/nord/Ravageur.cfg
+++ b/units/AoA_units/norse_jarldoms/Devastating.cfg
@@ -1,6 +1,6 @@
 #textdomain armies_of_amberan
 [unit_type]
-    id=AE_AoA_nordian_ravageur
+    id=AE_AoA_norse_jarldoms_Devastating
     name= _ "Devastating"
     race=nordian
     gender=male,female
@@ -14,7 +14,7 @@
     cost=27
     usage=mixed fighter
     description={AE_AOA_UNIT_NOTICE}+ _ "description to come"
-    advances_to=AE_AoA_nordian_destructeur
+    advances_to=AE_AoA_norse_jarldoms_Destructive
     die_sound={SOUND_LIST:HUMAN_DIE}
     {DEFENSE_ANIM "units/nord/Ravageur.png" "units/nord/Ravageur.png" {SOUND_LIST:HUMAN_HIT} }
 
@@ -48,7 +48,7 @@
     {AXE_SOUND}
     {FIRE_SOUND}
     [female]
-        name= _"female^Devastating"
+        name= _"Devastating"
         gender=female
         image="units/nord/Ravageur2.png"
         die_sound={SOUND_LIST:HUMAN_FEMALE_DIE}
diff --git a/units/AoA_units/nord/Double-hache.cfg b/units/AoA_units/norse_jarldoms/Double_Axe.cfg
similarity index 85%
rename from units/AoA_units/nord/Double-hache.cfg
rename to units/AoA_units/norse_jarldoms/Double_Axe.cfg
index c451ffbe3..1669c5ab8 100644
--- a/units/AoA_units/nord/Double-hache.cfg
+++ b/units/AoA_units/norse_jarldoms/Double_Axe.cfg
@@ -1,7 +1,7 @@
 #textdomain armies_of_amberan
 [unit_type]
-    id=AE_AoA_nordian_doubleHache
-    name= _ "Double-axe"
+    id=AE_AoA_norse_jarldoms_Double_Axe
+    name= _ "Double-Axe"
     race=nordian
     gender=male,female
     image="units/nord/Double-hache.png"
@@ -14,7 +14,7 @@
     cost=14
     usage=mixed fighter
     description={AE_AOA_UNIT_NOTICE}+ _ "description to come"
-    advances_to=AE_AoA_nordian_viking,AE_AoA_nordian_ravageur,AE_AoA_nordian_berserker
+    advances_to=AE_AoA_norse_jarldoms_Viking,AE_AoA_norse_jarldoms_Devastating,AE_AoA_norse_jarldoms_Berserker
     die_sound={SOUND_LIST:HUMAN_DIE}
     {DEFENSE_ANIM "units/nord/Double-hache.png" "units/nord/Double-hache.png" {SOUND_LIST:HUMAN_HIT} }
 
@@ -44,7 +44,7 @@
     {AXE_SOUND}
     {HATCHET_SOUND}
     [female]
-        name= _"female^Double-axe"
+        name= _"Double-Axe"
         gender=female
         image="units/nord/Double-hache2.png"
         die_sound={SOUND_LIST:HUMAN_FEMALE_DIE}
diff --git a/units/AoA_units/nord/Garde.cfg b/units/AoA_units/norse_jarldoms/Guard.cfg
similarity index 91%
rename from units/AoA_units/nord/Garde.cfg
rename to units/AoA_units/norse_jarldoms/Guard.cfg
index dc4fb19d3..b229a57c7 100644
--- a/units/AoA_units/nord/Garde.cfg
+++ b/units/AoA_units/norse_jarldoms/Guard.cfg
@@ -1,6 +1,6 @@
 #textdomain armies_of_amberan
 [unit_type]
-    id=AE_AoA_nordian_garde
+    id=AE_AoA_norse_jarldoms_Guard
     name= _ "Guard"
     race=nordian
     gender=male,female
@@ -14,7 +14,7 @@
     cost=18
     usage=fighter
     description={AE_AOA_UNIT_NOTICE}+ _ "description to come"
-    advances_to=AE_AoA_nordian_soldat
+    advances_to=AE_AoA_norse_jarldoms_Soldier
     die_sound={SOUND_LIST:HUMAN_DIE}
     {DEFENSE_ANIM "units/nord/Garde.png" "units/nord/Garde.png" {SOUND_LIST:HUMAN_HIT} }
     [abilities]
@@ -37,7 +37,7 @@
     [/attack]
     {SPEAR_SOUND}
     [female]
-        name= _"female^Guard"
+        name= _"Guard"
         gender=female
         image="units/nord/Garde2.png"
         die_sound={SOUND_LIST:HUMAN_FEMALE_DIE}
diff --git a/units/AoA_units/nord/Arbaletrier_lourd.cfg b/units/AoA_units/norse_jarldoms/Heavy_Crossbow.cfg
similarity index 88%
rename from units/AoA_units/nord/Arbaletrier_lourd.cfg
rename to units/AoA_units/norse_jarldoms/Heavy_Crossbow.cfg
index 5c29202ec..7ff2a5de3 100644
--- a/units/AoA_units/nord/Arbaletrier_lourd.cfg
+++ b/units/AoA_units/norse_jarldoms/Heavy_Crossbow.cfg
@@ -1,7 +1,7 @@
 #textdomain armies_of_amberan
 [unit_type]
-    id=AE_AoA_nordian_arbaletrierLourd
-    name= _ "Heavy crossbowman"
+    id=AE_AoA_norse_jarldoms_Heavy_Crossbowman
+    name= _ "Heavy Crossbowman"
     race=nordian
     gender=male,female
     image="units/nord/Arbaletrier-lourd.png"
@@ -14,7 +14,7 @@
     cost=26
     usage=mixed fighter
     description={AE_AOA_UNIT_NOTICE}+ _ "description to come"
-    advances_to=AE_AoA_nordian_maitreArbaletrier
+    advances_to=AE_AoA_norse_jarldoms_Master_Crossbowman
     die_sound={SOUND_LIST:HUMAN_DIE}
     {DEFENSE_ANIM "units/nord/Arbaletrier-lourd.png" "units/nord/Arbaletrier-lourd.png" {SOUND_LIST:HUMAN_HIT} }
 
@@ -44,7 +44,7 @@
     {SWORD_SOUND}
     {CROSSBOW_SOUND}
     [female]
-        name= _"female^Heavy crossbowman"
+        name= _"Heavy Crossbowman"
         gender=female
         image="units/nord/Arbaletrier-lourd2.png"
         die_sound={SOUND_LIST:HUMAN_FEMALE_DIE}
diff --git a/units/AoA_units/nord/Haut_roi.cfg b/units/AoA_units/norse_jarldoms/High_King.cfg
similarity index 94%
rename from units/AoA_units/nord/Haut_roi.cfg
rename to units/AoA_units/norse_jarldoms/High_King.cfg
index f1f4a80a3..585a049d4 100644
--- a/units/AoA_units/nord/Haut_roi.cfg
+++ b/units/AoA_units/norse_jarldoms/High_King.cfg
@@ -1,7 +1,7 @@
 #textdomain armies_of_amberan
 [unit_type]
-    id=AE_AoA_nordian_hautRoi
-    name= _ "High king"
+    id=AE_AoA_norse_jarldoms_High_King
+    name= _ "High King"
     race=nordian
     gender=male,female
     image="units/nord/Haut-roi.png"
@@ -55,7 +55,7 @@
     {SWORD_SOUND}
     {MACE_SOUND}
     [female]
-        name= _"female^High queen"
+        name= _"High queen"
         gender=female
         image="units/nord/Haute-reine.png"
         die_sound={SOUND_LIST:HUMAN_FEMALE_DIE}
diff --git a/units/AoA_units/nord/Chasseur.cfg b/units/AoA_units/norse_jarldoms/Hunter.cfg
similarity index 91%
rename from units/AoA_units/nord/Chasseur.cfg
rename to units/AoA_units/norse_jarldoms/Hunter.cfg
index c7343acb1..84ee195cb 100644
--- a/units/AoA_units/nord/Chasseur.cfg
+++ b/units/AoA_units/norse_jarldoms/Hunter.cfg
@@ -1,6 +1,6 @@
 #textdomain armies_of_amberan
 [unit_type]
-    id=AE_AoA_nordian_chasseur
+    id=AE_AoA_norse_jarldoms_Hunter
     name= _ "Hunter"
     race=nordian
     gender=male,female
@@ -14,7 +14,7 @@
     cost=15
     usage=archer
     description={AE_AOA_UNIT_NOTICE}+ _ "description a venir"
-    advances_to=AE_AoA_nordian_archer
+    advances_to=AE_AoA_norse_jarldoms_Nordic_Bowman
     die_sound={SOUND_LIST:HUMAN_DIE}
     {DEFENSE_ANIM "units/nord/Chasseur.png" "units/nord/Chasseur.png" {SOUND_LIST:HUMAN_HIT} }
 
@@ -48,7 +48,7 @@
     {RAPIER_SOUND}
     {BOW_SOUND}
     [female]
-        name= _"female^Hunter"
+        name= _"Hunter"
         gender=female
         image="units/nord/Chasseur2.png"
         die_sound={SOUND_LIST:HUMAN_FEMALE_DIE}
diff --git a/units/AoA_units/nord/Huskarl.cfg b/units/AoA_units/norse_jarldoms/Huskarl.cfg
similarity index 92%
rename from units/AoA_units/nord/Huskarl.cfg
rename to units/AoA_units/norse_jarldoms/Huskarl.cfg
index f36e47dd7..25e66c943 100644
--- a/units/AoA_units/nord/Huskarl.cfg
+++ b/units/AoA_units/norse_jarldoms/Huskarl.cfg
@@ -1,6 +1,6 @@
 #textdomain armies_of_amberan
 [unit_type]
-    id=AE_AoA_nordian_huskarl
+    id=AE_AoA_norse_jarldoms_Huskarl
     name= _ "Huskarl"
     race=nordian
     gender=male,female
@@ -14,7 +14,7 @@
     cost=34
     usage=fighter
     description={AE_AOA_UNIT_NOTICE}+ _ "description to come"
-    advances_to=AE_AoA_nordian_thane
+    advances_to=AE_AoA_norse_jarldoms_Thane
     die_sound={SOUND_LIST:HUMAN_DIE}
     {DEFENSE_ANIM "units/nord/Huskarl.png" "units/nord/Huskarl.png" {SOUND_LIST:HUMAN_HIT} }
 
@@ -44,7 +44,7 @@
     {SWORD_SOUND}
     {MACE_SOUND}
     [female]
-        name= _"female^Huskarl"
+        name= _"Huskarl"
         gender=female
         image="units/nord/Huskarl2.png"
         die_sound={SOUND_LIST:HUMAN_FEMALE_DIE}
diff --git a/units/AoA_units/nord/Jarl.cfg b/units/AoA_units/norse_jarldoms/Jarl.cfg
similarity index 96%
rename from units/AoA_units/nord/Jarl.cfg
rename to units/AoA_units/norse_jarldoms/Jarl.cfg
index 26b133505..2b0b84e09 100644
--- a/units/AoA_units/nord/Jarl.cfg
+++ b/units/AoA_units/norse_jarldoms/Jarl.cfg
@@ -1,6 +1,6 @@
 #textdomain armies_of_amberan
 [unit_type]
-    id=AE_AoA_nordian_jarl
+    id=AE_AoA_norse_jarldoms_Jarl
     name= _ "Jarl"
     race=nordian
     gender=male,female
@@ -49,7 +49,7 @@
     {SWORD_SOUND}
     {MACE_SOUND}
     [female]
-        name= _"female^Jarl"
+        name= _"Jarl"
         gender=female
         image="units/nord/Jarl2.png"
         die_sound={SOUND_LIST:HUMAN_FEMALE_DIE}
diff --git a/units/AoA_units/nord/Maraudeur.cfg b/units/AoA_units/norse_jarldoms/Maraudeur.cfg
similarity index 90%
rename from units/AoA_units/nord/Maraudeur.cfg
rename to units/AoA_units/norse_jarldoms/Maraudeur.cfg
index 224d9cad8..8dc46044f 100644
--- a/units/AoA_units/nord/Maraudeur.cfg
+++ b/units/AoA_units/norse_jarldoms/Maraudeur.cfg
@@ -1,6 +1,6 @@
 #textdomain armies_of_amberan
 [unit_type]
-    id=AE_AoA_nordian_maraudeur
+    id=AE_AoA_norse_jarldoms_Maraudeur
     name= _ "Maraudeur"
     race=nordian
     gender=male,female
@@ -14,7 +14,7 @@
     cost=29
     usage=fighter
     description={AE_AOA_UNIT_NOTICE}+ _ "description to come"
-    advances_to=AE_AoA_nordian_seigneurDeGuerre
+    advances_to=AE_AoA_norse_jarldoms_Warlord
     die_sound={SOUND_LIST:HUMAN_DIE}
     {DEFENSE_ANIM "units/nord/Maraudeur.png" "units/nord/Maraudeur.png" {SOUND_LIST:HUMAN_HIT} }
 
@@ -35,7 +35,7 @@
     [/attack]
     {AXE_SOUND}
     [female]
-        name= _"female^Maraudeur"
+        name= _"Maraudeur"
         gender=female
         image="units/nord/Maraudeur2.png"
         die_sound={SOUND_LIST:HUMAN_FEMALE_DIE}
diff --git a/units/AoA_units/nord/Maitre_arbaletrier.cfg b/units/AoA_units/norse_jarldoms/Master_Crossbowman.cfg
similarity index 91%
rename from units/AoA_units/nord/Maitre_arbaletrier.cfg
rename to units/AoA_units/norse_jarldoms/Master_Crossbowman.cfg
index 51a83533b..d944eafd3 100644
--- a/units/AoA_units/nord/Maitre_arbaletrier.cfg
+++ b/units/AoA_units/norse_jarldoms/Master_Crossbowman.cfg
@@ -1,7 +1,7 @@
 #textdomain armies_of_amberan
 [unit_type]
-    id=AE_AoA_nordian_maitreArbaletrier
-    name= _ "Master crossbowman"
+    id=AE_AoA_norse_jarldoms_Master_Crossbowman
+    name= _ "Master Crossbowman"
     race=nordian
     gender=male,female
     image="units/nord/Maitre-arbaletrier.png"
@@ -45,7 +45,7 @@
     {SWORD_SOUND}
     {CROSSBOW_SOUND}
     [female]
-        name= _"female^Master crossbowman"
+        name= _"Master Crossbowman"
         gender=female
         image="units/nord/Maitre-arbaletrier2.png"
         die_sound={SOUND_LIST:HUMAN_FEMALE_DIE}
diff --git a/units/AoA_units/nord/Maitre_archer_monte.cfg b/units/AoA_units/norse_jarldoms/Mounted_Archer.cfg
similarity index 92%
rename from units/AoA_units/nord/Maitre_archer_monte.cfg
rename to units/AoA_units/norse_jarldoms/Mounted_Archer.cfg
index 977ce3ee5..6a020ce02 100644
--- a/units/AoA_units/nord/Maitre_archer_monte.cfg
+++ b/units/AoA_units/norse_jarldoms/Mounted_Archer.cfg
@@ -1,7 +1,7 @@
 #textdomain armies_of_amberan
 [unit_type]
-    id=AE_AoA_nordian_maitreArcherMonte
-    name= _ "Mounted archer"
+    id=AE_AoA_norse_jarldoms_Mounted_Archer
+    name= _ "Mounted Archer"
     race=nordian
     gender=male,female
     image="units/nord/Maitre-archer-monte.png"
@@ -48,7 +48,7 @@
     {AXE_SOUND}
     {BOW_SOUND}
     [female]
-        name= _"female^Mounted archer"
+        name= _"Mounted Archer"
         gender=female
         image="units/nord/Maitre-archer-monte2.png"
         die_sound={SOUND_LIST:HUMAN_FEMALE_DIE}
diff --git a/units/AoA_units/nord/Archer_monte.cfg b/units/AoA_units/norse_jarldoms/Mounted_Bowman.cfg
similarity index 89%
rename from units/AoA_units/nord/Archer_monte.cfg
rename to units/AoA_units/norse_jarldoms/Mounted_Bowman.cfg
index 472fa8b6d..a837c4924 100644
--- a/units/AoA_units/nord/Archer_monte.cfg
+++ b/units/AoA_units/norse_jarldoms/Mounted_Bowman.cfg
@@ -1,7 +1,7 @@
 #textdomain armies_of_amberan
 [unit_type]
-    id=AE_AoA_nordian_archerMonte
-    name= _ "Mounted bowman"
+    id=AE_AoA_norse_jarldoms_Mounted_Bowman
+    name= _ "Mounted Bowman"
     race=nordian
     gender=male,female
     image="units/nord/Archer-monte.png"
@@ -14,7 +14,7 @@
     cost=29
     usage=scout
     description={AE_AOA_UNIT_NOTICE}+ _ "description to come"
-    advances_to=AE_AoA_nordian_maitreArcherMonte
+    advances_to=AE_AoA_norse_jarldoms_Mounted_Archer
     die_sound={SOUND_LIST:HUMAN_DIE}
     {DEFENSE_ANIM "units/nord/Archer-monte.png" "units/nord/Archer-monte.png" {SOUND_LIST:HUMAN_HIT} }
     [movement_costs]
@@ -47,7 +47,7 @@
     {AXE_SOUND}
     {BOW_SOUND}
     [female]
-        name= _"female^Mounted bowman"
+        name= _"Mounted Bowman"
         gender=female
         image="units/nord/Archer-monte2.png"
         die_sound={SOUND_LIST:HUMAN_FEMALE_DIE}
diff --git a/units/AoA_units/nord/Huskarl_monte.cfg b/units/AoA_units/norse_jarldoms/Mounted_Huskarl.cfg
similarity index 90%
rename from units/AoA_units/nord/Huskarl_monte.cfg
rename to units/AoA_units/norse_jarldoms/Mounted_Huskarl.cfg
index 3e6004014..d44cfe1a0 100644
--- a/units/AoA_units/nord/Huskarl_monte.cfg
+++ b/units/AoA_units/norse_jarldoms/Mounted_Huskarl.cfg
@@ -1,7 +1,7 @@
 #textdomain armies_of_amberan
 [unit_type]
-    id=AE_AoA_nordian_huskarlMonte
-    name= _ "Mounted huskarl"
+    id=AE_AoA_norse_jarldoms_Mounted_Huskarl
+    name= _ "Mounted Huskarl"
     race=nordian
     gender=male,female
     image="units/nord/Huskarl-monte.png"
@@ -14,7 +14,7 @@
     cost=45
     usage=fighter
     description={AE_AOA_UNIT_NOTICE}+ _ "description to come"
-    advances_to=AE_AoA_nordian_chevalier
+    advances_to=AE_AoA_norse_jarldoms_Nordic_Knight
     die_sound={SOUND_LIST:HUMAN_DIE}
     {DEFENSE_ANIM "units/nord/Huskarl-monte.png" "units/nord/Huskarl-monte.png" {SOUND_LIST:HUMAN_HIT} }
     [movement_costs]
@@ -54,7 +54,7 @@
     [/attack]
     {AXE_SOUND}
     [female]
-        name= _"female^Mounted huskarl"
+        name= _"Mounted Huskarl"
         gender=female
         image="units/nord/Huskarl-monte2.png"
         die_sound={SOUND_LIST:HUMAN_FEMALE_DIE}
diff --git a/units/AoA_units/nord/Maitre_archer.cfg b/units/AoA_units/norse_jarldoms/Nordic_Master_Archer.cfg
similarity index 94%
rename from units/AoA_units/nord/Maitre_archer.cfg
rename to units/AoA_units/norse_jarldoms/Nordic_Master_Archer.cfg
index 97b17e04d..ff97edbac 100644
--- a/units/AoA_units/nord/Maitre_archer.cfg
+++ b/units/AoA_units/norse_jarldoms/Nordic_Master_Archer.cfg
@@ -1,6 +1,6 @@
 #textdomain armies_of_amberan
 [unit_type]
-    id=AE_AoA_nordian_maitreArcher
+    id=AE_AoA_norse_jarldoms_Nordic_Master_Archer
     name= _ "Nordic Master Archer"
     race=nordian
     gender=male,female
@@ -47,7 +47,7 @@
     {SWORD_SOUND}
     {BOW_SOUND}
     [female]
-        name= _"female^Archer"
+        name= _"Archer"
         gender=female
         image="units/nord/Maitre-archer2.png"
         die_sound={SOUND_LIST:HUMAN_FEMALE_DIE}
diff --git a/units/AoA_units/nord/Pillard.cfg b/units/AoA_units/norse_jarldoms/Pluderer.cfg
similarity index 90%
rename from units/AoA_units/nord/Pillard.cfg
rename to units/AoA_units/norse_jarldoms/Pluderer.cfg
index c8f5301d4..afa595845 100644
--- a/units/AoA_units/nord/Pillard.cfg
+++ b/units/AoA_units/norse_jarldoms/Pluderer.cfg
@@ -1,6 +1,6 @@
 #textdomain armies_of_amberan
 [unit_type]
-    id=AE_AoA_nordian_pillard
+    id=AE_AoA_norse_jarldoms_Pluderer
     name= _ "Pluderer"
     race=nordian
     gender=male,female
@@ -14,7 +14,7 @@
     cost=14
     usage=fighter
     description={AE_AOA_UNIT_NOTICE}+ _ "description to come"
-    advances_to=AE_AoA_nordian_maraudeur
+    advances_to=AE_AoA_norse_jarldoms_Maraudeur
     die_sound={SOUND_LIST:HUMAN_DIE}
     {DEFENSE_ANIM "units/nord/Pillard.png" "units/nord/Pillard.png" {SOUND_LIST:HUMAN_HIT} }
 
@@ -34,7 +34,7 @@
     [/attack]
     {AXE_SOUND}
     [female]
-        name= _"female^Pluderer"
+        name= _"Pluderer"
         gender=female
         image="units/nord/Pillard2.png"
         die_sound={SOUND_LIST:HUMAN_FEMALE_DIE}
diff --git a/units/AoA_units/nord/Rempart.cfg b/units/AoA_units/norse_jarldoms/Rempart.cfg
similarity index 95%
rename from units/AoA_units/nord/Rempart.cfg
rename to units/AoA_units/norse_jarldoms/Rempart.cfg
index bd0f6427d..57ede7816 100644
--- a/units/AoA_units/nord/Rempart.cfg
+++ b/units/AoA_units/norse_jarldoms/Rempart.cfg
@@ -1,6 +1,6 @@
 #textdomain armies_of_amberan
 [unit_type]
-    id=AE_AoA_nordian_rempart
+    id=AE_AoA_norse_jarldoms_Rempart
     name= _ "Rempart"
     race=nordian
     gender=male,female
@@ -49,7 +49,7 @@
     {SPEAR_SOUND}
     {JAVELIN_SOUND}
     [female]
-        name= _"female^Rempart"
+        name= _"Rempart"
         gender=female
         image="units/nord/Rempart2.png"
         die_sound={SOUND_LIST:HUMAN_FEMALE_DIE}
diff --git a/units/AoA_units/nord/Cavalier.cfg b/units/AoA_units/norse_jarldoms/Rider.cfg
similarity index 87%
rename from units/AoA_units/nord/Cavalier.cfg
rename to units/AoA_units/norse_jarldoms/Rider.cfg
index 19888ca84..26c839472 100644
--- a/units/AoA_units/nord/Cavalier.cfg
+++ b/units/AoA_units/norse_jarldoms/Rider.cfg
@@ -1,6 +1,6 @@
 #textdomain armies_of_amberan
 [unit_type]
-    id=AE_AoA_nordian_cavalier
+    id=AE_AoA_norse_jarldoms_Rider
     name= _ "Rider"
     race=nordian
     gender=male,female
@@ -14,7 +14,7 @@
     cost=19
     usage=scout
     description={AE_AOA_UNIT_NOTICE}+ _ "description to come"
-    advances_to=AE_AoA_nordian_huskarlMonte,AE_AoA_nordian_archerMonte
+    advances_to=AE_AoA_norse_jarldoms_Mounted_Huskarl,AE_AoA_norse_jarldoms_Mounted_Bowman
     die_sound={SOUND_LIST:HUMAN_DIE}
     {DEFENSE_ANIM "units/nord/Cavalier.png" "units/nord/Cavalier.png" {SOUND_LIST:HUMAN_HIT} }
     [movement_costs]
@@ -37,7 +37,7 @@
     [/attack]
     {AXE_SOUND}
     [female]
-        name= _"female^Rider"
+        name= _"Rider"
         gender=female
         image="units/nord/Cavalier2.png"
         die_sound={SOUND_LIST:HUMAN_FEMALE_DIE}
diff --git a/units/AoA_units/nord/Soldat.cfg b/units/AoA_units/norse_jarldoms/Soldier.cfg
similarity index 92%
rename from units/AoA_units/nord/Soldat.cfg
rename to units/AoA_units/norse_jarldoms/Soldier.cfg
index b1ef04a02..40426ddf1 100644
--- a/units/AoA_units/nord/Soldat.cfg
+++ b/units/AoA_units/norse_jarldoms/Soldier.cfg
@@ -1,6 +1,6 @@
 #textdomain armies_of_amberan
 [unit_type]
-    id=AE_AoA_nordian_soldat
+    id=AE_AoA_norse_jarldoms_Soldier
     name= _ "Soldier"
     race=nordian
     gender=male,female
@@ -14,7 +14,7 @@
     cost=33
     usage=fighter
     description={AE_AOA_UNIT_NOTICE}+ _ "description to come"
-    advances_to=AE_AoA_nordian_rempart
+    advances_to=AE_AoA_norse_jarldoms_Rempart
     die_sound={SOUND_LIST:HUMAN_DIE}
     {DEFENSE_ANIM "units/nord/Soldat.png" "units/nord/Soldat.png" {SOUND_LIST:HUMAN_HIT} }
     [abilities]
@@ -48,7 +48,7 @@
     {SPEAR_SOUND}
     {JAVELIN_SOUND}
     [female]
-        name= _"female^Soldier"
+        name= _"Soldier"
         gender=female
         image="units/nord/Soldat2.png"
         die_sound={SOUND_LIST:HUMAN_FEMALE_DIE}
diff --git a/units/AoA_units/nord/Thane.cfg b/units/AoA_units/norse_jarldoms/Thane.cfg
similarity index 92%
rename from units/AoA_units/nord/Thane.cfg
rename to units/AoA_units/norse_jarldoms/Thane.cfg
index 1b110ed32..ab09cd8d6 100644
--- a/units/AoA_units/nord/Thane.cfg
+++ b/units/AoA_units/norse_jarldoms/Thane.cfg
@@ -1,6 +1,6 @@
 #textdomain armies_of_amberan
 [unit_type]
-    id=AE_AoA_nordian_thane
+    id=AE_AoA_norse_jarldoms_Thane
     name= _ "Thane"
     race=nordian
     gender=male,female
@@ -14,7 +14,7 @@
     cost=67
     usage=fighter
     description={AE_AOA_UNIT_NOTICE}+ _ "description to come"
-    advances_to=AE_AoA_nordian_jarl
+    advances_to=AE_AoA_norse_jarldoms_Jarl
     die_sound={SOUND_LIST:HUMAN_DIE}
     {DEFENSE_ANIM "units/nord/Thane.png" "units/nord/Thane.png" {SOUND_LIST:HUMAN_HIT} }
 
@@ -45,7 +45,7 @@
     {SWORD_SOUND}
     {MACE_SOUND}
     [female]
-        name= _"female^Thane"
+        name= _"Thane"
         gender=female
         image="units/nord/Thane2.png"
         die_sound={SOUND_LIST:HUMAN_FEMALE_DIE}
diff --git a/units/AoA_units/nord/Varegue.cfg b/units/AoA_units/norse_jarldoms/Varangian.cfg
similarity index 95%
rename from units/AoA_units/nord/Varegue.cfg
rename to units/AoA_units/norse_jarldoms/Varangian.cfg
index 158a0339d..1d4d98cb1 100644
--- a/units/AoA_units/nord/Varegue.cfg
+++ b/units/AoA_units/norse_jarldoms/Varangian.cfg
@@ -1,6 +1,6 @@
 #textdomain armies_of_amberan
 [unit_type]
-    id=AE_AoA_nordian_varegue
+    id=AE_AoA_norse_jarldoms_Varangian
     name= _ "Varangian"
     race=nordian
     gender=male,female
@@ -52,7 +52,7 @@
     {AXE_SOUND}
     {HATCHET_SOUND}
     [female]
-        name= _"female^Varangian"
+        name= _"Varangian"
         gender=female
         image="units/nord/Varegue2.png"
         die_sound={SOUND_LIST:HUMAN_FEMALE_DIE}
diff --git a/units/AoA_units/nord/Viking.cfg b/units/AoA_units/norse_jarldoms/Viking.cfg
similarity index 92%
rename from units/AoA_units/nord/Viking.cfg
rename to units/AoA_units/norse_jarldoms/Viking.cfg
index b7ae3cf78..309a453ae 100644
--- a/units/AoA_units/nord/Viking.cfg
+++ b/units/AoA_units/norse_jarldoms/Viking.cfg
@@ -1,6 +1,6 @@
 #textdomain armies_of_amberan
 [unit_type]
-    id=AE_AoA_nordian_viking
+    id=AE_AoA_norse_jarldoms_Viking
     name= _ "Viking"
     race=nordian
     gender=male,female
@@ -14,7 +14,7 @@
     cost=32
     usage=fighter
     description={AE_AOA_UNIT_NOTICE}+ _ "description to comr"
-    advances_to=AE_AoA_nordian_varegue
+    advances_to=AE_AoA_norse_jarldoms_Varangian
     die_sound={SOUND_LIST:HUMAN_DIE}
     {DEFENSE_ANIM "units/nord/Viking.png" "units/nord/Viking.png" {SOUND_LIST:HUMAN_HIT} }
 
@@ -50,7 +50,7 @@
     {AXE_SOUND}
     {HATCHET_SOUND}
     [female]
-        name= _"female^Viking"
+        name= _"Viking"
         gender=female
         image="units/nord/Viking2.png"
         die_sound={SOUND_LIST:HUMAN_FEMALE_DIE}
diff --git a/units/AoA_units/nord/Villageois.cfg b/units/AoA_units/norse_jarldoms/Villager.cfg
similarity index 82%
rename from units/AoA_units/nord/Villageois.cfg
rename to units/AoA_units/norse_jarldoms/Villager.cfg
index 0bc44a791..45453ba22 100644
--- a/units/AoA_units/nord/Villageois.cfg
+++ b/units/AoA_units/norse_jarldoms/Villager.cfg
@@ -1,6 +1,6 @@
 #textdomain armies_of_amberan
 [unit_type]
-    id=AE_AoA_nordian_villageois
+    id=AE_AoA_norse_jarldoms_Villager
     name= _ "Villager"
     race=nordian
     gender=male,female
@@ -14,7 +14,7 @@
     cost=6
     usage=mixed fighter
     description={AE_AOA_UNIT_NOTICE}+ _ "description to come"
-    advances_to=AE_AoA_nordian_guerrier,AE_AoA_nordian_garde,AE_AoA_nordian_arbaletrier,AE_AoA_nordian_doubleHache,AE_AoA_nordian_chasseur
+    advances_to=AE_AoA_norse_jarldoms_Warrior,AE_AoA_norse_jarldoms_Guard,AE_AoA_norse_jarldoms_Crossbowman,AE_AoA_norse_jarldoms_Double_Axe,AE_AoA_norse_jarldoms_Hunter
     die_sound={SOUND_LIST:HUMAN_DIE}
     {DEFENSE_ANIM "units/nord/Villageois.png" "units/nord/Villageois.png" {SOUND_LIST:HUMAN_HIT} }
     [movement_costs]
@@ -37,7 +37,7 @@
     [/attack]
     {AXE_SOUND}
     [female]
-        name= _"female^Villager"
+        name= _"Villager"
         gender=female
         image="units/nord/Villageois2.png"
         die_sound={SOUND_LIST:HUMAN_FEMALE_DIE}
diff --git a/units/AoA_units/nord/Seigneur_de_guerre.cfg b/units/AoA_units/norse_jarldoms/Warlord.cfg
similarity index 95%
rename from units/AoA_units/nord/Seigneur_de_guerre.cfg
rename to units/AoA_units/norse_jarldoms/Warlord.cfg
index 145b74b3c..92204f759 100644
--- a/units/AoA_units/nord/Seigneur_de_guerre.cfg
+++ b/units/AoA_units/norse_jarldoms/Warlord.cfg
@@ -1,6 +1,6 @@
 #textdomain armies_of_amberan
 [unit_type]
-    id=AE_AoA_nordian_seigneurDeGuerre
+    id=AE_AoA_norse_jarldoms_Warlord
     name= _ "Warlord"
     race=nordian
     gender=male,female
@@ -49,7 +49,7 @@
     [/attack]
     {AXE_SOUND}
     [female]
-        name= _"female^Warlady"
+        name= _"Warlady"
         gender=female
         image="units/nord/Seigneur-de-guerre2.png"
         die_sound={SOUND_LIST:HUMAN_FEMALE_DIE}
diff --git a/units/AoA_units/nord/Guerrier.cfg b/units/AoA_units/norse_jarldoms/Warrior.cfg
similarity index 91%
rename from units/AoA_units/nord/Guerrier.cfg
rename to units/AoA_units/norse_jarldoms/Warrior.cfg
index c3aa75e7d..9cd16cf27 100644
--- a/units/AoA_units/nord/Guerrier.cfg
+++ b/units/AoA_units/norse_jarldoms/Warrior.cfg
@@ -1,6 +1,6 @@
 #textdomain armies_of_amberan
 [unit_type]
-    id=AE_AoA_nordian_guerrier
+    id=AE_AoA_norse_jarldoms_Warrior
     name= _ "Warrior"
     race=nordian
     gender=male,female
@@ -14,7 +14,7 @@
     cost=15
     usage=fighter
     description={AE_AOA_UNIT_NOTICE}+ _ "description to come"
-    advances_to=AE_AoA_nordian_huskarl
+    advances_to=AE_AoA_norse_jarldoms_Huskarl
     die_sound={SOUND_LIST:HUMAN_DIE}
     {DEFENSE_ANIM "units/nord/Guerrier.png" "units/nord/Guerrier.png" {SOUND_LIST:HUMAN_HIT} }
 
@@ -42,7 +42,7 @@
     {SWORD_SOUND}
     {MACE_SOUND}
     [female]
-        name= _"female^Warrior"
+        name= _"Warrior"
         gender=female
         image="units/nord/Guerrier2.png"
         die_sound={SOUND_LIST:HUMAN_FEMALE_DIE}
diff --git a/units/AoA_units/rov_elf/Archidruide.cfg b/units/AoA_units/rovahrian_elves/Archdruid.cfg
similarity index 97%
rename from units/AoA_units/rov_elf/Archidruide.cfg
rename to units/AoA_units/rovahrian_elves/Archdruid.cfg
index 90cb190d3..9ee15d0d0 100644
--- a/units/AoA_units/rov_elf/Archidruide.cfg
+++ b/units/AoA_units/rovahrian_elves/Archdruid.cfg
@@ -1,6 +1,6 @@
 #textdomain armies_of_amberan
 [unit_type]
-    id=AE_AoA_rovelf_archidruide
+    id=AE_AoA_rovahrian_elves_Archdruid
     name= _ "Archdruid"
     race=rovElfe
     gender=female
diff --git a/units/AoA_units/rov_elf/Vengeur.cfg b/units/AoA_units/rovahrian_elves/Avenger.cfg
similarity index 95%
rename from units/AoA_units/rov_elf/Vengeur.cfg
rename to units/AoA_units/rovahrian_elves/Avenger.cfg
index 2791ab28a..9f246fc54 100644
--- a/units/AoA_units/rov_elf/Vengeur.cfg
+++ b/units/AoA_units/rovahrian_elves/Avenger.cfg
@@ -1,6 +1,6 @@
 #textdomain armies_of_amberan
 [unit_type]
-    id=AE_AoA_rovelf_vengeur
+    id=AE_AoA_rovahrian_elves_Avenger
     name= _ "Avenger"
     race=rovElfe
     gender=male,female
@@ -53,7 +53,7 @@
     {SWORD_SOUND}
     {BOW_SOUND}
     [female]
-        name= _"female^Avenger"
+        name= _"Avenger"
         gender=female
         image="units/Elfe_Rovh/Vengeur2.png"
         die_sound={SOUND_LIST:ELF_FEMALE_HIT}
diff --git a/units/AoA_units/rov_elf/Danse-lame.cfg b/units/AoA_units/rovahrian_elves/Blade_Dancer.cfg
similarity index 85%
rename from units/AoA_units/rov_elf/Danse-lame.cfg
rename to units/AoA_units/rovahrian_elves/Blade_Dancer.cfg
index 227860b21..06ecbd28d 100644
--- a/units/AoA_units/rov_elf/Danse-lame.cfg
+++ b/units/AoA_units/rovahrian_elves/Blade_Dancer.cfg
@@ -1,7 +1,7 @@
 #textdomain armies_of_amberan
 [unit_type]
-    id=AE_AoA_rovelf_danseLame
-    name= _ "Blade danser"
+    id=AE_AoA_rovahrian_elves_Blade_Dancer
+    name= _ "Blade Dancer"
     race=rovElfe
     gender=male,female
     image="units/Elfe_Rovh/Danse-lame.png"
@@ -14,7 +14,7 @@
     cost=19
     usage=fighter
     description={AE_AOA_UNIT_NOTICE}+ _ "description to come"
-    advances_to=AE_AoA_rovelf_danseGuerre
+    advances_to=AE_AoA_rovahrian_elves_War_Dancer
     die_sound={SOUND_LIST:ELF_HIT}
     {DEFENSE_ANIM "units/Elfe_Rovh/Danse-lame.png" "units/Elfe_Rovh/Danse-lame.png" {SOUND_LIST:ELF_HIT} }
     [abilities]
@@ -26,7 +26,7 @@
 
     [attack]
         name=epee
-        description=_"blade danse"
+        description=_"blade dance"
         icon=attacks/sword-elven.png
         type=blade
         [specials]
@@ -38,7 +38,7 @@
     [/attack]
     {SWORD_SOUND}
     [female]
-        name= _"female^Blade danser"
+        name= _"Blade Dancer"
         gender=female
         image="units/Elfe_Rovh/Danse-lame2.png"
         die_sound={SOUND_LIST:ELF_FEMALE_HIT}
diff --git a/units/AoA_units/rov_elf/Maitre-epeiste.cfg b/units/AoA_units/rovahrian_elves/Blademaster.cfg
similarity index 94%
rename from units/AoA_units/rov_elf/Maitre-epeiste.cfg
rename to units/AoA_units/rovahrian_elves/Blademaster.cfg
index 2253f1eac..123534643 100644
--- a/units/AoA_units/rov_elf/Maitre-epeiste.cfg
+++ b/units/AoA_units/rovahrian_elves/Blademaster.cfg
@@ -1,6 +1,6 @@
 #textdomain armies_of_amberan
 [unit_type]
-    id=AE_AoA_rovelf_maitreEpeiste
+    id=AE_AoA_rovahrian_elves_Blademaster
     name= _ "Blademaster"
     race=rovElfe
     gender=male,female
@@ -34,7 +34,7 @@
     [/attack]
     {SWORD_SOUND}
     [female]
-        name= _"female^Blademaster"
+        name= _"Blademaster"
         gender=female
         image="units/Elfe_Rovh/Maitre-lame2.png"
         die_sound={SOUND_LIST:ELF_FEMALE_HIT}
diff --git a/units/AoA_units/rov_elf/Archer.cfg b/units/AoA_units/rovahrian_elves/Bowman.cfg
similarity index 89%
rename from units/AoA_units/rov_elf/Archer.cfg
rename to units/AoA_units/rovahrian_elves/Bowman.cfg
index 3595ce6de..2adc0e3d9 100644
--- a/units/AoA_units/rov_elf/Archer.cfg
+++ b/units/AoA_units/rovahrian_elves/Bowman.cfg
@@ -1,6 +1,6 @@
 #textdomain armies_of_amberan
 [unit_type]
-    id=AE_AoA_rovelf_archer
+    id=AE_AoA_rovahrian_elves_Bowman
     name= _ "Bowman"
     race=rovElfe
     gender=male,female
@@ -14,7 +14,7 @@
     cost=17
     usage=archer
     description={AE_AOA_UNIT_NOTICE}+ _ "description to come"
-    advances_to=AE_AoA_rovelf_archerDeGuerre,AE_AoA_rovelf_ranger
+    advances_to=AE_AoA_rovahrian_elves_War_Archer,AE_AoA_rovahrian_elves_Ranger
     die_sound={SOUND_LIST:ELF_HIT}
     {DEFENSE_ANIM "units/Elfe_Rovh/Archer.png" "units/Elfe_Rovh/Archer.png" {SOUND_LIST:ELF_HIT} }
     {TRAIT_DEXTROUS}
@@ -42,7 +42,7 @@
     {SWORD_SOUND}
     {BOW_SOUND}
     [female]
-        name= _"female^Bowman"
+        name= _"Bowman"
         gender=female
         image="units/Elfe_Rovh/Archer2.png"
         die_sound={SOUND_LIST:ELF_FEMALE_HIT}
diff --git a/units/AoA_units/rov_elf/Druide.cfg b/units/AoA_units/rovahrian_elves/Druid.cfg
similarity index 93%
rename from units/AoA_units/rov_elf/Druide.cfg
rename to units/AoA_units/rovahrian_elves/Druid.cfg
index d68afbc0e..a540a3762 100644
--- a/units/AoA_units/rov_elf/Druide.cfg
+++ b/units/AoA_units/rovahrian_elves/Druid.cfg
@@ -1,6 +1,6 @@
 #textdomain armies_of_amberan
 [unit_type]
-    id=AE_AoA_rovelf_druide
+    id=AE_AoA_rovahrian_elves_Druid
     name= _ "Druid"
     race=rovElfe
     gender=female
@@ -15,7 +15,7 @@
     cost=25
     usage=healer
     description={AE_AOA_UNIT_NOTICE}+ _ "description to come"
-    advances_to=AE_AoA_rovelf_archidruide
+    advances_to=AE_AoA_rovahrian_elves_Archdruid
     die_sound={SOUND_LIST:ELF_FEMALE_HIT}
     {DEFENSE_ANIM "units/Elfe_Rovh/Druide.png" "units/Elfe_Rovh/Druide.png" {SOUND_LIST:ELF_FEMALE_HIT} }
     [abilities]
diff --git a/units/AoA_units/rov_elf/Champion-forestier.cfg b/units/AoA_units/rovahrian_elves/Forest_Champion.cfg
similarity index 95%
rename from units/AoA_units/rov_elf/Champion-forestier.cfg
rename to units/AoA_units/rovahrian_elves/Forest_Champion.cfg
index bdd50136d..19a393831 100644
--- a/units/AoA_units/rov_elf/Champion-forestier.cfg
+++ b/units/AoA_units/rovahrian_elves/Forest_Champion.cfg
@@ -1,7 +1,7 @@
 #textdomain armies_of_amberan
 [unit_type]
-    id=AE_AoA_rovelf_championForestier
-    name= _ "Forest champion"
+    id=AE_AoA_rovahrian_elves_Forest_Champion
+    name= _ "Forest Champion"
     race=rovElfe
     gender=male
     image="units/Elfe_Rovh/Champion-forestier.png"
diff --git a/units/AoA_units/rov_elf/Chevalier-forestier.cfg b/units/AoA_units/rovahrian_elves/Forest_Knight.cfg
similarity index 92%
rename from units/AoA_units/rov_elf/Chevalier-forestier.cfg
rename to units/AoA_units/rovahrian_elves/Forest_Knight.cfg
index 0dbd7041e..90a221f3d 100644
--- a/units/AoA_units/rov_elf/Chevalier-forestier.cfg
+++ b/units/AoA_units/rovahrian_elves/Forest_Knight.cfg
@@ -1,7 +1,7 @@
 #textdomain armies_of_amberan
 [unit_type]
-    id=AE_AoA_rovelf_chevalierForestier
-    name= _ "Forest knight"
+    id=AE_AoA_rovahrian_elves_Forest_Knight
+    name= _ "Forest Knight"
     race=rovElfe
     gender=male
     image="units/Elfe_Rovh/Chevalier-forestier.png"
@@ -15,7 +15,7 @@
     cost=48
     usage=fighter
     description={AE_AOA_UNIT_NOTICE}+ _ "description to come"
-    advances_to=AE_AoA_rovelf_championForestier
+    advances_to=AE_AoA_rovahrian_elves_Forest_Champion
     die_sound={SOUND_LIST:ELF_HIT}
     {DEFENSE_ANIM "units/Elfe_Rovh/Chevalier-forestier.png" "units/Elfe_Rovh/Chevalier-forestier.png" {SOUND_LIST:ELF_HIT} }
     [movement_costs]
diff --git a/units/AoA_units/rov_elf/Patrouilleur-forestier.cfg b/units/AoA_units/rovahrian_elves/Forest_Patrol.cfg
similarity index 91%
rename from units/AoA_units/rov_elf/Patrouilleur-forestier.cfg
rename to units/AoA_units/rovahrian_elves/Forest_Patrol.cfg
index 9d4db57f7..cd5165bde 100644
--- a/units/AoA_units/rov_elf/Patrouilleur-forestier.cfg
+++ b/units/AoA_units/rovahrian_elves/Forest_Patrol.cfg
@@ -1,7 +1,7 @@
 #textdomain armies_of_amberan
 [unit_type]
-    id=AE_AoA_rovelf_patrouilleurForestier
-    name= _ "Forest patroll"
+    id=AE_AoA_rovahrian_elves_Forest_Patrol
+    name= _ "Forest Patrol"
     race=rovElfe
     gender=male
     image="units/Elfe_Rovh/Patrouilleur-forestier.png"
@@ -15,7 +15,7 @@
     cost=25
     usage=fighter
     description={AE_AOA_UNIT_NOTICE}+ _ "description to come"
-    advances_to=AE_AoA_rovelf_chevalierForestier
+    advances_to=AE_AoA_rovahrian_elves_Forest_Knight
     die_sound={SOUND_LIST:ELF_HIT}
     {DEFENSE_ANIM "units/Elfe_Rovh/Patrouilleur-forestier.png" "units/Elfe_Rovh/Patrouilleur-forestier.png" {SOUND_LIST:ELF_HIT} }
     [movement_costs]
diff --git a/units/AoA_units/rov_elf/Soigneur.cfg b/units/AoA_units/rovahrian_elves/Healer.cfg
similarity index 92%
rename from units/AoA_units/rov_elf/Soigneur.cfg
rename to units/AoA_units/rovahrian_elves/Healer.cfg
index 8695c2fc6..db32e6421 100644
--- a/units/AoA_units/rov_elf/Soigneur.cfg
+++ b/units/AoA_units/rovahrian_elves/Healer.cfg
@@ -1,6 +1,6 @@
 #textdomain armies_of_amberan
 [unit_type]
-    id=AE_AoA_rovelf_soigneur
+    id=AE_AoA_rovahrian_elves_Healer
     name= _ "Healer"
     race=rovElfe
     gender=female
@@ -15,7 +15,7 @@
     cost=15
     usage=healer
     description={AE_AOA_UNIT_NOTICE}+ _ "description to come"
-    advances_to=AE_AoA_rovelf_druide
+    advances_to=AE_AoA_rovahrian_elves_Druid
     die_sound={SOUND_LIST:ELF_FEMALE_HIT}
     {DEFENSE_ANIM "units/Elfe_Rovh/Soigneur.png" "units/Elfe_Rovh/Soigneur.png" {SOUND_LIST:ELF_FEMALE_HIT} }
     [abilities]
diff --git a/units/AoA_units/rov_elf/Heraut.cfg b/units/AoA_units/rovahrian_elves/Herald.cfg
similarity index 95%
rename from units/AoA_units/rov_elf/Heraut.cfg
rename to units/AoA_units/rovahrian_elves/Herald.cfg
index 9d13eb15e..7e2c78467 100644
--- a/units/AoA_units/rov_elf/Heraut.cfg
+++ b/units/AoA_units/rovahrian_elves/Herald.cfg
@@ -1,6 +1,6 @@
 #textdomain armies_of_amberan
 [unit_type]
-    id=AE_AoA_rovelf_heraut
+    id=AE_AoA_rovahrian_elves_Herald
     name= _ "Herald"
     race=rovElfe
     gender=male,female
@@ -47,7 +47,7 @@
     {SWORD_SOUND}
     {BOW_SOUND}
     [female]
-        name= _"female^Herald"
+        name= _"Herald"
         gender=female
         image="units/Elfe_Rovh/Heraut.png"
         die_sound={SOUND_LIST:ELF_FEMALE_HIT}
diff --git a/units/AoA_units/rov_elf/Haut-Seigneur.cfg b/units/AoA_units/rovahrian_elves/High_Lord.cfg
similarity index 93%
rename from units/AoA_units/rov_elf/Haut-Seigneur.cfg
rename to units/AoA_units/rovahrian_elves/High_Lord.cfg
index ba026b0b6..b711f8c85 100644
--- a/units/AoA_units/rov_elf/Haut-Seigneur.cfg
+++ b/units/AoA_units/rovahrian_elves/High_Lord.cfg
@@ -1,7 +1,7 @@
 #textdomain armies_of_amberan
 [unit_type]
-    id=AE_AoA_rovelf_hautSeigneur
-    name= _ "High lord"
+    id=AE_AoA_rovahrian_elves_High_Lord
+    name= _ "High Lord"
     race=rovElfe
     gender=male,female
     image="units/Elfe_Rovh/Haut-seigneur.png"
@@ -47,7 +47,7 @@
     {SWORD_SOUND}
     {HOLYFIRE_SOUND}
     [female]
-        name= _"female^High lady"
+        name= _"High lady"
         gender=female
         image="units/Elfe_Rovh/Haut-seigneur2.png"
         die_sound={SOUND_LIST:ELF_FEMALE_HIT}
diff --git a/units/AoA_units/rov_elf/Seigneur.cfg b/units/AoA_units/rovahrian_elves/Lord.cfg
similarity index 92%
rename from units/AoA_units/rov_elf/Seigneur.cfg
rename to units/AoA_units/rovahrian_elves/Lord.cfg
index a2e9ed2ed..b9c0968a2 100644
--- a/units/AoA_units/rov_elf/Seigneur.cfg
+++ b/units/AoA_units/rovahrian_elves/Lord.cfg
@@ -1,6 +1,6 @@
 #textdomain armies_of_amberan
 [unit_type]
-    id=AE_AoA_rovelf_seigneur
+    id=AE_AoA_rovahrian_elves_Lord
     name= _ "Lord"
     race=rovElfe
     gender=male,female
@@ -15,7 +15,7 @@
     cost=39
     usage=fighter
     description={AE_AOA_UNIT_NOTICE}+ _ "description to come"
-    advances_to=AE_AoA_rovelf_hautSeigneur
+    advances_to=AE_AoA_rovahrian_elves_High_Lord
     die_sound={SOUND_LIST:ELF_HIT}
     {DEFENSE_ANIM "units/Elfe_Rovh/Seigneur.png" "units/Elfe_Rovh/Seigneur.png" {SOUND_LIST:ELF_HIT} }
     {TRAIT_DEXTROUS}
@@ -46,7 +46,7 @@
     {SWORD_SOUND}
     {HOLYFIRE_SOUND}
     [female]
-        name= _"female^Lady"
+        name= _"Lady"
         gender=female
         image="units/Elfe_Rovh/Seigneur2.png"
         die_sound={SOUND_LIST:ELF_FEMALE_HIT}
diff --git a/units/AoA_units/rov_elf/Mage.cfg b/units/AoA_units/rovahrian_elves/Mage.cfg
similarity index 92%
rename from units/AoA_units/rov_elf/Mage.cfg
rename to units/AoA_units/rovahrian_elves/Mage.cfg
index a6f8d2311..e328228be 100644
--- a/units/AoA_units/rov_elf/Mage.cfg
+++ b/units/AoA_units/rovahrian_elves/Mage.cfg
@@ -1,6 +1,6 @@
 #textdomain armies_of_amberan
 [unit_type]
-    id=AE_AoA_rovelf_mage
+    id=AE_AoA_rovahrian_elves_Mage
     name= _ "Mage"
     race=rovElfe
     gender=male,female
@@ -15,7 +15,7 @@
     cost=38
     usage=mixed fighter
     description={AE_AOA_UNIT_NOTICE}+ _ "description to come"
-    advances_to=AE_AoA_rovelf_magister
+    advances_to=AE_AoA_rovahrian_elves_Magister
     die_sound={SOUND_LIST:ELF_HIT}
     {DEFENSE_ANIM "units/Elfe_Rovh/Mage.png" "units/Elfe_Rovh/Mage.png" {SOUND_LIST:ELF_HIT} }
     {TRAIT_DEXTROUS}
@@ -42,7 +42,7 @@
     {STAFF_SOUND}
     {FIREBALL_SOUND}
     [female]
-        name= _"female^Mage"
+        name= _"Mage"
         gender=female
         image="units/Elfe_Rovh/Mage2.png"
         die_sound={SOUND_LIST:ELF_FEMALE_HIT}
diff --git a/units/AoA_units/rov_elf/Magistere.cfg b/units/AoA_units/rovahrian_elves/Magister.cfg
similarity index 95%
rename from units/AoA_units/rov_elf/Magistere.cfg
rename to units/AoA_units/rovahrian_elves/Magister.cfg
index 76167d963..63e8fcfee 100644
--- a/units/AoA_units/rov_elf/Magistere.cfg
+++ b/units/AoA_units/rovahrian_elves/Magister.cfg
@@ -1,6 +1,6 @@
 #textdomain armies_of_amberan
 [unit_type]
-    id=AE_AoA_rovelf_magister
+    id=AE_AoA_rovahrian_elves_Magister
     name= _ "Magister"
     race=rovElfe
     gender=male,female
@@ -49,7 +49,7 @@
     {STAFF_SOUND}
     {FIREBALL_SOUND}
     [female]
-        name= _"female^Magister"
+        name= _"Magister"
         gender=female
         image="units/Elfe_Rovh/Magistere2.png"
         die_sound={SOUND_LIST:ELF_FEMALE_HIT}
diff --git a/units/AoA_units/rov_elf/Maitre-archer.cfg b/units/AoA_units/rovahrian_elves/Master_Archer.cfg
similarity index 92%
rename from units/AoA_units/rov_elf/Maitre-archer.cfg
rename to units/AoA_units/rovahrian_elves/Master_Archer.cfg
index f11821897..a0ff938d7 100644
--- a/units/AoA_units/rov_elf/Maitre-archer.cfg
+++ b/units/AoA_units/rovahrian_elves/Master_Archer.cfg
@@ -1,7 +1,7 @@
 #textdomain armies_of_amberan
 [unit_type]
-    id=AE_AoA_rovelf_maitreArcher
-    name= _ "Master archer"
+    id=AE_AoA_rovahrian_elves_Master_Archer
+    name= _ "Master Archer"
     race=rovElfe
     gender=male,female
     image="units/Elfe_Rovh/Maitre-archer.png"
@@ -43,7 +43,7 @@
     {SWORD_SOUND}
     {BOW_SOUND}
     [female]
-        name= _"female^Master archer"
+        name= _"Master Archer"
         gender=female
         image="units/Elfe_Rovh/Maitre-archer2.png"
         die_sound={SOUND_LIST:ELF_FEMALE_HIT}
diff --git a/units/AoA_units/rov_elf/Noble.cfg b/units/AoA_units/rovahrian_elves/Noble.cfg
similarity index 90%
rename from units/AoA_units/rov_elf/Noble.cfg
rename to units/AoA_units/rovahrian_elves/Noble.cfg
index 7157f429d..05675038d 100644
--- a/units/AoA_units/rov_elf/Noble.cfg
+++ b/units/AoA_units/rovahrian_elves/Noble.cfg
@@ -1,6 +1,6 @@
 #textdomain armies_of_amberan
 [unit_type]
-    id=AE_AoA_rovelf_noble
+    id=AE_AoA_rovahrian_elves_Noble
     name= _ "Noble"
     race=rovElfe
     gender=male,female
@@ -15,7 +15,7 @@
     cost=17
     usage=fighter
     description={AE_AOA_UNIT_NOTICE}+ _ "description to come"
-    advances_to=AE_AoA_rovelf_seigneur,AE_AoA_rovelf_mage
+    advances_to=AE_AoA_rovahrian_elves_Lord,AE_AoA_rovahrian_elves_Mage
     die_sound={SOUND_LIST:ELF_HIT}
     {DEFENSE_ANIM "units/Elfe_Rovh/Noble.png" "units/Elfe_Rovh/Noble.png" {SOUND_LIST:ELF_HIT} }
     {TRAIT_DEXTROUS}
@@ -43,7 +43,7 @@
     {SWORD_SOUND}
     {HOLYFIRE_SOUND}
     [female]
-        name= _"female^Noble"
+        name= _"Noble"
         gender=female
         image="units/Elfe_Rovh/Noble2.png"
         die_sound={SOUND_LIST:ELF_FEMALE_HIT}
diff --git a/units/AoA_units/rov_elf/Ranger.cfg b/units/AoA_units/rovahrian_elves/Ranger.cfg
similarity index 92%
rename from units/AoA_units/rov_elf/Ranger.cfg
rename to units/AoA_units/rovahrian_elves/Ranger.cfg
index 74d9fec76..7b117df0f 100644
--- a/units/AoA_units/rov_elf/Ranger.cfg
+++ b/units/AoA_units/rovahrian_elves/Ranger.cfg
@@ -1,6 +1,6 @@
 #textdomain armies_of_amberan
 [unit_type]
-    id=AE_AoA_rovelf_ranger
+    id=AE_AoA_rovahrian_elves_Ranger
     name= _ "Ranger"
     race=rovElfe
     gender=male,female
@@ -14,7 +14,7 @@
     cost=32
     usage=mixed fighter
     description={AE_AOA_UNIT_NOTICE}+ _ "description to come"
-    advances_to=AE_AoA_rovelf_vengeur
+    advances_to=AE_AoA_rovahrian_elves_Avenger
     die_sound={SOUND_LIST:ELF_HIT}
     {DEFENSE_ANIM "units/Elfe_Rovh/Ranger.png" "units/Elfe_Rovh/Ranger.png" {SOUND_LIST:ELF_HIT} }
     {TRAIT_DEXTROUS}
@@ -51,7 +51,7 @@
     {SWORD_SOUND}
     {BOW_SOUND}
     [female]
-        name= _"female^Ranger"
+        name= _"Ranger"
         gender=female
         image="units/Elfe_Rovh/Ranger2.png"
         die_sound={SOUND_LIST:ELF_FEMALE_HIT}
diff --git a/units/AoA_units/rov_elf/Rempart.cfg b/units/AoA_units/rovahrian_elves/Rempart.cfg
similarity index 90%
rename from units/AoA_units/rov_elf/Rempart.cfg
rename to units/AoA_units/rovahrian_elves/Rempart.cfg
index 8874ed162..d8cdaa5bd 100644
--- a/units/AoA_units/rov_elf/Rempart.cfg
+++ b/units/AoA_units/rovahrian_elves/Rempart.cfg
@@ -1,6 +1,6 @@
 #textdomain armies_of_amberan
 [unit_type]
-    id=AE_AoA_rovelf_rempart
+    id=AE_AoA_rovahrian_elves_Rempart
     name= _ "Rempart"
     race=rovElfe
     gender=male,female
@@ -15,7 +15,7 @@
     cost=23
     usage=fighter
     description={AE_AOA_UNIT_NOTICE}+ _ "description to come"
-    advances_to=AE_AoA_rovelf_gardeRoyal
+    advances_to=AE_AoA_rovahrian_elves_Royal_Guard
     die_sound={SOUND_LIST:ELF_HIT}
     {DEFENSE_ANIM "units/Elfe_Rovh/Rempart.png" "units/Elfe_Rovh/Rempart.png" {SOUND_LIST:ELF_HIT} }
     [resistance]
@@ -37,7 +37,7 @@
     [/attack]
     {SPEAR_SOUND}
     [female]
-        name= _"female^Rempart"
+        name= _"Rempart"
         gender=female
         image="units/Elfe_Rovh/Rempart2.png"
         die_sound={SOUND_LIST:ELF_FEMALE_HIT}
diff --git a/units/AoA_units/rov_elf/Cavalier.cfg b/units/AoA_units/rovahrian_elves/Rider.cfg
similarity index 92%
rename from units/AoA_units/rov_elf/Cavalier.cfg
rename to units/AoA_units/rovahrian_elves/Rider.cfg
index 4735e4b8f..848c99941 100644
--- a/units/AoA_units/rov_elf/Cavalier.cfg
+++ b/units/AoA_units/rovahrian_elves/Rider.cfg
@@ -1,6 +1,6 @@
 #textdomain armies_of_amberan
 [unit_type]
-    id=AE_AoA_rovelf_cavalier
+    id=AE_AoA_rovahrian_elves_Rider
     name= _ "Rider"
     race=rovElfe
     gender=male,female
@@ -15,7 +15,7 @@
     usage=scout
     undead_variation=mounted
     description={AE_AOA_UNIT_NOTICE}+ _ "description to come"
-    advances_to=AE_AoA_rovelf_heraut
+    advances_to=AE_AoA_rovahrian_elves_Herald
     die_sound={SOUND_LIST:ELF_HIT}
     {DEFENSE_ANIM "units/Elfe_Rovh/Cavalier.png" "units/Elfe_Rovh/Cavalier.png" {SOUND_LIST:ELF_HIT} }
     {TRAIT_DEXTROUS}
@@ -47,7 +47,7 @@
     {SWORD_SOUND}
     {BOW_SOUND}
     [female]
-        name= _"female^Rider"
+        name= _"Rider"
         gender=female
         image="units/Elfe_Rovh/Cavalier.png"
         die_sound={SOUND_LIST:ELF_FEMALE_HIT}
diff --git a/units/AoA_units/rov_elf/Garde-royal.cfg b/units/AoA_units/rovahrian_elves/Royal_Guard.cfg
similarity index 92%
rename from units/AoA_units/rov_elf/Garde-royal.cfg
rename to units/AoA_units/rovahrian_elves/Royal_Guard.cfg
index 9dfcab866..7b2d6b441 100644
--- a/units/AoA_units/rov_elf/Garde-royal.cfg
+++ b/units/AoA_units/rovahrian_elves/Royal_Guard.cfg
@@ -1,7 +1,7 @@
 #textdomain armies_of_amberan
 [unit_type]
-    id=AE_AoA_rovelf_gardeRoyal
-    name= _ "Royal guard"
+    id=AE_AoA_rovahrian_elves_Royal_Guard
+    name= _ "Royal Guard"
     race=rovElfe
     gender=male,female
     image="units/Elfe_Rovh/Garde-royal.png"
@@ -39,7 +39,7 @@
     [/attack]
     {SPEAR_SOUND}
     [female]
-        name= _"female^Royal guard"
+        name= _"Royal Guard"
         gender=female
         image="units/Elfe_Rovh/Garde-royal2.png"
         die_sound={SOUND_LIST:ELF_FEMALE_HIT}
diff --git a/units/AoA_units/rov_elf/Eclaireur.cfg b/units/AoA_units/rovahrian_elves/Scout.cfg
similarity index 92%
rename from units/AoA_units/rov_elf/Eclaireur.cfg
rename to units/AoA_units/rovahrian_elves/Scout.cfg
index 87abbc4a5..e1999f08f 100644
--- a/units/AoA_units/rov_elf/Eclaireur.cfg
+++ b/units/AoA_units/rovahrian_elves/Scout.cfg
@@ -1,6 +1,6 @@
 #textdomain armies_of_amberan
 [unit_type]
-    id=AE_AoA_rovelf_eclaireur
+    id=AE_AoA_rovahrian_elves_Scout
     name= _ "Scout"
     race=rovElfe
     gender=male,female
@@ -15,7 +15,7 @@
     usage=scout
     description={AE_AOA_UNIT_NOTICE}+ _ "description to come"
     undead_variation=mounted
-    advances_to=AE_AoA_rovelf_cavalier
+    advances_to=AE_AoA_rovahrian_elves_Rider
     die_sound={SOUND_LIST:ELF_HIT}
     {DEFENSE_ANIM "units/Elfe_Rovh/Eclaireur.png" "units/Elfe_Rovh/Eclaireur.png" {SOUND_LIST:ELF_HIT} }
     {TRAIT_DEXTROUS}
@@ -47,7 +47,7 @@
     {SWORD_SOUND}
     {BOW_SOUND}
     [female]
-        name= _"female^Scout"
+        name= _"Scout"
         gender=female
         image="units/Elfe_Rovh/Eclaireur.png"
         die_sound={SOUND_LIST:ELF_FEMALE_HIT}
diff --git a/units/AoA_units/rov_elf/Lancier.cfg b/units/AoA_units/rovahrian_elves/Spearman.cfg
similarity index 88%
rename from units/AoA_units/rov_elf/Lancier.cfg
rename to units/AoA_units/rovahrian_elves/Spearman.cfg
index b739d21fe..1494ac484 100644
--- a/units/AoA_units/rov_elf/Lancier.cfg
+++ b/units/AoA_units/rovahrian_elves/Spearman.cfg
@@ -1,6 +1,6 @@
 #textdomain armies_of_amberan
 [unit_type]
-    id=AE_AoA_rovelf_lancier
+    id=AE_AoA_rovahrian_elves_Spearman
     name= _ "Spearman"
     race=rovElfe
     gender=male,female
@@ -15,7 +15,7 @@
     cost=13
     usage=fighter
     description={AE_AOA_UNIT_NOTICE}+ _ "description to come"
-    advances_to=AE_AoA_rovelf_rempart,AE_AoA_rovelf_epeiste
+    advances_to=AE_AoA_rovahrian_elves_Rempart,AE_AoA_rovahrian_elves_Swordman
     die_sound={SOUND_LIST:ELF_HIT}
     {DEFENSE_ANIM "units/Elfe_Rovh/Lancier.png" "units/Elfe_Rovh/Lancier.png" {SOUND_LIST:ELF_HIT} }
     [attack]
@@ -32,7 +32,7 @@
     [/attack]
     {SPEAR_SOUND}
     [female]
-        name= _"female^Lancier"
+        name= _"Lancier"
         gender=female
         image="units/Elfe_Rovh/Lancier2.png"
         die_sound={SOUND_LIST:ELF_FEMALE_HIT}
diff --git a/units/AoA_units/rov_elf/Epeiste.cfg b/units/AoA_units/rovahrian_elves/Swordman.cfg
similarity index 90%
rename from units/AoA_units/rov_elf/Epeiste.cfg
rename to units/AoA_units/rovahrian_elves/Swordman.cfg
index a935ef9e1..2852fc42b 100644
--- a/units/AoA_units/rov_elf/Epeiste.cfg
+++ b/units/AoA_units/rovahrian_elves/Swordman.cfg
@@ -1,6 +1,6 @@
 #textdomain armies_of_amberan
 [unit_type]
-    id=AE_AoA_rovelf_epeiste
+    id=AE_AoA_rovahrian_elves_Swordman
     name= _ "Swordman"
     race=rovElfe
     gender=male,female
@@ -15,7 +15,7 @@
     cost=28
     usage=fighter
     description={AE_AOA_UNIT_NOTICE}+ _ "description to come"
-    advances_to=AE_AoA_rovelf_maitreEpeiste
+    advances_to=AE_AoA_rovahrian_elves_Blademaster
     die_sound={SOUND_LIST:ELF_HIT}
     {DEFENSE_ANIM "units/Elfe_Rovh/Epeiste.png" "units/Elfe_Rovh/Epeiste.png" {SOUND_LIST:ELF_HIT} }
     [resistance]
@@ -33,7 +33,7 @@
     [/attack]
     {SWORD_SOUND}
     [female]
-        name= _"female^Swordman"
+        name= _"Swordman"
         gender=female
         image="units/Elfe_Rovh/Epeiste2.png"
         die_sound={SOUND_LIST:ELF_FEMALE_HIT}
diff --git a/units/AoA_units/rov_elf/Archer-de-guerre.cfg b/units/AoA_units/rovahrian_elves/War_Archer.cfg
similarity index 89%
rename from units/AoA_units/rov_elf/Archer-de-guerre.cfg
rename to units/AoA_units/rovahrian_elves/War_Archer.cfg
index eb551982d..f0bc7e432 100644
--- a/units/AoA_units/rov_elf/Archer-de-guerre.cfg
+++ b/units/AoA_units/rovahrian_elves/War_Archer.cfg
@@ -1,7 +1,7 @@
 #textdomain armies_of_amberan
 [unit_type]
-    id=AE_AoA_rovelf_archerDeGuerre
-    name= _ "War archer"
+    id=AE_AoA_rovahrian_elves_War_Archer
+    name= _ "War Archer"
     race=rovElfe
     gender=male,female
     image="units/Elfe_Rovh/Archer-de-guerre.png"
@@ -14,7 +14,7 @@
     cost=31
     usage=archer
     description={AE_AOA_UNIT_NOTICE}+ _ "description to come"
-    advances_to=AE_AoA_rovelf_maitreArcher
+    advances_to=AE_AoA_rovahrian_elves_Master_Archer
     die_sound={SOUND_LIST:ELF_HIT}
     {DEFENSE_ANIM "units/Elfe_Rovh/Archer-de-guerre.png" "units/Elfe_Rovh/Archer-de-guerre.png" {SOUND_LIST:ELF_HIT} }
     {TRAIT_DEXTROUS}
@@ -42,7 +42,7 @@
     {SWORD_SOUND}
     {BOW_SOUND}
     [female]
-        name= _"female^War archer"
+        name= _"War Archer"
         gender=female
         image="units/Elfe_Rovh/Archer-de-guerre2.png"
         die_sound={SOUND_LIST:ELF_FEMALE_HIT}
diff --git a/units/AoA_units/rov_elf/Danse-guerre.cfg b/units/AoA_units/rovahrian_elves/War_Dancer.cfg
similarity index 90%
rename from units/AoA_units/rov_elf/Danse-guerre.cfg
rename to units/AoA_units/rovahrian_elves/War_Dancer.cfg
index c306e0658..a59ac3f87 100644
--- a/units/AoA_units/rov_elf/Danse-guerre.cfg
+++ b/units/AoA_units/rovahrian_elves/War_Dancer.cfg
@@ -1,7 +1,7 @@
 #textdomain armies_of_amberan
 [unit_type]
-    id=AE_AoA_rovelf_danseGuerre
-    name= _ "War danser"
+    id=AE_AoA_rovahrian_elves_War_Dancer
+    name= _ "War Dancer"
     race=rovElfe
     gender=male,female
     image="units/Elfe_Rovh/Danse-guerre.png"
@@ -28,7 +28,7 @@
 
     [attack]
         name=epee
-        description=_"war danse"
+        description=_"war dance"
         icon=attacks/greatsword-elven.png
         type=blade
         [specials]
@@ -40,7 +40,7 @@
     [/attack]
     {SWORD_SOUND}
     [female]
-        name= _"female^War danser"
+        name= _"War Dancer"
         gender=female
         image="units/Elfe_Rovh/Danse-guerre2.png"
         die_sound={SOUND_LIST:ELF_FEMALE_HIT}
diff --git a/units/AoA_units/units.cfg b/units/AoA_units/units.cfg
index d0585c547..a523b5ebc 100644
--- a/units/AoA_units/units.cfg
+++ b/units/AoA_units/units.cfg
@@ -280,13 +280,13 @@
     {ROV_ELF_NAMES}
 [/race]
 
-{GET_AE_UNITS AoA_units/farengar}
-{GET_AE_UNITS AoA_units/empire}
-{GET_AE_UNITS AoA_units/federation}
-{GET_AE_UNITS AoA_units/nord}
-{GET_AE_UNITS AoA_units/rovahr}
+{GET_AE_UNITS AoA_units/farengarian_dwarves_counties}
+{GET_AE_UNITS AoA_units/farengarians_kingdoms}
+{GET_AE_UNITS AoA_units/finn_empire}
 {GET_AE_UNITS AoA_units/galianos}
-{GET_AE_UNITS AoA_units/far_nains}
-{GET_AE_UNITS AoA_units/mork-darf}
-{GET_AE_UNITS AoA_units/gobmon}
-{GET_AE_UNITS AoA_units/rov_elf}
+{GET_AE_UNITS AoA_units/kingdoms_rovahr}
+{GET_AE_UNITS AoA_units/mauve_islands_federation}
+{GET_AE_UNITS AoA_units/morkenost_darfenlend}
+{GET_AE_UNITS AoA_units/mountain_goblins}
+{GET_AE_UNITS AoA_units/norse_jarldoms}
+{GET_AE_UNITS AoA_units/rovahrian_elves}