CASC-219: renamed matcher class to match behavior