Naming consistency for 2 forgotten structs