Forms updated with minor changes.

Some field names have been changed.