Cleaned up full name generation