Fix a case where fuzzy name matching of attributes or commands, mistakenly picks a wrong reference.
Fix a case where fuzzy name matching of attributes or commands, mistakenly picks a wrong reference.

project-chip/zap,project-chip/zap,project-chip/zap,project-chip/zap