Expand types to use FQN