fix bugs caused by renaming