Change instances of Token object to Identifier objects