Improved type-directed name disambiguation