Take both names into account for structs
Typo