Update to use underscore prefixes for structs