Rename remaining originWorker references