fix our modules to use the new module interface