all these renames are a consequence of the getMugTypeByQuestionType refactor, see above