Renamed state machine