Adding support to new module naming structure.