fix #87 add more name fields