Are we at the point where this can be removed, or renamed?