[es] Improved some rules, added category type, some rule naming cleanup.