more robust renaming