Rename this thing, to make space for bug 25471