improve renaming