The template that displays the modal SMS instructions references 'NUMBER' not phone, so if we change this to phone we have to change that too.

I agree with you, but wasn't sure where this got introduced and since we already used NUMBER thought it would be good to switch this back. Should I change this back and change the base.html template?