Rename for new module format