cherry picking repo-rename changes