Fixed a few minor naming issues with the Field model