Use option instead of actual name
(cherry picked from commit 73531c4)