ENH: re-order labels to better match workflow