renaming class and adding new regex