Bug fix. Use Name.match for name matching.