More naming, and added week2 questions