Adjust to option struct naming change