Rename WAITING state to WAIT