Fix small issues with renaming