FormBuilder refactor - rename field classes