Also remove underscore in DBC names when looking for the appropriate structure.