Update implementation to use underscore attributes

- We recently updated the protocol spec to force the
  use of underscore attributes, this updates the implementation
  accordingly