Finish off renames.