Rename items
merge changes