Rename some variables in parser