Merge "Name anonymous records, don't depend on fully qualified name for type-id." into pi-dev