Rename grammar productions for clarity