I don't know if this got lost in the server, so I'll send it again.
In an attempt to resolve all this conflict, there's a new naming convention proposal:
http://en.wikipedia.org/wiki/Wikipedia:Naming_conventions_(countries)
Feel free to comment on the talk page.
-- Stephen Bain stephen.bain@gmail.com