Update to new module naming convnetion