Fix tests broken by rename.