Merge "Tweak command-line verb names"