Match names correctly