Change name for validator classes to rule suffix