Fix country names and codes in address

Few countries changed their name and this PR updates those names
from old ones to new ones.
Also refactored some code in address.yml file for consistency.

Resolves: #2848