Fix order state event names and methods