Renamed Object and Property to ObjectInstance and PropertyInstance.