Fix field order

Chase-san had the right idea, this updates the rest of the places that need to be in sync.
Hopefully I can get rid of this enum crap soon.