Finish renaming etc.