improved property naming in Models to be less confusing