clean up matcher name