Rename Q6 to HW1-Q6