Changes to support converting named imports to the proper type