uniform token naming, writers require project, update of several writers