Consistent input/output in CLI feature

The feature still reads confusingly but at least all the scenarios match.