Should keep the term "options" where appropriate in that new code