edit all name comparison to be .contains