Implement case/symbol insensitive matching
Fix whole name matches