switched OPF_SDP and OPF_SDP_nonrank1 naming