Update variable names to match usage elsewhere in Waterline.  (Models, not collections)
Update variable names to match usage elsewhere in Waterline.  (Models, not collections)

luislobo/waterline,balderdashy/waterline