Fix the Instruction model to use short_form and long_form