Fix quality flaws due to grammar rule names