Changed fieldnames for model