Change to different option variable for both to avoid some confusion

Thanks go to @Zren for this.

Closes #357