fix name and nickname