Support for proper renaming via. context menu