Rename typedef'd structs so they don't have type_ in the name