Update type references to use a fully qualified name when we have more than one candidate available to us. See gh-41614