rewrote imports to handle aliasing