New version of quizzes; changed naming convention