[5.x] Update our custom string based rules to class based rules

[5.x] Update our custom string based rules to class based rules #20806