Improve matching in general
Change name