Fixed issue with renaming