Rework ruleset and declaration naming