amended NameMatch class