Added short names for countries