Improve name generation.