Adapted new naming in .proto file