Renamed 'object' to 'entity' in places where it is not a verbal role.