Update structs to have underscore prefixes