Rename rule-related classes
Rework rule activation process