Improve consistency of Grammar methods for names of rules and tokens