Named the structs (as per DonDiego's review)