Renaming with history