I concur.
My ideal would be to keep Swordsman, Axemen, and Spearmen as separate units, each with slight bonuses to offer a little variety (Swordsmen: +5% City Attack, Axemen: +5% vs Melee, Spearmen: +10% vs Mounted), then renaming Champions to Men-at-Arms, and Phalanxes to Champions.
If...