Significantly rework form field names

This should be much easier to examine and use. Still needs work. Breaking change.