Fix spelling and order

This was noticed in the merge conflict resolution. Fixed here.