Fixing renaming errors