minor revisions to reconicle new module names