Changed names to form field types. Fixed issues with filled forms.