Fixed bugs with renaming items