Rename fields in DuplexState
Add state types