rename package from FormFields to fields