adds poll service, renames events in uploader service