Better handling of missing echos

- Rename state machine states for clarity