Refactor QuestionChoice into Choice

This is to avoid confusion with Question itself and inconsistencies in
code and API between "questionChoice" and short form "choice"