Made option naming less verbose