rename some rules for better consistency