changed some names in parser.c