Updated name generator