Rename to new module format