Make templates' Identity <Civ> tag consistently use the long civilization version. E.g. instead of egypt use egyptian. Fixes most remaining issues.