Add a few aliases, shift generate_cities from denormalize to generate.
Merge