Update prompts to be consistent

(As well as matching question to variable)