Fixes renaming errors