change from illegal names in protobuf stuff