Use correct model, field name fixes