Updating the form builder to support different types of field names