Fix for renaming problem