Structure name fixes