Fix some wording to be more CLI-specific