Finish renaming everything