Remove "Check" at the end of the name of 2 rules
Remove calls to deprecated methods