Update uses of models w/ new attribute names