Substitute spaces from country name
Rename to proper country name