fix variable and form field names