Rename M->MBox and lift->box, modify some code.