Unify city naming into one method with pattern matching.

This was a simple refactoring that made the city naming method more general. It can be used to create any random text. Next step, random pattern generator!