Refactor to rename structs to conform to style guidelines