Work on cleaner separation of RenameWidget to simpler classes