[2.1] Removing old references to the deprecated "field" type, replacing with "form" type