Fix references to data_structures