CUP Parser with name changes