Improve renaming and editing