Recovering from too much renaming