Major rework of name generation for towns