More accurate names for grammar and generated parsers