Update prompts to be consistent

(As well as matching question to variable)
Merge pull request #2 from bradp/patch-1

Update prompts to be consistent