Correcting name fields