Refactored the contact form to use the standard Form name