Updated names of model fields