Add word boundaries to regular expression to fix name matching error.