Rename remaining things