Changed text field names so that they appear correctly in save form.