renamed Model.Property => Model.ModelProperty