Fixed errors caused by renaming of model fields