More work on the callout/calloutdialog for rename