CORE-4031: changed the names of some of the form fields