Renaming by pressing F2, rename fixes