Fix discrepancies caused by renaming.