Issue #160: Changed the names of a few of the form elements that were not being referenced properly.