diff --git a/binaries/data/mods/public/simulation/templates/units/brit_cavalry_javelinist_hero_boudicca.xml b/binaries/data/mods/public/simulation/templates/units/brit_hero_boudicca_cavalry_javelinist.xml
similarity index 100%
rename from binaries/data/mods/public/simulation/templates/units/brit_cavalry_javelinist_hero_boudicca.xml
rename to binaries/data/mods/public/simulation/templates/units/brit_hero_boudicca_cavalry_javelinist.xml
diff --git a/binaries/data/mods/public/simulation/templates/units/gaul_infantry_swordsman_hero_vercingetorix.xml b/binaries/data/mods/public/simulation/templates/units/gaul_hero_vercingetorix_infantry.xml
similarity index 100%
rename from binaries/data/mods/public/simulation/templates/units/gaul_infantry_swordsman_hero_vercingetorix.xml
rename to binaries/data/mods/public/simulation/templates/units/gaul_hero_vercingetorix_infantry.xml
diff --git a/binaries/data/mods/public/simulation/templates/units/iber_infantry_spearman_hero_indibil.xml b/binaries/data/mods/public/simulation/templates/units/iber_hero_indibil_infantry.xml
similarity index 100%
rename from binaries/data/mods/public/simulation/templates/units/iber_infantry_spearman_hero_indibil.xml
rename to binaries/data/mods/public/simulation/templates/units/iber_hero_indibil_infantry.xml
diff --git a/binaries/data/mods/public/simulation/templates/units/rome_hero_infantry_swordsman_marcellus.xml b/binaries/data/mods/public/simulation/templates/units/rome_hero_marcellus_infantry.xml
similarity index 100%
rename from binaries/data/mods/public/simulation/templates/units/rome_hero_infantry_swordsman_marcellus.xml
rename to binaries/data/mods/public/simulation/templates/units/rome_hero_marcellus_infantry.xml
diff --git a/binaries/data/mods/public/simulation/templates/units/rome_hero_infantry_swordsman_maximus.xml b/binaries/data/mods/public/simulation/templates/units/rome_hero_maximus_infantry.xml
similarity index 100%
rename from binaries/data/mods/public/simulation/templates/units/rome_hero_infantry_swordsman_maximus.xml
rename to binaries/data/mods/public/simulation/templates/units/rome_hero_maximus_infantry.xml
diff --git a/binaries/data/mods/public/simulation/templates/units/spart_infantry_spearman_hero_leonidas_300.xml b/binaries/data/mods/public/simulation/templates/units/spart_hero_leonidas_300.xml
similarity index 100%
rename from binaries/data/mods/public/simulation/templates/units/spart_infantry_spearman_hero_leonidas_300.xml
rename to binaries/data/mods/public/simulation/templates/units/spart_hero_leonidas_300.xml