Replaced tokens in grammar with named tokens