Since there's the whole rename thing going on, we should rename stuff in the actual code.
Bug watches keep track of this bug in other bug trackers.