minor revisions to import lines consistent with new module names