tweak namings of some protobuf things