Changed terminal names in parser.yy