Merge "Fix name in partial convo guts" into rvc-dev