Change enum wire order to match JDK