Renaming some variables in the grammar