Hotfixes, error when renaming