Rename cities

Enforce some semblance of a naming convention. Do not merge this yet please.