These issues have been the bane of my existence lately, especially your F2 renaming example.