Changed structs names.