Apply patch from Cullen regarding drafts that have changed names