Fix clash on naming structs