Update client to use underscore in attributes