rename cases, change plot orderings