Fix namespacing on upstream struct