Fix for ambiguity in name matching.

Added exact name matching as the first step of fuzzy matching.