Clarified name fields