Fixing the problems caused by renaming.