Rename model attributes to match feedzirra's methods
Fix conflicts