Merge "Rename type resolution entrypoints."