Rename substructure for ease of debugging