Add missing include for new Identifier class and change reference from
Token to Identifier