Improved renaming interactions to be more intuitive