Stick to the cli conventions