Additional fixes to renaming with  context menu