Update C++ bindings demo with new struct naming