Rename form fields.

While these are not the names I would have gone with, they were what was
originally used and changing them alters the config, which makes stripping
them out for a run more painful than it should be.