fixed trailing space getting matched in member names;

improved name matching