Improve rename behavior