Added more name and splitting and name gender logic