few minor changes to name generation