Renames should be handled efficiently (fixes #3)