Merges wils' fixes to protobuf naming.