Finish renaming things