Improved name generation