Renamed several things in the FetcherRetest patch.