MistyRonin
Warlord
Due to how it seems to be implemented, I think it's inevitable.I know they have great options for not making it Madrid, but making it change capital if the other Spain is in the game gives you information about who your random opponents are.
But I guess, as in wild guess, they will allow an option to disable multiple leaders per civ in the game config screen.
IMHO is better to have a clear capital for each AI/player leader (even if they are from the same civ) than a repeated city name just to prevent giving to much info on unknown opponents.