Improved name generation.