Rename vp->lvalue to vp->vp_*, as appropriate.