SAMZA-68; make regex class and regex filename match