Updating markup to use form-field instead of the plural