Clarify city vs country

[D-stefaang]

Easy ticket: the code currently uses the letter c, which can be confused as a country vs city.
Make it more explicit to prevent mistakes.

[wxnnvs]

fixed here