Finalize renaming