Merge "Tweak command-line verb names" into rvc-dev