Be more consistent in command line terminology