Added name generation