Fix country names

Remove the words inside parentheses and put them in front of the names, as people would do when writing country names.

The versions with parentheses are only used in alphabetical listings, not in real-world situations.