Update key ordering to match old order