Fix for renaming