For #1850: Disable by default and better names

- also use Mode instead of Action