Fix alphabetical ordering to make it... alphabetical