Fix incorrect import references